[SCM] Audacity debian packaging branch, upstream, updated. upstream/1.3.6-1-g0f90c51

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Tue Feb 3 10:58:13 UTC 2009


The following commit has been merged in the upstream branch:
commit 0f90c513aebbeb14f72b751680c5f7d8f288a866
Author: Benjamin Drung <benjamin.drung at gmail.com>
Date:   Tue Feb 3 11:55:24 2009 +0100

    Imported upstream version 1.3.7

diff --git a/Makefile.in b/Makefile.in
index 9674cc6..c0ac721 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,10 +2,11 @@
 INSTALL = @INSTALL@
 exec_prefix= @exec_prefix@
 prefix= @prefix@
+datarootdir= @datarootdir@
 BINDIR= @bindir@
 DATADIR= @datadir@
+DATAROOTDIR = @datarootdir@
 MANDIR= @mandir@
-ZIP = @ZIP@
 AUDACITY_NAME = @AUDACITY_NAME@
 EXTRAINSTALLTARGETS= @EXTRAINSTALLTARGETS@
 EXTRAUNINSTALLTARGETS= @EXTRAUNINSTALLTARGETS@
@@ -98,7 +99,7 @@ dox: audacity.dox
 	doxygen audacity.dox
 
 check: src/libaudacity.a
-	$(MAKE) -C tests check
+	-$(MAKE) -C tests check
 
 dep:
 	$(MAKE) -C src dep
@@ -106,7 +107,7 @@ dep:
 clean:
 	$(MAKE) -C lib-src clean
 	$(MAKE) -C src clean
-	$(MAKE) -C tests clean
+	-$(MAKE) -C tests clean
 	rm -f audacity
 	rm -f help/audacity.1.gz
 	rm -rf Audacity.app
@@ -120,9 +121,9 @@ veryclean: clean
 distclean: clean
 	$(MAKE) -C locale distclean
 	$(MAKE) -C lib-src distclean
-	$(MAKE) -C tests distclean
+	-$(MAKE) -C tests distclean
 
-	rm -f Makefile src/Makefile lib-src/Makefile lib-src/allegro/Makefile
+	rm -f Makefile src/Makefile lib-src/Makefile
 	rm -f locale/Makefile src/configunix.h
 	rm -f config.log config.status config.cache
 
diff --git a/README.txt b/README.txt
index da26722..87d370e 100644
--- a/README.txt
+++ b/README.txt
@@ -17,12 +17,12 @@ Audacity source code archive, except as otherwise noted
 
 "Audacity" is a registered trademark of Dominic Mazzoni.
 
-Version 1.3.6 Beta
+Version 1.3.7 Beta
 
 Contents of this README:
 
 1.  Licensing
-2.  Changes in version 1.3.6 Beta
+2.  Changes in version 1.3.7 Beta
 3.  Known Issues
 4.  Source Code, Libraries and Additional Copyright Information
 5.  Compilation Instructions
@@ -54,34 +54,84 @@ to http://www.gnu.org/copyleft/gpl.html or write to
 
 --------------------------------------------------------------------------------
 
-2.  Changes in 1.3.6 Beta (since Alpha 1.3.6a6):
-
-Interface:
-        * "Save Compressed Copy of Project" saves in much smaller .OGG
-           format to facilitate online transmission of projects
-        * Improved MIDI import and export routines, and clearer color
-           for selection region
-        * Default temporary directory on Mac now accessible in Finder
-
-Import / Export:
-	* Stability improvements in on-demand loading
-        * FFmpeg: support for latest version of library, improved
-           version checks and error messages, stability improvements
-           in custom exporter
-
-Bug Fixes:
-        * Crash in "Get Noise Profile" step of Noise Removal at project
-           rates below 20480 Hz.
-        * Underestimation of peak level in tracks with a small number
-           of different peaks
-        * Truncate Silence could result in repeated or lost audio if
-           applied to the whole of a track
-        * Other interface, generating, exporting and platform-specific
-           fixes
-
-Compilation:
-        * Added autoconf macro archive to CVS, enabling *.nix users
-           without this archive to build --with -MIDI
+2.  Changes in version 1.3.7 Beta
+
+Cross-platform Bug Fixes:
+        * Muting/soloing caused incorrect channel results in exported
+           stereo files
+        * Noise Removal and all Nyquist effects pasted the original
+           unmodified audio at the end of the modified region
+        * Noise Removal inserted a tail of low level noise at the end
+           of the modified region
+        * Nyquist and Compressor plug-ins did not display moving bars
+           in progress dialogue and over-estimated "Remaining Time"
+        * Cancelling Nyquist effects deleted unprocessed audio
+        * Change Speed and Change Tempo failed to modify the original
+           selection length
+        * Cut lines invisible
+        * Fixed various bugs importing multi-stream files via FFmpeg
+        * File > Export as WAV could be corrupted if overwriting
+           an imported WAV read direct from the file
+        * Export multiple "Other uncompressed files" choice always
+           produced 16-bit PCM audio irrespective of chosen options.
+        * MP3 export usually produced a 128 kbps constant bit rate file
+           irrespective of chosen options; reported length often
+           incorrect
+        * MP3 ID3 Genre tag misread on import if the genre list in
+           Metadata Editor was opened and saved
+        * Exported metadata tags in MP3, OGG and FLAC often not seen by
+           player software - now substantially improved
+        * WMA exports (via FFmpeg)corrupted if metadata tags included
+        * Some multi-channel recording devices that previously recorded
+           more than two channels no longer did so
+        * Generated audio did not fit in window
+        * No warning was given when saving an empty project
+        * Beep on completing longer process did not work on many
+           systems
+        * fixed crashes importing lists of files (.LOF), in Meter Toolbar
+           and Change Speed
+
+Platform-specific Bug Fixes:
+        * Windows Vista: crash opening Preferences with no sound
+           devices enabled and connected
+        * Mac OS X and Linux:
+           * Spurious clipping at start of playback
+           * Labels did not accept certain legal characters
+           * Shortcuts did not work after running effects
+           * Project Rate did not change to respect rate of first
+              imported file if that rate was unsupported
+        * Mac OS X only:
+           * Crash resizing project window
+           * Menu items became inactive or visibly corrupted
+           * File > Open dialogue did not always work on OS X 10.4
+           * Impossible to set independent Command and Control
+              shortcuts that shared the same key
+           * Freeze importing uncompressed files via On-Demand
+              (please report any remaining instances of this to:
+               feedback at audacityteam.org)
+           * Portable settings were not picked up, instead settings
+              were taken from the default location
+           * Fixed unavailability of FFmpeg installer
+
+New Features:
+           * F11 Full Screen mode
+           * High-quality "Sliding Time Scale/Pitch Shift" effect
+           * Audio Contrast Analyzer for testing audio on the
+              internet for WCAG2 accessibility compliance.
+           * Windows: sound devices can now be opened using the
+              more efficient DirectSound API
+
+Other changes:
+           * Latency correction should be improved for many users
+              by employing a fixed rather than variable correction
+           * Grouping of Effects into categories turned off until
+              a way is added for users to do so themselves
+           * Numerous minor interface improvements such as Metadata
+              Editor navigation, new "hh:mm:ss + hundredths"
+              selection format
+           * Note: Windows users wanting to export MP3 files will
+              require the latest version of the LAME encoder from
+              http://lame.buanzo.com.ar/
 
 
 --------------------------------------------------------------------------------
@@ -95,39 +145,58 @@ for details of any issues that have been identified after release of
 this version.
 
 
- * Creating a Label Track (with or without a label), then pasting in
-    error into any selected track before clipboard has any content
-    causes a crash.
+ * Analyze > Silence Finder and Analyze > Beat Finder crash on
+    cancelling progress dialogue.
 
- * Muting/soloing specific stereo tracks when exporting may produce
-    incorrect channel results in the exported file. A file exported
-    from a single stereo track may have left channel only after use
-    of solo/mute buttons.
+ * Creating a Label Track (with or without a label), then pasting in
+    error into any selected audio track before clipboard has content
+    causes a crash. Pasting into the Label Track does not crash
 
  * Muting specific time-shifted mono tracks when exporting produces
     audio at wrong point on timeline in exported file if muted tracks
     are to left of unmuted.
 
- * Entering a negative three-digit value in "Change Speed", then
-    previewing, raises an "Unhandled Exception" dialogue on which any
-    of the "Abort, Retry, Ignore" choices cause a crash. Also possible
-    freeze or crash on exit if a negative three-digit percent change is
-    previewed in "Change Tempo" or "Change Pitch".
-
- * Nyquist plug-ins do not display moving bars in progress dialogue and
-    over-estimate "Remaining Time"; if effect is cancelled, the
-    unprocessed audio is deleted from the track, or Audacity crashes
-
- * Change Speed and Change Tempo fail to modify the original selection
-    length after applying the effect. Repeat fails to include the
-    original selection region after applyihg the effect.
-
  * In projects containing many tracks, clips dragged at the bottom of
     the project may jump upwards into tracks towards the top when they
     pass the snap-to point with other clips.
 
- * Starting monitoring in Meter Toolbar after recording in another
-    project window then closing it causes a crash
+ * Exports:
+    * WAVEX (Microsoft) headers: GSM 6.10 files cannot be exported, and
+       U-Law/A-Law files may not be playable
+    * M4A: exports at rates below 44100 Hz have incorrect sample rates,
+       and 38000 Hz exports may not play properly (FFmpeg bugs); M4A
+       renamed to MOV will not play in Windows iTunes or QuickTime
+
+ * Export Multiple:
+    * fails with no export or warning if an empty label is encountered.
+
+    * if user chooses to overwrite WAV files imported with preference
+       set to "read directly", the exported files and the project are
+       silenced. Set the preference to "Make a copy..." or use the
+       "FFmpeg-compatible files" import filter.
+
+ * Applying a chain including Equalization to files (File > Apply
+    Chain... > Apply to Files) leads to corruption of the waveform
+
+ * Cut Preview: when label track present and linking on, audio playback
+    continues through the region instead of omitting it.
+
+ * Nyquist effects remove or corrupt cut and split lines in the
+    modified region.
+
+ * If shortcut for "Add label at playback position" is an unmodified
+    character, using it a second time while playing or recording a
+    track enters that shortcut in a label placed at the start cursor.
+
+ * After using Plot Spectrum in one window then clearing to a new
+    window, Plot Spectrum no longer opens until Audacity is exited
+    and restarted.
+
+ * Preferences window:
+    * overflows in some locales using smaller screen sizes or larger
+       fonts, and on Macs at 1024x768 or smaller.
+    * OK button does not work when a tab is selected in the left-hand
+       panel.
 
  * LADSPA Multiband EQ may not be visible in the Effect menu, and
     may crash in use.
@@ -143,35 +212,12 @@ this version.
  * Linked audio and label tracks:
     * Labels do not move with Effect > Repeat, Reverse, and Truncate
        Silence, or when time-shifting clips
-    * When a Time Track is present, audio is not pasted into all
-       tracks, leading to desynchronisation
-
- * Exports:
-    * WAVEX (Microsoft) headers: GSM 6.10 files cannot be exported, and
-       U-Law/A-Law files may not be playable
-    * M4A: exports at rates below 44100 Hz have incorrect sample rates,
-       and 38000 Hz exports may not play properly (FFmpeg bugs); M4A
-       renamed to MOV will not play in Windows iTunes or QuickTime
-    * MP3: Bit Rate Mode and Quality choices in MP3 Options dialogue
-       are non-functional, almost always producing a 128 kbps CBR file.
-       Reported length is often incorrect (the actual length is correct)
-
- * Export Multiple:
-    * fails with no export or warning if an empty label is encountered.
-    * "Other uncompressed files" choice always produces 16-bit PCM
-       audio irrespective of header and encoding chosen in Options.
-
- * Some multi-channel recording devices that previously recorded more
-    than two channels may no longer do so. Please send reports to:
-      feedback at audacityteam.org
+    * When a Time Track is present, cut, copy and paste have no effect
 
  * When in Spectrum, Spectrum log or Pitch view, pasting in audio then
     zooming in causes the pasted content beyond the horizontal scroll
     to disappear.
 
- * Preferences window: OK button does not work when a tab is selected
-    in the left-hand panel.
-
  * When more than one track is selected, and the region selected in the
     clips includes white space, "Split New" and "Noise Removal" cause
     the clip(s) to perform unwanted alignments instead of remaining at
@@ -182,11 +228,21 @@ this version.
     clip, the newly split clip wrongly aligns with the left edge of the
     residual clip in the original track.
 
+ * Import > Audio produces no entries in File > Recent Files.
+
  * "Audio Cache" on the Directories tab of Preferences caches most
     audio data for the duration of the session, including project data
     and imported files. Enabling it could cause a crash when making
     long recordings or opening large files or projects.
 
+ * It is currently possible to attempt simultaneous imports or exports
+    by using shortcuts (or File > New on Mac). Audacity is not yet
+    capable of running these simultaneous operations safely, and
+    attempting this may crash your project.
+
+ * Not all menu items are correctly enabled when the preference:
+    "Select all audio in project, if none selected" is checked.
+
  * A few interface elements do not change language without restart.
 
  * Calculation of "disk space remains for recording (time)" incorrect
@@ -196,35 +252,17 @@ this version.
  * Pressing Play (but not spacebar) in a second project when another is
     already playing stops playback of the first project.
 
- * Projects created by Audacity 1.1.x may open incorrectly.
-
- * Metadata such as ID3 tags is not fully imported and exported for
-    all supported file formats. MP3 tags *are* correctly imported and
-    exported to the current ID3 specification, but some players don't
-    fully support this specification, so may not see all the tags.
-
- * ID3 Genre tags of imported MP3s are misread (and will therefore
-    also be exported incorrectly) if the genre list in Metadata Editor
-    is opened and saved.
-
- * No warning given if File > Save or File > Save Project As... is
-    carried out with no tracks open.
-
- * Not all menu items correctly enabled when the preference: "Select
-    all audio in project, if none selected" is checked.
-
- * Beep on completing long process may not be audible on many systems.
+ * Projects created by Audacity 1.1.x or earlier are no longer
+    supported. Export each project track as WAV using the appropriate
+    legacy version of Audacity, then import the WAV files into current
+    Audacity.
 
  * Audacity can import, display and cut/copy/paste MIDI files, then
     export them, but they cannot be played. Undoing an edit with a MIDI
     track open causes the MIDI data to be lost in Windows builds
 
- * Windows only: LV2 support: LADSPA plug-ins not yet categorisable;
-    the slv2 library needed for full LV2 support does not build.
-
- * Windows only: Welcome Message: On some systems/browsers, links are
-    not brought to top, and some screen readers that otherwise work
-    well with Audacity cannot read its text.
+ * Windows and Linux only: Welcome Message: On some systems/browsers,
+    links are not brought to top when the browser is already running.
 
  * Windows (reported on): There have been reports of clicks during
     recording on some Windows XP systems using Audacity 1.3.4 and
@@ -254,36 +292,9 @@ this version.
     usage which could cause a crash. This appears to be due to buggy
     memory allocation in "Hear".
 
- * Mac OS X only: Portable settings aren't picked up, and the default
-    settings (in the default location) are always used. See this page
-    for a workaround:
-      http://audacityteam.org/wiki/index.php?title=Portable_Audacity
-
- * Mac OS X and Linux only: Labels do not accept certain legal
-    characters.
-
- * Linux only: When importing larger WAV files with Import/Export
-    Preferences set to "read directly", exporting to the same file by
-    overwriting may result in a visually/audibly corrupted file.
-
- * Linux only: Audacity does not build if EXPERIMENTAL_SCOREALIGN is
-    defined
-
  * Linux only: Audacity now supports interfacing with Jack, however
     this has not been tested, and has a number of known reliability and
-    useability issues. Patches to improve both will be welcomed.
-
- * Linux (reported on): The first file imported into a project no
-    longer changes the project rate to the file's rate, if that rate is
-    absent from the project rate list.
-
- * Linux (Debian-derived) only: Audacity configure script does not
-    detect libsoundtouch on the system and so Change Pitch and Change
-    Tempo effects are disabled. This is a debian bug (#476699), which
-    can be worked around by symlinking
-    /usr/lib/pkgconfig/soundtouch-1.0.pc
-    to
-    /usr/lib/pkgconfig/libSoundTouch.pc
+    usability issues. Patches to improve both will be welcomed.
 
 Also note the Windows installer will not replace 1.2.x installations,
 but will install alongside them.
@@ -294,7 +305,7 @@ but will install alongside them.
 4.  Source Code, Libraries and Additional Copyright Information
 
 Source code to this program is always available; for more information visit
-our website at:
+our web site at:
 
   http://audacity.sourceforge.net/download/
 
@@ -458,6 +469,37 @@ or e-mail us at:
 
 6.  Previous Changes going back to version 1.1.0
 
+
+Changes in 1.3.6 Beta (since 1.3.6a6 Alpha):
+
+Interface:
+        * "Save Compressed Copy of Project" saves in much smaller .OGG
+           format to facilitate online transmission of projects
+        * Improved MIDI import and export routines, and clearer color
+           for selection region
+        * Default temporary directory on Mac now accessible in Finder
+
+Import / Export:
+	* Stability improvements in on-demand loading
+        * FFmpeg: support for latest version of library, improved
+           version checks and error messages, stability improvements
+           in custom exporter
+
+Bug Fixes:
+        * Crash in "Get Noise Profile" step of Noise Removal at project
+           rates below 20480 Hz.
+        * Underestimation of peak level in tracks with a small number
+           of different peaks
+        * Truncate Silence could result in repeated or lost audio if
+           applied to the whole of a track
+        * Other interface, generating, exporting and platform-specific
+           fixes
+
+Compilation:
+        * Added autoconf macro archive to CVS, enabling *.nix users
+           without this archive to build --with -MIDI
+
+
 Changes in 1.3.6a6:
 
 Interface:
@@ -585,7 +627,7 @@ Miscellaneous:
         * Bug fixes for shortcut availability/tab order in Selection Bar,
            and for window focus issues when previewing effects
         * Improvements in escaping and navigating fields in dialogs,
-           and in stabilty when screen readers are used
+           and in stability when screen readers are used
 
 
 Changes in 1.3.6a1:
@@ -1063,7 +1105,7 @@ Changes in 1.2.0-pre4:
     non-seekable PCM audio files, such as GSM610.
 
   * Fixed bug that was causing the samples to shift off-screen
-    horizonally when zoomed in very far and the track had a
+    horizontally when zoomed in very far and the track had a
     time-shift offset.
 
   * Fixed bugs in the new resampler that added noise to resampled
@@ -1176,7 +1218,7 @@ Changes in 1.2.0-pre3:
 Changes in 1.2.0-pre2:
 
   * Online help completed.  The full manual is nearly complete
-    and will be posted to the website for online browsing shortly.
+    and will be posted to the web site for online browsing shortly.
 
   * Audacity will no longer let you do unsafe editing operations
     while playing or recording.  This eliminates many potential
@@ -1317,7 +1359,7 @@ New features in Audacity 1.1.2:
 New features in Audacity 1.1.1:
 
   * User Interface
-    - Tooltips appear in Statusbar.
+    - Tooltips appear in Status Bar.
     - Vertical cursor follows play/record
     - Pause button
     - Drawing tool (with three different modes)
@@ -1368,7 +1410,7 @@ New features in Audacity 1.1.0:
     - Automatic real-time resampling (using linear
         interpolation)
   * Effects:
-    - Support LADSPA plugins on Linux / Unix
+    - Support LADSPA plug-ins on Linux / Unix
   * File formats:
     - New XML-based Audacity project format
     - Full Ogg Vorbis support now (importing and exporting)
diff --git a/audacity.dox b/audacity.dox
new file mode 100644
index 0000000..7d405d7
--- /dev/null
+++ b/audacity.dox
@@ -0,0 +1,236 @@
+# Doxyfile 1.4.6
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = Audacity
+PROJECT_NUMBER         = 1.3.x
+OUTPUT_DIRECTORY       = dox/
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = YES
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 3
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+BUILTIN_STL_SUPPORT    = NO
+DISTRIBUTE_GROUP_DOC   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
+FILE_VERSION_FILTER    = 
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = src/ \
+                         dox2-src/
+FILE_PATTERNS          = *.cpp \
+                         *.h \
+                         *.dox2
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = dox2-src/
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = YES
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = gif
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 1000
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
diff --git a/configure b/configure
index 3eac339..3d38b91 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -615,119 +637,143 @@ ac_includes_default="\
 #endif"
 
 ac_header_list=
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXCPP
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-HAVE_PKG_CONFIG
-LOCAL_LIBS
-EXTRAOBJS
-EXTRATARGETS
-EXTRAINSTALLTARGETS
-EXTRAUNINSTALLTARGETS
-OPTOBJS
-CDEPEND
-PRECOMP_CFLAGS
-AFTERBUILD
-INSTALL_PREFIX
-CONFIGHEADER
-BUILD_LDFLAGS
-LIBSRC_BUILD
-AUDACITY_NAME
-GREP
-EGREP
-SED
-CFLAG_VISIBILITY
-HAVE_VISIBILITY
-WX_CONFIG
-subdirs
-PKG_CONFIG
-WIDGETEXTRA_CFLAGS
-WIDGETEXTRA_LIBS
-SNDFILE_CFLAGS
-SNDFILE_LIBS
-SAMPLERATE_CFLAGS
-SAMPLERATE_LIBS
-LIBMAD_CFLAGS
-LIBMAD_LIBS
-SOUNDTOUCH_CFLAGS
-SOUNDTOUCH_LIBS
-VAMP_CFLAGS
-VAMP_LIBS
-LIBTWOLAME_CFLAGS
-LIBTWOLAME_LIBS
-AVCODEC_CFLAGS
-AVCODEC_LIBS
-AVFORMAT_CFLAGS
-AVFORMAT_LIBS
-REDLAND_CFLAGS
-REDLAND_LIBS
-SLV2_CFLAGS
-SLV2_LIBS
-LIBLRDF_CFLAGS
-LIBLRDF_LIBS
-PORTSMF_CFLAGS
-PORTSMF_LIBS
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-JACK_CFLAGS
-JACK_LIBS
+enable_option_checking=no
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+JACK_LIBS
+JACK_CFLAGS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+PORTSMF_LIBS
+PORTSMF_CFLAGS
+AVFORMAT_LIBS
+AVFORMAT_CFLAGS
+AVCODEC_LIBS
+AVCODEC_CFLAGS
+LIBTWOLAME_LIBS
+LIBTWOLAME_CFLAGS
+VAMP_LIBS
+VAMP_CFLAGS
+SOUNDTOUCH_LIBS
+SOUNDTOUCH_CFLAGS
+SBSMS_LIBS
+SBSMS_CFLAGS
+LIBMAD_LIBS
+LIBMAD_CFLAGS
+SAMPLERATE_LIBS
+SAMPLERATE_CFLAGS
+SNDFILE_LIBS
+SNDFILE_CFLAGS
+WIDGETEXTRA_LIBS
+WIDGETEXTRA_CFLAGS
+PKG_CONFIG
+subdirs
+WX_CONFIG
+HAVE_VISIBILITY
+CFLAG_VISIBILITY
+SED
+EGREP
+GREP
+AUDACITY_NAME
+LIBSRC_BUILD
+BUILD_LDFLAGS
+CONFIGHEADER
+INSTALL_PREFIX
+AFTERBUILD
+PRECOMP_CFLAGS
+CDEPEND
+OPTOBJS
+EXTRAUNINSTALLTARGETS
+EXTRAINSTALLTARGETS
+EXTRATARGETS
+EXTRAOBJS
+LOCAL_LIBS
+HAVE_PKG_CONFIG
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+CXXCPP
+ac_ct_CXX
+CXXFLAGS
+CXX
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_static
+enable_unicode
+enable_debug
+with_lib_preference
+with_libsndfile
+with_expat
+with_libsamplerate
+with_libresample
+with_libvorbis
+with_libmad
+with_libflac
+with_libid3tag
+with_sbsms
+with_soundtouch
+enable_nyquist
+with_libvamp
+with_libtwolame
+with_ffmpeg
+with_midi
+enable_audiounits
+enable_ladspa
+enable_quicktime
+with_portmixer
+with_portaudio
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -749,6 +795,8 @@ SAMPLERATE_CFLAGS
 SAMPLERATE_LIBS
 LIBMAD_CFLAGS
 LIBMAD_LIBS
+SBSMS_CFLAGS
+SBSMS_LIBS
 SOUNDTOUCH_CFLAGS
 SOUNDTOUCH_LIBS
 VAMP_CFLAGS
@@ -759,12 +807,6 @@ AVCODEC_CFLAGS
 AVCODEC_LIBS
 AVFORMAT_CFLAGS
 AVFORMAT_LIBS
-REDLAND_CFLAGS
-REDLAND_LIBS
-SLV2_CFLAGS
-SLV2_LIBS
-LIBLRDF_CFLAGS
-LIBLRDF_LIBS
 PORTSMF_CFLAGS
 PORTSMF_LIBS
 JACK_CFLAGS
@@ -772,12 +814,13 @@ JACK_LIBS'
 ac_subdirs_all='"lib-src/FileDialog"
 $CONFIG_SUBDIRS
 lib-src/portaudio-v19
-lib-src/portmixer
-lib-src/dlcompat'
+lib-src/portmixer'
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -876,13 +919,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -895,13 +946,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1092,22 +1151,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1127,7 +1202,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1136,16 +1211,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1154,22 +1229,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1184,7 +1275,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1200,10 +1291,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1211,12 +1302,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1243,12 +1334,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1297,9 +1388,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1309,25 +1400,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1348,6 +1439,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-static         link wx statically [default=no]
@@ -1376,13 +1468,11 @@ Optional Packages:
   --with-libmad           use libmad for mp2/3 decoding support
   --with-libflac          use libFLAC for FLAC support
   --with-libid3tag        use libid3tag for mp3 id3 tag support
+  --with-sbsms            use libsbsms for pitch and tempo changing
   --with-soundtouch       use libSoundTouch for pitch and tempo changing
   --with-libvamp          use libvamp for Vamp plug-in support [default=yes]
   --with-libtwolame       use libtwolame for MP2 export support
   --with-ffmpeg           use ffmpeg for import and export support
-  --with-redland          use Redland for reading RDF data
-  --with-slv2             use SLV2 for loading LV2 plugins
-  --with-liblrdf          use liblrdf for categorisation of LADSPA plugins
   --with-midi             use portSMF for Midi support
   --with-portmixer        compile with PortMixer [default=yes]
   --with-portaudio        which version of PortAudio to use (=[v18,v19])
@@ -1415,6 +1505,9 @@ Some influential environment variables:
   LIBMAD_CFLAGS
               C compiler flags for LIBMAD, overriding pkg-config
   LIBMAD_LIBS linker flags for LIBMAD, overriding pkg-config
+  SBSMS_CFLAGS
+              C compiler flags for SBSMS, overriding pkg-config
+  SBSMS_LIBS  linker flags for SBSMS, overriding pkg-config
   SOUNDTOUCH_CFLAGS
               C compiler flags for SOUNDTOUCH, overriding pkg-config
   SOUNDTOUCH_LIBS
@@ -1433,16 +1526,6 @@ Some influential environment variables:
               C compiler flags for AVFORMAT, overriding pkg-config
   AVFORMAT_LIBS
               linker flags for AVFORMAT, overriding pkg-config
-  REDLAND_CFLAGS
-              C compiler flags for REDLAND, overriding pkg-config
-  REDLAND_LIBS
-              linker flags for REDLAND, overriding pkg-config
-  SLV2_CFLAGS C compiler flags for SLV2, overriding pkg-config
-  SLV2_LIBS   linker flags for SLV2, overriding pkg-config
-  LIBLRDF_CFLAGS
-              C compiler flags for LIBLRDF, overriding pkg-config
-  LIBLRDF_LIBS
-              linker flags for LIBLRDF, overriding pkg-config
   PORTSMF_CFLAGS
               C compiler flags for PORTSMF, overriding pkg-config
   PORTSMF_LIBS
@@ -1460,15 +1543,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1504,7 +1589,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1514,10 +1599,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1528,7 +1613,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1564,7 +1649,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1599,7 +1684,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1651,11 +1736,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1685,9 +1771,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1702,9 +1788,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1720,8 +1806,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1763,21 +1849,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1787,16 +1876,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1811,29 +1900,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1843,10 +1941,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1887,10 +1987,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1903,7 +2003,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1914,11 +2014,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1927,10 +2027,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1943,7 +2043,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1954,11 +2054,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -1966,12 +2066,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -1984,10 +2080,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2000,7 +2096,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2011,11 +2107,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2024,10 +2120,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2045,7 +2141,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2068,11 +2164,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2083,10 +2179,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2099,7 +2195,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2110,11 +2206,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2127,10 +2223,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2143,7 +2239,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2154,11 +2250,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2170,12 +2266,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2185,44 +2277,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2241,27 +2339,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2272,10 +2365,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2286,7 +2380,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2313,25 +2407,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2340,49 +2436,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2391,31 +2491,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2438,40 +2540,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2497,20 +2602,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2520,15 +2626,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2555,20 +2665,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2593,20 +2704,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2632,20 +2744,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2660,8 +2773,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2677,10 +2790,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2751,20 +2864,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2780,15 +2894,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -2818,10 +2932,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2834,7 +2948,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2845,11 +2959,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2862,10 +2976,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2878,7 +2992,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2889,11 +3003,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2905,12 +3019,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -2920,43 +3030,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2982,20 +3096,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3005,15 +3120,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -3040,20 +3159,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -3078,20 +3198,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -3117,20 +3238,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3145,8 +3267,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -3173,11 +3295,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -3209,20 +3331,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3246,13 +3369,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3260,7 +3384,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3285,8 +3409,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -3314,20 +3438,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3351,13 +3476,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3365,7 +3491,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3381,11 +3507,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=cpp
@@ -3415,8 +3543,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3442,11 +3570,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3475,17 +3604,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3498,8 +3639,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3511,10 +3652,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_HAVE_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_PKG_CONFIG"; then
   ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
@@ -3527,7 +3668,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_PKG_CONFIG="yes"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3539,17 +3680,17 @@ fi
 fi
 HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
 if test -n "$HAVE_PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $HAVE_PKG_CONFIG" >&5
-echo "${ECHO_T}$HAVE_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $HAVE_PKG_CONFIG" >&5
+$as_echo "$HAVE_PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x$HAVE_PKG_CONFIG = xno ; then
-   { { echo "$as_me:$LINENO: error: pkg-config is required to compile audacity!" >&5
-echo "$as_me: error: pkg-config is required to compile audacity!" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: pkg-config is required to compile audacity!" >&5
+$as_echo "$as_me: error: pkg-config is required to compile audacity!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3573,13 +3714,10 @@ test "$program_prefix" != NONE &&
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
 
@@ -3653,17 +3791,17 @@ fi
 
 
 if test x"$debug_preference" = "xyes" ; then
-      { echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
-echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
+      { $as_echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
+$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
    CFLAGS="${CFLAGS} -g "
    CXXFLAGS="${CXXFLAGS} -g "
 fi
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3735,20 +3873,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -3756,53 +3895,48 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3817,74 +3951,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3899,40 +4019,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3959,20 +4070,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4064,37 +4176,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4116,11 +4231,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4138,20 +4253,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4159,12 +4275,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4172,26 +4291,58 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (size_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -4202,30 +4353,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -4242,20 +4402,21 @@ fi
 
 for ac_header in $ac_header_list
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4271,32 +4432,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4310,69 +4472,73 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4390,10 +4556,10 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
-echo $ECHO_N "checking CFLAGS for strict prototypes... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
+$as_echo_n "checking CFLAGS for strict prototypes... " >&6; }
 if test "${ac_cv_cflags_strict_prototypes+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_cflags_strict_prototypes="no, unknown"
 
@@ -4427,20 +4593,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_cflags_strict_prototypes=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4475,13 +4642,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4490,7 +4658,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 then if test `diff config.log config.tmp | grep -i warning | wc -l` != 1
 then ac_cv_cflags_strict_prototypes="no, suppressed, signal.h," ; fi ; fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
@@ -4509,23 +4677,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
-echo "${ECHO_T}$ac_cv_cflags_strict_prototypes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
+$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
 case ".$ac_cv_cflags_strict_prototypes" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
-   then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
+   then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
   (: CFLAGS does contain $ac_cv_cflags_strict_prototypes) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-   else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
+   else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
   (: CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
                       CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes"
    fi
@@ -4533,10 +4701,10 @@ case ".$ac_cv_cflags_strict_prototypes" in
 esac
 
 
-{ echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
-echo $ECHO_N "checking wall_flags for maximum warnings... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
+$as_echo_n "checking wall_flags for maximum warnings... " >&6; }
 if test "${ac_cv_cflags_warn_all+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_cflags_warn_all="no, unknown"
 
@@ -4570,20 +4738,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4600,23 +4769,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
-echo "${ECHO_T}$ac_cv_cflags_warn_all" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
+$as_echo "$ac_cv_cflags_warn_all" >&6; }
 case ".$ac_cv_cflags_warn_all" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
-   then { (echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
+   then { ($as_echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
   (: wall_flags does contain $ac_cv_cflags_warn_all) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-   else { (echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
+   else { ($as_echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
   (: wall_flags="$wall_flags $ac_cv_cflags_warn_all") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
                       wall_flags="$wall_flags $ac_cv_cflags_warn_all"
    fi
@@ -4624,48 +4793,43 @@ case ".$ac_cv_cflags_warn_all" in
 esac
 
 CFLAGS="${CFLAGS} $wall_flags"
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
-     echo "$ac_script" | sed 99q >conftest.sed
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     # Extract the first word of "sed gsed" to use in msg output
-if test -z "$SED"; then
-set dummy sed gsed; ac_prog_name=$2
-if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$SED"; then
   ac_path_SED_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in sed gsed; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-    # Check for GNU ac_path_SED and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo '' >> "conftest.nl"
+    $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4680,31 +4844,23 @@ case `"$ac_path_SED" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_SED_found && break 3
+      $ac_path_SED_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-SED="$ac_cv_path_SED"
-if test -z "$SED"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4715,10 +4871,10 @@ echo "${ECHO_T}$ac_cv_path_SED" >&6; }
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
-echo $ECHO_N "checking whether the C++ compiler accepts the $wall_flags flag... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
+$as_echo_n "checking whether the C++ compiler accepts the $wall_flags flag... " >&6; }
 if { as_var=ax_cv_cxx_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -4754,13 +4910,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -4769,7 +4926,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       eval "ax_cv_cxx_check_flag_$flag=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4790,9 +4947,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-ac_res=`eval echo '${'ax_cv_cxx_check_flag_$flag'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'ax_cv_cxx_check_flag_$flag'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
   if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then
 
@@ -4817,10 +4975,10 @@ fi
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
-echo $ECHO_N "checking whether the C++ preprocessor accepts the $wall_flags flag... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
+$as_echo_n "checking whether the C++ preprocessor accepts the $wall_flags flag... " >&6; }
 if { as_var=ax_cv_cxxcpp_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -4855,13 +5013,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -4870,7 +5029,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       eval "ax_cv_cxxcpp_check_flag_$flag=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4891,9 +5050,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-ac_res=`eval echo '${'ax_cv_cxxcpp_check_flag_$flag'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'ax_cv_cxxcpp_check_flag_$flag'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
   if eval "test \"`echo '$ax_cv_cxxcpp_check_flag_'$flag`\" = yes"; then
 
@@ -4917,10 +5077,10 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-    { echo "$as_me:$LINENO: checking for simple visibility declarations" >&5
-echo $ECHO_N "checking for simple visibility declarations... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for simple visibility declarations" >&5
+$as_echo_n "checking for simple visibility declarations... " >&6; }
     if test "${gl_cv_cc_visibility+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
       gl_save_CFLAGS="$CFLAGS"
@@ -4949,20 +5109,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   gl_cv_cc_visibility=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gl_cv_cc_visibility=no
@@ -4972,8 +5133,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       CFLAGS="$gl_save_CFLAGS"
 fi
 
-    { echo "$as_me:$LINENO: result: $gl_cv_cc_visibility" >&5
-echo "${ECHO_T}$gl_cv_cc_visibility" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $gl_cv_cc_visibility" >&5
+$as_echo "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -4991,10 +5152,10 @@ _ACEOF
 
 # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_WX_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $WX_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -5010,7 +5171,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5023,17 +5184,17 @@ esac
 fi
 WX_CONFIG=$ac_cv_path_WX_CONFIG
 if test -n "$WX_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
-echo "${ECHO_T}$WX_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
+$as_echo "$WX_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if [ "$WX_CONFIG" = "no" ] ; then
-   { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&5
-echo "$as_me: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&5
+$as_echo "$as_me: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5046,8 +5207,8 @@ fi
 wxconfigargs="$static_preference $unicode_preference  $wxconfigargs $wx_preference"
 wx_version=`${WX_CONFIG} $wxconfigargs --version`
 
-{ echo "$as_me:$LINENO: Checking that the chosen version of wxWidgets is 2.8.x" >&5
-echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
+{ $as_echo "$as_me:$LINENO: Checking that the chosen version of wxWidgets is 2.8.x" >&5
+$as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
 
 case "${wx_version}" in
   2.8.*)
@@ -5055,13 +5216,13 @@ case "${wx_version}" in
     ;;
   *)
   wx_list=`${WX_CONFIG} --list`
-  { { echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+  { { $as_echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
 The currently available configurations are listed below.  If necessary, either
 install the package for your distribution or download the latest version of
 wxWidgets
 from http://wxwidgets.org.
 ${wx_list}" >&5
-echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+$as_echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
 The currently available configurations are listed below.  If necessary, either
 install the package for your distribution or download the latest version of
 wxWidgets
@@ -5077,6 +5238,8 @@ CXXFLAGS="$CXXFLAGS `$WX_CONFIG $wxconfigargs --cxxflags`"
 
 
 
+
+
 subdirs="$subdirs "lib-src/FileDialog""
 
 LOCAL_LIBS="$LOCAL_LIBS FileDialog.a"
@@ -5088,10 +5251,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -5106,7 +5269,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5118,11 +5281,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5131,10 +5294,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -5149,7 +5312,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5161,11 +5324,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -5173,12 +5336,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -5190,14 +5349,14 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 
@@ -5255,8 +5414,8 @@ fi
   fi
 
   ax_popdir=`pwd`
-  { echo "$as_me:$LINENO: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
+  { $as_echo "$as_me:$LINENO: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+$as_echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
       { as_dir=""${srcdir}/lib-src/lib-widget-extra""
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
@@ -5265,7 +5424,7 @@ echo "$as_me: Configuring sources in \"${srcdir}/lib-src/lib-widget-extra\"" >&6
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -5274,7 +5433,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5295,17 +5454,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
       ac_builddir=.
 
 case ""${srcdir}/lib-src/lib-widget-extra"" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo ""${srcdir}/lib-src/lib-widget-extra"" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo ""${srcdir}/lib-src/lib-widget-extra"" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -5343,8 +5502,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     # This should be Cygnus configure.
 	ax_sub_configure=$ac_aux_dir/configure
   else
-    { echo "$as_me:$LINENO: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/lib-widget-extra\"" >&2;}
     ax_sub_configure=
   fi
 
@@ -5357,31 +5516,31 @@ echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/li
 	ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
     esac
 
-    { echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+    { $as_echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
     # The eval makes quoting arguments work.
     eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
 	   --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
   fi
 
   cd "$ax_popdir"
-  { echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
-echo "$as_me: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
+  { $as_echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&5
+$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/lib-widget-extra\"" >&6;}
 
          export PKG_CONFIG_PATH="${srcdir}/lib-src/lib-widget-extra/:$PKG_CONFIG_PATH"
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for WIDGETEXTRA" >&5
-echo $ECHO_N "checking for WIDGETEXTRA... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for WIDGETEXTRA" >&5
+$as_echo_n "checking for WIDGETEXTRA... " >&6; }
 
 if test -n "$WIDGETEXTRA_CFLAGS"; then
     pkg_cv_WIDGETEXTRA_CFLAGS="$WIDGETEXTRA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\"") >&5
   ($PKG_CONFIG --exists --print-errors "libwidgetextra") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_WIDGETEXTRA_CFLAGS=`$PKG_CONFIG --cflags "libwidgetextra" 2>/dev/null`
 else
@@ -5394,10 +5553,10 @@ if test -n "$WIDGETEXTRA_LIBS"; then
     pkg_cv_WIDGETEXTRA_LIBS="$WIDGETEXTRA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwidgetextra\"") >&5
   ($PKG_CONFIG --exists --print-errors "libwidgetextra") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_WIDGETEXTRA_LIBS=`$PKG_CONFIG --libs "libwidgetextra" 2>/dev/null`
 else
@@ -5424,22 +5583,22 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WIDGETEXTRA_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 widgetextra_available="no"
 elif test $pkg_failed = untried; then
 	widgetextra_available="no"
 else
 	WIDGETEXTRA_CFLAGS=$pkg_cv_WIDGETEXTRA_CFLAGS
 	WIDGETEXTRA_LIBS=$pkg_cv_WIDGETEXTRA_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	widgetextra_available="yes"
 fi
 
    if test "x$widgetextra_available" != "xyes" ; then
-      { { echo "$as_me:$LINENO: error: lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." >&5
-echo "$as_me: error: lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." >&2;}
+      { { $as_echo "$as_me:$LINENO: error: lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." >&5
+$as_echo "$as_me: error: lib-widget-extra is required to build audacity. A copy is included in the audacity source distribution at lib-src/lib-widget-extra/." >&2;}
    { (exit 1); exit 1; }; }
    fi
 
@@ -5447,10 +5606,10 @@ BUILD_LDFLAGS="$BUILD_LDFLAGS $WIDGETEXTRA_LIBS"
 CXXFLAGS="$CXXFLAGS $WIDGETEXTRA_CFLAGS"
 LIBSRC_BUILD="$LIBSRC_BUILD widgetextra"
 
-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF"
+LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
 
-{ echo "$as_me:$LINENO: Determining what libraries are available in this tree and on the system" >&5
-echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;}
+{ $as_echo "$as_me:$LINENO: Determining what libraries are available in this tree and on the system" >&5
+$as_echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;}
 
 
 
@@ -5466,17 +5625,17 @@ fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SNDFILE" >&5
-echo $ECHO_N "checking for SNDFILE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SNDFILE" >&5
+$as_echo_n "checking for SNDFILE... " >&6; }
 
 if test -n "$SNDFILE_CFLAGS"; then
     pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.0" 2>/dev/null`
 else
@@ -5489,10 +5648,10 @@ if test -n "$SNDFILE_LIBS"; then
     pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.0" 2>/dev/null`
 else
@@ -5519,16 +5678,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SNDFILE_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 sndfile_available_system="no"
 elif test $pkg_failed = untried; then
 	sndfile_available_system="no"
 else
 	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
 	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	sndfile_available_system="yes"
 fi
 
@@ -5536,24 +5695,24 @@ fi
       LIBSNDFILE_SYSTEM_AVAILABLE="yes"
       LIBSNDFILE_SYSTEM_LIBS=$SNDFILE_LIBS
       LIBSNDFILE_SYSTEM_CXXFLAGS=$SNDFILE_CFLAGS
-      { echo "$as_me:$LINENO: Libsndfile libraries are available as system libraries" >&5
-echo "$as_me: Libsndfile libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libsndfile libraries are available as system libraries" >&5
+$as_echo "$as_me: Libsndfile libraries are available as system libraries" >&6;}
    else
       LIBSNDFILE_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Libsndfile libraries are NOT available as system libraries" >&5
-echo "$as_me: Libsndfile libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libsndfile libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Libsndfile libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
   eval "$as_ac_File=yes"
@@ -5561,10 +5720,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   libsndfile_found="yes"
 else
   libsndfile_found="no"
@@ -5576,14 +5738,15 @@ fi
       LIBSNDFILE_LOCAL_LIBS="libsndfile.a"
       LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src'
       LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile"
-      { echo "$as_me:$LINENO: libsndfile libraries are available in this source tree" >&5
-echo "$as_me: libsndfile libraries are available in this source tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libsndfile libraries are available in this source tree" >&5
+$as_echo "$as_me: libsndfile libraries are available in this source tree" >&6;}
+
 
             ac_configure_args="$ac_configure_args --disable-sqlite --disable-flac --disable-alsa"
    else
       LIBSNDFILE_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libsndfile libraries are NOT available in this source tree" >&5
-echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libsndfile libraries are NOT available in this source tree" >&5
+$as_echo "$as_me: libsndfile libraries are NOT available in this source tree" >&6;}
    fi
 
 
@@ -5599,10 +5762,10 @@ fi
 
 
 
-   { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
-echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
 if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
@@ -5634,33 +5797,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_expat_XML_ParserCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_expat_XML_ParserCreate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
   libexpat_found="yes"
 else
   libexpat_found="no"
@@ -5670,17 +5837,17 @@ fi
    expat_h_found="no"
 
    if test "${ac_cv_header_expat_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for expat.h" >&5
-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for expat.h" >&5
+$as_echo_n "checking for expat.h... " >&6; }
 if test "${ac_cv_header_expat_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+$as_echo "$ac_cv_header_expat_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking expat.h usability" >&5
-echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5
+$as_echo_n "checking expat.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5696,32 +5863,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking expat.h presence" >&5
-echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking expat.h presence" >&5
+$as_echo_n "checking expat.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5735,66 +5903,67 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for expat.h" >&5
-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5
+$as_echo_n "checking for expat.h... " >&6; }
 if test "${ac_cv_header_expat_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_expat_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+$as_echo "$ac_cv_header_expat_h" >&6; }
 
 fi
-if test $ac_cv_header_expat_h = yes; then
+if test "x$ac_cv_header_expat_h" = x""yes; then
   expat_h_found="yes"
 else
   expat_h_found="no"
@@ -5806,24 +5975,24 @@ fi
       LIBEXPAT_SYSTEM_AVAILABLE="yes"
       LIBEXPAT_SYSTEM_LIBS="-lexpat"
       LIBEXPAT_SYSTEM_CPPSYMBOLS="USE_SYSTEM_EXPAT"
-      { echo "$as_me:$LINENO: Expat libraries are available as system libraries" >&5
-echo "$as_me: Expat libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Expat libraries are available as system libraries" >&5
+$as_echo "$as_me: Expat libraries are available as system libraries" >&6;}
    else
       LIBEXPAT_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Expat libraries are NOT available as system libraries" >&5
-echo "$as_me: Expat libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Expat libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Expat libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/expat/xmlparse/xmlparse.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/xmlparse/xmlparse.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/expat/xmlparse/xmlparse.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/expat/xmlparse/xmlparse.h"; then
   eval "$as_ac_File=yes"
@@ -5831,10 +6000,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   xmlparse_h_found="yes"
 else
   xmlparse_h_found="no"
@@ -5847,12 +6019,12 @@ fi
       LIBEXPAT_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/expat'
       LIBEXPAT_LOCAL_CPPSYMBOLS="USE_LOCAL_EXPAT"
 
-      { echo "$as_me:$LINENO: Expat libraries are available in the local tree" >&5
-echo "$as_me: Expat libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: Expat libraries are available in the local tree" >&5
+$as_echo "$as_me: Expat libraries are available in the local tree" >&6;}
    else
       LIBEXPAT_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Expat libraries are NOT available in the local tree" >&5
-echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: Expat libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: Expat libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -5877,17 +6049,17 @@ _ACEOF
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SAMPLERATE" >&5
-echo $ECHO_N "checking for SAMPLERATE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SAMPLERATE" >&5
+$as_echo_n "checking for SAMPLERATE... " >&6; }
 
 if test -n "$SAMPLERATE_CFLAGS"; then
     pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\"") >&5
   ($PKG_CONFIG --exists --print-errors "samplerate >= 0.1.2") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null`
 else
@@ -5900,10 +6072,10 @@ if test -n "$SAMPLERATE_LIBS"; then
     pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\"") >&5
   ($PKG_CONFIG --exists --print-errors "samplerate >= 0.1.2") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null`
 else
@@ -5930,16 +6102,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 samplerate_available_system="no"
 elif test $pkg_failed = untried; then
 	samplerate_available_system="no"
 else
 	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
 	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	samplerate_available_system="yes"
 fi
 
@@ -5948,24 +6120,24 @@ fi
       LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
       LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
       LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
-      { echo "$as_me:$LINENO: Libsamplerate libraries are available as system libraries" >&5
-echo "$as_me: Libsamplerate libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libsamplerate libraries are available as system libraries" >&5
+$as_echo "$as_me: Libsamplerate libraries are available as system libraries" >&6;}
    else
       LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Libsamplerate libraries are NOT available as system libraries" >&5
-echo "$as_me: Libsamplerate libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libsamplerate libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Libsamplerate libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libsamplerate/src/samplerate.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsamplerate/src/samplerate.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libsamplerate/src/samplerate.h"; then
   eval "$as_ac_File=yes"
@@ -5973,10 +6145,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   samplerate_h_found="yes"
 else
   samplerate_h_found="no"
@@ -5992,12 +6167,12 @@ fi
       if test ! -f lib-src/libsamplerate/Makefile ; then
          LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate"
       fi
-      { echo "$as_me:$LINENO: libsamplerate libraries are available in the local tree" >&5
-echo "$as_me: libsamplerate libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libsamplerate libraries are available in the local tree" >&5
+$as_echo "$as_me: libsamplerate libraries are available in the local tree" >&6;}
    else
       LIBSAMPLERATE_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libsamplerate libraries are NOT available in the local tree" >&5
-echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libsamplerate libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -6024,15 +6199,15 @@ _ACEOF
    LIBRESAMPLE_SYSTEM_AVAILABLE="no"
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libresample/include/libresample.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libresample/include/libresample.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libresample/include/libresample.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libresample/include/libresample.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libresample/include/libresample.h"; then
   eval "$as_ac_File=yes"
@@ -6040,10 +6215,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   resample_h_found="yes"
 else
   resample_h_found="no"
@@ -6059,12 +6237,12 @@ fi
       if test ! -f lib-src/libresample/Makefile ; then
          LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
       fi
-      { echo "$as_me:$LINENO: libresample libraries are available in the local tree" >&5
-echo "$as_me: libresample libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libresample libraries are available in the local tree" >&5
+$as_echo "$as_me: libresample libraries are available in the local tree" >&6;}
    else
       LIBRESAMPLE_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libresample libraries are NOT available in the local tree" >&5
-echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libresample libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -6087,10 +6265,10 @@ fi
 
 
 
-   { echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
-echo $ECHO_N "checking for vorbis_bitrate_addblock in -lvorbisfile... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
+$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
 if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvorbisfile -lvorbis -logg $LIBS"
@@ -6122,33 +6300,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
-echo "${ECHO_T}$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
-if test $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
+$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
+if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then
   lib_found="yes"
 else
   lib_found="no"
@@ -6156,17 +6338,17 @@ fi
 
 
    if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
+$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
 if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
-echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
+$as_echo "$ac_cv_header_vorbis_vorbisfile_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking vorbis/vorbisfile.h usability" >&5
-echo $ECHO_N "checking vorbis/vorbisfile.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking vorbis/vorbisfile.h usability" >&5
+$as_echo_n "checking vorbis/vorbisfile.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6182,32 +6364,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking vorbis/vorbisfile.h presence" >&5
-echo $ECHO_N "checking vorbis/vorbisfile.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking vorbis/vorbisfile.h presence" >&5
+$as_echo_n "checking vorbis/vorbisfile.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6221,66 +6404,67 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
+$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
 if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_vorbis_vorbisfile_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
-echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
+$as_echo "$ac_cv_header_vorbis_vorbisfile_h" >&6; }
 
 fi
-if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
+if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then
   header_found="yes"
 else
   header_found="no"
@@ -6292,24 +6476,24 @@ fi
       LIBVORBIS_SYSTEM_AVAILABLE="yes"
       LIBVORBIS_SYSTEM_LIBS="-lvorbisenc -lvorbisfile -lvorbis -logg"
       LIBVORBIS_SYSTEM_CPPSYMBOLS="USE_LIBVORBIS"
-      { echo "$as_me:$LINENO: Vorbis libraries are available as system libraries" >&5
-echo "$as_me: Vorbis libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Vorbis libraries are available as system libraries" >&5
+$as_echo "$as_me: Vorbis libraries are available as system libraries" >&6;}
    else
       LIBVORBIS_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Vorbis libraries are NOT available as system libraries" >&5
-echo "$as_me: Vorbis libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Vorbis libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Vorbis libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
   eval "$as_ac_File=yes"
@@ -6317,25 +6501,28 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   vorbisenc_h_available="yes"
 else
   vorbisenc_h_available="no"
 fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
   eval "$as_ac_File=yes"
@@ -6343,10 +6530,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   ogg_h_available="yes"
 else
   ogg_h_available="no"
@@ -6364,11 +6554,11 @@ fi
       LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
 
       LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
-      { echo "$as_me:$LINENO: Vorbis libraries are available in this source tree" >&5
-echo "$as_me: Vorbis libraries are available in this source tree" >&6;}
+      { $as_echo "$as_me:$LINENO: Vorbis libraries are available in this source tree" >&5
+$as_echo "$as_me: Vorbis libraries are available in this source tree" >&6;}
    else
-      { echo "$as_me:$LINENO: Vorbis libraries are NOT available in this source tree" >&5
-echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
+      { $as_echo "$as_me:$LINENO: Vorbis libraries are NOT available in this source tree" >&5
+$as_echo "$as_me: Vorbis libraries are NOT available in this source tree" >&6;}
    fi
 
 
@@ -6393,17 +6583,17 @@ fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for LIBMAD" >&5
-echo $ECHO_N "checking for LIBMAD... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for LIBMAD" >&5
+$as_echo_n "checking for LIBMAD... " >&6; }
 
 if test -n "$LIBMAD_CFLAGS"; then
     pkg_cv_LIBMAD_CFLAGS="$LIBMAD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\"") >&5
   ($PKG_CONFIG --exists --print-errors "mad >= 0.14.2b") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_LIBMAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.14.2b" 2>/dev/null`
 else
@@ -6416,10 +6606,10 @@ if test -n "$LIBMAD_LIBS"; then
     pkg_cv_LIBMAD_LIBS="$LIBMAD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.14.2b\"") >&5
   ($PKG_CONFIG --exists --print-errors "mad >= 0.14.2b") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_LIBMAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.14.2b" 2>/dev/null`
 else
@@ -6446,24 +6636,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBMAD_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 libmad_available_system="no"
 elif test $pkg_failed = untried; then
 	libmad_available_system="no"
 else
 	LIBMAD_CFLAGS=$pkg_cv_LIBMAD_CFLAGS
 	LIBMAD_LIBS=$pkg_cv_LIBMAD_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	libmad_available_system="yes"
 fi
 
 
-   { echo "$as_me:$LINENO: checking for mad_decoder_init in -lmad" >&5
-echo $ECHO_N "checking for mad_decoder_init in -lmad... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for mad_decoder_init in -lmad" >&5
+$as_echo_n "checking for mad_decoder_init in -lmad... " >&6; }
 if test "${ac_cv_lib_mad_mad_decoder_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmad  $LIBS"
@@ -6495,33 +6685,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mad_mad_decoder_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_mad_mad_decoder_init=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mad_mad_decoder_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mad_mad_decoder_init" >&6; }
-if test $ac_cv_lib_mad_mad_decoder_init = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mad_mad_decoder_init" >&5
+$as_echo "$ac_cv_lib_mad_mad_decoder_init" >&6; }
+if test "x$ac_cv_lib_mad_mad_decoder_init" = x""yes; then
   libmad_found="yes"
 else
   libmad_found="no"
@@ -6529,8 +6723,8 @@ fi
 
 
    if test "x$libmad_available_system" = "xyes" && test "x$libmad_found" = "xno" ; then
-      { echo "$as_me:$LINENO: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&5
-echo "$as_me: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&5
+$as_echo "$as_me: WARNING: system installation of libmad found, but it is too old.  Upgrade to at least 0.14.2b to use with Audacity" >&2;}
    fi
 
    if test "x$libmad_available_system" = "xyes" ; then
@@ -6538,23 +6732,23 @@ echo "$as_me: WARNING: system installation of libmad found, but it is too old.
       LIBMAD_SYSTEM_LIBS="$LIBMAD_LIBS"
 	  LIBMAD_SYSTEM_CXXFLAGS="$LIBMAD_CFLAGS"
       LIBMAD_SYSTEM_CPPSYMBOLS="USE_LIBMAD"
-      { echo "$as_me:$LINENO: libmad libraries are available as system libraries" >&5
-echo "$as_me: libmad libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: libmad libraries are available as system libraries" >&5
+$as_echo "$as_me: libmad libraries are available as system libraries" >&6;}
    else
-      { echo "$as_me:$LINENO: libmad libraries are NOT available as system libraries" >&5
-echo "$as_me: libmad libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: libmad libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: libmad libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libmad/frame.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libmad/frame.h"; then
   eval "$as_ac_File=yes"
@@ -6562,10 +6756,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   frame_h_found="yes"
 else
   frame_h_found="no"
@@ -6578,12 +6775,12 @@ fi
       LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad'
       LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD"
       LIBMAD_LOCAL_CONFIG_SUBDIRS="lib-src/libmad"
-      { echo "$as_me:$LINENO: libmad libraries are available in the local tree" >&5
-echo "$as_me: libmad libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libmad libraries are available in the local tree" >&5
+$as_echo "$as_me: libmad libraries are available in the local tree" >&6;}
    else
       LIBMAD_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libmad libraries are NOT available in the local tree" >&5
-echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libmad libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: libmad libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -6606,10 +6803,10 @@ fi
 
 
 
-   { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
+$as_echo_n "checking for FLAC__stream_decoder_new in -lFLAC... " >&6; }
 if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lFLAC -lFLAC++ -lFLAC $LIBS"
@@ -6641,33 +6838,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
-if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
+$as_echo "$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6; }
+if test "x$ac_cv_lib_FLAC_FLAC__stream_decoder_new" = x""yes; then
   lib_found="yes"
 else
   lib_found="no"
@@ -6675,17 +6876,17 @@ fi
 
 
    if test "${ac_cv_header_FLAC_format_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
-echo $ECHO_N "checking for FLAC/format.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
+$as_echo_n "checking for FLAC/format.h... " >&6; }
 if test "${ac_cv_header_FLAC_format_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
-echo "${ECHO_T}$ac_cv_header_FLAC_format_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
+$as_echo "$ac_cv_header_FLAC_format_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking FLAC/format.h usability" >&5
-echo $ECHO_N "checking FLAC/format.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking FLAC/format.h usability" >&5
+$as_echo_n "checking FLAC/format.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6701,32 +6902,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking FLAC/format.h presence" >&5
-echo $ECHO_N "checking FLAC/format.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking FLAC/format.h presence" >&5
+$as_echo_n "checking FLAC/format.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6740,66 +6942,67 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: FLAC/format.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: FLAC/format.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: FLAC/format.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: FLAC/format.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: FLAC/format.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: FLAC/format.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: FLAC/format.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: FLAC/format.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: FLAC/format.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: FLAC/format.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: FLAC/format.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
-echo $ECHO_N "checking for FLAC/format.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for FLAC/format.h" >&5
+$as_echo_n "checking for FLAC/format.h... " >&6; }
 if test "${ac_cv_header_FLAC_format_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_FLAC_format_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
-echo "${ECHO_T}$ac_cv_header_FLAC_format_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_format_h" >&5
+$as_echo "$ac_cv_header_FLAC_format_h" >&6; }
 
 fi
-if test $ac_cv_header_FLAC_format_h = yes; then
+if test "x$ac_cv_header_FLAC_format_h" = x""yes; then
   header_found="yes"
 else
   header_found="no"
@@ -6811,24 +7014,24 @@ fi
       LIBFLAC_SYSTEM_AVAILABLE="yes"
       LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC"
       LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
-      { echo "$as_me:$LINENO: FLAC libraries are available as system libraries" >&5
-echo "$as_me: FLAC libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: FLAC libraries are available as system libraries" >&5
+$as_echo "$as_me: FLAC libraries are available as system libraries" >&6;}
    else
       LIBFLAC_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: FLAC/FLAC++ libraries are NOT available as system libraries" >&5
-echo "$as_me: FLAC/FLAC++ libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: FLAC/FLAC++ libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: FLAC/FLAC++ libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
   eval "$as_ac_File=yes"
@@ -6836,25 +7039,28 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   flac_h_available="yes"
 else
   flac_h_available="no"
 fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
   eval "$as_ac_File=yes"
@@ -6862,10 +7068,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   flacpp_h_available="yes"
 else
   flacpp_h_available="no"
@@ -6883,11 +7092,11 @@ fi
       LIBFLAC_LOCAL_CPPSYMBOLS="USE_LIBFLAC"
       LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac"
 
-      { echo "$as_me:$LINENO: FLAC libraries are available in this source tree" >&5
-echo "$as_me: FLAC libraries are available in this source tree" >&6;}
+      { $as_echo "$as_me:$LINENO: FLAC libraries are available in this source tree" >&5
+$as_echo "$as_me: FLAC libraries are available in this source tree" >&6;}
    else
-      { echo "$as_me:$LINENO: FLAC libraries are NOT available in this source tree" >&5
-echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
+      { $as_echo "$as_me:$LINENO: FLAC libraries are NOT available in this source tree" >&5
+$as_echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
    fi
 
 
@@ -6910,10 +7119,10 @@ _ACEOF
    fi
 
 
-   { echo "$as_me:$LINENO: checking for id3_file_open in -lid3tag" >&5
-echo $ECHO_N "checking for id3_file_open in -lid3tag... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for id3_file_open in -lid3tag" >&5
+$as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
 if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lid3tag -lz $LIBS"
@@ -6945,33 +7154,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_id3tag_id3_file_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_id3tag_id3_file_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_id3tag_id3_file_open" >&5
-echo "${ECHO_T}$ac_cv_lib_id3tag_id3_file_open" >&6; }
-if test $ac_cv_lib_id3tag_id3_file_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3tag_id3_file_open" >&5
+$as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
+if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then
   libid3tag_found="yes"
 else
   libid3tag_found="no"
@@ -6979,17 +7192,17 @@ fi
 
 
    if test "${ac_cv_header_id3tag_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for id3tag.h" >&5
-echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for id3tag.h" >&5
+$as_echo_n "checking for id3tag.h... " >&6; }
 if test "${ac_cv_header_id3tag_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
-echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
+$as_echo "$ac_cv_header_id3tag_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking id3tag.h usability" >&5
-echo $ECHO_N "checking id3tag.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking id3tag.h usability" >&5
+$as_echo_n "checking id3tag.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7005,32 +7218,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking id3tag.h presence" >&5
-echo $ECHO_N "checking id3tag.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking id3tag.h presence" >&5
+$as_echo_n "checking id3tag.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7044,66 +7258,67 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: id3tag.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: id3tag.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: id3tag.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: id3tag.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: id3tag.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: id3tag.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: id3tag.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: id3tag.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: id3tag.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: id3tag.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: id3tag.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for id3tag.h" >&5
-echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for id3tag.h" >&5
+$as_echo_n "checking for id3tag.h... " >&6; }
 if test "${ac_cv_header_id3tag_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_id3tag_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
-echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
+$as_echo "$ac_cv_header_id3tag_h" >&6; }
 
 fi
-if test $ac_cv_header_id3tag_h = yes; then
+if test "x$ac_cv_header_id3tag_h" = x""yes; then
   id3tag_h_found="yes"
 else
   id3tag_h_found="no"
@@ -7115,24 +7330,24 @@ fi
       LIBID3TAG_SYSTEM_AVAILABLE="yes"
       LIBID3TAG_SYSTEM_LIBS=-lid3tag
       LIBID3TAG_SYSTEM_CPPSYMBOLS="USE_LIBID3TAG"
-      { echo "$as_me:$LINENO: Libid3tag libraries are available as system libraries" >&5
-echo "$as_me: Libid3tag libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libid3tag libraries are available as system libraries" >&5
+$as_echo "$as_me: Libid3tag libraries are available as system libraries" >&6;}
    else
       LIBID3TAG_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Libid3tag libraries are NOT available as system libraries" >&5
-echo "$as_me: Libid3tag libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libid3tag libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Libid3tag libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libid3tag/frame.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
   eval "$as_ac_File=yes"
@@ -7140,10 +7355,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   frame_h_found="yes"
 else
   frame_h_found="no"
@@ -7157,16 +7375,165 @@ fi
       LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag'
       LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG"
       LIBID3TAG_LOCAL_CONFIG_SUBDIRS="lib-src/libid3tag"
-      { echo "$as_me:$LINENO: libid3tag libraries are available in the local tree" >&5
-echo "$as_me: libid3tag libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libid3tag libraries are available in the local tree" >&5
+$as_echo "$as_me: libid3tag libraries are available in the local tree" >&6;}
    else
       LIBID3TAG_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libid3tag libraries are NOT available in the local tree" >&5
-echo "$as_me: libid3tag libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libid3tag libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: libid3tag libraries are NOT available in the local tree" >&6;}
+   fi
+
+
+
+# Check whether --with-sbsms was given.
+if test "${with_sbsms+set}" = set; then
+  withval=$with_sbsms; LIBSBSMS_ARGUMENT=$withval
+else
+  LIBSBSMS_ARGUMENT="unspecified"
+fi
+
+
+   if false ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SBSMS 1
+_ACEOF
+
    fi
 
 
 
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for SBSMS" >&5
+$as_echo_n "checking for SBSMS... " >&6; }
+
+if test -n "$SBSMS_CFLAGS"; then
+    pkg_cv_SBSMS_CFLAGS="$SBSMS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sbsms >= 1.6.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sbsms >= 1.6.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SBSMS_CFLAGS=`$PKG_CONFIG --cflags "sbsms >= 1.6.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SBSMS_LIBS"; then
+    pkg_cv_SBSMS_LIBS="$SBSMS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sbsms >= 1.6.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sbsms >= 1.6.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SBSMS_LIBS=`$PKG_CONFIG --libs "sbsms >= 1.6.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SBSMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sbsms >= 1.6.0" 2>&1`
+        else
+	        SBSMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "sbsms >= 1.6.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SBSMS_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                sbsms_available_system="no"
+elif test $pkg_failed = untried; then
+	sbsms_available_system="no"
+else
+	SBSMS_CFLAGS=$pkg_cv_SBSMS_CFLAGS
+	SBSMS_LIBS=$pkg_cv_SBSMS_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	sbsms_available_system="yes"
+fi
+
+
+   if test "x$sbsms_available_system" = "xyes" ; then
+      LIBSBSMS_SYSTEM_AVAILABLE="yes"
+      LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS
+      LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS
+      LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS"
+      { $as_echo "$as_me:$LINENO: Libsbsms libraries are available as system libraries" >&5
+$as_echo "$as_me: Libsbsms libraries are available as system libraries" >&6;}
+   else
+      LIBSBSMS_SYSTEM_AVAILABLE="no"
+      { $as_echo "$as_me:$LINENO: Libsbsms libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Libsbsms libraries are NOT available as system libraries" >&6;}
+   fi
+
+
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  sbsms_h_found="yes"
+else
+  sbsms_h_found="no"
+fi
+
+
+   if test "x$sbsms_h_found" = "xyes" ; then
+      LIBSBSMS_LOCAL_AVAILABLE="yes"
+      LIBSBSMS_LOCAL_LIBS="libsbsms.a"
+      LIBSBSMS_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/sbsms/include'
+      LIBSBSMS_LOCAL_CPPSYMBOLS="USE_SBSMS"
+
+	        LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
+	  ac_configure_args="$ac_configure_args --disable-programs"
+
+      { $as_echo "$as_me:$LINENO: libsbsms libraries are available in the local tree" >&5
+$as_echo "$as_me: libsbsms libraries are available in the local tree" >&6;}
+   else
+      LIBSBSMS_LOCAL_AVAILABLE="no"
+      { $as_echo "$as_me:$LINENO: libsbsms libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: libsbsms libraries are NOT available in the local tree" >&6;}
+   fi
+
+
+
+
 # Check whether --with-soundtouch was given.
 if test "${with_soundtouch+set}" = set; then
   withval=$with_soundtouch; LIBSOUNDTOUCH_ARGUMENT=$withval
@@ -7186,17 +7553,17 @@ _ACEOF
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
-echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
+$as_echo_n "checking for SOUNDTOUCH... " >&6; }
 
 if test -n "$SOUNDTOUCH_CFLAGS"; then
     pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
 else
@@ -7209,10 +7576,10 @@ if test -n "$SOUNDTOUCH_LIBS"; then
     pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"soundtouch-1.0 >= 1.3.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" 2>/dev/null`
 else
@@ -7239,16 +7606,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDTOUCH_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 soundtouch_available_system="no"
 elif test $pkg_failed = untried; then
 	soundtouch_available_system="no"
 else
 	SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS
 	SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	soundtouch_available_system="yes"
 fi
 
@@ -7258,24 +7625,24 @@ fi
       LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
       LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
       LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
-      { echo "$as_me:$LINENO: Libsoundtouch libraries are available as system libraries" >&5
-echo "$as_me: Libsoundtouch libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libsoundtouch libraries are available as system libraries" >&5
+$as_echo "$as_me: Libsoundtouch libraries are available as system libraries" >&6;}
    else
       LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Libsoundtouch libraries are NOT available as system libraries" >&5
-echo "$as_me: Libsoundtouch libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Libsoundtouch libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Libsoundtouch libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
   eval "$as_ac_File=yes"
@@ -7283,10 +7650,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   soundtouch_h_found="yes"
 else
   soundtouch_h_found="no"
@@ -7302,12 +7672,12 @@ fi
       if test ! -f lib-src/soundtouch/Makefile ; then
          LIBSOUNDTOUCH_LOCAL_CONFIG_SUBDIRS="lib-src/soundtouch"
       fi
-      { echo "$as_me:$LINENO: libsoundtouch libraries are available in the local tree" >&5
-echo "$as_me: libsoundtouch libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libsoundtouch libraries are available in the local tree" >&5
+$as_echo "$as_me: libsoundtouch libraries are available in the local tree" >&6;}
    else
       LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libsoundtouch libraries are NOT available in the local tree" >&5
-echo "$as_me: libsoundtouch libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libsoundtouch libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: libsoundtouch libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -7331,15 +7701,15 @@ _ACEOF
          LIBNYQUIST_SYSTEM_AVAILABLE="no"
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx/nyx.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libnyquist/nyx/nyx.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libnyquist/nyx/nyx.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx/nyx.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libnyquist/nyx/nyx.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx/nyx.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/libnyquist/nyx/nyx.h"; then
   eval "$as_ac_File=yes"
@@ -7347,10 +7717,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   nyx_h_found="yes"
 else
   nyx_h_found="no"
@@ -7365,12 +7738,12 @@ fi
       LIBNYQUIST_LOCAL_OPTOBJS="effects/nyquist/Nyquist.o"
       LIBNYQUIST_LOCAL_OPTOBJS="$LIBNYQUIST_LOCAL_OPTOBJS effects/nyquist/LoadNyquist.o"
 
-      { echo "$as_me:$LINENO: nyquist libraries are available in the local tree" >&5
-echo "$as_me: nyquist libraries are available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: nyquist libraries are available in the local tree" >&5
+$as_echo "$as_me: nyquist libraries are available in the local tree" >&6;}
    else
       LIBNYQUIST_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: nyquist libraries are NOT available in the local tree" >&5
-echo "$as_me: nyquist libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: nyquist libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: nyquist libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -7394,19 +7767,19 @@ _ACEOF
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for VAMP" >&5
-echo $ECHO_N "checking for VAMP... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for VAMP" >&5
+$as_echo_n "checking for VAMP... " >&6; }
 
 if test -n "$VAMP_CFLAGS"; then
     pkg_cv_VAMP_CFLAGS="$VAMP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 1.1.0" 2>/dev/null`
+  pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7417,12 +7790,12 @@ if test -n "$VAMP_LIBS"; then
     pkg_cv_VAMP_LIBS="$VAMP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 1.1.0" 2>/dev/null`
+  pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7440,23 +7813,23 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 1.1.0" 2>&1`
+	        VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 2.0" 2>&1`
         else
-	        VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 1.1.0" 2>&1`
+	        VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$VAMP_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 vamp_available_system="no"
 elif test $pkg_failed = untried; then
 	vamp_available_system="no"
 else
 	VAMP_CFLAGS=$pkg_cv_VAMP_CFLAGS
 	VAMP_LIBS=$pkg_cv_VAMP_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	vamp_available_system="yes"
 fi
 
@@ -7466,35 +7839,38 @@ fi
       LIBVAMP_SYSTEM_CXXFLAGS=$VAMP_CFLAGS
 	        LIBVAMP_SYSTEM_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
       LIBVAMP_SYSTEM_CPPSYMBOLS="USE_VAMP"
-      { echo "$as_me:$LINENO: Vamp libraries are available as system libraries" >&5
-echo "$as_me: Vamp libraries are available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Vamp libraries are available as system libraries" >&5
+$as_echo "$as_me: Vamp libraries are available as system libraries" >&6;}
    else
       LIBVAMP_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Vamp libraries are NOT available as system libraries" >&5
-echo "$as_me: Vamp libraries are NOT available as system libraries" >&6;}
+      { $as_echo "$as_me:$LINENO: Vamp libraries are NOT available as system libraries" >&5
+$as_echo "$as_me: Vamp libraries are NOT available as system libraries" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "${srcdir}/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h"; then
+if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   vamp_h_found="yes"
 else
   vamp_h_found="no"
@@ -7503,19 +7879,20 @@ fi
 
    if test "x$vamp_h_found" = "xyes" ; then
       LIBVAMP_LOCAL_AVAILABLE="yes"
-      LIBVAMP_LOCAL_LIBS="libvamp-hostsdk.a"
-      LIBVAMP_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libvamp'
-      LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
-      LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP"
-      if test ! -f lib-src/libvamp/Makefile ; then
-         LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
-      fi
-      { echo "$as_me:$LINENO: Vamp libraries are available in the local tree" >&5
-echo "$as_me: Vamp libraries are available in the local tree" >&6;}
+	        LIBVAMP_LOCAL_BUILD="vamp-sdk"
+	        LIBVAMP_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libvamp'
+      LIBVAMP_LOCAL_LDFLAGS='-L$(top_builddir)/lib-src/libvamp/src -lvamp-hostsdk'
+	        LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
+	  	        LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP"
+	        LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
+	  ac_configure_args="$ac_configure_args --disable-programs"
+
+      { $as_echo "$as_me:$LINENO: Vamp libraries are available in the local tree" >&5
+$as_echo "$as_me: Vamp libraries are available in the local tree" >&6;}
    else
       LIBVAMP_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Vamp libraries are NOT available in the local tree" >&5
-echo "$as_me: Vamp libraries are NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: Vamp libraries are NOT available in the local tree" >&5
+$as_echo "$as_me: Vamp libraries are NOT available in the local tree" >&6;}
    fi
 
 
@@ -7539,17 +7916,17 @@ _ACEOF
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for LIBTWOLAME" >&5
-echo $ECHO_N "checking for LIBTWOLAME... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for LIBTWOLAME" >&5
+$as_echo_n "checking for LIBTWOLAME... " >&6; }
 
 if test -n "$LIBTWOLAME_CFLAGS"; then
     pkg_cv_LIBTWOLAME_CFLAGS="$LIBTWOLAME_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\"") >&5
   ($PKG_CONFIG --exists --print-errors "twolame >= 0.3.9") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_LIBTWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame >= 0.3.9" 2>/dev/null`
 else
@@ -7562,10 +7939,10 @@ if test -n "$LIBTWOLAME_LIBS"; then
     pkg_cv_LIBTWOLAME_LIBS="$LIBTWOLAME_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.9\"") >&5
   ($PKG_CONFIG --exists --print-errors "twolame >= 0.3.9") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_LIBTWOLAME_LIBS=`$PKG_CONFIG --libs "twolame >= 0.3.9" 2>/dev/null`
 else
@@ -7592,16 +7969,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBTWOLAME_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 twolame_available_system="no"
 elif test $pkg_failed = untried; then
 	twolame_available_system="no"
 else
 	LIBTWOLAME_CFLAGS=$pkg_cv_LIBTWOLAME_CFLAGS
 	LIBTWOLAME_LIBS=$pkg_cv_LIBTWOLAME_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	twolame_available_system="yes"
 fi
 
@@ -7610,24 +7987,24 @@ fi
       LIBTWOLAME_SYSTEM_LIBS=$LIBTWOLAME_LIBS
       LIBTWOLAME_SYSTEM_CXXFLAGS=$LIBTWOLAME_CFLAGS
       LIBTWOLAME_SYSTEM_CPPSYMBOLS="USE_LIBTWOLAME"
-      { echo "$as_me:$LINENO: Libtwolame library available as system library" >&5
-echo "$as_me: Libtwolame library available as system library" >&6;}
+      { $as_echo "$as_me:$LINENO: Libtwolame library available as system library" >&5
+$as_echo "$as_me: Libtwolame library available as system library" >&6;}
    else
       LIBTWOLAME_SYSTEM_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Libtwolame library NOT available as system library" >&5
-echo "$as_me: Libtwolame library NOT available as system library" >&6;}
+      { $as_echo "$as_me:$LINENO: Libtwolame library NOT available as system library" >&5
+$as_echo "$as_me: Libtwolame library NOT available as system library" >&6;}
    fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
   eval "$as_ac_File=yes"
@@ -7635,10 +8012,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   twolame_h_found="yes"
 else
   twolame_h_found="no"
@@ -7651,15 +8031,15 @@ fi
       LIBTWOLAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame'
       LIBTWOLAME_LOCAL_CPPSYMBOLS="USE_LIBTWOLAME"
 
-      if test ! -f lib-src/twolame/Makefile ; then
-         LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
-      fi
-      { echo "$as_me:$LINENO: libtwolame library is available in the local tree" >&5
-echo "$as_me: libtwolame library is available in the local tree" >&6;}
+	        LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
+	  	  ac_configure_args="$ac_configure_args --disable-programs"
+
+      { $as_echo "$as_me:$LINENO: libtwolame library is available in the local tree" >&5
+$as_echo "$as_me: libtwolame library is available in the local tree" >&6;}
    else
       LIBTWOLAME_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: libtwolame library is NOT available in the local tree" >&5
-echo "$as_me: libtwolame library is NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: libtwolame library is NOT available in the local tree" >&5
+$as_echo "$as_me: libtwolame library is NOT available in the local tree" >&6;}
    fi
 
 
@@ -7683,17 +8063,17 @@ _ACEOF
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for AVCODEC" >&5
-echo $ECHO_N "checking for AVCODEC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for AVCODEC" >&5
+$as_echo_n "checking for AVCODEC... " >&6; }
 
 if test -n "$AVCODEC_CFLAGS"; then
     pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavcodec >= 51.53") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 51.53" 2>/dev/null`
 else
@@ -7706,10 +8086,10 @@ if test -n "$AVCODEC_LIBS"; then
     pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 51.53\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavcodec >= 51.53") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.53" 2>/dev/null`
 else
@@ -7736,31 +8116,31 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVCODEC_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 avcodec_available_system="no"
 elif test $pkg_failed = untried; then
 	avcodec_available_system="no"
 else
 	AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
 	AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	avcodec_available_system="yes"
 fi
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for AVFORMAT" >&5
-echo $ECHO_N "checking for AVFORMAT... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for AVFORMAT" >&5
+$as_echo_n "checking for AVFORMAT... " >&6; }
 
 if test -n "$AVFORMAT_CFLAGS"; then
     pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
 else
@@ -7773,10 +8153,10 @@ if test -n "$AVFORMAT_LIBS"; then
     pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
   ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
 else
@@ -7803,16 +8183,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVFORMAT_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 avformat_available_system="no"
 elif test $pkg_failed = untried; then
 	avformat_available_system="no"
 else
 	AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
 	AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	avformat_available_system="yes"
 fi
 
@@ -7824,25 +8204,25 @@ fi
          FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
 		 		 		 FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
 		 	export/ExportFFmpegDialogs.o"
-         { echo "$as_me:$LINENO: FFmpeg library available as system library" >&5
-echo "$as_me: FFmpeg library available as system library" >&6;}
+         { $as_echo "$as_me:$LINENO: FFmpeg library available as system library" >&5
+$as_echo "$as_me: FFmpeg library available as system library" >&6;}
       fi
    fi
    if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then
-      { echo "$as_me:$LINENO: FFmpeg library NOT available as system library" >&5
-echo "$as_me: FFmpeg library NOT available as system library" >&6;}
+      { $as_echo "$as_me:$LINENO: FFmpeg library NOT available as system library" >&5
+$as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
    fi
 
          FFMPEG_LOCAL_AVAILABLE="no"
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
   eval "$as_ac_File=yes"
@@ -7850,25 +8230,28 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   avcodec_h_found="yes"
 else
   avcodec_h_found="no"
 fi
 
 
-   as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... $ECHO_C" >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
+$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
   eval "$as_ac_File=yes"
@@ -7876,10 +8259,13 @@ else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   avformat_h_found="yes"
 else
   avformat_h_found="no"
@@ -7894,438 +8280,13 @@ fi
          FFMPEG_LOCAL_CPPSYMBOLS="USE_FFMPEG"
                            FFMPEG_LOCAL_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
             export/ExportFFmpegDialogs.o"
-         { echo "$as_me:$LINENO: FFmpeg headers are available in the local tree" >&5
-echo "$as_me: FFmpeg headers are available in the local tree" >&6;}
+         { $as_echo "$as_me:$LINENO: FFmpeg headers are available in the local tree" >&5
+$as_echo "$as_me: FFmpeg headers are available in the local tree" >&6;}
       fi
    fi
    if test "x$FFMPEG_LOCAL_AVAILABLE" = "xno" ; then
-      { echo "$as_me:$LINENO: ffmpeg library is NOT available in the local tree" >&5
-echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
-   fi
-
-
-
-# Check whether --with-redland was given.
-if test "${with_redland+set}" = set; then
-  withval=$with_redland; REDLAND_ARGUMENT=$withval
-else
-  REDLAND_ARGUMENT="unspecified"
-fi
-
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for REDLAND" >&5
-echo $ECHO_N "checking for REDLAND... $ECHO_C" >&6; }
-
-if test -n "$REDLAND_CFLAGS"; then
-    pkg_cv_REDLAND_CFLAGS="$REDLAND_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"redland >= 1.0.7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "redland >= 1.0.7") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland >= 1.0.7" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$REDLAND_LIBS"; then
-    pkg_cv_REDLAND_LIBS="$REDLAND_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"redland >= 1.0.7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "redland >= 1.0.7") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_REDLAND_LIBS=`$PKG_CONFIG --libs "redland >= 1.0.7" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        REDLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "redland >= 1.0.7" 2>&1`
-        else
-	        REDLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors "redland >= 1.0.7" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$REDLAND_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                redland_available_system="no"
-elif test $pkg_failed = untried; then
-	redland_available_system="no"
-else
-	REDLAND_CFLAGS=$pkg_cv_REDLAND_CFLAGS
-	REDLAND_LIBS=$pkg_cv_REDLAND_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	redland_available_system="yes"
-fi
-   REDLAND_SYSTEM_AVAILABLE="no"
-   if test "x$redland_available_system" = "xyes" ; then
-      REDLAND_SYSTEM_AVAILABLE="yes"
-      REDLAND_SYSTEM_LIBS="$REDLAND_LIBS"
-      REDLAND_SYSTEM_CXXFLAGS="$REDLAND_CFLAGS"
-      { echo "$as_me:$LINENO: Redland available as system library" >&5
-echo "$as_me: Redland available as system library" >&6;}
-   fi
-   if test "x$REDLAND_SYSTEM_AVAILABLE" = "xno" ; then
-      { echo "$as_me:$LINENO: Redland NOT available as system library" >&5
-echo "$as_me: Redland NOT available as system library" >&6;}
-   fi
-
-      as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/redland/librdf/librdf.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/redland/librdf/librdf.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/redland/librdf/librdf.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "${srcdir}/lib-src/redland/librdf/librdf.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  librdf_h_found="yes"
-else
-  librdf_h_found="no"
-fi
-
-
-   if test "x$librdf_h_found" = "xyes" ; then
-      REDLAND_LOCAL_AVAILABLE="yes"
-      REDLAND_LOCAL_LIBS="librdf.a libraptor.a librasqal.a"
-      REDLAND_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/redland/librdf -I$(top_srcdir)/lib-src/redland/raptor/src -I$(top_srcdir)/lib-src/redland/rasqal/src'
-      if test ! -f lib-src/redland/Makefile ; then
-         REDLAND_LOCAL_CONFIG_SUBDIRS="lib-src/redland"
-      fi
-      if test "x$LIBEXPAT_SYSTEM_AVAILABLE" = "xno" ; then
-         # This is a horrible hack to keep from having to modify the raptor/configure.ac.  It makes
-         # the raptor configure think there's a full expat source tree.  But, all we have is expat.h
-         # tucked away in audacity/src/include.  So, we trick it...
-         ac_configure_args="$ac_configure_args \"--with-expat-source=dummy_magic\" CPPFLAGS='$CPPFLAGS -I../../../src/include'"
-      fi
-      ac_configure_args="$ac_configure_args RAPTOR_CFLAGS='-I../../redland/raptor/src' RAPTOR_LIBS='-L.. -L../.. -lraptor' REDLAND_CFLAGS='-I../../redland/raptor/src -I../../redland/rasqal/src -I../../redland/librdf' REDLAND_LIBS='-L.. -L../.. -lrdf -lraptor -lrasqal'"
-      { echo "$as_me:$LINENO: Redland is available in the local tree" >&5
-echo "$as_me: Redland is available in the local tree" >&6;}
-   else
-      REDLAND_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: Redland is NOT available in the local tree" >&5
-echo "$as_me: Redland is NOT available in the local tree" >&6;}
-   fi
-
-
-
-# Check whether --with-slv2 was given.
-if test "${with_slv2+set}" = set; then
-  withval=$with_slv2; SLV2_ARGUMENT=$withval
-else
-  SLV2_ARGUMENT="unspecified"
-fi
-
-
-   if false ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SLV2 1
-_ACEOF
-
-   fi
-
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SLV2" >&5
-echo $ECHO_N "checking for SLV2... $ECHO_C" >&6; }
-
-if test -n "$SLV2_CFLAGS"; then
-    pkg_cv_SLV2_CFLAGS="$SLV2_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"slv2 >= 0.6.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "slv2 >= 0.6.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SLV2_CFLAGS=`$PKG_CONFIG --cflags "slv2 >= 0.6.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SLV2_LIBS"; then
-    pkg_cv_SLV2_LIBS="$SLV2_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"slv2 >= 0.6.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "slv2 >= 0.6.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SLV2_LIBS=`$PKG_CONFIG --libs "slv2 >= 0.6.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SLV2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "slv2 >= 0.6.0" 2>&1`
-        else
-	        SLV2_PKG_ERRORS=`$PKG_CONFIG --print-errors "slv2 >= 0.6.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SLV2_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                slv2_available_system="no"
-elif test $pkg_failed = untried; then
-	slv2_available_system="no"
-else
-	SLV2_CFLAGS=$pkg_cv_SLV2_CFLAGS
-	SLV2_LIBS=$pkg_cv_SLV2_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	slv2_available_system="yes"
-fi
-   SLV2_SYSTEM_AVAILABLE="no"
-   if test "x$slv2_available_system" = "xyes" ; then
-      SLV2_SYSTEM_AVAILABLE="yes"
-      SLV2_SYSTEM_LIBS="$SLV2_LIBS"
-      SLV2_SYSTEM_CXXFLAGS="$SLV2_CFLAGS"
-      SLV2_SYSTEM_CPPSYMBOLS="USE_SLV2"
-      SLV2_SYSTEM_OPTOBJS="effects/lv2/LoadLV2.o effects/lv2/LV2Effect.o effects/lv2/LV2PortGroup.o"
-      { echo "$as_me:$LINENO: SLV2 available as system library" >&5
-echo "$as_me: SLV2 available as system library" >&6;}
-   fi
-   if test "x$SLV2_SYSTEM_AVAILABLE" = "xno" ; then
-      { echo "$as_me:$LINENO: SLV2 NOT available as system library" >&5
-echo "$as_me: SLV2 NOT available as system library" >&6;}
-   fi
-
-      as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/slv2/slv2/slv2.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/slv2/slv2/slv2.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/slv2/slv2/slv2.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "${srcdir}/lib-src/slv2/slv2/slv2.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  slv2_h_found="yes"
-else
-  slv2_h_found="no"
-fi
-
-
-   if test "x$slv2_h_found" = "xyes" ; then
-      SLV2_LOCAL_AVAILABLE="yes"
-      SLV2_LOCAL_LIBS="libslv2.a"
-      SLV2_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/slv2'
-      SLV2_LOCAL_CPPSYMBOLS="USE_SLV2"
-      SLV2_LOCAL_OPTOBJS="effects/lv2/LoadLV2.o effects/lv2/LV2Effect.o effects/lv2/LV2PortGroup.o"
-      if test ! -f lib-src/slv2/Makefile ; then
-         SLV2_LOCAL_CONFIG_SUBDIRS="lib-src/slv2"
-      fi
-      { echo "$as_me:$LINENO: SLV2 is available in the local tree" >&5
-echo "$as_me: SLV2 is available in the local tree" >&6;}
-   else
-      SLV2_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: SLV2 is NOT available in the local tree" >&5
-echo "$as_me: SLV2 is NOT available in the local tree" >&6;}
-   fi
-
-
-
-# Check whether --with-liblrdf was given.
-if test "${with_liblrdf+set}" = set; then
-  withval=$with_liblrdf; LIBLRDF_ARGUMENT=$withval
-else
-  LIBLRDF_ARGUMENT="unspecified"
-fi
-
-
-   if false ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_LIBLRDF 1
-_ACEOF
-
-   fi
-
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for LIBLRDF" >&5
-echo $ECHO_N "checking for LIBLRDF... $ECHO_C" >&6; }
-
-if test -n "$LIBLRDF_CFLAGS"; then
-    pkg_cv_LIBLRDF_CFLAGS="$LIBLRDF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lrdf >= 0.4.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "lrdf >= 0.4.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_LIBLRDF_CFLAGS=`$PKG_CONFIG --cflags "lrdf >= 0.4.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBLRDF_LIBS"; then
-    pkg_cv_LIBLRDF_LIBS="$LIBLRDF_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lrdf >= 0.4.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "lrdf >= 0.4.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_LIBLRDF_LIBS=`$PKG_CONFIG --libs "lrdf >= 0.4.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBLRDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lrdf >= 0.4.0" 2>&1`
-        else
-	        LIBLRDF_PKG_ERRORS=`$PKG_CONFIG --print-errors "lrdf >= 0.4.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBLRDF_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                liblrdf_available_system="no"
-elif test $pkg_failed = untried; then
-	liblrdf_available_system="no"
-else
-	LIBLRDF_CFLAGS=$pkg_cv_LIBLRDF_CFLAGS
-	LIBLRDF_LIBS=$pkg_cv_LIBLRDF_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	liblrdf_available_system="yes"
-fi
-
-   LIBLRDF_SYSTEM_AVAILABLE="no"
-   if test "x$liblrdf_available_system" = "xyes" ; then
-      LIBLRDF_SYSTEM_AVAILABLE="yes"
-      LIBLRDF_SYSTEM_LIBS="$LIBLRDF_LIBS"
-      LIBLRDF_SYSTEM_CXXFLAGS="$LIBLRDF_CFLAGS"
-      LIBLRDF_SYSTEM_CPPSYMBOLS="USE_LIBLRDF"
-      { echo "$as_me:$LINENO: liblrdf available as system library" >&5
-echo "$as_me: liblrdf available as system library" >&6;}
-   fi
-   if test "x$LIBLRDF_SYSTEM_AVAILABLE" = "xno" ; then
-      { echo "$as_me:$LINENO: liblrdf NOT available as system library" >&5
-echo "$as_me: liblrdf NOT available as system library" >&6;}
-   fi
-
-      as_ac_File=`echo "ac_cv_file_${srcdir}/lib-src/liblrdf/lrdf.h" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${srcdir}/lib-src/liblrdf/lrdf.h" >&5
-echo $ECHO_N "checking for ${srcdir}/lib-src/liblrdf/lrdf.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "${srcdir}/lib-src/liblrdf/lrdf.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval echo '${'$as_ac_File'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  lrdf_h_found="yes"
-else
-  lrdf_h_found="no"
-fi
-
-
-   if test "x$lrdf_h_found" = "xyes" ; then
-      LIBLRDF_LOCAL_AVAILABLE="yes"
-      LIBLRDF_LOCAL_LIBS="liblrdf.a"
-      LIBLRDF_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/liblrdf'
-      LIBLRDF_LOCAL_CPPSYMBOLS="USE_LIBLRDF"
-      if test ! -f lib-src/liblrdf/Makefile ; then
-         LIBLRDF_LOCAL_CONFIG_SUBDIRS="lib-src/liblrdf"
-      fi
-      { echo "$as_me:$LINENO: liblrdf is available in the local tree" >&5
-echo "$as_me: liblrdf is available in the local tree" >&6;}
-   else
-      LIBLRDF_LOCAL_AVAILABLE="no"
-      { echo "$as_me:$LINENO: liblrdf is NOT available in the local tree" >&5
-echo "$as_me: liblrdf is NOT available in the local tree" >&6;}
+      { $as_echo "$as_me:$LINENO: ffmpeg library is NOT available in the local tree" >&5
+$as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
    fi
 
 
@@ -8399,8 +8360,8 @@ _ACEOF
   fi
 
   ax_popdir=`pwd`
-  { echo "$as_me:$LINENO: Configuring sources in \"${srcdir}/lib-src/portsmf\"" >&5
-echo "$as_me: Configuring sources in \"${srcdir}/lib-src/portsmf\"" >&6;}
+  { $as_echo "$as_me:$LINENO: Configuring sources in \"${srcdir}/lib-src/portsmf\"" >&5
+$as_echo "$as_me: Configuring sources in \"${srcdir}/lib-src/portsmf\"" >&6;}
       { as_dir=""${srcdir}/lib-src/portsmf""
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
@@ -8409,7 +8370,7 @@ echo "$as_me: Configuring sources in \"${srcdir}/lib-src/portsmf\"" >&6;}
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -8418,7 +8379,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -8439,17 +8400,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
       ac_builddir=.
 
 case ""${srcdir}/lib-src/portsmf"" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo ""${srcdir}/lib-src/portsmf"" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo ""${srcdir}/lib-src/portsmf"" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -8487,8 +8448,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     # This should be Cygnus configure.
 	ax_sub_configure=$ac_aux_dir/configure
   else
-    { echo "$as_me:$LINENO: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&5
-echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&5
+$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&2;}
     ax_sub_configure=
   fi
 
@@ -8501,32 +8462,32 @@ echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/po
 	ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
     esac
 
-    { echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+    { $as_echo "$as_me:$LINENO: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
     # The eval makes quoting arguments work.
     eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
 	   --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
   fi
 
   cd "$ax_popdir"
-  { echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&5
-echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
+  { $as_echo "$as_me:$LINENO: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&5
+$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
 
    fi
          export PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for PORTSMF" >&5
-echo $ECHO_N "checking for PORTSMF... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for PORTSMF" >&5
+$as_echo_n "checking for PORTSMF... " >&6; }
 
 if test -n "$PORTSMF_CFLAGS"; then
     pkg_cv_PORTSMF_CFLAGS="$PORTSMF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
   ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
 else
@@ -8539,10 +8500,10 @@ if test -n "$PORTSMF_LIBS"; then
     pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portSMF\"") >&5
   ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
 else
@@ -8569,16 +8530,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PORTSMF_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 portsmf_available="no"
 elif test $pkg_failed = untried; then
 	portsmf_available="no"
 else
 	PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
 	PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	portsmf_available="yes"
 fi
 
@@ -8595,8 +8556,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: Figuring out what libraries to enable" >&5
-echo "$as_me: Figuring out what libraries to enable" >&6;}
+{ $as_echo "$as_me:$LINENO: Figuring out what libraries to enable" >&5
+$as_echo "$as_me: Figuring out what libraries to enable" >&6;}
 
 lib_preference=`echo $lib_preference | tr [:lower:], "[:upper:] "`
 
@@ -8612,42 +8573,42 @@ for lib in $LIBRARIES ; do
          if test "$AVAILABLE" = "yes" ; then
             eval ${lib}_USE_${sys_or_local}="yes"
             lib_activated="yes"
-            { echo "$as_me:$LINENO: Using $sys_or_local libraries for $lib" >&5
-echo "$as_me: Using $sys_or_local libraries for $lib" >&6;}
+            { $as_echo "$as_me:$LINENO: Using $sys_or_local libraries for $lib" >&5
+$as_echo "$as_me: Using $sys_or_local libraries for $lib" >&6;}
             break
          fi
       done
       if test $lib_activated = no ; then
-         { echo "$as_me:$LINENO: disabling $lib" >&5
-echo "$as_me: disabling $lib" >&6;}
+         { $as_echo "$as_me:$LINENO: disabling $lib" >&5
+$as_echo "$as_me: disabling $lib" >&6;}
       fi
    else
             if test $LIB_ARGUMENT = local ; then
          if test $LIB_LOCAL_AVAILABLE = yes ; then
             eval ${lib}_USE_LOCAL="yes"
-            { echo "$as_me:$LINENO: Using the LOCAL libraries for $lib because you specifically requested this" >&5
-echo "$as_me: Using the LOCAL libraries for $lib because you specifically requested this" >&6;}
+            { $as_echo "$as_me:$LINENO: Using the LOCAL libraries for $lib because you specifically requested this" >&5
+$as_echo "$as_me: Using the LOCAL libraries for $lib because you specifically requested this" >&6;}
          else
-            { { echo "$as_me:$LINENO: error: You requested using the local libraries for $lib but they are not available" >&5
-echo "$as_me: error: You requested using the local libraries for $lib but they are not available" >&2;}
+            { { $as_echo "$as_me:$LINENO: error: You requested using the local libraries for $lib but they are not available" >&5
+$as_echo "$as_me: error: You requested using the local libraries for $lib but they are not available" >&2;}
    { (exit 1); exit 1; }; }
          fi
       elif test $LIB_ARGUMENT = system ; then
          if test $LIB_SYSTEM_AVAILABLE = yes ; then
             eval ${lib}_USE_SYSTEM="yes"
-            { echo "$as_me:$LINENO: Using the SYSTEM libraries for $lib because you specifically requested this" >&5
-echo "$as_me: Using the SYSTEM libraries for $lib because you specifically requested this" >&6;}
+            { $as_echo "$as_me:$LINENO: Using the SYSTEM libraries for $lib because you specifically requested this" >&5
+$as_echo "$as_me: Using the SYSTEM libraries for $lib because you specifically requested this" >&6;}
          else
-            { { echo "$as_me:$LINENO: error: You requested using the system libraries for $lib but they are not available" >&5
-echo "$as_me: error: You requested using the system libraries for $lib but they are not available" >&2;}
+            { { $as_echo "$as_me:$LINENO: error: You requested using the system libraries for $lib but they are not available" >&5
+$as_echo "$as_me: error: You requested using the system libraries for $lib but they are not available" >&2;}
    { (exit 1); exit 1; }; }
          fi
       elif test $LIB_ARGUMENT = no ; then
-         { echo "$as_me:$LINENO: disabling $lib at your request" >&5
-echo "$as_me: disabling $lib at your request" >&6;}
+         { $as_echo "$as_me:$LINENO: disabling $lib at your request" >&5
+$as_echo "$as_me: disabling $lib at your request" >&6;}
       else
-         { { echo "$as_me:$LINENO: error: I didn't understand the argument $LIB_ARGUMENT for $lib" >&5
-echo "$as_me: error: I didn't understand the argument $LIB_ARGUMENT for $lib" >&2;}
+         { { $as_echo "$as_me:$LINENO: error: I didn't understand the argument $LIB_ARGUMENT for $lib" >&5
+$as_echo "$as_me: error: I didn't understand the argument $LIB_ARGUMENT for $lib" >&2;}
    { (exit 1); exit 1; }; }
       fi
    fi
@@ -8660,14 +8621,14 @@ done
 #     liblrdf
 
 if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
-   { { echo "$as_me:$LINENO: error: Audacity requires libsndfile to be enabled" >&5
-echo "$as_me: error: Audacity requires libsndfile to be enabled" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: Audacity requires libsndfile to be enabled" >&5
+$as_echo "$as_me: error: Audacity requires libsndfile to be enabled" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "$LIBEXPAT_USE_LOCAL" != "yes" && test "$LIBEXPAT_USE_SYSTEM" != "yes" ; then
-   { { echo "$as_me:$LINENO: error: Audacity requires expat to be enabled" >&5
-echo "$as_me: error: Audacity requires expat to be enabled" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: Audacity requires expat to be enabled" >&5
+$as_echo "$as_me: error: Audacity requires expat to be enabled" >&2;}
    { (exit 1); exit 1; }; }
 else
    if test "$LIBEXPAT_USE_SYSTEM" = "yes" ; then
@@ -8680,29 +8641,23 @@ _ACEOF
 fi
 
 if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
-      { echo "$as_me:$LINENO: Both libresample and libsamplerate are available" >&5
-echo "$as_me: Both libresample and libsamplerate are available" >&6;}
-   { echo "$as_me:$LINENO: deciding which to use based on arguments ..." >&5
-echo "$as_me: deciding which to use based on arguments ..." >&6;}
+      { $as_echo "$as_me:$LINENO: Both libresample and libsamplerate are available" >&5
+$as_echo "$as_me: Both libresample and libsamplerate are available" >&6;}
+   { $as_echo "$as_me:$LINENO: deciding which to use based on arguments ..." >&5
+$as_echo "$as_me: deciding which to use based on arguments ..." >&6;}
    if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
             LIBSAMPLERATE_USE_LOCAL="no"
       LIBSAMPLERATE_USE_SYSTEM="no"
-            { echo "$as_me:$LINENO: Libsamplerate not explicity requested, using libresample" >&5
-echo "$as_me: Libsamplerate not explicity requested, using libresample" >&6;}
+            { $as_echo "$as_me:$LINENO: Libsamplerate not explicity requested, using libresample" >&5
+$as_echo "$as_me: Libsamplerate not explicity requested, using libresample" >&6;}
    else
                         LIBRESAMPLE_USE_LOCAL="no"
       LIBRESAMPLE_USE_SYSTEM="no"
-            { echo "$as_me:$LINENO: Using libsamplerate as requested" >&5
-echo "$as_me: Using libsamplerate as requested" >&6;}
+            { $as_echo "$as_me:$LINENO: Using libsamplerate as requested" >&5
+$as_echo "$as_me: Using libsamplerate as requested" >&6;}
    fi
 fi
 
-if ( test "$SLV2_USE_LOCAL" != "yes" && test "$LIBLRDF_USE_LOCAL" != "yes") && test "$REDLAND_USE_LOCAL" = "yes" ; then
-   { echo "$as_me:$LINENO: Not building local Redland library since we don't use the local SLV2 or liblrdf libraries" >&5
-echo "$as_me: Not building local Redland library since we don't use the local SLV2 or liblrdf libraries" >&6;}
-   REDLAND_USE_LOCAL=no
-   REDLAND_USE_SYSTEM=no
-fi
 
 if [ "x$LIBLRDF_USE_LOCAL" = "xyes" ]; then
    EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-lrdf-data"
@@ -8715,7 +8670,7 @@ for lib in $LIBRARIES ; do
    if test "x$LIB_USE_LOCAL" = "xyes" ; then
       eval LIBSRC_BUILD=\"$LIBSRC_BUILD \$${lib}_LOCAL_BUILD\"
       eval LOCAL_LIBS=\"$LOCAL_LIBS \$${lib}_LOCAL_LIBS\"
-      eval BUILD_LDFLAGS=\"$BUILD_LDFLAGS \$${lib}_LOCAL_LDFLAGS\"
+      eval BUILD_LDFLAGS=\"\$BUILD_LDFLAGS \$${lib}_LOCAL_LDFLAGS\"
       eval OPTOBJS=\"$OPTOBJS \$${lib}_LOCAL_OPTOBJS\"
       eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_LOCAL_CXXFLAGS\"
       eval CONFIG_SUBDIRS=\"\$${lib}_LOCAL_CONFIG_SUBDIRS\"
@@ -8795,34 +8750,34 @@ fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -8839,27 +8794,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -8942,10 +8897,10 @@ _ACEOF
       cygwin*)
          ;;
       *)
-                  { echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+                  { $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -8977,33 +8932,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
   have_alsa=yes
 else
   have_alsa=no
@@ -9014,17 +8973,17 @@ fi
          fi
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for JACK" >&5
-echo $ECHO_N "checking for JACK... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for JACK" >&5
+$as_echo_n "checking for JACK... " >&6; }
 
 if test -n "$JACK_CFLAGS"; then
     pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
   ($PKG_CONFIG --exists --print-errors "jack") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
 else
@@ -9037,10 +8996,10 @@ if test -n "$JACK_LIBS"; then
     pkg_cv_JACK_LIBS="$JACK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
   ($PKG_CONFIG --exists --print-errors "jack") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
 else
@@ -9067,25 +9026,25 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JACK_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 have_jack=no
 elif test $pkg_failed = untried; then
 	have_jack=no
 else
 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
 	JACK_LIBS=$pkg_cv_JACK_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	have_jack=yes
 fi
          if [ $have_jack = "yes" ] ; then
             LIBS="$LIBS $JACK_LIBS"
          fi
-         { echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" >&5
-echo $ECHO_N "checking for HPI_SubSysCreate in -lhpi... $ECHO_C" >&6; }
+         { $as_echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" >&5
+$as_echo_n "checking for HPI_SubSysCreate in -lhpi... " >&6; }
 if test "${ac_cv_lib_hpi_HPI_SubSysCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhpi -lm $LIBS"
@@ -9117,33 +9076,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hpi_HPI_SubSysCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_hpi_HPI_SubSysCreate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_hpi_HPI_SubSysCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_hpi_HPI_SubSysCreate" >&6; }
-if test $ac_cv_lib_hpi_HPI_SubSysCreate = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hpi_HPI_SubSysCreate" >&5
+$as_echo "$ac_cv_lib_hpi_HPI_SubSysCreate" >&6; }
+if test "x$ac_cv_lib_hpi_HPI_SubSysCreate" = x""yes; then
   have_asihpi=yes
 else
   have_asihpi=no
@@ -9152,10 +9115,10 @@ fi
          if [ $have_asihpi = "yes" ] ; then
             LIBS="$LIBS -lhpi"
          fi
-         { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
-echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
+         { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
@@ -9187,33 +9150,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_rt_clock_gettime=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6; }
-if test $ac_cv_lib_rt_clock_gettime = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
   rt_libs=" -lrt"
 fi
 
@@ -9222,11 +9189,11 @@ fi
 
 for ac_func in clock_gettime nanosleep
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9279,35 +9246,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9374,12 +9348,10 @@ _ACEOF
    fi
 fi
 
-case "$host_os" in
-   *)
-            { echo "$as_me:$LINENO: checking for lrint" >&5
-echo $ECHO_N "checking for lrint... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for lrint" >&5
+$as_echo_n "checking for lrint... " >&6; }
 if test "${ac_cv_c99_lrint+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9407,20 +9379,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c99_lrint=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c99_lrint=no
@@ -9428,8 +9401,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c99_lrint" >&5
-echo "${ECHO_T}$ac_cv_c99_lrint" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c99_lrint" >&5
+$as_echo "$ac_cv_c99_lrint" >&6; }
 if test "x$ac_cv_c99_lrint" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -9438,10 +9411,10 @@ _ACEOF
 
 fi
 
-      { echo "$as_me:$LINENO: checking for lrintf" >&5
-echo $ECHO_N "checking for lrintf... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for lrintf" >&5
+$as_echo_n "checking for lrintf... " >&6; }
 if test "${ac_cv_c99_lrintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9469,20 +9442,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c99_lrintf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c99_lrintf=no
@@ -9490,8 +9464,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c99_lrintf" >&5
-echo "${ECHO_T}$ac_cv_c99_lrintf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c99_lrintf" >&5
+$as_echo "$ac_cv_c99_lrintf" >&6; }
 if test "x$ac_cv_c99_lrintf" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -9500,30 +9474,9 @@ _ACEOF
 
 fi
 
-      ;;
-esac
 
 
 if [ "$use_ladspa" = "yes" ] ; then
-   case "$host_os" in
-      darwin7*)
-         LIBS="$LIBS -ldl"
-         ;;
-      darwin[123456].* | rhapsody*)
-         LOCAL_LIBS="$LOCAL_LIBS libdl.a"
-         CXXFLAGS="$CXXFLAGS -I$(srcdir)/lib-src/dlcompat"
-         if test ! -f "lib-src/dlcompat/Makefile"; then
-            echo "--- Configuring dlcompat";
-            subdirs="$subdirs lib-src/dlcompat"
-
-         fi
-         ;;
-      *)
-         ;;
-   esac
-fi
-
-if [ "$use_ladspa" = "yes" ] ; then
    OPTOBJS="$OPTOBJS effects/ladspa/LoadLadspa.o"
    OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
 
@@ -9532,6 +9485,14 @@ cat >>confdefs.h <<\_ACEOF
 #define USE_LADSPA 1
 _ACEOF
 
+
+      case "$host_os" in
+      darwin7*)
+         LIBS="$LIBS -ldl"
+         ;;
+      *)
+         ;;
+   esac
 fi
 
 if [ "$use_audiounits" = "yes" ] ; then
@@ -9569,7 +9530,7 @@ case "${host_os}" in
       ;;
 esac
 
-ac_config_files="$ac_config_files Makefile src/Makefile lib-src/Makefile lib-src/libnyquist/Makefile lib-src/libvamp/Makefile locale/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile lib-src/Makefile lib-src/libnyquist/Makefile lib-src/libnyquist/misc/Makefile locale/Makefile"
 
 if [ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]; then
    ac_config_files="$ac_config_files lib-src/expat/Makefile"
@@ -9611,11 +9572,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -9648,12 +9610,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -9669,7 +9631,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9682,11 +9644,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -9699,7 +9662,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -9709,7 +9672,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -9731,17 +9694,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -9757,8 +9748,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -9781,7 +9770,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -9794,17 +9783,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -9826,7 +9808,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -9877,7 +9859,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -9905,7 +9887,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -9918,19 +9899,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -9955,10 +9939,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -9981,7 +9965,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9994,29 +9978,39 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -10027,24 +10021,24 @@ $config_headers
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -10066,30 +10060,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -10108,30 +10108,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -10143,14 +10145,14 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;;
     "lib-src/libnyquist/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/libnyquist/Makefile" ;;
-    "lib-src/libvamp/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/libvamp/Makefile" ;;
+    "lib-src/libnyquist/misc/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/libnyquist/misc/Makefile" ;;
     "locale/Makefile") CONFIG_FILES="$CONFIG_FILES locale/Makefile" ;;
     "lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
     "lib-src/portaudio/pa_unix_oss/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/portaudio/pa_unix_oss/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -10190,218 +10192,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-HAVE_PKG_CONFIG!$HAVE_PKG_CONFIG$ac_delim
-LOCAL_LIBS!$LOCAL_LIBS$ac_delim
-EXTRAOBJS!$EXTRAOBJS$ac_delim
-EXTRATARGETS!$EXTRATARGETS$ac_delim
-EXTRAINSTALLTARGETS!$EXTRAINSTALLTARGETS$ac_delim
-EXTRAUNINSTALLTARGETS!$EXTRAUNINSTALLTARGETS$ac_delim
-OPTOBJS!$OPTOBJS$ac_delim
-CDEPEND!$CDEPEND$ac_delim
-PRECOMP_CFLAGS!$PRECOMP_CFLAGS$ac_delim
-AFTERBUILD!$AFTERBUILD$ac_delim
-INSTALL_PREFIX!$INSTALL_PREFIX$ac_delim
-CONFIGHEADER!$CONFIGHEADER$ac_delim
-BUILD_LDFLAGS!$BUILD_LDFLAGS$ac_delim
-LIBSRC_BUILD!$LIBSRC_BUILD$ac_delim
-AUDACITY_NAME!$AUDACITY_NAME$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-SED!$SED$ac_delim
-CFLAG_VISIBILITY!$CFLAG_VISIBILITY$ac_delim
-HAVE_VISIBILITY!$HAVE_VISIBILITY$ac_delim
-WX_CONFIG!$WX_CONFIG$ac_delim
-subdirs!$subdirs$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-WIDGETEXTRA_CFLAGS!$WIDGETEXTRA_CFLAGS$ac_delim
-WIDGETEXTRA_LIBS!$WIDGETEXTRA_LIBS$ac_delim
-SNDFILE_CFLAGS!$SNDFILE_CFLAGS$ac_delim
-SNDFILE_LIBS!$SNDFILE_LIBS$ac_delim
-SAMPLERATE_CFLAGS!$SAMPLERATE_CFLAGS$ac_delim
-SAMPLERATE_LIBS!$SAMPLERATE_LIBS$ac_delim
-LIBMAD_CFLAGS!$LIBMAD_CFLAGS$ac_delim
-LIBMAD_LIBS!$LIBMAD_LIBS$ac_delim
-SOUNDTOUCH_CFLAGS!$SOUNDTOUCH_CFLAGS$ac_delim
-SOUNDTOUCH_LIBS!$SOUNDTOUCH_LIBS$ac_delim
-VAMP_CFLAGS!$VAMP_CFLAGS$ac_delim
-VAMP_LIBS!$VAMP_LIBS$ac_delim
-LIBTWOLAME_CFLAGS!$LIBTWOLAME_CFLAGS$ac_delim
-LIBTWOLAME_LIBS!$LIBTWOLAME_LIBS$ac_delim
-AVCODEC_CFLAGS!$AVCODEC_CFLAGS$ac_delim
-AVCODEC_LIBS!$AVCODEC_LIBS$ac_delim
-AVFORMAT_CFLAGS!$AVFORMAT_CFLAGS$ac_delim
-AVFORMAT_LIBS!$AVFORMAT_LIBS$ac_delim
-REDLAND_CFLAGS!$REDLAND_CFLAGS$ac_delim
-REDLAND_LIBS!$REDLAND_LIBS$ac_delim
-SLV2_CFLAGS!$SLV2_CFLAGS$ac_delim
-SLV2_LIBS!$SLV2_LIBS$ac_delim
-LIBLRDF_CFLAGS!$LIBLRDF_CFLAGS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-LIBLRDF_LIBS!$LIBLRDF_LIBS$ac_delim
-PORTSMF_CFLAGS!$PORTSMF_CFLAGS$ac_delim
-PORTSMF_LIBS!$PORTSMF_LIBS$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-JACK_CFLAGS!$JACK_CFLAGS$ac_delim
-JACK_LIBS!$JACK_LIBS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -10417,19 +10345,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -10458,26 +10500,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -10487,7 +10541,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10513,7 +10567,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -10522,7 +10576,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10543,17 +10597,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10593,12 +10647,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -10607,13 +10662,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -10627,15 +10683,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -10645,119 +10702,58 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
 
@@ -10771,6 +10767,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -10798,7 +10799,8 @@ fi
 #
 if test "$no_recursion" != yes; then
 
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
+  # so they do not pile up.
   ac_sub_configure_args=
   ac_prev=
   eval "set x $ac_configure_args"
@@ -10827,9 +10829,11 @@ if test "$no_recursion" != yes; then
       ac_prev=prefix ;;
     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
       ;;
+    --disable-option-checking)
+      ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
     esac
@@ -10839,7 +10843,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -10848,6 +10852,10 @@ if test "$no_recursion" != yes; then
     ac_sub_configure_args="--silent $ac_sub_configure_args"
   fi
 
+  # Always prepend --disable-option-checking to silence warnings, since
+  # different subdirs can have different --enable and --with options.
+  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
+
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
@@ -10856,8 +10864,8 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    echo "$as_me:$LINENO: $ac_msg" >&5
-    echo "$ac_msg" >&6
+    $as_echo "$as_me:$LINENO: $ac_msg" >&5
+    $as_echo "$ac_msg" >&6
     { as_dir="$ac_dir"
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
@@ -10866,7 +10874,7 @@ if test "$no_recursion" != yes; then
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -10875,7 +10883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10896,17 +10904,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10945,8 +10953,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/configure
     else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -10959,19 +10967,23 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
     cd "$ac_popdir"
   done
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 pa_libs=
diff --git a/configure.in b/configure.in
index 955802f..6e0fcc7 100644
--- a/configure.in
+++ b/configure.in
@@ -215,7 +215,7 @@ dnl If the C++ compiler supports making symbols within audacity hidden then
 dnl we would like to do so. This means that only the required symbols for
 dnl plug-in functionality are exposed, rather than everything in the program.
 dnl-------------------------------------------------------------------------
-AUDACITY_CHECK_VISIBILITY
+gl_VISIBILITY
 
 dnl-------------------------------------------------------------
 dnl Configure the libraries which are essential to audacity.
@@ -289,7 +289,9 @@ dnl-------------------------------------------------------------
 dnl Optional library support. Lots of things we could use, but 
 dnl can do without if they aren't available.
 dnl-------------------------------------------------------------
-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF"
+dnl LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF"
+dnl disable plugin categorisation and LV2 libs for 1.3.7 release
+LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
 
 AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system])
 
@@ -301,14 +303,15 @@ AUDACITY_CHECKLIB_LIBVORBIS
 AUDACITY_CHECKLIB_LIBMAD
 AUDACITY_CHECKLIB_LIBFLAC
 AUDACITY_CHECKLIB_LIBID3TAG
+AUDACITY_CHECKLIB_LIBSBSMS
 AUDACITY_CHECKLIB_LIBSOUNDTOUCH
 AUDACITY_CHECKLIB_LIBNYQUIST
 AUDACITY_CHECKLIB_LIBVAMP
 AUDACITY_CHECKLIB_LIBTWOLAME
 AUDACITY_CHECKLIB_FFMPEG
-AUDACITY_CHECKLIB_REDLAND
-AUDACITY_CHECKLIB_SLV2
-AUDACITY_CHECKLIB_LIBLRDF
+dnl AUDACITY_CHECKLIB_REDLAND
+dnl AUDACITY_CHECKLIB_SLV2
+dnl AUDACITY_CHECKLIB_LIBLRDF
 AUDACITY_CHECKLIB_PORTSMF
 
 dnl Decide what libraries to build with, and whether to use system or local libraries
@@ -405,11 +408,11 @@ if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "
    fi
 fi
 
-if ( test "$SLV2_USE_LOCAL" != "yes" && test "$LIBLRDF_USE_LOCAL" != "yes") && test "$REDLAND_USE_LOCAL" = "yes" ; then
-   AC_MSG_NOTICE([Not building local Redland library since we don't use the local SLV2 or liblrdf libraries])
-   REDLAND_USE_LOCAL=no
-   REDLAND_USE_SYSTEM=no
-fi
+dnl if ( test "$SLV2_USE_LOCAL" != "yes" && test "$LIBLRDF_USE_LOCAL" != "yes") && test "$REDLAND_USE_LOCAL" = "yes" ; then
+dnl   AC_MSG_NOTICE([Not building local Redland library since we don't use the local SLV2 or liblrdf libraries])
+dnl   REDLAND_USE_LOCAL=no
+dnl   REDLAND_USE_SYSTEM=no
+dnl fi
 
 dnl If we are using a local copy of liblrdf then some extra files need to be
 dnl installed on the system, so we need to add the targets to
@@ -427,7 +430,7 @@ for lib in $LIBRARIES ; do
    if test "x$LIB_USE_LOCAL" = "xyes" ; then
       eval LIBSRC_BUILD=\"$LIBSRC_BUILD \$${lib}_LOCAL_BUILD\"
       eval LOCAL_LIBS=\"$LOCAL_LIBS \$${lib}_LOCAL_LIBS\"
-      eval BUILD_LDFLAGS=\"$BUILD_LDFLAGS \$${lib}_LOCAL_LDFLAGS\"
+      eval BUILD_LDFLAGS=\"\$BUILD_LDFLAGS \$${lib}_LOCAL_LDFLAGS\"
       eval OPTOBJS=\"$OPTOBJS \$${lib}_LOCAL_OPTOBJS\"
       eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_LOCAL_CXXFLAGS\"
       eval CONFIG_SUBDIRS=\"\$${lib}_LOCAL_CONFIG_SUBDIRS\"
@@ -647,45 +650,28 @@ if [[ "$use_portmixer" = "yes" ]] ; then
    fi
 fi
 
-case "$host_os" in
-dnl   darwin* | rhapsody*)
-dnl      AC_MSG_WARN([[Not using native lrint() and lrintf() because they are missing on 10.1.]])
-dnl      ;;
-   *)
-      dnl For all other Unix systems, we want to check for lrint/lrintf
-      AC_C99_FUNC_LRINT
-      AC_C99_FUNC_LRINTF
-      ;;
-esac
+dnl Check for lrint/lrintf
+AC_C99_FUNC_LRINT
+AC_C99_FUNC_LRINTF
 
 
-dnl Special configuration for LADSPA on Mac OS X
 if [[ "$use_ladspa" = "yes" ]] ; then
+   OPTOBJS="$OPTOBJS effects/ladspa/LoadLadspa.o"
+   OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
+
+   AC_DEFINE(USE_LADSPA, 1,
+             [Define if LADSPA plug-ins are enabled])
+
+   dnl Special configuration for LADSPA on Mac OS X
    case "$host_os" in
       darwin7*)
          LIBS="$LIBS -ldl"
          ;;
-      darwin[[123456]].* | rhapsody*)
-         LOCAL_LIBS="$LOCAL_LIBS libdl.a"
-         CXXFLAGS="$CXXFLAGS -I$(srcdir)/lib-src/dlcompat"
-         if test ! -f "lib-src/dlcompat/Makefile"; then
-            echo "--- Configuring dlcompat";
-            AC_CONFIG_SUBDIRS([lib-src/dlcompat])
-         fi    
-         ;;
       *)
          ;;
    esac
 fi
 
-if [[ "$use_ladspa" = "yes" ]] ; then
-   OPTOBJS="$OPTOBJS effects/ladspa/LoadLadspa.o"
-   OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
-
-   AC_DEFINE(USE_LADSPA, 1,
-             [Define if LADSPA plug-ins are enabled])
-fi
-
 if [[ "$use_audiounits" = "yes" ]] ; then
    OPTOBJS="$OPTOBJS effects/audiounits/LoadAudioUnits.o"
    OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
@@ -714,7 +700,7 @@ case "${host_os}" in
 esac
 
 AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \
-                 lib-src/libnyquist/Makefile lib-src/libvamp/Makefile \
+                 lib-src/libnyquist/Makefile lib-src/libnyquist/misc/Makefile \
                  locale/Makefile])
 dnl There are various other files we might need to process, depends on what
 dnl has been enabled previously
diff --git a/dox2-src/CrossPlatform.dox2 b/dox2-src/CrossPlatform.dox2
new file mode 100644
index 0000000..4630413
--- /dev/null
+++ b/dox2-src/CrossPlatform.dox2
@@ -0,0 +1,161 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  CrossPlatform.dox2
+
+  James Crook
+
+  Documents Cross Platform coding issues.
+
+********************************************************************//*
+
+JKC: The examples in this file need to be extracted into a separate file so
+that we can get the comments to show correctly in the output files.
+
+
+/*****************************************************************//*! 
+\page CrossPlatform Cross Platform Coding Tips
+\brief Guidelines for making the code compile and work on all supported platforms.
+
+\section PragmaOnce \#pragma once
+
+The following is not supported under gcc 2.x:
+
+\code
+// WRONG
+#pragma once
+\endcode
+
+Instead use the traditional:
+
+\code
+#ifndef __AUDACITY_HEADER_FILE_NAME__
+#define __AUDACITY_HEADER_FILE_NAME__
+
+// your header file contents goes here.
+
+#endif
+\endcode
+
+\section UnicodeStrings Unicode strings
+
+Audacity code is translated, and it may be built in Unicode versions.  
+For this reason all strings should be wrapped like this:
+
+\code
+   // for strings which are not translated
+   mMyFirstString = wxT("some untranslated string");
+   // for strings which should be translated
+   mMySecondString = _("some translatable string");
+\endcode
+
+In some cases you need to give hints to a translator about how a 
+string should be translated.  Do so as follows:
+
+\dontinclude examples.hh
+
+\skip i18n-hint
+\until "R"
+
+Very long strings can be wrapped across multiple lines, as follows:
+
+\code
+   // For untranslated strings:
+   wxT("This is a long untranslated string ")
+   wxT("which spans several lines ")
+   wxT("and works in Unicode builds too")
+
+   // For translated strings:
+   _("This is a long translated string "
+   wxT("which spans several lines ")
+   wxT("and works in Unicode builds too"))
+\endcode
+
+Notice that in the translated example, all bar the first substring
+are contained within a \p wxT().
+
+\section ConstructorsAsArguments Constructors as Arguments
+
+Don't write code like this:
+
+\code
+   // WRONG
+   // Now call OnSampleRateChange to update the values.
+   OnSampleRateChange( wxCommandEvent() );
+\endcode
+
+Whilst it is fine under MSVC it will cause a problem under gcc as the 
+constructor is a temporary object which will be optimised away.  
+
+Instead use:
+
+\code
+   // Now call OnSampleRateChange to update the values.
+   wxCommandEvent e;
+   OnSampleRateChange( e );
+\endcode
+
+\section HeaderFiles Header Files
+
+Windows systems are not case sensitive, whilst Linux systems are.
+You therefore need to take care in capitalisation, e.g:
+
+\code
+#include "AttachableScrollBar.h"
+\endcode
+
+\section ClassNamesInClasses Class Names in Classes
+
+Microsoft Visual C++ allows you to write code like this in a header file:
+
+\code
+// WRONG
+class MyClass 
+{
+public:
+   int MyClass::SomeFunction();
+   //... other stuff
+\endcode
+
+For portability, the \p 'MyClass::' prefix should be left out. 
+
+\section wxStringInFormat Using wxString in Format
+
+Don't write code like this:
+
+\code
+   wxString Message( wxT("Hello" )); 
+   // WRONG
+   wxString Temp = wxString::Format(wxT("Your said %s in your message"), Message );
+\endcode
+
+Although MSVC won't complain even in Unicode mode, it generates a warning under gcc.
+Instead you need:
+
+\code
+   wxString Message( wxT("Hello" )); 
+   wxString Temp = wxString::Format(wxT("Your said %s in your message"), Message.c_str() );
+\endcode
+   
+   
+\section ForwardEnums Forward Declared Enums
+
+Microsoft Visual C++ allows you to write code like this in a header file:
+
+\code
+// WRONG
+enum MyEnum;
+\endcode
+
+That is, you can forward declare an enum just as you can forward 
+declare a class.  This is not portable.  The alternative is to include
+a header file containing the full enum definition.
+
+\code
+#include "MyEnum.h"
+\endcode
+
+
+
+*//*****************************************************************/
diff --git a/dox2-src/InsideNyquist.dox2 b/dox2-src/InsideNyquist.dox2
new file mode 100644
index 0000000..7013795
--- /dev/null
+++ b/dox2-src/InsideNyquist.dox2
@@ -0,0 +1,18 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  InsideNyquist.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\page InsideNyquist Inside Nyquist
+
+\section NyquistIntro Introduction
+
+Nyquist is a LISP interpreter, based on XLISP.
+
+
+*//********************************************************************/
\ No newline at end of file
diff --git a/dox2-src/MainPage.dox2 b/dox2-src/MainPage.dox2
new file mode 100644
index 0000000..e5b6c1b
--- /dev/null
+++ b/dox2-src/MainPage.dox2
@@ -0,0 +1,56 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  MainPage.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\mainpage Audacity Index Page
+
+\section intro_sec Introduction
+
+Audacity is a free, easy-to-use audio editor and recorder for Windows, 
+Mac OS X, GNU/Linux, and other operating systems.
+
+\section license License
+
+Audacity is free software, developed by a group of volunteers and 
+distributed under the GNU General Public License (GPL).  See
+License.txt for details.
+
+Free software is not just free of cost (like &quot;free beer&quot;). 
+It is free as in freedom (like &quot;free speech&quot;). 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 Free Software Foundation.
+
+Programs like Audacity are also called open source software, because their 
+source code is available for anyone to study or use. There are thousands of 
+other free and open source programs, including the Mozilla web browser, the 
+OpenOffice.org office suite, and entire Linux-based operating systems.
+
+\section src_code Understanding The Source Code
+
+To understand the GUI parts of Audacity, you will first need to familiarise 
+yourself with the wxWidgets toolkit. You will find \ref ShuttleSystem used very
+widely for user interface construction. See the classes in src/widgets
+for how we create new widgets of our own.
+
+ - A great deal of the Audio processing in Audacity is done using libraries of
+code such as libsndfile and allegro.  Some self contained audio functions
+can be found in src/effects, for example EffectEcho and its accompanying
+dialog EchoDialog.
+ - The BlockFile system is central to how Audacity allows cut and paste
+of audio to be performed efficiently.  It works closely with the DirManager
+class.
+
+Also look at the overview pages in the Doxygen documentation, which cover 
+special topics.
+
+*//**************************************************************************/
+
+
+
+
diff --git a/dox2-src/OtherHeaders.dox2 b/dox2-src/OtherHeaders.dox2
new file mode 100644
index 0000000..8547fbf
--- /dev/null
+++ b/dox2-src/OtherHeaders.dox2
@@ -0,0 +1,122 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  OtherHeaders.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\page OtherHeaders Other Headers
+
+\section OtherHeadersIntro Introduction
+
+Some of the header files contained in the Audacity source directory 
+are headers for linkage with other modules.
+
+ - lapspa.h provides the API for Linux Audio Plugins Architecture.
+
+*//*****************************************************************//**
+
+\class _LADSPA_PortRangeHint
+\brief _LADSPA_PortRangeHint is a structure that gives parameter 
+validation information for a LADSPA (Linux Audio Plugin Architecture) 
+plug in effect.  
+
+For example it can indicate that a value (called a 
+'Port' in LADSPA terminology) has a logarithmic scale, and what its 
+upper and lower bounds are.
+
+*//*****************************************************************//**
+
+\class _LADSPA_Descriptor
+\brief _LADSPA_Descriptor is a structure that provides the API to a 
+LADSPA (Linux Audio Plugin Architecture) Effect.  
+
+It specifies how many parameters there are and the callback to run 
+the effect, amongst other properties.
+
+*//*****************************************************************//**
+
+\class BE_CONFIG
+\brief BE_CONFIG is a structure defined in the Blade DLL Interface 
+for LAME (MP3 Conversion DLL).
+
+*//*****************************************************************//**
+
+\class BE_VERSION
+\brief BE_VERSION is a structure defined in the Blade DLL Interface 
+for LAME (MP3 Conversion DLL).
+
+*//*****************************************************************//**
+
+\class lame_global_flags
+\brief struct with zillion of control parameters that control
+lame export (MP3 Conversion DLL).
+
+*//*****************************************************************//**
+
+\class mad_bitptr
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_decoder
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_frame
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_header
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_pcm
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_stream
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_synth
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class mad_timer_t
+\brief struct in the MPEG library, used for MP3 compression by 
+MP3Exporter
+
+*//*****************************************************************//**
+
+\class wxTreebook
+\brief A wxTreebook is a class like wxNotebook, but not yet supported
+by wxWidgets 2.6.3
+
+*//*****************************************************************//**
+
+\class wxTreebookItemData
+\brief One item in a wxTreebook.  (I think)
+
+*//*******************************************************************/
+
+
+
+
+
diff --git a/dox2-src/ShuttleSystem.dox2 b/dox2-src/ShuttleSystem.dox2
new file mode 100644
index 0000000..4143083
--- /dev/null
+++ b/dox2-src/ShuttleSystem.dox2
@@ -0,0 +1,179 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  ShuttleSystem.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\page ShuttleSystem The Shuttle System
+
+\section ShuttleIntro Introduction
+
+The classes ShuttleGui, ShuttleCli, ShuttleGuiBase and Shuttle were 
+designed to simplify repetitive code that moves data around.  Common
+repetitive tasks in Audacity are creating dialogs, moving data in and 
+out of dialogs and converting from binary to text formats.
+
+\section ShuttleSplit ShuttleGui Vs ShuttleGuiBase
+
+ShuttleGuiBase is slated for \ref WidgetMigration . It contains functions
+that work with widgets that are in wxWidgets.  The derived class, 
+ShuttleGui, contains extensions that are specific to Audacity widgets.  
+It isn't slated for widget migration.
+
+\section ShuttleGuiInit Initialising ShuttleGui
+
+A common idiom in using the ShuttleGui is as follows  - this example 
+comes from AudioIOPrefs::Populate() :
+
+\code
+   // Code is from a dialog class, so 'this' is a pointer to the dialog
+   ShuttleGui S(this, eIsCreatingFromPrefs); // Create the shuttle.
+   PopulateOrExchange(S); // Use it.
+\endcode
+
+\p S is a temporary object, only kept for as long as needed to actually do
+the one exchange.
+
+The first line creates and initialises the ShuttleGui object, setting it 
+up for creating a dialog's contents using information about initial values 
+from the global preferences.
+
+The \p PopulateOrExchange() function is here being used to populate the dialog.
+The same function can be called from elsewhere, later, with a different \p S to 
+exchange data.  
+
+The instance of ShuttleGui, \p S, shown in the example above isn't needed 
+after returning from \p PopulateOrExchange().
+
+\section ShuttleGuiMethods ShuttleGui Methods
+
+ShuttleGui has several kinds of methods.
+
+ - Layout methods like ShuttleGui::StartHorizontalLay(), used to start 
+ a piece of GUI that is to be laid out horizontally.  Use 
+ ShuttleGui::EndHorizontalLay() to end such a section.  This is a simple 
+ wrapper for the wxWidgets wxBoxSizer.  It has the advantage that the 
+ Shuttle keeps track of the sizer.  You do not need to.  You do not need
+ to provide a name for the sizer.  This shortens the code.  
+
+\code
+   // Example of using a Start/End pair
+   S.StartHorizontalLay()
+   {
+   ... Add controls that you want in the horizontal layout
+   }
+   S.EndHorizontalLay()
+\endcode
+
+The \p { \p } braces are optional, just add them where they improve
+readability.
+
+
+ - \p Add methods, like ShuttleGui::AddCheckBox().  This adds the check box 
+ and returns a pointer to it.  You use \p Add methods when you don't want
+ ShuttleGui to handle the data exchange.  It just creates the control and
+ adds it into the current sizer.
+
+\code
+  // Example of calling an Add method
+      S.AddChoice( _("Script:"),_("(a) Basic Operation"), &mScripts );
+\endcode
+
+ - \p Tie methods, like ShuttleGui::TieCheckBox().  This creates the check 
+ box as above, returning a pointer to it.  It also facilitates 
+ exchange of data with the control.
+
+\code
+  // Example of calling a Tie method
+      S.TieChoice( _("Device:"), mDevice,
+         wxT(""), mmPlayNames, mmPlayLabels );
+\endcode
+
+So \p Tie methods and \p Add methods are very similar.  The \p Tie 
+methods have more parameters to them.  You have to specify what you 
+are exchanging with.  There are many name overloaded variants on \p Tie 
+methods to suit different circumstances.  Exchanging an integer with 
+a text box uses a different overload to exchanging a string with the text box.
+
+In the example above, \p mDevice is a \p wxString variable passed by reference
+to the function.  This allows ShuttleGui both to read and write to it.  Which
+happens depends on how \p S has been configured.
+
+With both \p Add and \p Tie you can optionally specify a windows Id.  Use code
+like the following:
+
+\code
+   // Example of using a windows Id that we chose.  
+   S.Id( idSplashScreen ).TieCheckBox( _("Show Splash Screen"),
+      wxT("\Inits\Splash"), true );
+\endcode
+
+Where you don't specify an Id, ShuttleGui will assign the Id's sequentially.  
+
+\section ShuttleGuiLayoutTips ShuttleGui Layout Tips
+
+ShuttleGui wraps wxWidget sizers, and the wxWidgets sizer system can sometimes 
+itself be confusing.  The most common problem is finding that controls don't
+resize at all for some reason.
+
+Resizing requires that 'stretchiness' propogate all the way down from the 
+ultimate parent window.  Any sizers that is not using \p wxEXPAND will cause
+everything within in it to retain the size it had when the GUI was created,
+i.e. it will not resize when the window does.  A very common idiom is to
+use \p wxEXPAND but with an expand proportion of '0'.  That still allows 
+expansion but <b>not</b> in the main direction.  By contrast using 
+\p wxALIGN_LEFT prevents expansion in either direction.
+
+Many of the \p Add and \p Tie functions are designed with a two column layout in 
+mind.  So use an idiom like this:
+
+\code
+   // The '1' in the next line indicates a resizable wxStaticBox.
+   S.StartStatic( _("Recording"), 1 );
+   {
+      S.StartTwoColumn();
+      S.TieChoice( _("Device:"), wxT("RecordingDevice"), 
+         wxT(""), mmPlayNames, mmPlayLabels );
+      S.TieChoice( _("Channels:"), wxT("RecordChannels"), 
+         wxT("2"), mmChannelNames, mmChannelLabels );
+      S.EndTwoColumn();
+   }
+\endcode
+
+The prompts \p 'Device:' and \p 'Channels:' will land in the first column and the
+actual choice controls will land in the second column.  All of this is 
+inside a \p wxStaticBox with the name \p 'Recording' on it.
+
+To make the choice controls stretch when the \p wxStaticBox grows or shrinks, 
+adjust the code to read:
+
+\code
+
+   // This idiom may be simplified when new functions are added to ShuttleGui
+   S.StartStatic( _("Recording"), 1 );
+   {
+      S.StartMultiColumn(2, wxEXPAND);
+      S.SetStretchyCol(1);
+      S.TieChoice( _("Device:"), wxT("RecordingDevice"), 
+         wxT(""), mmPlayNames, mmPlayLabels );
+      S.TieChoice( _("Channels:"), wxT("RecordChannels"), 
+         wxT("2"), mmChannelNames, mmChannelLabels );
+      S.EndMultiColumn();
+   }
+\endcode
+
+
+\section ShuttleGuiInternals ShuttleGui Internals
+
+ShuttleGui cleans up the classes which use it.  Parts of its own internal
+code are quite repetitive, doing the same thing for different widgets with
+slightly different options - e.g. a wxTextCtrl with an integer value or with
+a string.  To make the internals of ShuttleGui cleaner, it uses class 
+WrappedType.  Also compound functions are formed by chaining
+together shorter functions.  This makes it much easier to add new options.
+
+*//********************************************************************/
\ No newline at end of file
diff --git a/dox2-src/Themability.dox2 b/dox2-src/Themability.dox2
new file mode 100644
index 0000000..583f27d
--- /dev/null
+++ b/dox2-src/Themability.dox2
@@ -0,0 +1,251 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  Themability.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\page Themability Themability of Audacity
+
+\section ThemeIntro Introduction
+
+Audacity is Themable.  That means the images, colours and fonts can be
+changed at run time, and pre-built combinations can be loaded when the
+program starts.
+
+A sample of the saved ImageCache is shown here, hover over any 
+part to see its name (if there is no image shown here, you will need
+to add the image ImageCache.png into the html directory):
+
+\htmlonly
+<img src="ImageCache.png" width=192 height=584 usemap="#map1" align="left" hspace="10">
+<map name="map1">
+<area title="Bitmap:Pause" shape=rect coords="0,0,15,15">
+<area title="Bitmap:PauseDisabled" shape=rect coords="0,16,15,31">
+<area title="Bitmap:Play" shape=rect coords="16,0,31,15">
+<area title="Bitmap:PlayDisabled" shape=rect coords="16,16,31,31">
+<area title="Bitmap:Loop" shape=rect coords="32,0,47,15">
+<area title="Bitmap:LoopDisabled" shape=rect coords="32,16,47,31">
+<area title="Bitmap:Stop" shape=rect coords="48,0,63,15">
+<area title="Bitmap:StopDisabled" shape=rect coords="48,16,63,31">
+<area title="Bitmap:Rewind" shape=rect coords="64,0,79,15">
+<area title="Bitmap:RewindDisabled" shape=rect coords="64,16,79,31">
+<area title="Bitmap:FFwd" shape=rect coords="80,0,95,15">
+<area title="Bitmap:FFwdDisabled" shape=rect coords="80,16,95,31">
+<area title="Bitmap:Record" shape=rect coords="96,0,111,15">
+<area title="Bitmap:RecordDisabled" shape=rect coords="96,16,111,31">
+<area title="Bitmap:CleanSpeech" shape=rect coords="112,0,127,15">
+<area title="Bitmap:CleanSpeechDisabled" shape=rect coords="112,16,127,31">
+<area title="Bitmap:ToolBarToggle" shape=rect coords="0,32,42,66">
+<area title="Bitmap:ToolBarTarget" shape=rect coords="43,32,59,57">
+<area title="Bitmap:ToolBarGrabber" shape=rect coords="60,32,76,39">
+<area title="Bitmap:UpButton" shape=rect coords="0,67,47,114">
+<area title="Bitmap:DownButton" shape=rect coords="48,67,95,114">
+<area title="Bitmap:HiliteButton" shape=rect coords="96,67,143,114">
+<area title="Bitmap:RecolouredUpButton" shape=rect coords="144,67,191,114">
+<area title="Bitmap:RecolouredDownButton" shape=rect coords="0,115,47,162">
+<area title="Bitmap:RecolouredHiliteButton" shape=rect coords="48,115,95,162">
+<area title="Bitmap:IBeamCursor" shape=rect coords="0,163,31,194">
+<area title="Bitmap:DrawCursor" shape=rect coords="0,195,31,226">
+<area title="Bitmap:EnvCursor" shape=rect coords="32,163,63,194">
+<area title="Bitmap:TimeCursor" shape=rect coords="32,195,63,226">
+<area title="Bitmap:ZoomInCursor" shape=rect coords="64,163,95,194">
+<area title="Bitmap:ZoomOutCursor" shape=rect coords="64,195,95,226">
+<area title="Bitmap:LabelCursorLeft" shape=rect coords="96,163,127,194">
+<area title="Bitmap:LabelCursorRight" shape=rect coords="96,195,127,226">
+<area title="Bitmap:DisabledCursor" shape=rect coords="128,163,159,194">
+<area title="Bitmap:Cut" shape=rect coords="0,227,25,250">
+<area title="Bitmap:CutDisabled" shape=rect coords="0,251,25,274">
+<area title="Bitmap:Copy" shape=rect coords="26,227,51,250">
+<area title="Bitmap:CopyDisabled" shape=rect coords="26,251,51,274">
+<area title="Bitmap:Paste" shape=rect coords="52,227,77,250">
+<area title="Bitmap:PasteDisabled" shape=rect coords="52,251,77,274">
+<area title="Bitmap:Trim" shape=rect coords="78,227,103,250">
+<area title="Bitmap:TrimDisabled" shape=rect coords="78,251,103,274">
+<area title="Bitmap:Silence" shape=rect coords="104,227,129,250">
+<area title="Bitmap:SilenceDisabled" shape=rect coords="104,251,129,274">
+<area title="Bitmap:Undo" shape=rect coords="130,227,155,250">
+<area title="Bitmap:UndoDisabled" shape=rect coords="130,251,155,274">
+<area title="Bitmap:Redo" shape=rect coords="156,227,181,250">
+<area title="Bitmap:RedoDisabled" shape=rect coords="156,251,181,274">
+<area title="Bitmap:ZoomFit" shape=rect coords="0,275,26,301">
+<area title="Bitmap:ZoomFitDisabled" shape=rect coords="0,302,26,328">
+<area title="Bitmap:ZoomIn" shape=rect coords="27,275,53,301">
+<area title="Bitmap:ZoomInDisabled" shape=rect coords="27,302,53,328">
+<area title="Bitmap:ZoomOut" shape=rect coords="54,275,80,301">
+<area title="Bitmap:ZoomOutDisabled" shape=rect coords="54,302,80,328">
+<area title="Bitmap:ZoomSel" shape=rect coords="81,275,107,301">
+<area title="Bitmap:ZoomSelDisabled" shape=rect coords="81,302,107,328">
+<area title="Bitmap:IBeam" shape=rect coords="108,275,134,301">
+<area title="Bitmap:Zoom" shape=rect coords="108,302,134,328">
+<area title="Bitmap:Envelope" shape=rect coords="135,275,161,301">
+<area title="Bitmap:TimeShift" shape=rect coords="135,302,161,328">
+<area title="Bitmap:Draw" shape=rect coords="162,275,188,301">
+<area title="Bitmap:Multi" shape=rect coords="162,302,188,328">
+<area title="Bitmap:Mic" shape=rect coords="0,329,24,353">
+<area title="Bitmap:Speaker" shape=rect coords="25,329,49,353">
+<area title="Bitmap:Up" shape=rect coords="0,354,26,380">
+<area title="Bitmap:Down" shape=rect coords="27,354,53,380">
+<area title="Bitmap:Hilite" shape=rect coords="54,354,80,380">
+<area title="Bitmap:PostfishHome" shape=rect coords="81,354,99,370">
+<area title="Bitmap:PostfishFastRewind" shape=rect coords="100,354,116,370">
+<area title="Bitmap:PostfishRewind" shape=rect coords="117,354,134,370">
+<area title="Bitmap:PostfishPlay" shape=rect coords="135,354,163,370">
+<area title="Bitmap:PostfishForward" shape=rect coords="164,354,181,370">
+<area title="Bitmap:PostfishFastForward" shape=rect coords="0,381,16,397">
+<area title="Bitmap:PostfishEnd" shape=rect coords="17,381,35,397">
+<area title="Bitmap:PostfishLoop" shape=rect coords="36,381,64,397">
+<area title="Colour:Blank" shape=rect coords="0,398,9,407">
+<area title="Colour:Unselected" shape=rect coords="10,398,19,407">
+<area title="Colour:Selected" shape=rect coords="20,398,29,407">
+<area title="Colour:Sample" shape=rect coords="30,398,39,407">
+<area title="Colour:SelSample" shape=rect coords="40,398,49,407">
+<area title="Colour:DragSample" shape=rect coords="50,398,59,407">
+<area title="Colour:MuteSample" shape=rect coords="60,398,69,407">
+<area title="Colour:Rms" shape=rect coords="70,398,79,407">
+<area title="Colour:MuteRms" shape=rect coords="80,398,89,407">
+<area title="Colour:Shadow" shape=rect coords="90,398,99,407">
+</map>
+\endhtmlonly
+
+ThemeBase provides most of the implementation of Themes.  It is destined for 
+\ref WidgetMigration.   Theme is Audacity's variant of a class derived 
+from ThemeBase.  It contains the Audacity specific list of icons and images
+and overloads for the required virtual functions.  A singleton instance, 
+\p theTheme is created by Audacity.
+
+Another class, ThemePrefs, provides the GUI for loading and saving theme 
+information.
+
+<hr>
+
+\section RepresentationOfIcons The Different Ways Theme Images are Stored 
+
+Audacity includes a system for loading and saving different icons and 
+colours.
+
+There are three formats:
+ - Images stored combined into one PNG file.
+ - Images stored as individual PNG files.
+ - The PNG file as a file of comma separated numbers.
+ 
+The first form is the one usually used.  It is useful for designers 
+making systematic changes of the images, particularly systematic 
+colour changes.  It is also convenient for archives containing many 
+themes and for sharing of themes.  However it is inconvenient when 
+there are additions to and removals from the image set used in 
+Audacity, as can happen between versions.  A combined PNG made 
+for one version of Audacity may no longer be suitable for the next 
+version.
+
+Storing as individual images solves that problem and makes it easier
+for a designer to change just one image.  In CVS we check in the 
+individual images.
+
+The third form allows Audacity to store the combined PNG in 'C' format
+for use in the exe.  It is only ever used by developers.  It is this 
+third form that provides the built in defaults in Audacity.
+
+\attention The button to save a theme in the 'C' format is only 
+provided in debug builds. 
+
+<hr>
+
+\section ThemesChoosingVersion How Audacity Chooses Which Version Of The images To Use?  
+
+At the time of writing this document, Audacity also has a deprecated system
+for its images where they initially start out with contents determined by
+XPMs built into the program.  
+
+The current algorithm for determining which image to use is:
+  - IF loading the theme at start up is disabled, use the XPM defaults.
+  - ELSE if the image cache is available THEN use it.
+  - ELSE use the built in ' ThemeAsCeeCode.h ' defaults.
+
+This is handled in function \ref ThemeBase::LoadThemeAtStartUp().  Once the 
+deprecated XPMs have been removed, we wil switch over to using the built 
+in 'ThemeAsCeeCode.h' defualts where we currently use the XPM defaults.
+
+
+
+
+<hr>
+
+\section ChangingTheColourScheme Changing The Colour Scheme
+
+To change the colour scheme:
+
+ - Run the program and use the 'Save Theme' button on the ThemePrefs panel.  
+This saves all the images as a single .png file, ImageCache.png.
+ - Use the GIMP to modify the colours in ImageCache.png.  Using the colour 
+balance feature provides a nice way to make a systematic change.  Note in 
+particular near the end of the image a row of small squares.  These are 
+used for colours such as the colours in the waveform.
+ - Use the 'Load Theme' button on the ThemePrefs panel to accept the 
+changes.
+ - Check the 'Load Theme At Startup' check box so that the theme will be 
+loaded next time you start Audacity.
+
+<hr>
+
+\section AddingNewImages Adding New Images
+
+To add a new image to Audacity, add a blank place holder for the image into
+the program like so:
+
+\code
+	IMAGE( bmpSomeNewImage, wxBitmap(64,64), wxT("SomeNewImage") )
+\endcode
+
+This reserves a 64 x 64 pixel bitmap.  You can now refer to it from within the 
+program using bmpSomeNewImage.  If you add images on to the end of the list 
+you will generally have the least problems with compatability of versions.  
+If you are adding many images, the most efficient packing of images occurs 
+when the images are added in tallest-first order since Audacity starts a new
+row whenever the height increases.
+
+Having defined the new image, follow these steps:
+
+ - Compile Audacity in debug mode.
+ - Run the program and use the 'Save Components' button on the 
+ThemePrefs panel.  This saves all the images as .png files, including 
+a blank image for your new image.  
+ - Replace that .png file with the image you want to use.
+ - Press the 'Load Components' button on the ThemPrefs panel.
+ - Press the 'Save Theme' button on the ThemePrefs panel.  You now have
+a composite .png file that includes your image.
+ - Press the 'Output Sourcery' button on the Theme prefs panel.  This
+generates a new data file, ThemeAsCeeCode.h, which can be used for defaults.
+ - Replace the existing ThemeAsCeeCode.h in the Audacity source code
+and recompile.  You should now have a version of Audacity with the new
+.png as a built in default.
+ 
+Audacity will now be using the image.  
+
+ - When you come to check in the updated code into CVS, including 
+ThemeAsCeeCode.h, remember to also add your new .png image into CVS 
+too.
+
+<hr>
+
+\section RescuingDefaultImages Rescuing Default Images
+
+It is possible to completely screw up the built in default images 
+through using an incorrect ThemeAsCeeCode.h.  A correct ThemeAsCeeCode.h
+can be regenerated as follows:
+
+ - Retrieve a correct set of images from CVS and place them in the 
+components directory used by Audacity.
+ - Compile Audacity in debug mode.
+ - Use ThemePrefs 'Load Components' to load the correct set of images.
+ - Press the 'Output Sourcery' button on the Theme prefs panel.  This
+generates a corrected ThemeAsCeeCode.h using the images you just loaded.
+ - Replace the existing ThemeAsCeeCode.h in the Audacity source code
+and recompile.  
+
+
+
+*//********************************************************************/
\ No newline at end of file
diff --git a/dox2-src/WidgetMigration.dox2 b/dox2-src/WidgetMigration.dox2
new file mode 100644
index 0000000..5a0a196
--- /dev/null
+++ b/dox2-src/WidgetMigration.dox2
@@ -0,0 +1,52 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  WidgetMigration.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\page WidgetMigration Migration of Generic Code To wxWidgets
+
+\section MigrationIntro Introduction
+
+Some of the code in Audacity may in time migrate into the wxWidgets
+library.  It is both in Audacity's interests and wxWidgets interests
+that this kind of code migration be possible.
+
+\section MigrationHow How This is Being Done
+
+To facilitate this some generic parts of Audacity are being written with
+the wxWindows license, rather than with the GPL.  There are many ways this
+can be achieved and stay within both the spirit and letter of the GPL.
+The most clearcut way is to actually compile the migratable code in a
+separate intermediate wxWindows licensed library that is then linked with 
+wxWidgets and the GPL'ed Audacity code.  Another approach is as each 
+source file is created, release it under the wxWindows license.  It is
+automatically then also a GPL compatible file, and it is a GPL licensed 
+version that is linked in to the exe.  The wxWindows licensed version
+is still available from our CVS.  This is what we are doing.  We require 
+that developers checking in changes into Audacity CVS for these files 
+authorise their changes to be used under the wxWindows license.  Of 
+course anyone is free to use these dual-licensed files under the GPL 
+instead.  They may also choose to make their changes GPL only, but in that 
+case they may not check their changes back into our CVS.
+
+\section MigrationItems Code Slated For Migration
+
+Some examples of code that is slated for wxWidgets migration:
+
+ - Theme code, see \ref Themability
+ - ShuttleGui code, see \ref ShuttleSystem
+ 
+The migration process is expected to be slow.  It may be several years 
+before we formally offer some of the code to wxWidgets.  We want to 
+contribute mature  well tested code, complete with doucmentation demo 
+sample code etc.  We  want the code for migration to be of a maturity 
+suitable for inclusion in the default wxWidgets distribution from the 
+start, in the same way that optional sub libraries like the PNG library 
+are included, rather  than as a contrib.
+
+*//********************************************************************/
\ No newline at end of file
diff --git a/dox2-src/WxWishlist.dox2 b/dox2-src/WxWishlist.dox2
new file mode 100644
index 0000000..5c5b0a4
--- /dev/null
+++ b/dox2-src/WxWishlist.dox2
@@ -0,0 +1,73 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  WxWishlist.dox2
+
+  James Crook
+
+********************************************************************//**
+
+\page WxWishList WX Wish List
+
+\section WxWishlistIntro Introduction
+
+We're using this section to record requests for enhancements to 
+wxWidgets.  It's here in the documentation on the source code, because
+it indicates issues we have 'worked around' which we'd like a cleaner 
+solution to.
+
+\section WxWishlistTransparency Transparency, Masks, Alpha, wxImages and wxBitmaps
+
+At the time of writing, wxWidgets support for alpha-channel based 
+transparency is patchy.
+
+ - Support for masks, that is all or nothing transparency, is excellent.
+ - Support for alpha channel transparency, that is where values between
+ 0 and 255 let some but not all of the background show through, is 
+ incomplete.  It seems to be best supported on Windows, and least well
+ supported on Mac.
+
+Mask based transparency leads to sharp edges that look blocky and 'dated' on
+modern PC's - so we try to use alpha blending when we need transparency .
+
+Support for alpha blending in wxImage and wxBitmap is different.
+
+  - wxImage is a platform neutral image.  There are nice functions
+  for loading and saving PNGs with transparency to or from a wxImage.
+  These work on all platforms we use.
+  - wxBitmap is a platform specific 'image'.  To display an image it 
+  must at some point be converted to a wxBitmap.
+
+Now, a 32 bit wxBitmap has 24 bits for RGB and 8 bits for alpha.  Under
+WindowsXP you can paste wxBitmaps into a wxMemDc and preserve the alpha 
+channel.  However, when you convert to a wxImage, unless you use an 
+undocumented function which only works on WindowsXP, you lose it.  To 
+output a wxBitmap to a file you have to convert to a wxImage.
+
+The workarounds for the incomplete alpha-channel support can be found
+in \ref ImageManipulation.cpp .  Also, in implementing \ref Themability 
+we keep both wxImages and wxBitmaps to work around the conversion 
+problems.
+
+So, the wishlist item is for wxWidgets to sort this out!
+
+\section WxWishlistTreebook wxTreeBook 
+
+We know a wxTreeBook is coming in wxWidgets 2.7.0.  We're using 
+a contrib-version that works pretty well, but using it as 
+if it were a wxListBook.  We've tried using wxWidgets 2.6.3 
+undocumented versions of wxChoiceBook and wxListBook, and 
+in 2.6.3, neither is ready for prime time.
+
+We're looking forward to having a built in wxTreeBook.
+
+\section WxWishlist Docking And Layout System
+
+There are contrib directories that have partial implementations of
+Toolbar docking and layout.  Our own system is rather hacked together, 
+and just about meets our needs.  We'd like a full strength system built
+in to wxWidgets.
+
+
+*//********************************************************************/
\ No newline at end of file
diff --git a/dox2-src/examples.hh b/dox2-src/examples.hh
new file mode 100644
index 0000000..91eb4e1
--- /dev/null
+++ b/dox2-src/examples.hh
@@ -0,0 +1,22 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  examples.hh
+
+  James Crook
+
+********************************************************************//*
+
+JKC: This file is for the doxygen documentation system.
+We can use it for small example that have '/ *' style comments in 
+them, which cannot be included in Doxy documents otherwise.
+
+/*****************************************************************//*! 
+
+//First Example:
+
+   /* i18n-hint: One-letter abbreviation for Left, in VU Meter */
+   mLeftText = _("L");
+   /* i18n-hint: One-letter abbreviation for Right, in VU Meter */
+   mRightText = _("R");
diff --git a/help/audacity.1 b/help/audacity.1
index 450d95b..d0dd1db 100644
--- a/help/audacity.1
+++ b/help/audacity.1
@@ -6,17 +6,17 @@
 audacity \- Graphical cross-platform audio editor
 .SH SYNOPSIS
 .B audacity
--help
+\-help
 .br
 .B audacity
--version
+\-version
 .br
 
 .B audacity
-[-blocksize nnn] -test
+[\-blocksize nnn] \-test
 .br
 .B audacity
-[-blocksize nnn] [
+[\-blocksize nnn] [
 .I AUDIO-FILE
 ]
 .B ...
@@ -55,25 +55,25 @@ driven by a bash script will be much more powerful than audacity.
 
 .SH OPTIONS
 .TP 10
-\fB-help\fR
+\fB\-help\fR
 display a brief list of command line options
 .TP 10
-\fB-version\fR
+\fB\-version\fR
 display the audacity version number
 .TP 10
-\fB-test\fR
+\fB\-test\fR
 run self diagnostics tests (only present in development builds)
 .TP 10
-\fB-blocksize nnn\fR
+\fB\-blocksize nnn\fR
 set the audacity block size for writing files to disk to nnn bytes
 
 .SH FILES
-.I ~/.audacity-data/audacity.cfg
+.I ~/.audacity\-data/audacity.cfg
 .RS
 Per user configuration file.
 .RE
 
-.I /tmp/audacity-<user>/
+.I /tmp/audacity\-<user>/
 .RS
 Default location of Audacity's temp directory, where <user> is your
 username.  If this location is not suitable (not enough space in
@@ -104,7 +104,7 @@ environment variable will be searched before anywhere else.
 The current working directory when Audacity is started.
 .RE
 
-.I ~/.audacity-files
+.I ~/.audacity\-files
 
 .I <prefix>/share/audacity
 .RS
@@ -122,11 +122,11 @@ For localization files in particular (i.e. translations of Audacity
 into other languages), Audacity also searches
 .I <prefix>/share/locale
 
-.SH PLUG-INS
+.SH PLUG\-INS
 
 Audacity supports two types of plug-ins on Unix: LADSPA and Nyquist
 plug-ins.  These are generally placed in a directory called 
-.I plug-ins 
+.I plug\-ins 
 somewhere on the search path (see above).
 
 LADSPA plug-ins can either be in the plug-ins directory, or alternatively
diff --git a/lib-src/FileDialog/FileDialog.cpp b/lib-src/FileDialog/FileDialog.cpp
old mode 100755
new mode 100644
diff --git a/lib-src/FileDialog/FileDialog.h b/lib-src/FileDialog/FileDialog.h
old mode 100755
new mode 100644
diff --git a/lib-src/FileDialog/aclocal.m4 b/lib-src/FileDialog/aclocal.m4
deleted file mode 100644
index cabf275..0000000
--- a/lib-src/FileDialog/aclocal.m4
+++ /dev/null
@@ -1,210 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
diff --git a/lib-src/FileDialog/config.h b/lib-src/FileDialog/config.h
new file mode 100644
index 0000000..bf86160
--- /dev/null
+++ b/lib-src/FileDialog/config.h
@@ -0,0 +1 @@
+#define HAVE_GTK 1
diff --git a/lib-src/FileDialog/gtk/FileDialogPrivate.cpp b/lib-src/FileDialog/gtk/FileDialogPrivate.cpp
old mode 100755
new mode 100644
diff --git a/lib-src/FileDialog/gtk/FileDialogPrivate.h b/lib-src/FileDialog/gtk/FileDialogPrivate.h
old mode 100755
new mode 100644
diff --git a/lib-src/FileDialog/gtk/private.h b/lib-src/FileDialog/gtk/private.h
old mode 100755
new mode 100644
diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.cpp b/lib-src/FileDialog/mac/FileDialogPrivate.cpp
old mode 100755
new mode 100644
index c0c29db..85b4ce0
--- a/lib-src/FileDialog/mac/FileDialogPrivate.cpp
+++ b/lib-src/FileDialog/mac/FileDialogPrivate.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by: Leland Lucius
 // Created:     1998-01-01
-// RCS-ID:      $Id: FileDialogPrivate.cpp,v 1.3 2008/05/24 02:57:39 llucius Exp $
+// RCS-ID:      $Id: FileDialogPrivate.cpp,v 1.5 2009/01/15 00:13:04 llucius Exp $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 //
@@ -66,6 +66,7 @@ struct CustomData {
    wxString       defaultLocation;
    int            currentfilter;
    bool           saveMode;
+   bool           showing;
 };
 
 typedef struct CustomData
@@ -163,6 +164,7 @@ static void HandleCustomMouseDown(NavCBRecPtr callBackParms, CustomData *data)
                      }
 #endif
                   }
+                  NavCustomControl(callBackParms->context, kNavCtlBrowserRedraw, NULL);
                }
                
                break;
@@ -171,7 +173,6 @@ static void HandleCustomMouseDown(NavCBRecPtr callBackParms, CustomData *data)
             case kButton:
             {
                data->me->ClickButton(GetControl32BitValue(data->choice) - 1);
-               
                break;
             }
          }
@@ -244,6 +245,12 @@ static pascal void NavEventProc(NavEventCallbackMessage inSelector,
 			HandleNormalEvents(ioParams, data);
 			break;
       }
+         
+      case kNavCBTerminate:
+      {
+         data->showing = false;
+         break;
+      }
    }
 }
 
@@ -325,7 +332,6 @@ static Boolean CheckFile( const wxString &filename , OSType type , CustomDataPtr
    
    if ( data->extensions.GetCount() > 0 )
    {
-      //for ( int i = 0 ; i < data->numfilters ; ++i )
       int i = data->currentfilter ;
       if ( data->extensions[i].Right(2) == wxT(".*") )
          return true ;
@@ -352,9 +358,13 @@ static Boolean CheckFile( const wxString &filename , OSType type , CustomDataPtr
 
 // end wxmac
 
-FileDialog::FileDialog(wxWindow *parent, const wxString& message,
-                       const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
-                       long style, const wxPoint& pos)
+FileDialog::FileDialog(wxWindow *parent,
+                       const wxString& message,
+                       const wxString& defaultDir,
+                       const wxString& defaultFileName,
+                       const wxString& wildCard,
+                       long style,
+                       const wxPoint& pos)
 :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
 {
    wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
@@ -414,7 +424,6 @@ int FileDialog::ShowModal()
    wxMacCFStringHolder defaultFileName(m_fileName, m_font.GetEncoding());
    dialogCreateOptions.saveFileName = defaultFileName;
    
-   
    NavDialogRef dialog;
    NavObjectFilterUPP navFilterUPP = NULL;
    CustomData myData;
@@ -426,6 +435,7 @@ int FileDialog::ShowModal()
    myData.choice = NULL;
    myData.button = NULL;
    myData.saveMode = false;
+   myData.showing = true;
    
    Rect r;
    SInt16 base;
@@ -444,7 +454,7 @@ int FileDialog::ShowModal()
          ::AppendMenuItemTextWithCFString(myData.menu,
                                           wxMacCFStringHolder(myData.name[i],
                                                               m_font.GetEncoding()),
-                                          0,
+                                          4,
                                           i,
                                           NULL);
       }
@@ -479,8 +489,11 @@ int FileDialog::ShowModal()
    
    dialogCreateOptions.optionFlags |= kNavNoTypePopup;
    
-   if (m_dialogStyle & wxSAVE)
+   if (m_dialogStyle & wxFD_SAVE)
    {
+      dialogCreateOptions.modality = kWindowModalityWindowModal;
+      dialogCreateOptions.parentWindow = (WindowRef) GetParent()->MacGetTopLevelWindowRef();
+   
       myData.saveMode = true;
       
       if (!numFilters)
@@ -495,11 +508,12 @@ int FileDialog::ShowModal()
          dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
       
 #if TARGET_API_MAC_OSX
-      if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
+      if (!(m_dialogStyle & wxFD_OVERWRITE_PROMPT))
       {
          dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
       }
 #endif
+      
       err = ::NavCreatePutFileDialog(&dialogCreateOptions,
                                      // Suppresses the 'Default' (top) menu item
                                      kNavGenericSignature, kNavGenericSignature,
@@ -526,6 +540,31 @@ int FileDialog::ShowModal()
    if (err == noErr)
       err = ::NavDialogRun(dialog);
    
+   if (err == noErr)
+   {
+      WindowRef w = NavDialogGetWindow(dialog);
+      Rect r;
+      
+      // This creates our "fake" dialog with the same dimensions as the sheet so
+      // that Options dialogs will center properly on the sheet.  The "fake" dialog
+      // is never actually seen.
+      GetWindowBounds(w,kWindowStructureRgn, &r);
+      wxDialog::Create(NULL,  // no parent...otherwise strange things happen
+                       wxID_ANY,
+                       wxEmptyString,
+                       wxPoint(r.left, r.top),
+                       wxSize(r.right - r.left, r.bottom - r.top));
+      
+      BeginAppModalStateForWindow(w);
+      
+      while (myData.showing)
+      {
+         wxTheApp->MacDoOneEvent();
+      }
+      
+      EndAppModalStateForWindow(w);
+   }
+   
    // clean up filter related data, etc.
    if (navFilterUPP)
       ::DisposeNavObjectFilterUPP(navFilterUPP);
@@ -554,7 +593,7 @@ int FileDialog::ShowModal()
          if (err != noErr)
             break;
          
-         if (m_dialogStyle & wxSAVE)
+         if (m_dialogStyle & wxFD_SAVE)
             thePath = wxMacFSRefToPath( &theFSRef , navReply.saveFileName ) ;
          else
             thePath = wxMacFSRefToPath( &theFSRef ) ;
diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.h b/lib-src/FileDialog/mac/FileDialogPrivate.h
old mode 100755
new mode 100644
diff --git a/lib-src/FileDialog/win/FileDialogPrivate.cpp b/lib-src/FileDialog/win/FileDialogPrivate.cpp
old mode 100755
new mode 100644
index ba7db97..64bf76c
--- a/lib-src/FileDialog/win/FileDialogPrivate.cpp
+++ b/lib-src/FileDialog/win/FileDialogPrivate.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Leland Lucius
 // Created:     01/02/97
-// RCS-ID:      $Id: FileDialogPrivate.cpp,v 1.13 2008/10/17 10:14:24 l_r_nightmare Exp $
+// RCS-ID:      $Id: FileDialogPrivate.cpp,v 1.14 2008/11/08 21:00:26 llucius Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 //
@@ -82,6 +82,76 @@ static wxRect gs_rectDialog(0, 0, 428, 266);
 IMPLEMENT_CLASS(FileDialog, wxFileDialogBase)
 
 // ----------------------------------------------------------------------------
+// Alternative implementation for SHBindToParent() since older
+// shell32.dll version do not supply it.
+//
+// By jim at mvps.org
+// http://www.geocities.com/SiliconValley/2060/
+// ----------------------------------------------------------------------------
+
+#include <ShlObj.h>
+#include <ComDef.h>
+
+HRESULT SHBindToParentLocal(
+                       LPCITEMIDLIST pidl,
+                       REFIID riid,
+                       VOID** ppv,
+                       LPCITEMIDLIST* ppidlLast)
+{
+   if (!ppv)
+      return E_POINTER;
+
+   // There must be at least one item ID.
+   if (!pidl || !pidl->mkid.cb)
+      return E_INVALIDARG;
+
+   // Get the root folder.
+   IShellFolderPtr desktop;
+   HRESULT hr = SHGetDesktopFolder(&desktop);
+   if (FAILED(hr))
+      return hr;
+
+   // Walk to the penultimate item ID.
+   LPCITEMIDLIST marker = pidl;
+   for (;;)
+   {
+      LPCITEMIDLIST next = reinterpret_cast<LPCITEMIDLIST>(
+         marker->mkid.abID - sizeof(marker->mkid.cb) + marker->mkid.cb);
+      if (!next->mkid.cb)
+         break;
+      marker = next;
+   };
+
+   if (marker == pidl)
+   {
+      // There was only a single item ID, so bind to the root folder.
+      hr = desktop->QueryInterface(riid, ppv);
+   }
+   else
+   {
+      // Copy the ID list, truncating the last item.
+      int length = marker->mkid.abID - pidl->mkid.abID;
+      if (LPITEMIDLIST parent_id = reinterpret_cast<LPITEMIDLIST>(
+         malloc(length + sizeof(pidl->mkid.cb))))
+      {
+         LPBYTE raw_data = reinterpret_cast<LPBYTE>(parent_id);
+         memcpy(raw_data, pidl, length);
+         memset(raw_data + length, 0, sizeof(pidl->mkid.cb));
+         hr = desktop->BindToObject(parent_id, 0, riid, ppv);
+         free(parent_id);
+      }
+      else
+         return E_OUTOFMEMORY;
+   }
+
+   // Return a pointer to the last item ID.
+   if (ppidlLast)
+      *ppidlLast = marker;
+
+   return hr;
+}
+
+// ----------------------------------------------------------------------------
 // hook function for moving the dialog
 // ----------------------------------------------------------------------------
 
@@ -224,7 +294,7 @@ void FileDialog::FilterFiles(HWND hDlg)
       // Retrieve the IShellFolder interface of the parent (must be Release()'d)
       if (ishell == NULL)
       {
-         hr = SHBindToParent(fidl, IID_IShellFolder, (void **)&ishell, NULL);
+         hr = SHBindToParentLocal(fidl, IID_IShellFolder, (void **)&ishell, NULL);
          if (!SUCCEEDED(hr))
          {
             wxASSERT(SUCCEEDED(hr));
diff --git a/lib-src/FileDialog/win/FileDialogPrivate.h b/lib-src/FileDialog/win/FileDialogPrivate.h
old mode 100755
new mode 100644
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 2ba230c..c2f75e8 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -55,10 +55,14 @@ libnyquist.a: libnyquist-recursive
 	ln -sf libnyquist/libnyquist.a libnyquist.a
 
 # libvamp
-libvamp-recursive:
-	$(MAKE) -C libvamp
-libvamp-hostsdk.a: libvamp-recursive
-	ln -sf libvamp/vamp-sdk/libvamp-hostsdk.a libvamp-hostsdk.a
+#
+# The reason for the "sdkstatic" is that's all that we really need
+# and it circumvents an issue when building on OSX...the makefile
+# has different options for OSX, but they aren't configurable via
+# the configure script.
+#
+vamp-sdk:
+	$(MAKE) -C libvamp sdkstatic
 
 # redland
 redland-recursive:
@@ -120,6 +124,12 @@ libsndfile-recursive:
 libsndfile.a: libsndfile-recursive
 	ln -sf libsndfile/src/.libs/libsndfile.a libsndfile.a
 
+# SBSMS
+sbsms-recursive:
+	$(MAKE) -C sbsms
+libsbsms.a: sbsms-recursive
+	ln -sf sbsms/src/.libs/libsbsms.a .
+
 # SoundTouch
 soundtouch-recursive:
 	$(MAKE) -C soundtouch
@@ -180,6 +190,7 @@ clean:
 	-$(MAKE) -C portmixer clean
 	-$(MAKE) -C portmixer/px_unix_oss clean
 	-$(MAKE) -C portmixer/px_mac_core clean
+	-$(MAKE) -C sbsms clean
 	-$(MAKE) -C soundtouch clean
 	-$(MAKE) -C twolame clean
 	-rm -rf @LOCAL_LIBS@
@@ -207,16 +218,17 @@ distclean:
 	-$(MAKE) -C portmixer distclean
 	-$(MAKE) -C portmixer/px_unix_oss distclean
 	-$(MAKE) -C portmixer/px_mac_core distclean
+	-$(MAKE) -C sbsms distclean
 	-$(MAKE) -C soundtouch distclean
 	-$(MAKE) -C twolame distclean
 	-rm -f @LOCAL_LIBS@
 
 # list here all the targets that aren't actually files to be made
-.PHONY: portsmf eexpat-recursive FileDialog-recursive \
+.PHONY: portSMF eexpat-recursive FileDialog-recursive \
 		widgetextra libogg-recursive \
 	libvorbis-recursive libnyquist-recursive libmad-recursive \
-	libid3tag-recursive soundtouch-recursive libsndfile-recursive \
-	libresample-recursive libsamplerate-recursive libvamp-recursive \
+	libid3tag-recursive sbsms-recursive soundtouch-recursive libsndfile-recursive \
+	libresample-recursive libsamplerate-recursive vamp-sdk \
 	portaudio-v19-recursive portmixer-recursive libtwolame-recursive \
 	liblrdf-recursive redland-recursive slv2-recursive
 
diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt
index 56f43d7..e5a7a81 100644
--- a/lib-src/audacity-patches.txt
+++ b/lib-src/audacity-patches.txt
@@ -51,6 +51,10 @@ Upstream version: 1.2.1
 libid3tag
 ---------
 MP3 tag manipulation library. Comes with libmad (below)
+arguments ([-Wall foreign]) added to AM_INIT_AUTOMAKE to avoid autoreconf
+failures
+arguments (--no-verify) removed from ltconfig execution to prevent configure
+failures
 
 libmad
 ------
@@ -61,6 +65,8 @@ Patches: libmad-mp2-out-of-spec.patch:	Import some forms of MP2 file that are
 theoretically out of spec but in practise work fine (msmeyer)
 osx-universal-build.patch: Makes build work on OS X for universal binary by
 using compiler-defined symbols for targets as well as hosts.
+autotools.patch:			Update to autotools to work with recent auto{conf,
+make}
 Upstream version: 0.15.1 (beta)
 
 libnyquist
@@ -72,6 +78,8 @@ libogg
 library to handle Xiph.org's open multimedia container format
 Version in Audacity CVS: 1.1.3
 Patches: None, except docs build disabled in Makefile.am
+/usr/share/aclocal/libtool.m4 copied to acinclude.m4 (working round not having
+an m4 directory in the package for libtool files)
 Upstream Version: 1.1.3
 
 libresample
@@ -85,6 +93,8 @@ in release builds, could probably be removed altogther except for comparision
 purposes.
 Version in Audacity CVS: 0.1.2
 Patches: ??
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
 Upstream Version: 0.1.2
 
 libsndfile
@@ -94,16 +104,23 @@ to audacity.
 Version in Audacity CVS: 1.0.17
 Patches:  wav-bext.patch: backport patch from 1.0.18 of a patch to fix reading
 bext chunks in WAV files
+		  update-autotools.patch: backport patch from 1.0.18pre25 to use an M4
+		  directory for m4 macro files, and other changes so that the source
+		  tree will take libtoolise --copy --force; aclocal -I M4 --install;
+		  autoreconf and generate a working build system on any reasonably
+		  sensible host.
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
 Upstream Version: 1.0.17
 TODO: upgrade to 1.0.18 when it comes out in order to drop the bext patch
 
 libvamp
 -------
 Library to load and use VAMP plug-ins. http://www.vamp-plugins.org/
-Version in Audacity CVS: 1.2
-Patches: correct-includes.patch: Adds more C++ includes needed to keep gcc
-			4.3.1 happy. In upstream CVS
-Upstream Version: 1.2
+Version in Audacity CVS: 2.0
+Patches: optional-progs.patch: Make building the Vamp host (and so the
+dependecy on libsndfile) optional rather than mandatory
+Upstream Version: 2.0
 
 libvorbis
 ---------
@@ -116,6 +133,13 @@ no-docs-examples.patch: disable building documentation and examples, so we can
 avoid shipping the files in those directories
 Upstream Version: 1.2.0
 
+liblrdf
+-------
+Patches:
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
+
+
 lib-widget-extra
 ----------------
 
@@ -134,7 +158,7 @@ portaudio-v19
 -------------
 http://portaudio.com/
 cross-platform audio I/O library version 19, used for 1.3.2 onwards releases
-Version in audacity cvs: 18th March 2008 SVN snapshot (r1373)
+Version in audacity cvs: 31st December 2008 SVN snapshot (r1396)
 Patches:
 ../portmixer/portaudio.patch	add features needed to make portmixer work.
 		Integration by upstream in progress. Will need updating as upstream
@@ -151,6 +175,9 @@ portsmf-includes.patch	add include of <cstring> needed to compile with recent
 portsmf-string-const.patch	Add string const qualifiers as needed
 local-macros.patch		Add all the necessary 3rd party m4 macros into autotools
 						/m4/ and supporting changes.
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
+
 
 portburn
 --------
@@ -177,6 +204,18 @@ http://www.music.mcgill.ca/~gary/rtaudio/
 Another cross-platform audio I/O library that was at one point available as an
 alternative to portaudio.
 
+sbsms
+-----
+http://sbsms.sourceforge.net/
+An audio stretching library for changing pitch or tempo without changing the
+other. Alternative to SoundTouch, better on large changes but slower.
+Version in audacity cvs: ??
+Patches:
+Misc fixes to configure.in/Makefile.am for autoconf macros and libtool. More
+files added to m4/ directory by libtoolizing commited to CVS.
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
+
 slv2
 -------
 http://wiki.drobilla.net/SLV2
@@ -185,6 +224,9 @@ Version in audacity cvs: 0.6.0
 Patches:
 audacity_build_tweaks.patch	Patches the configure scripts to not build hosts and utility programs and to use local Redland libraries if requested. No need to integrate with upstream.
 lv2core_internal.patch		Add lv2.h as an internal header to avoid the dependency on lv2core.
+i18n.patch					Patch to support translation of some form?
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
 
 soundtouch
 ----------
@@ -197,6 +239,8 @@ correct-const-usage.patch: makes usage of const keyword consistent so it
 compiles with Sun's C++ compiler. Patch sent upstream 17/03/2008
 fix-includes.patch: needed for GCC 4.3.1 to include all the headers we use
 directly. In upstream SVN
+Argument ([-Wall foreign]) added to AM_INIT_AUTOMAKE because autoreconf fails
+otherwise
 Upstream Version: 1.3.1
 
 twolame
@@ -205,6 +249,8 @@ http://www.twolame.org/
 MPEG I layer 2 audio encoding library used for MP2 exports
 Version in audacity cvs: 0.3.12
 Patches: None
+AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
+by default
 Upstream Version: 0.3.12
 
 wave++
@@ -244,6 +290,9 @@ don't need to do a recusive touch.
 CVS will list files with a ? if they are new and need to be added to the
 repository. To get a list, run 
 cvs st 2>/dev/null | grep '?'
+Remember to ignore the generated files from the build system which don't need
+to be included in CVS, like aclocal.m4 and autom4te.cache
+
 Finding which files have been removed is a bit harder:
 cvs st 2>/dev/null | grep 'Status: Needs Checkout'
 gives file names but not their paths, so you have to go back and grep each
diff --git a/lib-src/dlcompat/AUTHORS b/lib-src/dlcompat/AUTHORS
deleted file mode 100644
index 6b58092..0000000
--- a/lib-src/dlcompat/AUTHORS
+++ /dev/null
@@ -1,15 +0,0 @@
-Original code by Jorge Acereda  <jacereda at users.sourceforge.net>
-This was heavily modified by Peter O'Gorman <ogorman at users.sourceforge.net>
-
-With input from (in alphabetical order):
-
-StŽphane Conversy <conversy at lri.fr>
-Francis James Franklin <fjf at alinameridon.com>
-Ben Hines <bhines at alumni.ucsd.edu>
-Max Horn <max at quendi.de>
-Karin Kosina <kyrah at sim.no>
-Darin Ohashi <DOhashi at maplesoft.com>
-Benjamin Reed <ranger at befunk.com>
-
-Forgive me if I missed you, and e-mail me <ogorman at users.sourceforge.net> 
-to get added to this list.
diff --git a/lib-src/dlcompat/ChangeLog b/lib-src/dlcompat/ChangeLog
deleted file mode 100644
index fe9daf1..0000000
--- a/lib-src/dlcompat/ChangeLog
+++ /dev/null
@@ -1,259 +0,0 @@
-2003-06-29  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* configure.in, dlopen.3.in, dladdr.3: Release 20030629, tell people to use the native
-	funcs in new code. Add dladdr.3 to the dist.
-
-2003-06-23  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, dlopen.3.in: Clean up the error reporting stuff, note in the manpage that
-	things are pretty broken for force_flat_namespace executables.
-
-2003-06-20  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Better? error reporting for cirdan. Cleanup after ourselves using atexit.
-
-2003-06-10  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, dlopen.3.in: Allow _init and _fini routines to call dl* funcs.
-
-2003-06-08  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* AUTHORS: forgot RangerRick
-	
-2003-06-08  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, spec_notes.txt, dladdr.3, Makefile.in, dlopen.3.in: reformat ascii
-	diagram, cleanup, avoid a deadlock if _init or _fini routines attempt to call
-	dl* functions, just exits the app right now. Update the manpages. Finally made
-	the decision to keep dlfunc out until I see a port which needs it, or it becomes
-	part of the spec. Removed RTLD_SELF for similar reasons.
-
-2003-06-05  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, spec_notes.txt: small changes to dlfcn.c, added some notes about spec
-	compliance.
-
-2003-06-05  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, dlfcn.h: Readded dlfunc, implemented RTLD_NEXT, RTLD_SELF and RTLD_DEFAULT
-	for dlsym. Compiles against the freebsd 5.0 header, but I can't grab that because it
-	would break binary compat, reran indent to fix problems with my use of a multitude of
-	editors (if only they would stop crashing).
-
-2003-05-22  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* AUTHORS: Forgot people.
-
-2003-05-22  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* Makefile.in,configure.in,README,dlfcn.c,dlfnc.h,dlfcn_simple.c,dlopen.3.in:
-	dlopen.3 should is generated by the makefile, not configure, dlfcn_simple.c some
-	rewrite of the error code, preparation for release, remove the dlfunc I added on
-	the 20th, I need to convince myself that it is worthwhile.
-
-2003-05-20  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, dlfcn.h: dynamically allocate space for all needed paths, add dlfunc, use
-	the restric keyword for gcc >3, fix dladdr for MH_SPLIT_SEGS, use our own NSAddImage
-	for the search linked libs case, as NSAddImage is stupid, and does not search
-	DYLD_LIBRARY_PATH or match install_names. Use NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES
-	for ppc in dlclose, and NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED if the object has
-	any __mod_term_func's to avoid the bus error in atexit(3) with c++ static destructors.
-
-2003-05-12  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: reset the error string when an exported function is called. Do not write
-	off the end of the search_paths array, increase MAX_SEARCH_PATHS to 128. This needs
-	to be looked at again, the search paths array should be allocated dynamically so all
-	the paths can be included.
-
-2003-04-27  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Patch from Ben Hines for better error reporting in dlclose a non bundle.
-
-2003-04-06  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Checking some code that has been sitting here for months. thread safe,
-	removed crap code for c++ static initializer calling. Need to add something back
-	later.
-	
-2003-01-27  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn_simple.c: Cleanup.
-
-2002-12-18  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Quick hack to get sound working in artsd.
-
-2002-11-15  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* configure.in, Makefile.in: Upped version for release on 11/17, include LICENSE in
-	the distribution.
-
-2002-11-11  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, dlfcn_simple.c, Makefile.in, README, configure.in, dlopen.3.in: Ran indent
-	on the source code, changed an error message. Make make dist work, changed cvs 
-	instructions in README, added a man page from freebsd.
-	
-2002-11-10  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, AUTHORS, LICENSE, Makefile.in, configure.in, dlfcn.h: Updated LICENSE to
-	add myself to the copyright, sugegsted by Max, fixed a bug in declatation order,
-	thanks to fjf, added AUTHORS file.
-
-2002-11-8  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Patch from Max Horn applied. Fixes some path issues, and code cleanup.
-
-
-2002-10-29  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Lookup the NSAddImage etc stuff that was added in OS 10.1, so that the
-	binary can be used on 10.0. It may or may not work, don't have a 10.0 system to
-	try it.
-
-2002-10-23  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	*dlfcn.c: Moving things around.
-
-2002-10-14  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfnc.c: bugfixes
-
-2002-09-29  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, README, TODO, dlfcn_simple.c: Added /usr/local/lib to the default search 
-	paths, updated README file, and TODO, added some comments to dlfcn_simple.c, and 
-	removed the #if FINK_BUILD stuff from it, it is meant as an example, no need to go
-	confusing it.
-
-2002-09-25  Peter O'Gorman <ogorman at users.sourceforge.net>
-	
-	* dlfcn.c: fixed quite a few thinko's in last commit.
-
-2002-09-22  Peter O'Gorman <ogorman at users.sourceforge.net>
-	* fink.mk,dlfcn.c,dlfcn_simple.c: Modified fink.mk to call make -f fink.mk
-	for debug builds, addded searching dependent libraries to fix a problem where
-	kate.so wouldn't be launched because it contains no symbols, the _main symbol
-	actually appears in one of it's dependant libs. Added dlfcn_simple.c as an example
-	of what to do to add dlopen(3) functionality to apps, I don't want people using the
-	mess that is dlfcn.c as their basis. The code I added to dlfcn.c still needs work,
-	and lots of it.
-
-2002-08-27  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* fink.mk: Keep fink happy.
-
-2002-08-27  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* Makefile, README: Removed any and all finkisms.
-
-2002-08-22  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, Makefile: Prepend the underscore by default for dlsym.
-
-2002-07-31  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.h: Duh, protect the header from being included twice.	
-
-2002-07-02  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* Makefile: Made Makefile bsdmake compatible.
-
-2002-07-02  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c, dlfcn.h, LICENSE, Makefile, README: Noted bug reports go to
-	me and not Jorge.
-
-2002-06-30  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c dlfcn.h: First attempt at adding dladdr
-
-2002-06-09  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* README: added some notes
-	* dlfcn.c: Format changes, small bugfix.
-	
-2002-06-06  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: I broke finks xemacs, now fixed.
-
-2002-05-27  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: I really should read specs instead of making assumptions.
-	dlopen(NULL,x) opens the _global_ context, not the application context.
-	Fixed. Made dlsym_prepend_underscore work with stupidly long 
-	symbol names.
-
-2002-05-23  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: When opening a bundle for the second time, reuse the
-	dlstatus struct from the previously closed version. Removed some
-	debugging routines.
-	* README: Minor update
-
-2002-05-18  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Fixed my last "fix". Thanks to Darin Ohashi again.
-
-2002-05-15  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Fixed bug reported by Darin Ohashi. dlopen a bundle
-	close it, and dlopen same bundle again fails.
-
-2002-05-07  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Changes on 2002-05-01 broke dlopen self, now fixed.
-
-2002-05-05  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Better error reporting (I hope)
-	* Makefile: New debug target, from vasi.
-
-2002-05-01  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: When doing dlsym on dylibs, only check for the 
-	symbol in the lib that was passed.
-
-2002-04-23  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: fixed warnings when building with gcc3.
-
-2002-04-17  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: modified dlsym_auto_underscore so it doesn't set the 
-	error on the first call.
-
-2002-04-16  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: added dlsym_auto_underscore on Justin's request.
-
-2002-04-13  Max Horn  <max at quendi.de>
-
-	* dlfcn.c: added dlsymIntern (like dlsym but for internal use); changed 
-	dlopen/dlclose to use dlsymIntern, to prevent some border case problems.
-
-2002-04-11  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* dlfcn.c: Added function dlsym_prepend_underscore for ease of
-	porting packages which expect to be able to call
-	dlsym(module,symbol) without a leading underscore, those package
-	maintainers can now add -Ddlsym=dlsym_prepend_underscore to the
-	CFLAGS and the package should just work, I hope
-
-2002-03-23  Max Horn  <max at quendi.de>
-
-	* dlfcn.c: changed 'enum bool' to int to fix a problem with newer
-	systems
-
-2002-03-22  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* README: Updated README
-
-2002-03-22  Peter O'Gorman <ogorman at users.sourceforge.net>
-
-	* .cvsignore, dlcompat.info, dlfcn.c, dlfcn.h, LICENSE, Makefile,
-	README, TODO, dltest.fs, test/.cvsignore, test/Makefile,
-	test/README, test/dltest.c, test/libbar.c, test/libfoo.c,
-	test/runtest.sh: Initial revision
diff --git a/lib-src/dlcompat/LICENSE b/lib-src/dlcompat/LICENSE
deleted file mode 100644
index 786fb50..0000000
--- a/lib-src/dlcompat/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2002 Jorge Acereda  <jacereda at users.sourceforge.net> &
-                   Peter O'Gorman <ogorman at users.sourceforge.net>
-                   
-Portions may be copyright others, see the AUTHORS file included with this
-distribution.
-
-Maintained by Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Bug Reports and other queries should go to <ogorman at users.sourceforge.net>
-
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
diff --git a/lib-src/dlcompat/Makefile.in b/lib-src/dlcompat/Makefile.in
deleted file mode 100644
index e1dbadc..0000000
--- a/lib-src/dlcompat/Makefile.in
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2002 Jorge Acereda  <jacereda at users.sourceforge.net> &
-#                    Peter O'Gorman <ogorman at users.sourceforge.net>
-#                   
-# Portions may be copyright others, see the AUTHORS file included with this
-# distribution.    
-# Maintained by Peter O'Gorman <ogorman at users.sourceforge.net>
-#
-# Bug Reports and other queries should go to <ogorman at users.sourceforge.net>
-#
-#
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-prefix=@prefix@
-exec_prefix = @exec_prefix@
-mandir = @mandir@
-includedir = @includedir@
-libdir = @libdir@
-DEBUG=0
-CC=@CC@
-OPT=@OPT@
-DEBUGOPT=-g -O0
-CFLAGS=$(OPT)
-AR=ar cru
-RANLIB=@RANLIB@
-INSTALL=/usr/bin/install
-VERSTRING=@VERSTRING@
-LIBVER=@LIBVER@
-
-DEFINES=@DEBUGDEF@ @FINKDEF@
-VERSION=@VERSION@
-NOTPREPEND=@NOTPREPEND@
-
-DESTDIR=
-
-DISTFILES= README \
-	configure \
-	configure.in \
-	dlfcn.c \
-	dlfcn_simple.c \
-	dlfcn.h \
-	ChangeLog \
-	Makefile.in \
-	TODO \
-	AUTHORS \
-	LICENSE \
-	install-sh \
-	dlopen.3.in \
-	dladdr.3 \
-	test/Makefile test/dltest.c test/dlmodule.c test/dladdr.c
-		
-OBJS = dlfcn.o
-
-all: libdl.a libdl.dylib dlopen.3
-
-configure: configure.in
-	autoconf
-
-dist: $(DISTFILES)
-	tar -cvf dlcompat-$(VERSION).tar $(DISTFILES)
-	if test -d dlcompat-$(VERSION); then  rm -rf dlcompat-$(VERSION); fi;
-	mkdir dlcompat-$(VERSION)
-	tar -C dlcompat-$(VERSION) -xvf dlcompat-$(VERSION).tar
-	rm dlcompat-$(VERSION).tar
-	tar -cvzf dlcompat-$(VERSION).tar.gz dlcompat-$(VERSION)
-	rm -rf dlcompat-$(VERSION)
-
-install: all man
-	$(INSTALL) -d -m 755 $(DESTDIR)/$(libdir)/
-	$(INSTALL) -m 644 libdl.a $(DESTDIR)/$(libdir)/
-	$(INSTALL) -m 644 libdl.$(LIBVER).dylib $(DESTDIR)/$(libdir)/
-	ln -fs libdl.$(LIBVER).dylib $(DESTDIR)/$(libdir)/libdl.dylib
-	$(INSTALL) -d -m 755 $(DESTDIR)/$(includedir)/
-	$(INSTALL) -m 644 dlfcn.h $(DESTDIR)/$(includedir)/
-
-dlopen.3: dlopen.3.in
-	sed -e "s/%%NOTPREPEND%%/$(NOTPREPEND)/" < dlopen.3.in > dlopen.3
-
-man: dlopen.3
-	$(INSTALL) -d -m 755 $(DESTDIR)/$(mandir)/man3/
-	$(INSTALL) -m 644 dlopen.3 $(DESTDIR)/$(mandir)/man3/dlopen.3
-	$(INSTALL) -m 644 dladdr.3 $(DESTDIR)/$(mandir)/man3/dladdr.3	
-	ln -fs dlopen.3 $(DESTDIR)/$(mandir)/man3/dlsym.3
-	ln -fs dlopen.3 $(DESTDIR)/$(mandir)/man3/dlclose.3
-	ln -fs dlopen.3 $(DESTDIR)/$(mandir)/man3/dlerror.3
-		
-.c.o:
-	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
-
-libdl.a: $(OBJS)
-	$(AR) libdl.a $(OBJS)
-	$(RANLIB) libdl.a
-
-libdl.dylib: libdl.$(LIBVER).dylib
-	ln -sf libdl.$(LIBVER).dylib $@
-
-libdl.$(LIBVER).dylib: $(OBJS)
-	$(CC) -dynamiclib -o $@ $(OBJS) -install_name $(prefix)/lib/$@ $(VERSTRING)
-
-clean:
-	rm -f $(OBJS) libdl.* *~ *.o dlopen.3
diff --git a/lib-src/dlcompat/README b/lib-src/dlcompat/README
deleted file mode 100644
index f6164de..0000000
--- a/lib-src/dlcompat/README
+++ /dev/null
@@ -1,96 +0,0 @@
-dlcompat for Darwin
-=========================
-
-This is dlcompat, a small library that emulates the dlopen()
-interface on top of Darwin's dyld API.
-
-dlcompat allows loading a ".dylib" library (as long as the RTLD_LOCAL 
-flag isn't passed to dlopen()). It can be configured to yield a warning 
-when trying to close it (dynamic libraries cannot currently be unloaded).
-
-It automatically searches for modules in several directories when no 
-absolute path is specified and the module is not found in the current 
-directory.
-
-The paths searched are those specified in the environment variables
-LD_LIBRARY_PATH and DYLD_LIBRARY_PATH plus /lib, /usr/local/lib and 
-/usr/lib or the path specified in the environment variable 
-DYLD_FALLBACK_LIBRARY_PATH.
-
-In the default install the behavior of dlsym is to automatically prepend
-an underscore to passed in symbol names, this allows easier porting of
-applications which were written specifically for ELF based lifeforms.
-
-Installation
---------------
-Type:
-	./configure
-	make
-	sudo make install
-
-This will compile the source file, generate both a static and shared
-library called libdl and install it into /usr/local/lib. The header
-file dlfcn.h will be installed in /usr/local/include, and the man pages
-go in /usr/local/man.
-
-If you want to place the files somewhere else, run
-
-  make clean
-  ./configure --prefix=<prefix>
-  make
-  sudo make install
-
-where <prefix> is the hierarchy you want to install into, e.g. /usr
-for /usr/lib and /usr/include (_NOT_ recommended!).
-
-To enable debugging output (useful for me), run
-
-  make clean
-  ./configure --enable-debug
-  make
-  sudo make install
-  
-If you want old dlcompat style behavior of not prepending the underscore
-on calls to dlsym then type:
-
-  make clean
-  ./configure --enable-fink
-  make
-  sudo make install
-
-Usage
--------
-Software that uses GNU autoconf will likely check for a library called
-libdl, that's why I named it that way. For software that doesn't find
-the library on its own, you must add a '-ldl' to the appropriate
-Makefile (or environment) variable, usually LIBS.
-
-If you installed dlcompat into a directory other than /usr/local/lib,
-you must tell the compiler where to find it. Add '-L<prefix>/lib' to
-LDFLAGS (or CFLAGS) and '-I<prefix>/include' to CPPFLAGS (or CFLAGS).
-
-Notes
------
-If you are writing new software and plan to have Mac OX X compatibility you
-should look at the dyld api's in /usr/include/mach-o/dyld.h, rather than
-using dlcompat, using the native api's is the supported method of loading
-dynamically on Mac OS X, if you want an small example, look at dlfcn_simple.c,
-which should help get you started.
-
-As of this version the functions in dlcompat should all be thread safe.
-
-You can always get the latest version from opendarwin cvs:
-
-  cvs -d :pserver:anonymous at anoncvs.opendarwin.org:/cvs/od login
-  cvs -z3 -d :pserver:anonymous at anoncvs.opendarwin.org:/cvs/od \
-               co -d dlcompat proj/dlcompat
-               
-But remember that you'll have to run autoconf to generate the configure script.
-
-It is hoped that this library will be useful, and as bug free as possible, if you find
-any bugs please let us know about them so they can be fixed.
-
-Please send bug reports to Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Thanks.
-
diff --git a/lib-src/dlcompat/TODO b/lib-src/dlcompat/TODO
deleted file mode 100644
index 6cd3644..0000000
--- a/lib-src/dlcompat/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Implement RTLD_LAZY, RTLD_SHARED/UNSHARED, RTLD_LAZY_UNDEF if needed.
diff --git a/lib-src/dlcompat/configure b/lib-src/dlcompat/configure
deleted file mode 100755
index 7ada018..0000000
--- a/lib-src/dlcompat/configure
+++ /dev/null
@@ -1,4716 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="dlfcn.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-RANLIB
-LN_S
-VERSION
-CPP
-GREP
-EGREP
-OPT
-DEBUGDEF
-FINKDEF
-VERSTRING
-LIBVER
-NOTPREPEND
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug   build a debug version
-  --enable-fink  build a fink version
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
-
-OPT=-O2
-VERSION=20030629
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-if test "${ac_cv_header_mach_o_dyld_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for mach-o/dyld.h" >&5
-echo $ECHO_N "checking for mach-o/dyld.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_mach_o_dyld_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_mach_o_dyld_h" >&5
-echo "${ECHO_T}$ac_cv_header_mach_o_dyld_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking mach-o/dyld.h usability" >&5
-echo $ECHO_N "checking mach-o/dyld.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <mach-o/dyld.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking mach-o/dyld.h presence" >&5
-echo $ECHO_N "checking mach-o/dyld.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <mach-o/dyld.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: mach-o/dyld.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: mach-o/dyld.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: mach-o/dyld.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: mach-o/dyld.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: mach-o/dyld.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: mach-o/dyld.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mach-o/dyld.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mach-o/dyld.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: mach-o/dyld.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for mach-o/dyld.h" >&5
-echo $ECHO_N "checking for mach-o/dyld.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_mach_o_dyld_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_mach_o_dyld_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_mach_o_dyld_h" >&5
-echo "${ECHO_T}$ac_cv_header_mach_o_dyld_h" >&6; }
-
-fi
-if test $ac_cv_header_mach_o_dyld_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: No dyld.h found, can not continue" >&5
-echo "$as_me: error: No dyld.h found, can not continue" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-{ echo "$as_me:$LINENO: checking for NSLinkModule" >&5
-echo $ECHO_N "checking for NSLinkModule... $ECHO_C" >&6; }
-if test "${ac_cv_func_NSLinkModule+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define NSLinkModule to an innocuous variant, in case <limits.h> declares NSLinkModule.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define NSLinkModule innocuous_NSLinkModule
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char NSLinkModule (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef NSLinkModule
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char NSLinkModule ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_NSLinkModule || defined __stub___NSLinkModule
-choke me
-#endif
-
-int
-main ()
-{
-return NSLinkModule ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_NSLinkModule=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_NSLinkModule=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_NSLinkModule" >&5
-echo "${ECHO_T}$ac_cv_func_NSLinkModule" >&6; }
-if test $ac_cv_func_NSLinkModule = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: Can not continue" >&5
-echo "$as_me: error: Can not continue" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-{ echo "$as_me:$LINENO: checking for NSAddImage" >&5
-echo $ECHO_N "checking for NSAddImage... $ECHO_C" >&6; }
-if test "${ac_cv_func_NSAddImage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define NSAddImage to an innocuous variant, in case <limits.h> declares NSAddImage.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define NSAddImage innocuous_NSAddImage
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char NSAddImage (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef NSAddImage
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char NSAddImage ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_NSAddImage || defined __stub___NSAddImage
-choke me
-#endif
-
-int
-main ()
-{
-return NSAddImage ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_NSAddImage=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_NSAddImage=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_NSAddImage" >&5
-echo "${ECHO_T}$ac_cv_func_NSAddImage" >&6; }
-if test $ac_cv_func_NSAddImage = yes; then
-  :
-else
-  { echo "$as_me:$LINENO: WARNING: Not tested without NSAddImage, good luck!" >&5
-echo "$as_me: WARNING: Not tested without NSAddImage, good luck!" >&2;}
-fi
-
-# debug option
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
-		OPT="-O0 -g"
-		DEBUGDEF="-DDEBUG=2"
-
-fi
-
-# for the fink package manager, build a version that is binary compatible
-# with all previous releases of dlcompat
-# no automatic underscore prepending
-# lib is named libdl.0.dylib
-# Check whether --enable-fink was given.
-if test "${enable_fink+set}" = set; then
-  enableval=$enable_fink;
-		FINKDEF="-DFINK_BUILD=1"
-		VERSTRING=""
-		LIBVER=0
-		NOTPREPEND="not"
-
-else
-
-		FINKDEF=""
-		VERSTRING="-compatibility_version 1 -current_version 1"
-		LIBVER=1
-		NOTPREPEND="indeed"
-
-fi
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files ./Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf at gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "./Makefile") CONFIG_FILES="$CONFIG_FILES ./Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-RANLIB!$RANLIB$ac_delim
-LN_S!$LN_S$ac_delim
-VERSION!$VERSION$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-OPT!$OPT$ac_delim
-DEBUGDEF!$DEBUGDEF$ac_delim
-FINKDEF!$FINKDEF$ac_delim
-VERSTRING!$VERSTRING$ac_delim
-LIBVER!$LIBVER$ac_delim
-NOTPREPEND!$NOTPREPEND$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-
-
-
-  esac
-
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/lib-src/dlcompat/configure.in b/lib-src/dlcompat/configure.in
deleted file mode 100644
index cb38896..0000000
--- a/lib-src/dlcompat/configure.in
+++ /dev/null
@@ -1,43 +0,0 @@
-# configure.in for dlcompat, process with autocong to generate a configure script
-#
-# This does only minimal checks, but it is all that is needed.
-
-AC_INIT(dlfcn.c)
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PROG_LN_S
-OPT=-O2
-VERSION=20030629
-AC_SUBST(VERSION)
-AC_CHECK_HEADER(mach-o/dyld.h, [], [AC_MSG_ERROR([No dyld.h found, can not continue])])
-AC_CHECK_FUNC(NSLinkModule, [], [AC_MSG_ERROR([Can not continue])])
-AC_CHECK_FUNC(NSAddImage, [], [AC_MSG_WARN([Not tested without NSAddImage, good luck!])])
-# debug option
-AC_ARG_ENABLE(debug,[  --enable-debug   build a debug version],[
-		OPT="-O0 -g"
-		DEBUGDEF="-DDEBUG=2"
-		],[])
-# for the fink package manager, build a version that is binary compatible
-# with all previous releases of dlcompat
-# no automatic underscore prepending
-# lib is named libdl.0.dylib
-AC_ARG_ENABLE(fink,	[  --enable-fink  build a fink version], [
-		FINKDEF="-DFINK_BUILD=1"
-		VERSTRING=""
-		LIBVER=0
-		NOTPREPEND="not"
-		],[
-		FINKDEF=""
-		VERSTRING="-compatibility_version 1 -current_version 1"
-		LIBVER=1
-		NOTPREPEND="indeed"
-		])
-AC_SUBST(OPT)
-AC_SUBST(DEBUGDEF)
-AC_SUBST(FINKDEF)
-AC_SUBST(VERSTRING)
-AC_SUBST(LIBVER)
-AC_SUBST(NOTPREPEND)
-AC_OUTPUT(
-		./Makefile
-		)
diff --git a/lib-src/dlcompat/dladdr.3 b/lib-src/dlcompat/dladdr.3
deleted file mode 100644
index 2ffc408..0000000
--- a/lib-src/dlcompat/dladdr.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"
-.\" Copyright (c) 1998 John D. Polstra
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/dladdr.3,v 1.3.2.4 2003/03/15 15:11:05 trhodes Exp $
-.\"
-.Dd June 8, 2003
-.Os
-.Dt DLADDR 3
-.Sh NAME
-.Nm dladdr
-.Nd find the shared object containing a given address
-.Sh SYNOPSIS
-.In dlfcn.h
-.Ft int
-.Fn dladdr "const void *addr" "Dl_info *info"
-.Sh DESCRIPTION
-The
-.Fn dladdr
-function
-queries the dynamic linker for information about the shared object
-containing the address
-.Fa addr .
-The information is returned in the structure specified by
-.Fa info .
-The structure contains at least the following members:
-.Bl -tag -width "XXXconst char *dli_fname"
-.It Li "const char *dli_fname"
-The pathname of the shared object containing the address.
-.It Li "void *dli_fbase"
-The base address at which the shared object is mapped into the
-address space of the calling process.
-.It Li "const char *dli_sname"
-The name of the nearest run-time symbol with a value less than or
-equal to
-.Fa addr .
-.Pp
-If no symbol with a suitable value is found, both this field and
-.Va dli_saddr
-are set to
-.Dv NULL .
-.It Li "void *dli_saddr"
-The value of the symbol returned in
-.Li dli_sname .
-.El
-.Pp
-The
-.Fn dladdr
-function
-is available only in dynamically linked programs.
-.Sh ERRORS
-If a mapped shared object containing
-.Fa addr
-cannot be found,
-.Fn dladdr
-returns 0.
-.Pp
-On success, a non-zero value is returned.
-.Sh SEE ALSO
-.Xr dyld 3 ,
-.Xr dlopen 3
-.Sh HISTORY
-The
-.Fn dladdr
-function first appeared in the Solaris operating system.
-.Sh AUTHORS
-The dlcompat package was written by Jorge Acereda 
-<jacereda at users.sourceforge.net> and
-Peter O'Gorman <ogorman at users.sourceforge.net>
-.Pp
-Some of the code for this particular function was borrowed from
-a post to the darwin development list by Douglas Davidson.
-.Pp
-This man page was borrowed from FreeBSD and modified.
-.Sh BUGS
-This implementation is almost bug-compatible with the Solaris
-implementation.  The following bugs are present:
-.Bl -bullet
-.It
-If
-.Fa addr
-lies in the main executable rather than in a shared library, the
-pathname returned in
-.Va dli_fname
-may not be correct.  The pathname is taken directly from
-.Va argv[0]
-of the calling process.  When executing a program specified by its
-full pathname, most shells set
-.Va argv[0]
-to the pathname.  But this is not required of shells or guaranteed
-by the operating system.
-.It
-.Fn dlerror
-can not be used to get the error string if 
-.Fn dladdr
-fails.
-.It
-The symbol returned has an underscore if it is a C symbol, and can
-not be used as input to 
-.Fn dlsym
-as
-.Fn dlsym 
-in a default dlcompat installation takes symbol names as they appear
-in C source code (no underscore).
-.It
-Returning 0 as an indication of failure goes against long-standing
-Unix tradition.
-.El
diff --git a/lib-src/dlcompat/dlfcn.c b/lib-src/dlcompat/dlfcn.c
deleted file mode 100644
index fe9aca2..0000000
--- a/lib-src/dlcompat/dlfcn.c
+++ /dev/null
@@ -1,1311 +0,0 @@
-/*
-Copyright (c) 2002 Jorge Acereda  <jacereda at users.sourceforge.net> &
-                   Peter O'Gorman <ogorman at users.sourceforge.net>
-                   
-Portions may be copyright others, see the AUTHORS file included with this
-distribution.                  
-
-Maintained by Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Bug Reports and other queries should go to <ogorman at users.sourceforge.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <mach-o/dyld.h>
-#include <mach-o/nlist.h>
-#include <mach-o/getsect.h>
-/* Just playing to see if it would compile with the freebsd headers, it does,
- * but because of the different values for RTLD_LOCAL etc, it would break binary
- * compat... oh well
- */
-#ifndef __BSD_VISIBLE
-#define __BSD_VISIBLE 1
-#endif
-#include "dlfcn.h"
-
-#ifndef dl_restrict
-#define dl_restrict __restrict
-#endif
-/* This is not available on 10.1 */
-#ifndef LC_LOAD_WEAK_DYLIB
-#define	LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
-#endif
-
-/* With this stuff here, this thing may actually compile/run on 10.0 systems
- * Not that I have a 10.0 system to test it on anylonger
- */
-#ifndef LC_REQ_DYLD
-#define LC_REQ_DYLD 0x80000000
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
-#define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
-#endif
-/* These symbols will be looked for in dyld */
-static const struct mach_header *(*dyld_NSAddImage) (const char *, unsigned long) = 0;
-static int (*dyld_NSIsSymbolNameDefinedInImage) (const struct mach_header *, const char *) = 0;
-static NSSymbol(*dyld_NSLookupSymbolInImage)
-	(const struct mach_header *, const char *, unsigned long) = 0;
-
-/* Define this to make dlcompat reuse data block. This way in theory we save
- * a little bit of overhead. However we then couldn't correctly catch excess
- * calls to dlclose(). Hence we don't use this feature
- */
-#undef REUSE_STATUS
-
-/* Size of the internal error message buffer (used by dlerror()) */
-#define ERR_STR_LEN			251
-
-/* Maximum number of search paths supported by getSearchPath */
-#define MAX_SEARCH_PATHS	32
-
-
-#define MAGIC_DYLIB_OFI ((NSObjectFileImage) 'DYOF')
-#define MAGIC_DYLIB_MOD ((NSModule) 'DYMO')
-
-/* internal flags */
-#define DL_IN_LIST 0x01
-
-/* our mutex */
-static pthread_mutex_t dlcompat_mutex;
-/* Our thread specific storage
- */
-static pthread_key_t dlerror_key;
-
-struct dlthread
-{
-	int lockcnt;
-	unsigned char errset;
-	char errstr[ERR_STR_LEN];
-};
-
-/* This is our central data structure. Whenever a module is loaded via
- * dlopen(), we create such a struct.
- */
-struct dlstatus
-{
-	struct dlstatus *next;		/* pointer to next element in the linked list */
-	NSModule module;
-	const struct mach_header *lib;
-	int refs;					/* reference count */
-	int mode;					/* mode in which this module was loaded */
-	dev_t device;
-	ino_t inode;
-	int flags;					/* Any internal flags we may need */
-};
-
-/* Head node of the dlstatus list */
-static struct dlstatus mainStatus = { 0, MAGIC_DYLIB_MOD, NULL, -1, RTLD_GLOBAL, 0, 0, 0 };
-static struct dlstatus *stqueue = &mainStatus;
-
-
-/* Storage for the last error message (used by dlerror()) */
-/* static char err_str[ERR_STR_LEN]; */
-/* static int err_filled = 0; */
-
-/* Prototypes to internal functions */
-static void debug(const char *fmt, ...);
-static void error(const char *str, ...);
-static const char *safegetenv(const char *s);
-static const char *searchList(void);
-static const char *getSearchPath(int i);
-static const char *getFullPath(int i, const char *file);
-static const struct stat *findFile(const char *file, const char **fullPath);
-static int isValidStatus(struct dlstatus *status);
-static inline int isFlagSet(int mode, int flag);
-static struct dlstatus *lookupStatus(const struct stat *sbuf);
-static void insertStatus(struct dlstatus *dls, const struct stat *sbuf);
-static int promoteLocalToGlobal(struct dlstatus *dls);
-static void *reference(struct dlstatus *dls, int mode);
-static void *dlsymIntern(struct dlstatus *dls, const char *symbol, int canSetError);
-static struct dlstatus *allocStatus(void);
-static struct dlstatus *loadModule(const char *path, const struct stat *sbuf, int mode);
-static NSSymbol *search_linked_libs(const struct mach_header *mh, const char *symbol);
-static const char *get_lib_name(const struct mach_header *mh);
-static const struct mach_header *get_mach_header_from_NSModule(NSModule * mod);
-static void dlcompat_init_func(void);
-static inline void dolock(void);
-static inline void dounlock(void);
-static void dlerrorfree(void *data);
-static void resetdlerror(void);
-static const struct mach_header *my_find_image(const char *name);
-static const struct mach_header *image_for_address(const void *address);
-static void dlcompat_cleanup(void);
-static inline const char *dyld_error_str(void);
-
-#if FINK_BUILD
-/* Two Global Functions */
-void *dlsym_prepend_underscore(void *handle, const char *symbol);
-void *dlsym_auto_underscore(void *handle, const char *symbol);
-
-/* And their _intern counterparts */
-static void *dlsym_prepend_underscore_intern(void *handle, const char *symbol);
-static void *dlsym_auto_underscore_intern(void *handle, const char *symbol);
-#endif
-
-/* Functions */
-
-static void debug(const char *fmt, ...)
-{
-#if DEBUG > 1
-	va_list arg;
-	va_start(arg, fmt);
-	fprintf(stderr, "DLDEBUG: ");
-	vfprintf(stderr, fmt, arg);
-	fprintf(stderr, "\n");
-	fflush(stderr);
-	va_end(arg);
-#endif
-}
-
-static void error(const char *str, ...)
-{
-	va_list arg;
-	struct dlthread  *tss;
-	char * err_str;
-	va_start(arg, str);
-	tss = pthread_getspecific(dlerror_key);
-	err_str = tss->errstr;
-	strncpy(err_str, "dlcompat: ", ERR_STR_LEN);
-	vsnprintf(err_str + 10, ERR_STR_LEN - 10, str, arg);
-	va_end(arg);
-	debug("ERROR: %s\n", err_str);
-	tss->errset = 1;
-}
-
-static void warning(const char *str)
-{
-#if DEBUG > 0
-	fprintf(stderr, "WARNING: dlcompat: %s\n", str);
-#endif
-}
-
-static const char *safegetenv(const char *s)
-{
-	const char *ss = getenv(s);
-	return ss ? ss : "";
-}
-
-/* because this is only used for debugging and error reporting functions, we
- * don't really care about how elegant it is... it could use the load
- * commands to find the install name of the library, but...
- */
-static const char *get_lib_name(const struct mach_header *mh)
-{
-	unsigned long count = _dyld_image_count();
-	unsigned long i;
-	const char *val = NULL;
-	if (mh)
-	{
-		for (i = 0; i < count; i++)
-		{
-			if (mh == _dyld_get_image_header(i))
-			{
-				val = _dyld_get_image_name(i);
-				break;
-			}
-		}
-	}
-	return val;
-}
-
-/* Returns the mach_header for the module bu going through all the loaded images
- * and finding the one with the same name as the module. There really ought to be
- * an api for doing this, would be faster, but there isn't one right now
- */
-static const struct mach_header *get_mach_header_from_NSModule(NSModule * mod)
-{
-	const char *mod_name = NSNameOfModule(mod);
-	struct mach_header *mh = NULL;
-	unsigned long count = _dyld_image_count();
-	unsigned long i;
-	debug("Module name: %s", mod_name);
-	for (i = 0; i < count; i++)
-	{
-		if (!strcmp(mod_name, _dyld_get_image_name(i)))
-		{
-			mh = _dyld_get_image_header(i);
-			break;
-		}
-	}
-	return mh;
-}
-
-
-/* Compute and return a list of all directories that we should search when
- * trying to locate a module. We first look at the values of LD_LIBRARY_PATH
- * and DYLD_LIBRARY_PATH, and then finally fall back to looking into
- * /usr/lib and /lib. Since both of the environments variables can contain a
- * list of colon seperated paths, we simply concat them and the two other paths
- * into one big string, which we then can easily parse.
- * Splitting this string into the actual path list is done by getSearchPath()
- */
-static const char *searchList()
-{
-	size_t buf_size;
-	static char *buf=NULL;
-	const char *ldlp = safegetenv("LD_LIBRARY_PATH");
-	const char *dyldlp = safegetenv("DYLD_LIBRARY_PATH");
-	const char *stdpath = getenv("DYLD_FALLBACK_LIBRARY_PATH");
-	if (!stdpath)
-		stdpath = "/usr/local/lib:/lib:/usr/lib";
-	if (!buf)
-	{	
-		buf_size = strlen(ldlp) + strlen(dyldlp) + strlen(stdpath) + 4;
-		buf = malloc(buf_size);
-		snprintf(buf, buf_size, "%s%s%s%s%s%c", dyldlp, (dyldlp[0] ? ":" : ""), ldlp, (ldlp[0] ? ":" : ""),
-				 stdpath, '\0');
-	}
-	return buf;
-}
-
-/* Returns the ith search path from the list as computed by searchList() */
-static const char *getSearchPath(int i)
-{
-	static const char *list = 0;
-	static char **path = (char **)0;
-	static int end = 0;
-	static int numsize = MAX_SEARCH_PATHS;
-	static char **tmp;
-	/* So we can call free() in the "destructor" we use i=-1 to return the alloc'd array */
-	if (i == -1)
-	{
-		return (const char*)path;
-	}
-	if (!path)
-	{
-		path = (char **)calloc(MAX_SEARCH_PATHS, sizeof(char **));
-	}
-	if (!list && !end)
-		list = searchList();
-	if (i >= (numsize))
-	{
-		debug("Increasing size for long PATH");
-		tmp = (char **)calloc((MAX_SEARCH_PATHS + numsize), sizeof(char **));
-		if (tmp)
-		{
-			memcpy(tmp, path, sizeof(char **) * numsize);
-			free(path);
-			path = tmp;
-			numsize += MAX_SEARCH_PATHS;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	while (!path[i] && !end)
-	{
-		path[i] = strsep((char **)&list, ":");
-
-		if (path[i][0] == 0)
-			path[i] = 0;
-		end = (list == 0);
-	}
-	return path[i];
-}
-
-static const char *getFullPath(int i, const char *file)
-{
-	static char buf[PATH_MAX];
-	const char *path = getSearchPath(i);
-	if (path)
-	{
-		snprintf(buf, PATH_MAX, "%s/%s", path, file);
-	}
-	return path ? buf : 0;
-}
-
-/* Given a file name, try to determine the full path for that file. Starts
- * its search in the current directory, and then tries all paths in the 
- * search list in the order they are specified there.
- */
-static const struct stat *findFile(const char *file, const char **fullPath)
-{
-	int i = 0;
-	static struct stat sbuf;
-	char *fileName;
-	debug("finding file %s", file);
-	*fullPath = file;
-	if (0 == stat(file, &sbuf))
-		return &sbuf;
-	if (strchr(file, '/'))
-		return 0;				/* If the path had a / we don't look in env var places */
-	fileName = NULL;
-	if (!fileName)
-		fileName = (char *)file;
-	while ((*fullPath = getFullPath(i++, fileName)))
-	{
-		if (0 == stat(*fullPath, &sbuf))
-			return &sbuf;
-	}
-	;
-	return 0;
-}
-
-/* Determine whether a given dlstatus is valid or not */
-static int isValidStatus(struct dlstatus *status)
-{
-	/* Walk the list to verify status is contained in it */
-	struct dlstatus *dls = stqueue;
-	while (dls && status != dls)
-		dls = dls->next;
-	if (dls == 0)
-		error("invalid handle");
-	else if ((dls->module == 0) || (dls->refs == 0))
-		error("handle to closed library");
-	else
-		return TRUE;
-	return FALSE;
-}
-
-static inline int isFlagSet(int mode, int flag)
-{
-	return (mode & flag) == flag;
-}
-
-static struct dlstatus *lookupStatus(const struct stat *sbuf)
-{
-	struct dlstatus *dls = stqueue;
-	debug("looking for status");
-	while (dls && ( /* isFlagSet(dls->mode, RTLD_UNSHARED) */ 0
-				   || sbuf->st_dev != dls->device || sbuf->st_ino != dls->inode))
-		dls = dls->next;
-	return dls;
-}
-
-static void insertStatus(struct dlstatus *dls, const struct stat *sbuf)
-{
-	debug("inserting status");
-	dls->inode = sbuf->st_ino;
-	dls->device = sbuf->st_dev;
-	dls->refs = 0;
-	dls->mode = 0;
-	if ((dls->flags & DL_IN_LIST) == 0)
-	{
-		dls->next = stqueue;
-		stqueue = dls;
-		dls->flags |= DL_IN_LIST;
-	}
-}
-
-static struct dlstatus *allocStatus()
-{
-	struct dlstatus *dls;
-#ifdef REUSE_STATUS
-	dls = stqueue;
-	while (dls && dls->module)
-		dls = dls->next;
-	if (!dls)
-#endif
-		dls = malloc(sizeof(*dls));
-	dls->flags = 0;
-	return dls;
-}
-
-static int promoteLocalToGlobal(struct dlstatus *dls)
-{
-	static int (*p) (NSModule module) = 0;
-	debug("promoting");
-	if (!p)
-		_dyld_func_lookup("__dyld_NSMakePrivateModulePublic", (unsigned long *)&p);
-	return (dls->module == MAGIC_DYLIB_MOD) || (p && p(dls->module));
-}
-
-static void *reference(struct dlstatus *dls, int mode)
-{
-	if (dls)
-	{
-		if (dls->module == MAGIC_DYLIB_MOD && !isFlagSet(mode, RTLD_GLOBAL))
-		{
-			warning("trying to open a .dylib with RTLD_LOCAL");
-			error("unable to open a .dylib with RTLD_LOCAL");
-			return NULL;
-		}
-		if (isFlagSet(mode, RTLD_GLOBAL) &&
-			!isFlagSet(dls->mode, RTLD_GLOBAL) && !promoteLocalToGlobal(dls))
-		{
-			error("unable to promote local module to global");
-			return NULL;
-		}
-		dls->mode |= mode;
-		dls->refs++;
-	}
-	else
-		debug("reference called with NULL argument");
-
-	return dls;
-}
-
-static const struct mach_header *my_find_image(const char *name)
-{
-	const struct mach_header *mh = 0;
-	const char *id = NULL;
-	int i = _dyld_image_count();
-	int j;
-	mh = (struct mach_header *)
-		dyld_NSAddImage(name, NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED |
-						NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-	if (!mh)
-	{
-		for (j = 0; j < i; j++)
-		{
-			id = _dyld_get_image_name(j);
-			if (!strcmp(id, name))
-			{
-				mh = _dyld_get_image_header(j);
-				break;
-			}
-		}
-	}
-	return mh;
-}
-
-/*
- * dyld adds libraries by first adding the directly dependant libraries in link order, and
- * then adding the dependencies for those libraries, so we should do the same... but we don't
- * bother adding the extra dependencies, if the symbols are neither in the loaded image nor
- * any of it's direct dependencies, then it probably isn't there.
- */
-NSSymbol *search_linked_libs(const struct mach_header * mh, const char *symbol)
-{
-	int n;
-	struct load_command *lc = 0;
-	struct mach_header *wh;
-	NSSymbol *nssym = 0;
-	if (dyld_NSAddImage && dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
-	{
-		lc = (struct load_command *)((char *)mh + sizeof(struct mach_header));
-		for (n = 0; n < mh->ncmds; n++, lc = (struct load_command *)((char *)lc + lc->cmdsize))
-		{
-			if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
-			{
-				if ((wh = (struct mach_header *)
-					 my_find_image((char *)(((struct dylib_command *)lc)->dylib.name.offset +
-											(char *)lc))))
-				{
-					if (dyld_NSIsSymbolNameDefinedInImage(wh, symbol))
-					{
-						nssym = dyld_NSLookupSymbolInImage(wh,
-														   symbol,
-														   NSLOOKUPSYMBOLINIMAGE_OPTION_BIND |
-														   NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-						break;
-					}
-				}
-			}
-		}
-		if ((!nssym) && NSIsSymbolNameDefined(symbol))
-		{
-			/* I've never seen this debug message...*/
-			debug("Symbol \"%s\" is defined but was not found", symbol);
-		}
-	}
-	return nssym;
-}
-
-/* Up to the caller to free() returned string */
-static inline const char *dyld_error_str()
-{
-	NSLinkEditErrors dylder;
-	int dylderno;
-	const char *dylderrstr;
-	const char *dyldfile;
-	const char* retStr = NULL;
-	NSLinkEditError(&dylder, &dylderno, &dyldfile, &dylderrstr);
-	if (dylderrstr && strlen(dylderrstr))
-	{
-		retStr = malloc(strlen(dylderrstr) +1);
-		strcpy((char*)retStr,dylderrstr);
-	}
-	return retStr;
-}
-
-static void *dlsymIntern(struct dlstatus *dls, const char *symbol, int canSetError)
-{
-	NSSymbol *nssym = 0;
-	void *caller = __builtin_return_address(1);	/* Be *very* careful about inlining */
-	const struct mach_header *caller_mh = 0;
-	const char* savedErrorStr = NULL;
-	resetdlerror();
-#ifndef RTLD_SELF
-#define	RTLD_SELF		((void *) -3)
-#endif
-	if (NULL == dls)
-		dls = RTLD_SELF;
-	if ((RTLD_NEXT == dls) || (RTLD_SELF == dls))
-	{
-		if (dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
-		{
-			caller_mh = image_for_address(caller);
-			if (RTLD_SELF == dls)
-			{
-				/* FIXME: We should be using the NSModule api, if SELF is an MH_BUNDLE
-				 * But it appears to work anyway, and looking at the code in dyld_libfuncs.c
-				 * this is acceptable.
-				 */
-				if (dyld_NSIsSymbolNameDefinedInImage(caller_mh, symbol))
-				{
-					nssym = dyld_NSLookupSymbolInImage(caller_mh,
-													   symbol,
-													   NSLOOKUPSYMBOLINIMAGE_OPTION_BIND |
-													   NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-				}
-			}
-			if (!nssym)
-			{
-				if (RTLD_SELF == dls)
-					savedErrorStr = dyld_error_str();
-				nssym = search_linked_libs(caller_mh, symbol);
-			}
-		}
-		else
-		{
-			if (canSetError)
-				error("RTLD_SELF and RTLD_NEXT are not supported");
-			return NULL;
-		}
-	}
-	if (!nssym)
-	{
-
-		if (RTLD_DEFAULT == dls)
-		{
-			dls = &mainStatus;
-		}
-		if (!isValidStatus(dls))
-			return NULL;
-
-		if (dls->module != MAGIC_DYLIB_MOD)
-		{
-			nssym = NSLookupSymbolInModule(dls->module, symbol);
-			if (!nssym && NSIsSymbolNameDefined(symbol))
-			{
-				debug("Searching dependencies");
-				savedErrorStr = dyld_error_str();
-				nssym = search_linked_libs(get_mach_header_from_NSModule(dls->module), symbol);
-			}
-		}
-		else if (dls->lib && dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
-		{
-			if (dyld_NSIsSymbolNameDefinedInImage(dls->lib, symbol))
-			{
-				nssym = dyld_NSLookupSymbolInImage(dls->lib,
-												   symbol,
-												   NSLOOKUPSYMBOLINIMAGE_OPTION_BIND |
-												   NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-			}
-			else if (NSIsSymbolNameDefined(symbol))
-			{
-				debug("Searching dependencies");
-				savedErrorStr = dyld_error_str();
-				nssym = search_linked_libs(dls->lib, symbol);
-			}
-		}
-		else if (dls->module == MAGIC_DYLIB_MOD)
-		{
-			/* Global context, use NSLookupAndBindSymbol */
-			if (NSIsSymbolNameDefined(symbol))
-			{
-				/* There doesn't seem to be a return on error option for this call???
-				   this is potentially broken, if binding fails, it will improperly
-				   exit the application. */
-				nssym = NSLookupAndBindSymbol(symbol);
-			}
-			else
-			{
-				if (savedErrorStr)
-					free((char*)savedErrorStr);			
-				savedErrorStr = malloc(256);
-				snprintf((char*)savedErrorStr, 256, "Symbol \"%s\" not in global context",symbol);	
-			}
-		}
-	}
-	/* Error reporting */
-	if (!nssym)
-	{
-		if (!savedErrorStr || !strlen(savedErrorStr))
-		{
-			if (savedErrorStr)
-				free((char*)savedErrorStr);
-			savedErrorStr = malloc(256);
-			snprintf((char*)savedErrorStr, 256,"Symbol \"%s\" not found",symbol);
-		}
-		if (canSetError)
-		{
-			error(savedErrorStr);
-		}
-		else
-		{
-			debug(savedErrorStr);
-		}
-		if (savedErrorStr)
-			free((char*)savedErrorStr);
-		return NULL;
-	}
-	return NSAddressOfSymbol(nssym);
-}
-
-static struct dlstatus *loadModule(const char *path, const struct stat *sbuf, int mode)
-{
-	NSObjectFileImage ofi = 0;
-	NSObjectFileImageReturnCode ofirc;
-	struct dlstatus *dls;
-	NSLinkEditErrors ler;
-	int lerno;
-	const char *errstr;
-	const char *file;
-	void (*init) (void);
-	ofirc = NSCreateObjectFileImageFromFile(path, &ofi);
-	switch (ofirc)
-	{
-		case NSObjectFileImageSuccess:
-			break;
-		case NSObjectFileImageInappropriateFile:
-			if (dyld_NSAddImage && dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
-			{
-				if (!isFlagSet(mode, RTLD_GLOBAL))
-				{
-					warning("trying to open a .dylib with RTLD_LOCAL");
-					error("unable to open this file with RTLD_LOCAL");
-					return NULL;
-				}
-			}
-			else
-			{
-				error("opening this file is unsupported on this system");
-				return NULL;
-			}
-			break;
-		case NSObjectFileImageFailure:
-			error("object file setup failure");
-			return NULL;
-		case NSObjectFileImageArch:
-			error("no object for this architecture");
-			return NULL;
-		case NSObjectFileImageFormat:
-			error("bad object file format");
-			return NULL;
-		case NSObjectFileImageAccess:
-			error("can't read object file");
-			return NULL;
-		default:
-			error("unknown error from NSCreateObjectFileImageFromFile()");
-			return NULL;
-	}
-	dls = lookupStatus(sbuf);
-	if (!dls)
-	{
-		dls = allocStatus();
-	}
-	if (!dls)
-	{
-		error("unable to allocate memory");
-		return NULL;
-	}
-	dls->lib = 0;
-	if (ofirc == NSObjectFileImageInappropriateFile)
-	{
-		if ((dls->lib = dyld_NSAddImage(path, NSADDIMAGE_OPTION_RETURN_ON_ERROR)))
-		{
-			debug("Dynamic lib loaded at %ld", dls->lib);
-			ofi = MAGIC_DYLIB_OFI;
-			dls->module = MAGIC_DYLIB_MOD;
-			ofirc = NSObjectFileImageSuccess;
-			/* Although it is possible with a bit of work to modify this so it works and
-			   functions with RTLD_NOW, I don't deem it necessary at the moment */
-		}
-		if (!(dls->module))
-		{
-			NSLinkEditError(&ler, &lerno, &file, &errstr);
-			if (!errstr || (!strlen(errstr)))
-				error("Can't open this file type");
-			else
-				error(errstr);
-			if ((dls->flags & DL_IN_LIST) == 0)
-			{
-				free(dls);
-			}
-			return NULL;
-		}
-	}
-	else
-	{
-		dls->module = NSLinkModule(ofi, path,
-								   NSLINKMODULE_OPTION_RETURN_ON_ERROR |
-								   NSLINKMODULE_OPTION_PRIVATE |
-								   (isFlagSet(mode, RTLD_NOW) ? NSLINKMODULE_OPTION_BINDNOW : 0));
-		NSDestroyObjectFileImage(ofi);
-		if (dls->module)
-		{
-			dls->lib = get_mach_header_from_NSModule(dls->module);
-		}
-	}
-	if (!dls->module)
-	{
-		NSLinkEditError(&ler, &lerno, &file, &errstr);
-		if ((dls->flags & DL_IN_LIST) == 0)
-		{
-			free(dls);
-		}
-		error(errstr);
-		return NULL;
-	}
-
-	insertStatus(dls, sbuf);
-	dls = reference(dls, mode);
-	if ((init = dlsymIntern(dls, "__init", 0)))
-	{
-		debug("calling _init()");
-		init();
-	}
-	return dls;
-}
-
-static void dlcompat_init_func(void)
-{
-	static int inited = 0;
-	if (!inited)
-	{
-		inited = 1;
-		_dyld_func_lookup("__dyld_NSAddImage", (unsigned long *)&dyld_NSAddImage);
-		_dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",
-						  (unsigned long *)&dyld_NSIsSymbolNameDefinedInImage);
-		_dyld_func_lookup("__dyld_NSLookupSymbolInImage", (unsigned long *)&dyld_NSLookupSymbolInImage);
-		if (pthread_mutex_init(&dlcompat_mutex, NULL))
-			exit(1);
-		if (pthread_key_create(&dlerror_key, &dlerrorfree))
-			exit(1);
-		/* And be neat and tidy and clean up after ourselves */	
-		atexit(dlcompat_cleanup);
-	}
-}
-
-#pragma CALL_ON_LOAD dlcompat_init_func
-
-static void dlcompat_cleanup(void)
-{
-	struct dlstatus *dls;
-	struct dlstatus *next;
-	char *data;
-	data = (char *)searchList();
-	if ( data )
-		free( data );
-	data = 	(char *)getSearchPath(-1);
-	if ( data )
-		free( data );
-	pthread_mutex_destroy(&dlcompat_mutex);
-	pthread_key_delete(dlerror_key);
-	next = stqueue;
-	while (next && (next != &mainStatus))
-	{
-		dls = next;
-		next = dls->next;
-		free(dls);
-	}
-}
-
-static void resetdlerror()
-{
-	struct dlthread *tss;
-	tss = pthread_getspecific(dlerror_key);
-	tss->errset = 0;
-}
-
-static void dlerrorfree(void *data)
-{
-	free(data);
-}
-
-/* We kind of want a recursive lock here, but meet a little trouble
- * because they are not available pre OS X 10.2, so we fake it
- * using thread specific storage to keep a lock count
- */ 
-static inline void dolock(void)
-{
-	int err = 0;
-	struct dlthread *tss;
-	tss = pthread_getspecific(dlerror_key);
-	if (!tss)
-	{
-		tss = malloc(sizeof(struct dlthread));
-		tss->lockcnt = 0;
-		tss->errset = 0;
-		if (pthread_setspecific(dlerror_key, tss))
-		{
-			fprintf(stderr,"dlcompat: pthread_setspecific failed\n");
-			exit(1);
-		}
-	}
-	if (!tss->lockcnt)
-		err = pthread_mutex_lock(&dlcompat_mutex);
-	tss->lockcnt = tss->lockcnt +1;	
-	if (err)
-		exit(err);
-}
-
-static inline void dounlock(void)
-{
-	int err = 0;
-	struct dlthread *tss;
-	tss = pthread_getspecific(dlerror_key);
-	tss->lockcnt = tss->lockcnt -1;
-	if (!tss->lockcnt)
-		err = pthread_mutex_unlock(&dlcompat_mutex);
-	if (err)
-		exit(err);
-}
-
-void *dlopen(const char *path, int mode)
-{
-	const struct stat *sbuf;
-	struct dlstatus *dls;
-	const char *fullPath;
-	dlcompat_init_func();		/* Just in case */
-	dolock();
-	resetdlerror();
-	if (!path)
-	{
-		dls = &mainStatus;
-		goto dlopenok;
-	}
-	if (!(sbuf = findFile(path, &fullPath)))
-	{
-		error("file \"%s\" not found", path);
-		goto dlopenerror;
-	}
-	/* Now checks that it hasn't been closed already */
-	if ((dls = lookupStatus(sbuf)) && (dls->refs > 0))
-	{
-		/* debug("status found"); */
-		dls = reference(dls, mode);
-		goto dlopenok;
-	}
-#ifdef 	RTLD_NOLOAD
-	if (isFlagSet(mode, RTLD_NOLOAD))
-	{
-		error("no existing handle and RTLD_NOLOAD specified");
-		goto dlopenerror;
-	}
-#endif
-	if (isFlagSet(mode, RTLD_LAZY) && isFlagSet(mode, RTLD_NOW))
-	{
-		error("how can I load something both RTLD_LAZY and RTLD_NOW?");
-		goto dlopenerror;
-	}
-	dls = loadModule(fullPath, sbuf, mode);
-	
-  dlopenok:
-	dounlock();
-	return (void *)dls;
-  dlopenerror:
-	dounlock();
-	return NULL;
-}
-
-#if !FINK_BUILD
-void *dlsym(void * dl_restrict handle, const char * dl_restrict symbol)
-{
-	int sym_len = strlen(symbol);
-	void *value = NULL;
-	char *malloc_sym = NULL;
-	dolock();
-	malloc_sym = malloc(sym_len + 2);
-	if (malloc_sym)
-	{
-		sprintf(malloc_sym, "_%s", symbol);
-		value = dlsymIntern(handle, malloc_sym, 1);
-		free(malloc_sym);
-	}
-	else
-	{
-		error("Unable to allocate memory");
-		goto dlsymerror;
-	}
-	dounlock();
-	return value;
-  dlsymerror:
-	dounlock();
-	return NULL;
-}
-#endif
-
-#if FINK_BUILD
-
-void *dlsym_prepend_underscore(void *handle, const char *symbol)
-{
-	void *answer;
-	dolock();
-	answer = dlsym_prepend_underscore_intern(handle, symbol);
-	dounlock();
-	return answer;
-}
-
-static void *dlsym_prepend_underscore_intern(void *handle, const char *symbol)
-{
-/*
- *	A quick and easy way for porting packages which call dlsym(handle,"sym")
- *	If the porter adds -Ddlsym=dlsym_prepend_underscore to the CFLAGS then
- *	this function will be called, and will add the required underscore.
- *	
- *	Note that I haven't figured out yet which should be "standard", prepend
- *	the underscore always, or not at all. These global functions need to go away
- *	for opendarwin.
- */
-	int sym_len = strlen(symbol);
-	void *value = NULL;
-	char *malloc_sym = NULL;
-	malloc_sym = malloc(sym_len + 2);
-	if (malloc_sym)
-	{
-		sprintf(malloc_sym, "_%s", symbol);
-		value = dlsymIntern(handle, malloc_sym, 1);
-		free(malloc_sym);
-	}
-	else
-	{
-		error("Unable to allocate memory");
-	}
-	return value;
-}
-
-void *dlsym_auto_underscore(void *handle, const char *symbol)
-{
-	void *answer;
-	dolock();
-	answer = dlsym_auto_underscore_intern(handle, symbol);
-	dounlock();
-	return answer;
-
-}
-static void *dlsym_auto_underscore_intern(void *handle, const char *symbol)
-{
-	struct dlstatus *dls = handle;
-	void *addr = 0;
-	addr = dlsymIntern(dls, symbol, 0);
-	if (!addr)
-		addr = dlsym_prepend_underscore_intern(handle, symbol);
-	return addr;
-}
-
-
-void *dlsym(void * dl_restrict handle, const char * dl_restrict symbol)
-{
-	struct dlstatus *dls = handle;
-	void *addr = 0;
-	dolock();
-	addr = dlsymIntern(dls, symbol, 1);
-	dounlock();
-	return addr;
-}
-#endif
-
-int dlclose(void *handle)
-{
-	struct dlstatus *dls = handle;
-	dolock();
-	resetdlerror();
-	if (!isValidStatus(dls))
-	{
-		goto dlcloseerror;
-	}
-	if (dls->module == MAGIC_DYLIB_MOD)
-	{
-		const char *name;
-		if (!dls->lib)
-		{
-			name = "global context";
-		}
-		else
-		{
-			name = get_lib_name(dls->lib);
-		}
-		warning("trying to close a .dylib!");
-		error("Not closing \"%s\" - dynamic libraries cannot be closed", name);
-		goto dlcloseerror;
-	}
-	if (!dls->module)
-	{
-		error("module already closed");
-		goto dlcloseerror;
-	}
-	
-	if (dls->refs == 1)
-	{
-		unsigned long options = 0;
-		void (*fini) (void);
-		if ((fini = dlsymIntern(dls, "__fini", 0)))
-		{
-			debug("calling _fini()");
-			fini();
-		}
-#ifdef __ppc__
-		options |= NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
-#endif
-#if 1
-/*  Currently, if a module contains c++ static destructors and it is unloaded, we
- *  get a segfault in atexit(), due to compiler and dynamic loader differences of
- *  opinion, this works around that.
- *  I really need a way to figure out from code if this is still necessary.
- */
-		if ((const struct section *)NULL !=
-			getsectbynamefromheader(get_mach_header_from_NSModule(dls->module),
-									"__DATA", "__mod_term_func"))
-		{
-			options |= NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
-		}
-#endif
-#ifdef RTLD_NODELETE
-		if (isFlagSet(dls->mode, RTLD_NODELETE))
-			options |= NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
-#endif
-		if (!NSUnLinkModule(dls->module, options))
-		{
-			error("unable to unlink module");
-			goto dlcloseerror;
-		}
-		dls->refs--;
-		dls->module = 0;
-		/* Note: the dlstatus struct dls is neither removed from the list
-		 * nor is the memory it occupies freed. This shouldn't pose a 
-		 * problem in mostly all cases, though.
-		 */
-	}
-	dounlock();
-	return 0;
-  dlcloseerror:
-	dounlock();
-	return 1;
-}
-
-const char *dlerror(void)
-{
-	struct dlthread  *tss;
-	char * err_str;
-	tss = pthread_getspecific(dlerror_key);
-	err_str = tss->errstr;
-	tss = pthread_getspecific(dlerror_key);
-	if (tss->errset == 0)
-		return 0;
-	tss->errset = 0;	
-	return (err_str );
-}
-
-/* Given an address, return the mach_header for the image containing it
- * or zero if the given address is not contained in any loaded images.
- */
-const struct mach_header *image_for_address(const void *address)
-{
-	unsigned long i;
-	unsigned long j;
-	unsigned long count = _dyld_image_count();
-	struct mach_header *mh = 0;
-	struct load_command *lc = 0;
-	unsigned long addr = NULL;
-	for (i = 0; i < count; i++)
-	{
-		addr = (unsigned long)address - _dyld_get_image_vmaddr_slide(i);
-		mh = _dyld_get_image_header(i);
-		if (mh)
-		{
-			lc = (struct load_command *)((char *)mh + sizeof(struct mach_header));
-			for (j = 0; j < mh->ncmds; j++, lc = (struct load_command *)((char *)lc + lc->cmdsize))
-			{
-				if (LC_SEGMENT == lc->cmd &&
-					addr >= ((struct segment_command *)lc)->vmaddr &&
-					addr <
-					((struct segment_command *)lc)->vmaddr + ((struct segment_command *)lc)->vmsize)
-				{
-					goto image_found;
-				}
-			}
-		}
-		mh = 0;
-	}
-  image_found:
-	return mh;
-}
-
-int dladdr(const void * dl_restrict p, Dl_info * dl_restrict info)
-{
-/*
-	FIXME: USe the routine image_for_address.
-*/
-	unsigned long i;
-	unsigned long j;
-	unsigned long count = _dyld_image_count();
-	struct mach_header *mh = 0;
-	struct load_command *lc = 0;
-	unsigned long addr = NULL;
-	unsigned long table_off = (unsigned long)0;
-	int found = 0;
-	if (!info)
-		return 0;
-	dolock();
-	resetdlerror();
-	info->dli_fname = 0;
-	info->dli_fbase = 0;
-	info->dli_sname = 0;
-	info->dli_saddr = 0;
-/* Some of this was swiped from code posted by Douglas Davidson <ddavidso AT apple DOT com>
- * to darwin-development AT lists DOT apple DOT com and slightly modified
- */
-	for (i = 0; i < count; i++)
-	{
-		addr = (unsigned long)p - _dyld_get_image_vmaddr_slide(i);
-		mh = _dyld_get_image_header(i);
-		if (mh)
-		{
-			lc = (struct load_command *)((char *)mh + sizeof(struct mach_header));
-			for (j = 0; j < mh->ncmds; j++, lc = (struct load_command *)((char *)lc + lc->cmdsize))
-			{
-				if (LC_SEGMENT == lc->cmd &&
-					addr >= ((struct segment_command *)lc)->vmaddr &&
-					addr <
-					((struct segment_command *)lc)->vmaddr + ((struct segment_command *)lc)->vmsize)
-				{
-					info->dli_fname = _dyld_get_image_name(i);
-					info->dli_fbase = (void *)mh;
-					found = 1;
-					break;
-				}
-			}
-			if (found)
-				break;
-		}
-	}
-	if (!found)
-	{
-		dounlock();
-		return 0;
-	}
-	lc = (struct load_command *)((char *)mh + sizeof(struct mach_header));
-	for (j = 0; j < mh->ncmds; j++, lc = (struct load_command *)((char *)lc + lc->cmdsize))
-	{
-		if (LC_SEGMENT == lc->cmd)
-		{
-			if (!strcmp(((struct segment_command *)lc)->segname, "__LINKEDIT"))
-				break;
-		}
-	}
-	table_off =
-		((unsigned long)((struct segment_command *)lc)->vmaddr) -
-		((unsigned long)((struct segment_command *)lc)->fileoff) + _dyld_get_image_vmaddr_slide(i);
-	debug("table off %x", table_off);
-
-	lc = (struct load_command *)((char *)mh + sizeof(struct mach_header));
-	for (j = 0; j < mh->ncmds; j++, lc = (struct load_command *)((char *)lc + lc->cmdsize))
-	{
-		if (LC_SYMTAB == lc->cmd)
-		{
-
-			struct nlist *symtable = (struct nlist *)(((struct symtab_command *)lc)->symoff + table_off);
-			unsigned long numsyms = ((struct symtab_command *)lc)->nsyms;
-			struct nlist *nearest = NULL;
-			unsigned long diff = 0xffffffff;
-			unsigned long strtable = (unsigned long)(((struct symtab_command *)lc)->stroff + table_off);
-			debug("symtable %x", symtable);
-			for (i = 0; i < numsyms; i++)
-			{
-				/* Ignore the following kinds of Symbols */
-				if ((!symtable->n_value)	/* Undefined */
-					|| (symtable->n_type >= N_PEXT)	/* Debug symbol */
-					|| (!(symtable->n_type & N_EXT))	/* Local Symbol */
-					)
-				{
-					symtable++;
-					continue;
-				}
-				if ((addr >= symtable->n_value) && (diff >= (symtable->n_value - addr)))
-				{
-					diff = (unsigned long)symtable->n_value - addr;
-					nearest = symtable;
-				}
-				symtable++;
-			}
-			if (nearest)
-			{
-				info->dli_saddr = nearest->n_value + ((void *)p - addr);
-				info->dli_sname = (char *)(strtable + nearest->n_un.n_strx);
-			}
-		}
-	}
-	dounlock();
-	return 1;
-}
-
-
-/*
- * Implement the dlfunc() interface, which behaves exactly the same as
- * dlsym() except that it returns a function pointer instead of a data
- * pointer.  This can be used by applications to avoid compiler warnings
- * about undefined behavior, and is intended as prior art for future
- * POSIX standardization.  This function requires that all pointer types
- * have the same representation, which is true on all platforms FreeBSD
- * runs on, but is not guaranteed by the C standard.
- */
-#if 0 
-dlfunc_t dlfunc(void * dl_restrict handle, const char * dl_restrict symbol)
-{
-	union
-	{
-		void *d;
-		dlfunc_t f;
-	} rv;
-	int sym_len = strlen(symbol);
-	char *malloc_sym = NULL;
-	dolock();
-	malloc_sym = malloc(sym_len + 2);
-	if (malloc_sym)
-	{
-		sprintf(malloc_sym, "_%s", symbol);
-		rv.d = dlsymIntern(handle, malloc_sym, 1);
-		free(malloc_sym);
-	}
-	else
-	{
-		error("Unable to allocate memory");
-		goto dlfuncerror;
-	}
-	dounlock();
-	return rv.f;
-  dlfuncerror:
-	dounlock();
-	return NULL;
-}
-#endif
diff --git a/lib-src/dlcompat/dlfcn.h b/lib-src/dlcompat/dlfcn.h
deleted file mode 100644
index 40dfd05..0000000
--- a/lib-src/dlcompat/dlfcn.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2002 Jorge Acereda  <jacereda at users.sourceforge.net> &
-                   Peter O'Gorman <ogorman at users.sourceforge.net>
-                   
-Portions may be copyright others, see the AUTHORS file included with this
-distribution.
-
-Maintained by Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Bug Reports and other queries should go to <ogorman at users.sourceforge.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef _DLFCN_H_
-#define _DLFCN_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (__GNUC__) && __GNUC__ > 3
-#define dl_restrict __restrict
-#else
-#define dl_restrict
-#endif
-/*
- * Structure filled in by dladdr().
- */
-
-typedef struct dl_info {
-        const char      *dli_fname;     /* Pathname of shared object */
-        void            *dli_fbase;     /* Base address of shared object */
-        const char      *dli_sname;     /* Name of nearest symbol */
-        void            *dli_saddr;     /* Address of nearest symbol */
-} Dl_info;
-
-extern void * dlopen(const char *path, int mode);
-extern void * dlsym(void * dl_restrict handle, const char * dl_restrict symbol);
-extern const char * dlerror(void);
-extern int dlclose(void * handle);
-extern int dladdr(const void * dl_restrict, Dl_info * dl_restrict);
-
-#define RTLD_LAZY	0x1
-#define RTLD_NOW	0x2
-#define RTLD_LOCAL	0x4
-#define RTLD_GLOBAL	0x8
-#define RTLD_NOLOAD	0x10
-#define RTLD_NODELETE	0x80
-
-/*
- * Special handle arguments for dlsym().
- */
-#define	RTLD_NEXT		((void *) -1)	/* Search subsequent objects. */
-#define	RTLD_DEFAULT	((void *) -2)	/* Use default search algorithm. */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DLFCN_H_ */
diff --git a/lib-src/dlcompat/dlfcn_simple.c b/lib-src/dlcompat/dlfcn_simple.c
deleted file mode 100644
index 5d31d8a..0000000
--- a/lib-src/dlcompat/dlfcn_simple.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-Copyright (c) 2002 Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-
-/* Just to prove that it isn't that hard to add Mac calls to your code :)
-   This works with pretty much everything, including kde3 xemacs and the gimp,
-   I'd guess that it'd work in at least 95% of cases, use this as your starting
-   point, rather than the mess that is dlfcn.c, assuming that your code does not
-   require ref counting or symbol lookups in dependent libraries
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <mach-o/dyld.h>
-#include "dlfcn.h"
-
-#define ERR_STR_LEN 256
-static void *dlsymIntern(void *handle, const char *symbol);
-static const char *error(int setget, const char *str, ...);
-
-
-
-/* Set and get the error string for use by dlerror */
-static const char *error(int setget, const char *str, ...)
-{
-	static char errstr[ERR_STR_LEN];
-	static int err_filled = 0;
-	const char *retval;
-	NSLinkEditErrors ler;
-	int lerno;
-	const char *dylderrstr;
-	const char *file;
-	va_list arg;
-	if (setget <= 0)
-	{
-		va_start(arg, str);
-		strncpy(errstr, "dlsimple: ", ERR_STR_LEN);
-		vsnprintf(errstr + 10, ERR_STR_LEN - 10, str, arg);
-		va_end(arg);
-	/* We prefer to use the dyld error string if getset is 1*/
-		if (setget == 0) {
-			NSLinkEditError(&ler, &lerno, &file, &dylderrstr);
-			fprintf(stderr,"dyld: %s\n",dylderrstr);
-			if (dylderrstr && strlen(dylderrstr))
-				strncpy(errstr,dylderrstr,ERR_STR_LEN);
-		}		
-		err_filled = 1;
-		retval = NULL;
-	}
-	else
-	{
-		if (!err_filled)
-			retval = NULL;
-		else
-			retval = errstr;
-		err_filled = 0;
-	}
-	return retval;
-}
-
-/* dlopen */
-void *dlopen(const char *path, int mode)
-{
-	void *module = 0;
-	NSObjectFileImage ofi = 0;
-	NSObjectFileImageReturnCode ofirc;
-	static int (*make_private_module_public) (NSModule module) = 0;
-	unsigned int flags =  NSLINKMODULE_OPTION_RETURN_ON_ERROR | NSLINKMODULE_OPTION_PRIVATE;
-
-	/* If we got no path, the app wants the global namespace, use -1 as the marker
-	   in this case */
-	if (!path)
-		return (void *)-1;
-
-	/* Create the object file image, works for things linked with the -bundle arg to ld */
-	ofirc = NSCreateObjectFileImageFromFile(path, &ofi);
-	switch (ofirc)
-	{
-		case NSObjectFileImageSuccess:
-			/* It was okay, so use NSLinkModule to link in the image */
-			if (!(mode & RTLD_LAZY)) flags += NSLINKMODULE_OPTION_BINDNOW;
-			module = NSLinkModule(ofi, path,flags);
-			/* Don't forget to destroy the object file image, unless you like leaks */
-			NSDestroyObjectFileImage(ofi);
-			/* If the mode was global, then change the module, this avoids
-			   multiply defined symbol errors to first load private then make
-			   global. Silly, isn't it. */
-			if ((mode & RTLD_GLOBAL))
-			{
-			  if (!make_private_module_public)
-			  {
-			    _dyld_func_lookup("__dyld_NSMakePrivateModulePublic", 
-				(unsigned long *)&make_private_module_public);
-			  }
-			  make_private_module_public(module);
-			}
-			break;
-		case NSObjectFileImageInappropriateFile:
-			/* It may have been a dynamic library rather than a bundle, try to load it */
-			module = (void *)NSAddImage(path, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-			break;
-		case NSObjectFileImageFailure:
-			error(0,"Object file setup failure :  \"%s\"", path);
-			return 0;
-		case NSObjectFileImageArch:
-			error(0,"No object for this architecture :  \"%s\"", path);
-			return 0;
-		case NSObjectFileImageFormat:
-			error(0,"Bad object file format :  \"%s\"", path);
-			return 0;
-		case NSObjectFileImageAccess:
-			error(0,"Can't read object file :  \"%s\"", path);
-			return 0;		
-	}
-	if (!module)
-		error(0, "Can not open \"%s\"", path);
-	return module;
-}
-
-/* dlsymIntern is used by dlsym to find the symbol */
-void *dlsymIntern(void *handle, const char *symbol)
-{
-	NSSymbol *nssym = 0;
-	/* If the handle is -1, if is the app global context */
-	if (handle == (void *)-1)
-	{
-		/* Global context, use NSLookupAndBindSymbol */
-		if (NSIsSymbolNameDefined(symbol))
-		{
-			nssym = NSLookupAndBindSymbol(symbol);
-		}
-
-	}
-	/* Now see if the handle is a struch mach_header* or not, use NSLookupSymbol in image
-	   for libraries, and NSLookupSymbolInModule for bundles */
-	else
-	{
-		/* Check for both possible magic numbers depending on x86/ppc byte order */
-		if ((((struct mach_header *)handle)->magic == MH_MAGIC) ||
-			(((struct mach_header *)handle)->magic == MH_CIGAM))
-		{
-			if (NSIsSymbolNameDefinedInImage((struct mach_header *)handle, symbol))
-			{
-				nssym = NSLookupSymbolInImage((struct mach_header *)handle,
-											  symbol,
-											  NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-											  | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-			}
-
-		}
-		else
-		{
-			nssym = NSLookupSymbolInModule(handle, symbol);
-		}
-	}
-	if (!nssym)
-	{
-		error(0, "Symbol \"%s\" Not found", symbol);
-		return NULL;
-	}
-	return NSAddressOfSymbol(nssym);
-}
-
-const char *dlerror(void)
-{
-	return error(1, (char *)NULL);
-}
-
-int dlclose(void *handle)
-{
-	if ((((struct mach_header *)handle)->magic == MH_MAGIC) ||
-		(((struct mach_header *)handle)->magic == MH_CIGAM))
-	{
-		error(-1, "Can't remove dynamic libraries on darwin");
-		return 0;
-	}
-	if (!NSUnLinkModule(handle, 0))
-	{
-		error(0, "unable to unlink module %s", NSNameOfModule(handle));
-		return 1;
-	}
-	return 0;
-}
-
-
-/* dlsym, prepend the underscore and call dlsymIntern */
-void *dlsym(void *handle, const char *symbol)
-{
-	static char undersym[257];	/* Saves calls to malloc(3) */
-	int sym_len = strlen(symbol);
-	void *value = NULL;
-	char *malloc_sym = NULL;
-
-	if (sym_len < 256)
-	{
-		snprintf(undersym, 256, "_%s", symbol);
-		value = dlsymIntern(handle, undersym);
-	}
-	else
-	{
-		malloc_sym = malloc(sym_len + 2);
-		if (malloc_sym)
-		{
-			sprintf(malloc_sym, "_%s", symbol);
-			value = dlsymIntern(handle, malloc_sym);
-			free(malloc_sym);
-		}
-		else
-		{
-			error(-1, "Unable to allocate memory");
-		}
-	}
-	return value;
-}
diff --git a/lib-src/dlcompat/dlopen.3.in b/lib-src/dlcompat/dlopen.3.in
deleted file mode 100644
index 837f58a..0000000
--- a/lib-src/dlcompat/dlopen.3.in
+++ /dev/null
@@ -1,344 +0,0 @@
-.\" This source code is a product of Sun Microsystems, Inc. and is provided
-.\" for unrestricted use provided that this legend is included on all tape
-.\" media and as a part of the software program in whole or part.  Users
-.\" may copy or modify this source code without charge, but are not authorized
-.\" to license or distribute it to anyone else except as part of a product or
-.\" program developed by the user.
-.\"
-.\" THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
-.\" SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
-.\" OF SUCH SOURCE CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT
-.\" EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  SUN MICROSYSTEMS, INC. DISCLAIMS
-.\" ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN
-.\" NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
-.\" INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-.\" FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
-.\"
-.\" This source code is provided with no support and without any obligation on
-.\" the part of Sun Microsystems, Inc. to assist in its use, correction,
-.\" modification or enhancement.
-.\"
-.\" SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-.\" INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
-.\" SOURCE CODE OR ANY PART THEREOF.
-.\"
-.\" Sun Microsystems, Inc.
-.\" 2550 Garcia Avenue
-.\" Mountain View, California 94043
-.\"
-.\" Copyright (c) 1991 Sun Microsystems, Inc.
-.\"
-.\" @(#) dlopen.3 1.6 90/01/31 SMI
-.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.21 2002/05/29 19:35:13 wollman Exp $
-.\"
-.Dd June 8, 2003
-.Os
-.Dt DLOPEN 3
-.Sh NAME
-.Nm dlopen ,
-.Nm dlsym ,
-.\" .Nm dlfunc ,
-.Nm dlerror ,
-.Nm dlclose
-.Nd programmatic interface to the dynamic linker
-.Sh SYNOPSIS
-.In dlfcn.h
-.Ft void *
-.Fn dlopen "const char *path" "int mode"
-.Ft void *
-.Fn dlsym "void * restrict handle" "const char * restrict symbol"
-.\" .Ft dlfunc_t
-.\" .Fn dlfunc "void * restrict handle" "const char * restrict symbol"
-.Ft const char *
-.Fn dlerror "void"
-.Ft int
-.Fn dlclose "void *handle"
-.Sh DESCRIPTION
-These functions provide a simple programmatic interface to the services of the
-dynamic linker.
-Operations are provided to add new shared objects to a
-program's address space, to obtain the address bindings of symbols
-defined by such
-objects, and to remove such objects when their use is no longer required.
-All these functions use the native
-.Xr dyld 3 , 
-.Xr NSModule 3 ,
-and
-.Xr NSObjectFileImage 3
-functions to provide a compatibility library so that common unix source code may be
-easily compiled.
-.Pp
-New code should use the native functions, not this compatibility layer, see the above
-manual pages for usage.
-.Pp
-.Fn dlopen
-provides access to the shared object in
-.Fa path ,
-returning a descriptor that can be used for later
-references to the object in calls to
-.Fn dlsym
-and
-.Fn dlclose .
-If
-.Fa path
-was not in the address space prior to the call to
-.Fn dlopen ,
-it is placed in the address space.
-When an object is first loaded into the address space in this way, its
-function
-.Fn _init ,
-if any, is called.
-If
-.Fa path
-has already been placed in the address space in a previous call to
-.Fn dlopen ,
-it is not added a second time, although a reference count of
-.Fn dlopen
-operations on
-.Fa path
-is maintained.
-A null pointer supplied for
-.Fa path
-is interpreted as a reference to the main
-executable of the process.
-.Fa mode
-controls the way in which external function references from the
-loaded object are bound to their referents.
-It must contain one of the following values, possibly ORed with
-additional flags which will be described subsequently:
-.Bl -tag -width RTLD_LAZYX
-.It Dv RTLD_LAZY
-Each external function reference is resolved when the function is first
-called.
-.It Dv RTLD_NOW
-All external function references are bound immediately by
-.Fn dlopen .
-.El
-.Pp
-.Dv RTLD_LAZY
-is normally preferred, for reasons of efficiency.
-However,
-.Dv RTLD_NOW
-is useful to ensure that any undefined symbols are discovered during the
-call to
-.Fn dlopen .
-.Pp
-One of the following flags may be ORed into the
-.Fa mode
-argument:
-.Bl -tag -width RTLD_GLOBALX
-.It Dv RTLD_GLOBAL
-Symbols from this shared object and its directed acyclic graph (DAG)
-of needed objects will be available for resolving undefined references
-from all other shared objects. This is the only opion available for objects
-linked with the -dylib flag to
-.Xr ld 1
-.It Dv RTLD_LOCAL
-Symbols in this shared object and its DAG of needed objects will be
-available for resolving undefined references only from other objects
-in the same DAG.  This is the default for objects linked with the -bundle
-flag to
-.Xr ld 1
-but it may be set explicitly with this flag.
-.El
-.Pp
-If
-.Fn dlopen
-fails, it returns a null pointer, and sets an error condition which may
-be interrogated with
-.Fn dlerror .
-.Pp
-The
-.Fn dlsym
-returns the address binding of the symbol described in the null-terminated
-character string
-.Fa symbol ,
-as it occurs in the shared object identified by
-.Fa handle .
-The symbols exported by objects added to the address space by
-.Fn dlopen
-can be accessed only through calls to
-.Fn dlsym .
-Such symbols do not supersede any definition of those symbols already present
-in the address space when the object is loaded, nor are they available to
-satisfy normal dynamic linking references.
-.Pp
-See the note about underscores and C symbols,
-.Fn dlsym
-.\" and
-.\" .Fn dlfunc
-may or may not need to be called with an underscore prepended to the C function
-name, depending upon how this package was configured.
-.Pp
-If
-.Fn dlsym
-is called with the special
-.Fa handle
-.Dv RTLD_NEXT ,
-then the search for the symbol is limited to the shared objects
-which were loaded after the one issuing the call to
-.Fn dlsym .
-Thus, if the function is called from the main program, all
-the shared libraries are searched.
-If it is called from a shared library, all subsequent shared
-libraries are searched.
-.Dv RTLD_NEXT
-is useful for implementing wrappers around library functions.
-For example, a wrapper function
-.Fn getpid
-could access the
-.Dq real
-.Fn getpid
-with
-.Li dlsym(RTLD_NEXT, \&"getpid\&") .
-.\" (Actually, the
-.\" .Fn dlfunc
-.\" interface, below, should be used, since
-.\" .Fn getpid
-.\" is a function and not a data object.)
-.Pp
-If
-.Fn dlsym
-is called with the special
-.Fa handle
-.Dv RTLD_SELF ,
-then the search for the symbol is limited to the shared object
-issuing the call to
-.Fn dlsym
-and those shared objects which were loaded after it.
-.Pp
-The
-.Fn dlsym
-function
-returns a null pointer if the symbol cannot be found, and sets an error
-condition which may be queried with
-.Fn dlerror .
-.Pp
-.\" The
-.\" .Fn dlfunc
-.\" function
-.\" implements all of the behavior of
-.\" .Fn dlsym ,
-.\" but has a return type which can be cast to a function pointer without
-.\" triggering compiler diagnostics.
-.\" (The
-.\" .Fn dlsym
-.\" function
-.\" returns a data pointer; in the C standard, conversions between
-.\" data and function pointer types are undefined.
-.\" Some compilers and
-.\" .Xr lint 1
-.\" utilities warn about such casts.)
-.\" The precise return type of
-.\" .Fn dlfunc
-.\" is unspecified; applications must cast it to an appropriate function pointer
-.\" type.
-.Pp
-The
-.Fn dlerror
-returns a null-terminated character string describing the last error that
-occurred during a call to
-.Fn dlopen ,
-.Fn dlsym ,
-or
-.Fn dlclose .
-If no such error has occurred,
-.Fn dlerror
-returns a null pointer.
-At each call to
-.Fn dlerror ,
-the error indication is reset.  Thus in the case of two calls
-to
-.Fn dlerror ,
-where the second call follows the first immediately, the second call
-will always return a null pointer.
-.Pp
-.Fn dlclose
-deletes a reference to the shared object referenced by
-.Fa handle .
-If the reference count drops to 0, the object is removed from the
-address space, and
-.Fa handle
-is rendered invalid.
-Just before removing a shared object in this way, the object's
-.Fn _fini
-function is called, if such a function is defined by the object.
-If
-.Fn dlclose
-is successful, it returns a value of 0.
-Otherwise it returns -1, and sets an error condition that can be
-interrogated with
-.Fn dlerror .
-.Pp
-The object-intrinsic functions
-.Fn _init
-and
-.Fn _fini
-are called with no arguments, and are not expected to return values.
-.Sh NOTES
-In darwin objects, C symbols have an underscore prepended to the symbol name.
-So, the function 
-.Fn getpid
-ends up in the object file as _getpid
-Most code assumes that there is no underscore and calls
-.Fn dlsym
-with
-.Fa symbol
-as \&"getpid\&" which would fail to find the symbol.
-.Pp
-Depending on how the dlcompat package was built, the
-.Fn dlsym
-function may, or may not, automatically prepend an underscore to the passed
-.Fa symbol  
-to compensate for this.
-In this case calling
-.Fn dlsym
-with
-.Fa symbol
-as \&"getpid\&"
-does %%NOTPREPEND%% find the _getpid symbol.
-.Sh ERRORS
-.Fn dlopen
-and
-.Fn dlsym
-return a null pointer in the event of errors.
-.Fn dlclose
-returns 0 on success, or -1 if an error occurred.
-Whenever an error has been detected, a message detailing it can be
-retrieved via a call to
-.Fn dlerror .
-.Sh AUTHORS
-The dlcompat package was written by Jorge Acereda 
-<jacereda at users.sourceforge.net> and
-Peter O'Gorman <ogorman at users.sourceforge.net>
-.Pp
-This man page was borrowed from FreeBSD and modified,
-it originally came from Sun Microsystems, Inc.
-.Sh BUGS
-.Bl -bullet
-.It
-None of these rountines should be expected to work as advertised with MH_DYLIB files.
-They are always opened globally and may not be closed, RTLD_NOW is ignored for them.
-.It
-The search for symbols in objects which were loaded as a result of loading handle terminates
-too soon.
-.It
-None of the functions work as advertised for executables linked with the
-.Xr ld 1
-flag -force_flat_namespace, or when the
-.Xr dyld 1
-DYLD_FORCE_FLAT_NAMESPACE environment variable is set. This is because the
-.Fn NSLookupSymbolInImage
-function ignores the passed in mach_header in this case.
-.It
-The underscore or not issue is unnecessarily confusing.
-.El
-.Pp
-If you find any more, please contact Peter O'Gorman <ogorman at users.sourceforge.net>
-.Sh SEE ALSO
-.Xr ld 1
-.Xr cc 1
-.Xr NSModule 3
-.Xr NSObjectFileImage 3
-.Xr dyld 3
\ No newline at end of file
diff --git a/lib-src/dlcompat/install-sh b/lib-src/dlcompat/install-sh
deleted file mode 100755
index 398a88e..0000000
--- a/lib-src/dlcompat/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/lib-src/dlcompat/test/Makefile b/lib-src/dlcompat/test/Makefile
deleted file mode 100644
index 5d16c85..0000000
--- a/lib-src/dlcompat/test/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-all:		dlone.so dltwo.so dllib.dylib dllib.a dltest dladdr dlsymtest
-
-dlone.so:	dlmodule.c
-		cc -bundle -o dlone.so dlmodule.c -DDL_MODULE_NUMBER=\"one\"
-
-dltwo.so:	dlmodule.c
-		cc -bundle -o dltwo.so dlmodule.c -DDL_MODULE_NUMBER=\"two\"
-
-dlmodule.o:	dlmodule.c
-		cc -c -o dlmodule.o dlmodule.c -fno-common -DPIC -DDL_MODULE_NUMBER=\"lib\"
-
-dllib.dylib:	dlmodule.o
-		cc -dynamiclib -o dllib.dylib dlmodule.o
-
-dllib.a:	dlmodule.o
-		ar cru dllib.a dlmodule.o
-		ranlib dllib.a
-
-dltest:		dltest.c
-		cc -o dltest dltest.c -I.. -L.. -ldl
-dladdr:		dladdr.c
-		cc -o dladdr dladdr.c -I.. -L.. -ldl
-		
-dlsymtest: dlsymtest.c libfoo.dylib
-		gcc -o dlsymtest  dlsymtest.c -I.. -L.. -L. -ldl -lfoo
-        			
-libfoo.o: libfoo.c
-		gcc -c -o libfoo.o libfoo.c
-  
-libfoo.dylib: libfoo.o
-		gcc -dynamiclib -o libfoo.dylib libfoo.o
-
-clean:		
-		rm -f *~ *.o *.so *.dylib *.a dltest dladdr dlsymtest
diff --git a/lib-src/dlcompat/test/dladdr.c b/lib-src/dlcompat/test/dladdr.c
deleted file mode 100644
index 73ce178..0000000
--- a/lib-src/dlcompat/test/dladdr.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#define __BSD_VISIBLE 1
-#include "dlfcn.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <mach-o/dyld.h>
-
-int main(int argc, const char* argv[])
-{
-	int retCode = 0;
-	const char * syms[] = {"_printf","_dlopen","_main",0};
-	int i=0;
-	struct dl_info info;
-	NSSymbol syml;
-	void* addr;
-	while (syms[i]) {
-		syml = NSLookupAndBindSymbol(syms[i]);
-		if (syml)
-		{
-			addr = NSAddressOfSymbol(syml);
-			dladdr(addr,&info);
-			fprintf(stdout,"Symbol: %s\nNSSym: %x\nAddress: %x\nFName: %s\nBase: %x\nSymbol: %s\nAddress: %x\n\n\n",
-				syms[i],syml,addr,info.dli_fname,info.dli_fbase,info.dli_sname,info.dli_saddr);
-			if (addr != info.dli_saddr) retCode++;
-			if (strcmp(syms[i],info.dli_sname)) retCode++;
-		}
-		i++;
-	}
-	return retCode;
-}
\ No newline at end of file
diff --git a/lib-src/dlcompat/test/dlmodule.c b/lib-src/dlcompat/test/dlmodule.c
deleted file mode 100644
index 2cf473f..0000000
--- a/lib-src/dlcompat/test/dlmodule.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (c) 2002 Francis James Franklin <fjf at alinameridon.com>
-
-Maintained by Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Bug Reports and other queries should go to <ogorman at users.sourceforge.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <stdio.h>
-
-void _init ()
-{
-  fprintf (stderr, "dlcompat: dl%s: _init()\n", DL_MODULE_NUMBER);
-}
-
-void _fini ()
-{
-  fprintf (stderr, "dlcompat: dl%s: _fini()\n", DL_MODULE_NUMBER);
-}
-
-void test (int number)
-{
-  fprintf (stderr, "dlcompat: dl%s: test(%d)\n", DL_MODULE_NUMBER, number);
-}
diff --git a/lib-src/dlcompat/test/dltest.c b/lib-src/dlcompat/test/dltest.c
deleted file mode 100644
index bfb148f..0000000
--- a/lib-src/dlcompat/test/dltest.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-Copyright (c) 2002 Francis James Franklin <fjf at alinameridon.com>
-
-Maintained by Peter O'Gorman <ogorman at users.sourceforge.net>
-
-Bug Reports and other queries should go to <ogorman at users.sourceforge.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#define __BSD_VISIBLE 1
-#include "dlfcn.h"
-
-#define FLAGS (RTLD_NOW|RTLD_GLOBAL)
-
-typedef void (*dlModuleTestFn) (int number);
-
-int test_one ();
-int test_two ();
-int test_three ();
-
-int main (int argc, char ** argv)
-{
-  if (argc == 1) return test_one ();
-
-  if (strcmp (argv[1], "-3") == 0)
-    return test_three ();
-
-  if (strcmp (argv[1], "-2") == 0)
-    return test_two ();
-
-  return test_one ();
-}
-
-int test_one ()
-{
-  dlModuleTestFn test = 0;
-  void * handle[4] = { 0, 0, 0, 0 };
-  void * handle2[4] = { 0, 0, 0, 0 };
-  int i;
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "==================\n");
-  fprintf (stderr, "Test #1: existence\n");
-  fprintf (stderr, "==================\n");
-
-  handle[0] = dlopen ("dlone.so", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dlone.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-  dlclose (handle[0]);
-
-  handle[0] = dlopen ("dltwo.so", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dltwo.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "================\n");
-  fprintf (stderr, "Test #2: re-open\n");
-  fprintf (stderr, "================\n");
-
-  handle[0] = dlopen ("dlone.so", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dlone.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-  dlclose (handle[0]);
-
-  handle[0] = dlopen ("dltwo.so", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dltwo.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "===================\n");
-  fprintf (stderr, "Test #3: multi-open\n");
-  fprintf (stderr, "===================\n");
-
-  for (i = 0; i < 4; i++)
-    {
-      handle[i] = dlopen ("dlone.so", FLAGS);
-      if (handle[i] == 0)
-	{
-	  fprintf (stderr, "dlopen(\"dlone.so\",FLAGS) failed: %s\n", dlerror ());
-	  return 1;
-	}
-      test = (dlModuleTestFn) dlsym (handle[i], "test");
-      if(test == 0)
-	{
-	  fprintf (stderr, "dlsym(handle[i],\"test\"): symbol not found\n");
-	  return 1;
-	}
-      test (i);
-
-      handle2[i] = dlopen ("dltwo.so", FLAGS);
-      if (handle[i] == 0)
-	{
-	  fprintf (stderr, "dlopen(\"dltwo.so\",FLAGS) failed: %s\n", dlerror ());
-	  return 1;
-	}
-      test = (dlModuleTestFn) dlsym (handle2[i], "test");
-      if(test == 0)
-	{
-	  fprintf (stderr, "dlsym(handle2[i],\"test\"): symbol not found\n");
-	  return 1;
-	}
-      test (i);
-    }
-  for (i = 0; i < 4; i++)
-    {
-      dlclose (handle[i]);
-      dlclose (handle2[i]);
-    }
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "===================\n");
-  fprintf (stderr, "Test #4: dylib-open\n");
-  fprintf (stderr, "===================\n");
-
-  for (i = 0; i < 4; i++)
-    {
-      handle[i] = dlopen ("dllib.dylib", FLAGS);
-      if (handle[i] == 0)
-	{
-	  fprintf (stderr, "dlopen(\"dllib.dylib\",FLAGS) failed: %s\n", dlerror ());
-	  return 1;
-	}
-      test = (dlModuleTestFn) dlsym (handle[i], "test");
-      if(test == 0)
-	{
-	  fprintf (stderr, "dlsym(handle[i],\"test\"): symbol not found\n");
-	  return 1;
-	}
-      test (i);
-    }
-  for (i = 0; i < 4; i++)
-    {
-      dlclose (handle[i]);
-    }
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "======================\n");
-  fprintf (stderr, "Test #5: dylib-re-open\n");
-  fprintf (stderr, "======================\n");
-
-  handle[0] = dlopen ("dllib.dylib", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dllib.dylib\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  return 0;
-}
-
-int test_two ()
-{
-  dlModuleTestFn test = 0;
-  void * handle[4] = { 0, 0, 0, 0 };
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "=====================\n");
-  fprintf (stderr, "Test #2.1: open dylib\n");
-  fprintf (stderr, "=====================\n");
-
-  handle[0] = dlopen ("dllib.dylib", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dllib.dylib\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "======================\n");
-  fprintf (stderr, "Test #2.2: open module\n");
-  fprintf (stderr, "======================\n");
-
-  handle[1] = dlopen ("dlone.so", FLAGS);
-  if (handle[1] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dlone.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[1], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[1],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-  fprintf (stderr, "(closing)\n");
-  fprintf (stderr, "\n");
-
-  dlclose (handle[1]);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "=====================\n");
-  fprintf (stderr, "Test #2.3: open dylib\n");
-  fprintf (stderr, "=====================\n");
-
-  handle[0] = dlopen ("dllib.dylib", FLAGS);
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dllib.dylib\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "======================\n");
-  fprintf (stderr, "Test #2.4: open module\n");
-  fprintf (stderr, "======================\n");
-
-  handle[1] = dlopen ("dltwo.so", FLAGS);
-  if (handle[1] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dltwo.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[1], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[1],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-  fprintf (stderr, "(closing)\n");
-  fprintf (stderr, "\n");
-
-  dlclose (handle[1]);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  return 0;
-}
-
-void * try_open (const char * f1, const char * f2, const char * f3)
-{
-  void * handle = 0;
-
-  fprintf (stderr, "- loading `%s'... ", f1);
-  if ((handle = dlopen (f1, FLAGS)) == 0)
-    {
-      fprintf (stderr, "%s\n", dlerror ());
-      fprintf (stderr, "- loading `%s'...\n", f2);
-      if ((handle = dlopen (f2, FLAGS)) == 0)
-	{
-	  fprintf (stderr, "%s\n", dlerror ());
-	  fprintf (stderr, "- loading `%s'...\n", f3);
-	  if ((handle = dlopen (f3, FLAGS)) == 0)
-	    {
-	      fprintf (stderr, "%s\n", dlerror ());
-	    }
-	}
-    }
-  fprintf (stderr, "  handle = %p\n", handle);
-
-  return handle;
-}
-
-int test_three ()
-{
-  dlModuleTestFn test = 0;
-  void * handle[4] = { 0, 0, 0, 0 };
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "=====================\n");
-  fprintf (stderr, "Test #3.1: open dylib\n");
-  fprintf (stderr, "=====================\n");
-
-  handle[0] = try_open ("dllib.a", "libs/dllib.dylib", "dllib.dylib");
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dllib.dylib\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "======================\n");
-  fprintf (stderr, "Test #3.2: open module\n");
-  fprintf (stderr, "======================\n");
-
-  handle[1] = try_open ("dlone.a", "libs/dlone.so", "dlone.so");
-  if (handle[1] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dlone.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[1], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[1],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-  fprintf (stderr, "(closing)\n");
-  fprintf (stderr, "\n");
-
-  dlclose (handle[1]);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "=====================\n");
-  fprintf (stderr, "Test #3.3: open dylib\n");
-  fprintf (stderr, "=====================\n");
-
-  handle[0] = try_open ("dllib.a", "libs/dllib.dylib", "dllib.dylib");
-  if (handle[0] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dllib.dylib\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[0], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[0],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, "======================\n");
-  fprintf (stderr, "Test #3.4: open module\n");
-  fprintf (stderr, "======================\n");
-
-  handle[1] = try_open ("dltwo.a", "libs/dltwo.so", "dltwo.so");
-  if (handle[1] == 0)
-    {
-      fprintf (stderr, "dlopen(\"dltwo.so\",FLAGS) failed: %s\n", dlerror ());
-      return 1;
-    }
-  test = (dlModuleTestFn) dlsym (handle[1], "test");
-  if(test == 0)
-    {
-      fprintf (stderr, "dlsym(handle[1],\"test\"): symbol not found\n");
-      return 1;
-    }
-  test (0);
-
-  fprintf (stderr, "\n");
-  fprintf (stderr, "(closing)\n");
-  fprintf (stderr, "\n");
-
-  dlclose (handle[1]);
-  dlclose (handle[0]);
-
-  fprintf (stderr, "\n");
-
-  return 0;
-}
diff --git a/lib-src/lib-widget-extra/configure b/lib-src/lib-widget-extra/configure
index 7a89d42..6c80277 100755
--- a/lib-src/lib-widget-extra/configure
+++ b/lib-src/lib-widget-extra/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -576,6 +598,7 @@ PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
+ac_unique_file="NonGuiThread.h"
 ac_default_prefix=/usr/local
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -613,65 +636,71 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXCPP
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-INSTALL_PREFIX
-SED
-WX_CONFIG
-GREP
-EGREP
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+EGREP
+GREP
+WX_CONFIG
+SED
+INSTALL_PREFIX
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+CXXCPP
+ac_ct_CXX
+CXXFLAGS
+CXX
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_static
+enable_unicode
+enable_debug
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -689,6 +718,8 @@ CXXCPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -787,13 +818,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -806,13 +845,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1003,22 +1050,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1038,7 +1101,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1047,16 +1110,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1065,22 +1128,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1095,7 +1174,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1111,10 +1190,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1122,12 +1201,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1154,12 +1233,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1208,9 +1287,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1220,25 +1299,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1250,8 +1329,10 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-static         link wx statically [default=no]
   --enable-unicode        enable unicode support [default=yes]
   --enable-debug          enable debug support [default=no]
 
@@ -1277,15 +1358,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1321,7 +1404,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1331,10 +1414,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1345,7 +1428,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1381,7 +1464,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1416,7 +1499,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1468,11 +1551,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1502,9 +1586,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1519,9 +1603,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1537,8 +1621,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1580,21 +1664,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1604,16 +1691,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1627,29 +1714,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1659,10 +1755,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1690,6 +1788,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
 cflags_save="$CFLAGS"
 cppflags_save="$CPPFLAGS"
 cxxflags_save="$CXXFLAGS"
@@ -1701,10 +1801,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1717,7 +1817,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1728,11 +1828,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1741,10 +1841,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1757,7 +1857,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1768,11 +1868,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -1780,12 +1880,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -1798,10 +1894,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1814,7 +1910,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1825,11 +1921,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1838,10 +1934,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1859,7 +1955,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1882,11 +1978,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1897,10 +1993,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1913,7 +2009,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1924,11 +2020,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1941,10 +2037,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1957,7 +2053,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1968,11 +2064,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1984,12 +2080,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -1999,44 +2091,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2055,27 +2153,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2086,10 +2179,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2100,7 +2194,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2127,25 +2221,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2154,49 +2250,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2205,31 +2305,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2252,40 +2354,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2311,20 +2416,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2334,15 +2440,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2369,20 +2479,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2407,20 +2518,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2446,20 +2558,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2474,8 +2587,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2491,10 +2604,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2565,20 +2678,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2594,15 +2708,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -2632,10 +2746,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2648,7 +2762,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2659,11 +2773,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2676,10 +2790,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2692,7 +2806,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2703,11 +2817,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2719,12 +2833,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -2734,43 +2844,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2796,20 +2910,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2819,15 +2934,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -2854,20 +2973,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -2892,20 +3012,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -2931,20 +3052,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2959,8 +3081,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -2987,11 +3109,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -3023,20 +3145,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3060,13 +3183,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3074,7 +3198,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3099,8 +3223,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -3128,20 +3252,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3165,13 +3290,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3179,7 +3305,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3195,11 +3321,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=cpp
@@ -3229,8 +3357,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3256,11 +3384,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3289,17 +3418,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3312,8 +3453,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3341,6 +3482,14 @@ _ACEOF
 fi
 
 
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval=$enable_static; static_preference="--static=$enableval"
+else
+  static_preference=""
+fi
+
+
 # Check whether --enable-unicode was given.
 if test "${enable_unicode+set}" = set; then
   enableval=$enable_unicode; unicode_preference="--unicode=$enableval"
@@ -3360,18 +3509,18 @@ fi
 
 
 if test x"$debug_preference" = "xyes" ; then
-      { echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
-echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
+      { $as_echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
+$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
    CFLAGS="${CFLAGS} -g "
    CXXFLAGS="${CXXFLAGS} -g "
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
-echo $ECHO_N "checking CFLAGS for strict prototypes... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
+$as_echo_n "checking CFLAGS for strict prototypes... " >&6; }
 if test "${ac_cv_cflags_strict_prototypes+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_cflags_strict_prototypes="no, unknown"
 
@@ -3405,20 +3554,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_cflags_strict_prototypes=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3453,13 +3603,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3468,7 +3619,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 then if test `diff config.log config.tmp | grep -i warning | wc -l` != 1
 then ac_cv_cflags_strict_prototypes="no, suppressed, signal.h," ; fi ; fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
@@ -3487,23 +3638,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
-echo "${ECHO_T}$ac_cv_cflags_strict_prototypes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
+$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
 case ".$ac_cv_cflags_strict_prototypes" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
-   then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
+   then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
   (: CFLAGS does contain $ac_cv_cflags_strict_prototypes) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-   else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
+   else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
   (: CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
                       CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes"
    fi
@@ -3511,10 +3662,10 @@ case ".$ac_cv_cflags_strict_prototypes" in
 esac
 
 
-{ echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
-echo $ECHO_N "checking wall_flags for maximum warnings... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
+$as_echo_n "checking wall_flags for maximum warnings... " >&6; }
 if test "${ac_cv_cflags_warn_all+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_cflags_warn_all="no, unknown"
 
@@ -3548,20 +3699,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3578,23 +3730,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
-echo "${ECHO_T}$ac_cv_cflags_warn_all" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
+$as_echo "$ac_cv_cflags_warn_all" >&6; }
 case ".$ac_cv_cflags_warn_all" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
-   then { (echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
+   then { ($as_echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
   (: wall_flags does contain $ac_cv_cflags_warn_all) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-   else { (echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
+   else { ($as_echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
   (: wall_flags="$wall_flags $ac_cv_cflags_warn_all") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
                       wall_flags="$wall_flags $ac_cv_cflags_warn_all"
    fi
@@ -3602,48 +3754,43 @@ case ".$ac_cv_cflags_warn_all" in
 esac
 
 CFLAGS="${CFLAGS} $wall_flags"
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
-     echo "$ac_script" | sed 99q >conftest.sed
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     # Extract the first word of "sed gsed" to use in msg output
-if test -z "$SED"; then
-set dummy sed gsed; ac_prog_name=$2
-if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$SED"; then
   ac_path_SED_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in sed gsed; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-    # Check for GNU ac_path_SED and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo '' >> "conftest.nl"
+    $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3658,31 +3805,23 @@ case `"$ac_path_SED" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_SED_found && break 3
+      $ac_path_SED_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-SED="$ac_cv_path_SED"
-if test -z "$SED"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -3694,10 +3833,10 @@ echo "${ECHO_T}$ac_cv_path_SED" >&6; }
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
-echo $ECHO_N "checking whether the C++ compiler accepts the $wall_flags flag... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
+$as_echo_n "checking whether the C++ compiler accepts the $wall_flags flag... " >&6; }
 if { as_var=ax_cv_cxx_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -3733,13 +3872,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3748,7 +3888,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       eval "ax_cv_cxx_check_flag_$flag=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3769,9 +3909,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-ac_res=`eval echo '${'ax_cv_cxx_check_flag_$flag'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'ax_cv_cxx_check_flag_$flag'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
   if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then
 
@@ -3797,10 +3938,10 @@ fi
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
-echo $ECHO_N "checking whether the C++ preprocessor accepts the $wall_flags flag... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
+$as_echo_n "checking whether the C++ preprocessor accepts the $wall_flags flag... " >&6; }
 if { as_var=ax_cv_cxxcpp_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -3835,13 +3976,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3850,7 +3992,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       eval "ax_cv_cxxcpp_check_flag_$flag=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3871,9 +4013,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-ac_res=`eval echo '${'ax_cv_cxxcpp_check_flag_$flag'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'ax_cv_cxxcpp_check_flag_$flag'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
   if eval "test \"`echo '$ax_cv_cxxcpp_check_flag_'$flag`\" = yes"; then
 
@@ -3895,10 +4038,10 @@ fi
 
 # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_WX_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $WX_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -3914,7 +4057,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3927,17 +4070,17 @@ esac
 fi
 WX_CONFIG=$ac_cv_path_WX_CONFIG
 if test -n "$WX_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
-echo "${ECHO_T}$WX_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
+$as_echo "$WX_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if [ "$WX_CONFIG" = "no" ] ; then
-   { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&5
-echo "$as_me: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&5
+$as_echo "$as_me: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3952,8 +4095,8 @@ wxconfigargs="$static_preference $unicode_preference  $wxconfigargs $wx_preferen
 
 wx_version=`${WX_CONFIG} $wxconfigargs --version`
 
-{ echo "$as_me:$LINENO: Checking that the chosen version of wxWidgets is 2.8.x" >&5
-echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
+{ $as_echo "$as_me:$LINENO: Checking that the chosen version of wxWidgets is 2.8.x" >&5
+$as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
 
 case "${wx_version}" in
   2.8.*)
@@ -3961,13 +4104,13 @@ case "${wx_version}" in
     ;;
   *)
   wx_list=`${WX_CONFIG} --list`
-  { { echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+  { { $as_echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
 The currently available configurations are listed below.  If necessary, either
 install the package for your distribution or download the latest version of
 wxWidgets
 from http://wxwidgets.org.
 ${wx_list}" >&5
-echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+$as_echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
 The currently available configurations are listed below.  If necessary, either
 install the package for your distribution or download the latest version of
 wxWidgets
@@ -3980,10 +4123,10 @@ esac
 LIBS="$LIBS `$WX_CONFIG $wxconfigargs --libs`"
 CPPFLAGS="$CPPFLAGS `$WX_CONFIG $wxconfigargs --cxxflags`"
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4055,20 +4198,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -4076,52 +4220,47 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4136,74 +4275,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4218,40 +4343,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4278,20 +4394,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4383,37 +4500,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4435,11 +4555,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4457,20 +4577,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4478,12 +4599,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4491,26 +4615,58 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (size_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -4521,30 +4677,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -4585,11 +4750,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -4622,12 +4788,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -4644,6 +4810,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -4673,7 +4845,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -4686,11 +4858,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -4703,7 +4876,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -4713,7 +4886,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -4735,17 +4908,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -4761,8 +4962,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -4785,7 +4984,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -4798,17 +4997,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -4830,7 +5022,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -4881,7 +5073,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -4909,7 +5101,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -4922,19 +5113,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -4959,10 +5153,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -4985,7 +5179,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4998,26 +5192,33 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -5025,24 +5226,24 @@ $config_files
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -5064,21 +5265,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -5097,30 +5301,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -5130,8 +5336,8 @@ do
     "libwidgetextra.pc") CONFIG_FILES="$CONFIG_FILES libwidgetextra.pc" ;;
     "libwidgetextra-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libwidgetextra-uninstalled.pc" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -5170,123 +5376,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-INSTALL_PREFIX!$INSTALL_PREFIX$ac_delim
-SED!$SED$ac_delim
-WX_CONFIG!$WX_CONFIG$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -5302,19 +5529,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -5343,26 +5572,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -5372,7 +5613,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5398,7 +5639,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -5407,7 +5648,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5428,17 +5669,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -5478,12 +5719,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -5492,13 +5734,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -5512,15 +5755,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -5530,21 +5774,28 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -5559,6 +5810,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -5580,6 +5836,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 echo ""
diff --git a/lib-src/lib-widget-extra/configure.in b/lib-src/lib-widget-extra/configure.in
index 0dd4c22..57beb63 100644
--- a/lib-src/lib-widget-extra/configure.in
+++ b/lib-src/lib-widget-extra/configure.in
@@ -56,6 +56,12 @@ fi
 
 dnl Build Options
 
+AC_ARG_ENABLE(static,
+            [AS_HELP_STRING([--enable-static],
+                            [link wx statically [default=no]])],
+            static_preference="--static=$enableval",
+            static_preference="")
+
 AC_ARG_ENABLE(unicode,
             [AS_HELP_STRING([--enable-unicode],
                             [enable unicode support [default=yes]])],   
diff --git a/lib-src/libnyquist/misc/Makefile b/lib-src/libnyquist/misc/Makefile
deleted file mode 100644
index cae3434..0000000
--- a/lib-src/libnyquist/misc/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# FILE: Makefile
-#   BY: Christopher Lee Fraley
-#   and Roger B. Dannenberg.
-# DESC: This file builds various utilities for Nyquist
-#
-
-CC = cc $(CFLAGS)
-
-# the unix path gets us switches.h:
-# the cmt path gets us swlogic.h:
-CFLAGS += -I../sys -I../cmt
-
-# Directory info:
-BINPATH = .
-
-# Intgen stuff:
-intgen: cmdline.o intgen.o
-	$(CC) cmdline.o intgen.o -o $(BINPATH)/intgen
-
-cmdline.o: cext.h cmdline.h
-intgen.o: cext.h cmdline.h
-
-#sampleprint - dumb but useful
-sampleprint: sampleprint.o
-	$(CC) sampleprint.o -o $(BINPATH)/sampleprint
-
-sampleprint.o: sampleprint.c
-
-#sine
-sne: sne.o
-	$(CC) sne.o -o $(BINPATH)/sne
-
-sne.o: sne.c
-
-#play
-play: play.o
-	$(CC) play.o -o $(BINPATH)/play
-
-play.o: play.c
-
-#plot
-plot: plot.o
-	$(CC) plot.o -o $(BINPATH)/plot
-
-plot.o: plot.c
-
-#unpacker
-unpacker_o = unpacker.o convert.o
-
-unpacker: $(unpacker_o)
-	$(CC) $(unpacker_o) -o unpacker
-
-#packer
-packer_o = packer.o convert.o
-
-packer: $(packer_o)
-	$(CC) $(packer_o) -o packer
-
-clean:
-	rm -f *.o
-
-cleaner: clean
-	rm -f intgen play sine plot packer unpacker
-	rm -f *.BAK
-	rm -f *~
-
diff --git a/lib-src/libnyquist/misc/Makefile.in b/lib-src/libnyquist/misc/Makefile.in
new file mode 100644
index 0000000..8a84268
--- /dev/null
+++ b/lib-src/libnyquist/misc/Makefile.in
@@ -0,0 +1,67 @@
+#
+# FILE: Makefile
+#   BY: Christopher Lee Fraley
+#   and Roger B. Dannenberg.
+# DESC: This file builds various utilities for Nyquist
+#
+
+CC = @CC@ @CFLAGS@
+
+# the unix path gets us switches.h:
+# the cmt path gets us swlogic.h:
+CFLAGS += -I../sys -I../cmt
+
+# Directory info:
+BINPATH = .
+
+# Intgen stuff:
+intgen: cmdline.o intgen.o
+	$(CC) cmdline.o intgen.o -o $(BINPATH)/intgen
+
+cmdline.o: cext.h cmdline.h
+intgen.o: cext.h cmdline.h
+
+#sampleprint - dumb but useful
+sampleprint: sampleprint.o
+	$(CC) sampleprint.o -o $(BINPATH)/sampleprint
+
+sampleprint.o: sampleprint.c
+
+#sine
+sne: sne.o
+	$(CC) sne.o -o $(BINPATH)/sne
+
+sne.o: sne.c
+
+#play
+play: play.o
+	$(CC) play.o -o $(BINPATH)/play
+
+play.o: play.c
+
+#plot
+plot: plot.o
+	$(CC) plot.o -o $(BINPATH)/plot
+
+plot.o: plot.c
+
+#unpacker
+unpacker_o = unpacker.o convert.o
+
+unpacker: $(unpacker_o)
+	$(CC) $(unpacker_o) -o unpacker
+
+#packer
+packer_o = packer.o convert.o
+
+packer: $(packer_o)
+	$(CC) $(packer_o) -o packer
+
+clean:
+	rm -f *.o
+
+cleaner: clean
+	rm -f intgen play sine plot packer unpacker
+	rm -f *.BAK
+	rm -f *~
+
diff --git a/lib-src/libnyquist/nyqsrc/seqfnint.c b/lib-src/libnyquist/nyqsrc/seqfnint.c
deleted file mode 100644
index 9424097..0000000
--- a/lib-src/libnyquist/nyqsrc/seqfnint.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* nyqsrc/seqfnint.c -- interface to  cmt/seqdecls.h, 
- * nyqsrc/seqext.h, cmt/seq.h, nyqsrc/seqinterf.h, 
- * cmt/seqread.h, cmt/seqmread.h, cmt/seqwrite.h, 
- * cmt/seqmwrite.h */
-
-#ifndef mips
-#include "stdlib.h"
-#endif
-#include "xlisp.h"
-
-extern LVAL s_true;
-#define cvboolean(i) ((i) ? s_true : NIL)
-#define testarg2(e) (moreargs() ? (e) : (getflonum(xltoofew())))
-#define xlgaanynum() (floatp(*xlargv) ? getflonum(nextarg()) : \
-    (fixp(*xlargv) ? (double) getfixnum(nextarg()) : \
-        getflonum(xlbadtype(*xlargv))))
-#define getboolean(lval) ((lval) != NIL)
-
-extern LVAL RSLT_sym;
-
-
-#include "seqdecls.h"
-
-#include "seqext.h"
-
-#include "seq.h"
-
-/* xlc_seq_reset -- interface to C routine seq_reset */
-/**/
-LVAL xlc_seq_reset(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-
-    xllastarg();
-    seq_reset(arg1);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_ctrl -- interface to C routine insert_ctrl */
-/**/
-LVAL xlc_seq_insert_ctrl(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_ctrl(arg1, arg2, arg3, arg4, arg5, arg6);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_ramp -- interface to C routine insert_ctrlramp */
-/**/
-LVAL xlc_seq_insert_ramp(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-    long arg8 = getfixnum(xlgafixnum());
-    long arg9 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_ctrlramp(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_macctrl -- interface to C routine insert_macctrl */
-/**/
-LVAL xlc_seq_insert_macctrl(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_macctrl(arg1, arg2, arg3, arg4, arg5, arg6);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_note -- interface to C routine insert_note */
-/**/
-LVAL xlc_seq_insert_note(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_note(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-    return NIL;
-}
-
-
-/* xlc_seq_copy -- interface to C routine seq_copy */
-/**/
-LVAL xlc_seq_copy(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    seq_type result;
-
-    xllastarg();
-    result = seq_copy(arg1);
-    return cvseq(result);
-}
-
-
-/* xlc_seq_create -- interface to C routine seq_create */
-/**/
-LVAL xlc_seq_create(void)
-{
-    seq_type result;
-
-    xllastarg();
-    result = seq_create();
-    return cvseq(result);
-}
-
-
-#include "seqinterf.h"
-
-/* xlc_seq_next -- interface to C routine seq_next */
-/**/
-LVAL xlc_seq_next(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    boolean result;
-
-    xllastarg();
-    result = seq_next(arg1);
-    return cvboolean(result);
-}
-
-
-/* xlc_seq_get -- interface to C routine seq_get */
-/**/
-LVAL xlc_seq_get(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = 0;
-    long arg3 = 0;
-    long arg4 = 0;
-    long arg5 = 0;
-    long arg6 = 0;
-    long arg7 = 0;
-    long arg8 = 0;
-    LVAL result;
-
-    xllastarg();
-    seq_get(arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8);
-    {	LVAL *next = &getvalue(RSLT_sym);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg2);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg3);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg4);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg5);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg6);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg7);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg8);
-    }
-    result = getvalue(RSLT_sym);
-    return result;
-}
-
-
-#include "seqread.h"
-
-/* xlc_seq_read -- interface to C routine seq_read */
-/**/
-LVAL xlc_seq_read(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-
-    xllastarg();
-    seq_read(arg1, arg2);
-    return NIL;
-}
-
-
-#include "seqmread.h"
-
-/* xlc_seq_read_smf -- interface to C routine seq_read_smf */
-/**/
-LVAL xlc_seq_read_smf(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-
-    xllastarg();
-    seq_read_smf(arg1, arg2);
-    return NIL;
-}
-
-
-#include "seqwrite.h"
-
-/* xlc_seq_write -- interface to C routine seq_write */
-/**/
-LVAL xlc_seq_write(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-    int arg3 = getboolean(xlgetarg());
-
-    xllastarg();
-    seq_write(arg1, arg2, arg3);
-    return NIL;
-}
-
-
-#include "seqmwrite.h"
-
-/* xlc_seq_write_smf -- interface to C routine seq_write_smf */
-/**/
-LVAL xlc_seq_write_smf(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-
-    xllastarg();
-    seq_write_smf(arg1, arg2);
-    return NIL;
-}
-
-
diff --git a/lib-src/libnyquist/nyqsrc/seqfnintdefs.h b/lib-src/libnyquist/nyqsrc/seqfnintdefs.h
deleted file mode 100644
index ba09956..0000000
--- a/lib-src/libnyquist/nyqsrc/seqfnintdefs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-extern LVAL xlc_seq_reset(void);
-extern LVAL xlc_seq_insert_ctrl(void);
-extern LVAL xlc_seq_insert_ramp(void);
-extern LVAL xlc_seq_insert_macctrl(void);
-extern LVAL xlc_seq_insert_note(void);
-extern LVAL xlc_seq_copy(void);
-extern LVAL xlc_seq_create(void);
-extern LVAL xlc_seq_next(void);
-extern LVAL xlc_seq_get(void);
-extern LVAL xlc_seq_read(void);
-extern LVAL xlc_seq_read_smf(void);
-extern LVAL xlc_seq_write(void);
-extern LVAL xlc_seq_write_smf(void);
diff --git a/lib-src/libnyquist/nyqsrc/seqfnintptrs.h b/lib-src/libnyquist/nyqsrc/seqfnintptrs.h
deleted file mode 100644
index 9defce5..0000000
--- a/lib-src/libnyquist/nyqsrc/seqfnintptrs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-  { "SEQ-RESET",  S, xlc_seq_reset}, 
-  { "SEQ-INSERT-CTRL",  S, xlc_seq_insert_ctrl}, 
-  { "SEQ-INSERT-RAMP",  S, xlc_seq_insert_ramp}, 
-  { "SEQ-INSERT-MACCTRL",  S, xlc_seq_insert_macctrl}, 
-  { "SEQ-INSERT-NOTE",  S, xlc_seq_insert_note}, 
-  { "SEQ-COPY",  S, xlc_seq_copy}, 
-  { "SEQ-CREATE",  S, xlc_seq_create}, 
-  { "SEQ-NEXT",  S, xlc_seq_next}, 
-  { "SEQ-GET",  S, xlc_seq_get}, 
-  { "SEQ-READ",  S, xlc_seq_read}, 
-  { "SEQ-READ-SMF",  S, xlc_seq_read_smf}, 
-  { "SEQ-WRITE",  S, xlc_seq_write}, 
-  { "SEQ-WRITE-SMF",  S, xlc_seq_write_smf}, 
diff --git a/lib-src/libnyquist/nyqsrc/sndfnint.c b/lib-src/libnyquist/nyqsrc/sndfnint.c
deleted file mode 100644
index a8942ab..0000000
--- a/lib-src/libnyquist/nyqsrc/sndfnint.c
+++ /dev/null
@@ -1,1670 +0,0 @@
-/* nyqsrc/sndfnint.c -- interface to  snd/snd.h, 
- * nyqsrc/sound.h, nyqsrc/downsample.h, nyqsrc/sndread.h, 
- * nyqsrc/sndseq.h, nyqsrc/add.h, nyqsrc/multiseq.h, 
- * nyqsrc/samples.h, nyqsrc/sndwrite.h, nyqsrc/sndmax.h, 
- * nyqsrc/compose.h, nyqsrc/inverse.h, nyqsrc/resamp.h, 
- * nyqsrc/resampv.h, nyqsrc/fft.h, nyqsrc/avg.h, 
- * tran/amosc.h, tran/clip.h, tran/const.h, tran/fmosc.h, 
- * tran/integrate.h, tran/log.h, tran/maxv.h, tran/osc.h, 
- * tran/prod.h, tran/buzz.h, tran/pwl.h, tran/recip.h, 
- * tran/upsample.h, tran/scale.h, tran/sine.h, 
- * tran/partial.h, tran/white.h, tran/tone.h, 
- * tran/tonev.h, tran/atonev.h, tran/atone.h, 
- * tran/reson.h, tran/areson.h, tran/resonvc.h, 
- * tran/resoncv.h, tran/aresonvc.h, tran/aresoncv.h, 
- * tran/resonvv.h, tran/aresonvv.h, tran/offset.h, 
- * tran/slope.h, tran/delay.h, tran/delaycv.h, 
- * tran/shape.h, tran/sampler.h, tran/exp.h, 
- * tran/siosc.h, tran/follow.h, tran/gate.h, 
- * tran/quantize.h, tran/ifft.h, tran/congen.h, 
- * tran/fromobject.h, tran/fromarraystream.h, 
- * tran/coterm.h, tran/convolve.h, tran/alpass.h, 
- * tran/oneshot.h, tran/chase.h, tran/tapv.h, 
- * tran/biquad.h, tran/pluck.h, tran/abs.h, tran/sqrt.h, 
- * tran/alpasscv.h, tran/alpassvc.h */
-
-#ifndef mips
-#include "stdlib.h"
-#endif
-#include "xlisp.h"
-
-extern LVAL s_true;
-#define cvboolean(i) ((i) ? s_true : NIL)
-#define testarg2(e) (moreargs() ? (e) : (getflonum(xltoofew())))
-#define xlgaanynum() (floatp(*xlargv) ? getflonum(nextarg()) : \
-    (fixp(*xlargv) ? (double) getfixnum(nextarg()) : \
-        getflonum(xlbadtype(*xlargv))))
-#define getboolean(lval) ((lval) != NIL)
-
-extern LVAL RSLT_sym;
-
-
-#include "snd.h"
-
-#include "sound.h"
-
-/* xlc_soundp -- interface to C routine soundp */
-/**/
-LVAL xlc_soundp(void)
-{
-    LVAL arg1 = xlgetarg();
-    boolean result;
-
-    xllastarg();
-    result = soundp(arg1);
-    return cvboolean(result);
-}
-
-
-/* xlc_hz_to_step -- interface to C routine hz_to_step */
-/**/
-LVAL xlc_hz_to_step(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double result;
-
-    xllastarg();
-    result = hz_to_step(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_set_logical_stop -- interface to C routine set_logical_stop_time */
-/**/
-LVAL xlc_snd_set_logical_stop(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-
-    xllastarg();
-    set_logical_stop_time(arg1, arg2);
-    return NIL;
-}
-
-
-/* xlc_log -- interface to C routine xlog */
-/**/
-LVAL xlc_log(void)
-{
-    double arg1 = getflonum(xlgaflonum());
-    double result;
-
-    xllastarg();
-    result = xlog(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_sref -- interface to C routine snd_sref */
-/**/
-LVAL xlc_snd_sref(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double result;
-
-    xllastarg();
-    result = snd_sref(arg1, arg2);
-    return cvflonum(result);
-}
-
-
-/* xlc_sref_inverse -- interface to C routine snd_sref_inverse */
-/**/
-LVAL xlc_sref_inverse(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double result;
-
-    xllastarg();
-    result = snd_sref_inverse(arg1, arg2);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_stop_time -- interface to C routine snd_stop_time */
-/**/
-LVAL xlc_snd_stop_time(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double result;
-
-    xllastarg();
-    result = snd_stop_time(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_time -- interface to C routine snd_time */
-/**/
-LVAL xlc_snd_time(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double result;
-
-    xllastarg();
-    result = snd_time(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_srate -- interface to C routine snd_srate */
-/**/
-LVAL xlc_snd_srate(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double result;
-
-    xllastarg();
-    result = snd_srate(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_t0 -- interface to C routine snd_t0 */
-/**/
-LVAL xlc_snd_t0(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double result;
-
-    xllastarg();
-    result = snd_t0(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_xform -- interface to C routine snd_xform */
-/**/
-LVAL xlc_snd_xform(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    double arg6 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_xform(arg1, arg2, arg3, arg4, arg5, arg6);
-    return cvsound(result);
-}
-
-
-/* xlc_block_watch -- interface to C routine block_watch */
-/**/
-LVAL xlc_block_watch(void)
-{
-    long arg1 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    block_watch(arg1);
-    return NIL;
-}
-
-
-/* xlc_sound_nth_block -- interface to C routine sound_nth_block */
-/**/
-LVAL xlc_sound_nth_block(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    long result;
-
-    xllastarg();
-    result = sound_nth_block(arg1, arg2);
-    return cvfixnum(result);
-}
-
-
-/* xlc_snd_copy -- interface to C routine sound_copy */
-/**/
-LVAL xlc_snd_copy(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = sound_copy(arg1);
-    return cvsound(result);
-}
-
-
-/* xlc_snd_print -- interface to C routine sound_print */
-/**/
-LVAL xlc_snd_print(void)
-{
-    LVAL arg1 = xlgetarg();
-    long arg2 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    sound_print(arg1, arg2);
-    return NIL;
-}
-
-
-/* xlc_snd_play -- interface to C routine sound_play */
-/**/
-LVAL xlc_snd_play(void)
-{
-    LVAL arg1 = xlgetarg();
-
-    xllastarg();
-    sound_play(arg1);
-    return NIL;
-}
-
-
-/* xlc_stats -- interface to C routine stats */
-/**/
-LVAL xlc_stats(void)
-{
-
-    xllastarg();
-    stats();
-    return NIL;
-}
-
-
-/* xlc_snd_print_tree -- interface to C routine sound_print_tree */
-/**/
-LVAL xlc_snd_print_tree(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-
-    xllastarg();
-    sound_print_tree(arg1);
-    return NIL;
-}
-
-
-/* xlc_snd_scale -- interface to C routine sound_scale */
-/**/
-LVAL xlc_snd_scale(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = sound_scale(arg1, arg2);
-    return cvsound(result);
-}
-
-
-/* xlc_snd_zero -- interface to C routine sound_zero */
-/**/
-LVAL xlc_snd_zero(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = sound_zero(arg1, arg2);
-    return cvsound(result);
-}
-
-
-/* xlc_step_to_hz -- interface to C routine step_to_hz */
-/**/
-LVAL xlc_step_to_hz(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double result;
-
-    xllastarg();
-    result = step_to_hz(arg1);
-    return cvflonum(result);
-}
-
-
-#include "downsample.h"
-
-/* xlc_snd_down -- interface to C routine snd_down */
-/**/
-LVAL xlc_snd_down(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_down(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "sndread.h"
-
-/* xlc_snd_read -- interface to C routine snd_make_read */
-/**/
-LVAL xlc_snd_read(void)
-{
-    unsigned char * arg1 = getstring(xlgastring());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-    long arg8 = getfixnum(xlgafixnum());
-    double arg9 = testarg2(xlgaanynum());
-    double arg10 = testarg2(xlgaanynum());
-    long arg11 = 0;
-    long arg12 = 0;
-    LVAL result;
-
-    xllastarg();
-    xlprot1(result);
-    result = snd_make_read(arg1, arg2, arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, &arg10, &arg11, &arg12);
-    {	LVAL *next = &getvalue(RSLT_sym);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg4);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg5);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg6);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg7);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg8);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvflonum(arg9);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvflonum(arg10);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg11);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg12);
-    }
-    xlpop();
-    return (result);
-}
-
-
-#include "sndseq.h"
-
-/* xlc_snd_seq -- interface to C routine snd_sndseq */
-/**/
-LVAL xlc_snd_seq(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    LVAL arg2 = xlgetarg();
-    sound_type result;
-
-    xllastarg();
-    result = snd_sndseq(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "add.h"
-
-/* xlc_snd_add -- interface to C routine snd_add */
-/**/
-LVAL xlc_snd_add(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_add(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "multiseq.h"
-
-/* xlc_snd_multiseq -- interface to C routine snd_make_multiseq */
-/**/
-LVAL xlc_snd_multiseq(void)
-{
-    LVAL arg1 = xlgetarg();
-    LVAL arg2 = xlgetarg();
-    LVAL result;
-
-    xllastarg();
-    result = snd_make_multiseq(arg1, arg2);
-    return (result);
-}
-
-
-#include "samples.h"
-
-/* xlc_snd_from_array -- interface to C routine snd_from_array */
-/**/
-LVAL xlc_snd_from_array(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    LVAL arg3 = xlgetarg();
-    sound_type result;
-
-    xllastarg();
-    result = snd_from_array(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-/* xlc_snd_samples -- interface to C routine snd_samples */
-/**/
-LVAL xlc_snd_samples(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    LVAL result;
-
-    xllastarg();
-    result = snd_samples(arg1, arg2);
-    return (result);
-}
-
-
-/* xlc_snd_length -- interface to C routine snd_length */
-/**/
-LVAL xlc_snd_length(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    long result;
-
-    xllastarg();
-    result = snd_length(arg1, arg2);
-    return cvfixnum(result);
-}
-
-
-/* xlc_snd_maxsamp -- interface to C routine snd_maxsamp */
-/**/
-LVAL xlc_snd_maxsamp(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double result;
-
-    xllastarg();
-    result = snd_maxsamp(arg1);
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_fetch -- interface to C routine snd_fetch */
-/**/
-LVAL xlc_snd_fetch(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    LVAL result;
-
-    xllastarg();
-    result = snd_fetch(arg1);
-    return (result);
-}
-
-
-/* xlc_snd_fetch_array -- interface to C routine snd_fetch_array */
-/**/
-LVAL xlc_snd_fetch_array(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    LVAL result;
-
-    xllastarg();
-    result = snd_fetch_array(arg1, arg2, arg3);
-    return (result);
-}
-
-
-#include "sndwrite.h"
-
-/* xlc_snd_save -- interface to C routine sound_save */
-/**/
-LVAL xlc_snd_save(void)
-{
-    LVAL arg1 = xlgetarg();
-    long arg2 = getfixnum(xlgafixnum());
-    unsigned char * arg3 = getstring(xlgastring());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-    double arg8 = 0.0;
-    long arg9 = 0;
-    double arg10 = 0.0;
-    LVAL arg11 = xlgetarg();
-    double result;
-
-    xllastarg();
-    result = sound_save(arg1, arg2, arg3, arg4, arg5, arg6, arg7, &arg8, &arg9, &arg10, arg11);
-    {	LVAL *next = &getvalue(RSLT_sym);
-	*next = cons(NIL, NIL);
-	car(*next) = cvflonum(arg8);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg9);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvflonum(arg10);
-    }
-    return cvflonum(result);
-}
-
-
-/* xlc_snd_overwrite -- interface to C routine sound_overwrite */
-/**/
-LVAL xlc_snd_overwrite(void)
-{
-    LVAL arg1 = xlgetarg();
-    long arg2 = getfixnum(xlgafixnum());
-    unsigned char * arg3 = getstring(xlgastring());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-    long arg8 = getfixnum(xlgafixnum());
-    double arg9 = testarg2(xlgaanynum());
-    long arg10 = getfixnum(xlgafixnum());
-    double arg11 = 0.0;
-    double result;
-
-    xllastarg();
-    result = sound_overwrite(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, &arg11);
-    {	LVAL *next = &getvalue(RSLT_sym);
-	*next = cons(NIL, NIL);
-	car(*next) = cvflonum(arg11);
-    }
-    return cvflonum(result);
-}
-
-
-#include "sndmax.h"
-
-/* xlc_snd_max -- interface to C routine sound_max */
-/**/
-LVAL xlc_snd_max(void)
-{
-    LVAL arg1 = xlgetarg();
-    long arg2 = getfixnum(xlgafixnum());
-    double result;
-
-    xllastarg();
-    result = sound_max(arg1, arg2);
-    return cvflonum(result);
-}
-
-
-#include "compose.h"
-
-/* xlc_snd_compose -- interface to C routine snd_compose */
-/**/
-LVAL xlc_snd_compose(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_compose(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "inverse.h"
-
-/* xlc_snd_inverse -- interface to C routine snd_inverse */
-/**/
-LVAL xlc_snd_inverse(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_inverse(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "resamp.h"
-
-/* xlc_snd_resample -- interface to C routine snd_resample */
-/**/
-LVAL xlc_snd_resample(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_resample(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "resampv.h"
-
-/* xlc_snd_resamplev -- interface to C routine snd_resamplev */
-/**/
-LVAL xlc_snd_resamplev(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_resamplev(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "fft.h"
-
-/* xlc_snd_fft -- interface to C routine snd_fft */
-/**/
-LVAL xlc_snd_fft(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    LVAL arg4 = xlgetarg();
-    LVAL result;
-
-    xllastarg();
-    result = snd_fft(arg1, arg2, arg3, arg4);
-    return (result);
-}
-
-
-#include "avg.h"
-
-/* xlc_snd_avg -- interface to C routine snd_avg */
-/**/
-LVAL xlc_snd_avg(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_avg(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "amosc.h"
-
-/* xlc_snd_amosc -- interface to C routine snd_amosc */
-/**/
-LVAL xlc_snd_amosc(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    sound_type arg6 = getsound(xlgasound());
-    double arg7 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_amosc(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-    return cvsound(result);
-}
-
-
-#include "clip.h"
-
-/* xlc_snd_clip -- interface to C routine snd_clip */
-/**/
-LVAL xlc_snd_clip(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_clip(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "const.h"
-
-/* xlc_snd_const -- interface to C routine snd_const */
-/**/
-LVAL xlc_snd_const(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_const(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "fmosc.h"
-
-/* xlc_snd_fmosc -- interface to C routine snd_fmosc */
-/**/
-LVAL xlc_snd_fmosc(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    sound_type arg6 = getsound(xlgasound());
-    double arg7 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_fmosc(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-    return cvsound(result);
-}
-
-
-#include "integrate.h"
-
-/* xlc_snd_integrate -- interface to C routine snd_integrate */
-/**/
-LVAL xlc_snd_integrate(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_integrate(arg1);
-    return cvsound(result);
-}
-
-
-#include "log.h"
-
-/* xlc_snd_log -- interface to C routine snd_log */
-/**/
-LVAL xlc_snd_log(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_log(arg1);
-    return cvsound(result);
-}
-
-
-#include "maxv.h"
-
-/* xlc_snd_maxv -- interface to C routine snd_maxv */
-/**/
-LVAL xlc_snd_maxv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_maxv(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "osc.h"
-
-/* xlc_snd_osc -- interface to C routine snd_osc */
-/**/
-LVAL xlc_snd_osc(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    double arg6 = testarg2(xlgaanynum());
-    double arg7 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_osc(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-    return cvsound(result);
-}
-
-
-#include "prod.h"
-
-/* xlc_snd_prod -- interface to C routine snd_prod */
-/**/
-LVAL xlc_snd_prod(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_prod(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "buzz.h"
-
-/* xlc_snd_buzz -- interface to C routine snd_buzz */
-/**/
-LVAL xlc_snd_buzz(void)
-{
-    long arg1 = getfixnum(xlgafixnum());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    sound_type arg5 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_buzz(arg1, arg2, arg3, arg4, arg5);
-    return cvsound(result);
-}
-
-
-#include "pwl.h"
-
-/* xlc_snd_pwl -- interface to C routine snd_pwl */
-/**/
-LVAL xlc_snd_pwl(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    LVAL arg3 = xlgetarg();
-    sound_type result;
-
-    xllastarg();
-    result = snd_pwl(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "recip.h"
-
-/* xlc_snd_recip -- interface to C routine snd_recip */
-/**/
-LVAL xlc_snd_recip(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_recip(arg1);
-    return cvsound(result);
-}
-
-
-#include "upsample.h"
-
-/* xlc_snd_up -- interface to C routine snd_up */
-/**/
-LVAL xlc_snd_up(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_up(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "scale.h"
-
-/* xlc_snd_normalize -- interface to C routine snd_normalize */
-/**/
-LVAL xlc_snd_normalize(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_normalize(arg1);
-    return cvsound(result);
-}
-
-
-#include "sine.h"
-
-/* xlc_snd_sine -- interface to C routine snd_sine */
-/**/
-LVAL xlc_snd_sine(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_sine(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "partial.h"
-
-/* xlc_snd_partial -- interface to C routine snd_partial */
-/**/
-LVAL xlc_snd_partial(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_partial(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "white.h"
-
-/* xlc_snd_white -- interface to C routine snd_white */
-/**/
-LVAL xlc_snd_white(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_white(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "tone.h"
-
-/* xlc_snd_tone -- interface to C routine snd_tone */
-/**/
-LVAL xlc_snd_tone(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_tone(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "tonev.h"
-
-/* xlc_snd_tonev -- interface to C routine snd_tonev */
-/**/
-LVAL xlc_snd_tonev(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_tonev(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "atonev.h"
-
-/* xlc_snd_atonev -- interface to C routine snd_atonev */
-/**/
-LVAL xlc_snd_atonev(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_atonev(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "atone.h"
-
-/* xlc_snd_atone -- interface to C routine snd_atone */
-/**/
-LVAL xlc_snd_atone(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_atone(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "reson.h"
-
-/* xlc_snd_reson -- interface to C routine snd_reson */
-/**/
-LVAL xlc_snd_reson(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_reson(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "areson.h"
-
-/* xlc_snd_areson -- interface to C routine snd_areson */
-/**/
-LVAL xlc_snd_areson(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_areson(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "resonvc.h"
-
-/* xlc_snd_resonvc -- interface to C routine snd_resonvc */
-/**/
-LVAL xlc_snd_resonvc(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    double arg3 = testarg2(xlgaanynum());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_resonvc(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "resoncv.h"
-
-/* xlc_snd_resoncv -- interface to C routine snd_resoncv */
-/**/
-LVAL xlc_snd_resoncv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_resoncv(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "aresonvc.h"
-
-/* xlc_snd_aresonvc -- interface to C routine snd_aresonvc */
-/**/
-LVAL xlc_snd_aresonvc(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    double arg3 = testarg2(xlgaanynum());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_aresonvc(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "aresoncv.h"
-
-/* xlc_snd_aresoncv -- interface to C routine snd_aresoncv */
-/**/
-LVAL xlc_snd_aresoncv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_aresoncv(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "resonvv.h"
-
-/* xlc_snd_resonvv -- interface to C routine snd_resonvv */
-/**/
-LVAL xlc_snd_resonvv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type arg3 = getsound(xlgasound());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_resonvv(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "aresonvv.h"
-
-/* xlc_snd_aresonvv -- interface to C routine snd_aresonvv */
-/**/
-LVAL xlc_snd_aresonvv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type arg3 = getsound(xlgasound());
-    long arg4 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_aresonvv(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "offset.h"
-
-/* xlc_snd_offset -- interface to C routine snd_offset */
-/**/
-LVAL xlc_snd_offset(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_offset(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "slope.h"
-
-/* xlc_snd_slope -- interface to C routine snd_slope */
-/**/
-LVAL xlc_snd_slope(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_slope(arg1);
-    return cvsound(result);
-}
-
-
-#include "delay.h"
-
-/* xlc_snd_delay -- interface to C routine snd_delay */
-/**/
-LVAL xlc_snd_delay(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_delay(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "delaycv.h"
-
-/* xlc_snd_delaycv -- interface to C routine snd_delaycv */
-/**/
-LVAL xlc_snd_delaycv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_delaycv(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "shape.h"
-
-/* xlc_snd_shape -- interface to C routine snd_shape */
-/**/
-LVAL xlc_snd_shape(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_shape(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "sampler.h"
-
-/* xlc_snd_sampler -- interface to C routine snd_sampler */
-/**/
-LVAL xlc_snd_sampler(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    double arg6 = testarg2(xlgaanynum());
-    sound_type arg7 = getsound(xlgasound());
-    long arg8 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_sampler(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-    return cvsound(result);
-}
-
-
-#include "exp.h"
-
-/* xlc_snd_exp -- interface to C routine snd_exp */
-/**/
-LVAL xlc_snd_exp(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_exp(arg1);
-    return cvsound(result);
-}
-
-
-#include "siosc.h"
-
-/* xlc_snd_siosc -- interface to C routine snd_siosc */
-/**/
-LVAL xlc_snd_siosc(void)
-{
-    LVAL arg1 = xlgetarg();
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    sound_type arg5 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_siosc(arg1, arg2, arg3, arg4, arg5);
-    return cvsound(result);
-}
-
-
-#include "follow.h"
-
-/* xlc_snd_follow -- interface to C routine snd_follow */
-/**/
-LVAL xlc_snd_follow(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    long arg5 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_follow(arg1, arg2, arg3, arg4, arg5);
-    return cvsound(result);
-}
-
-
-#include "gate.h"
-
-/* xlc_snd_gate -- interface to C routine snd_gate */
-/**/
-LVAL xlc_snd_gate(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    double arg6 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_gate(arg1, arg2, arg3, arg4, arg5, arg6);
-    return cvsound(result);
-}
-
-
-#include "quantize.h"
-
-/* xlc_snd_quantize -- interface to C routine snd_quantize */
-/**/
-LVAL xlc_snd_quantize(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    long arg2 = getfixnum(xlgafixnum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_quantize(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "ifft.h"
-
-/* xlc_snd_ifft -- interface to C routine snd_ifft */
-/**/
-LVAL xlc_snd_ifft(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    LVAL arg3 = xlgetarg();
-    long arg4 = getfixnum(xlgafixnum());
-    LVAL arg5 = xlgetarg();
-    sound_type result;
-
-    xllastarg();
-    result = snd_ifft(arg1, arg2, arg3, arg4, arg5);
-    return cvsound(result);
-}
-
-
-#include "congen.h"
-
-/* xlc_snd_congen -- interface to C routine snd_congen */
-/**/
-LVAL xlc_snd_congen(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_congen(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "fromobject.h"
-
-/* xlc_snd_fromobject -- interface to C routine snd_fromobject */
-/**/
-LVAL xlc_snd_fromobject(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    LVAL arg3 = xlgetarg();
-    sound_type result;
-
-    xllastarg();
-    result = snd_fromobject(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "fromarraystream.h"
-
-/* xlc_snd_fromarraystream -- interface to C routine snd_fromarraystream */
-/**/
-LVAL xlc_snd_fromarraystream(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    LVAL arg3 = xlgetarg();
-    sound_type result;
-
-    xllastarg();
-    result = snd_fromarraystream(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "coterm.h"
-
-/* xlc_snd_coterm -- interface to C routine snd_coterm */
-/**/
-LVAL xlc_snd_coterm(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_coterm(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "convolve.h"
-
-/* xlc_snd_convolve -- interface to C routine snd_convolve */
-/**/
-LVAL xlc_snd_convolve(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_convolve(arg1, arg2);
-    return cvsound(result);
-}
-
-
-#include "alpass.h"
-
-/* xlc_snd_alpass -- interface to C routine snd_alpass */
-/**/
-LVAL xlc_snd_alpass(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_alpass(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "oneshot.h"
-
-/* xlc_snd_oneshot -- interface to C routine snd_oneshot */
-/**/
-LVAL xlc_snd_oneshot(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_oneshot(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "chase.h"
-
-/* xlc_snd_chase -- interface to C routine snd_chase */
-/**/
-LVAL xlc_snd_chase(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_chase(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "tapv.h"
-
-/* xlc_snd_tapv -- interface to C routine snd_tapv */
-/**/
-LVAL xlc_snd_tapv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    double arg4 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_tapv(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
-#include "biquad.h"
-
-/* xlc_snd_biquad -- interface to C routine snd_biquad */
-/**/
-LVAL xlc_snd_biquad(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    double arg6 = testarg2(xlgaanynum());
-    double arg7 = testarg2(xlgaanynum());
-    double arg8 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_biquad(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-    return cvsound(result);
-}
-
-
-#include "pluck.h"
-
-/* xlc_snd_pluck -- interface to C routine snd_pluck */
-/**/
-LVAL xlc_snd_pluck(void)
-{
-    double arg1 = testarg2(xlgaanynum());
-    double arg2 = testarg2(xlgaanynum());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    double arg5 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_pluck(arg1, arg2, arg3, arg4, arg5);
-    return cvsound(result);
-}
-
-
-#include "abs.h"
-
-/* xlc_snd_abs -- interface to C routine snd_abs */
-/**/
-LVAL xlc_snd_abs(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_abs(arg1);
-    return cvsound(result);
-}
-
-
-#include "sqrt.h"
-
-/* xlc_snd_sqrt -- interface to C routine snd_sqrt */
-/**/
-LVAL xlc_snd_sqrt(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_sqrt(arg1);
-    return cvsound(result);
-}
-
-
-#include "alpasscv.h"
-
-/* xlc_snd_alpasscv -- interface to C routine snd_alpasscv */
-/**/
-LVAL xlc_snd_alpasscv(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    double arg2 = testarg2(xlgaanynum());
-    sound_type arg3 = getsound(xlgasound());
-    sound_type result;
-
-    xllastarg();
-    result = snd_alpasscv(arg1, arg2, arg3);
-    return cvsound(result);
-}
-
-
-#include "alpassvc.h"
-
-/* xlc_snd_alpassvc -- interface to C routine snd_alpassvc */
-/**/
-LVAL xlc_snd_alpassvc(void)
-{
-    sound_type arg1 = getsound(xlgasound());
-    sound_type arg2 = getsound(xlgasound());
-    double arg3 = testarg2(xlgaanynum());
-    double arg4 = testarg2(xlgaanynum());
-    sound_type result;
-
-    xllastarg();
-    result = snd_alpassvc(arg1, arg2, arg3, arg4);
-    return cvsound(result);
-}
-
-
diff --git a/lib-src/libnyquist/nyqsrc/sndfnintdefs.h b/lib-src/libnyquist/nyqsrc/sndfnintdefs.h
deleted file mode 100644
index 460251e..0000000
--- a/lib-src/libnyquist/nyqsrc/sndfnintdefs.h
+++ /dev/null
@@ -1,97 +0,0 @@
-extern LVAL xlc_soundp(void);
-extern LVAL xlc_hz_to_step(void);
-extern LVAL xlc_snd_set_logical_stop(void);
-extern LVAL xlc_log(void);
-extern LVAL xlc_snd_sref(void);
-extern LVAL xlc_sref_inverse(void);
-extern LVAL xlc_snd_stop_time(void);
-extern LVAL xlc_snd_time(void);
-extern LVAL xlc_snd_srate(void);
-extern LVAL xlc_snd_t0(void);
-extern LVAL xlc_snd_xform(void);
-extern LVAL xlc_block_watch(void);
-extern LVAL xlc_sound_nth_block(void);
-extern LVAL xlc_snd_copy(void);
-extern LVAL xlc_snd_print(void);
-extern LVAL xlc_snd_play(void);
-extern LVAL xlc_stats(void);
-extern LVAL xlc_snd_print_tree(void);
-extern LVAL xlc_snd_scale(void);
-extern LVAL xlc_snd_zero(void);
-extern LVAL xlc_step_to_hz(void);
-extern LVAL xlc_snd_down(void);
-extern LVAL xlc_snd_read(void);
-extern LVAL xlc_snd_seq(void);
-extern LVAL xlc_snd_add(void);
-extern LVAL xlc_snd_multiseq(void);
-extern LVAL xlc_snd_from_array(void);
-extern LVAL xlc_snd_samples(void);
-extern LVAL xlc_snd_length(void);
-extern LVAL xlc_snd_maxsamp(void);
-extern LVAL xlc_snd_fetch(void);
-extern LVAL xlc_snd_fetch_array(void);
-extern LVAL xlc_snd_save(void);
-extern LVAL xlc_snd_overwrite(void);
-extern LVAL xlc_snd_max(void);
-extern LVAL xlc_snd_compose(void);
-extern LVAL xlc_snd_inverse(void);
-extern LVAL xlc_snd_resample(void);
-extern LVAL xlc_snd_resamplev(void);
-extern LVAL xlc_snd_fft(void);
-extern LVAL xlc_snd_avg(void);
-extern LVAL xlc_snd_amosc(void);
-extern LVAL xlc_snd_clip(void);
-extern LVAL xlc_snd_const(void);
-extern LVAL xlc_snd_fmosc(void);
-extern LVAL xlc_snd_integrate(void);
-extern LVAL xlc_snd_log(void);
-extern LVAL xlc_snd_maxv(void);
-extern LVAL xlc_snd_osc(void);
-extern LVAL xlc_snd_prod(void);
-extern LVAL xlc_snd_buzz(void);
-extern LVAL xlc_snd_pwl(void);
-extern LVAL xlc_snd_recip(void);
-extern LVAL xlc_snd_up(void);
-extern LVAL xlc_snd_normalize(void);
-extern LVAL xlc_snd_sine(void);
-extern LVAL xlc_snd_partial(void);
-extern LVAL xlc_snd_white(void);
-extern LVAL xlc_snd_tone(void);
-extern LVAL xlc_snd_tonev(void);
-extern LVAL xlc_snd_atonev(void);
-extern LVAL xlc_snd_atone(void);
-extern LVAL xlc_snd_reson(void);
-extern LVAL xlc_snd_areson(void);
-extern LVAL xlc_snd_resonvc(void);
-extern LVAL xlc_snd_resoncv(void);
-extern LVAL xlc_snd_aresonvc(void);
-extern LVAL xlc_snd_aresoncv(void);
-extern LVAL xlc_snd_resonvv(void);
-extern LVAL xlc_snd_aresonvv(void);
-extern LVAL xlc_snd_offset(void);
-extern LVAL xlc_snd_slope(void);
-extern LVAL xlc_snd_delay(void);
-extern LVAL xlc_snd_delaycv(void);
-extern LVAL xlc_snd_shape(void);
-extern LVAL xlc_snd_sampler(void);
-extern LVAL xlc_snd_exp(void);
-extern LVAL xlc_snd_siosc(void);
-extern LVAL xlc_snd_follow(void);
-extern LVAL xlc_snd_gate(void);
-extern LVAL xlc_snd_quantize(void);
-extern LVAL xlc_snd_ifft(void);
-extern LVAL xlc_snd_congen(void);
-extern LVAL xlc_snd_fromobject(void);
-extern LVAL xlc_snd_fromarraystream(void);
-extern LVAL xlc_snd_coterm(void);
-extern LVAL xlc_snd_convolve(void);
-extern LVAL xlc_snd_alpass(void);
-extern LVAL xlc_snd_oneshot(void);
-extern LVAL xlc_snd_chase(void);
-extern LVAL xlc_snd_tapv(void);
-extern LVAL xlc_snd_biquad(void);
-extern LVAL xlc_snd_pluck(void);
-extern LVAL xlc_snd_abs(void);
-extern LVAL xlc_snd_sqrt(void);
-extern LVAL xlc_snd_alpasscv(void);
-extern LVAL xlc_snd_alpassvc(void);
diff --git a/lib-src/libnyquist/nyqsrc/sndfnintptrs.h b/lib-src/libnyquist/nyqsrc/sndfnintptrs.h
deleted file mode 100644
index e038367..0000000
--- a/lib-src/libnyquist/nyqsrc/sndfnintptrs.h
+++ /dev/null
@@ -1,97 +0,0 @@
-  { "SOUNDP",  S, xlc_soundp}, 
-  { "HZ-TO-STEP",  S, xlc_hz_to_step}, 
-  { "SND-SET-LOGICAL-STOP",  S, xlc_snd_set_logical_stop}, 
-  { "LOG",  S, xlc_log}, 
-  { "SND-SREF",  S, xlc_snd_sref}, 
-  { "SREF-INVERSE",  S, xlc_sref_inverse}, 
-  { "SND-STOP-TIME",  S, xlc_snd_stop_time}, 
-  { "SND-TIME",  S, xlc_snd_time}, 
-  { "SND-SRATE",  S, xlc_snd_srate}, 
-  { "SND-T0",  S, xlc_snd_t0}, 
-  { "SND-XFORM",  S, xlc_snd_xform}, 
-  { "BLOCK-WATCH",  S, xlc_block_watch}, 
-  { "SOUND-NTH-BLOCK",  S, xlc_sound_nth_block}, 
-  { "SND-COPY",  S, xlc_snd_copy}, 
-  { "SND-PRINT",  S, xlc_snd_print}, 
-  { "SND-PLAY",  S, xlc_snd_play}, 
-  { "STATS",  S, xlc_stats}, 
-  { "SND-PRINT-TREE",  S, xlc_snd_print_tree}, 
-  { "SND-SCALE",  S, xlc_snd_scale}, 
-  { "SND-ZERO",  S, xlc_snd_zero}, 
-  { "STEP-TO-HZ",  S, xlc_step_to_hz}, 
-  { "SND-DOWN",  S, xlc_snd_down}, 
-  { "SND-READ",  S, xlc_snd_read}, 
-  { "SND-SEQ",  S, xlc_snd_seq}, 
-  { "SND-ADD",  S, xlc_snd_add}, 
-  { "SND-MULTISEQ",  S, xlc_snd_multiseq}, 
-  { "SND-FROM-ARRAY",  S, xlc_snd_from_array}, 
-  { "SND-SAMPLES",  S, xlc_snd_samples}, 
-  { "SND-LENGTH",  S, xlc_snd_length}, 
-  { "SND-MAXSAMP",  S, xlc_snd_maxsamp}, 
-  { "SND-FETCH",  S, xlc_snd_fetch}, 
-  { "SND-FETCH-ARRAY",  S, xlc_snd_fetch_array}, 
-  { "SND-SAVE",  S, xlc_snd_save}, 
-  { "SND-OVERWRITE",  S, xlc_snd_overwrite}, 
-  { "SND-MAX",  S, xlc_snd_max}, 
-  { "SND-COMPOSE",  S, xlc_snd_compose}, 
-  { "SND-INVERSE",  S, xlc_snd_inverse}, 
-  { "SND-RESAMPLE",  S, xlc_snd_resample}, 
-  { "SND-RESAMPLEV",  S, xlc_snd_resamplev}, 
-  { "SND-FFT",  S, xlc_snd_fft}, 
-  { "SND-AVG",  S, xlc_snd_avg}, 
-  { "SND-AMOSC",  S, xlc_snd_amosc}, 
-  { "SND-CLIP",  S, xlc_snd_clip}, 
-  { "SND-CONST",  S, xlc_snd_const}, 
-  { "SND-FMOSC",  S, xlc_snd_fmosc}, 
-  { "SND-INTEGRATE",  S, xlc_snd_integrate}, 
-  { "SND-LOG",  S, xlc_snd_log}, 
-  { "SND-MAXV",  S, xlc_snd_maxv}, 
-  { "SND-OSC",  S, xlc_snd_osc}, 
-  { "SND-PROD",  S, xlc_snd_prod}, 
-  { "SND-BUZZ",  S, xlc_snd_buzz}, 
-  { "SND-PWL",  S, xlc_snd_pwl}, 
-  { "SND-RECIP",  S, xlc_snd_recip}, 
-  { "SND-UP",  S, xlc_snd_up}, 
-  { "SND-NORMALIZE",  S, xlc_snd_normalize}, 
-  { "SND-SINE",  S, xlc_snd_sine}, 
-  { "SND-PARTIAL",  S, xlc_snd_partial}, 
-  { "SND-WHITE",  S, xlc_snd_white}, 
-  { "SND-TONE",  S, xlc_snd_tone}, 
-  { "SND-TONEV",  S, xlc_snd_tonev}, 
-  { "SND-ATONEV",  S, xlc_snd_atonev}, 
-  { "SND-ATONE",  S, xlc_snd_atone}, 
-  { "SND-RESON",  S, xlc_snd_reson}, 
-  { "SND-ARESON",  S, xlc_snd_areson}, 
-  { "SND-RESONVC",  S, xlc_snd_resonvc}, 
-  { "SND-RESONCV",  S, xlc_snd_resoncv}, 
-  { "SND-ARESONVC",  S, xlc_snd_aresonvc}, 
-  { "SND-ARESONCV",  S, xlc_snd_aresoncv}, 
-  { "SND-RESONVV",  S, xlc_snd_resonvv}, 
-  { "SND-ARESONVV",  S, xlc_snd_aresonvv}, 
-  { "SND-OFFSET",  S, xlc_snd_offset}, 
-  { "SND-SLOPE",  S, xlc_snd_slope}, 
-  { "SND-DELAY",  S, xlc_snd_delay}, 
-  { "SND-DELAYCV",  S, xlc_snd_delaycv}, 
-  { "SND-SHAPE",  S, xlc_snd_shape}, 
-  { "SND-SAMPLER",  S, xlc_snd_sampler}, 
-  { "SND-EXP",  S, xlc_snd_exp}, 
-  { "SND-SIOSC",  S, xlc_snd_siosc}, 
-  { "SND-FOLLOW",  S, xlc_snd_follow}, 
-  { "SND-GATE",  S, xlc_snd_gate}, 
-  { "SND-QUANTIZE",  S, xlc_snd_quantize}, 
-  { "SND-IFFT",  S, xlc_snd_ifft}, 
-  { "SND-CONGEN",  S, xlc_snd_congen}, 
-  { "SND-FROMOBJECT",  S, xlc_snd_fromobject}, 
-  { "SND-FROMARRAYSTREAM",  S, xlc_snd_fromarraystream}, 
-  { "SND-COTERM",  S, xlc_snd_coterm}, 
-  { "SND-CONVOLVE",  S, xlc_snd_convolve}, 
-  { "SND-ALPASS",  S, xlc_snd_alpass}, 
-  { "SND-ONESHOT",  S, xlc_snd_oneshot}, 
-  { "SND-CHASE",  S, xlc_snd_chase}, 
-  { "SND-TAPV",  S, xlc_snd_tapv}, 
-  { "SND-BIQUAD",  S, xlc_snd_biquad}, 
-  { "SND-PLUCK",  S, xlc_snd_pluck}, 
-  { "SND-ABS",  S, xlc_snd_abs}, 
-  { "SND-SQRT",  S, xlc_snd_sqrt}, 
-  { "SND-ALPASSCV",  S, xlc_snd_alpasscv}, 
-  { "SND-ALPASSVC",  S, xlc_snd_alpassvc}, 
diff --git a/lib-src/libnyquist/nyx/nyx.c b/lib-src/libnyquist/nyx/nyx.c
index 92d858c..ad0e8c1 100644
--- a/lib-src/libnyquist/nyx/nyx.c
+++ b/lib-src/libnyquist/nyx/nyx.c
@@ -138,7 +138,7 @@ void nyx_susp_fetch(register nyx_susp_type susp, snd_list_type snd_list)
       n = susp->len - susp->susp.current;
 
    err = susp->callback(out_ptr, susp->channel,
-                            susp->susp.current, n, susp->userdata);
+                            susp->susp.current, n, 0, susp->userdata);
    if (err)
       longjmp(nyx_cntxt.c_jmpbuf, 1);      
 
@@ -409,7 +409,7 @@ int nyx_get_audio_num_channels()
       return 1;
 }
 
-void nyx_get_audio(nyx_audio_callback callback, void *userdata)
+int nyx_get_audio(nyx_audio_callback callback, void *userdata)
 {
    sample_block_type block;
    sound_type snd;
@@ -417,10 +417,12 @@ void nyx_get_audio(nyx_audio_callback callback, void *userdata)
    float *buffer;
    long bufferlen;
    long *totals;
+   long *lens;
    long cnt;
    int result = 0;
    int num_channels;
    int ch, i;
+   int success = FALSE;
 
    if (nyx_get_type(nyx_result) != nyx_audio)
       return;
@@ -428,6 +430,7 @@ void nyx_get_audio(nyx_audio_callback callback, void *userdata)
    num_channels = nyx_get_audio_num_channels();
    snds = (sound_type *)malloc(num_channels * sizeof(sound_type));
    totals = (long *)malloc(num_channels * sizeof(long));
+   lens = (long *)malloc(num_channels * sizeof(long));
 
    /* setup the error return */
    xlbegin(&nyx_cntxt,CF_TOPLEVEL|CF_CLEANUP|CF_BRKLEVEL,(LVAL)1);
@@ -441,6 +444,7 @@ void nyx_get_audio(nyx_audio_callback callback, void *userdata)
          snd = getsound(getelement(nyx_result, ch));
       snds[ch] = snd;
       totals[ch] = 0;
+      lens[ch] = snd_length(snd, snd->stop);
    }
 
    buffer = NULL;
@@ -472,20 +476,28 @@ void nyx_get_audio(nyx_audio_callback callback, void *userdata)
             buffer[i] *= snd->scale;
 
          result = callback(buffer, ch,
-                           totals[ch], cnt, userdata);
+                           totals[ch], cnt, lens[ch], userdata);
 
-         if (result == 0)
-            totals[ch] += cnt;
+         if (result != 0) {
+            goto finish;
+         }
+
+         totals[ch] += cnt;
       }
    }
 
+   success = TRUE;
+
  finish:
-      if (buffer)
-         free(buffer);
+   if (buffer)
+      free(buffer);
    free(snds);
    free(totals);
+   free(lens);
 
    xlend(&nyx_cntxt);
+
+   return success;
 }
 
 int nyx_get_int()
diff --git a/lib-src/libnyquist/nyx/nyx.h b/lib-src/libnyquist/nyx/nyx.h
index 3692d87..8b16ab0 100644
--- a/lib-src/libnyquist/nyx/nyx.h
+++ b/lib-src/libnyquist/nyx/nyx.h
@@ -34,6 +34,7 @@ extern "C"
    typedef int (*nyx_audio_callback)(float *buffer,
                                      int channel,
                                      long start, long len,
+                                     long totlen,
                                      void *userdata);
 
    /* Set to 0 to stop capturing output */
@@ -53,7 +54,7 @@ extern "C"
    nyx_rval    nyx_eval_expression(const char *expr);
    
    int         nyx_get_audio_num_channels();
-   void        nyx_get_audio(nyx_audio_callback callback,
+   int         nyx_get_audio(nyx_audio_callback callback,
                              void *userdata);
 
    int         nyx_get_int();
diff --git a/lib-src/libnyquist/tran/recip.alg b/lib-src/libnyquist/tran/recip.alg
index 3e02ff6..8a535d6 100644
--- a/lib-src/libnyquist/tran/recip.alg
+++ b/lib-src/libnyquist/tran/recip.alg
@@ -1,7 +1,7 @@
 (RECIP-ALG
   (NAME "recip")
   (ARGUMENTS ("sound_type" "s1"))
-  (STATE ("double" "scale" "s1->scale"))
+  (STATE ("double" "scale" "(1.0 / s1->scale)"))
   (INTERNAL-SCALING s1)
   (CONSTANT "scale")
   (START (MIN s1))
diff --git a/lib-src/libnyquist/tran/recip.c b/lib-src/libnyquist/tran/recip.c
index aea3217..8a32d38 100644
--- a/lib-src/libnyquist/tran/recip.c
+++ b/lib-src/libnyquist/tran/recip.c
@@ -165,7 +165,7 @@ sound_type snd_make_recip(sound_type s1)
     sample_type scale_factor = 1.0F;
     time_type t0_min = t0;
     falloc_generic(susp, recip_susp_node, "snd_make_recip");
-    susp->scale = s1->scale;
+    susp->scale = (1.0 / s1->scale);
     susp->susp.fetch = recip_n_fetch;
     susp->terminate_cnt = UNKNOWN;
     /* handle unequal start times, if any */
diff --git a/lib-src/libscorealign/Makefile.linux b/lib-src/libscorealign/Makefile.linux
new file mode 100644
index 0000000..b4e56bf
--- /dev/null
+++ b/lib-src/libscorealign/Makefile.linux
@@ -0,0 +1,107 @@
+# Linux makefile for scorealign
+# please use either make -f Makfile.linux
+# -OR- ln -s Makfile.linux Makefile
+
+# profile = -pg
+profile = 
+
+DEBUGFLAGS = 
+
+optimize = -g $(DEBUGFLAGS) $(profile)
+# optimize = -O
+
+#PORTSMF LIBRARY PATH:
+# (set this to the location of allegro.cpp, allegrosmfrd.cpp, allegrosmfwr.cpp, etc.)
+# (if you do not have this directory, look for portsmf in the portmedia project
+#  on sourceforge)
+PORTSMF = ../portsmf
+
+INCLUDES = -Isnd -Ifft3 -I$(PORTSMF)
+
+#OPTIONS FOR LINUX:
+c_opts = $(optimize) -DLINUX $(INCLUDES)
+
+cc = gcc $(c_opts)
+c++ = g++ $(c_opts)
+cclink = gcc
+c++link = g++
+syslibs = -lm
+
+scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o \
+               snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o \
+               snd/ieeecvt.o snd/sndlinux.o snd/sndfaillinux.o \
+               fft3/FFT.o $(PORTSMF)/mfmidi.o $(PORTSMF)/allegro.o \
+               $(PORTSMF)/allegrosmfrd.o $(PORTSMF)/allegrosmfwr.o \
+               $(PORTSMF)/allegrord.o $(PORTSMF)/strparse.o trace.o \
+               regression.o sautils.o curvefit.o hillclimb.o
+
+.SUFFIXES: .cpp .c .h .aur .o
+
+.cpp.o:
+	$(c++) -c $< -o $*.o
+
+.c.o:
+	$(cc) -c $< -o $*.o
+
+all: scorealign
+
+header:
+	echo "**********************************************************"
+	echo "**********************************************************"
+
+clean: 
+	echo "removing objects"
+	find . -name "*~" | xargs rm -f
+	rm -f $(scorealign_o)
+	rm -f core*
+
+cleaner: clean
+	rm -f TAGS
+
+cleanest: cleaner
+	rm -f scorealign
+	rm -f scorealign.ncb
+	rm -f scorealign.opt
+	rm -f scorealign.plg
+
+TAGS: 
+	find . \( -name "*.cpp" -o -name "*.h" \) -print | etags -
+
+tags: TAGS
+
+backup: cleanest
+	tar cvf ../scorealign.tar .
+	gzip ../scorealign.tar
+	echo "please rename ../scorealign.tar.gz"
+
+
+scorealign: $(scorealign_o)
+	$(c++link) $(scorealign_o) -o scorealign $(syslibs)
+
+test0:
+	./scorealign /home/rbd/wdh/music/nyquist-temp.wav /home/rbd/wdh/music/chrom_nyquist-temp.wav > output.txt
+	diff output.txt /home/rbd/wdh/music/output.txt | less
+
+test:
+	./scorealign /home/rbd/scorealign/data/live-beeth-s5m1-25s-mono.wav  /home/rbd/scorealign/data/midi-beeth-s5m1-25s-mono.wav > output.txt
+	diff output.txt /home/rbd/wdh/music/output.txt | less
+
+bigtest:
+	./scorealign data/live-Beethoven_Symphony_No5_Mvt1.wav data/midi-Beethoven_Symphony_No5_Mvt1.wav
+
+bigtest2: 
+	./scorealign data/midi-Beethoven_Symphony_No5_Mvt1.wav data/live-Beethoven_Symphony_No5_Mvt1.wav
+
+
+# DEPENDENCIES
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib-src/libscorealign/Makefile.osx b/lib-src/libscorealign/Makefile.osx
new file mode 100644
index 0000000..cf65aad
--- /dev/null
+++ b/lib-src/libscorealign/Makefile.osx
@@ -0,0 +1,100 @@
+# OS X Makefile for scorealign
+# NOTE: This is out of date. See the score-align.vcproj -OR- Makefile.linux
+
+# profile = -pg
+profile = 
+
+DEBUGFLAGS = 
+
+#optimize = -g $(DEBUGFLAGS) $(profile)
+optimize = -O
+
+#PORTSMF LIBRARY PATH:
+# (set this to the location of allegro.cpp, allegrosmfrd.cpp, allegrosmfwr.cpp, etc.)
+# (if you do not have this directory, look for portsmf in the portmedia project
+#  on sourceforge)
+PORTSMF = ../portsmf
+
+INCLUDES = -Isnd -Ifft3 -I$(PORTSMF)
+
+#OPTIONS FOR LINUX:
+c_opts = $(optimize) -DLINUX $(INCLUDES)
+
+cc = gcc $(c_opts)
+c++ = g++ $(c_opts)
+cclink = gcc
+c++link = g++
+syslibs = -lm
+
+scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o snd/ieeecvt.o snd/sndlinux.o snd/sndfaillinux.o fft3/FFT.o mfmidi.o $(PORTSMF)/allegro.o $(PORTSMF)/allegrosmfrd.o $(PORTSMF)/allegrosmfwr.o $(PORTSMF)/allegrord.o $(PORTSMF)/strparse.o trace.o regression.o
+
+.SUFFIXES: .cpp .c .h .aur .o
+
+.cpp.o:
+	$(c++) -c $< -o $*.o
+
+.c.o:
+	$(cc) -c $< -o $*.o
+
+all: scorealign
+
+header:
+	echo "**********************************************************"
+	echo "**********************************************************"
+
+clean: 
+	echo "removing objects"
+	find . -name "*~" | xargs rm -f
+	rm -f $(scorealign_o)
+	rm -f core*
+
+cleaner: clean
+	rm -f TAGS
+
+cleanest: cleaner
+	rm -f scorealign
+	rm -f scorealign.ncb
+	rm -f scorealign.opt
+	rm -f scorealign.plg
+
+TAGS: 
+	find . \( -name "*.cpp" -o -name "*.h" \) -print | etags -
+
+tags: TAGS
+
+backup: cleanest
+	tar cvf ../scorealign.tar .
+	gzip ../scorealign.tar
+	echo "please rename ../scorealign.tar.gz"
+
+
+scorealign: $(scorealign_o)
+	$(c++link) $(scorealign_o) -o scorealign $(syslibs)
+
+test0:
+	./scorealign /home/rbd/wdh/music/nyquist-temp.wav /home/rbd/wdh/music/chrom_nyquist-temp.wav > output.txt
+	diff output.txt /home/rbd/wdh/music/output.txt | less
+
+test:
+	./scorealign /home/rbd/scorealign/data/live-beeth-s5m1-25s-mono.wav  /home/rbd/scorealign/data/midi-beeth-s5m1-25s-mono.wav > output.txt
+	diff output.txt /home/rbd/wdh/music/output.txt | less
+
+bigtest:
+	./scorealign data/live-Beethoven_Symphony_No5_Mvt1.wav data/midi-Beethoven_Symphony_No5_Mvt1.wav
+
+bigtest2: 
+	./scorealign data/midi-Beethoven_Symphony_No5_Mvt1.wav data/live-Beethoven_Symphony_No5_Mvt1.wav
+
+
+# DEPENDENCIES
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib-src/libscorealign/README.txt b/lib-src/libscorealign/README.txt
new file mode 100644
index 0000000..45b9d66
--- /dev/null
+++ b/lib-src/libscorealign/README.txt
@@ -0,0 +1,119 @@
+scorealign -- a program for audio-to-audio and audio-to-midi alignment
+
+Last updated July 17, 2008 by RBD
+
+Contributors include: 
+             Ning Hu
+             Roger B. Dannenberg
+             Joshua Hailpern
+             Umpei Kurokawa
+             Greg Wakefield
+             Mark Bartsch
+ 
+scorealign works by computing chromagrams of the two sources. Midi chromagrams
+are estimated directly from pitch data without synthesis. A similarity matrix
+is constructed and dynamic programming finds the lowest-cost path through the
+matrix.
+
+(some more details should be added here about handling boundaries)
+
+Output includes a map from one version to the other. If one file is MIDI, 
+output also includes (1) an estimated transcript in ASCII format with time, 
+pitch, MIDI channel, and duration of each notes in the audio file, (2) a
+time-aligned midi file, and (3) a text file with beat times.
+
+scorealign uses libsndfile (http://www.mega-nerd.com/libsndfile/). You must
+install libsndfile to build scorealign.
+
+For Macintosh OS X, use Xcode to open scorealign.xcodeproj
+For Linux, use "make -f Makefile.linux"
+For Windows, open score-align.vcproj (probably out of date now -- please
+    update the project following Makefile.linux, or contact rbd at cs.cmu.edu)
+
+Command line parameters:
+
+scorealign [-<flags> [<period><windowsize><path> <smooth><trans> <midi>]] 
+                 <file1> [<file2>]
+   specifying only <file1> simply transcribes MIDI in <file1> to  
+   transcription.txt. Otherwise, align <file1> and <file2>.
+   -h 0.25 indicates a frame period of 0.25 seconds
+   -w 0.25 indicates a window size of 0.25 seconds. 
+   -r indicates filename to write raw alignment path to (default path.data)
+   -s is filename to write smoothed alignment path(default is smooth.data)
+   -t is filename to write the time aligned transcription 
+      (default is transcription.txt)
+   -m is filename to write the time aligned midi file (default is midi.mid)
+   -b is filename to write the time aligned beat times (default is beatmap.txt)
+   -o 2.0 indicates a smoothing window of 2.0s
+   -p 3.0 means pre-smooth with a 3s window
+   -x 6.0 indicates 6s line segment approximation
+   
+A bit more detail:
+
+The -o flag (smoothing) controls a post-process on the path. Since the
+path is discrete, it will have small jumps ahead or pauses whenever it
+differs from the diagonal. A linear regression is performed at each frame
+using a set of points whose size is determined by the -o parameter, and the
+discrete time indicated by the path is replaced by a continuous time estimated
+from neighboring points. This smooths out local irregularities in the time
+map.
+
+The -p flag (presmoothing) operates on the discrete path. It tries to fit a 
+straight line segment (length is set by -p) to the path. If the path fits
+well to the first half of the path and the second half of the path, the 
+entire path is replaced with a straight line approximation. To "fit well",
+half of the path points must fall very close to the straight line (currently,
+within 1.5 frames). For example, if the line segment spans 40 frames, then 10
+path points must be close to the first 20 frames and 10 path points must be 
+close to the last 20 frames. The step is repeated on overlapping windows
+through the whole piece. This presmoothing step is designed to detect
+places where dynamic programming "wanders off" from the true path and then
+realigns to the true path. The off-track points are replaced, so they do not
+adversely affect the smoothing step. This approach does not seem to be 
+robust, but sometimes works well.
+
+The -x flag is another approach to deal with dynamic programming errors. It
+divides the entire piece into segments whose lengths are about equal and about
+the length specified by the -x parameter. The line segments are fit to the
+path by linear regression, and their endpoints are joined by averaging their
+linear regression values. Next, a hill-climbing search is performed to 
+minimize the total distance along the path. This is like dynamic programming
+except that each line spans many frames, so the resulting path is forced to 
+be fairly straight. Linear interpolation is used to estimate chroma distance
+since the lines do always pass through integer frame locations. This approach
+is probably good when the audio is known to have a steady tempo or be 
+performed with tempo changes that match those in the midi file.
+
+Some notes on the software architecture of scorealign:
+
+scorealign was originally implemented as a fairly monolithic program
+in MatLab. It was ported to C++. To incorporate this code into Audacity,
+the code was restructured so that audio input is obtained from
+Audio_reader, an abstract class that calls on a subclass to implement
+read(). The subclass just copies floats into the provided buffer. It is
+responsible for sample format conversion, stereo-to-mono conversion, etc.
+The Audio_reader returns possibly overlapping buffers of floats. The
+Audio_file_reader subclass uses libsndfile to read in samples and convert
+them to float. It does its own conversion to mono.
+
+When scorealign is used in Audacity, a different subclass of Audio_reader
+will call into Audacity using a Mixer object to retrieve samples from
+selected tracks.
+
+For use from the command line, scorealign has a module main.cpp that 
+parses command line arguments. A lot of parameters and options that 
+were formerly globals are now stored in a Scorealign object that is
+passed around to many routines and methods. main.cpp creates a (global)
+Scorealign object and uses code in the module alignfiles.cpp to do the
+work. The purpose of alignfiles is to provide an API that does not 
+depend upon a command line interface, but which assumes you are aligning
+files. Finally, alignfiles.cpp uses an Audio_file_reader to offer
+samples to the main score alignment algorithm.
+
+To summarize:
+   scorealign.cpp and gen_chroma.cpp do most of the pure alignment work
+   audioreader.cpp abstracts the source of audio, whether it comes from
+      a file or some other source
+   alignfiles.cpp opens files and invokes the modules above
+   main.cpp parses the command line and invokes alignfiles.
+
diff --git a/lib-src/libscorealign/audiomixerreader.cpp b/lib-src/libscorealign/audiomixerreader.cpp
new file mode 100644
index 0000000..6091df9
--- /dev/null
+++ b/lib-src/libscorealign/audiomixerreader.cpp
@@ -0,0 +1,78 @@
+/* audiomixerreader.cpp -- implements a class to read samples from Audacity
+*
+* 17-Jun-08  RBD created based on audiofilereader.cpp
+*/
+#include "assert.h"
+#include "stdlib.h"
+#include "audioreader.h"
+#include "allegro.h"
+#include "scorealign-glue.h"
+#include "audiomixerreader.h"
+
+double Audio_mixer_reader::get_sample_rate()
+{
+    return sample_rate;
+}
+
+
+Audio_mixer_reader::Audio_mixer_reader(void *mixer_, 
+        mixer_process_fn fn_ptr, int chans, 
+        double srate, double end_time)
+{
+    mixer = mixer_; // store in member variable
+    mixer_process = fn_ptr;
+    buffer = NULL;
+    buffer_len = 0;
+    index = 0;
+    channels = chans;
+    sample_rate = srate;
+    total_frames = end_time * srate + 0.5 /* for rounding */;
+}
+
+
+long Audio_mixer_reader::get_frames()
+{
+    // precondition: mixer is valid and no samples have been read
+    return total_frames;
+}
+
+
+long Audio_mixer_reader::read(float *data, long n)
+{
+    for (int i = 0; i < n; i++) { // fill data
+        float sum = 0;
+        // note: assume mixer returns stereo (interleaved)
+        for (int chan = 0; chan < channels; chan++) {
+            // sum over channels within a frame
+            if (index >= buffer_len * channels) {
+                buffer_len = 
+                   (*mixer_process) (mixer, &buffer, AMR_BUFFER_FRAMES);
+                // frame_count = mixer->Process(AMR_BUFFER_FRAMES);
+                // buffer = (float *) mixer->GetBuffer();
+                index = 0;
+                if (buffer_len == 0) { // no more samples to read
+                    // but we processed i
+                    return i;
+                }
+            }
+            sum += buffer[index++];
+        }
+        data[i] = sum;
+    }
+    return n; // when end is reached, n will be 0, but the caller shouldn't
+              // be asking for samples beyond the end because the caller knows
+              // how many samples to ask for.
+}
+
+void Audio_mixer_reader::close()
+{
+    // mixer is deleted by the creator of this object, so don't delete here
+    buffer = NULL; 
+}
+
+void Audio_mixer_reader::print_info()
+{
+    printf("   Audacity mixer at @ %p\n", mixer);
+    printf("   sample rate %g\n", get_sample_rate());
+    printf("   total frames %d\n", get_frames());
+}
diff --git a/lib-src/libscorealign/audiomixerreader.h b/lib-src/libscorealign/audiomixerreader.h
new file mode 100644
index 0000000..8e2158a
--- /dev/null
+++ b/lib-src/libscorealign/audiomixerreader.h
@@ -0,0 +1,27 @@
+/* audiomixerreader.h -- reads samples from an Audacity mixer on behalf of scorealign
+ *
+ * 21-Jul-08 RBD
+ */
+
+#define AMR_BUFFER_FRAMES 4096
+
+class Audio_mixer_reader : public Audio_reader {
+public:
+  virtual long read(float *data, long n);
+  // Mixer *mixer;
+  void *mixer;
+  mixer_process_fn mixer_process;
+  float *buffer;
+  int channels;
+  long buffer_len; // number of samples pointed to by buffer
+  long index; // index into buffer
+  long total_frames; // number of frames in input audio 
+                     // (returned by get_frames)
+  double sample_rate;
+  Audio_mixer_reader(void *mixer, mixer_process_fn fn_ptr, int chans, 
+                     double srate, double end_time);
+  void close();
+  double get_sample_rate();
+  long get_frames();
+  void print_info();
+};
\ No newline at end of file
diff --git a/lib-src/libscorealign/audioreader.cpp b/lib-src/libscorealign/audioreader.cpp
new file mode 100644
index 0000000..a366e0c
--- /dev/null
+++ b/lib-src/libscorealign/audioreader.cpp
@@ -0,0 +1,98 @@
+/* audioreader.cpp -- reads sequence of overlapping windows
+ *
+ * 14-Jul-08  RBD
+ */
+
+#include "assert.h"
+#include "stdio.h"
+#include "math.h"
+#include "sautils.h"
+#include "string.h"
+#include <fstream>
+#include "allegro.h"
+#include "audioreader.h"
+#include "scorealign.h"
+
+using namespace std;
+
+long Audio_reader::read_window(float *data)
+// reads the next window of samples
+//   the first time, fill half the window with zeros and the second half 
+// with data from the file
+// after that, shift the window by hop_size and fill the end of the window 
+//   with hop_size new samples
+// the window is actually constructed in temp_data, then copied to data. 
+// That way, the caller can apply a smoothing function to data and we'll
+//   still have a copy.
+// the function returns false on the next call when detecting that there
+//   is no more samples, 
+// data -- the window to be returned
+// temp_data -- since we destroy data by windowing, temp_data saves 
+//   overlapping samples so we don't have to read them again
+// samples_per_frame -- must be even, note that first window is padded
+//   half-full with zeros
+// hop_samples -- additional samples read each time after the first window
+{
+    int frames_read;    // how many frames did we read?
+
+    int hop = hop_samples;
+    if (reading_first_window) {
+        hop = samples_per_frame / 2; // first time we read more data	
+        // zero end of temp_data, which will shift to beginning
+        memset(temp_data + hop, 0, 
+               sizeof(float) * (samples_per_frame - hop));
+        reading_first_window = false;
+    }
+	
+    // before reading in new sounds, shift temp_data by hop_size
+    memmove(temp_data, temp_data + hop, 
+            (samples_per_frame - hop) * sizeof(float));
+
+    frames_read = read(temp_data + samples_per_frame - hop, hop);
+    // zero any leftovers (happens at last frame):
+    //printf("check fr %i  hs %i ws %i ",frames_read,hop_size,window_size); 
+    memset(temp_data + samples_per_frame - hop + frames_read, 0, 
+           sizeof(float) * (hop - frames_read));
+    assert(samples_per_frame - frames_read >= 0);
+
+    // now copy temp_data to data	
+    memcpy(data, temp_data, sizeof(float) * samples_per_frame);
+    
+    if (frames_read != hop && reading_last_window == false) {
+        reading_last_window = true;
+        return true; 
+    } else if (reading_last_window == true) {
+        return false; 
+    } else {
+        return true; 
+    }
+}
+
+
+void Audio_reader::calculate_parameters(Scorealign &sa, bool verbose)
+{
+    double sample_rate = get_sample_rate();
+    long pcm_frames = get_frames();
+    // we want to make sure samples_per_frame is even, to keep things 
+    // consistent we'll change hopsize_samples the same way
+    samples_per_frame = (int) (sa.window_size * sample_rate + 0.5);
+    if (samples_per_frame % 2 == 1) 
+        samples_per_frame = samples_per_frame + 1;
+   
+   /*=============================================================*/
+	
+    hop_samples = (int)(sa.frame_period * sample_rate + 0.5);
+    if (hop_samples % 2 == 1) 
+        hop_samples = hop_samples + 1;
+    actual_frame_period = (hop_samples / sample_rate);
+
+    // this is stored back in a field in sa as well as here in the reader
+    frame_count= (int) ceil(((float) pcm_frames / hop_samples + 1)); 	
+    this->frame_count = frame_count;
+    temp_data = ALLOC(float, samples_per_frame);
+    memset(temp_data, 0, samples_per_frame * sizeof(temp_data[0]));
+    assert(temp_data);
+}
+
+
+
diff --git a/lib-src/libscorealign/audioreader.h b/lib-src/libscorealign/audioreader.h
new file mode 100644
index 0000000..c364b8d
--- /dev/null
+++ b/lib-src/libscorealign/audioreader.h
@@ -0,0 +1,29 @@
+class Scorealign;
+
+class Audio_reader {
+ public:
+    long samples_per_frame;
+    long hop_samples;
+    double actual_frame_period;
+    long frame_count; // number of chroma vectors (analysis windows)
+    virtual void print_info() = 0;
+    long read_window(float *data);
+    virtual long read(float *data, long n) = 0;
+    virtual double get_sample_rate() = 0;
+    virtual long get_frames() = 0; // returns frames of input audio 
+    // i.e. (samples/channels)
+    void calculate_parameters(Scorealign &sa, bool verbose);
+    Audio_reader() {
+        reading_first_window = true;
+        reading_last_window = false;
+        temp_data = NULL;
+    }
+    ~Audio_reader() {
+        if (temp_data) free(temp_data);
+    }
+ protected:
+    bool reading_first_window;
+    bool reading_last_window;
+    float *temp_data;
+};
+
diff --git a/lib-src/libscorealign/comp_chroma.cpp b/lib-src/libscorealign/comp_chroma.cpp
new file mode 100644
index 0000000..d084d01
--- /dev/null
+++ b/lib-src/libscorealign/comp_chroma.cpp
@@ -0,0 +1,92 @@
+
+#include <fstream>
+#include "allegro.h"
+#include "audioreader.h"
+#include "gen_chroma.h"
+#include  "comp_chroma.h"
+
+using namespace std;
+
+/*				NORM_CHROMA
+ *
+ * This function normalizes the chroma for each frame of the
+ * chrom_energy to mean 0 and std. dev. 1. But if this is a
+ * "silent frame", set the 13th element to 1.
+ */
+void norm_chroma( int len, float *chrom_energy ) {
+
+  float avg = 0;
+  float dev = 0;
+  float sum = 0;
+
+  for( int i = 0; i < len; i++ ) {
+
+    /* Calculate avg for this frame */
+    sum = 0;
+    for ( int j = 0; j < 12; j++ )
+        sum += AREF2(chrom_energy, i, j);
+    avg = sum / 12.0;
+
+	/* Silence detection: */ 
+	float silence = 0.0F;
+	if (avg < SILENCE_THRESHOLD) { /* assume silent */
+		silence = 1.0F;
+	}
+    AREF2(chrom_energy, i, 12) = silence;
+	
+	// printf("avg at %g: %g\n", i * 0.25, avg);
+
+    /* Normalize this frame to avg. 0 */
+    for ( int j = 0; j < 12; j++ )
+        AREF2(chrom_energy, i, j) -= avg;
+
+    /* Calculate std. dev. for this frame */
+    sum = 0;
+    for ( int j = 0; j < 12; j++ ) {
+        float x = AREF2(chrom_energy, i, j);
+        sum += x * x;
+    }
+    dev = sqrt( sum / 12.0 );
+	if (dev == 0.0) dev = 1.0F; /* don't divide by zero */
+
+    /* Normalize this frame to std. dev. 1*/
+    for ( int j = 0; j < 12; j++ )
+        AREF2(chrom_energy, i, j) /= dev;
+  }
+}
+
+/* Returns the minimum of two values */
+double min2( double x, double y ) {
+    return (x < y ? x : y);
+}
+
+/*				GEN_DIST
+ *
+ * This function generates the Euclidean distance for points i
+ * and j in two chroma vectors for use with dynamic time warping of 
+ * the chroma vectors.
+ */
+float gen_dist( int i, int j, float *chrom_energy1, 
+	       float *chrom_energy2 ) {
+
+  float sum = 0;
+  float MAX = 12.0;
+
+  if (AREF2(chrom_energy1, i, CHROMA_BIN_COUNT) !=
+	  AREF2(chrom_energy2, j, CHROMA_BIN_COUNT)) {
+      //printf("gd%g ", SILENCE_DISTANCE); // print result
+      return SILENCE_DISTANCE;
+  }
+  /* Determine the distance between these vectors 
+     chroma1[i] and chroma2[j] to return */
+  for (int k = 0; k < 12; k++) {
+      float x = AREF2(chrom_energy1, i, k);
+      float y = AREF2(chrom_energy2, j, k);
+      float diff = x - y;
+
+      sum += diff*diff ;
+  }
+  sum = min2( sqrt( sum ), MAX );
+  //printf("gd%g ", sum); // print the result
+  return sum;
+}
diff --git a/lib-src/libscorealign/comp_chroma.h b/lib-src/libscorealign/comp_chroma.h
new file mode 100644
index 0000000..66a0168
--- /dev/null
+++ b/lib-src/libscorealign/comp_chroma.h
@@ -0,0 +1,24 @@
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<ctype.h>
+#include	<math.h>
+
+#define SILENCE_THRESHOLD 0.001
+#define SILENCE_DISTANCE 16.0
+
+/*				NORM_CHROMA
+ *
+ * This function normalizes the chroma for each frame of the
+ * chrom_energy to mean 0 and std. dev. 1.
+ */
+void norm_chroma( int len, float *chrom_energy );
+
+/*				GEN_DIST
+ *
+ * This function generates the Euclidean distance for points i
+ * and j in two chroma vectors for use with dynamic time warping of 
+ * the chroma vectors.
+ */
+float gen_dist(int i, int j, float *chrom_energy1, 
+		       float *chrom_energy2 );
diff --git a/lib-src/libscorealign/curvefit.cpp b/lib-src/libscorealign/curvefit.cpp
new file mode 100644
index 0000000..6d0a8d3
--- /dev/null
+++ b/lib-src/libscorealign/curvefit.cpp
@@ -0,0 +1,267 @@
+/*
+ *  curvefit.cpp
+ *  scorealign
+ *
+ *  Created by Roger Dannenberg on 10/20/07.
+ *  Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ */
+
+#include "assert.h"
+#include "comp_chroma.h"
+#include "sautils.h"
+// the following are needed to get Scorealign
+#include <fstream>
+#include "allegro.h"
+#include "audioreader.h"
+#include "scorealign.h"
+#include "hillclimb.h"
+#include "curvefit.h"
+
+void save_path(char *filename);
+
+/* Curvefit class: do hill-climbing to fit lines to data
+ *
+ * This class implements the algorithm described above.
+ * The problem is partitioned into the general search algorithm
+ * (implemented in Hillclimb::optimize) and the evaluation function
+ * (implemented in Curvefit::evaluate). A brute-force evaluation
+ * would simply recompute the cost of the entire path every time,
+ * but note that the search algorithm works by adjusting one parameter
+ * at a time. This affects at most two line segments, so the rest
+ * contribute a cost that does not need to be recomputed. Thus the
+ * total cost can be computed incrementally. It is hard to see how
+ * to use this optimization within the general Hillclimb:optimize
+ * method, so to avoid making that algorithm very specific and ugly,
+ * I decided to hide the incremental nature of evaluate inside
+ * the evaluate function itself. The way this works is that evaluate
+ * keeps a cache of the coordinates of each line segment and the
+ * resulting cost of the segment. Before recomputing any segment,
+ * the cache is consulted. If the end points have not moved, the
+ * cached value is retrieved. Ideally, there should be a 3-element
+ * cache because endpoints are moved and then restored. (The three
+ * elements would hold the results of the original, changed left,
+ * and changed right endpoints.) The bigger cache would eliminate
+ * 1/3 of the computation, but the simple cache already eliminates
+ * about (n-2)/n of the work, so that should help a lot.
+ */
+
+class Curvefit : public Hillclimb {
+public:
+    Curvefit(Scorealign *sa_, bool verbose_) { sa = sa_; verbose = verbose_; }
+    virtual double evaluate();
+    void setup(int n);
+    double *get_x() { return x; }
+private:
+    Scorealign *sa;
+    bool verbose;
+    double line_dist(int i); // get cost of line segment i
+    double compute_dist(int i); // compute cost of line segment i
+    double distance_rc(int row, int col);
+    double distance_xy(double x, double y);
+
+    double *p1_cache; // left endpoint y values
+    double *p2_cache; // right endpoint y values
+    double *d_cache; // cached cost of line segment
+    double *x;       // the x values of line segment endpoints
+        // (the y values are in parameters[])
+};
+
+
+double Curvefit::evaluate()
+{
+    double sum = 0;
+    // why does this loop go to n-2? Because i represents the left endpoint
+    // of the line segment. There are n parameters, but only n-1 segments.
+    for (int i = 0; i < n-1; i++) {
+        sum += line_dist(i); // look up in cache or recompute each segment
+    }
+    return -sum; // return negative of distance so that bigger will be better
+}
+
+
+double Curvefit::line_dist(int i)
+{
+    if (p1_cache[i] == parameters[i] &&
+        p2_cache[i] == parameters[i+1]) {
+        // endpoints have not changed:
+        return d_cache[i];
+    }
+    // otherwise, we need to recompute and save dist in cache
+    double d = compute_dist(i);
+    p1_cache[i] = parameters[i];
+    p2_cache[i] = parameters[i+1];
+    d_cache[i] = d;
+    return d;
+}
+
+
+void Curvefit::setup(int segments)
+{
+    // number of parameters is greater than segments because the left
+    // col of segment i is parameter i, so the right col of 
+    // the last segment == parameter[segments].
+    n = segments + 1;
+    parameters = ALLOC(double, n);
+    p1_cache = ALLOC(double, n);
+    p2_cache = ALLOC(double, n);
+    d_cache = ALLOC(double, n);
+    x = ALLOC(double, n);
+    step_size = ALLOC(double, n);
+    min_param = ALLOC(double, n);
+    max_param = ALLOC(double, n);
+    int i;
+    // ideal frames per segment
+    float seg_length = ((float) (sa->file1_frames - 1)) / segments;
+    for (i = 0; i < n; i++) { // initialize cache keys to garbage
+        p1_cache[i] = p2_cache[i] = -999999.99;
+        // initialize x values
+        x[i] = ROUND(i * seg_length);
+        // now initialize parameters based on pathx/pathy/time_map
+        // time_map has y values for each x
+        parameters[i] = sa->time_map[(int) x[i]];
+        if (verbose)
+            printf("initial x[%d] = %g, parameters[%d] = %g\n", 
+                   i, x[i], i, parameters[i]);
+        step_size[i] = 0.5;
+        min_param[i] = 0;
+        max_param[i] = sa->file2_frames - 1;
+    }
+}
+
+
+// distance_rc -- look up or compute distance between chroma vectors
+//     at row, col in similarity matrix
+//
+// Note: in current implementation, there is no stored representation
+// of the matrix, so we have to recompute every time. It would be
+// possible to store the whole matrix, but it's large and it would
+// double the memory requirements (we already allocate the large
+// PATH array in compare_chroma to compute the optimal path.
+// 
+// Since distance can be computed relatively quickly, a better plan
+// would be to cache values along the path. Here's a brief design
+// (for the future, assuming this routine is actually a hot spot):
+// Allocate a matrix that is, say, 20 x file1_frames to contain distances
+// that are +/- 10 frames from the path. Initialize cells to -1.
+// Allocate an array of integer offsets of size file1_frames.
+// Fill in the integer offsets with the column number (pathy) value of
+// the path. 
+// Now, to get distance_rc(row, col):
+//    offset = offsets[row]
+//    i = 10 + col - offset;
+//    if (i < 0 || i > 20) /* not in cache */ return compute_distance(...);
+//    dist = distances[20 * row + i];
+//    if (dist == -1) { return distances[20 * row + i] = compute_distance...}
+//    return dist;
+//
+double Curvefit::distance_rc(int row, int col)
+{
+    return gen_dist(row, col, sa->chrom_energy1, sa->chrom_energy2);
+}
+
+
+// compute distance from distance matrix using interpolation. A least
+// one of x, y should be an integer value so interpolation is only 2-way
+double Curvefit::distance_xy(double x, double y)
+{
+    int xi = (int) x;
+    int yi = (int) y;
+    if (xi == x) { // x is integer, interpolate along y axis
+        double d1 = distance_rc(xi, yi);
+        double d2 = distance_rc(xi, yi + 1);
+        return interpolate(yi, d1, yi + 1, d2, y);
+    } else if (yi == y) { // y is integer, interpolate along x axis
+        double d1 = distance_rc(xi, yi);
+        double d2 = distance_rc(xi + 1, yi);
+        return interpolate(xi, d1, xi + 1, d2, x);
+    } else {
+        printf("FATAL INTERNAL ERROR IN distance_xy: neither x nor y is "
+               "an integer\n");
+        assert(false);
+    }
+}
+
+
+double Curvefit::compute_dist(int i)
+{
+    double x1 = x[i], x2 = x[i+1];
+    double y1 = parameters[i], y2 = parameters[i+1];
+    double dx = x2 - x1, dy = y2 - y1;
+    double sum = 0;
+    int n;
+    if (dx > dy) { // evauate at each x
+        n = (int) dx;
+        for (int x = (int) x1; x < x2; x++) {
+            double y = interpolate(x1, y1, x2, y2, x);
+            sum += distance_xy(x, y);
+        }
+    } else { // evaluate at each y
+        n = (int) dy;
+        for (int y = (int) y1; y < y2; y++) {
+            double x = interpolate(y1, x1, y2, x2, y);
+            sum += distance_xy(x, y);
+        }
+    }
+    // normalize using line length: sum/n is average distance. Multiply
+    // avg. distance (cost per unit length) by length to get total cost:
+    double rslt = sqrt(dx*dx + dy*dy) * sum / n;
+    // printf("compute_dist %d: x1 %g y1 %g x2 %g y2 %g sum %g rslt %g\n",
+    //        i, x1, y1, x2, y2, sum, rslt);
+    return rslt;
+}
+
+    
+void curve_fitting(Scorealign *sa, bool verbose)
+{
+    if (verbose)
+        printf("Performing line-segment approximation with %gs segments.\n", 
+               sa->line_time);
+    Curvefit curvefit(sa, verbose);
+    double *parameters;
+    double *x;
+    // how many segments? About total time / line_time:
+    int segments = 
+        (int) (0.5 + (sa->actual_frame_period_1 * sa->file1_frames) /
+                     sa->line_time);
+    curvefit.setup(segments);
+    curvefit.optimize();
+    parameters = curvefit.get_parameters();
+    x = curvefit.get_x();
+    // now, rewrite pathx and pathy according to segments
+    // pathx and pathy are generously allocated, so we can change pathlen
+    // each segment goes from x[i], parameters[i] to x[i+1], parameters[i+1]
+    int i;
+    int j = 0; // index into path
+    for (i = 0; i < segments; i++) {
+        int x1 = (int) x[i];
+        int x2 = (int) x[i+1];
+        int y1 = (int) parameters[i];
+        int y2 = (int) parameters[i+1];
+        int dx = x2 - x1;
+        int dy = y2 - y1;
+        if (dx >= dy) { // output point at each x
+            int x;
+            for (x = x1; x < x2; x++) {
+                sa->pathx[j] = x;
+                sa->pathy[j] = (int) (0.5 + interpolate(x1, y1, x2, y2, x));
+                j++;
+            }
+        } else {
+            int y;
+            for (y = y1; y < y2; y++) {
+                sa->pathx[j] = (int) (0.5 + interpolate(y1, x1, y2, x2, y));
+                sa->pathy[j] = y;
+                j++;
+            }
+        }
+    }
+    // output last point
+    sa->pathx[j] = (int) x[segments];
+    sa->pathy[j] = (int) (0.5 + parameters[segments]);
+    j++;
+    sa->set_pathlen(j);
+}
+
+
+
diff --git a/lib-src/libscorealign/curvefit.h b/lib-src/libscorealign/curvefit.h
new file mode 100644
index 0000000..cbcd1ad
--- /dev/null
+++ b/lib-src/libscorealign/curvefit.h
@@ -0,0 +1,40 @@
+/*
+ *  curvefit.h
+ *  scorealign
+ *
+ *  Created by Roger B. Dannenberg on 10/20/07.
+ *  Copyright 2007 by Roger B. Dannenberg. All rights reserved.
+ *
+ * Dynamic programming does a good job of getting a rough alignment
+ * that is very good in a global sense, but there are often short-term
+ * "digressions" where the optimal path wanders off the "true" path.
+ * These digressions are hard to correct with simple smoothing. This
+ * module is intended to assert a "steady tempo" constraint to improve
+ * the path. It starts with the dynamic programming path, which is likely
+ * to be close to the correct path. The DP path (in pathx[] and pathy[])
+ * is divided evenly into segments of approximately line_time seconds
+ * along the x axis. For a segment from x1 to x2, linear regression is 
+ * performed on the DP path from x1 to x2. This specifies an initial
+ * line segment. Next, the end-points are joined by averaging: if
+ * the segment from x1 to x2 ends at y-end and the segment from x2 to x3
+ * starts at y-start, then the end of line x1--x2 and the beginning of
+ * line x2--x3 are adjusted to (y-end + y-start)/2. Now the fun starts:
+ * the endpoints of all the lines are adjusted up and down in order to 
+ * minimize a distance function. The distance function estimates the
+ * integral of the distance matrix value along the line. Since the line
+ * falls between discrete points in the matrix, interpolation is used.
+ * The end result is converted back into a discrete path. (Maybe in the 
+ * future, the pathx[]/pathy[] representation should be generalized to
+ * allow for non-integer path coordinates.) The resulting path will
+ * have steady tempo at least within each segment. What I hope will
+ * happen is that when there are chord changes or melody changes, there
+ * will be "narrow" pathways in the distance matrix. Getting the 
+ * alignment wrong at these transitions will cost a lot. Other places
+ * are not so critical, which is why I think DP wanders off the true
+ * path. The straight-line path will ensure that for the most part, the
+ * score alignment is determined by the transitions, and where alignment
+ * is not critical, the alignment will avoid any rubato or over-fitting.
+ */
+
+void curve_fitting(Scorealign *sa, bool verbose);
+
diff --git a/lib-src/libscorealign/fft3/FFT3.cpp b/lib-src/libscorealign/fft3/FFT3.cpp
new file mode 100644
index 0000000..d60cd1b
--- /dev/null
+++ b/lib-src/libscorealign/fft3/FFT3.cpp
@@ -0,0 +1,402 @@
+/**********************************************************************
+
+  FFT3.cpp -- see notes in FFT3.h -RBD
+
+  FFT.cpp
+
+  Dominic Mazzoni
+
+  September 2000
+
+  This file contains a few FFT routines, including a real-FFT
+  routine that is almost twice as fast as a normal complex FFT,
+  and a power spectrum routine when you know you don't care
+  about phase information.
+
+  Some of this code was based on a free implementation of an FFT
+  by Don Cross, available on the web at:
+
+    http://www.intersrv.com/~dcross/fft.html
+
+  The basic algorithm for his code was based on Numerican Recipes
+  in Fortran.  I optimized his code further by reducing array
+  accesses, caching the bit reversal table, and eliminating
+  float-to-float conversions, and I added the routines to
+  calculate a real FFT and a real power spectrum.
+
+**********************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#ifndef __MACH__
+   #include <malloc.h>
+#endif
+#include "FFT3.h"
+
+int **gFFTBitTable3 = NULL;
+const int MaxFastBits = 16;
+
+int IsPowerOfTwo(int x)
+{
+   if (x < 2)
+      return false;
+
+   if (x & (x - 1))             /* Thanks to 'byang' for this cute trick! */
+      return false;
+
+   return true;
+}
+
+int NumberOfBitsNeeded(int PowerOfTwo)
+{
+   int i;
+
+   if (PowerOfTwo < 2) {
+      fprintf(stderr, "Error: FFT called with size %d\n", PowerOfTwo);
+      exit(1);
+   }
+
+   for (i = 0;; i++)
+      if (PowerOfTwo & (1 << i))
+         return i;
+}
+
+int ReverseBits(int index, int NumBits)
+{
+   int i, rev;
+
+   for (i = rev = 0; i < NumBits; i++) {
+      rev = (rev << 1) | (index & 1);
+      index >>= 1;
+   }
+
+   return rev;
+}
+
+void InitFFT()
+{
+   gFFTBitTable3 = (int **) malloc(sizeof(int *) * MaxFastBits);
+
+   int len = 2;
+   int b;
+   for (b = 1; b <= MaxFastBits; b++) {
+
+       gFFTBitTable3[b - 1] = (int *) malloc(len * sizeof(int));
+       int i;
+      for (i = 0; i < len; i++)
+         gFFTBitTable3[b - 1][i] = ReverseBits(i, b);
+
+      len <<= 1;
+   }
+}
+
+inline int FastReverseBits3(int i, int NumBits)
+{
+   if (NumBits <= MaxFastBits)
+      return gFFTBitTable3[NumBits - 1][i];
+   else
+      return ReverseBits(i, NumBits);
+}
+
+/*
+ * Complex Fast Fourier Transform
+ */
+
+void FFT3(int NumSamples,
+         int InverseTransform,
+         float *RealIn, float *ImagIn, float *RealOut, float *ImagOut)
+{
+   int NumBits;                 /* Number of bits needed to store indices */
+   int i, j, k, n;
+   int BlockSize, BlockEnd;
+
+   float angle_numerator = 2.0 * M_PI;
+   float tr, ti;                /* temp real, temp imaginary */
+
+   if (!IsPowerOfTwo(NumSamples)) {
+      fprintf(stderr, "%d is not a power of two\n", NumSamples);
+      exit(1);
+   }
+
+   if (!gFFTBitTable3)
+      InitFFT();
+
+   if (InverseTransform)
+      angle_numerator = -angle_numerator;
+
+   NumBits = NumberOfBitsNeeded(NumSamples);
+
+   /*
+    **   Do simultaneous data copy and bit-reversal ordering into outputs...
+    */
+
+   for (i = 0; i < NumSamples; i++) {
+      j = FastReverseBits3(i, NumBits);
+      RealOut[j] = RealIn[i];
+      ImagOut[j] = (ImagIn == NULL) ? 0.0F : ImagIn[i];
+   }
+
+   /*
+    **   Do the FFT itself...
+    */
+
+   BlockEnd = 1;
+   for (BlockSize = 2; BlockSize <= NumSamples; BlockSize <<= 1) {
+
+      float delta_angle = angle_numerator / (float) BlockSize;
+
+      float sm2 = sin(-2 * delta_angle);
+      float sm1 = sin(-delta_angle);
+      float cm2 = cos(-2 * delta_angle);
+      float cm1 = cos(-delta_angle);
+      float w = 2 * cm1;
+      float ar0, ar1, ar2, ai0, ai1, ai2;
+
+      for (i = 0; i < NumSamples; i += BlockSize) {
+         ar2 = cm2;
+         ar1 = cm1;
+
+         ai2 = sm2;
+         ai1 = sm1;
+
+         for (j = i, n = 0; n < BlockEnd; j++, n++) {
+            ar0 = w * ar1 - ar2;
+            ar2 = ar1;
+            ar1 = ar0;
+
+            ai0 = w * ai1 - ai2;
+            ai2 = ai1;
+            ai1 = ai0;
+
+            k = j + BlockEnd;
+            tr = ar0 * RealOut[k] - ai0 * ImagOut[k];
+            ti = ar0 * ImagOut[k] + ai0 * RealOut[k];
+
+            /*     if(k==NumSamples-1)
+                printf("j=NumSamples-1 => %g - %g=",RealOut[j],tr);
+            */
+            RealOut[k] = RealOut[j] - tr;
+            ImagOut[k] = ImagOut[j] - ti;
+/*
+            if(k==NumSamples-1)
+                printf("%g\n",RealOut[k]);
+*/
+            RealOut[j] += tr;
+            ImagOut[j] += ti;
+         }
+      }
+
+      BlockEnd = BlockSize;
+   }
+
+   /*
+      **   Need to normalize if inverse transform...
+    */
+
+   if (InverseTransform) {
+      float denom = (float) NumSamples;
+
+      for (i = 0; i < NumSamples; i++) {
+         RealOut[i] /= denom;
+         ImagOut[i] /= denom;
+      }
+   }
+}
+
+/*
+ * Real Fast Fourier Transform
+ *
+ * This function was based on the code in Numerical Recipes in C.
+ * In Num. Rec., the inner loop is based on a single 1-based array
+ * of interleaved real and imaginary numbers.  Because we have two
+ * separate zero-based arrays, our indices are quite different.
+ * Here is the correspondence between Num. Rec. indices and our indices:
+ *
+ * i1  <->  real[i]
+ * i2  <->  imag[i]
+ * i3  <->  real[n/2-i]
+ * i4  <->  imag[n/2-i]
+ */
+
+void RealFFT3(int NumSamples, float *RealIn, float *RealOut, float *ImagOut)
+{
+   int Half = NumSamples / 2;
+   int i;
+
+   float theta = M_PI / Half;
+
+   float *tmpReal = (float *) alloca(sizeof(float) * Half);
+   float *tmpImag = (float *) alloca(sizeof(float) * Half);
+
+   for (i = 0; i < Half; i++) {
+      tmpReal[i] = RealIn[2 * i];
+      tmpImag[i] = RealIn[2 * i + 1];
+   }
+
+   FFT3(Half, 0, tmpReal, tmpImag, RealOut, ImagOut);
+
+   float wtemp = (float) (sin(0.5 * theta));
+
+   float wpr = -2.0F * wtemp * wtemp;
+   float wpi = (float) (sin(theta));
+   float wr = 1.0F + wpr;
+   float wi = wpi;
+
+   int i3;
+
+   float h1r, h1i, h2r, h2i;
+
+   for (i = 1; i < Half / 2; i++) {
+
+      i3 = Half - i;
+
+      h1r = 0.5F * (RealOut[i] + RealOut[i3]);
+      h1i = 0.5F * (ImagOut[i] - ImagOut[i3]);
+      h2r = 0.5F * (ImagOut[i] + ImagOut[i3]);
+      h2i = -0.5F * (RealOut[i] - RealOut[i3]);
+
+      RealOut[i] = h1r + wr * h2r - wi * h2i;
+      ImagOut[i] = h1i + wr * h2i + wi * h2r;
+      RealOut[i3] = h1r - wr * h2r + wi * h2i;
+      ImagOut[i3] = -h1i + wr * h2i + wi * h2r;
+
+      wr = (wtemp = wr) * wpr - wi * wpi + wr;
+      wi = wi * wpr + wtemp * wpi + wi;
+   }
+
+   RealOut[0] = (h1r = RealOut[0]) + ImagOut[0];
+   ImagOut[0] = h1r - ImagOut[0];
+
+   //free(tmpReal);
+   //free(tmpImag);
+}
+
+/*
+ * PowerSpectrum
+ *
+ * This function computes the same as RealFFT, above, but
+ * adds the squares of the real and imaginary part of each
+ * coefficient, extracting the power and throwing away the
+ * phase.
+ *
+ * For speed, it does not call RealFFT, but duplicates some
+ * of its code.
+ */
+
+void PowerSpectrum3(int NumSamples, float *In, float *Out)
+{
+   int Half = NumSamples / 2;
+   int i;
+
+   float theta = M_PI / Half;
+
+   float *tmpReal = (float *) alloca(sizeof(float) * Half);;
+   float *tmpImag = (float *) alloca(sizeof(float) * Half);
+   float *RealOut = (float *) alloca(sizeof(float) * Half);
+   float *ImagOut = (float *) alloca(sizeof(float) * Half);
+
+   for (i = 0; i < Half; i++) {
+      tmpReal[i] = In[2 * i];
+      tmpImag[i] = In[2 * i + 1];
+   }
+
+   FFT3(Half, 0, tmpReal, tmpImag, RealOut, ImagOut);
+
+   float wtemp = (float) (sin(0.5 * theta));
+
+   float wpr = -2.0F * wtemp * wtemp;
+   float wpi = (float) (sin(theta));
+   float wr = 1.0F + wpr;
+   float wi = wpi;
+
+   int i3;
+
+   float h1r, h1i, h2r, h2i, rt, it;
+
+   for (i = 1; i < Half / 2; i++) {
+
+      i3 = Half - i;
+
+      h1r = 0.5F * (RealOut[i] + RealOut[i3]);
+      h1i = 0.5F * (ImagOut[i] - ImagOut[i3]);
+      h2r = 0.5F * (ImagOut[i] + ImagOut[i3]);
+      h2i = -0.5F * (RealOut[i] - RealOut[i3]);
+
+      rt = h1r + wr * h2r - wi * h2i;
+      it = h1i + wr * h2i + wi * h2r;
+
+      Out[i] = rt * rt + it * it;
+
+      rt = h1r - wr * h2r + wi * h2i;
+      it = -h1i + wr * h2i + wi * h2r;
+
+      Out[i3] = rt * rt + it * it;
+
+      wr = (wtemp = wr) * wpr - wi * wpi + wr;
+      wi = wi * wpr + wtemp * wpi + wi;
+   }
+
+   rt = (h1r = RealOut[0]) + ImagOut[0];
+   it = h1r - ImagOut[0];
+   Out[0] = rt * rt + it * it;
+
+   rt = RealOut[Half / 2];
+   it = ImagOut[Half / 2];
+   Out[Half / 2] = rt * rt + it * it;
+
+   //free(tmpReal);
+   //free(tmpImag);
+   //free(RealOut);
+   //free(ImagOut);
+}
+
+/*
+ * Windowing Functions
+ */
+
+int NumWindowFuncs3()
+{
+   return 4;
+}
+
+char *WindowFuncName3(int whichFunction)
+{
+   switch (whichFunction) {
+   default:
+   case 0:
+      return "Rectangular";
+   case 1:
+      return "Bartlett";
+   case 2:
+      return "Hamming";
+   case 3:
+      return "Hanning";
+   }
+}
+
+void WindowFunc3(int whichFunction, int NumSamples, float *in)
+{
+   int i;
+
+   if (whichFunction == 1) {
+      // Bartlett (triangular) window
+      for (i = 0; i < NumSamples / 2; i++) {
+         in[i] *= (i / (float) (NumSamples / 2));
+         in[i + (NumSamples / 2)] *=
+             (1.0F - (i / (float) (NumSamples / 2)));
+      }
+   }
+
+   if (whichFunction == 2) {
+      // Hamming
+      for (i = 0; i < NumSamples; i++)
+         in[i] *= 0.54F - 0.46F * (float) cos(2 * M_PI * i / (NumSamples - 1));
+   }
+
+   if (whichFunction == 3) {
+      // Hanning
+      for (i = 0; i < NumSamples; i++)
+         in[i] *= 0.50F - 0.50F * (float) cos(2 * M_PI * i / (NumSamples - 1));
+   }
+}      
diff --git a/lib-src/libscorealign/fft3/FFT3.h b/lib-src/libscorealign/fft3/FFT3.h
new file mode 100644
index 0000000..daa0591
--- /dev/null
+++ b/lib-src/libscorealign/fft3/FFT3.h
@@ -0,0 +1,103 @@
+/**********************************************************************
+
+  FFT3.h -- FFT routines, based on the following but renamed with "3"
+  to avoid naming problems. This early implementation from Audacity has
+  been upated and the current Audacity version imports wxChar, but if I
+  adapt the latest code into the scorealign library, then scorealign
+  will depend upon wxWindows. On the other hand, if I don't update to
+  the latest, then there are name conflicts when scorealign is used
+  within Audacity. For now, at least, I'm just renaming functions, 
+  which has no real impact on scorealign (other than function names
+  with the mystery "3" appended), but will result in duplicated code
+  in Audacity. -RBD
+
+  FFT.h
+
+  Dominic Mazzoni
+
+  September 2000
+
+  This file contains a few FFT routines, including a real-FFT
+  routine that is almost twice as fast as a normal complex FFT,
+  and a power spectrum routine which is more convenient when
+  you know you don't care about phase information.  It now also
+  contains a few basic windowing functions.
+
+  Some of this code was based on a free implementation of an FFT
+  by Don Cross, available on the web at:
+
+    http://www.intersrv.com/~dcross/fft.html
+
+  The basic algorithm for his code was based on Numerical Recipes
+  in Fortran.  I optimized his code further by reducing array
+  accesses, caching the bit reversal table, and eliminating
+  float-to-float conversions, and I added the routines to
+  calculate a real FFT and a real power spectrum.
+
+  Note: all of these routines use single-precision floats.
+  I have found that in practice, floats work well until you
+  get above 8192 samples.  If you need to do a larger FFT,
+  you need to use floats.
+
+**********************************************************************/
+
+#ifndef M_PI
+#define	M_PI		3.14159265358979323846  /* pi */
+#endif
+
+#define false 0
+#define true 1
+
+/*
+ * This is the function you will use the most often.
+ * Given an array of floats, this will compute the power
+ * spectrum by doing a Real FFT and then computing the
+ * sum of the squares of the real and imaginary parts.
+ * Note that the output array is half the length of the
+ * input array, and that NumSamples must be a power of two.
+ */
+
+void PowerSpectrum3(int NumSamples, float *In, float *Out);
+
+/*
+ * Computes an FFT when the input data is real but you still
+ * want complex data as output.  The output arrays are half
+ * the length of the input, and NumSamples must be a power of
+ * two.
+ */
+
+void RealFFT3(int NumSamples,
+             float *RealIn, float *RealOut, float *ImagOut);
+
+/*
+ * Computes a FFT of complex input and returns complex output.
+ * Currently this is the only function here that supports the
+ * inverse transform as well.
+ */
+
+void FFT3(int NumSamples,
+         int InverseTransform,
+         float *RealIn, float *ImagIn, float *RealOut, float *ImagOut);
+
+/*
+ * Applies a windowing function to the data in place
+ *
+ * 0: Rectangular (no window)
+ * 1: Bartlett    (triangular)
+ * 2: Hamming
+ * 3: Hanning
+ */
+
+void WindowFunc3(int whichFunction, int NumSamples, float *data);
+
+/*
+ * Returns the name of the windowing function (for UI display)
+ */
+
+char *WindowFuncName3(int whichFunction);
+
+/*
+ * Returns the number of windowing functions supported
+ */
+
+int NumWindowFuncs3();   
diff --git a/lib-src/libscorealign/gen_chroma.cpp b/lib-src/libscorealign/gen_chroma.cpp
new file mode 100644
index 0000000..b2d50bc
--- /dev/null
+++ b/lib-src/libscorealign/gen_chroma.cpp
@@ -0,0 +1,474 @@
+
+#ifdef _WIN32
+    #include "malloc.h"
+#endif
+#include "stdlib.h" // for OSX compatibility, malloc.h -> stdlib.h
+#include "stdio.h"
+#include "assert.h"
+#include "string.h"
+#include "math.h"
+#include <fstream>
+#include "allegro.h"
+#include "fft3/FFT3.h"
+#include "audioreader.h"
+#include "scorealign.h"
+#include "gen_chroma.h"
+#include "comp_chroma.h"
+#include "mfmidi.h"
+#include "sautils.h"
+#ifdef SA_VERBOSE
+#include <iostream> // cout
+#endif
+using namespace std;
+
+//if 1, causes printing internally
+#define PRINT_BIN_ENERGY 1
+
+#define p1 0.0577622650466621
+#define p2 2.1011784386926213
+
+// each row is one chroma vector, 
+// data is stored as an array of chroma vectors:
+// vector 1, vector 2, ...
+#define CHROM(row, column) AREF2((*chrom_energy), row, column)
+
+float hz_to_step(float hz)
+{
+    return float((log(hz) - p2) / p1);
+}
+
+/*				GEN_MAGNITUDE
+   given the real and imaginary portions of a complex FFT function, compute 
+   the magnitude of the fft bin.
+   given input of 2 arrays (inR and inI) of length n, takes the ith element
+   from each, squares them, sums them, takes the square root of the sum and
+   puts the output into the ith position in the array out.
+   
+   NOTE: out should be length n
+*/
+void gen_Magnitude(float* inR,float* inI, int low, int hi, float* out)
+{
+    int i;
+    for (i = low; i < hi; i++) {
+      float magVal = sqrt(inR[i] * inR[i] + inI[i] * inI[i]);
+      //printf("   %d: sqrt(%g^2+%g^2)=%g\n",i,inR[i],inI[i+1],magVal);
+      out[i]= magVal;
+#ifdef SA_VERBOSE
+      if (i == 1000) printf("gen_Magnitude: %d %g\n", i, magVal);
+#endif
+    }
+}
+
+
+/*				PRINT_BINS
+    This function is intended for debugging purposes.
+    pass in an array representing the "mid point"
+    of each bin, and the number of bins.  The
+    function will print out:
+    i value
+    index falue
+    low range of the bin
+    middle of the bin
+    high range of the bin
+*/
+void print_Bins(float* bins, int numBins){
+    printf("BINS: \n");
+    int i;
+    for (i=0; i<numBins; i++) {
+      int index = i % numBins;
+      int indexNext = (index + 1) % numBins;
+      int indexPrev = (index - 1) % numBins;
+      
+      float maxValue =(bins[index]+bins[indexNext])/2;
+      float minValue=(bins[index]+bins[indexPrev])/2;
+      
+      if(index == 1)
+        maxValue =bins[index]+(bins[index]-((bins[index]+bins[indexPrev])/2));
+      if(index == 2)
+        minValue =bins[index]-(((bins[index]+bins[indexNext])/2)-bins[index]);
+      
+      printf("%d (%d) %g||%g||%g\n",i,index,minValue,bins[i],maxValue);
+    }		
+}
+
+/*				MIN_BIN_NUM
+    Returns the index in the array of bins
+    of the "smallest" bin.  aka, the bin
+    whose midpoint is the smallest.
+*/
+int min_Bin_Num(float* bins, int numBins){
+    
+    int i;
+    int minIndex=0;
+    float minValue=bins[0];
+    for (i = 0; i < numBins; i++) {   
+      if (minValue > bins[i]) {
+        minValue = bins[i];
+        minIndex = i;
+      }
+    }
+    return minIndex;
+}
+
+
+/*				GEN_HAMMING
+    given data from reading in a section of a sound file
+    applies the hamming function to each sample.
+    n specifies the length of in and out.
+*/
+void gen_Hamming(float* in, int n, float* out)
+{
+    int k = 0;
+    for(k = 0; k < n; k++) {
+      float internalValue = 2.0 * M_PI * k * (1.0 / (n - 1));
+      float cosValue = cos(internalValue);
+      float hammingValue = 0.54F + (-0.46F * cosValue);
+#ifdef SA_VERBOSE
+      if (k == 1000) printf("Hamming %g\n", hammingValue);
+#endif
+      out[k] = hammingValue * in[k];
+    }
+}
+
+/*				NEXTPOWEROF2
+    given an int n, finds the next power of 2 larger than
+    or equal to n.
+*/
+int nextPowerOf2(int n)
+{
+    int result = 1;
+    while (result < n) result = (result << 1);
+    return result;
+}
+
+
+/* GEN_CHROMA_AUDIO -- compute chroma for an audio file 
+ */
+/*
+    generates the chroma energy for a given sequence
+    with a low cutoff and high cutoff.  
+    The chroma energy is placed in the float *chrom_energy.
+    this 2D is an array of pointers.
+    The function returns the number of frames 
+    (aka the length of the 1st dimention of chrom_energy)
+*/
+int Scorealign::gen_chroma_audio(Audio_reader &reader, int hcutoff, 
+        int lcutoff, float **chrom_energy, float *actual_frame_period,
+        int id, bool verbose)
+{
+    int i;
+    double sample_rate = reader.get_sample_rate();
+    float reg11[CHROMA_BIN_COUNT]; // temp storage1;
+    float reg12[CHROMA_BIN_COUNT]; // temp storage2;
+
+    if (verbose) {
+        printf ("==============FILE %d====================\n", id);
+        reader.print_info();
+    }
+    // this seems like a poor way to set actual_frame_period_1 or _2 in 
+    // the Scorealign object, but I'm not sure what would be better:
+    *actual_frame_period = reader.actual_frame_period;
+
+    for (i = 0; i < CHROMA_BIN_COUNT; i++) {
+        reg11[i] = -999;
+      }
+    for (i = 0; i < CHROMA_BIN_COUNT; i++){
+        reg12[i] = 0;
+      }
+
+   /*=============================================================*/
+
+    // allocate some buffers for use in the loop
+    int full_data_size = nextPowerOf2(reader.samples_per_frame);
+    if (verbose) {
+        printf("   samples per frame is %d \n", reader.samples_per_frame);
+        printf("   total chroma frames %d\n", reader.frame_count); 
+        // printf("   Window size  %g second \n", reader.window_size);
+        printf("   hopsize in samples %d \n", reader.hop_samples);
+        printf("   fft size %d\n", full_data_size);
+    }
+
+    float *full_data = ALLOC(float, full_data_size);
+    float *fft_dataR = ALLOC(float, full_data_size);
+    float *fft_dataI = ALLOC(float, full_data_size);	
+    //set to zero
+    memset(full_data, 0, full_data_size * sizeof(float));
+    memset(fft_dataR, 0, full_data_size * sizeof(float));	
+    memset(fft_dataI, 0, full_data_size * sizeof(float));
+    //check to see if memory has been allocated
+    assert(full_data != NULL);
+    assert(fft_dataR != NULL);
+    assert(fft_dataI != NULL);
+   
+    int *bin_map = ALLOC(int, full_data_size);
+	
+    //set up the chrom_energy array;
+    *chrom_energy = ALLOC(float, reader.frame_count * (CHROMA_BIN_COUNT + 1));
+    int cv_index = 0;
+
+    // set up mapping from spectral bins to chroma bins
+    // ordinarily, we would add 0.5 to round to nearest bin, but we also
+    // want to subtract 0.5 because the bin has a width of +/- 0.5. These
+    // two cancel out, so we can just round down and get the right answer.
+    int num_bins_to_use = (int) (hcutoff * full_data_size / sample_rate);
+    // But then we want to add 1 because the loops will only go to 
+    // high_bin - 1:
+    int high_bin = min(num_bins_to_use + 1, full_data_size);
+    //printf("center freq of high bin is %g\n", (high_bin - 1) * sample_rate / 
+    //    full_data_size);
+    //printf("high freq of high bin is %g\n", 
+    //     (high_bin - 1 + 0.5) * sample_rate / full_data_size);
+    // If we add 0.5, we'll round to nearest bin center frequency, but
+    // bin covers a frequency range that goes 0.5 bin width lower, so we
+    // add 1 before rounding.
+    int low_bin = (int) (lcutoff * full_data_size / sample_rate);
+    //printf("center freq of low bin is %g\n", low_bin * sample_rate / 
+    //    full_data_size);
+    //printf("low freq of low bin is %g\n", (low_bin - 0.5) * sample_rate / 
+    //    full_data_size);
+    //printf("frequency spacing of bins is %g\n", 
+    //     sample_rate / full_data_size);
+    double freq = low_bin * sample_rate / full_data_size;
+    for (i = low_bin; i < high_bin; i++) {
+        float raw_bin = hz_to_step(freq);
+        int round_bin = (int) (raw_bin + 0.5F);
+        int mod_bin = round_bin % 12;
+        bin_map[i] = mod_bin;
+        freq += sample_rate / full_data_size;
+    }
+    // printf("BIN_COUNT is !!!!!!!!!!!!!   %d\n",CHROMA_BIN_COUNT);
+
+    while (reader.read_window(full_data)) {
+        //fill out array with 0's till next power of 2
+#ifdef SA_VERBOSE
+        printf("samples_per_frame %d sample %g\n", reader.samples_per_frame,
+               full_data[0]);
+#endif
+        for (i = reader.samples_per_frame; i < full_data_size; i++) 
+            full_data[i] = 0;
+
+#ifdef AS_VERBOSE
+        printf("preFFT: full_data[1000] %g\n", full_data[1000]);
+#endif
+
+        //the data from the wave file, each point mult by a hamming value
+        gen_Hamming(full_data, full_data_size, full_data);
+
+#ifdef SA_VERBOSE
+        printf("preFFT: hammingData[1000] %g\n", full_data[1000]);
+#endif
+        FFT3(full_data_size, 0, full_data, NULL, fft_dataR, fft_dataI); //fft3
+      
+        //given the fft, compute the energy of each point
+        gen_Magnitude(fft_dataR, fft_dataI, low_bin, high_bin, full_data);
+      
+        /*-------------------------------------
+          GENERATE BINS AND PUT
+          THE CORRECT ENERGY IN
+          EACH BIN, CORRESPONDING
+          TO THE CORRECT PITCH
+          -------------------------------------*/
+
+        float binEnergy[CHROMA_BIN_COUNT];
+        int binCount[CHROMA_BIN_COUNT];
+
+        for (i = 0; i < CHROMA_BIN_COUNT; i++) {
+            binCount[i] = 0; 
+            binEnergy[i] = 0.0;
+        }
+      
+        for (i = low_bin; i < high_bin; i++) {
+            int mod_bin = bin_map[i];
+            binEnergy[mod_bin] += full_data[i];
+            binCount[mod_bin]++;
+        }
+
+        /*-------------------------------------
+          END OF BIN GENERATION
+          -------------------------------------*/
+        /* THE FOLLOWING LOOKS LIKE SOME OLD CODE TO COMPUTE
+         * CHROMA FLUX, BUT IT IS NOT IN USE NOW 
+         
+        if (PRINT_BIN_ENERGY) {
+            float mao1;
+            float sum=0.;
+         
+            for (i = 0; i < CHROMA_BIN_COUNT; i++) {
+                reg12[i]=binEnergy[i] / binCount[i];
+            }
+       
+            if (reg11[0]==-999){
+                printf("Chroma Flux \n\n");
+            } else {
+                for (i = 0; i < CHROMA_BIN_COUNT; i++) {
+                }
+                for (int k = 0; k < CHROMA_BIN_COUNT; k++) {
+                    float x = reg11[k];
+                    float y = reg12[k];
+                    float diff = x - y;
+                    sum += diff * diff;
+                }
+                mao1 = sqrt(sum);         
+                sequence++;      
+                sum = 0.;
+                mao1 = 0.;
+            }
+            for (i = 0; i < CHROMA_BIN_COUNT; i++) {
+                reg11[i]=reg12[i];
+            }
+            //fclose(Pointer);
+          }
+        */
+        //put chrom energy into the returned array
+
+#ifdef SA_VERBOSE
+        printf("cv_index %d\n", cv_index);
+#endif
+        assert(cv_index < reader.frame_count);
+        for (i = 0;  i < CHROMA_BIN_COUNT; i++)
+            CHROM(cv_index, i) = binEnergy[i] / binCount[i];
+        cv_index++;
+    } // end of while ((readcount = read_mono_floats...
+
+    free(fft_dataI);
+    free(fft_dataR);
+    free(full_data);
+    if (verbose)
+        printf("\nGenerated Chroma. file%d_frames is %i\n", id, file1_frames);
+    return cv_index;
+}
+
+
+class Event_list {
+public:
+	Alg_note_ptr note;
+	Event_list *next;
+
+	Event_list(Alg_event_ptr event_, Event_list *next_) {
+		note = (Alg_note_ptr) event_;
+		next = next_;
+	}
+
+	~Event_list() {
+	}
+};
+typedef Event_list *Event_list_ptr;
+
+
+/* gen_chroma_midi -- generate chroma vectors for midi file */
+/*
+    generates the chroma energy for a given sequence
+    with a low cutoff and high cutoff.  
+    The chroma energy is placed in the float *chrom_energy.
+    this 2D is an array of pointers.
+    The function returns the number of frames 
+    (aka the length of the 1st dimention of chrom_energy)
+ *
+ *
+  Notes: keep a list of notes that are sounding.
+  For each frame, 
+    zero the vector
+    while next note starts before end of frame, insert note in list
+	  for each note in list, compute weight and add to vector. Remove
+	  if note ends before frame start time.	 
+  How many frames? 
+ */
+
+int Scorealign::gen_chroma_midi(Alg_seq &seq, int hcutoff, int lcutoff, 
+                    float **chrom_energy, float *actual_frame_period,
+                    int id, bool verbose)
+{	
+    if (verbose) {
+        printf ("==============FILE %d====================\n", id);
+        SA_V(seq.write(cout, true));
+    }
+    /*=============================================================*/
+
+    *actual_frame_period = (frame_period) ; // since we don't quantize to samples
+	
+    /*=============================================================*/
+    
+    seq.convert_to_seconds();
+    /* find duration */
+    float dur = 0.0F;
+    int nnotes = 0;
+    nnotes= find_midi_duration(seq, &dur); 
+
+    /*================================================================*/
+	
+    int frame_count= (int)ceil(((float)dur/ frame_period + 1)); 	
+	
+    /*================================================================*/
+	
+    if (verbose) {
+        printf("   note count = %d\n", nnotes);
+        printf("   duration in sec = %f\n", dur); 
+        printf("   chroma frames %d\n", frame_count);
+    }
+
+    //set up the chrom_energy array;
+    (*chrom_energy) = ALLOC(float, frame_count * (CHROMA_BIN_COUNT + 1));
+    Event_list_ptr list = NULL;
+    seq.iteration_begin();
+    Alg_event_ptr event = seq.iteration_next();
+    int cv_index;
+    for (cv_index = 0; cv_index < frame_count; cv_index++) {
+		
+        /*====================================================*/
+
+        float frame_begin = max((cv_index * (frame_period)) - 
+                                window_size/2 , 0.0F); //chooses zero if negative
+
+        float frame_end= frame_begin +(window_size/2); 	
+	/*============================================================*/
+        /* zero the vector */
+        for (int i = 0; i < CHROMA_BIN_COUNT; i++) CHROM(cv_index, i) = 0;
+        /* add new notes that are in the frame */
+        while (event && event->time < frame_end) {
+            if (event->is_note()) {
+                list = new Event_list(event, list);
+            }
+            event = seq.iteration_next();
+        }
+        /* remove notes that are no longer sounding */
+        Event_list_ptr *ptr = &list;
+        while (*ptr) {
+            while ((*ptr) && 
+                   (*ptr)->note->time + (*ptr)->note->dur < frame_begin) {
+                Event_list_ptr temp = *ptr;
+                *ptr = (*ptr)->next;
+                delete temp;
+            }
+            if (*ptr) ptr = &((*ptr)->next);
+        }
+        for (Event_list_ptr item = list; item; item = item->next) {
+            /* compute duration of overlap */
+            float overlap = 
+                min(frame_end, (float) (item->note->time + item->note->dur)) - 
+                max(frame_begin, (float) item->note->time);
+            float velocity = item->note->loud;
+            float weight = overlap * velocity;
+#if DEBUG_LOG
+            fprintf(dbf, "%3d pitch %g key %d overlap %g velocity %g\n", 
+                    cv_index, item->note->pitch, item->note->get_identifier(), 
+                    overlap, velocity);
+#endif
+            CHROM(cv_index, (int)item->note->pitch % 12) += weight;
+        }
+#if DEBUG_LOG
+        for (int i = 0; i < CHROMA_BIN_COUNT; i++) {
+            fprintf(dbf, "%d:%g ", i, CHROM(cv_index, i));
+        }
+        fprintf(dbf, "\n\n");
+#endif
+    }
+    while (list) {
+        Event_list_ptr temp = list;
+        list = list->next;
+        delete temp;
+    }
+    seq.iteration_end();
+    if (verbose)
+        printf("\nGenerated Chroma. file%d_frames is %i\n", id, file1_frames);
+    return frame_count;
+}
diff --git a/lib-src/libscorealign/gen_chroma.h b/lib-src/libscorealign/gen_chroma.h
new file mode 100644
index 0000000..84caba1
--- /dev/null
+++ b/lib-src/libscorealign/gen_chroma.h
@@ -0,0 +1,6 @@
+#define CHROMA_BIN_COUNT 12
+
+bool is_midi_file(char *filename);
+
+#define AREF2(chrom_energy, row, column) \
+    (chrom_energy[row * (CHROMA_BIN_COUNT + 1) + column])
diff --git a/lib-src/libscorealign/hillclimb.cpp b/lib-src/libscorealign/hillclimb.cpp
new file mode 100644
index 0000000..8639cc3
--- /dev/null
+++ b/lib-src/libscorealign/hillclimb.cpp
@@ -0,0 +1,161 @@
+/*
+ *  hillclimb.cpp
+ *  scorealign
+ *
+ *  Created by Roger Dannenberg on 10/20/07.
+ *  Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ * Hillclimb is an abstract class for optimization. It models problems where
+ * you have a vector of parameters (stored as an array), a corresponding set
+ * of step sizes, and a non-linear function. The function is a virtual
+ * member function that subclasses must implement.
+ *
+ * The optimization algorithm is as follows:
+ * An initial set of parameters and step sizes is given.
+ *
+ * Estimate the partial derivatives with respect to each parameter value
+ * by taking a step along that dimension (use step sizes to determine
+ * how far to go) and calling the evaluate virtual function.
+ * Find the parameter that causes the maximum absolute change. If the
+ * change is positive for that parameter, take the step along that
+ * dimension. If the change is negative, take a negative step along that
+ * dimension. 
+ *
+ * Repeat the previous paragraph as long as the result of evaluate is
+ * increasing. When it stops, you are at the top of a hill, a local
+ * maximum.
+ */
+
+#include "hillclimb.h"
+#include "stdio.h"
+
+#define HC_VERBOSE 0
+#define V if (HC_VERBOSE)
+
+void Hillclimb::set_parameters(double *p, double *ss, 
+                               double *min_, double *max_, int plen)
+{
+    parameters = p;
+    step_size = ss;
+    min_param = min_;
+    max_param = max_;
+    n = plen;
+}
+
+/* this optimize assumes that the surface is smooth enought that if the
+ * function decreases when parameter[i] increases, then the function will
+ * increase when parameter[i] decreases. The alternative version does more
+ * evaluation, but checks in both directions to find the best overall move.
+
+double Hillclimb::optimize()
+{
+    double best = evaluate();
+    while (true) {
+        printf("best %g ", best);
+        // eval partial derivatives
+        int i;
+        // variables to search for max partial derivative
+        double max = 0; // max of |dy| so far
+        int max_i; // index where max was found
+        int max_sign = 1; // sign of dy
+        double max_y; // value of evaluate() at max_i
+        // now search over all parameters for max change
+        for (i = 0; i < n; i++) {
+            int sign = 1; // sign of derivative in the +step direction
+            int step_direction = 1; // how to undo parameter variation
+            parameters[i] += step_size[i];
+            if (parameters[i] > max_param[i]) {
+                // try stepping in the other direction
+                parameters[i] -= step_size[i] * 2;
+                sign = -1;
+                step_direction = -1;
+            }
+            
+            double y = evaluate();
+            // restore parameter i
+            parameters[i] -= step_size[i] * step_direction;
+            
+            double dy = y - best;
+            if (dy < 0) {
+                dy = -dy;
+                sign = -sign;
+            }
+            // is this the best yet and legal move?
+            double proposal = parameters[i] + step_size[i] * sign;
+            if (dy > max && proposal <= max_param[i] && 
+                proposal >= min_param[i]) {
+                max = dy;
+                max_i = i;
+                max_y = y;
+                max_sign = sign;
+            }
+        }
+        // best move is parameter max_i in max_sign direction
+        parameters[max_i] += step_size[max_i] * max_sign;
+        printf("moved %d to %g", max_i, parameters[max_i]);
+        // what's the value now? put it in max_y
+        if (max_sign == -1) max_y = evaluate();
+        printf(" to get %g (vs. best %g)\n", max_y, best);
+        // otherwise, max_y already has the new value
+        if (max_y <= best) { // no improvement, we're done
+            parameters[max_i] -= step_size[max_i] * max_sign;
+            printf("\nCompleted hillclimbing, best %g\n", best);
+            return best;
+        }
+        // improvement because max_y higher than best:
+        best = max_y;
+    }
+}
+*/
+
+double Hillclimb::optimize()
+{
+    double best = evaluate();
+    while (true) {
+        V printf("best %g ", best);
+        // eval partial derivatives
+        int i;
+        // variables to search for max partial derivative
+        double max_y = best; // max of evaluate() so far
+        int max_i; // index where best max was found
+        double max_parameter; // the good parameter value for max_i
+        // now search over all parameters for best improvement
+        for (i = 0; i < n; i++) {
+            V printf("optimize at %d param %g ", i, parameters[i]);
+            double save_param = parameters[i];
+            parameters[i] = save_param + step_size[i];
+            if (parameters[i] <= max_param[i]) {
+                double y = evaluate();
+                V printf("up->%g ", y);
+                if (y > max_y) {
+                    V printf("NEW MAX! ");
+                    max_y = y;
+                    max_i = i;
+                    max_parameter = parameters[i];
+                }
+            }
+            parameters[i] = save_param - step_size[i];
+            if (parameters[i] >= min_param[i]) {
+                double y = evaluate();
+                V printf("dn->%g ", y);
+                if (y > max_y) {
+                    V printf("NEW MAX! ");
+                    max_y = y;
+                    max_i = i;
+                    max_parameter = parameters[i];
+                }
+            }
+            parameters[i] = save_param;
+            V printf("\n");
+        }
+        if (max_y <= best) { // no improvement, we're done
+            V printf("\nCompleted hillclimbing, best %g\n", best);
+            return best;
+        }
+        // improvement because max_y higher than best:
+        parameters[max_i] = max_parameter;
+        best = max_y;
+    }
+}
+
+
diff --git a/lib-src/libscorealign/hillclimb.h b/lib-src/libscorealign/hillclimb.h
new file mode 100644
index 0000000..55ab6f2
--- /dev/null
+++ b/lib-src/libscorealign/hillclimb.h
@@ -0,0 +1,35 @@
+/*
+ *  hillclimb.h
+ *  scorealign
+ *
+ *  Created by Roger Dannenberg on 10/20/07.
+ *  Copyright 2007 by Roger B. Dannenberg. All rights reserved.
+ *
+ * USAGE:
+ *    Subclass and define evaluate, a function of n parameters.
+ * Set parameters, step_size, min, max, and n. Parameters must
+ * be near a local maximum and step_size defines the grid that
+ * is searched. Search will not go outside of min and max.
+ * Call optimize()
+ * retrieve optimized parameter values with get_parameters.
+ * 
+ */
+
+class Hillclimb {
+protected:
+    double *parameters; // parameters to optimize
+    double *step_size;  // step size for each parameter (these are 
+        // provided by the user and remain fixed)
+    double *min_param; // minimum parameter values
+    double *max_param; // maximum parameter values
+    int n; // number of parameters
+public:
+    void set_parameters(double *parameters_, double *step_size_, 
+                        double *min_, double *max_, int n_);
+    // retrieve parameters after optimization:
+    double *get_parameters() { return parameters; }
+    virtual double evaluate() = 0;
+    double optimize();
+};
+
+
diff --git a/lib-src/libscorealign/libscorealign.vcproj b/lib-src/libscorealign/libscorealign.vcproj
new file mode 100644
index 0000000..e6cc7ea
--- /dev/null
+++ b/lib-src/libscorealign/libscorealign.vcproj
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libscorealign"
+	ProjectGUID="{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
+	RootNamespace="scorealign"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="2"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\lib-src\portsmf&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="fft3;..\portsmf;snd"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\lib-src\portsmf&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="fft3;..\portsmf;snd"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath=".\audiomixerreader.h"
+				>
+			</File>
+			<File
+				RelativePath=".\audioreader.h"
+				>
+			</File>
+			<File
+				RelativePath=".\comp_chroma.h"
+				>
+			</File>
+			<File
+				RelativePath=".\curvefit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\fft3\FFT3.h"
+				>
+			</File>
+			<File
+				RelativePath=".\gen_chroma.h"
+				>
+			</File>
+			<File
+				RelativePath=".\hillclimb.h"
+				>
+			</File>
+			<File
+				RelativePath=".\regression.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sautils.h"
+				>
+			</File>
+			<File
+				RelativePath=".\scorealign-glue.h"
+				>
+			</File>
+			<File
+				RelativePath=".\scorealign.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\audiomixerreader.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\audioreader.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\comp_chroma.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\curvefit.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\fft3\FFT3.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\gen_chroma.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\hillclimb.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\regression.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sautils.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\scorealign-glue.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\scorealign.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/libscorealign/regression.cpp b/lib-src/libscorealign/regression.cpp
new file mode 100644
index 0000000..6760eca
--- /dev/null
+++ b/lib-src/libscorealign/regression.cpp
@@ -0,0 +1,49 @@
+// Regression is a class to compute a linear regression
+// 
+#include "regression.h"
+
+
+Regression::Regression()
+{
+    init();
+}
+
+void Regression::init()
+{
+    sumxx = 0;
+    sumyy = 0;
+    sumxy = 0;
+    sumx = 0;
+    sumy = 0;
+    n = 0;
+}
+
+void Regression::point(float x, float y)
+{
+    sumx = sumx + x;
+    sumy = sumy + y;
+    sumxx = sumxx + x * x;
+    sumyy = sumyy + y * y;
+    sumxy = sumxy + x * y;
+    n = n + 1;
+}
+
+void Regression::regress()
+{
+    float sxx = sumxx - sumx * sumx / n;
+    float sxy = sumxy - sumx * sumy / n;
+    b = sxy / sxx;
+    a = (sumy - b * sumx) / n;
+}
+
+
+float Regression::f(float x)
+{
+    return a + b * x;
+}
+
+
+float Regression::f_inv(float y)
+{
+    return (y - a) / b;
+}
diff --git a/lib-src/libscorealign/regression.h b/lib-src/libscorealign/regression.h
new file mode 100644
index 0000000..c5182ae
--- /dev/null
+++ b/lib-src/libscorealign/regression.h
@@ -0,0 +1,29 @@
+// Regression is a class to compute a linear regression
+// 
+// call point(x, y) to add a data point
+// call regress() to compute the regression
+// call f(x) to evaluate the linear regression at x
+// call f_inv(y) to evaluate the inverse linear regression at y
+// to restart with new points, call init()
+// regress() can be called after each point()
+//
+// other forms of regression should be added. This one does
+// standard least squares regression
+
+class Regression {
+    float sumxx; // sum of x^2
+    float sumyy; // sum of y^2
+    float sumxy; // sum of xy
+    float sumx;  // sum of x
+    float sumy;  // sum of y
+    int n;       // number of points
+    float a, b;  // regression line is a + b*x
+ public:
+    Regression();
+    void init();
+    void point(float x, float y);
+    void regress();
+    float f(float x);
+    float f_inv(float y);
+};
+
diff --git a/lib-src/libscorealign/sautils.cpp b/lib-src/libscorealign/sautils.cpp
new file mode 100644
index 0000000..e022324
--- /dev/null
+++ b/lib-src/libscorealign/sautils.cpp
@@ -0,0 +1,17 @@
+/*
+ *  sautils.cpp
+ *  scorealign
+ *
+ *  Created by Roger Dannenberg on 10/20/07.
+ *  Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ */
+
+#include "sautils.h"
+
+double interpolate(double x1, double y1, double x2, double y2, double x)
+{
+    return y1 + (y2 - y1) * (x - x1) / (x2 - x1);
+}
+
+
diff --git a/lib-src/libscorealign/sautils.h b/lib-src/libscorealign/sautils.h
new file mode 100644
index 0000000..5350cfe
--- /dev/null
+++ b/lib-src/libscorealign/sautils.h
@@ -0,0 +1,16 @@
+/*
+ *  sautils.h
+ *  scorealign
+ *
+ *  Created by Roger Dannenberg on 10/20/07.
+ *  Copyright 2007 by Roger B. Dannenberg. All rights reserved.
+ *
+ */
+
+#define ALLOC(t, n) (t *) malloc(sizeof(t) * (n))
+
+#define ROUND(x) ((int) (0.5 + (x)))
+
+double interpolate(double x1, double y1, double x2, double y2, double x);
+
+
diff --git a/lib-src/libscorealign/scorealign-glue.cpp b/lib-src/libscorealign/scorealign-glue.cpp
new file mode 100644
index 0000000..25bb66a
--- /dev/null
+++ b/lib-src/libscorealign/scorealign-glue.cpp
@@ -0,0 +1,24 @@
+/* scorealign-glue.cpp -- interface between Audacity and scorealign library
+ *
+ * 21-Jul-08 RBD
+ */
+
+#include "allegro.h"
+#include "scorealign-glue.h"
+#include "audioreader.h"
+#include "audiomixerreader.h"
+#include "scorealign.h"
+
+void scorealign(void *mixer, mixer_process_fn fn_ptr, int chans, double srate,
+                double end_time, Alg_seq *seq)
+{
+    Scorealign sa;
+    sa.frame_period = 0.2;
+    sa.window_size = 0.2;
+    Audio_mixer_reader reader(mixer, fn_ptr, chans, srate, end_time);
+    reader.calculate_parameters(sa, false);
+    sa.align_midi_to_audio(*seq, reader, true);
+    sa.midi_tempo_align(*seq, false);
+    // seq has now been modified to conform to audio provided by mixer
+    seq->set_real_dur(end_time);
+}
diff --git a/lib-src/libscorealign/scorealign-glue.h b/lib-src/libscorealign/scorealign-glue.h
new file mode 100644
index 0000000..6b8efe3
--- /dev/null
+++ b/lib-src/libscorealign/scorealign-glue.h
@@ -0,0 +1,5 @@
+typedef long (*mixer_process_fn)(void *mix, float **buffer, long n);
+
+void scorealign(void *mixer, mixer_process_fn fn_ptr,
+                int chans, double srate, 
+                double end_time, Alg_seq *seq);
diff --git a/lib-src/libscorealign/scorealign.cpp b/lib-src/libscorealign/scorealign.cpp
new file mode 100644
index 0000000..c5741be
--- /dev/null
+++ b/lib-src/libscorealign/scorealign.cpp
@@ -0,0 +1,673 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <math.h>
+#ifndef __MACH__
+#include <malloc.h>
+#endif
+#include <fstream>
+#include "allegro.h"
+#include "audioreader.h"
+#include "scorealign.h"
+#include "gen_chroma.h"
+#include "comp_chroma.h"
+#include "curvefit.h"
+#include "mfmidi.h"
+#include "regression.h"
+#include "sautils.h"
+
+#if (defined (WIN32) || defined (_WIN32))
+#define	snprintf	_snprintf
+#endif
+
+#define	LOW_CUTOFF  40
+#define HIGH_CUTOFF 2000
+
+// Note: There are "verbose" flags passed as parameters that 
+// enable some printing. The SA_VERBOSE compiler flag causes a
+// lot more debugging output, so it could be called VERY_VERBOSE
+// as opposed to the quieter verbose flags.
+
+#ifdef SA_VERBOSE
+#include "main.h"
+#endif
+
+// for presmoothing, how near does a point have to be to be "on the line"
+#define NEAR 1.5
+
+// path is file1_frames by file2_frames array, so first index
+// (rows) is in [0 .. file1_frames]. Array is sequence of rows.
+// columns (j) ranges from [0 .. file2_frames]
+#define PATH(i,j) (path[(i) * file2_frames + (j)])
+
+/*===========================================================================*/
+
+#if DEBUG_LOG
+FILE *dbf = NULL;
+#endif
+
+
+/*			MAP_TIME  
+    lookup time of file1 in smooth_time_map and interpolate
+    to get time in file2 
+*/
+
+float Scorealign::map_time(float t1)
+{
+    t1 /= actual_frame_period_1; // convert from seconds to frames
+    int i = (int) t1; // round down
+    if (i < 0) i = 0;
+    if (i >= file1_frames - 1) i = file1_frames - 2;
+    // interpolate to get time
+    return actual_frame_period_2 * 
+        interpolate(i, smooth_time_map[i], i+1, smooth_time_map[i+1],
+                    t1);
+}
+
+
+/*				FIND_MIDI_DURATION 
+    Finds the duration of a midi song where the end
+    is defined by where the last note off occurs. Duration
+    in seconds is given in DUR, and returns in int the number
+    of notes in the song
+*/
+
+int find_midi_duration(Alg_seq &seq, float *dur) 
+{
+    *dur = 0.0F;
+    int nnotes = 0;
+    int i, j;
+    seq.convert_to_seconds();
+    for (j = 0; j < seq.track_list.length(); j++) {
+        Alg_events &notes = (seq.track_list[j]);
+            
+        for (i = 0; i < notes.length(); i++) {
+            Alg_event_ptr e = notes[i];
+            if (e->is_note()) {
+                Alg_note_ptr n = (Alg_note_ptr) e;
+                float note_end = n->time + n->dur;
+                if (note_end > *dur) *dur = note_end;
+                nnotes++;
+            }
+        }
+    }
+    return nnotes; 
+}
+    
+    
+    
+/* Returns the minimum of three values */
+double min3(double x, double y, double z)
+{
+    return (x < y ?
+            (x < z ? x : z) :
+            (y < z ? y : z));
+}
+
+
+void save_frames(char *name, int frames, float **chrom_energy)
+{
+    FILE *outf = fopen(name, "w");
+    int i,j;
+    for (j=0; j < frames; j++) {
+        float *chrom_energy_frame = chrom_energy[j];
+        for (i = 0;  i <= CHROMA_BIN_COUNT; i++) {
+            fprintf(outf, "%g ", chrom_energy_frame[i]);
+        }
+        fprintf(outf, "\n");
+    }
+    fclose(outf);
+}
+
+
+/* steps through the dynamic programming path
+*/
+void Scorealign::path_step(int i, int j)
+{
+#if DEBUG_LOG
+    fprintf(dbf, "(%i,%i) ", i, j);
+	if (++path_count % 5 == 0 ||
+		(i == 0 && j == 0)) 
+		fprintf(dbf, "\n");
+#endif
+    pathx[pathlen] = i; 
+    pathy[pathlen] = j;
+    pathlen++;
+}        
+
+
+/* path_reverse -- path is computed from last to first, flip it */
+/**/
+void Scorealign::path_reverse()
+{
+    int i = 0;
+    int j = pathlen - 1;
+    while (i < j) {
+        short tempx = pathx[i]; short tempy = pathy[i];
+        pathx[i] = pathx[j]; pathy[i] = pathy[j];
+        pathx[j] = tempx; pathy[j] = tempy;
+        i++; j--;
+    }
+}
+ 
+/*
+  Sees if the chroma energy vector is silent (indicated by the 12th element being one)
+  Returns true if it is silent.  False if it is not silent 
+*/
+ bool silent( int i, float *chrom_energy)
+ {
+     if (AREF2(chrom_energy, i,CHROMA_BIN_COUNT) == 1.0F)
+         return true;
+     else 
+         return false; 
+     
+}
+
+/*
+returns the first index in pathy where the element is bigger than sec 
+*/
+int Scorealign::sec_to_pathy_index(float sec) 
+{
+    for (int i = 0 ; i < (file1_frames + file2_frames); i++) {
+        if (smooth_time_map[i] * actual_frame_period_2 >= sec) {
+            return i; 
+        }
+        //printf("%i\n" ,pathy[i]);
+    }
+    return -1; 
+}
+
+
+/*	
+given a chrom_energy vector, sees how many 
+of the inital frames are designated as silent 
+*/
+
+int frames_of_init_silence( float *chrom_energy, int frame_count)
+{
+    bool silence = true;
+    int frames=0; 
+    while (silence) {
+        if (silent(frames, chrom_energy)) 
+            frames++; 
+        else
+            silence=false; 
+    }
+    
+    return frames; 
+}
+
+
+/*		COMPARE_CHROMA
+Perform Dynamic Programming to find optimal alignment
+*/
+void Scorealign::compare_chroma(bool verbose)
+{
+    float *path;
+    int x = 0;
+    int y = 0;
+    
+    /* Allocate the distance matrix */
+    path = (float *) calloc(file1_frames * file2_frames, sizeof(float));
+    
+    /* Initialize first row and column */
+
+    /* allow free skip over initial silence in either signal, but not both */
+    /* silence is indicated by a run of zeros along the first row and or 
+     * column, starting at the origin (0,0). After computing these runs, we
+     * put the proper value at (0,0)
+     */
+    if (verbose) printf("Performing silent skip DP \n"); 
+    PATH(0, 0) = (silent(0, chrom_energy1) ? 0 :
+                  gen_dist(0, 0, chrom_energy1, chrom_energy2));
+    for (int i = 1; i < file1_frames; i++)
+        PATH(i, 0) = (PATH(i-1, 0) == 0 && silent(i, chrom_energy1) ? 0 :
+                      gen_dist(i, 0, chrom_energy1, chrom_energy2) + 
+                      PATH(i-1, 0));
+    PATH(0, 0) = (silent(0, chrom_energy2) ? 0 :
+                  gen_dist(0, 0, chrom_energy1, chrom_energy2));
+    for (int j = 1; j < file2_frames; j++)
+        PATH(0, j) = (PATH(0, j-1) == 0 && silent(j, chrom_energy2) ? 0 :
+                      gen_dist(0, j, chrom_energy1, chrom_energy2) + 
+                      PATH(0, j-1));
+    /* first row and first column are done, put proper value at (0,0) */
+    PATH(0, 0) = (!silent(0, chrom_energy1) || !silent(0, chrom_energy2) ?
+                  gen_dist(0, 0, chrom_energy1, chrom_energy2) : 0);
+    
+    /* Perform DP for the rest of the matrix */
+    for (int i = 1; i < file1_frames; i++)
+        for (int j = 1; j < file2_frames; j++)
+            PATH(i, j) = gen_dist(i, j, chrom_energy1, chrom_energy2) +
+                min3(PATH(i-1, j-1), PATH(i-1, j), PATH(i, j-1)); 
+    
+    if (verbose) printf("Completed Dynamic Programming.\n");
+    
+    
+    x = file1_frames - 1;
+    y = file2_frames - 1;
+
+    //x and y are the ending points, it can end at either the end of midi, 
+    // or end of audio but not both
+    pathx = ALLOC(short, (x + y + 2));
+    pathy = ALLOC(short, (x + y + 2));
+	
+    assert(pathx != NULL);
+    assert(pathy != NULL);
+	 
+    // map from file1 time to file2 time
+    time_map = ALLOC(float, file1_frames);
+    smooth_time_map = ALLOC(float, file1_frames);
+	
+#if DEBUG_LOG
+    fprintf(dbf, "\nOptimal Path: ");
+#endif
+    while (1) {
+        /* Check for stopping */
+        if (x ==  0 & y == 0) {
+            path_step(0, 0);
+            path_reverse();
+            break;
+        }
+		
+        /* Print the current coordinate in the path*/
+        path_step(x, y);
+
+        /* Check for the optimal path backwards*/
+        if (x > 0 && y > 0 && PATH(x-1, y-1) <= PATH(x-1, y) &&
+            PATH(x-1, y-1) <= PATH(x, y-1)) {
+            x--;
+            y--;
+        } else if (x > 0 && y > 0 && PATH(x-1, y) <= PATH(x, y-1)) {
+            x--;
+        } else if (y > 0) {
+            y--;
+        } else if (x > 0) {
+            x--;
+        }
+    }
+    free(path);
+}
+
+
+
+void Scorealign::linear_regression(int n, int width, float &a, float &b)
+{
+    int hw = (width - 1) / 2; // a more convenient form: 1/2 width
+    // compute average of x = avg of time_map[i]
+    float xsum = 0;
+    float ysum = 0;
+    float xavg, yavg;
+    int i;
+    for (i = n - hw; i <= n + hw; i++) {
+        xsum += i;
+        ysum += time_map[i];
+    }
+    xavg = xsum / width;
+    yavg = ysum / width;
+    float num = 0;
+    float den = 0;
+    for (i = n - hw; i <= n + hw; i++) {
+        num += (i - xavg) * (time_map[i] - yavg);
+        den += (i - xavg) * (i - xavg);
+    }
+    b = num / den;
+    a = yavg - b * xavg;
+}
+
+
+
+
+
+/*			COMPUTE_SMOOTH_TIME_MAP 
+	 compute regression line and estimate point at i
+ 
+	 Number of points in regression is smooth (an odd number). First
+	 index to compute is (smooth-1)/2. Use that line for the first
+	 (smooth+1)/2 points. The last index to compute is 
+	 (file1_frames - (smooth+1)/2). Use that line for the last 
+	 (smooth+1)/2 points.
+*/
+void Scorealign::compute_smooth_time_map()
+{
+    // do the first points:
+    float a, b;
+    linear_regression((smooth - 1) / 2, smooth, a, b);
+    int i;
+    for (i = 0; i < (smooth + 1) / 2; i++) {
+        smooth_time_map[i] = a + b*i;
+    }
+    
+    // do the middle points:
+    for (i = (smooth + 1) / 2; i < file1_frames - (smooth + 1) / 2; i++) {
+        linear_regression(i, smooth, a, b);
+        smooth_time_map[i] = a + b*i;
+        
+#if DEBUG_LOG
+        fprintf(dbf, "time_map[%d] = %g, smooth_time_map[%d] = %g\n", 
+                i, time_map[i], i, a + b*i);
+#endif
+        
+    }
+    
+    // do the last points
+    linear_regression(file1_frames - (smooth + 1) / 2, smooth, a, b);
+    for (i = file1_frames - (smooth + 1) / 2; i < file1_frames; i++) {
+        smooth_time_map[i] = a + b*i;
+    }
+    
+    
+}
+ 
+
+/* near_line -- see if point is near line */
+/**/
+bool near_line(float x1, float y1, float x2, float y2, float x, float y)
+{
+    float exact_y;
+    if (x1 == x) {
+        exact_y = y1;
+    } else {
+        assert(x1 != x2);
+        exact_y = y1 + (y2 - y1) * ((x - x1) / (x2 - x1));
+    }
+    y = y - exact_y;
+    return y < NEAR && y > -NEAR;
+}
+
+
+// path_copy -- copy a path for debugging
+short *path_copy(short *path, int len)
+{
+    short *new_path = ALLOC(short, len);
+    memcpy(new_path, path, len * sizeof(path[0]));
+    return new_path;
+}
+
+
+/* presmooth -- try to remove typical dynamic programming errors
+ * 
+ * A common problem is that the best path wanders off track a ways
+ * and then comes back. The idea of presmoothing is to see if the
+ * path is mostly a straight line. If so, adjust the points off of
+ * the line to fall along the line. The variable presmooth_time is
+ * the duration of the line. It is drawn between every pair of 
+ * points presmooth_time apart. If 25% of the first half of the line
+ * falls within one frame of the path, and 25% of the second half of
+ * the line falls within one frame of the path, then find the best
+ * fit of the line to the points within 1 frame. Then adjust the middle
+ * part of the line (from 25% to 75%) to fall along the line.
+ * Note that all this curve fitting is done on integer coordinates.
+ */
+void Scorealign::presmooth()
+{
+    int n = ROUND(presmooth_time / actual_frame_period_2);
+    n = (n + 3) & ~3; // round up to multiple of 4
+    int i = 0;
+    while (pathx[i] + n < file2_frames) {
+        /* line goes from i to i+n-1 */
+        int x1 = pathx[i];
+        int xmid = x1 + n/2;
+        int x2 = x1 + n;
+        int y1 = pathy[i];
+        int y2;
+        int j;
+        /* search for y2 = pathy[j] s.t. pathx[j] == x2 */
+        for (j = i + n; j < pathlen; j++) {
+            if (pathx[j] == x2) {
+                y2 = pathy[j];
+                break;
+            }
+        }
+        Regression regr;
+        /* see if line fits the data */
+        int k = i;
+        int count = 0;
+        while (pathx[k] < xmid) { // search first half
+            if (near_line(x1, y1, x2, y2, pathx[k], pathy[k])) {
+                count++;
+                regr.point(pathx[k], pathy[k]);
+            }
+            k++;
+        }
+        /* see if points were close to line */
+        if (count < n/4) {
+            i++;
+            continue;
+        }
+        /* see if line fits top half of the data */
+        while (pathx[k] < x2) {
+            if (near_line(x1, y1, x2, y2, pathx[k], pathy[k])) {
+                count++;
+                regr.point(pathx[k], pathy[k]);
+            }
+            k++;
+        }
+        /* see if points were close to line */
+        if (count < n/4) {
+            i++;
+            continue;
+        }
+        /* debug: */
+        SA_V(printf("presmoothing path from %d to %d:\n", i, j);)
+        SA_V(print_path_range(pathx, pathy, i, j);)
+        /* fit line to nearby points */
+        regr.regress();
+        /* adjust points to fall along line */
+        // basically reconstruct pathx and pathy from i to j
+        short x = pathx[i];
+        short y = pathy[i];
+        k = i + 1;
+        SA_V(printf("start loop: j %d, pathx %d, pathy %d\n",
+                 j, pathx[j], pathy[j]);)
+        while (x < pathx[j] || y < pathy[j]) {
+            SA_V(printf("top of loop: x %d, y %d\n", x, y);)
+            // iteratively make an optional move in the +y direction
+            // then make a move in the x direction
+            // check y direction: want to move to y+1 if either we are below
+            // the desired y coordinate or we are below the maximum slope
+            // line (if y is too low, we'll have to go at sharper than 2:1
+            // slope to get to pathx[j], pathy[j], which is bad
+            int target_y = ROUND(regr.f(x));
+            SA_V(printf("target_y@%d %d, r %g, ", x, target_y, regr.f(x));)
+            // but what if the line goes way below the last point?
+            // we don't want to go below a diagonal through the last point
+            int dist_to_last_point = pathx[j] - x;
+            int minimum_y = pathy[j] - 2 * dist_to_last_point;
+            if (target_y < minimum_y) {
+                target_y = minimum_y;
+                SA_V(printf("minimum_y %d, ", minimum_y);)
+            }
+            // alternatively, if line goes too high:
+            int maximum_y = pathy[j] - dist_to_last_point / 2;
+            if (target_y > maximum_y) {
+                target_y = maximum_y;
+                SA_V(printf("maximum y %d, ", maximum_y);)
+            }
+            // now advance to target_y
+            if (target_y > y) {
+                pathx[k] = x;
+                pathy[k] = y + 1;
+                SA_V(printf("up: pathx[%d] %d, pathy[%d] %d\n", 
+                         k, pathx[k], k, pathy[k]);)
+                k++;
+                y++;
+            }
+            if (x < pathx[j]) {
+                // now advance x
+                x++;
+                // y can either go horizontal or diagonal, i.e. y either
+                // stays the same or increments by one
+                target_y = ROUND(regr.f(x));
+                SA_V(printf("target_y@%d %d, r %g, ", x, target_y, regr.f(x));)
+                if (target_y > y) y++;
+                pathx[k] = x;
+                pathy[k] = y;
+                SA_V(printf("pathx[%d] %d, pathy[%d] %d\n", 
+                         k, pathx[k], k, pathy[k]);)
+                k++;
+            }
+        }
+        // make sure new path is no longer than original path
+        // the last point we wrote was k - 1
+        k = k - 1; // the last point we wrote is now k
+        // DEBUG
+        if (k > j) {
+            printf("oops: k %d, j %d\n", k, j);
+            SA_V(print_path_range(pathx, pathy, i, k);)
+        }
+        assert(k <= j);
+        // if new path is shorter than original, then fix up path
+        if (k < j) {
+            memmove(&pathx[k], &pathx[j], sizeof(pathx[0]) * (pathlen - j));
+            memmove(&pathy[k], &pathy[j], sizeof(pathy[0]) * (pathlen - j));
+            pathlen -= (j - k);
+        }
+        /* debug */
+        SA_V(printf("after presmoothing:\n");)
+        SA_V(print_path_range(pathx, pathy, i, k);)
+        /* since we adjusted the path, skip by 3/4 of n */
+        i = i + 3 * n/4;
+    }
+}
+
+
+/*				COMPUTE_REGRESSION_LINES
+	computes the smooth time map from the path computed
+	by dynamic programming
+
+*/
+void Scorealign::compute_regression_lines()
+{
+    // first, compute the y value of the path at
+    // each x value. If the path has multiple values
+    // on x, take the average.
+    int p = 0;
+    int i;
+    int upper, lower;
+    for (i = 0; i < file1_frames; i++) {
+        lower = pathy[p];
+        while (p < pathlen && pathx[p] == i) {
+            upper = pathy[p];
+            p = p + 1;
+        }
+        time_map[i] = (lower + upper) * 0.5;
+    }
+    // now fit a line to the nearest WINDOW points and record the 
+    // line's y value for each x.
+    compute_smooth_time_map();
+}
+
+
+void Scorealign::midi_tempo_align(Alg_seq &seq, bool verbose)
+{
+    // We create a new time map out of the alignment, and replace
+    // the original time map in the Alg_seq sequence
+    Alg_seq new_time_map_seq;
+
+    /** align at all integer beats **/
+    int totalbeats; 
+    float dur_in_sec; 
+    // probably alignment should respect the real_dur encoded into the seq
+    // rather than computing real_dur based on note off times -- the 
+    // caller should be required to set real_dur to a good value, and
+    // the find_midi_duration() function should be available to the caller
+    // if necessary -RBD
+    find_midi_duration(seq, &dur_in_sec); 
+    // 
+    // totalbeat = lastbeat + 1 and round up the beat
+    totalbeats = (int) (seq.get_time_map()->time_to_beat(dur_in_sec) + 2);
+    if (verbose)
+        printf("midi duration = %f, totalbeats=%i \n", dur_in_sec, totalbeats);   
+    
+    for (int i = 0; i < totalbeats; i++) {
+        double newtime = map_time(seq.get_time_map()->beat_to_time(i));
+        if (newtime > 0) 
+            new_time_map_seq.insert_beat(newtime, (double) i);
+    }
+    seq.convert_to_beats();
+    seq.set_time_map(new_time_map_seq.get_time_map());
+}
+
+
+// this routine performs an alignment by adjusting midi to match audio
+//
+void Scorealign::align_midi_to_audio(Alg_seq &seq, Audio_reader &reader, 
+                                    bool verbose)
+{
+    /* Generate the chroma for file 1 
+     * This will always be the MIDI File when aligning midi with audio.
+     */
+    file1_frames = gen_chroma_midi(seq, HIGH_CUTOFF, LOW_CUTOFF, 
+            &chrom_energy1, &actual_frame_period_1, 1, verbose);
+
+    /* Generate the chroma for file 2 */
+    file2_frames = gen_chroma_audio(reader, HIGH_CUTOFF, LOW_CUTOFF, 
+            &chrom_energy2, &actual_frame_period_2, 2, verbose);
+
+    align_chromagrams(verbose);
+}
+
+void Scorealign::align_audio_to_audio(Audio_reader &reader1, 
+                                     Audio_reader &reader2, bool verbose)
+{
+    file1_frames = gen_chroma_audio(reader1, HIGH_CUTOFF, LOW_CUTOFF, 
+                    &chrom_energy1, &actual_frame_period_1, 1, verbose);
+    file2_frames = gen_chroma_audio(reader2, HIGH_CUTOFF, LOW_CUTOFF, 
+                    &chrom_energy2, &actual_frame_period_2, 2, verbose);
+    align_chromagrams(verbose);
+}
+
+
+void Scorealign::align_midi_to_midi(Alg_seq &seq1, Alg_seq &seq2, 
+                                   bool verbose)
+{
+    file1_frames = gen_chroma_midi(seq1, HIGH_CUTOFF, LOW_CUTOFF, 
+            &chrom_energy1, &actual_frame_period_1, 1, verbose);
+
+    file2_frames = gen_chroma_midi(seq2, HIGH_CUTOFF, LOW_CUTOFF, 
+            &chrom_energy2, &actual_frame_period_2, 2, verbose);
+
+    align_chromagrams(verbose);
+}
+
+void Scorealign::align_chromagrams(bool verbose)
+{
+    if (verbose)
+        printf("\nGenerated Chroma.\n");
+    /* now that we have actual_frame_period_2, we can compute smooth */
+    // smooth is an odd number of frames that spans about smooth_time
+    smooth = ROUND(smooth_time / actual_frame_period_2);
+    if (smooth < 3) smooth = 3;
+    if (!(smooth & 1)) smooth++; // must be odd
+    if (verbose) {
+        printf("smoothing time is %g\n", smooth_time);
+        printf("smooth count is %d\n", smooth);
+    }
+    /* Normalize the chroma frames */
+    norm_chroma(file1_frames, chrom_energy1);
+    SA_V(printf("Chromagram data for file 1:\n");)
+    SA_V(print_chroma_table(chrom_energy1, file1_frames);)
+    norm_chroma(file2_frames, chrom_energy2);
+    SA_V(printf("Chromagram data for file 2:\n");)
+    SA_V(print_chroma_table(chrom_energy2, file2_frames);)
+    if (verbose)
+        printf("Normalized Chroma.\n");
+
+    /* Compare the chroma frames */
+    compare_chroma(verbose);
+    /* Compute the smooth time map now for use by curve-fitting */	
+    compute_regression_lines();
+    /* if line_time is set, do curve-fitting */
+    if (line_time > 0.0) {
+        curve_fitting(this, verbose);
+        /* Redo the smooth time map after curve fitting or smoothing */	
+        compute_regression_lines();
+    }
+    /* if presmooth_time is set, do presmoothing */
+    if (presmooth_time > 0.0) {
+        presmooth();
+        /* Redo the smooth time map after curve fitting or smoothing */	
+        compute_regression_lines();
+    }
+}
diff --git a/lib-src/libscorealign/scorealign.h b/lib-src/libscorealign/scorealign.h
new file mode 100644
index 0000000..3a28509
--- /dev/null
+++ b/lib-src/libscorealign/scorealign.h
@@ -0,0 +1,106 @@
+/* scorealign.h 
+ *
+ * RBD
+ */
+
+// turn on lots of debugging, comment this line out to disable
+// #define SA_VERBOSE 1
+
+#ifdef SA_VERBOSE
+#define SA_V(stmt) stmt
+#else
+#define SA_V(stmt) 
+#endif
+
+
+class Scorealign {
+ public:
+    float frame_period; // time in seconds
+    float window_size;
+    float presmooth_time;
+    float line_time;
+    float smooth_time; // duration of smoothing window
+    int smooth; // number of points used to compute the smooth time map
+
+    Scorealign() {
+        frame_period = 0.25;
+        window_size = 0.25;
+        presmooth_time = 0.0;
+        line_time = 0.0;
+        smooth_time = 1.75;
+        pathlen = 0;
+        path_count = 0;
+        pathx = NULL;
+        pathy = NULL;
+    }
+
+    ~Scorealign() {
+        if (pathx) free(pathx);
+        if (pathy) free(pathy);
+    }
+
+    // chromagrams and lengths, path data
+    float *chrom_energy1;
+    int file1_frames; // number of frames in file1
+    float *chrom_energy2;
+    int file2_frames; //number of frames in file2
+    short *pathx;  //for midi (when aligning midi and audio)
+    short *pathy; //for audio (when aligning midi and audio)
+    int pathlen;
+    void set_pathlen(int p) { pathlen = p; }
+    float *time_map;
+    float *smooth_time_map;
+
+    // chroma vectors are calculated from an integer number of samples
+    // that approximates the nominal frame_period. Actual frame period
+    // is calculated and stored here:
+    // time in seconds for midi (when aligning midi and audio)
+    float actual_frame_period_1; 
+    // time in seconds for audio (when aligning midi and audio)
+    float actual_frame_period_2; 
+
+    /* gen_chroma.cpp stuff:
+       generates the chroma energy for a given file
+       with a low cutoff and high cutoff.  
+       The chroma energy is placed in the float** chrom_energy.
+       this 2D is an array of pointers.  the pointers point to an array 
+       of length 12, representing the 12 chroma bins
+       The function returns the number of frames 
+       (i.e. the length of the 1st dimention of chrom_energy
+    */
+    int gen_chroma_audio(Audio_reader &reader, int hcutoff, int lcutoff, 
+                         float **chrom_energy, float *actual_frame_period,
+                         int id, bool verbose);
+
+    int gen_chroma_midi(Alg_seq &seq,  int hcutoff, int lcutoff, 
+                        float **chrom_energy, float *actual_frame_period,
+                        int id, bool verbose);
+
+    /* scorealign.cpp stuff: */
+    float map_time(float t1);
+    void midi_tempo_align(Alg_seq &seq , char *midiname, char *beatname);
+    void align_midi_to_audio(Alg_seq &seq, Audio_reader &reader, 
+                            bool verbose);
+    void align_midi_to_midi(Alg_seq &seq1, Alg_seq &seq2, bool verbose);
+    void align_audio_to_audio(Audio_reader &reader1, 
+                             Audio_reader &reader2, bool verbose);
+    void align_chromagrams(bool verbose);
+
+    int path_count; // for debug log formatting
+    void path_step(int i, int j);
+    void path_reverse();
+    int sec_to_pathy_index(float sec);
+    void compare_chroma(bool verbose);
+    void linear_regression(int n, int width, float &a, float &b);
+    void compute_smooth_time_map();
+    void presmooth();
+    void compute_regression_lines();
+    void midi_tempo_align(Alg_seq &seq, bool verbose);
+};
+
+#define DEBUG_LOG 0
+#if DEBUG_LOG
+extern FILE *dbf;
+#endif
+
+int find_midi_duration(Alg_seq &seq, float *dur);
diff --git a/lib-src/libscorealign/scorealign.sln b/lib-src/libscorealign/scorealign.sln
new file mode 100644
index 0000000..7745c68
--- /dev/null
+++ b/lib-src/libscorealign/scorealign.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "score-align", "score-align.vcproj", "{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.Build.0 = Debug|Win32
+		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.ActiveCfg = Release|Win32
+		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/lib-src/libscorealign/scorealign.xcodeproj/project.pbxproj b/lib-src/libscorealign/scorealign.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..2e83a30
--- /dev/null
+++ b/lib-src/libscorealign/scorealign.xcodeproj/project.pbxproj
@@ -0,0 +1,321 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		3D6E91710E351D8300FE12E2 /* FFT3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D6E916F0E351D8300FE12E2 /* FFT3.cpp */; };
+		3D6E91720E351D8300FE12E2 /* FFT3.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D6E91700E351D8300FE12E2 /* FFT3.h */; };
+		3D848DC60E2C391300EDB5E3 /* audiofilereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D848DC50E2C391300EDB5E3 /* audiofilereader.cpp */; };
+		3D848DC90E2C392600EDB5E3 /* audioreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D848DC80E2C392600EDB5E3 /* audioreader.cpp */; };
+		3D848E540E2CE2B300EDB5E3 /* alignfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D848E530E2CE2B300EDB5E3 /* alignfiles.cpp */; };
+		3D848E7A0E2CEC4200EDB5E3 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D848E790E2CEC4200EDB5E3 /* main.cpp */; };
+		3D9037AD0CC7CB3C00F46FD5 /* comp_chroma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037AB0CC7CB3C00F46FD5 /* comp_chroma.cpp */; };
+		3D9037AE0CC7CB3C00F46FD5 /* comp_chroma.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037AC0CC7CB3C00F46FD5 /* comp_chroma.h */; };
+		3D9037B10CC7CB9C00F46FD5 /* gen_chroma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037AF0CC7CB9C00F46FD5 /* gen_chroma.cpp */; };
+		3D9037B20CC7CB9C00F46FD5 /* gen_chroma.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037B00CC7CB9C00F46FD5 /* gen_chroma.h */; };
+		3D9037B80CC7D16200F46FD5 /* regression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037B70CC7D16200F46FD5 /* regression.cpp */; };
+		3D9037BA0CC7D18400F46FD5 /* regression.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037B90CC7D18400F46FD5 /* regression.h */; };
+		3D9037BD0CC7D18F00F46FD5 /* scorealign.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037BB0CC7D18F00F46FD5 /* scorealign.cpp */; };
+		3D9037BE0CC7D18F00F46FD5 /* scorealign.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037BC0CC7D18F00F46FD5 /* scorealign.h */; };
+		3D9037E20CC7E2E000F46FD5 /* allegro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037E10CC7E2E000F46FD5 /* allegro.cpp */; };
+		3D9037E40CC7E2F700F46FD5 /* allegro.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037E30CC7E2F700F46FD5 /* allegro.h */; };
+		3D9037E60CC7E30600F46FD5 /* allegrord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037E50CC7E30600F46FD5 /* allegrord.cpp */; };
+		3D9037E80CC7E31300F46FD5 /* allegrosmfrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037E70CC7E31300F46FD5 /* allegrosmfrd.cpp */; };
+		3D9037EA0CC7E31C00F46FD5 /* allegrowr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037E90CC7E31C00F46FD5 /* allegrowr.cpp */; };
+		3D9037EC0CC7E32400F46FD5 /* allegrosmfwr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037EB0CC7E32400F46FD5 /* allegrosmfwr.cpp */; };
+		3D9037EF0CC7E33200F46FD5 /* mfmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037ED0CC7E33200F46FD5 /* mfmidi.cpp */; };
+		3D9037F30CC7E33D00F46FD5 /* strparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9037F10CC7E33D00F46FD5 /* strparse.cpp */; };
+		3D9037F40CC7E33D00F46FD5 /* strparse.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037F20CC7E33D00F46FD5 /* strparse.h */; };
+		3D9037FF0CC7E46700F46FD5 /* mfmidi.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9037FE0CC7E46700F46FD5 /* mfmidi.h */; };
+		3D9038800CC9B54000F46FD5 /* curvefit.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D90387E0CC9B54000F46FD5 /* curvefit.h */; };
+		3D9038810CC9B54000F46FD5 /* curvefit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D90387F0CC9B54000F46FD5 /* curvefit.cpp */; };
+		3D9038880CCA25E100F46FD5 /* hillclimb.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9038860CCA25E100F46FD5 /* hillclimb.h */; };
+		3D9038890CCA25E100F46FD5 /* hillclimb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9038870CCA25E100F46FD5 /* hillclimb.cpp */; };
+		3D9038DE0CCA815D00F46FD5 /* sautils.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D9038DC0CCA815D00F46FD5 /* sautils.h */; };
+		3D9038DF0CCA815D00F46FD5 /* sautils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D9038DD0CCA815D00F46FD5 /* sautils.cpp */; };
+		8DD76F6A0486A84900D96B5E /* scorealign.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* scorealign.1 */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		8DD76F690486A84900D96B5E /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+				8DD76F6A0486A84900D96B5E /* scorealign.1 in CopyFiles */,
+				3D9037AE0CC7CB3C00F46FD5 /* comp_chroma.h in CopyFiles */,
+				3D9037B20CC7CB9C00F46FD5 /* gen_chroma.h in CopyFiles */,
+				3D9037BA0CC7D18400F46FD5 /* regression.h in CopyFiles */,
+				3D9037BE0CC7D18F00F46FD5 /* scorealign.h in CopyFiles */,
+				3D9037E40CC7E2F700F46FD5 /* allegro.h in CopyFiles */,
+				3D9037F40CC7E33D00F46FD5 /* strparse.h in CopyFiles */,
+				3D9037FF0CC7E46700F46FD5 /* mfmidi.h in CopyFiles */,
+				3D9038800CC9B54000F46FD5 /* curvefit.h in CopyFiles */,
+				3D9038880CCA25E100F46FD5 /* hillclimb.h in CopyFiles */,
+				3D9038DE0CCA815D00F46FD5 /* sautils.h in CopyFiles */,
+				3D6E91720E351D8300FE12E2 /* FFT3.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		3D6E916F0E351D8300FE12E2 /* FFT3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FFT3.cpp; path = fft3/FFT3.cpp; sourceTree = "<group>"; };
+		3D6E91700E351D8300FE12E2 /* FFT3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FFT3.h; path = fft3/FFT3.h; sourceTree = "<group>"; };
+		3D848DC50E2C391300EDB5E3 /* audiofilereader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = audiofilereader.cpp; sourceTree = "<group>"; };
+		3D848DC80E2C392600EDB5E3 /* audioreader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = audioreader.cpp; sourceTree = "<group>"; };
+		3D848E530E2CE2B300EDB5E3 /* alignfiles.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = alignfiles.cpp; sourceTree = "<group>"; };
+		3D848E790E2CEC4200EDB5E3 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
+		3D9037AB0CC7CB3C00F46FD5 /* comp_chroma.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = comp_chroma.cpp; sourceTree = "<group>"; };
+		3D9037AC0CC7CB3C00F46FD5 /* comp_chroma.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = comp_chroma.h; sourceTree = "<group>"; };
+		3D9037AF0CC7CB9C00F46FD5 /* gen_chroma.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gen_chroma.cpp; sourceTree = "<group>"; };
+		3D9037B00CC7CB9C00F46FD5 /* gen_chroma.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gen_chroma.h; sourceTree = "<group>"; };
+		3D9037B70CC7D16200F46FD5 /* regression.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = regression.cpp; sourceTree = "<group>"; };
+		3D9037B90CC7D18400F46FD5 /* regression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = regression.h; sourceTree = "<group>"; };
+		3D9037BB0CC7D18F00F46FD5 /* scorealign.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scorealign.cpp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+		3D9037BC0CC7D18F00F46FD5 /* scorealign.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = scorealign.h; sourceTree = "<group>"; };
+		3D9037E10CC7E2E000F46FD5 /* allegro.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = allegro.cpp; path = ../portsmf/allegro.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037E30CC7E2F700F46FD5 /* allegro.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = allegro.h; path = ../portsmf/allegro.h; sourceTree = SOURCE_ROOT; };
+		3D9037E50CC7E30600F46FD5 /* allegrord.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = allegrord.cpp; path = ../portsmf/allegrord.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037E70CC7E31300F46FD5 /* allegrosmfrd.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = allegrosmfrd.cpp; path = ../portsmf/allegrosmfrd.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037E90CC7E31C00F46FD5 /* allegrowr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = allegrowr.cpp; path = ../portsmf/allegrowr.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037EB0CC7E32400F46FD5 /* allegrosmfwr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = allegrosmfwr.cpp; path = ../portsmf/allegrosmfwr.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037ED0CC7E33200F46FD5 /* mfmidi.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = mfmidi.cpp; path = ../portsmf/mfmidi.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037F10CC7E33D00F46FD5 /* strparse.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = strparse.cpp; path = ../portsmf/strparse.cpp; sourceTree = SOURCE_ROOT; };
+		3D9037F20CC7E33D00F46FD5 /* strparse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = strparse.h; path = ../portsmf/strparse.h; sourceTree = SOURCE_ROOT; };
+		3D9037FE0CC7E46700F46FD5 /* mfmidi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = mfmidi.h; path = ../portsmf/mfmidi.h; sourceTree = SOURCE_ROOT; };
+		3D90387E0CC9B54000F46FD5 /* curvefit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curvefit.h; sourceTree = "<group>"; };
+		3D90387F0CC9B54000F46FD5 /* curvefit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curvefit.cpp; sourceTree = "<group>"; };
+		3D9038860CCA25E100F46FD5 /* hillclimb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hillclimb.h; sourceTree = "<group>"; };
+		3D9038870CCA25E100F46FD5 /* hillclimb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hillclimb.cpp; sourceTree = "<group>"; };
+		3D9038DC0CCA815D00F46FD5 /* sautils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sautils.h; sourceTree = "<group>"; };
+		3D9038DD0CCA815D00F46FD5 /* sautils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sautils.cpp; sourceTree = "<group>"; };
+		8DD76F6C0486A84900D96B5E /* scorealign */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = scorealign; sourceTree = BUILT_PRODUCTS_DIR; };
+		C6859E8B029090EE04C91782 /* scorealign.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = scorealign.1; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8DD76F660486A84900D96B5E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		08FB7794FE84155DC02AAC07 /* scorealign */ = {
+			isa = PBXGroup;
+			children = (
+				08FB7795FE84155DC02AAC07 /* Source */,
+				C6859E8C029090F304C91782 /* Documentation */,
+				1AB674ADFE9D54B511CA2CBB /* Products */,
+			);
+			name = scorealign;
+			sourceTree = "<group>";
+		};
+		08FB7795FE84155DC02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				3D6E916F0E351D8300FE12E2 /* FFT3.cpp */,
+				3D6E91700E351D8300FE12E2 /* FFT3.h */,
+				3D9038DC0CCA815D00F46FD5 /* sautils.h */,
+				3D9038DD0CCA815D00F46FD5 /* sautils.cpp */,
+				3D9038860CCA25E100F46FD5 /* hillclimb.h */,
+				3D9038870CCA25E100F46FD5 /* hillclimb.cpp */,
+				3D90387E0CC9B54000F46FD5 /* curvefit.h */,
+				3D90387F0CC9B54000F46FD5 /* curvefit.cpp */,
+				3D9037F10CC7E33D00F46FD5 /* strparse.cpp */,
+				3D9037F20CC7E33D00F46FD5 /* strparse.h */,
+				3D9037ED0CC7E33200F46FD5 /* mfmidi.cpp */,
+				3D9037EB0CC7E32400F46FD5 /* allegrosmfwr.cpp */,
+				3D9037E90CC7E31C00F46FD5 /* allegrowr.cpp */,
+				3D848DC80E2C392600EDB5E3 /* audioreader.cpp */,
+				3D848E790E2CEC4200EDB5E3 /* main.cpp */,
+				3D848DC50E2C391300EDB5E3 /* audiofilereader.cpp */,
+				3D9037E70CC7E31300F46FD5 /* allegrosmfrd.cpp */,
+				3D9037E50CC7E30600F46FD5 /* allegrord.cpp */,
+				3D9037E30CC7E2F700F46FD5 /* allegro.h */,
+				3D848E530E2CE2B300EDB5E3 /* alignfiles.cpp */,
+				3D9037E10CC7E2E000F46FD5 /* allegro.cpp */,
+				3D9037BC0CC7D18F00F46FD5 /* scorealign.h */,
+				3D9037B90CC7D18400F46FD5 /* regression.h */,
+				3D9037B70CC7D16200F46FD5 /* regression.cpp */,
+				3D9037AF0CC7CB9C00F46FD5 /* gen_chroma.cpp */,
+				3D9037B00CC7CB9C00F46FD5 /* gen_chroma.h */,
+				3D9037AB0CC7CB3C00F46FD5 /* comp_chroma.cpp */,
+				3D9037FE0CC7E46700F46FD5 /* mfmidi.h */,
+				3D9037AC0CC7CB3C00F46FD5 /* comp_chroma.h */,
+				3D9037BB0CC7D18F00F46FD5 /* scorealign.cpp */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		1AB674ADFE9D54B511CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8DD76F6C0486A84900D96B5E /* scorealign */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		C6859E8C029090F304C91782 /* Documentation */ = {
+			isa = PBXGroup;
+			children = (
+				C6859E8B029090EE04C91782 /* scorealign.1 */,
+			);
+			name = Documentation;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8DD76F620486A84900D96B5E /* scorealign */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "scorealign" */;
+			buildPhases = (
+				8DD76F640486A84900D96B5E /* Sources */,
+				8DD76F660486A84900D96B5E /* Frameworks */,
+				8DD76F690486A84900D96B5E /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = scorealign;
+			productInstallPath = "$(HOME)/bin";
+			productName = scorealign;
+			productReference = 8DD76F6C0486A84900D96B5E /* scorealign */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		08FB7793FE84155DC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "scorealign" */;
+			hasScannedForEncodings = 1;
+			mainGroup = 08FB7794FE84155DC02AAC07 /* scorealign */;
+			projectDirPath = "";
+			targets = (
+				8DD76F620486A84900D96B5E /* scorealign */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8DD76F640486A84900D96B5E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3D9037AD0CC7CB3C00F46FD5 /* comp_chroma.cpp in Sources */,
+				3D9037B10CC7CB9C00F46FD5 /* gen_chroma.cpp in Sources */,
+				3D9037B80CC7D16200F46FD5 /* regression.cpp in Sources */,
+				3D9037BD0CC7D18F00F46FD5 /* scorealign.cpp in Sources */,
+				3D9037E20CC7E2E000F46FD5 /* allegro.cpp in Sources */,
+				3D9037E60CC7E30600F46FD5 /* allegrord.cpp in Sources */,
+				3D9037E80CC7E31300F46FD5 /* allegrosmfrd.cpp in Sources */,
+				3D9037EA0CC7E31C00F46FD5 /* allegrowr.cpp in Sources */,
+				3D9037EC0CC7E32400F46FD5 /* allegrosmfwr.cpp in Sources */,
+				3D9037EF0CC7E33200F46FD5 /* mfmidi.cpp in Sources */,
+				3D9037F30CC7E33D00F46FD5 /* strparse.cpp in Sources */,
+				3D9038890CCA25E100F46FD5 /* hillclimb.cpp in Sources */,
+				3D9038810CC9B54000F46FD5 /* curvefit.cpp in Sources */,
+				3D9038DF0CCA815D00F46FD5 /* sautils.cpp in Sources */,
+				3D848DC60E2C391300EDB5E3 /* audiofilereader.cpp in Sources */,
+				3D848DC90E2C392600EDB5E3 /* audioreader.cpp in Sources */,
+				3D848E540E2CE2B300EDB5E3 /* alignfiles.cpp in Sources */,
+				3D848E7A0E2CEC4200EDB5E3 /* main.cpp in Sources */,
+				3D6E91710E351D8300FE12E2 /* FFT3.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		1DEB923208733DC60010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				INSTALL_PATH = "$(HOME)/bin";
+				OTHER_LDFLAGS = (
+					"-L/usr/local/lib",
+					"-lsndfile",
+				);
+				PRODUCT_NAME = scorealign;
+				USER_HEADER_SEARCH_PATHS = "../portsmf/ /usr/local/include";
+				ZERO_LINK = YES;
+			};
+			name = Debug;
+		};
+		1DEB923308733DC60010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = "$(HOME)/bin";
+				PRODUCT_NAME = scorealign;
+				USER_HEADER_SEARCH_PATHS = ../portsmf/;
+			};
+			name = Release;
+		};
+		1DEB923608733DC60010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				USER_HEADER_SEARCH_PATHS = ../portsmf/;
+			};
+			name = Debug;
+		};
+		1DEB923708733DC60010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "scorealign" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB923208733DC60010E9CD /* Debug */,
+				1DEB923308733DC60010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "scorealign" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB923608733DC60010E9CD /* Debug */,
+				1DEB923708733DC60010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}
diff --git a/lib-src/libvamp/CHANGELOG b/lib-src/libvamp/CHANGELOG
index c800a31..6707355 100644
--- a/lib-src/libvamp/CHANGELOG
+++ b/lib-src/libvamp/CHANGELOG
@@ -1,4 +1,21 @@
 
+Version 2.0
+
+  * Feature structure now has an optional duration (plugin API change)
+  * Libraries reorganised into separate include and src directories for
+    plugin and host SDKs; hosts should no longer include from vamp-sdk/
+    but always from vamp-hostsdk/ instead (host source compatibility change)
+  * OutputDescriptor now declares whether its features will have duration
+  * Vamp RDF ontology now included for providing online (out-of-plugin)
+    descriptions of plugins; program to generate skeleton RDF for a plugin
+    set is included, and RDF for example plugins provided
+  * New PluginSummarisingAdapter providing averages, min/max, count etc
+    of returned features on request
+  * New example plugins: Fixed Tempo Estimator and Power Spectrum
+  * Command-line host now has a complete listing option, to print out
+    all data reported by plugins
+  * More complete Visual Studio project support
+
 Version 1.3, 2008-07-09 (maintenance release):
 
   * PluginBufferingAdapter has several important fixes to bugs that
diff --git a/lib-src/libvamp/Doxyfile b/lib-src/libvamp/Doxyfile
deleted file mode 100644
index 653d4e6..0000000
--- a/lib-src/libvamp/Doxyfile
+++ /dev/null
@@ -1,1377 +0,0 @@
-# Doxyfile 1.5.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = VampPluginSDK
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 1.2
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, 
-# and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = docs/doxygen/warning.log
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = vamp \
-                         vamp-sdk \
-                         vamp-sdk/hostext \
-                         examples \
-                         host
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          = *.h \
-                         *.C \
-                         *.cpp \
-                         *.cc \
-                         doc-overview
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = qrc_*.cpp \
-                         moc_*.cpp \
-                         *.moc.cpp \
-                         *_skel.cpp
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.  Otherwise they will link to the documentstion.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 3
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = YES
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = NO
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = HAVE_FFTW3F \
-                         HAVE_FISHSOUND \
-                         HAVE_JACK \
-                         HAVE_LIBLO \
-                         HAVE_LRDF \
-                         HAVE_MAD \
-                         HAVE_OGGZ \
-                         HAVE_PORTAUDIO \
-                         HAVE_SAMPLERATE \
-                         HAVE_SNDFILE \
-                         HAVE_VAMP
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH            = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = YES
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = NO
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is enabled by default, which results in a transparent 
-# background. Warning: Depending on the platform used, enabling this option 
-# may lead to badly anti-aliased labels on the edges of a graph (i.e. they 
-# become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/lib-src/libvamp/Makefile.in b/lib-src/libvamp/Makefile.in
index e5da1d0..e52f422 100644
--- a/lib-src/libvamp/Makefile.in
+++ b/lib-src/libvamp/Makefile.in
@@ -4,12 +4,19 @@
 # suit your operating system requirements.
 
 APIDIR		= vamp
+
 SDKDIR		= vamp-sdk
-HOSTEXTDIR      = vamp-sdk/hostext
+HOSTSDKDIR	= vamp-hostsdk
+
+SRCDIR		= src
+SDKSRCDIR	= src/vamp-sdk
+HOSTSDKSRCDIR	= src/vamp-hostsdk
+
 EXAMPLEDIR	= examples
 HOSTDIR		= host
-
-CXX		= @CXX@
+PCDIR		= pkgconfig
+LADIR		= build
+RDFGENDIR	= rdf/generator
 
 ###
 ### Start of user-serviceable parts
@@ -22,64 +29,85 @@ CXX		= @CXX@
 #   sdkstatic -- build only the static versions of the SDK libraries
 #   plugins   -- build the example plugins (and the SDK if required)
 #   host      -- build the simple Vamp plugin host (and the SDK if required)
+#   rdfgen    -- build the RDF template generator (and the SDK if required)
 #   test      -- build the host and example plugins, and run a quick test
 #   clean     -- remove binary targets
 #   distclean -- remove all targets
 #
-default:	sdkstatic
+default: @TARGETS@
 
 # Compile flags
 #
-CXXFLAGS	:= $(CXXFLAGS) -O2 -I.
+CXXFLAGS	:= -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
 
-# Libraries required for the plugins.
-# (Note that it is desirable to statically link libstdc++ if possible,
-# because our plugin exposes only a C API so there are no boundary
-# compatibility problems.)
+# ar, ranlib
 #
-PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a
-#PLUGIN_LIBS	= vamp-sdk/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a)
+AR		:= ar
+RANLIB		:= ranlib
 
-# Flags required to tell the compiler to link to a dynamically loadable object
+# Libraries required for the plugins.
 #
-PLUGIN_LDFLAGS	= -shared -Wl,-Bsymbolic -static-libgcc
+PLUGIN_LIBS	= $(SRCDIR)/libvamp-sdk.a
 
 # File extension for a dynamically loadable object
 #
 PLUGIN_EXT	= .so
-
-## For OS/X with g++:
-#PLUGIN_LDFLAGS	= -dynamiclib
+#PLUGIN_EXT	= .dll
 #PLUGIN_EXT	= .dylib
 
 # Libraries required for the host.
 #
-HOST_LIBS	= $(SDKDIR)/libvamp-hostsdk.a -lsndfile -ldl
+HOST_LIBS	= $(SRCDIR)/libvamp-hostsdk.a @SNDFILE_LIBS@ @LIBS@
+
+# Libraries required for the RDF template generator.
+#
+RDFGEN_LIBS	= $(SRCDIR)/libvamp-hostsdk.a @LIBS@
 
 # Locations for "make install".  This will need quite a bit of 
 # editing for non-Linux platforms.  Of course you don't necessarily
 # have to use "make install".
 #
-INSTALL_PREFIX	 	  := /usr/local
+INSTALL_PREFIX	 	  := @prefix@
 INSTALL_API_HEADERS	  := $(INSTALL_PREFIX)/include/vamp
 INSTALL_SDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk
-INSTALL_HOSTEXT_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk/hostext
+INSTALL_HOSTSDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-hostsdk
 INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)/lib
+INSTALL_PLUGINS		  := $(INSTALL_PREFIX)/lib/vamp
+INSTALL_BINARIES	  := $(INSTALL_PREFIX)/bin 
 
-INSTALL_SDK_LIBNAME	  := libvamp-sdk.so.1.0.0
-INSTALL_SDK_LINK_ABI	  := libvamp-sdk.so.1
+INSTALL_SDK_LIBNAME	  := libvamp-sdk.so.2.0.0
+INSTALL_SDK_LINK_ABI	  := libvamp-sdk.so.2
 INSTALL_SDK_LINK_DEV	  := libvamp-sdk.so
 INSTALL_SDK_STATIC        := libvamp-sdk.a
 INSTALL_SDK_LA            := libvamp-sdk.la
 
-INSTALL_HOSTSDK_LIBNAME   := libvamp-hostsdk.so.1.0.0
-INSTALL_HOSTSDK_LINK_ABI  := libvamp-hostsdk.so.1
+INSTALL_HOSTSDK_LIBNAME   := libvamp-hostsdk.so.3.0.0
+INSTALL_HOSTSDK_LINK_ABI  := libvamp-hostsdk.so.3
 INSTALL_HOSTSDK_LINK_DEV  := libvamp-hostsdk.so
 INSTALL_HOSTSDK_STATIC    := libvamp-hostsdk.a
 INSTALL_HOSTSDK_LA        := libvamp-hostsdk.la
 
 INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)/lib/pkgconfig
 
+# Flags required to tell the compiler to create a dynamically loadable object
+#
+DYNAMIC_LDFLAGS		= -static-libgcc -shared -Wl,-Bsymbolic
+SDK_DYNAMIC_LDFLAGS	= $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI)
+HOSTSDK_DYNAMIC_LDFLAGS	= $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI)
+
+# Additional flags for making a plugin.  This version script tells the
+# GNU linker to make all symbols in the library hidden except for the
+# public entry point.  It's not essential, but makes a tidier library.
+PLUGIN_LDFLAGS		= $(DYNAMIC_LDFLAGS) -Wl,--version-script=build/vamp-plugin.map
+
+
+## For OS/X with g++:
+#DYNAMIC_LDFLAGS		= -dynamiclib
+#PLUGIN_LDFLAGS			= $(DYNAMIC_LDFLAGS)
+#SDK_DYNAMIC_LDFLAGS		= $(DYNAMIC_LDFLAGS)
+#HOSTSDK_DYNAMIC_LDFLAGS	= $(DYNAMIC_LDFLAGS)
+
+
 ### End of user-serviceable parts
 
 
@@ -90,58 +118,69 @@ SDK_HEADERS	= \
 		$(SDKDIR)/Plugin.h \
 		$(SDKDIR)/PluginAdapter.h \
 		$(SDKDIR)/PluginBase.h \
-		$(SDKDIR)/RealTime.h
+		$(SDKDIR)/RealTime.h \
+		$(SDKDIR)/plugguard.h \
+		$(SDKDIR)/vamp-sdk.h
 
 HOSTSDK_HEADERS	= \
-		$(SDKDIR)/Plugin.h \
-		$(SDKDIR)/PluginBase.h \
-		$(SDKDIR)/PluginHostAdapter.h \
-		$(SDKDIR)/RealTime.h
-
-HOSTEXT_HEADERS = \
-		$(HOSTEXTDIR)/PluginBufferingAdapter.h \
-		$(HOSTEXTDIR)/PluginChannelAdapter.h \
-		$(HOSTEXTDIR)/PluginInputDomainAdapter.h \
-		$(HOSTEXTDIR)/PluginLoader.h \
-		$(HOSTEXTDIR)/PluginWrapper.h
+		$(HOSTSDKDIR)/Plugin.h \
+		$(HOSTSDKDIR)/PluginBase.h \
+		$(HOSTSDKDIR)/PluginHostAdapter.h \
+		$(HOSTSDKDIR)/RealTime.h \
+		$(HOSTSDKDIR)/PluginBufferingAdapter.h \
+		$(HOSTSDKDIR)/PluginChannelAdapter.h \
+		$(HOSTSDKDIR)/PluginInputDomainAdapter.h \
+		$(HOSTSDKDIR)/PluginLoader.h \
+		$(HOSTSDKDIR)/PluginSummarisingAdapter.h \
+		$(HOSTSDKDIR)/PluginWrapper.h \
+		$(HOSTSDKDIR)/hostguard.h \
+		$(HOSTSDKDIR)/vamp-hostsdk.h
 
 SDK_OBJECTS	= \
-		$(SDKDIR)/PluginAdapter.o \
-		$(SDKDIR)/RealTime.o
+		$(SDKSRCDIR)/PluginAdapter.o \
+		$(SDKSRCDIR)/RealTime.o
 
 HOSTSDK_OBJECTS	= \
-		$(SDKDIR)/PluginHostAdapter.o \
-		$(HOSTEXTDIR)/PluginBufferingAdapter.o \
-		$(HOSTEXTDIR)/PluginChannelAdapter.o \
-		$(HOSTEXTDIR)/PluginInputDomainAdapter.o \
-		$(HOSTEXTDIR)/PluginLoader.o \
-		$(HOSTEXTDIR)/PluginWrapper.o \
-		$(SDKDIR)/RealTime.o
+		$(HOSTSDKSRCDIR)/PluginHostAdapter.o \
+		$(HOSTSDKSRCDIR)/RealTime.o \
+		$(HOSTSDKSRCDIR)/PluginBufferingAdapter.o \
+		$(HOSTSDKSRCDIR)/PluginChannelAdapter.o \
+		$(HOSTSDKSRCDIR)/PluginInputDomainAdapter.o \
+		$(HOSTSDKSRCDIR)/PluginLoader.o \
+		$(HOSTSDKSRCDIR)/PluginSummarisingAdapter.o \
+		$(HOSTSDKSRCDIR)/PluginWrapper.o
 
 SDK_STATIC	= \
-		$(SDKDIR)/libvamp-sdk.a
+		$(SRCDIR)/libvamp-sdk.a
 
 HOSTSDK_STATIC	= \
-		$(SDKDIR)/libvamp-hostsdk.a
+		$(SRCDIR)/libvamp-hostsdk.a
 
 SDK_DYNAMIC	= \
-		$(SDKDIR)/libvamp-sdk.so
+		$(SRCDIR)/libvamp-sdk$(PLUGIN_EXT)
 
 HOSTSDK_DYNAMIC	= \
-		$(SDKDIR)/libvamp-hostsdk.so
+		$(SRCDIR)/libvamp-hostsdk$(PLUGIN_EXT)
 
 SDK_LA		= \
-		$(SDKDIR)/libvamp-sdk.la
+		$(LADIR)/libvamp-sdk.la
+
+HOSTSDK_LA	= \
+		$(LADIR)/libvamp-hostsdk.la
 
 PLUGIN_HEADERS	= \
 		$(EXAMPLEDIR)/SpectralCentroid.h \
+		$(EXAMPLEDIR)/PowerSpectrum.h \
 		$(EXAMPLEDIR)/PercussionOnsetDetector.h \
+		$(EXAMPLEDIR)/FixedTempoEstimator.h \
 		$(EXAMPLEDIR)/AmplitudeFollower.h \
 		$(EXAMPLEDIR)/ZeroCrossing.h
 
 PLUGIN_OBJECTS	= \
 		$(EXAMPLEDIR)/SpectralCentroid.o \
+		$(EXAMPLEDIR)/PowerSpectrum.o \
 		$(EXAMPLEDIR)/PercussionOnsetDetector.o \
+		$(EXAMPLEDIR)/FixedTempoEstimator.o \
 		$(EXAMPLEDIR)/AmplitudeFollower.o \
 		$(EXAMPLEDIR)/ZeroCrossing.o \
 		$(EXAMPLEDIR)/plugins.o
@@ -149,6 +188,9 @@ PLUGIN_OBJECTS	= \
 PLUGIN_TARGET	= \
 		$(EXAMPLEDIR)/vamp-example-plugins$(PLUGIN_EXT)
 
+PLUGIN_CAT	= \
+		$(EXAMPLEDIR)/vamp-example-plugins.cat
+
 HOST_HEADERS	= \
 		$(HOSTDIR)/system.h
 
@@ -158,27 +200,37 @@ HOST_OBJECTS	= \
 HOST_TARGET	= \
 		$(HOSTDIR)/vamp-simple-host
 
-sdk:		$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC)
+RDFGEN_OBJECTS	= \
+		$(RDFGENDIR)/vamp-rdf-template-generator.o
+
+RDFGEN_TARGET	= \
+		$(RDFGENDIR)/vamp-rdf-template-generator
+
+sdk:		sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
 
 sdkstatic:	$(SDK_STATIC) $(HOSTSDK_STATIC)
+		$(RANLIB) $(SDK_STATIC)
+		$(RANLIB) $(HOSTSDK_STATIC)
 
 plugins:	$(PLUGIN_TARGET)
 
 host:		$(HOST_TARGET)
 
-all:		sdk plugins host test
+rdfgen:		$(RDFGEN_TARGET)
+
+all:		sdk plugins host rdfgen test
 
 $(SDK_STATIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
 		$(AR) r $@ $(SDK_OBJECTS)
 
-$(HOSTSDK_STATIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS) $(HOSTEXT_HEADERS)
+$(HOSTSDK_STATIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS)
 		$(AR) r $@ $(HOSTSDK_OBJECTS)
 
 $(SDK_DYNAMIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
-		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(SDK_OBJECTS)
+		$(CXX) $(LDFLAGS) $(SDK_DYNAMIC_LDFLAGS) -o $@ $(SDK_OBJECTS)
 
-$(HOSTSDK_DYNAMIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS) $(HOSTEXT_HEADERS)
-		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS)
+$(HOSTSDK_DYNAMIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS)
+		$(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS)
 
 $(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(SDK_STATIC) $(PLUGIN_HEADERS)
 		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)
@@ -186,53 +238,173 @@ $(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(SDK_STATIC) $(PLUGIN_HEADERS)
 $(HOST_TARGET):	$(HOST_OBJECTS) $(HOSTSDK_STATIC) $(HOST_HEADERS)
 		$(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $(HOST_OBJECTS) $(HOST_LIBS)
 
+$(RDFGEN_TARGET):	$(RDFGEN_OBJECTS) $(HOSTSDK_STATIC) 
+		$(CXX) $(LDFLAGS) $(RDFGEN_LDFLAGS) -o $@ $(RDFGEN_OBJECTS) $(RDFGEN_LIBS)
+
 test:		plugins host
 		VAMP_PATH=$(EXAMPLEDIR) $(HOST_TARGET) -l
 
 clean:		
-		rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS)
+		rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS) $(RDFGEN_OBJECTS)
 
 distclean:	clean
-		rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) *~ */*~
-
-install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET)
-		mkdir -p $(INSTALL_API_HEADERS)
-		mkdir -p $(INSTALL_SDK_HEADERS)
-		mkdir -p $(INSTALL_HOSTEXT_HEADERS)
-		mkdir -p $(INSTALL_SDK_LIBS)
-		mkdir -p $(INSTALL_PKGCONFIG)
-		cp $(API_HEADERS) $(INSTALL_API_HEADERS)
-		cp $(SDK_HEADERS) $(INSTALL_SDK_HEADERS)
-		cp $(HOSTSDK_HEADERS) $(INSTALL_SDK_HEADERS)
-		cp $(HOSTEXT_HEADERS) $(INSTALL_HOSTEXT_HEADERS)
-		cp $(SDK_STATIC) $(INSTALL_SDK_LIBS)
-		cp $(HOSTSDK_STATIC) $(INSTALL_SDK_LIBS)
-		cp $(SDK_DYNAMIC) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME)
-		cp $(HOSTSDK_DYNAMIC) $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME)
-		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
-		ln -s $(INSTALL_SDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
-		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
-		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
-		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
-		ln -s $(INSTALL_SDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
-		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
-		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(APIDIR)/vamp.pc.in \
-		> $(INSTALL_PKGCONFIG)/vamp.pc
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(SDKDIR)/vamp-sdk.pc.in \
-		> $(INSTALL_PKGCONFIG)/vamp-sdk.pc
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(SDKDIR)/vamp-hostsdk.pc.in \
-		> $(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
+		rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) *~ */*~
+
+install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET)
+		mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
+		mkdir -p $(DESTDIR)$(INSTALL_SDK_HEADERS)
+		mkdir -p $(DESTDIR)$(INSTALL_HOSTSDK_HEADERS)
+		mkdir -p $(DESTDIR)$(INSTALL_SDK_LIBS)
+		mkdir -p $(DESTDIR)$(INSTALL_PKGCONFIG)
+		mkdir -p $(DESTDIR)$(INSTALL_BINARIES)
+		mkdir -p $(DESTDIR)$(INSTALL_PLUGINS)
+		cp $(HOST_TARGET) $(DESTDIR)$(INSTALL_BINARIES)
+		cp $(RDFGEN_TARGET) $(DESTDIR)$(INSTALL_BINARIES)
+		cp $(PLUGIN_TARGET) $(DESTDIR)$(INSTALL_PLUGINS)
+		cp $(PLUGIN_CAT) $(DESTDIR)$(INSTALL_PLUGINS)
+		cp $(API_HEADERS) $(DESTDIR)$(INSTALL_API_HEADERS)
+		cp $(SDK_HEADERS) $(DESTDIR)$(INSTALL_SDK_HEADERS)
+		cp $(HOSTSDK_HEADERS) $(DESTDIR)$(INSTALL_HOSTSDK_HEADERS)
+		cp $(SDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS)
+		cp $(HOSTSDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS)
+		cp $(SDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME)
+		cp $(HOSTSDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME)
+		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
+		ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
+		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
+		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
+		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
+		ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
+		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
+		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
+		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp.pc.in \
+		> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc
+		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-sdk.pc.in \
+		> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-sdk.pc
+		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-hostsdk.pc.in \
+		> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
 		sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \
 		    -e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \
 		    -e "s,%LINK_DEV%,$(INSTALL_SDK_LINK_DEV),g" \
 		    -e "s,%STATIC%,$(INSTALL_SDK_STATIC),g" \
 		    -e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(SDK_LA).in \
-		> $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LA)
+		> $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LA)
 		sed -e "s,%LIBNAME%,$(INSTALL_HOSTSDK_LIBNAME),g" \
 		    -e "s,%LINK_ABI%,$(INSTALL_HOSTSDK_LINK_ABI),g" \
 		    -e "s,%LINK_DEV%,$(INSTALL_HOSTSDK_LINK_DEV),g" \
 		    -e "s,%STATIC%,$(INSTALL_HOSTSDK_STATIC),g" \
-		    -e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(SDK_LA).in \
-		> $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LA)
-
+		    -e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(HOSTSDK_LA).in \
+		> $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LA)
+
+depend:
+		makedepend -Y. */*.cpp */*/*.cpp */*/*/*.cpp
+
+# DO NOT DELETE
+
+examples/AmplitudeFollower.o: examples/AmplitudeFollower.h vamp-sdk/Plugin.h
+examples/AmplitudeFollower.o: vamp-sdk/PluginBase.h vamp-sdk/plugguard.h
+examples/AmplitudeFollower.o: vamp-sdk/RealTime.h
+examples/FixedTempoEstimator.o: examples/FixedTempoEstimator.h
+examples/FixedTempoEstimator.o: vamp-sdk/Plugin.h vamp-sdk/PluginBase.h
+examples/FixedTempoEstimator.o: vamp-sdk/plugguard.h vamp-sdk/RealTime.h
+examples/PercussionOnsetDetector.o: examples/PercussionOnsetDetector.h
+examples/PercussionOnsetDetector.o: vamp-sdk/Plugin.h vamp-sdk/PluginBase.h
+examples/PercussionOnsetDetector.o: vamp-sdk/plugguard.h vamp-sdk/RealTime.h
+examples/SpectralCentroid.o: examples/SpectralCentroid.h vamp-sdk/Plugin.h
+examples/SpectralCentroid.o: vamp-sdk/PluginBase.h vamp-sdk/plugguard.h
+examples/SpectralCentroid.o: vamp-sdk/RealTime.h
+examples/PowerSpectrum.o: examples/PowerSpectrum.h vamp-sdk/Plugin.h
+examples/PowerSpectrum.o: vamp-sdk/PluginBase.h vamp-sdk/plugguard.h
+examples/PowerSpectrum.o: vamp-sdk/RealTime.h
+examples/ZeroCrossing.o: examples/ZeroCrossing.h vamp-sdk/Plugin.h
+examples/ZeroCrossing.o: vamp-sdk/PluginBase.h vamp-sdk/plugguard.h
+examples/ZeroCrossing.o: vamp-sdk/RealTime.h
+examples/plugins.o: vamp/vamp.h vamp-sdk/PluginAdapter.h vamp-sdk/Plugin.h
+examples/plugins.o: vamp-sdk/PluginBase.h vamp-sdk/plugguard.h
+examples/plugins.o: vamp-sdk/RealTime.h examples/ZeroCrossing.h
+examples/plugins.o: vamp-sdk/Plugin.h examples/SpectralCentroid.h
+examples/plugins.o: examples/PercussionOnsetDetector.h examples/PowerSpectrum.h
+examples/plugins.o: examples/FixedTempoEstimator.h
+examples/plugins.o: examples/AmplitudeFollower.h
+host/vamp-simple-host.o: ./vamp-hostsdk/PluginHostAdapter.h vamp/vamp.h
+host/vamp-simple-host.o: vamp-sdk/Plugin.h vamp-sdk/PluginBase.h
+host/vamp-simple-host.o: vamp-sdk/plugguard.h vamp-sdk/RealTime.h
+host/vamp-simple-host.o: ./vamp-hostsdk/PluginInputDomainAdapter.h
+host/vamp-simple-host.o: ./vamp-hostsdk/PluginWrapper.h
+host/vamp-simple-host.o: ./vamp-hostsdk/Plugin.h ./vamp-hostsdk/hostguard.h
+host/vamp-simple-host.o: vamp-sdk/Plugin.h
+host/vamp-simple-host.o: ./vamp-hostsdk/PluginLoader.h host/system.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/PluginHostAdapter.h
+rdf/generator/vamp-rdf-template-generator.o: vamp/vamp.h vamp-sdk/Plugin.h
+rdf/generator/vamp-rdf-template-generator.o: vamp-sdk/PluginBase.h
+rdf/generator/vamp-rdf-template-generator.o: vamp-sdk/plugguard.h vamp-sdk/RealTime.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/PluginChannelAdapter.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/PluginWrapper.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/Plugin.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/hostguard.h
+rdf/generator/vamp-rdf-template-generator.o: vamp-sdk/Plugin.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/PluginInputDomainAdapter.h
+rdf/generator/vamp-rdf-template-generator.o: ./vamp-hostsdk/PluginLoader.h
+src/vamp-hostsdk/PluginHostAdapter.o: ./vamp-hostsdk/PluginHostAdapter.h
+src/vamp-hostsdk/PluginHostAdapter.o: vamp/vamp.h vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginHostAdapter.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginHostAdapter.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginHostAdapter.o: vamp-sdk/RealTime.h
+src/vamp-hostsdk/RealTime.o: src/vamp-sdk/RealTime.cpp ./vamp-sdk/RealTime.h
+src/vamp-hostsdk/RealTime.o: vamp-sdk/plugguard.h
+src/vamp-sdk/PluginAdapter.o: vamp-sdk/PluginAdapter.h vamp/vamp.h
+src/vamp-sdk/PluginAdapter.o: vamp-sdk/Plugin.h vamp-sdk/PluginBase.h
+src/vamp-sdk/PluginAdapter.o: vamp-sdk/plugguard.h vamp-sdk/RealTime.h
+src/vamp-sdk/RealTime.o: ./vamp-sdk/RealTime.h vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: ./vamp-hostsdk/PluginBufferingAdapter.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: ./vamp-hostsdk/PluginWrapper.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: ./vamp-hostsdk/Plugin.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: ./vamp-hostsdk/hostguard.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginBufferingAdapter.o: vamp-sdk/RealTime.h
+src/vamp-hostsdk/PluginChannelAdapter.o: ./vamp-hostsdk/PluginChannelAdapter.h
+src/vamp-hostsdk/PluginChannelAdapter.o: ./vamp-hostsdk/PluginWrapper.h
+src/vamp-hostsdk/PluginChannelAdapter.o: ./vamp-hostsdk/Plugin.h
+src/vamp-hostsdk/PluginChannelAdapter.o: ./vamp-hostsdk/hostguard.h
+src/vamp-hostsdk/PluginChannelAdapter.o: vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginChannelAdapter.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginChannelAdapter.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginChannelAdapter.o: vamp-sdk/RealTime.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: ./vamp-hostsdk/PluginInputDomainAdapter.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: ./vamp-hostsdk/PluginWrapper.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: ./vamp-hostsdk/Plugin.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: ./vamp-hostsdk/hostguard.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginInputDomainAdapter.o: vamp-sdk/RealTime.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/PluginHostAdapter.h
+src/vamp-hostsdk/PluginLoader.o: vamp/vamp.h vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginLoader.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginLoader.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginLoader.o: vamp-sdk/RealTime.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/PluginLoader.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/PluginWrapper.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/Plugin.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/hostguard.h
+src/vamp-hostsdk/PluginLoader.o: vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/PluginInputDomainAdapter.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/PluginChannelAdapter.h
+src/vamp-hostsdk/PluginLoader.o: ./vamp-hostsdk/PluginBufferingAdapter.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: ./vamp-hostsdk/PluginSummarisingAdapter.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: ./vamp-hostsdk/PluginWrapper.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: ./vamp-hostsdk/Plugin.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: ./vamp-hostsdk/hostguard.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginSummarisingAdapter.o: vamp-sdk/RealTime.h
+src/vamp-hostsdk/PluginWrapper.o: ./vamp-hostsdk/PluginWrapper.h
+src/vamp-hostsdk/PluginWrapper.o: ./vamp-hostsdk/Plugin.h
+src/vamp-hostsdk/PluginWrapper.o: ./vamp-hostsdk/hostguard.h
+src/vamp-hostsdk/PluginWrapper.o: vamp-sdk/Plugin.h
+src/vamp-hostsdk/PluginWrapper.o: vamp-sdk/PluginBase.h
+src/vamp-hostsdk/PluginWrapper.o: vamp-sdk/plugguard.h
+src/vamp-hostsdk/PluginWrapper.o: vamp-sdk/RealTime.h
diff --git a/lib-src/libvamp/README b/lib-src/libvamp/README
index d96e5d8..d70f344 100644
--- a/lib-src/libvamp/README
+++ b/lib-src/libvamp/README
@@ -9,53 +9,38 @@ An API for audio analysis and feature extraction plugins.
 Vamp is an API for C and C++ plugins that process sampled audio data
 to produce descriptive output (measurements or semantic observations).
 
-The principal differences between Vamp and a real-time audio
-processing plugin system such as VST are:
-
- * Vamp plugins may output complex multidimensional data with labels.
-   As a consequence, they are likely to work best when the output
-   data has a much lower sampling rate than the input.  (This also
-   means it is usually desirable to implement them in C++ using the
-   high-level base class provided rather than use the raw C API.)
-
- * While Vamp plugins receive data block-by-block, they are not
-   required to return output immediately on receiving the input.
-   A Vamp plugin may be non-causal, preferring to store up data
-   based on its input until the end of a processing run and then
-   return all results at once.
-
- * Vamp plugins have more control over their inputs than a typical
-   real-time processing plugin.  For example, they can indicate to
-   the host their preferred processing block and step sizes, and these
-   may differ.
-
- * Vamp plugins may ask to receive data in the frequency domain
-   instead of the time domain.  The host takes the responsibility
-   for converting the input data using an FFT of windowed frames.
-   This simplifies plugins that do straightforward frequency-domain
-   processing and permits the host to cache frequency-domain data
-   when possible.
-
- * A Vamp plugin is configured once before each processing run, and
-   receives no further parameter changes during use -- unlike real-
-   time plugin APIs in which the input parameters may change at any
-   time.  This also means that fundamental properties such as the
-   number of values per output or the preferred processing block
-   size may depend on the input parameters.
-
- * Vamp plugins do not have to be able to run in real time.
-
-
-About this SDK
-==============
-
-This is version 1.3 of the Vamp plugin Software Development Kit.
+This is version 2.0 of the Vamp plugin Software Development Kit.
+
 Plugins and hosts built with this SDK are binary compatible with those
-built using version 1.0 of the SDK.
+built using version 1.0 of the SDK, with certain restrictions.  See
+the file README.compat for more details.
+
+See the file CHANGELOG for a list of the changes in this release.
+
+A documentation guide to writing plugins using the Vamp SDK can be
+found at http://www.vamp-plugins.org/guide.pdf .
+
+
+Compiling and Installing the SDK and Examples
+=============================================
+
+This SDK is intended for use on Windows, OS/X, Linux, and other POSIX
+and GNU platforms.
+
+Please see the platform-specific README file (README.msvc, README.osx,
+README.linux) in the build/ directory for details about how to compile
+and install the SDK, how to build plugin libraries using it, and how
+to install the example plugins so you can use them in a host.
+
+
+What's In This SDK
+==================
 
 This SDK contains the following:
 
- * vamp/vamp.h
+
+vamp/vamp.h
+-----------
 
 The formal C language plugin API for Vamp plugins.
 
@@ -64,78 +49,122 @@ platform) exposing one C-linkage entry point (vampGetPluginDescriptor)
 which returns data defined in the rest of this C header.
 
 Although the C API is the official API for Vamp, we don't recommend
-that you program directly to it.  The C++ abstraction found in the
-vamp-sdk directory (below) is preferable for most purposes and is
-more thoroughly documented.
+that you program directly to it.  The C++ abstractions found in the
+vamp-sdk and vamp-hostsdk directories (below) are preferable for most
+purposes and are more thoroughly documented.
+
 
- * vamp-sdk
+vamp-sdk
+--------
 
-C++ classes for straightforwardly implementing Vamp plugins and hosts.
+C++ classes for implementing Vamp plugins.
 
 Plugins should subclass Vamp::Plugin and then use Vamp::PluginAdapter
 to expose the correct C API for the plugin.  Plugin authors should
-read vamp-sdk/PluginBase.h and Plugin.h for code documentation, and
-refer to the example plugin code in the examples directory.  Plugins
-should link with -lvamp-sdk.
-
-Hosts may use the Vamp::PluginHostAdapter to convert the loaded
-plugin's C API back into a Vamp::Plugin object.  Host authors should
-refer to the example host code in the host directory.  Hosts should
-link with -lvamp-hostsdk.
-
- * vamp-sdk/hostext
-
-Additional C++ classes to make a host's life easier (introduced in
-versions 1.1 and 1.2 of the Vamp SDK).
-
-Vamp::HostExt::PluginLoader provides a very easy interface for a host
-to discover, load, and find out category information about the
-available plugins.  Most "casual" Vamp hosts will probably want to use
-this class.
-
-Vamp::HostExt::PluginInputDomainAdapter provides a means for hosts to
-handle plugins that expect frequency-domain input, without having to
-convert the input themselves.
-
-Vamp::HostExt::PluginChannelAdapter provides a means for hosts to use
-plugins that do not necessarily support the same number of audio
-channels as they have available, without having to worry about
-applying a channel management / mixdown policy themselves.
-
-Vamp::HostExt::PluginBufferingAdapter provides a means for hosts to
-avoid having to negotiate the input step and block size, instead
-permitting the host to use any block size they desire (and a step size
-equal to it).  This is particularly useful for "streaming" hosts that
-cannot seek backwards in the input audio stream and so would otherwise
-need to implement an additional buffer to support step sizes smaller
-than the block size.
-
-The PluginLoader class can also use the input domain and channel
-adapters automatically to make the entire conversion process
-transparent to the host if required.
-
- * examples
-
-Example plugins implemented using the C++ classes.  ZeroCrossing
-calculates the positions and density of zero-crossing points in an
-audio waveform.  SpectralCentroid calculates the centre of gravity of
-the frequency domain representation of each block of audio.
-AmplitudeFollower tracks the amplitude of a signal based on a method
-from the SuperCollider real-time audio system.
-PercussionOnsetDetector estimates the locations of percussive onsets
-using a simple method described in "Drum Source Separation using
-Percussive Feature Detection and Spectral Modulation" by Dan Barry,
-Derry Fitzgerald, Eugene Coyle and Bob Lawlor, ISSC 2005.
-
- * host
+read vamp-sdk/PluginBase.h and Plugin.h for code documentation.
+
+See "examples" below for details of the example plugins in the SDK,
+from which you are welcome to take code and inspiration.
+
+Plugins should link with -lvamp-sdk.
+
+
+vamp-hostsdk
+------------
+
+C++ classes for implementing Vamp hosts.
+
+Hosts will normally use a Vamp::PluginHostAdapter to convert each
+plugin's exposed C API back into a useful Vamp::Plugin C++ object.
+
+The Vamp::HostExt namespace contains several additional C++ classes to
+do this work for them, and make the host's life easier:
+
+ - Vamp::HostExt::PluginLoader provides a very easy interface for a
+ host to discover, load, and find out category information about the
+ available plugins.  Most Vamp hosts will probably want to use this
+ class.
+
+ - Vamp::HostExt::PluginInputDomainAdapter provides a simple means for
+ hosts to handle plugins that want frequency-domain input, without
+ having to convert the input themselves.
+
+ - Vamp::HostExt::PluginChannelAdapter provides a simple means for
+ hosts to use plugins that do not necessarily support the same number
+ of audio channels as they have available, without having to apply a
+ channel management / mixdown policy themselves.
+
+ - Vamp::HostExt::PluginBufferingAdapter provides a means for hosts to
+ avoid having to negotiate the input step and block size, instead
+ permitting the host to use any block size they desire (and a step
+ size equal to it).  This is particularly useful for "streaming" hosts
+ that cannot seek backwards in the input audio stream and so would
+ otherwise need to implement an additional buffer to support step
+ sizes smaller than the block size.
+
+ - Vamp::HostExt::PluginSummarisingAdapter provides summarisation
+ methods such as mean and median averages of output features, for use
+ in any context where an available plugin produces individual values
+ but the result that is actually needed is some sort of aggregate.
+
+The PluginLoader class can also use the input domain, channel, and
+buffering adapters automatically to make these conversions transparent
+to the host if required.
+
+Host authors should also refer to the example host code in the host
+directory of the SDK.
+
+Hosts should link with -lvamp-hostsdk.
+
+
+examples
+--------
+
+Example plugins implemented using the C++ classes.
+
+These plugins are intended to be useful examples you can draw code
+from in order to provide the basic shape and structure of a Vamp
+plugin.  They are also intended to be correct and useful, if simple.
+
+ - ZeroCrossing calculates the positions and density of zero-crossing
+ points in an audio waveform.
+
+ - SpectralCentroid calculates the centre of gravity of the frequency
+ domain representation of each block of audio.
+
+ - PowerSpectrum calculates a power spectrum from the input audio.
+ Actually, it doesn't do any work except calculating power from a
+ cartesian complex FFT output.  The work of calculating this frequency
+ domain output is done for it by the host or host SDK; the plugin just
+ needs to declare that it wants frequency domain input.  This is the
+ simplest of the example plugins.
+
+ - AmplitudeFollower is a simple implementation of SuperCollider's
+ amplitude-follower algorithm.
+
+ - PercussionOnsetDetector estimates the locations of percussive
+ onsets using a simple method described in "Drum Source Separation
+ using Percussive Feature Detection and Spectral Modulation" by Dan
+ Barry, Derry Fitzgerald, Eugene Coyle and Bob Lawlor, ISSC 2005.
+
+ - FixedTempoEstimator calculates a single beats-per-minute value
+ which is an estimate of the tempo of a piece of music that is assumed
+ to be of fixed tempo, using autocorrelation of a frequency domain
+ energy rise metric.  It has several outputs that return intermediate
+ results used in the calculation, and may be a useful example of a
+ plugin having several outputs with varying feature structures.
+
+
+host
+----
 
 A simple command-line Vamp host, capable of loading a plugin and using
 it to process a complete audio file, with its default parameters.
-Requires libsndfile (http://www.mega-nerd.com/libsndfile/).
 
-If you don't have libsndfile, you may want to edit the Makefile to
-change the default build target from "all" to "sdk", so as to compile
-only the SDK and not the host.
+This host also contains a number of options for listing the installed
+plugins and their properties in various formats.  For that reason, it
+isn't really as simple as one might hope.  The core of the code is
+still reasonably straightforward, however.
 
 
 Plugin Lookup and Categorisation
@@ -176,74 +205,6 @@ Vamp plugin's API itself.  The Vamp::HostExt::PluginLoader class also
 provides support for plugin category lookup using this scheme.
 
 
-Compiling the SDK and Examples
-==============================
-
-This SDK is intended for use on Windows, OS/X, Linux, and other POSIX
-platforms.
-
- * Windows
-
-A project file for Visual Studio is included (VampPluginSDK.vcproj).
-This builds the SDK library, but does not build the example plugins or
-command-line host.
-
-Alternatively, when using Visual Studio or another IDE to build a
-plugin or host using the SDK, you can simply add the .cpp files in the
-vamp-sdk and vamp-sdk/hostext directories to your existing project.
-
-If you are using a Cygwin or MinGW GNU toolchain, use the included
-Makefile (see Linux and other POSIX platforms below).
-
- * OS/X
-
-Run "make -f Makefile.osx" to build the SDK, example plugins, and
-command-line host.
-
-Note that the host requires that you have libsndfile
-(http://www.mega-nerd.com/libsndfile/) installed.  To build only the
-SDK and examples, "make -f Makefile.osx sdk examples".
-
-If you are using an IDE, you may prefer to simply add the .cpp files
-in the vamp-sdk and vamp-sdk/hostext directories to your existing
-project.
-
- * Linux and other POSIX platforms
-
-To build the SDK, example plugins, and command-line host, edit the
-Makefile to suit your platform according to the comments in it, then
-run "make".
-
-Note that the host requires that you have libsndfile
-(http://www.mega-nerd.com/libsndfile/) installed.  To build only the
-SDK and examples, edit the Makefile then run "make sdk examples".
-
-
-Installing the Example Plugins
-==============================
-
-Installing the example plugins so that they can be found by other Vamp
-hosts depends on your platform:
-
- * Windows: copy the files
-      examples/vamp-example-plugins.dll
-      examples/vamp-example-plugins.cat
-   to
-      C:\Program Files\Vamp Plugins
-
- * Linux: copy the files
-      examples/vamp-example-plugins.so
-      examples/vamp-example-plugins.cat
-   to
-      /usr/local/lib/vamp/
-
- * OS/X: copy the files
-      examples/vamp-example-plugins.dylib
-      examples/vamp-example-plugins.cat
-   to
-      /Library/Audio/Plug-Ins/Vamp
-
-
 Licensing
 =========
 
diff --git a/lib-src/libvamp/README.compat b/lib-src/libvamp/README.compat
new file mode 100644
index 0000000..f5cac15
--- /dev/null
+++ b/lib-src/libvamp/README.compat
@@ -0,0 +1,102 @@
+
+Backward Compatibility Statement for Vamp Plugin SDK version 2.0
+================================================================
+
+Plugin binary compatibility
+---------------------------
+Version 2.0 of the Vamp plugin binary interface is backward compatible
+with version 1.0.
+
+A plugin that was compiled and (statically) linked using version 1.x
+of the SDK should load and run without modification in a host that was
+compiled and linked using version 2.0 of the SDK.
+
+A plugin that was compiled and (statically) linked using version 2.0
+of the SDK should load and run in a host that was compiled and linked
+using version 1.x of the SDK.  However, the 1.x host will be unable to
+see any durations that the plugin specifies for its returned features,
+as there was no support for duration in version 1 of the Vamp plugin
+interface.
+
+Plugin/host version discrimination
+----------------------------------
+A Vamp plugin library receives the Vamp SDK version number for the
+host as the first argument to its vampGetPluginDescriptor function.
+It may use this information to provide different behaviour depending
+on the version of the host.
+
+For example, the plugin may structure its outputs differently in older
+hosts that do not support feature duration.  Or, if the plugins rely
+on version 2.0 features, the library could make itself invisible to
+older hosts (returning no plugin descriptors).
+
+The version argument passed to vampGetPluginDescriptor will be 1 for
+Vamp 1.x hosts or 2 for Vamp 2.0 hosts.  (Plugin libraries should
+behave as for version 2 if passed a version number greater than 2.)
+
+Plugin SDK library compatibility
+--------------------------------
+For plugin code, version 2.0 of the Vamp plugin SDK is source
+compatible but not library ABI compatible with version 1.x.
+
+Plugins written for version 1.x should compile and link without
+modification using version 2.0.  Plugins dynamically linked against
+version 1.x SDK libraries will need to be rebuilt if they are to work
+with version 2.0 libraries.  To avoid dynamic library resolution
+issues, it is generally preferable to link the SDK statically when
+distributing binary plugins.
+
+Host SDK library compatibility
+------------------------------
+For host code, version 2.0 of the Vamp plugin SDK is neither source
+nor binary compatible with version 1.x.
+
+The host SDK header include location has moved for version 2.0; hosts
+should now only include headers from the vamp-hostsdk/ include
+directory -- the vamp-sdk/ directory is reserved for inclusion in
+plugin code only.  There is also no longer a separate subdirectory for
+hostext headers.
+
+Hosts written for version 1.x will therefore need to have their
+#include directives updated as follows:
+
+  Old                                            New
+
+  <vamp-sdk/PluginBase.h>                        <vamp-hostsdk/PluginBase.h>
+  <vamp-sdk/Plugin.h>                            <vamp-hostsdk/Plugin.h>
+  <vamp-sdk/RealTime.h>                          <vamp-hostsdk/RealTime.h>
+  <vamp-sdk/hostext/PluginLoader.h>              <vamp-hostsdk/PluginLoader.h>
+  <vamp-sdk/hostext/PluginBufferingAdapter.h>    <vamp-hostsdk/PluginBufferingAdapter.h>
+  <vamp-sdk/hostext/PluginChannelAdapter.h>      <vamp-hostsdk/PluginChannelAdapter.h>
+  <vamp-sdk/hostext/PluginInputDomainAdapter.h>  <vamp-hostsdk/PluginInputDomainAdapter.h>
+  <vamp-sdk/PluginHostAdapter.h>                 <vamp-hostsdk/PluginHostAdapter.h>
+
+For most hosts, these should be the only changes necessary; the actual
+code remains the same.
+
+Hosts that incorporate plugin code
+----------------------------------
+One of the changes in this version of the SDK is that separate
+top-level C++ namespaces are used for classes compiled into plugins
+(the _VampPlugin namespace) and hosts (the _VampHost namespace), to
+avoid any confusion between host and plugin namespaces in unusual
+linkage situations (as the host and plugin SDKs contain many of the
+same classes, there is a risk that the wrong class may be picked up by
+a stupid dynamic linker in cases where the host and plugin SDK
+versions do not match).  This additional namespace is added and opened
+silently in a manner that is transparent in most circumstances, and
+neither plugin nor host authors will normally need to know about it.
+
+However, hosts that directly incorporate code from plugins, for
+example to provide functionality that is the same as those plugins
+without having to explicitly load them, will find that they cannot
+resolve plugin symbols at link time because of this namespace
+mismatch.  To avoid this, you may define the preprocessor symbol
+_VAMP_PLUGIN_IN_HOST_NAMESPACE when compiling the plugin code in the
+context of the host, to ensure that both host and plugin code exist
+within the same namespace.
+
+(If your host does this, why not make it load the plugins dynamically
+instead using the normal Vamp plugin loader method?  There are many
+advantages to that.)
+
diff --git a/lib-src/libvamp/build/Doxyfile b/lib-src/libvamp/build/Doxyfile
new file mode 100644
index 0000000..68f885e
--- /dev/null
+++ b/lib-src/libvamp/build/Doxyfile
@@ -0,0 +1,1368 @@
+# Doxyfile 1.5.5
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = VampPluginSDK
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 2.0
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, 
+# and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = docs/doxygen/warning.log
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = vamp \
+                         vamp-sdk \
+                         vamp-hostsdk \
+                         src \
+                         examples \
+                         host
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.h \
+                         *.C \
+                         *.cpp \
+                         *.cc \
+                         doc-overview
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = qrc_*.cpp \
+                         moc_*.cpp \
+                         *.moc.cpp \
+                         *_skel.cpp
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 3
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = NO
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = _VAMP_NO_PLUGIN_NAMESPACE
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = NO
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is enabled by default, which results in a transparent 
+# background. Warning: Depending on the platform used, enabling this option 
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they 
+# become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/lib-src/libvamp/build/README.linux b/lib-src/libvamp/build/README.linux
new file mode 100644
index 0000000..9643066
--- /dev/null
+++ b/lib-src/libvamp/build/README.linux
@@ -0,0 +1,64 @@
+
+The Vamp Plugin SDK -- Platform Notes for Linux and other GNU platforms
+=======================================================================
+
+Building at the command line
+----------------------------
+
+To build the SDK, example plugins, and command-line host:
+
+$ ./configure
+$ make
+
+To install after a successful make, run "make install" as root (or via
+sudo).
+
+
+Installing the Example Plugins
+------------------------------
+
+To install the example plugins so you can load them in Vamp hosts,
+copy the files
+
+   examples/vamp-example-plugins.so
+and
+   examples/vamp-example-plugins.cat
+
+to
+   /usr/local/lib/vamp/
+or 
+   $HOME/vamp/
+
+
+Plugin Linkage
+--------------
+
+Vamp plugins are distributed as dynamic libraries (.so files).  A
+properly packaged Vamp plugin library should export exactly one public
+symbol, namely the Vamp API entry point vampGetPluginDescriptor.
+
+The default for the GNU linker is to export all of the symbols in the
+library.  This will work (the host will be able to load the plugin),
+but it unnecessarily pollutes the host's symbol namespace, it may
+cause symbol collisions in some esoteric circumstances, and it
+increases the amount of time the plugin takes to load.
+
+To improve this behaviour, you can instruct the linker to export only
+the one required symbol using a linker script.  To do this, place the
+text
+
+{
+	global: vampGetPluginDescriptor;
+	local: *;
+};
+
+into a text file, and then use the --version-script option to the
+linker to tell it to refer to this file.  All other symbols will then
+be properly hidden.
+
+The Makefile included in this SDK uses this method to manage symbol
+visibility for the included example plugins, using the file
+build/vamp-plugin.map.  There are other methods that will work too,
+but this one is simple and has the advantage of requiring no changes
+to the code.
+
diff --git a/lib-src/libvamp/build/README.msvc b/lib-src/libvamp/build/README.msvc
new file mode 100644
index 0000000..5887019
--- /dev/null
+++ b/lib-src/libvamp/build/README.msvc
@@ -0,0 +1,80 @@
+
+The Vamp Plugin SDK -- Platform Notes for Visual C++ on Windows
+===============================================================
+
+Visual C++ Project Files
+------------------------
+
+Three Visual C++ project files are included with the SDK:
+
+ - build/VampPluginSDK.vcproj
+
+   This builds the plugin SDK into a single static library, but does
+   not build the example plugins, the host SDK, or the host.  (We
+   recommend using static linkage for the SDK rather than distributing
+   it as a DLL, particularly when building plugins.)
+
+ - build/VampHostSDK.vcproj
+
+   This builds the host SDK into a single static library, but does not
+   build the plugin SDK, example plugins, or host.
+
+ - build/VampExamplePlugins.vcproj
+
+   This builds the example plugins DLL, but does not build the plugin
+   or host SDKs or the host.  You don't need to build the plugin SDK
+   before this, because this project simply includes the plugin SDK
+   files rather than using the library.
+
+Of course, when using Visual Studio or another IDE to build a plugin
+or host using the SDK, you may simply add the .h and .cpp files in the
+vamp-sdk or vamp-hostsdk directories to your existing project.  This
+is the approach taken in the VampExamplePlugins project.
+
+As the command-line host has additional library dependencies (namely
+libsndfile), no pre-packaged project is included to build it.
+
+
+Installing the Example Plugins
+------------------------------
+
+To install the example plugins so you can load them in Vamp hosts,
+copy the files
+
+   build\release\vamp-example-plugins.dll
+and
+   examples\vamp-example-plugins.cat
+
+to
+
+   C:\Program Files\Vamp Plugins
+
+
+Plugin Linkage
+--------------
+
+Vamp plugins are distributed as dynamic libraries (DLLs).  A properly
+packaged Vamp plugin DLL should export exactly one public symbol,
+namely the Vamp API entry point vampGetPluginDescriptor.
+
+One nice tidy way to achieve this with Visual Studio is to add the
+linker option /EXPORT:vampGetPluginDescriptor to your project.  (All
+of the other symbols will be properly hidden, because that is the
+default for the Visual Studio linker.)  The included example plugins
+project in build/VampExamplePlugins.vcproj does this.
+
+Alternatively, you may modify vamp/vamp.h to add the
+__declspec(dllexport) attribute to the vampGetPluginDescriptor
+declaration.  This is not present by default, because it isn't
+portable and, as we only want one symbol exported, the above linker
+option works equally well without code changes.
+
+(If you don't take at least one of these actions, your plugin library
+simply will not load in any host.)
+
+
+Using MinGW/Cygwin
+------------------
+
+Refer to README.linux for build instructions using the GNU toolchain.
+
diff --git a/lib-src/libvamp/build/README.osx b/lib-src/libvamp/build/README.osx
new file mode 100644
index 0000000..5a5ff68
--- /dev/null
+++ b/lib-src/libvamp/build/README.osx
@@ -0,0 +1,70 @@
+
+The Vamp Plugin SDK -- Platform Notes for OS/X
+==============================================
+
+Building at the command line
+----------------------------
+
+To build the SDK, example plugins, and command-line host:
+
+ $ make -f Makefile.osx
+
+You must have libsndfile (http://www.mega-nerd.com/libsndfile/)
+installed in order to build the command-line host successfully.  To
+build only the SDK and examples:
+
+ $ make -f Makefile.osx sdk examples
+
+See the comments at the top of Makefile.osx for more information about
+the libraries and other targets that are built in this way.
+
+If you are using an IDE, you may prefer to simply add the vamp-sdk and
+src/vamp-sdk (for plugins) or vamp-hostsdk and src/vamp-hostsdk (for
+hosts) directories to your existing project.
+
+
+Installing the Example Plugins
+------------------------------
+
+To install the example plugins so you can load them in Vamp hosts,
+copy the files
+
+   examples/vamp-example-plugins.dylib
+and
+   examples/vamp-example-plugins.cat
+
+to
+   /Library/Audio/Plug-Ins/Vamp/
+or 
+   $HOME/Library/Audio/Plug-Ins/Vamp/
+
+
+Plugin Linkage
+--------------
+
+Vamp plugins are distributed as dynamic libraries (.dylib).  A
+well-packaged Vamp plugin library should export exactly one public
+symbol, namely the Vamp API entry point vampGetPluginDescriptor.
+
+The default for the OS/X linker is to export all of the symbols in the
+library.  This will work (the host will be able to load the plugin),
+but it unnecessarily pollutes the host's symbol namespace, it may
+cause symbol collisions in some esoteric circumstances, and it
+increases the amount of time the plugin takes to load.
+
+To improve this behaviour, you can instruct the linker to export only
+the one required symbol using a symbols list file.  To do this, place
+the single line
+
+_vampGetPluginDescriptor
+
+(with leading underscore) into a text file, and then use the
+-exported_symbols_list option to the linker to tell it to refer to
+this file.  All other symbols will then be properly hidden.
+
+The Makefile.osx included in this SDK uses this method to manage
+symbol visibility for the included example plugins, using the file
+build/vamp-plugin.list.  There are other methods that will work too,
+but this one is simple and has the advantage of requiring no changes
+to the code.
+
diff --git a/lib-src/libvamp/build/VampExamplePlugins.vcproj b/lib-src/libvamp/build/VampExamplePlugins.vcproj
new file mode 100644
index 0000000..5201d55
--- /dev/null
+++ b/lib-src/libvamp/build/VampExamplePlugins.vcproj
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="VampExamplePlugins"
+	ProjectGUID="{B3D1F5A4-4571-4D20-B184-8ACD03D6C97A}"
+	RootNamespace="VampExamplePlugins"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VAMPEXAMPLEPLUGINS_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/EXPORT:vampGetPluginDescriptor"
+				OutputFile="$(OutDir)\vamp-example-plugins.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VAMPEXAMPLEPLUGINS_EXPORTS;"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/EXPORT:vampGetPluginDescriptor"
+				OutputFile="$(OutDir)\vamp-example-plugins.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\examples\AmplitudeFollower.h"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\FixedTempoEstimator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\PercussionOnsetDetector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\plugguard.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\Plugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\PluginAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\PluginBase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\RealTime.h"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\SpectralCentroid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\PowerSpectrum.h"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\ZeroCrossing.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\AmplitudeFollower.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\FixedTempoEstimator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\PercussionOnsetDetector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-sdk\PluginAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\plugins.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-sdk\RealTime.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\SpectralCentroid.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\PowerSpectrum.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\ZeroCrossing.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/libvamp/build/VampHostSDK.vcproj b/lib-src/libvamp/build/VampHostSDK.vcproj
new file mode 100644
index 0000000..b57959d
--- /dev/null
+++ b/lib-src/libvamp/build/VampHostSDK.vcproj
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="VampHostSDK"
+	ProjectGUID="{3875EF8B-14E8-4825-B2C1-A8B869C336F5}"
+	RootNamespace="VampHostSDK"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\vamp-hostsdk\hostguard.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\Plugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginBase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginBufferingAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginChannelAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginHostAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginInputDomainAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginLoader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginSummarisingAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\PluginWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\RealTime.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-hostsdk\vamp-hostsdk.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginBufferingAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginChannelAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginHostAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginInputDomainAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginLoader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginSummarisingAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\PluginWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-hostsdk\RealTime.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/libvamp/build/VampPluginSDK.vcproj b/lib-src/libvamp/build/VampPluginSDK.vcproj
new file mode 100644
index 0000000..823dcc1
--- /dev/null
+++ b/lib-src/libvamp/build/VampPluginSDK.vcproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="VampPluginSDK"
+	ProjectGUID="{65EFA7D7-C3CE-4D29-BE96-E27F2B5979A5}"
+	RootNamespace="VampPluginSDK"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\vamp-sdk\plugguard.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\Plugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\PluginAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\PluginBase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\RealTime.h"
+				>
+			</File>
+			<File
+				RelativePath="..\vamp-sdk\vamp-sdk.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\vamp-sdk\PluginAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\vamp-sdk\RealTime.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/libvamp/build/libvamp-hostsdk.la.in b/lib-src/libvamp/build/libvamp-hostsdk.la.in
new file mode 100644
index 0000000..9b3b6b8
--- /dev/null
+++ b/lib-src/libvamp/build/libvamp-hostsdk.la.in
@@ -0,0 +1,9 @@
+dlname='%LINK_ABI%'
+library_names='%LIBNAME% %LINK_ABI% %LINK_DEV%'
+old_library='%STATIC%'
+dependency_libs=''
+current=3
+age=0
+revision=0
+installed=yes
+libdir='%LIBS%'
diff --git a/lib-src/libvamp/build/libvamp-sdk.la.in b/lib-src/libvamp/build/libvamp-sdk.la.in
new file mode 100644
index 0000000..83362dc
--- /dev/null
+++ b/lib-src/libvamp/build/libvamp-sdk.la.in
@@ -0,0 +1,9 @@
+dlname='%LINK_ABI%'
+library_names='%LIBNAME% %LINK_ABI% %LINK_DEV%'
+old_library='%STATIC%'
+dependency_libs=''
+current=2
+age=0
+revision=0
+installed=yes
+libdir='%LIBS%'
diff --git a/lib-src/libvamp/build/vamp-plugin.list b/lib-src/libvamp/build/vamp-plugin.list
new file mode 100644
index 0000000..47a3e77
--- /dev/null
+++ b/lib-src/libvamp/build/vamp-plugin.list
@@ -0,0 +1 @@
+_vampGetPluginDescriptor
diff --git a/lib-src/libvamp/vamp-plugin.map b/lib-src/libvamp/build/vamp-plugin.map
similarity index 100%
rename from lib-src/libvamp/vamp-plugin.map
rename to lib-src/libvamp/build/vamp-plugin.map
diff --git a/lib-src/libvamp/configure b/lib-src/libvamp/configure
new file mode 100755
index 0000000..ca56016
--- /dev/null
+++ b/lib-src/libvamp/configure
@@ -0,0 +1,5612 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.63 for vamp-plugin-sdk 2.0.
+#
+# Report bugs to <cannam at all-day-breakfast.com>.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Identity of this package.
+PACKAGE_NAME='vamp-plugin-sdk'
+PACKAGE_TARNAME='vamp-plugin-sdk'
+PACKAGE_VERSION='2.0'
+PACKAGE_STRING='vamp-plugin-sdk 2.0'
+PACKAGE_BUGREPORT='cannam at all-day-breakfast.com'
+
+ac_unique_file="vamp/vamp.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+TARGETS
+SNDFILE_LIBS
+SNDFILE_CFLAGS
+PKG_CONFIG
+EGREP
+GREP
+CPP
+ac_ct_CC
+CFLAGS
+CC
+OBJEXT
+EXEEXT
+ac_ct_CXX
+CPPFLAGS
+LDFLAGS
+CXXFLAGS
+CXX
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_static
+enable_shared
+enable_static_sdk
+enable_programs
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CXX
+CXXFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CCC
+CC
+CFLAGS
+CPP
+PKG_CONFIG
+SNDFILE_CFLAGS
+SNDFILE_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures vamp-plugin-sdk 2.0 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/vamp-plugin-sdk]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of vamp-plugin-sdk 2.0:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-static         enable building of static linked vamp SDK
+                          [default=no]
+  --enable-shared         enable building of dynamic linked vamp SDK
+                          [default=yes]
+  --enable-static-sdk     enable building of static linked vamp SDK
+                          [default=no]
+  --enable-programs       enable building of example host and RDF generator
+                          [default=yes]
+
+Some influential environment variables:
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  SNDFILE_CFLAGS
+              C compiler flags for SNDFILE, overriding pkg-config
+  SNDFILE_LIBS
+              linker flags for SNDFILE, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <cannam at all-day-breakfast.com>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+vamp-plugin-sdk configure 2.0
+generated by GNU Autoconf 2.63
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by vamp-plugin-sdk $as_me 2.0, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  $as_echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C++ compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+    fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
+
+cat >>confdefs.h <<\_ACEOF
+#define AC_APPLE_UNIVERSAL_BUILD 1
+_ACEOF
+
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+ esac
+
+
+if pkg-config --modversion vamp-sdk >/dev/null 2>&1; then
+  echo "WARNING: A version of the Vamp plugin SDK is already installed."
+  echo "         Expect worries and sorrows if you install a new version"
+  echo "         without removing the old one first.  (Continuing)"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if test "${ac_cv_search_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_dlopen=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_dlopen+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_dlopen+set}" = set; then
+  :
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+TARGETS="plugins"
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval=$enable_static; SSDK_ARGUMENT=$enableval
+else
+  SSDK_ARGUMENT="no"
+fi
+
+
+if test "x$SSDK_ARGUMENT" = "xyes" ; then
+	TARGETS="$TARGETS sdkstatic"
+fi
+
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared; DSDK_ARGUMENT=$enableval
+else
+  DSDK_ARGUMENT="yes"
+fi
+
+
+if test "x$DSDK_ARGUMENT" = "xyes" ; then
+	TARGETS="$TARGETS sdk"
+fi
+
+# Check whether --enable-static-sdk was given.
+if test "${enable_static_sdk+set}" = set; then
+  enableval=$enable_static_sdk; SSDK_ARGUMENT=$enableval
+else
+  SSDK_ARGUMENT="no"
+fi
+
+
+if test "x$SSDK_ARGUMENT" = "xyes" ; then
+	TARGETS="$TARGETS sdkstatic"
+fi
+
+
+# Check whether --enable-programs was given.
+if test "${enable_programs+set}" = set; then
+  enableval=$enable_programs; PROGS_ARGUMENT=$enableval
+else
+  PROGS_ARGUMENT="yes"
+fi
+
+
+
+
+if test "x$PROGS_ARGUMENT" = "xyes" ; then
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for SNDFILE" >&5
+$as_echo_n "checking for SNDFILE... " >&6; }
+
+if test -n "$SNDFILE_CFLAGS"; then
+    pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sndfile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SNDFILE_LIBS"; then
+    pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sndfile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile" 2>&1`
+        else
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SNDFILE_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                have_sndfile="no"
+elif test $pkg_failed = untried; then
+	have_sndfile="no"
+else
+	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
+	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_sndfile="yes"
+fi
+	if test "x$have_sndfile" = "xyes" ; then
+					TARGETS="$TARGETS host rdfgen test"
+	else
+				{ { $as_echo "$as_me:$LINENO: error: libsndfile not found - cannot build example Vamp host!" >&5
+$as_echo "$as_me: error: libsndfile not found - cannot build example Vamp host!" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+fi
+
+
+
+
+
+
+if test "x$GCC" = "xyes"; then
+  case " $CXXFLAGS " in
+    *[\ \	]-fPIC\ -Wall[\ \	]*) ;;
+    *) CXXFLAGS="$CXXFLAGS -fPIC -Wall" ;;
+  esac
+fi
+
+ac_config_files="$ac_config_files Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by vamp-plugin-sdk $as_me 2.0, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTION]... [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <bug-autoconf at gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+vamp-plugin-sdk config.status 2.0
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
diff --git a/lib-src/libvamp/configure.ac b/lib-src/libvamp/configure.ac
new file mode 100644
index 0000000..dbad1d0
--- /dev/null
+++ b/lib-src/libvamp/configure.ac
@@ -0,0 +1,88 @@
+
+AC_INIT(vamp-plugin-sdk, 2.0, cannam at all-day-breakfast.com)
+
+AC_CONFIG_SRCDIR(vamp/vamp.h)
+AC_PROG_CXX
+AC_HEADER_STDC
+AC_C_BIGENDIAN
+
+if pkg-config --modversion vamp-sdk >/dev/null 2>&1; then
+  echo "WARNING: A version of the Vamp plugin SDK is already installed."
+  echo "         Expect worries and sorrows if you install a new version"
+  echo "         without removing the old one first.  (Continuing)"
+fi
+
+AC_SEARCH_LIBS([dlopen],[dl])
+
+TARGETS="plugins"
+dnl to start with, example plug-ins. Next bit will build a list
+dnl of other things like static and dynamic SDKs
+
+dnl See if the user wants to build static SDK
+AC_ARG_ENABLE(static,	[AS_HELP_STRING([--enable-static],
+	[enable building of static linked vamp SDK [default=no]])],
+	SSDK_ARGUMENT=$enableval,
+	SSDK_ARGUMENT="no")
+
+if test "x$SSDK_ARGUMENT" = "xyes" ; then
+	TARGETS="$TARGETS sdkstatic"
+fi
+
+dnl See if the user wants to build shared SDK
+AC_ARG_ENABLE(shared,	[AS_HELP_STRING([--enable-shared],
+	[enable building of dynamic linked vamp SDK [default=yes]])],
+	DSDK_ARGUMENT=$enableval,
+	DSDK_ARGUMENT="yes")
+
+if test "x$DSDK_ARGUMENT" = "xyes" ; then
+	TARGETS="$TARGETS sdk"
+fi
+
+dnl See if the user wants to build static SDK
+AC_ARG_ENABLE(static-sdk,	[AS_HELP_STRING([--enable-static-sdk],
+	[enable building of static linked vamp SDK [default=no]])],
+	SSDK_ARGUMENT=$enableval,
+	SSDK_ARGUMENT="no")
+
+if test "x$SSDK_ARGUMENT" = "xyes" ; then
+	TARGETS="$TARGETS sdkstatic"
+fi
+
+
+dnl See if the user wants to build programs
+AC_ARG_ENABLE(programs,	[AS_HELP_STRING([--enable-programs],
+	[enable building of example host and RDF generator [default=yes]])],
+	PROGS_ARGUMENT=$enableval,
+	PROGS_ARGUMENT="yes")
+
+
+
+dnl if the user wants progs, then we need to check for libsndfile
+if test "x$PROGS_ARGUMENT" = "xyes" ; then 
+	PKG_CHECK_MODULES([SNDFILE],[sndfile], 
+					  have_sndfile="yes", have_sndfile="no")
+	if test "x$have_sndfile" = "xyes" ; then
+			dnl all good, build everything (test depends on host)
+		TARGETS="$TARGETS host rdfgen test"
+	else
+		dnl no libsndfile - can't build host!
+		AC_MSG_ERROR([libsndfile not found - cannot build example Vamp host!])
+	fi
+fi
+
+AC_SUBST(SNDFILE_CFLAGS)
+AC_SUBST(SNDFILE_LIBS)
+AC_SUBST(TARGETS)
+
+
+changequote(,)dnl
+if test "x$GCC" = "xyes"; then
+  case " $CXXFLAGS " in
+    *[\ \	]-fPIC\ -Wall[\ \	]*) ;;
+    *) CXXFLAGS="$CXXFLAGS -fPIC -Wall" ;;
+  esac
+fi
+changequote([,])dnl
+
+AC_OUTPUT([Makefile])
+
diff --git a/lib-src/libvamp/correct-includes.patch b/lib-src/libvamp/correct-includes.patch
deleted file mode 100644
index 2d7ad24..0000000
--- a/lib-src/libvamp/correct-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
-+++ b/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
-@@ -36,6 +36,9 @@
- 
- #include "PluginAdapter.h"
- 
-+#include <cstdlib>
-+#include <cstring>
-+
- //#define DEBUG_PLUGIN_ADAPTER 1
- 
- 
---- a/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
-+++ b/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
-@@ -36,6 +36,8 @@
- 
- #include "PluginHostAdapter.h"
- 
-+#include <cstdlib>
-+
- namespace Vamp
- {
- 
---- a/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
-+++ b/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
-@@ -61,6 +61,8 @@
- 
- #endif /* ! _WIN32 */
- 
-+#include <cstring>
-+
- using namespace std;
- 
- namespace Vamp {
diff --git a/lib-src/libvamp/examples/FixedTempoEstimator.cpp b/lib-src/libvamp/examples/FixedTempoEstimator.cpp
new file mode 100644
index 0000000..4850521
--- /dev/null
+++ b/lib-src/libvamp/examples/FixedTempoEstimator.cpp
@@ -0,0 +1,724 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2008 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include "FixedTempoEstimator.h"
+
+using std::string;
+using std::vector;
+using std::cerr;
+using std::endl;
+
+using Vamp::RealTime;
+
+#include <cmath>
+
+
+class FixedTempoEstimator::D
+// this class just avoids us having to declare any data members in the header
+{
+public:
+    D(float inputSampleRate);
+    ~D();
+
+    size_t getPreferredStepSize() const { return 64; }
+    size_t getPreferredBlockSize() const { return 256; }
+
+    ParameterList getParameterDescriptors() const;
+    float getParameter(string id) const;
+    void setParameter(string id, float value);
+
+    OutputList getOutputDescriptors() const;
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void reset();
+    FeatureSet process(const float *const *, RealTime);
+    FeatureSet getRemainingFeatures();
+
+private:
+    void calculate();
+    FeatureSet assembleFeatures();
+
+    float lag2tempo(int);
+    int tempo2lag(float);
+
+    float m_inputSampleRate;
+    size_t m_stepSize;
+    size_t m_blockSize;
+
+    float m_minbpm;
+    float m_maxbpm;
+    float m_maxdflen;
+
+    float *m_priorMagnitudes;
+
+    size_t m_dfsize;
+    float *m_df;
+    float *m_r;
+    float *m_fr;
+    float *m_t;
+    size_t m_n;
+
+    Vamp::RealTime m_start;
+    Vamp::RealTime m_lasttime;
+};
+
+FixedTempoEstimator::D::D(float inputSampleRate) :
+    m_inputSampleRate(inputSampleRate),
+    m_stepSize(0),
+    m_blockSize(0),
+    m_minbpm(50),
+    m_maxbpm(190),
+    m_maxdflen(10),
+    m_priorMagnitudes(0),
+    m_df(0),
+    m_r(0),
+    m_fr(0),
+    m_t(0),
+    m_n(0)
+{
+}
+
+FixedTempoEstimator::D::~D()
+{
+    delete[] m_priorMagnitudes;
+    delete[] m_df;
+    delete[] m_r;
+    delete[] m_fr;
+    delete[] m_t;
+}
+
+FixedTempoEstimator::ParameterList
+FixedTempoEstimator::D::getParameterDescriptors() const
+{
+    ParameterList list;
+
+    ParameterDescriptor d;
+    d.identifier = "minbpm";
+    d.name = "Minimum estimated tempo";
+    d.description = "Minimum beat-per-minute value which the tempo estimator is able to return";
+    d.unit = "bpm";
+    d.minValue = 10;
+    d.maxValue = 360;
+    d.defaultValue = 50;
+    d.isQuantized = false;
+    list.push_back(d);
+
+    d.identifier = "maxbpm";
+    d.name = "Maximum estimated tempo";
+    d.description = "Maximum beat-per-minute value which the tempo estimator is able to return";
+    d.defaultValue = 190;
+    list.push_back(d);
+
+    d.identifier = "maxdflen";
+    d.name = "Input duration to study";
+    d.description = "Length of audio input, in seconds, which should be taken into account when estimating tempo.  There is no need to supply the plugin with any further input once this time has elapsed since the start of the audio.  The tempo estimator may use only the first part of this, up to eight times the slowest beat duration: increasing this value further than that is unlikely to improve results.";
+    d.unit = "s";
+    d.minValue = 2;
+    d.maxValue = 40;
+    d.defaultValue = 10;
+    list.push_back(d);
+
+    return list;
+}
+
+float
+FixedTempoEstimator::D::getParameter(string id) const
+{
+    if (id == "minbpm") {
+        return m_minbpm;
+    } else if (id == "maxbpm") {
+        return m_maxbpm;
+    } else if (id == "maxdflen") {
+        return m_maxdflen;
+    }
+    return 0.f;
+}
+
+void
+FixedTempoEstimator::D::setParameter(string id, float value)
+{
+    if (id == "minbpm") {
+        m_minbpm = value;
+    } else if (id == "maxbpm") {
+        m_maxbpm = value;
+    } else if (id == "maxdflen") {
+        m_maxdflen = value;
+    }
+}
+
+static int TempoOutput = 0;
+static int CandidatesOutput = 1;
+static int DFOutput = 2;
+static int ACFOutput = 3;
+static int FilteredACFOutput = 4;
+
+FixedTempoEstimator::OutputList
+FixedTempoEstimator::D::getOutputDescriptors() const
+{
+    OutputList list;
+
+    OutputDescriptor d;
+    d.identifier = "tempo";
+    d.name = "Tempo";
+    d.description = "Estimated tempo";
+    d.unit = "bpm";
+    d.hasFixedBinCount = true;
+    d.binCount = 1;
+    d.hasKnownExtents = false;
+    d.isQuantized = false;
+    d.sampleType = OutputDescriptor::VariableSampleRate;
+    d.sampleRate = m_inputSampleRate;
+    d.hasDuration = true; // our returned tempo spans a certain range
+    list.push_back(d);
+
+    d.identifier = "candidates";
+    d.name = "Tempo candidates";
+    d.description = "Possible tempo estimates, one per bin with the most likely in the first bin";
+    d.unit = "bpm";
+    d.hasFixedBinCount = false;
+    list.push_back(d);
+
+    d.identifier = "detectionfunction";
+    d.name = "Detection Function";
+    d.description = "Onset detection function";
+    d.unit = "";
+    d.hasFixedBinCount = 1;
+    d.binCount = 1;
+    d.hasKnownExtents = true;
+    d.minValue = 0.0;
+    d.maxValue = 1.0;
+    d.isQuantized = false;
+    d.quantizeStep = 0.0;
+    d.sampleType = OutputDescriptor::FixedSampleRate;
+    if (m_stepSize) {
+        d.sampleRate = m_inputSampleRate / m_stepSize;
+    } else {
+        d.sampleRate = m_inputSampleRate / (getPreferredBlockSize()/2);
+    }
+    d.hasDuration = false;
+    list.push_back(d);
+
+    d.identifier = "acf";
+    d.name = "Autocorrelation Function";
+    d.description = "Autocorrelation of onset detection function";
+    d.hasKnownExtents = false;
+    d.unit = "r";
+    list.push_back(d);
+
+    d.identifier = "filtered_acf";
+    d.name = "Filtered Autocorrelation";
+    d.description = "Filtered autocorrelation of onset detection function";
+    d.unit = "r";
+    list.push_back(d);
+
+    return list;
+}
+
+bool
+FixedTempoEstimator::D::initialise(size_t, size_t stepSize, size_t blockSize)
+{
+    m_stepSize = stepSize;
+    m_blockSize = blockSize;
+
+    float dfLengthSecs = m_maxdflen;
+    m_dfsize = (dfLengthSecs * m_inputSampleRate) / m_stepSize;
+
+    m_priorMagnitudes = new float[m_blockSize/2];
+    m_df = new float[m_dfsize];
+
+    for (size_t i = 0; i < m_blockSize/2; ++i) {
+        m_priorMagnitudes[i] = 0.f;
+    }
+    for (size_t i = 0; i < m_dfsize; ++i) {
+        m_df[i] = 0.f;
+    }
+
+    m_n = 0;
+
+    return true;
+}
+
+void
+FixedTempoEstimator::D::reset()
+{
+    if (!m_priorMagnitudes) return;
+
+    for (size_t i = 0; i < m_blockSize/2; ++i) {
+        m_priorMagnitudes[i] = 0.f;
+    }
+    for (size_t i = 0; i < m_dfsize; ++i) {
+        m_df[i] = 0.f;
+    }
+
+    delete[] m_r;
+    m_r = 0;
+
+    delete[] m_fr; 
+    m_fr = 0;
+
+    delete[] m_t; 
+    m_t = 0;
+
+    m_n = 0;
+
+    m_start = RealTime::zeroTime;
+    m_lasttime = RealTime::zeroTime;
+}
+
+FixedTempoEstimator::FeatureSet
+FixedTempoEstimator::D::process(const float *const *inputBuffers, RealTime ts)
+{
+    FeatureSet fs;
+
+    if (m_stepSize == 0) {
+	cerr << "ERROR: FixedTempoEstimator::process: "
+	     << "FixedTempoEstimator has not been initialised"
+	     << endl;
+	return fs;
+    }
+
+    if (m_n == 0) m_start = ts;
+    m_lasttime = ts;
+
+    if (m_n == m_dfsize) {
+        // If we have seen enough input, do the estimation and return
+        calculate();
+        fs = assembleFeatures();
+        ++m_n;
+        return fs;
+    }
+
+    // If we have seen more than enough, just discard and return!
+    if (m_n > m_dfsize) return FeatureSet();
+
+    float value = 0.f;
+
+    // m_df will contain an onset detection function based on the rise
+    // in overall power from one spectral frame to the next --
+    // simplistic but reasonably effective for our purposes.
+
+    for (size_t i = 1; i < m_blockSize/2; ++i) {
+
+        float real = inputBuffers[0][i*2];
+        float imag = inputBuffers[0][i*2 + 1];
+
+        float sqrmag = real * real + imag * imag;
+        value += fabsf(sqrmag - m_priorMagnitudes[i]);
+
+        m_priorMagnitudes[i] = sqrmag;
+    }
+
+    m_df[m_n] = value;
+
+    ++m_n;
+    return fs;
+}    
+
+FixedTempoEstimator::FeatureSet
+FixedTempoEstimator::D::getRemainingFeatures()
+{
+    FeatureSet fs;
+    if (m_n > m_dfsize) return fs;
+    calculate();
+    fs = assembleFeatures();
+    ++m_n;
+    return fs;
+}
+
+float
+FixedTempoEstimator::D::lag2tempo(int lag)
+{
+    return 60.f / ((lag * m_stepSize) / m_inputSampleRate);
+}
+
+int
+FixedTempoEstimator::D::tempo2lag(float tempo)
+{
+    return ((60.f / tempo) * m_inputSampleRate) / m_stepSize;
+}
+
+void
+FixedTempoEstimator::D::calculate()
+{    
+    if (m_r) {
+        cerr << "FixedTempoEstimator::calculate: calculation already happened?" << endl;
+        return;
+    }
+
+    if (m_n < m_dfsize / 9 &&
+        m_n < (1.0 * m_inputSampleRate) / m_stepSize) { // 1 second
+        cerr << "FixedTempoEstimator::calculate: Input is too short" << endl;
+        return;
+    }
+
+    // This function takes m_df (the detection function array filled
+    // out in process()) and calculates m_r (the raw autocorrelation)
+    // and m_fr (the filtered autocorrelation from whose peaks tempo
+    // estimates will be taken).
+
+    int n = m_n; // length of actual df array (m_dfsize is the theoretical max)
+
+    m_r  = new float[n/2]; // raw autocorrelation
+    m_fr = new float[n/2]; // filtered autocorrelation
+    m_t  = new float[n/2]; // averaged tempo estimate for each lag value
+
+    for (int i = 0; i < n/2; ++i) {
+        m_r[i]  = 0.f;
+        m_fr[i] = 0.f;
+        m_t[i]  = lag2tempo(i);
+    }
+
+    // Calculate the raw autocorrelation of the detection function
+
+    for (int i = 0; i < n/2; ++i) {
+
+        for (int j = i; j < n; ++j) {
+            m_r[i] += m_df[j] * m_df[j - i];
+        }
+
+        m_r[i] /= n - i - 1;
+    }
+
+    // Filter the autocorrelation and average out the tempo estimates
+    
+    float related[] = { 0.5, 2, 4, 8 };
+
+    for (int i = 1; i < n/2-1; ++i) {
+
+        m_fr[i] = m_r[i];
+
+        int div = 1;
+
+        for (int j = 0; j < int(sizeof(related)/sizeof(related[0])); ++j) {
+
+            // Check for an obvious peak at each metrically related lag
+
+            int k0 = int(i * related[j] + 0.5);
+
+            if (k0 >= 0 && k0 < int(n/2)) {
+
+                int kmax = 0, kmin = 0;
+                float kvmax = 0, kvmin = 0;
+                bool have = false;
+
+                for (int k = k0 - 1; k <= k0 + 1; ++k) {
+
+                    if (k < 0 || k >= n/2) continue;
+
+                    if (!have || (m_r[k] > kvmax)) { kmax = k; kvmax = m_r[k]; }
+                    if (!have || (m_r[k] < kvmin)) { kmin = k; kvmin = m_r[k]; }
+                    
+                    have = true;
+                }
+                
+                // Boost the original lag according to the strongest
+                // value found close to this related lag
+
+                m_fr[i] += m_r[kmax] / 5;
+
+                if ((kmax == 0 || m_r[kmax] > m_r[kmax-1]) &&
+                    (kmax == n/2-1 || m_r[kmax] > m_r[kmax+1]) &&
+                    kvmax > kvmin * 1.05) {
+
+                    // The strongest value close to the related lag is
+                    // also a pretty good looking peak, so use it to
+                    // improve our tempo estimate for the original lag
+                    
+                    m_t[i] = m_t[i] + lag2tempo(kmax) * related[j];
+                    ++div;
+                }
+            }
+        }
+        
+        m_t[i] /= div;
+        
+        // Finally apply a primitive perceptual weighting (to prefer
+        // tempi of around 120-130)
+
+        float weight = 1.f - fabsf(128.f - lag2tempo(i)) * 0.005;
+        if (weight < 0.f) weight = 0.f;
+        weight = weight * weight * weight;
+
+        m_fr[i] += m_fr[i] * (weight / 3);
+    }
+}
+    
+FixedTempoEstimator::FeatureSet
+FixedTempoEstimator::D::assembleFeatures()
+{
+    FeatureSet fs;
+    if (!m_r) return fs; // No autocorrelation: no results
+
+    Feature feature;
+    feature.hasTimestamp = true;
+    feature.hasDuration = false;
+    feature.label = "";
+    feature.values.clear();
+    feature.values.push_back(0.f);
+
+    char buffer[40];
+
+    int n = m_n;
+
+    for (int i = 0; i < n; ++i) {
+
+        // Return the detection function in the DF output
+
+        feature.timestamp = m_start +
+            RealTime::frame2RealTime(i * m_stepSize, m_inputSampleRate);
+        feature.values[0] = m_df[i];
+        feature.label = "";
+        fs[DFOutput].push_back(feature);
+    }
+
+    for (int i = 1; i < n/2; ++i) {
+
+        // Return the raw autocorrelation in the ACF output, each
+        // value labelled according to its corresponding tempo
+
+        feature.timestamp = m_start +
+            RealTime::frame2RealTime(i * m_stepSize, m_inputSampleRate);
+        feature.values[0] = m_r[i];
+        sprintf(buffer, "%.1f bpm", lag2tempo(i));
+        if (i == n/2-1) feature.label = "";
+        else feature.label = buffer;
+        fs[ACFOutput].push_back(feature);
+    }
+
+    float t0 = m_minbpm; // our minimum detected tempo
+    float t1 = m_maxbpm; // our maximum detected tempo
+
+    int p0 = tempo2lag(t1);
+    int p1 = tempo2lag(t0);
+
+    std::map<float, int> candidates;
+
+    for (int i = p0; i <= p1 && i+1 < n/2; ++i) {
+
+        if (m_fr[i] > m_fr[i-1] &&
+            m_fr[i] > m_fr[i+1]) {
+
+            // This is a peak in the filtered autocorrelation: stick
+            // it into the map from filtered autocorrelation to lag
+            // index -- this sorts our peaks by filtered acf value
+
+            candidates[m_fr[i]] = i;
+        }
+
+        // Also return the filtered autocorrelation in its own output
+
+        feature.timestamp = m_start +
+            RealTime::frame2RealTime(i * m_stepSize, m_inputSampleRate);
+        feature.values[0] = m_fr[i];
+        sprintf(buffer, "%.1f bpm", lag2tempo(i));
+        if (i == p1 || i == n/2-2) feature.label = "";
+        else feature.label = buffer;
+        fs[FilteredACFOutput].push_back(feature);
+    }
+
+    if (candidates.empty()) {
+        cerr << "No tempo candidates!" << endl;
+        return fs;
+    }
+
+    feature.hasTimestamp = true;
+    feature.timestamp = m_start;
+    
+    feature.hasDuration = true;
+    feature.duration = m_lasttime - m_start;
+
+    // The map contains only peaks and is sorted by filtered acf
+    // value, so the final element in it is our "best" tempo guess
+
+    std::map<float, int>::const_iterator ci = candidates.end();
+    --ci;
+    int maxpi = ci->second;
+
+    if (m_t[maxpi] > 0) {
+
+        // This lag has an adjusted tempo from the averaging process:
+        // use it
+
+        feature.values[0] = m_t[maxpi];
+
+    } else {
+
+        // shouldn't happen -- it would imply that this high value was
+        // not a peak!
+
+        feature.values[0] = lag2tempo(maxpi);
+        cerr << "WARNING: No stored tempo for index " << maxpi << endl;
+    }
+
+    sprintf(buffer, "%.1f bpm", feature.values[0]);
+    feature.label = buffer;
+
+    // Return the best tempo in the main output
+
+    fs[TempoOutput].push_back(feature);
+
+    // And return the other estimates (up to the arbitrarily chosen
+    // number of 10 of them) in the candidates output
+
+    feature.values.clear();
+    feature.label = "";
+
+    while (feature.values.size() < 10) {
+        if (m_t[ci->second] > 0) {
+            feature.values.push_back(m_t[ci->second]);
+        } else {
+            feature.values.push_back(lag2tempo(ci->second));
+        }
+        if (ci == candidates.begin()) break;
+        --ci;
+    }
+
+    fs[CandidatesOutput].push_back(feature);
+    
+    return fs;
+}
+
+    
+
+FixedTempoEstimator::FixedTempoEstimator(float inputSampleRate) :
+    Plugin(inputSampleRate),
+    m_d(new D(inputSampleRate))
+{
+}
+
+FixedTempoEstimator::~FixedTempoEstimator()
+{
+    delete m_d;
+}
+
+string
+FixedTempoEstimator::getIdentifier() const
+{
+    return "fixedtempo";
+}
+
+string
+FixedTempoEstimator::getName() const
+{
+    return "Simple Fixed Tempo Estimator";
+}
+
+string
+FixedTempoEstimator::getDescription() const
+{
+    return "Study a short section of audio and estimate its tempo, assuming the tempo is constant";
+}
+
+string
+FixedTempoEstimator::getMaker() const
+{
+    return "Vamp SDK Example Plugins";
+}
+
+int
+FixedTempoEstimator::getPluginVersion() const
+{
+    return 1;
+}
+
+string
+FixedTempoEstimator::getCopyright() const
+{
+    return "Code copyright 2008 Queen Mary, University of London.  Freely redistributable (BSD license)";
+}
+
+size_t
+FixedTempoEstimator::getPreferredStepSize() const
+{
+    return m_d->getPreferredStepSize();
+}
+
+size_t
+FixedTempoEstimator::getPreferredBlockSize() const
+{
+    return m_d->getPreferredBlockSize();
+}
+
+bool
+FixedTempoEstimator::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    if (channels < getMinChannelCount() ||
+	channels > getMaxChannelCount()) return false;
+
+    return m_d->initialise(channels, stepSize, blockSize);
+}
+
+void
+FixedTempoEstimator::reset()
+{
+    return m_d->reset();
+}
+
+FixedTempoEstimator::ParameterList
+FixedTempoEstimator::getParameterDescriptors() const
+{
+    return m_d->getParameterDescriptors();
+}
+
+float
+FixedTempoEstimator::getParameter(std::string id) const
+{
+    return m_d->getParameter(id);
+}
+
+void
+FixedTempoEstimator::setParameter(std::string id, float value)
+{
+    m_d->setParameter(id, value);
+}
+
+FixedTempoEstimator::OutputList
+FixedTempoEstimator::getOutputDescriptors() const
+{
+    return m_d->getOutputDescriptors();
+}
+
+FixedTempoEstimator::FeatureSet
+FixedTempoEstimator::process(const float *const *inputBuffers, RealTime ts)
+{
+    return m_d->process(inputBuffers, ts);
+}
+
+FixedTempoEstimator::FeatureSet
+FixedTempoEstimator::getRemainingFeatures()
+{
+    return m_d->getRemainingFeatures();
+}
diff --git a/lib-src/libvamp/examples/FixedTempoEstimator.h b/lib-src/libvamp/examples/FixedTempoEstimator.h
new file mode 100644
index 0000000..16a69e1
--- /dev/null
+++ b/lib-src/libvamp/examples/FixedTempoEstimator.h
@@ -0,0 +1,84 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2008 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _FIXED_TEMPO_ESTIMATOR_PLUGIN_H_
+#define _FIXED_TEMPO_ESTIMATOR_PLUGIN_H_
+
+#include "vamp-sdk/Plugin.h"
+
+/**
+ * Example plugin that estimates the tempo of a short fixed-tempo sample.
+ */
+
+class FixedTempoEstimator : public Vamp::Plugin
+{
+public:
+    FixedTempoEstimator(float inputSampleRate);
+    virtual ~FixedTempoEstimator();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void reset();
+
+    InputDomain getInputDomain() const { return FrequencyDomain; }
+
+    std::string getIdentifier() const;
+    std::string getName() const;
+    std::string getDescription() const;
+    std::string getMaker() const;
+    int getPluginVersion() const;
+    std::string getCopyright() const;
+
+    size_t getPreferredStepSize() const;
+    size_t getPreferredBlockSize() const;
+
+    ParameterList getParameterDescriptors() const;
+    float getParameter(std::string id) const;
+    void setParameter(std::string id, float value);
+
+    OutputList getOutputDescriptors() const;
+
+    FeatureSet process(const float *const *inputBuffers,
+                       Vamp::RealTime timestamp);
+
+    FeatureSet getRemainingFeatures();
+
+protected:
+    class D;
+    D *m_d;
+};
+
+
+#endif
diff --git a/lib-src/libvamp/examples/PercussionOnsetDetector.cpp b/lib-src/libvamp/examples/PercussionOnsetDetector.cpp
index 447eb19..f46932a 100644
--- a/lib-src/libvamp/examples/PercussionOnsetDetector.cpp
+++ b/lib-src/libvamp/examples/PercussionOnsetDetector.cpp
@@ -245,7 +245,7 @@ PercussionOnsetDetector::process(const float *const *inputBuffers,
         if (m_priorMagnitudes[i] > 0.f) {
             float diff = 10.f * log10f(sqrmag / m_priorMagnitudes[i]);
 
-//        std::cout << "i=" << i << ", mag=" << mag << ", prior=" << m_priorMagnitudes[i] << ", diff=" << diff << ", threshold=" << m_threshold << std::endl;
+//        std::cout << "i=" << i << ", sqrmag=" << sqrmag << ", prior=" << m_priorMagnitudes[i] << ", diff=" << diff << ", threshold=" << m_threshold << " " << (diff >= m_threshold ? "[*]" : "") << std::endl;
 
             if (diff >= m_threshold) ++count;
         }
@@ -264,10 +264,12 @@ PercussionOnsetDetector::process(const float *const *inputBuffers,
         m_dfMinus1 >= count &&
         m_dfMinus1 > ((100 - m_sensitivity) * m_blockSize) / 200) {
 
+//std::cout << "result at " << ts << "! (count == " << count << ", prev == " << m_dfMinus1 << ")" << std::endl;
+
         Feature onset;
         onset.hasTimestamp = true;
         onset.timestamp = ts - Vamp::RealTime::frame2RealTime
-            (m_stepSize, lrintf(m_inputSampleRate));
+            (m_stepSize, int(m_inputSampleRate + 0.5));
         returnFeatures[0].push_back(onset);
     }
 
diff --git a/lib-src/libvamp/examples/PowerSpectrum.cpp b/lib-src/libvamp/examples/PowerSpectrum.cpp
new file mode 100644
index 0000000..3346926
--- /dev/null
+++ b/lib-src/libvamp/examples/PowerSpectrum.cpp
@@ -0,0 +1,170 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2008 QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include "PowerSpectrum.h"
+
+using std::string;
+using std::cerr;
+using std::endl;
+
+#include <math.h>
+
+PowerSpectrum::PowerSpectrum(float inputSampleRate) :
+    Plugin(inputSampleRate),
+    m_blockSize(0)
+{
+}
+
+PowerSpectrum::~PowerSpectrum()
+{
+}
+
+string
+PowerSpectrum::getIdentifier() const
+{
+    return "powerspectrum";
+}
+
+string
+PowerSpectrum::getName() const
+{
+    return "Simple Power Spectrum";
+}
+
+string
+PowerSpectrum::getDescription() const
+{
+    return "Return the power spectrum of a signal";
+}
+
+string
+PowerSpectrum::getMaker() const
+{
+    return "Vamp SDK Example Plugins";
+}
+
+int
+PowerSpectrum::getPluginVersion() const
+{
+    return 1;
+}
+
+string
+PowerSpectrum::getCopyright() const
+{
+    return "Freely redistributable (BSD license)";
+}
+
+bool
+PowerSpectrum::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    if (channels < getMinChannelCount() ||
+	channels > getMaxChannelCount()) return false;
+
+    m_blockSize = blockSize;
+
+    return true;
+}
+
+void
+PowerSpectrum::reset()
+{
+}
+
+PowerSpectrum::OutputList
+PowerSpectrum::getOutputDescriptors() const
+{
+    OutputList list;
+
+    OutputDescriptor d;
+    d.identifier = "powerspectrum";
+    d.name = "Power Spectrum";
+    d.description = "Power values of the frequency spectrum bins calculated from the input signal";
+    d.unit = "";
+    d.hasFixedBinCount = true;
+    if (m_blockSize == 0) {
+        // Just so as not to return "1".  This is the bin count that
+        // would result from a block size of 1024, which is a likely
+        // default -- but the host should always set the block size
+        // before querying the bin count for certain.
+        d.binCount = 513;
+    } else {
+        d.binCount = m_blockSize / 2 + 1;
+    }
+    d.hasKnownExtents = false;
+    d.isQuantized = false;
+    d.sampleType = OutputDescriptor::OneSamplePerStep;
+    list.push_back(d);
+
+    return list;
+}
+
+PowerSpectrum::FeatureSet
+PowerSpectrum::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
+{
+    FeatureSet fs;
+
+    if (m_blockSize == 0) {
+	cerr << "ERROR: PowerSpectrum::process: Not initialised" << endl;
+	return fs;
+    }
+
+    size_t n = m_blockSize / 2 + 1;
+    const float *fbuf = inputBuffers[0];
+
+    Feature feature;
+    feature.hasTimestamp = false;
+    feature.values.reserve(n); // optional
+
+    for (size_t i = 0; i < n; ++i) {
+
+	double real = fbuf[i * 2];
+	double imag = fbuf[i * 2 + 1];
+
+        feature.values.push_back(real * real + imag * imag);
+    }
+
+    fs[0].push_back(feature);
+
+    return fs;
+}
+
+PowerSpectrum::FeatureSet
+PowerSpectrum::getRemainingFeatures()
+{
+    return FeatureSet();
+}
+
diff --git a/lib-src/libvamp/examples/PowerSpectrum.h b/lib-src/libvamp/examples/PowerSpectrum.h
new file mode 100644
index 0000000..a86d5f7
--- /dev/null
+++ b/lib-src/libvamp/examples/PowerSpectrum.h
@@ -0,0 +1,80 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _POWER_SPECTRUM_PLUGIN_H_
+#define _POWER_SPECTRUM_PLUGIN_H_
+
+#include "vamp-sdk/Plugin.h"
+
+/**
+ * Example plugin that returns a power spectrum calculated (trivially)
+ * from the frequency domain representation of each block of audio.
+ * This is one of the simplest possible Vamp plugins, included as an
+ * example of how to return the appropriate value structure for this
+ * sort of visualisation.
+ */
+
+class PowerSpectrum : public Vamp::Plugin
+{
+public:
+    PowerSpectrum(float inputSampleRate);
+    virtual ~PowerSpectrum();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void reset();
+
+    InputDomain getInputDomain() const { return FrequencyDomain; }
+
+    std::string getIdentifier() const;
+    std::string getName() const;
+    std::string getDescription() const;
+    std::string getMaker() const;
+    int getPluginVersion() const;
+    std::string getCopyright() const;
+
+    OutputList getOutputDescriptors() const;
+
+    FeatureSet process(const float *const *inputBuffers,
+                       Vamp::RealTime timestamp);
+
+    FeatureSet getRemainingFeatures();
+
+protected:
+    size_t m_blockSize;
+};
+
+
+#endif
diff --git a/lib-src/libvamp/examples/SpectralCentroid.cpp b/lib-src/libvamp/examples/SpectralCentroid.cpp
index 82d80b8..1fc8ac8 100644
--- a/lib-src/libvamp/examples/SpectralCentroid.cpp
+++ b/lib-src/libvamp/examples/SpectralCentroid.cpp
@@ -41,8 +41,12 @@ using std::vector;
 using std::cerr;
 using std::endl;
 
-#include <cmath>
+#include <math.h>
 
+#ifdef WIN32
+#define isnan(x) false
+#define isinf(x) false
+#endif
 
 SpectralCentroid::SpectralCentroid(float inputSampleRate) :
     Plugin(inputSampleRate),
@@ -134,7 +138,7 @@ SpectralCentroid::getOutputDescriptors() const
 }
 
 SpectralCentroid::FeatureSet
-SpectralCentroid::process(const float *const *inputBuffers, Vamp::RealTime)
+SpectralCentroid::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
 {
     if (m_stepSize == 0) {
 	cerr << "ERROR: SpectralCentroid::process: "
@@ -149,29 +153,28 @@ SpectralCentroid::process(const float *const *inputBuffers, Vamp::RealTime)
 	double freq = (double(i) * m_inputSampleRate) / m_blockSize;
 	double real = inputBuffers[0][i*2];
 	double imag = inputBuffers[0][i*2 + 1];
-	double power = sqrt(real * real + imag * imag) / (m_blockSize/2);
-	numLin += freq * power;
-        numLog += log10f(freq) * power;
-	denom += power;
+	double scalemag = sqrt(real * real + imag * imag) / (m_blockSize/2);
+	numLin += freq * scalemag;
+        numLog += log10f(freq) * scalemag;
+	denom += scalemag;
     }
 
     FeatureSet returnFeatures;
 
-//    std::cerr << "power " << denom << ", block size " << m_blockSize << std::endl;
-
     if (denom != 0.0) {
 	float centroidLin = float(numLin / denom);
 	float centroidLog = powf(10, float(numLog / denom));
 
 	Feature feature;
 	feature.hasTimestamp = false;
-        if (!std::isnan(centroidLog) && !std::isinf(centroidLog)) {
+
+        if (!isnan(centroidLog) && !isinf(centroidLog)) {
             feature.values.push_back(centroidLog);
         }
 	returnFeatures[0].push_back(feature);
 
         feature.values.clear();
-        if (!std::isnan(centroidLin) && !std::isinf(centroidLin)) {
+        if (!isnan(centroidLin) && !isinf(centroidLin)) {
             feature.values.push_back(centroidLin);
         }
 	returnFeatures[1].push_back(feature);
diff --git a/lib-src/libvamp/examples/ZeroCrossing.cpp b/lib-src/libvamp/examples/ZeroCrossing.cpp
index 4b678e3..eb176d6 100644
--- a/lib-src/libvamp/examples/ZeroCrossing.cpp
+++ b/lib-src/libvamp/examples/ZeroCrossing.cpp
@@ -41,6 +41,7 @@ using std::vector;
 using std::cerr;
 using std::endl;
 
+#include <cmath>
 
 ZeroCrossing::ZeroCrossing(float inputSampleRate) :
     Plugin(inputSampleRate),
diff --git a/lib-src/libvamp/examples/plugins.cpp b/lib-src/libvamp/examples/plugins.cpp
index 25c6e6c..11444e4 100644
--- a/lib-src/libvamp/examples/plugins.cpp
+++ b/lib-src/libvamp/examples/plugins.cpp
@@ -40,12 +40,16 @@
 #include "ZeroCrossing.h"
 #include "SpectralCentroid.h"
 #include "PercussionOnsetDetector.h"
+#include "FixedTempoEstimator.h"
 #include "AmplitudeFollower.h"
+#include "PowerSpectrum.h"
 
 static Vamp::PluginAdapter<ZeroCrossing> zeroCrossingAdapter;
 static Vamp::PluginAdapter<SpectralCentroid> spectralCentroidAdapter;
 static Vamp::PluginAdapter<PercussionOnsetDetector> percussionOnsetAdapter;
+static Vamp::PluginAdapter<FixedTempoEstimator> fixedTempoAdapter;
 static Vamp::PluginAdapter<AmplitudeFollower> amplitudeAdapter;
+static Vamp::PluginAdapter<PowerSpectrum> powerSpectrum;
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
                                                     unsigned int index)
@@ -57,6 +61,8 @@ const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
     case  1: return spectralCentroidAdapter.getDescriptor();
     case  2: return percussionOnsetAdapter.getDescriptor();
     case  3: return amplitudeAdapter.getDescriptor();
+    case  4: return fixedTempoAdapter.getDescriptor();
+    case  5: return powerSpectrum.getDescriptor();
     default: return 0;
     }
 }
diff --git a/lib-src/libvamp/examples/vamp-example-plugins.cat b/lib-src/libvamp/examples/vamp-example-plugins.cat
index 7676c4a..8559b39 100644
--- a/lib-src/libvamp/examples/vamp-example-plugins.cat
+++ b/lib-src/libvamp/examples/vamp-example-plugins.cat
@@ -1,5 +1,6 @@
 vamp:vamp-example-plugins:zerocrossing::Low Level Features
 vamp:vamp-example-plugins:spectralcentroid::Low Level Features
+vamp:vamp-example-plugins:powerspectrum::Visualisation
 vamp:vamp-example-plugins:percussiononsets::Time > Onsets
 vamp:vamp-example-plugins:amplitudefollower::Low Level Features
-
+vamp:vamp-example-plugins:fixedtempo::Time > Tempo
diff --git a/lib-src/libvamp/examples/vamp-example-plugins.n3 b/lib-src/libvamp/examples/vamp-example-plugins.n3
new file mode 100644
index 0000000..85c5766
--- /dev/null
+++ b/lib-src/libvamp/examples/vamp-example-plugins.n3
@@ -0,0 +1,306 @@
+ at prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
+ at prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .
+ at prefix vamp:     <http://purl.org/ontology/vamp/> .
+ at prefix plugbase: <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#> .
+ at prefix owl:      <http://www.w3.org/2002/07/owl#> .
+ at prefix dc:       <http://purl.org/dc/elements/1.1/> .
+ at prefix af:       <http://purl.org/ontology/af/> .
+ at prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+ at prefix cc:       <http://web.resource.org/cc/> .
+ at prefix :         <#> .
+
+<>  a   vamp:PluginDescription ;
+    foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
+    foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins> .
+
+:vamp-example-plugins a  vamp:PluginLibrary ;
+    vamp:identifier "vamp-example-plugins"  ; 
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html> ;
+    vamp:available_plugin plugbase:amplitudefollower ; 
+    vamp:available_plugin plugbase:fixedtempo ; 
+    vamp:available_plugin plugbase:percussiononsets ; 
+    vamp:available_plugin plugbase:powerspectrum ; 
+    vamp:available_plugin plugbase:spectralcentroid ; 
+    vamp:available_plugin plugbase:zerocrossing ; 
+    .
+
+plugbase:amplitudefollower a   vamp:Plugin ;
+    dc:title              "Amplitude Follower" ;
+    vamp:name             "Amplitude Follower" ;
+    dc:description        "Track the amplitude of the audio signal" ;
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html#amplitudefollower> ;
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ;
+    cc:license            <http://creativecommons.org/licenses/BSD/> ;
+    dc:rights             "Freely redistributable (BSD license)" ;
+    vamp:identifier       "amplitudefollower" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "1" ;
+    vamp:input_domain     vamp:TimeDomain ;
+
+    vamp:parameter   plugbase:amplitudefollower_param_attack ;
+    vamp:parameter   plugbase:amplitudefollower_param_release ;
+
+    vamp:output      plugbase:amplitudefollower_output_amplitude ;
+    .
+plugbase:amplitudefollower_param_attack a  vamp:Parameter ;
+    vamp:identifier     "attack" ;
+    dc:title            "Attack time" ;
+    dc:format           "s" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "s"  ;
+    vamp:default_value   0.01 ;
+    vamp:value_names     ();
+    .
+plugbase:amplitudefollower_param_release a  vamp:Parameter ;
+    vamp:identifier     "release" ;
+    dc:title            "Release time" ;
+    dc:format           "s" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "s"  ;
+    vamp:default_value   0.01 ;
+    vamp:value_names     ();
+    .
+plugbase:amplitudefollower_output_amplitude a  vamp:DenseOutput ;
+    vamp:identifier       "amplitude" ;
+    dc:title              "Amplitude" ;
+    dc:description        ""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "V" ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:Signal ;
+    .
+plugbase:fixedtempo a   vamp:Plugin ;
+    dc:title              "Simple Fixed Tempo Estimator" ;
+    vamp:name             "Simple Fixed Tempo Estimator" ;
+    dc:description        "Study a short section of audio and estimate its tempo, assuming the tempo is constant" ;
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html#fixedtempo> ;
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ;
+    cc:license            <http://creativecommons.org/licenses/BSD/> ;
+    dc:rights             "Freely redistributable (BSD license)" ;
+    vamp:identifier       "fixedtempo" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "1" ;
+    vamp:input_domain     vamp:FrequencyDomain ;
+
+    vamp:output      plugbase:fixedtempo_output_tempo ;
+    vamp:output      plugbase:fixedtempo_output_candidates ;
+    vamp:output      plugbase:fixedtempo_output_detectionfunction ;
+    vamp:output      plugbase:fixedtempo_output_acf ;
+    vamp:output      plugbase:fixedtempo_output_filtered_acf ;
+    .
+plugbase:fixedtempo_output_tempo a  vamp:SparseOutput ;
+    vamp:identifier       "tempo" ;
+    dc:title              "Tempo" ;
+    dc:description        "Estimated tempo"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "bpm" ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:sample_type      vamp:VariableSampleRate ;
+    vamp:computes_event_type   af:Tempo ;
+    .
+plugbase:fixedtempo_output_candidates a  vamp:SparseOutput ;
+    vamp:identifier       "candidates" ;
+    dc:title              "Tempo candidates" ;
+    dc:description        "Possible tempo estimates, one per bin with the most likely in the first bin"  ;
+    vamp:fixed_bin_count  "false" ;
+    vamp:unit             "bpm" ;
+    vamp:sample_type      vamp:VariableSampleRate ;
+    vamp:computes_event_type   af:Tempo ;
+    .
+plugbase:fixedtempo_output_detectionfunction a  vamp:DenseOutput ;
+    vamp:identifier       "detectionfunction" ;
+    dc:title              "Detection Function" ;
+    dc:description        "Onset detection function"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    a                 vamp:KnownExtentsOutput ;
+    vamp:min_value    0  ;
+    vamp:max_value    1  ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:OnsetDetectionFunction ;
+    .
+plugbase:fixedtempo_output_acf a  vamp:DenseOutput ;
+    vamp:identifier       "acf" ;
+    dc:title              "Autocorrelation Function" ;
+    dc:description        "Autocorrelation of onset detection function"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "r" ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:Signal ;
+    .
+plugbase:fixedtempo_output_filtered_acf a  vamp:DenseOutput ;
+    vamp:identifier       "filtered_acf" ;
+    dc:title              "Filtered Autocorrelation" ;
+    dc:description        "Filtered autocorrelation of onset detection function"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "r" ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:Signal ;
+    .
+plugbase:percussiononsets a   vamp:Plugin ;
+    dc:title              "Simple Percussion Onset Detector" ;
+    vamp:name             "Simple Percussion Onset Detector" ;
+    dc:description        "Detect percussive note onsets by identifying broadband energy rises" ;
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html#percussiononsets> ;
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ; 
+    cc:license            <http://creativecommons.org/licenses/BSD/> ;
+    dc:rights             "Freely redistributable (BSD license)" ;
+    vamp:identifier       "percussiononsets" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "2" ;
+    vamp:input_domain     vamp:FrequencyDomain ;
+
+    vamp:parameter   plugbase:percussiononsets_param_threshold ;
+    vamp:parameter   plugbase:percussiononsets_param_sensitivity ;
+
+    vamp:output      plugbase:percussiononsets_output_onsets ;
+    vamp:output      plugbase:percussiononsets_output_detectionfunction ;
+    .
+plugbase:percussiononsets_param_threshold a  vamp:Parameter ;
+    vamp:identifier     "threshold" ;
+    dc:title            "Energy rise threshold" ;
+    dc:format           "dB" ;
+    vamp:min_value       0 ;
+    vamp:max_value       20 ;
+    vamp:unit           "dB"  ;
+    vamp:default_value   3 ;
+    vamp:value_names     ();
+    .
+plugbase:percussiononsets_param_sensitivity a  vamp:Parameter ;
+    vamp:identifier     "sensitivity" ;
+    dc:title            "Sensitivity" ;
+    dc:format           "%" ;
+    vamp:min_value       0 ;
+    vamp:max_value       100 ;
+    vamp:unit           "%"  ;
+    vamp:default_value   40 ;
+    vamp:value_names     ();
+    .
+plugbase:percussiononsets_output_onsets a  vamp:SparseOutput ;
+    vamp:identifier       "onsets" ;
+    dc:title              "Onsets" ;
+    dc:description        "Percussive note onset locations"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        0 ;
+    vamp:bin_names        ();
+    vamp:sample_type      vamp:VariableSampleRate ;
+    vamp:computes_event_type  af:Onset ;
+    .
+plugbase:percussiononsets_output_detectionfunction a  vamp:DenseOutput ;
+    vamp:identifier       "detectionfunction" ;
+    dc:title              "Detection Function" ;
+    dc:description        "Broadband energy rise detection function"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    a                     vamp:QuantizedOutput ;
+    vamp:quantize_step    1  ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:OnsetDetectionFunction ;
+    .
+plugbase:powerspectrum a   vamp:Plugin ;
+    dc:title              "Simple Power Spectrum" ;
+    vamp:name             "Simple Power Spectrum" ;
+    dc:description        "Return the power spectrum of a signal" ;
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html#powerspectrum> ;
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ; 
+    cc:license            <http://creativecommons.org/licenses/BSD/> ;
+    dc:rights             "Freely redistributable (BSD license)" ;
+    vamp:identifier       "powerspectrum" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "1" ;
+    vamp:input_domain     vamp:FrequencyDomain ;
+
+    vamp:output      plugbase:powerspectrum_output_powerspectrum ;
+    .
+plugbase:powerspectrum_output_powerspectrum a  vamp:DenseOutput ;
+    vamp:identifier       "powerspectrum" ;
+    dc:title              "Power Spectrum" ;
+    dc:description        "Power values of the frequency spectrum bins calculated from the input signal"  ;
+    vamp:computes_signal_type  af:Signal ;
+    .
+plugbase:spectralcentroid a   vamp:Plugin ;
+    dc:title              "Spectral Centroid" ;
+    vamp:name             "Spectral Centroid" ;
+    dc:description        "Calculate the centroid frequency of the spectrum of the input signal" ;
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html#spectralcentroid> ;
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ; 
+    cc:license            <http://creativecommons.org/licenses/BSD/> ;
+    dc:rights             "Freely redistributable (BSD license)" ;
+    vamp:identifier       "spectralcentroid" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "2" ;
+    vamp:input_domain     vamp:FrequencyDomain ;
+
+    vamp:output      plugbase:spectralcentroid_output_logcentroid ;
+    vamp:output      plugbase:spectralcentroid_output_linearcentroid ;
+    .
+plugbase:spectralcentroid_output_logcentroid a  vamp:DenseOutput ;
+    vamp:identifier       "logcentroid" ;
+    dc:title              "Log Frequency Centroid" ;
+    dc:description        "Centroid of the log weighted frequency spectrum"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "Hz" ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:LogFrequencyCentroid ;
+    .
+plugbase:spectralcentroid_output_linearcentroid a  vamp:DenseOutput ;
+    vamp:identifier       "linearcentroid" ;
+    dc:title              "Linear Frequency Centroid" ;
+    dc:description        "Centroid of the linear frequency spectrum"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "Hz" ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type  af:LinearFrequencyCentroid ;
+    .
+plugbase:zerocrossing a   vamp:Plugin ;
+    dc:title              "Zero Crossings" ;
+    vamp:name             "Zero Crossings" ;
+    dc:description        "Detect and count zero crossing points" ;
+    foaf:page <http://www.vamp-plugins.org/plugin-doc/vamp-example-plugins.html#zerocrossing> ;
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ; 
+    cc:license            <http://creativecommons.org/licenses/BSD/> ;
+    dc:rights             "Freely redistributable (BSD license)" ;
+    vamp:identifier       "zerocrossing" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "2" ;
+    vamp:input_domain     vamp:TimeDomain ;
+    vamp:output      plugbase:zerocrossing_output_counts ;
+    vamp:output      plugbase:zerocrossing_output_zerocrossings ;
+    .
+plugbase:zerocrossing_output_counts a  vamp:DenseOutput ;
+    vamp:identifier       "counts" ;
+    dc:title              "Zero Crossing Counts" ;
+    dc:description        "The number of zero crossing points per processing block"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "crossings" ;
+    a                     vamp:QuantizedOutput ;
+    vamp:quantize_step    1  ;
+    vamp:bin_count        1 ;
+    vamp:bin_names        ( "");
+    vamp:computes_signal_type   af:ZeroCrossingCount ;
+    .
+plugbase:zerocrossing_output_zerocrossings a  vamp:SparseOutput ;
+    vamp:identifier       "zerocrossings" ;
+    dc:title              "Zero Crossings" ;
+    dc:description        "The locations of zero crossing points"  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    a                     vamp:QuantizedOutput ;
+    vamp:quantize_step    1  ;
+    vamp:bin_count        0 ;
+    vamp:bin_names        ();
+    vamp:sample_type      vamp:VariableSampleRate ;
+    vamp:computes_event_type   af:ZeroCrossing ;
+    .
+
diff --git a/lib-src/libvamp/examples/vamp-example-plugins.rdf b/lib-src/libvamp/examples/vamp-example-plugins.rdf
deleted file mode 100644
index 327da1c..0000000
--- a/lib-src/libvamp/examples/vamp-example-plugins.rdf
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF xmlns:af="http://purl.org/ontology/af/" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:plugbase="http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:vamp="http://purl.org/ontology/vamp/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xml:base="http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#">
-  <vamp:PluginDescription rdf:about="">
-    <foaf:maker rdf:resource="x"/>
-    <foaf:maker rdf:resource="http://www.vamp-plugins.org/doap.rdf#template-generator"/>
-    <foaf:primaryTopic rdf:resource=""/>
-  </vamp:PluginDescription>
-  <vamp:PluginLibrary rdf:about="#vamp-example-plugins">
-    <vamp:identifier>vamp-example-plugins</vamp:identifier>
-    <vamp:available_plugin rdf:resource="#amplitudefollower"/>
-    <vamp:available_plugin rdf:resource="#percussiononsets"/>
-    <vamp:available_plugin rdf:resource="#spectralcentroid"/>
-    <vamp:available_plugin rdf:resource="#zerocrossing"/>
-  </vamp:PluginLibrary>
-  <vamp:Plugin rdf:about="#amplitudefollower">
-    <dc:title>Amplitude Follower</dc:title>
-    <vamp:name>Amplitude Follower</vamp:name>
-    <dc:description>Track the amplitude of the audio signal</dc:description>
-    <foaf:maker>
-      <rdf:Description>
-        <foaf:name>Vamp SDK Example Plugins</foaf:name>
-      </rdf:Description>
-    </foaf:maker>
-    <vamp:identifier>amplitudefollower</vamp:identifier>
-    <vamp:vamp_API_version rdf:resource="http://purl.org/ontology/vamp/api_version_1"/>
-    <owl:versionInfo>1</owl:versionInfo>
-    <vamp:input_domain rdf:resource="http://purl.org/ontology/vamp/TimeDomain"/>
-    <vamp:parameter rdf:resource="#amplitudefollower_param_attack"/>
-    <vamp:parameter rdf:resource="#amplitudefollower_param_release"/>
-    <vamp:output rdf:resource="#amplitudefollower_output_amplitude"/>
-  </vamp:Plugin>
-  <vamp:Parameter rdf:about="#amplitudefollower_param_attack">
-    <vamp:identifier>attack</vamp:identifier>
-    <dc:title>Attack time</dc:title>
-    <dc:format>s</dc:format>
-    <vamp:min_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</vamp:min_value>
-    <vamp:max_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:max_value>
-    <vamp:unit>s</vamp:unit>
-    <vamp:default_value rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">0.01</vamp:default_value>
-    <vamp:value_names rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-  </vamp:Parameter>
-  <vamp:Parameter rdf:about="#amplitudefollower_param_release">
-    <vamp:identifier>release</vamp:identifier>
-    <dc:title>Release time</dc:title>
-    <dc:format>s</dc:format>
-    <vamp:min_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</vamp:min_value>
-    <vamp:max_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:max_value>
-    <vamp:unit>s</vamp:unit>
-    <vamp:default_value rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">0.01</vamp:default_value>
-    <vamp:value_names rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-  </vamp:Parameter>
-  <vamp:DenseOutput rdf:about="#amplitudefollower_output_amplitude">
-    <vamp:identifier>amplitude</vamp:identifier>
-    <dc:title>Amplitude</dc:title>
-    <dc:description></dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit>V</vamp:unit>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:bin_count>
-    <vamp:bin_names>
-      <rdf:Description>
-        <rdf:first></rdf:first>
-        <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-      </rdf:Description>
-    </vamp:bin_names>
-  </vamp:DenseOutput>
-  <vamp:Plugin rdf:about="#percussiononsets">
-    <dc:title>Simple Percussion Onset Detector</dc:title>
-    <vamp:name>Simple Percussion Onset Detector</vamp:name>
-    <dc:description>Detect percussive note onsets by identifying broadband energy rises</dc:description>
-    <foaf:maker>
-      <rdf:Description>
-        <foaf:name>Vamp SDK Example Plugins</foaf:name>
-      </rdf:Description>
-    </foaf:maker>
-    <vamp:identifier>percussiononsets</vamp:identifier>
-    <vamp:vamp_API_version rdf:resource="http://purl.org/ontology/vamp/api_version_1"/>
-    <owl:versionInfo>2</owl:versionInfo>
-    <vamp:input_domain rdf:resource="http://purl.org/ontology/vamp/FrequencyDomain"/>
-    <vamp:parameter rdf:resource="#percussiononsets_param_threshold"/>
-    <vamp:parameter rdf:resource="#percussiononsets_param_sensitivity"/>
-    <vamp:output rdf:resource="#percussiononsets_output_onsets"/>
-    <vamp:output rdf:resource="#percussiononsets_output_detectionfunction"/>
-  </vamp:Plugin>
-  <vamp:Parameter rdf:about="#percussiononsets_param_threshold">
-    <vamp:identifier>threshold</vamp:identifier>
-    <dc:title>Energy rise threshold</dc:title>
-    <dc:format>dB</dc:format>
-    <vamp:min_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</vamp:min_value>
-    <vamp:max_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">20</vamp:max_value>
-    <vamp:unit>dB</vamp:unit>
-    <vamp:default_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">3</vamp:default_value>
-    <vamp:value_names rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-  </vamp:Parameter>
-  <vamp:Parameter rdf:about="#percussiononsets_param_sensitivity">
-    <vamp:identifier>sensitivity</vamp:identifier>
-    <dc:title>Sensitivity</dc:title>
-    <dc:format>%</dc:format>
-    <vamp:min_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</vamp:min_value>
-    <vamp:max_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">100</vamp:max_value>
-    <vamp:unit>%</vamp:unit>
-    <vamp:default_value rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">40</vamp:default_value>
-    <vamp:value_names rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-  </vamp:Parameter>
-  <vamp:SparseOutput rdf:about="#percussiononsets_output_onsets">
-    <vamp:identifier>onsets</vamp:identifier>
-    <dc:title>Onsets</dc:title>
-    <dc:description>Percussive note onset locations</dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit></vamp:unit>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</vamp:bin_count>
-    <vamp:bin_names rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-    <vamp:sample_type rdf:resource="http://purl.org/ontology/vamp/VariableSampleRate"/>
-    <vamp:sample_rate rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">44100</vamp:sample_rate>
-  </vamp:SparseOutput>
-  <vamp:DenseOutput rdf:about="#percussiononsets_output_detectionfunction">
-    <vamp:identifier>detectionfunction</vamp:identifier>
-    <dc:title>Detection Function</dc:title>
-    <dc:description>Broadband energy rise detection function</dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit></vamp:unit>
-    <rdf:type rdf:resource="http://purl.org/ontology/vamp/QuantizedOutput"/>
-    <vamp:quantize_step rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:quantize_step>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:bin_count>
-    <vamp:bin_names>
-      <rdf:Description>
-        <rdf:first></rdf:first>
-        <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-      </rdf:Description>
-    </vamp:bin_names>
-  </vamp:DenseOutput>
-  <vamp:Plugin rdf:about="#spectralcentroid">
-    <dc:title>Spectral Centroid</dc:title>
-    <vamp:name>Spectral Centroid</vamp:name>
-    <dc:description>Calculate the centroid frequency of the spectrum of the input signal</dc:description>
-    <foaf:maker>
-      <rdf:Description>
-        <foaf:name>Vamp SDK Example Plugins</foaf:name>
-      </rdf:Description>
-    </foaf:maker>
-    <vamp:identifier>spectralcentroid</vamp:identifier>
-    <vamp:vamp_API_version rdf:resource="http://purl.org/ontology/vamp/api_version_1"/>
-    <owl:versionInfo>2</owl:versionInfo>
-    <vamp:input_domain rdf:resource="http://purl.org/ontology/vamp/FrequencyDomain"/>
-    <vamp:output rdf:resource="#spectralcentroid_output_logcentroid"/>
-    <vamp:output rdf:resource="#spectralcentroid_output_linearcentroid"/>
-  </vamp:Plugin>
-  <vamp:DenseOutput rdf:about="#spectralcentroid_output_logcentroid">
-    <vamp:identifier>logcentroid</vamp:identifier>
-    <dc:title>Log Frequency Centroid</dc:title>
-    <dc:description>Centroid of the log weighted frequency spectrum</dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit>Hz</vamp:unit>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:bin_count>
-    <vamp:bin_names>
-      <rdf:Description>
-        <rdf:first></rdf:first>
-        <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-      </rdf:Description>
-    </vamp:bin_names>
-  </vamp:DenseOutput>
-  <vamp:DenseOutput rdf:about="#spectralcentroid_output_linearcentroid">
-    <vamp:identifier>linearcentroid</vamp:identifier>
-    <dc:title>Linear Frequency Centroid</dc:title>
-    <dc:description>Centroid of the linear frequency spectrum</dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit>Hz</vamp:unit>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:bin_count>
-    <vamp:bin_names>
-      <rdf:Description>
-        <rdf:first></rdf:first>
-        <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-      </rdf:Description>
-    </vamp:bin_names>
-  </vamp:DenseOutput>
-  <vamp:Plugin rdf:about="#zerocrossing">
-    <dc:title>Zero Crossings</dc:title>
-    <vamp:name>Zero Crossings</vamp:name>
-    <dc:description>Detect and count zero crossing points</dc:description>
-    <foaf:maker>
-      <rdf:Description>
-        <foaf:name>Vamp SDK Example Plugins</foaf:name>
-      </rdf:Description>
-    </foaf:maker>
-    <vamp:identifier>zerocrossing</vamp:identifier>
-    <vamp:vamp_API_version rdf:resource="http://purl.org/ontology/vamp/api_version_1"/>
-    <owl:versionInfo>2</owl:versionInfo>
-    <vamp:input_domain rdf:resource="http://purl.org/ontology/vamp/TimeDomain"/>
-    <vamp:output rdf:resource="#zerocrossing_output_counts"/>
-    <vamp:output rdf:resource="#zerocrossing_output_zerocrossings"/>
-  </vamp:Plugin>
-  <vamp:DenseOutput rdf:about="#zerocrossing_output_counts">
-    <vamp:identifier>counts</vamp:identifier>
-    <dc:title>Zero Crossing Counts</dc:title>
-    <dc:description>The number of zero crossing points per processing block</dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit>crossings</vamp:unit>
-    <rdf:type rdf:resource="http://purl.org/ontology/vamp/QuantizedOutput"/>
-    <vamp:quantize_step rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:quantize_step>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:bin_count>
-    <vamp:bin_names>
-      <rdf:Description>
-        <rdf:first></rdf:first>
-        <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-      </rdf:Description>
-    </vamp:bin_names>
-  </vamp:DenseOutput>
-  <vamp:SparseOutput rdf:about="#zerocrossing_output_zerocrossings">
-    <vamp:identifier>zerocrossings</vamp:identifier>
-    <dc:title>Zero Crossings</dc:title>
-    <dc:description>The locations of zero crossing points</dc:description>
-    <vamp:fixed_bin_count>true</vamp:fixed_bin_count>
-    <vamp:unit></vamp:unit>
-    <rdf:type rdf:resource="http://purl.org/ontology/vamp/QuantizedOutput"/>
-    <vamp:quantize_step rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</vamp:quantize_step>
-    <vamp:bin_count rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</vamp:bin_count>
-    <vamp:bin_names rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-    <vamp:sample_type rdf:resource="http://purl.org/ontology/vamp/VariableSampleRate"/>
-    <vamp:sample_rate rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">44100</vamp:sample_rate>
-  </vamp:SparseOutput>
-</rdf:RDF>
diff --git a/lib-src/libvamp/host/vamp-simple-host.cpp b/lib-src/libvamp/host/vamp-simple-host.cpp
index 4b2ad65..1a6f72f 100644
--- a/lib-src/libvamp/host/vamp-simple-host.cpp
+++ b/lib-src/libvamp/host/vamp-simple-host.cpp
@@ -6,8 +6,7 @@
     An API for audio analysis and feature extraction plugins.
 
     Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006 Chris Cannam.
-    FFT code from Don Cross's public domain FFT implementation.
+    Copyright 2006 Chris Cannam, copyright 2007-2008 QMUL.
   
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
@@ -35,11 +34,21 @@
     authorization.
 */
 
-#include "vamp-sdk/PluginHostAdapter.h"
-#include "vamp-sdk/hostext/PluginChannelAdapter.h"
-#include "vamp-sdk/hostext/PluginInputDomainAdapter.h"
-#include "vamp-sdk/hostext/PluginLoader.h"
-#include "vamp/vamp.h"
+
+/*
+ * This "simple" Vamp plugin host is no longer as simple as it was; it
+ * now has a lot of options and includes a lot of code to handle the
+ * various useful listing modes it supports.
+ *
+ * However, the runPlugin function still contains a reasonable
+ * implementation of a fairly generic Vamp plugin host capable of
+ * evaluating a given output on a given plugin for a sound file read
+ * via libsndfile.
+ */
+
+#include <vamp-hostsdk/PluginHostAdapter.h>
+#include <vamp-hostsdk/PluginInputDomainAdapter.h>
+#include <vamp-hostsdk/PluginLoader.h>
 
 #include <iostream>
 #include <fstream>
@@ -59,13 +68,16 @@ using Vamp::Plugin;
 using Vamp::PluginHostAdapter;
 using Vamp::RealTime;
 using Vamp::HostExt::PluginLoader;
+using Vamp::HostExt::PluginWrapper;
+using Vamp::HostExt::PluginInputDomainAdapter;
 
-#define HOST_VERSION "1.1"
+#define HOST_VERSION "1.4"
 
 enum Verbosity {
     PluginIds,
     PluginOutputIds,
-    PluginInformation
+    PluginInformation,
+    PluginInformationDetailed
 };
 
 void printFeatures(int, int, int, Plugin::FeatureSet, ofstream *, bool frames);
@@ -81,9 +93,9 @@ int runPlugin(string myname, string soname, string id, string output,
 void usage(const char *name)
 {
     cerr << "\n"
-         << name << ": A simple Vamp plugin host.\n\n"
+         << name << ": A command-line host for Vamp audio analysis plugins.\n\n"
         "Centre for Digital Music, Queen Mary, University of London.\n"
-        "Copyright 2006-2007 Chris Cannam and QMUL.\n"
+        "Copyright 2006-2008 Chris Cannam and QMUL.\n"
         "Freely redistributable; published under a BSD-style license.\n\n"
         "Usage:\n\n"
         "  " << name << " [-s] pluginlibrary[." << PLUGIN_SUFFIX << "]:plugin[:output] file.wav [-o out.txt]\n"
@@ -98,9 +110,13 @@ void usage(const char *name)
         "       If the -s option is given, results will be labelled with the audio\n"
         "       sample frame at which they occur. Otherwise, they will be labelled\n"
         "       with time in seconds.\n\n"
-        "  " << name << " -l\n\n"
+        "  " << name << " -l\n"
+        "  " << name << " --list\n\n"
         "    -- List the plugin libraries and Vamp plugins in the library search path\n"
         "       in a verbose human-readable format.\n\n"
+        "  " << name << " --list-full\n\n"
+        "    -- List all data reported by all the Vamp plugins in the library search\n"
+        "       path in a very verbose human-readable format.\n\n"
         "  " << name << " --list-ids\n\n"
         "    -- List the plugins in the search path in a terse machine-readable format,\n"
         "       in the form vamp:soname:identifier.\n\n"
@@ -139,12 +155,17 @@ int main(int argc, char **argv)
                  << "Vamp SDK version: " << VAMP_SDK_VERSION << endl;
             return 0;
 
-        } else if (!strcmp(argv[1], "-l")) {
+        } else if (!strcmp(argv[1], "-l") || !strcmp(argv[1], "--list")) {
 
             printPluginPath(true);
             enumeratePlugins(PluginInformation);
             return 0;
 
+        } else if (!strcmp(argv[1], "--list-full")) {
+
+            enumeratePlugins(PluginInformationDetailed);
+            return 0;
+
         } else if (!strcmp(argv[1], "-p")) {
 
             printPluginPath(false);
@@ -286,6 +307,17 @@ int runPlugin(string myname, string soname, string id,
 
     cerr << "Running plugin: \"" << plugin->getIdentifier() << "\"..." << endl;
 
+    // Note that the following would be much simpler if we used a
+    // PluginBufferingAdapter as well -- i.e. if we had passed
+    // PluginLoader::ADAPT_ALL to loader->loadPlugin() above, instead
+    // of ADAPT_ALL_SAFE.  Then we could simply specify our own block
+    // size, keep the step size equal to the block size, and ignore
+    // the plugin's bleatings.  However, there are some issues with
+    // using a PluginBufferingAdapter that make the results sometimes
+    // technically different from (if effectively the same as) the
+    // un-adapted plugin, so we aren't doing that here.  See the
+    // PluginBufferingAdapter documentation for details.
+
     int blockSize = plugin->getPreferredBlockSize();
     int stepSize = plugin->getPreferredStepSize();
 
@@ -317,6 +349,10 @@ int runPlugin(string myname, string soname, string id,
     cerr << "Using block size = " << blockSize << ", step size = "
               << stepSize << endl;
 
+    // The channel queries here are for informational purposes only --
+    // a PluginChannelAdapter is being used automatically behind the
+    // scenes, and it will take case of any channel mismatch
+
     int minch = plugin->getMinChannelCount();
     int maxch = plugin->getMaxChannelCount();
     cerr << "Plugin accepts " << minch << " -> " << maxch << " channel(s)" << endl;
@@ -328,6 +364,10 @@ int runPlugin(string myname, string soname, string id,
     int returnValue = 1;
     int progress = 0;
 
+    RealTime rt;
+    PluginWrapper *wrapper = 0;
+    RealTime adjustment = RealTime::zeroTime;
+
     if (outputs.empty()) {
 	cerr << "ERROR: Plugin has no outputs!" << endl;
         goto done;
@@ -365,6 +405,15 @@ int runPlugin(string myname, string soname, string id,
         goto done;
     }
 
+    wrapper = dynamic_cast<PluginWrapper *>(plugin);
+    if (wrapper) {
+        // See documentation for
+        // PluginInputDomainAdapter::getTimestampAdjustment
+        PluginInputDomainAdapter *ida =
+            wrapper->getWrapper<PluginInputDomainAdapter>();
+        if (ida) adjustment = ida->getTimestampAdjustment();
+    }
+
     for (size_t i = 0; i < sfinfo.frames; i += stepSize) {
 
         int count;
@@ -391,9 +440,11 @@ int runPlugin(string myname, string soname, string id,
             }
         }
 
+        rt = RealTime::frame2RealTime(i, sfinfo.samplerate);
+
         printFeatures
-            (i, sfinfo.samplerate, outputNo, plugin->process
-             (plugbuf, RealTime::frame2RealTime(i, sfinfo.samplerate)),
+            (RealTime::realTime2Frame(rt + adjustment, sfinfo.samplerate),
+             sfinfo.samplerate, outputNo, plugin->process(plugbuf, rt),
              out, useFrames);
 
         int pp = progress;
@@ -404,7 +455,10 @@ int runPlugin(string myname, string soname, string id,
     }
     if (out) cerr << "\rDone" << endl;
 
-    printFeatures(sfinfo.frames, sfinfo.samplerate, outputNo,
+    rt = RealTime::frame2RealTime(sfinfo.frames, sfinfo.samplerate);
+
+    printFeatures(RealTime::realTime2Frame(rt + adjustment, sfinfo.samplerate),
+                  sfinfo.samplerate, outputNo,
                   plugin->getRemainingFeatures(), out, useFrames);
 
     returnValue = 0;
@@ -434,7 +488,15 @@ printFeatures(int frame, int sr, int output,
                     (features[output][i].timestamp, sr);
             }
 
-            (out ? *out : cout) << displayFrame << ":";
+            (out ? *out : cout) << displayFrame;
+
+            if (features[output][i].hasDuration) {
+                displayFrame = RealTime::realTime2Frame
+                    (features[output][i].duration, sr);
+                (out ? *out : cout) << "," << displayFrame;
+            }
+
+            (out ? *out : cout)  << ":";
 
         } else {
 
@@ -444,7 +506,14 @@ printFeatures(int frame, int sr, int output,
                 rt = features[output][i].timestamp;
             }
 
-            (out ? *out : cout) << rt.toString() << ":";
+            (out ? *out : cout) << rt.toString();
+
+            if (features[output][i].hasDuration) {
+                rt = features[output][i].duration;
+                (out ? *out : cout) << "," << rt.toString();
+            }
+
+            (out ? *out : cout) << ":";
         }
 
         for (unsigned int j = 0; j < features[output][i].values.size(); ++j) {
@@ -474,6 +543,18 @@ printPluginPath(bool verbose)
     if (verbose) cout << endl;
 }
 
+static
+string
+header(string text, int level)
+{
+    string out = '\n' + text + '\n';
+    for (size_t i = 0; i < text.length(); ++i) {
+        out += (level == 1 ? '=' : level == 2 ? '-' : '~');
+    }
+    out += '\n';
+    return out;
+}
+
 void
 enumeratePlugins(Verbosity verbosity)
 {
@@ -507,6 +588,10 @@ enumeratePlugins(Verbosity verbosity)
             index = 0;
             if (verbosity == PluginInformation) {
                 cout << "\n  " << path << ":" << endl;
+            } else if (verbosity == PluginInformationDetailed) {
+                string::size_type ki = i->second.find(':');
+                string text = "Library \"" + i->second.substr(0, ki) + "\"";
+                cout << "\n" << header(text, 1);
             }
         }
 
@@ -516,6 +601,16 @@ enumeratePlugins(Verbosity verbosity)
             char c = char('A' + index);
             if (c > 'Z') c = char('a' + (index - 26));
 
+            PluginLoader::PluginCategoryHierarchy category =
+                loader->getPluginCategory(key);
+            string catstr;
+            if (!category.empty()) {
+                for (size_t ci = 0; ci < category.size(); ++ci) {
+                    if (ci > 0) catstr += " > ";
+                        catstr += category[ci];
+                }
+            }
+
             if (verbosity == PluginInformation) {
 
                 cout << "    [" << c << "] [v"
@@ -523,22 +618,42 @@ enumeratePlugins(Verbosity verbosity)
                      << plugin->getName() << ", \""
                      << plugin->getIdentifier() << "\"" << " ["
                      << plugin->getMaker() << "]" << endl;
-
-                PluginLoader::PluginCategoryHierarchy category =
-                    loader->getPluginCategory(key);
-
-                if (!category.empty()) {
-                    cout << "       ";
-                    for (size_t ci = 0; ci < category.size(); ++ci) {
-                        cout << " > " << category[ci];
-                    }
-                    cout << endl;
+                
+                if (catstr != "") {
+                    cout << "       > " << catstr << endl;
                 }
 
                 if (plugin->getDescription() != "") {
                     cout << "        - " << plugin->getDescription() << endl;
                 }
 
+            } else if (verbosity == PluginInformationDetailed) {
+
+                cout << header(plugin->getName(), 2);
+                cout << " - Identifier:         "
+                     << key << endl;
+                cout << " - Plugin Version:     " 
+                     << plugin->getPluginVersion() << endl;
+                cout << " - Vamp API Version:   "
+                     << plugin->getVampApiVersion() << endl;
+                cout << " - Maker:              \""
+                     << plugin->getMaker() << "\"" << endl;
+                cout << " - Copyright:          \""
+                     << plugin->getCopyright() << "\"" << endl;
+                cout << " - Description:        \""
+                     << plugin->getDescription() << "\"" << endl;
+                cout << " - Input Domain:       "
+                     << (plugin->getInputDomain() == Vamp::Plugin::TimeDomain ?
+                         "Time Domain" : "Frequency Domain") << endl;
+                cout << " - Default Step Size:  " 
+                     << plugin->getPreferredStepSize() << endl;
+                cout << " - Default Block Size: " 
+                     << plugin->getPreferredBlockSize() << endl;
+                cout << " - Minimum Channels:   " 
+                     << plugin->getMinChannelCount() << endl;
+                cout << " - Maximum Channels:   " 
+                     << plugin->getMaxChannelCount() << endl;
+
             } else if (verbosity == PluginIds) {
                 cout << "vamp:" << key << endl;
             }
@@ -546,6 +661,91 @@ enumeratePlugins(Verbosity verbosity)
             Plugin::OutputList outputs =
                 plugin->getOutputDescriptors();
 
+            if (verbosity == PluginInformationDetailed) {
+
+                Plugin::ParameterList params = plugin->getParameterDescriptors();
+                for (size_t j = 0; j < params.size(); ++j) {
+                    Plugin::ParameterDescriptor &pd(params[j]);
+                    cout << "\nParameter " << j+1 << ": \"" << pd.name << "\"" << endl;
+                    cout << " - Identifier:         " << pd.identifier << endl;
+                    cout << " - Description:        \"" << pd.description << "\"" << endl;
+                    if (pd.unit != "") {
+                        cout << " - Unit:               " << pd.unit << endl;
+                    }
+                    cout << " - Range:              ";
+                    cout << pd.minValue << " -> " << pd.maxValue << endl;
+                    cout << " - Default:            ";
+                    cout << pd.defaultValue << endl;
+                    if (pd.isQuantized) {
+                        cout << " - Quantize Step:      "
+                             << pd.quantizeStep << endl;
+                    }
+                    if (!pd.valueNames.empty()) {
+                        cout << " - Value Names:        ";
+                        for (size_t k = 0; k < pd.valueNames.size(); ++k) {
+                            if (k > 0) cout << ", ";
+                            cout << "\"" << pd.valueNames[k] << "\"";
+                        }
+                        cout << endl;
+                    }
+                }
+
+                if (outputs.empty()) {
+                    cout << "\n** Note: This plugin reports no outputs!" << endl;
+                }
+                for (size_t j = 0; j < outputs.size(); ++j) {
+                    Plugin::OutputDescriptor &od(outputs[j]);
+                    cout << "\nOutput " << j+1 << ": \"" << od.name << "\"" << endl;
+                    cout << " - Identifier:         " << od.identifier << endl;
+                    cout << " - Description:        \"" << od.description << "\"" << endl;
+                    if (od.unit != "") {
+                        cout << " - Unit:               " << od.unit << endl;
+                    }
+                    if (od.hasFixedBinCount) {
+                        cout << " - Default Bin Count:  " << od.binCount << endl;
+                    }
+                    if (!od.binNames.empty()) {
+                        bool have = false;
+                        for (size_t k = 0; k < od.binNames.size(); ++k) {
+                            if (od.binNames[k] != "") {
+                                have = true; break;
+                            }
+                        }
+                        if (have) {
+                            cout << " - Bin Names:          ";
+                            for (size_t k = 0; k < od.binNames.size(); ++k) {
+                                if (k > 0) cout << ", ";
+                                cout << "\"" << od.binNames[k] << "\"";
+                            }
+                            cout << endl;
+                        }
+                    }
+                    if (od.hasKnownExtents) {
+                        cout << " - Default Extents:    ";
+                        cout << od.minValue << " -> " << od.maxValue << endl;
+                    }
+                    if (od.isQuantized) {
+                        cout << " - Quantize Step:      "
+                             << od.quantizeStep << endl;
+                    }
+                    cout << " - Sample Type:        "
+                         << (od.sampleType ==
+                             Plugin::OutputDescriptor::OneSamplePerStep ?
+                             "One Sample Per Step" :
+                             od.sampleType ==
+                             Plugin::OutputDescriptor::FixedSampleRate ?
+                             "Fixed Sample Rate" :
+                             "Variable Sample Rate") << endl;
+                    if (od.sampleType !=
+                        Plugin::OutputDescriptor::OneSamplePerStep) {
+                        cout << " - Default Rate:       "
+                             << od.sampleRate << endl;
+                    }
+                    cout << " - Has Duration:       "
+                         << (od.hasDuration ? "Yes" : "No") << endl;
+                }
+            }
+
             if (outputs.size() > 1 || verbosity == PluginOutputIds) {
                 for (size_t j = 0; j < outputs.size(); ++j) {
                     if (verbosity == PluginInformation) {
@@ -568,7 +768,8 @@ enumeratePlugins(Verbosity verbosity)
         }
     }
 
-    if (verbosity == PluginInformation) {
+    if (verbosity == PluginInformation ||
+        verbosity == PluginInformationDetailed) {
         cout << endl;
     }
 }
diff --git a/lib-src/libvamp/optional-progs.patch b/lib-src/libvamp/optional-progs.patch
new file mode 100644
index 0000000..6dda939
--- /dev/null
+++ b/lib-src/libvamp/optional-progs.patch
@@ -0,0 +1,53 @@
+Index: Makefile.in
+===================================================================
+RCS file: /cvsroot/audacity/lib-src/libvamp/Makefile.in,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.in
+--- Makefile.in	29 Dec 2008 22:00:31 -0000	1.4
++++ Makefile.in	23 Jan 2009 23:11:52 -0000
+@@ -34,7 +34,7 @@
+ #   clean     -- remove binary targets
+ #   distclean -- remove all targets
+ #
+-default:	all
++default: @TARGETS@
+ 
+ # Compile flags
+ #
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/audacity/lib-src/libvamp/configure.ac,v
+retrieving revision 1.1
+diff -u -r1.1 configure.ac
+--- configure.ac	29 Dec 2008 22:00:31 -0000	1.1
++++ configure.ac	23 Jan 2009 23:11:52 -0000
+@@ -14,7 +14,28 @@
+ 
+ AC_SEARCH_LIBS([dlopen],[dl])
+ 
+-PKG_CHECK_MODULES([SNDFILE],[sndfile])
++dnl See if the user wants to build programs, or just the SDK
++AC_ARG_ENABLE(programs,	[AS_HELP_STRING([--enable-programs],
++	[enable building of example host and RDF generator [default=yes]])],
++	PROGS_ARGUMENT=$enableval,
++	PROGS_ARGUMENT="yes")
++
++dnl if the user wants progs, then we need to check for libsndfile
++if test "x$PROGS_ARGUMENT" = "xyes" ; then 
++	PKG_CHECK_MODULES([SNDFILE],[sndfile], 
++					  have_sndfile="yes", have_sndfile="no")
++	if test "x$have_sndfile" = "xyes" ; then
++		dnl all good, build everything
++		TARGETS="sdk plugins host rdfgen test"
++	else
++		dnl no libsndfile - can't build host!
++		AC_MSG_ERROR([libsndfile not found - cannot build example Vamp host!])
++	fi
++else
++	dnl user didn't want programs - so we won't build them
++	TARGETS="sdk plugins test"
++fi
++
+ AC_SUBST(SNDFILE_CFLAGS)
+ AC_SUBST(SNDFILE_LIBS)
+ 
diff --git a/lib-src/libvamp/pkgconfig/vamp-hostsdk.pc.in b/lib-src/libvamp/pkgconfig/vamp-hostsdk.pc.in
new file mode 100644
index 0000000..fbe2c7d
--- /dev/null
+++ b/lib-src/libvamp/pkgconfig/vamp-hostsdk.pc.in
@@ -0,0 +1,10 @@
+prefix=%PREFIX%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: vamp-hostsdk
+Version: 2.0.0
+Description: Development library for Vamp audio analysis plugin hosts
+Libs: -L${libdir} -lvamp-hostsdk
+Cflags: -I${includedir} 
diff --git a/lib-src/libvamp/pkgconfig/vamp-sdk.pc.in b/lib-src/libvamp/pkgconfig/vamp-sdk.pc.in
new file mode 100644
index 0000000..3ac54a3
--- /dev/null
+++ b/lib-src/libvamp/pkgconfig/vamp-sdk.pc.in
@@ -0,0 +1,10 @@
+prefix=%PREFIX%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: vamp-sdk
+Version: 2.0.0
+Description: Development library for Vamp audio analysis plugins
+Libs: -L${libdir} -lvamp-sdk
+Cflags: -I${includedir} 
diff --git a/lib-src/libvamp/pkgconfig/vamp.pc.in b/lib-src/libvamp/pkgconfig/vamp.pc.in
new file mode 100644
index 0000000..24cf046
--- /dev/null
+++ b/lib-src/libvamp/pkgconfig/vamp.pc.in
@@ -0,0 +1,10 @@
+prefix=%PREFIX%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: vamp
+Version: 2.0
+Description: An API for audio analysis and feature extraction plugins
+Libs: 
+Cflags: -I${includedir} 
diff --git a/lib-src/libvamp/rdf/README b/lib-src/libvamp/rdf/README
new file mode 100644
index 0000000..c7c5924
--- /dev/null
+++ b/lib-src/libvamp/rdf/README
@@ -0,0 +1,7 @@
+Vamp Ontology/Transform OWL description
+
+David Pastor Escuredo
+with Chris Sutton, Yves Raimond, Chris Cannam
+
+Copyright 2008, Centre For Digital Music, Queen Mary, University of London.
+
diff --git a/lib-src/libvamp/rdf/ToDo b/lib-src/libvamp/rdf/ToDo
new file mode 100644
index 0000000..1e643f0
--- /dev/null
+++ b/lib-src/libvamp/rdf/ToDo
@@ -0,0 +1,4 @@
+-automatic library URI assignment (not is a bit tricky)
+-rules to define TrackLevelOutputs and other exceptions
+-mapping vamp-audio features
+...
diff --git a/lib-src/libvamp/rdf/doc/glance.htm b/lib-src/libvamp/rdf/doc/glance.htm
new file mode 100644
index 0000000..a7b4b7f
--- /dev/null
+++ b/lib-src/libvamp/rdf/doc/glance.htm
@@ -0,0 +1,2 @@
+<h2 id="overview">Overview of Terms</h2>
+<p>An alphabetical index of the ontology terms, divided into classes, properties and individuals. All the terms are hyperlinked to their detailed description for quick reference.</p>
\ No newline at end of file
diff --git a/lib-src/libvamp/rdf/doc/vamp.html b/lib-src/libvamp/rdf/doc/vamp.html
new file mode 100644
index 0000000..4b88268
--- /dev/null
+++ b/lib-src/libvamp/rdf/doc/vamp.html
@@ -0,0 +1,813 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<link rel="meta" type="application/rdf+xml" title="FOAF" href="" />
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<meta name="author" content="" />
+<link href="style.css" rel="stylesheet" type="text/css" /><meta name="robots" content="all" />
+<title>Vamp Plugins Ontology</title>
+</head>
+<body><h2 id="overview">Overview of Terms</h2>
+<p>An alphabetical index of the ontology terms, divided into classes, properties and individuals. All the terms are hyperlinked to their detailed description for quick reference.</p><div class="glance" id="glance">
+<p>Classes: | <a href="#term_Configuration">Configuration</a> | <a href="#term_DenseOutput">DenseOutput</a> | <a href="#term_Feature">Feature</a> | <a href="#term_InputDomain">InputDomain</a> | <a href="#term_Parameter">Parameter</a> | <a href="#term_ParameterDescriptor">ParameterDescriptor</a> | <a href="#term_Plugin">Plugin</a> | <a href="#term_PluginDescription">PluginDescription</a> | <a href="#term_PluginLibrary">PluginLibrary</a> | <a href="#term_PluginOutput">PluginOutput</a> | <a href="#term_PluginProgram">PluginProgram</a> | <a href="#term_SampleType">SampleType</a> | <a href="#term_SparseOutput">SparseOutput</a> | <a href="#term_TrackLevelOutput">TrackLevelOutput</a> | <a href="#term_Transform">Transform</a> | <a href="#term_TransformType">TransformType</a> |  </p>
+<p>Properties: | <a href="#term_available_plugin">available_plugin</a> | 
+<a href="#term_bin_count">bin_count</a> | 
+<a href="#term_bin_names">bin_names</a> | 
+<a href="#term_block_size">block_size</a> | 
+<a href="#term_computes_feature_type">computes_feature_type</a> | 
+<a href="#term_default_value">default_value</a> | 
+<a href="#term_duration">duration</a> | 
+<a href="#term_engine">engine</a> | 
+<a href="#term_fixed_bin_count">fixed_bin_count</a> | 
+<a href="#term_identifier">identifier</a> | 
+<a href="#term_input_domain">input_domain</a> | 
+<a href="#term_max_value">max_value</a> | 
+<a href="#term_min_value">min_value</a> | 
+<a href="#term_name">name</a> | 
+<a href="#term_output_descriptor">output_descriptor</a> | 
+<a href="#term_parameter">parameter</a> | 
+<a href="#term_parameter_descriptor">parameter_descriptor</a> | 
+<a href="#term_plugin_description">plugin_description</a> | 
+<a href="#term_program">program</a> | 
+<a href="#term_quantized_step">quantized_step</a> | 
+<a href="#term_sample_rate">sample_rate</a> | 
+<a href="#term_sample_type">sample_type</a> | 
+<a href="#term_start">start</a> | 
+<a href="#term_step_size">step_size</a> | 
+<a href="#term_transform_type">transform_type</a> | 
+<a href="#term_unit">unit</a> | 
+<a href="#term_value">value</a> | 
+<a href="#term_vamp_API_version">vamp_API_version</a> | 
+<a href="#term_window_type">window_type</a> | 
+</p>
+<p>Individuals: | <a href="#term_Effect">Effect</a> | 
+<a href="#term_FeatureExtraction">FeatureExtraction</a> | 
+<a href="#term_FixedSampleRate">FixedSampleRate</a> | 
+<a href="#term_OneSamplePerStep">OneSamplePerStep</a> | 
+<a href="#term_VariableSampleRate">VariableSampleRate</a> | 
+<a href="#term_frequency_domain">frequency_domain</a> | 
+<a href="#term_time_domain">time_domain</a> | 
+ </p></div><h2 id="terms_classes">Classes</h2><div class="specterm" id="term_Configuration"><h3>Class: vamp:Configuration   -   unstable   -   </h3>
+<em>Configuration</em>
+ - 			For extension (SV implementation of Transform).<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_program">program</a></td>
+</tr>
+
+
+</table>
+
+</div><div class="specterm" id="term_DenseOutput"><h3>Class: vamp:DenseOutput   -   unstable   -   </h3>
+<em>DenseOutput</em>
+ - 			Specific output type comprising large binary data (e.g.: chromagram).<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+
+<tr><th>sub-class-of:</th><td><a href="#term_PluginOutput">PluginOutput</a></td>
+</tr>
+</table>
+
+</div><div class="specterm" id="term_Feature"><h3>Class: vamp:Feature   -   deprecated   -   </h3>
+<em>Feature</em>
+ - This may be removed mighty soon as we rely on the Audio Features Ontology for this 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+
+</table>
+
+</div><div class="specterm" id="term_InputDomain"><h3>Class: vamp:InputDomain   -   stable   -   </h3>
+<em>InputDomain</em>
+ - 			Plugins warn about the input domain they require so the host can convert properly the input data. Note that this is not necessary if the host is using a PluginAdapter to wrap plugins (see Vamp doc).<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_input_domain">input_domain</a></td>
+</tr>
+
+
+</table>
+
+</div><div class="specterm" id="term_Parameter"><h3>Class: vamp:Parameter   -   unstable   -   </h3>
+<em>Parameter</em>
+ - 			Parameter used by the plugin transform to set up the plugin. The parameter class instances should be instantiated according to the specific vamp:PluginDescriptor instance for each plugin.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_parameter">parameter</a></td>
+</tr>
+
+<tr><th>in-domain-of:</th><td><a href="#term_value">value</a></td>
+<td><a href="#term_parameter_descriptor">parameter_descriptor</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_ParameterDescriptor"><h3>Class: vamp:ParameterDescriptor   -   stable   -   </h3>
+<em>ParameterDescriptor</em>
+ - 			Descriptior of a plugin parameter. Hosts require to know about the specific type and form of the parameters of a particular plugin for a correct transform setup.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_default_value">default_value</a></td>
+<td><a href="#term_min_value">min_value</a></td>
+<td><a href="#term_max_value">max_value</a></td>
+<td><a href="#term_parameter_descriptor">parameter_descriptor</a></td>
+</tr>
+
+<tr><th>in-domain-of:</th><td><a href="#term_quantized_step">quantized_step</a></td>
+<td><a href="#term_unit">unit</a></td>
+<td><a href="#term_identifier">identifier</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_Plugin"><h3>Class: vamp:Plugin   -   stable   -   </h3>
+<em>Plugin</em>
+ - 		Vamp plugin is an implementation of a feature extraction algorithm based on the Vamp API. <br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_engine">engine</a></td>
+<td><a href="#term_available_plugin">available_plugin</a></td>
+</tr>
+
+<tr><th>in-domain-of:</th><td><a href="#term_input_domain">input_domain</a></td>
+<td><a href="#term_output_descriptor">output_descriptor</a></td>
+<td><a href="#term_parameter_descriptor">parameter_descriptor</a></td>
+<td><a href="#term_plugin_description">plugin_description</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_PluginDescription"><h3>Class: vamp:PluginDescription   -   unstable   -   </h3>
+<em>PluginDescription</em>
+ - 			The plugin descriptor provides basic metadata of the plugin. We may remove this and link directly to the plugin instance.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_plugin_description">plugin_description</a></td>
+</tr>
+
+<tr><th>in-domain-of:</th><td><a href="#term_vamp_API_version">vamp_API_version</a></td>
+<td><a href="#term_name">name</a></td>
+<td><a href="#term_identifier">identifier</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_PluginLibrary"><h3>Class: vamp:PluginLibrary   -   stable   -   </h3>
+<em>PluginLibrary</em>
+ - 			Library of Vamp Plugins. This may need to include rights.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+<tr><th>in-domain-of:</th><td><a href="#term_available_plugin">available_plugin</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_PluginOutput"><h3>Class: vamp:PluginOutput   -   unstable   -   </h3>
+<em>PluginOutput</em>
+ - 		Descriptior of the plugin output. This descriptor provides necessary information to interpret correctly the output features. The output type will determine how to read the temporal information of the extracted feature and how to manage the burden of ouput data.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_min_value">min_value</a></td>
+<td><a href="#term_max_value">max_value</a></td>
+<td><a href="#term_output_descriptor">output_descriptor</a></td>
+</tr>
+
+<tr><th>in-domain-of:</th><td><a href="#term_computes_feature_type">computes_feature_type</a></td>
+<td><a href="#term_sample_type">sample_type</a></td>
+<td><a href="#term_bin_names">bin_names</a></td>
+<td><a href="#term_bin_count">bin_count</a></td>
+<td><a href="#term_quantized_step">quantized_step</a></td>
+<td><a href="#term_sample_rate">sample_rate</a></td>
+<td><a href="#term_unit">unit</a></td>
+<td><a href="#term_fixed_bin_count">fixed_bin_count</a></td>
+<td><a href="#term_identifier">identifier</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_PluginProgram"><h3>Class: vamp:PluginProgram   -   unstable   -   </h3>
+<em>PluginProgram</em>
+ - 			Plugin program defines a predefined context of parameters. We may not need a concept for this and just a property linking a string representing the program name.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_program">program</a></td>
+</tr>
+
+<tr><th>in-domain-of:</th><td><a href="#term_identifier">identifier</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_SampleType"><h3>Class: vamp:SampleType   -   stable   -   </h3>
+<em>SampleType</em>
+ - 			Sample type specifies the temporal information of the plugin output. This information should be confronted with the output type for a correct interpretation.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }"><tr><th>in-range-of:</th><td><a href="#term_sample_type">sample_type</a></td>
+</tr>
+
+
+</table>
+
+</div><div class="specterm" id="term_SparseOutput"><h3>Class: vamp:SparseOutput   -   unstable   -   </h3>
+<em>SparseOutput</em>
+ - 			Specific output type used in sparse data outputs (e.g.: key detector).<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+
+<tr><th>sub-class-of:</th><td><a href="#term_PluginOutput">PluginOutput</a></td>
+</tr>
+</table>
+
+</div><div class="specterm" id="term_TrackLevelOutput"><h3>Class: vamp:TrackLevelOutput   -   unstable   -   </h3>
+<em>TrackLevelOutput</em>
+ - 			Specific output type that returns track level information. This sort of output will require a "hacky" interpretation of the feature timestamp as it will reflect some track metadata instead of temporal data.<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+
+<tr><th>sub-class-of:</th><td><a href="#term_PluginOutput">PluginOutput</a></td>
+</tr>
+</table>
+
+</div><div class="specterm" id="term_Transform"><h3>Class: vamp:Transform   -   stable   -   </h3>
+<em>Transform</em>
+ - 			The Transform defines the environment of any audio processing computation. <br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+<tr><th>in-domain-of:</th><td><a href="#term_duration">duration</a></td>
+<td><a href="#term_start">start</a></td>
+<td><a href="#term_window_type">window_type</a></td>
+<td><a href="#term_transform_type">transform_type</a></td>
+<td><a href="#term_block_size">block_size</a></td>
+<td><a href="#term_step_size">step_size</a></td>
+<td><a href="#term_parameter">parameter</a></td>
+<td><a href="#term_program">program</a></td>
+<td><a href="#term_engine">engine</a></td>
+<td><a href="#term_sample_rate">sample_rate</a></td>
+<td><a href="#term_identifier">identifier</a></td>
+</tr>
+
+</table>
+
+</div><div class="specterm" id="term_TransformType"><h3>Class: vamp:TransformType   -   unstable   -   </h3>
+<em>TransformType</em>
+ - 		Specifies the type of transform. May be feature extraction, effect...<br/>
+	 
+<br/>
+<p style="float: right; font-size: small;">[<a href="#glance">back to top</a>]</p>
+<br/>
+<table style="th { float: top; }">
+
+</table>
+
+</div><h2 id="terms_props">Properties</h2><div class="specterm" id="term_available_plugin">
+<h3>Property: vamp:available_plugin   -   stable   -   </h3>
+<em>available_plugin</em> - 			Available plugins in the library<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginLibrary">PluginLibrary</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_Plugin">Plugin</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_bin_count">
+<h3>Property: vamp:bin_count   -   unstable   -   </h3>
+<em>bin_count</em> - 		Number of elements of the bin output. This information is necessary to define the output as belonging to a specific subclass of Plugin Output.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_bin_names">
+<h3>Property: vamp:bin_names   -   unstable   -   </h3>
+<em>bin_names</em> - 		List of bin names if available<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_block_size">
+<h3>Property: vamp:block_size   -   stable   -   </h3>
+<em>block_size</em> - 			Specifies the block size for the framing. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_computes_feature_type">
+<h3>Property: vamp:computes_feature_type   -   unstable   -   </h3>
+<em>computes_feature_type</em> - 			Feature Types output by the plugin. Links the vamp ontology to the audio features ontology.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="http://purl.org/ontology/af/AudioFeature">af:AudioFeature</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_default_value">
+<h3>Property: vamp:default_value   -   unstable   -   </h3>
+<em>default_value</em> - 		Default value of the parameter<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_duration">
+<h3>Property: vamp:duration   -   unstable   -   </h3>
+<em>duration</em> - 			Specifies temporal information when processing a data stream. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_engine">
+<h3>Property: vamp:engine   -   stable   -   </h3>
+<em>engine</em> - 			Specifies the plugin in execution. This is an extension to use Transform with other plugin libraries<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_Plugin">Plugin</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_fixed_bin_count">
+<h3>Property: vamp:fixed_bin_count   -   unstable   -   </h3>
+<em>fixed_bin_count</em> - 		Fixed bin count. A boolean type.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_identifier">
+<h3>Property: vamp:identifier   -   stable   -   </h3>
+<em>identifier</em> - 		Machine-readable identifier for Vamp plugin classes (and Transform).<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+<td><a href="#term_PluginProgram">PluginProgram</a></td>
+<td><a href="#term_PluginDescription">PluginDescription</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_input_domain">
+<h3>Property: vamp:input_domain   -   stable   -   </h3>
+<em>input_domain</em> - 			Input domain allowed by the plugin (time or frequency).<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Plugin">Plugin</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_InputDomain">InputDomain</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_max_value">
+<h3>Property: vamp:max_value   -   unstable   -   </h3>
+<em>max_value</em> - 		Maximum value of the parameter range<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_min_value">
+<h3>Property: vamp:min_value   -   unstable   -   </h3>
+<em>min_value</em> - 		Minimum value of the parameter range<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_name">
+<h3>Property: vamp:name   -   stable   -   </h3>
+<em>name</em> - 		Human-readable identifier for the plugin.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginDescription">PluginDescription</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_output_descriptor">
+<h3>Property: vamp:output_descriptor   -   stable   -   </h3>
+<em>output_descriptor</em> - 			Links each output type to the plugin.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Plugin">Plugin</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_parameter">
+<h3>Property: vamp:parameter   -   stable   -   </h3>
+<em>parameter</em> - 			Specifies the parameter to set the plugin in execution. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_Parameter">Parameter</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_parameter_descriptor">
+<h3>Property: vamp:parameter_descriptor   -   stable   -   </h3>
+<em>parameter_descriptor</em> - 			Links each parameter descriptor to the plugin.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Parameter">Parameter</a></td>
+<td><a href="#term_Plugin">Plugin</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_parameter_descriptor">
+<h3>Property: vamp:parameter_descriptor   -   stable   -   </h3>
+<em>parameter_descriptor</em> - 			Specifies exactly the type of descriptor to set in the transform by linking it.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Parameter">Parameter</a></td>
+<td><a href="#term_Plugin">Plugin</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_plugin_description">
+<h3>Property: vamp:plugin_description   -   stable   -   </h3>
+<em>plugin_description</em> - 			Links the plugin descriptor to the plugin (it may be redundant for an RDF decription to have a plugin descriptor in between an actual plugin and its properties).<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Plugin">Plugin</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_PluginDescription">PluginDescription</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_program">
+<h3>Property: vamp:program   -   stable   -   </h3>
+<em>program</em> - 			Extension for configuration. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_Configuration">Configuration</a></td>
+<td><a href="#term_PluginProgram">PluginProgram</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_program">
+<h3>Property: vamp:program   -   stable   -   </h3>
+<em>program</em> - 			Specifies the program to set the plugin in execution.  Here the plugin program matches with the one in the plugin descriptor. There is not descriptor required for the program (just a string), is it?<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_Configuration">Configuration</a></td>
+<td><a href="#term_PluginProgram">PluginProgram</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_quantized_step">
+<h3>Property: vamp:quantized_step   -   unstable   -   </h3>
+<em>quantized_step</em> - 		Quantized step (if any). We do not include isQuantized.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_sample_rate">
+<h3>Property: vamp:sample_rate   -   stable   -   </h3>
+<em>sample_rate</em> - 			Specifies the sample rate if it is not constant.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_sample_rate">
+<h3>Property: vamp:sample_rate   -   stable   -   </h3>
+<em>sample_rate</em> - 		Sample rate of the output if any. Should be read depending on SampleType and Output classes.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_sample_rate">
+<h3>Property: vamp:sample_rate   -   unstable   -   </h3>
+<em>sample_rate</em> - 			Specifies the sample rate if it is not constant.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_sample_rate">
+<h3>Property: vamp:sample_rate   -   unstable   -   </h3>
+<em>sample_rate</em> - 		Sample rate of the output if any. Should be read depending on SampleType and Output classes.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_sample_type">
+<h3>Property: vamp:sample_type   -   unstable   -   </h3>
+<em>sample_type</em> - 		The sample type specifies the temporal information of the output.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+<td><a href="#term_SampleType">SampleType</a></td>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_start">
+<h3>Property: vamp:start   -   unstable   -   </h3>
+<em>start</em> - 			Specifies temporal information when processing a data stream. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_step_size">
+<h3>Property: vamp:step_size   -   stable   -   </h3>
+<em>step_size</em> - 			Specifies the step size for the framing. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_transform_type">
+<h3>Property: vamp:transform_type   -   unstable   -   </h3>
+<em>transform_type</em> - 			Specifies the transform type (we could do this by subclassin transform instead of using a property). <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_unit">
+<h3>Property: vamp:unit   -   unstable   -   </h3>
+<em>unit</em> - 		Unit of the output/parameter. A string type<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_ParameterDescriptor">ParameterDescriptor</a></td>
+<td><a href="#term_PluginOutput">PluginOutput</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_value">
+<h3>Property: vamp:value   -   stable   -   </h3>
+<em>value</em> - 			Specifies the current value of the parameter. <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Parameter">Parameter</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_vamp_API_version">
+<h3>Property: vamp:vamp_API_version   -   stable   -   </h3>
+<em>vamp_API_version</em> - 			Version of the Vamp API used to implement this plugin.<br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_PluginDescription">PluginDescription</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><div class="specterm" id="term_window_type">
+<h3>Property: vamp:window_type   -   unstable   -   </h3>
+<em>window_type</em> - 			Specifies the window type (they should be individuals and clearly not here). <br/>
+	 
+<br/><table style="th { float: top; }">
+<tr><th>Domain:</th>
+<td><a href="#term_Transform">Transform</a></td>
+
+</tr>
+<tr><th>Range:</th>
+</tr>
+
+
+</table>
+<br/></div><h2 id="terms_inds">Individuals</h2><div class="specterm" id="term_Effect">
+<h3>Individual: Effect   -   </h3>
+<em>Effect</em> - 		Effect transform. This may be just a subclass of Transform...
+	 
+<br/><table style="th { float: top; }"><tr><th>Class:</th>
+<td><a href="#term_TransformType">vamp:TransformType</a></td>
+</tr></table></div><div class="specterm" id="term_FeatureExtraction">
+<h3>Individual: FeatureExtraction   -   </h3>
+<em>Feature Extraction</em> - 		Feature extraction transform. This may be just a subclass of Transform...
+	 
+<br/><table style="th { float: top; }"><tr><th>Class:</th>
+<td><a href="#term_TransformType">vamp:TransformType</a></td>
+</tr></table></div>
\ No newline at end of file
diff --git a/lib-src/libvamp/rdf/doc/vamp.pl b/lib-src/libvamp/rdf/doc/vamp.pl
new file mode 100644
index 0000000..e506a11
--- /dev/null
+++ b/lib-src/libvamp/rdf/doc/vamp.pl
@@ -0,0 +1,37 @@
+:- use_module('../../../motools/mo/ontospec/onto_spec').
+:- use_module(library('semweb/rdf_db')).
+:- use_module(library('semweb/rdf_turtle')).
+
+:- rdf_load('../vamp.rdf').
+
+:- rdf_db:rdf_register_ns(vamp,'http://purl.org/ontology/vamp/').
+
+author_name('').
+author_foaf('').
+page_title('Vamp Plugins Ontology').
+
+output('vamp.html').
+
+:-  output(Output),
+	open(Output,write,Otp),
+	header(Header),
+	write(Otp,Header),
+	open('../doc/glance.htm',read,GlanceIntro),
+	copy_stream_data(GlanceIntro, Otp),
+	glance_html_desc(Glance),
+	write(Otp,Glance),
+	write(Otp,'<h2 id="terms_classes">Classes</h2>'),
+	classes_html_desc(Classes),
+	write(Otp,Classes),
+	write(Otp,'<h2 id="terms_props">Properties</h2>'),
+	props_html_desc(Props),
+	write(Otp,Props),
+	write(Otp,'<h2 id="terms_inds">Individuals</h2>'),
+	inds_html_desc(Inds),
+	write(Otp,Inds),
+	deprecs_html_desc(Deprecs),
+	write(Otp,Deprecs),
+	close(Otp),
+	rdf_db:rdf_retractall(_,_,_).
+
+:- halt.
diff --git a/lib-src/libvamp/rdf/generator/vamp-rdf-template-generator.cpp b/lib-src/libvamp/rdf/generator/vamp-rdf-template-generator.cpp
new file mode 100644
index 0000000..d39ab05
--- /dev/null
+++ b/lib-src/libvamp/rdf/generator/vamp-rdf-template-generator.cpp
@@ -0,0 +1,466 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+#include <vamp-hostsdk/PluginHostAdapter.h>
+#include <vamp-hostsdk/PluginChannelAdapter.h>
+#include <vamp-hostsdk/PluginInputDomainAdapter.h>
+#include <vamp-hostsdk/PluginLoader.h>
+#include <vamp/vamp.h>
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+
+#include <cstdlib>
+#include <cstring>
+
+using std::cout;
+using std::cin;
+using std::cerr;
+using std::getline;
+using std::endl;
+using std::string;
+using std::vector;
+using std::ofstream;
+using std::ios;
+
+using Vamp::HostExt::PluginLoader;
+using Vamp::Plugin;
+
+//???
+string programURI = "http://www.vamp-plugins.org/doap.rdf#template-generator";
+
+void usage()
+{
+    cerr << endl;
+    cerr << "vamp-rdf-template-generator: Create a skeleton RDF description file describing" << endl;
+    cerr << "a Vamp plugin library using the Vamp ontology." << endl;
+    cerr << endl;
+    cerr << "Usage:" << endl;
+    cerr << "   vamp-rdf-template-generator -i vamp:soname[:plugin] [vamp:soname[:plugin] ...]" << endl;
+    cerr << "   vamp-rdf-template-generator PLUGIN_BASE_URI [ -m YOUR_URI ] [vamp:]soname[:plugin] [[vamp:]soname[:plugin] ...]" << endl;
+    cerr << endl;
+    cerr << "Example:" << endl;
+    cerr << "   vamp-rdf-template-generator http://vamp-plugins.org/rdf/plugins/ vamp-example-plugins" << endl;
+    cerr << endl;
+    exit(2);
+}
+
+template <class T>
+inline string to_string (const T& t)
+{
+    std::stringstream ss;
+    ss << t;
+    return ss.str();
+}
+
+string describe_namespaces(string pluginBundleBaseURI, string libname)
+{
+    string res=\
+        "@prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .\n\
+ at prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .\n\
+ at prefix vamp:     <http://purl.org/ontology/vamp/> .\n\
+ at prefix plugbase: <"+pluginBundleBaseURI+libname+"#> .\n\
+ at prefix owl:      <http://www.w3.org/2002/07/owl#> .\n\
+ at prefix dc:       <http://purl.org/dc/elements/1.1/> .\n\
+ at prefix af:       <http://purl.org/ontology/af/> .\n\
+ at prefix foaf:     <http://xmlns.com/foaf/0.1/> .\n\
+ at prefix cc:       <http://web.resource.org/cc/> .\n\
+ at prefix :         <#> .\n\n";
+	
+    return res;
+}
+
+string describe_doc(string describerURI, string pluginBundleBaseURI,
+                    string libname)
+{
+    string res=\
+        "<>  a   vamp:PluginDescription ;\n";
+    if (describerURI != "") {
+        res += "    foaf:maker          <"+describerURI+"> ;\n";
+    }
+    res += "\
+    foaf:maker          <"+programURI+"> ;\n\
+    foaf:primaryTopic   <"+pluginBundleBaseURI+libname+"> .\n\n";
+    return res;
+}
+
+
+string describe_library(string libname, vector<Plugin *> plugins)
+{
+    string res=\
+        ":"+libname+" a  vamp:PluginLibrary ;\n\
+    vamp:identifier \""+libname+"\" ";
+
+    for (size_t i = 0; i < plugins.size(); ++i) {
+        res += " ; \n\
+    vamp:available_plugin plugbase:"+plugins[i]->getIdentifier();
+    }
+
+    res += " ; \n\
+#   foaf:page <Place more-information HTML page URL here and uncomment> ;\n\
+    .\n\n";
+    return res;
+}
+
+string describe_plugin(Plugin* plugin)
+{
+    string res=\
+        "plugbase:"+plugin->getIdentifier()+" a   vamp:Plugin ;\n\
+    dc:title              \""+plugin->getName()+"\" ;\n\
+    vamp:name             \""+plugin->getName()+"\" ;\n\
+    dc:description        \"\"\""+plugin->getDescription()+"\"\"\" ;\n\
+    foaf:maker            [ foaf:name \""+plugin->getMaker()+"\" ] ; # FIXME could give plugin author's URI here\n\
+    dc:rights             \"\"\""+plugin->getCopyright()+"\"\"\" ;\n\
+#   cc:license            <Place plugin license URI here and uncomment> ; \n\
+    vamp:identifier       \""+plugin->getIdentifier()+"\" ;\n\
+    vamp:vamp_API_version vamp:api_version_"+to_string(plugin->getVampApiVersion())+" ;\n\
+    owl:versionInfo       \""+to_string(plugin->getPluginVersion())+"\" ;\n";
+    if (plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain)
+        res+="    vamp:input_domain     vamp:FrequencyDomain ;\n\n";
+    else
+        res+="    vamp:input_domain     vamp:TimeDomain ;\n";
+	
+
+    Plugin::ParameterList params = plugin->getParameterDescriptors();
+    if (!params.empty()) res+="\n";
+    for (Plugin::ParameterList::const_iterator i = params.begin(); i != params.end(); i++)
+        res+="    vamp:parameter   plugbase:"+plugin->getIdentifier()+"_param_"+(*i).identifier+" ;\n";
+    if (!params.empty()) res+="\n";
+
+    Plugin::OutputList outputs = plugin->getOutputDescriptors();
+    for (Plugin::OutputList::const_iterator i = outputs.begin(); i!= outputs.end(); i++)
+        res+="    vamp:output      plugbase:"+plugin->getIdentifier()+"_output_"+(*i).identifier+" ;\n";
+    res+="    .\n";
+	
+    return res;
+}
+
+string describe_param(Plugin *plugin, Plugin::ParameterDescriptor p)
+{
+
+    //FIXME: dc:format and vamp:unit are the same???
+    //Should be a QUantizedParameter also a Parameter??
+    if(p.isQuantized){
+     string res=\
+        "plugbase:"+plugin->getIdentifier()+"_param_"+p.identifier+" a  vamp:QuantizedParameter ;\n\
+    vamp:identifier     \""+p.identifier+"\" ;\n\
+    dc:title            \""+p.name+"\" ;\n\
+    dc:format           \""+p.unit+"\" ;\n\
+    vamp:min_value       "+to_string(p.minValue)+" ;\n\
+    vamp:max_value       "+to_string(p.maxValue)+" ;\n\
+    vamp:unit           \""+p.unit+"\" ;\n\
+    vamp:quantize_step   "+to_string(p.quantizeStep)+"  ;\n\
+    vamp:default_value   "+to_string(p.defaultValue)+" ;\n\
+    vamp:value_names     (";
+
+            unsigned int i;
+            for (i=0; i+1 < p.valueNames.size(); i++)
+                res+=" \""+p.valueNames[i]+"\"";
+            if (i < p.valueNames.size())
+                res+=" \""+p.valueNames[i]+"\"";
+            res+=");\n";
+    
+    res+="    .\n";
+
+    return res;
+            
+    }else{
+    string res=\
+        "plugbase:"+plugin->getIdentifier()+"_param_"+p.identifier+" a  vamp:Parameter ;\n\
+    vamp:identifier     \""+p.identifier+"\" ;\n\
+    dc:title            \""+p.name+"\" ;\n\
+    dc:format           \""+p.unit+"\" ;\n\
+    vamp:min_value       "+to_string(p.minValue)+" ;\n\
+    vamp:max_value       "+to_string(p.maxValue)+" ;\n\
+    vamp:unit           \""+p.unit+"\"  ;\n\
+    vamp:default_value   "+to_string(p.defaultValue)+" ;\n\
+    vamp:value_names     (";
+
+            unsigned int i;
+            for (i=0; i+1 < p.valueNames.size(); i++)
+                res+=" \""+p.valueNames[i]+"\"";
+            if (i < p.valueNames.size())
+                res+=" \""+p.valueNames[i]+"\"";
+            res+=");\n";
+    
+    res+="    .\n";
+
+    return res;
+
+    }  
+}
+
+string describe_output(Plugin *plugin, Plugin::OutputDescriptor o)
+{
+
+    //we need to distinguish here between different output types:
+
+//Quantize or not
+//KnownExtents or not
+//Data output classification:
+    //DenseOutput
+    //SparseOutput
+    //TrackLevelOutput
+
+
+    // SparseOutput: variable sample rate. Events are not evenly
+    // spaced so we need to record the time associated with the event
+    // as it its not ensured that we have an event after the next one
+    // (but there is not time to set the duration, it has to be
+    // calculated as the different between 2 different events). The
+    // timestamp must be read.
+
+    string res;
+
+    if (o.sampleType == Plugin::OutputDescriptor::VariableSampleRate ||
+        !o.hasFixedBinCount)
+    {
+
+        res=\
+            "plugbase:"+plugin->getIdentifier()+"_output_"+o.identifier+" a  vamp:SparseOutput ;\n\
+    vamp:identifier       \""+o.identifier+"\" ;\n\
+    dc:title              \""+o.name+"\" ;\n\
+    dc:description        \"\"\""+o.description+"\"\"\"  ;\n\
+    vamp:fixed_bin_count  \""+(o.hasFixedBinCount == 1 ? "true" : "false")+"\" ;\n\
+    vamp:unit             \""+(o.unit)+"\" ;\n";
+                          
+             
+        //another type of output           
+        if(o.isQuantized){
+
+            res+="    a                     vamp:QuantizedOutput ;\n";
+            res+="    vamp:quantize_step    "+to_string(o.quantizeStep)+"  ;\n";    
+        }
+        
+        //and yet another type
+        if(o.hasKnownExtents){
+
+            res+="    a                 vamp:KnownExtentsOutput ;\n";
+            res+="    vamp:min_value    "+to_string(o.minValue)+"  ;\n"; 
+            res+="    vamp:max_value    "+to_string(o.maxValue)+"  ;\n";    
+        }
+
+        // FIXME ? Bin names may vary based on plugin setup, so including them here might be misleading...
+        if (o.hasFixedBinCount)
+        {
+            res+="    vamp:bin_count        "+to_string(o.binCount)+" ;\n";
+
+            bool haveBinNames = false;
+            for (int i=0; i < o.binNames.size(); i++) {
+                if (o.binNames[i] != "") {
+                    haveBinNames = true;
+                    break;
+                }
+            }
+            
+            if (haveBinNames) {
+                res+="    vamp:bin_names        (";
+
+                unsigned int i;
+                for (i=0; i+1 < o.binNames.size(); i++)
+                    res+=" \""+o.binNames[i]+"\"";
+                if (i < o.binNames.size())
+                    res+=" \""+o.binNames[i]+"\"";
+                res+=");\n";
+            }
+        }
+       
+        res+="    vamp:sample_type      vamp:VariableSampleRate ;\n";
+        if (o.sampleRate > 0.0f)
+            res+="    vamp:sample_rate      "+to_string(o.sampleRate)+" ;\n";
+	        
+    }
+
+    //If we do not have SparseOutput, then we have DenseOutput. TrackLevelOutput can not be inferred from the plugin directly without actually
+    //running the plugin.
+    else{
+
+        res=\
+            "plugbase:"+plugin->getIdentifier()+"_output_"+o.identifier+" a  vamp:DenseOutput ;\n\
+    vamp:identifier       \""+o.identifier+"\" ;\n\
+    dc:title              \""+o.name+"\" ;\n\
+    dc:description        \"\"\""+o.description+"\"\"\"  ;\n\
+    vamp:fixed_bin_count  \""+(o.hasFixedBinCount == 1 ? "true" : "false")+"\" ;\n\
+    vamp:unit             \""+(o.unit)+"\" ;\n";
+
+
+        //another type of output           
+        if(o.isQuantized){
+
+            res+="    a                     vamp:QuantizedOutput ;\n";
+            res+="    vamp:quantize_step    "+to_string(o.quantizeStep)+"  ;\n";    
+        }
+        
+        //and yet another type
+        if(o.hasKnownExtents){
+
+            res+="    a                 vamp:KnownExtentsOutput ;\n";
+            res+="    vamp:min_value    "+to_string(o.minValue)+"  ;\n"; 
+            res+="    vamp:max_value    "+to_string(o.maxValue)+"  ;\n";    
+        }
+
+        // FIXME ? Bin names may vary based on plugin setup, so including them here might be misleading...
+        if (o.hasFixedBinCount)
+        {
+            res+="    vamp:bin_count        "+to_string(o.binCount)+" ;\n";
+
+            bool haveBinNames = false;
+            for (int i=0; i < o.binNames.size(); i++) {
+                if (o.binNames[i] != "") {
+                    haveBinNames = true;
+                    break;
+                }
+            }
+
+            if (haveBinNames) {
+                res+="    vamp:bin_names        (";
+
+                unsigned int i;
+                for (i=0; i+1 < o.binNames.size(); i++)
+                    res+=" \""+o.binNames[i]+"\"";
+                if (i < o.binNames.size())
+                    res+=" \""+o.binNames[i]+"\"";
+                res+=");\n";
+            }
+        }
+
+        else if (o.sampleType == Plugin::OutputDescriptor::FixedSampleRate)
+        {
+            res+="    vamp:sample_type      vamp:FixedSampleRate ;\n";
+            res+="    vamp:sample_rate      "+to_string(o.sampleRate)+" ;\n";
+        }
+        else if (o.sampleType == Plugin::OutputDescriptor::OneSamplePerStep)
+            res+="    vamp:sample_type      vamp:OneSamplePerStep ;\n";
+        else
+        {
+            cerr<<"Incomprehensible sampleType for output descriptor "+o.identifier<<" !"<<endl;
+            exit(1);
+        }
+    }
+
+    //There is no way to know this in advance, but we can use the km a bit for this.
+    res+="#   vamp:computes_event_type   <Place event type URI here and uncomment> ;\n";
+    res+="#   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;\n";
+    res+="#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;\n";
+    res+="    .\n";
+
+    return res;
+}
+
+string describe(vector<Plugin *> plugins, string pluginBundleBaseURI,
+                string describerURI, string libname)
+{
+    string res = describe_namespaces(pluginBundleBaseURI, libname);
+	
+    res += describe_doc(describerURI, pluginBundleBaseURI, libname);
+	
+    res += describe_library(libname, plugins);
+
+    for (size_t i = 0; i < plugins.size(); ++i) {
+
+        Plugin *plugin = plugins[i];
+
+        res += describe_plugin(plugin);
+	
+        Plugin::ParameterList params = plugin->getParameterDescriptors();
+        for (Plugin::ParameterList::const_iterator i = params.begin(); i != params.end(); i++)
+            res += describe_param(plugin, *i);
+	
+        Plugin::OutputList outputs = plugin->getOutputDescriptors();
+        for (Plugin::OutputList::const_iterator i = outputs.begin(); i!= outputs.end(); i++)
+            res += describe_output(plugin, *i);
+    }
+	
+    return res;
+}
+
+int main(int argc, char **argv)
+{
+    if (argc < 3) usage();
+
+    bool interactive = false;
+    if (!strcmp(argv[1], "-i")) interactive = true;
+
+    if (!interactive && argc < 3) usage();
+
+    string pluginBundleBaseURI, describerURI;
+
+    int argidx = 2;
+	
+    if (!interactive) {
+        pluginBundleBaseURI = argv[1];
+        if (!strcmp(argv[2], "-m")) {
+            if (argc < 5) usage();
+            describerURI = argv[3];
+            argidx = 4;
+        }
+    } else {
+        cerr << "Please enter the base URI for the plugin bundle : ";
+        getline(cin, pluginBundleBaseURI);
+        cerr << "Please enter your URI (empty to omit) : ";
+        getline(cin, describerURI);
+    }
+
+    vector<Plugin *> plugins;
+    string libname;
+
+    PluginLoader *loader = PluginLoader::getInstance();
+
+    while (argidx < argc) {
+
+        string pluginName = argv[argidx];
+
+        if (pluginName.substr(0, 5) == "vamp:") {
+            pluginName = pluginName.substr(5);
+        }
+
+        string mylibname = pluginName.substr(0, pluginName.find(':'));
+
+        if (libname == "") libname = mylibname;
+        else if (libname != mylibname) {
+            cerr << "ERROR: All plugins specified on command line must originate in the same library" << endl;
+            exit(1);
+        }
+
+        if (mylibname == pluginName) { // pluginName is a library, not a plugin
+
+            PluginLoader::PluginKeyList list = loader->listPlugins();
+            for (size_t i = 0; i < list.size(); ++i) {
+                string thislibname = list[i].substr(0, list[i].find(':'));
+                if (thislibname != mylibname) continue;
+                Plugin *plugin = loader->loadPlugin(list[i], 44100);
+                if (!plugin) {
+                    cerr << "ERROR: Plugin \"" << list[i] << "\" could not be loaded" << endl;
+                    exit(1);
+                }
+                plugins.push_back(plugin);
+            }
+
+            if (plugins.empty()) {
+                cerr << "ERROR: Plugin library \"" << mylibname << "\" does not exist, could not be opened, or contains no plugins" << endl;
+                exit(1);
+            }
+
+        } else { // pluginName is a plugin
+
+            Plugin *plugin = loader->loadPlugin(pluginName, size_t(44100));
+            if (!plugin) {
+                cerr << "ERROR: Plugin \"" << pluginName << "\" could not be loaded" << endl;
+                exit(1);
+            }
+            plugins.push_back(plugin);
+        }
+
+        ++argidx;
+    }
+	
+    cout << describe(plugins, pluginBundleBaseURI, describerURI, libname) << endl;
+
+    return 0;
+}
+
+
diff --git a/lib-src/libvamp/rdf/vamp.n3 b/lib-src/libvamp/rdf/vamp.n3
new file mode 100644
index 0000000..ce4894d
--- /dev/null
+++ b/lib-src/libvamp/rdf/vamp.n3
@@ -0,0 +1,758 @@
+ at prefix owl: <http://www.w3.org/2002/07/owl#>.
+ at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+ at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+ at prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
+ at prefix foaf: <http://xmlns.com/foaf/0.1/>.
+ at prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#>.
+ at prefix dc: <http://purl.org/dc/elements/1.1/>.
+ at prefix event: <http://purl.org/NET/c4dm/event.owl#>.
+ at prefix af: <http://purl.org/ontology/af/>.
+ at prefix vamp: <http://purl.org/ontology/vamp/>.
+ at prefix :         <> .
+
+<> 
+	a owl:Ontology;
+	dc:title "Vamp Plugins Ontology";
+	rdfs:label "Vamp Plugins Ontology";
+	rdfs:comment """
+			Vamp Ontology. This ontology includes the following descriptions:
+			
+				- OWL description of the Vamp API
+				- OWL description of the Transform environment necessary to set up the execution of any plugin 
+			
+			This Ontology provides semantics to describe and control Vamp plugins in RDF. Any "RDF-speaker" host is therefore able to 
+			use this ontology to read, set up and execute plugins.
+			The extracted features are expressed in terms of the Audio Features Ontology: http://purl.org/ontology/af/.
+			For more information, please visit the Vamp Plugins website: http://www.vamp-plugins.org/
+	""";
+	foaf:maker "Chris Cannam";
+	foaf:maker "Chris Sutton";
+	foaf:maker "Yves Raimond";
+	foaf:maker "David Pastor Escuredo";
+        dc:date "$Date: 2008/12/29 22:00:31 $";
+	.
+
+vs:term_status a owl:AnnotationProperty.
+
+#Authors foaf
+
+#############################################
+# Part 1: Describing a Vamp plugin
+#############################################
+
+#########################################
+# CLASSES
+#########################################
+
+# Note: we don't include a Feature concept because we rely on the Audio Feature ontology
+# Note: we additionally define a Transform concept to link the running context
+
+vamp:Plugin
+	a owl:Class;
+	rdfs:label "Vamp Plugin";
+	rdfs:comment """
+		A Vamp plugin is an implementation of an audio feature extraction algorithm using the Vamp API.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:PluginLibrary
+	a owl:Class;
+	rdfs:label "Vamp Plugin Library";
+	rdfs:comment """
+		Library of Vamp Plugins. This may need to include rights.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:Parameter
+	a owl:Class;
+	rdfs:label "Vamp Plugin Parameter";
+	rdfs:comment """
+		Descriptor for a plugin parameter. Hosts need to know about the specific type and form of the parameters of a particular plugin for a correct transform setup.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:QuantizedParameter
+	a owl:Class;
+	rdfs:label "Quantized Parameter";
+	rdfs:subClassOf	vamp:Parameter;
+	rdfs:comment """
+			Descriptor of a parameter that does have quantized values. The property quantize_step is just defined for this subclass and not for the general Parameter.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:PluginOutput
+	a owl:Class;
+	rdfs:label "Vamp Plugin output descriptor";
+	rdfs:comment """
+		Descriptor for an output of a plugin. This descriptor provides information that is necessary to correctly interpret the output features. The output type will determine how to read the temporal information of the extracted features and how to manage the burden of ouput data.
+	""";
+	vs:term_status "unstable";
+	.
+
+#3 classifications of outputs: 
+#-density of data
+#-quantised
+#-known extents
+
+#there is not classification for fix_bin_count
+
+vamp:QuantizedOutput
+	a owl:Class;
+	rdfs:label "Quantized Output";
+	rdfs:subClassOf	vamp:PluginOutput;
+	rdfs:comment """
+			Descriptor of an output that does have quantized values.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:KnownExtentsOutput
+	a owl:Class;
+	rdfs:label "Known Extents Output";
+	rdfs:subClassOf	vamp:PluginOutput;
+	rdfs:comment """
+			Descriptor of an output that does have known extents.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:DenseOutput
+	a owl:Class;
+	rdfs:subClassOf vamp:PluginOutput;
+	rdfs:label "Dense output";
+	rdfs:comment """
+		Specific output type for data evenly spaced in time, which may be of high volume and which it is usually desirable to represent in a compact form.
+	""";
+	vs:term_status "unstable";
+	.
+
+vamp:SparseOutput 
+	a owl:Class;
+	rdfs:label "Sparse output";
+	rdfs:subClassOf vamp:PluginOutput;
+	rdfs:comment """
+		Specific output type for data that consist of features that require their own individual temporal information.
+	""";
+	vs:term_status "unstable";
+	.
+
+vamp:TrackLevelOutput
+	a owl:Class;
+	rdfs:label "track level output";
+	rdfs:subClassOf vamp:PluginOutput;
+	rdfs:comment """
+		Specific output type for track level information.  The Vamp API does not provide for this sort of output directly, so this will require a "hacky" interpretation of the feature timestamp to establish that it reflects track metadata instead of temporal data.
+	""";
+	vs:term_status "unstable";
+	.
+
+vamp:PluginProgram
+	a owl:Class;
+	rdfs:label "Plugin program";
+	rdfs:comment """
+		The program is a predefined context of parameters. We may not need a concept for this and just a property linking a string representing the program name.
+	""";
+	vs:term_status "unstable";
+	.
+
+vamp:Feature
+	a owl:Class;
+	rdfs:label "Vamp Feature";
+	rdfs:comment "This may be removed mighty soon as we rely on the Audio Features Ontology for this";
+	vs:term_status "deprecated";
+	.
+
+# Classes for enumerations in the Vamp API
+
+vamp:InputDomain
+	a owl:Class;
+	rdfs:label "Plugin input domain";
+	rdfs:comment """
+		Plugins declare the input domain they require, so the host can convert the input data properly. Hosts using the Vamp SDK PluginAdapter to wrap plugins should see this work done for them automatically - see the Vamp documentation.
+	""";
+	vs:term_status "stable";
+	.
+
+vamp:SampleType
+	a owl:Class;
+	rdfs:label "sample type";
+	rdfs:comment """
+		The sample type specifies the temporal information of the plugin output. This information should be combined with the output type for a correct interpretation.
+	""";
+	vs:term_status "stable";
+	.
+
+##################################################################
+# PROPERTIES. 
+##################################################################
+
+##### Plugin properties
+
+
+
+##!!! lacking plugin version?
+
+vamp:parameter
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "parameter descriptor";
+	rdfs:comment """
+		Links each parameter descriptor to the plugin.
+	""";
+	rdfs:range vamp:Parameter;
+	rdfs:domain vamp:ParameterBinding;
+	rdfs:domain vamp:Plugin;
+	vs:term_status "stable";
+	.
+
+vamp:output
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "output";
+	rdfs:comment """
+		Links each output type to the plugin.
+	""";
+	rdfs:range vamp:PluginOutput;
+	rdfs:domain vamp:Plugin;
+	rdfs:domain vamp:Transform;
+	vs:term_status "stable";
+	.
+
+##### Plugin Library properties (could include affiliation, rights...)
+
+vamp:available_plugin 
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "available plugin";
+	rdfs:comment """
+		Available plugins in the library
+	""";
+	rdfs:range vamp:Plugin;
+	rdfs:domain vamp:PluginLibrary;
+	vs:term_status "stable";
+	.
+
+#### Plugin Descriptor properties
+
+vamp:identifier
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "plugin identifier";
+	rdfs:comment """
+		Machine-readable identifier for a Vamp plugin within the scope of its library, or for a plugin descriptor within the scope of the plugin.
+	""";
+	rdfs:domain vamp:Plugin;
+	rdfs:domain vamp:PluginLibrary;
+	rdfs:domain vamp:PluginProgram;
+	rdfs:domain vamp:PluginOutput;
+	rdfs:domain vamp:Parameter;
+	rdfs:domain vamp:Transform;
+	vs:term_status "stable";
+	.
+
+vamp:name
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "plugin name";
+	rdfs:comment """
+		Human-readable identifier for the plugin.
+	""";
+	rdfs:domain vamp:Plugin;
+	vs:term_status "stable";
+	.
+
+vamp:vamp_API_version
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "Vamp API version";
+	rdfs:comment """
+		Version of the Vamp API used to implement this plugin.
+	""";
+	rdfs:domain vamp:Plugin;
+	vs:term_status "stable";
+	.
+
+vamp:input_domain
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "input domain";
+	rdfs:comment """
+		Input domain required by the plugin (time or frequency).
+	""";
+	rdfs:domain vamp:Plugin;
+	rdfs:range vamp:InputDomain;
+	vs:term_status "stable";
+	.
+
+# Note that other properties like maker can be linked to the plugin descriptor using other namespaces
+
+##### Parameter Descriptor properties (and some common with PluginOutput)
+
+# Note: Identifier has been already defined
+
+vamp:max_value
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "max value";
+	rdfs:comment """
+		Maximum value of the parameter range
+	""";
+	rdfs:range vamp:Parameter;
+	rdfs:range vamp:KnownExtentsOutput;
+	vs:term_status "unstable";
+	.
+
+vamp:min_value
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "min value";
+	rdfs:comment """
+		Minimum value of the parameter range
+	""";
+	rdfs:range vamp:Parameter;
+	rdfs:range vamp:KnownExtentsOutput;
+	vs:term_status "unstable";
+	.
+
+vamp:default_value
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "default value";
+	rdfs:comment """
+		Default value of the parameter
+	""";
+	rdfs:range vamp:Parameter;
+	vs:term_status "unstable";
+	.
+
+vamp:quantize_step
+	a rdf:Property;
+	a owl:FunctionalProperty;
+	a owl:DatatypeProperty;
+	rdfs:label "quantized step";
+	rdfs:comment """
+		Quantize step. Only defined for quantized outputs
+	""";
+	rdfs:domain vamp:QuantizedOutput;
+	rdfs:domain vamp:QuantizedParameter;
+	vs:term_status "unstable";
+	.
+
+vamp:has_duration
+	a rdf:Property;
+	a owl:FunctionalProperty;
+	a owl:DatatypeProperty;
+	rdfs:label "has duration";
+	rdfs:comment """
+		True if features on this output are known to have durations
+	""";
+	rdfs:domain vamp:PluginOutput;
+	vs:term_status "unstable";
+	.
+
+vamp:unit 
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "unit";
+	rdfs:comment """
+		Unit of the output/parameter. A string type
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:domain vamp:Parameter;
+	vs:term_status "unstable";
+	.
+
+vamp:value_names  
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "value names";
+	rdfs:comment """
+		List of value names if available
+	""";
+	rdfs:domain vamp:Parameter;
+	vs:term_status "unstable";
+	.
+
+########Output Descriptor properties
+
+vamp:fixed_bin_count 
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "fixed bin count";
+	rdfs:comment """
+		Fixed bin count. A boolean type.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	vs:term_status "unstable";
+	.
+
+vamp:sample_rate
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "sample rate";
+	rdfs:comment """
+		Sample rate of the output if any. Should be read depending on SampleType and Output classes.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	vs:term_status "unstable";
+	.
+	
+vamp:bin_count      
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "bin count";
+	rdfs:comment """
+		Number of elements of the bin output. This information is necessary to define the output as belonging to a specific subclass of Plugin Output.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	vs:term_status "unstable";
+	.
+
+vamp:bin_names  
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	rdfs:label "bin names";
+	rdfs:comment """
+		List of bin names if available.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	vs:term_status "unstable";
+	.
+
+vamp:sample_type  
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "sample type";
+	rdfs:comment """
+		The sample type specifies the temporal information of the output.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:range vamp:SampleType;
+	vs:term_status "unstable";
+	.
+
+# The next 3 properties are included to link in the Audio Features Ontology (not strictly from the Vamp API).
+
+vamp:computes_event_type
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "event type";
+	rdfs:comment """
+			Associates a plugin output with its corresponding event type (for example, in the Audio Features ontology).
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:range event:Event;
+	vs:term_status "unstable";
+	.
+
+vamp:computes_feature
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "feature type";
+	rdfs:comment """
+			Associates a plugin output with the attribute connecting the event to its value data.
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:range event:factor;
+	vs:term_status "unstable";
+	.
+
+vamp:computes_signal_type
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "signal type";
+	rdfs:comment """
+			Associates a dense plugin output with its corresponding signal type (for example, in the Audio Features ontology).
+	""";
+	rdfs:domain vamp:PluginOutput;
+	rdfs:range af:Signal;
+	vs:term_status "unstable";
+	.
+	
+########################
+# INDIVIDUALS
+########################
+
+vamp:TimeDomain 
+	a vamp:InputDomain;
+	.
+
+vamp:FrequencyDomain
+	a vamp:InputDomain;
+	.
+
+vamp:OneSamplePerStep
+	a vamp:SampleType;
+	.
+
+vamp:FixedSampleRate
+	a vamp:SampleType;
+	.
+
+vamp:VariableSampleRate
+	a vamp:SampleType; 
+	.
+
+################################################### END OF THE VAMP API DESCRIPTION ############################################################
+
+
+#############################################
+# Part 2: Classes to describe plugin execution. TRANSFORM
+#############################################
+
+# Note: we need to define this part of the ontology to give a minimun common standard for hosts.
+# Note: this may split up in some other ontology or become part of the DSP namespace
+
+vamp:Transform
+	a owl:Class;
+	rdfs:label "Transform";
+	vs:term_status "stable";
+	rdfs:comment """
+		The Transform defines the environment of any audio processing computation. 
+	""";
+	.
+
+vamp:ParameterBinding
+	a owl:Class;
+	rdfs:label "Parameter binding";
+	vs:term_status "unstable";
+	rdfs:comment """
+		Parameter setting used by the plugin transform to set up the plugin.
+	""";
+	.
+
+vamp:Configuration
+	a owl:Class;
+	rdfs:label "Configuration";
+	vs:term_status "unstable";
+	rdfs:comment """
+		For extension (key/value data provided to DSSI plugins, not relevant to Vamp)
+	""";
+	.
+
+vamp:TransformType
+	a owl:Class;
+	rdfs:label "Transform Type";
+	vs:term_status "unstable";
+	rdfs:comment """
+		Specifies the type of transform. May be feature extraction, effect...
+	""";
+	.
+
+##individuals of transformtype
+vamp:FeatureExtraction
+	a vamp:TransformType;
+	rdfs:label "Feature Extraction";
+	vs:term_status "unstable";
+	rdfs:comment """
+		Feature extraction transform. This may be just a subclass of Transform...
+	""";
+	.
+
+vamp:Effect
+	a vamp:TransformType;
+	rdfs:label "Effect";
+	vs:term_status "unstable";
+	rdfs:comment """
+		Effect transform. This may be just a subclass of Transform...
+	""";
+	.
+
+################
+# Properties
+################
+
+##### Plugin Transform properties
+
+#identifier and output are declared above
+
+vamp:engine
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "plugin";
+	vs:term_status "stable";
+	rdfs:comment """
+		Specifies the sort of plugin in execution. This is an extension to use Transform with other plugin libraries
+	""";
+	rdfs:domain vamp:Transform;
+	rdfs:range vamp:Plugin;
+	.
+
+vamp:program
+	a rdf:Property;
+	a owl:ObjectProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "program";
+	vs:term_status "stable";
+	rdfs:comment """
+		Specifies the program to set the plugin in execution.  Here the plugin program matches with the one in the plugin descriptor. There is not descriptor required for the program (just a string), is it?
+	""";
+	rdfs:domain vamp:Transform;
+	rdfs:range vamp:PluginProgram;
+	.
+
+vamp:configuration
+	a rdf:Property;
+	a owl:ObjectProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "program";
+	vs:term_status "stable";
+	rdfs:comment """
+		Extension for configuration. 
+	""";
+	rdfs:domain vamp:Transform;
+	rdfs:range vamp:Configuration;
+	.
+
+vamp:parameter_binding
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "parameter";
+	vs:term_status "stable";
+	rdfs:comment """
+			Specifies the parameter to set the plugin in execution. 
+	""";
+	rdfs:domain vamp:Transform;
+	rdfs:range vamp:ParameterBinding;
+	.
+
+vamp:step_size
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "step size";
+	vs:term_status "stable";
+	rdfs:comment """
+			Specifies the step size for the framing. 
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:block_size
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "block size";
+	vs:term_status "stable";
+	rdfs:comment """
+			Specifies the block size for the framing. 
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:sample_rate
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "sample rate";
+	vs:term_status "stable";
+	rdfs:comment """
+			Specifies the sample rate if it is not constant.
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:transform_type
+	a rdf:Property;
+	a owl:ObjectProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "transform type";
+	vs:term_status "unstable";
+	rdfs:comment """
+			Specifies the transform type (we could do this by subclassin transform instead of using a property). 
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:window_type
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "window type";
+	vs:term_status "unstable";
+	rdfs:comment """
+			Specifies the window type (they should be individuals and clearly not here). 
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:start
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "start";
+	vs:term_status "unstable";
+	rdfs:comment """
+			Specifies temporal information when processing a data stream. 
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:duration
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "start";
+	vs:term_status "unstable";
+	rdfs:comment """
+			Specifies temporal information when processing a data stream. 
+	""";
+	rdfs:domain vamp:Transform;
+	.
+
+vamp:summary_type
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "summary type";
+	vs:term_status "unstable";
+	rdfs:comment """
+		     Specifies a summary type to be used (for averaging etc) on transform results.
+        """;
+	rdfs:domain vamp:Transform;
+	.
+	
+##### Parameter properties
+
+vamp:value
+	a rdf:Property;
+	a owl:DatatypeProperty;
+	a owl:FunctionalProperty;
+	rdfs:label "value";
+	vs:term_status "stable";
+	rdfs:comment """
+			Specifies the current value of the parameter. 
+	""";
+	rdfs:domain vamp:ParameterBinding;
+	.
+
+#parameter declared above
+
+
+# The next property is here to link the Audio Features ontology to the
+# Transform ontology terms -- an audio feature may use this to
+# indicate which transform produced it
+
+vamp:computed_by
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "computed by";
+	rdfs:comment """
+			Associates an audio feature with the transform that was used to compute it.
+	""";
+	rdfs:domain event:Event;
+	rdfs:domain af:Signal;
+	rdfs:range vamp:Transform;
+	vs:term_status "unstable";
+	.
+
+
diff --git a/lib-src/libvamp/rdf/vamp.rdf b/lib-src/libvamp/rdf/vamp.rdf
new file mode 100644
index 0000000..e62d1fb
--- /dev/null
+++ b/lib-src/libvamp/rdf/vamp.rdf
@@ -0,0 +1,498 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rdf:RDF xmlns:af="http://purl.org/ontology/af/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:event="http://purl.org/NET/c4dm/event.owl#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:vamp="http://purl.org/ontology/vamp/" xmlns:vs="http://www.w3.org/2003/06/sw-vocab-status/ns#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xml:base="http://purl.org/ontology/vamp/">
+  <owl:Ontology rdf:about="">
+    <dc:title>Vamp Plugins Ontology</dc:title>
+    <rdfs:label>Vamp Plugins Ontology</rdfs:label>
+    <rdfs:comment>
+			Vamp Ontology. This ontology includes the following descriptions:
+			
+				- OWL description of the Vamp API
+				- OWL description of the Transform environment necessary to set up the execution of any plugin 
+			
+			This Ontology provides semantics to describe and control Vamp plugins in RDF. Any "RDF-speaker" host is therefore able to 
+			use this ontology to read, set up and execute plugins.
+			The extracted features are expressed in terms of the Audio Features Ontology: http://purl.org/ontology/af/.
+			For more information, please visit the Vamp Plugins website: http://www.vamp-plugins.org/
+	</rdfs:comment>
+    <foaf:maker>Chris Cannam</foaf:maker>
+    <foaf:maker>Chris Sutton</foaf:maker>
+    <foaf:maker>Yves Raimond</foaf:maker>
+    <foaf:maker>David Pastor Escuredo</foaf:maker>
+    <dc:date>$Date: 2008/12/29 22:00:31 $</dc:date>
+  </owl:Ontology>
+  <owl:AnnotationProperty rdf:about="http://www.w3.org/2003/06/sw-vocab-status/ns#term_status"/>
+  <owl:Class rdf:about="Plugin">
+    <rdfs:label>Vamp Plugin</rdfs:label>
+    <rdfs:comment>
+		A Vamp plugin is an implementation of an audio feature extraction algorithm using the Vamp API.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="PluginLibrary">
+    <rdfs:label>Vamp Plugin Library</rdfs:label>
+    <rdfs:comment>
+		Library of Vamp Plugins. This may need to include rights.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="Parameter">
+    <rdfs:label>Vamp Plugin Parameter</rdfs:label>
+    <rdfs:comment>
+		Descriptor for a plugin parameter. Hosts need to know about the specific type and form of the parameters of a particular plugin for a correct transform setup.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="QuantizedParameter">
+    <rdfs:label>Quantized Parameter</rdfs:label>
+    <rdfs:subClassOf rdf:resource="Parameter"/>
+    <rdfs:comment>
+			Descriptor of a parameter that does have quantized values. The property quantize_step is just defined for this subclass and not for the general Parameter.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="PluginOutput">
+    <rdfs:label>Vamp Plugin output descriptor</rdfs:label>
+    <rdfs:comment>
+		Descriptor for an output of a plugin. This descriptor provides information that is necessary to correctly interpret the output features. The output type will determine how to read the temporal information of the extracted features and how to manage the burden of ouput data.
+	</rdfs:comment>
+    <vs:term_status>unstable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="QuantizedOutput">
+    <rdfs:label>Quantized Output</rdfs:label>
+    <rdfs:subClassOf rdf:resource="PluginOutput"/>
+    <rdfs:comment>
+			Descriptor of an output that does have quantized values.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="KnownExtentsOutput">
+    <rdfs:label>Known Extents Output</rdfs:label>
+    <rdfs:subClassOf rdf:resource="PluginOutput"/>
+    <rdfs:comment>
+			Descriptor of an output that does have known extents.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="DenseOutput">
+    <rdfs:subClassOf rdf:resource="PluginOutput"/>
+    <rdfs:label>Dense output</rdfs:label>
+    <rdfs:comment>
+		Specific output type for data evenly spaced in time, which may be of high volume and which it is usually desirable to represent in a compact form.
+	</rdfs:comment>
+    <vs:term_status>unstable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="SparseOutput">
+    <rdfs:label>Sparse output</rdfs:label>
+    <rdfs:subClassOf rdf:resource="PluginOutput"/>
+    <rdfs:comment>
+		Specific output type for data that consist of features that require their own individual temporal information.
+	</rdfs:comment>
+    <vs:term_status>unstable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="TrackLevelOutput">
+    <rdfs:label>track level output</rdfs:label>
+    <rdfs:subClassOf rdf:resource="PluginOutput"/>
+    <rdfs:comment>
+		Specific output type for track level information.  The Vamp API does not provide for this sort of output directly, so this will require a "hacky" interpretation of the feature timestamp to establish that it reflects track metadata instead of temporal data.
+	</rdfs:comment>
+    <vs:term_status>unstable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="PluginProgram">
+    <rdfs:label>Plugin program</rdfs:label>
+    <rdfs:comment>
+		The program is a predefined context of parameters. We may not need a concept for this and just a property linking a string representing the program name.
+	</rdfs:comment>
+    <vs:term_status>unstable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="Feature">
+    <rdfs:label>Vamp Feature</rdfs:label>
+    <rdfs:comment>This may be removed mighty soon as we rely on the Audio Features Ontology for this</rdfs:comment>
+    <vs:term_status>deprecated</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="InputDomain">
+    <rdfs:label>Plugin input domain</rdfs:label>
+    <rdfs:comment>
+		Plugins declare the input domain they require, so the host can convert the input data properly. Hosts using the Vamp SDK PluginAdapter to wrap plugins should see this work done for them automatically - see the Vamp documentation.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <owl:Class rdf:about="SampleType">
+    <rdfs:label>sample type</rdfs:label>
+    <rdfs:comment>
+		The sample type specifies the temporal information of the plugin output. This information should be combined with the output type for a correct interpretation.
+	</rdfs:comment>
+    <vs:term_status>stable</vs:term_status>
+  </owl:Class>
+  <rdf:Property rdf:about="parameter">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>parameter descriptor</rdfs:label>
+    <rdfs:comment>
+		Links each parameter descriptor to the plugin.
+	</rdfs:comment>
+    <rdfs:range rdf:resource="Parameter"/>
+    <rdfs:domain rdf:resource="ParameterBinding"/>
+    <rdfs:domain rdf:resource="Plugin"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="output">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>output</rdfs:label>
+    <rdfs:comment>
+		Links each output type to the plugin.
+	</rdfs:comment>
+    <rdfs:range rdf:resource="PluginOutput"/>
+    <rdfs:domain rdf:resource="Plugin"/>
+    <rdfs:domain rdf:resource="Transform"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="available_plugin">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>available plugin</rdfs:label>
+    <rdfs:comment>
+		Available plugins in the library
+	</rdfs:comment>
+    <rdfs:range rdf:resource="Plugin"/>
+    <rdfs:domain rdf:resource="PluginLibrary"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="identifier">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>plugin identifier</rdfs:label>
+    <rdfs:comment>
+		Machine-readable identifier for a Vamp plugin within the scope of its library, or for a plugin descriptor within the scope of the plugin.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Plugin"/>
+    <rdfs:domain rdf:resource="PluginLibrary"/>
+    <rdfs:domain rdf:resource="PluginProgram"/>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <rdfs:domain rdf:resource="Parameter"/>
+    <rdfs:domain rdf:resource="Transform"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="name">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>plugin name</rdfs:label>
+    <rdfs:comment>
+		Human-readable identifier for the plugin.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Plugin"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="vamp_API_version">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>vamp API version</rdfs:label>
+    <rdfs:comment>
+		Version of the Vamp API used to implement this plugin.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Plugin"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="input_domain">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>input domain</rdfs:label>
+    <rdfs:comment>
+		Input domain required by the plugin (time or frequency).
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Plugin"/>
+    <rdfs:range rdf:resource="InputDomain"/>
+    <vs:term_status>stable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="max_value">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>max value</rdfs:label>
+    <rdfs:comment>
+		Maximum value of the parameter range
+	</rdfs:comment>
+    <rdfs:range rdf:resource="Parameter"/>
+    <rdfs:range rdf:resource="KnownExtentsOutput"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="min_value">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>min value</rdfs:label>
+    <rdfs:comment>
+		Minimum value of the parameter range
+	</rdfs:comment>
+    <rdfs:range rdf:resource="Parameter"/>
+    <rdfs:range rdf:resource="KnownExtentsOutput"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="default_value">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>default value</rdfs:label>
+    <rdfs:comment>
+		Default value of the parameter
+	</rdfs:comment>
+    <rdfs:range rdf:resource="Parameter"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="quantize_step">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>quantized step</rdfs:label>
+    <rdfs:comment>
+		Quantize step. Only defined if is_quantized is true
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="QuantizedOutput"/>
+    <rdfs:domain rdf:resource="QuantizedParameter"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="unit">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>unit</rdfs:label>
+    <rdfs:comment>
+		Unit of the output/parameter. A string type
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <rdfs:domain rdf:resource="Parameter"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="value_names">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>value names</rdfs:label>
+    <rdfs:comment>
+		List of value names if available
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Parameter"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="fixed_bin_count">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>fixed bin count</rdfs:label>
+    <rdfs:comment>
+		Fixed bin count. A boolean type.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="sample_rate">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>sample rate</rdfs:label>
+    <rdfs:comment>
+		Sample rate of the output if any. Should be read depending on SampleType and Output classes.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <vs:term_status>unstable</vs:term_status>
+    <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>sample rate</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+			Specifies the sample rate if it is not constant.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="bin_count">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>bin count</rdfs:label>
+    <rdfs:comment>
+		Number of elements of the bin output. This information is necessary to define the output as belonging to a specific subclass of Plugin Output.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="bin_names">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdfs:label>bin names</rdfs:label>
+    <rdfs:comment>
+		List of bin names if available.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="sample_type">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>sample type</rdfs:label>
+    <rdfs:comment>
+		The sample type specifies the temporal information of the output.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <rdfs:range rdf:resource="SampleType"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="computes_feature_type">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>feature type</rdfs:label>
+    <rdfs:comment>
+			Feature Types output by the plugin. Links the vamp ontology to the audio features ontology.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <rdfs:range rdf:resource="../af/AudioFeature"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <rdf:Property rdf:about="computes_event_type">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>event type</rdfs:label>
+    <rdfs:comment>
+			Event Type output by the plugin.
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="PluginOutput"/>
+    <rdfs:range rdf:resource="../../NET/c4dm/event.owl#Event"/>
+    <vs:term_status>unstable</vs:term_status>
+  </rdf:Property>
+  <vamp:InputDomain rdf:about="TimeDomain"/>
+  <vamp:InputDomain rdf:about="FrequencyDomain"/>
+  <vamp:SampleType rdf:about="OneSamplePerStep"/>
+  <vamp:SampleType rdf:about="FixedSampleRate"/>
+  <vamp:SampleType rdf:about="VariableSampleRate"/>
+  <owl:Class rdf:about="Transform">
+    <rdfs:label>Transform</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+		The Transform defines the environment of any audio processing computation. 
+	</rdfs:comment>
+  </owl:Class>
+  <owl:Class rdf:about="ParameterBinding">
+    <rdfs:label>Parameter binding</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+		Parameter setting used by the plugin transform to set up the plugin.
+	</rdfs:comment>
+  </owl:Class>
+  <owl:Class rdf:about="Configuration">
+    <rdfs:label>Configuration</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+		For extension (key/value data provided to DSSI plugins, not relevant to Vamp)
+	</rdfs:comment>
+  </owl:Class>
+  <owl:Class rdf:about="TransformType">
+    <rdfs:label>Transform Type</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+		Specifies the type of transform. May be feature extraction, effect...
+	</rdfs:comment>
+  </owl:Class>
+  <vamp:TransformType rdf:about="FeatureExtraction">
+    <rdfs:label>Feature Extraction</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+		Feature extraction transform. This may be just a subclass of Transform...
+	</rdfs:comment>
+  </vamp:TransformType>
+  <vamp:TransformType rdf:about="Effect">
+    <rdfs:label>Effect</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+		Effect transform. This may be just a subclass of Transform...
+	</rdfs:comment>
+  </vamp:TransformType>
+  <rdf:Property rdf:about="engine">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>plugin</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+		Specifies the sort of plugin in execution. This is an extension to use Transform with other plugin libraries
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+    <rdfs:range rdf:resource="Plugin"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="program">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>program</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+		Specifies the program to set the plugin in execution.  Here the plugin program matches with the one in the plugin descriptor. There is not descriptor required for the program (just a string), is it?
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+    <rdfs:range rdf:resource="PluginProgram"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="configuration">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>program</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+		Extension for configuration. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+    <rdfs:range rdf:resource="Configuration"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="parameter_binding">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdfs:label>parameter</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+			Specifies the parameter to set the plugin in execution. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+    <rdfs:range rdf:resource="ParameterBinding"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="step_size">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>step size</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+			Specifies the step size for the framing. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="block_size">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>block size</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+			Specifies the block size for the framing. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="transform_type">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>transform type</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+			Specifies the transform type (we could do this by subclassin transform instead of using a property). 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="window_type">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>window type</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+			Specifies the window type (they should be individuals and clearly not here). 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="start">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>start</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+			Specifies temporal information when processing a data stream. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="duration">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>start</rdfs:label>
+    <vs:term_status>unstable</vs:term_status>
+    <rdfs:comment>
+			Specifies temporal information when processing a data stream. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="Transform"/>
+  </rdf:Property>
+  <rdf:Property rdf:about="value">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
+    <rdfs:label>value</rdfs:label>
+    <vs:term_status>stable</vs:term_status>
+    <rdfs:comment>
+			Specifies the current value of the parameter. 
+	</rdfs:comment>
+    <rdfs:domain rdf:resource="ParameterBinding"/>
+  </rdf:Property>
+</rdf:RDF>
diff --git a/lib-src/libvamp/src/doc-overview b/lib-src/libvamp/src/doc-overview
new file mode 100644
index 0000000..2f9160b
--- /dev/null
+++ b/lib-src/libvamp/src/doc-overview
@@ -0,0 +1,159 @@
+
+/** \mainpage Vamp Plugin SDK
+
+\section about About Vamp
+
+Vamp is an API for C and C++ plugins that process sampled audio data
+to produce descriptive output (measurements or semantic observations).
+Find more information at http://www.vamp-plugins.org/ .
+
+Although the official API for Vamp plugins is defined in C for maximum
+binary compatibility, we strongly recommend using the provided C++
+classes in the SDK to implement your own plugins and hosts.
+
+\section plugins For Plugins
+
+Plugins should subclass Vamp::Plugin, and then use a
+Vamp::PluginAdapter to expose the correct C API for the plugin.  Read
+the documentation for Vamp::PluginBase and Vamp::Plugin before
+starting.
+
+Plugins should be compiled and linked into dynamic libraries using the
+usual convention for your platform, and should link (preferably
+statically) with -lvamp-sdk.  Any number of plugins can reside in a
+single dynamic library.  See plugins.cpp in the example plugins
+directory for the sort of code that will need to accompany your plugin
+class or classes, to make it possible for a host to look up your
+plugins properly.
+
+Please read the relevant README file for your platform found in the
+Vamp SDK build/ directory, for details about how to ensure the
+resulting dynamic library exports the correct linker symbols.
+
+The following example plugins are provided.  You may legally reuse any
+amount of the code from these examples in any plugins you write,
+whether proprietary or open-source.
+
+ - ZeroCrossing calculates the positions and density of zero-crossing
+ points in an audio waveform.
+
+ - SpectralCentroid calculates the centre of gravity of the frequency
+ domain representation of each block of audio.
+
+ - PowerSpectrum calculates a power spectrum from the input audio.
+ Actually, it doesn't do any work except calculating power from a
+ cartesian complex FFT output.  The work of calculating this frequency
+ domain output is done for it by the host or host SDK; the plugin just
+ needs to declare that it wants frequency domain input.  This is the
+ simplest of the example plugins.
+
+ - AmplitudeFollower is a simple implementation of SuperCollider's
+ amplitude-follower algorithm.
+
+ - PercussionOnsetDetector estimates the locations of percussive
+ onsets using a simple method described in "Drum Source Separation
+ using Percussive Feature Detection and Spectral Modulation" by Dan
+ Barry, Derry Fitzgerald, Eugene Coyle and Bob Lawlor, ISSC 2005.
+
+ - FixedTempoEstimator calculates a single beats-per-minute value
+ which is an estimate of the tempo of a piece of music that is assumed
+ to be of fixed tempo, using autocorrelation of a frequency domain
+ energy rise metric.  It has several outputs that return intermediate
+ results used in the calculation, and may be a useful example of a
+ plugin having several outputs with varying feature structures.
+
+\section hosts For Hosts
+
+Hosts will normally use a Vamp::PluginHostAdapter to convert each
+plugin's exposed C API back into a useful Vamp::Plugin C++ object.
+
+The Vamp::HostExt namespace contains several additional C++ classes to
+do this work for them, and make the host's life easier:
+
+ - Vamp::HostExt::PluginLoader provides a very easy interface for a
+ host to discover, load, and find out category information about the
+ available plugins.  Most Vamp hosts will probably want to use this
+ class.
+
+ - Vamp::HostExt::PluginInputDomainAdapter provides a simple means for
+ hosts to handle plugins that want frequency-domain input, without
+ having to convert the input themselves.
+
+ - Vamp::HostExt::PluginChannelAdapter provides a simple means for
+ hosts to use plugins that do not necessarily support the same number
+ of audio channels as they have available, without having to apply a
+ channel management / mixdown policy themselves.
+
+ - Vamp::HostExt::PluginBufferingAdapter provides a means for hosts to
+ avoid having to negotiate the input step and block size, instead
+ permitting the host to use any block size they desire (and a step
+ size equal to it).  This is particularly useful for "streaming" hosts
+ that cannot seek backwards in the input audio stream and so would
+ otherwise need to implement an additional buffer to support step
+ sizes smaller than the block size.
+
+ - Vamp::HostExt::PluginSummarisingAdapter provides summarisation
+ methods such as mean and median averages of output features, for use
+ in any context where an available plugin produces individual values
+ but the result that is actually needed is some sort of aggregate.
+
+The PluginLoader class can also use the input domain, channel, and
+buffering adapters automatically to make these conversions transparent
+to the host if required.
+
+Host authors should also refer to the example host code in the host
+directory of the SDK.
+
+Hosts should link with -lvamp-hostsdk.
+
+(The following notes in this section are mostly relevant for
+developers that are not using the HostExt classes, or that wish to
+know more about the policy they implement.)
+
+The Vamp API does not officially specify how to load plugin libraries
+or where to find them.  However, the SDK does include a function
+(Vamp::PluginHostAdapter::getPluginPath()) that returns a recommended
+directory search path that hosts may use for plugin libraries, and a
+class (Vamp::HostExt::PluginLoader) that implements a sensible
+cross-platform lookup policy using this path.  We recommend using this
+class in your host unless you have a good reason not to want to.  This
+implementation also permits the user to set the environment variable
+VAMP_PATH to override the default path if desired.
+
+The policy used by Vamp::HostExt::PluginLoader -- and our
+recommendation for any host -- is to search each directory in this
+path for .DLL (on Windows), .so (on Linux, Solaris, BSD etc) or .dylib
+(on OS/X) files, then to load each one and perform a dynamic name
+lookup on the vampGetPluginDescriptor function to enumerate the
+plugins in the library.  The example host has some code that may help,
+but this operation will necessarily be system-dependent.
+
+Vamp also has an informal convention for sorting plugins into
+functional categories.  In addition to the library file itself, a
+plugin library may install a category file with the same name as the
+library but .cat extension.  The existence and format of this file are
+not specified by the Vamp API, but by convention the file may contain
+lines of the format
+
+\code
+vamp:pluginlibrary:pluginname::General Category > Specific Category
+\endcode
+
+which a host may read and use to assign plugins a location within a
+category tree for display to the user.  The expectation is that
+advanced users may also choose to set up their own preferred category
+trees, which is why this information is not queried as part of the
+Vamp plugin's API itself.  The Vamp::HostExt::PluginLoader class also
+provides support for plugin category lookup using this scheme.
+
+\section license License
+
+This plugin SDK is freely redistributable under a "new-style BSD"
+licence.  See the file COPYING for more details.  In short, you may
+modify and redistribute the SDK and example plugins within any
+commercial or non-commercial, proprietary or open-source plugin or
+application under almost any conditions, with no obligation to provide
+source code, provided you retain the original copyright note.
+
+
+*/
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp
new file mode 100644
index 0000000..21a44f3
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp
@@ -0,0 +1,712 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+    This file by Mark Levy and Chris Cannam, Copyright 2007-2008 QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vector>
+#include <map>
+
+#include <vamp-hostsdk/PluginBufferingAdapter.h>
+
+using std::vector;
+using std::map;
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginBufferingAdapter.cpp)
+
+namespace Vamp {
+	
+namespace HostExt {
+		
+class PluginBufferingAdapter::Impl
+{
+public:
+    Impl(Plugin *plugin, float inputSampleRate);
+    ~Impl();
+	
+    void setPluginStepSize(size_t stepSize);	
+    void setPluginBlockSize(size_t blockSize);
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    void getActualStepAndBlockSizes(size_t &stepSize, size_t &blockSize);
+
+    OutputList getOutputDescriptors() const;
+
+    void setParameter(std::string, float);
+    void selectProgram(std::string);
+
+    void reset();
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+		
+    FeatureSet getRemainingFeatures();
+		
+protected:
+    class RingBuffer
+    {
+    public:
+        RingBuffer(int n) :
+            m_buffer(new float[n+1]), m_writer(0), m_reader(0), m_size(n+1) { }
+        virtual ~RingBuffer() { delete[] m_buffer; }
+
+        int getSize() const { return m_size-1; }
+        void reset() { m_writer = 0; m_reader = 0; }
+
+        int getReadSpace() const {
+            int writer = m_writer, reader = m_reader, space;
+            if (writer > reader) space = writer - reader;
+            else if (writer < reader) space = (writer + m_size) - reader;
+            else space = 0;
+            return space;
+        }
+
+        int getWriteSpace() const {
+            int writer = m_writer;
+            int reader = m_reader;
+            int space = (reader + m_size - writer - 1);
+            if (space >= m_size) space -= m_size;
+            return space;
+        }
+        
+        int peek(float *destination, int n) const {
+
+            int available = getReadSpace();
+
+            if (n > available) {
+                for (int i = available; i < n; ++i) {
+                    destination[i] = 0.f;
+                }
+                n = available;
+            }
+            if (n == 0) return n;
+
+            int reader = m_reader;
+            int here = m_size - reader;
+            const float *const bufbase = m_buffer + reader;
+
+            if (here >= n) {
+                for (int i = 0; i < n; ++i) {
+                    destination[i] = bufbase[i];
+                }
+            } else {
+                for (int i = 0; i < here; ++i) {
+                    destination[i] = bufbase[i];
+                }
+                float *const destbase = destination + here;
+                const int nh = n - here;
+                for (int i = 0; i < nh; ++i) {
+                    destbase[i] = m_buffer[i];
+                }
+            }
+
+            return n;
+        }
+
+        int skip(int n) {
+            
+            int available = getReadSpace();
+            if (n > available) {
+                n = available;
+            }
+            if (n == 0) return n;
+
+            int reader = m_reader;
+            reader += n;
+            while (reader >= m_size) reader -= m_size;
+            m_reader = reader;
+            return n;
+        }
+        
+        int write(const float *source, int n) {
+
+            int available = getWriteSpace();
+            if (n > available) {
+                n = available;
+            }
+            if (n == 0) return n;
+
+            int writer = m_writer;
+            int here = m_size - writer;
+            float *const bufbase = m_buffer + writer;
+            
+            if (here >= n) {
+                for (int i = 0; i < n; ++i) {
+                    bufbase[i] = source[i];
+                }
+            } else {
+                for (int i = 0; i < here; ++i) {
+                    bufbase[i] = source[i];
+                }
+                const int nh = n - here;
+                const float *const srcbase = source + here;
+                float *const buf = m_buffer;
+                for (int i = 0; i < nh; ++i) {
+                    buf[i] = srcbase[i];
+                }
+            }
+
+            writer += n;
+            while (writer >= m_size) writer -= m_size;
+            m_writer = writer;
+
+            return n;
+        }
+
+        int zero(int n) {
+            
+            int available = getWriteSpace();
+            if (n > available) {
+                n = available;
+            }
+            if (n == 0) return n;
+
+            int writer = m_writer;
+            int here = m_size - writer;
+            float *const bufbase = m_buffer + writer;
+
+            if (here >= n) {
+                for (int i = 0; i < n; ++i) {
+                    bufbase[i] = 0.f;
+                }
+            } else {
+                for (int i = 0; i < here; ++i) {
+                    bufbase[i] = 0.f;
+                }
+                const int nh = n - here;
+                for (int i = 0; i < nh; ++i) {
+                    m_buffer[i] = 0.f;
+                }
+            }
+            
+            writer += n;
+            while (writer >= m_size) writer -= m_size;
+            m_writer = writer;
+
+            return n;
+        }
+
+    protected:
+        float *m_buffer;
+        int    m_writer;
+        int    m_reader;
+        int    m_size;
+
+    private:
+        RingBuffer(const RingBuffer &); // not provided
+        RingBuffer &operator=(const RingBuffer &); // not provided
+    };
+
+    Plugin *m_plugin;
+    size_t m_inputStepSize;  // value passed to wrapper initialise()
+    size_t m_inputBlockSize; // value passed to wrapper initialise()
+    size_t m_setStepSize;    // value passed to setPluginStepSize()
+    size_t m_setBlockSize;   // value passed to setPluginBlockSize()
+    size_t m_stepSize;       // value actually used to initialise plugin
+    size_t m_blockSize;      // value actually used to initialise plugin
+    size_t m_channels;
+    vector<RingBuffer *> m_queue;
+    float **m_buffers;
+    float m_inputSampleRate;
+    long m_frame;
+    bool m_unrun;
+    mutable OutputList m_outputs;
+    mutable std::map<int, bool> m_rewriteOutputTimes;
+		
+    void processBlock(FeatureSet& allFeatureSets);
+};
+		
+PluginBufferingAdapter::PluginBufferingAdapter(Plugin *plugin) :
+    PluginWrapper(plugin)
+{
+    m_impl = new Impl(plugin, m_inputSampleRate);
+}
+		
+PluginBufferingAdapter::~PluginBufferingAdapter()
+{
+    delete m_impl;
+}
+
+size_t
+PluginBufferingAdapter::getPreferredStepSize() const
+{
+    return getPreferredBlockSize();
+}
+
+size_t
+PluginBufferingAdapter::getPreferredBlockSize() const
+{
+    return PluginWrapper::getPreferredBlockSize();
+}
+
+size_t
+PluginBufferingAdapter::getPluginPreferredStepSize() const
+{
+    return PluginWrapper::getPreferredStepSize();
+}
+
+size_t
+PluginBufferingAdapter::getPluginPreferredBlockSize() const
+{
+    return PluginWrapper::getPreferredBlockSize();
+}
+
+void
+PluginBufferingAdapter::setPluginStepSize(size_t stepSize)
+{
+    m_impl->setPluginStepSize(stepSize);
+}
+
+void
+PluginBufferingAdapter::setPluginBlockSize(size_t blockSize)
+{
+    m_impl->setPluginBlockSize(blockSize);
+}
+
+void
+PluginBufferingAdapter::getActualStepAndBlockSizes(size_t &stepSize,
+                                                   size_t &blockSize)
+{
+    m_impl->getActualStepAndBlockSizes(stepSize, blockSize);
+}
+		
+bool
+PluginBufferingAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    return m_impl->initialise(channels, stepSize, blockSize);
+}
+
+PluginBufferingAdapter::OutputList
+PluginBufferingAdapter::getOutputDescriptors() const
+{
+    return m_impl->getOutputDescriptors();
+}
+
+void
+PluginBufferingAdapter::setParameter(std::string name, float value)
+{
+    m_impl->setParameter(name, value);
+}
+
+void
+PluginBufferingAdapter::selectProgram(std::string name)
+{
+    m_impl->selectProgram(name);
+}
+
+void
+PluginBufferingAdapter::reset()
+{
+    m_impl->reset();
+}
+		
+PluginBufferingAdapter::FeatureSet
+PluginBufferingAdapter::process(const float *const *inputBuffers,
+                                RealTime timestamp)
+{
+    return m_impl->process(inputBuffers, timestamp);
+}
+		
+PluginBufferingAdapter::FeatureSet
+PluginBufferingAdapter::getRemainingFeatures()
+{
+    return m_impl->getRemainingFeatures();
+}
+		
+PluginBufferingAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
+    m_plugin(plugin),
+    m_inputStepSize(0),
+    m_inputBlockSize(0),
+    m_setStepSize(0),
+    m_setBlockSize(0),
+    m_stepSize(0),
+    m_blockSize(0),
+    m_channels(0), 
+    m_queue(0),
+    m_buffers(0),
+    m_inputSampleRate(inputSampleRate),
+    m_frame(0),
+    m_unrun(true)
+{
+    (void)getOutputDescriptors(); // set up m_outputs and m_rewriteOutputTimes
+}
+		
+PluginBufferingAdapter::Impl::~Impl()
+{
+    // the adapter will delete the plugin
+
+    for (size_t i = 0; i < m_channels; ++i) {
+        delete m_queue[i];
+        delete[] m_buffers[i];
+    }
+    delete[] m_buffers;
+}
+		
+void
+PluginBufferingAdapter::Impl::setPluginStepSize(size_t stepSize)
+{
+    if (m_inputStepSize != 0) {
+        std::cerr << "PluginBufferingAdapter::setPluginStepSize: ERROR: Cannot be called after initialise()" << std::endl;
+        return;
+    }
+    m_setStepSize = stepSize;
+}
+		
+void
+PluginBufferingAdapter::Impl::setPluginBlockSize(size_t blockSize)
+{
+    if (m_inputBlockSize != 0) {
+        std::cerr << "PluginBufferingAdapter::setPluginBlockSize: ERROR: Cannot be called after initialise()" << std::endl;
+        return;
+    }
+    m_setBlockSize = blockSize;
+}
+
+void
+PluginBufferingAdapter::Impl::getActualStepAndBlockSizes(size_t &stepSize,
+                                                         size_t &blockSize)
+{
+    stepSize = m_stepSize;
+    blockSize = m_blockSize;
+}
+
+bool
+PluginBufferingAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    if (stepSize != blockSize) {
+        std::cerr << "PluginBufferingAdapter::initialise: input stepSize must be equal to blockSize for this adapter (stepSize = " << stepSize << ", blockSize = " << blockSize << ")" << std::endl;
+        return false;
+    }
+
+    m_channels = channels;	
+    m_inputStepSize = stepSize;
+    m_inputBlockSize = blockSize;
+
+    // if the user has requested particular step or block sizes, use
+    // those; otherwise use the step and block sizes which the plugin
+    // prefers
+
+    m_stepSize = 0;
+    m_blockSize = 0;
+
+    if (m_setStepSize > 0) {
+        m_stepSize = m_setStepSize;
+    }
+    if (m_setBlockSize > 0) {
+        m_blockSize = m_setBlockSize;
+    }
+
+    if (m_stepSize == 0 && m_blockSize == 0) {
+        m_stepSize = m_plugin->getPreferredStepSize();
+        m_blockSize = m_plugin->getPreferredBlockSize();
+    }
+    
+    bool freq = (m_plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain);
+    
+    // or sensible defaults if it has no preference
+    if (m_blockSize == 0) {
+        if (m_stepSize == 0) {
+            m_blockSize = 1024;
+            if (freq) {
+                m_stepSize = m_blockSize / 2;
+            } else {
+                m_stepSize = m_blockSize;
+            }
+        } else if (freq) {
+            m_blockSize = m_stepSize * 2;
+        } else {
+            m_blockSize = m_stepSize;
+        }
+    } else if (m_stepSize == 0) { // m_blockSize != 0 (that was handled above)
+        if (freq) {
+            m_stepSize = m_blockSize/2;
+        } else {
+            m_stepSize = m_blockSize;
+        }
+    }
+    
+    // current implementation breaks if step is greater than block
+    if (m_stepSize > m_blockSize) {
+        size_t newBlockSize;
+        if (freq) {
+            newBlockSize = m_stepSize * 2;
+        } else {
+            newBlockSize = m_stepSize;
+        }
+        std::cerr << "PluginBufferingAdapter::initialise: WARNING: step size " << m_stepSize << " is greater than block size " << m_blockSize << ": cannot handle this in adapter; adjusting block size to " << newBlockSize << std::endl;
+        m_blockSize = newBlockSize;
+    }
+    
+    std::cerr << "PluginBufferingAdapter::initialise: NOTE: stepSize " << m_inputStepSize << " -> " << m_stepSize 
+              << ", blockSize " << m_inputBlockSize << " -> " << m_blockSize << std::endl;			
+
+    m_buffers = new float *[m_channels];
+
+    for (size_t i = 0; i < m_channels; ++i) {
+        m_queue.push_back(new RingBuffer(m_blockSize + m_inputBlockSize));
+        m_buffers[i] = new float[m_blockSize];
+    }
+    
+    bool success = m_plugin->initialise(m_channels, m_stepSize, m_blockSize);
+
+//    std::cerr << "PluginBufferingAdapter::initialise: success = " << success << std::endl;
+
+    if (success) {
+        // Re-query outputs; properties such as bin count may have
+        // changed on initialise
+        m_outputs.clear();
+        (void)getOutputDescriptors();
+    }
+
+    return success;
+}
+		
+PluginBufferingAdapter::OutputList
+PluginBufferingAdapter::Impl::getOutputDescriptors() const
+{
+    if (m_outputs.empty()) {
+//    std::cerr << "PluginBufferingAdapter::getOutputDescriptors: querying anew" << std::endl;
+
+        m_outputs = m_plugin->getOutputDescriptors();
+    }
+
+    PluginBufferingAdapter::OutputList outs = m_outputs;
+
+    for (size_t i = 0; i < outs.size(); ++i) {
+
+        switch (outs[i].sampleType) {
+
+        case OutputDescriptor::OneSamplePerStep:
+            outs[i].sampleType = OutputDescriptor::FixedSampleRate;
+            outs[i].sampleRate = (1.f / m_inputSampleRate) * m_stepSize;
+            m_rewriteOutputTimes[i] = true;
+            break;
+            
+        case OutputDescriptor::FixedSampleRate:
+            if (outs[i].sampleRate == 0.f) {
+                outs[i].sampleRate = (1.f / m_inputSampleRate) * m_stepSize;
+            }
+            // We actually only need to rewrite output times for
+            // features that don't have timestamps already, but we
+            // can't tell from here whether our features will have
+            // timestamps or not
+            m_rewriteOutputTimes[i] = true;
+            break;
+
+        case OutputDescriptor::VariableSampleRate:
+            m_rewriteOutputTimes[i] = false;
+            break;
+        }
+    }
+
+    return outs;
+}
+
+void
+PluginBufferingAdapter::Impl::setParameter(std::string name, float value)
+{
+    m_plugin->setParameter(name, value);
+
+    // Re-query outputs; properties such as bin count may have changed
+    m_outputs.clear();
+    (void)getOutputDescriptors();
+}
+
+void
+PluginBufferingAdapter::Impl::selectProgram(std::string name)
+{
+    m_plugin->selectProgram(name);
+
+    // Re-query outputs; properties such as bin count may have changed
+    m_outputs.clear();
+    (void)getOutputDescriptors();
+}
+
+void
+PluginBufferingAdapter::Impl::reset()
+{
+    m_frame = 0;
+    m_unrun = true;
+
+    for (size_t i = 0; i < m_queue.size(); ++i) {
+        m_queue[i]->reset();
+    }
+
+    m_plugin->reset();
+}
+
+PluginBufferingAdapter::FeatureSet
+PluginBufferingAdapter::Impl::process(const float *const *inputBuffers,
+                                      RealTime timestamp)
+{
+    if (m_inputStepSize == 0) {
+        std::cerr << "PluginBufferingAdapter::process: ERROR: Plugin has not been initialised" << std::endl;
+        return FeatureSet();
+    }
+
+    FeatureSet allFeatureSets;
+
+    if (m_unrun) {
+        m_frame = RealTime::realTime2Frame(timestamp,
+                                           int(m_inputSampleRate + 0.5));
+        m_unrun = false;
+    }
+			
+    // queue the new input
+    
+    for (size_t i = 0; i < m_channels; ++i) {
+        int written = m_queue[i]->write(inputBuffers[i], m_inputBlockSize);
+        if (written < int(m_inputBlockSize) && i == 0) {
+            std::cerr << "WARNING: PluginBufferingAdapter::Impl::process: "
+                      << "Buffer overflow: wrote " << written 
+                      << " of " << m_inputBlockSize 
+                      << " input samples (for plugin step size "
+                      << m_stepSize << ", block size " << m_blockSize << ")"
+                      << std::endl;
+        }
+    }    
+    
+    // process as much as we can
+
+    while (m_queue[0]->getReadSpace() >= int(m_blockSize)) {
+        processBlock(allFeatureSets);
+    }	
+    
+    return allFeatureSets;
+}
+    
+PluginBufferingAdapter::FeatureSet
+PluginBufferingAdapter::Impl::getRemainingFeatures() 
+{
+    FeatureSet allFeatureSets;
+    
+    // process remaining samples in queue
+    while (m_queue[0]->getReadSpace() >= int(m_blockSize)) {
+        processBlock(allFeatureSets);
+    }
+    
+    // pad any last samples remaining and process
+    if (m_queue[0]->getReadSpace() > 0) {
+        for (size_t i = 0; i < m_channels; ++i) {
+            m_queue[i]->zero(m_blockSize - m_queue[i]->getReadSpace());
+        }
+        processBlock(allFeatureSets);
+    }			
+    
+    // get remaining features			
+
+    FeatureSet featureSet = m_plugin->getRemainingFeatures();
+
+    for (map<int, FeatureList>::iterator iter = featureSet.begin();
+         iter != featureSet.end(); ++iter) {
+        FeatureList featureList = iter->second;
+        for (size_t i = 0; i < featureList.size(); ++i) {
+            allFeatureSets[iter->first].push_back(featureList[i]);
+        }
+    }
+    
+    return allFeatureSets;
+}
+    
+void
+PluginBufferingAdapter::Impl::processBlock(FeatureSet& allFeatureSets)
+{
+    for (size_t i = 0; i < m_channels; ++i) {
+        m_queue[i]->peek(m_buffers[i], m_blockSize);
+    }
+
+    long frame = m_frame;
+    RealTime timestamp = RealTime::frame2RealTime
+        (frame, int(m_inputSampleRate + 0.5));
+
+    FeatureSet featureSet = m_plugin->process(m_buffers, timestamp);
+    
+    for (FeatureSet::iterator iter = featureSet.begin();
+         iter != featureSet.end(); ++iter) {
+
+        int outputNo = iter->first;
+
+        if (m_rewriteOutputTimes[outputNo]) {
+            
+            FeatureList featureList = iter->second;
+	
+            for (size_t i = 0; i < featureList.size(); ++i) {
+
+                switch (m_outputs[outputNo].sampleType) {
+
+                case OutputDescriptor::OneSamplePerStep:
+                    // use our internal timestamp, always
+                    featureList[i].timestamp = timestamp;
+                    featureList[i].hasTimestamp = true;
+                    break;
+
+                case OutputDescriptor::FixedSampleRate:
+                    // use our internal timestamp if feature lacks one
+                    if (!featureList[i].hasTimestamp) {
+                        featureList[i].timestamp = timestamp;
+                        featureList[i].hasTimestamp = true;
+                    }
+                    break;
+
+                case OutputDescriptor::VariableSampleRate:
+                    break;		// plugin must set timestamp
+
+                default:
+                    break;
+                }
+            
+                allFeatureSets[outputNo].push_back(featureList[i]);
+            }
+        } else {
+            for (size_t i = 0; i < iter->second.size(); ++i) {
+                allFeatureSets[outputNo].push_back(iter->second[i]);
+            }
+        }
+    }
+    
+    // step forward
+
+    for (size_t i = 0; i < m_channels; ++i) {
+        m_queue[i]->skip(m_stepSize);
+    }
+    
+    // increment internal frame counter each time we step forward
+    m_frame += m_stepSize;
+}
+
+}
+	
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginBufferingAdapter.cpp)
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginChannelAdapter.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginChannelAdapter.cpp
new file mode 100644
index 0000000..deb1d3d
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginChannelAdapter.cpp
@@ -0,0 +1,270 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/PluginChannelAdapter.h>
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginChannelAdapter.cpp)
+
+namespace Vamp {
+
+namespace HostExt {
+
+class PluginChannelAdapter::Impl
+{
+public:
+    Impl(Plugin *plugin);
+    ~Impl();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+    FeatureSet processInterleaved(const float *inputBuffers, RealTime timestamp);
+
+protected:
+    Plugin *m_plugin;
+    size_t m_blockSize;
+    size_t m_inputChannels;
+    size_t m_pluginChannels;
+    float **m_buffer;
+    float **m_deinterleave;
+    const float **m_forwardPtrs;
+};
+
+PluginChannelAdapter::PluginChannelAdapter(Plugin *plugin) :
+    PluginWrapper(plugin)
+{
+    m_impl = new Impl(plugin);
+}
+
+PluginChannelAdapter::~PluginChannelAdapter()
+{
+    delete m_impl;
+}
+
+bool
+PluginChannelAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    return m_impl->initialise(channels, stepSize, blockSize);
+}
+
+PluginChannelAdapter::FeatureSet
+PluginChannelAdapter::process(const float *const *inputBuffers,
+                              RealTime timestamp)
+{
+    return m_impl->process(inputBuffers, timestamp);
+}
+
+PluginChannelAdapter::FeatureSet
+PluginChannelAdapter::processInterleaved(const float *inputBuffers,
+                                         RealTime timestamp)
+{
+    return m_impl->processInterleaved(inputBuffers, timestamp);
+}
+
+PluginChannelAdapter::Impl::Impl(Plugin *plugin) :
+    m_plugin(plugin),
+    m_blockSize(0),
+    m_inputChannels(0),
+    m_pluginChannels(0),
+    m_buffer(0),
+    m_deinterleave(0),
+    m_forwardPtrs(0)
+{
+}
+
+PluginChannelAdapter::Impl::~Impl()
+{
+    // the adapter will delete the plugin
+
+    if (m_buffer) {
+        if (m_inputChannels > m_pluginChannels) {
+            delete[] m_buffer[0];
+        } else {
+            for (size_t i = 0; i < m_pluginChannels - m_inputChannels; ++i) {
+                delete[] m_buffer[i];
+            }
+        }
+        delete[] m_buffer;
+        m_buffer = 0;
+    }
+
+    if (m_deinterleave) {
+        for (size_t i = 0; i < m_inputChannels; ++i) {
+            delete[] m_deinterleave[i];
+        }
+        delete[] m_deinterleave;
+        m_deinterleave = 0;
+    }
+
+    if (m_forwardPtrs) {
+        delete[] m_forwardPtrs;
+        m_forwardPtrs = 0;
+    }
+}
+
+bool
+PluginChannelAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    m_blockSize = blockSize;
+
+    size_t minch = m_plugin->getMinChannelCount();
+    size_t maxch = m_plugin->getMaxChannelCount();
+
+    m_inputChannels = channels;
+
+    if (m_inputChannels < minch) {
+
+        m_forwardPtrs = new const float *[minch];
+
+        if (m_inputChannels > 1) {
+            // We need a set of zero-valued buffers to add to the
+            // forwarded pointers
+            m_buffer = new float*[minch - channels];
+            for (size_t i = 0; i < minch; ++i) {
+                m_buffer[i] = new float[blockSize];
+                for (size_t j = 0; j < blockSize; ++j) {
+                    m_buffer[i][j] = 0.f;
+                }
+            }
+        }
+
+        m_pluginChannels = minch;
+
+        std::cerr << "PluginChannelAdapter::initialise: expanding " << m_inputChannels << " to " << m_pluginChannels << " for plugin" << std::endl;
+
+    } else if (m_inputChannels > maxch) {
+
+        // We only need m_buffer if we are mixing down to a single
+        // channel -- otherwise we can just forward the same float* as
+        // passed in to process(), expecting the excess to be ignored
+
+        if (maxch == 1) {
+            m_buffer = new float *[1];
+            m_buffer[0] = new float[blockSize];
+
+            std::cerr << "PluginChannelAdapter::initialise: mixing " << m_inputChannels << " to mono for plugin" << std::endl;
+
+        } else {
+            
+            std::cerr << "PluginChannelAdapter::initialise: reducing " << m_inputChannels << " to " << m_pluginChannels << " for plugin" << std::endl;
+        }
+
+        m_pluginChannels = maxch;
+
+    } else {
+ 
+        std::cerr << "PluginChannelAdapter::initialise: accepting given number of channels (" << m_inputChannels << ")" << std::endl;
+        m_pluginChannels = m_inputChannels;
+    }
+
+    return m_plugin->initialise(m_pluginChannels, stepSize, blockSize);
+}
+
+PluginChannelAdapter::FeatureSet
+PluginChannelAdapter::Impl::processInterleaved(const float *inputBuffers,
+                                               RealTime timestamp)
+{
+    if (!m_deinterleave) {
+        m_deinterleave = new float *[m_inputChannels];
+        for (size_t i = 0; i < m_inputChannels; ++i) {
+            m_deinterleave[i] = new float[m_blockSize];
+        }
+    }
+
+    for (size_t i = 0; i < m_inputChannels; ++i) {
+        for (size_t j = 0; j < m_blockSize; ++j) {
+            m_deinterleave[i][j] = inputBuffers[j * m_inputChannels + i];
+        }
+    }
+
+    return process(m_deinterleave, timestamp);
+}
+
+PluginChannelAdapter::FeatureSet
+PluginChannelAdapter::Impl::process(const float *const *inputBuffers,
+                                    RealTime timestamp)
+{
+//    std::cerr << "PluginChannelAdapter::process: " << m_inputChannels << " -> " << m_pluginChannels << " channels" << std::endl;
+
+    if (m_inputChannels < m_pluginChannels) {
+
+        if (m_inputChannels == 1) {
+            for (size_t i = 0; i < m_pluginChannels; ++i) {
+                m_forwardPtrs[i] = inputBuffers[0];
+            }
+        } else {
+            for (size_t i = 0; i < m_inputChannels; ++i) {
+                m_forwardPtrs[i] = inputBuffers[i];
+            }
+            for (size_t i = m_inputChannels; i < m_pluginChannels; ++i) {
+                m_forwardPtrs[i] = m_buffer[i - m_inputChannels];
+            }
+        }
+
+        return m_plugin->process(m_forwardPtrs, timestamp);
+
+    } else if (m_inputChannels > m_pluginChannels) {
+
+        if (m_pluginChannels == 1) {
+            for (size_t j = 0; j < m_blockSize; ++j) {
+                m_buffer[0][j] = inputBuffers[0][j];
+            }
+            for (size_t i = 1; i < m_inputChannels; ++i) {
+                for (size_t j = 0; j < m_blockSize; ++j) {
+                    m_buffer[0][j] += inputBuffers[i][j];
+                }
+            }
+            for (size_t j = 0; j < m_blockSize; ++j) {
+                m_buffer[0][j] /= m_inputChannels;
+            }
+            return m_plugin->process(m_buffer, timestamp);
+        } else {
+            return m_plugin->process(inputBuffers, timestamp);
+        }
+
+    } else {
+
+        return m_plugin->process(inputBuffers, timestamp);
+    }
+}
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginChannelAdapter.cpp)
+
+
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp
new file mode 100644
index 0000000..5bf323b
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp
@@ -0,0 +1,456 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/PluginHostAdapter.h>
+#include <cstdlib>
+
+#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 0 )
+#error Incorrect Vamp SDK header included (not the expected 2.0 SDK)
+#endif
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginHostAdapter.cpp)
+
+namespace Vamp
+{
+
+PluginHostAdapter::PluginHostAdapter(const VampPluginDescriptor *descriptor,
+                                     float inputSampleRate) :
+    Plugin(inputSampleRate),
+    m_descriptor(descriptor)
+{
+//    std::cerr << "PluginHostAdapter::PluginHostAdapter (plugin = " << descriptor->name << ")" << std::endl;
+    m_handle = m_descriptor->instantiate(m_descriptor, inputSampleRate);
+    if (!m_handle) {
+//        std::cerr << "WARNING: PluginHostAdapter: Plugin instantiation failed for plugin " << m_descriptor->name << std::endl;
+    }
+}
+
+PluginHostAdapter::~PluginHostAdapter()
+{
+//    std::cerr << "PluginHostAdapter::~PluginHostAdapter (plugin = " << m_descriptor->name << ")" << std::endl;
+    if (m_handle) m_descriptor->cleanup(m_handle);
+}
+
+std::vector<std::string>
+PluginHostAdapter::getPluginPath()
+{
+    std::vector<std::string> path;
+    std::string envPath;
+
+    char *cpath = getenv("VAMP_PATH");
+    if (cpath) envPath = cpath;
+
+#ifdef _WIN32
+#define PATH_SEPARATOR ';'
+#define DEFAULT_VAMP_PATH "%ProgramFiles%\\Vamp Plugins"
+#else
+#define PATH_SEPARATOR ':'
+#ifdef __APPLE__
+#define DEFAULT_VAMP_PATH "$HOME/Library/Audio/Plug-Ins/Vamp:/Library/Audio/Plug-Ins/Vamp"
+#else
+#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/lib/vamp:/usr/lib/vamp"
+#endif
+#endif
+
+    if (envPath == "") {
+        envPath = DEFAULT_VAMP_PATH;
+        char *chome = getenv("HOME");
+        if (chome) {
+            std::string home(chome);
+            std::string::size_type f;
+            while ((f = envPath.find("$HOME")) != std::string::npos &&
+                    f < envPath.length()) {
+                envPath.replace(f, 5, home);
+            }
+        }
+#ifdef _WIN32
+        char *cpfiles = getenv("ProgramFiles");
+        if (!cpfiles) cpfiles = (char *)"C:\\Program Files";
+        std::string pfiles(cpfiles);
+        std::string::size_type f;
+        while ((f = envPath.find("%ProgramFiles%")) != std::string::npos &&
+               f < envPath.length()) {
+            envPath.replace(f, 14, pfiles);
+        }
+#endif
+    }
+
+    std::string::size_type index = 0, newindex = 0;
+
+    while ((newindex = envPath.find(PATH_SEPARATOR, index)) < envPath.size()) {
+	path.push_back(envPath.substr(index, newindex - index));
+	index = newindex + 1;
+    }
+    
+    path.push_back(envPath.substr(index));
+
+    return path;
+}
+
+bool
+PluginHostAdapter::initialise(size_t channels,
+                              size_t stepSize,
+                              size_t blockSize)
+{
+    if (!m_handle) return false;
+    return m_descriptor->initialise(m_handle, channels, stepSize, blockSize) ?
+        true : false;
+}
+
+void
+PluginHostAdapter::reset()
+{
+    if (!m_handle) {
+//        std::cerr << "PluginHostAdapter::reset: no handle" << std::endl;
+        return;
+    }
+//    std::cerr << "PluginHostAdapter::reset(" << m_handle << ")" << std::endl;
+    m_descriptor->reset(m_handle);
+}
+
+PluginHostAdapter::InputDomain
+PluginHostAdapter::getInputDomain() const
+{
+    if (m_descriptor->inputDomain == vampFrequencyDomain) {
+        return FrequencyDomain;
+    } else {
+        return TimeDomain;
+    }
+}
+
+unsigned int
+PluginHostAdapter::getVampApiVersion() const
+{
+    return m_descriptor->vampApiVersion;
+}
+
+std::string
+PluginHostAdapter::getIdentifier() const
+{
+    return m_descriptor->identifier;
+}
+
+std::string
+PluginHostAdapter::getName() const
+{
+    return m_descriptor->name;
+}
+
+std::string
+PluginHostAdapter::getDescription() const
+{
+    return m_descriptor->description;
+}
+
+std::string
+PluginHostAdapter::getMaker() const
+{
+    return m_descriptor->maker;
+}
+
+int
+PluginHostAdapter::getPluginVersion() const
+{
+    return m_descriptor->pluginVersion;
+}
+
+std::string
+PluginHostAdapter::getCopyright() const
+{
+    return m_descriptor->copyright;
+}
+
+PluginHostAdapter::ParameterList
+PluginHostAdapter::getParameterDescriptors() const
+{
+    ParameterList list;
+    for (unsigned int i = 0; i < m_descriptor->parameterCount; ++i) {
+        const VampParameterDescriptor *spd = m_descriptor->parameters[i];
+        ParameterDescriptor pd;
+        pd.identifier = spd->identifier;
+        pd.name = spd->name;
+        pd.description = spd->description;
+        pd.unit = spd->unit;
+        pd.minValue = spd->minValue;
+        pd.maxValue = spd->maxValue;
+        pd.defaultValue = spd->defaultValue;
+        pd.isQuantized = spd->isQuantized;
+        pd.quantizeStep = spd->quantizeStep;
+        if (pd.isQuantized && spd->valueNames) {
+            for (unsigned int j = 0; spd->valueNames[j]; ++j) {
+                pd.valueNames.push_back(spd->valueNames[j]);
+            }
+        }
+        list.push_back(pd);
+    }
+    return list;
+}
+
+float
+PluginHostAdapter::getParameter(std::string param) const
+{
+    if (!m_handle) return 0.0;
+
+    for (unsigned int i = 0; i < m_descriptor->parameterCount; ++i) {
+        if (param == m_descriptor->parameters[i]->identifier) {
+            return m_descriptor->getParameter(m_handle, i);
+        }
+    }
+
+    return 0.0;
+}
+
+void
+PluginHostAdapter::setParameter(std::string param, 
+                                float value)
+{
+    if (!m_handle) return;
+
+    for (unsigned int i = 0; i < m_descriptor->parameterCount; ++i) {
+        if (param == m_descriptor->parameters[i]->identifier) {
+            m_descriptor->setParameter(m_handle, i, value);
+            return;
+        }
+    }
+}
+
+PluginHostAdapter::ProgramList
+PluginHostAdapter::getPrograms() const
+{
+    ProgramList list;
+    
+    for (unsigned int i = 0; i < m_descriptor->programCount; ++i) {
+        list.push_back(m_descriptor->programs[i]);
+    }
+    
+    return list;
+}
+
+std::string
+PluginHostAdapter::getCurrentProgram() const
+{
+    if (!m_handle) return "";
+
+    int pn = m_descriptor->getCurrentProgram(m_handle);
+    return m_descriptor->programs[pn];
+}
+
+void
+PluginHostAdapter::selectProgram(std::string program)
+{
+    if (!m_handle) return;
+
+    for (unsigned int i = 0; i < m_descriptor->programCount; ++i) {
+        if (program == m_descriptor->programs[i]) {
+            m_descriptor->selectProgram(m_handle, i);
+            return;
+        }
+    }
+}
+
+size_t
+PluginHostAdapter::getPreferredStepSize() const
+{
+    if (!m_handle) return 0;
+    return m_descriptor->getPreferredStepSize(m_handle);
+}
+
+size_t
+PluginHostAdapter::getPreferredBlockSize() const
+{
+    if (!m_handle) return 0;
+    return m_descriptor->getPreferredBlockSize(m_handle);
+}
+
+size_t
+PluginHostAdapter::getMinChannelCount() const
+{
+    if (!m_handle) return 0;
+    return m_descriptor->getMinChannelCount(m_handle);
+}
+
+size_t
+PluginHostAdapter::getMaxChannelCount() const
+{
+    if (!m_handle) return 0;
+    return m_descriptor->getMaxChannelCount(m_handle);
+}
+
+PluginHostAdapter::OutputList
+PluginHostAdapter::getOutputDescriptors() const
+{
+    OutputList list;
+    if (!m_handle) {
+//        std::cerr << "PluginHostAdapter::getOutputDescriptors: no handle " << std::endl;
+        return list;
+    }
+
+    unsigned int count = m_descriptor->getOutputCount(m_handle);
+
+    for (unsigned int i = 0; i < count; ++i) {
+        VampOutputDescriptor *sd = m_descriptor->getOutputDescriptor(m_handle, i);
+        OutputDescriptor d;
+        d.identifier = sd->identifier;
+        d.name = sd->name;
+        d.description = sd->description;
+        d.unit = sd->unit;
+        d.hasFixedBinCount = sd->hasFixedBinCount;
+        d.binCount = sd->binCount;
+        if (d.hasFixedBinCount && sd->binNames) {
+            for (unsigned int j = 0; j < sd->binCount; ++j) {
+                d.binNames.push_back(sd->binNames[j] ? sd->binNames[j] : "");
+            }
+        }
+        d.hasKnownExtents = sd->hasKnownExtents;
+        d.minValue = sd->minValue;
+        d.maxValue = sd->maxValue;
+        d.isQuantized = sd->isQuantized;
+        d.quantizeStep = sd->quantizeStep;
+
+        switch (sd->sampleType) {
+        case vampOneSamplePerStep:
+            d.sampleType = OutputDescriptor::OneSamplePerStep; break;
+        case vampFixedSampleRate:
+            d.sampleType = OutputDescriptor::FixedSampleRate; break;
+        case vampVariableSampleRate:
+            d.sampleType = OutputDescriptor::VariableSampleRate; break;
+        }
+
+        d.sampleRate = sd->sampleRate;
+
+        if (m_descriptor->vampApiVersion >= 2) {
+            d.hasDuration = sd->hasDuration;
+        } else {
+            d.hasDuration = false;
+        }
+
+        list.push_back(d);
+
+        m_descriptor->releaseOutputDescriptor(sd);
+    }
+
+    return list;
+}
+
+PluginHostAdapter::FeatureSet
+PluginHostAdapter::process(const float *const *inputBuffers,
+                           RealTime timestamp)
+{
+    FeatureSet fs;
+    if (!m_handle) return fs;
+
+    int sec = timestamp.sec;
+    int nsec = timestamp.nsec;
+    
+    VampFeatureList *features = m_descriptor->process(m_handle,
+                                                      inputBuffers,
+                                                      sec, nsec);
+    
+    convertFeatures(features, fs);
+    m_descriptor->releaseFeatureSet(features);
+    return fs;
+}
+
+PluginHostAdapter::FeatureSet
+PluginHostAdapter::getRemainingFeatures()
+{
+    FeatureSet fs;
+    if (!m_handle) return fs;
+    
+    VampFeatureList *features = m_descriptor->getRemainingFeatures(m_handle); 
+
+    convertFeatures(features, fs);
+    m_descriptor->releaseFeatureSet(features);
+    return fs;
+}
+
+void
+PluginHostAdapter::convertFeatures(VampFeatureList *features,
+                                   FeatureSet &fs)
+{
+    if (!features) return;
+
+    unsigned int outputs = m_descriptor->getOutputCount(m_handle);
+
+    for (unsigned int i = 0; i < outputs; ++i) {
+        
+        VampFeatureList &list = features[i];
+
+        if (list.featureCount > 0) {
+
+            Feature feature;
+            feature.values.reserve(list.features[0].v1.valueCount);
+
+            for (unsigned int j = 0; j < list.featureCount; ++j) {
+
+                feature.hasTimestamp = list.features[j].v1.hasTimestamp;
+                feature.timestamp = RealTime(list.features[j].v1.sec,
+                                             list.features[j].v1.nsec);
+                feature.hasDuration = false;
+
+                if (m_descriptor->vampApiVersion >= 2) {
+                    unsigned int j2 = j + list.featureCount;
+                    feature.hasDuration = list.features[j2].v2.hasDuration;
+                    feature.duration = RealTime(list.features[j2].v2.durationSec,
+                                                list.features[j2].v2.durationNsec);
+                }
+
+                for (unsigned int k = 0; k < list.features[j].v1.valueCount; ++k) {
+                    feature.values.push_back(list.features[j].v1.values[k]);
+                }
+
+                if (list.features[j].v1.label) {
+                    feature.label = list.features[j].v1.label;
+                }
+
+                fs[i].push_back(feature);
+
+                if (list.features[j].v1.valueCount > 0) {
+                    feature.values.clear();
+                }
+
+                if (list.features[j].v1.label) {
+                    feature.label = "";
+                }
+            }
+        }
+    }
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginHostAdapter.cpp)
+
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp
new file mode 100644
index 0000000..967d5cf
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp
@@ -0,0 +1,582 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    This file is based in part on Don Cross's public domain FFT
+    implementation.
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/PluginInputDomainAdapter.h>
+
+#include <cmath>
+
+
+/**
+ * If you want to compile using FFTW instead of the built-in FFT
+ * implementation for the PluginInputDomainAdapter, define HAVE_FFTW3
+ * in the Makefile.
+ *
+ * Be aware that FFTW is licensed under the GPL -- unlike this SDK,
+ * which is provided under a more liberal BSD license in order to
+ * permit use in closed source applications.  The use of FFTW would
+ * mean that your code would need to be licensed under the GPL as
+ * well.  Do not define this symbol unless you understand and accept
+ * the implications of this.
+ *
+ * Parties such as Linux distribution packagers who redistribute this
+ * SDK for use in other programs should _not_ define this symbol, as
+ * it would change the effective licensing terms under which the SDK
+ * was available to third party developers.
+ *
+ * The default is not to use FFTW, and to use the built-in FFT instead.
+ * 
+ * Note: The FFTW code uses FFTW_MEASURE, and so will perform badly on
+ * its first invocation unless the host has saved and restored FFTW
+ * wisdom (see the FFTW documentation).
+ */
+#ifdef HAVE_FFTW3
+#include <fftw3.h>
+#endif
+
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginInputDomainAdapter.cpp)
+
+namespace Vamp {
+
+namespace HostExt {
+
+class PluginInputDomainAdapter::Impl
+{
+public:
+    Impl(Plugin *plugin, float inputSampleRate);
+    ~Impl();
+    
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    size_t getPreferredStepSize() const;
+    size_t getPreferredBlockSize() const;
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+    
+    RealTime getTimestampAdjustment() const;
+
+protected:
+    Plugin *m_plugin;
+    float m_inputSampleRate;
+    int m_channels;
+    int m_blockSize;
+    float **m_freqbuf;
+
+    double *m_ri;
+    double *m_window;
+
+#ifdef HAVE_FFTW3
+    fftw_plan m_plan;
+    fftw_complex *m_cbuf;
+#else
+    double *m_ro;
+    double *m_io;
+    void fft(unsigned int n, bool inverse,
+             double *ri, double *ii, double *ro, double *io);
+#endif
+
+    size_t makeBlockSizeAcceptable(size_t) const;
+};
+
+PluginInputDomainAdapter::PluginInputDomainAdapter(Plugin *plugin) :
+    PluginWrapper(plugin)
+{
+    m_impl = new Impl(plugin, m_inputSampleRate);
+}
+
+PluginInputDomainAdapter::~PluginInputDomainAdapter()
+{
+    delete m_impl;
+}
+  
+bool
+PluginInputDomainAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    return m_impl->initialise(channels, stepSize, blockSize);
+}
+
+Plugin::InputDomain
+PluginInputDomainAdapter::getInputDomain() const
+{
+    return TimeDomain;
+}
+
+size_t
+PluginInputDomainAdapter::getPreferredStepSize() const
+{
+    return m_impl->getPreferredStepSize();
+}
+
+size_t
+PluginInputDomainAdapter::getPreferredBlockSize() const
+{
+    return m_impl->getPreferredBlockSize();
+}
+
+Plugin::FeatureSet
+PluginInputDomainAdapter::process(const float *const *inputBuffers, RealTime timestamp)
+{
+    return m_impl->process(inputBuffers, timestamp);
+}
+
+RealTime
+PluginInputDomainAdapter::getTimestampAdjustment() const
+{
+    return m_impl->getTimestampAdjustment();
+}
+
+
+PluginInputDomainAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
+    m_plugin(plugin),
+    m_inputSampleRate(inputSampleRate),
+    m_channels(0),
+    m_blockSize(0),
+    m_freqbuf(0),
+    m_ri(0),
+    m_window(0),
+#ifdef HAVE_FFTW3
+    m_plan(0),
+    m_cbuf(0)
+#else
+    m_ro(0),
+    m_io(0)
+#endif
+{
+}
+
+PluginInputDomainAdapter::Impl::~Impl()
+{
+    // the adapter will delete the plugin
+
+    if (m_channels > 0) {
+        for (int c = 0; c < m_channels; ++c) {
+            delete[] m_freqbuf[c];
+        }
+        delete[] m_freqbuf;
+#ifdef HAVE_FFTW3
+        if (m_plan) {
+            fftw_destroy_plan(m_plan);
+            fftw_free(m_ri);
+            fftw_free(m_cbuf);
+            m_plan = 0;
+        }
+#else
+        delete[] m_ri;
+        delete[] m_ro;
+        delete[] m_io;
+#endif
+        delete[] m_window;
+    }
+}
+
+// for some visual studii apparently
+#ifndef M_PI
+#define M_PI 3.14159265358979232846
+#endif
+    
+bool
+PluginInputDomainAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    if (m_plugin->getInputDomain() == TimeDomain) {
+
+        m_blockSize = int(blockSize);
+        m_channels = int(channels);
+
+        return m_plugin->initialise(channels, stepSize, blockSize);
+    }
+
+    if (blockSize < 2) {
+        std::cerr << "ERROR: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: blocksize < 2 not supported" << std::endl;
+        return false;
+    }                
+        
+    if (blockSize & (blockSize-1)) {
+        std::cerr << "ERROR: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: non-power-of-two\nblocksize " << blockSize << " not supported" << std::endl;
+        return false;
+    }
+
+    if (m_channels > 0) {
+        for (int c = 0; c < m_channels; ++c) {
+            delete[] m_freqbuf[c];
+        }
+        delete[] m_freqbuf;
+#ifdef HAVE_FFTW3
+        if (m_plan) {
+            fftw_destroy_plan(m_plan);
+            fftw_free(m_ri);
+            fftw_free(m_cbuf);
+            m_plan = 0;
+        }
+#else
+        delete[] m_ri;
+        delete[] m_ro;
+        delete[] m_io;
+#endif
+        delete[] m_window;
+    }
+
+    m_blockSize = int(blockSize);
+    m_channels = int(channels);
+
+    m_freqbuf = new float *[m_channels];
+    for (int c = 0; c < m_channels; ++c) {
+        m_freqbuf[c] = new float[m_blockSize + 2];
+    }
+    m_window = new double[m_blockSize];
+
+    for (int i = 0; i < m_blockSize; ++i) {
+        // Hanning window
+        m_window[i] = (0.50 - 0.50 * cos((2.0 * M_PI * i) / m_blockSize));
+    }
+
+#ifdef HAVE_FFTW3
+    m_ri = (double *)fftw_malloc(blockSize * sizeof(double));
+    m_cbuf = (fftw_complex *)fftw_malloc((blockSize/2 + 1) * sizeof(fftw_complex));
+    m_plan = fftw_plan_dft_r2c_1d(blockSize, m_ri, m_cbuf, FFTW_MEASURE);
+#else
+    m_ri = new double[m_blockSize];
+    m_ro = new double[m_blockSize];
+    m_io = new double[m_blockSize];
+#endif
+
+    return m_plugin->initialise(channels, stepSize, blockSize);
+}
+
+size_t
+PluginInputDomainAdapter::Impl::getPreferredStepSize() const
+{
+    size_t step = m_plugin->getPreferredStepSize();
+
+    if (step == 0 && (m_plugin->getInputDomain() == FrequencyDomain)) {
+        step = getPreferredBlockSize() / 2;
+    }
+
+    return step;
+}
+
+size_t
+PluginInputDomainAdapter::Impl::getPreferredBlockSize() const
+{
+    size_t block = m_plugin->getPreferredBlockSize();
+
+    if (m_plugin->getInputDomain() == FrequencyDomain) {
+        if (block == 0) {
+            block = 1024;
+        } else {
+            block = makeBlockSizeAcceptable(block);
+        }
+    }
+
+    return block;
+}
+
+size_t
+PluginInputDomainAdapter::Impl::makeBlockSizeAcceptable(size_t blockSize) const
+{
+    if (blockSize < 2) {
+
+        std::cerr << "WARNING: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: blocksize < 2 not" << std::endl
+                  << "supported, increasing from " << blockSize << " to 2" << std::endl;
+        blockSize = 2;
+        
+    } else if (blockSize & (blockSize-1)) {
+            
+#ifdef HAVE_FFTW3
+        // not an issue with FFTW
+#else
+
+        // not a power of two, can't handle that with our built-in FFT
+        // implementation
+
+        size_t nearest = blockSize;
+        size_t power = 0;
+        while (nearest > 1) {
+            nearest >>= 1;
+            ++power;
+        }
+        nearest = 1;
+        while (power) {
+            nearest <<= 1;
+            --power;
+        }
+        
+        if (blockSize - nearest > (nearest*2) - blockSize) {
+            nearest = nearest*2;
+        }
+        
+        std::cerr << "WARNING: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: non-power-of-two\nblocksize " << blockSize << " not supported, using blocksize " << nearest << " instead" << std::endl;
+        blockSize = nearest;
+
+#endif
+    }
+
+    return blockSize;
+}
+
+RealTime
+PluginInputDomainAdapter::Impl::getTimestampAdjustment() const
+{
+    if (m_plugin->getInputDomain() == TimeDomain) {
+        return RealTime::zeroTime;
+    } else {
+        return RealTime::frame2RealTime
+            (m_blockSize/2, int(m_inputSampleRate + 0.5));
+    }
+}
+
+Plugin::FeatureSet
+PluginInputDomainAdapter::Impl::process(const float *const *inputBuffers,
+                                        RealTime timestamp)
+{
+    if (m_plugin->getInputDomain() == TimeDomain) {
+        return m_plugin->process(inputBuffers, timestamp);
+    }
+
+    // The timestamp supplied should be (according to the Vamp::Plugin
+    // spec) the time of the start of the time-domain input block.
+    // However, we want to pass to the plugin an FFT output calculated
+    // from the block of samples _centred_ on that timestamp.
+    // 
+    // We have two options:
+    // 
+    // 1. Buffer the input, calculating the fft of the values at the
+    // passed-in block minus blockSize/2 rather than starting at the
+    // passed-in block.  So each time we call process on the plugin,
+    // we are passing in the same timestamp as was passed to our own
+    // process plugin, but not (the frequency domain representation
+    // of) the same set of samples.  Advantages: avoids confusion in
+    // the host by ensuring the returned values have timestamps
+    // comparable with that passed in to this function (in fact this
+    // is pretty much essential for one-value-per-block outputs);
+    // consistent with hosts such as SV that deal with the
+    // frequency-domain transform themselves.  Disadvantages: means
+    // making the not necessarily correct assumption that the samples
+    // preceding the first official block are all zero (or some other
+    // known value).
+    //
+    // 2. Increase the passed-in timestamps by half the blocksize.  So
+    // when we call process, we are passing in the frequency domain
+    // representation of the same set of samples as passed to us, but
+    // with a different timestamp.  Advantages: simplicity; avoids
+    // iffy assumption mentioned above.  Disadvantages: inconsistency
+    // with SV in cases where stepSize != blockSize/2; potential
+    // confusion arising from returned timestamps being calculated
+    // from the adjusted input timestamps rather than the original
+    // ones (and inaccuracy where the returned timestamp is implied,
+    // as in one-value-per-block).
+    //
+    // Neither way is ideal, but I don't think either is strictly
+    // incorrect either.  I think this is just a case where the same
+    // plugin can legitimately produce differing results from the same
+    // input data, depending on how that data is packaged.
+    // 
+    // We'll go for option 2, adjusting the timestamps.  Note in
+    // particular that this means some results can differ from those
+    // produced by SV.
+
+//    std::cerr << "PluginInputDomainAdapter: sampleRate " << m_inputSampleRate << ", blocksize " << m_blockSize << ", adjusting time from " << timestamp;
+
+    timestamp = timestamp + getTimestampAdjustment();
+
+//    std::cerr << " to " << timestamp << std::endl;
+
+    for (int c = 0; c < m_channels; ++c) {
+
+        for (int i = 0; i < m_blockSize; ++i) {
+            m_ri[i] = double(inputBuffers[c][i]) * m_window[i];
+        }
+
+        for (int i = 0; i < m_blockSize/2; ++i) {
+            // FFT shift
+            double value = m_ri[i];
+            m_ri[i] = m_ri[i + m_blockSize/2];
+            m_ri[i + m_blockSize/2] = value;
+        }
+
+#ifdef HAVE_FFTW3
+
+        fftw_execute(m_plan);
+
+        for (int i = 0; i <= m_blockSize/2; ++i) {
+            m_freqbuf[c][i * 2] = float(m_cbuf[i][0]);
+            m_freqbuf[c][i * 2 + 1] = float(m_cbuf[i][1]);
+        }
+
+#else
+
+        fft(m_blockSize, false, m_ri, 0, m_ro, m_io);
+
+        for (int i = 0; i <= m_blockSize/2; ++i) {
+            m_freqbuf[c][i * 2] = float(m_ro[i]);
+            m_freqbuf[c][i * 2 + 1] = float(m_io[i]);
+        }
+
+#endif
+    }
+
+    return m_plugin->process(m_freqbuf, timestamp);
+}
+
+#ifndef HAVE_FFTW3
+
+void
+PluginInputDomainAdapter::Impl::fft(unsigned int n, bool inverse,
+                                    double *ri, double *ii, double *ro, double *io)
+{
+    if (!ri || !ro || !io) return;
+
+    unsigned int bits;
+    unsigned int i, j, k, m;
+    unsigned int blockSize, blockEnd;
+
+    double tr, ti;
+
+    if (n < 2) return;
+    if (n & (n-1)) return;
+
+    double angle = 2.0 * M_PI;
+    if (inverse) angle = -angle;
+
+    for (i = 0; ; ++i) {
+	if (n & (1 << i)) {
+	    bits = i;
+	    break;
+	}
+    }
+
+    static unsigned int tableSize = 0;
+    static int *table = 0;
+
+    if (tableSize != n) {
+
+	delete[] table;
+
+	table = new int[n];
+
+	for (i = 0; i < n; ++i) {
+	
+	    m = i;
+
+	    for (j = k = 0; j < bits; ++j) {
+		k = (k << 1) | (m & 1);
+		m >>= 1;
+	    }
+
+	    table[i] = k;
+	}
+
+	tableSize = n;
+    }
+
+    if (ii) {
+	for (i = 0; i < n; ++i) {
+	    ro[table[i]] = ri[i];
+	    io[table[i]] = ii[i];
+	}
+    } else {
+	for (i = 0; i < n; ++i) {
+	    ro[table[i]] = ri[i];
+	    io[table[i]] = 0.0;
+	}
+    }
+
+    blockEnd = 1;
+
+    for (blockSize = 2; blockSize <= n; blockSize <<= 1) {
+
+	double delta = angle / (double)blockSize;
+	double sm2 = -sin(-2 * delta);
+	double sm1 = -sin(-delta);
+	double cm2 = cos(-2 * delta);
+	double cm1 = cos(-delta);
+	double w = 2 * cm1;
+	double ar[3], ai[3];
+
+	for (i = 0; i < n; i += blockSize) {
+
+	    ar[2] = cm2;
+	    ar[1] = cm1;
+
+	    ai[2] = sm2;
+	    ai[1] = sm1;
+
+	    for (j = i, m = 0; m < blockEnd; j++, m++) {
+
+		ar[0] = w * ar[1] - ar[2];
+		ar[2] = ar[1];
+		ar[1] = ar[0];
+
+		ai[0] = w * ai[1] - ai[2];
+		ai[2] = ai[1];
+		ai[1] = ai[0];
+
+		k = j + blockEnd;
+		tr = ar[0] * ro[k] - ai[0] * io[k];
+		ti = ar[0] * io[k] + ai[0] * ro[k];
+
+		ro[k] = ro[j] - tr;
+		io[k] = io[j] - ti;
+
+		ro[j] += tr;
+		io[j] += ti;
+	    }
+	}
+
+	blockEnd = blockSize;
+    }
+
+    if (inverse) {
+
+	double denom = (double)n;
+
+	for (i = 0; i < n; i++) {
+	    ro[i] /= denom;
+	    io[i] /= denom;
+	}
+    }
+}
+
+#endif
+
+}
+        
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginInputDomainAdapter.cpp)
+
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginLoader.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginLoader.cpp
new file mode 100644
index 0000000..3bf23bb
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginLoader.cpp
@@ -0,0 +1,641 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/PluginHostAdapter.h>
+#include <vamp-hostsdk/PluginLoader.h>
+#include <vamp-hostsdk/PluginInputDomainAdapter.h>
+#include <vamp-hostsdk/PluginChannelAdapter.h>
+#include <vamp-hostsdk/PluginBufferingAdapter.h>
+
+#include <fstream>
+#include <cctype> // tolower
+
+#include <cstring>
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include <tchar.h>
+#define PLUGIN_SUFFIX "dll"
+
+#else /* ! _WIN32 */
+
+#include <dirent.h>
+#include <dlfcn.h>
+
+#ifdef __APPLE__
+#define PLUGIN_SUFFIX "dylib"
+#else /* ! __APPLE__ */
+#define PLUGIN_SUFFIX "so"
+#endif /* ! __APPLE__ */
+
+#endif /* ! _WIN32 */
+
+using namespace std;
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginLoader.cpp)
+
+namespace Vamp {
+	
+namespace HostExt {
+
+class PluginLoader::Impl
+{
+public:
+    Impl();
+    virtual ~Impl();
+
+    PluginKeyList listPlugins();
+
+    Plugin *loadPlugin(PluginKey key,
+                       float inputSampleRate,
+                       int adapterFlags);
+
+    PluginKey composePluginKey(string libraryName, string identifier);
+
+    PluginCategoryHierarchy getPluginCategory(PluginKey key);
+
+    string getLibraryPathForPlugin(PluginKey key);
+
+    static void setInstanceToClean(PluginLoader *instance);
+
+protected:
+    class PluginDeletionNotifyAdapter : public PluginWrapper {
+    public:
+        PluginDeletionNotifyAdapter(Plugin *plugin, Impl *loader);
+        virtual ~PluginDeletionNotifyAdapter();
+    protected:
+        Impl *m_loader;
+    };
+
+    class InstanceCleaner {
+    public:
+        InstanceCleaner() : m_instance(0) { }
+        ~InstanceCleaner() { delete m_instance; }
+        void setInstance(PluginLoader *instance) { m_instance = instance; }
+    protected:
+        PluginLoader *m_instance;
+    };
+
+    virtual void pluginDeleted(PluginDeletionNotifyAdapter *adapter);
+
+    map<PluginKey, string> m_pluginLibraryNameMap;
+    bool m_allPluginsEnumerated;
+    void enumeratePlugins(PluginKey forPlugin = "");
+
+    map<PluginKey, PluginCategoryHierarchy> m_taxonomy;
+    void generateTaxonomy();
+
+    map<Plugin *, void *> m_pluginLibraryHandleMap;
+
+    bool decomposePluginKey(PluginKey key,
+                            string &libraryName, string &identifier);
+
+    void *loadLibrary(string path);
+    void unloadLibrary(void *handle);
+    void *lookupInLibrary(void *handle, const char *symbol);
+
+    string splicePath(string a, string b);
+    vector<string> listFiles(string dir, string ext);
+    
+    static InstanceCleaner m_cleaner;
+};
+
+PluginLoader *
+PluginLoader::m_instance = 0;
+
+PluginLoader::Impl::InstanceCleaner
+PluginLoader::Impl::m_cleaner;
+
+PluginLoader::PluginLoader()
+{
+    m_impl = new Impl();
+}
+
+PluginLoader::~PluginLoader()
+{
+    delete m_impl;
+}
+
+PluginLoader *
+PluginLoader::getInstance()
+{
+    if (!m_instance) {
+        // The cleaner doesn't own the instance, because we leave the
+        // instance pointer in the base class for binary backwards
+        // compatibility reasons and to avoid waste
+        m_instance = new PluginLoader();
+        Impl::setInstanceToClean(m_instance);
+    }
+    return m_instance;
+}
+
+vector<PluginLoader::PluginKey>
+PluginLoader::listPlugins() 
+{
+    return m_impl->listPlugins();
+}
+
+Plugin *
+PluginLoader::loadPlugin(PluginKey key,
+                         float inputSampleRate,
+                         int adapterFlags)
+{
+    return m_impl->loadPlugin(key, inputSampleRate, adapterFlags);
+}
+
+PluginLoader::PluginKey
+PluginLoader::composePluginKey(string libraryName, string identifier) 
+{
+    return m_impl->composePluginKey(libraryName, identifier);
+}
+
+PluginLoader::PluginCategoryHierarchy
+PluginLoader::getPluginCategory(PluginKey key)
+{
+    return m_impl->getPluginCategory(key);
+}
+
+string
+PluginLoader::getLibraryPathForPlugin(PluginKey key)
+{
+    return m_impl->getLibraryPathForPlugin(key);
+}
+ 
+PluginLoader::Impl::Impl() :
+    m_allPluginsEnumerated(false)
+{
+}
+
+PluginLoader::Impl::~Impl()
+{
+}
+
+void
+PluginLoader::Impl::setInstanceToClean(PluginLoader *instance)
+{
+    m_cleaner.setInstance(instance);
+}
+
+vector<PluginLoader::PluginKey>
+PluginLoader::Impl::listPlugins() 
+{
+    if (!m_allPluginsEnumerated) enumeratePlugins();
+
+    vector<PluginKey> plugins;
+    for (map<PluginKey, string>::iterator mi = m_pluginLibraryNameMap.begin();
+         mi != m_pluginLibraryNameMap.end(); ++mi) {
+        plugins.push_back(mi->first);
+    }
+
+    return plugins;
+}
+
+void
+PluginLoader::Impl::enumeratePlugins(PluginKey forPlugin)
+{
+    vector<string> path = PluginHostAdapter::getPluginPath();
+
+    string libraryName, identifier;
+    if (forPlugin != "") {
+        if (!decomposePluginKey(forPlugin, libraryName, identifier)) {
+            std::cerr << "WARNING: Vamp::HostExt::PluginLoader: Invalid plugin key \""
+                      << forPlugin << "\" in enumerate" << std::endl;
+            return;
+        }
+    }
+
+    for (size_t i = 0; i < path.size(); ++i) {
+        
+        vector<string> files = listFiles(path[i], PLUGIN_SUFFIX);
+
+        for (vector<string>::iterator fi = files.begin();
+             fi != files.end(); ++fi) {
+            
+            if (libraryName != "") {
+                // libraryName is lowercased and lacking an extension,
+                // as it came from the plugin key
+                string temp = *fi;
+                for (size_t i = 0; i < temp.length(); ++i) {
+                    temp[i] = tolower(temp[i]);
+                }
+                string::size_type pi = temp.find('.');
+                if (pi == string::npos) {
+                    if (libraryName != temp) continue;
+                } else {
+                    if (libraryName != temp.substr(0, pi)) continue;
+                }
+            }
+
+            string fullPath = path[i];
+            fullPath = splicePath(fullPath, *fi);
+            void *handle = loadLibrary(fullPath);
+            if (!handle) continue;
+            
+            VampGetPluginDescriptorFunction fn =
+                (VampGetPluginDescriptorFunction)lookupInLibrary
+                (handle, "vampGetPluginDescriptor");
+            
+            if (!fn) {
+                unloadLibrary(handle);
+                continue;
+            }
+            
+            int index = 0;
+            const VampPluginDescriptor *descriptor = 0;
+            
+            while ((descriptor = fn(VAMP_API_VERSION, index))) {
+                ++index;
+                if (identifier != "") {
+                    if (descriptor->identifier != identifier) continue;
+                }
+                PluginKey key = composePluginKey(*fi, descriptor->identifier);
+//                std::cerr << "enumerate: " << key << " (path: " << fullPath << ")" << std::endl;
+                if (m_pluginLibraryNameMap.find(key) ==
+                    m_pluginLibraryNameMap.end()) {
+                    m_pluginLibraryNameMap[key] = fullPath;
+                }
+            }
+            
+            unloadLibrary(handle);
+        }
+    }
+
+    if (forPlugin == "") m_allPluginsEnumerated = true;
+}
+
+PluginLoader::PluginKey
+PluginLoader::Impl::composePluginKey(string libraryName, string identifier)
+{
+    string basename = libraryName;
+
+    string::size_type li = basename.rfind('/');
+    if (li != string::npos) basename = basename.substr(li + 1);
+
+    li = basename.find('.');
+    if (li != string::npos) basename = basename.substr(0, li);
+
+    for (size_t i = 0; i < basename.length(); ++i) {
+        basename[i] = tolower(basename[i]);
+    }
+
+    return basename + ":" + identifier;
+}
+
+bool
+PluginLoader::Impl::decomposePluginKey(PluginKey key,
+                                       string &libraryName,
+                                       string &identifier)
+{
+    string::size_type ki = key.find(':');
+    if (ki == string::npos) {
+        return false;
+    }
+
+    libraryName = key.substr(0, ki);
+    identifier = key.substr(ki + 1);
+    return true;
+}
+
+PluginLoader::PluginCategoryHierarchy
+PluginLoader::Impl::getPluginCategory(PluginKey plugin)
+{
+    if (m_taxonomy.empty()) generateTaxonomy();
+    if (m_taxonomy.find(plugin) == m_taxonomy.end()) {
+        return PluginCategoryHierarchy();
+    }
+    return m_taxonomy[plugin];
+}
+
+string
+PluginLoader::Impl::getLibraryPathForPlugin(PluginKey plugin)
+{
+    if (m_pluginLibraryNameMap.find(plugin) == m_pluginLibraryNameMap.end()) {
+        if (m_allPluginsEnumerated) return "";
+        enumeratePlugins(plugin);
+    }
+    if (m_pluginLibraryNameMap.find(plugin) == m_pluginLibraryNameMap.end()) {
+        return "";
+    }
+    return m_pluginLibraryNameMap[plugin];
+}    
+
+Plugin *
+PluginLoader::Impl::loadPlugin(PluginKey key,
+                               float inputSampleRate, int adapterFlags)
+{
+    string libname, identifier;
+    if (!decomposePluginKey(key, libname, identifier)) {
+        std::cerr << "Vamp::HostExt::PluginLoader: Invalid plugin key \""
+                  << key << "\" in loadPlugin" << std::endl;
+        return 0;
+    }
+        
+    string fullPath = getLibraryPathForPlugin(key);
+    if (fullPath == "") return 0;
+    
+    void *handle = loadLibrary(fullPath);
+    if (!handle) return 0;
+    
+    VampGetPluginDescriptorFunction fn =
+        (VampGetPluginDescriptorFunction)lookupInLibrary
+        (handle, "vampGetPluginDescriptor");
+
+    if (!fn) {
+        unloadLibrary(handle);
+        return 0;
+    }
+
+    int index = 0;
+    const VampPluginDescriptor *descriptor = 0;
+
+    while ((descriptor = fn(VAMP_API_VERSION, index))) {
+
+        if (string(descriptor->identifier) == identifier) {
+
+            Vamp::PluginHostAdapter *plugin =
+                new Vamp::PluginHostAdapter(descriptor, inputSampleRate);
+
+            Plugin *adapter = new PluginDeletionNotifyAdapter(plugin, this);
+
+            m_pluginLibraryHandleMap[adapter] = handle;
+
+            if (adapterFlags & ADAPT_INPUT_DOMAIN) {
+                if (adapter->getInputDomain() == Plugin::FrequencyDomain) {
+                    adapter = new PluginInputDomainAdapter(adapter);
+                }
+            }
+
+            if (adapterFlags & ADAPT_BUFFER_SIZE) {
+                adapter = new PluginBufferingAdapter(adapter);
+            }
+
+            if (adapterFlags & ADAPT_CHANNEL_COUNT) {
+                adapter = new PluginChannelAdapter(adapter);
+            }
+
+            return adapter;
+        }
+
+        ++index;
+    }
+
+    cerr << "Vamp::HostExt::PluginLoader: Plugin \""
+         << identifier << "\" not found in library \""
+         << fullPath << "\"" << endl;
+
+    return 0;
+}
+
+void
+PluginLoader::Impl::generateTaxonomy()
+{
+//    cerr << "PluginLoader::Impl::generateTaxonomy" << endl;
+
+    vector<string> path = PluginHostAdapter::getPluginPath();
+    string libfragment = "/lib/";
+    vector<string> catpath;
+
+    string suffix = "cat";
+
+    for (vector<string>::iterator i = path.begin();
+         i != path.end(); ++i) {
+
+        // It doesn't matter that we're using literal forward-slash in
+        // this bit, as it's only relevant if the path contains
+        // "/lib/", which is only meaningful and only plausible on
+        // systems with forward-slash delimiters
+        
+        string dir = *i;
+        string::size_type li = dir.find(libfragment);
+
+        if (li != string::npos) {
+            catpath.push_back
+                (dir.substr(0, li)
+                 + "/share/"
+                 + dir.substr(li + libfragment.length()));
+        }
+
+        catpath.push_back(dir);
+    }
+
+    char buffer[1024];
+
+    for (vector<string>::iterator i = catpath.begin();
+         i != catpath.end(); ++i) {
+        
+        vector<string> files = listFiles(*i, suffix);
+
+        for (vector<string>::iterator fi = files.begin();
+             fi != files.end(); ++fi) {
+
+            string filepath = splicePath(*i, *fi);
+            ifstream is(filepath.c_str(), ifstream::in | ifstream::binary);
+
+            if (is.fail()) {
+//                cerr << "failed to open: " << filepath << endl;
+                continue;
+            }
+
+//            cerr << "opened: " << filepath << endl;
+
+            while (!!is.getline(buffer, 1024)) {
+
+                string line(buffer);
+
+//                cerr << "line = " << line << endl;
+
+                string::size_type di = line.find("::");
+                if (di == string::npos) continue;
+
+                string id = line.substr(0, di);
+                string encodedCat = line.substr(di + 2);
+
+                if (id.substr(0, 5) != "vamp:") continue;
+                id = id.substr(5);
+
+                while (encodedCat.length() >= 1 &&
+                       encodedCat[encodedCat.length()-1] == '\r') {
+                    encodedCat = encodedCat.substr(0, encodedCat.length()-1);
+                }
+
+//                cerr << "id = " << id << ", cat = " << encodedCat << endl;
+
+                PluginCategoryHierarchy category;
+                string::size_type ai;
+                while ((ai = encodedCat.find(" > ")) != string::npos) {
+                    category.push_back(encodedCat.substr(0, ai));
+                    encodedCat = encodedCat.substr(ai + 3);
+                }
+                if (encodedCat != "") category.push_back(encodedCat);
+
+                m_taxonomy[id] = category;
+            }
+        }
+    }
+}    
+
+void *
+PluginLoader::Impl::loadLibrary(string path)
+{
+    void *handle = 0;
+#ifdef _WIN32
+    handle = LoadLibrary(path.c_str());
+    if (!handle) {
+        cerr << "Vamp::HostExt::PluginLoader: Unable to load library \""
+             << path << "\"" << endl;
+    }
+#else
+    handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL);
+    if (!handle) {
+        cerr << "Vamp::HostExt::PluginLoader: Unable to load library \""
+             << path << "\": " << dlerror() << endl;
+    }
+#endif
+    return handle;
+}
+
+void
+PluginLoader::Impl::unloadLibrary(void *handle)
+{
+#ifdef _WIN32
+    FreeLibrary((HINSTANCE)handle);
+#else
+    dlclose(handle);
+#endif
+}
+
+void *
+PluginLoader::Impl::lookupInLibrary(void *handle, const char *symbol)
+{
+#ifdef _WIN32
+    return (void *)GetProcAddress((HINSTANCE)handle, symbol);
+#else
+    return (void *)dlsym(handle, symbol);
+#endif
+}
+
+string
+PluginLoader::Impl::splicePath(string a, string b)
+{
+#ifdef _WIN32
+    return a + "\\" + b;
+#else
+    return a + "/" + b;
+#endif
+}
+
+vector<string>
+PluginLoader::Impl::listFiles(string dir, string extension)
+{
+    vector<string> files;
+
+#ifdef _WIN32
+
+    string expression = dir + "\\*." + extension;
+    WIN32_FIND_DATA data;
+    HANDLE fh = FindFirstFile(expression.c_str(), &data);
+    if (fh == INVALID_HANDLE_VALUE) return files;
+
+    bool ok = true;
+    while (ok) {
+        files.push_back(data.cFileName);
+        ok = FindNextFile(fh, &data);
+    }
+
+    FindClose(fh);
+
+#else
+
+    size_t extlen = extension.length();
+    DIR *d = opendir(dir.c_str());
+    if (!d) return files;
+            
+    struct dirent *e = 0;
+    while ((e = readdir(d))) {
+ 
+        if (!e->d_name) continue;
+       
+        size_t len = strlen(e->d_name);
+        if (len < extlen + 2 ||
+            e->d_name + len - extlen - 1 != "." + extension) {
+            continue;
+        }
+
+        files.push_back(e->d_name);
+    }
+
+    closedir(d);
+#endif
+
+    return files;
+}
+
+void
+PluginLoader::Impl::pluginDeleted(PluginDeletionNotifyAdapter *adapter)
+{
+    void *handle = m_pluginLibraryHandleMap[adapter];
+    if (handle) unloadLibrary(handle);
+    m_pluginLibraryHandleMap.erase(adapter);
+}
+
+PluginLoader::Impl::PluginDeletionNotifyAdapter::PluginDeletionNotifyAdapter(Plugin *plugin,
+                                                                             Impl *loader) :
+    PluginWrapper(plugin),
+    m_loader(loader)
+{
+}
+
+PluginLoader::Impl::PluginDeletionNotifyAdapter::~PluginDeletionNotifyAdapter()
+{
+    // We need to delete the plugin before calling pluginDeleted, as
+    // the delete call may require calling through to the descriptor
+    // (for e.g. cleanup) but pluginDeleted may unload the required
+    // library for the call.  To prevent a double deletion when our
+    // parent's destructor runs (after this one), be sure to set
+    // m_plugin to 0 after deletion.
+    delete m_plugin;
+    m_plugin = 0;
+
+    if (m_loader) m_loader->pluginDeleted(this);
+}
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginLoader.cpp)
+
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp
new file mode 100644
index 0000000..4ffd90a
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp
@@ -0,0 +1,912 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2008 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/PluginSummarisingAdapter.h>
+
+#include <map>
+#include <algorithm>
+#include <cmath>
+#include <climits>
+
+//#define DEBUG_PLUGIN_SUMMARISING_ADAPTER 1
+//#define DEBUG_PLUGIN_SUMMARISING_ADAPTER_SEGMENT 1
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginSummarisingAdapter.cpp)
+
+namespace Vamp {
+
+namespace HostExt {
+
+class PluginSummarisingAdapter::Impl
+{
+public:
+    Impl(Plugin *plugin, float inputSampleRate);
+    ~Impl();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+    FeatureSet getRemainingFeatures();
+
+    void setSummarySegmentBoundaries(const SegmentBoundaries &);
+
+    FeatureList getSummaryForOutput(int output,
+                                    SummaryType type,
+                                    AveragingMethod avg);
+
+    FeatureSet getSummaryForAllOutputs(SummaryType type,
+                                       AveragingMethod avg);
+
+protected:
+    Plugin *m_plugin;
+    float m_inputSampleRate;
+    size_t m_stepSize;
+    size_t m_blockSize;
+
+    SegmentBoundaries m_boundaries;
+
+    typedef std::vector<float> ValueList;
+
+    struct Result { // smaller than Feature
+        RealTime time;
+        RealTime duration;
+        ValueList values; // bin number -> value
+    };
+
+    typedef std::vector<Result> ResultList;
+
+    struct OutputAccumulator {
+        int bins;
+        ResultList results;
+        OutputAccumulator() : bins(0) { }
+    };
+
+    typedef std::map<int, OutputAccumulator> OutputAccumulatorMap;
+    OutputAccumulatorMap m_accumulators; // output number -> accumulator
+
+    typedef std::map<RealTime, OutputAccumulator> SegmentAccumulatorMap;
+    typedef std::map<int, SegmentAccumulatorMap> OutputSegmentAccumulatorMap;
+    OutputSegmentAccumulatorMap m_segmentedAccumulators; // output -> segmented
+
+    typedef std::map<int, RealTime> OutputTimestampMap;
+    OutputTimestampMap m_prevTimestamps; // output number -> timestamp
+    OutputTimestampMap m_prevDurations; // output number -> durations
+
+    struct OutputBinSummary {
+
+        int count;
+
+        // extents
+        double minimum;
+        double maximum;
+        double sum;
+
+        // sample-average results
+        double median;
+        double mode;
+        double variance;
+
+        // continuous-time average results
+        double median_c;
+        double mode_c;
+        double mean_c;
+        double variance_c;
+    };
+
+    typedef std::map<int, OutputBinSummary> OutputSummary;
+    typedef std::map<RealTime, OutputSummary> SummarySegmentMap;
+    typedef std::map<int, SummarySegmentMap> OutputSummarySegmentMap;
+
+    OutputSummarySegmentMap m_summaries;
+
+    bool m_reduced;
+    RealTime m_endTime;
+
+    void accumulate(const FeatureSet &fs, RealTime, bool final);
+    void accumulate(int output, const Feature &f, RealTime, bool final);
+    void accumulateFinalDurations();
+    void findSegmentBounds(RealTime t, RealTime &start, RealTime &end);
+    void segment();
+    void reduce();
+
+    std::string getSummaryLabel(SummaryType type, AveragingMethod avg);
+};
+
+static RealTime INVALID_DURATION(INT_MIN, INT_MIN);
+    
+PluginSummarisingAdapter::PluginSummarisingAdapter(Plugin *plugin) :
+    PluginWrapper(plugin)
+{
+    m_impl = new Impl(plugin, m_inputSampleRate);
+}
+
+PluginSummarisingAdapter::~PluginSummarisingAdapter()
+{
+    delete m_impl;
+}
+
+bool
+PluginSummarisingAdapter::initialise(size_t channels,
+                                     size_t stepSize, size_t blockSize)
+{
+    return
+        PluginWrapper::initialise(channels, stepSize, blockSize) &&
+        m_impl->initialise(channels, stepSize, blockSize);
+}
+
+Plugin::FeatureSet
+PluginSummarisingAdapter::process(const float *const *inputBuffers, RealTime timestamp)
+{
+    return m_impl->process(inputBuffers, timestamp);
+}
+
+Plugin::FeatureSet
+PluginSummarisingAdapter::getRemainingFeatures()
+{
+    return m_impl->getRemainingFeatures();
+}
+
+void
+PluginSummarisingAdapter::setSummarySegmentBoundaries(const SegmentBoundaries &b)
+{
+    m_impl->setSummarySegmentBoundaries(b);
+}
+
+Plugin::FeatureList
+PluginSummarisingAdapter::getSummaryForOutput(int output,
+                                              SummaryType type,
+                                              AveragingMethod avg)
+{
+    return m_impl->getSummaryForOutput(output, type, avg);
+}
+
+Plugin::FeatureSet
+PluginSummarisingAdapter::getSummaryForAllOutputs(SummaryType type,
+                                                  AveragingMethod avg)
+{
+    return m_impl->getSummaryForAllOutputs(type, avg);
+}
+
+PluginSummarisingAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
+    m_plugin(plugin),
+    m_inputSampleRate(inputSampleRate),
+    m_reduced(false)
+{
+}
+
+PluginSummarisingAdapter::Impl::~Impl()
+{
+}
+
+bool
+PluginSummarisingAdapter::Impl::initialise(size_t channels,
+                                           size_t stepSize, size_t blockSize)
+{
+    m_stepSize = stepSize;
+    m_blockSize = blockSize;
+    return true;
+}
+
+Plugin::FeatureSet
+PluginSummarisingAdapter::Impl::process(const float *const *inputBuffers,
+                                        RealTime timestamp)
+{
+    if (m_reduced) {
+        std::cerr << "WARNING: Cannot call PluginSummarisingAdapter::process() or getRemainingFeatures() after one of the getSummary methods" << std::endl;
+    }
+    FeatureSet fs = m_plugin->process(inputBuffers, timestamp);
+    accumulate(fs, timestamp, false);
+    m_endTime = timestamp + 
+        RealTime::frame2RealTime(m_stepSize, int(m_inputSampleRate + 0.5));
+    return fs;
+}
+
+Plugin::FeatureSet
+PluginSummarisingAdapter::Impl::getRemainingFeatures()
+{
+    if (m_reduced) {
+        std::cerr << "WARNING: Cannot call PluginSummarisingAdapter::process() or getRemainingFeatures() after one of the getSummary methods" << std::endl;
+    }
+    FeatureSet fs = m_plugin->getRemainingFeatures();
+    accumulate(fs, m_endTime, true);
+    return fs;
+}
+
+void
+PluginSummarisingAdapter::Impl::setSummarySegmentBoundaries(const SegmentBoundaries &b)
+{
+    m_boundaries = b;
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+    std::cerr << "PluginSummarisingAdapter::setSummarySegmentBoundaries: boundaries are:" << std::endl;
+    for (SegmentBoundaries::const_iterator i = m_boundaries.begin();
+         i != m_boundaries.end(); ++i) {
+        std::cerr << *i << "  ";
+    }
+    std::cerr << std::endl;
+#endif
+}
+
+Plugin::FeatureList
+PluginSummarisingAdapter::Impl::getSummaryForOutput(int output,
+                                                    SummaryType type,
+                                                    AveragingMethod avg)
+{
+    if (!m_reduced) {
+        accumulateFinalDurations();
+        segment();
+        reduce();
+        m_reduced = true;
+    }
+
+    bool continuous = (avg == ContinuousTimeAverage);
+
+    FeatureList fl;
+    for (SummarySegmentMap::const_iterator i = m_summaries[output].begin();
+         i != m_summaries[output].end(); ++i) {
+
+        Feature f;
+
+        f.hasTimestamp = true;
+        f.timestamp = i->first;
+
+        f.hasDuration = true;
+        SummarySegmentMap::const_iterator ii = i;
+        if (++ii == m_summaries[output].end()) {
+            f.duration = m_endTime - f.timestamp;
+        } else {
+            f.duration = ii->first - f.timestamp;
+        }
+
+        f.label = getSummaryLabel(type, avg);
+
+        for (OutputSummary::const_iterator j = i->second.begin();
+             j != i->second.end(); ++j) {
+
+            // these will be ordered by bin number, and no bin numbers
+            // will be missing except at the end (because of the way
+            // the accumulators were initially filled in accumulate())
+
+            const OutputBinSummary &summary = j->second;
+            double result = 0.f;
+
+            switch (type) {
+
+            case Minimum:
+                result = summary.minimum;
+                break;
+
+            case Maximum:
+                result = summary.maximum;
+                break;
+
+            case Mean:
+                if (continuous) {
+                    result = summary.mean_c;
+                } else if (summary.count) {
+                    result = summary.sum / summary.count;
+                }
+                break;
+
+            case Median:
+                if (continuous) result = summary.median_c;
+                else result = summary.median;
+                break;
+
+            case Mode:
+                if (continuous) result = summary.mode_c;
+                else result = summary.mode;
+                break;
+
+            case Sum:
+                result = summary.sum;
+                break;
+
+            case Variance:
+                if (continuous) result = summary.variance_c;
+                else result = summary.variance;
+                break;
+
+            case StandardDeviation:
+                if (continuous) result = sqrtf(summary.variance_c);
+                else result = sqrtf(summary.variance);
+                break;
+
+            case Count:
+                result = summary.count;
+                break;
+
+            case UnknownSummaryType:
+                break;
+
+            default:
+                break;
+            }
+            
+            f.values.push_back(result);
+        }
+
+        fl.push_back(f);
+    }
+    return fl;
+}
+
+Plugin::FeatureSet
+PluginSummarisingAdapter::Impl::getSummaryForAllOutputs(SummaryType type,
+                                                        AveragingMethod avg)
+{
+    if (!m_reduced) {
+        accumulateFinalDurations();
+        segment();
+        reduce();
+        m_reduced = true;
+    }
+
+    FeatureSet fs;
+    for (OutputSummarySegmentMap::const_iterator i = m_summaries.begin();
+         i != m_summaries.end(); ++i) {
+        fs[i->first] = getSummaryForOutput(i->first, type, avg);
+    }
+    return fs;
+}
+
+void
+PluginSummarisingAdapter::Impl::accumulate(const FeatureSet &fs,
+                                           RealTime timestamp, 
+                                           bool final)
+{
+    for (FeatureSet::const_iterator i = fs.begin(); i != fs.end(); ++i) {
+        for (FeatureList::const_iterator j = i->second.begin();
+             j != i->second.end(); ++j) {
+            if (j->hasTimestamp) {
+                accumulate(i->first, *j, j->timestamp, final);
+            } else {
+                //!!! is this correct?
+                accumulate(i->first, *j, timestamp, final);
+            }
+        }
+    }
+}
+
+std::string
+PluginSummarisingAdapter::Impl::getSummaryLabel(SummaryType type,
+                                                AveragingMethod avg)
+{
+    std::string label;
+    std::string avglabel;
+
+    if (avg == SampleAverage) avglabel = ", sample average";
+    else avglabel = ", continuous-time average";
+
+    switch (type) {
+    case Minimum:  label = "(minimum value)"; break;
+    case Maximum:  label = "(maximum value)"; break;
+    case Mean:     label = "(mean value" + avglabel + ")"; break;
+    case Median:   label = "(median value" + avglabel + ")"; break;
+    case Mode:     label = "(modal value" + avglabel + ")"; break;
+    case Sum:      label = "(sum)"; break;
+    case Variance: label = "(variance" + avglabel + ")"; break;
+    case StandardDeviation: label = "(standard deviation" + avglabel + ")"; break;
+    case Count:    label = "(count)"; break;
+    case UnknownSummaryType: label = "(unknown summary)"; break;
+    }
+    
+    return label;
+}
+
+void
+PluginSummarisingAdapter::Impl::accumulate(int output,
+                                           const Feature &f,
+                                           RealTime timestamp,
+                                           bool final)
+{
+    // What should happen if a feature's duration spans a segment
+    // boundary?  I think we probably want to chop it, and pretend
+    // that it appears in both.  A very long feature (e.g. key, if the
+    // whole audio is in a single key) might span many or all
+    // segments, and we want that to be reflected in the results
+    // (e.g. it is the modal key in all of those segments, not just
+    // the first).  This is actually quite complicated to do.
+
+    // If features spanning a boundary should be chopped, then we need
+    // to have per-segment accumulators (and the feature value goes
+    // into both -- with a separate phase to split the accumulator up
+    // into segments).
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+    std::cerr << "output " << output << ": timestamp " << timestamp << ", prev timestamp " << m_prevTimestamps[output] << ", final " << final << std::endl;
+#endif
+
+    // At each process step, accumulate() is called once for each
+    // feature on each output within that process's returned feature
+    // list, and with the timestamp passed in being that of the start
+    // of the process block.
+
+    // At the end (in getRemainingFeatures), accumulate() is called
+    // once for each feature on each output within the feature list
+    // returned by getRemainingFeatures, and with the timestamp being
+    // the same as the last process block and final set to true.
+
+    // (What if getRemainingFeatures doesn't return any features?  We
+    // still need to ensure that the final duration is written.  Need
+    // a separate function to close the durations.)
+
+    // At each call, we pull out the value for the feature and stuff
+    // it into the accumulator's appropriate values array; and we
+    // calculate the duration for the _previous_ feature, or pull it
+    // from the prevDurations array if the previous feature had a
+    // duration in its structure, and stuff that into the
+    // accumulator's appropriate durations array.
+
+    if (m_prevDurations.find(output) != m_prevDurations.end()) {
+
+        // Not the first time accumulate has been called for this
+        // output -- there has been a previous feature
+
+        RealTime prevDuration;
+
+        // Note that m_prevDurations[output] only contains the
+        // duration field that was contained in the previous feature.
+        // If it didn't have an explicit duration,
+        // m_prevDurations[output] should be INVALID_DURATION and we
+        // will have to calculate the duration from the previous and
+        // current timestamps.
+
+        if (m_prevDurations[output] != INVALID_DURATION) {
+            prevDuration = m_prevDurations[output];
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+            std::cerr << "Previous duration from previous feature: " << prevDuration << std::endl;
+#endif
+        } else {
+            prevDuration = timestamp - m_prevTimestamps[output];
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+            std::cerr << "Previous duration from diff: " << timestamp << " - "
+                      << m_prevTimestamps[output] << std::endl;
+#endif
+        }
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+        std::cerr << "output " << output << ": ";
+        std::cerr << "Pushing previous duration as " << prevDuration << std::endl;
+#endif
+        
+        m_accumulators[output].results
+            [m_accumulators[output].results.size() - 1]
+            .duration = prevDuration;
+    }
+
+    if (f.hasDuration) m_prevDurations[output] = f.duration;
+    else m_prevDurations[output] = INVALID_DURATION;
+
+    m_prevTimestamps[output] = timestamp;
+
+    if (f.hasDuration) {
+        RealTime et = timestamp;
+        et = et + f.duration;
+        if (et > m_endTime) m_endTime = et;
+    }
+
+    Result result;
+    result.time = timestamp;
+    result.duration = INVALID_DURATION;
+
+    if (int(f.values.size()) > m_accumulators[output].bins) {
+        m_accumulators[output].bins = f.values.size();
+    }
+
+    for (int i = 0; i < int(f.values.size()); ++i) {
+        result.values.push_back(f.values[i]);
+    }
+
+    m_accumulators[output].results.push_back(result);
+}
+
+void
+PluginSummarisingAdapter::Impl::accumulateFinalDurations()
+{
+    for (OutputTimestampMap::iterator i = m_prevTimestamps.begin();
+         i != m_prevTimestamps.end(); ++i) {
+
+        int output = i->first;
+
+        int acount = m_accumulators[output].results.size();
+
+        if (acount == 0) continue;
+
+        RealTime prevTimestamp = i->second;
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+        std::cerr << "output " << output << ": ";
+#endif
+
+        if (m_prevDurations.find(output) != m_prevDurations.end() &&
+            m_prevDurations[output] != INVALID_DURATION) {
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+            std::cerr << "Pushing final duration from feature as " << m_prevDurations[output] << std::endl;
+#endif
+
+            m_accumulators[output].results[acount - 1].duration =
+                m_prevDurations[output];
+
+        } else {
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+            std::cerr << "Pushing final duration from diff as " << m_endTime << " - " << m_prevTimestamps[output] << std::endl;
+#endif
+
+            m_accumulators[output].results[acount - 1].duration =
+                m_endTime - m_prevTimestamps[output];
+        }
+        
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+        std::cerr << "so duration for result no " << acount-1 << " is "
+                  << m_accumulators[output].results[acount-1].duration
+                  << std::endl;
+#endif
+    }
+}
+
+void
+PluginSummarisingAdapter::Impl::findSegmentBounds(RealTime t,
+                                                  RealTime &start,
+                                                  RealTime &end)
+{
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER_SEGMENT
+    std::cerr << "findSegmentBounds: t = " << t <<  std::endl;
+#endif
+
+    SegmentBoundaries::const_iterator i = std::upper_bound
+        (m_boundaries.begin(), m_boundaries.end(), t);
+
+    start = RealTime::zeroTime;
+    end = m_endTime;
+
+    if (i != m_boundaries.end()) {
+        end = *i;
+    }
+
+    if (i != m_boundaries.begin()) {
+        start = *--i;
+    }
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER_SEGMENT
+    std::cerr << "findSegmentBounds: " << t << " is in segment " << start << " -> " << end << std::endl;
+#endif
+}
+
+void
+PluginSummarisingAdapter::Impl::segment()
+{
+    SegmentBoundaries::iterator boundaryitr = m_boundaries.begin();
+    RealTime segmentStart = RealTime::zeroTime;
+    
+    for (OutputAccumulatorMap::iterator i = m_accumulators.begin();
+         i != m_accumulators.end(); ++i) {
+
+        int output = i->first;
+        OutputAccumulator &source = i->second;
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER_SEGMENT
+        std::cerr << "segment: total results for output " << output << " = "
+                  << source.results.size() << std::endl;
+#endif
+
+        // This is basically nonsense if the results have no values
+        // (i.e. their times and counts are the only things of
+        // interest)... but perhaps it's the user's problem if they
+        // ask for segmentation (or any summary at all) in that case
+
+        for (int n = 0; n < int(source.results.size()); ++n) {
+            
+            // This result spans source.results[n].time to
+            // source.results[n].time + source.results[n].duration.
+            // We need to dispose it into segments appropriately
+
+            RealTime resultStart = source.results[n].time;
+            RealTime resultEnd = resultStart + source.results[n].duration;
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER_SEGMENT
+            std::cerr << "output: " << output << ", result start = " << resultStart << ", end = " << resultEnd << std::endl;
+#endif
+
+            RealTime segmentStart = RealTime::zeroTime;
+            RealTime segmentEnd = resultEnd - RealTime(1, 0);
+            
+            while (segmentEnd < resultEnd) {
+
+                findSegmentBounds(resultStart, segmentStart, segmentEnd);
+                
+                RealTime chunkStart = resultStart;
+                if (chunkStart < segmentStart) chunkStart = segmentStart;
+
+                RealTime chunkEnd = resultEnd;
+                if (chunkEnd > segmentEnd) chunkEnd = segmentEnd;
+                
+                m_segmentedAccumulators[output][segmentStart].bins = source.bins;
+
+                Result chunk;
+                chunk.time = chunkStart;
+                chunk.duration = chunkEnd - chunkStart;
+                chunk.values = source.results[n].values;
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER_SEGMENT
+                std::cerr << "chunk for segment " << segmentStart << ": from " << chunk.time << ", duration " << chunk.duration << std::endl;
+#endif
+
+                m_segmentedAccumulators[output][segmentStart].results
+                    .push_back(chunk);
+
+                resultStart = chunkEnd;
+            }
+        }
+    }
+}
+
+struct ValueDurationFloatPair
+{
+    float value;
+    float duration;
+
+    ValueDurationFloatPair() : value(0), duration(0) { }
+    ValueDurationFloatPair(float v, float d) : value(v), duration(d) { }
+    ValueDurationFloatPair &operator=(const ValueDurationFloatPair &p) {
+        value = p.value;
+        duration = p.duration;
+        return *this;
+    }
+    bool operator<(const ValueDurationFloatPair &p) const {
+        return value < p.value;
+    }
+};
+
+static double toSec(const RealTime &r)
+{
+    return r.sec + double(r.nsec) / 1000000000.0;
+}
+
+void
+PluginSummarisingAdapter::Impl::reduce()
+{
+    for (OutputSegmentAccumulatorMap::iterator i =
+             m_segmentedAccumulators.begin();
+         i != m_segmentedAccumulators.end(); ++i) {
+
+        int output = i->first;
+        SegmentAccumulatorMap &segments = i->second;
+
+        for (SegmentAccumulatorMap::iterator j = segments.begin();
+             j != segments.end(); ++j) {
+
+            RealTime segmentStart = j->first;
+            OutputAccumulator &accumulator = j->second;
+
+            int sz = accumulator.results.size();
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+            std::cerr << "reduce: segment starting at " << segmentStart
+                      << " on output " << output << " has " << sz << " result(s)" << std::endl;
+#endif
+
+            double totalDuration = 0.0;
+            //!!! is this right?
+            if (sz > 0) {
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+                std::cerr << "last time = " << accumulator.results[sz-1].time 
+                          << ", duration = " << accumulator.results[sz-1].duration
+                          << " (step = " << m_stepSize << ", block = " << m_blockSize << ")"
+                          << std::endl;
+#endif
+                totalDuration = toSec((accumulator.results[sz-1].time +
+                                       accumulator.results[sz-1].duration) -
+                                      segmentStart);
+            }
+
+            for (int bin = 0; bin < accumulator.bins; ++bin) {
+
+                // work on all values over time for a single bin
+
+                OutputBinSummary summary;
+
+                summary.count = sz;
+
+                summary.minimum = 0.f;
+                summary.maximum = 0.f;
+
+                summary.median = 0.f;
+                summary.mode = 0.f;
+                summary.sum = 0.f;
+                summary.variance = 0.f;
+
+                summary.median_c = 0.f;
+                summary.mode_c = 0.f;
+                summary.mean_c = 0.f;
+                summary.variance_c = 0.f;
+
+                if (sz == 0) continue;
+
+                std::vector<ValueDurationFloatPair> valvec;
+
+                for (int k = 0; k < sz; ++k) {
+                    while (int(accumulator.results[k].values.size()) <
+                           accumulator.bins) {
+                        accumulator.results[k].values.push_back(0.f);
+                    }
+                }
+
+                for (int k = 0; k < sz; ++k) {
+                    float value = accumulator.results[k].values[bin];
+                    valvec.push_back(ValueDurationFloatPair
+                                     (value,
+                                      toSec(accumulator.results[k].duration)));
+                }
+
+                std::sort(valvec.begin(), valvec.end());
+
+                summary.minimum = valvec[0].value;
+                summary.maximum = valvec[sz-1].value;
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+                std::cerr << "total duration = " << totalDuration << std::endl;
+#endif
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+/*
+                std::cerr << "value vector for medians:" << std::endl;
+                for (int k = 0; k < sz; ++k) {
+                    std::cerr << "(" << valvec[k].value << "," << valvec[k].duration << ") ";
+                }
+                std::cerr << std::endl;
+*/
+#endif
+
+                if (sz % 2 == 1) {
+                    summary.median = valvec[sz/2].value;
+                } else {
+                    summary.median = (valvec[sz/2].value + valvec[sz/2 + 1].value) / 2;
+                }
+            
+                double duracc = 0.0;
+                summary.median_c = valvec[sz-1].value;
+
+                for (int k = 0; k < sz; ++k) {
+                    duracc += valvec[k].duration;
+                    if (duracc > totalDuration/2) {
+                        summary.median_c = valvec[k].value;
+                        break;
+                    }
+                }
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+                std::cerr << "median_c = " << summary.median_c << std::endl;
+                std::cerr << "median = " << summary.median << std::endl;
+#endif
+                
+                std::map<float, int> distribution;
+
+                for (int k = 0; k < sz; ++k) {
+                    summary.sum += accumulator.results[k].values[bin];
+                    distribution[accumulator.results[k].values[bin]] += 1;
+                }
+
+                int md = 0;
+
+                for (std::map<float, int>::iterator di = distribution.begin();
+                     di != distribution.end(); ++di) {
+                    if (di->second > md) {
+                        md = di->second;
+                        summary.mode = di->first;
+                    }
+                }
+
+                distribution.clear();
+
+                std::map<float, double> distribution_c;
+
+                for (int k = 0; k < sz; ++k) {
+                    distribution_c[accumulator.results[k].values[bin]]
+                        += toSec(accumulator.results[k].duration);
+                }
+
+                double mrd = 0.0;
+
+                for (std::map<float, double>::iterator di = distribution_c.begin();
+                     di != distribution_c.end(); ++di) {
+                    if (di->second > mrd) {
+                        mrd = di->second;
+                        summary.mode_c = di->first;
+                    }
+                }
+
+                distribution_c.clear();
+
+                if (totalDuration > 0.0) {
+
+                    double sum_c = 0.0;
+
+                    for (int k = 0; k < sz; ++k) {
+                        double value = accumulator.results[k].values[bin]
+                            * toSec(accumulator.results[k].duration);
+                        sum_c += value;
+                    }
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+                    std::cerr << "mean_c = " << sum_c << " / " << totalDuration << " = "
+                              << sum_c / totalDuration << " (sz = " << sz << ")" << std::endl;
+#endif
+                
+                    summary.mean_c = sum_c / totalDuration;
+
+                    for (int k = 0; k < sz; ++k) {
+                        double value = accumulator.results[k].values[bin];
+//                            * toSec(accumulator.results[k].duration);
+                        summary.variance_c +=
+                            (value - summary.mean_c) * (value - summary.mean_c)
+                            * toSec(accumulator.results[k].duration);
+                    }
+
+//                    summary.variance_c /= summary.count;
+                    summary.variance_c /= totalDuration;
+                }
+
+                double mean = summary.sum / summary.count;
+
+#ifdef DEBUG_PLUGIN_SUMMARISING_ADAPTER
+                std::cerr << "mean = " << summary.sum << " / " << summary.count << " = "
+                          << summary.sum / summary.count << std::endl;
+#endif
+
+                for (int k = 0; k < sz; ++k) {
+                    float value = accumulator.results[k].values[bin];
+                    summary.variance += (value - mean) * (value - mean);
+                }
+                summary.variance /= summary.count;
+
+                m_summaries[output][segmentStart][bin] = summary;
+            }
+        }
+    }
+
+    m_segmentedAccumulators.clear();
+    m_accumulators.clear();
+}
+
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginSummarisingAdapter.cpp)
+
diff --git a/lib-src/libvamp/src/vamp-hostsdk/PluginWrapper.cpp b/lib-src/libvamp/src/vamp-hostsdk/PluginWrapper.cpp
new file mode 100644
index 0000000..02bdc28
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/PluginWrapper.cpp
@@ -0,0 +1,204 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/PluginWrapper.h>
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginWrapper.cpp)
+
+namespace Vamp {
+
+namespace HostExt {
+
+class PluginRateExtractor : public Plugin
+{
+public:
+    PluginRateExtractor() : Plugin(0) { }
+    float getRate() const { return m_inputSampleRate; }
+};
+
+PluginWrapper::PluginWrapper(Plugin *plugin) :
+    Plugin(((PluginRateExtractor *)plugin)->getRate()),
+    m_plugin(plugin)
+{
+}
+
+PluginWrapper::~PluginWrapper()
+{
+    delete m_plugin;
+}
+
+bool
+PluginWrapper::initialise(size_t channels, size_t stepSize, size_t blockSize)
+{
+    return m_plugin->initialise(channels, stepSize, blockSize);
+}
+
+void
+PluginWrapper::reset()
+{
+    m_plugin->reset();
+}
+
+Plugin::InputDomain
+PluginWrapper::getInputDomain() const
+{
+    return m_plugin->getInputDomain();
+}
+
+unsigned int
+PluginWrapper::getVampApiVersion() const
+{
+    return m_plugin->getVampApiVersion();
+}
+
+std::string
+PluginWrapper::getIdentifier() const
+{
+    return m_plugin->getIdentifier();
+}
+
+std::string
+PluginWrapper::getName() const
+{
+    return m_plugin->getName();
+}
+
+std::string
+PluginWrapper::getDescription() const
+{
+    return m_plugin->getDescription();
+}
+
+std::string
+PluginWrapper::getMaker() const
+{
+    return m_plugin->getMaker();
+}
+
+int
+PluginWrapper::getPluginVersion() const
+{
+    return m_plugin->getPluginVersion();
+}
+
+std::string
+PluginWrapper::getCopyright() const
+{
+    return m_plugin->getCopyright();
+}
+
+PluginBase::ParameterList
+PluginWrapper::getParameterDescriptors() const
+{
+    return m_plugin->getParameterDescriptors();
+}
+
+float
+PluginWrapper::getParameter(std::string parameter) const
+{
+    return m_plugin->getParameter(parameter);
+}
+
+void
+PluginWrapper::setParameter(std::string parameter, float value)
+{
+    m_plugin->setParameter(parameter, value);
+}
+
+PluginBase::ProgramList
+PluginWrapper::getPrograms() const
+{
+    return m_plugin->getPrograms();
+}
+
+std::string
+PluginWrapper::getCurrentProgram() const
+{
+    return m_plugin->getCurrentProgram();
+}
+
+void
+PluginWrapper::selectProgram(std::string program)
+{
+    m_plugin->selectProgram(program);
+}
+
+size_t
+PluginWrapper::getPreferredStepSize() const
+{
+    return m_plugin->getPreferredStepSize();
+}
+
+size_t
+PluginWrapper::getPreferredBlockSize() const
+{
+    return m_plugin->getPreferredBlockSize();
+}
+
+size_t
+PluginWrapper::getMinChannelCount() const
+{
+    return m_plugin->getMinChannelCount();
+}
+
+size_t PluginWrapper::getMaxChannelCount() const
+{
+    return m_plugin->getMaxChannelCount();
+}
+
+Plugin::OutputList
+PluginWrapper::getOutputDescriptors() const
+{
+    return m_plugin->getOutputDescriptors();
+}
+
+Plugin::FeatureSet
+PluginWrapper::process(const float *const *inputBuffers, RealTime timestamp)
+{
+    return m_plugin->process(inputBuffers, timestamp);
+}
+
+Plugin::FeatureSet
+PluginWrapper::getRemainingFeatures()
+{
+    return m_plugin->getRemainingFeatures();
+}
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginWrapper.cpp)
diff --git a/lib-src/libvamp/src/vamp-hostsdk/RealTime.cpp b/lib-src/libvamp/src/vamp-hostsdk/RealTime.cpp
new file mode 100644
index 0000000..537ccbd
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-hostsdk/RealTime.cpp
@@ -0,0 +1,39 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-hostsdk/RealTime.h>
+#include "../vamp-sdk/RealTime.cpp"
+
diff --git a/lib-src/libvamp/src/vamp-sdk/PluginAdapter.cpp b/lib-src/libvamp/src/vamp-sdk/PluginAdapter.cpp
new file mode 100644
index 0000000..fc195d7
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-sdk/PluginAdapter.cpp
@@ -0,0 +1,914 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#include <vamp-sdk/PluginAdapter.h>
+
+#include <cstring>
+#include <cstdlib>
+
+#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 0 )
+#error Incorrect Vamp SDK header included (not the expected 2.0 SDK)
+#endif
+
+
+//#define DEBUG_PLUGIN_ADAPTER 1
+
+_VAMP_SDK_PLUGSPACE_BEGIN(PluginAdapter.cpp)
+
+namespace Vamp {
+
+class PluginAdapterBase::Impl
+{
+public:
+    Impl(PluginAdapterBase *);
+    ~Impl();
+
+    const VampPluginDescriptor *getDescriptor();
+
+protected:
+    PluginAdapterBase *m_base;
+
+    static VampPluginHandle vampInstantiate(const VampPluginDescriptor *desc,
+                                            float inputSampleRate);
+
+    static void vampCleanup(VampPluginHandle handle);
+
+    static int vampInitialise(VampPluginHandle handle, unsigned int channels,
+                             unsigned int stepSize, unsigned int blockSize);
+
+    static void vampReset(VampPluginHandle handle);
+
+    static float vampGetParameter(VampPluginHandle handle, int param);
+    static void vampSetParameter(VampPluginHandle handle, int param, float value);
+
+    static unsigned int vampGetCurrentProgram(VampPluginHandle handle);
+    static void vampSelectProgram(VampPluginHandle handle, unsigned int program);
+
+    static unsigned int vampGetPreferredStepSize(VampPluginHandle handle);
+    static unsigned int vampGetPreferredBlockSize(VampPluginHandle handle);
+    static unsigned int vampGetMinChannelCount(VampPluginHandle handle);
+    static unsigned int vampGetMaxChannelCount(VampPluginHandle handle);
+
+    static unsigned int vampGetOutputCount(VampPluginHandle handle);
+
+    static VampOutputDescriptor *vampGetOutputDescriptor(VampPluginHandle handle,
+                                                       unsigned int i);
+
+    static void vampReleaseOutputDescriptor(VampOutputDescriptor *desc);
+
+    static VampFeatureList *vampProcess(VampPluginHandle handle,
+                                        const float *const *inputBuffers,
+                                        int sec,
+                                        int nsec);
+
+    static VampFeatureList *vampGetRemainingFeatures(VampPluginHandle handle);
+
+    static void vampReleaseFeatureSet(VampFeatureList *fs);
+
+    void checkOutputMap(Plugin *plugin);
+    void markOutputsChanged(Plugin *plugin);
+
+    void cleanup(Plugin *plugin);
+    unsigned int getOutputCount(Plugin *plugin);
+    VampOutputDescriptor *getOutputDescriptor(Plugin *plugin,
+                                             unsigned int i);
+    VampFeatureList *process(Plugin *plugin,
+                             const float *const *inputBuffers,
+                             int sec, int nsec);
+    VampFeatureList *getRemainingFeatures(Plugin *plugin);
+    VampFeatureList *convertFeatures(Plugin *plugin,
+                                     const Plugin::FeatureSet &features);
+    
+    // maps both plugins and descriptors to adapters
+    typedef std::map<const void *, Impl *> AdapterMap;
+    static AdapterMap *m_adapterMap;
+    static Impl *lookupAdapter(VampPluginHandle);
+
+    bool m_populated;
+    VampPluginDescriptor m_descriptor;
+    Plugin::ParameterList m_parameters;
+    Plugin::ProgramList m_programs;
+    
+    typedef std::map<Plugin *, Plugin::OutputList *> OutputMap;
+    OutputMap m_pluginOutputs;
+
+    std::map<Plugin *, VampFeatureList *> m_fs;
+    std::map<Plugin *, std::vector<size_t> > m_fsizes;
+    std::map<Plugin *, std::vector<std::vector<size_t> > > m_fvsizes;
+    void resizeFS(Plugin *plugin, int n);
+    void resizeFL(Plugin *plugin, int n, size_t sz);
+    void resizeFV(Plugin *plugin, int n, int j, size_t sz);
+};
+
+PluginAdapterBase::PluginAdapterBase()
+{
+    m_impl = new Impl(this);
+}
+
+PluginAdapterBase::~PluginAdapterBase()
+{
+    delete m_impl;
+}
+
+const VampPluginDescriptor *
+PluginAdapterBase::getDescriptor()
+{
+    return m_impl->getDescriptor();
+}
+
+PluginAdapterBase::Impl::Impl(PluginAdapterBase *base) :
+    m_base(base),
+    m_populated(false)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl[" << this << "]::Impl" << std::endl;
+#endif
+}
+
+const VampPluginDescriptor *
+PluginAdapterBase::Impl::getDescriptor()
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl[" << this << "]::getDescriptor" << std::endl;
+#endif
+
+    if (m_populated) return &m_descriptor;
+
+    Plugin *plugin = m_base->createPlugin(48000);
+
+    if (plugin->getVampApiVersion() != VAMP_API_VERSION) {
+        std::cerr << "Vamp::PluginAdapterBase::Impl::getDescriptor: ERROR: "
+                  << "API version " << plugin->getVampApiVersion()
+                  << " for\nplugin \"" << plugin->getIdentifier() << "\" "
+                  << "differs from version "
+                  << VAMP_API_VERSION << " for adapter.\n"
+                  << "This plugin is probably linked against a different version of the Vamp SDK\n"
+                  << "from the version it was compiled with.  It will need to be re-linked correctly\n"
+                  << "before it can be used." << std::endl;
+        delete plugin;
+        return 0;
+    }
+
+    m_parameters = plugin->getParameterDescriptors();
+    m_programs = plugin->getPrograms();
+
+    m_descriptor.vampApiVersion = plugin->getVampApiVersion();
+    m_descriptor.identifier = strdup(plugin->getIdentifier().c_str());
+    m_descriptor.name = strdup(plugin->getName().c_str());
+    m_descriptor.description = strdup(plugin->getDescription().c_str());
+    m_descriptor.maker = strdup(plugin->getMaker().c_str());
+    m_descriptor.pluginVersion = plugin->getPluginVersion();
+    m_descriptor.copyright = strdup(plugin->getCopyright().c_str());
+    
+    m_descriptor.parameterCount = m_parameters.size();
+    m_descriptor.parameters = (const VampParameterDescriptor **)
+        malloc(m_parameters.size() * sizeof(VampParameterDescriptor));
+
+    unsigned int i;
+    
+    for (i = 0; i < m_parameters.size(); ++i) {
+        VampParameterDescriptor *desc = (VampParameterDescriptor *)
+            malloc(sizeof(VampParameterDescriptor));
+        desc->identifier = strdup(m_parameters[i].identifier.c_str());
+        desc->name = strdup(m_parameters[i].name.c_str());
+        desc->description = strdup(m_parameters[i].description.c_str());
+        desc->unit = strdup(m_parameters[i].unit.c_str());
+        desc->minValue = m_parameters[i].minValue;
+        desc->maxValue = m_parameters[i].maxValue;
+        desc->defaultValue = m_parameters[i].defaultValue;
+        desc->isQuantized = m_parameters[i].isQuantized;
+        desc->quantizeStep = m_parameters[i].quantizeStep;
+        desc->valueNames = 0;
+        if (desc->isQuantized && !m_parameters[i].valueNames.empty()) {
+            desc->valueNames = (const char **)
+                malloc((m_parameters[i].valueNames.size()+1) * sizeof(char *));
+            for (unsigned int j = 0; j < m_parameters[i].valueNames.size(); ++j) {
+                desc->valueNames[j] = strdup(m_parameters[i].valueNames[j].c_str());
+            }
+            desc->valueNames[m_parameters[i].valueNames.size()] = 0;
+        }
+        m_descriptor.parameters[i] = desc;
+    }
+    
+    m_descriptor.programCount = m_programs.size();
+    m_descriptor.programs = (const char **)
+        malloc(m_programs.size() * sizeof(const char *));
+    
+    for (i = 0; i < m_programs.size(); ++i) {
+        m_descriptor.programs[i] = strdup(m_programs[i].c_str());
+    }
+    
+    if (plugin->getInputDomain() == Plugin::FrequencyDomain) {
+        m_descriptor.inputDomain = vampFrequencyDomain;
+    } else {
+        m_descriptor.inputDomain = vampTimeDomain;
+    }
+
+    m_descriptor.instantiate = vampInstantiate;
+    m_descriptor.cleanup = vampCleanup;
+    m_descriptor.initialise = vampInitialise;
+    m_descriptor.reset = vampReset;
+    m_descriptor.getParameter = vampGetParameter;
+    m_descriptor.setParameter = vampSetParameter;
+    m_descriptor.getCurrentProgram = vampGetCurrentProgram;
+    m_descriptor.selectProgram = vampSelectProgram;
+    m_descriptor.getPreferredStepSize = vampGetPreferredStepSize;
+    m_descriptor.getPreferredBlockSize = vampGetPreferredBlockSize;
+    m_descriptor.getMinChannelCount = vampGetMinChannelCount;
+    m_descriptor.getMaxChannelCount = vampGetMaxChannelCount;
+    m_descriptor.getOutputCount = vampGetOutputCount;
+    m_descriptor.getOutputDescriptor = vampGetOutputDescriptor;
+    m_descriptor.releaseOutputDescriptor = vampReleaseOutputDescriptor;
+    m_descriptor.process = vampProcess;
+    m_descriptor.getRemainingFeatures = vampGetRemainingFeatures;
+    m_descriptor.releaseFeatureSet = vampReleaseFeatureSet;
+    
+    if (!m_adapterMap) {
+        m_adapterMap = new AdapterMap;
+    }
+    (*m_adapterMap)[&m_descriptor] = this;
+
+    delete plugin;
+
+    m_populated = true;
+    return &m_descriptor;
+}
+
+PluginAdapterBase::Impl::~Impl()
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl[" << this << "]::~Impl" << std::endl;
+#endif
+
+    if (!m_populated) return;
+
+    free((void *)m_descriptor.identifier);
+    free((void *)m_descriptor.name);
+    free((void *)m_descriptor.description);
+    free((void *)m_descriptor.maker);
+    free((void *)m_descriptor.copyright);
+        
+    for (unsigned int i = 0; i < m_descriptor.parameterCount; ++i) {
+        const VampParameterDescriptor *desc = m_descriptor.parameters[i];
+        free((void *)desc->identifier);
+        free((void *)desc->name);
+        free((void *)desc->description);
+        free((void *)desc->unit);
+        if (desc->valueNames) {
+            for (unsigned int j = 0; desc->valueNames[j]; ++j) {
+                free((void *)desc->valueNames[j]);
+            }
+            free((void *)desc->valueNames);
+        }
+    }
+    free((void *)m_descriptor.parameters);
+
+    for (unsigned int i = 0; i < m_descriptor.programCount; ++i) {
+        free((void *)m_descriptor.programs[i]);
+    }
+    free((void *)m_descriptor.programs);
+
+    if (m_adapterMap) {
+        
+        m_adapterMap->erase(&m_descriptor);
+
+        if (m_adapterMap->empty()) {
+            delete m_adapterMap;
+            m_adapterMap = 0;
+        }
+    }
+}
+
+PluginAdapterBase::Impl *
+PluginAdapterBase::Impl::lookupAdapter(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::lookupAdapter(" << handle << ")" << std::endl;
+#endif
+
+    if (!m_adapterMap) return 0;
+    AdapterMap::const_iterator i = m_adapterMap->find(handle);
+    if (i == m_adapterMap->end()) return 0;
+    return i->second;
+}
+
+VampPluginHandle
+PluginAdapterBase::Impl::vampInstantiate(const VampPluginDescriptor *desc,
+                                         float inputSampleRate)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampInstantiate(" << desc << ")" << std::endl;
+#endif
+
+    if (!m_adapterMap) {
+        m_adapterMap = new AdapterMap();
+    }
+
+    if (m_adapterMap->find(desc) == m_adapterMap->end()) {
+        std::cerr << "WARNING: PluginAdapterBase::Impl::vampInstantiate: Descriptor " << desc << " not in adapter map" << std::endl;
+        return 0;
+    }
+
+    Impl *adapter = (*m_adapterMap)[desc];
+    if (desc != &adapter->m_descriptor) return 0;
+
+    Plugin *plugin = adapter->m_base->createPlugin(inputSampleRate);
+    if (plugin) {
+        (*m_adapterMap)[plugin] = adapter;
+    }
+
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampInstantiate(" << desc << "): returning handle " << plugin << std::endl;
+#endif
+
+    return plugin;
+}
+
+void
+PluginAdapterBase::Impl::vampCleanup(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampCleanup(" << handle << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) {
+        delete ((Plugin *)handle);
+        return;
+    }
+    adapter->cleanup(((Plugin *)handle));
+}
+
+int
+PluginAdapterBase::Impl::vampInitialise(VampPluginHandle handle,
+                                        unsigned int channels,
+                                        unsigned int stepSize,
+                                        unsigned int blockSize)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampInitialise(" << handle << ", " << channels << ", " << stepSize << ", " << blockSize << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return 0;
+    bool result = ((Plugin *)handle)->initialise(channels, stepSize, blockSize);
+    adapter->markOutputsChanged((Plugin *)handle);
+    return result ? 1 : 0;
+}
+
+void
+PluginAdapterBase::Impl::vampReset(VampPluginHandle handle) 
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampReset(" << handle << ")" << std::endl;
+#endif
+
+    ((Plugin *)handle)->reset();
+}
+
+float
+PluginAdapterBase::Impl::vampGetParameter(VampPluginHandle handle,
+                                    int param) 
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetParameter(" << handle << ", " << param << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return 0.0;
+    Plugin::ParameterList &list = adapter->m_parameters;
+    return ((Plugin *)handle)->getParameter(list[param].identifier);
+}
+
+void
+PluginAdapterBase::Impl::vampSetParameter(VampPluginHandle handle,
+                                    int param, float value)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampSetParameter(" << handle << ", " << param << ", " << value << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return;
+    Plugin::ParameterList &list = adapter->m_parameters;
+    ((Plugin *)handle)->setParameter(list[param].identifier, value);
+    adapter->markOutputsChanged((Plugin *)handle);
+}
+
+unsigned int
+PluginAdapterBase::Impl::vampGetCurrentProgram(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetCurrentProgram(" << handle << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return 0;
+    Plugin::ProgramList &list = adapter->m_programs;
+    std::string program = ((Plugin *)handle)->getCurrentProgram();
+    for (unsigned int i = 0; i < list.size(); ++i) {
+        if (list[i] == program) return i;
+    }
+    return 0;
+}
+
+void
+PluginAdapterBase::Impl::vampSelectProgram(VampPluginHandle handle,
+                                           unsigned int program)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampSelectProgram(" << handle << ", " << program << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return;
+
+    Plugin::ProgramList &list = adapter->m_programs;
+    ((Plugin *)handle)->selectProgram(list[program]);
+
+    adapter->markOutputsChanged((Plugin *)handle);
+}
+
+unsigned int
+PluginAdapterBase::Impl::vampGetPreferredStepSize(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetPreferredStepSize(" << handle << ")" << std::endl;
+#endif
+
+    return ((Plugin *)handle)->getPreferredStepSize();
+}
+
+unsigned int
+PluginAdapterBase::Impl::vampGetPreferredBlockSize(VampPluginHandle handle) 
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetPreferredBlockSize(" << handle << ")" << std::endl;
+#endif
+
+    return ((Plugin *)handle)->getPreferredBlockSize();
+}
+
+unsigned int
+PluginAdapterBase::Impl::vampGetMinChannelCount(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetMinChannelCount(" << handle << ")" << std::endl;
+#endif
+
+    return ((Plugin *)handle)->getMinChannelCount();
+}
+
+unsigned int
+PluginAdapterBase::Impl::vampGetMaxChannelCount(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetMaxChannelCount(" << handle << ")" << std::endl;
+#endif
+
+    return ((Plugin *)handle)->getMaxChannelCount();
+}
+
+unsigned int
+PluginAdapterBase::Impl::vampGetOutputCount(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetOutputCount(" << handle << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+
+//    std::cerr << "vampGetOutputCount: handle " << handle << " -> adapter "<< adapter << std::endl;
+
+    if (!adapter) return 0;
+    return adapter->getOutputCount((Plugin *)handle);
+}
+
+VampOutputDescriptor *
+PluginAdapterBase::Impl::vampGetOutputDescriptor(VampPluginHandle handle,
+                                                 unsigned int i)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetOutputDescriptor(" << handle << ", " << i << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+
+//    std::cerr << "vampGetOutputDescriptor: handle " << handle << " -> adapter "<< adapter << std::endl;
+
+    if (!adapter) return 0;
+    return adapter->getOutputDescriptor((Plugin *)handle, i);
+}
+
+void
+PluginAdapterBase::Impl::vampReleaseOutputDescriptor(VampOutputDescriptor *desc)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampReleaseOutputDescriptor(" << desc << ")" << std::endl;
+#endif
+
+    if (desc->identifier) free((void *)desc->identifier);
+    if (desc->name) free((void *)desc->name);
+    if (desc->description) free((void *)desc->description);
+    if (desc->unit) free((void *)desc->unit);
+    if (desc->hasFixedBinCount && desc->binNames) {
+        for (unsigned int i = 0; i < desc->binCount; ++i) {
+            if (desc->binNames[i]) {
+                free((void *)desc->binNames[i]);
+            }
+        }
+    }
+    if (desc->binNames) free((void *)desc->binNames);
+    free((void *)desc);
+}
+
+VampFeatureList *
+PluginAdapterBase::Impl::vampProcess(VampPluginHandle handle,
+                                     const float *const *inputBuffers,
+                                     int sec,
+                                     int nsec)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampProcess(" << handle << ", " << sec << ", " << nsec << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return 0;
+    return adapter->process((Plugin *)handle, inputBuffers, sec, nsec);
+}
+
+VampFeatureList *
+PluginAdapterBase::Impl::vampGetRemainingFeatures(VampPluginHandle handle)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampGetRemainingFeatures(" << handle << ")" << std::endl;
+#endif
+
+    Impl *adapter = lookupAdapter(handle);
+    if (!adapter) return 0;
+    return adapter->getRemainingFeatures((Plugin *)handle);
+}
+
+void
+PluginAdapterBase::Impl::vampReleaseFeatureSet(VampFeatureList *fs)
+{
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::vampReleaseFeatureSet" << std::endl;
+#endif
+}
+
+void 
+PluginAdapterBase::Impl::cleanup(Plugin *plugin)
+{
+    if (m_fs.find(plugin) != m_fs.end()) {
+        size_t outputCount = 0;
+        if (m_pluginOutputs[plugin]) {
+            outputCount = m_pluginOutputs[plugin]->size();
+        }
+        VampFeatureList *list = m_fs[plugin];
+        for (unsigned int i = 0; i < outputCount; ++i) {
+            for (unsigned int j = 0; j < m_fsizes[plugin][i]; ++j) {
+                if (list[i].features[j].v1.label) {
+                    free(list[i].features[j].v1.label);
+                }
+                if (list[i].features[j].v1.values) {
+                    free(list[i].features[j].v1.values);
+                }
+            }
+            if (list[i].features) free(list[i].features);
+        }
+        m_fs.erase(plugin);
+        m_fsizes.erase(plugin);
+        m_fvsizes.erase(plugin);
+    }
+
+    if (m_pluginOutputs.find(plugin) != m_pluginOutputs.end()) {
+        delete m_pluginOutputs[plugin];
+        m_pluginOutputs.erase(plugin);
+    }
+
+    if (m_adapterMap) {
+        m_adapterMap->erase(plugin);
+
+        if (m_adapterMap->empty()) {
+            delete m_adapterMap;
+            m_adapterMap = 0;
+        }
+    }
+
+    delete ((Plugin *)plugin);
+}
+
+void 
+PluginAdapterBase::Impl::checkOutputMap(Plugin *plugin)
+{
+    OutputMap::iterator i = m_pluginOutputs.find(plugin);
+
+    if (i == m_pluginOutputs.end() || !i->second) {
+
+        m_pluginOutputs[plugin] = new Plugin::OutputList
+            (plugin->getOutputDescriptors());
+
+//        std::cerr << "PluginAdapterBase::Impl::checkOutputMap: Have " << m_pluginOutputs[plugin]->size() << " outputs for plugin " << plugin->getIdentifier() << std::endl;
+    }
+}
+
+void
+PluginAdapterBase::Impl::markOutputsChanged(Plugin *plugin)
+{
+    OutputMap::iterator i = m_pluginOutputs.find(plugin);
+
+//    std::cerr << "PluginAdapterBase::Impl::markOutputsChanged" << std::endl;
+
+    if (i != m_pluginOutputs.end()) {
+
+        Plugin::OutputList *list = i->second;
+        m_pluginOutputs.erase(i);
+        delete list;
+    }
+}
+
+unsigned int 
+PluginAdapterBase::Impl::getOutputCount(Plugin *plugin)
+{
+    checkOutputMap(plugin);
+
+    return m_pluginOutputs[plugin]->size();
+}
+
+VampOutputDescriptor *
+PluginAdapterBase::Impl::getOutputDescriptor(Plugin *plugin,
+                                             unsigned int i)
+{
+    checkOutputMap(plugin);
+
+    Plugin::OutputDescriptor &od =
+        (*m_pluginOutputs[plugin])[i];
+
+    VampOutputDescriptor *desc = (VampOutputDescriptor *)
+        malloc(sizeof(VampOutputDescriptor));
+
+    desc->identifier = strdup(od.identifier.c_str());
+    desc->name = strdup(od.name.c_str());
+    desc->description = strdup(od.description.c_str());
+    desc->unit = strdup(od.unit.c_str());
+    desc->hasFixedBinCount = od.hasFixedBinCount;
+    desc->binCount = od.binCount;
+
+    if (od.hasFixedBinCount && od.binCount > 0
+        // We would like to do "&& !od.binNames.empty()" here -- but we
+        // can't, because it will crash older versions of the host adapter
+        // which try to copy the names across whenever the bin count is
+        // non-zero, regardless of whether they exist or not
+        ) {
+        desc->binNames = (const char **)
+            malloc(od.binCount * sizeof(const char *));
+        
+        for (unsigned int i = 0; i < od.binCount; ++i) {
+            if (i < od.binNames.size()) {
+                desc->binNames[i] = strdup(od.binNames[i].c_str());
+            } else {
+                desc->binNames[i] = 0;
+            }
+        }
+    } else {
+        desc->binNames = 0;
+    }
+
+    desc->hasKnownExtents = od.hasKnownExtents;
+    desc->minValue = od.minValue;
+    desc->maxValue = od.maxValue;
+    desc->isQuantized = od.isQuantized;
+    desc->quantizeStep = od.quantizeStep;
+
+    switch (od.sampleType) {
+    case Plugin::OutputDescriptor::OneSamplePerStep:
+        desc->sampleType = vampOneSamplePerStep; break;
+    case Plugin::OutputDescriptor::FixedSampleRate:
+        desc->sampleType = vampFixedSampleRate; break;
+    case Plugin::OutputDescriptor::VariableSampleRate:
+        desc->sampleType = vampVariableSampleRate; break;
+    }
+
+    desc->sampleRate = od.sampleRate;
+    desc->hasDuration = od.hasDuration;
+
+    return desc;
+}
+    
+VampFeatureList *
+PluginAdapterBase::Impl::process(Plugin *plugin,
+                                 const float *const *inputBuffers,
+                                 int sec, int nsec)
+{
+//    std::cerr << "PluginAdapterBase::Impl::process" << std::endl;
+    RealTime rt(sec, nsec);
+    checkOutputMap(plugin);
+    return convertFeatures(plugin, plugin->process(inputBuffers, rt));
+}
+    
+VampFeatureList *
+PluginAdapterBase::Impl::getRemainingFeatures(Plugin *plugin)
+{
+//    std::cerr << "PluginAdapterBase::Impl::getRemainingFeatures" << std::endl;
+    checkOutputMap(plugin);
+    return convertFeatures(plugin, plugin->getRemainingFeatures());
+}
+
+VampFeatureList *
+PluginAdapterBase::Impl::convertFeatures(Plugin *plugin,
+                                         const Plugin::FeatureSet &features)
+{
+    int lastN = -1;
+
+    int outputCount = 0;
+    if (m_pluginOutputs[plugin]) outputCount = m_pluginOutputs[plugin]->size();
+    
+    resizeFS(plugin, outputCount);
+    VampFeatureList *fs = m_fs[plugin];
+
+//    std::cerr << "PluginAdapter(v2)::convertFeatures: NOTE: sizeof(Feature) == " << sizeof(Plugin::Feature) << ", sizeof(VampFeature) == " << sizeof(VampFeature) << ", sizeof(VampFeatureList) == " << sizeof(VampFeatureList) << std::endl;
+
+    for (Plugin::FeatureSet::const_iterator fi = features.begin();
+         fi != features.end(); ++fi) {
+
+        int n = fi->first;
+        
+//        std::cerr << "PluginAdapterBase::Impl::convertFeatures: n = " << n << std::endl;
+
+        if (n >= int(outputCount)) {
+            std::cerr << "WARNING: PluginAdapterBase::Impl::convertFeatures: Too many outputs from plugin (" << n+1 << ", only should be " << outputCount << ")" << std::endl;
+            continue;
+        }
+
+        if (n > lastN + 1) {
+            for (int i = lastN + 1; i < n; ++i) {
+                fs[i].featureCount = 0;
+            }
+        }
+
+        const Plugin::FeatureList &fl = fi->second;
+
+        size_t sz = fl.size();
+        if (sz > m_fsizes[plugin][n]) resizeFL(plugin, n, sz);
+        fs[n].featureCount = sz;
+        
+        for (size_t j = 0; j < sz; ++j) {
+
+//            std::cerr << "PluginAdapterBase::Impl::convertFeatures: j = " << j << std::endl;
+
+            VampFeature *feature = &fs[n].features[j].v1;
+
+            feature->hasTimestamp = fl[j].hasTimestamp;
+            feature->sec = fl[j].timestamp.sec;
+            feature->nsec = fl[j].timestamp.nsec;
+            feature->valueCount = fl[j].values.size();
+
+            VampFeatureV2 *v2 = &fs[n].features[j + sz].v2;
+            
+            v2->hasDuration = fl[j].hasDuration;
+            v2->durationSec = fl[j].duration.sec;
+            v2->durationNsec = fl[j].duration.nsec;
+
+            if (feature->label) free(feature->label);
+
+            if (fl[j].label.empty()) {
+                feature->label = 0;
+            } else {
+                feature->label = strdup(fl[j].label.c_str());
+            }
+
+            if (feature->valueCount > m_fvsizes[plugin][n][j]) {
+                resizeFV(plugin, n, j, feature->valueCount);
+            }
+
+            for (unsigned int k = 0; k < feature->valueCount; ++k) {
+//                std::cerr << "PluginAdapterBase::Impl::convertFeatures: k = " << k << std::endl;
+                feature->values[k] = fl[j].values[k];
+            }
+        }
+
+        lastN = n;
+    }
+
+    if (lastN == -1) return 0;
+
+    if (int(outputCount) > lastN + 1) {
+        for (int i = lastN + 1; i < int(outputCount); ++i) {
+            fs[i].featureCount = 0;
+        }
+    }
+
+//    std::cerr << "PluginAdapter(v2)::convertFeatures: NOTE: have " << outputCount << " outputs" << std::endl;
+//    for (int i = 0; i < outputCount; ++i) {
+//        std::cerr << "PluginAdapter(v2)::convertFeatures: NOTE: output " << i << " has " << fs[i].featureCount << " features" << std::endl;
+//    }
+
+
+    return fs;
+}
+
+void
+PluginAdapterBase::Impl::resizeFS(Plugin *plugin, int n)
+{
+//    std::cerr << "PluginAdapterBase::Impl::resizeFS(" << plugin << ", " << n << ")" << std::endl;
+
+    int i = m_fsizes[plugin].size();
+    if (i >= n) return;
+
+//    std::cerr << "resizing from " << i << std::endl;
+
+    m_fs[plugin] = (VampFeatureList *)realloc
+        (m_fs[plugin], n * sizeof(VampFeatureList));
+
+    while (i < n) {
+        m_fs[plugin][i].featureCount = 0;
+        m_fs[plugin][i].features = 0;
+        m_fsizes[plugin].push_back(0);
+        m_fvsizes[plugin].push_back(std::vector<size_t>());
+        i++;
+    }
+}
+
+void
+PluginAdapterBase::Impl::resizeFL(Plugin *plugin, int n, size_t sz)
+{
+//    std::cerr << "PluginAdapterBase::Impl::resizeFL(" << plugin << ", " << n << ", "
+//              << sz << ")" << std::endl;
+
+    size_t i = m_fsizes[plugin][n];
+    if (i >= sz) return;
+
+//    std::cerr << "resizing from " << i << std::endl;
+
+    m_fs[plugin][n].features = (VampFeatureUnion *)realloc
+        (m_fs[plugin][n].features, 2 * sz * sizeof(VampFeatureUnion));
+
+    while (m_fsizes[plugin][n] < sz) {
+        m_fs[plugin][n].features[m_fsizes[plugin][n]].v1.hasTimestamp = 0;
+        m_fs[plugin][n].features[m_fsizes[plugin][n]].v1.valueCount = 0;
+        m_fs[plugin][n].features[m_fsizes[plugin][n]].v1.values = 0;
+        m_fs[plugin][n].features[m_fsizes[plugin][n]].v1.label = 0;
+        m_fs[plugin][n].features[m_fsizes[plugin][n] + sz].v2.hasDuration = 0;
+        m_fvsizes[plugin][n].push_back(0);
+        m_fsizes[plugin][n]++;
+    }
+}
+
+void
+PluginAdapterBase::Impl::resizeFV(Plugin *plugin, int n, int j, size_t sz)
+{
+//    std::cerr << "PluginAdapterBase::Impl::resizeFV(" << plugin << ", " << n << ", "
+//              << j << ", " << sz << ")" << std::endl;
+
+    size_t i = m_fvsizes[plugin][n][j];
+    if (i >= sz) return;
+
+//    std::cerr << "resizing from " << i << std::endl;
+
+    m_fs[plugin][n].features[j].v1.values = (float *)realloc
+        (m_fs[plugin][n].features[j].v1.values, sz * sizeof(float));
+
+    m_fvsizes[plugin][n][j] = sz;
+}
+  
+PluginAdapterBase::Impl::AdapterMap *
+PluginAdapterBase::Impl::m_adapterMap = 0;
+
+}
+
+_VAMP_SDK_PLUGSPACE_END(PluginAdapter.cpp)
+
diff --git a/lib-src/libvamp/src/vamp-sdk/RealTime.cpp b/lib-src/libvamp/src/vamp-sdk/RealTime.cpp
new file mode 100644
index 0000000..d3c4364
--- /dev/null
+++ b/lib-src/libvamp/src/vamp-sdk/RealTime.cpp
@@ -0,0 +1,252 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+/*
+   This is a modified version of a source file from the 
+   Rosegarden MIDI and audio sequencer and notation editor.
+   This file copyright 2000-2006 Chris Cannam.
+   Relicensed by the author as detailed above.
+*/
+
+#include <iostream>
+
+#if (__GNUC__ < 3)
+#include <strstream>
+#define stringstream strstream
+#else
+#include <sstream>
+#endif
+
+using std::cerr;
+using std::endl;
+
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+
+#include <vamp-sdk/RealTime.h>
+
+_VAMP_SDK_PLUGSPACE_BEGIN(RealTime.cpp)
+
+namespace Vamp {
+
+// A RealTime consists of two ints that must be at least 32 bits each.
+// A signed 32-bit int can store values exceeding +/- 2 billion.  This
+// means we can safely use our lower int for nanoseconds, as there are
+// 1 billion nanoseconds in a second and we need to handle double that
+// because of the implementations of addition etc that we use.
+//
+// The maximum valid RealTime on a 32-bit system is somewhere around
+// 68 years: 999999999 nanoseconds longer than the classic Unix epoch.
+
+#define ONE_BILLION 1000000000
+
+RealTime::RealTime(int s, int n) :
+    sec(s), nsec(n)
+{
+    if (sec == 0) {
+	while (nsec <= -ONE_BILLION) { nsec += ONE_BILLION; --sec; }
+	while (nsec >=  ONE_BILLION) { nsec -= ONE_BILLION; ++sec; }
+    } else if (sec < 0) {
+	while (nsec <= -ONE_BILLION) { nsec += ONE_BILLION; --sec; }
+	while (nsec > 0)             { nsec -= ONE_BILLION; ++sec; }
+    } else { 
+	while (nsec >=  ONE_BILLION) { nsec -= ONE_BILLION; ++sec; }
+	while (nsec < 0)             { nsec += ONE_BILLION; --sec; }
+    }
+}
+
+RealTime
+RealTime::fromSeconds(double sec)
+{
+    return RealTime(int(sec), int((sec - int(sec)) * ONE_BILLION + 0.5));
+}
+
+RealTime
+RealTime::fromMilliseconds(int msec)
+{
+    return RealTime(msec / 1000, (msec % 1000) * 1000000);
+}
+
+#ifndef _WIN32
+RealTime
+RealTime::fromTimeval(const struct timeval &tv)
+{
+    return RealTime(tv.tv_sec, tv.tv_usec * 1000);
+}
+#endif
+
+std::ostream &operator<<(std::ostream &out, const RealTime &rt)
+{
+    if (rt < RealTime::zeroTime) {
+	out << "-";
+    } else {
+	out << " ";
+    }
+
+    int s = (rt.sec < 0 ? -rt.sec : rt.sec);
+    int n = (rt.nsec < 0 ? -rt.nsec : rt.nsec);
+
+    out << s << ".";
+
+    int nn(n);
+    if (nn == 0) out << "00000000";
+    else while (nn < (ONE_BILLION / 10)) {
+	out << "0";
+	nn *= 10;
+    }
+    
+    out << n << "R";
+    return out;
+}
+
+std::string
+RealTime::toString() const
+{
+    std::stringstream out;
+    out << *this;
+    
+#if (__GNUC__ < 3)
+    out << std::ends;
+#endif
+
+    std::string s = out.str();
+
+    // remove trailing R
+    return s.substr(0, s.length() - 1);
+}
+
+std::string
+RealTime::toText(bool fixedDp) const
+{
+    if (*this < RealTime::zeroTime) return "-" + (-*this).toText();
+
+    std::stringstream out;
+
+    if (sec >= 3600) {
+	out << (sec / 3600) << ":";
+    }
+
+    if (sec >= 60) {
+	out << (sec % 3600) / 60 << ":";
+    }
+
+    if (sec >= 10) {
+	out << ((sec % 60) / 10);
+    }
+
+    out << (sec % 10);
+    
+    int ms = msec();
+
+    if (ms != 0) {
+	out << ".";
+	out << (ms / 100);
+	ms = ms % 100;
+	if (ms != 0) {
+	    out << (ms / 10);
+	    ms = ms % 10;
+	} else if (fixedDp) {
+	    out << "0";
+	}
+	if (ms != 0) {
+	    out << ms;
+	} else if (fixedDp) {
+	    out << "0";
+	}
+    } else if (fixedDp) {
+	out << ".000";
+    }
+	
+#if (__GNUC__ < 3)
+    out << std::ends;
+#endif
+
+    std::string s = out.str();
+
+    return s;
+}
+
+
+RealTime
+RealTime::operator/(int d) const
+{
+    int secdiv = sec / d;
+    int secrem = sec % d;
+
+    double nsecdiv = (double(nsec) + ONE_BILLION * double(secrem)) / d;
+    
+    return RealTime(secdiv, int(nsecdiv + 0.5));
+}
+
+double 
+RealTime::operator/(const RealTime &r) const
+{
+    double lTotal = double(sec) * ONE_BILLION + double(nsec);
+    double rTotal = double(r.sec) * ONE_BILLION + double(r.nsec);
+    
+    if (rTotal == 0) return 0.0;
+    else return lTotal/rTotal;
+}
+
+long
+RealTime::realTime2Frame(const RealTime &time, unsigned int sampleRate)
+{
+    if (time < zeroTime) return -realTime2Frame(-time, sampleRate);
+    double s = time.sec + double(time.nsec + 1) / 1000000000.0;
+    return long(s * sampleRate);
+}
+
+RealTime
+RealTime::frame2RealTime(long frame, unsigned int sampleRate)
+{
+    if (frame < 0) return -frame2RealTime(-frame, sampleRate);
+
+    RealTime rt;
+    rt.sec = frame / long(sampleRate);
+    frame -= rt.sec * long(sampleRate);
+    rt.nsec = (int)(((double(frame) * 1000000.0) / sampleRate) * 1000.0);
+    return rt;
+}
+
+const RealTime RealTime::zeroTime(0,0);
+
+}
+
+_VAMP_SDK_PLUGSPACE_END(RealTime.cpp)
+
+
+
diff --git a/lib-src/libvamp/vamp-hostsdk/Plugin.h b/lib-src/libvamp/vamp-hostsdk/Plugin.h
new file mode 100644
index 0000000..72a3b64
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/Plugin.h
@@ -0,0 +1,47 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_HOSTSDK_PLUGIN_H_
+#define _VAMP_HOSTSDK_PLUGIN_H_
+
+// Do not include vamp-sdk/Plugin.h directly from host code.  Always
+// use this header instead.
+
+#include "hostguard.h"
+
+#include <vamp-sdk/Plugin.h>
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginBase.h b/lib-src/libvamp/vamp-hostsdk/PluginBase.h
new file mode 100644
index 0000000..f12c25a
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginBase.h
@@ -0,0 +1,47 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_HOSTSDK_PLUGIN_BASE_H_
+#define _VAMP_HOSTSDK_PLUGIN_BASE_H_
+
+// Do not include vamp-sdk/PluginBase.h directly from host code.
+// Always use this header instead.
+
+#include "hostguard.h"
+
+#include <vamp-sdk/PluginBase.h>
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginBufferingAdapter.h b/lib-src/libvamp/vamp-hostsdk/PluginBufferingAdapter.h
new file mode 100644
index 0000000..21c2b36
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginBufferingAdapter.h
@@ -0,0 +1,194 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+    This file by Mark Levy and Chris Cannam, Copyright 2007-2008 QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_BUFFERING_ADAPTER_H_
+#define _VAMP_PLUGIN_BUFFERING_ADAPTER_H_
+
+#include "hostguard.h"
+#include "PluginWrapper.h"
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginBufferingAdapter.h)
+
+namespace Vamp {
+	
+namespace HostExt {
+		
+/**
+ * \class PluginBufferingAdapter PluginBufferingAdapter.h <vamp-hostsdk/PluginBufferingAdapter.h>
+ *
+ * PluginBufferingAdapter is a Vamp plugin adapter that allows plugins
+ * to be used by a host supplying an audio stream in non-overlapping
+ * buffers of arbitrary size.
+ *
+ * A host using PluginBufferingAdapter may ignore the preferred step
+ * and block size reported by the plugin, and still expect the plugin
+ * to run.  The value of blockSize and stepSize passed to initialise
+ * should be the size of the buffer which the host will supply; the
+ * stepSize should be equal to the blockSize.
+ *
+ * If the internal step size used for the plugin differs from that
+ * supplied by the host, the adapter will modify the sample type and
+ * rate specifications for the plugin outputs appropriately, and set
+ * timestamps on the output features for outputs that formerly used a
+ * different sample rate specification.  This is necessary in order to
+ * obtain correct time stamping.
+ * 
+ * In other respects, the PluginBufferingAdapter behaves identically
+ * to the plugin that it wraps. The wrapped plugin will be deleted
+ * when the wrapper is deleted.
+ */
+		
+class PluginBufferingAdapter : public PluginWrapper
+{
+public:
+    /**
+     * Construct a PluginBufferingAdapter wrapping the given plugin.
+     * The adapter takes ownership of the plugin, which will be
+     * deleted when the adapter is deleted.
+     */
+    PluginBufferingAdapter(Plugin *plugin);
+    virtual ~PluginBufferingAdapter();
+
+    /**
+     * Return the preferred step size for this adapter.
+     * 
+     * Because of the way this adapter works, its preferred step size
+     * will always be the same as its preferred block size.  This may
+     * or may not be the same as the preferred step size of the
+     * underlying plugin, which may be obtained by calling
+     * getPluginPreferredStepSize().
+     */
+    size_t getPreferredStepSize() const;
+
+    /**
+     * Return the preferred block size for this adapter.
+     * 
+     * This may or may not be the same as the preferred block size of
+     * the underlying plugin, which may be obtained by calling
+     * getPluginPreferredBlockSize().
+     *
+     * Note that this adapter may be initialised with any block size,
+     * not just its supposedly preferred one.
+     */
+    size_t getPreferredBlockSize() const;
+
+    /**
+     * Initialise the adapter (and therefore the plugin) for the given
+     * number of channels.  Initialise the adapter for the given step
+     * and block size, which must be equal.
+     *
+     * The step and block size used for the underlying plugin will
+     * depend on its preferences, or any values previously passed to
+     * setPluginStepSize and setPluginBlockSize.
+     */
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    /**
+     * Return the preferred step size of the plugin wrapped by this
+     * adapter.
+     *
+     * This is included mainly for informational purposes.  This value
+     * is not likely to be a valid step size for the adapter itself,
+     * and it is not usually of any use in interpreting the results
+     * (because the adapter re-writes OneSamplePerStep outputs to
+     * FixedSampleRate so that the hop size no longer needs to be
+     * known beforehand in order to interpret them).
+     */
+    size_t getPluginPreferredStepSize() const;
+
+    /** 
+     * Return the preferred block size of the plugin wrapped by this
+     * adapter.
+     *
+     * This is included mainly for informational purposes.
+     */
+    size_t getPluginPreferredBlockSize() const;
+
+    /**
+     * Set the step size that will be used for the underlying plugin
+     * when initialise() is called.  If this is not set, the plugin's
+     * own preferred step size will be used.  You will not usually
+     * need to call this function.  If you do call it, it must be
+     * before the first call to initialise().
+     */
+    void setPluginStepSize(size_t stepSize);
+
+    /**
+     * Set the block size that will be used for the underlying plugin
+     * when initialise() is called.  If this is not set, the plugin's
+     * own preferred block size will be used.  You will not usually
+     * need to call this function.  If you do call it, it must be
+     * before the first call to initialise().
+     */
+    void setPluginBlockSize(size_t blockSize);
+
+    /**
+     * Return the step and block sizes that were actually used when
+     * initialising the underlying plugin.
+     *
+     * This is included mainly for informational purposes.  You will
+     * not usually need to call this function.  If this is called
+     * before initialise(), it will return 0 for both values.  If it
+     * is called after a failed call to initialise(), it will return
+     * the values that were used in the failed call to the plugin's
+     * initialise() function.
+     */
+    void getActualStepAndBlockSizes(size_t &stepSize, size_t &blockSize);
+
+    void setParameter(std::string, float);
+    void selectProgram(std::string);
+
+    OutputList getOutputDescriptors() const;
+
+    void reset();
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+    
+    FeatureSet getRemainingFeatures();
+    
+protected:
+    class Impl;
+    Impl *m_impl;
+};
+    
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginBufferingAdapter.h)
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginChannelAdapter.h b/lib-src/libvamp/vamp-hostsdk/PluginChannelAdapter.h
new file mode 100644
index 0000000..28ee82a
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginChannelAdapter.h
@@ -0,0 +1,149 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_CHANNEL_ADAPTER_H_
+#define _VAMP_PLUGIN_CHANNEL_ADAPTER_H_
+
+#include "hostguard.h"
+#include "PluginWrapper.h"
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginChannelAdapter.h)
+
+namespace Vamp {
+
+namespace HostExt {
+
+/**
+ * \class PluginChannelAdapter PluginChannelAdapter.h <vamp-hostsdk/PluginChannelAdapter.h>
+ *
+ * PluginChannelAdapter is a Vamp plugin adapter that implements a
+ * policy for management of plugins that expect a different number of
+ * input channels from the number actually available in the source
+ * audio data.
+ *
+ * A host using PluginChannelAdapter may ignore the getMinChannelCount
+ * and getMaxChannelCount reported by the plugin, and still expect the
+ * plugin to run.
+ *
+ * PluginChannelAdapter implements the following policy:
+ *
+ *  - If the plugin supports the provided number of channels directly,
+ *  PluginChannelAdapter will just run the plugin as normal.
+ *
+ *  - If the plugin only supports exactly one channel but more than
+ *  one channel is provided, PluginChannelAdapter will use the mean of
+ *  the channels.  This ensures that the resulting values remain
+ *  within the same magnitude range as expected for mono data.
+ *
+ *  - If the plugin requires more than one channel but exactly one is
+ *  provided, the provided channel will be duplicated across all the
+ *  plugin input channels.
+ *
+ * If none of the above apply:
+ * 
+ *  - If the plugin requires more channels than are provided, the
+ *  minimum acceptable number of channels will be produced by adding
+ *  empty (zero valued) channels to those provided.
+ *
+ *  - If the plugin requires fewer channels than are provided, the
+ *  maximum acceptable number of channels will be produced by
+ *  discarding the excess channels.
+ *
+ * Hosts requiring a different channel policy from the above will need
+ * to implement it themselves, instead of using PluginChannelAdapter.
+ *
+ * Note that PluginChannelAdapter does not override the minimum and
+ * maximum channel counts returned by the wrapped plugin.  The host
+ * will need to be aware that it is using a PluginChannelAdapter, and
+ * be prepared to ignore these counts as necessary.  (This contrasts
+ * with the approach used in PluginInputDomainAdapter, which aims to
+ * make the host completely unaware of which underlying input domain
+ * is in fact in use.)
+ * 
+ * (The rationale for this is that a host may wish to use the
+ * PluginChannelAdapter but still discriminate in some way on the
+ * basis of the number of channels actually supported.  For example, a
+ * simple stereo audio host may prefer to reject plugins that require
+ * more than two channels on the grounds that doesn't actually
+ * understand what they are for, rather than allow the channel adapter
+ * to make a potentially meaningless channel conversion for them.)
+ *
+ * In every respect other than its management of channels, the
+ * PluginChannelAdapter behaves identically to the plugin that it
+ * wraps.  The wrapped plugin will be deleted when the wrapper is
+ * deleted.
+ *
+ * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
+ */
+
+class PluginChannelAdapter : public PluginWrapper
+{
+public:
+    /**
+     * Construct a PluginChannelAdapter wrapping the given plugin.
+     * The adapter takes ownership of the plugin, which will be
+     * deleted when the adapter is deleted.
+     */
+    PluginChannelAdapter(Plugin *plugin);
+    virtual ~PluginChannelAdapter();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+
+    /**
+     * Call process(), providing interleaved audio data with the
+     * number of channels passed to initialise().  The adapter will
+     * de-interleave into temporary buffers as appropriate before
+     * calling process().
+     *
+     * \note This function was introduced in version 1.4 of the Vamp
+     * plugin SDK.
+     */
+    FeatureSet processInterleaved(const float *inputBuffer, RealTime timestamp);
+
+protected:
+    class Impl;
+    Impl *m_impl;
+};
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginChannelAdapter.h)
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginHostAdapter.h b/lib-src/libvamp/vamp-hostsdk/PluginHostAdapter.h
new file mode 100644
index 0000000..2ca1d69
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginHostAdapter.h
@@ -0,0 +1,123 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_HOST_ADAPTER_H_
+#define _VAMP_PLUGIN_HOST_ADAPTER_H_
+
+#include "hostguard.h"
+#include "Plugin.h"
+
+#include <vamp/vamp.h>
+
+#include <vector>
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginHostAdapter.h)
+
+namespace Vamp {
+
+/**
+ * \class PluginHostAdapter PluginHostAdapter.h <vamp-hostsdk/PluginHostAdapter.h>
+ * 
+ * PluginHostAdapter is a wrapper class that a Vamp host can use to
+ * make the C-language VampPluginDescriptor object appear as a C++
+ * Vamp::Plugin object.
+ *
+ * The Vamp API is defined in vamp/vamp.h as a C API.  The C++ objects
+ * used for convenience by plugins and hosts actually communicate
+ * using the C low-level API, but the details of this communication
+ * are handled seamlessly by the Vamp SDK implementation provided the
+ * plugin and host use the proper C++ wrapper objects.
+ *
+ * See also PluginAdapter, the plugin-side wrapper that makes a C++
+ * plugin object available using the C query API.
+ */
+
+class PluginHostAdapter : public Plugin
+{
+public:
+    PluginHostAdapter(const VampPluginDescriptor *descriptor,
+                      float inputSampleRate);
+    virtual ~PluginHostAdapter();
+    
+    static std::vector<std::string> getPluginPath();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void reset();
+
+    InputDomain getInputDomain() const;
+
+    unsigned int getVampApiVersion() const;
+    std::string getIdentifier() const;
+    std::string getName() const;
+    std::string getDescription() const;
+    std::string getMaker() const;
+    int getPluginVersion() const;
+    std::string getCopyright() const;
+
+    ParameterList getParameterDescriptors() const;
+    float getParameter(std::string) const;
+    void setParameter(std::string, float);
+
+    ProgramList getPrograms() const;
+    std::string getCurrentProgram() const;
+    void selectProgram(std::string);
+
+    size_t getPreferredStepSize() const;
+    size_t getPreferredBlockSize() const;
+
+    size_t getMinChannelCount() const;
+    size_t getMaxChannelCount() const;
+
+    OutputList getOutputDescriptors() const;
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+
+    FeatureSet getRemainingFeatures();
+
+protected:
+    void convertFeatures(VampFeatureList *, FeatureSet &);
+
+    const VampPluginDescriptor *m_descriptor;
+    VampPluginHandle m_handle;
+};
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginHostAdapter.h)
+
+#endif
+
+
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginInputDomainAdapter.h b/lib-src/libvamp/vamp-hostsdk/PluginInputDomainAdapter.h
new file mode 100644
index 0000000..7f7c11c
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginInputDomainAdapter.h
@@ -0,0 +1,136 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_INPUT_DOMAIN_ADAPTER_H_
+#define _VAMP_PLUGIN_INPUT_DOMAIN_ADAPTER_H_
+
+#include "hostguard.h"
+#include "PluginWrapper.h"
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginInputDomainAdapter.h)
+
+namespace Vamp {
+
+namespace HostExt {
+
+/**
+ * \class PluginInputDomainAdapter PluginInputDomainAdapter.h <vamp-hostsdk/PluginInputDomainAdapter.h>
+ * 
+ * PluginInputDomainAdapter is a Vamp plugin adapter that converts
+ * time-domain input into frequency-domain input for plugins that need
+ * it.  This permits a host to use time- and frequency-domain plugins
+ * interchangeably without needing to handle the conversion itself.
+ *
+ * This adapter uses a basic Hanning windowed FFT that supports
+ * power-of-two block sizes only.  If a frequency domain plugin
+ * requests a non-power-of-two blocksize, the adapter will adjust it
+ * to a nearby power of two instead.  Thus, getPreferredBlockSize()
+ * will always return a power of two if the wrapped plugin is a
+ * frequency domain one.  If the plugin doesn't accept the adjusted
+ * power of two block size, initialise() will fail.
+ *
+ * The adapter provides no way for the host to discover whether the
+ * underlying plugin is actually a time or frequency domain plugin
+ * (except that if the preferred block size is not a power of two, it
+ * must be a time domain plugin).
+ *
+ * The FFT implementation is simple and self-contained, but unlikely
+ * to be the fastest available: a host can usually do better if it
+ * cares enough.
+ *
+ * In every respect other than its input domain handling, the
+ * PluginInputDomainAdapter behaves identically to the plugin that it
+ * wraps.  The wrapped plugin will be deleted when the wrapper is
+ * deleted.
+ *
+ * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
+ */
+
+class PluginInputDomainAdapter : public PluginWrapper
+{
+public:
+    /**
+     * Construct a PluginInputDomainAdapter wrapping the given plugin.
+     * The adapter takes ownership of the plugin, which will be
+     * deleted when the adapter is deleted.
+     */
+    PluginInputDomainAdapter(Plugin *plugin);
+    virtual ~PluginInputDomainAdapter();
+    
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    InputDomain getInputDomain() const;
+
+    size_t getPreferredStepSize() const;
+    size_t getPreferredBlockSize() const;
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+
+    /**
+     * Return the amount by which the timestamps supplied to process()
+     * are being incremented when they are passed to the plugin's own
+     * process() implementation.
+     *
+     * The Vamp API mandates that the timestamp passed to the plugin
+     * for time-domain input should be the time of the first sample in
+     * the block, but the timestamp passed for frequency-domain input
+     * should be the timestamp of the centre of the block.
+     *
+     * The PluginInputDomainAdapter adjusts its timestamps properly so
+     * that the plugin receives correct times, but in some
+     * circumstances (such as for establishing the correct timing of
+     * implicitly-timed features, i.e. features without their own
+     * timestamps) the host may need to be aware that this adjustment
+     * is taking place.
+     *
+     * If the plugin requires time-domain input, this function will
+     * return zero.  The result of calling this function before
+     * initialise() has been called is undefined.
+     */
+    RealTime getTimestampAdjustment() const;
+
+protected:
+    class Impl;
+    Impl *m_impl;
+};
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginInputDomainAdapter.h)
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginLoader.h b/lib-src/libvamp/vamp-hostsdk/PluginLoader.h
new file mode 100644
index 0000000..4d1daff
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginLoader.h
@@ -0,0 +1,243 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_LOADER_H_
+#define _VAMP_PLUGIN_LOADER_H_
+
+#include <vector>
+#include <string>
+#include <map>
+
+#include "hostguard.h"
+#include "PluginWrapper.h"
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginLoader.h)
+
+namespace Vamp {
+
+class Plugin;
+
+namespace HostExt {
+
+/**
+ * \class PluginLoader PluginLoader.h <vamp-hostsdk/PluginLoader.h>
+ * 
+ * Vamp::HostExt::PluginLoader is a convenience class for discovering
+ * and loading Vamp plugins using the typical plugin-path, library
+ * naming, and categorisation conventions described in the Vamp SDK
+ * documentation.  This class is intended to greatly simplify the task
+ * of becoming a Vamp plugin host for any C++ application.
+ * 
+ * Hosts are not required by the Vamp specification to use the same
+ * plugin search path and naming conventions as implemented by this
+ * class, and are certainly not required to use this actual class.
+ * But we do strongly recommend it.
+ *
+ * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
+ */
+
+class PluginLoader
+{
+public:
+    /**
+     * Obtain a pointer to the singleton instance of PluginLoader.
+     * Use this to obtain your loader object.
+     */
+    static PluginLoader *getInstance();
+
+    /**
+     * PluginKey is a string type that is used to identify a plugin
+     * uniquely within the scope of "the current system".  It consists
+     * of the lower-cased base name of the plugin library, a colon
+     * separator, and the identifier string for the plugin.  It is
+     * only meaningful in the context of a given plugin path (the one
+     * returned by PluginHostAdapter::getPluginPath()).
+     *
+     * Use composePluginKey() to construct a plugin key from a known
+     * plugin library name and identifier.
+     *
+     * Note: the fact that the library component of the key is
+     * lower-cased implies that library names are matched
+     * case-insensitively by the PluginLoader class, regardless of the
+     * case sensitivity of the underlying filesystem.  (Plugin
+     * identifiers _are_ case sensitive, however.)  Also, it is not
+     * possible to portably extract a working library name from a
+     * plugin key, as the result may fail on case-sensitive
+     * filesystems.  Use getLibraryPathForPlugin() instead.
+     */
+    typedef std::string PluginKey;
+
+    /**
+     * PluginKeyList is a sequence of plugin keys, such as returned by
+     * listPlugins().
+     */
+    typedef std::vector<PluginKey> PluginKeyList;
+
+    /**
+     * PluginCategoryHierarchy is a sequence of general->specific
+     * category names, as may be associated with a single plugin.
+     * This sequence describes the location of a plugin within a
+     * category forest, containing the human-readable names of the
+     * plugin's category tree root, followed by each of the nodes down
+     * to the leaf containing the plugin.
+     *
+     * \see getPluginCategory()
+     */
+    typedef std::vector<std::string> PluginCategoryHierarchy;
+
+    /**
+     * Search for all available Vamp plugins, and return a list of
+     * them in the order in which they were found.
+     */
+    PluginKeyList listPlugins();
+
+    /**
+     * AdapterFlags contains a set of values that may be OR'd together
+     * to indicate in which circumstances PluginLoader should use a
+     * plugin adapter to make a plugin easier to use for a host that
+     * does not want to cater for complex features.
+     *
+     * The available flags are:
+     * 
+     * ADAPT_INPUT_DOMAIN - If the plugin expects frequency domain
+     * input, wrap it in a PluginInputDomainAdapter that automatically
+     * converts the plugin to one that expects time-domain input.
+     * This enables a host to accommodate time- and frequency-domain
+     * plugins without needing to do any conversion itself.
+     *
+     * ADAPT_CHANNEL_COUNT - Wrap the plugin in a PluginChannelAdapter
+     * to handle any mismatch between the number of channels of audio
+     * the plugin can handle and the number available in the host.
+     * This enables a host to use plugins that may require the input
+     * to be mixed down to mono, etc., without having to worry about
+     * doing that itself.
+     *
+     * ADAPT_BUFFER_SIZE - Wrap the plugin in a PluginBufferingAdapter
+     * permitting the host to provide audio input using any block
+     * size, with no overlap, regardless of the plugin's preferred
+     * block size (suitable for hosts that read from non-seekable
+     * streaming media, for example).  This adapter introduces some
+     * run-time overhead and also changes the semantics of the plugin
+     * slightly (see the PluginBufferingAdapter header documentation
+     * for details).
+     *
+     * ADAPT_ALL_SAFE - Perform all available adaptations that are
+     * meaningful for the plugin and "safe".  Currently this means to
+     * ADAPT_INPUT_DOMAIN if the plugin wants FrequencyDomain input;
+     * ADAPT_CHANNEL_COUNT always; and ADAPT_BUFFER_SIZE never.
+     * 
+     * ADAPT_ALL - Perform all available adaptations that are
+     * meaningful for the plugin.
+     * 
+     * See PluginInputDomainAdapter, PluginChannelAdapter and
+     * PluginBufferingAdapter for more details of the classes that the
+     * loader may use if these flags are set.
+     */
+    enum AdapterFlags {
+
+        ADAPT_INPUT_DOMAIN  = 0x01,
+        ADAPT_CHANNEL_COUNT = 0x02,
+        ADAPT_BUFFER_SIZE   = 0x04,
+
+        ADAPT_ALL_SAFE      = 0x03,
+
+        ADAPT_ALL           = 0xff
+    };
+
+    /**
+     * Load a Vamp plugin, given its identifying key.  If the plugin
+     * could not be loaded, returns 0.
+     *
+     * The returned plugin should be deleted (using the standard C++
+     * delete keyword) after use.
+     *
+     * \param adapterFlags a bitwise OR of the values in the AdapterFlags
+     * enumeration, indicating under which circumstances an adapter should be
+     * used to wrap the original plugin.  If adapterFlags is 0, no
+     * optional adapters will be used.  Otherwise, the returned plugin
+     * may be of an adapter class type which will behave identically
+     * to the original plugin, apart from any particular features
+     * implemented by the adapter itself.
+     * 
+     * \see AdapterFlags, PluginInputDomainAdapter, PluginChannelAdapter
+     */
+    Plugin *loadPlugin(PluginKey key,
+                       float inputSampleRate,
+                       int adapterFlags = 0);
+
+    /**
+     * Given a Vamp plugin library name and plugin identifier, return
+     * the corresponding plugin key in a form suitable for passing in to
+     * loadPlugin().
+     */
+    PluginKey composePluginKey(std::string libraryName,
+                               std::string identifier);
+
+    /**
+     * Return the category hierarchy for a Vamp plugin, given its
+     * identifying key.
+     *
+     * If the plugin has no category information, return an empty
+     * hierarchy.
+     *
+     * \see PluginCategoryHierarchy
+     */
+    PluginCategoryHierarchy getPluginCategory(PluginKey plugin);
+
+    /**
+     * Return the file path of the dynamic library from which the
+     * given plugin will be loaded (if available).
+     */
+    std::string getLibraryPathForPlugin(PluginKey plugin);
+
+protected:
+    PluginLoader();
+    virtual ~PluginLoader();
+
+    class Impl;
+    Impl *m_impl;
+
+    static PluginLoader *m_instance;
+};
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginLoader.h)
+
+#endif
+
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginSummarisingAdapter.h b/lib-src/libvamp/vamp-hostsdk/PluginSummarisingAdapter.h
new file mode 100644
index 0000000..42a8dad
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginSummarisingAdapter.h
@@ -0,0 +1,195 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2008 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_SUMMARISING_ADAPTER_H_
+#define _VAMP_PLUGIN_SUMMARISING_ADAPTER_H_
+
+#include "hostguard.h"
+#include "PluginWrapper.h"
+
+#include <set>
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginSummarisingAdapter.h)
+
+namespace Vamp {
+
+namespace HostExt {
+
+/**
+ * \class PluginSummarisingAdapter PluginSummarisingAdapter.h <vamp-hostsdk/PluginSummarisingAdapter.h>
+ *
+ * PluginSummarisingAdapter is a Vamp plugin adapter that provides
+ * summarisation methods such as mean and median averages of output
+ * features, for use in any context where an available plugin produces
+ * individual values but the result that is actually needed is some
+ * sort of aggregate.
+ *
+ * To make use of PluginSummarisingAdapter, the host should configure,
+ * initialise and run the plugin through the adapter interface just as
+ * normal.  Then, after the process and getRemainingFeatures methods
+ * have been properly called and processing is complete, the host may
+ * call getSummaryForOutput or getSummaryForAllOutputs to obtain
+ * summarised features: averages, maximum values, etc, depending on
+ * the SummaryType passed to the function.
+ *
+ * By default PluginSummarisingAdapter calculates a single summary of
+ * each output's feature across the whole duration of processed audio.
+ * A host needing summaries of sub-segments of the whole audio may
+ * call setSummarySegmentBoundaries before retrieving the summaries,
+ * providing a list of times such that one summary will be provided
+ * for each segment between two consecutive times.
+ *
+ * PluginSummarisingAdapter is straightforward rather than fast.  It
+ * calculates all of the summary types for all outputs always, and
+ * then returns only the ones that are requested.  It is designed on
+ * the basis that, for most features, summarising and storing
+ * summarised results is far cheaper than calculating the results in
+ * the first place.  If this is not true for your particular feature,
+ * PluginSummarisingAdapter may not be the best approach for you.
+ *
+ * \note This class was introduced in version 2.0 of the Vamp plugin SDK.
+ */
+
+class PluginSummarisingAdapter : public PluginWrapper
+{
+public:
+    /**
+     * Construct a PluginSummarisingAdapter wrapping the given plugin.
+     * The adapter takes ownership of the plugin, which will be
+     * deleted when the adapter is deleted.
+     */
+    PluginSummarisingAdapter(Plugin *plugin); 
+    virtual ~PluginSummarisingAdapter();
+
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+    FeatureSet getRemainingFeatures();
+
+    typedef std::set<RealTime> SegmentBoundaries;
+
+    /**
+     * Specify a series of segment boundaries, such that one summary
+     * will be returned for each of the contiguous intra-boundary
+     * segments.  This function must be called before
+     * getSummaryForOutput or getSummaryForAllOutputs.
+     * 
+     * Note that you cannot retrieve results with multiple different
+     * segmentations by repeatedly calling this function followed by
+     * one of the getSummary functions.  The summaries are all
+     * calculated at the first call to any getSummary function, and
+     * once the summaries have been calculated, they remain
+     * calculated.
+     */
+    void setSummarySegmentBoundaries(const SegmentBoundaries &);
+
+    enum SummaryType {
+        Minimum            = 0,
+        Maximum            = 1,
+        Mean               = 2,
+        Median             = 3,
+        Mode               = 4,
+        Sum                = 5,
+        Variance           = 6,
+        StandardDeviation  = 7,
+        Count              = 8,
+
+        UnknownSummaryType = 999
+    };
+
+    /**
+     * AveragingMethod indicates how the adapter should handle
+     * average-based summaries of features whose results are not
+     * equally spaced in time.
+     *
+     * If SampleAverage is specified, summary types based on averages
+     * will be calculated by treating each result individually without
+     * regard to its time: for example, the mean will be the sum of
+     * all values divided by the number of values.
+     *
+     * If ContinuousTimeAverage is specified, each feature will be
+     * considered to have a duration, either as specified in the
+     * feature's duration field, or until the following feature: thus,
+     * for example, the mean will be the sum of the products of values
+     * and durations, divided by the total duration.
+     *
+     * Although SampleAverage is useful for many types of feature,
+     * ContinuousTimeAverage is essential for some situations, for
+     * example finding the result that spans the largest proportion of
+     * the input given a feature that emits a new result only when the
+     * value changes (the modal value integrated over time).
+     */
+    enum AveragingMethod {
+        SampleAverage         = 0,
+        ContinuousTimeAverage = 1,
+    };
+
+    /**
+     * Return summaries of the features that were returned on the
+     * given output, using the given SummaryType and AveragingMethod.
+     *
+     * The plugin must have been fully run (process() and
+     * getRemainingFeatures() calls all made as appropriate) before
+     * this function is called.
+     */
+    FeatureList getSummaryForOutput(int output,
+                                    SummaryType type,
+                                    AveragingMethod method = SampleAverage);
+
+    /**
+     * Return summaries of the features that were returned on all of
+     * the plugin's outputs, using the given SummaryType and
+     * AveragingMethod.
+     *
+     * The plugin must have been fully run (process() and
+     * getRemainingFeatures() calls all made as appropriate) before
+     * this function is called.
+     */
+    FeatureSet getSummaryForAllOutputs(SummaryType type,
+                                       AveragingMethod method = SampleAverage);
+
+protected:
+    class Impl;
+    Impl *m_impl;
+};
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginSummarisingAdapter.h)
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/PluginWrapper.h b/lib-src/libvamp/vamp-hostsdk/PluginWrapper.h
new file mode 100644
index 0000000..357050d
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/PluginWrapper.h
@@ -0,0 +1,135 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006-2007 Chris Cannam and QMUL.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_PLUGIN_WRAPPER_H_
+#define _VAMP_PLUGIN_WRAPPER_H_
+
+#include "hostguard.h"
+#include <vamp-hostsdk/Plugin.h>
+
+_VAMP_SDK_HOSTSPACE_BEGIN(PluginWrapper.h)
+
+namespace Vamp {
+
+namespace HostExt {
+
+/**
+ * \class PluginWrapper PluginWrapper.h <vamp-hostsdk/PluginWrapper.h>
+ * 
+ * PluginWrapper is a simple base class for adapter plugins.  It takes
+ * a pointer to a "to be wrapped" Vamp plugin on construction, and
+ * provides implementations of all the Vamp plugin methods that simply
+ * delegate through to the wrapped plugin.  A subclass can therefore
+ * override only the methods that are meaningful for the particular
+ * adapter.
+ *
+ * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
+ */
+
+class PluginWrapper : public Plugin
+{
+public:
+    virtual ~PluginWrapper();
+    
+    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void reset();
+
+    InputDomain getInputDomain() const;
+
+    unsigned int getVampApiVersion() const;
+    std::string getIdentifier() const;
+    std::string getName() const;
+    std::string getDescription() const;
+    std::string getMaker() const;
+    int getPluginVersion() const;
+    std::string getCopyright() const;
+
+    ParameterList getParameterDescriptors() const;
+    float getParameter(std::string) const;
+    void setParameter(std::string, float);
+
+    ProgramList getPrograms() const;
+    std::string getCurrentProgram() const;
+    void selectProgram(std::string);
+
+    size_t getPreferredStepSize() const;
+    size_t getPreferredBlockSize() const;
+
+    size_t getMinChannelCount() const;
+    size_t getMaxChannelCount() const;
+
+    OutputList getOutputDescriptors() const;
+
+    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
+
+    FeatureSet getRemainingFeatures();
+
+    /**
+     * Return a pointer to the plugin wrapper of type WrapperType
+     * surrounding this wrapper's plugin, if present.
+     *
+     * This is useful in situations where a plugin is wrapped by
+     * multiple different wrappers (one inside another) and the host
+     * wants to call some wrapper-specific function on one of the
+     * layers without having to care about the order in which they are
+     * wrapped.  For example, the plugin returned by
+     * PluginLoader::loadPlugin may have more than one wrapper; if the
+     * host wanted to query or fine-tune some property of one of them,
+     * it would be hard to do so without knowing the order of the
+     * wrappers.  This function therefore gives direct access to the
+     * wrapper of a particular type.
+     */
+    template <typename WrapperType>
+    WrapperType *getWrapper() {
+        WrapperType *w = dynamic_cast<WrapperType *>(this);
+        if (w) return w;
+        PluginWrapper *pw = dynamic_cast<PluginWrapper *>(m_plugin);
+        if (pw) return pw->getWrapper<WrapperType>();
+        return 0;
+    }
+
+protected:
+    PluginWrapper(Plugin *plugin); // I take ownership of plugin
+    Plugin *m_plugin;
+};
+
+}
+
+}
+
+_VAMP_SDK_HOSTSPACE_END(PluginWrapper.h)
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/RealTime.h b/lib-src/libvamp/vamp-hostsdk/RealTime.h
new file mode 100644
index 0000000..d789b6a
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/RealTime.h
@@ -0,0 +1,46 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_HOSTSDK_REALTIME_H_
+#define _VAMP_HOSTSDK_REALTIME_H_
+
+// Do not include vamp-sdk/RealTime.h directly from host code.  Always
+// use this header instead.
+
+#include "hostguard.h"
+#include <vamp-sdk/RealTime.h>
+
+#endif
diff --git a/lib-src/libvamp/vamp-hostsdk/hostguard.h b/lib-src/libvamp/vamp-hostsdk/hostguard.h
new file mode 100644
index 0000000..3698d84
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/hostguard.h
@@ -0,0 +1,69 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_HOSTSDK_HOSTGUARD_H_
+#define _VAMP_HOSTSDK_HOSTGUARD_H_
+
+#ifdef _VAMP_IN_PLUGINSDK
+#error You have included headers from both vamp-sdk and vamp-hostsdk in the same source file. Please include only vamp-sdk headers in plugin code, and only vamp-hostsdk headers in host code.
+#else
+
+#define _VAMP_IN_HOSTSDK
+
+#ifdef _VAMP_NO_HOST_NAMESPACE
+#define _VAMP_SDK_HOSTSPACE_BEGIN(h)
+#define _VAMP_SDK_HOSTSPACE_END(h)
+#define _VAMP_SDK_PLUGSPACE_BEGIN(h)
+#define _VAMP_SDK_PLUGSPACE_END(h)
+#else
+#define _VAMP_SDK_HOSTSPACE_BEGIN(h) \
+	namespace _VampHost {
+
+#define _VAMP_SDK_HOSTSPACE_END(h) \
+	} \
+	using namespace _VampHost;
+#define _VAMP_SDK_PLUGSPACE_BEGIN(h) \
+	namespace _VampHost {
+
+#define _VAMP_SDK_PLUGSPACE_END(h) \
+	} \
+	using namespace _VampHost;
+#endif
+
+#endif
+
+#endif
+
diff --git a/lib-src/libvamp/vamp-hostsdk/vamp-hostsdk.h b/lib-src/libvamp/vamp-hostsdk/vamp-hostsdk.h
new file mode 100644
index 0000000..f32583d
--- /dev/null
+++ b/lib-src/libvamp/vamp-hostsdk/vamp-hostsdk.h
@@ -0,0 +1,53 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_HOSTSDK_SINGLE_INCLUDE_H_
+#define _VAMP_HOSTSDK_SINGLE_INCLUDE_H_
+
+#include "PluginBase.h"
+#include "PluginBufferingAdapter.h"
+#include "PluginChannelAdapter.h"
+#include "Plugin.h"
+#include "PluginHostAdapter.h"
+#include "PluginInputDomainAdapter.h"
+#include "PluginLoader.h"
+#include "PluginSummarisingAdapter.h"
+#include "PluginWrapper.h"
+#include "RealTime.h"
+
+#endif
+
+
diff --git a/lib-src/libvamp/vamp-sdk/Plugin.h b/lib-src/libvamp/vamp-sdk/Plugin.h
index fb64707..4709b19 100644
--- a/lib-src/libvamp/vamp-sdk/Plugin.h
+++ b/lib-src/libvamp/vamp-sdk/Plugin.h
@@ -34,16 +34,19 @@
     authorization.
 */
 
-#ifndef _VAMP_PLUGIN_H_
-#define _VAMP_PLUGIN_H_
-
-#include "PluginBase.h"
-#include "RealTime.h"
+#ifndef _VAMP_SDK_PLUGIN_H_
+#define _VAMP_SDK_PLUGIN_H_
 
 #include <string>
 #include <vector>
 #include <map>
 
+#include "PluginBase.h"
+#include "RealTime.h"
+
+#include "plugguard.h"
+_VAMP_SDK_PLUGSPACE_BEGIN(Plugin.h)
+
 namespace Vamp {
 
 /**
@@ -304,6 +307,16 @@ public:
 	 * this to zero if that behaviour is not desired.
 	 */
 	float sampleRate;
+
+        /**
+         * True if the returned results for this output are known to
+         * have a duration field.
+         */
+        bool hasDuration;
+
+        OutputDescriptor() : // defaults for mandatory non-class-type members
+            hasFixedBinCount(false), hasKnownExtents(false), isQuantized(false),
+            sampleType(OneSamplePerStep), hasDuration(false) { }
     };
 
     typedef std::vector<OutputDescriptor> OutputList;
@@ -319,17 +332,34 @@ public:
     {
 	/**
 	 * True if an output feature has its own timestamp.  This is
-	 * mandatory if the output has VariableSampleRate, and is
-	 * likely to be disregarded otherwise.
+	 * mandatory if the output has VariableSampleRate, optional if
+	 * the output has FixedSampleRate, and unused if the output
+	 * has OneSamplePerStep.
 	 */
 	bool hasTimestamp;
 
 	/**
 	 * Timestamp of the output feature.  This is mandatory if the
-	 * output has VariableSampleRate, and is likely to be
-	 * disregarded otherwise.  Undefined if hasTimestamp is false.
+	 * output has VariableSampleRate or if the output has
+	 * FixedSampleRate and hasTimestamp is true, and unused
+	 * otherwise.
 	 */
 	RealTime timestamp;
+
+        /**
+         * True if an output feature has a specified duration.  This
+         * is optional if the output has VariableSampleRate or
+         * FixedSampleRate, and and unused if the output has
+         * OneSamplePerStep.
+         */
+        bool hasDuration;
+
+        /**
+         * Duration of the output feature.  This is mandatory if the
+         * output has VariableSampleRate or FixedSampleRate and
+         * hasDuration is true, and unused otherwise.
+         */
+        RealTime duration;
 	
 	/**
 	 * Results for a single sample of this feature.  If the output
@@ -342,9 +372,13 @@ public:
 	 * Label for the sample of this feature.
 	 */
 	std::string label;
+
+        Feature() : // defaults for mandatory non-class-type members
+            hasTimestamp(false), hasDuration(false) { }
     };
 
     typedef std::vector<Feature> FeatureList;
+
     typedef std::map<int, FeatureList> FeatureSet; // key is output no
 
     /**
@@ -353,9 +387,9 @@ public:
      * If the plugin's inputDomain is TimeDomain, inputBuffers will
      * point to one array of floats per input channel, and each of
      * these arrays will contain blockSize consecutive audio samples
-     * (the host will zero-pad as necessary).  The timestamp will be
-     * the real time in seconds of the start of the supplied block of
-     * samples.
+     * (the host will zero-pad as necessary).  The timestamp in this
+     * case will be the real time in seconds of the start of the
+     * supplied block of samples.
      *
      * If the plugin's inputDomain is FrequencyDomain, inputBuffers
      * will point to one array of floats per input channel, and each
@@ -399,6 +433,8 @@ protected:
 
 }
 
+_VAMP_SDK_PLUGSPACE_END(Plugin.h)
+
 #endif
 
 
diff --git a/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp b/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
deleted file mode 100644
index b2ce813..0000000
--- a/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
+++ /dev/null
@@ -1,853 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006 Chris Cannam.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "PluginAdapter.h"
-
-#include <cstring>
-#include <cstdlib>
-
-//#define DEBUG_PLUGIN_ADAPTER 1
-
-namespace Vamp {
-
-class PluginAdapterBase::Impl
-{
-public:
-    Impl(PluginAdapterBase *);
-    ~Impl();
-
-    const VampPluginDescriptor *getDescriptor();
-
-protected:
-    PluginAdapterBase *m_base;
-
-    static VampPluginHandle vampInstantiate(const VampPluginDescriptor *desc,
-                                          float inputSampleRate);
-
-    static void vampCleanup(VampPluginHandle handle);
-
-    static int vampInitialise(VampPluginHandle handle, unsigned int channels,
-                             unsigned int stepSize, unsigned int blockSize);
-
-    static void vampReset(VampPluginHandle handle);
-
-    static float vampGetParameter(VampPluginHandle handle, int param);
-    static void vampSetParameter(VampPluginHandle handle, int param, float value);
-
-    static unsigned int vampGetCurrentProgram(VampPluginHandle handle);
-    static void vampSelectProgram(VampPluginHandle handle, unsigned int program);
-
-    static unsigned int vampGetPreferredStepSize(VampPluginHandle handle);
-    static unsigned int vampGetPreferredBlockSize(VampPluginHandle handle);
-    static unsigned int vampGetMinChannelCount(VampPluginHandle handle);
-    static unsigned int vampGetMaxChannelCount(VampPluginHandle handle);
-
-    static unsigned int vampGetOutputCount(VampPluginHandle handle);
-
-    static VampOutputDescriptor *vampGetOutputDescriptor(VampPluginHandle handle,
-                                                       unsigned int i);
-
-    static void vampReleaseOutputDescriptor(VampOutputDescriptor *desc);
-
-    static VampFeatureList *vampProcess(VampPluginHandle handle,
-                                        const float *const *inputBuffers,
-                                        int sec,
-                                        int nsec);
-
-    static VampFeatureList *vampGetRemainingFeatures(VampPluginHandle handle);
-
-    static void vampReleaseFeatureSet(VampFeatureList *fs);
-
-    void cleanup(Plugin *plugin);
-    void checkOutputMap(Plugin *plugin);
-    unsigned int getOutputCount(Plugin *plugin);
-    VampOutputDescriptor *getOutputDescriptor(Plugin *plugin,
-                                             unsigned int i);
-    VampFeatureList *process(Plugin *plugin,
-                             const float *const *inputBuffers,
-                             int sec, int nsec);
-    VampFeatureList *getRemainingFeatures(Plugin *plugin);
-    VampFeatureList *convertFeatures(Plugin *plugin,
-                                     const Plugin::FeatureSet &features);
-    
-    // maps both plugins and descriptors to adapters
-    typedef std::map<const void *, Impl *> AdapterMap;
-    static AdapterMap *m_adapterMap;
-    static Impl *lookupAdapter(VampPluginHandle);
-
-    bool m_populated;
-    VampPluginDescriptor m_descriptor;
-    Plugin::ParameterList m_parameters;
-    Plugin::ProgramList m_programs;
-    
-    typedef std::map<Plugin *, Plugin::OutputList *> OutputMap;
-    OutputMap m_pluginOutputs;
-
-    std::map<Plugin *, VampFeatureList *> m_fs;
-    std::map<Plugin *, std::vector<size_t> > m_fsizes;
-    std::map<Plugin *, std::vector<std::vector<size_t> > > m_fvsizes;
-    void resizeFS(Plugin *plugin, int n);
-    void resizeFL(Plugin *plugin, int n, size_t sz);
-    void resizeFV(Plugin *plugin, int n, int j, size_t sz);
-};
-
-PluginAdapterBase::PluginAdapterBase()
-{
-    m_impl = new Impl(this);
-}
-
-PluginAdapterBase::~PluginAdapterBase()
-{
-    delete m_impl;
-}
-
-const VampPluginDescriptor *
-PluginAdapterBase::getDescriptor()
-{
-    return m_impl->getDescriptor();
-}
-
-PluginAdapterBase::Impl::Impl(PluginAdapterBase *base) :
-    m_base(base),
-    m_populated(false)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl[" << this << "]::Impl" << std::endl;
-#endif
-}
-
-const VampPluginDescriptor *
-PluginAdapterBase::Impl::getDescriptor()
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl[" << this << "]::getDescriptor" << std::endl;
-#endif
-
-    if (m_populated) return &m_descriptor;
-
-    Plugin *plugin = m_base->createPlugin(48000);
-
-    if (plugin->getVampApiVersion() != VAMP_API_VERSION) {
-        std::cerr << "Vamp::PluginAdapterBase::Impl::getDescriptor: ERROR: "
-                  << "Plugin object API version "
-                  << plugin->getVampApiVersion()
-                  << " does not match actual API version "
-                  << VAMP_API_VERSION << std::endl;
-        delete plugin;
-        return 0;
-    }
-
-    m_parameters = plugin->getParameterDescriptors();
-    m_programs = plugin->getPrograms();
-
-    m_descriptor.vampApiVersion = plugin->getVampApiVersion();
-    m_descriptor.identifier = strdup(plugin->getIdentifier().c_str());
-    m_descriptor.name = strdup(plugin->getName().c_str());
-    m_descriptor.description = strdup(plugin->getDescription().c_str());
-    m_descriptor.maker = strdup(plugin->getMaker().c_str());
-    m_descriptor.pluginVersion = plugin->getPluginVersion();
-    m_descriptor.copyright = strdup(plugin->getCopyright().c_str());
-    
-    m_descriptor.parameterCount = m_parameters.size();
-    m_descriptor.parameters = (const VampParameterDescriptor **)
-        malloc(m_parameters.size() * sizeof(VampParameterDescriptor));
-
-    unsigned int i;
-    
-    for (i = 0; i < m_parameters.size(); ++i) {
-        VampParameterDescriptor *desc = (VampParameterDescriptor *)
-            malloc(sizeof(VampParameterDescriptor));
-        desc->identifier = strdup(m_parameters[i].identifier.c_str());
-        desc->name = strdup(m_parameters[i].name.c_str());
-        desc->description = strdup(m_parameters[i].description.c_str());
-        desc->unit = strdup(m_parameters[i].unit.c_str());
-        desc->minValue = m_parameters[i].minValue;
-        desc->maxValue = m_parameters[i].maxValue;
-        desc->defaultValue = m_parameters[i].defaultValue;
-        desc->isQuantized = m_parameters[i].isQuantized;
-        desc->quantizeStep = m_parameters[i].quantizeStep;
-        desc->valueNames = 0;
-        if (desc->isQuantized && !m_parameters[i].valueNames.empty()) {
-            desc->valueNames = (const char **)
-                malloc((m_parameters[i].valueNames.size()+1) * sizeof(char *));
-            for (unsigned int j = 0; j < m_parameters[i].valueNames.size(); ++j) {
-                desc->valueNames[j] = strdup(m_parameters[i].valueNames[j].c_str());
-            }
-            desc->valueNames[m_parameters[i].valueNames.size()] = 0;
-        }
-        m_descriptor.parameters[i] = desc;
-    }
-    
-    m_descriptor.programCount = m_programs.size();
-    m_descriptor.programs = (const char **)
-        malloc(m_programs.size() * sizeof(const char *));
-    
-    for (i = 0; i < m_programs.size(); ++i) {
-        m_descriptor.programs[i] = strdup(m_programs[i].c_str());
-    }
-    
-    if (plugin->getInputDomain() == Plugin::FrequencyDomain) {
-        m_descriptor.inputDomain = vampFrequencyDomain;
-    } else {
-        m_descriptor.inputDomain = vampTimeDomain;
-    }
-
-    m_descriptor.instantiate = vampInstantiate;
-    m_descriptor.cleanup = vampCleanup;
-    m_descriptor.initialise = vampInitialise;
-    m_descriptor.reset = vampReset;
-    m_descriptor.getParameter = vampGetParameter;
-    m_descriptor.setParameter = vampSetParameter;
-    m_descriptor.getCurrentProgram = vampGetCurrentProgram;
-    m_descriptor.selectProgram = vampSelectProgram;
-    m_descriptor.getPreferredStepSize = vampGetPreferredStepSize;
-    m_descriptor.getPreferredBlockSize = vampGetPreferredBlockSize;
-    m_descriptor.getMinChannelCount = vampGetMinChannelCount;
-    m_descriptor.getMaxChannelCount = vampGetMaxChannelCount;
-    m_descriptor.getOutputCount = vampGetOutputCount;
-    m_descriptor.getOutputDescriptor = vampGetOutputDescriptor;
-    m_descriptor.releaseOutputDescriptor = vampReleaseOutputDescriptor;
-    m_descriptor.process = vampProcess;
-    m_descriptor.getRemainingFeatures = vampGetRemainingFeatures;
-    m_descriptor.releaseFeatureSet = vampReleaseFeatureSet;
-    
-    if (!m_adapterMap) {
-        m_adapterMap = new AdapterMap;
-    }
-    (*m_adapterMap)[&m_descriptor] = this;
-
-    delete plugin;
-
-    m_populated = true;
-    return &m_descriptor;
-}
-
-PluginAdapterBase::Impl::~Impl()
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl[" << this << "]::~Impl" << std::endl;
-#endif
-
-    if (!m_populated) return;
-
-    free((void *)m_descriptor.identifier);
-    free((void *)m_descriptor.name);
-    free((void *)m_descriptor.description);
-    free((void *)m_descriptor.maker);
-    free((void *)m_descriptor.copyright);
-        
-    for (unsigned int i = 0; i < m_descriptor.parameterCount; ++i) {
-        const VampParameterDescriptor *desc = m_descriptor.parameters[i];
-        free((void *)desc->identifier);
-        free((void *)desc->name);
-        free((void *)desc->description);
-        free((void *)desc->unit);
-        if (desc->valueNames) {
-            for (unsigned int j = 0; desc->valueNames[j]; ++j) {
-                free((void *)desc->valueNames[j]);
-            }
-            free((void *)desc->valueNames);
-        }
-    }
-    free((void *)m_descriptor.parameters);
-
-    for (unsigned int i = 0; i < m_descriptor.programCount; ++i) {
-        free((void *)m_descriptor.programs[i]);
-    }
-    free((void *)m_descriptor.programs);
-
-    if (m_adapterMap) {
-        
-        m_adapterMap->erase(&m_descriptor);
-
-        if (m_adapterMap->empty()) {
-            delete m_adapterMap;
-            m_adapterMap = 0;
-        }
-    }
-}
-
-PluginAdapterBase::Impl *
-PluginAdapterBase::Impl::lookupAdapter(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::lookupAdapter(" << handle << ")" << std::endl;
-#endif
-
-    if (!m_adapterMap) return 0;
-    AdapterMap::const_iterator i = m_adapterMap->find(handle);
-    if (i == m_adapterMap->end()) return 0;
-    return i->second;
-}
-
-VampPluginHandle
-PluginAdapterBase::Impl::vampInstantiate(const VampPluginDescriptor *desc,
-                                   float inputSampleRate)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampInstantiate(" << desc << ")" << std::endl;
-#endif
-
-    if (!m_adapterMap) {
-        m_adapterMap = new AdapterMap();
-    }
-
-    if (m_adapterMap->find(desc) == m_adapterMap->end()) {
-        std::cerr << "WARNING: PluginAdapterBase::Impl::vampInstantiate: Descriptor " << desc << " not in adapter map" << std::endl;
-        return 0;
-    }
-
-    Impl *adapter = (*m_adapterMap)[desc];
-    if (desc != &adapter->m_descriptor) return 0;
-
-    Plugin *plugin = adapter->m_base->createPlugin(inputSampleRate);
-    if (plugin) {
-        (*m_adapterMap)[plugin] = adapter;
-    }
-
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampInstantiate(" << desc << "): returning handle " << plugin << std::endl;
-#endif
-
-    return plugin;
-}
-
-void
-PluginAdapterBase::Impl::vampCleanup(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampCleanup(" << handle << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) {
-        delete ((Plugin *)handle);
-        return;
-    }
-    adapter->cleanup(((Plugin *)handle));
-}
-
-int
-PluginAdapterBase::Impl::vampInitialise(VampPluginHandle handle,
-                                  unsigned int channels,
-                                  unsigned int stepSize,
-                                  unsigned int blockSize)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampInitialise(" << handle << ", " << channels << ", " << stepSize << ", " << blockSize << ")" << std::endl;
-#endif
-
-    bool result = ((Plugin *)handle)->initialise
-        (channels, stepSize, blockSize);
-    return result ? 1 : 0;
-}
-
-void
-PluginAdapterBase::Impl::vampReset(VampPluginHandle handle) 
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampReset(" << handle << ")" << std::endl;
-#endif
-
-    ((Plugin *)handle)->reset();
-}
-
-float
-PluginAdapterBase::Impl::vampGetParameter(VampPluginHandle handle,
-                                    int param) 
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetParameter(" << handle << ", " << param << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) return 0.0;
-    Plugin::ParameterList &list = adapter->m_parameters;
-    return ((Plugin *)handle)->getParameter(list[param].identifier);
-}
-
-void
-PluginAdapterBase::Impl::vampSetParameter(VampPluginHandle handle,
-                                    int param, float value)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampSetParameter(" << handle << ", " << param << ", " << value << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) return;
-    Plugin::ParameterList &list = adapter->m_parameters;
-    ((Plugin *)handle)->setParameter(list[param].identifier, value);
-}
-
-unsigned int
-PluginAdapterBase::Impl::vampGetCurrentProgram(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetCurrentProgram(" << handle << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) return 0;
-    Plugin::ProgramList &list = adapter->m_programs;
-    std::string program = ((Plugin *)handle)->getCurrentProgram();
-    for (unsigned int i = 0; i < list.size(); ++i) {
-        if (list[i] == program) return i;
-    }
-    return 0;
-}
-
-void
-PluginAdapterBase::Impl::vampSelectProgram(VampPluginHandle handle,
-                                     unsigned int program)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampSelectProgram(" << handle << ", " << program << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) return;
-    Plugin::ProgramList &list = adapter->m_programs;
-    ((Plugin *)handle)->selectProgram(list[program]);
-}
-
-unsigned int
-PluginAdapterBase::Impl::vampGetPreferredStepSize(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetPreferredStepSize(" << handle << ")" << std::endl;
-#endif
-
-    return ((Plugin *)handle)->getPreferredStepSize();
-}
-
-unsigned int
-PluginAdapterBase::Impl::vampGetPreferredBlockSize(VampPluginHandle handle) 
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetPreferredBlockSize(" << handle << ")" << std::endl;
-#endif
-
-    return ((Plugin *)handle)->getPreferredBlockSize();
-}
-
-unsigned int
-PluginAdapterBase::Impl::vampGetMinChannelCount(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetMinChannelCount(" << handle << ")" << std::endl;
-#endif
-
-    return ((Plugin *)handle)->getMinChannelCount();
-}
-
-unsigned int
-PluginAdapterBase::Impl::vampGetMaxChannelCount(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetMaxChannelCount(" << handle << ")" << std::endl;
-#endif
-
-    return ((Plugin *)handle)->getMaxChannelCount();
-}
-
-unsigned int
-PluginAdapterBase::Impl::vampGetOutputCount(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetOutputCount(" << handle << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-
-//    std::cerr << "vampGetOutputCount: handle " << handle << " -> adapter "<< adapter << std::endl;
-
-    if (!adapter) return 0;
-    return adapter->getOutputCount((Plugin *)handle);
-}
-
-VampOutputDescriptor *
-PluginAdapterBase::Impl::vampGetOutputDescriptor(VampPluginHandle handle,
-                                           unsigned int i)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetOutputDescriptor(" << handle << ", " << i << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-
-//    std::cerr << "vampGetOutputDescriptor: handle " << handle << " -> adapter "<< adapter << std::endl;
-
-    if (!adapter) return 0;
-    return adapter->getOutputDescriptor((Plugin *)handle, i);
-}
-
-void
-PluginAdapterBase::Impl::vampReleaseOutputDescriptor(VampOutputDescriptor *desc)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampReleaseOutputDescriptor(" << desc << ")" << std::endl;
-#endif
-
-    if (desc->identifier) free((void *)desc->identifier);
-    if (desc->name) free((void *)desc->name);
-    if (desc->description) free((void *)desc->description);
-    if (desc->unit) free((void *)desc->unit);
-    if (desc->hasFixedBinCount && desc->binNames) {
-        for (unsigned int i = 0; i < desc->binCount; ++i) {
-            if (desc->binNames[i]) {
-                free((void *)desc->binNames[i]);
-            }
-        }
-    }
-    if (desc->binNames) free((void *)desc->binNames);
-    free((void *)desc);
-}
-
-VampFeatureList *
-PluginAdapterBase::Impl::vampProcess(VampPluginHandle handle,
-                                     const float *const *inputBuffers,
-                                     int sec,
-                                     int nsec)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampProcess(" << handle << ", " << sec << ", " << nsec << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) return 0;
-    return adapter->process((Plugin *)handle,
-                            inputBuffers, sec, nsec);
-}
-
-VampFeatureList *
-PluginAdapterBase::Impl::vampGetRemainingFeatures(VampPluginHandle handle)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampGetRemainingFeatures(" << handle << ")" << std::endl;
-#endif
-
-    Impl *adapter = lookupAdapter(handle);
-    if (!adapter) return 0;
-    return adapter->getRemainingFeatures((Plugin *)handle);
-}
-
-void
-PluginAdapterBase::Impl::vampReleaseFeatureSet(VampFeatureList *fs)
-{
-#ifdef DEBUG_PLUGIN_ADAPTER
-    std::cerr << "PluginAdapterBase::Impl::vampReleaseFeatureSet" << std::endl;
-#endif
-}
-
-void 
-PluginAdapterBase::Impl::cleanup(Plugin *plugin)
-{
-    if (m_fs.find(plugin) != m_fs.end()) {
-        size_t outputCount = 0;
-        if (m_pluginOutputs[plugin]) {
-            outputCount = m_pluginOutputs[plugin]->size();
-        }
-        VampFeatureList *list = m_fs[plugin];
-        for (unsigned int i = 0; i < outputCount; ++i) {
-            for (unsigned int j = 0; j < m_fsizes[plugin][i]; ++j) {
-                if (list[i].features[j].label) {
-                    free(list[i].features[j].label);
-                }
-                if (list[i].features[j].values) {
-                    free(list[i].features[j].values);
-                }
-            }
-            if (list[i].features) free(list[i].features);
-        }
-        m_fs.erase(plugin);
-        m_fsizes.erase(plugin);
-        m_fvsizes.erase(plugin);
-    }
-
-    if (m_pluginOutputs.find(plugin) != m_pluginOutputs.end()) {
-        delete m_pluginOutputs[plugin];
-        m_pluginOutputs.erase(plugin);
-    }
-
-    if (m_adapterMap) {
-        m_adapterMap->erase(plugin);
-
-        if (m_adapterMap->empty()) {
-            delete m_adapterMap;
-            m_adapterMap = 0;
-        }
-    }
-
-    delete ((Plugin *)plugin);
-}
-
-void 
-PluginAdapterBase::Impl::checkOutputMap(Plugin *plugin)
-{
-    if (m_pluginOutputs.find(plugin) == m_pluginOutputs.end() ||
-        !m_pluginOutputs[plugin]) {
-        m_pluginOutputs[plugin] = new Plugin::OutputList
-            (plugin->getOutputDescriptors());
-//        std::cerr << "PluginAdapterBase::Impl::checkOutputMap: Have " << m_pluginOutputs[plugin]->size() << " outputs for plugin " << plugin->getIdentifier() << std::endl;
-    }
-}
-
-unsigned int 
-PluginAdapterBase::Impl::getOutputCount(Plugin *plugin)
-{
-    checkOutputMap(plugin);
-    return m_pluginOutputs[plugin]->size();
-}
-
-VampOutputDescriptor *
-PluginAdapterBase::Impl::getOutputDescriptor(Plugin *plugin,
-                                       unsigned int i)
-{
-    checkOutputMap(plugin);
-    Plugin::OutputDescriptor &od =
-        (*m_pluginOutputs[plugin])[i];
-
-    VampOutputDescriptor *desc = (VampOutputDescriptor *)
-        malloc(sizeof(VampOutputDescriptor));
-
-    desc->identifier = strdup(od.identifier.c_str());
-    desc->name = strdup(od.name.c_str());
-    desc->description = strdup(od.description.c_str());
-    desc->unit = strdup(od.unit.c_str());
-    desc->hasFixedBinCount = od.hasFixedBinCount;
-    desc->binCount = od.binCount;
-
-    if (od.hasFixedBinCount && od.binCount > 0) {
-        desc->binNames = (const char **)
-            malloc(od.binCount * sizeof(const char *));
-        
-        for (unsigned int i = 0; i < od.binCount; ++i) {
-            if (i < od.binNames.size()) {
-                desc->binNames[i] = strdup(od.binNames[i].c_str());
-            } else {
-                desc->binNames[i] = 0;
-            }
-        }
-    } else {
-        desc->binNames = 0;
-    }
-
-    desc->hasKnownExtents = od.hasKnownExtents;
-    desc->minValue = od.minValue;
-    desc->maxValue = od.maxValue;
-    desc->isQuantized = od.isQuantized;
-    desc->quantizeStep = od.quantizeStep;
-
-    switch (od.sampleType) {
-    case Plugin::OutputDescriptor::OneSamplePerStep:
-        desc->sampleType = vampOneSamplePerStep; break;
-    case Plugin::OutputDescriptor::FixedSampleRate:
-        desc->sampleType = vampFixedSampleRate; break;
-    case Plugin::OutputDescriptor::VariableSampleRate:
-        desc->sampleType = vampVariableSampleRate; break;
-    }
-
-    desc->sampleRate = od.sampleRate;
-
-    return desc;
-}
-    
-VampFeatureList *
-PluginAdapterBase::Impl::process(Plugin *plugin,
-                                 const float *const *inputBuffers,
-                                 int sec, int nsec)
-{
-//    std::cerr << "PluginAdapterBase::Impl::process" << std::endl;
-    RealTime rt(sec, nsec);
-    checkOutputMap(plugin);
-    return convertFeatures(plugin, plugin->process(inputBuffers, rt));
-}
-    
-VampFeatureList *
-PluginAdapterBase::Impl::getRemainingFeatures(Plugin *plugin)
-{
-//    std::cerr << "PluginAdapterBase::Impl::getRemainingFeatures" << std::endl;
-    checkOutputMap(plugin);
-    return convertFeatures(plugin, plugin->getRemainingFeatures());
-}
-
-VampFeatureList *
-PluginAdapterBase::Impl::convertFeatures(Plugin *plugin,
-                                   const Plugin::FeatureSet &features)
-{
-    int lastN = -1;
-
-    int outputCount = 0;
-    if (m_pluginOutputs[plugin]) outputCount = m_pluginOutputs[plugin]->size();
-    
-    resizeFS(plugin, outputCount);
-    VampFeatureList *fs = m_fs[plugin];
-
-    for (Plugin::FeatureSet::const_iterator fi = features.begin();
-         fi != features.end(); ++fi) {
-
-        int n = fi->first;
-        
-//        std::cerr << "PluginAdapterBase::Impl::convertFeatures: n = " << n << std::endl;
-
-        if (n >= int(outputCount)) {
-            std::cerr << "WARNING: PluginAdapterBase::Impl::convertFeatures: Too many outputs from plugin (" << n+1 << ", only should be " << outputCount << ")" << std::endl;
-            continue;
-        }
-
-        if (n > lastN + 1) {
-            for (int i = lastN + 1; i < n; ++i) {
-                fs[i].featureCount = 0;
-            }
-        }
-
-        const Plugin::FeatureList &fl = fi->second;
-
-        size_t sz = fl.size();
-        if (sz > m_fsizes[plugin][n]) resizeFL(plugin, n, sz);
-        fs[n].featureCount = sz;
-        
-        for (size_t j = 0; j < sz; ++j) {
-
-//            std::cerr << "PluginAdapterBase::Impl::convertFeatures: j = " << j << std::endl;
-
-            VampFeature *feature = &fs[n].features[j];
-
-            feature->hasTimestamp = fl[j].hasTimestamp;
-            feature->sec = fl[j].timestamp.sec;
-            feature->nsec = fl[j].timestamp.nsec;
-            feature->valueCount = fl[j].values.size();
-
-            if (feature->label) free(feature->label);
-
-            if (fl[j].label.empty()) {
-                feature->label = 0;
-            } else {
-                feature->label = strdup(fl[j].label.c_str());
-            }
-
-            if (feature->valueCount > m_fvsizes[plugin][n][j]) {
-                resizeFV(plugin, n, j, feature->valueCount);
-            }
-
-            for (unsigned int k = 0; k < feature->valueCount; ++k) {
-//                std::cerr << "PluginAdapterBase::Impl::convertFeatures: k = " << k << std::endl;
-                feature->values[k] = fl[j].values[k];
-            }
-        }
-
-        lastN = n;
-    }
-
-    if (lastN == -1) return 0;
-
-    if (int(outputCount) > lastN + 1) {
-        for (int i = lastN + 1; i < int(outputCount); ++i) {
-            fs[i].featureCount = 0;
-        }
-    }
-
-    return fs;
-}
-
-void
-PluginAdapterBase::Impl::resizeFS(Plugin *plugin, int n)
-{
-//    std::cerr << "PluginAdapterBase::Impl::resizeFS(" << plugin << ", " << n << ")" << std::endl;
-
-    int i = m_fsizes[plugin].size();
-    if (i >= n) return;
-
-//    std::cerr << "resizing from " << i << std::endl;
-
-    m_fs[plugin] = (VampFeatureList *)realloc
-        (m_fs[plugin], n * sizeof(VampFeatureList));
-
-    while (i < n) {
-        m_fs[plugin][i].featureCount = 0;
-        m_fs[plugin][i].features = 0;
-        m_fsizes[plugin].push_back(0);
-        m_fvsizes[plugin].push_back(std::vector<size_t>());
-        i++;
-    }
-}
-
-void
-PluginAdapterBase::Impl::resizeFL(Plugin *plugin, int n, size_t sz)
-{
-//    std::cerr << "PluginAdapterBase::Impl::resizeFL(" << plugin << ", " << n << ", "
-//              << sz << ")" << std::endl;
-
-    size_t i = m_fsizes[plugin][n];
-    if (i >= sz) return;
-
-//    std::cerr << "resizing from " << i << std::endl;
-
-    m_fs[plugin][n].features = (VampFeature *)realloc
-        (m_fs[plugin][n].features, sz * sizeof(VampFeature));
-
-    while (m_fsizes[plugin][n] < sz) {
-        m_fs[plugin][n].features[m_fsizes[plugin][n]].valueCount = 0;
-        m_fs[plugin][n].features[m_fsizes[plugin][n]].values = 0;
-        m_fs[plugin][n].features[m_fsizes[plugin][n]].label = 0;
-        m_fvsizes[plugin][n].push_back(0);
-        m_fsizes[plugin][n]++;
-    }
-}
-
-void
-PluginAdapterBase::Impl::resizeFV(Plugin *plugin, int n, int j, size_t sz)
-{
-//    std::cerr << "PluginAdapterBase::Impl::resizeFV(" << plugin << ", " << n << ", "
-//              << j << ", " << sz << ")" << std::endl;
-
-    size_t i = m_fvsizes[plugin][n][j];
-    if (i >= sz) return;
-
-//    std::cerr << "resizing from " << i << std::endl;
-
-    m_fs[plugin][n].features[j].values = (float *)realloc
-        (m_fs[plugin][n].features[j].values, sz * sizeof(float));
-
-    m_fvsizes[plugin][n][j] = sz;
-}
-  
-PluginAdapterBase::Impl::AdapterMap *
-PluginAdapterBase::Impl::m_adapterMap = 0;
-
-}
-
diff --git a/lib-src/libvamp/vamp-sdk/PluginAdapter.h b/lib-src/libvamp/vamp-sdk/PluginAdapter.h
index bfc9750..dafd532 100644
--- a/lib-src/libvamp/vamp-sdk/PluginAdapter.h
+++ b/lib-src/libvamp/vamp-sdk/PluginAdapter.h
@@ -37,11 +37,13 @@
 #ifndef _VAMP_PLUGIN_ADAPTER_H_
 #define _VAMP_PLUGIN_ADAPTER_H_
 
+#include <map>
 #include <vamp/vamp.h>
 
 #include "Plugin.h"
 
-#include <map>
+#include "plugguard.h"
+_VAMP_SDK_PLUGSPACE_BEGIN(PluginAdapter.h)
 
 namespace Vamp {
 
@@ -113,5 +115,7 @@ protected:
     
 }
 
+_VAMP_SDK_PLUGSPACE_END(PluginAdapter.h)
+
 #endif
 
diff --git a/lib-src/libvamp/vamp-sdk/PluginBase.h b/lib-src/libvamp/vamp-sdk/PluginBase.h
index f51a812..147ffdc 100644
--- a/lib-src/libvamp/vamp-sdk/PluginBase.h
+++ b/lib-src/libvamp/vamp-sdk/PluginBase.h
@@ -34,13 +34,18 @@
     authorization.
 */
 
-#ifndef _VAMP_PLUGIN_BASE_H_
-#define _VAMP_PLUGIN_BASE_H_
+#ifndef _VAMP_SDK_PLUGIN_BASE_H_
+#define _VAMP_SDK_PLUGIN_BASE_H_
 
 #include <string>
 #include <vector>
 
-#define VAMP_SDK_VERSION "1.2"
+#define VAMP_SDK_VERSION "2.0"
+#define VAMP_SDK_MAJOR_VERSION 2
+#define VAMP_SDK_MINOR_VERSION 0
+
+#include "plugguard.h"
+_VAMP_SDK_PLUGSPACE_BEGIN(PluginBase.h)
 
 namespace Vamp {
 
@@ -64,7 +69,7 @@ public:
     /**
      * Get the Vamp API compatibility level of the plugin.
      */
-    virtual unsigned int getVampApiVersion() const { return 1; }
+    virtual unsigned int getVampApiVersion() const { return 2; }
 
     /**
      * Get the computer-usable name of the plugin.  This should be
@@ -190,6 +195,9 @@ public:
          * encoded in the names.
          */
         std::vector<std::string> valueNames;
+
+        ParameterDescriptor() : // the defaults are invalid: you must set them
+            minValue(0), maxValue(0), defaultValue(0), isQuantized(false) { }
     };
 
     typedef std::vector<ParameterDescriptor> ParameterList;
@@ -249,4 +257,6 @@ public:
 
 }
 
+_VAMP_SDK_PLUGSPACE_END(PluginBase.h)
+
 #endif
diff --git a/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp b/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
deleted file mode 100644
index 585358b..0000000
--- a/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006 Chris Cannam.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "PluginHostAdapter.h"
-#include <cstdlib>
-
-namespace Vamp
-{
-
-PluginHostAdapter::PluginHostAdapter(const VampPluginDescriptor *descriptor,
-                                     float inputSampleRate) :
-    Plugin(inputSampleRate),
-    m_descriptor(descriptor)
-{
-//    std::cerr << "PluginHostAdapter::PluginHostAdapter (plugin = " << descriptor->name << ")" << std::endl;
-    m_handle = m_descriptor->instantiate(m_descriptor, inputSampleRate);
-    if (!m_handle) {
-//        std::cerr << "WARNING: PluginHostAdapter: Plugin instantiation failed for plugin " << m_descriptor->name << std::endl;
-    }
-}
-
-PluginHostAdapter::~PluginHostAdapter()
-{
-//    std::cerr << "PluginHostAdapter::~PluginHostAdapter (plugin = " << m_descriptor->name << ")" << std::endl;
-    if (m_handle) m_descriptor->cleanup(m_handle);
-}
-
-std::vector<std::string>
-PluginHostAdapter::getPluginPath()
-{
-    std::vector<std::string> path;
-    std::string envPath;
-
-    char *cpath = getenv("VAMP_PATH");
-    if (cpath) envPath = cpath;
-
-#ifdef _WIN32
-#define PATH_SEPARATOR ';'
-#define DEFAULT_VAMP_PATH "%ProgramFiles%\\Vamp Plugins"
-#else
-#define PATH_SEPARATOR ':'
-#ifdef __APPLE__
-#define DEFAULT_VAMP_PATH "$HOME/Library/Audio/Plug-Ins/Vamp:/Library/Audio/Plug-Ins/Vamp"
-#else
-#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/lib/vamp:/usr/lib/vamp"
-#endif
-#endif
-
-    if (envPath == "") {
-        envPath = DEFAULT_VAMP_PATH;
-        char *chome = getenv("HOME");
-        if (chome) {
-            std::string home(chome);
-            std::string::size_type f;
-            while ((f = envPath.find("$HOME")) != std::string::npos &&
-                    f < envPath.length()) {
-                envPath.replace(f, 5, home);
-            }
-        }
-#ifdef _WIN32
-        char *cpfiles = getenv("ProgramFiles");
-        if (!cpfiles) cpfiles = "C:\\Program Files";
-        std::string pfiles(cpfiles);
-        std::string::size_type f;
-        while ((f = envPath.find("%ProgramFiles%")) != std::string::npos &&
-               f < envPath.length()) {
-            envPath.replace(f, 14, pfiles);
-        }
-#endif
-    }
-
-    std::string::size_type index = 0, newindex = 0;
-
-    while ((newindex = envPath.find(PATH_SEPARATOR, index)) < envPath.size()) {
-	path.push_back(envPath.substr(index, newindex - index));
-	index = newindex + 1;
-    }
-    
-    path.push_back(envPath.substr(index));
-
-    return path;
-}
-
-bool
-PluginHostAdapter::initialise(size_t channels,
-                              size_t stepSize,
-                              size_t blockSize)
-{
-    if (!m_handle) return false;
-    return m_descriptor->initialise(m_handle, channels, stepSize, blockSize) ?
-        true : false;
-}
-
-void
-PluginHostAdapter::reset()
-{
-    if (!m_handle) return;
-    m_descriptor->reset(m_handle);
-}
-
-PluginHostAdapter::InputDomain
-PluginHostAdapter::getInputDomain() const
-{
-    if (m_descriptor->inputDomain == vampFrequencyDomain) {
-        return FrequencyDomain;
-    } else {
-        return TimeDomain;
-    }
-}
-
-unsigned int
-PluginHostAdapter::getVampApiVersion() const
-{
-    return m_descriptor->vampApiVersion;
-}
-
-std::string
-PluginHostAdapter::getIdentifier() const
-{
-    return m_descriptor->identifier;
-}
-
-std::string
-PluginHostAdapter::getName() const
-{
-    return m_descriptor->name;
-}
-
-std::string
-PluginHostAdapter::getDescription() const
-{
-    return m_descriptor->description;
-}
-
-std::string
-PluginHostAdapter::getMaker() const
-{
-    return m_descriptor->maker;
-}
-
-int
-PluginHostAdapter::getPluginVersion() const
-{
-    return m_descriptor->pluginVersion;
-}
-
-std::string
-PluginHostAdapter::getCopyright() const
-{
-    return m_descriptor->copyright;
-}
-
-PluginHostAdapter::ParameterList
-PluginHostAdapter::getParameterDescriptors() const
-{
-    ParameterList list;
-    for (unsigned int i = 0; i < m_descriptor->parameterCount; ++i) {
-        const VampParameterDescriptor *spd = m_descriptor->parameters[i];
-        ParameterDescriptor pd;
-        pd.identifier = spd->identifier;
-        pd.name = spd->name;
-        pd.description = spd->description;
-        pd.unit = spd->unit;
-        pd.minValue = spd->minValue;
-        pd.maxValue = spd->maxValue;
-        pd.defaultValue = spd->defaultValue;
-        pd.isQuantized = spd->isQuantized;
-        pd.quantizeStep = spd->quantizeStep;
-        if (pd.isQuantized && spd->valueNames) {
-            for (unsigned int j = 0; spd->valueNames[j]; ++j) {
-                pd.valueNames.push_back(spd->valueNames[j]);
-            }
-        }
-        list.push_back(pd);
-    }
-    return list;
-}
-
-float
-PluginHostAdapter::getParameter(std::string param) const
-{
-    if (!m_handle) return 0.0;
-
-    for (unsigned int i = 0; i < m_descriptor->parameterCount; ++i) {
-        if (param == m_descriptor->parameters[i]->identifier) {
-            return m_descriptor->getParameter(m_handle, i);
-        }
-    }
-
-    return 0.0;
-}
-
-void
-PluginHostAdapter::setParameter(std::string param, 
-                                float value)
-{
-    if (!m_handle) return;
-
-    for (unsigned int i = 0; i < m_descriptor->parameterCount; ++i) {
-        if (param == m_descriptor->parameters[i]->identifier) {
-            m_descriptor->setParameter(m_handle, i, value);
-            return;
-        }
-    }
-}
-
-PluginHostAdapter::ProgramList
-PluginHostAdapter::getPrograms() const
-{
-    ProgramList list;
-    
-    for (unsigned int i = 0; i < m_descriptor->programCount; ++i) {
-        list.push_back(m_descriptor->programs[i]);
-    }
-    
-    return list;
-}
-
-std::string
-PluginHostAdapter::getCurrentProgram() const
-{
-    if (!m_handle) return "";
-
-    int pn = m_descriptor->getCurrentProgram(m_handle);
-    return m_descriptor->programs[pn];
-}
-
-void
-PluginHostAdapter::selectProgram(std::string program)
-{
-    if (!m_handle) return;
-
-    for (unsigned int i = 0; i < m_descriptor->programCount; ++i) {
-        if (program == m_descriptor->programs[i]) {
-            m_descriptor->selectProgram(m_handle, i);
-            return;
-        }
-    }
-}
-
-size_t
-PluginHostAdapter::getPreferredStepSize() const
-{
-    if (!m_handle) return 0;
-    return m_descriptor->getPreferredStepSize(m_handle);
-}
-
-size_t
-PluginHostAdapter::getPreferredBlockSize() const
-{
-    if (!m_handle) return 0;
-    return m_descriptor->getPreferredBlockSize(m_handle);
-}
-
-size_t
-PluginHostAdapter::getMinChannelCount() const
-{
-    if (!m_handle) return 0;
-    return m_descriptor->getMinChannelCount(m_handle);
-}
-
-size_t
-PluginHostAdapter::getMaxChannelCount() const
-{
-    if (!m_handle) return 0;
-    return m_descriptor->getMaxChannelCount(m_handle);
-}
-
-PluginHostAdapter::OutputList
-PluginHostAdapter::getOutputDescriptors() const
-{
-    OutputList list;
-    if (!m_handle) {
-//        std::cerr << "PluginHostAdapter::getOutputDescriptors: no handle " << std::endl;
-        return list;
-    }
-
-    unsigned int count = m_descriptor->getOutputCount(m_handle);
-
-    for (unsigned int i = 0; i < count; ++i) {
-        VampOutputDescriptor *sd = m_descriptor->getOutputDescriptor(m_handle, i);
-        OutputDescriptor d;
-        d.identifier = sd->identifier;
-        d.name = sd->name;
-        d.description = sd->description;
-        d.unit = sd->unit;
-        d.hasFixedBinCount = sd->hasFixedBinCount;
-        d.binCount = sd->binCount;
-        if (d.hasFixedBinCount) {
-            for (unsigned int j = 0; j < sd->binCount; ++j) {
-                d.binNames.push_back(sd->binNames[j] ? sd->binNames[j] : "");
-            }
-        }
-        d.hasKnownExtents = sd->hasKnownExtents;
-        d.minValue = sd->minValue;
-        d.maxValue = sd->maxValue;
-        d.isQuantized = sd->isQuantized;
-        d.quantizeStep = sd->quantizeStep;
-
-        switch (sd->sampleType) {
-        case vampOneSamplePerStep:
-            d.sampleType = OutputDescriptor::OneSamplePerStep; break;
-        case vampFixedSampleRate:
-            d.sampleType = OutputDescriptor::FixedSampleRate; break;
-        case vampVariableSampleRate:
-            d.sampleType = OutputDescriptor::VariableSampleRate; break;
-        }
-
-        d.sampleRate = sd->sampleRate;
-
-        list.push_back(d);
-
-        m_descriptor->releaseOutputDescriptor(sd);
-    }
-
-    return list;
-}
-
-PluginHostAdapter::FeatureSet
-PluginHostAdapter::process(const float *const *inputBuffers,
-                           RealTime timestamp)
-{
-    FeatureSet fs;
-    if (!m_handle) return fs;
-
-    int sec = timestamp.sec;
-    int nsec = timestamp.nsec;
-    
-    VampFeatureList *features = m_descriptor->process(m_handle,
-                                                      inputBuffers,
-                                                      sec, nsec);
-    
-    convertFeatures(features, fs);
-    m_descriptor->releaseFeatureSet(features);
-    return fs;
-}
-
-PluginHostAdapter::FeatureSet
-PluginHostAdapter::getRemainingFeatures()
-{
-    FeatureSet fs;
-    if (!m_handle) return fs;
-    
-    VampFeatureList *features = m_descriptor->getRemainingFeatures(m_handle); 
-
-    convertFeatures(features, fs);
-    m_descriptor->releaseFeatureSet(features);
-    return fs;
-}
-
-void
-PluginHostAdapter::convertFeatures(VampFeatureList *features,
-                                   FeatureSet &fs)
-{
-    if (!features) return;
-
-    unsigned int outputs = m_descriptor->getOutputCount(m_handle);
-
-    for (unsigned int i = 0; i < outputs; ++i) {
-        
-        VampFeatureList &list = features[i];
-
-        if (list.featureCount > 0) {
-
-            Feature feature;
-            feature.values.reserve(list.features[0].valueCount);
-
-            for (unsigned int j = 0; j < list.featureCount; ++j) {
-
-                feature.hasTimestamp = list.features[j].hasTimestamp;
-                feature.timestamp = RealTime(list.features[j].sec,
-                                             list.features[j].nsec);
-
-                for (unsigned int k = 0; k < list.features[j].valueCount; ++k) {
-                    feature.values.push_back(list.features[j].values[k]);
-                }
-
-                if (list.features[j].label) {
-                    feature.label = list.features[j].label;
-                }
-
-                fs[i].push_back(feature);
-
-                if (list.features[j].valueCount > 0) {
-                    feature.values.clear();
-                }
-
-                if (list.features[j].label) {
-                    feature.label = "";
-                }
-            }
-        }
-    }
-}
-
-}
diff --git a/lib-src/libvamp/vamp-sdk/PluginHostAdapter.h b/lib-src/libvamp/vamp-sdk/PluginHostAdapter.h
deleted file mode 100644
index 80ae620..0000000
--- a/lib-src/libvamp/vamp-sdk/PluginHostAdapter.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006 Chris Cannam.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#ifndef _VAMP_PLUGIN_HOST_ADAPTER_H_
-#define _VAMP_PLUGIN_HOST_ADAPTER_H_
-
-#include <vamp/vamp.h>
-#include <vamp-sdk/Plugin.h>
-
-#include <vector>
-
-namespace Vamp {
-
-/**
- * \class PluginHostAdapter PluginHostAdapter.h <vamp-sdk/PluginHostAdapter.h>
- * 
- * PluginHostAdapter is a wrapper class that a Vamp host can use to
- * make the C-language VampPluginDescriptor object appear as a C++
- * Vamp::Plugin object.
- *
- * The Vamp API is defined in vamp/vamp.h as a C API.  The C++ objects
- * used for convenience by plugins and hosts actually communicate
- * using the C low-level API, but the details of this communication
- * are handled seamlessly by the Vamp SDK implementation provided the
- * plugin and host use the proper C++ wrapper objects.
- *
- * See also PluginAdapter, the plugin-side wrapper that makes a C++
- * plugin object available using the C query API.
- */
-
-class PluginHostAdapter : public Plugin
-{
-public:
-    PluginHostAdapter(const VampPluginDescriptor *descriptor,
-                      float inputSampleRate);
-    virtual ~PluginHostAdapter();
-    
-    static std::vector<std::string> getPluginPath();
-
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-    void reset();
-
-    InputDomain getInputDomain() const;
-
-    unsigned int getVampApiVersion() const;
-    std::string getIdentifier() const;
-    std::string getName() const;
-    std::string getDescription() const;
-    std::string getMaker() const;
-    int getPluginVersion() const;
-    std::string getCopyright() const;
-
-    ParameterList getParameterDescriptors() const;
-    float getParameter(std::string) const;
-    void setParameter(std::string, float);
-
-    ProgramList getPrograms() const;
-    std::string getCurrentProgram() const;
-    void selectProgram(std::string);
-
-    size_t getPreferredStepSize() const;
-    size_t getPreferredBlockSize() const;
-
-    size_t getMinChannelCount() const;
-    size_t getMaxChannelCount() const;
-
-    OutputList getOutputDescriptors() const;
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-
-    FeatureSet getRemainingFeatures();
-
-protected:
-    void convertFeatures(VampFeatureList *, FeatureSet &);
-
-    const VampPluginDescriptor *m_descriptor;
-    VampPluginHandle m_handle;
-};
-
-}
-
-#endif
-
-
diff --git a/lib-src/libvamp/vamp-sdk/RealTime.cpp b/lib-src/libvamp/vamp-sdk/RealTime.cpp
deleted file mode 100644
index 996cb6c..0000000
--- a/lib-src/libvamp/vamp-sdk/RealTime.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006 Chris Cannam.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-/*
-   This is a modified version of a source file from the 
-   Rosegarden MIDI and audio sequencer and notation editor.
-   This file copyright 2000-2006 Chris Cannam.
-   Relicensed by the author as detailed above.
-*/
-
-#include <iostream>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
-using std::cerr;
-using std::endl;
-
-#include "RealTime.h"
-
-#ifndef _WIN32
-#include <sys/time.h>
-#endif
-
-namespace Vamp {
-
-// A RealTime consists of two ints that must be at least 32 bits each.
-// A signed 32-bit int can store values exceeding +/- 2 billion.  This
-// means we can safely use our lower int for nanoseconds, as there are
-// 1 billion nanoseconds in a second and we need to handle double that
-// because of the implementations of addition etc that we use.
-//
-// The maximum valid RealTime on a 32-bit system is somewhere around
-// 68 years: 999999999 nanoseconds longer than the classic Unix epoch.
-
-#define ONE_BILLION 1000000000
-
-RealTime::RealTime(int s, int n) :
-    sec(s), nsec(n)
-{
-    if (sec == 0) {
-	while (nsec <= -ONE_BILLION) { nsec += ONE_BILLION; --sec; }
-	while (nsec >=  ONE_BILLION) { nsec -= ONE_BILLION; ++sec; }
-    } else if (sec < 0) {
-	while (nsec <= -ONE_BILLION) { nsec += ONE_BILLION; --sec; }
-	while (nsec > 0)             { nsec -= ONE_BILLION; ++sec; }
-    } else { 
-	while (nsec >=  ONE_BILLION) { nsec -= ONE_BILLION; ++sec; }
-	while (nsec < 0)             { nsec += ONE_BILLION; --sec; }
-    }
-}
-
-RealTime
-RealTime::fromSeconds(double sec)
-{
-    return RealTime(int(sec), int((sec - int(sec)) * ONE_BILLION + 0.5));
-}
-
-RealTime
-RealTime::fromMilliseconds(int msec)
-{
-    return RealTime(msec / 1000, (msec % 1000) * 1000000);
-}
-
-#ifndef _WIN32
-RealTime
-RealTime::fromTimeval(const struct timeval &tv)
-{
-    return RealTime(tv.tv_sec, tv.tv_usec * 1000);
-}
-#endif
-
-std::ostream &operator<<(std::ostream &out, const RealTime &rt)
-{
-    if (rt < RealTime::zeroTime) {
-	out << "-";
-    } else {
-	out << " ";
-    }
-
-    int s = (rt.sec < 0 ? -rt.sec : rt.sec);
-    int n = (rt.nsec < 0 ? -rt.nsec : rt.nsec);
-
-    out << s << ".";
-
-    int nn(n);
-    if (nn == 0) out << "00000000";
-    else while (nn < (ONE_BILLION / 10)) {
-	out << "0";
-	nn *= 10;
-    }
-    
-    out << n << "R";
-    return out;
-}
-
-std::string
-RealTime::toString() const
-{
-    std::stringstream out;
-    out << *this;
-    
-#if (__GNUC__ < 3)
-    out << std::ends;
-#endif
-
-    std::string s = out.str();
-
-    // remove trailing R
-    return s.substr(0, s.length() - 1);
-}
-
-std::string
-RealTime::toText(bool fixedDp) const
-{
-    if (*this < RealTime::zeroTime) return "-" + (-*this).toText();
-
-    std::stringstream out;
-
-    if (sec >= 3600) {
-	out << (sec / 3600) << ":";
-    }
-
-    if (sec >= 60) {
-	out << (sec % 3600) / 60 << ":";
-    }
-
-    if (sec >= 10) {
-	out << ((sec % 60) / 10);
-    }
-
-    out << (sec % 10);
-    
-    int ms = msec();
-
-    if (ms != 0) {
-	out << ".";
-	out << (ms / 100);
-	ms = ms % 100;
-	if (ms != 0) {
-	    out << (ms / 10);
-	    ms = ms % 10;
-	} else if (fixedDp) {
-	    out << "0";
-	}
-	if (ms != 0) {
-	    out << ms;
-	} else if (fixedDp) {
-	    out << "0";
-	}
-    } else if (fixedDp) {
-	out << ".000";
-    }
-	
-#if (__GNUC__ < 3)
-    out << std::ends;
-#endif
-
-    std::string s = out.str();
-
-    return s;
-}
-
-
-RealTime
-RealTime::operator/(int d) const
-{
-    int secdiv = sec / d;
-    int secrem = sec % d;
-
-    double nsecdiv = (double(nsec) + ONE_BILLION * double(secrem)) / d;
-    
-    return RealTime(secdiv, int(nsecdiv + 0.5));
-}
-
-double 
-RealTime::operator/(const RealTime &r) const
-{
-    double lTotal = double(sec) * ONE_BILLION + double(nsec);
-    double rTotal = double(r.sec) * ONE_BILLION + double(r.nsec);
-    
-    if (rTotal == 0) return 0.0;
-    else return lTotal/rTotal;
-}
-
-long
-RealTime::realTime2Frame(const RealTime &time, unsigned int sampleRate)
-{
-    if (time < zeroTime) return -realTime2Frame(-time, sampleRate);
-    double s = time.sec + double(time.nsec + 1) / 1000000000.0;
-    return long(s * sampleRate);
-}
-
-RealTime
-RealTime::frame2RealTime(long frame, unsigned int sampleRate)
-{
-    if (frame < 0) return -frame2RealTime(-frame, sampleRate);
-
-    RealTime rt;
-    rt.sec = frame / long(sampleRate);
-    frame -= rt.sec * long(sampleRate);
-    rt.nsec = (int)(((double(frame) * 1000000.0) / sampleRate) * 1000.0);
-    return rt;
-}
-
-const RealTime RealTime::zeroTime(0,0);
-
-}
diff --git a/lib-src/libvamp/vamp-sdk/RealTime.h b/lib-src/libvamp/vamp-sdk/RealTime.h
index 6b88ed5..297c4ad 100644
--- a/lib-src/libvamp/vamp-sdk/RealTime.h
+++ b/lib-src/libvamp/vamp-sdk/RealTime.h
@@ -51,6 +51,9 @@
 struct timeval;
 #endif
 
+#include "plugguard.h"
+_VAMP_SDK_PLUGSPACE_BEGIN(RealTime.h)
+
 namespace Vamp {
 
 /**
@@ -158,5 +161,7 @@ struct RealTime
 std::ostream &operator<<(std::ostream &out, const RealTime &rt);
 
 }
+
+_VAMP_SDK_PLUGSPACE_END(RealTime.h)
     
 #endif
diff --git a/lib-src/libvamp/vamp-sdk/doc-overview b/lib-src/libvamp/vamp-sdk/doc-overview
deleted file mode 100644
index 9cc08d3..0000000
--- a/lib-src/libvamp/vamp-sdk/doc-overview
+++ /dev/null
@@ -1,128 +0,0 @@
-
-/** \mainpage Vamp Plugin SDK
-
-\section about About Vamp
-
-Vamp is an API for C and C++ plugins that process sampled audio data
-to produce descriptive output (measurements or semantic observations).
-Find more information at http://www.vamp-plugins.org/ .
-
-Although the official API for Vamp plugins is defined in C for maximum
-binary compatibility, we strongly recommend using the provided C++
-classes in the SDK to implement your own plugins and hosts.
-
-\section plugins For Plugins
-
-Plugins should subclass Vamp::Plugin, and then use a
-Vamp::PluginAdapter to expose the correct C API for the plugin.  Read
-the documentation for Vamp::PluginBase and Vamp::Plugin before
-starting.
-
-Plugins should be compiled and linked into dynamic libraries using the
-usual convention for your platform, and should link (preferably
-statically) with -lvamp-sdk.  Any number of plugins can reside in a
-single dynamic library.  See plugins.cpp in the example plugins
-directory for the sort of code that will need to accompany your plugin
-class or classes, to make it possible for a host to look up your
-plugins properly.
-
-The following example plugins are provided:
-
- - ZeroCrossing calculates the positions and density of zero-crossing
- points in an audio waveform.
-
- - SpectralCentroid calculates the centre of gravity of the frequency
- domain representation of each block of audio.
-
- - AmplitudeFollower is an implementation of SuperCollider's
- amplitude-follower algorithm as a simple Vamp plugin.
-
- - PercussionOnsetDetector estimates the locations of percussive
- onsets using a simple method described in "Drum Source Separation
- using Percussive Feature Detection and Spectral Modulation" by Dan
- Barry, Derry Fitzgerald, Eugene Coyle and Bob Lawlor, ISSC 2005.
-
-\section hosts For Hosts
-
-Hosts will normally use a Vamp::PluginHostAdapter to convert each
-plugin's exposed C API back into a useful Vamp::Plugin C++ object.
-
-Starting with version 1.1 of the Vamp SDK, there are several classes
-in the Vamp::HostExt namespace that aim to make the host's life as
-easy as possible:
-
- - Vamp::HostExt::PluginLoader provides a very simple interface for a
- host to discover, load, and find out category information about the
- available plugins.  Most "casual" Vamp hosts will probably want to
- use this class.
-
- - Vamp::HostExt::PluginInputDomainAdapter provides a simple means for
- hosts to handle plugins that expect frequency-domain input, without
- having to convert the input themselves.
-
- - Vamp::HostExt::PluginChannelAdapter provides a simple means for
- hosts to use plugins that do not necessarily support the same number
- of audio channels as they have available, without having to apply a
- channel management / mixdown policy themselves.
-
- - Vamp::HostExt::PluginBufferingAdapter (new in version 1.2) provides
- a means for hosts to avoid having to negotiate the input step and
- block size, instead permitting the host to use any block size they
- desire (and a step size equal to it).  This is particularly useful
- for "streaming" hosts that cannot seek backwards in the input audio
- stream and so would otherwise need to implement an additional buffer
- to support step sizes smaller than the block size.
-
-The PluginLoader class can also use the input domain and channel
-adapters automatically to make the entire conversion process
-transparent to the host if required.
-
-Hosts should link with -lvamp-hostsdk.
-
-(The following notes in this section are mostly relevant for
-developers that are not using the HostExt classes, or that wish to
-know more about the policy they implement.)
-
-The Vamp API does not officially specify how to load plugin libraries
-or where to find them.  However, the SDK does include a function
-(Vamp::PluginHostAdapter::getPluginPath()) that returns a recommended
-directory search path that hosts may use for plugin libraries.
-
-Our suggestion for a host is to search each directory in this path for
-.DLL (on Windows), .so (on Linux, Solaris, BSD etc) or .dylib (on
-OS/X) files, then to load each one and perform a dynamic name lookup
-on the vampGetPluginDescriptor function to enumerate the plugins in
-the library.  The example host has some code that may help, but this
-operation will necessarily be system-dependent.
-
-Vamp also has an informal convention for sorting plugins into
-functional categories.  In addition to the library file itself, a
-plugin library may install a category file with the same name as the
-library but .cat extension.  The existence and format of this file are
-not specified by the Vamp API, but by convention the file may contain
-lines of the format
-
-\code
-vamp:pluginlibrary:pluginname::General Category > Specific Category
-\endcode
-
-which a host may read and use to assign plugins a location within a
-category tree for display to the user.  The expectation is that
-advanced users may also choose to set up their own preferred category
-trees, which is why this information is not queried as part of the
-Vamp API itself.
-
-There is an example host in the "host" directory from which code may
-be drawn.
-
-\section license License
-
-This plugin SDK is freely redistributable under a "new-style BSD"
-licence.  See the file COPYING for more details.  In short, you may
-modify and redistribute the SDK and example plugins within any
-commercial or non-commercial, proprietary or open-source plugin or
-application under almost any conditions, with no obligation to provide
-source code, provided you retain the original copyright note.
-
-
-*/
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginBufferingAdapter.cpp b/lib-src/libvamp/vamp-sdk/hostext/PluginBufferingAdapter.cpp
deleted file mode 100644
index 9a87aa0..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginBufferingAdapter.cpp
+++ /dev/null
@@ -1,554 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-    This file by Mark Levy and Chris Cannam.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include <vector>
-#include <map>
-
-#include "PluginBufferingAdapter.h"
-
-using std::vector;
-using std::map;
-
-namespace Vamp {
-	
-namespace HostExt {
-		
-class PluginBufferingAdapter::Impl
-{
-public:
-    Impl(Plugin *plugin, float inputSampleRate);
-    ~Impl();
-		
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-
-    OutputList getOutputDescriptors() const;
-
-    void reset();
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-		
-    FeatureSet getRemainingFeatures();
-		
-protected:
-    class RingBuffer
-    {
-    public:
-        RingBuffer(int n) :
-            m_buffer(new float[n+1]), m_writer(0), m_reader(0), m_size(n+1) { }
-        virtual ~RingBuffer() { delete[] m_buffer; }
-
-        int getSize() const { return m_size-1; }
-        void reset() { m_writer = 0; m_reader = 0; }
-
-        int getReadSpace() const {
-            int writer = m_writer, reader = m_reader, space;
-            if (writer > reader) space = writer - reader;
-            else if (writer < reader) space = (writer + m_size) - reader;
-            else space = 0;
-            return space;
-        }
-
-        int getWriteSpace() const {
-            int writer = m_writer;
-            int reader = m_reader;
-            int space = (reader + m_size - writer - 1);
-            if (space >= m_size) space -= m_size;
-            return space;
-        }
-        
-        int peek(float *destination, int n) const {
-
-            int available = getReadSpace();
-
-            if (n > available) {
-                for (int i = available; i < n; ++i) {
-                    destination[i] = 0.f;
-                }
-                n = available;
-            }
-            if (n == 0) return n;
-
-            int reader = m_reader;
-            int here = m_size - reader;
-            const float *const bufbase = m_buffer + reader;
-
-            if (here >= n) {
-                for (int i = 0; i < n; ++i) {
-                    destination[i] = bufbase[i];
-                }
-            } else {
-                for (int i = 0; i < here; ++i) {
-                    destination[i] = bufbase[i];
-                }
-                float *const destbase = destination + here;
-                const int nh = n - here;
-                for (int i = 0; i < nh; ++i) {
-                    destbase[i] = m_buffer[i];
-                }
-            }
-
-            return n;
-        }
-
-        int skip(int n) {
-            
-            int available = getReadSpace();
-            if (n > available) {
-                n = available;
-            }
-            if (n == 0) return n;
-
-            int reader = m_reader;
-            reader += n;
-            while (reader >= m_size) reader -= m_size;
-            m_reader = reader;
-            return n;
-        }
-        
-        int write(const float *source, int n) {
-
-            int available = getWriteSpace();
-            if (n > available) {
-                n = available;
-            }
-            if (n == 0) return n;
-
-            int writer = m_writer;
-            int here = m_size - writer;
-            float *const bufbase = m_buffer + writer;
-            
-            if (here >= n) {
-                for (int i = 0; i < n; ++i) {
-                    bufbase[i] = source[i];
-                }
-            } else {
-                for (int i = 0; i < here; ++i) {
-                    bufbase[i] = source[i];
-                }
-                const int nh = n - here;
-                const float *const srcbase = source + here;
-                float *const buf = m_buffer;
-                for (int i = 0; i < nh; ++i) {
-                    buf[i] = srcbase[i];
-                }
-            }
-
-            writer += n;
-            while (writer >= m_size) writer -= m_size;
-            m_writer = writer;
-
-            return n;
-        }
-
-        int zero(int n) {
-            
-            int available = getWriteSpace();
-            if (n > available) {
-                n = available;
-            }
-            if (n == 0) return n;
-
-            int writer = m_writer;
-            int here = m_size - writer;
-            float *const bufbase = m_buffer + writer;
-
-            if (here >= n) {
-                for (int i = 0; i < n; ++i) {
-                    bufbase[i] = 0.f;
-                }
-            } else {
-                for (int i = 0; i < here; ++i) {
-                    bufbase[i] = 0.f;
-                }
-                const int nh = n - here;
-                for (int i = 0; i < nh; ++i) {
-                    m_buffer[i] = 0.f;
-                }
-            }
-            
-            writer += n;
-            while (writer >= m_size) writer -= m_size;
-            m_writer = writer;
-
-            return n;
-        }
-
-    protected:
-        float *m_buffer;
-        int    m_writer;
-        int    m_reader;
-        int    m_size;
-
-    private:
-        RingBuffer(const RingBuffer &); // not provided
-        RingBuffer &operator=(const RingBuffer &); // not provided
-    };
-
-    Plugin *m_plugin;
-    size_t m_inputStepSize;
-    size_t m_inputBlockSize;
-    size_t m_stepSize;
-    size_t m_blockSize;
-    size_t m_channels;
-    vector<RingBuffer *> m_queue;
-    float **m_buffers;
-    float m_inputSampleRate;
-    long m_frame;
-    bool m_unrun;
-    mutable OutputList m_outputs;
-    mutable std::map<int, bool> m_rewriteOutputTimes;
-		
-    void processBlock(FeatureSet& allFeatureSets);
-};
-		
-PluginBufferingAdapter::PluginBufferingAdapter(Plugin *plugin) :
-    PluginWrapper(plugin)
-{
-    m_impl = new Impl(plugin, m_inputSampleRate);
-}
-		
-PluginBufferingAdapter::~PluginBufferingAdapter()
-{
-    delete m_impl;
-}
-		
-bool
-PluginBufferingAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    return m_impl->initialise(channels, stepSize, blockSize);
-}
-
-PluginBufferingAdapter::OutputList
-PluginBufferingAdapter::getOutputDescriptors() const
-{
-    return m_impl->getOutputDescriptors();
-}
-
-void
-PluginBufferingAdapter::reset()
-{
-    m_impl->reset();
-}
-		
-PluginBufferingAdapter::FeatureSet
-PluginBufferingAdapter::process(const float *const *inputBuffers,
-                                RealTime timestamp)
-{
-    return m_impl->process(inputBuffers, timestamp);
-}
-		
-PluginBufferingAdapter::FeatureSet
-PluginBufferingAdapter::getRemainingFeatures()
-{
-    return m_impl->getRemainingFeatures();
-}
-		
-PluginBufferingAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
-    m_plugin(plugin),
-    m_inputStepSize(0),
-    m_inputBlockSize(0),
-    m_stepSize(0),
-    m_blockSize(0),
-    m_channels(0), 
-    m_queue(0),
-    m_buffers(0),
-    m_inputSampleRate(inputSampleRate),
-    m_frame(0),
-    m_unrun(true)
-{
-    (void)getOutputDescriptors(); // set up m_outputs and m_rewriteOutputTimes
-}
-		
-PluginBufferingAdapter::Impl::~Impl()
-{
-    // the adapter will delete the plugin
-
-    for (size_t i = 0; i < m_channels; ++i) {
-        delete m_queue[i];
-        delete[] m_buffers[i];
-    }
-    delete[] m_buffers;
-}
-
-size_t
-PluginBufferingAdapter::getPreferredStepSize() const
-{
-    return getPreferredBlockSize();
-}
-		
-bool
-PluginBufferingAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    if (stepSize != blockSize) {
-        std::cerr << "PluginBufferingAdapter::initialise: input stepSize must be equal to blockSize for this adapter (stepSize = " << stepSize << ", blockSize = " << blockSize << ")" << std::endl;
-        return false;
-    }
-
-    m_channels = channels;	
-    m_inputStepSize = stepSize;
-    m_inputBlockSize = blockSize;
-    
-    // use the step and block sizes which the plugin prefers
-    m_stepSize = m_plugin->getPreferredStepSize();
-    m_blockSize = m_plugin->getPreferredBlockSize();
-    
-    // or sensible defaults if it has no preference
-    if (m_blockSize == 0) {
-        m_blockSize = 1024;
-    }
-    if (m_stepSize == 0) {
-        if (m_plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain) {
-            m_stepSize = m_blockSize/2;
-        } else {
-            m_stepSize = m_blockSize;
-        }
-    } else if (m_stepSize > m_blockSize) {
-        if (m_plugin->getInputDomain() == Vamp::Plugin::FrequencyDomain) {
-            m_blockSize = m_stepSize * 2;
-        } else {
-            m_blockSize = m_stepSize;
-        }
-    }
-    
-    std::cerr << "PluginBufferingAdapter::initialise: stepSize " << m_inputStepSize << " -> " << m_stepSize 
-              << ", blockSize " << m_inputBlockSize << " -> " << m_blockSize << std::endl;			
-    
-    // current implementation breaks if step is greater than block
-    if (m_stepSize > m_blockSize) {
-        std::cerr << "PluginBufferingAdapter::initialise: plugin's preferred stepSize greater than blockSize, giving up!" << std::endl;
-        return false;
-    }
-
-    m_buffers = new float *[m_channels];
-
-    for (size_t i = 0; i < m_channels; ++i) {
-        m_queue.push_back(new RingBuffer(m_blockSize + m_inputBlockSize));
-        m_buffers[i] = new float[m_blockSize];
-    }
-    
-    return m_plugin->initialise(m_channels, m_stepSize, m_blockSize);
-}
-		
-PluginBufferingAdapter::OutputList
-PluginBufferingAdapter::Impl::getOutputDescriptors() const
-{
-    if (m_outputs.empty()) {
-        m_outputs = m_plugin->getOutputDescriptors();
-    }
-
-    PluginBufferingAdapter::OutputList outs = m_outputs;
-
-    for (size_t i = 0; i < outs.size(); ++i) {
-
-        switch (outs[i].sampleType) {
-
-        case OutputDescriptor::OneSamplePerStep:
-            outs[i].sampleType = OutputDescriptor::FixedSampleRate;
-            outs[i].sampleRate = (1.f / m_inputSampleRate) * m_stepSize;
-            m_rewriteOutputTimes[i] = true;
-            break;
-            
-        case OutputDescriptor::FixedSampleRate:
-            if (outs[i].sampleRate == 0.f) {
-                outs[i].sampleRate = (1.f / m_inputSampleRate) * m_stepSize;
-            }
-            // We actually only need to rewrite output times for
-            // features that don't have timestamps already, but we
-            // can't tell from here whether our features will have
-            // timestamps or not
-            m_rewriteOutputTimes[i] = true;
-            break;
-
-        case OutputDescriptor::VariableSampleRate:
-            m_rewriteOutputTimes[i] = false;
-            break;
-        }
-    }
-
-    return outs;
-}
-
-void
-PluginBufferingAdapter::Impl::reset()
-{
-    m_frame = 0;
-    m_unrun = true;
-
-    for (size_t i = 0; i < m_queue.size(); ++i) {
-        m_queue[i]->reset();
-    }
-}
-
-PluginBufferingAdapter::FeatureSet
-PluginBufferingAdapter::Impl::process(const float *const *inputBuffers,
-                                      RealTime timestamp)
-{
-    FeatureSet allFeatureSets;
-
-    if (m_unrun) {
-        m_frame = RealTime::realTime2Frame(timestamp,
-                                           int(m_inputSampleRate + 0.5));
-        m_unrun = false;
-    }
-			
-    // queue the new input
-    
-    for (size_t i = 0; i < m_channels; ++i) {
-        int written = m_queue[i]->write(inputBuffers[i], m_inputBlockSize);
-        if (written < int(m_inputBlockSize) && i == 0) {
-            std::cerr << "WARNING: PluginBufferingAdapter::Impl::process: "
-                      << "Buffer overflow: wrote " << written 
-                      << " of " << m_inputBlockSize 
-                      << " input samples (for plugin step size "
-                      << m_stepSize << ", block size " << m_blockSize << ")"
-                      << std::endl;
-        }
-    }    
-    
-    // process as much as we can
-
-    while (m_queue[0]->getReadSpace() >= int(m_blockSize)) {
-        processBlock(allFeatureSets);
-    }	
-    
-    return allFeatureSets;
-}
-    
-PluginBufferingAdapter::FeatureSet
-PluginBufferingAdapter::Impl::getRemainingFeatures() 
-{
-    FeatureSet allFeatureSets;
-    
-    // process remaining samples in queue
-    while (m_queue[0]->getReadSpace() >= int(m_blockSize)) {
-        processBlock(allFeatureSets);
-    }
-    
-    // pad any last samples remaining and process
-    if (m_queue[0]->getReadSpace() > 0) {
-        for (size_t i = 0; i < m_channels; ++i) {
-            m_queue[i]->zero(m_blockSize - m_queue[i]->getReadSpace());
-        }
-        processBlock(allFeatureSets);
-    }			
-    
-    // get remaining features			
-
-    FeatureSet featureSet = m_plugin->getRemainingFeatures();
-
-    for (map<int, FeatureList>::iterator iter = featureSet.begin();
-         iter != featureSet.end(); ++iter) {
-        FeatureList featureList = iter->second;
-        for (size_t i = 0; i < featureList.size(); ++i) {
-            allFeatureSets[iter->first].push_back(featureList[i]);
-        }
-    }
-    
-    return allFeatureSets;
-}
-    
-void
-PluginBufferingAdapter::Impl::processBlock(FeatureSet& allFeatureSets)
-{
-    for (size_t i = 0; i < m_channels; ++i) {
-        m_queue[i]->peek(m_buffers[i], m_blockSize);
-    }
-
-    long frame = m_frame;
-    RealTime timestamp = RealTime::frame2RealTime
-        (frame, int(m_inputSampleRate + 0.5));
-
-    FeatureSet featureSet = m_plugin->process(m_buffers, timestamp);
-    
-    for (FeatureSet::iterator iter = featureSet.begin();
-         iter != featureSet.end(); ++iter) {
-
-        int outputNo = iter->first;
-
-        if (m_rewriteOutputTimes[outputNo]) {
-            
-            FeatureList featureList = iter->second;
-	
-            for (size_t i = 0; i < featureList.size(); ++i) {
-
-                switch (m_outputs[outputNo].sampleType) {
-
-                case OutputDescriptor::OneSamplePerStep:
-                    // use our internal timestamp, always
-                    featureList[i].timestamp = timestamp;
-                    featureList[i].hasTimestamp = true;
-                    break;
-
-                case OutputDescriptor::FixedSampleRate:
-                    // use our internal timestamp if feature lacks one
-                    if (!featureList[i].hasTimestamp) {
-                        featureList[i].timestamp = timestamp;
-                        featureList[i].hasTimestamp = true;
-                    }
-                    break;
-
-                case OutputDescriptor::VariableSampleRate:
-                    break;		// plugin must set timestamp
-
-                default:
-                    break;
-                }
-            
-                allFeatureSets[outputNo].push_back(featureList[i]);
-            }
-        } else {
-            for (size_t i = 0; i < iter->second.size(); ++i) {
-                allFeatureSets[outputNo].push_back(iter->second[i]);
-            }
-        }
-    }
-    
-    // step forward
-
-    for (size_t i = 0; i < m_channels; ++i) {
-        m_queue[i]->skip(m_stepSize);
-    }
-    
-    // increment internal frame counter each time we step forward
-    m_frame += m_stepSize;
-}
-
-}
-	
-}
-
-
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginBufferingAdapter.h b/lib-src/libvamp/vamp-sdk/hostext/PluginBufferingAdapter.h
deleted file mode 100644
index d5fa676..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginBufferingAdapter.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-    This file by Mark Levy, Copyright 2007 QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#ifndef _VAMP_PLUGIN_BUFFERING_ADAPTER_H_
-#define _VAMP_PLUGIN_BUFFERING_ADAPTER_H_
-
-#include "PluginWrapper.h"
-
-namespace Vamp {
-	
-namespace HostExt {
-		
-/**
- * \class PluginBufferingAdapter PluginBufferingAdapter.h <vamp-sdk/hostext/PluginBufferingAdapter.h>
- *
- * PluginBufferingAdapter is a Vamp plugin adapter that allows plugins
- * to be used by a host supplying an audio stream in non-overlapping
- * buffers of arbitrary size.
- *
- * A host using PluginBufferingAdapter may ignore the preferred step
- * and block size reported by the plugin, and still expect the plugin
- * to run.  The value of blockSize and stepSize passed to initialise
- * should be the size of the buffer which the host will supply; the
- * stepSize should be equal to the blockSize.
- *
- * If the internal step size used for the plugin differs from that
- * supplied by the host, the adapter will modify the sample type and
- * rate specifications for the plugin outputs appropriately, and set
- * timestamps on the output features for outputs that formerly used a
- * different sample rate specification.  This is necessary in order to
- * obtain correct time stamping.
- * 
- * In other respects, the PluginBufferingAdapter behaves identically
- * to the plugin that it wraps. The wrapped plugin will be deleted
- * when the wrapper is deleted.
- */
-		
-class PluginBufferingAdapter : public PluginWrapper
-{
-public:
-    PluginBufferingAdapter(Plugin *plugin); // I take ownership of plugin
-    virtual ~PluginBufferingAdapter();
-    
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-
-    size_t getPreferredStepSize() const;
-    
-    OutputList getOutputDescriptors() const;
-
-    void reset();
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-    
-    FeatureSet getRemainingFeatures();
-    
-protected:
-    class Impl;
-    Impl *m_impl;
-};
-    
-}
-
-}
-
-#endif
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.cpp b/lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.cpp
deleted file mode 100644
index 3ce51ce..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "PluginChannelAdapter.h"
-
-namespace Vamp {
-
-namespace HostExt {
-
-class PluginChannelAdapter::Impl
-{
-public:
-    Impl(Plugin *plugin);
-    ~Impl();
-
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-
-protected:
-    Plugin *m_plugin;
-    size_t m_blockSize;
-    size_t m_inputChannels;
-    size_t m_pluginChannels;
-    float **m_buffer;
-    const float **m_forwardPtrs;
-};
-
-PluginChannelAdapter::PluginChannelAdapter(Plugin *plugin) :
-    PluginWrapper(plugin)
-{
-    m_impl = new Impl(plugin);
-}
-
-PluginChannelAdapter::~PluginChannelAdapter()
-{
-    delete m_impl;
-}
-
-bool
-PluginChannelAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    return m_impl->initialise(channels, stepSize, blockSize);
-}
-
-PluginChannelAdapter::FeatureSet
-PluginChannelAdapter::process(const float *const *inputBuffers,
-                              RealTime timestamp)
-{
-    return m_impl->process(inputBuffers, timestamp);
-}
-
-PluginChannelAdapter::Impl::Impl(Plugin *plugin) :
-    m_plugin(plugin),
-    m_blockSize(0),
-    m_inputChannels(0),
-    m_pluginChannels(0),
-    m_buffer(0),
-    m_forwardPtrs(0)
-{
-}
-
-PluginChannelAdapter::Impl::~Impl()
-{
-    // the adapter will delete the plugin
-
-    if (m_buffer) {
-        if (m_inputChannels > m_pluginChannels) {
-            delete[] m_buffer[0];
-        } else {
-            for (size_t i = 0; i < m_pluginChannels - m_inputChannels; ++i) {
-                delete[] m_buffer[i];
-            }
-        }
-        delete[] m_buffer;
-        m_buffer = 0;
-    }
-
-    if (m_forwardPtrs) {
-        delete[] m_forwardPtrs;
-        m_forwardPtrs = 0;
-    }
-}
-
-bool
-PluginChannelAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    m_blockSize = blockSize;
-
-    size_t minch = m_plugin->getMinChannelCount();
-    size_t maxch = m_plugin->getMaxChannelCount();
-
-    m_inputChannels = channels;
-
-    if (m_inputChannels < minch) {
-
-        m_forwardPtrs = new const float *[minch];
-
-        if (m_inputChannels > 1) {
-            // We need a set of zero-valued buffers to add to the
-            // forwarded pointers
-            m_buffer = new float*[minch - channels];
-            for (size_t i = 0; i < minch; ++i) {
-                m_buffer[i] = new float[blockSize];
-                for (size_t j = 0; j < blockSize; ++j) {
-                    m_buffer[i][j] = 0.f;
-                }
-            }
-        }
-
-        m_pluginChannels = minch;
-
-        std::cerr << "PluginChannelAdapter::initialise: expanding " << m_inputChannels << " to " << m_pluginChannels << " for plugin" << std::endl;
-
-    } else if (m_inputChannels > maxch) {
-
-        // We only need m_buffer if we are mixing down to a single
-        // channel -- otherwise we can just forward the same float* as
-        // passed in to process(), expecting the excess to be ignored
-
-        if (maxch == 1) {
-            m_buffer = new float *[1];
-            m_buffer[0] = new float[blockSize];
-
-            std::cerr << "PluginChannelAdapter::initialise: mixing " << m_inputChannels << " to mono for plugin" << std::endl;
-
-        } else {
-            
-            std::cerr << "PluginChannelAdapter::initialise: reducing " << m_inputChannels << " to " << m_pluginChannels << " for plugin" << std::endl;
-        }
-
-        m_pluginChannels = maxch;
-
-    } else {
- 
-        std::cerr << "PluginChannelAdapter::initialise: accepting given number of channels (" << m_inputChannels << ")" << std::endl;
-        m_pluginChannels = m_inputChannels;
-    }
-
-    return m_plugin->initialise(m_pluginChannels, stepSize, blockSize);
-}
-
-PluginChannelAdapter::FeatureSet
-PluginChannelAdapter::Impl::process(const float *const *inputBuffers,
-                                    RealTime timestamp)
-{
-//    std::cerr << "PluginChannelAdapter::process: " << m_inputChannels << " -> " << m_pluginChannels << " channels" << std::endl;
-
-    if (m_inputChannels < m_pluginChannels) {
-
-        if (m_inputChannels == 1) {
-            for (size_t i = 0; i < m_pluginChannels; ++i) {
-                m_forwardPtrs[i] = inputBuffers[0];
-            }
-        } else {
-            for (size_t i = 0; i < m_inputChannels; ++i) {
-                m_forwardPtrs[i] = inputBuffers[i];
-            }
-            for (size_t i = m_inputChannels; i < m_pluginChannels; ++i) {
-                m_forwardPtrs[i] = m_buffer[i - m_inputChannels];
-            }
-        }
-
-        return m_plugin->process(m_forwardPtrs, timestamp);
-
-    } else if (m_inputChannels > m_pluginChannels) {
-
-        if (m_pluginChannels == 1) {
-            for (size_t j = 0; j < m_blockSize; ++j) {
-                m_buffer[0][j] = inputBuffers[0][j];
-            }
-            for (size_t i = 1; i < m_inputChannels; ++i) {
-                for (size_t j = 0; j < m_blockSize; ++j) {
-                    m_buffer[0][j] += inputBuffers[i][j];
-                }
-            }
-            for (size_t j = 0; j < m_blockSize; ++j) {
-                m_buffer[0][j] /= m_inputChannels;
-            }
-            return m_plugin->process(m_buffer, timestamp);
-        } else {
-            return m_plugin->process(inputBuffers, timestamp);
-        }
-
-    } else {
-
-        return m_plugin->process(inputBuffers, timestamp);
-    }
-}
-
-}
-
-}
-
-
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.h b/lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.h
deleted file mode 100644
index a2b4d89..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#ifndef _VAMP_PLUGIN_CHANNEL_ADAPTER_H_
-#define _VAMP_PLUGIN_CHANNEL_ADAPTER_H_
-
-#include "PluginWrapper.h"
-
-namespace Vamp {
-
-namespace HostExt {
-
-/**
- * \class PluginChannelAdapter PluginChannelAdapter.h <vamp-sdk/hostext/PluginChannelAdapter.h>
- *
- * PluginChannelAdapter is a Vamp plugin adapter that implements a
- * policy for management of plugins that expect a different number of
- * input channels from the number actually available in the source
- * audio data.
- *
- * A host using PluginChannelAdapter may ignore the getMinChannelCount
- * and getMaxChannelCount reported by the plugin, and still expect the
- * plugin to run.
- *
- * PluginChannelAdapter implements the following policy:
- *
- *  - If the plugin supports the provided number of channels directly,
- *  PluginChannelAdapter will just run the plugin as normal.
- *
- *  - If the plugin only supports exactly one channel but more than
- *  one channel is provided, PluginChannelAdapter will use the mean of
- *  the channels.  This ensures that the resulting values remain
- *  within the same magnitude range as expected for mono data.
- *
- *  - If the plugin requires more than one channel but exactly one is
- *  provided, the provided channel will be duplicated across all the
- *  plugin input channels.
- *
- * If none of the above apply:
- * 
- *  - If the plugin requires more channels than are provided, the
- *  minimum acceptable number of channels will be produced by adding
- *  empty (zero valued) channels to those provided.
- *
- *  - If the plugin requires fewer channels than are provided, the
- *  maximum acceptable number of channels will be produced by
- *  discarding the excess channels.
- *
- * Hosts requiring a different channel policy from the above will need
- * to implement it themselves, instead of using PluginChannelAdapter.
- *
- * Note that PluginChannelAdapter does not override the minimum and
- * maximum channel counts returned by the wrapped plugin.  The host
- * will need to be aware that it is using a PluginChannelAdapter, and
- * be prepared to ignore these counts as necessary.  (This contrasts
- * with the approach used in PluginInputDomainAdapter, which aims to
- * make the host completely unaware of which underlying input domain
- * is in fact in use.)
- * 
- * (The rationale for this is that a host may wish to use the
- * PluginChannelAdapter but still discriminate in some way on the
- * basis of the number of channels actually supported.  For example, a
- * simple stereo audio host may prefer to reject plugins that require
- * more than two channels on the grounds that doesn't actually
- * understand what they are for, rather than allow the channel adapter
- * to make a potentially meaningless channel conversion for them.)
- *
- * In every respect other than its management of channels, the
- * PluginChannelAdapter behaves identically to the plugin that it
- * wraps.  The wrapped plugin will be deleted when the wrapper is
- * deleted.
- *
- * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
- */
-
-class PluginChannelAdapter : public PluginWrapper
-{
-public:
-    PluginChannelAdapter(Plugin *plugin); // I take ownership of plugin
-    virtual ~PluginChannelAdapter();
-
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-
-protected:
-    class Impl;
-    Impl *m_impl;
-};
-
-}
-
-}
-
-#endif
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.cpp b/lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.cpp
deleted file mode 100644
index 51011e4..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    This file is based in part on Don Cross's public domain FFT
-    implementation.
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "PluginInputDomainAdapter.h"
-
-#include <cmath>
-
-
-/**
- * If you want to compile using FFTW instead of the built-in FFT
- * implementation for the PluginInputDomainAdapter, define HAVE_FFTW3
- * in the Makefile.
- *
- * Be aware that FFTW is licensed under the GPL -- unlike this SDK,
- * which is provided under a more liberal BSD license in order to
- * permit use in closed source applications.  The use of FFTW would
- * mean that your code would need to be licensed under the GPL as
- * well.  Do not define this symbol unless you understand and accept
- * the implications of this.
- *
- * Parties such as Linux distribution packagers who redistribute this
- * SDK for use in other programs should _not_ define this symbol, as
- * it would change the effective licensing terms under which the SDK
- * was available to third party developers.
- *
- * The default is not to use FFTW, and to use the built-in FFT instead.
- * 
- * Note: The FFTW code uses FFTW_MEASURE, and so will perform badly on
- * its first invocation unless the host has saved and restored FFTW
- * wisdom (see the FFTW documentation).
- */
-#ifdef HAVE_FFTW3
-#include <fftw3.h>
-#endif
-
-
-namespace Vamp {
-
-namespace HostExt {
-
-class PluginInputDomainAdapter::Impl
-{
-public:
-    Impl(Plugin *plugin, float inputSampleRate);
-    ~Impl();
-    
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-
-    size_t getPreferredStepSize() const;
-    size_t getPreferredBlockSize() const;
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-
-protected:
-    Plugin *m_plugin;
-    float m_inputSampleRate;
-    int m_channels;
-    int m_blockSize;
-    float **m_freqbuf;
-
-    double *m_ri;
-    double *m_window;
-
-#ifdef HAVE_FFTW3
-    fftw_plan m_plan;
-    fftw_complex *m_cbuf;
-#else
-    double *m_ro;
-    double *m_io;
-    void fft(unsigned int n, bool inverse,
-             double *ri, double *ii, double *ro, double *io);
-#endif
-
-    size_t makeBlockSizeAcceptable(size_t) const;
-};
-
-PluginInputDomainAdapter::PluginInputDomainAdapter(Plugin *plugin) :
-    PluginWrapper(plugin)
-{
-    m_impl = new Impl(plugin, m_inputSampleRate);
-}
-
-PluginInputDomainAdapter::~PluginInputDomainAdapter()
-{
-    delete m_impl;
-}
-  
-bool
-PluginInputDomainAdapter::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    return m_impl->initialise(channels, stepSize, blockSize);
-}
-
-Plugin::InputDomain
-PluginInputDomainAdapter::getInputDomain() const
-{
-    return TimeDomain;
-}
-
-size_t
-PluginInputDomainAdapter::getPreferredStepSize() const
-{
-    return m_impl->getPreferredStepSize();
-}
-
-size_t
-PluginInputDomainAdapter::getPreferredBlockSize() const
-{
-    return m_impl->getPreferredBlockSize();
-}
-
-Plugin::FeatureSet
-PluginInputDomainAdapter::process(const float *const *inputBuffers, RealTime timestamp)
-{
-    return m_impl->process(inputBuffers, timestamp);
-}
-
-PluginInputDomainAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
-    m_plugin(plugin),
-    m_inputSampleRate(inputSampleRate),
-    m_channels(0),
-    m_blockSize(0),
-    m_freqbuf(0),
-    m_ri(0),
-    m_window(0),
-#ifdef HAVE_FFTW3
-    m_plan(0),
-    m_cbuf(0)
-#else
-    m_ro(0),
-    m_io(0)
-#endif
-{
-}
-
-PluginInputDomainAdapter::Impl::~Impl()
-{
-    // the adapter will delete the plugin
-
-    if (m_channels > 0) {
-        for (int c = 0; c < m_channels; ++c) {
-            delete[] m_freqbuf[c];
-        }
-        delete[] m_freqbuf;
-#ifdef HAVE_FFTW3
-        if (m_plan) {
-            fftw_destroy_plan(m_plan);
-            fftw_free(m_ri);
-            fftw_free(m_cbuf);
-            m_plan = 0;
-        }
-#else
-        delete[] m_ri;
-        delete[] m_ro;
-        delete[] m_io;
-#endif
-        delete[] m_window;
-    }
-}
-
-// for some visual studii apparently
-#ifndef M_PI
-#define M_PI 3.14159265358979232846
-#endif
-    
-bool
-PluginInputDomainAdapter::Impl::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    if (m_plugin->getInputDomain() == TimeDomain) {
-
-        m_blockSize = int(blockSize);
-        m_channels = int(channels);
-
-        return m_plugin->initialise(channels, stepSize, blockSize);
-    }
-
-    if (blockSize < 2) {
-        std::cerr << "ERROR: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: blocksize < 2 not supported" << std::endl;
-        return false;
-    }                
-        
-    if (blockSize & (blockSize-1)) {
-        std::cerr << "ERROR: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: non-power-of-two\nblocksize " << blockSize << " not supported" << std::endl;
-        return false;
-    }
-
-    if (m_channels > 0) {
-        for (int c = 0; c < m_channels; ++c) {
-            delete[] m_freqbuf[c];
-        }
-        delete[] m_freqbuf;
-#ifdef HAVE_FFTW3
-        if (m_plan) {
-            fftw_destroy_plan(m_plan);
-            fftw_free(m_ri);
-            fftw_free(m_cbuf);
-            m_plan = 0;
-        }
-#else
-        delete[] m_ri;
-        delete[] m_ro;
-        delete[] m_io;
-#endif
-        delete[] m_window;
-    }
-
-    m_blockSize = int(blockSize);
-    m_channels = int(channels);
-
-    m_freqbuf = new float *[m_channels];
-    for (int c = 0; c < m_channels; ++c) {
-        m_freqbuf[c] = new float[m_blockSize + 2];
-    }
-    m_window = new double[m_blockSize];
-
-    for (int i = 0; i < m_blockSize; ++i) {
-        // Hanning window
-        m_window[i] = (0.50 - 0.50 * cos((2.0 * M_PI * i) / m_blockSize));
-    }
-
-#ifdef HAVE_FFTW3
-    m_ri = (double *)fftw_malloc(blockSize * sizeof(double));
-    m_cbuf = (fftw_complex *)fftw_malloc((blockSize/2 + 1) * sizeof(fftw_complex));
-    m_plan = fftw_plan_dft_r2c_1d(blockSize, m_ri, m_cbuf, FFTW_MEASURE);
-#else
-    m_ri = new double[m_blockSize];
-    m_ro = new double[m_blockSize];
-    m_io = new double[m_blockSize];
-#endif
-
-    return m_plugin->initialise(channels, stepSize, blockSize);
-}
-
-size_t
-PluginInputDomainAdapter::Impl::getPreferredStepSize() const
-{
-    size_t step = m_plugin->getPreferredStepSize();
-
-    if (step == 0 && (m_plugin->getInputDomain() == FrequencyDomain)) {
-        step = getPreferredBlockSize() / 2;
-    }
-
-    return step;
-}
-
-size_t
-PluginInputDomainAdapter::Impl::getPreferredBlockSize() const
-{
-    size_t block = m_plugin->getPreferredBlockSize();
-
-    if (m_plugin->getInputDomain() == FrequencyDomain) {
-        if (block == 0) {
-            block = 1024;
-        } else {
-            block = makeBlockSizeAcceptable(block);
-        }
-    }
-
-    return block;
-}
-
-size_t
-PluginInputDomainAdapter::Impl::makeBlockSizeAcceptable(size_t blockSize) const
-{
-    if (blockSize < 2) {
-
-        std::cerr << "WARNING: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: blocksize < 2 not" << std::endl
-                  << "supported, increasing from " << blockSize << " to 2" << std::endl;
-        blockSize = 2;
-        
-    } else if (blockSize & (blockSize-1)) {
-            
-#ifdef HAVE_FFTW3
-        // not an issue with FFTW
-#else
-
-        // not a power of two, can't handle that with our built-in FFT
-        // implementation
-
-        size_t nearest = blockSize;
-        size_t power = 0;
-        while (nearest > 1) {
-            nearest >>= 1;
-            ++power;
-        }
-        nearest = 1;
-        while (power) {
-            nearest <<= 1;
-            --power;
-        }
-        
-        if (blockSize - nearest > (nearest*2) - blockSize) {
-            nearest = nearest*2;
-        }
-        
-        std::cerr << "WARNING: Vamp::HostExt::PluginInputDomainAdapter::Impl::initialise: non-power-of-two\nblocksize " << blockSize << " not supported, using blocksize " << nearest << " instead" << std::endl;
-        blockSize = nearest;
-
-#endif
-    }
-
-    return blockSize;
-}
-
-Plugin::FeatureSet
-PluginInputDomainAdapter::Impl::process(const float *const *inputBuffers,
-                                        RealTime timestamp)
-{
-    if (m_plugin->getInputDomain() == TimeDomain) {
-        return m_plugin->process(inputBuffers, timestamp);
-    }
-
-    // The timestamp supplied should be (according to the Vamp::Plugin
-    // spec) the time of the start of the time-domain input block.
-    // However, we want to pass to the plugin an FFT output calculated
-    // from the block of samples _centred_ on that timestamp.
-    // 
-    // We have two options:
-    // 
-    // 1. Buffer the input, calculating the fft of the values at the
-    // passed-in block minus blockSize/2 rather than starting at the
-    // passed-in block.  So each time we call process on the plugin,
-    // we are passing in the same timestamp as was passed to our own
-    // process plugin, but not (the frequency domain representation
-    // of) the same set of samples.  Advantages: avoids confusion in
-    // the host by ensuring the returned values have timestamps
-    // comparable with that passed in to this function (in fact this
-    // is pretty much essential for one-value-per-block outputs);
-    // consistent with hosts such as SV that deal with the
-    // frequency-domain transform themselves.  Disadvantages: means
-    // making the not necessarily correct assumption that the samples
-    // preceding the first official block are all zero (or some other
-    // known value).
-    //
-    // 2. Increase the passed-in timestamps by half the blocksize.  So
-    // when we call process, we are passing in the frequency domain
-    // representation of the same set of samples as passed to us, but
-    // with a different timestamp.  Advantages: simplicity; avoids
-    // iffy assumption mentioned above.  Disadvantages: inconsistency
-    // with SV in cases where stepSize != blockSize/2; potential
-    // confusion arising from returned timestamps being calculated
-    // from the adjusted input timestamps rather than the original
-    // ones (and inaccuracy where the returned timestamp is implied,
-    // as in one-value-per-block).
-    //
-    // Neither way is ideal, but I don't think either is strictly
-    // incorrect either.  I think this is just a case where the same
-    // plugin can legitimately produce differing results from the same
-    // input data, depending on how that data is packaged.
-    // 
-    // We'll go for option 2, adjusting the timestamps.  Note in
-    // particular that this means some results can differ from those
-    // produced by SV.
-
-//    std::cerr << "PluginInputDomainAdapter: sampleRate " << m_inputSampleRate << ", blocksize " << m_blockSize << ", adjusting time from " << timestamp;
-
-    timestamp = timestamp + RealTime::frame2RealTime
-        (m_blockSize/2, int(m_inputSampleRate + 0.5));
-
-//    std::cerr << " to " << timestamp << std::endl;
-
-    for (int c = 0; c < m_channels; ++c) {
-
-        for (int i = 0; i < m_blockSize; ++i) {
-            m_ri[i] = double(inputBuffers[c][i]) * m_window[i];
-        }
-
-        for (int i = 0; i < m_blockSize/2; ++i) {
-            // FFT shift
-            double value = m_ri[i];
-            m_ri[i] = m_ri[i + m_blockSize/2];
-            m_ri[i + m_blockSize/2] = value;
-        }
-
-#ifdef HAVE_FFTW3
-
-        fftw_execute(m_plan);
-
-        for (int i = 0; i <= m_blockSize/2; ++i) {
-            m_freqbuf[c][i * 2] = float(m_cbuf[i][0]);
-            m_freqbuf[c][i * 2 + 1] = float(m_cbuf[i][1]);
-        }
-
-#else
-
-        fft(m_blockSize, false, m_ri, 0, m_ro, m_io);
-
-        for (int i = 0; i <= m_blockSize/2; ++i) {
-            m_freqbuf[c][i * 2] = float(m_ro[i]);
-            m_freqbuf[c][i * 2 + 1] = float(m_io[i]);
-        }
-
-#endif
-    }
-
-    return m_plugin->process(m_freqbuf, timestamp);
-}
-
-#ifndef HAVE_FFTW3
-
-void
-PluginInputDomainAdapter::Impl::fft(unsigned int n, bool inverse,
-                                    double *ri, double *ii, double *ro, double *io)
-{
-    if (!ri || !ro || !io) return;
-
-    unsigned int bits;
-    unsigned int i, j, k, m;
-    unsigned int blockSize, blockEnd;
-
-    double tr, ti;
-
-    if (n < 2) return;
-    if (n & (n-1)) return;
-
-    double angle = 2.0 * M_PI;
-    if (inverse) angle = -angle;
-
-    for (i = 0; ; ++i) {
-	if (n & (1 << i)) {
-	    bits = i;
-	    break;
-	}
-    }
-
-    static unsigned int tableSize = 0;
-    static int *table = 0;
-
-    if (tableSize != n) {
-
-	delete[] table;
-
-	table = new int[n];
-
-	for (i = 0; i < n; ++i) {
-	
-	    m = i;
-
-	    for (j = k = 0; j < bits; ++j) {
-		k = (k << 1) | (m & 1);
-		m >>= 1;
-	    }
-
-	    table[i] = k;
-	}
-
-	tableSize = n;
-    }
-
-    if (ii) {
-	for (i = 0; i < n; ++i) {
-	    ro[table[i]] = ri[i];
-	    io[table[i]] = ii[i];
-	}
-    } else {
-	for (i = 0; i < n; ++i) {
-	    ro[table[i]] = ri[i];
-	    io[table[i]] = 0.0;
-	}
-    }
-
-    blockEnd = 1;
-
-    for (blockSize = 2; blockSize <= n; blockSize <<= 1) {
-
-	double delta = angle / (double)blockSize;
-	double sm2 = -sin(-2 * delta);
-	double sm1 = -sin(-delta);
-	double cm2 = cos(-2 * delta);
-	double cm1 = cos(-delta);
-	double w = 2 * cm1;
-	double ar[3], ai[3];
-
-	for (i = 0; i < n; i += blockSize) {
-
-	    ar[2] = cm2;
-	    ar[1] = cm1;
-
-	    ai[2] = sm2;
-	    ai[1] = sm1;
-
-	    for (j = i, m = 0; m < blockEnd; j++, m++) {
-
-		ar[0] = w * ar[1] - ar[2];
-		ar[2] = ar[1];
-		ar[1] = ar[0];
-
-		ai[0] = w * ai[1] - ai[2];
-		ai[2] = ai[1];
-		ai[1] = ai[0];
-
-		k = j + blockEnd;
-		tr = ar[0] * ro[k] - ai[0] * io[k];
-		ti = ar[0] * io[k] + ai[0] * ro[k];
-
-		ro[k] = ro[j] - tr;
-		io[k] = io[j] - ti;
-
-		ro[j] += tr;
-		io[j] += ti;
-	    }
-	}
-
-	blockEnd = blockSize;
-    }
-
-    if (inverse) {
-
-	double denom = (double)n;
-
-	for (i = 0; i < n; i++) {
-	    ro[i] /= denom;
-	    io[i] /= denom;
-	}
-    }
-}
-
-#endif
-
-}
-        
-}
-
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.h b/lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.h
deleted file mode 100644
index 73da053..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#ifndef _VAMP_PLUGIN_INPUT_DOMAIN_ADAPTER_H_
-#define _VAMP_PLUGIN_INPUT_DOMAIN_ADAPTER_H_
-
-#include "PluginWrapper.h"
-
-namespace Vamp {
-
-namespace HostExt {
-
-/**
- * \class PluginInputDomainAdapter PluginInputDomainAdapter.h <vamp-sdk/hostext/PluginInputDomainAdapter.h>
- * 
- * PluginInputDomainAdapter is a Vamp plugin adapter that converts
- * time-domain input into frequency-domain input for plugins that need
- * it.  This permits a host to use time- and frequency-domain plugins
- * interchangeably without needing to handle the conversion itself.
- *
- * This adapter uses a basic Hanning windowed FFT that supports
- * power-of-two block sizes only.  If a frequency domain plugin
- * requests a non-power-of-two blocksize, the adapter will adjust it
- * to a nearby power of two instead.  Thus, getPreferredBlockSize()
- * will always return a power of two if the wrapped plugin is a
- * frequency domain one.  If the plugin doesn't accept the adjusted
- * power of two block size, initialise() will fail.
- *
- * The adapter provides no way for the host to discover whether the
- * underlying plugin is actually a time or frequency domain plugin
- * (except that if the preferred block size is not a power of two, it
- * must be a time domain plugin).
- *
- * The FFT implementation is simple and self-contained, but unlikely
- * to be the fastest available: a host can usually do better if it
- * cares enough.
- *
- * In every respect other than its input domain handling, the
- * PluginInputDomainAdapter behaves identically to the plugin that it
- * wraps.  The wrapped plugin will be deleted when the wrapper is
- * deleted.
- *
- * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
- */
-
-class PluginInputDomainAdapter : public PluginWrapper
-{
-public:
-    PluginInputDomainAdapter(Plugin *plugin); // I take ownership of plugin
-    virtual ~PluginInputDomainAdapter();
-    
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-
-    InputDomain getInputDomain() const;
-
-    size_t getPreferredStepSize() const;
-    size_t getPreferredBlockSize() const;
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-
-protected:
-    class Impl;
-    Impl *m_impl;
-};
-
-}
-
-}
-
-#endif
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp b/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
deleted file mode 100644
index 5f439fd..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
+++ /dev/null
@@ -1,636 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "vamp-sdk/PluginHostAdapter.h"
-#include "PluginLoader.h"
-#include "PluginInputDomainAdapter.h"
-#include "PluginChannelAdapter.h"
-#include "PluginBufferingAdapter.h"
-
-#include <fstream>
-#include <cctype> // tolower
-
-#include <cstring>
-
-#ifdef _WIN32
-
-#include <windows.h>
-#include <tchar.h>
-#define PLUGIN_SUFFIX "dll"
-
-#else /* ! _WIN32 */
-
-#include <dirent.h>
-#include <dlfcn.h>
-
-#ifdef __APPLE__
-#define PLUGIN_SUFFIX "dylib"
-#else /* ! __APPLE__ */
-#define PLUGIN_SUFFIX "so"
-#endif /* ! __APPLE__ */
-
-#endif /* ! _WIN32 */
-
-using namespace std;
-
-namespace Vamp {
-	
-namespace HostExt {
-
-class PluginLoader::Impl
-{
-public:
-    Impl();
-    virtual ~Impl();
-
-    PluginKeyList listPlugins();
-
-    Plugin *loadPlugin(PluginKey key,
-                       float inputSampleRate,
-                       int adapterFlags);
-
-    PluginKey composePluginKey(string libraryName, string identifier);
-
-    PluginCategoryHierarchy getPluginCategory(PluginKey key);
-
-    string getLibraryPathForPlugin(PluginKey key);
-
-    static void setInstanceToClean(PluginLoader *instance);
-
-protected:
-    class PluginDeletionNotifyAdapter : public PluginWrapper {
-    public:
-        PluginDeletionNotifyAdapter(Plugin *plugin, Impl *loader);
-        virtual ~PluginDeletionNotifyAdapter();
-    protected:
-        Impl *m_loader;
-    };
-
-    class InstanceCleaner {
-    public:
-        InstanceCleaner() : m_instance(0) { }
-        ~InstanceCleaner() { delete m_instance; }
-        void setInstance(PluginLoader *instance) { m_instance = instance; }
-    protected:
-        PluginLoader *m_instance;
-    };
-
-    virtual void pluginDeleted(PluginDeletionNotifyAdapter *adapter);
-
-    map<PluginKey, string> m_pluginLibraryNameMap;
-    bool m_allPluginsEnumerated;
-    void enumeratePlugins(PluginKey forPlugin = "");
-
-    map<PluginKey, PluginCategoryHierarchy> m_taxonomy;
-    void generateTaxonomy();
-
-    map<Plugin *, void *> m_pluginLibraryHandleMap;
-
-    bool decomposePluginKey(PluginKey key,
-                            string &libraryName, string &identifier);
-
-    void *loadLibrary(string path);
-    void unloadLibrary(void *handle);
-    void *lookupInLibrary(void *handle, const char *symbol);
-
-    string splicePath(string a, string b);
-    vector<string> listFiles(string dir, string ext);
-    
-    static InstanceCleaner m_cleaner;
-};
-
-PluginLoader *
-PluginLoader::m_instance = 0;
-
-PluginLoader::Impl::InstanceCleaner
-PluginLoader::Impl::m_cleaner;
-
-PluginLoader::PluginLoader()
-{
-    m_impl = new Impl();
-}
-
-PluginLoader::~PluginLoader()
-{
-    delete m_impl;
-}
-
-PluginLoader *
-PluginLoader::getInstance()
-{
-    if (!m_instance) {
-        // The cleaner doesn't own the instance, because we leave the
-        // instance pointer in the base class for binary backwards
-        // compatibility reasons and to avoid waste
-        m_instance = new PluginLoader();
-        Impl::setInstanceToClean(m_instance);
-    }
-    return m_instance;
-}
-
-vector<PluginLoader::PluginKey>
-PluginLoader::listPlugins() 
-{
-    return m_impl->listPlugins();
-}
-
-Plugin *
-PluginLoader::loadPlugin(PluginKey key,
-                         float inputSampleRate,
-                         int adapterFlags)
-{
-    return m_impl->loadPlugin(key, inputSampleRate, adapterFlags);
-}
-
-PluginLoader::PluginKey
-PluginLoader::composePluginKey(string libraryName, string identifier) 
-{
-    return m_impl->composePluginKey(libraryName, identifier);
-}
-
-PluginLoader::PluginCategoryHierarchy
-PluginLoader::getPluginCategory(PluginKey key)
-{
-    return m_impl->getPluginCategory(key);
-}
-
-string
-PluginLoader::getLibraryPathForPlugin(PluginKey key)
-{
-    return m_impl->getLibraryPathForPlugin(key);
-}
- 
-PluginLoader::Impl::Impl() :
-    m_allPluginsEnumerated(false)
-{
-}
-
-PluginLoader::Impl::~Impl()
-{
-}
-
-void
-PluginLoader::Impl::setInstanceToClean(PluginLoader *instance)
-{
-    m_cleaner.setInstance(instance);
-}
-
-vector<PluginLoader::PluginKey>
-PluginLoader::Impl::listPlugins() 
-{
-    if (!m_allPluginsEnumerated) enumeratePlugins();
-
-    vector<PluginKey> plugins;
-    for (map<PluginKey, string>::iterator mi = m_pluginLibraryNameMap.begin();
-         mi != m_pluginLibraryNameMap.end(); ++mi) {
-        plugins.push_back(mi->first);
-    }
-
-    return plugins;
-}
-
-void
-PluginLoader::Impl::enumeratePlugins(PluginKey forPlugin)
-{
-    vector<string> path = PluginHostAdapter::getPluginPath();
-
-    string libraryName, identifier;
-    if (forPlugin != "") {
-        if (!decomposePluginKey(forPlugin, libraryName, identifier)) {
-            std::cerr << "WARNING: Vamp::HostExt::PluginLoader: Invalid plugin key \""
-                      << forPlugin << "\" in enumerate" << std::endl;
-            return;
-        }
-    }
-
-    for (size_t i = 0; i < path.size(); ++i) {
-        
-        vector<string> files = listFiles(path[i], PLUGIN_SUFFIX);
-
-        for (vector<string>::iterator fi = files.begin();
-             fi != files.end(); ++fi) {
-            
-            if (libraryName != "") {
-                // libraryName is lowercased and lacking an extension,
-                // as it came from the plugin key
-                string temp = *fi;
-                for (size_t i = 0; i < temp.length(); ++i) {
-                    temp[i] = tolower(temp[i]);
-                }
-                string::size_type pi = temp.find('.');
-                if (pi == string::npos) {
-                    if (libraryName != temp) continue;
-                } else {
-                    if (libraryName != temp.substr(0, pi)) continue;
-                }
-            }
-
-            string fullPath = path[i];
-            fullPath = splicePath(fullPath, *fi);
-            void *handle = loadLibrary(fullPath);
-            if (!handle) continue;
-            
-            VampGetPluginDescriptorFunction fn =
-                (VampGetPluginDescriptorFunction)lookupInLibrary
-                (handle, "vampGetPluginDescriptor");
-            
-            if (!fn) {
-                unloadLibrary(handle);
-                continue;
-            }
-            
-            int index = 0;
-            const VampPluginDescriptor *descriptor = 0;
-            
-            while ((descriptor = fn(VAMP_API_VERSION, index))) {
-                ++index;
-                if (identifier != "") {
-                    if (descriptor->identifier != identifier) continue;
-                }
-                PluginKey key = composePluginKey(*fi, descriptor->identifier);
-//                std::cerr << "enumerate: " << key << " (path: " << fullPath << ")" << std::endl;
-                if (m_pluginLibraryNameMap.find(key) ==
-                    m_pluginLibraryNameMap.end()) {
-                    m_pluginLibraryNameMap[key] = fullPath;
-                }
-            }
-            
-            unloadLibrary(handle);
-        }
-    }
-
-    if (forPlugin == "") m_allPluginsEnumerated = true;
-}
-
-PluginLoader::PluginKey
-PluginLoader::Impl::composePluginKey(string libraryName, string identifier)
-{
-    string basename = libraryName;
-
-    string::size_type li = basename.rfind('/');
-    if (li != string::npos) basename = basename.substr(li + 1);
-
-    li = basename.find('.');
-    if (li != string::npos) basename = basename.substr(0, li);
-
-    for (size_t i = 0; i < basename.length(); ++i) {
-        basename[i] = tolower(basename[i]);
-    }
-
-    return basename + ":" + identifier;
-}
-
-bool
-PluginLoader::Impl::decomposePluginKey(PluginKey key,
-                                       string &libraryName,
-                                       string &identifier)
-{
-    string::size_type ki = key.find(':');
-    if (ki == string::npos) {
-        return false;
-    }
-
-    libraryName = key.substr(0, ki);
-    identifier = key.substr(ki + 1);
-    return true;
-}
-
-PluginLoader::PluginCategoryHierarchy
-PluginLoader::Impl::getPluginCategory(PluginKey plugin)
-{
-    if (m_taxonomy.empty()) generateTaxonomy();
-    if (m_taxonomy.find(plugin) == m_taxonomy.end()) {
-        return PluginCategoryHierarchy();
-    }
-    return m_taxonomy[plugin];
-}
-
-string
-PluginLoader::Impl::getLibraryPathForPlugin(PluginKey plugin)
-{
-    if (m_pluginLibraryNameMap.find(plugin) == m_pluginLibraryNameMap.end()) {
-        if (m_allPluginsEnumerated) return "";
-        enumeratePlugins(plugin);
-    }
-    if (m_pluginLibraryNameMap.find(plugin) == m_pluginLibraryNameMap.end()) {
-        return "";
-    }
-    return m_pluginLibraryNameMap[plugin];
-}    
-
-Plugin *
-PluginLoader::Impl::loadPlugin(PluginKey key,
-                               float inputSampleRate, int adapterFlags)
-{
-    string libname, identifier;
-    if (!decomposePluginKey(key, libname, identifier)) {
-        std::cerr << "Vamp::HostExt::PluginLoader: Invalid plugin key \""
-                  << key << "\" in loadPlugin" << std::endl;
-        return 0;
-    }
-        
-    string fullPath = getLibraryPathForPlugin(key);
-    if (fullPath == "") return 0;
-    
-    void *handle = loadLibrary(fullPath);
-    if (!handle) return 0;
-    
-    VampGetPluginDescriptorFunction fn =
-        (VampGetPluginDescriptorFunction)lookupInLibrary
-        (handle, "vampGetPluginDescriptor");
-
-    if (!fn) {
-        unloadLibrary(handle);
-        return 0;
-    }
-
-    int index = 0;
-    const VampPluginDescriptor *descriptor = 0;
-
-    while ((descriptor = fn(VAMP_API_VERSION, index))) {
-
-        if (string(descriptor->identifier) == identifier) {
-
-            Vamp::PluginHostAdapter *plugin =
-                new Vamp::PluginHostAdapter(descriptor, inputSampleRate);
-
-            Plugin *adapter = new PluginDeletionNotifyAdapter(plugin, this);
-
-            m_pluginLibraryHandleMap[adapter] = handle;
-
-            if (adapterFlags & ADAPT_INPUT_DOMAIN) {
-                if (adapter->getInputDomain() == Plugin::FrequencyDomain) {
-                    adapter = new PluginInputDomainAdapter(adapter);
-                }
-            }
-
-            if (adapterFlags & ADAPT_BUFFER_SIZE) {
-                adapter = new PluginBufferingAdapter(adapter);
-            }
-
-            if (adapterFlags & ADAPT_CHANNEL_COUNT) {
-                adapter = new PluginChannelAdapter(adapter);
-            }
-
-            return adapter;
-        }
-
-        ++index;
-    }
-
-    cerr << "Vamp::HostExt::PluginLoader: Plugin \""
-         << identifier << "\" not found in library \""
-         << fullPath << "\"" << endl;
-
-    return 0;
-}
-
-void
-PluginLoader::Impl::generateTaxonomy()
-{
-//    cerr << "PluginLoader::Impl::generateTaxonomy" << endl;
-
-    vector<string> path = PluginHostAdapter::getPluginPath();
-    string libfragment = "/lib/";
-    vector<string> catpath;
-
-    string suffix = "cat";
-
-    for (vector<string>::iterator i = path.begin();
-         i != path.end(); ++i) {
-
-        // It doesn't matter that we're using literal forward-slash in
-        // this bit, as it's only relevant if the path contains
-        // "/lib/", which is only meaningful and only plausible on
-        // systems with forward-slash delimiters
-        
-        string dir = *i;
-        string::size_type li = dir.find(libfragment);
-
-        if (li != string::npos) {
-            catpath.push_back
-                (dir.substr(0, li)
-                 + "/share/"
-                 + dir.substr(li + libfragment.length()));
-        }
-
-        catpath.push_back(dir);
-    }
-
-    char buffer[1024];
-
-    for (vector<string>::iterator i = catpath.begin();
-         i != catpath.end(); ++i) {
-        
-        vector<string> files = listFiles(*i, suffix);
-
-        for (vector<string>::iterator fi = files.begin();
-             fi != files.end(); ++fi) {
-
-            string filepath = splicePath(*i, *fi);
-            ifstream is(filepath.c_str(), ifstream::in | ifstream::binary);
-
-            if (is.fail()) {
-//                cerr << "failed to open: " << filepath << endl;
-                continue;
-            }
-
-//            cerr << "opened: " << filepath << endl;
-
-            while (!!is.getline(buffer, 1024)) {
-
-                string line(buffer);
-
-//                cerr << "line = " << line << endl;
-
-                string::size_type di = line.find("::");
-                if (di == string::npos) continue;
-
-                string id = line.substr(0, di);
-                string encodedCat = line.substr(di + 2);
-
-                if (id.substr(0, 5) != "vamp:") continue;
-                id = id.substr(5);
-
-                while (encodedCat.length() >= 1 &&
-                       encodedCat[encodedCat.length()-1] == '\r') {
-                    encodedCat = encodedCat.substr(0, encodedCat.length()-1);
-                }
-
-//                cerr << "id = " << id << ", cat = " << encodedCat << endl;
-
-                PluginCategoryHierarchy category;
-                string::size_type ai;
-                while ((ai = encodedCat.find(" > ")) != string::npos) {
-                    category.push_back(encodedCat.substr(0, ai));
-                    encodedCat = encodedCat.substr(ai + 3);
-                }
-                if (encodedCat != "") category.push_back(encodedCat);
-
-                m_taxonomy[id] = category;
-            }
-        }
-    }
-}    
-
-void *
-PluginLoader::Impl::loadLibrary(string path)
-{
-    void *handle = 0;
-#ifdef _WIN32
-    handle = LoadLibrary(path.c_str());
-    if (!handle) {
-        cerr << "Vamp::HostExt::PluginLoader: Unable to load library \""
-             << path << "\"" << endl;
-    }
-#else
-    handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL);
-    if (!handle) {
-        cerr << "Vamp::HostExt::PluginLoader: Unable to load library \""
-             << path << "\": " << dlerror() << endl;
-    }
-#endif
-    return handle;
-}
-
-void
-PluginLoader::Impl::unloadLibrary(void *handle)
-{
-#ifdef _WIN32
-    FreeLibrary((HINSTANCE)handle);
-#else
-    dlclose(handle);
-#endif
-}
-
-void *
-PluginLoader::Impl::lookupInLibrary(void *handle, const char *symbol)
-{
-#ifdef _WIN32
-    return (void *)GetProcAddress((HINSTANCE)handle, symbol);
-#else
-    return (void *)dlsym(handle, symbol);
-#endif
-}
-
-string
-PluginLoader::Impl::splicePath(string a, string b)
-{
-#ifdef _WIN32
-    return a + "\\" + b;
-#else
-    return a + "/" + b;
-#endif
-}
-
-vector<string>
-PluginLoader::Impl::listFiles(string dir, string extension)
-{
-    vector<string> files;
-
-#ifdef _WIN32
-
-    string expression = dir + "\\*." + extension;
-    WIN32_FIND_DATA data;
-    HANDLE fh = FindFirstFile(expression.c_str(), &data);
-    if (fh == INVALID_HANDLE_VALUE) return files;
-
-    bool ok = true;
-    while (ok) {
-        files.push_back(data.cFileName);
-        ok = FindNextFile(fh, &data);
-    }
-
-    FindClose(fh);
-
-#else
-
-    size_t extlen = extension.length();
-    DIR *d = opendir(dir.c_str());
-    if (!d) return files;
-            
-    struct dirent *e = 0;
-    while ((e = readdir(d))) {
- 
-        if (!e->d_name) continue;
-       
-        size_t len = strlen(e->d_name);
-        if (len < extlen + 2 ||
-            e->d_name + len - extlen - 1 != "." + extension) {
-            continue;
-        }
-
-        files.push_back(e->d_name);
-    }
-
-    closedir(d);
-#endif
-
-    return files;
-}
-
-void
-PluginLoader::Impl::pluginDeleted(PluginDeletionNotifyAdapter *adapter)
-{
-    void *handle = m_pluginLibraryHandleMap[adapter];
-    if (handle) unloadLibrary(handle);
-    m_pluginLibraryHandleMap.erase(adapter);
-}
-
-PluginLoader::Impl::PluginDeletionNotifyAdapter::PluginDeletionNotifyAdapter(Plugin *plugin,
-                                                                             Impl *loader) :
-    PluginWrapper(plugin),
-    m_loader(loader)
-{
-}
-
-PluginLoader::Impl::PluginDeletionNotifyAdapter::~PluginDeletionNotifyAdapter()
-{
-    // We need to delete the plugin before calling pluginDeleted, as
-    // the delete call may require calling through to the descriptor
-    // (for e.g. cleanup) but pluginDeleted may unload the required
-    // library for the call.  To prevent a double deletion when our
-    // parent's destructor runs (after this one), be sure to set
-    // m_plugin to 0 after deletion.
-    delete m_plugin;
-    m_plugin = 0;
-
-    if (m_loader) m_loader->pluginDeleted(this);
-}
-
-}
-
-}
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h b/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h
deleted file mode 100644
index f48143c..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#ifndef _VAMP_PLUGIN_LOADER_H_
-#define _VAMP_PLUGIN_LOADER_H_
-
-#include <vector>
-#include <string>
-#include <map>
-
-#include "PluginWrapper.h"
-
-namespace Vamp {
-
-class Plugin;
-
-namespace HostExt {
-
-/**
- * \class PluginLoader PluginLoader.h <vamp-sdk/hostext/PluginLoader.h>
- * 
- * Vamp::HostExt::PluginLoader is a convenience class for discovering
- * and loading Vamp plugins using the typical plugin-path, library
- * naming, and categorisation conventions described in the Vamp SDK
- * documentation.  This class is intended to greatly simplify the task
- * of becoming a Vamp plugin host for any C++ application.
- * 
- * Hosts are not required by the Vamp specification to use the same
- * plugin search path and naming conventions as implemented by this
- * class, and are certainly not required to use this actual class.
- * But we do strongly recommend it.
- *
- * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
- */
-
-class PluginLoader
-{
-public:
-    /**
-     * Obtain a pointer to the singleton instance of PluginLoader.
-     * Use this to obtain your loader object.
-     */
-    static PluginLoader *getInstance();
-
-    /**
-     * PluginKey is a string type that is used to identify a plugin
-     * uniquely within the scope of "the current system".  It consists
-     * of the lower-cased base name of the plugin library, a colon
-     * separator, and the identifier string for the plugin.  It is
-     * only meaningful in the context of a given plugin path (the one
-     * returned by PluginHostAdapter::getPluginPath()).
-     *
-     * Use composePluginKey() to construct a plugin key from a known
-     * plugin library name and identifier.
-     *
-     * Note: the fact that the library component of the key is
-     * lower-cased implies that library names are matched
-     * case-insensitively by the PluginLoader class, regardless of the
-     * case sensitivity of the underlying filesystem.  (Plugin
-     * identifiers _are_ case sensitive, however.)  Also, it is not
-     * possible to portably extract a working library name from a
-     * plugin key, as the result may fail on case-sensitive
-     * filesystems.  Use getLibraryPathForPlugin() instead.
-     */
-    typedef std::string PluginKey;
-
-    /**
-     * PluginKeyList is a sequence of plugin keys, such as returned by
-     * listPlugins().
-     */
-    typedef std::vector<PluginKey> PluginKeyList;
-
-    /**
-     * PluginCategoryHierarchy is a sequence of general->specific
-     * category names, as may be associated with a single plugin.
-     * This sequence describes the location of a plugin within a
-     * category forest, containing the human-readable names of the
-     * plugin's category tree root, followed by each of the nodes down
-     * to the leaf containing the plugin.
-     *
-     * \see getPluginCategory()
-     */
-    typedef std::vector<std::string> PluginCategoryHierarchy;
-
-    /**
-     * Search for all available Vamp plugins, and return a list of
-     * them in the order in which they were found.
-     */
-    PluginKeyList listPlugins();
-
-    /**
-     * AdapterFlags contains a set of values that may be OR'd together
-     * to indicate in which circumstances PluginLoader should use a
-     * plugin adapter to make a plugin easier to use for a host that
-     * does not want to cater for complex features.
-     *
-     * The available flags are:
-     * 
-     * ADAPT_INPUT_DOMAIN - If the plugin expects frequency domain
-     * input, wrap it in a PluginInputDomainAdapter that automatically
-     * converts the plugin to one that expects time-domain input.
-     * This enables a host to accommodate time- and frequency-domain
-     * plugins without needing to do any conversion itself.
-     *
-     * ADAPT_CHANNEL_COUNT - Wrap the plugin in a PluginChannelAdapter
-     * to handle any mismatch between the number of channels of audio
-     * the plugin can handle and the number available in the host.
-     * This enables a host to use plugins that may require the input
-     * to be mixed down to mono, etc., without having to worry about
-     * doing that itself.
-     *
-     * ADAPT_BUFFER_SIZE - Wrap the plugin in a PluginBufferingAdapter
-     * permitting the host to provide audio input using any block
-     * size, with no overlap, regardless of the plugin's preferred
-     * block size (suitable for hosts that read from non-seekable
-     * streaming media, for example).  This adapter introduces some
-     * run-time overhead and also changes the semantics of the plugin
-     * slightly (see the PluginBufferingAdapter header documentation
-     * for details).
-     *
-     * ADAPT_ALL_SAFE - Perform all available adaptations that are
-     * meaningful for the plugin and "safe".  Currently this means to
-     * ADAPT_INPUT_DOMAIN if the plugin wants FrequencyDomain input;
-     * ADAPT_CHANNEL_COUNT always; and ADAPT_BUFFER_SIZE never.
-     * 
-     * ADAPT_ALL - Perform all available adaptations that are
-     * meaningful for the plugin.
-     * 
-     * See PluginInputDomainAdapter, PluginChannelAdapter and
-     * PluginBufferingAdapter for more details of the classes that the
-     * loader may use if these flags are set.
-     */
-    enum AdapterFlags {
-
-        ADAPT_INPUT_DOMAIN  = 0x01,
-        ADAPT_CHANNEL_COUNT = 0x02,
-        ADAPT_BUFFER_SIZE   = 0x04,
-
-        ADAPT_ALL_SAFE      = 0x03,
-
-        ADAPT_ALL           = 0xff
-    };
-
-    /**
-     * Load a Vamp plugin, given its identifying key.  If the plugin
-     * could not be loaded, returns 0.
-     *
-     * The returned plugin should be deleted (using the standard C++
-     * delete keyword) after use.
-     *
-     * \param adapterFlags a bitwise OR of the values in the AdapterFlags
-     * enumeration, indicating under which circumstances an adapter should be
-     * used to wrap the original plugin.  If adapterFlags is 0, no
-     * optional adapters will be used.  Otherwise, the returned plugin
-     * may be of an adapter class type which will behave identically
-     * to the original plugin, apart from any particular features
-     * implemented by the adapter itself.
-     * 
-     * \see AdapterFlags, PluginInputDomainAdapter, PluginChannelAdapter
-     */
-    Plugin *loadPlugin(PluginKey key,
-                       float inputSampleRate,
-                       int adapterFlags = 0);
-
-    /**
-     * Given a Vamp plugin library name and plugin identifier, return
-     * the corresponding plugin key in a form suitable for passing in to
-     * loadPlugin().
-     */
-    PluginKey composePluginKey(std::string libraryName,
-                               std::string identifier);
-
-    /**
-     * Return the category hierarchy for a Vamp plugin, given its
-     * identifying key.
-     *
-     * If the plugin has no category information, return an empty
-     * hierarchy.
-     *
-     * \see PluginCategoryHierarchy
-     */
-    PluginCategoryHierarchy getPluginCategory(PluginKey plugin);
-
-    /**
-     * Return the file path of the dynamic library from which the
-     * given plugin will be loaded (if available).
-     */
-    std::string getLibraryPathForPlugin(PluginKey plugin);
-
-protected:
-    PluginLoader();
-    virtual ~PluginLoader();
-
-    class Impl;
-    Impl *m_impl;
-
-    static PluginLoader *m_instance;
-};
-
-}
-
-}
-
-#endif
-
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginWrapper.cpp b/lib-src/libvamp/vamp-sdk/hostext/PluginWrapper.cpp
deleted file mode 100644
index dcbdf5b..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginWrapper.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "PluginWrapper.h"
-
-namespace Vamp {
-
-namespace HostExt {
-
-class PluginRateExtractor : public Plugin
-{
-public:
-    PluginRateExtractor() : Plugin(0) { }
-    float getRate() const { return m_inputSampleRate; }
-};
-
-PluginWrapper::PluginWrapper(Plugin *plugin) :
-    Plugin(((PluginRateExtractor *)plugin)->getRate()),
-    m_plugin(plugin)
-{
-}
-
-PluginWrapper::~PluginWrapper()
-{
-    delete m_plugin;
-}
-
-bool
-PluginWrapper::initialise(size_t channels, size_t stepSize, size_t blockSize)
-{
-    return m_plugin->initialise(channels, stepSize, blockSize);
-}
-
-void
-PluginWrapper::reset()
-{
-    m_plugin->reset();
-}
-
-Plugin::InputDomain
-PluginWrapper::getInputDomain() const
-{
-    return m_plugin->getInputDomain();
-}
-
-unsigned int
-PluginWrapper::getVampApiVersion() const
-{
-    return m_plugin->getVampApiVersion();
-}
-
-std::string
-PluginWrapper::getIdentifier() const
-{
-    return m_plugin->getIdentifier();
-}
-
-std::string
-PluginWrapper::getName() const
-{
-    return m_plugin->getName();
-}
-
-std::string
-PluginWrapper::getDescription() const
-{
-    return m_plugin->getDescription();
-}
-
-std::string
-PluginWrapper::getMaker() const
-{
-    return m_plugin->getMaker();
-}
-
-int
-PluginWrapper::getPluginVersion() const
-{
-    return m_plugin->getPluginVersion();
-}
-
-std::string
-PluginWrapper::getCopyright() const
-{
-    return m_plugin->getCopyright();
-}
-
-PluginBase::ParameterList
-PluginWrapper::getParameterDescriptors() const
-{
-    return m_plugin->getParameterDescriptors();
-}
-
-float
-PluginWrapper::getParameter(std::string parameter) const
-{
-    return m_plugin->getParameter(parameter);
-}
-
-void
-PluginWrapper::setParameter(std::string parameter, float value)
-{
-    m_plugin->setParameter(parameter, value);
-}
-
-PluginBase::ProgramList
-PluginWrapper::getPrograms() const
-{
-    return m_plugin->getPrograms();
-}
-
-std::string
-PluginWrapper::getCurrentProgram() const
-{
-    return m_plugin->getCurrentProgram();
-}
-
-void
-PluginWrapper::selectProgram(std::string program)
-{
-    m_plugin->selectProgram(program);
-}
-
-size_t
-PluginWrapper::getPreferredStepSize() const
-{
-    return m_plugin->getPreferredStepSize();
-}
-
-size_t
-PluginWrapper::getPreferredBlockSize() const
-{
-    return m_plugin->getPreferredBlockSize();
-}
-
-size_t
-PluginWrapper::getMinChannelCount() const
-{
-    return m_plugin->getMinChannelCount();
-}
-
-size_t PluginWrapper::getMaxChannelCount() const
-{
-    return m_plugin->getMaxChannelCount();
-}
-
-Plugin::OutputList
-PluginWrapper::getOutputDescriptors() const
-{
-    return m_plugin->getOutputDescriptors();
-}
-
-Plugin::FeatureSet
-PluginWrapper::process(const float *const *inputBuffers, RealTime timestamp)
-{
-    return m_plugin->process(inputBuffers, timestamp);
-}
-
-Plugin::FeatureSet
-PluginWrapper::getRemainingFeatures()
-{
-    return m_plugin->getRemainingFeatures();
-}
-
-}
-
-}
-
diff --git a/lib-src/libvamp/vamp-sdk/hostext/PluginWrapper.h b/lib-src/libvamp/vamp-sdk/hostext/PluginWrapper.h
deleted file mode 100644
index d796a6a..0000000
--- a/lib-src/libvamp/vamp-sdk/hostext/PluginWrapper.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
-/*
-    Vamp
-
-    An API for audio analysis and feature extraction plugins.
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2006-2007 Chris Cannam and QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#ifndef _VAMP_PLUGIN_WRAPPER_H_
-#define _VAMP_PLUGIN_WRAPPER_H_
-
-#include "vamp-sdk/Plugin.h"
-
-namespace Vamp {
-
-namespace HostExt {
-
-/**
- * \class PluginWrapper PluginWrapper.h <vamp-sdk/hostext/PluginWrapper.h>
- * 
- * PluginWrapper is a simple base class for adapter plugins.  It takes
- * a pointer to a "to be wrapped" Vamp plugin on construction, and
- * provides implementations of all the Vamp plugin methods that simply
- * delegate through to the wrapped plugin.  A subclass can therefore
- * override only the methods that are meaningful for the particular
- * adapter.
- *
- * \note This class was introduced in version 1.1 of the Vamp plugin SDK.
- */
-
-class PluginWrapper : public Plugin
-{
-public:
-    virtual ~PluginWrapper();
-    
-    bool initialise(size_t channels, size_t stepSize, size_t blockSize);
-    void reset();
-
-    InputDomain getInputDomain() const;
-
-    unsigned int getVampApiVersion() const;
-    std::string getIdentifier() const;
-    std::string getName() const;
-    std::string getDescription() const;
-    std::string getMaker() const;
-    int getPluginVersion() const;
-    std::string getCopyright() const;
-
-    ParameterList getParameterDescriptors() const;
-    float getParameter(std::string) const;
-    void setParameter(std::string, float);
-
-    ProgramList getPrograms() const;
-    std::string getCurrentProgram() const;
-    void selectProgram(std::string);
-
-    size_t getPreferredStepSize() const;
-    size_t getPreferredBlockSize() const;
-
-    size_t getMinChannelCount() const;
-    size_t getMaxChannelCount() const;
-
-    OutputList getOutputDescriptors() const;
-
-    FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
-
-    FeatureSet getRemainingFeatures();
-
-protected:
-    PluginWrapper(Plugin *plugin); // I take ownership of plugin
-    Plugin *m_plugin;
-};
-
-}
-
-}
-
-#endif
diff --git a/lib-src/libvamp/vamp-sdk/libvamp-hostsdk.la.in b/lib-src/libvamp/vamp-sdk/libvamp-hostsdk.la.in
deleted file mode 100644
index c28c986..0000000
--- a/lib-src/libvamp/vamp-sdk/libvamp-hostsdk.la.in
+++ /dev/null
@@ -1,9 +0,0 @@
-dlname='%LINK_ABI%'
-library_names='%LIBNAME% %LINK_ABI% %LINK_DEV%'
-old_library='%STATIC%'
-dependency_libs=''
-current=2
-age=1
-revision=0
-installed=yes
-libdir='%LIBS%'
diff --git a/lib-src/libvamp/vamp-sdk/libvamp-sdk.la.in b/lib-src/libvamp/vamp-sdk/libvamp-sdk.la.in
deleted file mode 100644
index 6ac24d0..0000000
--- a/lib-src/libvamp/vamp-sdk/libvamp-sdk.la.in
+++ /dev/null
@@ -1,9 +0,0 @@
-dlname='%LINK_ABI%'
-library_names='%LIBNAME% %LINK_ABI% %LINK_DEV%'
-old_library='%STATIC%'
-dependency_libs=''
-current=1
-age=1
-revision=1
-installed=yes
-libdir='%LIBS%'
diff --git a/lib-src/libvamp/vamp-sdk/plugguard.h b/lib-src/libvamp/vamp-sdk/plugguard.h
new file mode 100644
index 0000000..311dd48
--- /dev/null
+++ b/lib-src/libvamp/vamp-sdk/plugguard.h
@@ -0,0 +1,98 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_SDK_PLUGGUARD_H_
+#define _VAMP_SDK_PLUGGUARD_H_
+
+/**
+ * Normal usage should be:
+ *
+ * - Plugins include vamp-sdk/Plugin.h or vamp-sdk/PluginBase.h.
+ *   These files include this header, which specifies an appropriate
+ *   namespace for the plugin classes to avoid any risk of conflict
+ *   with non-plugin class implementations in the host on load.
+ *
+ * - Hosts include vamp-hostsdk/Plugin.h, vamp-hostsdk/PluginBase.h,
+ *   vamp-hostsdk/PluginHostAdapter, vamp-hostsdk/PluginLoader.h etc.
+ *   These files include vamp-hostsdk/hostguard.h, which makes a note
+ *   that we are in a host.  A file such as vamp-hostsdk/Plugin.h
+ *   then simply includes vamp-sdk/Plugin.h, and this guard header
+ *   takes notice of the fact that it has been included from a host
+ *   and leaves the plugin namespace unset.
+ *
+ * Problems will occur when a host includes files directly from the
+ * vamp-sdk directory.  There are two reasons this might happen:
+ * mistake, perhaps owing to ignorance of the fact that this isn't
+ * allowed (particularly since it was the normal mechanism in v1 of
+ * the SDK); and a wish to incorporate plugin code directly into the
+ * host rather than having to load it.
+ *
+ * What if the host does include a vamp-sdk header by mistake?  We can
+ * catch it if it's included before something from vamp-hostsdk.  If
+ * it's included after something from vamp-hostsdk, it will work OK
+ * anyway.  The remaining problem case is where nothing from
+ * vamp-hostsdk is included in the same file.  We can't catch that.
+ */
+
+#ifndef _VAMP_IN_HOSTSDK
+
+#define _VAMP_IN_PLUGINSDK 1
+
+#ifdef _VAMP_NO_PLUGIN_NAMESPACE
+#define _VAMP_SDK_PLUGSPACE_BEGIN(h)
+#define _VAMP_SDK_PLUGSPACE_END(h)
+#else
+#ifdef _VAMP_PLUGIN_IN_HOST_NAMESPACE
+#define _VAMP_SDK_PLUGSPACE_BEGIN(h) \
+	namespace _VampHost {
+
+#define _VAMP_SDK_PLUGSPACE_END(h) \
+	} \
+	using namespace _VampHost;
+#else
+#define _VAMP_SDK_PLUGSPACE_BEGIN(h) \
+	namespace _VampPlugin {
+
+#define _VAMP_SDK_PLUGSPACE_END(h) \
+	} \
+	using namespace _VampPlugin;
+#endif
+#endif
+
+#endif
+
+#endif
+
diff --git a/lib-src/libvamp/vamp-sdk/vamp-hostsdk.pc.in b/lib-src/libvamp/vamp-sdk/vamp-hostsdk.pc.in
deleted file mode 100644
index d5432c0..0000000
--- a/lib-src/libvamp/vamp-sdk/vamp-hostsdk.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: vamp-hostsdk
-Version: 1.1.0
-Description: Development library for Vamp audio analysis plugin hosts
-Libs: -L${libdir} -lvamp-hostsdk
-Cflags: -I${includedir} 
diff --git a/lib-src/libvamp/vamp-sdk/vamp-sdk.h b/lib-src/libvamp/vamp-sdk/vamp-sdk.h
new file mode 100644
index 0000000..3ac2f8b
--- /dev/null
+++ b/lib-src/libvamp/vamp-sdk/vamp-sdk.h
@@ -0,0 +1,46 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp
+
+    An API for audio analysis and feature extraction plugins.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    Copyright 2006 Chris Cannam.
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the names of the Centre for
+    Digital Music; Queen Mary, University of London; and Chris Cannam
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization.
+*/
+
+#ifndef _VAMP_SDK_SINGLE_INCLUDE_H_
+#define _VAMP_SDK_SINGLE_INCLUDE_H_
+
+#include "PluginBase.h"
+#include "Plugin.h"
+#include "RealTime.h"
+
+#endif
+
+
diff --git a/lib-src/libvamp/vamp-sdk/vamp-sdk.pc.in b/lib-src/libvamp/vamp-sdk/vamp-sdk.pc.in
deleted file mode 100644
index cc436ad..0000000
--- a/lib-src/libvamp/vamp-sdk/vamp-sdk.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: vamp-sdk
-Version: 1.3.0
-Description: Development library for Vamp audio analysis plugins
-Libs: -L${libdir} -lvamp-sdk
-Cflags: -I${includedir} 
diff --git a/lib-src/libvamp/vamp/vamp.h b/lib-src/libvamp/vamp/vamp.h
index f3b7ddb..08a83ee 100644
--- a/lib-src/libvamp/vamp/vamp.h
+++ b/lib-src/libvamp/vamp/vamp.h
@@ -50,7 +50,7 @@ extern "C" {
  * See also the vampApiVersion field in the plugin descriptor, and the
  * hostApiVersion argument to the vampGetPluginDescriptor function.
  */
-#define VAMP_API_VERSION 1
+#define VAMP_API_VERSION 2
 
 /**
  * C language API for Vamp plugins.
@@ -160,6 +160,15 @@ typedef struct _VampOutputDescriptor
        "Resolution" of result, if sampleType is vampVariableSampleRate. */
     float sampleRate;
 
+    /** 1 if the returned results for this output are known to have a
+        duration field.
+
+        This field is new in Vamp API version 2; it must not be tested
+        for plugins that report an older API version in their plugin
+        descriptor.
+    */
+    int hasDuration;
+
 } VampOutputDescriptor;
 
 typedef struct _VampFeature
@@ -184,13 +193,46 @@ typedef struct _VampFeature
 
 } VampFeature;
 
+typedef struct _VampFeatureV2
+{
+    /** 1 if the feature has a duration. */
+    int hasDuration;
+
+    /** Seconds component of duratiion. */
+    int durationSec;
+
+    /** Nanoseconds component of duration. */
+    int durationNsec;
+
+} VampFeatureV2;
+
+typedef union _VampFeatureUnion
+{
+    // sizeof(featureV1) >= sizeof(featureV2) for backward compatibility
+    VampFeature   v1;
+    VampFeatureV2 v2;
+
+} VampFeatureUnion;
+
 typedef struct _VampFeatureList
 {
     /** Number of features in this feature list. */
     unsigned int featureCount;
 
-    /** Features in this feature list.  May be NULL if featureCount is zero. */
-    VampFeature *features;
+    /** Features in this feature list.  May be NULL if featureCount is
+        zero.
+
+        If present, this array must contain featureCount feature
+        structures for a Vamp API version 1 plugin, or 2*featureCount
+        feature unions for a Vamp API version 2 plugin.
+
+        The features returned by an API version 2 plugin must consist
+        of the same feature structures as in API version 1 for the
+        first featureCount array elements, followed by featureCount
+        unions that contain VampFeatureV2 structures (or NULL pointers
+        if no V2 feature structures are present).
+     */
+    VampFeatureUnion *features;
 
 } VampFeatureList;
 
@@ -289,7 +331,7 @@ typedef struct _VampPluginDescriptor
         handle, or releaseOutputDescriptor for this descriptor. Host
         must call releaseOutputDescriptor after use. */
     VampOutputDescriptor *(*getOutputDescriptor)(VampPluginHandle,
-                                                unsigned int);
+                                                 unsigned int);
 
     /** Destroy a descriptor for a feature output. */
     void (*releaseOutputDescriptor)(VampOutputDescriptor *);
diff --git a/lib-src/libvamp/vamp/vamp.pc.in b/lib-src/libvamp/vamp/vamp.pc.in
deleted file mode 100644
index 82d4dec..0000000
--- a/lib-src/libvamp/vamp/vamp.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: vamp
-Version: 1.0
-Description: An API for audio analysis and feature extraction plugins
-Libs: 
-Cflags: -I${includedir} 
diff --git a/lib-src/mod-script-pipe/PipeServer.cpp b/lib-src/mod-script-pipe/PipeServer.cpp
deleted file mode 100644
index 31039a5..0000000
--- a/lib-src/mod-script-pipe/PipeServer.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-
-#if defined(WIN32)
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#include <windows.h>
-#include <stdio.h>
-#include <tchar.h>
-
-const int nBuff = 1024;
-
-extern "C" int DoSrv( char * pIn );
-extern "C" int DoSrvMore( char * pOut, int nMax );
-
-void PipeServer()
-{
-   HANDLE hPipeToSrv;
-   HANDLE hPipeFromSrv;
-
-   LPTSTR pipeNameToSrv= _T("\\\\.\\pipe\\ToSrvPipe");
-
-   hPipeToSrv = CreateNamedPipe( 
-      pipeNameToSrv ,
-      PIPE_ACCESS_DUPLEX,
-      PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT ,//| PIPE_REJECT_REMOTE_CLIENTS,
-      PIPE_UNLIMITED_INSTANCES,
-      nBuff,
-      nBuff,
-      50,//Timeout - always send straight away.
-      NULL);
-   if( hPipeToSrv == INVALID_HANDLE_VALUE)
-      return;
-
-   LPTSTR pipeNameFromSrv= __T("\\\\.\\pipe\\FromSrvPipe");
-
-   hPipeFromSrv = CreateNamedPipe( 
-      pipeNameFromSrv ,
-      PIPE_ACCESS_DUPLEX,
-      PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT ,//| PIPE_REJECT_REMOTE_CLIENTS,
-      PIPE_UNLIMITED_INSTANCES,
-      nBuff,
-      nBuff,
-      50,//Timeout - always send straight away.
-      NULL);
-   if( hPipeFromSrv == INVALID_HANDLE_VALUE)
-      return;
-
-   BOOL bConnected;
-   BOOL bSuccess;
-   DWORD cbBytesRead;
-   DWORD cbBytesWritten;
-   CHAR chRequest[ nBuff ];
-   CHAR chResponse[ nBuff ];
-
-   int jj=0;
-
-   for(;;)
-   {
-      printf( "Obtaining pipe\n" );
-      bConnected = ConnectNamedPipe(hPipeToSrv, NULL) ? 
-         TRUE : (GetLastError()==ERROR_PIPE_CONNECTED );
-      printf( "Obtained to-srv %i\n", bConnected );
-      bConnected = ConnectNamedPipe(hPipeFromSrv, NULL) ? 
-         TRUE : (GetLastError()==ERROR_PIPE_CONNECTED );
-      printf( "Obtained from-srv %i\n", bConnected );
-      if( bConnected )
-      {
-         for(;;)
-         {
-            printf( "About to read\n" );
-            bSuccess = ReadFile( hPipeToSrv, chRequest, nBuff, &cbBytesRead, NULL);
-
-            chRequest[ cbBytesRead] = '\0'; 
-
-            if( !bSuccess || cbBytesRead==0 )
-               break;
-
-            printf( "Rxd %s\n", chRequest );
-
-            DoSrv( chRequest );
-            jj++;
-            while( true )
-            {
-               int nWritten = DoSrvMore( chResponse, nBuff );
-               if( nWritten <= 1 )
-                  break;
-               WriteFile( hPipeFromSrv, chResponse, nWritten-1, &cbBytesWritten, NULL);
-            }
-            //FlushFileBuffers( hPipeFromSrv );
-         }
-         FlushFileBuffers( hPipeToSrv );
-         DisconnectNamedPipe( hPipeToSrv );
-         FlushFileBuffers( hPipeFromSrv );
-         DisconnectNamedPipe( hPipeFromSrv );
-         break;
-      }
-      else
-      {
-         CloseHandle( hPipeToSrv );
-         CloseHandle( hPipeFromSrv );
-      }
-   }
-   CloseHandle( hPipeToSrv );
-   CloseHandle( hPipeFromSrv );
-}
-
-#else
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-const char fifotmpl[] = "/tmp/audacity_script_pipe.%d";
-
-const int nBuff = 1024;
-
-extern "C" int DoSrv( char * pIn );
-extern "C" int DoSrvMore( char * pOut, int nMax );
-
-void PipeServer()
-{
-   FILE *fifo = NULL;
-   int rc;
-   char buf[nBuff];
-   char fifoname[nBuff];
-   
-   sprintf(fifoname, fifotmpl, getuid());
-
-   rc = mkfifo(fifoname, S_IRWXU);
-   if (rc < 0)
-   {
-      perror("Unable to create fifo");
-      printf("Ignoring...");
-//      return;
-   }
-
-   fifo = fopen(fifoname, "rw");
-   if (fifo == NULL)
-   {
-      perror("Unable to open fifo");
-      return;
-   }
-
-   while (true)
-   {
-      int len;
-
-      if (fgets(buf, sizeof(buf), fifo) == NULL)
-      {
-         perror("Read failed on fifo");
-         break;
-      }
-
-      len = strlen(buf);
-      if (len <= 1)
-      {
-         continue;
-      }
-
-      buf[len - 1] = '\0';
-
-      DoSrv(buf);
-
-      while (true)
-      {
-         len = DoSrvMore(buf, nBuff);
-         if (len <= 1)
-         {
-            break;
-         }
-         printf(buf);
-
-         fwrite(buf, 1, len, fifo);
-      }
-
-      // Here until I figure out why the second read fails.
-      break;
-   }
-
-   if (fifo != NULL)
-   {
-      fclose(fifo);
-   }
-
-   unlink(fifoname);
-}
-#endif
diff --git a/lib-src/mod-script-pipe/ScripterCallback.cpp b/lib-src/mod-script-pipe/ScripterCallback.cpp
deleted file mode 100644
index c28d0c2..0000000
--- a/lib-src/mod-script-pipe/ScripterCallback.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// ScripterCallback.cpp : 
-//
-// A loadable module that connects a windows named pipe
-// to a registered service function that is able to
-// process a single command at a time.
-//
-// The service function is provided by the application
-// and not by libscript.  mod_script_pipe was developed for
-// Audacity.  Because it forwards commands
-// rather than handling them itself it can be used in
-// other projects too.  
-
-#include <wx/wx.h>
-#include "ScripterCallback.h"
-//#include "../lib_widget_extra/ShuttleGuiBase.h"
-#include "../../src/ShuttleGui.h"
-
-#ifdef NOT_DEFINED
-
-// This is 'traditional code' for DLLs, which we're not
-// using.
-
-//#include "stdafx.h"
-
-BOOL APIENTRY DllMain( HANDLE hModule, 
-                       DWORD  ul_reason_for_call, 
-                       LPVOID lpReserved
-					 )
-{
-    switch (ul_reason_for_call)
-	{
-		case DLL_PROCESS_ATTACH:
-		case DLL_THREAD_ATTACH:
-		case DLL_THREAD_DETACH:
-		case DLL_PROCESS_DETACH:
-			break;
-    }
-    return TRUE;
-}
-
-#endif
-
-
-extern void PipeServer();
-
-
-extern "C" {
-
-   // This is an example of an exported variable
-
-typedef SCRIPT_PIPE_DLL_IMPORT int (*tpExecScriptServerFunc)( wxString * pOut, wxString * pIn);
-
-
-static tpExecScriptServerFunc pScriptServerFn=NULL;
-
-wxString Str2;
-wxArrayString aStr;
-int iSent;
-
-// Do serv sends the command back to the script server function,
-// and creates a list of response lines to be sent.
-int DoSrv( char * pIn )
-{
-   wxString Str1(pIn, wxConvISO8859_1);
-   Str1.Replace( wxT("\r"), wxT(""));
-   Str1.Replace( wxT("\n"), wxT(""));
-   (*pScriptServerFn)( &Str2, &Str1 );
-   size_t l = Str2.Length();
-   Str2+= wxT('\n');
-   aStr.Clear();
-   iSent = -1;
-   size_t iStart = 0;
-   size_t i;
-   for(i=0;i<=l;i++)
-   {
-      if( Str2[i] == wxT('\n') )
-      {
-         aStr.Add( Str2.Mid( iStart, i-iStart) );
-         iStart = i+1;
-      }
-   }
-//   wxLogDebug("Added %i Strings", aStr.GetCount());
-   return 1;
-}
-
-// DoSrvMore yields one script line at a time.
-int DoSrvMore( char * pOut, int nMax )
-{
-
-   wxString Temp;
-
-   if( aStr.GetCount() == 1 )
-   {
-      if( iSent != -1 )
-         return -1;
-      iSent++;
-      Temp = aStr[0];
-   }
-   else if( iSent == -1 )
-   {
-      Temp = wxString::Format(wxT("Lines:%i"), aStr.GetCount());
-      iSent++;
-   }
-   else
-   {
-      if( iSent >= (int)aStr.GetCount() )
-         return -2;
-      Temp = aStr[iSent];
-      iSent++;
-   }
-   size_t l;
-   l = Temp.Length();
-   if( l>= (nMax-3) )
-      l=(nMax-4);
-   memcpy( pOut, Temp.mb_str(), l );
-   pOut[l] = '\n';
-   pOut[l+1] = '\0';
-   return l+2;
-}
-
-
-int SCRIPT_PIPE_DLL_API RegScriptServerFunc( tpExecScriptServerFunc pFn )
-{
-   if( pFn )
-   {
-      pScriptServerFn = pFn;
-      PipeServer();
-   }
-   return 4;
-}
-
-
-// This is an example of an exported function.
-int SCRIPT_PIPE_DLL_API ExtensionModuleInit(int ix)
-{
-//   pExecFunc = NULL;
-   ix;// compiler food.
-
-#if defined(_DEBUG)
-   wxLogDebug(wxT("Got into DLL"));
-#endif
-
-   // Here is proof that the DLL was dynamically loaded and this Init function
-   // called.
-   wxDialog Dlg( (wxWindow*)NULL, (wxWindowID)-1, wxT("mod-script-pipe - Dialog Loaded by Plug In"), wxPoint(0,0));
-
-
-#if 0
-   ShuttleGui S( &Dlg, eIsCreating );
-   S.StartStatic( "Scripter Initialising" );
-   S.StartHorizontalLay();
-   S.Id(wxID_CANCEL).AddButton( "Cancel" ); 
-   S.Id(wxID_OK).AddButton( "OK" )->SetFocus(); 
-   S.EndHorizontalLay();
-   S.EndStatic();
-#endif
-
-   Dlg.Fit();
-   Dlg.Move( 100,100 );
-   int id = Dlg.ShowModal();
-printf("id = %d\n", id);
-   // return -1 for cancel, anything else for OK.
-//   return (id==wxID_CANCEL)?-1:42;
-   return 0;
-}
-
-
-}
-
diff --git a/lib-src/mod-script-pipe/ScripterCallback.h b/lib-src/mod-script-pipe/ScripterCallback.h
deleted file mode 100644
index d126d27..0000000
--- a/lib-src/mod-script-pipe/ScripterCallback.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// The following ifdef block is the standard way of creating macros which make exporting 
-// from a DLL simpler. All files within this DLL are compiled with the LIBSCRIPT_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see 
-// SCRIPT_PIPE_DLL_API functions as being imported from a DLL, wheras this DLL sees symbols
-// defined with this macro as being exported.
-
-
-/* Magic for dynamic library import and export. This is unfortunately
- * compiler-specific because there isn't a standard way to do it. Currently it
- * works with the Visual Studio compiler for windows, and for GCC 4+. Anything
- * else gets all symbols made public, which gets messy */
-/* The Visual Studio implementation */
-#ifdef _MSC_VER
-   #define SCRIPT_PIPE_DLL_IMPORT _declspec(dllimport)
-   #ifdef BUILDING_SCRIPT_PIPE
-      #define SCRIPT_PIPE_DLL_API _declspec(dllexport)
-   #elif _DLL
-      #define SCRIPT_PIPE_DLL_API _declspec(dllimport)
-   #else
-      #define AUDACITY_DLL_API
-   #endif
-#endif //_MSC_VER
-
-/* The GCC implementation */
-#ifdef CC_HASVISIBILITY // this is provided by the configure script, is only
-// enabled for suitable GCC versions
-/* The incantation is a bit weird here because it uses ELF symbol stuff. If we 
- * make a symbol "default" it makes it visible (for import or export). Making it
- * "hidden" means it is invisible outside the shared object. */
-   #define SCRIPT_PIPE_DLL_IMPORT __attribute__((visibility("default")))
-   #ifdef BUILDING_SCRIPT_PIPE
-      #define SCRIPT_PIPE_DLL_API __attribute__((visibility("default")))
-   #else
-      #define SCRIPT_PIPE_DLL_API __attribute__((visibility("default")))
-   #endif
-#endif
diff --git a/lib-src/mod-script-pipe/mod-script-pipe.vcproj b/lib-src/mod-script-pipe/mod-script-pipe.vcproj
deleted file mode 100644
index 0e1bd83..0000000
--- a/lib-src/mod-script-pipe/mod-script-pipe.vcproj
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod-script-pipe"
-	ProjectGUID="{85774A29-EA2F-4A40-994F-6BE593D847A5}"
-	RootNamespace="mod-script-pipe"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug wx284|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswd&quot;;&quot;$(WXWIN)\include&quot;"
-				PreprocessorDefinitions="BUILDING_SCRIPT_PIPE;WXUSINGDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxmsw28d_core.lib wxbase28d.lib odbc32.lib odbccp32.lib oldnames.lib comctl32.lib rpcrt4.lib wsock32.lib netapi32.lib"
-				OutputFile="$(OutDir)\modules\$(ProjectName).dll"
-				AdditionalLibraryDirectories="&quot;$(WXWIN)\lib\vc_dll&quot;"
-				GenerateDebugInformation="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Modular_Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswd&quot;;&quot;$(WXWIN)\include&quot;"
-				PreprocessorDefinitions="BUILDING_SCRIPT_PIPE;WXUSINGDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxmsw28d_core.lib wxbase28d.lib odbc32.lib odbccp32.lib oldnames.lib comctl32.lib rpcrt4.lib wsock32.lib netapi32.lib"
-				OutputFile="$(OutDir)\modules\$(ProjectName).dll"
-				AdditionalLibraryDirectories="&quot;$(WXWIN)\lib\vc_dll&quot;"
-				GenerateDebugInformation="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;h;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\PipeServer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ScripterCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ScripterCallback.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/lib-src/portaudio-v19/COMPILING.DARWIN b/lib-src/portaudio-v19/COMPILING.DARWIN
deleted file mode 100644
index 6d7aa87..0000000
--- a/lib-src/portaudio-v19/COMPILING.DARWIN
+++ /dev/null
@@ -1 +0,0 @@
-To compile on darwin, you will need to use the darwin makefile, gcc 3.3 or later and the universal SDK. for more info, see http://portaudio.com/trac/wiki/TutorialDir/Compile/MacintoshCoreAudio
diff --git a/lib-src/portaudio-v19/bindings/cpp/aclocal.m4 b/lib-src/portaudio-v19/bindings/cpp/aclocal.m4
deleted file mode 100644
index c4301f4..0000000
--- a/lib-src/portaudio-v19/bindings/cpp/aclocal.m4
+++ /dev/null
@@ -1,7571 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 52 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-_LT_REQUIRED_DARWIN_CHECKS
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
-#
-# Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
-#        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
-#        calls AC_LIBTOOL_CONFIG and creates libtool.
-#
-_LT_VERSION_CHECK
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_VERSION_CHECK
-# -----------------
-AC_DEFUN([_LT_VERSION_CHECK],
-[AC_MSG_CHECKING([for correct ltmain.sh version])
-if test "x$ltmain" = "x" ; then
-  AC_MSG_RESULT(no)
-  AC_MSG_ERROR([
-
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** \$ltmain is not defined, please check the patch for consistency! ***
-])
-fi
-gentoo_lt_version="1.5.26"
-gentoo_ltmain_version=`sed -n '/^[[ 	]]*VERSION=/{s/^[[ 	]]*VERSION=//;p;q;}' "$ltmain"`
-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-  AC_MSG_RESULT(no)
-  AC_MSG_ERROR([
-
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** libtool.m4 and ltmain.sh have a version mismatch! ***
-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
-
-Please run:
-
-  libtoolize --copy --force
-
-if appropriate, please contact the maintainer of this
-package (or your distribution) for help.
-])
-else
-  AC_MSG_RESULT(yes)
-fi
-])# _LT_VERSION_CHECK
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	      lt_cv_sys_max_cmd_len=$new_result &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix[[4-9]]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  :
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix[[3-9]]*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C++ 5.9
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-	  # Not sure whether something based on
-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	  # would be better.
-	  output_verbose_link_cmd='echo'
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	  # necessary to make sure instantiated templates are included
-	  # in the archive.
-	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	  ;;
-	esac
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The compiler driver will combine and reorder linker options,
-	    # but understands `-z linker_flag'.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	  case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	  esac
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([LT_AC_PROG_SED])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-m4_ifndef([_AS_TEST_PREPARE],
-[m4_defun([_AS_TEST_PREPARE],
-[if test -x / >/dev/null 2>&1; then
-  as_executable_p='test -x'
-else
-  as_executable_p='test -f'
-fi
-])])# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-m4_ifndef([AS_EXECUTABLE_P],
-[m4_defun([AS_EXECUTABLE_P],
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/lib-src/portaudio-v19/bindings/cpp/build/gnu/aclocal.m4 b/lib-src/portaudio-v19/bindings/cpp/build/gnu/aclocal.m4
deleted file mode 100644
index c80e0ac..0000000
--- a/lib-src/portaudio-v19/bindings/cpp/build/gnu/aclocal.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-
diff --git a/lib-src/portaudio-v19/bindings/cpp/configure b/lib-src/portaudio-v19/bindings/cpp/configure
index 0493cd1..28e7267 100755
--- a/lib-src/portaudio-v19/bindings/cpp/configure
+++ b/lib-src/portaudio-v19/bindings/cpp/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for PortAudioCpp 12.
+# Generated by GNU Autoconf 2.63 for PortAudioCpp 12.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -767,121 +789,133 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-SED
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-DSYMUTIL
-NMEDIT
-DLLTOOL
-AS
-OBJDUMP
-CPP
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-DEFAULT_INCLUDES
-PORTAUDIO_ROOT
-LT_VERSION_INFO
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+LT_VERSION_INFO
+PORTAUDIO_ROOT
+DEFAULT_INCLUDES
+LIBTOOL
+ac_ct_F77
+FFLAGS
+F77
+CXXCPP
+CPP
+OBJDUMP
+AS
+DLLTOOL
+NMEDIT
+DSYMUTIL
+RANLIB
+AR
+ECHO
+LN_S
+EGREP
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+enable_dependency_tracking
+enable_shared
+enable_static
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -902,6 +936,8 @@ FFLAGS'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1000,13 +1036,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1019,13 +1063,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1216,22 +1268,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1251,7 +1319,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1260,16 +1328,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1278,22 +1346,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1308,7 +1392,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1324,10 +1408,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1335,12 +1419,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1367,12 +1451,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1421,9 +1505,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1433,25 +1517,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/portaudiocpp]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/portaudiocpp]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1474,6 +1558,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -1519,15 +1604,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1563,7 +1650,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1573,10 +1660,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 PortAudioCpp configure 12
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1587,7 +1674,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by PortAudioCpp $as_me 12, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1623,7 +1710,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1658,7 +1745,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1710,11 +1797,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1744,9 +1832,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1761,9 +1849,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1779,8 +1867,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1822,21 +1910,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1846,16 +1937,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1869,29 +1960,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1901,10 +2001,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1958,8 +2060,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1985,11 +2087,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2018,17 +2121,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2041,8 +2156,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2052,8 +2167,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -2076,9 +2191,9 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -2089,26 +2204,23 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -2119,8 +2231,8 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
@@ -2160,10 +2272,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2176,7 +2288,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2187,22 +2299,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2219,12 +2332,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2240,8 +2353,8 @@ rmdir .tst 2>/dev/null
 # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2295,10 +2408,10 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2311,7 +2424,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2322,11 +2435,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2335,10 +2448,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2351,7 +2464,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2362,11 +2475,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2374,12 +2487,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2403,8 +2512,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2412,8 +2521,8 @@ else
   USE_MAINTAINER_MODE=no
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
 
 
 if test $USE_MAINTAINER_MODE = yes; then
@@ -2451,10 +2560,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2467,7 +2576,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2478,11 +2587,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2491,10 +2600,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2507,7 +2616,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2518,11 +2627,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2530,12 +2639,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2548,10 +2653,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2564,7 +2669,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2575,11 +2680,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2588,10 +2693,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2609,7 +2714,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2632,11 +2737,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2647,10 +2752,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2663,7 +2768,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2674,11 +2779,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2691,10 +2796,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2707,7 +2812,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2718,11 +2823,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2734,12 +2839,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2749,44 +2850,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2805,27 +2912,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2836,10 +2938,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2850,7 +2953,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2877,25 +2980,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2904,49 +3009,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2955,31 +3064,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3002,40 +3113,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3061,20 +3175,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3084,15 +3199,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3119,20 +3238,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3157,20 +3277,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3196,20 +3317,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3224,8 +3346,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3241,10 +3363,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3315,20 +3437,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3344,15 +3467,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3373,8 +3496,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3401,8 +3524,8 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3429,10 +3552,10 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3519,8 +3642,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 
@@ -3550,10 +3673,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -3566,7 +3689,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3577,11 +3700,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3594,10 +3717,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -3610,7 +3733,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3621,11 +3744,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3637,12 +3760,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -3652,43 +3771,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3714,20 +3837,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3737,15 +3861,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -3772,20 +3900,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -3810,20 +3939,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -3849,20 +3979,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3877,8 +4008,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -3902,10 +4033,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3992,8 +4123,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
 
@@ -4085,34 +4216,34 @@ fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -4129,27 +4260,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -4166,10 +4297,10 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -4222,45 +4353,40 @@ fi
 
 SED=$lt_cv_path_SED
 
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4275,74 +4401,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4357,33 +4469,24 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -4398,8 +4501,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4428,14 +4531,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -4465,19 +4568,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -4489,20 +4592,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -4519,10 +4622,10 @@ case $host_os in
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -4568,25 +4671,25 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -4769,8 +4872,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -4804,7 +4907,7 @@ ia64-*-hpux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -4819,11 +4922,11 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4822 "configure"' > conftest.$ac_ext
+  echo '#line 4925 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -4861,7 +4964,7 @@ s390*-*linux*|sparc*-*linux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
@@ -4911,10 +5014,10 @@ s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4943,26 +5046,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
@@ -4972,8 +5079,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -4985,7 +5092,7 @@ sparc*-*solaris*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -5007,10 +5114,10 @@ sparc*-*solaris*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@ -5023,7 +5130,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5034,11 +5141,11 @@ fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5047,10 +5154,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@ -5063,7 +5170,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5074,11 +5181,11 @@ fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -5086,12 +5193,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -5103,10 +5206,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
   ac_cv_prog_AS="$AS" # Let the user override the test.
@@ -5119,7 +5222,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5130,11 +5233,11 @@ fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+$as_echo "$AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5143,10 +5246,10 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
   ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
@@ -5159,7 +5262,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5170,11 +5273,11 @@ fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -5182,12 +5285,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -5199,10 +5298,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
@@ -5215,7 +5314,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5226,11 +5325,11 @@ fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-echo "${ECHO_T}$OBJDUMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5239,10 +5338,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
@@ -5255,7 +5354,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5266,11 +5365,11 @@ fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -5278,12 +5377,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -5304,15 +5399,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -5344,20 +5439,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5381,13 +5477,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -5395,7 +5492,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5420,8 +5517,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -5449,20 +5546,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5486,13 +5584,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -5500,7 +5599,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5516,11 +5615,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -5530,10 +5631,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5560,20 +5661,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -5665,37 +5767,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5717,11 +5822,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5739,20 +5844,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -5760,12 +5866,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5776,20 +5885,21 @@ done
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5805,32 +5915,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5844,69 +5955,73 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5923,11 +6038,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -5959,20 +6074,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5996,13 +6112,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -6010,7 +6127,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -6035,8 +6152,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -6064,20 +6181,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -6101,13 +6219,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -6115,7 +6234,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -6131,11 +6250,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=cpp
@@ -6156,10 +6277,10 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -6172,7 +6293,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6183,11 +6304,11 @@ fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6200,10 +6321,10 @@ if test -z "$F77"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -6216,7 +6337,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6227,11 +6348,11 @@ fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6243,12 +6364,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     F77=$ac_ct_F77
@@ -6257,37 +6374,41 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 rm -f a.out
 
@@ -6295,10 +6416,10 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
       program main
@@ -6314,20 +6435,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -6337,16 +6459,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   FFLAGS=-g
 cat >conftest.$ac_ext <<_ACEOF
@@ -6360,20 +6482,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_prog_f77_g=no
@@ -6382,8 +6505,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -6400,7 +6523,11 @@ else
   fi
 fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
+if test $ac_compiler_gnu = yes; then
+  G77=yes
+else
+  G77=
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6411,10 +6538,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     i=0
   teststring="ABCD"
@@ -6523,11 +6650,11 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
@@ -6535,10 +6662,10 @@ fi
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -6643,14 +6770,14 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -6705,7 +6832,7 @@ EOF
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -6740,17 +6867,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -6762,8 +6889,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -6814,10 +6941,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -6830,7 +6957,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6841,11 +6968,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6854,10 +6981,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -6870,7 +6997,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6881,11 +7008,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -6893,12 +7020,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6910,10 +7033,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -6926,7 +7049,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6937,11 +7060,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6950,10 +7073,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -6966,7 +7089,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6977,11 +7100,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -6989,12 +7112,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7006,10 +7125,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -7022,7 +7141,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7033,11 +7152,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7046,10 +7165,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -7062,7 +7181,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7073,11 +7192,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -7085,12 +7204,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -7153,10 +7268,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -7206,19 +7321,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -7268,11 +7383,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -7290,10 +7405,10 @@ esac
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@ -7306,7 +7421,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7317,11 +7432,11 @@ fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7330,10 +7445,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@ -7346,7 +7461,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7357,11 +7472,11 @@ fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7369,12 +7484,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7386,10 +7497,10 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@ -7402,7 +7513,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7413,11 +7524,11 @@ fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7426,10 +7537,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@ -7442,7 +7553,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7453,11 +7564,11 @@ fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7465,12 +7576,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7480,10 +7587,10 @@ else
 fi
 
 
-    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
 if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
@@ -7501,12 +7608,12 @@ else
    rm conftest.c
       fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
@@ -7533,33 +7640,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_ld_exported_symbols_list=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_ld_exported_symbols_list=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[0123])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -7622,17 +7733,17 @@ test -z "$pic_mode" && pic_mode=default
 #        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
 #        calls AC_LIBTOOL_CONFIG and creates libtool.
 #
-{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
-echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
+$as_echo_n "checking for correct ltmain.sh version... " >&6; }
 if test "x$ltmain" = "x" ; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error:
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  { { $as_echo "$as_me:$LINENO: error:
 
 *** [Gentoo] sanity check failed! ***
 *** \$ltmain is not defined, please check the patch for consistency! ***
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 
 *** [Gentoo] sanity check failed! ***
 *** \$ltmain is not defined, please check the patch for consistency! ***
@@ -7642,9 +7753,9 @@ fi
 gentoo_lt_version="1.5.26"
 gentoo_ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' "$ltmain"`
 if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error:
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  { { $as_echo "$as_me:$LINENO: error:
 
 *** [Gentoo] sanity check failed! ***
 *** libtool.m4 and ltmain.sh have a version mismatch! ***
@@ -7657,7 +7768,7 @@ Please run:
 if appropriate, please contact the maintainer of this
 package (or your distribution) for help.
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 
 *** [Gentoo] sanity check failed! ***
 *** libtool.m4 and ltmain.sh have a version mismatch! ***
@@ -7672,8 +7783,8 @@ package (or your distribution) for help.
 " >&2;}
    { (exit 1); exit 1; }; }
 else
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -7732,10 +7843,10 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -7750,11 +7861,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7753: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7864: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7757: \$? = $ac_status" >&5
+   echo "$as_me:7868: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7767,8 +7878,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -7782,8 +7893,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -8014,18 +8125,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
@@ -8040,11 +8151,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8043: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8047: \$? = $ac_status" >&5
+   echo "$as_me:8158: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8057,8 +8168,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -8085,10 +8196,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -8113,8 +8224,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -8123,10 +8234,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
@@ -8144,11 +8255,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8147: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8258: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8151: \$? = $ac_status" >&5
+   echo "$as_me:8262: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8170,34 +8281,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -8627,18 +8738,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8653,12 +8767,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8693,18 +8808,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8719,12 +8837,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9176,8 +9295,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -9197,15 +9316,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -9223,7 +9342,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -9235,16 +9354,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -9858,19 +9977,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -9882,8 +10001,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -9907,8 +10026,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -9921,13 +10040,13 @@ fi
 
 striplib=
 old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -9935,16 +10054,16 @@ else
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -9976,10 +10095,10 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -10011,33 +10130,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -10050,10 +10173,10 @@ fi
    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10106,38 +10229,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -10169,39 +10296,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10254,38 +10385,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -10317,39 +10452,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -10381,39 +10520,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -10445,33 +10588,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -10510,10 +10657,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -10521,7 +10668,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10524 "configure"
+#line 10671 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10587,7 +10734,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10605,15 +10752,15 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -10621,7 +10768,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10624 "configure"
+#line 10771 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10687,7 +10834,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10705,8 +10852,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -10728,13 +10875,13 @@ fi
 
 
 # Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -10754,15 +10901,15 @@ aix[4-9]*)
   fi
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -10855,8 +11002,8 @@ if test -f "$ltmain"; then
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -11268,18 +11415,18 @@ fi
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -11296,16 +11443,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -11448,8 +11595,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -11478,14 +11625,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -11515,19 +11662,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -11539,8 +11686,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -11590,8 +11737,8 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -11708,18 +11855,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11734,12 +11884,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11775,18 +11926,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11801,12 +11955,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12536,8 +12691,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -12556,7 +12711,7 @@ EOF
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -12712,8 +12867,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -12996,18 +13151,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
@@ -13022,11 +13177,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13025: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13180: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13029: \$? = $ac_status" >&5
+   echo "$as_me:13184: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13039,8 +13194,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -13067,10 +13222,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
@@ -13095,8 +13250,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -13105,10 +13260,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
@@ -13126,11 +13281,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13129: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13284: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13133: \$? = $ac_status" >&5
+   echo "$as_me:13288: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13152,34 +13307,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -13204,8 +13359,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -13225,15 +13380,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -13251,7 +13406,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -13263,16 +13418,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -13834,19 +13989,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -13858,8 +14013,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -13883,8 +14038,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -14422,13 +14577,13 @@ done
 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -14447,15 +14602,15 @@ aix[4-9]*)
   fi
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -14464,8 +14619,8 @@ lt_prog_compiler_wl_F77=
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -14696,18 +14851,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
@@ -14722,11 +14877,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14725: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14880: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14729: \$? = $ac_status" >&5
+   echo "$as_me:14884: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14739,8 +14894,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
@@ -14767,10 +14922,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
@@ -14795,8 +14950,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
@@ -14805,10 +14960,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
@@ -14826,11 +14981,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14829: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14984: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14833: \$? = $ac_status" >&5
+   echo "$as_me:14988: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14852,34 +15007,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -15299,18 +15454,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -15325,12 +15483,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15355,18 +15514,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -15381,12 +15543,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15838,8 +16001,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 #
@@ -15859,15 +16022,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -15885,7 +16048,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_F77=no
@@ -15897,16 +16060,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -16468,19 +16631,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -16492,8 +16655,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var_F77" || \
@@ -16517,8 +16680,8 @@ else
   # directories.
   hardcode_action_F77=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -17028,10 +17191,10 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -17046,11 +17209,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17049: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17212: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17053: \$? = $ac_status" >&5
+   echo "$as_me:17216: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17063,8 +17226,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -17078,8 +17241,8 @@ lt_prog_compiler_wl_GCJ=
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -17310,18 +17473,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
@@ -17336,11 +17499,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17339: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17502: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17343: \$? = $ac_status" >&5
+   echo "$as_me:17506: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17353,8 +17516,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
@@ -17381,10 +17544,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
@@ -17409,8 +17572,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
@@ -17419,10 +17582,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
@@ -17440,11 +17603,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17443: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17606: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17447: \$? = $ac_status" >&5
+   echo "$as_me:17610: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17466,34 +17629,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -17923,18 +18086,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -17949,12 +18115,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17989,18 +18156,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -18015,12 +18185,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -18472,8 +18643,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+$as_echo "$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
@@ -18493,15 +18664,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -18519,7 +18690,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_GCJ=no
@@ -18531,16 +18702,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -19102,19 +19273,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -19126,8 +19297,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var_GCJ" || \
@@ -19151,8 +19322,8 @@ else
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+$as_echo "$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -20075,8 +20246,8 @@ CC="$lt_save_CC"
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
       esac
@@ -20095,8 +20266,8 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -20166,11 +20337,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -20203,12 +20375,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -20225,6 +20397,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -20254,7 +20432,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -20266,40 +20444,41 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -20312,7 +20491,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -20322,7 +20501,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -20344,17 +20523,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -20370,8 +20577,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -20394,7 +20599,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -20407,17 +20612,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -20439,7 +20637,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -20490,7 +20688,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -20518,7 +20716,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -20531,19 +20728,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -20568,10 +20768,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -20594,7 +20794,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by PortAudioCpp $as_me 12, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -20607,27 +20807,34 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -20638,24 +20845,25 @@ $config_commands
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 PortAudioCpp config.status 12
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -20677,21 +20885,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -20710,27 +20921,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -20738,7 +20951,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -20752,8 +20965,8 @@ do
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "portaudiocpp.pc") CONFIG_FILES="$CONFIG_FILES portaudiocpp.pc" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -20793,220 +21006,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-AS!$AS$ac_delim
-OBJDUMP!$OBJDUMP$ac_delim
-CPP!$CPP$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-DEFAULT_INCLUDES!$DEFAULT_INCLUDES$ac_delim
-PORTAUDIO_ROOT!$PORTAUDIO_ROOT$ac_delim
-LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -21022,19 +21159,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -21063,26 +21202,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -21092,7 +21243,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -21118,7 +21269,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -21127,7 +21278,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -21148,17 +21299,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -21198,12 +21349,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -21212,13 +21364,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -21232,15 +21385,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -21250,26 +21404,33 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -21290,7 +21451,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -21334,7 +21495,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -21360,7 +21521,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -21369,7 +21530,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -21390,8 +21551,8 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -21408,6 +21569,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -21429,4 +21595,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/lib-src/portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj b/lib-src/portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj
deleted file mode 100644
index 64f7161..0000000
--- a/lib-src/portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj
+++ /dev/null
@@ -1,1218 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="PAStaticWMMEv19"
-	ProjectGUID="{7ABA0F80-94AE-4E82-AB89-2E1258212D59}"
-	RootNamespace="PAStaticWMMEv19"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/O2"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS=/I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19d.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS= /I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode_Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19ud.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS= /I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode_Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/O2"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19u.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS=/I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19d.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS= /I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug wx284|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19d.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS= /I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Modular_Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/O2"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../src/common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-				AssemblerListingLocation=".\$(ConfigurationName)/"
-				ObjectFile=".\$(ConfigurationName)/"
-				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="set CFLAGS=/I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\..\src\common\pa_allocation.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_allocation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_converters.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_converters.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_cpuload.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_cpuload.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_dither.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_dither.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_endianness.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_front.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_hostapi.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_process.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_process.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_skeleton.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_stream.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_stream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_trace.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_trace.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_types.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_util.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="hostapi"
-				>
-				<Filter
-					Name="wmme"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="wdmks"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\wdmks\pa_win_wdmks.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="dsound"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.h"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="asio"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.h"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\hostapi\asio\pa_asio.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DLL|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug wx284|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Modular_Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="os"
-				>
-				<File
-					RelativePath="..\..\src\os\win\pa_win_hostapis.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\os\win\pa_win_util.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\os\win\pa_win_waveformat.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\pa_win_waveformat.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\os\win\pa_win_wdmks_utils.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\os\win\pa_win_wdmks_utils.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\os\win\pa_x86_plain_converters.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\os\win\pa_x86_plain_converters.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Public Headers"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\include\pa_win_ds.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode_Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode_Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug DLL|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug wx284|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Modular_Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\pa_win_wmme.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\portaudio.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/lib-src/portaudio-v19/config.guess b/lib-src/portaudio-v19/config.guess
index 34093cc..2313a17 100755
--- a/lib-src/portaudio-v19/config.guess
+++ b/lib-src/portaudio-v19/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-07-22'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -549,7 +549,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -816,6 +816,9 @@ EOF
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -850,7 +853,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -971,8 +981,8 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-${LIBC}
 	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-${LIBC}
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -1493,9 +1503,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/lib-src/portaudio-v19/config.sub b/lib-src/portaudio-v19/config.sub
index 63cdd0a..ba16ebf 100755
--- a/lib-src/portaudio-v19/config.sub
+++ b/lib-src/portaudio-v19/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-06-28'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -668,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -831,6 +851,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1039,6 +1067,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
diff --git a/lib-src/portaudio-v19/configure b/lib-src/portaudio-v19/configure
index 968cece..ebb1bbd 100755
--- a/lib-src/portaudio-v19/configure
+++ b/lib-src/portaudio-v19/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -767,102 +789,126 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-SED
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-STRIP
-DSYMUTIL
-NMEDIT
-DLLTOOL
-AS
-OBJDUMP
-CPP
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-PKG_CONFIG
-JACK_CFLAGS
-JACK_LIBS
-LT_CURRENT
-LT_REVISION
-LT_AGE
-OTHER_OBJS
-PADLL
-SHARED_FLAGS
-THREAD_CFLAGS
-DLL_LIBS
-NASM
-NASMOPT
-subdirs
-ENABLE_CXX_TRUE
-ENABLE_CXX_FALSE
+enable_option_checking=no
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+ENABLE_CXX_FALSE
+ENABLE_CXX_TRUE
+subdirs
+NASMOPT
+NASM
+DLL_LIBS
+THREAD_CFLAGS
+SHARED_FLAGS
+PADLL
+OTHER_OBJS
+LT_AGE
+LT_REVISION
+LT_CURRENT
+JACK_LIBS
+JACK_CFLAGS
+PKG_CONFIG
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+LIBTOOL
+ac_ct_F77
+FFLAGS
+F77
+CXXCPP
+ac_ct_CXX
+CXXFLAGS
+CXX
+CPP
+OBJDUMP
+AS
+DLLTOOL
+NMEDIT
+DSYMUTIL
+STRIP
+RANLIB
+AR
+ECHO
+LN_S
+EGREP
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_alsa
+with_jack
+with_oss
+with_asihpi
+with_host_os
+with_winapi
+with_macapi
+with_asiodir
+with_dxdir
+enable_debug_output
+enable_cxx
+enable_mac_debug
+enable_mac_universal
+enable_shared
+enable_static
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -886,6 +932,8 @@ ac_subdirs_all='bindings/cpp'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -984,13 +1032,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1003,13 +1059,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1200,22 +1264,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1235,7 +1315,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1244,16 +1324,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1262,22 +1342,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1292,7 +1388,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1308,10 +1404,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1319,12 +1415,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1351,12 +1447,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1405,9 +1501,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1417,25 +1513,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1451,6 +1547,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug-output
@@ -1508,15 +1605,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1552,7 +1651,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1562,10 +1661,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1576,7 +1675,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1612,7 +1711,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1647,7 +1746,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1699,11 +1798,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1733,9 +1833,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1750,9 +1850,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1768,8 +1868,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1811,21 +1911,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1835,16 +1938,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1858,29 +1961,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1890,10 +2002,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2006,7 +2120,7 @@ if test "${enable_debug_output+set}" = set; then
   enableval=$enable_debug_output; if test x$enableval != xno ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define PA_ENABLE_DEBUG_OUTPUT
+#define PA_ENABLE_DEBUG_OUTPUT /**/
 _ACEOF
 
              fi
@@ -2047,10 +2161,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2063,7 +2177,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2074,11 +2188,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2087,10 +2201,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2103,7 +2217,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2114,11 +2228,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2126,12 +2240,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2144,10 +2254,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2160,7 +2270,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2171,11 +2281,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2184,10 +2294,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2205,7 +2315,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2228,11 +2338,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2243,10 +2353,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2259,7 +2369,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2270,11 +2380,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2287,10 +2397,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2303,7 +2413,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2314,11 +2424,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2330,12 +2440,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2345,44 +2451,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2401,27 +2513,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2432,10 +2539,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2446,7 +2554,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2473,25 +2581,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2500,49 +2610,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2551,31 +2665,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2598,40 +2714,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2657,20 +2776,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2680,15 +2800,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2715,20 +2839,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2753,20 +2878,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2792,20 +2918,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2820,8 +2947,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2837,10 +2964,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2911,20 +3038,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2940,15 +3068,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3049,8 +3177,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3065,34 +3193,34 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -3109,27 +3237,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -3146,10 +3274,10 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -3202,45 +3330,40 @@ fi
 
 SED=$lt_cv_path_SED
 
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3255,74 +3378,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3337,33 +3446,24 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -3378,8 +3478,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -3408,14 +3508,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -3445,19 +3545,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -3469,20 +3569,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -3499,10 +3599,10 @@ case $host_os in
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -3548,25 +3648,25 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -3749,8 +3849,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3784,7 +3884,7 @@ ia64-*-hpux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -3799,11 +3899,11 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3802 "configure"' > conftest.$ac_ext
+  echo '#line 3902 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -3841,7 +3941,7 @@ s390*-*linux*|sparc*-*linux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
@@ -3891,10 +3991,10 @@ s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3923,26 +4023,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
@@ -3952,8 +4056,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -3965,7 +4069,7 @@ sparc*-*solaris*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -3987,10 +4091,10 @@ sparc*-*solaris*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@ -4003,7 +4107,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4014,11 +4118,11 @@ fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4027,10 +4131,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@ -4043,7 +4147,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4054,11 +4158,11 @@ fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -4066,12 +4170,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -4083,10 +4183,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
   ac_cv_prog_AS="$AS" # Let the user override the test.
@@ -4099,7 +4199,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4110,11 +4210,11 @@ fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+$as_echo "$AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4123,10 +4223,10 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
   ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
@@ -4139,7 +4239,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4150,11 +4250,11 @@ fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -4162,12 +4262,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -4179,10 +4275,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
@@ -4195,7 +4291,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4206,11 +4302,11 @@ fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-echo "${ECHO_T}$OBJDUMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4219,10 +4315,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
@@ -4235,7 +4331,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4246,11 +4342,11 @@ fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -4258,12 +4354,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -4284,15 +4376,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4324,20 +4416,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4361,13 +4454,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4375,7 +4469,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4400,8 +4494,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4429,20 +4523,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4466,13 +4561,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4480,7 +4576,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4496,11 +4592,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -4510,10 +4608,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4540,20 +4638,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4645,37 +4744,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4697,11 +4799,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4719,20 +4821,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4740,12 +4843,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4756,20 +4862,21 @@ done
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4785,32 +4892,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4824,69 +4932,73 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4907,10 +5019,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -4923,7 +5035,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4934,11 +5046,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4951,10 +5063,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -4967,7 +5079,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4978,11 +5090,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4994,12 +5106,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -5009,43 +5117,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5071,20 +5183,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -5094,15 +5207,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -5129,20 +5246,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -5167,20 +5285,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -5206,20 +5325,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -5234,8 +5354,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -5267,11 +5387,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -5303,20 +5423,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5340,13 +5461,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -5354,7 +5476,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5379,8 +5501,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -5408,20 +5530,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5445,13 +5568,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -5459,7 +5583,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5475,11 +5599,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=cpp
@@ -5500,10 +5626,10 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -5516,7 +5642,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5527,11 +5653,11 @@ fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5544,10 +5670,10 @@ if test -z "$F77"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -5560,7 +5686,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5571,11 +5697,11 @@ fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5587,12 +5713,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     F77=$ac_ct_F77
@@ -5601,37 +5723,41 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 rm -f a.out
 
@@ -5639,10 +5765,10 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
       program main
@@ -5658,20 +5784,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -5681,16 +5808,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   FFLAGS=-g
 cat >conftest.$ac_ext <<_ACEOF
@@ -5704,20 +5831,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_prog_f77_g=no
@@ -5726,8 +5854,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -5744,7 +5872,11 @@ else
   fi
 fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
+if test $ac_compiler_gnu = yes; then
+  G77=yes
+else
+  G77=
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5755,10 +5887,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     i=0
   teststring="ABCD"
@@ -5867,11 +5999,11 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
@@ -5879,10 +6011,10 @@ fi
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -5987,14 +6119,14 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -6049,7 +6181,7 @@ EOF
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -6084,17 +6216,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -6106,8 +6238,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -6158,10 +6290,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -6174,7 +6306,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6185,11 +6317,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6198,10 +6330,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -6214,7 +6346,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6225,11 +6357,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -6237,12 +6369,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6254,10 +6382,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -6270,7 +6398,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6281,11 +6409,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6294,10 +6422,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -6310,7 +6438,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6321,11 +6449,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -6333,12 +6461,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -6350,10 +6474,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -6366,7 +6490,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6377,11 +6501,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6390,10 +6514,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -6406,7 +6530,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6417,11 +6541,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6429,12 +6553,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6497,10 +6617,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -6550,19 +6670,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -6612,11 +6732,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -6634,10 +6754,10 @@ esac
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@ -6650,7 +6770,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6661,11 +6781,11 @@ fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6674,10 +6794,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@ -6690,7 +6810,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6701,11 +6821,11 @@ fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -6713,12 +6833,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -6730,10 +6846,10 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@ -6746,7 +6862,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6757,11 +6873,11 @@ fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6770,10 +6886,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@ -6786,7 +6902,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6797,11 +6913,11 @@ fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -6809,12 +6925,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -6824,10 +6936,10 @@ else
 fi
 
 
-    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
 if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
@@ -6845,12 +6957,12 @@ else
    rm conftest.c
       fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
@@ -6877,33 +6989,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_ld_exported_symbols_list=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_ld_exported_symbols_list=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[0123])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -6966,17 +7082,17 @@ test -z "$pic_mode" && pic_mode=default
 #        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
 #        calls AC_LIBTOOL_CONFIG and creates libtool.
 #
-{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
-echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
+$as_echo_n "checking for correct ltmain.sh version... " >&6; }
 if test "x$ltmain" = "x" ; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error:
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  { { $as_echo "$as_me:$LINENO: error:
 
 *** [Gentoo] sanity check failed! ***
 *** \$ltmain is not defined, please check the patch for consistency! ***
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 
 *** [Gentoo] sanity check failed! ***
 *** \$ltmain is not defined, please check the patch for consistency! ***
@@ -6986,9 +7102,9 @@ fi
 gentoo_lt_version="1.5.26"
 gentoo_ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' "$ltmain"`
 if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error:
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  { { $as_echo "$as_me:$LINENO: error:
 
 *** [Gentoo] sanity check failed! ***
 *** libtool.m4 and ltmain.sh have a version mismatch! ***
@@ -7001,7 +7117,7 @@ Please run:
 if appropriate, please contact the maintainer of this
 package (or your distribution) for help.
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 
 *** [Gentoo] sanity check failed! ***
 *** libtool.m4 and ltmain.sh have a version mismatch! ***
@@ -7016,8 +7132,8 @@ package (or your distribution) for help.
 " >&2;}
    { (exit 1); exit 1; }; }
 else
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -7076,10 +7192,10 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -7094,11 +7210,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7097: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7213: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7101: \$? = $ac_status" >&5
+   echo "$as_me:7217: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7111,8 +7227,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -7126,8 +7242,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -7358,18 +7474,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
@@ -7384,11 +7500,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7387: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7503: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7391: \$? = $ac_status" >&5
+   echo "$as_me:7507: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7401,8 +7517,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -7429,10 +7545,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -7457,8 +7573,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -7467,10 +7583,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
@@ -7488,11 +7604,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7491: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7607: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7495: \$? = $ac_status" >&5
+   echo "$as_me:7611: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7514,34 +7630,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -7971,18 +8087,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -7997,12 +8116,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8037,18 +8157,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8063,12 +8186,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8520,8 +8644,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -8541,15 +8665,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -8567,7 +8691,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -8579,16 +8703,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -9202,19 +9326,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -9226,8 +9350,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -9251,8 +9375,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -9265,13 +9389,13 @@ fi
 
 striplib=
 old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -9279,16 +9403,16 @@ else
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -9320,10 +9444,10 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -9355,33 +9479,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -9394,10 +9522,10 @@ fi
    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9450,38 +9578,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -9513,39 +9645,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9598,38 +9734,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -9661,39 +9801,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -9725,39 +9869,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -9789,33 +9937,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -9854,10 +10006,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -9865,7 +10017,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9868 "configure"
+#line 10020 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9931,7 +10083,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -9949,15 +10101,15 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -9965,7 +10117,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9968 "configure"
+#line 10120 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10031,7 +10183,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10049,8 +10201,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -10072,13 +10224,13 @@ fi
 
 
 # Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -10098,15 +10250,15 @@ aix[4-9]*)
   fi
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -10199,8 +10351,8 @@ if test -f "$ltmain"; then
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -10612,18 +10764,18 @@ fi
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -10640,16 +10792,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -10792,8 +10944,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -10822,14 +10974,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -10859,19 +11011,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -10883,8 +11035,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -10934,8 +11086,8 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -11052,18 +11204,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11078,12 +11233,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11119,18 +11275,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11145,12 +11304,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11880,8 +12040,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -11900,7 +12060,7 @@ EOF
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -12056,8 +12216,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -12340,18 +12500,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
@@ -12366,11 +12526,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12529: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12373: \$? = $ac_status" >&5
+   echo "$as_me:12533: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12383,8 +12543,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -12411,10 +12571,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
@@ -12439,8 +12599,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -12449,10 +12609,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
@@ -12470,11 +12630,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12473: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12633: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12477: \$? = $ac_status" >&5
+   echo "$as_me:12637: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12496,34 +12656,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -12548,8 +12708,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -12569,15 +12729,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -12595,7 +12755,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -12607,16 +12767,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -13178,19 +13338,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -13202,8 +13362,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -13227,8 +13387,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -13766,13 +13926,13 @@ done
 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -13791,15 +13951,15 @@ aix[4-9]*)
   fi
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -13808,8 +13968,8 @@ lt_prog_compiler_wl_F77=
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -14040,18 +14200,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
@@ -14066,11 +14226,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14069: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14229: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14073: \$? = $ac_status" >&5
+   echo "$as_me:14233: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14083,8 +14243,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
@@ -14111,10 +14271,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
@@ -14139,8 +14299,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
@@ -14149,10 +14309,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
@@ -14170,11 +14330,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14173: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14333: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14177: \$? = $ac_status" >&5
+   echo "$as_me:14337: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14196,34 +14356,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -14643,18 +14803,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -14669,12 +14832,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14699,18 +14863,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -14725,12 +14892,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15182,8 +15350,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 #
@@ -15203,15 +15371,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -15229,7 +15397,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_F77=no
@@ -15241,16 +15409,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -15812,19 +15980,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -15836,8 +16004,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var_F77" || \
@@ -15861,8 +16029,8 @@ else
   # directories.
   hardcode_action_F77=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -16372,10 +16540,10 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -16390,11 +16558,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16393: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16561: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16397: \$? = $ac_status" >&5
+   echo "$as_me:16565: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16407,8 +16575,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -16422,8 +16590,8 @@ lt_prog_compiler_wl_GCJ=
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16654,18 +16822,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
@@ -16680,11 +16848,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16683: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16687: \$? = $ac_status" >&5
+   echo "$as_me:16855: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16697,8 +16865,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
@@ -16725,10 +16893,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
@@ -16753,8 +16921,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
@@ -16763,10 +16931,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
@@ -16784,11 +16952,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16787: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16955: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16791: \$? = $ac_status" >&5
+   echo "$as_me:16959: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16810,34 +16978,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -17267,18 +17435,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -17293,12 +17464,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17333,18 +17505,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -17359,12 +17534,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17816,8 +17992,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+$as_echo "$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
@@ -17837,15 +18013,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -17863,7 +18039,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_GCJ=no
@@ -17875,16 +18051,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -18446,19 +18622,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -18470,8 +18646,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var_GCJ" || \
@@ -18495,8 +18671,8 @@ else
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+$as_echo "$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -19419,8 +19595,8 @@ CC="$lt_save_CC"
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
       esac
@@ -19439,8 +19615,8 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -19487,11 +19663,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -19520,17 +19697,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -19543,8 +19732,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -19554,23 +19743,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $AR in
   [\\/]* | ?:[\\/]*)
@@ -19585,7 +19774,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19598,42 +19787,92 @@ esac
 fi
 AR=$ac_cv_path_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if [ $AR = "no" ] ; then
-    { { echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
-echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
+$as_echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -19645,33 +19884,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -19683,20 +19923,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -19704,29 +19945,69 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
   ;
   return 0;
 }
@@ -19737,30 +20018,101 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -19779,14 +20131,14 @@ int
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -19798,62 +20150,69 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
 
 cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
+#define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
 
 
-{ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -19885,42 +20244,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
   have_alsa=yes
 else
   have_alsa=no
 fi
 
-{ echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" >&5
-echo $ECHO_N "checking for HPI_SubSysCreate in -lhpi... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" >&5
+$as_echo_n "checking for HPI_SubSysCreate in -lhpi... " >&6; }
 if test "${ac_cv_lib_hpi_HPI_SubSysCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhpi -lm $LIBS"
@@ -19952,42 +20315,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hpi_HPI_SubSysCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_hpi_HPI_SubSysCreate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_hpi_HPI_SubSysCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_hpi_HPI_SubSysCreate" >&6; }
-if test $ac_cv_lib_hpi_HPI_SubSysCreate = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hpi_HPI_SubSysCreate" >&5
+$as_echo "$ac_cv_lib_hpi_HPI_SubSysCreate" >&6; }
+if test "x$ac_cv_lib_hpi_HPI_SubSysCreate" = x""yes; then
   have_asihpi=yes
 else
   have_asihpi=no
 fi
 
-{ echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
-echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
+$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
 if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio  $LIBS"
@@ -20019,33 +20386,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ossaudio__oss_ioctl=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ossaudio__oss_ioctl=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
-echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then
   have_libossaudio=yes
 else
   have_libossaudio=no
@@ -20059,10 +20430,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -20077,7 +20448,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -20089,11 +20460,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20102,10 +20473,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -20120,7 +20491,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -20132,11 +20503,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -20144,12 +20515,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -20161,58 +20528,54 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 
 fi
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for JACK" >&5
-echo $ECHO_N "checking for JACK... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$JACK_CFLAGS"; then
-        pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
+{ $as_echo "$as_me:$LINENO: checking for JACK" >&5
+$as_echo_n "checking for JACK... " >&6; }
+
+if test -n "$JACK_CFLAGS"; then
+    pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
   ($PKG_CONFIG --exists --print-errors "jack") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$JACK_LIBS"; then
-        pkg_cv_JACK_LIBS="$JACK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
+if test -n "$JACK_LIBS"; then
+    pkg_cv_JACK_LIBS="$JACK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack\"") >&5
   ($PKG_CONFIG --exists --print-errors "jack") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -20225,23 +20588,23 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack"`
+	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "jack" 2>&1`
         else
-	        JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack"`
+	        JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "jack" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JACK_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 have_jack=no
 elif test $pkg_failed = untried; then
 	have_jack=no
 else
 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
 	JACK_LIBS=$pkg_cv_JACK_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	have_jack=yes
 fi
 
@@ -20250,20 +20613,21 @@ fi
 
 for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20279,32 +20643,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20318,69 +20683,73 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -20389,68 +20758,14 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -20461,11 +20776,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -20478,13 +20792,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -20498,11 +20813,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -20515,20 +20829,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -20542,7 +20857,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -20552,11 +20867,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
 test_array [0] = 0
 
   ;
@@ -20569,13 +20883,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -20589,11 +20904,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -20606,20 +20920,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -20633,7 +20948,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -20653,11 +20968,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -20670,20 +20984,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -20694,11 +21009,13 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_short=0
    fi ;;
@@ -20711,9 +21028,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (short)); }
+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -20723,20 +21039,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (short))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -20749,43 +21067,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_short=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
 
@@ -20794,68 +21117,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -20866,11 +21135,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -20883,13 +21151,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -20903,11 +21172,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -20920,20 +21188,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -20947,7 +21216,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -20957,11 +21226,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
 test_array [0] = 0
 
   ;
@@ -20974,13 +21242,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -20994,11 +21263,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21011,20 +21279,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -21038,7 +21307,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -21058,11 +21327,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21075,20 +21343,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -21099,11 +21368,13 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_int=0
    fi ;;
@@ -21116,9 +21387,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (int)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -21128,20 +21398,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (int))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -21154,43 +21426,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
@@ -21199,68 +21476,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -21271,11 +21494,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -21288,13 +21510,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21308,11 +21531,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21325,20 +21547,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -21352,7 +21575,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -21362,11 +21585,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -21379,13 +21601,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21399,11 +21622,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21416,20 +21638,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -21443,7 +21666,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -21463,11 +21686,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21480,20 +21702,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -21504,11 +21727,13 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_long=0
    fi ;;
@@ -21521,9 +21746,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -21533,20 +21757,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -21559,43 +21785,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
@@ -21606,10 +21837,10 @@ _ACEOF
 
 
 save_LIBS="${LIBS}"
-{ echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
-echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
@@ -21641,33 +21872,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_rt_clock_gettime=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6; }
-if test $ac_cv_lib_rt_clock_gettime = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
   rt_libs=" -lrt"
 fi
 
@@ -21677,11 +21912,11 @@ DLL_LIBS="${DLL_LIBS}${rt_libs}"
 
 for ac_func in clock_gettime nanosleep
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21734,35 +21969,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -21920,10 +22162,10 @@ _ACEOF
 
   irix* )
 
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -21955,33 +22197,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -21989,16 +22235,16 @@ _ACEOF
   LIBS="-lpthread $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: IRIX posix thread library not found!" >&5
-echo "$as_me: error: IRIX posix thread library not found!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: IRIX posix thread library not found!" >&5
+$as_echo "$as_me: error: IRIX posix thread library not found!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for alOpenPort in -laudio" >&5
-echo $ECHO_N "checking for alOpenPort in -laudio... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for alOpenPort in -laudio" >&5
+$as_echo_n "checking for alOpenPort in -laudio... " >&6; }
 if test "${ac_cv_lib_audio_alOpenPort+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-laudio  $LIBS"
@@ -22030,33 +22276,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_audio_alOpenPort=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_audio_alOpenPort=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_audio_alOpenPort" >&5
-echo "${ECHO_T}$ac_cv_lib_audio_alOpenPort" >&6; }
-if test $ac_cv_lib_audio_alOpenPort = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audio_alOpenPort" >&5
+$as_echo "$ac_cv_lib_audio_alOpenPort" >&6; }
+if test "x$ac_cv_lib_audio_alOpenPort" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAUDIO 1
 _ACEOF
@@ -22064,16 +22314,16 @@ _ACEOF
   LIBS="-laudio $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: IRIX audio library not found!" >&5
-echo "$as_me: error: IRIX audio library not found!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: IRIX audio library not found!" >&5
+$as_echo "$as_me: error: IRIX audio library not found!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for dmGetUST in -ldmedia" >&5
-echo $ECHO_N "checking for dmGetUST in -ldmedia... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dmGetUST in -ldmedia" >&5
+$as_echo_n "checking for dmGetUST in -ldmedia... " >&6; }
 if test "${ac_cv_lib_dmedia_dmGetUST+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmedia  $LIBS"
@@ -22105,33 +22355,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dmedia_dmGetUST=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dmedia_dmGetUST=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dmedia_dmGetUST" >&5
-echo "${ECHO_T}$ac_cv_lib_dmedia_dmGetUST" >&6; }
-if test $ac_cv_lib_dmedia_dmGetUST = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmedia_dmGetUST" >&5
+$as_echo "$ac_cv_lib_dmedia_dmGetUST" >&6; }
+if test "x$ac_cv_lib_dmedia_dmGetUST" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDMEDIA 1
 _ACEOF
@@ -22139,8 +22393,8 @@ _ACEOF
   LIBS="-ldmedia $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: IRIX digital media library not found!" >&5
-echo "$as_me: error: IRIX digital media library not found!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: IRIX digital media library not found!" >&5
+$as_echo "$as_me: error: IRIX digital media library not found!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -22161,10 +22415,10 @@ _ACEOF
 
   *)
 
-        { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -22196,37 +22450,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
   have_pthread="yes"
 else
-  { { echo "$as_me:$LINENO: error: libpthread not found!" >&5
-echo "$as_me: error: libpthread not found!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: libpthread not found!" >&5
+$as_echo "$as_me: error: libpthread not found!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -22294,7 +22552,9 @@ esac
 CFLAGS="$CFLAGS $THREAD_CFLAGS"
 
 if test "$enable_cxx" = "yes"; then
-   subdirs="$subdirs bindings/cpp"
+
+
+subdirs="$subdirs bindings/cpp"
 
    ENABLE_CXX_TRUE=""
    ENABLE_CXX_FALSE="#"
@@ -22334,11 +22594,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -22371,12 +22632,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -22393,6 +22654,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -22422,7 +22689,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -22434,12 +22701,14 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
+
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -22452,7 +22721,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -22462,7 +22731,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -22484,17 +22753,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -22510,8 +22807,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -22534,7 +22829,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -22547,17 +22842,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -22579,7 +22867,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -22630,7 +22918,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -22658,7 +22946,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -22671,19 +22958,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -22708,10 +22998,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -22734,7 +23024,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22747,26 +23037,33 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -22774,24 +23071,24 @@ $config_files
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -22813,21 +23110,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -22846,30 +23146,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -22878,8 +23180,8 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "portaudio-2.0.pc") CONFIG_FILES="$CONFIG_FILES portaudio-2.0.pc" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -22918,160 +23220,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-STRIP!$STRIP$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-AS!$AS$ac_delim
-OBJDUMP!$OBJDUMP$ac_delim
-CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-JACK_CFLAGS!$JACK_CFLAGS$ac_delim
-JACK_LIBS!$JACK_LIBS$ac_delim
-LT_CURRENT!$LT_CURRENT$ac_delim
-LT_REVISION!$LT_REVISION$ac_delim
-LT_AGE!$LT_AGE$ac_delim
-OTHER_OBJS!$OTHER_OBJS$ac_delim
-PADLL!$PADLL$ac_delim
-SHARED_FLAGS!$SHARED_FLAGS$ac_delim
-THREAD_CFLAGS!$THREAD_CFLAGS$ac_delim
-DLL_LIBS!$DLL_LIBS$ac_delim
-NASM!$NASM$ac_delim
-NASMOPT!$NASMOPT$ac_delim
-subdirs!$subdirs$ac_delim
-ENABLE_CXX_TRUE!$ENABLE_CXX_TRUE$ac_delim
-ENABLE_CXX_FALSE!$ENABLE_CXX_FALSE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -23087,19 +23373,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -23128,26 +23416,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -23157,7 +23457,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23183,7 +23483,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -23192,7 +23492,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23213,17 +23513,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -23263,12 +23563,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -23277,13 +23578,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -23297,15 +23599,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -23315,21 +23618,28 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -23344,6 +23654,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -23371,7 +23686,8 @@ fi
 #
 if test "$no_recursion" != yes; then
 
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
+  # so they do not pile up.
   ac_sub_configure_args=
   ac_prev=
   eval "set x $ac_configure_args"
@@ -23400,9 +23716,11 @@ if test "$no_recursion" != yes; then
       ac_prev=prefix ;;
     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
       ;;
+    --disable-option-checking)
+      ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
     esac
@@ -23412,7 +23730,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -23421,6 +23739,10 @@ if test "$no_recursion" != yes; then
     ac_sub_configure_args="--silent $ac_sub_configure_args"
   fi
 
+  # Always prepend --disable-option-checking to silence warnings, since
+  # different subdirs can have different --enable and --with options.
+  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
+
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
@@ -23429,8 +23751,8 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    echo "$as_me:$LINENO: $ac_msg" >&5
-    echo "$ac_msg" >&6
+    $as_echo "$as_me:$LINENO: $ac_msg" >&5
+    $as_echo "$ac_msg" >&6
     { as_dir="$ac_dir"
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
@@ -23439,7 +23761,7 @@ if test "$no_recursion" != yes; then
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -23448,7 +23770,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23469,17 +23791,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -23518,8 +23840,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/configure
     else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -23532,17 +23854,21 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
     cd "$ac_popdir"
   done
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/lib-src/portaudio-v19/include/pa_asio.h b/lib-src/portaudio-v19/include/pa_asio.h
index b9e595a..3b8f543 100644
--- a/lib-src/portaudio-v19/include/pa_asio.h
+++ b/lib-src/portaudio-v19/include/pa_asio.h
@@ -1,7 +1,7 @@
 #ifndef PA_ASIO_H
 #define PA_ASIO_H
 /*
- * $Id: pa_asio.h,v 1.7 2008/03/18 12:36:27 richardash1981 Exp $
+ * $Id: pa_asio.h,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * ASIO specific extensions
  *
diff --git a/lib-src/portaudio-v19/include/pa_linux_alsa.h b/lib-src/portaudio-v19/include/pa_linux_alsa.h
index 8f46327..613ab60 100644
--- a/lib-src/portaudio-v19/include/pa_linux_alsa.h
+++ b/lib-src/portaudio-v19/include/pa_linux_alsa.h
@@ -2,7 +2,7 @@
 #define PA_LINUX_ALSA_H
 
 /*
- * $Id: pa_linux_alsa.h,v 1.8 2008/03/18 12:36:27 richardash1981 Exp $
+ * $Id: pa_linux_alsa.h,v 1.9 2008/12/31 15:38:31 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * ALSA-specific extensions
  *
diff --git a/lib-src/portaudio-v19/include/pa_unix_oss.h b/lib-src/portaudio-v19/include/pa_unix_oss.h
index 9a05dc0..c87e434 100644
--- a/lib-src/portaudio-v19/include/pa_unix_oss.h
+++ b/lib-src/portaudio-v19/include/pa_unix_oss.h
@@ -2,7 +2,7 @@
 #define PA_UNIX_OSS_H
 
 /*
- * $Id: pa_unix_oss.h,v 1.5 2008/03/18 12:36:28 richardash1981 Exp $
+ * $Id: pa_unix_oss.h,v 1.6 2008/12/31 15:38:31 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * OSS-specific extensions
  *
@@ -54,7 +54,7 @@ const char *PaOSS_GetStreamOutputDevice( PaStream *s );
 #define PA_UNIX_OSS_H
 
 /*
- * $Id: pa_unix_oss.h,v 1.5 2008/03/18 12:36:28 richardash1981 Exp $
+ * $Id: pa_unix_oss.h,v 1.6 2008/12/31 15:38:31 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * OSS-specific extensions
  *
diff --git a/lib-src/portaudio-v19/include/pa_win_ds.h b/lib-src/portaudio-v19/include/pa_win_ds.h
index 04fda98..4921a03 100644
--- a/lib-src/portaudio-v19/include/pa_win_ds.h
+++ b/lib-src/portaudio-v19/include/pa_win_ds.h
@@ -1,7 +1,7 @@
 #ifndef PA_WIN_DS_H
 #define PA_WIN_DS_H
 /*
- * $Id: pa_win_ds.h,v 1.6 2008/06/01 06:57:28 llucius Exp $
+ * $Id: pa_win_ds.h,v 1.8 2009/01/01 22:31:28 martynshaw Exp $
  * PortAudio Portable Real-Time Audio Library
  * DirectSound specific extensions
  *
@@ -28,13 +28,13 @@
  */
 
 /*
- * The text above constitutes the entire PortAudio license; however, 
+ * The text above constitutes the entire PortAudio license; however,
  * the PortAudio community also makes the following non-binding requests:
  *
  * Any person wishing to distribute modifications to the Software is
  * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
  * license above.
  */
 
@@ -83,7 +83,7 @@ typedef struct PaWinDirectSoundStreamInfo{
 
     /*
         support for WAVEFORMATEXTENSIBLE channel masks. If flags contains
-        paWinDirectSoundUseChannelMask this allows you to specify which speakers 
+        paWinDirectSoundUseChannelMask this allows you to specify which speakers
         to address in a multichannel stream. Constants for channelMask
         are specified in pa_win_waveformat.h
 
@@ -113,4 +113,4 @@ LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s );
 }
 #endif /* __cplusplus */
 
-#endif /* PA_WIN_DS_H */                                  
+#endif /* PA_WIN_DS_H */
diff --git a/lib-src/portaudio-v19/include/pa_win_waveformat.h b/lib-src/portaudio-v19/include/pa_win_waveformat.h
index 5d9bdde..6f65834 100644
--- a/lib-src/portaudio-v19/include/pa_win_waveformat.h
+++ b/lib-src/portaudio-v19/include/pa_win_waveformat.h
@@ -29,13 +29,13 @@
  */
 
 /*
- * The text above constitutes the entire PortAudio license; however, 
+ * The text above constitutes the entire PortAudio license; however,
  * the PortAudio community also makes the following non-binding requests:
  *
  * Any person wishing to distribute modifications to the Software is
  * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
  * license above.
  */
 
@@ -125,11 +125,11 @@ typedef unsigned long PaWinWaveFormatChannelMask;
 
 /*
 	PaWinWaveFormat is defined here to provide compatibility with
-	compilation environments which don't have headers defining 
+	compilation environments which don't have headers defining
 	WAVEFORMATEXTENSIBLE (e.g. older versions of MSVC, Borland C++ etc.
 
 	The fields for WAVEFORMATEX and WAVEFORMATEXTENSIBLE are declared as an
-    unsigned char array here to avoid clients who include this file having 
+    unsigned char array here to avoid clients who include this file having
     a dependency on windows.h and mmsystem.h, and also to to avoid having
     to write separate packing pragmas for each compiler.
 */
@@ -138,18 +138,18 @@ typedef unsigned long PaWinWaveFormatChannelMask;
 
 typedef struct{
     unsigned char fields[ PAWIN_SIZEOF_WAVEFORMATEXTENSIBLE ];
-    unsigned long extraLongForAlignment; /* ensure that compiler aligns struct to DWORD */ 
+    unsigned long extraLongForAlignment; /* ensure that compiler aligns struct to DWORD */
 } PaWinWaveFormat;
 
 /*
     WAVEFORMATEXTENSIBLE fields:
-    
+
     union  {
-	    WORD  wValidBitsPerSample;    
-	    WORD  wSamplesPerBlock;    
-	    WORD  wReserved;  
+	    WORD  wValidBitsPerSample;
+	    WORD  wSamplesPerBlock;
+	    WORD  wReserved;
     } Samples;
-    DWORD  dwChannelMask;  
+    DWORD  dwChannelMask;
     GUID  SubFormat;
 */
 
@@ -161,11 +161,11 @@ typedef struct{
 	Use the following two functions to initialize the waveformat structure.
 */
 
-void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, 
+void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat,
 		int numChannels, PaSampleFormat sampleFormat, double sampleRate );
 
 
-void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, 
+void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat,
 		int numChannels, PaSampleFormat sampleFormat, double sampleRate,
 	    PaWinWaveFormatChannelMask channelMask );
 
diff --git a/lib-src/portaudio-v19/include/pa_win_wmme.h b/lib-src/portaudio-v19/include/pa_win_wmme.h
index ad44421..6449c09 100644
--- a/lib-src/portaudio-v19/include/pa_win_wmme.h
+++ b/lib-src/portaudio-v19/include/pa_win_wmme.h
@@ -1,7 +1,7 @@
 #ifndef PA_WIN_WMME_H
 #define PA_WIN_WMME_H
 /*
- * $Id: pa_win_wmme.h,v 1.7 2008/03/18 12:36:28 richardash1981 Exp $
+ * $Id: pa_win_wmme.h,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * MME specific extensions
  *
diff --git a/lib-src/portaudio-v19/include/portaudio.h b/lib-src/portaudio-v19/include/portaudio.h
index e89cf9d..88688a1 100644
--- a/lib-src/portaudio-v19/include/portaudio.h
+++ b/lib-src/portaudio-v19/include/portaudio.h
@@ -1,7 +1,7 @@
 #ifndef PORTAUDIO_H
 #define PORTAUDIO_H
 /*
- * $Id: portaudio.h,v 1.9 2008/03/18 12:36:28 richardash1981 Exp $
+ * $Id: portaudio.h,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * PortAudio API Header File
  * Latest version available at: http://www.portaudio.com/
diff --git a/lib-src/portaudio-v19/pablio/pablio.c b/lib-src/portaudio-v19/pablio/pablio.c
index 9e2bcdd..6c7ac76 100644
--- a/lib-src/portaudio-v19/pablio/pablio.c
+++ b/lib-src/portaudio-v19/pablio/pablio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pablio.c,v 1.9 2008/03/18 12:36:29 richardash1981 Exp $
+ * $Id: pablio.c,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * pablio.c
  * Portable Audio Blocking Input/Output utility.
  *
diff --git a/lib-src/portaudio-v19/pablio/pablio.h b/lib-src/portaudio-v19/pablio/pablio.h
index 035a6fa..0885599 100644
--- a/lib-src/portaudio-v19/pablio/pablio.h
+++ b/lib-src/portaudio-v19/pablio/pablio.h
@@ -7,7 +7,7 @@ extern "C"
 #endif /* __cplusplus */
 
 /*
- * $Id: pablio.h,v 1.9 2008/03/18 12:36:29 richardash1981 Exp $
+ * $Id: pablio.h,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * PABLIO.h
  * Portable Audio Blocking read/write utility.
  *
diff --git a/lib-src/portaudio-v19/pablio/test_rw.c b/lib-src/portaudio-v19/pablio/test_rw.c
index c4a226c..cfe57e5 100644
--- a/lib-src/portaudio-v19/pablio/test_rw.c
+++ b/lib-src/portaudio-v19/pablio/test_rw.c
@@ -1,5 +1,5 @@
 /*
- * $Id: test_rw.c,v 1.9 2008/03/18 12:36:29 richardash1981 Exp $
+ * $Id: test_rw.c,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * test_rw.c
  * Read input from one stream and write it to another.
  *
diff --git a/lib-src/portaudio-v19/pablio/test_rw_echo.c b/lib-src/portaudio-v19/pablio/test_rw_echo.c
index 0d4f670..826f01f 100644
--- a/lib-src/portaudio-v19/pablio/test_rw_echo.c
+++ b/lib-src/portaudio-v19/pablio/test_rw_echo.c
@@ -1,5 +1,5 @@
 /*
- * $Id: test_rw_echo.c,v 1.9 2008/03/18 12:36:29 richardash1981 Exp $
+ * $Id: test_rw_echo.c,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * test_rw_echo.c
  * Echo delayed input to output.
  *
diff --git a/lib-src/portaudio-v19/pablio/test_w_saw.c b/lib-src/portaudio-v19/pablio/test_w_saw.c
index f44bcac..4ddeebf 100644
--- a/lib-src/portaudio-v19/pablio/test_w_saw.c
+++ b/lib-src/portaudio-v19/pablio/test_w_saw.c
@@ -1,5 +1,5 @@
 /*
- * $Id: test_w_saw.c,v 1.9 2008/03/18 12:36:29 richardash1981 Exp $
+ * $Id: test_w_saw.c,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * test_w_saw.c
  * Generate stereo sawtooth waveforms.
  *
diff --git a/lib-src/portaudio-v19/pablio/test_w_saw8.c b/lib-src/portaudio-v19/pablio/test_w_saw8.c
index 09bc30a..c742fb0 100644
--- a/lib-src/portaudio-v19/pablio/test_w_saw8.c
+++ b/lib-src/portaudio-v19/pablio/test_w_saw8.c
@@ -1,5 +1,5 @@
 /*
- * $Id: test_w_saw8.c,v 1.9 2008/03/18 12:36:29 richardash1981 Exp $
+ * $Id: test_w_saw8.c,v 1.10 2008/12/31 15:38:31 richardash1981 Exp $
  * test_w_saw8.c
  * Generate stereo 8 bit sawtooth waveforms.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_allocation.c b/lib-src/portaudio-v19/src/common/pa_allocation.c
index 8b1f189..6f004e2 100644
--- a/lib-src/portaudio-v19/src/common/pa_allocation.c
+++ b/lib-src/portaudio-v19/src/common/pa_allocation.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_allocation.c,v 1.7 2008/03/18 12:36:30 richardash1981 Exp $
+ * $Id: pa_allocation.c,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * Portable Audio I/O Library allocation group implementation
  * memory allocation group for tracking allocation groups
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_allocation.h b/lib-src/portaudio-v19/src/common/pa_allocation.h
index 3748ca3..723a5a9 100644
--- a/lib-src/portaudio-v19/src/common/pa_allocation.h
+++ b/lib-src/portaudio-v19/src/common/pa_allocation.h
@@ -1,7 +1,7 @@
 #ifndef PA_ALLOCATION_H
 #define PA_ALLOCATION_H
 /*
- * $Id: pa_allocation.h,v 1.7 2008/03/18 12:36:30 richardash1981 Exp $
+ * $Id: pa_allocation.h,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * Portable Audio I/O Library allocation context header
  * memory allocation context for tracking allocation groups
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_converters.c b/lib-src/portaudio-v19/src/common/pa_converters.c
index 71a967e..2a047e6 100644
--- a/lib-src/portaudio-v19/src/common/pa_converters.c
+++ b/lib-src/portaudio-v19/src/common/pa_converters.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_converters.c,v 1.7 2008/03/18 12:36:30 richardash1981 Exp $
+ * $Id: pa_converters.c,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * Portable Audio I/O Library sample conversion mechanism
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/common/pa_converters.h b/lib-src/portaudio-v19/src/common/pa_converters.h
index 76f39ff..4090112 100644
--- a/lib-src/portaudio-v19/src/common/pa_converters.h
+++ b/lib-src/portaudio-v19/src/common/pa_converters.h
@@ -1,7 +1,7 @@
 #ifndef PA_CONVERTERS_H
 #define PA_CONVERTERS_H
 /*
- * $Id: pa_converters.h,v 1.7 2008/03/18 12:36:30 richardash1981 Exp $
+ * $Id: pa_converters.h,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * Portable Audio I/O Library sample conversion mechanism
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/common/pa_cpuload.c b/lib-src/portaudio-v19/src/common/pa_cpuload.c
index 15e3ea0..3db4ebc 100644
--- a/lib-src/portaudio-v19/src/common/pa_cpuload.c
+++ b/lib-src/portaudio-v19/src/common/pa_cpuload.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_cpuload.c,v 1.7 2008/03/18 12:36:30 richardash1981 Exp $
+ * $Id: pa_cpuload.c,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * Portable Audio I/O Library CPU Load measurement functions
  * Portable CPU load measurement facility.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_cpuload.h b/lib-src/portaudio-v19/src/common/pa_cpuload.h
index f50e6c6..753e481 100644
--- a/lib-src/portaudio-v19/src/common/pa_cpuload.h
+++ b/lib-src/portaudio-v19/src/common/pa_cpuload.h
@@ -1,7 +1,7 @@
 #ifndef PA_CPULOAD_H
 #define PA_CPULOAD_H
 /*
- * $Id: pa_cpuload.h,v 1.7 2008/03/18 12:36:30 richardash1981 Exp $
+ * $Id: pa_cpuload.h,v 1.8 2008/12/31 15:38:31 richardash1981 Exp $
  * Portable Audio I/O Library CPU Load measurement functions
  * Portable CPU load measurement facility.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_debugprint.c b/lib-src/portaudio-v19/src/common/pa_debugprint.c
index 29aa613..b94b69e 100644
--- a/lib-src/portaudio-v19/src/common/pa_debugprint.c
+++ b/lib-src/portaudio-v19/src/common/pa_debugprint.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_debugprint.c,v 1.8 2008/05/28 22:58:14 martynshaw Exp $
+ * $Id: pa_debugprint.c,v 1.10 2009/01/01 22:31:28 martynshaw Exp $
  * Portable Audio I/O Library Multi-Host API front end
  * Validate function parameters and manage multiple host APIs.
  *
@@ -74,7 +74,10 @@ void PaUtil_SetDebugPrintFunction(PaUtilLogCallback cb)
  VERY dangerous alternative, vsprintf (with no n)
  */
 
-#if (_MSC_VER) && (_MSC_VER <= 1400)
+#if _MSC_VER
+/* Some Windows Mobile SDKs don't define vsnprintf but all define _vsnprintf (hopefully).
+   According to MSDN "vsnprintf is identical to _vsnprintf". So we use _vsnprintf with MSC.
+*/
 #define VSNPRINTF  _vsnprintf
 #else
 #define VSNPRINTF  vsnprintf
diff --git a/lib-src/portaudio-v19/src/common/pa_debugprint.h b/lib-src/portaudio-v19/src/common/pa_debugprint.h
index 5fba766..48262a6 100644
--- a/lib-src/portaudio-v19/src/common/pa_debugprint.h
+++ b/lib-src/portaudio-v19/src/common/pa_debugprint.h
@@ -101,7 +101,7 @@ void PaUtil_DebugPrint( const char *format, ... );
 
 
 #ifdef PA_LOG_API_CALLS
-#define PA_LOGAPI(x) PaUtil_DebugPrint x 
+#define PA_LOGAPI(x) PaUtil_DebugPrint x
 
 #define PA_LOGAPI_ENTER(functionName) PaUtil_DebugPrint( functionName " called.\n" )
 
@@ -133,7 +133,7 @@ void PaUtil_DebugPrint( const char *format, ... );
 #define PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( functionName, positiveResultFormatString, result )
 #endif
 
-    
+
 typedef void (*PaUtilLogCallback ) (const char *log);
 
 /**
diff --git a/lib-src/portaudio-v19/src/common/pa_dither.c b/lib-src/portaudio-v19/src/common/pa_dither.c
index 91cba92..039fc17 100644
--- a/lib-src/portaudio-v19/src/common/pa_dither.c
+++ b/lib-src/portaudio-v19/src/common/pa_dither.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_dither.c,v 1.7 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_dither.c,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library triangular dither generator
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/common/pa_dither.h b/lib-src/portaudio-v19/src/common/pa_dither.h
index 8bcc08e..348d2b6 100644
--- a/lib-src/portaudio-v19/src/common/pa_dither.h
+++ b/lib-src/portaudio-v19/src/common/pa_dither.h
@@ -1,7 +1,7 @@
 #ifndef PA_DITHER_H
 #define PA_DITHER_H
 /*
- * $Id: pa_dither.h,v 1.7 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_dither.h,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library triangular dither generator
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/common/pa_endianness.h b/lib-src/portaudio-v19/src/common/pa_endianness.h
index 1940348..4813900 100644
--- a/lib-src/portaudio-v19/src/common/pa_endianness.h
+++ b/lib-src/portaudio-v19/src/common/pa_endianness.h
@@ -1,7 +1,7 @@
 #ifndef PA_ENDIANNESS_H
 #define PA_ENDIANNESS_H
 /*
- * $Id: pa_endianness.h,v 1.8 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_endianness.h,v 1.9 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library current platform endianness macros
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/common/pa_front.c b/lib-src/portaudio-v19/src/common/pa_front.c
index c485dda..5acb764 100644
--- a/lib-src/portaudio-v19/src/common/pa_front.c
+++ b/lib-src/portaudio-v19/src/common/pa_front.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_front.c,v 1.10 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_front.c,v 1.11 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library Multi-Host API front end
  * Validate function parameters and manage multiple host APIs.
  *
@@ -90,7 +90,7 @@
 
 
 #define PA_VERSION_  1899
-#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__  ")"
+#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__  " " __TIME__ ")"
 
 
 
@@ -1508,7 +1508,7 @@ const PaStreamInfo* Pa_GetStreamInfo( PaStream *stream )
         result = 0;
 
         PA_LOGAPI(("Pa_GetStreamInfo returned:\n" ));
-        PA_LOGAPI(("\tconst PaStreamInfo*: 0 [PaError error:%d ( %s )]\n", result, error, Pa_GetErrorText( error ) ));
+        PA_LOGAPI(("\tconst PaStreamInfo*: 0 [PaError error:%d ( %s )]\n", error, Pa_GetErrorText( error ) ));
 
     }
     else
diff --git a/lib-src/portaudio-v19/src/common/pa_hostapi.h b/lib-src/portaudio-v19/src/common/pa_hostapi.h
index e8485f6..36764d2 100644
--- a/lib-src/portaudio-v19/src/common/pa_hostapi.h
+++ b/lib-src/portaudio-v19/src/common/pa_hostapi.h
@@ -1,7 +1,7 @@
 #ifndef PA_HOSTAPI_H
 #define PA_HOSTAPI_H
 /*
- * $Id: pa_hostapi.h,v 1.7 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_hostapi.h,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library
  * host api representation
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_memorybarrier.h b/lib-src/portaudio-v19/src/common/pa_memorybarrier.h
index 3c4cdfd..d36a1b2 100644
--- a/lib-src/portaudio-v19/src/common/pa_memorybarrier.h
+++ b/lib-src/portaudio-v19/src/common/pa_memorybarrier.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_memorybarrier.h,v 1.2 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_memorybarrier.h,v 1.3 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library
  * Memory barrier utilities
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_process.c b/lib-src/portaudio-v19/src/common/pa_process.c
index 6a0abde..1667947 100644
--- a/lib-src/portaudio-v19/src/common/pa_process.c
+++ b/lib-src/portaudio-v19/src/common/pa_process.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_process.c,v 1.7 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_process.c,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library
  * streamCallback <-> host buffer processing adapter
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_process.h b/lib-src/portaudio-v19/src/common/pa_process.h
index c4d2762..f3f8ca9 100644
--- a/lib-src/portaudio-v19/src/common/pa_process.h
+++ b/lib-src/portaudio-v19/src/common/pa_process.h
@@ -1,7 +1,7 @@
 #ifndef PA_PROCESS_H
 #define PA_PROCESS_H
 /*
- * $Id: pa_process.h,v 1.7 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_process.h,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library callback buffer processing adapters
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/common/pa_ringbuffer.c b/lib-src/portaudio-v19/src/common/pa_ringbuffer.c
index 4a36b8c..d22b878 100644
--- a/lib-src/portaudio-v19/src/common/pa_ringbuffer.c
+++ b/lib-src/portaudio-v19/src/common/pa_ringbuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_ringbuffer.c,v 1.7 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_ringbuffer.c,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library
  * Ring Buffer utility.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_ringbuffer.h b/lib-src/portaudio-v19/src/common/pa_ringbuffer.h
index 81a65dc..d876ed5 100644
--- a/lib-src/portaudio-v19/src/common/pa_ringbuffer.h
+++ b/lib-src/portaudio-v19/src/common/pa_ringbuffer.h
@@ -1,7 +1,7 @@
 #ifndef PA_RINGBUFFER_H
 #define PA_RINGBUFFER_H
 /*
- * $Id: pa_ringbuffer.h,v 1.5 2008/03/18 12:36:31 richardash1981 Exp $
+ * $Id: pa_ringbuffer.h,v 1.6 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library
  * Ring Buffer utility.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_skeleton.c b/lib-src/portaudio-v19/src/common/pa_skeleton.c
index 230f83b..4ad506d 100644
--- a/lib-src/portaudio-v19/src/common/pa_skeleton.c
+++ b/lib-src/portaudio-v19/src/common/pa_skeleton.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_skeleton.c,v 1.7 2008/03/18 12:36:32 richardash1981 Exp $
+ * $Id: pa_skeleton.c,v 1.8 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library skeleton implementation
  * demonstrates how to use the common functions to implement support
  * for a host API
diff --git a/lib-src/portaudio-v19/src/common/pa_stream.c b/lib-src/portaudio-v19/src/common/pa_stream.c
index 56b7079..8d280bf 100644
--- a/lib-src/portaudio-v19/src/common/pa_stream.c
+++ b/lib-src/portaudio-v19/src/common/pa_stream.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_stream.c,v 1.9 2008/03/18 12:36:32 richardash1981 Exp $
+ * $Id: pa_stream.c,v 1.10 2008/12/31 15:38:32 richardash1981 Exp $
  * Portable Audio I/O Library
  * stream interface
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_stream.h b/lib-src/portaudio-v19/src/common/pa_stream.h
index 0dda1f6..73bfb72 100644
--- a/lib-src/portaudio-v19/src/common/pa_stream.h
+++ b/lib-src/portaudio-v19/src/common/pa_stream.h
@@ -1,7 +1,7 @@
 #ifndef PA_STREAM_H
 #define PA_STREAM_H
 /*
- * $Id: pa_stream.h,v 1.9 2008/03/18 12:36:32 richardash1981 Exp $
+ * $Id: pa_stream.h,v 1.10 2008/12/31 15:38:33 richardash1981 Exp $
  * Portable Audio I/O Library
  * stream interface
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_trace.c b/lib-src/portaudio-v19/src/common/pa_trace.c
index 525f077..b8ffc99 100644
--- a/lib-src/portaudio-v19/src/common/pa_trace.c
+++ b/lib-src/portaudio-v19/src/common/pa_trace.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_trace.c,v 1.7 2008/03/18 12:36:32 richardash1981 Exp $
+ * $Id: pa_trace.c,v 1.8 2008/12/31 15:38:33 richardash1981 Exp $
  * Portable Audio I/O Library Trace Facility
  * Store trace information in real-time for later printing.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_trace.h b/lib-src/portaudio-v19/src/common/pa_trace.h
index 31bc8b3..fd28ea9 100644
--- a/lib-src/portaudio-v19/src/common/pa_trace.h
+++ b/lib-src/portaudio-v19/src/common/pa_trace.h
@@ -1,7 +1,7 @@
 #ifndef PA_TRACE_H
 #define PA_TRACE_H
 /*
- * $Id: pa_trace.h,v 1.7 2008/03/18 12:36:32 richardash1981 Exp $
+ * $Id: pa_trace.h,v 1.8 2008/12/31 15:38:33 richardash1981 Exp $
  * Portable Audio I/O Library Trace Facility
  * Store trace information in real-time for later printing.
  *
diff --git a/lib-src/portaudio-v19/src/common/pa_util.h b/lib-src/portaudio-v19/src/common/pa_util.h
index 43507bc..d7a5e73 100644
--- a/lib-src/portaudio-v19/src/common/pa_util.h
+++ b/lib-src/portaudio-v19/src/common/pa_util.h
@@ -1,7 +1,7 @@
 #ifndef PA_UTIL_H
 #define PA_UTIL_H
 /*
- * $Id: pa_util.h,v 1.7 2008/03/18 12:36:32 richardash1981 Exp $
+ * $Id: pa_util.h,v 1.8 2008/12/31 15:38:35 richardash1981 Exp $
  * Portable Audio I/O Library implementation utilities header
  * common implementation utilities and interfaces
  *
diff --git a/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c b/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
index 014af6d..8471cf7 100644
--- a/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
+++ b/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_linux_alsa.c,v 1.9 2008/03/18 12:36:33 richardash1981 Exp $
+ * $Id: pa_linux_alsa.c,v 1.10 2008/12/31 15:38:35 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * Latest Version at: http://www.portaudio.com
  * ALSA implementation by Joshua Haberman and Arve Knudsen
diff --git a/lib-src/portaudio-v19/src/hostapi/asio/pa_asio.cpp b/lib-src/portaudio-v19/src/hostapi/asio/pa_asio.cpp
index 4b507ad..08fb738 100644
--- a/lib-src/portaudio-v19/src/hostapi/asio/pa_asio.cpp
+++ b/lib-src/portaudio-v19/src/hostapi/asio/pa_asio.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_asio.cpp,v 1.7 2008/03/18 12:36:36 richardash1981 Exp $
+ * $Id: pa_asio.cpp,v 1.8 2008/12/31 15:38:35 richardash1981 Exp $
  * Portable Audio I/O Library for ASIO Drivers
  *
  * Author: Stephane Letz
@@ -965,13 +965,20 @@ PaError PaAsio_GetAvailableLatencyValues( PaDeviceIndex device,
     return result;
 }
 
-
+/* Unload whatever we loaded in LoadAsioDriver().
+   Also balance the call to CoInitialize(0).
+*/
+static void UnloadAsioDriver( void )
+{
+	ASIOExit();
+	CoUninitialize();
+}
 
 /*
     load the asio driver named by <driverName> and return statistics about
     the driver in info. If no error occurred, the driver will remain open
-    and must be closed by the called by calling ASIOExit() - if an error
-    is returned the driver will already be closed.
+    and must be closed by the called by calling UnloadAsioDriver() - if an error
+    is returned the driver will already be unloaded.
 */
 static PaError LoadAsioDriver( PaAsioHostApiRepresentation *asioHostApi, const char *driverName,
         PaAsioDriverInfo *driverInfo, void *systemSpecific )
@@ -980,12 +987,23 @@ static PaError LoadAsioDriver( PaAsioHostApiRepresentation *asioHostApi, const c
     ASIOError asioError;
     int asioIsInitialized = 0;
 
-    /* @todo note that the V18 version always called CoInitialize() here to ensure 
-        that COM was initialized before loading the driver. 
-        probably the docs need to require clients to initialize COM in new threads?
+    /* 
+	ASIO uses CoCreateInstance() to load a driver. That requires that
+	CoInitialize(0) be called for every thread that loads a driver.
+	It is OK to call CoInitialize(0) multiple times form one thread as long
+	as it is balanced by a call to CoUninitialize(). See UnloadAsioDriver().
+
+	The V18 version called CoInitialize() starting on 2/19/02.
+	That was removed from PA V19 for unknown reasons.
+	Phil Burk added it back on 6/27/08 so that JSyn would work.
     */
+	CoInitialize( 0 );
+
     if( !asioHostApi->asioDrivers->loadDriver( const_cast<char*>(driverName) ) )
     {
+		/* If this returns an error then it might be because CoInitialize(0) was removed.
+		  It should be called right before this.
+	    */
         result = paUnanticipatedHostError;
         PA_ASIO_SET_LAST_HOST_ERROR( 0, "Failed to load ASIO driver" );
         goto error;
@@ -1031,8 +1049,10 @@ static PaError LoadAsioDriver( PaAsioHostApiRepresentation *asioHostApi, const c
 
 error:
     if( asioIsInitialized )
-        ASIOExit();
-
+	{
+		ASIOExit();
+	}
+	CoUninitialize();
     return result;
 }
 
@@ -1275,7 +1295,7 @@ PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex
                 if( !asioDeviceInfo->asioChannelInfos )
                 {
                     result = paInsufficientMemory;
-                    goto error;
+                    goto error_unload;
                 }
 
                 int a;
@@ -1288,7 +1308,7 @@ PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex
                     {
                         result = paUnanticipatedHostError;
                         PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-                        goto error;
+                        goto error_unload;
                     }
                 }
 
@@ -1301,13 +1321,13 @@ PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex
                     {
                         result = paUnanticipatedHostError;
                         PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-                        goto error;
+                        goto error_unload;
                     }
                 }
 
 
                 /* unload the driver */
-                ASIOExit();
+                UnloadAsioDriver();
 
                 (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
                 ++(*hostApi)->info.deviceCount;
@@ -1344,6 +1364,9 @@ PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex
 
     return result;
 
+error_unload:
+	UnloadAsioDriver();
+
 error:
     if( asioHostApi )
     {
@@ -1516,7 +1539,7 @@ done:
     /* close the device if it wasn't already open */
     if( asioHostApi->openAsioDeviceIndex == paNoDevice )
     {
-        ASIOExit(); /* not sure if we should check for errors here */
+        UnloadAsioDriver(); /* not sure if we should check for errors here */
     }
 
     if( result == paNoError )
@@ -1865,7 +1888,7 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
     if( result == paNoError )
         asioIsInitialized = 1;
     else{
-        PA_DEBUG(("OpenStream ERROR1\n"));
+        PA_DEBUG(("OpenStream ERROR1 - LoadAsioDriver returned %d\n", result));
         goto error;
     }
 
@@ -2577,8 +2600,9 @@ error:
         ASIODisposeBuffers();
 
     if( asioIsInitialized )
-        ASIOExit();
-
+	{
+		UnloadAsioDriver();
+	}
     return result;
 }
 
@@ -2629,7 +2653,7 @@ static PaError CloseStream( PaStream* s )
     PaUtil_FreeMemory( stream );
 
     ASIODisposeBuffers();
-    ASIOExit();
+    UnloadAsioDriver();
 
     return result;
 }
@@ -3382,7 +3406,7 @@ static PaError ReadStream( PaStream      *s     ,
                data block is processed although it may be incomplete. */
 
             /* If the available amount of data frames is insufficient. */
-            if( PaUtil_GetRingBufferReadAvailable(pRb) < lFramesPerBlock )
+            if( PaUtil_GetRingBufferReadAvailable(pRb) < (long) lFramesPerBlock )
             {
                 /* Make sure, the event isn't already set! */
                 /* ResetEvent( blockingState->readFramesReadyEvent ); */
@@ -3557,7 +3581,7 @@ static PaError WriteStream( PaStream      *s     ,
                data block is processed although it may be incomplete. */
 
             /* If the available amount of buffers is insufficient. */
-            if( PaUtil_GetRingBufferWriteAvailable(pRb) < lFramesPerBlock )
+            if( PaUtil_GetRingBufferWriteAvailable(pRb) < (long) lFramesPerBlock )
             {
                 /* Make sure, the event isn't already set! */
                 /* ResetEvent( blockingState->writeBuffersReadyEvent ); */
@@ -3716,10 +3740,9 @@ PaError PaAsio_ShowControlPanel( PaDeviceIndex device, void* systemSpecific )
 
     asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
 
-    /* @todo note that the V18 version always called CoInitialize() here to ensure 
-        that COM was initialized before loading the driver. 
-        probably the docs need to require clients to initialize COM in new threads?
-    */
+    /* See notes about CoInitialize(0) in LoadAsioDriver(). */
+	CoInitialize(0);
+
     if( !asioHostApi->asioDrivers->loadDriver( const_cast<char*>(asioDeviceInfo->commonDeviceInfo.name) ) )
     {
         result = paUnanticipatedHostError;
@@ -3768,13 +3791,17 @@ PA_DEBUG(("PaAsio_ShowControlPanel: ASIOControlPanel(): %s\n", PaAsio_GetAsioErr
         goto error;
     }
 
+	CoUninitialize();
 PA_DEBUG(("PaAsio_ShowControlPanel: ASIOExit(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
 
     return result;
 
 error:
     if( asioIsInitialized )
-        ASIOExit();
+	{
+		ASIOExit();
+	}
+	CoUninitialize();
 
     return result;
 }
@@ -3885,7 +3912,7 @@ static int BlockingIoPaCallback(const void                     *inputBuffer    ,
         pRb = &blockingState->writeRingBuffer;
 
         /* If the blocking i/o buffer contains enough output data, */
-        if( PaUtil_GetRingBufferReadAvailable(pRb) >= framesPerBuffer )
+        if( PaUtil_GetRingBufferReadAvailable(pRb) >= (long) framesPerBuffer )
         {
             /* Extract the requested data from the ring buffer. */
             PaUtil_ReadRingBuffer( pRb, outputBuffer, framesPerBuffer );
@@ -3899,7 +3926,7 @@ static int BlockingIoPaCallback(const void                     *inputBuffer    ,
             (*pBp->outputZeroer)( outputBuffer, 1, pBp->outputChannelCount * framesPerBuffer );
 
             /* If playback is to be stopped */
-            if( blockingState->stopFlag && PaUtil_GetRingBufferReadAvailable(pRb) < framesPerBuffer )
+            if( blockingState->stopFlag && PaUtil_GetRingBufferReadAvailable(pRb) < (long) framesPerBuffer )
             {
                 /* Extract all the remaining data from the ring buffer,
                    whether it is a complete data block or not. */
@@ -3908,7 +3935,7 @@ static int BlockingIoPaCallback(const void                     *inputBuffer    ,
         }
 
         /* Set blocking i/o event? */
-        if( blockingState->writeBuffersRequestedFlag && PaUtil_GetRingBufferWriteAvailable(pRb) >= blockingState->writeBuffersRequested )
+        if( blockingState->writeBuffersRequestedFlag && PaUtil_GetRingBufferWriteAvailable(pRb) >= (long) blockingState->writeBuffersRequested )
         {
             /* Reset buffer request. */
             blockingState->writeBuffersRequestedFlag = FALSE;
@@ -3934,7 +3961,7 @@ static int BlockingIoPaCallback(const void                     *inputBuffer    ,
         pRb = &blockingState->readRingBuffer;
 
         /* If the blocking i/o buffer contains not enough input buffers */
-        if( PaUtil_GetRingBufferWriteAvailable(pRb) < framesPerBuffer )
+        if( PaUtil_GetRingBufferWriteAvailable(pRb) < (long) framesPerBuffer )
         {
             /* Signalize a read-buffer overflow. */
             blockingState->inputOverflowFlag = TRUE;
@@ -3947,7 +3974,7 @@ static int BlockingIoPaCallback(const void                     *inputBuffer    ,
         PaUtil_WriteRingBuffer( pRb, inputBuffer, framesPerBuffer );
 
         /* Set blocking i/o event? */
-        if( blockingState->readFramesRequestedFlag && PaUtil_GetRingBufferReadAvailable(pRb) >= blockingState->readFramesRequested )
+        if( blockingState->readFramesRequestedFlag && PaUtil_GetRingBufferReadAvailable(pRb) >= (long) blockingState->readFramesRequested )
         {
             /* Reset buffer request. */
             blockingState->readFramesRequestedFlag = FALSE;
diff --git a/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c b/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c
index 7a69075..3ea20fd 100644
--- a/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c
+++ b/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c
@@ -580,7 +580,7 @@ signed long GetStreamReadAvailable( PaStream* stream )
     VVDBUG(("GetStreamReadAvailable()\n"));
 
     return PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer )
-                         / ( blio->outputSampleSizeActual * blio->outChan );
+                         / ( blio->inputSampleSizeActual * blio->inChan );
 }
 
 
diff --git a/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c b/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c
index fa7157a..af3380d 100644
--- a/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c
+++ b/lib-src/portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_mac_core_old.c,v 1.8 2008/03/18 12:36:37 richardash1981 Exp $
+ * $Id: pa_mac_core_old.c,v 1.9 2008/12/31 15:38:35 richardash1981 Exp $
  * pa_mac_core.c
  * Implementation of PortAudio for Mac OS X CoreAudio       
  *                                                                                         
diff --git a/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c b/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c
index a3f4a01..d4a7c60 100644
--- a/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c
+++ b/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_win_ds.c,v 1.10 2008/03/18 12:36:38 richardash1981 Exp $
+ * $Id: pa_win_ds.c,v 1.11 2008/12/31 15:38:35 richardash1981 Exp $
  * Portable Audio I/O Library DirectSound implementation
  *
  * Authors: Phil Burk, Robert Marsanyi & Ross Bencina
diff --git a/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c b/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c
index a27a098..c3ad982 100644
--- a/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c
+++ b/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_jack.c,v 1.8 2008/03/18 12:36:39 richardash1981 Exp $
+ * $Id: pa_jack.c,v 1.9 2008/12/31 15:38:35 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * Latest Version at: http://www.portaudio.com
  * JACK Implementation by Joshua Haberman
diff --git a/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c b/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
index 3b241f1..c55113e 100644
--- a/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
+++ b/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_unix_oss.c,v 1.12 2008/03/18 12:36:39 richardash1981 Exp $
+ * $Id: pa_unix_oss.c,v 1.13 2008/12/31 15:38:35 richardash1981 Exp $
  * PortAudio Portable Real-Time Audio Library
  * Latest Version at: http://www.portaudio.com
  * OSS implementation by:
@@ -782,11 +782,15 @@ error:
     return result;
 }
 
+/** Open input and output devices.
+ *
+ * @param idev: Returned input device file descriptor.
+ * @param odev: Returned output device file descriptor.
+ */
 static PaError OpenDevices( const char *idevName, const char *odevName, int *idev, int *odev )
 {
     PaError result = paNoError;
     int flags = O_NONBLOCK, duplex = 0;
-    int enableBits = 0;
     *idev = *odev = -1;
 
     if( idevName && odevName )
@@ -806,10 +810,6 @@ static PaError OpenDevices( const char *idevName, const char *odevName, int *ide
     {
         ENSURE_( *idev = open( idevName, flags ), paDeviceUnavailable );
         PA_ENSURE( ModifyBlocking( *idev, 1 ) ); /* Blocking */
-
-        /* Initially disable */
-        enableBits = ~PCM_ENABLE_INPUT;
-        ENSURE_( ioctl( *idev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
     }
     if( odevName )
     {
@@ -817,10 +817,6 @@ static PaError OpenDevices( const char *idevName, const char *odevName, int *ide
         {
             ENSURE_( *odev = open( odevName, flags ), paDeviceUnavailable );
             PA_ENSURE( ModifyBlocking( *odev, 1 ) ); /* Blocking */
-
-            /* Initially disable */
-            enableBits = ~PCM_ENABLE_OUTPUT;
-            ENSURE_( ioctl( *odev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
         }
         else
         {
@@ -973,6 +969,8 @@ static int CalcHigherLogTwo( int n )
     return log2;
 }
 
+/** Configure stream component device parameters.
+ */
 static PaError PaOssStreamComponent_Configure( PaOssStreamComponent *component, double sampleRate, unsigned long
         framesPerBuffer, StreamMode streamMode, PaOssStreamComponent *master )
 {
@@ -1434,6 +1432,12 @@ static PaError PaOssStream_Prepare( PaOssStream *stream )
     if( stream->triggered )
         return result;
 
+    /* The OSS reference instructs us to clear direction bits before setting them.*/
+    if( stream->playback )
+        ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+    if( stream->capture )
+        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+
     if( stream->playback )
     {
         size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );
@@ -1507,7 +1511,6 @@ static PaError PaOssStream_Stop( PaOssStream *stream, int abort )
         result = paUnanticipatedHostError;
     }
 
-error:
     return result;
 }
 
@@ -1979,8 +1982,11 @@ static signed long GetStreamWriteAvailable( PaStream* s )
 #endif
     return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
 
+/* Conditionally compile this to avoid warning about unused label */
+#ifdef SNDCTL_DSP_GETODELAY
 error:
     return result;
+#endif
 }
 
 const char *PaOSS_GetStreamInputDevice( PaStream* s )
diff --git a/lib-src/portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.cpp b/lib-src/portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.cpp
index f13a7f2..ea91eb2 100644
--- a/lib-src/portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.cpp
+++ b/lib-src/portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.cpp
@@ -56,6 +56,8 @@
 #include <functiondiscoverykeys.h>  // PKEY_Device_FriendlyName
 #endif
 
+#include <process.h>
+
 #include "pa_util.h"
 #include "pa_allocation.h"
 #include "pa_hostapi.h"
@@ -73,7 +75,12 @@
 #define PORTAUDIO_SHAREMODE     AUDCLNT_SHAREMODE_SHARED
 //#define PORTAUDIO_SHAREMODE   AUDCLNT_SHAREMODE_EXCLUSIVE
 
-
+/* use CreateThread for CYGWIN, _beginthreadex for all others */
+#ifndef __CYGWIN__
+#define CREATE_THREAD (HANDLE) _beginthreadex(NULL, 0, (unsigned (_stdcall *)(void *))ProcThread, (LPVOID) stream, 0, (unsigned *)&stream->dwThreadId)
+#else
+#define CREATE_THREAD CreateThread(NULL, 0, ProcThread, (LPVOID) stream, 0, &stream->dwThreadId)
+#endif
 
 /* prototypes for functions declared in this file */
 
@@ -1517,14 +1524,8 @@ static PaError StartStream( PaStream *s )
 	}
 
     // Create a thread for this client.
-    stream->hThread = CreateThread(
-        NULL,              // no security attribute
-        0,                 // default stack size
-        ProcThread,
-        (LPVOID) stream,    // thread parameter
-        0,                 // not suspended
-        &stream->dwThreadId);      // returns thread ID
-
+    stream->hThread = CREATE_THREAD;
+        
     if (stream->hThread == NULL)
         return paUnanticipatedHostError;
 
diff --git a/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c b/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c
index ada2c4e..d43d26f 100644
--- a/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c
+++ b/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_win_wdmks.c,v 1.7 2008/03/18 12:36:40 richardash1981 Exp $
+ * $Id: pa_win_wdmks.c,v 1.8 2008/12/31 15:38:35 richardash1981 Exp $
  * PortAudio Windows WDM-KS interface
  *
  * Author: Andrew Baldwin
@@ -106,6 +106,20 @@
     #define DYNAMIC_GUID(data) DYNAMIC_GUID_THUNK(data)
 #endif
 
+/* use CreateThread for CYGWIN, _beginthreadex for all others */
+#ifndef __CYGWIN__
+#define CREATE_THREAD (HANDLE)_beginthreadex( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#else
+#define CREATE_THREAD CreateThread( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#endif
+
+/* use ExitThread for CYGWIN, _endthreadex for all others */
+#ifndef __CYGWIN__
+#define EXIT_THREAD _endthreadex(0)
+#else
+#define EXIT_THREAD ExitThread(0)
+#endif
+
 #ifdef _MSC_VER
     #define DYNAMIC_GUID(data) {data}
     #define _INC_MMREG
@@ -3010,7 +3024,7 @@ static DWORD WINAPI ProcessingThread(LPVOID pParam)
     }
 
     PA_LOGL_;
-    ExitThread(0);
+    EXIT_THREAD;
     return 0;
 }
 
@@ -3045,7 +3059,7 @@ static PaError StartStream( PaStream *s )
       PA_DEBUG(("Class ret = %d;",ret));*/
 
     stream->streamStarted = 1;
-    stream->streamThread = CreateThread(NULL, 0, ProcessingThread, stream, 0, &dwID);
+    stream->streamThread = (HANDLE)_beginthreadex(NULL, 0, ProcessingThread, stream, 0, &dwID);
     if(stream->streamThread == NULL)
     {
         stream->streamStarted = 0;
diff --git a/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c b/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c
index 3cbc37e..4e4824a 100644
--- a/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c
+++ b/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_win_wmme.c,v 1.7 2008/03/18 12:36:40 richardash1981 Exp $
+ * $Id: pa_win_wmme.c,v 1.8 2008/12/31 15:38:36 richardash1981 Exp $
  * pa_win_wmme.c
  * Implementation of PortAudio for Windows MultiMedia Extensions (WMME)       
  *                                                                                         
@@ -151,6 +151,13 @@ Non-critical stuff for the future:
 #endif
 #endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
 
+/* use CreateThread for CYGWIN, _beginthreadex for all others */
+#ifndef __CYGWIN__
+#define CREATE_THREAD (HANDLE)_beginthreadex( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#else
+#define CREATE_THREAD CreateThread( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#endif
+
 #if (defined(UNDER_CE))
 #pragma comment(lib, "Coredll.lib")
 #elif (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
@@ -3244,7 +3251,7 @@ static PaError StartStream( PaStream *s )
         if( result != paNoError ) goto error;
 
         /* Create thread that waits for audio buffers to be ready for processing. */
-        stream->processingThread = CreateThread( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId );
+        stream->processingThread = CREATE_THREAD;
         if( !stream->processingThread )
         {
             result = paUnanticipatedHostError;
diff --git a/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c b/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c
index 9e9b4b4..af122e8 100644
--- a/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c
+++ b/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_unix_hostapis.c,v 1.7 2008/03/18 12:36:41 richardash1981 Exp $
+ * $Id: pa_unix_hostapis.c,v 1.8 2008/12/31 15:38:36 richardash1981 Exp $
  * Portable Audio I/O Library UNIX initialization table
  *
  * Based on the Open Source API proposed by Ross Bencina
@@ -52,9 +52,24 @@ PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
 PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
 PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
 
+/** Note that ALSA is placed before OSS so that the latter is preferred over the
+ * latter on Linux.
+ */
 
 PaUtilHostApiInitializer *paHostApiInitializers[] =
     {
+#ifdef __linux__
+
+#ifdef PA_USE_ALSA
+        PaAlsa_Initialize,
+#endif
+
+#ifdef PA_USE_OSS
+        PaOSS_Initialize,
+#endif
+
+#else
+
 #ifdef PA_USE_OSS
         PaOSS_Initialize,
 #endif
@@ -63,6 +78,8 @@ PaUtilHostApiInitializer *paHostApiInitializers[] =
         PaAlsa_Initialize,
 #endif
 
+#endif  /* __linux__ */
+
 #ifdef PA_USE_JACK
         PaJack_Initialize,
 #endif
diff --git a/lib-src/portaudio-v19/src/os/unix/pa_unix_util.c b/lib-src/portaudio-v19/src/os/unix/pa_unix_util.c
index ebfdbaf..8ef9b82 100644
--- a/lib-src/portaudio-v19/src/os/unix/pa_unix_util.c
+++ b/lib-src/portaudio-v19/src/os/unix/pa_unix_util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_unix_util.c,v 1.10 2008/03/18 12:36:41 richardash1981 Exp $
+ * $Id: pa_unix_util.c,v 1.11 2008/12/31 15:38:36 richardash1981 Exp $
  * Portable Audio I/O Library
  * UNIX platform-specific support functions
  *
diff --git a/lib-src/portaudio-v19/src/os/unix/pa_unix_util.h b/lib-src/portaudio-v19/src/os/unix/pa_unix_util.h
index f552847..2fcfc8a 100644
--- a/lib-src/portaudio-v19/src/os/unix/pa_unix_util.h
+++ b/lib-src/portaudio-v19/src/os/unix/pa_unix_util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_unix_util.h,v 1.7 2008/03/18 12:36:41 richardash1981 Exp $
+ * $Id: pa_unix_util.h,v 1.8 2008/12/31 15:38:36 richardash1981 Exp $
  * Portable Audio I/O Library
  * UNIX platform-specific support functions
  *
diff --git a/lib-src/portaudio-v19/src/os/win/pa_win_hostapis.c b/lib-src/portaudio-v19/src/os/win/pa_win_hostapis.c
index e73693d..1b0e651 100644
--- a/lib-src/portaudio-v19/src/os/win/pa_win_hostapis.c
+++ b/lib-src/portaudio-v19/src/os/win/pa_win_hostapis.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_win_hostapis.c,v 1.7 2008/03/18 12:36:41 richardash1981 Exp $
+ * $Id: pa_win_hostapis.c,v 1.8 2008/12/31 15:38:36 richardash1981 Exp $
  * Portable Audio I/O Library Windows initialization table
  *
  * Based on the Open Source API proposed by Ross Bencina
diff --git a/lib-src/portaudio-v19/src/os/win/pa_win_util.c b/lib-src/portaudio-v19/src/os/win/pa_win_util.c
index 4b19dce..dfbf484 100644
--- a/lib-src/portaudio-v19/src/os/win/pa_win_util.c
+++ b/lib-src/portaudio-v19/src/os/win/pa_win_util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pa_win_util.c,v 1.7 2008/03/18 12:36:42 richardash1981 Exp $
+ * $Id: pa_win_util.c,v 1.8 2008/12/31 15:38:36 richardash1981 Exp $
  * Portable Audio I/O Library
  * Win32 platform-specific support functions
  *
diff --git a/lib-src/portaudio-v19/src/os/win/pa_win_waveformat.c b/lib-src/portaudio-v19/src/os/win/pa_win_waveformat.c
index 0c25584..5f71a26 100644
--- a/lib-src/portaudio-v19/src/os/win/pa_win_waveformat.c
+++ b/lib-src/portaudio-v19/src/os/win/pa_win_waveformat.c
@@ -26,13 +26,13 @@
  */
 
 /*
- * The text above constitutes the entire PortAudio license; however, 
+ * The text above constitutes the entire PortAudio license; however,
  * the PortAudio community also makes the following non-binding requests:
  *
  * Any person wishing to distribute modifications to the Software is
  * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
  * license above.
  */
 
@@ -51,15 +51,15 @@
 #define  WAVE_FORMAT_IEEE_FLOAT         0x0003
 #endif
 
-static GUID pawin_ksDataFormatSubtypePcm = 
+static GUID pawin_ksDataFormatSubtypePcm =
 	{ (USHORT)(WAVE_FORMAT_PCM), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
 
-static GUID pawin_ksDataFormatSubtypeIeeeFloat = 
+static GUID pawin_ksDataFormatSubtypeIeeeFloat =
 	{ (USHORT)(WAVE_FORMAT_IEEE_FLOAT), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
 
 
 
-void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, 
+void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat,
 		int numChannels, PaSampleFormat sampleFormat, double sampleRate )
 {
 	WAVEFORMATEX *waveFormatEx = (WAVEFORMATEX*)waveFormat;
@@ -70,7 +70,7 @@ void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat,
         waveFormatEx->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
     else
         waveFormatEx->wFormatTag = WAVE_FORMAT_PCM;
-	
+
 	waveFormatEx->nChannels = (WORD)numChannels;
 	waveFormatEx->nSamplesPerSec = (DWORD)sampleRate;
 	waveFormatEx->nAvgBytesPerSec = waveFormatEx->nSamplesPerSec * bytesPerFrame;
@@ -80,7 +80,7 @@ void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat,
 }
 
 
-void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, 
+void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat,
 		int numChannels, PaSampleFormat sampleFormat, double sampleRate,
 		PaWinWaveFormatChannelMask channelMask )
 {
@@ -100,7 +100,7 @@ void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat,
 			waveFormatEx->wBitsPerSample;
 
 	*((DWORD*)&waveFormat->fields[PAWIN_INDEXOF_DWCHANNELMASK]) = channelMask;
-			
+
     if( sampleFormat == paFloat32 )
         *((GUID*)&waveFormat->fields[PAWIN_INDEXOF_SUBFORMAT]) =
             pawin_ksDataFormatSubtypeIeeeFloat;
@@ -116,7 +116,7 @@ PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels )
 		case 1:
 			return PAWIN_SPEAKER_MONO;
 		case 2:
-			return PAWIN_SPEAKER_STEREO; 
+			return PAWIN_SPEAKER_STEREO;
 		case 3:
             return PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_FRONT_RIGHT;
 		case 4:
@@ -127,22 +127,22 @@ PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels )
             /* The meaning of the PAWIN_SPEAKER_5POINT1 flag has changed over time:
                 http://msdn2.microsoft.com/en-us/library/aa474707.aspx
                We use PAWIN_SPEAKER_5POINT1 (not PAWIN_SPEAKER_5POINT1_SURROUND)
-               because on some cards (eg Audigy) PAWIN_SPEAKER_5POINT1_SURROUND 
-               results in a virtual mixdown placing the rear output in the 
+               because on some cards (eg Audigy) PAWIN_SPEAKER_5POINT1_SURROUND
+               results in a virtual mixdown placing the rear output in the
                front _and_ rear speakers.
             */
-			return PAWIN_SPEAKER_5POINT1; 
+			return PAWIN_SPEAKER_5POINT1;
         /* case 7: */
 		case 8:
 			return PAWIN_SPEAKER_7POINT1;
 	}
 
-    /* Apparently some Audigy drivers will output silence 
-       if the direct-out constant (0) is used. So this is not ideal.    
+    /* Apparently some Audigy drivers will output silence
+       if the direct-out constant (0) is used. So this is not ideal.
     */
 	return  PAWIN_SPEAKER_DIRECTOUT;
 
-    /* Note that Alec Rogers proposed the following as an alternate method to 
+    /* Note that Alec Rogers proposed the following as an alternate method to
         generate the default channel mask, however it doesn't seem to be an improvement
         over the above, since some drivers will matrix outputs mapping to non-present
         speakers accross multiple physical speakers.
diff --git a/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.c b/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.c
index 99eff97..6cbdcea 100644
--- a/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.c
+++ b/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.c
@@ -25,13 +25,13 @@
  */
 
 /*
- * The text above constitutes the entire PortAudio license; however, 
+ * The text above constitutes the entire PortAudio license; however,
  * the PortAudio community also makes the following non-binding requests:
  *
  * Any person wishing to distribute modifications to the Software is
  * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
  * license above.
  */
 
@@ -150,7 +150,7 @@ static KSPIN_DATAFLOW GetKSFilterPinPropertyDataflow( HANDLE deviceHandle, int p
 }
 
 
-static int KSFilterPinPropertyIdentifiersInclude( 
+static int KSFilterPinPropertyIdentifiersInclude(
         HANDLE deviceHandle, int pinId, unsigned long property, const GUID *identifierSet, unsigned long identifierId  )
 {
     KSMULTIPLE_ITEM* item = NULL;
@@ -160,7 +160,7 @@ static int KSFilterPinPropertyIdentifiersInclude(
 
     if( WdmGetPinPropertyMulti( deviceHandle, pinId, property, &item) != paNoError )
         return 0;
-    
+
     identifier = (KSIDENTIFIER*)(item+1);
 
     for( i = 0; i < (int)item->Count; i++ )
@@ -179,7 +179,7 @@ static int KSFilterPinPropertyIdentifiersInclude(
 }
 
 
-/* return the maximum channel count supported by any pin on the device. 
+/* return the maximum channel count supported by any pin on the device.
    if isInput is non-zero we query input pins, otherwise output pins.
 */
 int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInput )
@@ -188,7 +188,7 @@ int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInp
     int pinCount, pinId, i;
     int result = 0;
     KSPIN_DATAFLOW requiredDataflowDirection = (isInput ? KSPIN_DATAFLOW_OUT : KSPIN_DATAFLOW_IN );
-    
+
     if( !wcharDevicePath )
         return 0;
 
@@ -203,12 +203,12 @@ int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInp
         KSPIN_DATAFLOW dataflow = GetKSFilterPinPropertyDataflow( deviceHandle, pinId );
         if( ( dataflow == requiredDataflowDirection ) &&
                 (( communication == KSPIN_COMMUNICATION_SINK) ||
-                 ( communication == KSPIN_COMMUNICATION_BOTH)) 
-             && ( KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
+                 ( communication == KSPIN_COMMUNICATION_BOTH))
+             && ( KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId,
                     KSPROPERTY_PIN_INTERFACES, &KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_STREAMING )
-                || KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
+                || KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId,
                     KSPROPERTY_PIN_INTERFACES, &KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_LOOPED_STREAMING ) )
-             && KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
+             && KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId,
                     KSPROPERTY_PIN_MEDIUMS, &KSMEDIUMSETID_Standard, KSMEDIUM_STANDARD_DEVIO ) )
          {
             KSMULTIPLE_ITEM* item = NULL;
@@ -225,10 +225,10 @@ int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInp
                                 && ( memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof(GUID) ) == 0 ) ) )
                     {
                         KSDATARANGE_AUDIO *dataRangeAudio = (KSDATARANGE_AUDIO*)dataRange;
-                        
+
                         /*
                         printf( ">>> %d %d %d %d %S\n", isInput, dataflow, communication, dataRangeAudio->MaximumChannels, devicePath );
-                       
+
                         if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, sizeof(GUID) ) == 0 )
                             printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_WAVEFORMATEX\n" );
                         else if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_DSOUND, sizeof(GUID) ) == 0 )
@@ -246,7 +246,7 @@ int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInp
                         if( dataRangeAudio->MaximumChannels  < 0xFFFFUL && (int)dataRangeAudio->MaximumChannels > result )
                             result = (int)dataRangeAudio->MaximumChannels;
                     }
-                    
+
                     dataRange = (KSDATARANGE*)( ((char*)dataRange) + dataRange->FormatSize);
                 }
 
@@ -254,7 +254,7 @@ int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInp
             }
         }
     }
-    
+
     CloseHandle( deviceHandle );
     return result;
 }
diff --git a/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.h b/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.h
index b8e923a..6903e65 100644
--- a/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.h
+++ b/lib-src/portaudio-v19/src/os/win/pa_win_wdmks_utils.h
@@ -28,13 +28,13 @@
  */
 
 /*
- * The text above constitutes the entire PortAudio license; however, 
+ * The text above constitutes the entire PortAudio license; however,
  * the PortAudio community also makes the following non-binding requests:
  *
  * Any person wishing to distribute modifications to the Software is
  * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
  * license above.
  */
 
diff --git a/lib-src/portmixer/configure b/lib-src/portmixer/configure
index 4fa8f59..aad82ef 100755
--- a/lib-src/portmixer/configure
+++ b/lib-src/portmixer/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for PortMixer 2.0.
+# Generated by GNU Autoconf 2.63 for PortMixer 2.0.
 #
 # Report bugs to <audacity.sourceforge.net>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -65,8 +93,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -102,17 +128,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -160,7 +179,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -242,7 +261,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -263,7 +282,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -343,10 +362,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -415,9 +434,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -494,19 +513,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -531,10 +553,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -615,61 +637,66 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-RANLIB
-AR
-CPP
-GREP
-EGREP
-cflags
-include
-objects
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+objects
+include
+cflags
+EGREP
+GREP
+CPP
+AR
+RANLIB
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_debug
+with_pa_include
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -684,6 +711,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -782,13 +811,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -801,13 +838,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -998,22 +1043,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1033,7 +1094,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1042,16 +1103,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1060,22 +1121,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1090,7 +1167,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1106,10 +1183,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1117,12 +1194,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1149,12 +1226,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1203,9 +1280,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1215,25 +1292,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/portmixer]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/portmixer]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1247,6 +1324,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          enable debug compilation
@@ -1277,15 +1355,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1321,7 +1401,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1331,10 +1411,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 PortMixer configure 2.0
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1345,7 +1425,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by PortMixer $as_me 2.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1381,7 +1461,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1416,7 +1496,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1468,11 +1548,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1502,9 +1583,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1519,9 +1600,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1537,8 +1618,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1580,21 +1661,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1604,16 +1688,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1627,29 +1711,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1659,10 +1752,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1712,10 +1807,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1728,7 +1823,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1739,11 +1834,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1752,10 +1847,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1768,7 +1863,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1779,11 +1874,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -1791,12 +1886,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -1809,10 +1900,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1825,7 +1916,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1836,11 +1927,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1849,10 +1940,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1870,7 +1961,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1893,11 +1984,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1908,10 +1999,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1924,7 +2015,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1935,11 +2026,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1952,10 +2043,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1968,7 +2059,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1979,11 +2070,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1995,12 +2086,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2010,44 +2097,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2066,27 +2159,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2097,10 +2185,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2111,7 +2200,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2138,25 +2227,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2165,49 +2256,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2216,31 +2311,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2263,40 +2360,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2322,20 +2422,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2345,15 +2446,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2380,20 +2485,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2418,20 +2524,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2457,20 +2564,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2485,8 +2593,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2502,10 +2610,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2576,20 +2684,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2605,15 +2714,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -2626,10 +2735,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2642,7 +2751,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2653,11 +2762,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2666,10 +2775,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -2682,7 +2791,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2693,11 +2802,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -2705,12 +2814,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -2721,10 +2826,10 @@ fi
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $AR in
   [\\/]* | ?:[\\/]*)
@@ -2739,7 +2844,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2752,17 +2857,17 @@ esac
 fi
 AR=$ac_cv_path_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if [ $AR = "no" ] ; then
-    { { echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
-echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
+$as_echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
    { (exit 1); exit 1; }; };
 fi
 
@@ -2775,15 +2880,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -2815,20 +2920,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -2852,13 +2958,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2866,7 +2973,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -2891,8 +2998,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -2920,20 +3027,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -2957,13 +3065,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2971,7 +3080,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -2987,11 +3096,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -3001,42 +3112,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3051,74 +3157,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3133,40 +3225,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3193,20 +3276,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -3298,37 +3382,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3341,17 +3428,17 @@ fi
 #
 # Check for debug
 #
-{ echo "$as_me:$LINENO: checking whether to compile debug version" >&5
-echo $ECHO_N "checking whether to compile debug version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to compile debug version" >&5
+$as_echo_n "checking whether to compile debug version... " >&6; }
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug; cflags="$cflags -g"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
   cflags="$cflags -O2"
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3398,8 +3485,8 @@ fi
 rm -f conftest*
 
 if [ $have_support = "no" ] ; then
-		{ echo "$as_me:$LINENO: WARNING: \"Missing support in pa_win_ds.h\"" >&5
-echo "$as_me: WARNING: \"Missing support in pa_win_ds.h\"" >&2;};
+		{ $as_echo "$as_me:$LINENO: WARNING: \"Missing support in pa_win_ds.h\"" >&5
+$as_echo "$as_me: WARNING: \"Missing support in pa_win_ds.h\"" >&2;};
 fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3419,8 +3506,8 @@ fi
 rm -f conftest*
 
 if [ $have_support = "no" ] ; then
-		{ echo "$as_me:$LINENO: WARNING: \"Missing support in pa_linux_alsa.h\"" >&5
-echo "$as_me: WARNING: \"Missing support in pa_linux_alsa.h\"" >&2;};
+		{ $as_echo "$as_me:$LINENO: WARNING: \"Missing support in pa_linux_alsa.h\"" >&5
+$as_echo "$as_me: WARNING: \"Missing support in pa_linux_alsa.h\"" >&2;};
 fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3440,8 +3527,8 @@ fi
 rm -f conftest*
 
 if [ $have_support = "no" ] ; then
-		{ echo "$as_me:$LINENO: WARNING: \"Missing support in pa_win_wmme.h\"" >&5
-echo "$as_me: WARNING: \"Missing support in pa_win_wmme.h\"" >&2;};
+		{ $as_echo "$as_me:$LINENO: WARNING: \"Missing support in pa_win_wmme.h\"" >&5
+$as_echo "$as_me: WARNING: \"Missing support in pa_win_wmme.h\"" >&2;};
 fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3461,8 +3548,8 @@ fi
 rm -f conftest*
 
 if [ $have_support = "no" ] ; then
-		{ echo "$as_me:$LINENO: WARNING: \"Missing support in pa_mac_core.h\"" >&5
-echo "$as_me: WARNING: \"Missing support in pa_mac_core.h\"" >&2;};
+		{ $as_echo "$as_me:$LINENO: WARNING: \"Missing support in pa_mac_core.h\"" >&5
+$as_echo "$as_me: WARNING: \"Missing support in pa_mac_core.h\"" >&2;};
 fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3482,8 +3569,8 @@ fi
 rm -f conftest*
 
 if [ $have_support = "no" ] ; then
-		{ echo "$as_me:$LINENO: WARNING: \"Missing support in pa_unix_oss.h\"" >&5
-echo "$as_me: WARNING: \"Missing support in pa_unix_oss.h\"" >&2;};
+		{ $as_echo "$as_me:$LINENO: WARNING: \"Missing support in pa_unix_oss.h\"" >&5
+$as_echo "$as_me: WARNING: \"Missing support in pa_unix_oss.h\"" >&2;};
 fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3503,13 +3590,13 @@ fi
 rm -f conftest*
 
 if [ $have_support = "no" ] ; then
-		{ echo "$as_me:$LINENO: WARNING: \"Missing support in portaudio.h\"" >&5
-echo "$as_me: WARNING: \"Missing support in portaudio.h\"" >&2;};
+		{ $as_echo "$as_me:$LINENO: WARNING: \"Missing support in portaudio.h\"" >&5
+$as_echo "$as_me: WARNING: \"Missing support in portaudio.h\"" >&2;};
 fi
 
 if [ $have_support = "no" ] ; then
-   { { echo "$as_me:$LINENO: error: \"Your version of portaudio does not include required functions\"" >&5
-echo "$as_me: error: \"Your version of portaudio does not include required functions\"" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: \"Your version of portaudio does not include required functions\"" >&5
+$as_echo "$as_me: error: \"Your version of portaudio does not include required functions\"" >&2;}
    { (exit 1); exit 1; }; };
 fi
 
@@ -3537,11 +3624,11 @@ objects=px_mixer.o
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3559,20 +3646,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -3580,12 +3668,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3594,17 +3685,17 @@ done
 
 
 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
-echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
+$as_echo_n "checking for linux/soundcard.h... " >&6; }
 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
+$as_echo "$ac_cv_header_linux_soundcard_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5
-echo $ECHO_N "checking linux/soundcard.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5
+$as_echo_n "checking linux/soundcard.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3620,32 +3711,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5
-echo $ECHO_N "checking linux/soundcard.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5
+$as_echo_n "checking linux/soundcard.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3659,51 +3751,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## --------------------------------------- ##
 ## Report this to audacity.sourceforge.net ##
@@ -3712,18 +3805,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
-echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
+$as_echo_n "checking for linux/soundcard.h... " >&6; }
 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_linux_soundcard_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
+$as_echo "$ac_cv_header_linux_soundcard_h" >&6; }
 
 fi
-if test $ac_cv_header_linux_soundcard_h = yes; then
+if test "x$ac_cv_header_linux_soundcard_h" = x""yes; then
   have_oss=yes
 else
   have_oss=no
@@ -3731,17 +3824,17 @@ fi
 
 
 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
-echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
+$as_echo_n "checking for alsa/asoundlib.h... " >&6; }
 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
+$as_echo "$ac_cv_header_alsa_asoundlib_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5
-echo $ECHO_N "checking alsa/asoundlib.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5
+$as_echo_n "checking alsa/asoundlib.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3757,32 +3850,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking alsa/asoundlib.h presence" >&5
-echo $ECHO_N "checking alsa/asoundlib.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alsa/asoundlib.h presence" >&5
+$as_echo_n "checking alsa/asoundlib.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3796,51 +3890,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## --------------------------------------- ##
 ## Report this to audacity.sourceforge.net ##
@@ -3849,18 +3944,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
-echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
+$as_echo_n "checking for alsa/asoundlib.h... " >&6; }
 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_alsa_asoundlib_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
+$as_echo "$ac_cv_header_alsa_asoundlib_h" >&6; }
 
 fi
-if test $ac_cv_header_alsa_asoundlib_h = yes; then
+if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then
   have_alsa=yes
 else
   have_alsa=no
@@ -3868,17 +3963,17 @@ fi
 
 
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3894,32 +3989,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3933,51 +4029,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## --------------------------------------- ##
 ## Report this to audacity.sourceforge.net ##
@@ -3986,18 +4083,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 
 fi
-if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = x""yes; then
   have_coreaudio=yes
 else
   have_coreaudio=no
@@ -4008,11 +4105,11 @@ fi
 #
 # Set up to use the identified ones
 #
-{ echo "$as_me:$LINENO: ---------------------------------------" >&5
-echo "$as_me: ---------------------------------------" >&6;};
+{ $as_echo "$as_me:$LINENO: ---------------------------------------" >&5
+$as_echo "$as_me: ---------------------------------------" >&6;};
 if [ $have_oss = "yes" ] ; then
-   { echo "$as_me:$LINENO: Including support for OSS" >&5
-echo "$as_me: Including support for OSS" >&6;};
+   { $as_echo "$as_me:$LINENO: Including support for OSS" >&5
+$as_echo "$as_me: Including support for OSS" >&6;};
    cat >>confdefs.h <<\_ACEOF
 #define PX_USE_UNIX_OSS 1
 _ACEOF
@@ -4021,8 +4118,8 @@ _ACEOF
 fi
 
 if [ $have_alsa = "yes" ] ; then
-   { echo "$as_me:$LINENO: Including support for ALSA" >&5
-echo "$as_me: Including support for ALSA" >&6;};
+   { $as_echo "$as_me:$LINENO: Including support for ALSA" >&5
+$as_echo "$as_me: Including support for ALSA" >&6;};
    cat >>confdefs.h <<\_ACEOF
 #define PX_USE_LINUX_ALSA 1
 _ACEOF
@@ -4031,16 +4128,16 @@ _ACEOF
 fi
 
 if [ $have_coreaudio = "yes" ] ; then
-   { echo "$as_me:$LINENO: Including support for Coreaudio" >&5
-echo "$as_me: Including support for Coreaudio" >&6;};
+   { $as_echo "$as_me:$LINENO: Including support for Coreaudio" >&5
+$as_echo "$as_me: Including support for Coreaudio" >&6;};
    cat >>confdefs.h <<\_ACEOF
 #define PX_USE_MAC_COREAUDIO 1
 _ACEOF
 
    objects="$objects px_mac_coreaudio.o"
 fi
-{ echo "$as_me:$LINENO: ---------------------------------------" >&5
-echo "$as_me: ---------------------------------------" >&6;};
+{ $as_echo "$as_me:$LINENO: ---------------------------------------" >&5
+$as_echo "$as_me: ---------------------------------------" >&6;};
 
 #
 # Write it all out
@@ -4072,11 +4169,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -4109,12 +4207,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -4131,6 +4229,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -4160,7 +4264,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -4173,11 +4277,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -4190,7 +4295,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -4200,7 +4305,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -4222,17 +4327,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -4248,8 +4381,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -4272,7 +4403,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -4285,17 +4416,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -4317,7 +4441,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -4368,7 +4492,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -4396,7 +4520,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -4409,19 +4532,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -4446,10 +4572,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -4472,7 +4598,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by PortMixer $as_me 2.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4485,26 +4611,33 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -4512,23 +4645,23 @@ $config_files
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 PortMixer config.status 2.0
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -4550,21 +4683,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -4583,30 +4719,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -4614,8 +4752,8 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -4654,119 +4792,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-RANLIB!$RANLIB$ac_delim
-AR!$AR$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-cflags!$cflags$ac_delim
-include!$include$ac_delim
-objects!$objects$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -4782,19 +4945,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -4823,26 +4988,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -4852,7 +5029,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -4878,7 +5055,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -4887,7 +5064,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -4908,17 +5085,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -4954,12 +5131,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -4968,13 +5146,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -4988,15 +5167,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -5005,21 +5185,28 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -5034,6 +5221,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -5055,4 +5247,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/lib-src/portmixer/portaudio.patch b/lib-src/portmixer/portaudio.patch
index 6c7883a..510adce 100644
--- a/lib-src/portmixer/portaudio.patch
+++ b/lib-src/portmixer/portaudio.patch
@@ -1,797 +1,3 @@
-diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh --exclude autom4te.cache ../../../portaudio/build/msvc/PAStaticWMMEv19.vcproj portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj
---- ../../../portaudio/build/msvc/PAStaticWMMEv19.vcproj	1970-01-01 01:00:00.000000000 +0100
-+++ portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj	2008-03-18 11:39:39.000000000 +0000
-@@ -0,0 +1,790 @@
-+<?xml version="1.0" encoding="Windows-1252"?>
-+<VisualStudioProject
-+	ProjectType="Visual C++"
-+	Version="8.00"
-+	Name="PAStaticWMMEv19"
-+	ProjectGUID="{7ABA0F80-94AE-4E82-AB89-2E1258212D59}"
-+	RootNamespace="PAStaticWMMEv19"
-+	>
-+	<Platforms>
-+		<Platform
-+			Name="Win32"
-+		/>
-+	</Platforms>
-+	<ToolFiles>
-+	</ToolFiles>
-+	<Configurations>
-+		<Configuration
-+			Name="Release|Win32"
-+			OutputDirectory="$(ConfigurationName)"
-+			IntermediateDirectory="$(ConfigurationName)"
-+			ConfigurationType="4"
-+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-+			UseOfMFC="0"
-+			ATLMinimizesCRunTimeLibraryUsage="false"
-+			CharacterSet="2"
-+			>
-+			<Tool
-+				Name="VCPreBuildEventTool"
-+				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-+			/>
-+			<Tool
-+				Name="VCCustomBuildTool"
-+			/>
-+			<Tool
-+				Name="VCXMLDataGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCWebServiceProxyGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCMIDLTool"
-+			/>
-+			<Tool
-+				Name="VCCLCompilerTool"
-+				AdditionalOptions="/O2"
-+				Optimization="2"
-+				InlineFunctionExpansion="1"
-+				AdditionalIncludeDirectories="../../include;../../src/common"
-+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-+				StringPooling="true"
-+				RuntimeLibrary="0"
-+				EnableFunctionLevelLinking="true"
-+				UsePrecompiledHeader="0"
-+				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-+				AssemblerListingLocation=".\$(ConfigurationName)/"
-+				ObjectFile=".\$(ConfigurationName)/"
-+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-+				WarningLevel="3"
-+				SuppressStartupBanner="true"
-+				CompileAs="0"
-+				DisableSpecificWarnings="4996"
-+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-+			/>
-+			<Tool
-+				Name="VCManagedResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCResourceCompilerTool"
-+				PreprocessorDefinitions="NDEBUG"
-+				Culture="1032"
-+			/>
-+			<Tool
-+				Name="VCPreLinkEventTool"
-+			/>
-+			<Tool
-+				Name="VCLibrarianTool"
-+				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19.lib"
-+				SuppressStartupBanner="true"
-+			/>
-+			<Tool
-+				Name="VCALinkTool"
-+			/>
-+			<Tool
-+				Name="VCXDCMakeTool"
-+			/>
-+			<Tool
-+				Name="VCBscMakeTool"
-+			/>
-+			<Tool
-+				Name="VCFxCopTool"
-+			/>
-+			<Tool
-+				Name="VCPostBuildEventTool"
-+				CommandLine="set CFLAGS=/I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-+			/>
-+		</Configuration>
-+		<Configuration
-+			Name="Debug|Win32"
-+			OutputDirectory="$(ConfigurationName)"
-+			IntermediateDirectory="$(ConfigurationName)"
-+			ConfigurationType="4"
-+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-+			UseOfMFC="0"
-+			ATLMinimizesCRunTimeLibraryUsage="false"
-+			CharacterSet="2"
-+			>
-+			<Tool
-+				Name="VCPreBuildEventTool"
-+				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-+			/>
-+			<Tool
-+				Name="VCCustomBuildTool"
-+			/>
-+			<Tool
-+				Name="VCXMLDataGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCWebServiceProxyGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCMIDLTool"
-+			/>
-+			<Tool
-+				Name="VCCLCompilerTool"
-+				Optimization="0"
-+				AdditionalIncludeDirectories="../../include;../../src/common"
-+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-+				BasicRuntimeChecks="3"
-+				RuntimeLibrary="1"
-+				UsePrecompiledHeader="0"
-+				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-+				AssemblerListingLocation=".\$(ConfigurationName)/"
-+				ObjectFile=".\$(ConfigurationName)/"
-+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-+				WarningLevel="3"
-+				SuppressStartupBanner="true"
-+				DebugInformationFormat="4"
-+				CompileAs="0"
-+				DisableSpecificWarnings="4996"
-+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-+			/>
-+			<Tool
-+				Name="VCManagedResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCResourceCompilerTool"
-+				PreprocessorDefinitions="_DEBUG"
-+				Culture="1032"
-+			/>
-+			<Tool
-+				Name="VCPreLinkEventTool"
-+			/>
-+			<Tool
-+				Name="VCLibrarianTool"
-+				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19d.lib"
-+				SuppressStartupBanner="true"
-+			/>
-+			<Tool
-+				Name="VCALinkTool"
-+			/>
-+			<Tool
-+				Name="VCXDCMakeTool"
-+			/>
-+			<Tool
-+				Name="VCBscMakeTool"
-+			/>
-+			<Tool
-+				Name="VCFxCopTool"
-+			/>
-+			<Tool
-+				Name="VCPostBuildEventTool"
-+				CommandLine="set CFLAGS= /I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-+			/>
-+		</Configuration>
-+		<Configuration
-+			Name="Unicode_Debug|Win32"
-+			OutputDirectory="$(ConfigurationName)"
-+			IntermediateDirectory="$(ConfigurationName)"
-+			ConfigurationType="4"
-+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-+			UseOfMFC="0"
-+			ATLMinimizesCRunTimeLibraryUsage="false"
-+			CharacterSet="0"
-+			>
-+			<Tool
-+				Name="VCPreBuildEventTool"
-+				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-+			/>
-+			<Tool
-+				Name="VCCustomBuildTool"
-+			/>
-+			<Tool
-+				Name="VCXMLDataGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCWebServiceProxyGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCMIDLTool"
-+			/>
-+			<Tool
-+				Name="VCCLCompilerTool"
-+				Optimization="0"
-+				AdditionalIncludeDirectories="../../include;../../src/common"
-+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-+				BasicRuntimeChecks="3"
-+				RuntimeLibrary="1"
-+				UsePrecompiledHeader="0"
-+				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-+				AssemblerListingLocation=".\$(ConfigurationName)/"
-+				ObjectFile=".\$(ConfigurationName)/"
-+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-+				WarningLevel="3"
-+				SuppressStartupBanner="true"
-+				DebugInformationFormat="4"
-+				CompileAs="0"
-+				DisableSpecificWarnings="4996"
-+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-+			/>
-+			<Tool
-+				Name="VCManagedResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCResourceCompilerTool"
-+				PreprocessorDefinitions="_DEBUG"
-+				Culture="1032"
-+			/>
-+			<Tool
-+				Name="VCPreLinkEventTool"
-+			/>
-+			<Tool
-+				Name="VCLibrarianTool"
-+				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19ud.lib"
-+				SuppressStartupBanner="true"
-+			/>
-+			<Tool
-+				Name="VCALinkTool"
-+			/>
-+			<Tool
-+				Name="VCXDCMakeTool"
-+			/>
-+			<Tool
-+				Name="VCBscMakeTool"
-+			/>
-+			<Tool
-+				Name="VCFxCopTool"
-+			/>
-+			<Tool
-+				Name="VCPostBuildEventTool"
-+				CommandLine="set CFLAGS= /I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-+			/>
-+		</Configuration>
-+		<Configuration
-+			Name="Unicode_Release|Win32"
-+			OutputDirectory="$(ConfigurationName)"
-+			IntermediateDirectory="$(ConfigurationName)"
-+			ConfigurationType="4"
-+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-+			UseOfMFC="0"
-+			ATLMinimizesCRunTimeLibraryUsage="false"
-+			CharacterSet="0"
-+			>
-+			<Tool
-+				Name="VCPreBuildEventTool"
-+				CommandLine="echo // Automatically generated file &gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;.\$(ConfigurationName)\config.h&quot;&#x0D;&#x0A;"
-+			/>
-+			<Tool
-+				Name="VCCustomBuildTool"
-+			/>
-+			<Tool
-+				Name="VCXMLDataGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCWebServiceProxyGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCMIDLTool"
-+			/>
-+			<Tool
-+				Name="VCCLCompilerTool"
-+				AdditionalOptions="/O2"
-+				Optimization="2"
-+				InlineFunctionExpansion="1"
-+				AdditionalIncludeDirectories="../../include;../../src/common"
-+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-+				StringPooling="true"
-+				RuntimeLibrary="0"
-+				EnableFunctionLevelLinking="true"
-+				UsePrecompiledHeader="0"
-+				PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch"
-+				AssemblerListingLocation=".\$(ConfigurationName)/"
-+				ObjectFile=".\$(ConfigurationName)/"
-+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
-+				WarningLevel="3"
-+				SuppressStartupBanner="true"
-+				CompileAs="0"
-+				DisableSpecificWarnings="4996"
-+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
-+			/>
-+			<Tool
-+				Name="VCManagedResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCResourceCompilerTool"
-+				PreprocessorDefinitions="NDEBUG"
-+				Culture="1032"
-+			/>
-+			<Tool
-+				Name="VCPreLinkEventTool"
-+			/>
-+			<Tool
-+				Name="VCLibrarianTool"
-+				OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19u.lib"
-+				SuppressStartupBanner="true"
-+			/>
-+			<Tool
-+				Name="VCALinkTool"
-+			/>
-+			<Tool
-+				Name="VCXDCMakeTool"
-+			/>
-+			<Tool
-+				Name="VCBscMakeTool"
-+			/>
-+			<Tool
-+				Name="VCFxCopTool"
-+			/>
-+			<Tool
-+				Name="VCPostBuildEventTool"
-+				CommandLine="set CFLAGS=/I &quot;../../include&quot; /I &quot;../../src/common&quot; /I &quot;../../src/common&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo&quot;.\$(OutDir)/&quot; /Fd&quot;.\$(OutDir)/&quot;&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%include&quot; &quot;..\..\src\hostapi\dsound\pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%lib\x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;..\..\src\hostapi\asio\iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\common\asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%\host\pc\asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;.\$(OutDir)\*.obj&quot; %LIBS%&#x0D;&#x0A;"
-+			/>
-+		</Configuration>
-+	</Configurations>
-+	<References>
-+	</References>
-+	<Files>
-+		<Filter
-+			Name="Source Files"
-+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-+			>
-+			<Filter
-+				Name="common"
-+				>
-+				<File
-+					RelativePath="..\..\src\common\pa_allocation.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_allocation.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_converters.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_converters.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_cpuload.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_cpuload.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_dither.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_dither.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_endianness.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_front.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_hostapi.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_process.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_process.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_skeleton.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_stream.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_stream.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_trace.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_trace.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_types.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\common\pa_util.h"
-+					>
-+				</File>
-+			</Filter>
-+			<Filter
-+				Name="hostapi"
-+				>
-+				<Filter
-+					Name="wmme"
-+					>
-+					<File
-+						RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c"
-+						>
-+					</File>
-+				</Filter>
-+				<Filter
-+					Name="wdmks"
-+					>
-+					<File
-+						RelativePath="..\..\src\hostapi\wdmks\pa_win_wdmks.c"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+				</Filter>
-+				<Filter
-+					Name="dsound"
-+					>
-+					<File
-+						RelativePath="..\..\src\hostapi\dsound\pa_win_ds.c"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+					<File
-+						RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+					<File
-+						RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.h"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+				</Filter>
-+				<Filter
-+					Name="asio"
-+					>
-+					<File
-+						RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+					<File
-+						RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.h"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCustomBuildTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+					<File
-+						RelativePath="..\..\src\hostapi\asio\pa_asio.cpp"
-+						>
-+						<FileConfiguration
-+							Name="Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Debug|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+						<FileConfiguration
-+							Name="Unicode_Release|Win32"
-+							ExcludedFromBuild="true"
-+							>
-+							<Tool
-+								Name="VCCLCompilerTool"
-+							/>
-+						</FileConfiguration>
-+					</File>
-+				</Filter>
-+			</Filter>
-+			<Filter
-+				Name="os"
-+				>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_win_hostapis.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_win_util.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_win_waveformat.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\include\pa_win_waveformat.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_win_wdmks_utils.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_win_wdmks_utils.h"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_x86_plain_converters.c"
-+					>
-+				</File>
-+				<File
-+					RelativePath="..\..\src\os\win\pa_x86_plain_converters.h"
-+					>
-+				</File>
-+			</Filter>
-+		</Filter>
-+		<Filter
-+			Name="Public Headers"
-+			Filter="h;hpp;hxx;hm;inl"
-+			>
-+			<File
-+				RelativePath="..\..\include\pa_win_ds.h"
-+				>
-+				<FileConfiguration
-+					Name="Release|Win32"
-+					ExcludedFromBuild="true"
-+					>
-+					<Tool
-+						Name="VCCustomBuildTool"
-+					/>
-+				</FileConfiguration>
-+				<FileConfiguration
-+					Name="Debug|Win32"
-+					ExcludedFromBuild="true"
-+					>
-+					<Tool
-+						Name="VCCustomBuildTool"
-+					/>
-+				</FileConfiguration>
-+				<FileConfiguration
-+					Name="Unicode_Debug|Win32"
-+					ExcludedFromBuild="true"
-+					>
-+					<Tool
-+						Name="VCCustomBuildTool"
-+					/>
-+				</FileConfiguration>
-+				<FileConfiguration
-+					Name="Unicode_Release|Win32"
-+					ExcludedFromBuild="true"
-+					>
-+					<Tool
-+						Name="VCCustomBuildTool"
-+					/>
-+				</FileConfiguration>
-+			</File>
-+			<File
-+				RelativePath="..\..\include\pa_win_wmme.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath="..\..\include\portaudio.h"
-+				>
-+			</File>
-+		</Filter>
-+	</Files>
-+	<Globals>
-+	</Globals>
-+</VisualStudioProject>
 diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh --exclude autom4te.cache ../../../portaudio/include/pa_unix_oss.h portaudio-v19/include/pa_unix_oss.h
 --- ../../../portaudio/include/pa_unix_oss.h	1970-01-01 01:00:00.000000000 +0100
 +++ portaudio-v19/include/pa_unix_oss.h	2008-03-18 11:39:39.000000000 +0000
@@ -800,7 +6,7 @@ diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefil
 +#define PA_UNIX_OSS_H
 +
 +/*
-+ * $Id: portaudio.patch,v 1.8 2008/03/18 12:35:51 richardash1981 Exp $
++ * $Id: portaudio.patch,v 1.9 2008/12/31 15:44:56 richardash1981 Exp $
 + * PortAudio Portable Real-Time Audio Library
 + * OSS-specific extensions
 + *
@@ -852,7 +58,7 @@ diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefil
 +#define PA_UNIX_OSS_H
 +
 +/*
-+ * $Id: portaudio.patch,v 1.8 2008/03/18 12:35:51 richardash1981 Exp $
++ * $Id: portaudio.patch,v 1.9 2008/12/31 15:44:56 richardash1981 Exp $
 + * PortAudio Portable Real-Time Audio Library
 + * OSS-specific extensions
 + *
diff --git a/lib-src/portmixer/px_common/portmixer.h b/lib-src/portmixer/px_common/portmixer.h
old mode 100755
new mode 100644
diff --git a/lib-src/portmixer/px_mac_core/Makefile b/lib-src/portmixer/px_mac_core/Makefile
deleted file mode 100644
index e7c0cdd..0000000
--- a/lib-src/portmixer/px_mac_core/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Make PortMixer Library for Mac OS X / CoreAudio
-
-CC = cc
-CFLAGS = -g -I../px_common
-PA = ../../portaudio$(PA_VER)
-
-ifeq ($(PA_VER),-v19)
-CFLAGS += -I$(PA)/include -I$(PA)/src/common -I$(PA)/src/hostapi/coreaudio
-else
-CFLAGS += -I$(PA)/pa_common
-endif
-
-PASRC = px_mac_core.c
-PAINC = ../px_common/portmixer.h
-PAOBJ = px_mac_core.o 
-
-portmixer.a: $(PAOBJ)
-	ar ruv portmixer.a $(PAOBJ)
-	ranlib portmixer.a
-
-clean:
-	rm -f portmixer.a *.o
-
-%.o: %.c $(PAINC) Makefile
-	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/lib-src/portmixer/px_none/Makefile b/lib-src/portmixer/px_none/Makefile
deleted file mode 100644
index 90fd5d1..0000000
--- a/lib-src/portmixer/px_none/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Make PortMixer Library for Mac OS X / CoreMixer
-
-CC = cc
-
-CFLAGS = -g -I../px_common -I../../portaudio/pa_common
-PASRC = px_none.c
-PAINC = ../px_common/portmixer.h
-PAOBJ = px_none.o 
-
-portmixer.a: $(PAOBJ)
-	ar ruv portmixer.a $(PAOBJ)
-	ranlib portmixer.a
-
-clean:
-	rm -f portmixer.a *.o
-
-%.o: %.c $(PAINC) Makefile
-	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/lib-src/portmixer/px_tests/Makefile b/lib-src/portmixer/px_tests/Makefile
deleted file mode 100755
index d3bf4c5..0000000
--- a/lib-src/portmixer/px_tests/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-all: px_test
-
-CFLAGS = -g -Wall -O -I../../portaudio/pa_common -I../px_common
-
-px_test: px_test.o px_unix_oss.o ../px_common/portmixer.h
-	gcc -g -o px_test px_test.o px_unix_oss.o -lm \
-		-L../../portaudio/pa_unix_oss -lportaudio -lpthread
-
-px_test.o: px_test.c ../px_common/portmixer.h
-	gcc $(CFLAGS) -c px_test.c
-
-
-px_unix_oss.o: ../px_unix_oss/px_unix_oss.c ../px_common/portmixer.h
-	gcc $(CFLAGS) -c ../px_unix_oss/px_unix_oss.c
-
-
diff --git a/lib-src/portmixer/px_unix_oss/Makefile b/lib-src/portmixer/px_unix_oss/Makefile
deleted file mode 100644
index 4712cd9..0000000
--- a/lib-src/portmixer/px_unix_oss/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Make PortMixer Library for Unix / OSS
-
-CC = gcc
-
-CFLAGS = -g -I../px_common -I../../portaudio/pa_common
-PASRC = px_unix_oss.c
-PAINC = ../px_common/portmixer.h
-PAOBJ = px_unix_oss.o 
-
-portmixer.a: $(PAOBJ)
-	ar ruv portmixer.a $(PAOBJ)
-	ranlib portmixer.a
-
-clean:
-	rm -f portmixer.a *.o
-
-%.o: %.c $(PAINC) Makefile
-	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/lib-src/portmixer/px_win_wmme/Makefile b/lib-src/portmixer/px_win_wmme/Makefile
deleted file mode 100644
index 61fe6d5..0000000
--- a/lib-src/portmixer/px_win_wmme/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Make PortMixer Library for Windows / Cygwin
-
-CC = gcc
-
-override CFLAGS = -g -I../px_common -I../../portaudio/pa_common
-PASRC = px_win_wmme.c
-PAINC = ../px_common/portmixer.h
-PAOBJ = px_win_wmme.o 
-
-portmixer.a: $(PAOBJ)
-	ar ruv portmixer.a $(PAOBJ)
-	ranlib portmixer.a
-
-clean:
-	rm -f portmixer.a *.o
-
-%.o: %.c $(PAINC) Makefile
-	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/lib-src/portsmf/Makefile.in b/lib-src/portsmf/Makefile.in
index 6e8ec16..fe225d6 100644
--- a/lib-src/portsmf/Makefile.in
+++ b/lib-src/portsmf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -135,6 +135,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
@@ -191,6 +192,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -245,7 +247,7 @@ all: all-am
 .SUFFIXES: .cpp .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -272,9 +274,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 portSMF.pc: $(top_builddir)/config.status $(srcdir)/portSMF.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -381,7 +383,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/lib-src/portsmf/configure b/lib-src/portsmf/configure
index 9e295e0..c252646 100644
--- a/lib-src/portsmf/configure
+++ b/lib-src/portsmf/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for portSMF 0.1.
+# Generated by GNU Autoconf 2.63 for portSMF 0.1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -614,95 +636,105 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CXXCPP
-RANLIB
-SED
-GREP
-EGREP
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+EGREP
+GREP
+SED
+RANLIB
+CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+enable_dependency_tracking
+enable_debug
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -720,6 +752,8 @@ CXXCPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -818,13 +852,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -837,13 +879,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1034,22 +1084,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1069,7 +1135,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1078,16 +1144,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1096,22 +1162,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1126,7 +1208,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1142,10 +1224,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1153,12 +1235,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1185,12 +1267,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1239,9 +1321,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1251,25 +1333,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/portsmf]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/portsmf]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1288,8 +1370,11 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-debug          enable debug support [default=no]
@@ -1316,15 +1401,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1360,7 +1447,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1370,10 +1457,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 portSMF configure 0.1
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1384,7 +1471,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by portSMF $as_me 0.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1420,7 +1507,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1455,7 +1542,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1507,11 +1594,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1541,9 +1629,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1558,9 +1646,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1576,8 +1664,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1619,21 +1707,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1643,16 +1734,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1666,29 +1757,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1698,10 +1798,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1754,8 +1856,8 @@ for ac_dir in autotools "$srcdir"/autotools; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1785,11 +1887,12 @@ am__api_version='1.10'
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -1818,17 +1921,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -1841,8 +1956,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1852,8 +1967,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1876,9 +1991,9 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -1889,26 +2004,23 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1919,15 +2031,15 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -1962,8 +2074,8 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -1975,10 +2087,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -1991,7 +2103,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2002,22 +2114,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2034,12 +2147,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2058,8 +2171,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -2114,10 +2227,10 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2130,7 +2243,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2141,11 +2254,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2154,10 +2267,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2170,7 +2283,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2181,11 +2294,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2193,12 +2306,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2222,6 +2331,28 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
 
 cflags_save="$CFLAGS"
 cppflags_save="$CPPFLAGS"
@@ -2234,10 +2365,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2250,7 +2381,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2261,11 +2392,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2274,10 +2405,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2290,7 +2421,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2301,11 +2432,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2313,12 +2444,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2331,10 +2458,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2347,7 +2474,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2358,11 +2485,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2371,10 +2498,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2392,7 +2519,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2415,11 +2542,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2430,10 +2557,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2446,7 +2573,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2457,11 +2584,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2474,10 +2601,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2490,7 +2617,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2501,11 +2628,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2517,12 +2644,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2532,44 +2655,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2588,27 +2717,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2619,10 +2743,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2633,7 +2758,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2660,25 +2785,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2687,49 +2814,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2738,31 +2869,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2785,40 +2918,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2844,20 +2980,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2867,15 +3004,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2902,20 +3043,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2940,20 +3082,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2979,20 +3122,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3007,8 +3151,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3024,10 +3168,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3098,20 +3242,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3127,15 +3272,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3156,8 +3301,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3184,8 +3329,8 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3209,10 +3354,10 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3300,8 +3445,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -3335,10 +3480,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -3351,7 +3496,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3362,11 +3507,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3379,10 +3524,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -3395,7 +3540,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3406,11 +3551,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3422,12 +3567,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -3437,43 +3578,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3499,20 +3644,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3522,15 +3668,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -3557,20 +3707,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -3595,20 +3746,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -3634,20 +3786,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3662,8 +3815,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -3687,10 +3840,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3778,8 +3931,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
@@ -3798,11 +3951,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -3834,20 +3987,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3871,13 +4025,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3885,7 +4040,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3910,8 +4065,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -3939,20 +4094,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3976,13 +4132,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3990,7 +4147,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4006,11 +4163,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=cpp
@@ -4036,11 +4195,12 @@ CXXFLAGS="$cxxflags_save"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4069,17 +4229,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -4092,8 +4264,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4106,10 +4278,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -4122,7 +4294,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4133,11 +4305,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4146,10 +4318,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -4162,7 +4334,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4173,11 +4345,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -4185,12 +4357,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -4225,18 +4393,18 @@ fi
 
 
 if test x"$debug_preference" = "xyes" ; then
-      { echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
-echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
+      { $as_echo "$as_me:$LINENO: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5
+$as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
    CFLAGS="${CFLAGS} -g "
    CXXFLAGS="${CXXFLAGS} -g "
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
-echo $ECHO_N "checking CFLAGS for strict prototypes... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
+$as_echo_n "checking CFLAGS for strict prototypes... " >&6; }
 if test "${ac_cv_cflags_strict_prototypes+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_cflags_strict_prototypes="no, unknown"
 
@@ -4270,20 +4438,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_cflags_strict_prototypes=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4318,13 +4487,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4333,7 +4503,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 then if test `diff config.log config.tmp | grep -i warning | wc -l` != 1
 then ac_cv_cflags_strict_prototypes="no, suppressed, signal.h," ; fi ; fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
@@ -4352,23 +4522,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
-echo "${ECHO_T}$ac_cv_cflags_strict_prototypes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
+$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
 case ".$ac_cv_cflags_strict_prototypes" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
-   then { (echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
+   then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
   (: CFLAGS does contain $ac_cv_cflags_strict_prototypes) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-   else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
+   else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
   (: CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
                       CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes"
    fi
@@ -4376,10 +4546,10 @@ case ".$ac_cv_cflags_strict_prototypes" in
 esac
 
 
-{ echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
-echo $ECHO_N "checking wall_flags for maximum warnings... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking wall_flags for maximum warnings" >&5
+$as_echo_n "checking wall_flags for maximum warnings... " >&6; }
 if test "${ac_cv_cflags_warn_all+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_cflags_warn_all="no, unknown"
 
@@ -4413,20 +4583,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4443,23 +4614,23 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
-echo "${ECHO_T}$ac_cv_cflags_warn_all" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
+$as_echo "$ac_cv_cflags_warn_all" >&6; }
 case ".$ac_cv_cflags_warn_all" in
      .ok|.ok,*)  ;;
    .|.no|.no,*)
  ;;
    *)
    if echo " $wall_flags " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
-   then { (echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
+   then { ($as_echo "$as_me:$LINENO: : wall_flags does contain \$ac_cv_cflags_warn_all") >&5
   (: wall_flags does contain $ac_cv_cflags_warn_all) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-   else { (echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
+   else { ($as_echo "$as_me:$LINENO: : wall_flags=\"\$wall_flags \$ac_cv_cflags_warn_all\"") >&5
   (: wall_flags="$wall_flags $ac_cv_cflags_warn_all") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
                       wall_flags="$wall_flags $ac_cv_cflags_warn_all"
    fi
@@ -4467,48 +4638,43 @@ case ".$ac_cv_cflags_warn_all" in
 esac
 
 CFLAGS="${CFLAGS} $wall_flags"
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
-     echo "$ac_script" | sed 99q >conftest.sed
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     # Extract the first word of "sed gsed" to use in msg output
-if test -z "$SED"; then
-set dummy sed gsed; ac_prog_name=$2
-if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$SED"; then
   ac_path_SED_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in sed gsed; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-    # Check for GNU ac_path_SED and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo '' >> "conftest.nl"
+    $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4523,31 +4689,23 @@ case `"$ac_path_SED" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_SED_found && break 3
+      $ac_path_SED_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-SED="$ac_cv_path_SED"
-if test -z "$SED"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4559,10 +4717,10 @@ echo "${ECHO_T}$ac_cv_path_SED" >&6; }
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
-echo $ECHO_N "checking whether the C++ compiler accepts the $wall_flags flag... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C++ compiler accepts the $wall_flags flag" >&5
+$as_echo_n "checking whether the C++ compiler accepts the $wall_flags flag... " >&6; }
 if { as_var=ax_cv_cxx_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -4598,13 +4756,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -4613,7 +4772,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       eval "ax_cv_cxx_check_flag_$flag=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4634,9 +4793,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-ac_res=`eval echo '${'ax_cv_cxx_check_flag_$flag'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'ax_cv_cxx_check_flag_$flag'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
   if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then
 
@@ -4662,10 +4822,10 @@ fi
 
   flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
 
-  { echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
-echo $ECHO_N "checking whether the C++ preprocessor accepts the $wall_flags flag... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C++ preprocessor accepts the $wall_flags flag" >&5
+$as_echo_n "checking whether the C++ preprocessor accepts the $wall_flags flag... " >&6; }
 if { as_var=ax_cv_cxxcpp_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -4700,13 +4860,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -4715,7 +4876,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       eval "ax_cv_cxxcpp_check_flag_$flag=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4736,9 +4897,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 fi
-ac_res=`eval echo '${'ax_cv_cxxcpp_check_flag_$flag'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'ax_cv_cxxcpp_check_flag_$flag'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
   if eval "test \"`echo '$ax_cv_cxxcpp_check_flag_'$flag`\" = yes"; then
 
@@ -4761,11 +4923,11 @@ fi
 
 for ac_func in strchr memmove
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4818,76 +4980,78 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4902,74 +5066,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4984,40 +5134,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5044,20 +5185,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -5149,37 +5291,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5201,11 +5346,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5223,20 +5368,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -5244,12 +5390,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5260,20 +5409,21 @@ done
 
 for ac_header in stdlib.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5289,32 +5439,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5328,79 +5479,83 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
-echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
 if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_malloc_0_nonnull=no
@@ -5431,36 +5586,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_malloc_0_nonnull=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_malloc_0_nonnull=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
 if test $ac_cv_func_malloc_0_nonnull = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5487,10 +5645,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
 if test "${ac_cv_header_stdbool_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5531,6 +5689,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 	char h[sizeof (_Bool)];
 	char i[sizeof s.t];
 	enum { j = false, k = true, l = false * true, m = true * 256 };
+	/* The following fails for
+	   HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
 	_Bool n[m];
 	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
 	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
@@ -5580,20 +5740,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdbool_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdbool_h=no
@@ -5601,28 +5762,60 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
-{ echo "$as_me:$LINENO: checking for _Bool" >&5
-echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+$as_echo_n "checking for _Bool... " >&6; }
 if test "${ac_cv_type__Bool+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type__Bool=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef _Bool ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (_Bool))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((_Bool)))
+	  return 0;
   ;
   return 0;
 }
@@ -5633,30 +5826,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type__Bool=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type__Bool=no
+	ac_cv_type__Bool=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
-if test $ac_cv_type__Bool = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+$as_echo "$ac_cv_type__Bool" >&6; }
+if test "x$ac_cv_type__Bool" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
@@ -5674,10 +5876,10 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5704,20 +5906,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -5809,37 +6012,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5852,20 +6058,21 @@ fi
 
 for ac_header in stdlib.h string.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5881,32 +6088,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5920,69 +6128,73 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5990,10 +6202,10 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6065,20 +6277,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -6086,36 +6299,68 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (size_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -6126,30 +6371,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -6190,11 +6444,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -6227,12 +6482,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -6249,6 +6504,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -6278,7 +6539,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -6289,34 +6550,42 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -6329,7 +6598,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -6339,7 +6608,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -6361,17 +6630,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -6387,8 +6684,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -6411,7 +6706,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -6424,17 +6719,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -6456,7 +6744,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -6507,7 +6795,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -6535,7 +6823,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -6548,19 +6835,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -6585,10 +6875,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -6611,7 +6901,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by portSMF $as_me 0.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6624,27 +6914,34 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -6655,13 +6952,13 @@ $config_commands
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 portSMF config.status 0.1
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -6669,11 +6966,12 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -6695,21 +6993,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -6728,27 +7029,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -6756,7 +7059,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -6767,8 +7070,8 @@ do
     "portSMF.pc") CONFIG_FILES="$CONFIG_FILES portSMF.pc" ;;
     "portSMF-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES portSMF-uninstalled.pc" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -6808,153 +7111,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-RANLIB!$RANLIB$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -6970,19 +7264,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -7011,26 +7307,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -7040,7 +7348,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -7066,7 +7374,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -7075,7 +7383,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -7096,17 +7404,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -7151,12 +7459,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -7165,13 +7474,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -7185,15 +7495,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -7204,32 +7515,48 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
@@ -7245,7 +7572,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -7289,7 +7616,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -7315,7 +7642,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -7324,7 +7651,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -7345,8 +7672,8 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -7363,6 +7690,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -7384,6 +7716,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 echo ""
diff --git a/lib-src/portsmf/configure.ac b/lib-src/portsmf/configure.ac
index b771ff7..ea873c3 100644
--- a/lib-src/portsmf/configure.ac
+++ b/lib-src/portsmf/configure.ac
@@ -24,7 +24,11 @@ dnl keep autools files in a subdirectory
 AC_CONFIG_AUX_DIR(autotools)
 # which also contains a subdir containing macros
 AC_CONFIG_MACRO_DIR([autotools/m4])
+dnl set up automake
 AM_INIT_AUTOMAKE([-Wall foreign])
+dnl Audacity policy: don't enable automatic rebuild of configure et al if 
+dnl sources change
+AM_MAINTAINER_MODE([enabled])
 
 dnl -------------------------------------------------------
 dnl Checks for programs.
diff --git a/lib-src/sbsms/AUTHORS b/lib-src/sbsms/AUTHORS
new file mode 100644
index 0000000..793bcf9
--- /dev/null
+++ b/lib-src/sbsms/AUTHORS
@@ -0,0 +1 @@
+Clayton Otey (wdwonka at users.sourceforge.net)
diff --git a/lib-src/sbsms/COPYING b/lib-src/sbsms/COPYING
new file mode 100644
index 0000000..187727f
--- /dev/null
+++ b/lib-src/sbsms/COPYING
@@ -0,0 +1,280 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+               59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff --git a/lib-src/sbsms/ChangeLog b/lib-src/sbsms/ChangeLog
new file mode 100644
index 0000000..08a627a
--- /dev/null
+++ b/lib-src/sbsms/ChangeLog
@@ -0,0 +1,196 @@
+Version 2.0.2 (15 Aug 2005)
+
+  * packaging changes:
+    - require automake (>= 1.5) for 'make -f Makefile.cvs'
+      (mandatory for 'dist-bzip2' automake option)
+
+  * src/gig.cpp, src/gig.h:
+    - support for gig v3 multi-file format (.gig, .gx01, .gx02, ...),
+      the extension files are read automatically when the samples are
+      loaded
+    - fixed the 24 bit decompression, the result should now be exact
+      instead of an approximation
+    - added VCFCutoffControllerInvert parameter and GetVelocityCutoff
+      function to DimensionRegion
+
+  * src/DLS.cpp, src/DLS.h:
+    - the upper bits of the pool table indices are read (used as
+      extension file numbers for gig v3)
+
+  * src/RIFF.cpp, src/RIFF.h:
+    - the file name is remembered in the RIFF::File object
+
+Version 2.0.1 (12 Jun 2005)
+
+  * packaging changes:
+    - include debian/ directory on 'make dist'
+    - create a bzip2 tarball on 'make dist'
+
+  * src/gigextract.cpp:
+    - show also version of libsndfile or build version of libaudiofile when
+      using the -v switch
+    - fixed mutual link dependency to libsndfile / libaudiofile
+
+  * src/gig.cpp, src/gig.h:
+    - added DimensionRegion::GetVelocityRelease function
+
+Version 2.0.0 (9 May 2005)
+
+  * packaging changes:
+    - fixed conditional linkage of either libsndfile or libaudiofile
+      (if none of the two exist, configure script will abort)
+    - man pages are now auto generated with the correct libgig version
+
+  * src/gig.cpp, src/gig.h:
+    - experimental support for Gigasampler v3 format;
+      64 bit file offsets are truncated to 32 bit, 24 bit samples are
+      truncated to 16 bit, up to 8 dimensions are read, additional
+      articulation informations are ignored at the moment
+      (patch by Andreas Persson)
+    - added some file format compatibility checks
+    - fixed vcf_type_lowpassturbo value (vcf_type_lowpassturbo was actually
+      never used, because the necessary check was made before
+      initialization)
+    - fixed crossfade points order (structure for big endian and little
+      endian systems was interchanged)
+    - fixed some memory leaks (patch by 'Gene', a.k.a Anders Alm)
+    - fixed crash which occured when patches did not have a sample assigned
+      to their region or dimension region (patch by Andreas Persson)
+    - support for compressed mono samples
+    - experimental support for compressed 24 bit samples
+    - fixed decompression on big-endian CPUs
+    - fixed decompression bug that truncated the last block of samples
+    - external decompression buffers can now be used for streaming samples
+      to avoid race conditions in case of multiple streaming threads
+    - added pre-calculated sample attenuation parameter
+    - added v3 "random" and "round robin" dimensions
+    - implemented progress indicator callback mechanism for loading
+      instruments and samples
+    - added functions libraryName() and libraryVersion()
+
+  * src/DLS.cpp, src/DLS.h:
+    - fixed File constructor which caused variable File::Instruments always
+      to be zero
+    - added functions libraryName() and libraryVersion()
+
+  * src/RIFF.cpp, src/RIFF.h:
+    - fixed method List::LoadSubChunks() which did not restore the original
+      position within the body of the given list chunk
+    - added functions libraryName() and libraryVersion()
+
+  * src/rifftree.cpp:
+    - added command line switch -v to show rifftree's revision and the used
+      libgig version
+
+  * src/dlsdump.cpp:
+    - added command line switch -v to show dlsdump's revision and the used
+      libgig version
+
+  * src/gigdump.cpp:
+    - added output of UnityNote, FineTune, Gain, SampleStartOffset an
+      LoopPlayCount
+    - added command line switch -v to show gigdump's revision and the used
+      libgig version
+
+  * src/gigextract.cpp:
+    - support for compressed mono samples and compressed 24 bit samples
+    - added command line switch -v to show gigextract's revision and the
+      used libgig version
+
+Version 1.0.0 (26 Nov 2004)
+
+  * packaging changes:
+    - renamed 'libgig.pc.in' -> 'gig.pc.in' and renamed pkg-config lib name
+      'libgig' -> 'gig' as it's common practice to omit the 'lib' prefix
+    - fixed man pages automake install rule (which didn't work on Mandrake,
+      SuSE and Fedora)
+    - fixed generation of Doxygen API documentation (now also included in
+      RPM and Debian packages)
+
+  * src/gig.cpp, src/gig.h:
+    - fixed / improved accuracy of all three velocity to volume
+      transformation functions a.k.a. 'nonlinear','linear','special'
+      (patch by Andreas Persson)
+    - denormals are filtered from the velocity to volume tables
+    - bugfix for dimension region switching (wrong handling of the release
+      trigger dimension, no bit range check for dimensions of split type
+      'split_type_bit')
+    - fixed panorama value in DimensionRegion (invalid conversion from
+      signed 7 bit to signed 8 bit)
+    - added class attribute 'Layers' to class 'gig::Region'
+    - symbol prototyping of gig::Region (fixes build failure with qsampler)
+
+  * src/gigextract.cpp:
+    - added support for libsndfile (if libaudiofile and libsndfile are
+      available then libsndfile is preferred)
+
+  * src/gigdump.cpp:
+    - added printout for dimension informations (amount, type, bits, zones)
+    - added printout for velocity response curve parameters
+    - added printout for crossfade definitions
+    - added printout for panorama value for each DimensionRegion
+    - replaced printout of DLS Region layer by printout of amount of
+      Gigasampler layers
+
+Version 0.7.1 (2 Jul 2004)
+
+  * packaging changes:
+    - added libgig.spec and libgig.pc package configurations for generating
+      Redhat packages
+    - header files included on installation.
+    - autotools-generated files removed from CVS repository.
+    - added support for generating Debian packages
+    - version of shared library can be set in configure.in
+
+Version 0.7.0 (3 May 2004)
+
+  * general changes:
+    - various big endian specific corrections
+      (successfully tested now on PPC)
+    - minor adjustments to avoid compile errors on some systems
+      (using now pow() instead of powl() and --pedantic g++ compiler switch)
+    - libtoolized the library
+    - added man pages for the command line tools
+      (gigextract, gigdump, dlsdump, rifftree)
+
+  * src/gig.cpp, src/gig.h:
+    - fixed bug in decompression algorithm which caused it not to detect
+      the end of a stream
+    - added method GetVelocityAttenuation() to class 'DimensionRegion' which
+      takes the MIDI key velocity value as an argument and returns the
+      appropriate volume factor (0.0 ... 1.0) for the sample to be played
+      back, the velocity curve transformation functions used for this are
+      only an approximation so far
+    - fixed class attributes 'Sample::LoopStart', 'Sample::LoopEnd' and
+      'Sample::LoopSize' which reflected wrong values
+    - class attributes 'Sample::LoopStart' and 'Sample::LoopEnd' are now
+      measured in sample points instead of byte offset
+    - renamed misleading attribute name 'Sample::MIDIPitchFraction' to
+      'Sample::FineTune'
+    - added class attribute 'Sample::LoopSize'
+    - added method GetInstrument(uint index) to class 'File'
+    - added ReadAndLoop() method to class 'Sample' which is an extension to
+      the normal Read() method to honor the sample's looping information
+      while streaming from disk
+    - changed interface for 'attenuation_ctrl_t', 'eg1_ctrl_t' and
+      'eg2_ctrl_t': replaced this huge enumeration by a structure which
+      reflects the MIDI controller number in case of an ordinary control
+      change controller (this saves a huge switch-case block in the
+      application of the library user)
+    - renamed following attributes in class 'DimensionRegion':
+      'AttenuationContol' -> 'AttenuationController',
+      'InvertAttenuationControl' -> 'InvertAttenuationController',
+      'AttenuationControlTreshold' -> 'AttenuationControllerThreshold'
+    - minor fix in API documentation for method GetVelocityAttenuation() in
+      class 'DimensionRegion'
+
+  * src/RIFF.cpp, src/RIFF.h:
+    - added additional API documentation
+    - minor fix in Chunk::Read() method (only a minor efficiency issue)
+
+  * src/gigdump.cpp:
+    - added printout of samples' looping informations
+
+Version 0.6.0 (3 Nov 2003)
+
+  * initial release
diff --git a/lib-src/sbsms/INSTALL b/lib-src/sbsms/INSTALL
new file mode 100644
index 0000000..02a4a07
--- /dev/null
+++ b/lib-src/sbsms/INSTALL
@@ -0,0 +1,167 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes a while.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Type `make install' to install the programs and any data files and
+     documentation.
+
+  4. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
+
diff --git a/lib-src/sbsms/Makefile.am b/lib-src/sbsms/Makefile.am
new file mode 100644
index 0000000..2851b8e
--- /dev/null
+++ b/lib-src/sbsms/Makefile.am
@@ -0,0 +1,10 @@
+SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = sbsms.pc
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck
+
+#tell aclocal that extra macros can be found in m4/
+ACLOCAL_AMFLAGS = -I m4
diff --git a/lib-src/sbsms/Makefile.in b/lib-src/sbsms/Makefile.in
new file mode 100644
index 0000000..d0f7342
--- /dev/null
+++ b/lib-src/sbsms/Makefile.in
@@ -0,0 +1,688 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/libsbsms.spec.in \
+	$(srcdir)/sbsms.pc.in $(top_srcdir)/configure AUTHORS COPYING \
+	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
+	install-sh ltmain.sh missing mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
+	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES = libsbsms.spec sbsms.pc
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
+RANLIB = @RANLIB@
+SBSMS_BIN = @SBSMS_BIN@
+SBSMS_PROGS = @SBSMS_PROGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
+SHELL = @SHELL@
+SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WX_CFLAGS = @WX_CFLAGS@
+WX_CONFIG = @WX_CONFIG@
+WX_LIBS = @WX_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = src
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = sbsms.pc
+
+#tell aclocal that extra macros can be found in m4/
+ACLOCAL_AMFLAGS = -I m4
+all: all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+libsbsms.spec: $(top_builddir)/config.status $(srcdir)/libsbsms.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+sbsms.pc: $(top_builddir)/config.status $(srcdir)/sbsms.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-pkgconfigDATA
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pkgconfigDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-generic distclean-libtool distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgconfigDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pkgconfigDATA
+
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib-src/portaudio-v19/bindings/cpp/NEWS b/lib-src/sbsms/NEWS
similarity index 100%
copy from lib-src/portaudio-v19/bindings/cpp/NEWS
copy to lib-src/sbsms/NEWS
diff --git a/lib-src/sbsms/README b/lib-src/sbsms/README
new file mode 100644
index 0000000..a5bf6be
--- /dev/null
+++ b/lib-src/sbsms/README
@@ -0,0 +1,58 @@
+Content
+=======
+
+libsbsms is a library for high quality time and pitch scale modification.  It uses octave subband sinusoidal modeling.
+
+sbsms has optional support for libsndfile(--enable-sndfile) and libmad(--enable-mp3) for reading(.wav and .mp3) and writing(.wav) files, and optional support for portaudio for playing .sbsms format files(--enable-portaudio) with sbsmsplay.
+
+The API is found in sbsms.h.  sbsms_create is called and supplied a callback which feeds sbsms_process samples.  The pitch_create and pitch_process functions are called only if pitch shifting is required.  It simply sticks a resampler on the end of the FIFO.  
+
+A program called sbsms is included.  It reads PCM files such as .wav and .aif (and .mp3 files if --enable-mp3), and writes .wav files using libsndfile.  The usage is:
+sbsms infile outfile rate-start rate-end halfsteps-start halfsteps-end <quality>
+
+For example:
+sbsms blob.wav blobOut.wav .5 .5 0 2 
+will slow down blob.wav by a factor of 2, while simultaneously sliding the pitch up two half-steps, and put the output in blobOut.wav
+
+Without sndfile support, the sbsms program will read text files in the format:
+%g %g\n
+...
+and write output in the same format.
+
+sbsms can also write .sbsms format files:
+sbsms blob.wav blob.sbsms 1 1 0 0
+
+which can be quickly rendered into .wav files at a new rate/pitch:
+sbsms blob.sbsms blobOut.wav .5 .5 0 2
+
+or played in realtime with sbsmsplay (if --enable-portaudio):
+sbsmsplay blob.sbsms .5 .5 0 2
+
+NOTE:
+When reading the output from sbsms, you must determine a stopping condition for yourself, as the library zero pads the output ad infinitum and never returns 0 samples.  The simplest method for doing so is found in test.cpp.
+  
+Clayton Otey (otey at users.sourceforge.net)
+
+Requirements
+============
+
+  POSIX systems (e.g. Linux, OS X):
+  ---------------------------------
+
+  You need at least to have libtool installed to be able to build the
+  library with "./configure && make".
+
+Compiling
+=========
+
+  Call './configure && make' on the console to compile the library, all
+  tools and demo applications, documentation and install them with
+  'make install'. The latter has to be called as root.
+
+  If you are compiling from CVS you have to call 'make -f Makefile.cvs'
+  to generate all autotools build files before calling
+  './configure && make'.
+
+  You can use 'make distclean' and probably 'make -f Makefile.cvs clean'
+  to clean up everything again. The latter will also delete all automatic
+  generated autools build files.
\ No newline at end of file
diff --git a/lib-src/sbsms/TODO b/lib-src/sbsms/TODO
new file mode 100644
index 0000000..e094ef2
--- /dev/null
+++ b/lib-src/sbsms/TODO
@@ -0,0 +1 @@
+- implement wxsbsmsplayer
\ No newline at end of file
diff --git a/lib-src/sbsms/bootstrap b/lib-src/sbsms/bootstrap
new file mode 100755
index 0000000..f50908f
--- /dev/null
+++ b/lib-src/sbsms/bootstrap
@@ -0,0 +1,5 @@
+#/bin/sh
+aclocal -I config
+autoheader
+automake --foreign --add-missing --copy
+autoconf
\ No newline at end of file
diff --git a/lib-src/sbsms/build/macosx.sh b/lib-src/sbsms/build/macosx.sh
new file mode 100755
index 0000000..ae45369
--- /dev/null
+++ b/lib-src/sbsms/build/macosx.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+export SNDFILE_LIBS=/usr/local/lib/libsndfile.a
+export SNDFILE_CFLAGS=-I/usr/local/include
+
+export PORTAUDIO_LIBS="/usr/local/lib/libportaudio.a -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
+export PORTAUDIO_CFLAGS=-I/usr/local/include
+
+export MAD_LIBS=/usr/local/lib/libmad.a
+
+./configure --enable-mp3 --enable-sndfile --enable-portaudio --enable-wx --enable-static --disable-dependency-tracking --enable-universal_binary --enable-multithreaded
+make
\ No newline at end of file
diff --git a/lib-src/sbsms/config.guess b/lib-src/sbsms/config.guess
new file mode 100755
index 0000000..2313a17
--- /dev/null
+++ b/lib-src/sbsms/config.guess
@@ -0,0 +1,1545 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+
+timestamp='2008-01-23'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner <per at bothner.com>.
+# Please send patches to <config-patches at gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi at noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+	eval $set_cc_for_build
+	cat << EOF > $dummy.c
+	#include <features.h>
+	#ifdef __UCLIBC__
+	# ifdef __UCLIBC_CONFIG_VERSION__
+	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+	# else
+	LIBC=uclibc
+	# endif
+	#else
+	LIBC=gnu
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+fi
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[456])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+		exit ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+		exit ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+		exit ;;
+	esac
+	# This should get integrated into the C code below, but now we hack
+	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel at ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes at openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf at swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches at gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/lib-src/sbsms/config.sub b/lib-src/sbsms/config.sub
new file mode 100755
index 0000000..ba16ebf
--- /dev/null
+++ b/lib-src/sbsms/config.sub
@@ -0,0 +1,1676 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+
+timestamp='2008-01-16'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches at gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx | dvp \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mipsEE* | ee | ps2)
+		basic_machine=mips64r5900el-scei
+		case $os in
+		    -linux*)
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
+	iop)
+		basic_machine=mipsel-scei
+		os=-irx
+		;;
+	dvp)
+		basic_machine=dvp-scei
+		os=-elf
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+        mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/lib-src/sbsms/config/README.TXT b/lib-src/sbsms/config/README.TXT
new file mode 100644
index 0000000..7c4f6e4
--- /dev/null
+++ b/lib-src/sbsms/config/README.TXT
@@ -0,0 +1,3 @@
+Files in this directory are used by GNU autoconf/automake system.
+These files aren't used/needed in the Windows environment.
+
diff --git a/lib-src/sbsms/config/am_include.mk b/lib-src/sbsms/config/am_include.mk
new file mode 100644
index 0000000..738d5c2
--- /dev/null
+++ b/lib-src/sbsms/config/am_include.mk
@@ -0,0 +1,51 @@
+## vim:tw=78
+## Process this file with automake to create Makefile.in
+##
+## $Id: am_include.mk,v 1.1 2008/11/25 06:45:46 otey Exp $
+##
+## Copyright (C) 2003 - David W. Durham
+## 
+## This file is part of SoundTouch, an audio processing library for pitch/time adjustments
+## 
+## SoundTouch is free software; you can redistribute it and/or modify it under the
+## terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+## 
+## SoundTouch is distributed in the hope that it will be useful, but WITHOUT ANY
+## WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+## A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+## Place - Suite 330, Boston, MA  02111-1307, USA
+
+## These are common definitions used in all Makefiles
+## It is actually included when a makefile.am is coverted to Makefile.in
+## by automake, so it's ok to have @MACROS@ that will be set by configure
+
+
+## INCLUDES is automatically added to CXXFLAGS at compile time. The
+## $(top_srcdir) macro is set by configure. It's important to use $(top_srcdir)
+## in case a user decides to build in a separate directory from the base package
+## directory. Using absolute, or relative paths is a bad idea.
+INCLUDES=-I$(top_srcdir)/include
+
+
+## CXXFLAGS is also automatically added to the $(CXX) macro at compile time, and
+## is passed down to the children as well
+## I list these here in case there needs to always be some flags passed to the compiler
+CXXFLAGS=@CXXFLAGS@
+
+
+## LDFLAGS will be added at link time
+## note that the -l flags are set by the LIBS macro that is set by configure
+## This line doesn't need to be here, configure will add LDFLAGS on it's own,
+## but I'm leaving here as a place to add LDFLAGS if so desired
+LDFLAGS=@LDFLAGS@
+
+
+# doc directory
+pkgdocdir=$(prefix)/doc/@PACKAGE@
+
+
diff --git a/lib-src/sbsms/config/config.guess b/lib-src/sbsms/config/config.guess
new file mode 100755
index 0000000..d56c46d
--- /dev/null
+++ b/lib-src/sbsms/config/config.guess
@@ -0,0 +1,1410 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-08-18'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per at bothner.com>.
+# Please send patches to <config-patches at gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi at noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel at ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes at openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf at swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches at gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/lib-src/sbsms/config/config.h b/lib-src/sbsms/config/config.h
new file mode 100644
index 0000000..64fc937
--- /dev/null
+++ b/lib-src/sbsms/config/config.h
@@ -0,0 +1,79 @@
+/* config/config.h.  Generated by configure.  */
+/* config/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "soundtouch"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://www.iki.fi/oparviai/soundtouch"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "SoundTouch"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "SoundTouch 1.2.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "soundtouch"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.2.1"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.2.1"
+
+/* */
+#define WORDS_BIGENDIAN 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
diff --git a/lib-src/sbsms/config/config.h.in b/lib-src/sbsms/config/config.h.in
new file mode 100644
index 0000000..136d27a
--- /dev/null
+++ b/lib-src/sbsms/config/config.h.in
@@ -0,0 +1,78 @@
+/* config/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* */
+#undef WORDS_BIGENDIAN
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+#undef inline
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
diff --git a/lib-src/sbsms/config/config.sub b/lib-src/sbsms/config/config.sub
new file mode 100755
index 0000000..6890099
--- /dev/null
+++ b/lib-src/sbsms/config/config.sub
@@ -0,0 +1,1508 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-08-18'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches at gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| msp430 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/lib-src/sbsms/config/depcomp b/lib-src/sbsms/config/depcomp
new file mode 100755
index 0000000..edb5d38
--- /dev/null
+++ b/lib-src/sbsms/config/depcomp
@@ -0,0 +1,479 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+if test -z "$depfile"; then
+   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
+   dir=`echo "$object" | sed 's,/.*$,/,'`
+   if test "$dir" = "$object"; then
+      dir=
+   fi
+   # FIXME: should be _deps on DOS.
+   depfile="$dir.deps/$base"
+fi
+
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.d"
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
diff --git a/lib-src/sbsms/config/install-sh b/lib-src/sbsms/config/install-sh
new file mode 100755
index 0000000..6ce63b9
--- /dev/null
+++ b/lib-src/sbsms/config/install-sh
@@ -0,0 +1,294 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+#
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd=$cpprog
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd=$stripprog
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "$0: no input file specified" >&2
+	exit 1
+else
+	:
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+
+	if [ -d "$dst" ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=$mkdirprog
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f "$src" ] || [ -d "$src" ]
+	then
+		:
+	else
+		echo "$0: $src does not exist" >&2
+		exit 1
+	fi
+
+	if [ x"$dst" = x ]
+	then
+		echo "$0: no destination specified" >&2
+		exit 1
+	else
+		:
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d "$dst" ]
+	then
+		dst=$dst/`basename "$src"`
+	else
+		:
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+	'
+IFS="${IFS-$defaultIFS}"
+
+oIFS=$IFS
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp=$pathcomp$1
+	shift
+
+	if [ ! -d "$pathcomp" ] ;
+        then
+		$mkdirprog "$pathcomp"
+	else
+		:
+	fi
+
+	pathcomp=$pathcomp/
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd "$dst" &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		dstfile=`basename "$dst" $transformbasename |
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		:
+	fi
+
+# Make a couple of temp file names in the proper directory.
+
+	dsttmp=$dstdir/_inst.$$_
+	rmtmp=$dstdir/_rm.$$_
+
+# Trap to clean up temp files at exit.
+
+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+	trap '(exit $?); exit' 1 2 13 15
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd "$src" "$dsttmp" &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+	if [ -f "$dstdir/$dstfile" ]
+	then
+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+		{
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		  (exit 1); exit
+		}
+	else
+		:
+	fi
+} &&
+
+# Now rename the file to the real destination.
+
+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+
+fi &&
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+
+{
+	(exit 0); exit
+}
diff --git a/lib-src/sbsms/config/ltmain.sh b/lib-src/sbsms/config/ltmain.sh
new file mode 100644
index 0000000..7e0c9f4
--- /dev/null
+++ b/lib-src/sbsms/config/ltmain.sh
@@ -0,0 +1,5062 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
+# The name of this program.
+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+modename="$progname"
+
+# Constants.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.4.3
+TIMESTAMP=" (1.922.2.110 2002/10/23 01:39:54)"
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII                                                         
+case `echo A|od -x` in                                                         
+ *[Cc]1*) # EBCDIC based system                                                
+  SP2NL="tr '\100' '\n'"                                                       
+  NL2SP="tr '\r\n' '\100\100'"                                                 
+  ;;                                                                           
+ *) # Assume ASCII based system                                                
+  SP2NL="tr '\040' '\012'"                                                     
+  NL2SP="tr '\015\012' '\040\040'"                                             
+  ;;                                                                           
+esac                                                                           
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+# Make sure IFS has a sensible default
+: ${IFS=" 	"}
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  echo "$modename: not configured to build any kind of library" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit 1
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+# Parse our command line options once, thoroughly.
+while test $# -gt 0
+do
+  arg="$1"
+  shift
+
+  case $arg in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case $prev in
+    execute_dlfiles)
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case $arg in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    exit 0
+    ;;
+
+  --config)
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+    exit 0
+    ;;
+
+  --debug)
+    echo "$progname: enabling shell trace mode"
+    set -x
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+    exit 0
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
+  --quiet | --silent)
+    show=:
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    case $nonopt in
+    *cc | *++ | gcc* | *-gcc* | xlc*)
+      mode=link
+      for arg
+      do
+	case $arg in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case $mode in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    prev=
+    lastarg=
+    srcfile="$nonopt"
+    suppress_output=
+
+    user_target=no
+    for arg
+    do
+      case $prev in
+      "") ;;
+      xcompiler)
+	# Aesthetically quote the previous argument.
+	prev=
+	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+
+	case $arg in
+	# Double-quote args containing other shell metacharacters.
+	# Many Bourne shells cannot handle close brackets correctly
+	# in scan sets, so we specify it separately.
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+
+	# Add the previous argument to base_compile.
+	if test -z "$base_compile"; then
+	  base_compile="$lastarg"
+	else
+	  base_compile="$base_compile $lastarg"
+	fi
+	continue
+	;;
+      esac
+
+      # Accept any command-line options.
+      case $arg in
+      -o)
+	if test "$user_target" != "no"; then
+	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	  exit 1
+	fi
+	user_target=next
+	;;
+
+      -static)
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	lastarg=
+	save_ifs="$IFS"; IFS=','
+	for arg in $args; do
+	  IFS="$save_ifs"
+
+	  # Double-quote args containing other shell metacharacters.
+	  # Many Bourne shells cannot handle close brackets correctly
+	  # in scan sets, so we specify it separately.
+	  case $arg in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    arg="\"$arg\""
+	    ;;
+	  esac
+	  lastarg="$lastarg $arg"
+	done
+	IFS="$save_ifs"
+	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+	# Add the arguments to base_compile.
+	if test -z "$base_compile"; then
+	  base_compile="$lastarg"
+	else
+	  base_compile="$base_compile $lastarg"
+	fi
+	continue
+	;;
+      esac
+
+      case $user_target in
+      next)
+	# The next one is the -o target name
+	user_target=yes
+	continue
+	;;
+      yes)
+	# We got the output file
+	user_target=set
+	libobj="$arg"
+	continue
+	;;
+      esac
+
+      # Accept the current argument as the source file.
+      lastarg="$srcfile"
+      srcfile="$arg"
+
+      # Aesthetically quote the previous argument.
+
+      # Backslashify any backslashes, double quotes, and dollar signs.
+      # These are the only characters that are still specially
+      # interpreted inside of double-quoted scrings.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      case $lastarg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      # Add the previous argument to base_compile.
+      if test -z "$base_compile"; then
+	base_compile="$lastarg"
+      else
+	base_compile="$base_compile $lastarg"
+      fi
+    done
+
+    case $user_target in
+    set)
+      ;;
+    no)
+      # Get the name of the library object.
+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    *)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSfmso]'
+    case $libobj in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.f90) xform=f90 ;;
+    *.for) xform=for ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case $libobj in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $libobj"
+    else
+      removelist="$libobj"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit 1" 1 2 15
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit 1" 1 2 15
+    else
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $run ln "$0" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+      echo $srcfile > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	# All platforms use -DPIC, to notify preprocessed assembler code.
+	command="$base_compile $srcfile $pic_flag -DPIC"
+      else
+	# Don't build PIC code
+	command="$base_compile $srcfile"
+      fi
+      if test "$build_old_libs" = yes; then
+	lo_libobj="$libobj"
+	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+	if test "X$dir" = "X$libobj"; then
+	  dir="$objdir"
+	else
+	  dir="$dir/$objdir"
+	fi
+	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+
+	if test -d "$dir"; then
+	  $show "$rm $libobj"
+	  $run $rm $libobj
+	else
+	  $show "$mkdir $dir"
+	  $run $mkdir $dir
+	  status=$?
+	  if test $status -ne 0 && test ! -d $dir; then
+	    exit $status
+	  fi
+	fi
+      fi
+      if test "$compiler_o_lo" = yes; then
+	output_obj="$libobj"
+	command="$command -o $output_obj"
+      elif test "$compiler_c_o" = yes; then
+	output_obj="$obj"
+	command="$command -o $output_obj"
+      fi
+
+      $run $rm "$output_obj"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+	echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test x"$output_obj" != x"$libobj"; then
+	$show "$mv $output_obj $libobj"
+	if $run $mv $output_obj $libobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # If we have no pic_flag, then copy the object into place and finish.
+      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
+	 test "$build_old_libs" = yes; then
+	# Rename the .lo from within objdir to obj
+	if test -f $obj; then
+	  $show $rm $obj
+	  $run $rm $obj
+	fi
+
+	$show "$mv $libobj $obj"
+	if $run $mv $libobj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+
+	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+	if test "X$xdir" = "X$obj"; then
+	  xdir="."
+	else
+	  xdir="$xdir"
+	fi
+	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
+	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+	# Now arrange that obj and lo_libobj become the same file
+	$show "(cd $xdir && $LN_S $baseobj $libobj)"
+	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+	  # Unlock the critical section if it was locked
+	  if test "$need_locks" != no; then
+	    $run $rm "$lockfile"
+	  fi
+	  exit 0
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Allow error messages only from the first compilation.
+      suppress_output=' >/dev/null 2>&1'
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $srcfile"
+      else
+	# All platforms use -DPIC, to notify preprocessed assembler code.
+	command="$base_compile $srcfile $pic_flag -DPIC"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+	output_obj="$obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $run $rm "$output_obj"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	$run $rm $removelist
+	exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+	echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed
+      if test x"$output_obj" != x"$obj"; then
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Create an invalid libtool object if no PIC, so that we do not
+      # accidentally link it into a program.
+      if test "$build_libtool_libs" != yes; then
+	$show "echo timestamp > $libobj"
+	$run eval "echo timestamp > \$libobj" || exit $?
+      else
+	# Move the .lo from within objdir
+	$show "$mv $libobj $lo_libobj"
+	if $run $mv $libobj $lo_libobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+    fi
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $run $rm "$lockfile"
+    fi
+
+    exit 0
+    ;;
+
+  # libtool link mode
+  link | relink)
+    modename="$modename: link"
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invokation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args="$nonopt"
+    compile_command="$nonopt"
+    finalize_command="$nonopt"
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	else
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	fi
+	build_libtool_libs=no
+	build_old_libs=yes
+	prefer_static_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test $# -gt 0; do
+      arg="$1"
+      shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+	;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit 1
+	  fi
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+	    exit 1
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  compile_command="$compile_command $wl$qarg"
+	  finalize_command="$finalize_command $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n $prev
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+	  exit 1
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | no/*-*-nonstopux*)
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  if test -z "$absdir"; then
+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+	    exit 1
+	  fi
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-mingw* | *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	 elif test "X$arg" = "X-lc_r"; then
+	  case $host in
+	 *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc_r directly, use -pthread flag.
+	    continue
+	    ;;
+	  esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # in order for the loader to find any dlls it needs.
+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+	  exit 1
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -static)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Wl,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $wl$flag"
+	  linker_flags="$linker_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+
+      *.lo | *.$objext)
+	# A library or standard object.
+	if test "$prev" = dlfiles; then
+	  # This file was specified with -dlopen.
+	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+	    dlfiles="$dlfiles $arg"
+	    prev=
+	    continue
+	  else
+	    # If libtool objects are unsupported, then we need to preload.
+	    prev=dlprefiles
+	  fi
+	fi
+
+	if test "$prev" = dlprefiles; then
+	  # Preload the old-style object.
+	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+	  prev=
+	else
+	  case $arg in
+	  *.lo) libobjs="$libobjs $arg" ;;
+	  *) objs="$objs $arg" ;;
+	  esac
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
+
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
+    else
+      output_objdir="$output_objdir/$objdir"
+    fi
+    # Create the object directory.
+    if test ! -d $output_objdir; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      status=$?
+      if test $status -ne 0 && test ! -d $output_objdir; then
+	exit $status
+      fi
+    fi
+
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+    case $linkmode in
+    lib)
+	passes="conv link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+	    exit 1
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+    for pass in $passes; do
+      if test $linkmode = prog; then
+	# Determine which files to process
+	case $pass in
+	dlopen)
+	  libs="$dlfiles"
+	  save_deplibs="$deplibs" # Collect dlpreopened libraries
+	  deplibs=
+	  ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-l*)
+	  if test $linkmode = oldlib && test $linkmode = obj; then
+	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+	    continue
+	  fi
+	  if test $pass = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	    # Search the libtool library
+	    lib="$searchdir/lib${name}.la"
+	    if test -f "$lib"; then
+	      found=yes
+	      break
+	    fi
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  fi
+	  ;; # -l
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test $pass = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  prog)
+	    if test $pass = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test $pass = scan; then
+	      deplibs="$deplib $deplibs"
+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    ;;
+	  *)
+	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test $pass = link; then
+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test $pass = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    if test "$deplibs_check_method" != pass_all; then
+	      echo
+	      echo "*** Warning: Trying to link with static lib archive $deplib."
+	      echo "*** I have the capability to make that library automatically link in when"
+	      echo "*** you link to this library.  But I can only do this if you have a"
+	      echo "*** shared version of the library, which you do not appear to have"
+	      echo "*** because the file extensions .$libext of this argument makes me believe"
+	      echo "*** that it is just a static archive that I should not used here."
+	    else
+	      echo
+	      echo "*** Warning: Linking the shared library $output against the"
+	      echo "*** static library $deplib is not portable!"
+	      deplibs="$deplib $deplibs"
+	    fi
+	    continue
+	    ;;
+	  prog)
+	    if test $pass != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	    # If there is no dlopen support or we're linking statically,
+	    # we need to preload.
+	    newdlprefiles="$newdlprefiles $deplib"
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    newdlfiles="$newdlfiles $deplib"
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+	if test $found = yes || test -f "$lib"; then :
+	else
+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+	  exit 1
+	fi
+
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  exit 1
+	fi
+
+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$ladir" = "X$lib" && ladir="."
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variable installed.
+	installed=yes
+
+	# Read the .la file
+	case $lib in
+	*/* | *\\*) . $lib ;;
+	*) . ./$lib ;;
+	esac
+
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test $linkmode = oldlib && test $linkmode = obj; }; then
+	   # Add dl[pre]opened files of deplib
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test $pass = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	      exit 1
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
+	        case "$tmp_libs " in
+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	        esac
+              fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
+	  elif test $linkmode != prog && test $linkmode != lib; then
+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+	    exit 1
+	  fi
+	  continue
+	fi # $pass = conv
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	  exit 1
+	fi
+
+	# This library was specified with -dlopen.
+	if test $pass = dlopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+	    exit 1
+	  fi
+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.
+	    dlprefiles="$dlprefiles $lib"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	else
+	  dir="$ladir/$objdir"
+	  absdir="$abs_ladir/$objdir"
+	  # Remove this search path later
+	  notinst_path="$notinst_path $abs_ladir"
+	fi # $installed = yes
+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+	# This library was specified with -dlpreopen.
+	if test $pass = dlpreopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+	    exit 1
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test $linkmode = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs"
+	  fi
+	  continue
+	fi
+
+	if test $linkmode = prog && test $pass != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test $linkalldeplibs = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	link_static=no # Whether the deplib will be linked statically
+	if test -n "$library_names" &&
+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	  # Link against this shared library
+
+	  if test "$linkmode,$pass" = "prog,link" ||
+	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	    if test $linkmode = prog; then
+	      # We need to hardcode the library path
+	      if test -n "$shlibpath_var"; then
+		# Make sure the rpath contains only unique directories.
+		case "$temp_rpath " in
+		*" $dir "*) ;;
+		*" $absdir "*) ;;
+		*) temp_rpath="$temp_rpath $dir" ;;
+		esac
+	      fi
+	    fi
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+
+	  if test "$installed" = no; then
+	    notinst_deplibs="$notinst_deplibs $lib"
+	    need_relink=yes
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    realname="$2"
+	    shift; shift
+	    libname=`eval \\$echo \"$libname_spec\"`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin*)
+		major=`expr $current - $age`
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      $show "extracting exported symbol list from \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      eval cmds=\"$extract_expsyms_cmds\"
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      $show "generating import library for \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      eval cmds=\"$old_archive_from_expsyms_cmds\"
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n $old_archive_from_expsyms_cmds
+
+	  if test $linkmode = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      $echo "$modename: configuration error: unsupported hardcode properties"
+	      exit 1
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test $linkmode = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes && \
+		 test "$hardcode_minus_L" != yes && \
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test $linkmode = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    fi
+
+	    if test $linkmode = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test $linkmode = prog; then
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+
+	  # Try to link the static library
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    echo "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    convenience="$convenience $dir/$old_library"
+	    old_convenience="$old_convenience $dir/$old_library"
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test $linkmode = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+	       test $link_static = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test $link_all_deplibs != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+		test "X$dir" = "X$deplib" && dir="."
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if grep "^installed=no" $deplib > /dev/null; then
+		  path="-L$absdir/$objdir"
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -z "$libdir"; then
+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		    exit 1
+		  fi
+		  if test "$absdir" != "$libdir"; then
+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		  fi
+		  path="-L$absdir"
+		fi
+		;;
+	      *) continue ;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$deplibs $path" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test $pass = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test $pass != dlopen; then
+	test $pass != scan && dependency_libs="$newdependency_libs"
+	if test $pass != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    *)
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      if test "$pass" = "conv" &&
+       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
+	libs="$deplibs" # reset libs
+	deplibs=
+      fi
+    done # for pass
+    if test $linkmode = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+	  exit 1
+	else
+	  echo
+	  echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  echo "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      if test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test $# -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  libext=al
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	current="$2"
+	revision="$3"
+	age="$4"
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case $revision in
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case $age in
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	if test $age -gt $current; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  minor_current=`expr $current + 1`
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	irix | nonstopux)
+	  major=`expr $current - $age + 1`
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test $loop != 0; do
+	    iface=`expr $revision - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=.`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test $loop != 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  major=`expr $current - $age`
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  verstring="0.0"
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=""
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+      fi
+
+      if test "$mode" != relink; then
+	# Remove our outputs.
+	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      for path in $notinst_path; do
+	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+      done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs -framework System"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test $build_libtool_need_lc = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behaviour.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  $CC -o conftest conftest.c $deplibs
+	  if test $? -eq 0 ; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	      # If $name is empty we are operating on a -L argument.
+	      if test -n "$name" && test "$name" != "0"; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		set dummy $deplib_matches
+		deplib_match=$2
+		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		  newdeplibs="$newdeplibs $i"
+		else
+		  droppeddeps=yes
+		  echo
+		  echo "*** Warning: dynamic linker does not accept needed library $i."
+		  echo "*** I have the capability to make that library automatically link in when"
+		  echo "*** you link to this library.  But I can only do this if you have a"
+		  echo "*** shared version of the library, which I believe you do not have"
+		  echo "*** because a test_compile did reveal that the linker did not use it for"
+		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occured in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	     # If $name is empty we are operating on a -L argument.
+	      if test -n "$name" && test "$name" != "0"; then
+		$rm conftest
+		$CC -o conftest conftest.c $i
+		# Did it work?
+		if test $? -eq 0 ; then
+		  ldd_output=`ldd conftest`
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    echo "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which you do not appear to have"
+		    echo "*** because a test_compile did reveal that the linker did not use this one"
+		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "***  make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      libname=`eval \\$echo \"$libname_spec\"`
+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		    for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+			 | ${SED} 10q \
+			 | egrep "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		    done
+	      done
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		echo "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  echo "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  echo "*** with $libname and none of the candidates passed a file format test"
+		  echo "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      libname=`eval \\$echo \"$libname_spec\"`
+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		for potent_lib in $potential_libs; do
+		  potlib="$potent_lib" # see symlink-check below in file_magic test
+		  if eval echo \"$potent_lib\" 2>/dev/null \
+		      | ${SED} 10q \
+		      | egrep "$match_pattern_regex" > /dev/null; then
+		    newdeplibs="$newdeplibs $a_deplib"
+		    a_deplib=""
+		    break 2
+		  fi
+		done
+	      done
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		echo "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  echo "*** with $libname and none of the candidates passed a file format test"
+		  echo "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
+	     grep . >/dev/null; then
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library is the System framework
+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test $allow_undefined = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test $hardcode_into_libs = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	test -z "$dlname" && dlname=$soname
+
+	lib="$output_objdir/$realname"
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Ensure that we have .o objects for linkers which dislike .lo
+	# (e.g. aix) in case we are running --disable-static
+	for obj in $libobjs; do
+	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$xdir" = "X$obj"; then
+	    xdir="."
+	  else
+	    xdir="$xdir"
+	  fi
+	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+	  if test ! -f $xdir/$oldobj; then
+	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
+	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
+	  fi
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    eval cmds=\"$export_symbols_cmds\"
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      $show "$cmd"
+	      $run eval "$cmd" || exit $?
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex"; then
+	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	fi
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "mkdir $gentop"
+	    $run mkdir "$gentop"
+	    status=$?
+	    if test $status -ne 0 && test ! -d "$gentop"; then
+	      exit $status
+	    fi
+	    generated="$generated $gentop"
+
+	    for xlib in $convenience; do
+	      # Extract the objects.
+	      case $xlib in
+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	      *) xabs=`pwd`"/$xlib" ;;
+	      esac
+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	      xdir="$gentop/$xlib"
+
+	      $show "${rm}r $xdir"
+	      $run ${rm}r "$xdir"
+	      $show "mkdir $xdir"
+	      $run mkdir "$xdir"
+	      status=$?
+	      if test $status -ne 0 && test ! -d "$xdir"; then
+		exit $status
+	      fi
+	      $show "(cd $xdir && $AR x $xabs)"
+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+	    done
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	  eval cmds=\"$archive_expsym_cmds\"
+	else
+	  save_deplibs="$deplibs"
+	  for conv in $convenience; do
+	    tmp_deplibs=
+	    for test_deplib in $deplibs; do
+	      if test "$test_deplib" != "$conv"; then
+		tmp_deplibs="$tmp_deplibs $test_deplib"
+	      fi
+	    done
+	    deplibs="$tmp_deplibs"
+	  done
+	  eval cmds=\"$archive_cmds\"
+	  deplibs="$save_deplibs"
+	fi
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+	  exit 0
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case $output in
+      *.lo)
+	if test -n "$objs$old_deplibs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit 1
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	else
+	  gentop="$output_objdir/${obj}x"
+	  $show "${rm}r $gentop"
+	  $run ${rm}r "$gentop"
+	  $show "mkdir $gentop"
+	  $run mkdir "$gentop"
+	  status=$?
+	  if test $status -ne 0 && test ! -d "$gentop"; then
+	    exit $status
+	  fi
+	  generated="$generated $gentop"
+
+	  for xlib in $convenience; do
+	    # Extract the objects.
+	    case $xlib in
+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	    *) xabs=`pwd`"/$xlib" ;;
+	    esac
+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	    xdir="$gentop/$xlib"
+
+	    $show "${rm}r $xdir"
+	    $run ${rm}r "$xdir"
+	    $show "mkdir $xdir"
+	    $run mkdir "$xdir"
+	    status=$?
+	    if test $status -ne 0 && test ! -d "$xdir"; then
+	      exit $status
+	    fi
+	    $show "(cd $xdir && $AR x $xabs)"
+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+	  done
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      eval cmds=\"$reload_cmds\"
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	exit 0
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	$show "echo timestamp > $libobj"
+	$run eval "echo timestamp > $libobj" || exit $?
+	exit 0
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	eval cmds=\"$reload_cmds\"
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      else
+	# Just create a symlink.
+	$show $rm $libobj
+	$run $rm $libobj
+	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+	if test "X$xdir" = "X$libobj"; then
+	  xdir="."
+	else
+	  xdir="$xdir"
+	fi
+	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
+	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
+      fi
+
+      if test -n "$gentop"; then
+	$show "${rm}r $gentop"
+	$run ${rm}r $gentop
+      fi
+
+      exit 0
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test "$preload" = yes; then
+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+	   test "$dlopen_self_static" = unknown; then
+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+	fi
+      fi
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	case $host in
+	*darwin*)
+	  # Don't allow lazy linking, it breaks C++ global constructors
+	  compile_command="$compile_command ${wl}-bind_at_load"
+	  finalize_command="$finalize_command ${wl}-bind_at_load"
+	  ;;
+	esac
+	;;
+      esac
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      dlsyms=
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	  dlsyms="${outputname}S.c"
+	else
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
+      fi
+
+      if test -n "$dlsyms"; then
+	case $dlsyms in
+	"") ;;
+	*.c)
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$output_objdir/${outputname}.nm"
+
+	  $show "$rm $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Parse the name list into a source file.
+	  $show "creating $output_objdir/$dlsyms"
+
+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$dlself" = yes; then
+	    $show "generating symbol list for \`$output'"
+
+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+	    # Add our own program objects to the symbol list.
+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	    for arg in $progfiles; do
+	      $show "extracting global C symbols from \`$arg'"
+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	    done
+
+	    if test -n "$exclude_expsyms"; then
+	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    if test -n "$export_symbols_regex"; then
+	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    # Prepare the list of exported symbols
+	    if test -z "$export_symbols"; then
+	      export_symbols="$output_objdir/$output.exp"
+	      $run $rm $export_symbols
+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	    else
+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+	      $run eval 'mv "$nlist"T "$nlist"'
+	    fi
+	  fi
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval 'echo ": $name " >> "$nlist"'
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    if test -n "$exclude_expsyms"; then
+	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $mv "$nlist"T "$nlist"
+	    fi
+
+	    # Try sorting and uniquifying the output.
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
+	      :
+	    else
+	      grep -v "^: " < "$nlist" > "$nlist"S
+	    fi
+
+	    if test -f "$nlist"S; then
+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+	    else
+	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
+
+	  pic_flag_for_symtable=
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
+	    esac;;
+	  *-*-hpux*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
+	    esac
+	  esac
+
+	  # Now compile the dynamic symbol file.
+	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+	  # Clean up the generated files.
+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Transform the symbol file into the correct name.
+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit 1
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
+
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      fi
+
+      if test $need_relink = no || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$link_command"
+	$run eval "$link_command"
+	status=$?
+
+	# Delete the generated files.
+	if test -n "$dlsyms"; then
+	  $show "$rm $output_objdir/${outputname}S.${objext}"
+	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	fi
+
+	exit $status
+      fi
+
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case $dir in
+	  [\\/]* | [A-Za-z]:[\\/]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$run $rm $output
+	# Link the executable and exit
+	$show "$link_command"
+	$run eval "$link_command" || exit $?
+	exit 0
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      $show "$link_command"
+      $run eval "$link_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+	case $0 in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*) exeext=.exe ;;
+	  *) exeext= ;;
+	esac
+	$rm $output
+	trap "$rm $output; exit 1" 1 2 15
+
+	$echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variable:
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  echo >> $output "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" || \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $mkdir \"\$progdir\"
+    else
+      $rm \"\$progdir/\$file\"
+    fi"
+
+	  echo >> $output "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$echo \"\$relink_command_output\" >&2
+	$rm \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $rm \"\$progdir/\$program\";
+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $rm \"\$progdir/\$file\"
+  fi"
+	else
+	  echo >> $output "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	echo >> $output "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 ${SED}
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# win32 systems need to use the prog path for dll
+	# lookup to work
+	*-*-cygwin* | *-*-pw32*)
+	  $echo >> $output "\
+      exec \$progdir/\$program \${1+\"\$@\"}
+"
+	  ;;
+
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2*)
+	  $echo >> $output "\
+      exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $echo >> $output "\
+      # Export the path to the program.
+      PATH=\"\$progdir:\$PATH\"
+      export PATH
+
+      exec \$program \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit 0
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	$show "${rm}r $gentop"
+	$run ${rm}r "$gentop"
+	$show "mkdir $gentop"
+	$run mkdir "$gentop"
+	status=$?
+	if test $status -ne 0 && test ! -d "$gentop"; then
+	  exit $status
+	fi
+	generated="$generated $gentop"
+
+	# Add in members from convenience archives.
+	for xlib in $addlibs; do
+	  # Extract the objects.
+	  case $xlib in
+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	  *) xabs=`pwd`"/$xlib" ;;
+	  esac
+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	  xdir="$gentop/$xlib"
+
+	  $show "${rm}r $xdir"
+	  $run ${rm}r "$xdir"
+	  $show "mkdir $xdir"
+	  $run mkdir "$xdir"
+	  status=$?
+	  if test $status -ne 0 && test ! -d "$xdir"; then
+	    exit $status
+	  fi
+	  $show "(cd $xdir && $AR x $xabs)"
+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+	done
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	eval cmds=\"$old_archive_from_new_cmds\"
+      else
+	# Ensure that we have .o objects in place in case we decided
+	# not to build a shared library, and have fallen back to building
+	# static libs even though --disable-static was passed!
+	for oldobj in $oldobjs; do
+	  if test ! -f $oldobj; then
+	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
+	    if test "X$xdir" = "X$oldobj"; then
+	      xdir="."
+	    else
+	      xdir="$xdir"
+	    fi
+	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
+	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
+	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
+	  fi
+	done
+
+	eval cmds=\"$old_archive_cmds\"
+      fi
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		if test -z "$libdir"; then
+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		  exit 1
+		fi
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit 1
+	      fi
+	      newdlfiles="$newdlfiles $libdir/$name"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit 1
+	      fi
+	      newdlprefiles="$newdlprefiles $libdir/$name"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $rm $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test $need_relink = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      ;;
+    esac
+    exit 0
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg="$nonopt"
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case $arg in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest="$arg"
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f) prev="-f" ;;
+      -g) prev="-g" ;;
+      -m) prev="-m" ;;
+      -o) prev="-o" ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*) ;;
+
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest="$arg"
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test $# -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	library_names=
+	old_library=
+	relink_command=
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  $echo "$modename: warning: relinking \`$file'" 1>&2
+	  $show "$relink_command"
+	  if $run eval "$relink_command"; then :
+	  else
+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+	    continue
+	  fi
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+	  if test -n "$stripme" && test -n "$striplib"; then
+	    $show "$striplib $destdir/$realname"
+	    $run eval "$striplib $destdir/$realname" || exit $?
+	  fi
+
+	  if test $# -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    for linkname
+	    do
+	      if test "$linkname" != "$realname"; then
+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+	      fi
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  eval cmds=\"$postinstall_cmds\"
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+	fi
+
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $file $destfile"
+	  $run eval "$install_prog $file $destfile" || exit $?
+	fi
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+	  $show "$install_prog $staticobj $staticdest"
+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	fi
+	exit 0
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin*|*mingw*)
+	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $wrapper ;;
+	  *) . ./$wrapper ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+	    exit 1
+	  fi
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case $lib in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $wrapper ;;
+	  *) . ./$wrapper ;;
+	  esac
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    if test "$finalize" = yes && test -z "$run"; then
+	      tmpdir="/tmp"
+	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+	      tmpdir="$tmpdir/libtool-$$"
+	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+	      else
+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+		continue
+	      fi
+	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	      outputname="$tmpdir/$file"
+	      # Replace the output file specification.
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	      $show "$relink_command"
+	      if $run eval "$relink_command"; then :
+	      else
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		${rm}r "$tmpdir"
+		continue
+	      fi
+	      file="$outputname"
+	    else
+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyways
+	case $install_prog,$host in
+	/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
+	    ;;
+	  esac
+	  ;;
+	esac
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	test -n "$outputname" && ${rm}r "$tmpdir"
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      if test -n "$stripme" && test -n "$striplib"; then
+	$show "$old_striplib $oldlib"
+	$run eval "$old_striplib $oldlib" || exit $?
+      fi
+
+      # Do each command in the postinstall commands.
+      eval cmds=\"$old_postinstall_cmds\"
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $0 --finish$current_libdirs'
+    else
+      exit 0
+    fi
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  eval cmds=\"$finish_cmds\"
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+	  done
+	  IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = ":" && exit 0
+
+    echo "----------------------------------------------------------------------"
+    echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      echo "   $libdir"
+    done
+    echo
+    echo "If you ever happen to want to link against installed libraries"
+    echo "in a given directory, LIBDIR, you must either use libtool, and"
+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    echo
+    echo "See any operating system documentation about shared libraries for"
+    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    echo "----------------------------------------------------------------------"
+    exit 0
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit 1
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  exit 1
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved enviroment variables
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+	$echo "export $shlibpath_var"
+      fi
+      $echo "$cmd$args"
+      exit 0
+    fi
+    ;;
+
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
+    rm="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    rmdirs=
+
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$dir" = "X$file"; then
+	dir=.
+	objdir="$objdir"
+      else
+	objdir="$dir/$objdir"
+      fi
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      test $mode = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test $mode = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if (test -L "$file") >/dev/null 2>&1 \
+	|| (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+	  if test $mode = uninstall; then
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      eval cmds=\"$postuninstall_cmds\"
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test $? != 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      eval cmds=\"$old_postuninstall_cmds\"
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test $? != 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	  fi
+	fi
+	;;
+
+      *.lo)
+	if test "$build_old_libs" = yes; then
+	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+	  rmfiles="$rmfiles $dir/$oldobj"
+	fi
+	;;
+
+      *)
+	# Do a test to see if this is a libtool program.
+	if test $mode = clean &&
+	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  relink_command=
+	  . $dir/$file
+
+	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	  if test "$fast_install" = yes && test -n "$relink_command"; then
+	    rmfiles="$rmfiles $objdir/lt-$name"
+	  fi
+	fi
+	;;
+      esac
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
+    done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
+      fi
+    done
+
+    exit $exit_status
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit 1
+    ;;
+  esac
+
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit 1
+  fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+  eval exec $exec_cmd
+  exit 1
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --version         print version information
+
+MODE must be one of the following:
+
+      clean           remove files from the build directory
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE."
+  exit 0
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+		    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+		    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+		    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+  ;;
+esac
+
+echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit 0
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/lib-src/sbsms/config/missing b/lib-src/sbsms/config/missing
new file mode 100755
index 0000000..fc54c64
--- /dev/null
+++ b/lib-src/sbsms/config/missing
@@ -0,0 +1,336 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing 0.4 - GNU automake"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/lib-src/sbsms/config/mkinstalldirs b/lib-src/sbsms/config/mkinstalldirs
new file mode 100755
index 0000000..d2d5f21
--- /dev/null
+++ b/lib-src/sbsms/config/mkinstalldirs
@@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage" 1>&2
+      exit 0
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+case $dirmode in
+  '')
+    if mkdir -p -- . 2>/dev/null; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    fi
+    ;;
+esac
+
+for file
+do
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  shift
+
+  pathcomp=
+  for d
+  do
+    pathcomp="$pathcomp$d"
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+  	errstatus=$lasterr
+      else
+  	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+    	  lasterr=""
+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+  	  if test ! -z "$lasterr"; then
+  	    errstatus=$lasterr
+  	  fi
+  	fi
+      fi
+    fi
+
+    pathcomp="$pathcomp/"
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here
diff --git a/lib-src/sbsms/config/stamp-h1 b/lib-src/sbsms/config/stamp-h1
new file mode 100644
index 0000000..22326a7
--- /dev/null
+++ b/lib-src/sbsms/config/stamp-h1
@@ -0,0 +1 @@
+timestamp for config/config.h
diff --git a/lib-src/sbsms/configure b/lib-src/sbsms/configure
new file mode 100755
index 0000000..b8ffc69
--- /dev/null
+++ b/lib-src/sbsms/configure
@@ -0,0 +1,18955 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.63 for sbsms 1.5.0.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+$*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Identity of this package.
+PACKAGE_NAME='sbsms'
+PACKAGE_TARNAME='sbsms'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='sbsms 1.5.0'
+PACKAGE_BUGREPORT=''
+
+ac_unique_file="src/sbsms.cpp"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+SBSMS_PROGS
+MACOSX_FALSE
+MACOSX_TRUE
+ENABLE_WX_FALSE
+ENABLE_WX_TRUE
+WX_CFLAGS
+WX_LIBS
+WX_CONFIG
+SBSMS_BIN
+ENABLE_PORTAUDIO_FALSE
+ENABLE_PORTAUDIO_TRUE
+PORTAUDIO_LIBS
+PORTAUDIO_CFLAGS
+ENABLE_SNDFILE_FALSE
+ENABLE_SNDFILE_TRUE
+SNDFILE_LIBS
+SNDFILE_CFLAGS
+PKG_CONFIG
+ENABLE_MP3_FALSE
+ENABLE_MP3_TRUE
+MAD_LIBS
+SHARED_VERSION_INFO
+SHLIB_VERSION_ARG
+CXXCPP
+ac_ct_CXX
+CXXFLAGS
+CXX
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+lt_ECHO
+RANLIB
+STRIP
+AR
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+LIBTOOL
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+enable_universal_binary
+enable_multithreaded
+enable_debug
+enable_sndfile
+enable_mp3
+enable_portaudio
+enable_wx
+enable_programs
+enable_dependency_tracking
+enable_maintainer_mode
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+PKG_CONFIG
+SNDFILE_CFLAGS
+SNDFILE_LIBS
+PORTAUDIO_CFLAGS
+PORTAUDIO_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures sbsms 1.5.0 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/sbsms]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of sbsms 1.5.0:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-shared[=PKGS]  build shared libraries [default=no]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-universal_binary enable universal binary build: (default: disable)
+  --enable-static enable static build: (default: disable)
+  --enable-multithreaded enable multithreaded build: (default: disable)
+  --enable-debug enable debug build: (default: disable)
+  --enable-sndfile enable sndfile support: (default: disable)
+  --enable-mp3 enable mp3 support (default: disable)
+  --enable-portaudio enable portaudio support: (default: disable)
+  --enable-wx enable wxWidgets support (default: disable)
+  --enable-programs Build SBSMS programs as well as library (default: enable)
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic              try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  SNDFILE_CFLAGS
+              C compiler flags for SNDFILE, overriding pkg-config
+  SNDFILE_LIBS
+              linker flags for SNDFILE, overriding pkg-config
+  PORTAUDIO_CFLAGS
+              C compiler flags for PORTAUDIO, overriding pkg-config
+  PORTAUDIO_LIBS
+              linker flags for PORTAUDIO, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+sbsms configure 1.5.0
+generated by GNU Autoconf 2.63
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by sbsms $as_me 1.5.0, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  $as_echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+#------------------------------------------------------------------------------------
+# Library's "official" release version:
+
+LIBSBSMS_RELEASE_MAJOR=1
+LIBSBSMS_RELEASE_MINOR=7
+LIBSBSMS_RELEASE_BUILD=0
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+ac_config_headers="$ac_config_headers src/config.h"
+
+
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=no
+fi
+
+
+
+
+
+
+
+
+
+#------------------------------------------------------------------------------------
+# The following is the libtool / shared library version. This doesn't have to
+# do anything with the release version. It MUST conform to the following rules:
+#
+#  1. Start with version information of `0:0:0' for each libtool library.
+#  2. Update the version information only immediately before a public release of
+#     your software. More frequent updates are unnecessary, and only guarantee
+#     that the current interface number gets larger faster.
+#  3. If the library source code has changed at all since the last update, then
+#     increment revision (`c:r:a' becomes `c:r+1:a').
+#  4. If any interfaces have been added, removed, or changed since the last update,
+#     increment current, and set revision to 0.
+#  5. If any interfaces have been added since the last public release, then increment
+#     age.
+#  6. If any interfaces have been removed since the last public release, then set age
+#     to 0.
+
+SHARED_VERSION_INFO="8:0:7"
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6'
+macro_revision='1.3012'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:3866: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:3869: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:3872: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line 5078 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_cc_needs_belf=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_cc_needs_belf=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+  withval=$with_pic; pic_mode="$withval"
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:6905: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:6909: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:7244: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:7248: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:7349: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:7353: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:7404: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:7408: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  whole_archive_flag_spec=''
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  # Handle Gentoo/FreeBSD as it was Linux
+  case $host_vendor in
+    gentoo)
+      version_type=linux ;;
+    *)
+      version_type=freebsd-$objformat ;;
+  esac
+
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+    linux)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      need_lib_prefix=no
+      need_version=no
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
+fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dl_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
+if test "${ac_cv_func_shl_load+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shl_load
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_shl_load || defined __stub___shl_load
+choke me
+#endif
+
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_shl_load=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_shl_load=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dld_shl_load=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef dlopen
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
+
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dl_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_svld_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dld_dld_link=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 10217 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 10313 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_CXX='$convenience'
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+        # as there is no search path for DLLs.
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        allow_undefined_flag_CXX=unsupported
+        always_export_symbols_CXX=no
+        enable_shared_with_static_runtimes_CXX=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  whole_archive_flag_spec_CXX=''
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[12]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	ld_shlibs_CXX=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13343: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:13347: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:13446: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13494: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:13498: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_CXX=no
+        else
+	  archive_cmds_need_lc_CXX=yes
+        fi
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  # Handle Gentoo/FreeBSD as it was Linux
+  case $host_vendor in
+    gentoo)
+      version_type=linux ;;
+    *)
+      version_type=freebsd-$objformat ;;
+  esac
+
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+    linux)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      need_lib_prefix=no
+      need_version=no
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
+fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+
+
+
+
+for ac_func in malloc calloc free memcpy
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for floor in -lm" >&5
+$as_echo_n "checking for floor in -lm... " >&6; }
+if test "${ac_cv_lib_m_floor+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char floor ();
+int
+main ()
+{
+return floor ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_m_floor=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_m_floor=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
+$as_echo "$ac_cv_lib_m_floor" >&6; }
+if test "x$ac_cv_lib_m_floor" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+
+
+
+
+for ac_func in floor sqrt log
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking for lrint" >&5
+$as_echo_n "checking for lrint... " >&6; }
+if test "${ac_cv_c99_lrint+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define		_ISOC9X_SOURCE	1
+#define 	_ISOC99_SOURCE	1
+#define		__USE_ISOC99	1
+#define 	__USE_ISOC9X	1
+#include	<math.h>
+int
+main ()
+{
+	int value = lrint (0.432) ;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c99_lrint=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c99_lrint=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c99_lrint" >&5
+$as_echo "$ac_cv_c99_lrint" >&6; }
+if test "x$ac_cv_c99_lrint" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LRINT 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for lrintf" >&5
+$as_echo_n "checking for lrintf... " >&6; }
+if test "${ac_cv_c99_lrintf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define		_ISOC9X_SOURCE	1
+#define 	_ISOC99_SOURCE	1
+#define		__USE_ISOC99	1
+#define 	__USE_ISOC9X	1
+#include	<math.h>
+int
+main ()
+{
+	int value = lrintf (0.432) ;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c99_lrintf=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c99_lrintf=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c99_lrintf" >&5
+$as_echo "$ac_cv_c99_lrintf" >&6; }
+if test "x$ac_cv_c99_lrintf" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LRINTF 1
+_ACEOF
+
+fi
+
+
+
+
+
+SBSMS_EXTRA_OBJ=""
+SBSMS_BIN=""
+
+# Check whether --enable-universal_binary was given.
+if test "${enable_universal_binary+set}" = set; then
+  enableval=$enable_universal_binary; enable_universal_binary=$enableval
+else
+  enable_universal_binary=no
+fi
+
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval=$enable_static; enable_static=$enableval
+else
+  enable_static=no
+fi
+
+
+# Check whether --enable-multithreaded was given.
+if test "${enable_multithreaded+set}" = set; then
+  enableval=$enable_multithreaded; enable_multithreaded=$enableval
+else
+  enable_multithreaded=no
+fi
+
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug; enable_debug=$enableval
+else
+  enable_debug=no
+fi
+
+
+# Check whether --enable-sndfile was given.
+if test "${enable_sndfile+set}" = set; then
+  enableval=$enable_sndfile; enable_sndfile=$enableval
+else
+  enable_sndfile=no
+fi
+
+
+# Check whether --enable-mp3 was given.
+if test "${enable_mp3+set}" = set; then
+  enableval=$enable_mp3; enable_mp3=$enableval
+else
+  enable_mp3=no
+fi
+
+
+# Check whether --enable-portaudio was given.
+if test "${enable_portaudio+set}" = set; then
+  enableval=$enable_portaudio; enable_portaudio=$enableval
+else
+  enable_portaudio=no
+fi
+
+
+# Check whether --enable-wx was given.
+if test "${enable_wx+set}" = set; then
+  enableval=$enable_wx; enable_wx=$enableval
+else
+  enable_wx=no
+fi
+
+
+# Check whether --enable-programs was given.
+if test "${enable_programs+set}" = set; then
+  enableval=$enable_programs; enable_progs=$enableval
+else
+  enable_progs=yes
+fi
+
+
+if test x$enable_mp3 = xyes; then
+   enable_sndfile=yes;
+   { $as_echo "$as_me:$LINENO: checking for mad_stream_init in -lmad" >&5
+$as_echo_n "checking for mad_stream_init in -lmad... " >&6; }
+if test "${ac_cv_lib_mad_mad_stream_init+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmad  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mad_stream_init ();
+int
+main ()
+{
+return mad_stream_init ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_mad_mad_stream_init=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_mad_mad_stream_init=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mad_mad_stream_init" >&5
+$as_echo "$ac_cv_lib_mad_mad_stream_init" >&6; }
+if test "x$ac_cv_lib_mad_mad_stream_init" = x""yes; then
+  mad_libs="-lmad"; SBSMS_EXTRA_OBJ="mp3.lo mp3tech.lo audiobuffer.lo"; use_libmad=yes
+else
+  echo "Sorry, you need libmad for mp3 support.  Install libmad or ./configure --disable-mp3"; exit -1
+fi
+
+   if test x$use_libmad = xyes; then
+      if test x$MAD_LIBS = x; then
+	 MAD_LIBS=$mad_libs
+      fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MAD 1
+_ACEOF
+
+   fi
+else
+    MAD_LIBS=""
+fi
+ if test x$enable_mp3 = xyes; then
+  ENABLE_MP3_TRUE=
+  ENABLE_MP3_FALSE='#'
+else
+  ENABLE_MP3_TRUE='#'
+  ENABLE_MP3_FALSE=
+fi
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for SNDFILE" >&5
+$as_echo_n "checking for SNDFILE... " >&6; }
+
+if test -n "$SNDFILE_CFLAGS"; then
+    pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SNDFILE_LIBS"; then
+    pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile >= 1.0.2" 2>&1`
+        else
+	        SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile >= 1.0.2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SNDFILE_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                ac_cv_sndfile=0
+elif test $pkg_failed = untried; then
+	ac_cv_sndfile=0
+else
+	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
+	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	ac_cv_sndfile=1
+fi
+
+if test x$enable_sndfile = xyes; then
+   # check for presence of libsndfile
+   if test "$ac_cv_sndfile" = "0"; then
+      echo "Sorry, you need libsndfile to --enable-sndfile.  Install libsndfile or --disable-sndfile"
+      exit -1;
+   else
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SNDFILE 1
+_ACEOF
+
+   fi
+else
+    SNDFILE_LIBS=""
+fi
+ if test x$enable_sndfile = xyes; then
+  ENABLE_SNDFILE_TRUE=
+  ENABLE_SNDFILE_FALSE='#'
+else
+  ENABLE_SNDFILE_TRUE='#'
+  ENABLE_SNDFILE_FALSE=
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for PORTAUDIO" >&5
+$as_echo_n "checking for PORTAUDIO... " >&6; }
+
+if test -n "$PORTAUDIO_CFLAGS"; then
+    pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 0.0.19\"") >&5
+  ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 0.0.19") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 0.0.19" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PORTAUDIO_LIBS"; then
+    pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 0.0.19\"") >&5
+  ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 0.0.19") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 0.0.19" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0 >= 0.0.19" 2>&1`
+        else
+	        PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0 >= 0.0.19" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PORTAUDIO_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                ac_cv_portaudio=0
+elif test $pkg_failed = untried; then
+	ac_cv_portaudio=0
+else
+	PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
+	PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	ac_cv_portaudio=1
+fi
+
+if test x$enable_portaudio = xyes; then
+   # check for presence of libportaudio
+   if test "$ac_cv_portaudio" = "0"; then
+      echo "Sorry, you need libportaudio-2.0 to --enable-portaudio.  Install libportaudio or --disable-portaudio"
+      exit -1;
+   else
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PORTAUDIO 1
+_ACEOF
+
+   fi
+else
+    PORTAUDIO_LIBS=""
+fi
+ if test x$enable_portaudio = xyes; then
+  ENABLE_PORTAUDIO_TRUE=
+  ENABLE_PORTAUDIO_FALSE='#'
+else
+  ENABLE_PORTAUDIO_TRUE='#'
+  ENABLE_PORTAUDIO_FALSE=
+fi
+
+
+CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"`
+
+if test x$enable_debug = xyes; then
+   CXXFLAGS="$CXXFLAGS -g -O0"
+else
+   CXXFLAGS="$CXXFLAGS -O3 -fomit-frame-pointer"
+fi
+
+if test x$enable_static = xyes; then
+   CXXFLAGS="$CXXFLAGS"
+else
+   case "$target_os" in
+     darwin*)
+	CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
+	;;
+	*)
+	;;
+   esac
+fi
+
+if test x$enable_universal_binary = xyes; then
+   case "$target_os" in
+     darwin*)
+        CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.4 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+	;;
+     *)
+	;;
+   esac
+else
+   CXXFLAGS="$CXXFLAGS"
+fi
+
+case "$target_os" in
+     darwin*)
+	macosx="yes"
+	;;
+     *)
+	macosx="no"
+	;;
+esac
+
+
+
+if test x$enable_wx = xyes; then
+
+   wxconfigargs=""
+   if test x$enable_static = xyes; then
+      wxconfigargs="$wxconfigargs --static=yes"
+   else
+      wxconfigargs="$wxconfigargs --static=no"
+   fi
+
+   if test x$enable_debug = xyes; then
+      wxconfigargs="$wxconfigargs --debug=yes"
+   else
+      wxconfigargs="$wxconfigargs --debug=no"
+   fi
+
+   # Extract the first word of "wx-config", so it can be a program name with args.
+set dummy wx-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_WX_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $WX_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WX_CONFIG="$WX_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/local/bin "
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
+  ;;
+esac
+fi
+WX_CONFIG=$ac_cv_path_WX_CONFIG
+if test -n "$WX_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
+$as_echo "$WX_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if [ "$WX_CONFIG" = "no" ] ; then
+      { { $as_echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&5
+$as_echo "$as_me: error: \"Could not find wx-config: is wxWidgets installed? is wx-config in your path?\"" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   { $as_echo "$as_me:$LINENO: Checking that the chosen version of wxWidgets is 2.8.x" >&5
+$as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
+
+   wx_version=`${WX_CONFIG} --version`
+   case "${wx_version}" in
+	2.8.*)
+	echo "Great, you're using wxWidgets ${wx_version}!"
+	;;
+	*)
+	wx_list=`${WX_CONFIG} --list`
+	{ { $as_echo "$as_me:$LINENO: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+	The currently available configurations are listed below.  If necessary, either
+	install the package for your distribution or download the latest version of
+	wxWidgets from http://wxwidgets.org. ${wx_list}" >&5
+$as_echo "$as_me: error: Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+	The currently available configurations are listed below.  If necessary, either
+	install the package for your distribution or download the latest version of
+	wxWidgets from http://wxwidgets.org. ${wx_list}" >&2;}
+   { (exit 1); exit 1; }; }
+    esac
+
+    WX_LIBS="`$WX_CONFIG $wxconfigargs --libs`"
+    WX_CFLAGS="`$WX_CONFIG $wxconfigargs --cxxflags`"
+
+
+fi
+ if test x$enable_wx = xyes; then
+  ENABLE_WX_TRUE=
+  ENABLE_WX_FALSE='#'
+else
+  ENABLE_WX_TRUE='#'
+  ENABLE_WX_FALSE=
+fi
+
+ if test "$macosx" = "yes"; then
+  MACOSX_TRUE=
+  MACOSX_FALSE='#'
+else
+  MACOSX_TRUE='#'
+  MACOSX_FALSE=
+fi
+
+
+if test x$enable_progs = xyes; then
+	# we would like programs, so work out which ones can be built
+	# sbsms can always be built (doesn't need optional libs)
+	SBSMS_PROGS="sbsms"
+	if test x$enable_portaudio = xyes; then
+		# portaudio available, build sbsmsplay
+		SBSMS_PROGS="$SBSMS_PROGS sbsmsplay"
+		if test x$enable_wx = xyes; then
+			# wx available, build wxsbsmsplayer
+			SBSMS_PROGS="$SBSMS_PROGS wxsbsmsplayer"
+		fi
+	fi
+else
+	# no progs please
+	SBSMS_PROGS=""
+fi
+
+
+if test x$enable_multithreaded = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define MULTITHREADED 1
+_ACEOF
+
+fi
+
+am__api_version='1.10'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE=libsbsms
+ VERSION="$LIBSBSMS_RELEASE_MAJOR.$LIBSBSMS_RELEASE_MINOR.$LIBSBSMS_RELEASE_BUILD"
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+ac_config_files="$ac_config_files Makefile src/Makefile libsbsms.spec sbsms.pc"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${ENABLE_MP3_TRUE}" && test -z "${ENABLE_MP3_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MP3\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_MP3\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${ENABLE_SNDFILE_TRUE}" && test -z "${ENABLE_SNDFILE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SNDFILE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_SNDFILE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${ENABLE_PORTAUDIO_TRUE}" && test -z "${ENABLE_PORTAUDIO_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PORTAUDIO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_PORTAUDIO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${ENABLE_WX_TRUE}" && test -z "${ENABLE_WX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_WX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_WX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${MACOSX_TRUE}" && test -z "${MACOSX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MACOSX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MACOSX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by sbsms $as_me 1.5.0, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTION]... [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf at gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+sbsms config.status 1.5.0
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
+hardcode_libdir_separator_CXX \
+fix_srcfile_path_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "libsbsms.spec") CONFIG_FILES="$CONFIG_FILES libsbsms.spec" ;;
+    "sbsms.pc") CONFIG_FILES="$CONFIG_FILES sbsms.pc" ;;
+
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+
+  esac
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/lib-src/sbsms/configure.in b/lib-src/sbsms/configure.in
new file mode 100644
index 0000000..b24cdc6
--- /dev/null
+++ b/lib-src/sbsms/configure.in
@@ -0,0 +1,241 @@
+AC_INIT([sbsms],[1.5.0])
+
+dnl Use the m4/ directory to contain libtool macros that will be needed to 
+dnl go with the ltmain.sh script (both will be created/updated via the command
+dnl libtoolize --copy --force
+AC_CONFIG_MACRO_DIR([m4])
+
+#------------------------------------------------------------------------------------
+# Library's "official" release version:
+
+LIBSBSMS_RELEASE_MAJOR=1
+LIBSBSMS_RELEASE_MINOR=7
+LIBSBSMS_RELEASE_BUILD=0
+AC_CONFIG_SRCDIR([src/sbsms.cpp])
+AC_CANONICAL_TARGET([])
+AM_CONFIG_HEADER(src/config.h)
+
+AC_DISABLE_SHARED dnl allows for optimizations
+
+#------------------------------------------------------------------------------------
+# The following is the libtool / shared library version. This doesn't have to
+# do anything with the release version. It MUST conform to the following rules:
+#
+#  1. Start with version information of `0:0:0' for each libtool library.
+#  2. Update the version information only immediately before a public release of
+#     your software. More frequent updates are unnecessary, and only guarantee
+#     that the current interface number gets larger faster.
+#  3. If the library source code has changed at all since the last update, then
+#     increment revision (`c:r:a' becomes `c:r+1:a').
+#  4. If any interfaces have been added, removed, or changed since the last update,
+#     increment current, and set revision to 0.
+#  5. If any interfaces have been added since the last public release, then increment
+#     age.
+#  6. If any interfaces have been removed since the last public release, then set age
+#     to 0.
+
+SHARED_VERSION_INFO="8:0:7"
+
+AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
+
+AC_LANG([C++])
+AC_PROG_CXX
+
+AC_CHECK_FUNCS(malloc calloc free memcpy)
+
+AC_CHECK_LIB([m],floor)
+AC_CHECK_FUNCS(floor sqrt log)
+
+AC_C99_FUNC_LRINT()
+AC_C99_FUNC_LRINTF()
+
+AC_SUBST(SHLIB_VERSION_ARG)
+AC_SUBST(SHARED_VERSION_INFO)
+
+SBSMS_EXTRA_OBJ=""
+SBSMS_BIN=""
+
+AC_ARG_ENABLE(universal_binary,[  --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
+
+AC_ARG_ENABLE(static,[  --enable-static enable static build: (default: disable)],[enable_static=$enableval],[enable_static=no])
+
+AC_ARG_ENABLE(multithreaded,[  --enable-multithreaded enable multithreaded build: (default: disable)],[enable_multithreaded=$enableval],[enable_multithreaded=no])
+
+AC_ARG_ENABLE(debug,[  --enable-debug enable debug build: (default: disable)],[enable_debug=$enableval],[enable_debug=no])
+
+AC_ARG_ENABLE(sndfile,[  --enable-sndfile enable sndfile support: (default: disable)],[enable_sndfile=$enableval],[enable_sndfile=no])
+
+AC_ARG_ENABLE(mp3,[  --enable-mp3 enable mp3 support (default: disable)],[enable_mp3=$enableval],[enable_mp3=no])
+
+AC_ARG_ENABLE(portaudio,[  --enable-portaudio enable portaudio support: (default: disable)],[enable_portaudio=$enableval],[enable_portaudio=no])
+
+AC_ARG_ENABLE(wx,[  --enable-wx enable wxWidgets support (default: disable)],[enable_wx=$enableval],[enable_wx=no])
+
+AC_ARG_ENABLE(programs,[  --enable-programs Build SBSMS programs as well as library (default: enable)],[enable_progs=$enableval],[enable_progs=yes])
+
+if test x$enable_mp3 = xyes; then
+   enable_sndfile=yes;
+   AC_CHECK_LIB(mad,mad_stream_init,[mad_libs="-lmad"; SBSMS_EXTRA_OBJ="mp3.lo mp3tech.lo audiobuffer.lo"; use_libmad=yes],[echo "Sorry, you need libmad for mp3 support.  Install libmad or ./configure --disable-mp3"; exit -1])
+   if test x$use_libmad = xyes; then
+      if test x$MAD_LIBS = x; then
+	 MAD_LIBS=$mad_libs
+      fi
+      AC_SUBST(MAD_LIBS)
+      AC_DEFINE(HAVE_MAD,1,[Define to use libmad])
+   fi
+else
+    MAD_LIBS=""
+fi
+AM_CONDITIONAL(ENABLE_MP3, test x$enable_mp3 = xyes)
+
+PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2, ac_cv_sndfile=1, ac_cv_sndfile=0)
+
+if test x$enable_sndfile = xyes; then
+   # check for presence of libsndfile
+   if test "$ac_cv_sndfile" = "0"; then
+      echo "Sorry, you need libsndfile to --enable-sndfile.  Install libsndfile or --disable-sndfile"
+      exit -1;
+   else
+      AC_SUBST(SNDFILE_CFLAGS)
+      AC_SUBST(SNDFILE_LIBS)
+      AC_DEFINE(HAVE_SNDFILE,1,[Define to use libsndfile])
+   fi
+else
+    SNDFILE_LIBS=""
+fi
+AM_CONDITIONAL(ENABLE_SNDFILE, test x$enable_sndfile = xyes)
+
+PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 0.0.19, ac_cv_portaudio=1, ac_cv_portaudio=0)
+
+if test x$enable_portaudio = xyes; then
+   # check for presence of libportaudio
+   if test "$ac_cv_portaudio" = "0"; then
+      echo "Sorry, you need libportaudio-2.0 to --enable-portaudio.  Install libportaudio or --disable-portaudio"
+      exit -1;
+   else
+      AC_SUBST(PORTAUDIO_CFLAGS)
+      AC_SUBST(PORTAUDIO_LIBS)
+      AC_DEFINE(HAVE_PORTAUDIO,1,[Define to use libportaudio])
+   fi
+else
+    PORTAUDIO_LIBS=""
+fi
+AM_CONDITIONAL(ENABLE_PORTAUDIO, test x$enable_portaudio = xyes)
+
+CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"`
+
+if test x$enable_debug = xyes; then
+   CXXFLAGS="$CXXFLAGS -g -O0"
+else
+   CXXFLAGS="$CXXFLAGS -O3 -fomit-frame-pointer"
+fi
+
+if test x$enable_static = xyes; then
+   CXXFLAGS="$CXXFLAGS"
+else
+   case "$target_os" in
+     darwin*)
+	CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
+	;;
+	*)
+	;;
+   esac
+fi
+
+if test x$enable_universal_binary = xyes; then
+   case "$target_os" in
+     darwin*)
+        CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.4 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+	;;
+     *)
+	;;
+   esac
+else
+   CXXFLAGS="$CXXFLAGS"
+fi
+
+case "$target_os" in
+     darwin*)
+	macosx="yes"
+	;;
+     *)
+	macosx="no"
+	;;
+esac
+
+AC_SUBST(SBSMS_BIN)
+
+if test x$enable_wx = xyes; then
+
+   wxconfigargs=""
+   if test x$enable_static = xyes; then
+      wxconfigargs="$wxconfigargs --static=yes"
+   else
+      wxconfigargs="$wxconfigargs --static=no"
+   fi
+
+   if test x$enable_debug = xyes; then
+      wxconfigargs="$wxconfigargs --debug=yes"
+   else
+      wxconfigargs="$wxconfigargs --debug=no"
+   fi
+
+   AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
+   if [[ "$WX_CONFIG" = "no" ]] ; then
+      AC_MSG_ERROR("Could not find wx-config: is wxWidgets installed? is wx-config in your path?")
+   fi
+
+   AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x])
+
+   wx_version=`${WX_CONFIG} --version`
+   case "${wx_version}" in
+	2.8.*)
+	echo "Great, you're using wxWidgets ${wx_version}!"
+	;;
+	*)
+	wx_list=`${WX_CONFIG} --list`
+	AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
+	The currently available configurations are listed below.  If necessary, either
+	install the package for your distribution or download the latest version of
+	wxWidgets from http://wxwidgets.org. ${wx_list}])
+    esac
+
+    WX_LIBS="`$WX_CONFIG $wxconfigargs --libs`"
+    WX_CFLAGS="`$WX_CONFIG $wxconfigargs --cxxflags`"
+    AC_SUBST(WX_LIBS)
+    AC_SUBST(WX_CFLAGS)
+fi
+AM_CONDITIONAL(ENABLE_WX, test x$enable_wx = xyes)
+AM_CONDITIONAL(MACOSX, test "$macosx" = "yes")
+
+if test x$enable_progs = xyes; then
+	# we would like programs, so work out which ones can be built
+	# sbsms can always be built (doesn't need optional libs)
+	SBSMS_PROGS="sbsms"
+	if test x$enable_portaudio = xyes; then
+		# portaudio available, build sbsmsplay
+		SBSMS_PROGS="$SBSMS_PROGS sbsmsplay"
+		if test x$enable_wx = xyes; then
+			# wx available, build wxsbsmsplayer
+			SBSMS_PROGS="$SBSMS_PROGS wxsbsmsplayer"
+		fi
+	fi
+else
+	# no progs please
+	SBSMS_PROGS=""
+fi
+AC_SUBST(SBSMS_PROGS)
+
+if test x$enable_multithreaded = xyes; then
+    AC_DEFINE(MULTITHREADED,1,[Define to compile multithreaded sbsms])
+fi
+
+AM_INIT_AUTOMAKE(libsbsms, "$LIBSBSMS_RELEASE_MAJOR.$LIBSBSMS_RELEASE_MINOR.$LIBSBSMS_RELEASE_BUILD")
+
+dnl Audacity policy: don't enable automatic rebuild of configure et al if 
+dnl sources change
+AM_MAINTAINER_MODE([enabled])
+
+AC_CONFIG_FILES([Makefile src/Makefile libsbsms.spec sbsms.pc])
+AC_OUTPUT
diff --git a/lib-src/sbsms/depcomp b/lib-src/sbsms/depcomp
new file mode 100755
index 0000000..807b991
--- /dev/null
+++ b/lib-src/sbsms/depcomp
@@ -0,0 +1,423 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+if test -z "$depfile"; then
+   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
+   dir=`echo "$object" | sed 's,/.*$,/,'`
+   if test "$dir" = "$object"; then
+      dir=
+   fi
+   # FIXME: should be _deps on DOS.
+   depfile="$dir.deps/$base"
+fi
+
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  This file always lives in the current directory.
+  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # $object doesn't have directory information.
+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  outname="$stripped.o"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.d"
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a space and a tab in the [].
+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.  We will use -o /dev/null later,
+  # however we can't do the remplacement now because
+  # `-o $object' might simply not be used
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    -*)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
diff --git a/lib-src/sbsms/include/sbsms.h b/lib-src/sbsms/include/sbsms.h
new file mode 100644
index 0000000..2959d0d
--- /dev/null
+++ b/lib-src/sbsms/include/sbsms.h
@@ -0,0 +1,193 @@
+#ifndef SBSMS_INCLUDE
+#define SBSMS_INCLUDE
+
+#include <stdio.h>
+
+#define SBSMS_REAL_FLOAT 1
+
+namespace _sbsms_ {
+typedef float real;
+typedef real interleaved[2];
+typedef interleaved audio;
+}
+
+#define SBSMS_WINDOW SBSMS_HANN
+extern _sbsms_::real SBSMS_P1;
+extern _sbsms_::real SBSMS_Q1;
+#define SBSMS_S 4
+#define SBSMS_MAX_BANDS 7
+#define SBSMS_QUALITIES 3
+#define SBSMS_MAX_STRETCH 12
+#define SBSMS_MIN_STRETCH 1.0/12.0
+extern int SBSMS_BANDS[SBSMS_QUALITIES];
+extern int SBSMS_M_MAX[SBSMS_QUALITIES];
+extern int SBSMS_FRAME_SIZE[SBSMS_QUALITIES];
+extern int SBSMS_MAX_FRAME_SIZE[SBSMS_QUALITIES];
+extern int SBSMS_H[SBSMS_QUALITIES][5];
+extern _sbsms_::real SBSMS_PAD[SBSMS_QUALITIES][SBSMS_MAX_BANDS];
+extern int SBSMS_RES[SBSMS_QUALITIES][SBSMS_MAX_BANDS];
+extern int SBSMS_N[SBSMS_QUALITIES][SBSMS_MAX_BANDS];
+
+struct sbsms_resample_frame {
+  _sbsms_::real ratio0;
+  _sbsms_::real ratio1;
+  _sbsms_::audio *in;
+  long size;
+};
+
+typedef long (*sbsms_cb)(_sbsms_::audio *buf, long n, void *data);
+typedef _sbsms_::real (*sbsms_stretch_cb)(long nProcessed, void *data);
+typedef _sbsms_::real (*sbsms_ratio_cb)(long nProcessed, void *data);
+typedef long (*sbsms_resample_cb)(void *cb_data, sbsms_resample_frame *frame);
+
+namespace _sbsms_ {
+  class subband;
+  class TrackAllocator;
+  class PeakAllocator;
+}
+
+struct sbsms {
+  FILE *fp;
+  sbsms_cb getSamplesCB;
+  sbsms_stretch_cb getStretchCB;
+  sbsms_ratio_cb getRatioCB;
+  _sbsms_::subband *top;
+  _sbsms_::TrackAllocator *ta;
+  _sbsms_::PeakAllocator *pa;
+  long n_prepad, n_postpad, n_prespent, n_processed;
+  bool bWritingComplete;
+  int quality, channels;
+  long bufsize;
+  long chunksize;
+  _sbsms_::audio *ina;
+  void *threadData;
+};
+
+namespace _sbsms_ {
+
+class SampleBufBase {
+ public:
+  SampleBufBase() {};
+  virtual ~SampleBufBase() {};
+  virtual long read(_sbsms_::audio *buf, long n)=0;
+  virtual void advance(long n)=0;
+  virtual long n_readable()=0;
+};
+
+
+class grain;
+class SampleBuf {
+ public:
+  SampleBuf() {};
+  SampleBuf(int N);
+  SampleBuf(int N, long delay);
+  void init(int N, long delay);
+  void clear();
+  virtual ~SampleBuf();
+
+  void grow(long pos);
+  long write(audio *buf, long n);
+  long write(grain* g, int h);
+  virtual long read(_sbsms_::audio *buf, long n);
+  virtual void advance(long n);
+  virtual long n_readable();
+  audio *getReadBuf();
+
+  long readPos, writePos;
+  long delay;
+
+  int N;
+  long length;
+  audio *buf;  
+};
+
+}
+
+
+using namespace _sbsms_;
+class Resampler {
+ public:
+  Resampler(sbsms_resample_cb func, void *data);
+  Resampler(SampleBuf *in, real ratio);
+  ~Resampler();
+  long read(_sbsms_::audio *audioOut, long frames);
+  void writingComplete();
+  void reset();
+  void init();
+  long samplesInOutput();
+
+ protected:
+  sbsms_resample_frame frame;
+  long startAbs;
+  long midAbs;
+  _sbsms_::real midAbsf;
+  long endAbs;
+  long writePosAbs;
+  bool bInput;
+  _sbsms_::SampleBuf *out;
+  sbsms_resample_cb cb;
+  void *data;
+  bool bPull;
+  SampleBuf *in;
+  long inOffset;
+  real sincZeros;
+  bool bWritingComplete;
+};
+
+struct pitcher {
+  void *sbsmsData;
+  sbsms *sbsmser;
+  _sbsms_::real ratio;
+  Resampler *postResampler;
+  _sbsms_::audio *buf;
+  long bufsize;
+};
+
+void sbsms_init(int n);
+void sbsms_reset(sbsms *sbsmser);
+void sbsms_seek(sbsms *sbsmser, long framePos, long samplePos);
+sbsms* sbsms_create(sbsms_cb getSamplesCB, sbsms_stretch_cb getStretchCB, sbsms_ratio_cb getRatioCB, int channels, int quality, bool bPreAnalyze, bool bSynthesize);
+sbsms* sbsms_create(FILE *fp, sbsms_stretch_cb getStretchCB, sbsms_ratio_cb getRatioCB);
+void sbsms_destroy(sbsms* sbsmser);
+long sbsms_read_frame(_sbsms_::audio *out, void *data, sbsms *sbsmer, _sbsms_::real *ratio0, _sbsms_::real *ratio1);
+long sbsms_write_frame(FILE *fp, void *data, sbsms *sbsmser);
+long sbsms_samples_processed(sbsms *sbsmser);
+long sbsms_pre_analyze(sbsms_cb getSamplesCB, void *data, sbsms *sbsmser);
+void sbsms_pre_analyze_complete(sbsms *sbsmser);
+
+long sbsms_get_samples_queued(sbsms *sbsmser);
+long sbsms_get_frames_queued(sbsms *sbsmser);
+long sbsms_get_last_input_frame_size(sbsms *sbsmser);
+long sbsms_get_frame_pos(sbsms *sbsmser);
+
+void sbsms_close_write(FILE *fp, sbsms *sbsmser);
+FILE *sbsms_open_write(const char *fileName, sbsms *sbsmser, long samples_to_process);
+void sbsms_close_read(FILE *fp);
+FILE *sbsms_open_read(const char *fileName);
+long sbsms_get_samples_to_process(FILE *fp);
+long sbsms_get_frames_to_process(FILE *fp);
+long sbsms_get_channels(FILE *fp);
+long sbsms_get_quality(FILE *fp);
+void sbsms_seek_start_data(FILE *fp);
+
+
+pitcher *pitch_create(sbsms *sbsmser, void *sbsmsData, _sbsms_::real ratio);
+void pitch_reset(pitcher *pitch);
+void pitch_destroy(pitcher *pitch);
+long pitch_process(_sbsms_::audio *out, long n, pitcher *pitch);
+long pitch_get_samples_queued(pitcher *pitch);
+
+struct sbsmsInfo {
+  float stretch0, stretch1;
+  float ratio0, ratio1;
+  long samplesToProcess;
+  long samplesToGenerate;
+  Resampler *rs;
+};
+
+real stretchCBLinear(long nProcessed, void *userData);
+real stretchCBConstant(long nProcessed, void *userData);
+real ratioCBLinear(long nProcessed, void *userData);
+real ratioCBConstant(long nProcessed, void *userData);
+
+#endif
diff --git a/lib-src/sbsms/install-sh b/lib-src/sbsms/install-sh
new file mode 100755
index 0000000..4d4a951
--- /dev/null
+++ b/lib-src/sbsms/install-sh
@@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/lib-src/sbsms/libsbsms.spec.in b/lib-src/sbsms/libsbsms.spec.in
new file mode 100644
index 0000000..4adb2e1
--- /dev/null
+++ b/lib-src/sbsms/libsbsms.spec.in
@@ -0,0 +1,62 @@
+
+%define name    libsbsms
+%define version 2.0.2
+%define release 5
+%define prefix  /usr/local
+
+Summary:	C++ library for subband sinusoidal modeling time stretching and pitch scaling
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}
+Prefix:		%{prefix}
+Copyright:	GPL
+Group:		Sound
+Source0:	%{name}-%{version}.tar.bz2
+URL:		
+BuildRoot:	/var/tmp/%{name}-%{version}-buildroot
+
+%description
+C++ library for subband sinusoidal modeling time stretching and pitch scaling
+
+%package devel
+Summary:	C++ library for subband sinusoidal modeling time stretching and pitch scaling
+Group:		Development/Libraries
+Requires:	%{name} = %{version}
+
+%description devel
+C++ library for subband sinusoidal modeling time stretching and pitch scaling
+
+%prep
+
+%setup
+if [ -f Makefile.cvs ]; then make -f Makefile.cvs; fi
+
+%build
+./configure --prefix=%{prefix}
+make
+make docs
+
+%install
+if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
+mkdir -p $RPM_BUILD_ROOT
+make prefix=$RPM_BUILD_ROOT%{prefix} install
+
+%clean
+if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%{prefix}/bin/*
+%{prefix}/lib/libsbsms.so*
+%{prefix}/man/man1/*
+
+%files devel
+%defattr(-,root,root)
+%doc doc/html/*
+%{prefix}/lib/libsbsms.a
+%{prefix}/lib/libsbsms.la
+%{prefix}/lib/pkgconfig/sbsms.pc
+%{prefix}/include/*
+
+%changelog
diff --git a/lib-src/sbsms/ltmain.sh b/lib-src/sbsms/ltmain.sh
new file mode 100644
index 0000000..0634c4b
--- /dev/null
+++ b/lib-src/sbsms/ltmain.sh
@@ -0,0 +1,8461 @@
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6
+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
+#
+# MODE must be one of the following:
+#
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#       host-triplet:	$host
+#       shell:		$SHELL
+#       compiler:		$LTCC
+#       compiler flags:		$LTCFLAGS
+#       linker:		$LD (gnu? $with_gnu_ld)
+#       $progname:		(GNU libtool) 2.2.6
+#       automake:		$automake_version
+#       autoconf:		$autoconf_version
+#
+# Report bugs to <bug-libtool at gnu.org>.
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=2.2.6
+TIMESTAMP=""
+package_revision=1.3012
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/opt/local/bin/gsed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+# Generated shell functions inserted here.
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=:
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "X$my_tmpdir" | $Xsed
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "X$1" | $Xsed \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $SED -n '/^# Usage:/,/# -h/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    $ECHO
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	p
+     }' < "$progpath"
+    exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    func_error "missing argument for $1"
+    exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+# Same for EGREP, and just to be sure, do LTCC as well
+if test "x$EGREP" = x ; then
+    EGREP=egrep
+fi
+if test "x$LTCC" = x ; then
+    LTCC=${CC-gcc}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    $ECHO "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      $ECHO "enable shared libraries"
+    else
+      $ECHO "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      $ECHO "enable static libraries"
+    else
+      $ECHO "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
+    ;;
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
+    ;;
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
+    ;;
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
+    ;;
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
+    ;;
+  esac
+
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
+    opt="$1"
+    shift
+
+    case $opt in
+      --config)		func_config					;;
+
+      --debug)		preserve_args="$preserve_args $opt"
+			func_echo "enabling shell trace mode"
+			opt_debug='set -x'
+			$opt_debug
+			;;
+
+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			execute_dlfiles="$execute_dlfiles $1"
+			shift
+			;;
+
+      --dry-run | -n)	opt_dry_run=:					;;
+      --features)       func_features					;;
+      --finish)		mode="finish"					;;
+
+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			case $1 in
+			  # Valid mode arguments:
+			  clean)	;;
+			  compile)	;;
+			  execute)	;;
+			  finish)	;;
+			  install)	;;
+			  link)		;;
+			  relink)	;;
+			  uninstall)	;;
+
+			  # Catch anything else as an error
+			  *) func_error "invalid argument for $opt"
+			     exit_cmd=exit
+			     break
+			     ;;
+		        esac
+
+			mode="$1"
+			shift
+			;;
+
+      --preserve-dup-deps)
+			opt_duplicate_deps=:				;;
+
+      --quiet|--silent)	preserve_args="$preserve_args $opt"
+			opt_silent=:
+			;;
+
+      --verbose| -v)	preserve_args="$preserve_args $opt"
+			opt_silent=false
+			;;
+
+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			preserve_args="$preserve_args $opt $1"
+			func_enable_tag "$1"	# tagname is set here
+			shift
+			;;
+
+      # Separate optargs to long options:
+      -dlopen=*|--mode=*|--tag=*)
+			func_opt_split "$opt"
+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+			shift
+			;;
+
+      -\?|-h)		func_usage					;;
+      --help)		opt_help=:					;;
+      --version)	func_version					;;
+
+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+
+      *)		nonopt="$opt"
+			break
+			;;
+    esac
+  done
+
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      ;;
+  esac
+
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
+
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
+  fi
+
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+  # Darwin sucks
+  eval std_shrext=\"$shrext_cmds\"
+
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
+
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+	func_dirname_and_basename "$1" "" "."
+	func_stripname '' '.exe' "$func_basename_result"
+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        func_quote_for_eval "$arg"
+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_quote_for_eval "$arg"
+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	    done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          pie_flag="$pie_flag $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  later="$later $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_quote_for_eval "$arg"
+	    lastarg="$lastarg $func_quote_for_eval_result"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      removelist="$removelist $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    removelist="$removelist $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$mode'"
+        ;;
+    esac
+
+    $ECHO
+    $ECHO "Try \`$progname --help' for more information about other modes."
+
+    exit $?
+}
+
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	$ECHO "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      $ECHO "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $ECHO
+
+    $ECHO "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	$ECHO "pages."
+	;;
+      *)
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    install_prog="$install_prog$func_quote_for_eval_result"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      install_prog="$install_prog $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_verbose "extracting global C symbols from \`$progfile'"
+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+	  $opt_dry_run || {
+	    eval '$ECHO ": $name " >> "$nlist"'
+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	  }
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+"
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* )
+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+	    lt_dlsym_const= ;;
+	  *osf5*)
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+	    lt_dlsym_const= ;;
+	  *)
+	    lt_dlsym_const=const ;;
+	  esac
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+
+# func_emit_wrapper_part1 [arg=no]
+#
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+	func_emit_wrapper_part1_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part1_arg1=$1
+	fi
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$ECHO "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
+EOF
+
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
+EOF
+	    func_emit_wrapper_part2 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+
+	    cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+  /* very simple arg parsing; don't want to rely on getopt */
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
+	  return 0;
+	}
+    }
+
+  newargz = XMALLOC (char *, argc + 1);
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
+    {
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal ("getcwd failed");
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  weak_libs="$weak_libs $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname '-L' '' "$arg"
+	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot)
+	compiler_flags="$compiler_flags $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	compiler_flags="$compiler_flags $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_duplicate_deps ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  case $lib in
+	  *.la)	func_source "$lib" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) deplibs="$deplibs $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    compiler_flags="$compiler_flags $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    dir=$func_stripname_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		$ECHO
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+		$ECHO "*** that it is just a static archive that I should not use here."
+	      else
+		$ECHO
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    # Keep a list of preopened convenience libraries to check
+	    # that they are being used correctly in the link pass.
+	    test -z "$libdir" && \
+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         newlib_search_path="$newlib_search_path $func_stripname_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    $ECHO
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  $ECHO
+			  $ECHO "*** And there doesn't seem to be a static archive available"
+			  $ECHO "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $ECHO
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** I have the capability to make that library automatically link in when"
+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+	    $ECHO "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $ECHO "*** But as you try to build a module library, libtool will still create "
+	      $ECHO "*** a static module, that should work as long as the dlopening application"
+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$ECHO
+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$ECHO "*** not find such a program.  So, this module is probably useless."
+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_dirname "$deplib" "" "."
+		dir="$func_dirname_result"
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  $ECHO
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      libobjs="$libobjs $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $ECHO
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    $ECHO "*** I have the capability to make that library automatically link in when"
+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+		    $ECHO "*** shared version of the library, which I believe you do not have"
+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		newdeplibs="$newdeplibs $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $ECHO
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      $ECHO "*** I have the capability to make that library automatically link in when"
+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+		      $ECHO "*** shared version of the library, which you do not appear to have"
+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  $ECHO
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $ECHO "*** make it link in!  You will probably need to install it or some"
+		  $ECHO "*** library that it depends on before this library will be fully"
+		  $ECHO "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		newdeplibs="$newdeplibs $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+	    done
+	  fi
+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+	     $GREP . >/dev/null; then
+	    $ECHO
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $ECHO "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $ECHO
+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $ECHO "*** a static module, that should work as long as the dlopening"
+	    $ECHO "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $ECHO
+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $ECHO "*** not find such a program.  So, this module is probably useless."
+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+	    $ECHO "*** automatically added whenever a program is linked with this library"
+	    $ECHO "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $ECHO
+	      $ECHO "*** Since this library must not contain undefined symbols,"
+	      $ECHO "*** because either the platform does not support them or"
+	      $ECHO "*** it was explicitly requested with -no-undefined,"
+	      $ECHO "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  delfiles="$delfiles $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval cmd=\"$cmd\"
+	      func_len " $cmd"
+	      len=$func_len_result
+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    $ECHO 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    $ECHO ')' >> $output
+	    delfiles="$delfiles $output"
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    delfiles="$delfiles $output"
+	    output=$firstobj\"$file_list_spec$output\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=$obj
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      delfiles="$delfiles $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  libobjs="$libobjs $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      compile_command="$compile_command ${wl}-bind_at_load"
+	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    oldobjs="$oldobjs $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	generated="$generated $gentop"
+
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  oldobjs="$oldobjs $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		if test "x$EGREP" = x ; then
+			EGREP=egrep
+		fi
+		# We do not want portage's install root ($D) present.  Check only for
+		# this if the .la is being installed.
+		if test "$installed" = yes && test "$D"; then
+		  eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+		else
+		  mynewdependency_lib="$libdir/$name"
+		fi
+		# Do not add duplicates
+		if test "$mynewdependency_lib"; then
+		  my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+		  if test -z "$my_little_ninja_foo_1"; then
+		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
+		  fi
+		fi
+		;;
+		  *)
+		if test "$installed" = yes; then
+		  # Rather use S=WORKDIR if our version of portage supports it.
+		  # This is because some ebuild (gcc) do not use $S as buildroot.
+		  if test "$PWORKDIR"; then
+		    S="$PWORKDIR"
+		  fi
+		  # We do not want portage's build root ($S) present.
+		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+		  # We do not want portage's install root ($D) present.
+		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
+		    mynewdependency_lib=""
+		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+		  else
+		    mynewdependency_lib="$deplib"
+		  fi
+		else
+		  mynewdependency_lib="$deplib"
+		fi
+		# Do not add duplicates
+		if test "$mynewdependency_lib"; then
+		  my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+		  if test -z "$my_little_ninja_foo_4"; then
+			newdependency_libs="$newdependency_libs $mynewdependency_lib"
+		  fi
+		fi
+		;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlfiles="$newdlfiles $libdir/$name"
+		;;
+	      *) newdlfiles="$newdlfiles $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlprefiles="$newdlprefiles $libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  # Do not add duplicates
+	  if test "$installed" = yes && test "$D"; then
+	    install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+	  fi
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$mode" = link || test "$mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff --git a/m4/ac_c99_func_lrint.m4 b/lib-src/sbsms/m4/ac_c99_func_lrint.m4
similarity index 100%
copy from m4/ac_c99_func_lrint.m4
copy to lib-src/sbsms/m4/ac_c99_func_lrint.m4
diff --git a/m4/ac_c99_func_lrintf.m4 b/lib-src/sbsms/m4/ac_c99_func_lrintf.m4
similarity index 100%
copy from m4/ac_c99_func_lrintf.m4
copy to lib-src/sbsms/m4/ac_c99_func_lrintf.m4
diff --git a/lib-src/sbsms/m4/libtool.m4 b/lib-src/sbsms/m4/libtool.m4
new file mode 100644
index 0000000..2f42cf8
--- /dev/null
+++ b/lib-src/sbsms/m4/libtool.m4
@@ -0,0 +1,7370 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool at gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "[$]0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  # Handle Gentoo/FreeBSD as it was Linux
+  case $host_vendor in
+    gentoo)
+      version_type=linux ;;
+    *)
+      version_type=freebsd-$objformat ;;
+  esac
+
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+    linux)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      need_lib_prefix=no
+      need_version=no
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[[12]]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${F77-"f77"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${FC-"f95"}
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
+])
diff --git a/lib-src/sbsms/m4/ltoptions.m4 b/lib-src/sbsms/m4/ltoptions.m4
new file mode 100644
index 0000000..34151a3
--- /dev/null
+++ b/lib-src/sbsms/m4/ltoptions.m4
@@ -0,0 +1,368 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/lib-src/sbsms/m4/ltsugar.m4 b/lib-src/sbsms/m4/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/lib-src/sbsms/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/lib-src/sbsms/m4/ltversion.m4 b/lib-src/sbsms/m4/ltversion.m4
new file mode 100644
index 0000000..b8e154f
--- /dev/null
+++ b/lib-src/sbsms/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3012 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6'
+macro_revision='1.3012'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/lib-src/sbsms/m4/lt~obsolete.m4 b/lib-src/sbsms/m4/lt~obsolete.m4
new file mode 100644
index 0000000..637bb20
--- /dev/null
+++ b/lib-src/sbsms/m4/lt~obsolete.m4
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
diff --git a/lib-src/sbsms/mac/Info.plist b/lib-src/sbsms/mac/Info.plist
new file mode 100644
index 0000000..d0a22c7
--- /dev/null
+++ b/lib-src/sbsms/mac/Info.plist
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>	
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>SBSMS</string>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sbsms</string>
+			</array>
+		</dict>
+	</array>
+
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleIconFile</key>
+	<string>sbsms.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.sourceforge.sbsms</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>wxsbsmsplayer</string>
+	<key>CFBundleName</key>
+	<string>SBSMS</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>sbsms</string>
+	<key>CFBundleVersion</key>
+	<string>1.6.0</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.6.0</string>
+	<key>CFBundleGetInfoString</key>
+	<string>SBSMS version 1.6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>Version 1.6.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Audacity version 1.3.4</string>
+	<key>LSRequiresCarbon</key>
+        <true/>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
diff --git a/lib-src/sbsms/mac/sbsms.icns b/lib-src/sbsms/mac/sbsms.icns
new file mode 100644
index 0000000..bd787d7
Binary files /dev/null and b/lib-src/sbsms/mac/sbsms.icns differ
diff --git a/lib-src/portaudio-v19/missing b/lib-src/sbsms/missing
similarity index 100%
copy from lib-src/portaudio-v19/missing
copy to lib-src/sbsms/missing
diff --git a/lib-src/sbsms/mkinstalldirs b/lib-src/sbsms/mkinstalldirs
new file mode 100755
index 0000000..8ab885e
--- /dev/null
+++ b/lib-src/sbsms/mkinstalldirs
@@ -0,0 +1,99 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+   case "${1}" in
+     -h | --help | --h* )			# -h for help
+	echo "${usage}" 1>&2; exit 0 ;;
+     -m )					# -m PERM arg
+	shift
+	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+	dirmode="${1}"
+	shift ;;
+     -- ) shift; break ;;			# stop option processing
+     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+     * )  break ;;				# first non-opt arg
+   esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+0) exit 0 ;;
+esac
+
+case $dirmode in
+'')
+  if mkdir -p -- . 2>/dev/null; then
+    echo "mkdir -p -- $*"
+    exec mkdir -p -- "$@"
+  fi ;;
+*)
+  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    echo "mkdir -m $dirmode -p -- $*"
+    exec mkdir -m "$dirmode" -p -- "$@"
+  fi ;;
+esac
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+	echo "mkdir $pathcomp"
+
+	mkdir "$pathcomp" || lasterr=$?
+
+	if test ! -d "$pathcomp"; then
+	  errstatus=$lasterr
+	else
+	  if test ! -z "$dirmode"; then
+	     echo "chmod $dirmode $pathcomp"
+
+	     lasterr=""
+	     chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	     if test ! -z "$lasterr"; then
+	       errstatus=$lasterr
+	     fi
+	  fi
+	fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 3
+# End:
+# mkinstalldirs ends here
diff --git a/lib-src/sbsms/resource/Pause.xpm b/lib-src/sbsms/resource/Pause.xpm
new file mode 100644
index 0000000..0dc55ee
--- /dev/null
+++ b/lib-src/sbsms/resource/Pause.xpm
@@ -0,0 +1,197 @@
+/* XPM */
+static char *Pause_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"28 25 166 2",
+"   c black",
+".  c #010101",
+"X  c gray3",
+"o  c #090909",
+"O  c #222222",
+"+  c #232323",
+"@  c #252525",
+"#  c gray15",
+"$  c gray16",
+"%  c #2A2A2A",
+"&  c gray17",
+"*  c #2C2C2C",
+"=  c #2D2D2D",
+"-  c gray18",
+";  c #484848",
+":  c gray29",
+">  c #626262",
+",  c gray40",
+"<  c #6C6B6C",
+"1  c #727272",
+"2  c gray45",
+"3  c #7C7C7C",
+"4  c gray49",
+"5  c #7E7E7E",
+"6  c gray53",
+"7  c #8E8E8E",
+"8  c #909090",
+"9  c #939393",
+"0  c #949394",
+"q  c gray58",
+"w  c #959595",
+"e  c #979797",
+"r  c #999799",
+"t  c #9A999A",
+"y  c #9B9B9B",
+"u  c gray62",
+"i  c gray63",
+"p  c #A2A2A2",
+"a  c #A7A7A7",
+"s  c #A8A7A8",
+"d  c gray66",
+"f  c #A9A9A9",
+"g  c #AAAAAA",
+"h  c #ACABAB",
+"j  c #ACACAC",
+"k  c gray68",
+"l  c #AEAEAE",
+"z  c #B2B2B2",
+"x  c #C1C1C1",
+"c  c #C2C2C3",
+"v  c #C5C5C5",
+"b  c #C6C6C6",
+"n  c #C7C6C7",
+"m  c gray78",
+"M  c #C8C9C8",
+"N  c #C9C8C9",
+"B  c gray79",
+"V  c #CACACA",
+"C  c #CBCCCC",
+"Z  c #CCCBCC",
+"A  c gray80",
+"S  c gray81",
+"D  c #D0CFD0",
+"F  c #D0D0D0",
+"G  c #D1D0D1",
+"H  c #D2D2D2",
+"J  c #D2D2D3",
+"K  c #D3D2D2",
+"L  c #D3D2D3",
+"P  c LightGray",
+"I  c #D4D3D4",
+"U  c gray83",
+"Y  c #D5D5D5",
+"T  c #D5D5D6",
+"R  c gray84",
+"E  c #D6D7D6",
+"W  c #D7D6D7",
+"Q  c #D7D7D7",
+"!  c #D8D8D8",
+"~  c gray85",
+"^  c #DADADA",
+"/  c #DADBDB",
+"(  c #DBDBDA",
+")  c gray86",
+"_  c gainsboro",
+"`  c #DDDDDC",
+"'  c #DDDDDD",
+"]  c #DEDDDE",
+"[  c #DEDEDD",
+"{  c gray87",
+"}  c #DFDFDF",
+"|  c #DFDFE0",
+" . c #DFE0E0",
+".. c gray88",
+"X. c #E0E0E1",
+"o. c #E1E1E1",
+"O. c #E2E1E1",
+"+. c #E2E2E2",
+"@. c #E3E2E3",
+"#. c gray89",
+"$. c #E3E3E4",
+"%. c #E3E4E4",
+"&. c #E4E3E3",
+"*. c #E4E3E4",
+"=. c #E4E4E3",
+"-. c #E4E4E4",
+";. c gray90",
+":. c #E5E6E6",
+">. c #E6E6E5",
+",. c #E6E6E6",
+"<. c #E6E6E7",
+"1. c #E6E7E6",
+"2. c #E6E7E7",
+"3. c #E7E6E6",
+"4. c #E7E7E6",
+"5. c #E7E7E7",
+"6. c #E7E7E8",
+"7. c gray91",
+"8. c #E9E9E9",
+"9. c #E9E9EA",
+"0. c #E9EAE9",
+"q. c #E9EAEA",
+"w. c #EAE9E9",
+"e. c #EAE9EA",
+"r. c #EAEAE9",
+"t. c #EAEAEA",
+"y. c gray92",
+"u. c #EBEBEC",
+"i. c #EBECEB",
+"p. c #EBECEC",
+"a. c #ECEBEB",
+"s. c #ECEBEC",
+"d. c #ECECEB",
+"f. c #ECECEC",
+"g. c #ECECED",
+"h. c #ECEDEC",
+"j. c gray93",
+"k. c #EDEDEE",
+"l. c #EEEEEE",
+"z. c #EEEEEF",
+"x. c #EEEFEE",
+"c. c #EEEFEF",
+"v. c #EFEEEE",
+"b. c #EFEEEF",
+"n. c #EFEFEE",
+"m. c #EFEFEF",
+"M. c #EFEFF0",
+"N. c gray94",
+"B. c #F0F0F1",
+"V. c #F0F1F0",
+"C. c #F0F1F1",
+"Z. c #F1F0F0",
+"A. c #F1F0F1",
+"S. c #F1F1F0",
+"D. c #F1F1F1",
+"F. c gray95",
+"G. c #F3F3F3",
+"H. c #F4F4F4",
+"J. c gray96",
+"K. c #F6F6F6",
+"L. c gray97",
+"P. c #F8F8F8",
+"I. c #F9F8F8",
+"U. c #F9F9F9",
+"Y. c gray100",
+"T. c None",
+/* pixels */
+"T.T.6 r e 9 9 0 0 0 9 9 9 9 0 0 9 9 0 0 0 0 9 r r 6 T.T.",
+"T.r 3 < , , , , , , , , , , , , , , , , , , , , < 3 r T.",
+"e 3 d U y.y.y.y.y.y.y.y.y.7.y.y.y.4.y.y.y.y.y.y.U d 3 e ",
+"e d y.y.y.y.y.d.a.y.y.y.y.y.y.y.y.y.y.y.a.y.y.y.y.a.u e ",
+"2 U d.a.d.k.d.d.a.y.a.k.a.y.u.a.d.d.k.k.a.i.i.d.u.i.c 2 ",
+", k.k.d.d.d.k.d.d.k.d.d.a.a.k.a.d.d.d.d.k.d.k.k.k.y.M , ",
+", k.k.k.k.k.k.d.k.k.k.d.k.k.k.k.d.k.k.k.k.k.k.k.k._ c , ",
+", k.k.n.k.k.k.k.k.k.>.% + Q k.; + z k.4.k.k.k.k.>.S b , ",
+", m.m.m.m.m.m.m.n.n.>.    U m.#   d S.m.m.m.m.m.~ M M , ",
+", m.S.m.m.S.S.S.S.S.>.o   U S.=   d S.S.S.m.m._ Z Z Z , ",
+", F.F.S.S.S.S.S.S.S.<.o   U S.=   d S.S.S.u._ D S S S , ",
+", F.F.F.F.F.G.G.S.F.<.o   W F.=   s A.y.| W I J P D K , ",
+", F.H.F.G.G.G.G.G.G.y.o   D m.*   i _ W U Q Q Q U U ~ , ",
+", H.H.J.G.G.L.G.y.$.D X   N | %   y _ _ } | _ ~ _ _ ~ , ",
+", J.J.J.L.G.k.y.| } U X   m | %   u | o.>.>.=.| } | _ , ",
+", J.J.J.G.k.=.| | | E X   M #.*   i 7.>.>.>.4.| | | | , ",
+", U.J.P.m.#.#.#.o.o.^     M $.#   i <.<.2.7.>.o.o.$.$., ",
+", U.P.S.<.<.2.2.<.>.| $ + D <.; O l <.>.7.>.2.<.>.>.5., ",
+", U.J.u.y.y.y.y.y.y.y.u.u.y.7.u.y.y.7.u.>.y.u.u.y.y.y., ",
+", U.F.u.i.u.u.i.a.a.u.a.a.k.a.a.y.a.a.a.k.k.y.k.i.k.k., ",
+"2 | S.k.k.c.c.k.m.m.k.k.k.k.m.m.m.m.m.S.k.k.k.A.m.A.~ 2 ",
+"e l S.S.n.S.S.S.S.S.A.A.S.A.S.A.m.S.m.S.S.A.m.S.S.S.d r ",
+"9 6 d _ F.F.S.F.F.F.F.F.F.F.F.F.F.F.F.F.F.F.S.S.~ d 6 9 ",
+"T.q 9 2 , , , , , , , , , , , , , , , , , , , , 2 9 0 T.",
+"T.T.> 7 9 e c M M M M V M V M V M M V M V M n y 7 > T.T."
+};
diff --git a/lib-src/sbsms/resource/PauseDown.xpm b/lib-src/sbsms/resource/PauseDown.xpm
new file mode 100644
index 0000000..9584781
--- /dev/null
+++ b/lib-src/sbsms/resource/PauseDown.xpm
@@ -0,0 +1,288 @@
+/* XPM */
+static char *PauseDown_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"28 25 257 2",
+"   c black",
+".  c #000101",
+"X  c #010101",
+"o  c #040708",
+"O  c #060708",
+"+  c #171C23",
+"@  c #141E24",
+"#  c #191F26",
+"$  c #142027",
+"%  c #17232B",
+"&  c #15222C",
+"*  c #16232D",
+"=  c #17242D",
+"-  c #1B2229",
+";  c #1E252C",
+":  c #1E252D",
+">  c #1E262D",
+",  c #1F272D",
+"<  c #293E4B",
+"1  c #2F3B48",
+"2  c #626262",
+"3  c gray40",
+"4  c #6C6B6C",
+"5  c #727272",
+"6  c gray45",
+"7  c #73777D",
+"8  c #74787E",
+"9  c #7C7C7C",
+"0  c #537FA4",
+"q  c #5180A6",
+"w  c #5585A7",
+"e  c #5686A7",
+"r  c #7E8588",
+"t  c #6C87A5",
+"y  c #6F8AA7",
+"u  c #6E8CA8",
+"i  c #6195B5",
+"p  c #7085A4",
+"a  c #708AA7",
+"s  c #728CA8",
+"d  c #7B8CA6",
+"f  c #7C8DA6",
+"g  c #728EB0",
+"h  c #7BA0B0",
+"j  c #7CA1B0",
+"k  c #518DDB",
+"l  c #5592DD",
+"z  c #5997DF",
+"x  c #5D93DC",
+"c  c #5D9CE1",
+"v  c #6B93CB",
+"b  c #659CE0",
+"n  c #65A0CF",
+"m  c #69A5D1",
+"M  c #6DAAD4",
+"N  c #70ADD4",
+"B  c #76B6DB",
+"V  c #62A2E3",
+"C  c #66A7E5",
+"Z  c #67A7E5",
+"A  c #66A8E5",
+"S  c #67A8E5",
+"D  c #67A8E6",
+"F  c #6BADE7",
+"G  c #6BAEE7",
+"H  c #6CADE7",
+"J  c #6CAEE7",
+"K  c #74A8E3",
+"L  c #7BA8E3",
+"P  c #7BAFE6",
+"I  c #72B2E1",
+"U  c #76B0E7",
+"Y  c #74B7E3",
+"T  c #72B3E9",
+"R  c #71B4EA",
+"E  c #71B5EA",
+"W  c #72B4EA",
+"Q  c #74B0E8",
+"!  c #74B1E8",
+"~  c #76B3E8",
+"^  c #74B8EB",
+"/  c #75B8EB",
+"(  c #77B9EB",
+")  c #74B8EC",
+"_  c #76BAEC",
+"`  c #76BBEC",
+"'  c #77BBED",
+"]  c #7CB1E8",
+"[  c #79BBE5",
+"{  c #79BDED",
+"}  c #79BDEE",
+"|  c #79BEEE",
+" . c #7ABFEE",
+".. c #7BBFEF",
+"X. c #7CBCEC",
+"o. c #7CBCED",
+"O. c #7AC0EE",
+"+. c #7BC0EE",
+"@. c #7BC0EF",
+"#. c #7FC1E9",
+"$. c #7CC1EE",
+"%. c #7DC1EF",
+"&. c #7EC4F0",
+"*. c #7EC4F1",
+"=. c #7FC4F0",
+"-. c #7FC4F1",
+";. c #7FC5F0",
+":. c gray53",
+">. c #8E8E8E",
+",. c #909090",
+"<. c #939393",
+"1. c #949394",
+"2. c gray58",
+"3. c #959595",
+"4. c #979797",
+"5. c #999799",
+"6. c #9A999A",
+"7. c #87A4B0",
+"8. c gray67",
+"9. c #B2B2B2",
+"0. c #88A5D1",
+"q. c #89AAD0",
+"w. c #8BA9D2",
+"e. c #89ABD4",
+"r. c #8CAED2",
+"t. c #8EAFD3",
+"y. c #90B3D3",
+"u. c #90B5D6",
+"i. c #81B5E1",
+"p. c #8FB2E6",
+"a. c #8EB6E8",
+"s. c #88BAEB",
+"d. c #8EBEEC",
+"f. c #91B3E6",
+"g. c #93B7E2",
+"h. c #90B5E7",
+"j. c #91B4E6",
+"k. c #92B6E7",
+"l. c #92B6E8",
+"z. c #94B8E0",
+"x. c #96BAE1",
+"c. c #94B8E8",
+"v. c #95B8E8",
+"b. c #96BBE9",
+"n. c #97BBE9",
+"m. c #98BDE2",
+"M. c #98BDEB",
+"N. c #99BDEB",
+"B. c #98BEEA",
+"V. c #98BEEB",
+"C. c #99BEEA",
+"Z. c #99BEEB",
+"A. c #99BFEB",
+"S. c #87C4DF",
+"D. c #8BC4EF",
+"F. c #8BC9E2",
+"G. c #82C3F0",
+"H. c #80C5F0",
+"J. c #80C7F2",
+"K. c #81C8F2",
+"L. c #82C9F2",
+"P. c #82C9F3",
+"I. c #83C8F2",
+"U. c #83C9F2",
+"Y. c #83C9F3",
+"T. c #83CAF2",
+"R. c #84C9F2",
+"E. c #84C9F3",
+"W. c #85CBF2",
+"Q. c #84CCF4",
+"!. c #86CDF4",
+"~. c #86CEF4",
+"^. c #87CEF4",
+"/. c #87CEF5",
+"(. c #87CFF5",
+"). c #87CFF6",
+"_. c #88CEF5",
+"`. c #88CFF4",
+"'. c #88CFF5",
+"]. c #89CFF5",
+"[. c #89D0F4",
+"{. c #89D2F6",
+"}. c #8AD2F6",
+"|. c #8AD3F6",
+" X c #8BD2F6",
+".X c #8BD2F7",
+"XX c #8BD3F6",
+"oX c #8FD1F6",
+"OX c #8DD6F7",
+"+X c #8DD7F7",
+"@X c #8ED6F7",
+"#X c #8DD6F8",
+"$X c #8ED6F8",
+"%X c #8FD9F9",
+"&X c #8FDAF9",
+"*X c #92C5EE",
+"=X c #95C3ED",
+"-X c #97C1EC",
+";X c #9AC0E4",
+":X c #9CC1E5",
+">X c #9BC1EB",
+",X c #9BC1EC",
+"<X c #9CC3ED",
+"1X c #9DC3ED",
+"2X c #9CC4ED",
+"3X c #9EC4EC",
+"4X c #9EC4ED",
+"5X c #9FC5ED",
+"6X c #9FC5EE",
+"7X c #9FC7EE",
+"8X c #99CDF2",
+"9X c #9FCEF3",
+"0X c #90D7F8",
+"qX c #90D9F9",
+"wX c #91D9F8",
+"eX c #91D9F9",
+"rX c #90DAF9",
+"tX c #91DAF9",
+"yX c #92DCFA",
+"uX c #93DCFA",
+"iX c #99D0F3",
+"pX c #9CDAF7",
+"aX c #A0C6EE",
+"sX c #A0C7EE",
+"dX c #A1C7EE",
+"fX c #A5CEE2",
+"gX c #A1C8EE",
+"hX c #A2C9EF",
+"jX c #A3CBEF",
+"kX c #A4CAEF",
+"lX c #A4CBEF",
+"zX c #A2CCF1",
+"xX c #A4CBF0",
+"cX c #A5CEF1",
+"vX c #A6CDF0",
+"bX c #A6CEF1",
+"nX c #A7CEF1",
+"mX c #A0D6F6",
+"MX c #A9D1F2",
+"NX c #AAD1F2",
+"BX c #ACD5F4",
+"VX c #ADD5F4",
+"CX c #ACD6F4",
+"ZX c #ABDDF7",
+"AX c #AFD8F5",
+"SX c #AFD9F5",
+"DX c #B2DCF6",
+"FX c #B2DCF7",
+"GX c #B4DFF8",
+"HX c #B5DFF8",
+"JX c #B6E2F8",
+"KX c #B9E4FA",
+"LX c #C6C6C6",
+"PX c #C8C8C8",
+"IX c gray79",
+"UX c gray100",
+"YX c None",
+/* pixels */
+"YXYX:.5.6.3.<.<.<.<.1.1.1.1.1.1.2.2.1.1.1.1.1.6.5.:.YXYX",
+"YX5.9 4 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 9 5.YX",
+"3.8 d 0.p.p.p.p.f.f.p.p.p.p.p.p.p.p.p.p.p.p.p.p.0.d 7 3.",
+"3.f j.j.j.p.j.j.f.f.f.l.j.j.j.p.j.j.j.j.j.j.j.j.j.j.p 3.",
+"6 w.l.l.l.j.l.l.c.j.c.j.l.l.j.l.j.c.l.j.j.l.l.l.l.l.v 6 ",
+"3 v.v.v.v.v.v.v.c.c.c.v.v.v.v.v.v.v.c.c.v.c.v.v.c.l.x 3 ",
+"3 n.n.v.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.v.n.n.v.n.n.L k 3 ",
+"3 A.A.A.>XV.V.V.-Xn.g.- @ e.n.1 @ g V.>Xn.>XV.V.a.b l 3 ",
+"3 A.4XA.-X>X4X>X>X-Xm.X X w.-X# X t >X>X>X>X>XV.K z z 3 ",
+"3 4X4XaX4X4X4X5X3XaXu.O X t.4X: X y 4X>X5X5X5XP c c c 3 ",
+"3 aXdXdXaXaXgXaXaXaXm.O X t.aX: X y 5X5X5X-X] V V V V 3 ",
+"3 lXlXlXlXlXlXgXgXaX;XO X y.xX: X s 7X5Xd.Q C C C C C 3 ",
+"3 nXnXxXxXMXxXnXjXjX;XO X u.mX, X y *Xs.Q H G G G H H 3 ",
+"3 NXMXNXMXMXMXNXzX*Xi.o X v E & X 0 Q Q T E E E E E E 3 ",
+"3 BXBXBXBXBX9XD.X.X.I o X m ` & X 0 ) ) ( ( ' ( ' ( ( 3 ",
+"3 AXAXDXAX8XG.....O.Y o X M O.= X w ' } ( ....O.O.O...3 ",
+"3 FXFXFX8X%.;.%.&.&.[ X X N %.& X e O.%.%.T.%.T.&.G.;.3 ",
+"3 HXHXmXT.T.T.Q.T.Y.X.% @ B E.< @ i T.E.E.^.T.T.E.E.Y.3 ",
+"3 JXZXoX|.Q.(.Q.Q.|.`.`.Q.`.`.Q.`.Q.|.(.(.(.(.Q.Q.Q.`.3 ",
+"3 KXpX|.|.XXXXXX(.oX|.oXXXXXoX|.|.oX|.oXXXXXXXXX.X.X.X3 ",
+"6 fX$XOXOXOXOXOXOX$X$X$X0X0X0X$X$X$XOXOXOXOXOXOXOXOXF.6 ",
+"5.7.&X%X%X%X&X&X&X&X&X$X&X&XwX&XuX$X&X%X&X&X&XuX&X&Xh <.",
+"<.r h F.uXuXuXuXuXuXuX&XuXuX&XuXuXuXuXuXuXuXuXuXF.h r <.",
+"YX3.,.5 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 5 ,.<.YX",
+"YXYX2 8.LXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX9.<.>.2 YXYX"
+};
diff --git a/lib-src/sbsms/resource/Play.xpm b/lib-src/sbsms/resource/Play.xpm
new file mode 100644
index 0000000..ba940c8
--- /dev/null
+++ b/lib-src/sbsms/resource/Play.xpm
@@ -0,0 +1,192 @@
+/* XPM */
+static char *Play_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"28 25 161 2",
+"   c black",
+".  c #010101",
+"X  c #040404",
+"o  c gray2",
+"O  c #070707",
+"+  c gray3",
+"@  c #131413",
+"#  c #1B1B1B",
+"$  c gray11",
+"%  c #1D1D1D",
+"&  c #1F201F",
+"*  c #626262",
+"=  c gray40",
+"-  c #6C6B6C",
+";  c #727272",
+":  c gray45",
+">  c gray46",
+",  c #7C7C7C",
+"<  c gray49",
+"1  c #7E7E7E",
+"2  c gray50",
+"3  c #818181",
+"4  c gray51",
+"5  c gray53",
+"6  c #8E8E8E",
+"7  c #909090",
+"8  c #939393",
+"9  c #949394",
+"0  c gray58",
+"q  c #959595",
+"w  c #979797",
+"e  c #999799",
+"r  c #9A999A",
+"t  c gray63",
+"y  c gray66",
+"u  c #A9A9A9",
+"i  c #ACABAB",
+"p  c #ACACAC",
+"a  c #AEAEAE",
+"s  c #B2B2B2",
+"d  c gray71",
+"f  c #B6B6B6",
+"g  c #B7B7B7",
+"h  c #B9B9B9",
+"j  c gray73",
+"k  c #C1C1C1",
+"l  c gray76",
+"z  c #C2C2C3",
+"x  c #C3C3C3",
+"c  c #C6C6C6",
+"v  c gray78",
+"b  c #C8C8C8",
+"n  c #C8C9C8",
+"m  c #C9C8C9",
+"M  c gray79",
+"N  c #CACACA",
+"B  c #CBCCCC",
+"V  c #CCCBCC",
+"C  c gray80",
+"Z  c gray81",
+"A  c #D0CFD0",
+"S  c #D2D2D2",
+"D  c #D2D2D3",
+"F  c #D3D2D2",
+"G  c #D3D2D3",
+"H  c LightGray",
+"J  c gray83",
+"K  c #D5D5D6",
+"L  c gray84",
+"P  c #D7D6D7",
+"I  c #D7D7D7",
+"U  c #D8D8D8",
+"Y  c #DADADA",
+"T  c #DADBDB",
+"R  c #DBDBDA",
+"E  c gray86",
+"W  c gainsboro",
+"Q  c #DDDDDC",
+"!  c #DDDDDD",
+"~  c #DEDDDE",
+"^  c #DEDEDD",
+"/  c gray87",
+"(  c #DFDFDF",
+")  c #DFDFE0",
+"_  c #DFE0E0",
+"`  c gray88",
+"'  c #E0E0E1",
+"]  c #E1E1E1",
+"[  c #E1E2E1",
+"{  c #E2E1E1",
+"}  c #E2E2E2",
+"|  c #E3E2E3",
+" . c gray89",
+".. c #E3E3E4",
+"X. c #E3E4E3",
+"o. c #E3E4E4",
+"O. c #E4E3E3",
+"+. c #E4E3E4",
+"@. c #E4E4E3",
+"#. c #E4E4E4",
+"$. c gray90",
+"%. c #E5E6E6",
+"&. c #E6E6E5",
+"*. c #E6E6E6",
+"=. c #E6E6E7",
+"-. c #E6E7E6",
+";. c #E6E7E7",
+":. c #E7E6E6",
+">. c #E7E7E6",
+",. c #E7E7E7",
+"<. c #E7E7E8",
+"1. c gray91",
+"2. c #E9E9E9",
+"3. c #E9E9EA",
+"4. c #E9EAE9",
+"5. c #E9EAEA",
+"6. c #EAE9E9",
+"7. c #EAE9EA",
+"8. c #EAEAE9",
+"9. c #EAEAEA",
+"0. c gray92",
+"q. c #EBEBEC",
+"w. c #EBECEB",
+"e. c #EBECEC",
+"r. c #ECEBEB",
+"t. c #ECEBEC",
+"y. c #ECECEB",
+"u. c #ECECEC",
+"i. c #ECECED",
+"p. c #ECEDEC",
+"a. c gray93",
+"s. c #EDEDEE",
+"d. c #EEEDEE",
+"f. c #EEEEEE",
+"g. c #EEEEEF",
+"h. c #EEEFEE",
+"j. c #EEEFEF",
+"k. c #EFEEEE",
+"l. c #EFEEEF",
+"z. c #EFEFEE",
+"x. c #EFEFEF",
+"c. c #EFEFF0",
+"v. c gray94",
+"b. c #F0F0F1",
+"n. c #F0F1F0",
+"m. c #F0F1F1",
+"M. c #F1F0F0",
+"N. c #F1F0F1",
+"B. c #F1F1F0",
+"V. c #F1F1F1",
+"C. c gray95",
+"Z. c #F3F3F3",
+"A. c #F4F4F4",
+"S. c gray96",
+"D. c #F6F6F6",
+"F. c gray97",
+"G. c #F8F8F8",
+"H. c #F9F8F8",
+"J. c #F9F9F9",
+"K. c gray100",
+"L. c None",
+/* pixels */
+"L.L.5 e w 8 8 9 9 9 8 8 8 8 9 9 8 8 8 9 9 9 9 w w 5 L.L.",
+"L.e , - = = = = = = = = = = = = = = = = = = = * - , e L.",
+"w , y J 0.0.0.0.0.0.0.0.0.1.0.0.0.1.0.0.0.0.0.0.J y , w ",
+"w y 0.0.0.0.0.y.r.0.0.0.0.0.0.0.0.0.0.r.r.0.0.0.0.0.t w ",
+": J y.r.y.s.y.y.s.0.r.y.r.0.q.r.y.y.s.s.r.0.r.r.q.w.z : ",
+"= s.s.y.y.y.s.y.r.y.s.y.r.r.s.r.y.y.y.y.s.s.y.s.r.0.m = ",
+"= s.s.s.s.s.s.y.s.s.s.1.y.s.s.s.y.s.s.s.s.y.s.s.s.! z = ",
+"= s.s.z.s.s.s.s.s.s.z.x 4 s.s.s.s.h.s.1.s.s.z.s.0.N v = ",
+"= c.c.c.s.c.c.c.z.z.c.z X > c.s.c.c.z.c.z.c.z.s.Y m m = ",
+"= B.c.c.B.B.B.B.B.z.B.v X . 2 B.B.c.c.B.B.c.c.! N N N = ",
+"= B.B.B.B.B.B.B.B.B.B.v O . . 3 B.Z.B.B.B.r.! Z S Z Z = ",
+"= B.Z.Z.B.Z.Z.Z.B.Z.Z.m O . . X 3 s.c.r.( U G G S S F = ",
+"= A.Z.Z.Z.Z.Z.Z.Z.Z.Z.m O . . . & P ! J J J U J J J I = ",
+"= Z.Z.Z.Z.Z.Z.F.0. .! d O . . # s R R ! ( } ! Y Q E Y = ",
+"= Z.D.D.Z.F.c.%.} ! ! h O . # d } ( }  . .%.} ! ! ! ! = ",
+"= D.D.D.Z.s. .} ! } } h . @ s } | %.%.>.%.%.%.} } } } = ",
+"= F.D.F.c.%.}  .| | %.d % a  . .%.>.%.1.=.1. . .| | | = ",
+"= F.D.B.=.%.=.>.%. .%.m h 0.%.%.>.1.=.=.>.>.=.1.%.%.>.= ",
+"= J.D.q.1.0.0.0.0.0.0.0.0.0.0.0.1.r.q.q.0.q.q.0.0.0.0.= ",
+"= J.Z.s.w.s.w.w.r.0.0.s.r.r.q.q.r.r.r.r.0.r.r.q.y.s.s.= ",
+": ) c.s.s.c.h.s.c.s.s.c.s.h.h.h.c.s.c.c.s.c.s.c.s.c.Y : ",
+"w a B.B.z.B.B.B.c.c.B.B.B.B.B.c.B.B.c.c.c.c.B.B.B.B.y w ",
+"8 5 y ! Z.B.B.Z.Z.Z.B.Z.A.B.Z.Z.B.B.B.Z.Z.Z.B.B.Y i 5 8 ",
+"L.0 8 : = = = = = = = = = = = = = = = = = = = = : 6 w L.",
+"L.L.* 6 8 w y v m m m m m m n n m m m n n N m w 6 * L.L."
+};
diff --git a/lib-src/sbsms/resource/PlayDown.xpm b/lib-src/sbsms/resource/PlayDown.xpm
new file mode 100644
index 0000000..f3a9473
--- /dev/null
+++ b/lib-src/sbsms/resource/PlayDown.xpm
@@ -0,0 +1,284 @@
+/* XPM */
+static char *PlayDown_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"28 25 253 2",
+"   c black",
+".  c #010101",
+"X  c #020304",
+"o  c #030304",
+"O  c #030405",
+"+  c #040607",
+"@  c #050607",
+"#  c #050608",
+"$  c #0B1115",
+"%  c #0E171D",
+"&  c #10191E",
+"*  c #161C21",
+"=  c #4C5F74",
+"-  c #54687D",
+";  c #626262",
+":  c gray40",
+">  c #6C6B6C",
+",  c #727272",
+"<  c gray45",
+"1  c #73777D",
+"2  c #74787E",
+"3  c #7C7C7C",
+"4  c #536880",
+"5  c #566A80",
+"6  c #576C81",
+"7  c #5E91BB",
+"8  c #5F96BF",
+"9  c #7E8588",
+"0  c #7F8588",
+"q  c #6196B8",
+"w  c #6097BB",
+"e  c #7085A4",
+"r  c #7B8CA6",
+"t  c #7C8DA6",
+"y  c #7BA0B0",
+"u  c #7CA1B0",
+"i  c #518DDB",
+"p  c #5592DD",
+"a  c #5997DF",
+"s  c #5D93DC",
+"d  c #5D9CE1",
+"f  c #629AC4",
+"g  c #669AC2",
+"h  c #669DC1",
+"j  c #669EC5",
+"k  c #6B93CB",
+"l  c #7D9CC0",
+"z  c #7E9DC0",
+"x  c #659CE0",
+"c  c #69A2C3",
+"v  c #73B0D4",
+"b  c #62A2E3",
+"n  c #66A7E5",
+"m  c #67A7E5",
+"M  c #66A8E5",
+"N  c #67A8E5",
+"B  c #67A8E6",
+"V  c #6BADE7",
+"C  c #6BAEE7",
+"Z  c #6CADE7",
+"A  c #6CAEE7",
+"S  c #74A8E3",
+"D  c #7BA8E3",
+"F  c #7BAFE6",
+"G  c #76B0E7",
+"H  c #72B3E9",
+"J  c #71B4EA",
+"K  c #71B5EA",
+"L  c #72B4EA",
+"P  c #73B6EB",
+"I  c #74B0E8",
+"U  c #74B1E8",
+"Y  c #76B3E8",
+"T  c #76B4E9",
+"R  c #74B8EB",
+"E  c #75B8EB",
+"W  c #77B9EB",
+"Q  c #74B8EC",
+"!  c #75B9EC",
+"~  c #76BAEC",
+"^  c #76BBEC",
+"/  c #77BBED",
+"(  c #7CB1E8",
+")  c #78BBEC",
+"_  c #78BCED",
+"`  c #79BDED",
+"'  c #79BDEE",
+"]  c #79BEEE",
+"[  c #7ABFEE",
+"{  c #7BBFEE",
+"}  c #7BBFEF",
+"|  c #7CBCEC",
+" . c #7CBCED",
+".. c #7AC0EE",
+"X. c #7BC0EE",
+"o. c #7BC0EF",
+"O. c #7CC1EE",
+"+. c #7DC1EF",
+"@. c #7EC2EF",
+"#. c #7EC4F0",
+"$. c #7EC4F1",
+"%. c #7FC4F0",
+"&. c #7FC4F1",
+"*. c #7FC5F0",
+"=. c gray53",
+"-. c #8E8E8E",
+";. c #909090",
+":. c #939393",
+">. c #949394",
+",. c gray58",
+"<. c #959595",
+"1. c #979797",
+"2. c #999799",
+"3. c #9A999A",
+"4. c #87A4B0",
+"5. c gray67",
+"6. c #B2B2B2",
+"7. c #82A1C3",
+"8. c #84A5C5",
+"9. c #88A8C6",
+"0. c #89A9C7",
+"q. c #88A5D1",
+"w. c #8BA9D2",
+"e. c #87BEEC",
+"r. c #8FB2E6",
+"t. c #8EB6E8",
+"y. c #88BAEB",
+"u. c #8EBEEC",
+"i. c #91B3E6",
+"p. c #90B5E7",
+"a. c #91B4E6",
+"s. c #93B7E4",
+"d. c #92B6E7",
+"f. c #92B6E8",
+"g. c #93BAE0",
+"h. c #94B8E8",
+"j. c #95B8E8",
+"k. c #96BBE9",
+"l. c #97BBE9",
+"z. c #98BDEB",
+"x. c #99BDEB",
+"c. c #98BEEA",
+"v. c #98BEEB",
+"b. c #99BEEA",
+"n. c #99BEEB",
+"m. c #99BFEB",
+"M. c #87C4DF",
+"N. c #8BC4EF",
+"B. c #8BC9E2",
+"V. c #82C3F0",
+"C. c #80C5F0",
+"Z. c #81C7F1",
+"A. c #80C7F2",
+"S. c #81C8F2",
+"D. c #83C8F1",
+"F. c #82C9F2",
+"G. c #82C9F3",
+"H. c #83C8F2",
+"J. c #83C9F2",
+"K. c #83C9F3",
+"L. c #83CAF2",
+"P. c #83CAF3",
+"I. c #84C9F2",
+"U. c #84C9F3",
+"Y. c #85CBF2",
+"T. c #84CCF4",
+"R. c #86CDF4",
+"E. c #86CEF4",
+"W. c #87CEF4",
+"Q. c #87CEF5",
+"!. c #87CFF5",
+"~. c #87CFF6",
+"^. c #88CEF5",
+"/. c #88CFF4",
+"(. c #88CFF5",
+"). c #89CFF5",
+"_. c #89D0F4",
+"`. c #89D2F6",
+"'. c #8AD2F6",
+"]. c #8AD3F6",
+"[. c #8BD2F6",
+"{. c #8BD2F7",
+"}. c #8BD3F6",
+"|. c #8FD1F6",
+" X c #8DD6F7",
+".X c #8DD7F7",
+"XX c #8ED6F7",
+"oX c #8DD6F8",
+"OX c #8ED6F8",
+"+X c #8FD9F9",
+"@X c #8FDAF9",
+"#X c #92C5EE",
+"$X c #95C3ED",
+"%X c #97C1EC",
+"&X c #9BC1EB",
+"*X c #9BC1EC",
+"=X c #9CC3ED",
+"-X c #9DC3EC",
+";X c #9DC3ED",
+":X c #9CC4ED",
+">X c #9EC4EC",
+",X c #9EC4ED",
+"<X c #9EC5ED",
+"1X c #9FC5ED",
+"2X c #9FC5EE",
+"3X c #9FC6ED",
+"4X c #9FC7EE",
+"5X c #99CDF2",
+"6X c #9FCEF3",
+"7X c #90D7F8",
+"8X c #90D9F9",
+"9X c #91D9F8",
+"0X c #91D9F9",
+"qX c #90DAF9",
+"wX c #91DAF9",
+"eX c #92DCFA",
+"rX c #93DCFA",
+"tX c #99D0F3",
+"yX c #9CDAF7",
+"uX c #A0C6EE",
+"iX c #A0C7EE",
+"pX c #A1C7EE",
+"aX c #A5CEE2",
+"sX c #A1C8EE",
+"dX c #A2C9EF",
+"fX c #A3CBEF",
+"gX c #A4CAEF",
+"hX c #A4CBEF",
+"jX c #A2CCF1",
+"kX c #A4CBF0",
+"lX c #A6CDF0",
+"zX c #A6CEF1",
+"xX c #A7CEF1",
+"cX c #A0D6F6",
+"vX c #A9D1F2",
+"bX c #AAD1F2",
+"nX c #ACD5F4",
+"mX c #ADD5F4",
+"MX c #ACD6F4",
+"NX c #ABDDF7",
+"BX c #AFD8F5",
+"VX c #AFD9F5",
+"CX c #B2DCF6",
+"ZX c #B2DCF7",
+"AX c #B4DFF8",
+"SX c #B5DFF8",
+"DX c #B6E2F8",
+"FX c #B9E4FA",
+"GX c #C6C6C6",
+"HX c #C8C8C8",
+"JX c gray79",
+"KX c gray100",
+"LX c None",
+/* pixels */
+"LXLX=.2.3.<.:.:.:.:.>.>.>.>.>.>.<.>.>.>.>.>.>.3.2.=.LXLX",
+"LX2.3 > : : : : : : : : : : : : : : : : : : : : > 3 2.LX",
+"<.2 r q.r.r.r.r.i.i.r.r.r.r.r.r.r.r.r.r.r.r.r.r.q.t 1 <.",
+"<.t a.a.a.r.a.a.i.i.i.f.a.a.a.r.a.a.a.a.a.a.a.a.a.a.e <.",
+"< w.f.f.f.a.f.f.s.f.f.f.f.f.a.f.a.f.a.f.f.f.f.f.f.f.k < ",
+": j.j.j.j.j.j.j.j.f.j.j.j.j.j.j.j.s.j.j.j.j.j.j.j.a.s : ",
+": l.l.j.l.l.l.l.l.l.j.s.l.l.l.l.j.b.l.v.l.l.l.j.l.D i : ",
+": m.m.m.&Xv.v.v.m.%Xm.l - v.%Xl.b.v.v.v.v.v.v.v.t.x p : ",
+": *X*X%X*X*X*X%X%X*X-Xy # = m.m.%X*X*X*X*X-X%Xm.S a a : ",
+": 1X1X>X>X>X>X>X>X1X*X7.# X - 2X2X>X*X1X*X1X>XF d d d : ",
+": 1X1XdXpXpXdX>X1X1X1X8.+ . . 5 >X>X1XuXdX$XF b b b b : ",
+": gXgXgXgXxXdXdXdX1XgX0.+ . . X 6 pXuX%Xu.F n m m m m : ",
+": xXxXxXxXxXxXxXfXhXhX0.# . . . * g.$Xy.I A A A C A A : ",
+": bXbXbXbXbXbXbXjX#Xe.g + . . % 7 T T I L L K K K K L : ",
+": nXnXnXnXnX6XN.| | ^ f O . % 8 ~ P P ~ P W ^ ~ ^ ~ ~ : ",
+": BXBXBXBX5XV.[ [ } [ j . $ 8 [ [ W [ ] W [ o.[ [ [ [ : ",
+": ZXZXZX5XV.$.$.$.$.$.h & q $.V.O.[ O.O.O.V.F.$.V.$.$.: ",
+": DXSXyXU.U.F.F.K.K.U.v c F.U.U.F.F.Z.U.Y.^.Q.F.K.A.K.: ",
+": DXNX|.Q.Q.E.E.Q.Q.^.^.Q.^.^.^.^.^.^.].Q.Q.Q.Q.Q.Q.~.: ",
+": FXyX`.].].].].`.|.`.`.].[.].].].[.[.[.].].].].`.`.`.: ",
+"< aX7X XXXXX X X X7X X7X X7X X X7X7X X7XXX X X X XoXB., ",
+"2.4. at X@X+X+X at X+X@X at X7X7X@XrX at X@X at X7X@X at X@X at X@X at X+X+Xy <.",
+";.=.u B.eXeXeXeXrXrXrX at XrXrXeXeXrXrXrXrXeXeXrXrXB.y =.;.",
+"LX,.;., : : : : : : : : : : : : : : : : : : : : , -.>.LX",
+"LXLX; 5.GXHXHXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX6.>.-.; LXLX"
+};
diff --git a/lib-src/sbsms/sbsms.pc.in b/lib-src/sbsms/sbsms.pc.in
new file mode 100644
index 0000000..fa30ba1
--- /dev/null
+++ b/lib-src/sbsms/sbsms.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: sbsms
+Description: C++ library for subband sinusoidal modeling time stretching and pitch scaling
+Version: @VERSION@
+Libs: -L${libdir} -lsbsms
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/lib-src/sbsms/src/Makefile.am b/lib-src/sbsms/src/Makefile.am
new file mode 100644
index 0000000..8490a21
--- /dev/null
+++ b/lib-src/sbsms/src/Makefile.am
@@ -0,0 +1,68 @@
+AM_CXXFLAGS = -funroll-loops -I../include -fstrict-aliasing $(SNDFILE_CFLAGS) $(PORTAUDIO_CFLAGS) $(WX_CFLAGS)
+
+libsbsmsincludedir = $(includedir)
+libsbsmsinclude_HEADERS = ../include/sbsms.h
+
+lib_LTLIBRARIES = libsbsms.la
+libsbsms_la_SOURCES = pitch.cpp peak.cpp sms.cpp track.cpp trackpoint.cpp utils.cpp audio.cpp resample.cpp sbsms.cpp fft.cpp grain.cpp buffer.cpp subband.cpp audio.h buffer.h fft.h utils.h defs.h peak.h trackpoint.h grain.h pitch.h real.h resample.h ../include/sbsms.h sms.h subband.h track.h
+
+libsbsms_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
+
+bin_PROGRAMS = @SBSMS_PROGS@
+EXTRA_PROGRAMS = sbsms sbsmsplay wxsbsmsplayer
+
+sbsms_LDADD = libsbsms.la $(SNDFILE_LIBS) $(MAD_LIBS)
+sbsms_LDFLAGS = $(os_ldflags)
+
+if ENABLE_PORTAUDIO
+sbsmsplay_LDADD = libsbsms.la $(PORTAUDIO_LIBS)
+sbsmsplay_LDFLAGS = $(os_ldflags)
+sbsmsplay_SOURCES = testplay.cpp play.cpp play.h audiobuffer.cpp audiobuffer.h
+endif
+
+if ENABLE_PORTAUDIO
+if ENABLE_WX
+wxsbsmsplayer_LDADD = libsbsms.la $(PORTAUDIO_LIBS) $(SNDFILE_LIBS) $(MAD_LIBS) $(WX_LIBS)
+wxsbsmsplayer_LDFLAGS = $(os_ldflags) $(PORTAUDIO_CFLAGS) $(SNDFILE_CFLAGS)
+endif
+endif
+
+if ENABLE_SNDFILE
+if ENABLE_MP3
+sbsms_SOURCES = test.cpp mp3.cpp mp3.h mp3tech.cpp mp3tech.h audiobuffer.cpp audiobuffer.h import.cpp import.h pcm.cpp pcm.h convert.cpp convert.h
+else
+sbsms_SOURCES = test.cpp import.cpp import.h pcm.cpp pcm.h convert.cpp convert.h
+endif
+else
+sbsms_SOURCES = test.cpp convert.cpp convert.h
+endif
+
+if ENABLE_SNDFILE
+if ENABLE_MP3
+wxsbsmsplayer_SOURCES = wxplayer.cpp wxplayer.h wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp convert.h mp3.cpp mp3.h mp3tech.cpp mp3tech.h import.cpp import.h pcm.cpp pcm.h audiobuffer.cpp audiobuffer.h
+else
+wxsbsmsplayer_SOURCES = wxplayer.cpp wxplayer.h wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp convert.h import.cpp import.h pcm.cpp pcm.h audiobuffer.cpp audiobuffer.h
+endif
+else
+wxsbsmsplayer_SOURCES = wxplayer.cpp wxplayer.h wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp convert.h audiobuffer.cpp audiobuffer.h
+endif
+
+if ENABLE_WX
+if ENABLE_PORTAUDIO
+if MACOSX
+clean: cleanapproot clean-am
+cleanapproot:
+	sudo rm -rf $(top_builddir)/approot
+all: $(top_builddir)/approot/Applications/wxsbsmsplayer.app $(top_builddir)/mac/Info.plist $(top_builddir)/mac/sbsms.icns
+$(top_builddir)/approot/Applications/wxsbsmsplayer.app: wxsbsmsplayer
+	sudo strip -u -r wxsbsmsplayer
+	sudo mkdir -p $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/MacOS
+	sudo mkdir -p $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/Resources
+	sudo cp -f wxsbsmsplayer $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/MacOS/wxsbsmsplayer
+	sudo cp -f $(top_builddir)/mac/Info.plist $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents
+	sudo cp -f $(top_builddir)/mac/sbsms.icns $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/Resources
+	sudo sh -c "echo sbsms > $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/PkgInfo"
+	sudo chown -R root:admin $(top_builddir)/approot/Applications
+endif
+endif
+endif
diff --git a/lib-src/sbsms/src/Makefile.in b/lib-src/sbsms/src/Makefile.in
new file mode 100644
index 0000000..c09113f
--- /dev/null
+++ b/lib-src/sbsms/src/Makefile.in
@@ -0,0 +1,734 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+EXTRA_PROGRAMS = sbsms$(EXEEXT) sbsmsplay$(EXEEXT) \
+	wxsbsmsplayer$(EXEEXT)
+subdir = src
+DIST_COMMON = $(libsbsmsinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
+	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(libsbsmsincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libsbsms_la_LIBADD =
+am_libsbsms_la_OBJECTS = pitch.lo peak.lo sms.lo track.lo \
+	trackpoint.lo utils.lo audio.lo resample.lo sbsms.lo fft.lo \
+	grain.lo buffer.lo subband.lo
+libsbsms_la_OBJECTS = $(am_libsbsms_la_OBJECTS)
+libsbsms_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libsbsms_la_LDFLAGS) $(LDFLAGS) -o $@
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am__sbsms_SOURCES_DIST = test.cpp import.cpp import.h pcm.cpp pcm.h \
+	convert.cpp convert.h mp3.cpp mp3.h mp3tech.cpp mp3tech.h \
+	audiobuffer.cpp audiobuffer.h
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE at am_sbsms_OBJECTS =  \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	test.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	import.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	pcm.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	convert.$(OBJEXT)
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE at am_sbsms_OBJECTS =  \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	test.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	mp3.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	mp3tech.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	audiobuffer.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	import.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	pcm.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	convert.$(OBJEXT)
+ at ENABLE_SNDFILE_FALSE@am_sbsms_OBJECTS = test.$(OBJEXT) \
+ at ENABLE_SNDFILE_FALSE@	convert.$(OBJEXT)
+sbsms_OBJECTS = $(am_sbsms_OBJECTS)
+am__DEPENDENCIES_1 =
+sbsms_DEPENDENCIES = libsbsms.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+sbsms_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+	$(sbsms_LDFLAGS) $(LDFLAGS) -o $@
+am__sbsmsplay_SOURCES_DIST = testplay.cpp play.cpp play.h \
+	audiobuffer.cpp audiobuffer.h
+ at ENABLE_PORTAUDIO_TRUE@am_sbsmsplay_OBJECTS = testplay.$(OBJEXT) \
+ at ENABLE_PORTAUDIO_TRUE@	play.$(OBJEXT) audiobuffer.$(OBJEXT)
+sbsmsplay_OBJECTS = $(am_sbsmsplay_OBJECTS)
+ at ENABLE_PORTAUDIO_TRUE@sbsmsplay_DEPENDENCIES = libsbsms.la \
+ at ENABLE_PORTAUDIO_TRUE@	$(am__DEPENDENCIES_1)
+sbsmsplay_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(sbsmsplay_LDFLAGS) $(LDFLAGS) -o $@
+am__wxsbsmsplayer_SOURCES_DIST = wxplayer.cpp wxplayer.h \
+	wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h \
+	wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp \
+	convert.h import.cpp import.h pcm.cpp pcm.h audiobuffer.cpp \
+	audiobuffer.h mp3.cpp mp3.h mp3tech.cpp mp3tech.h
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE at am_wxsbsmsplayer_OBJECTS =  \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	wxplayer.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	wxplayerframe.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	wxplayctrl.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	wxconvertdlg.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	play.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	convert.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	import.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	pcm.$(OBJEXT) \
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE@	audiobuffer.$(OBJEXT)
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE at am_wxsbsmsplayer_OBJECTS =  \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	wxplayer.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	wxplayerframe.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	wxplayctrl.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	wxconvertdlg.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	play.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	convert.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	mp3.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	mp3tech.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	import.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	pcm.$(OBJEXT) \
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE@	audiobuffer.$(OBJEXT)
+ at ENABLE_SNDFILE_FALSE@am_wxsbsmsplayer_OBJECTS = wxplayer.$(OBJEXT) \
+ at ENABLE_SNDFILE_FALSE@	wxplayerframe.$(OBJEXT) \
+ at ENABLE_SNDFILE_FALSE@	wxplayctrl.$(OBJEXT) \
+ at ENABLE_SNDFILE_FALSE@	wxconvertdlg.$(OBJEXT) play.$(OBJEXT) \
+ at ENABLE_SNDFILE_FALSE@	convert.$(OBJEXT) audiobuffer.$(OBJEXT)
+wxsbsmsplayer_OBJECTS = $(am_wxsbsmsplayer_OBJECTS)
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE at wxsbsmsplayer_DEPENDENCIES =  \
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@	libsbsms.la \
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@	$(am__DEPENDENCIES_1) \
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@	$(am__DEPENDENCIES_1) \
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@	$(am__DEPENDENCIES_1) \
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@	$(am__DEPENDENCIES_1)
+wxsbsmsplayer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(wxsbsmsplayer_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libsbsms_la_SOURCES) $(sbsms_SOURCES) $(sbsmsplay_SOURCES) \
+	$(wxsbsmsplayer_SOURCES)
+DIST_SOURCES = $(libsbsms_la_SOURCES) $(am__sbsms_SOURCES_DIST) \
+	$(am__sbsmsplay_SOURCES_DIST) \
+	$(am__wxsbsmsplayer_SOURCES_DIST)
+libsbsmsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libsbsmsinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
+RANLIB = @RANLIB@
+SBSMS_BIN = @SBSMS_BIN@
+SBSMS_PROGS = @SBSMS_PROGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
+SHELL = @SHELL@
+SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WX_CFLAGS = @WX_CFLAGS@
+WX_CONFIG = @WX_CONFIG@
+WX_LIBS = @WX_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CXXFLAGS = -funroll-loops -I../include -fstrict-aliasing $(SNDFILE_CFLAGS) $(PORTAUDIO_CFLAGS) $(WX_CFLAGS)
+libsbsmsincludedir = $(includedir)
+libsbsmsinclude_HEADERS = ../include/sbsms.h
+lib_LTLIBRARIES = libsbsms.la
+libsbsms_la_SOURCES = pitch.cpp peak.cpp sms.cpp track.cpp trackpoint.cpp utils.cpp audio.cpp resample.cpp sbsms.cpp fft.cpp grain.cpp buffer.cpp subband.cpp audio.h buffer.h fft.h utils.h defs.h peak.h trackpoint.h grain.h pitch.h real.h resample.h ../include/sbsms.h sms.h subband.h track.h
+libsbsms_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
+bin_PROGRAMS = @SBSMS_PROGS@
+sbsms_LDADD = libsbsms.la $(SNDFILE_LIBS) $(MAD_LIBS)
+sbsms_LDFLAGS = $(os_ldflags)
+ at ENABLE_PORTAUDIO_TRUE@sbsmsplay_LDADD = libsbsms.la $(PORTAUDIO_LIBS)
+ at ENABLE_PORTAUDIO_TRUE@sbsmsplay_LDFLAGS = $(os_ldflags)
+ at ENABLE_PORTAUDIO_TRUE@sbsmsplay_SOURCES = testplay.cpp play.cpp play.h audiobuffer.cpp audiobuffer.h
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE at wxsbsmsplayer_LDADD = libsbsms.la $(PORTAUDIO_LIBS) $(SNDFILE_LIBS) $(MAD_LIBS) $(WX_LIBS)
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE at wxsbsmsplayer_LDFLAGS = $(os_ldflags) $(PORTAUDIO_CFLAGS) $(SNDFILE_CFLAGS)
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE at sbsms_SOURCES = test.cpp import.cpp import.h pcm.cpp pcm.h convert.cpp convert.h
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE at sbsms_SOURCES = test.cpp mp3.cpp mp3.h mp3tech.cpp mp3tech.h audiobuffer.cpp audiobuffer.h import.cpp import.h pcm.cpp pcm.h convert.cpp convert.h
+ at ENABLE_SNDFILE_FALSE@sbsms_SOURCES = test.cpp convert.cpp convert.h
+ at ENABLE_MP3_FALSE@@ENABLE_SNDFILE_TRUE at wxsbsmsplayer_SOURCES = wxplayer.cpp wxplayer.h wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp convert.h import.cpp import.h pcm.cpp pcm.h audiobuffer.cpp audiobuffer.h
+ at ENABLE_MP3_TRUE@@ENABLE_SNDFILE_TRUE at wxsbsmsplayer_SOURCES = wxplayer.cpp wxplayer.h wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp convert.h mp3.cpp mp3.h mp3tech.cpp mp3tech.h import.cpp import.h pcm.cpp pcm.h audiobuffer.cpp audiobuffer.h
+ at ENABLE_SNDFILE_FALSE@wxsbsmsplayer_SOURCES = wxplayer.cpp wxplayer.h wxplayerframe.cpp wxplayerframe.h wxplayctrl.cpp wxplayctrl.h wxconvertdlg.cpp wxconvertdlg.h play.cpp play.h convert.cpp convert.h audiobuffer.cpp audiobuffer.h
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libsbsms.la: $(libsbsms_la_OBJECTS) $(libsbsms_la_DEPENDENCIES) 
+	$(libsbsms_la_LINK) -rpath $(libdir) $(libsbsms_la_OBJECTS) $(libsbsms_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+sbsms$(EXEEXT): $(sbsms_OBJECTS) $(sbsms_DEPENDENCIES) 
+	@rm -f sbsms$(EXEEXT)
+	$(sbsms_LINK) $(sbsms_OBJECTS) $(sbsms_LDADD) $(LIBS)
+sbsmsplay$(EXEEXT): $(sbsmsplay_OBJECTS) $(sbsmsplay_DEPENDENCIES) 
+	@rm -f sbsmsplay$(EXEEXT)
+	$(sbsmsplay_LINK) $(sbsmsplay_OBJECTS) $(sbsmsplay_LDADD) $(LIBS)
+wxsbsmsplayer$(EXEEXT): $(wxsbsmsplayer_OBJECTS) $(wxsbsmsplayer_DEPENDENCIES) 
+	@rm -f wxsbsmsplayer$(EXEEXT)
+	$(wxsbsmsplayer_LINK) $(wxsbsmsplayer_OBJECTS) $(wxsbsmsplayer_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audio.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audiobuffer.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/buffer.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/convert.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fft.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grain.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/import.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp3.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp3tech.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/peak.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pitch.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/play.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/resample.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sbsms.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sms.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/subband.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testplay.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/track.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trackpoint.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wxconvertdlg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wxplayctrl.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wxplayer.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wxplayerframe.Po at am__quote@
+
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libsbsmsincludeHEADERS: $(libsbsmsinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libsbsmsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libsbsmsincludedir)"
+	@list='$(libsbsmsinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libsbsmsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libsbsmsincludedir)/$$f'"; \
+	  $(libsbsmsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libsbsmsincludedir)/$$f"; \
+	done
+
+uninstall-libsbsmsincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libsbsmsinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libsbsmsincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libsbsmsincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libsbsmsincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+ at ENABLE_PORTAUDIO_FALSE@clean: clean-am
+
+ at ENABLE_WX_FALSE@clean: clean-am
+
+ at MACOSX_FALSE@clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libsbsmsincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-libsbsmsincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-libsbsmsincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-libLTLIBRARIES uninstall-libsbsmsincludeHEADERS
+
+
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE at clean: cleanapproot clean-am
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE at cleanapproot:
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo rm -rf $(top_builddir)/approot
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE at all: $(top_builddir)/approot/Applications/wxsbsmsplayer.app $(top_builddir)/mac/Info.plist $(top_builddir)/mac/sbsms.icns
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@$(top_builddir)/approot/Applications/wxsbsmsplayer.app: wxsbsmsplayer
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo strip -u -r wxsbsmsplayer
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo mkdir -p $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/MacOS
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo mkdir -p $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/Resources
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo cp -f wxsbsmsplayer $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/MacOS/wxsbsmsplayer
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo cp -f $(top_builddir)/mac/Info.plist $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo cp -f $(top_builddir)/mac/sbsms.icns $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/Resources
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo sh -c "echo sbsms > $(top_builddir)/approot/Applications/wxsbsmsplayer.app/Contents/PkgInfo"
+ at ENABLE_PORTAUDIO_TRUE@@ENABLE_WX_TRUE@@MACOSX_TRUE@	sudo chown -R root:admin $(top_builddir)/approot/Applications
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib-src/sbsms/src/audio.cpp b/lib-src/sbsms/src/audio.cpp
new file mode 100644
index 0000000..f72d9f3
--- /dev/null
+++ b/lib-src/sbsms/src/audio.cpp
@@ -0,0 +1,41 @@
+#include <stdlib.h>
+#include <string.h>
+#include "audio.h"
+
+namespace _sbsms_ {
+
+audio *make_audio_buf(long n) {
+  return (audio*)calloc(n,sizeof(audio));
+}
+
+void free_audio_buf(audio *buf) {
+  free(buf);
+}
+
+long copy_audio_buf(audio *to, long off1, audio *from, long off2, long n)
+{
+  memcpy(to+off1,from+off2,n*sizeof(audio));
+  return n;
+}
+
+long audio_convert_from(float *to, long off1, audio *from, long off2, long n)
+{
+  for(int k=0;k<n;k++) {
+    int k2 = (k+off1)<<1;
+    to[k2] = (float)from[k+off2][0];
+    to[k2+1] = (float)from[k+off2][1];
+  }
+  return n;
+}
+
+long audio_convert_to(audio *to, long off1, float *from, long off2, long n)
+{
+  for(int k=0;k<n;k++) {
+    int k2 = (k+off2)<<1;
+    to[k+off1][0] = (real)from[k2];
+    to[k+off1][1] = (real)from[k2+1];
+  }
+  return n;
+}
+
+}
\ No newline at end of file
diff --git a/lib-src/sbsms/src/audio.h b/lib-src/sbsms/src/audio.h
new file mode 100644
index 0000000..34633e4
--- /dev/null
+++ b/lib-src/sbsms/src/audio.h
@@ -0,0 +1,16 @@
+#ifndef SBSMS_AUDIO_H
+#define SBSMS_AUDIO_H
+
+#include "sbsms.h"
+
+namespace _sbsms_ {
+
+audio *make_audio_buf(long);
+void free_audio_buf(audio *);
+long copy_audio_buf(audio *, long off1, audio *, long off2, long n);
+long audio_convert_from(float *to, long off1, audio *from, long off2, long n);
+long audio_convert_to(audio *to, long off1, float *from, long off2, long n);
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/audiobuffer.cpp b/lib-src/sbsms/src/audiobuffer.cpp
new file mode 100644
index 0000000..ae7e41c
--- /dev/null
+++ b/lib-src/sbsms/src/audiobuffer.cpp
@@ -0,0 +1,209 @@
+#include <stdlib.h>
+#include "audiobuffer.h"
+#include "audio.h"
+#include "sbsms.h"
+#include <pthread.h>
+#include <string.h>
+#include "utils.h"
+
+namespace _sbsms_ {
+
+void AudioBuffer :: copy(float *out, long outOffset, float *in, long inOffset, long n)
+{
+  if(channels==1)
+    memcpy(out+outOffset,in+inOffset,n*sizeof(float));
+  else if(channels==2)
+    memcpy(out+(outOffset<<1),in+(inOffset<<1),(n<<1)*sizeof(float));
+}
+
+AudioBuffer :: AudioBuffer(long size, int channels)
+{
+  pthread_cond_init(&importWriteCondition, NULL);
+  pthread_mutex_init(&importWriteMutex, NULL);
+  pthread_cond_init(&importReadCondition, NULL);
+  pthread_mutex_init(&importReadMutex, NULL);
+  pthread_mutex_init(&importMutex, NULL);
+  
+  shareBufStart = 0;
+  shareBufEnd = 0;
+  readBlockSize = 0;
+  
+  n_done = 0;
+  bWritingComplete = false;
+  this->channels = channels;
+  shareBuf = new float[channels*size];
+  shareBufSize = size;
+  halfShareBufSize = size/2;
+  importWriteReady = true;
+  importReadReady = false;
+}
+
+AudioBuffer :: ~AudioBuffer()
+{
+  delete [] shareBuf;
+  pthread_cond_destroy(&importWriteCondition);
+  pthread_mutex_destroy(&importWriteMutex);
+  pthread_cond_destroy(&importReadCondition);
+  pthread_mutex_destroy(&importReadMutex);
+  pthread_mutex_destroy(&importMutex);
+}
+
+long AudioBuffer :: read(float *outputBuffer, long block_size) 
+{
+  long n_toread = block_size;
+  long n_done_now = 0;
+
+  if(pthread_mutex_lock(&importReadMutex) == 0) {
+    readBlockSize = block_size;
+    if(pthread_mutex_lock(&importMutex) == 0) {
+      importReadReady = isReadReady();
+      pthread_mutex_unlock(&importMutex);
+    }
+    while(!importReadReady) {
+      pthread_cond_wait(&importReadCondition, &importReadMutex);
+    }
+    readBlockSize = 0;
+    pthread_mutex_unlock(&importReadMutex);
+  }
+
+  if(pthread_mutex_lock(&importMutex) == 0) {
+    if(shareBufStart <= shareBufEnd) {
+      n_toread = min(n_toread, shareBufEnd-shareBufStart);
+      copy(outputBuffer,0,shareBuf,shareBufStart,n_toread);
+      n_done_now += n_toread;
+    } else {
+      n_toread = min(n_toread, shareBufSize-shareBufStart);
+      copy(outputBuffer,0,shareBuf,shareBufStart,n_toread);
+      n_done_now += n_toread;
+      n_toread = block_size - n_done_now;
+      n_toread = min(n_toread, shareBufEnd);
+      copy(outputBuffer,n_done_now,shareBuf,0,n_toread);
+      n_done_now += n_toread;
+    }
+
+    shareBufStart += n_done_now;  
+    shareBufStart %= shareBufSize;
+
+    importWriteReady = isWriteReady();
+    if(importWriteReady) {
+      pthread_cond_broadcast(&importWriteCondition);
+    }
+
+    pthread_mutex_unlock(&importMutex);
+  }
+
+  n_done += n_done_now;
+  return n_done_now;  
+}
+
+void AudioBuffer :: writingComplete()
+{
+  if(pthread_mutex_lock(&importMutex) == 0) {
+    bWritingComplete = true;
+    importReadReady = isReadReady();
+    if(importReadReady) {
+      pthread_cond_broadcast(&importReadCondition);
+    }
+    pthread_mutex_unlock(&importMutex);
+  }
+}
+
+void AudioBuffer :: flush()
+{
+  if(pthread_mutex_lock(&importMutex) == 0) {
+    shareBufStart = 0;
+    shareBufEnd = 0;
+    readBlockSize = 0;
+    bWritingComplete = false;
+    pthread_mutex_unlock(&importMutex);
+  }
+}
+
+long AudioBuffer :: n_readable()
+{
+  long n = 0;
+  if(pthread_mutex_lock(&importMutex) == 0) {
+    if(shareBufStart <= shareBufEnd) 
+      n = (shareBufEnd-shareBufStart);
+    else
+      n = (shareBufSize-shareBufStart + shareBufEnd);
+    pthread_mutex_unlock(&importMutex);
+  }
+  return n;
+}
+
+bool AudioBuffer :: isReadReady()
+{
+  if(bWritingComplete)
+    return true;
+  if(shareBufStart <= shareBufEnd) 
+    return (shareBufEnd-shareBufStart >= readBlockSize);
+  else
+    return (shareBufSize-shareBufStart + shareBufEnd >= readBlockSize);
+}
+
+bool AudioBuffer :: isWriteReady() 
+{
+  bool importWriteReady;
+  if(shareBufStart <= shareBufEnd) {
+    importWriteReady = (shareBufEnd-shareBufStart < halfShareBufSize);
+  } else {
+    importWriteReady = (shareBufStart-shareBufEnd >= halfShareBufSize);
+  }
+  return importWriteReady;
+}
+
+bool AudioBuffer :: isFull()
+{
+  bool bFull = false;
+  if(pthread_mutex_lock(&importMutex) == 0) {
+    bFull = !isWriteReady();
+    pthread_mutex_unlock(&importMutex);
+  }  
+  return bFull;
+}
+
+long AudioBuffer :: write(float *buf, long n)
+{
+  if(n>=halfShareBufSize) {
+    abort();
+  }
+
+  if(pthread_mutex_lock(&importWriteMutex) == 0) {
+    if(pthread_mutex_lock(&importMutex) == 0) {
+      importWriteReady = isWriteReady();
+      pthread_mutex_unlock(&importMutex);
+    }
+    while(!importWriteReady) {
+      pthread_cond_wait(&importWriteCondition, &importWriteMutex);
+    }
+    pthread_mutex_unlock(&importWriteMutex);
+  }
+
+  long n_written=0, n_towrite=0;
+  if(pthread_mutex_lock(&importMutex) == 0) {
+    n_towrite = min(n,shareBufSize-shareBufEnd);
+    copy(shareBuf,shareBufEnd,buf,n_written,n_towrite);
+    shareBufEnd += n_towrite;
+    n_written = n_towrite;
+    n_towrite = n - n_written;
+
+    if(n_towrite) {
+      shareBufEnd = 0;
+      copy(shareBuf,shareBufEnd,buf,n_written,n_towrite);
+      shareBufEnd += n_towrite;
+      n_written += n_towrite;
+    }
+
+    shareBufEnd %= shareBufSize;
+    importReadReady = isReadReady();
+    if(importReadReady) {
+      pthread_cond_broadcast(&importReadCondition);
+    }
+    pthread_mutex_unlock(&importMutex);
+  }
+  
+  return n_written;
+}
+
+}
diff --git a/lib-src/sbsms/src/audiobuffer.h b/lib-src/sbsms/src/audiobuffer.h
new file mode 100644
index 0000000..9fde86b
--- /dev/null
+++ b/lib-src/sbsms/src/audiobuffer.h
@@ -0,0 +1,46 @@
+#ifndef RINGBUFFER_H
+#define RINGBUFFER_H
+
+#include <pthread.h>
+
+namespace _sbsms_ {
+
+class AudioBuffer {
+
+ public:
+  AudioBuffer(long size, int channels);
+  ~AudioBuffer();
+
+  long n_readable();
+  long read(float *outputBuffer, long block_size);
+  long write(float *buf, long n);
+  void writingComplete();
+  void flush();
+  bool isFull();
+
+ protected:
+  bool isWriteReady();
+  bool isReadReady();
+  void copy(float *out, long outOffset, float *in, long inOffset, long n);
+  pthread_cond_t importWriteCondition;
+  pthread_mutex_t importWriteMutex;
+  pthread_cond_t importReadCondition;
+  pthread_mutex_t importReadMutex;
+  pthread_mutex_t importMutex;
+  bool importWriteReady;
+  bool importReadReady;
+  bool bWritingComplete;
+
+  int channels;
+  float *shareBuf;
+  long readBlockSize;
+  long shareBufStart;
+  long shareBufEnd;
+  long shareBufSize;
+  long halfShareBufSize;
+  long n_done;
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/btndown.cpp b/lib-src/sbsms/src/btndown.cpp
new file mode 100644
index 0000000..f618822
--- /dev/null
+++ b/lib-src/sbsms/src/btndown.cpp
@@ -0,0 +1,31 @@
+#include "BtnDown.h"
+
+//-------------------//
+//--- CBtnDownEvt ---//
+//-------------------//
+BEGIN_EVENT_TABLE(CBtnDownEvt, wxEvtHandler)
+  EVT_LEFT_DOWN	(CBtnDownEvt::OnLeftDown) 
+  EVT_LEFT_UP		(CBtnDownEvt::OnLeftUp)
+  EVT_MOTION		(CBtnDownEvt::OnMouseMove)
+END_EVENT_TABLE()
+
+void CBtnDownEvt::OnLeftDown( wxMouseEvent& event )
+{
+  pParent->SetBitmapLabel( *pBtnDown );
+  pParent->Refresh();
+  event.Skip();
+}
+
+void CBtnDownEvt::OnLeftUp( wxMouseEvent& event )
+{
+  pParent->SetBitmapLabel( *pBtnUp );
+  pParent->Refresh();
+  event.Skip();
+}
+
+void CBtnDownEvt::OnMouseMove( wxMouseEvent& event )
+{
+  if ( event.LeftIsDown() )
+    pParent->SetBitmapLabel( *pBtnUp );
+  event.Skip();
+}
diff --git a/lib-src/sbsms/src/btndown.h b/lib-src/sbsms/src/btndown.h
new file mode 100644
index 0000000..7a72609
--- /dev/null
+++ b/lib-src/sbsms/src/btndown.h
@@ -0,0 +1,23 @@
+#ifndef MUSIK_BTNDOWN_EVT
+#define MUSIK_BTNDOWN_EVT
+
+#include "wx/wx.h"
+
+class CBtnDownEvt : public wxEvtHandler
+{
+ public:
+  CBtnDownEvt( wxBitmapButton *parent, wxBitmap *down, wxBitmap *up ){ pParent = parent; pBtnDown = down; pBtnUp = up; };
+  ~CBtnDownEvt(){};
+  
+  void OnLeftDown	( wxMouseEvent& event );
+  void OnLeftUp	( wxMouseEvent& event );
+  void OnMouseMove( wxMouseEvent& event );
+  void OnEraseBackground(wxEraseEvent& ) {}
+  DECLARE_EVENT_TABLE()
+    private:
+  wxBitmapButton	*pParent;
+  wxBitmap		*pBtnDown;
+  wxBitmap		*pBtnUp;
+};
+
+#endif
diff --git a/lib-src/sbsms/src/buffer.cpp b/lib-src/sbsms/src/buffer.cpp
new file mode 100644
index 0000000..babadd4
--- /dev/null
+++ b/lib-src/sbsms/src/buffer.cpp
@@ -0,0 +1,347 @@
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "buffer.h"
+#include "sbsms.h"
+
+namespace _sbsms_ {
+
+#define INIT_SAMPLEBUF_LENGTH 65536
+#define INIT_GRAINBUF_LENGTH 128
+#define INIT_TPLBUF_LENGTH 128
+
+/****************
+
+ SampleBuf
+
+****************/
+
+SampleBuf :: SampleBuf(int N) 
+{
+  init(N,0);
+}
+
+SampleBuf :: SampleBuf(int N, long delay) 
+{
+  init(N,delay);
+}
+
+void SampleBuf :: init(int N, long delay)
+{
+  this->delay = delay;
+  this->N = N;
+  this->length = INIT_SAMPLEBUF_LENGTH;
+  this->buf = make_audio_buf(2*length);
+  this->readPos = 0;
+  this->writePos = 0;
+}
+
+SampleBuf :: ~SampleBuf() 
+{
+  free_audio_buf(buf);
+}
+
+long SampleBuf :: write(audio *in, long n)
+{
+  if(n==0) {
+    return 0;
+  }
+  grow(n);
+  memcpy(buf+writePos,in,n*sizeof(audio));
+  writePos += n;
+  return n;
+}
+
+void SampleBuf :: grow(long n)
+{
+  long pos = writePos+n;
+  while(pos >= 2*length) {
+    length *= 2;
+    audio *newBuf = make_audio_buf(2*length);
+    memcpy(newBuf,buf+readPos,(length-readPos)*sizeof(audio));
+    free_audio_buf(buf);
+    buf = newBuf;
+    writePos -= readPos;
+    pos -= readPos;
+    readPos = 0;
+  }
+}
+
+long SampleBuf :: write(grain *g, int h)
+{
+  grow(g->N);
+  g->synthesize();
+  real f = 2.0/(real)(N/h) * 4.0/3.0;
+  
+  for(int c=0;c<2;c++) {
+    int j = 0;
+    for(int k=writePos; k<writePos+g->N; k++) {
+      buf[k][c] += g->time[j++][c] * f;
+    }
+  }
+  writePos += h;
+  return h;
+}
+
+long SampleBuf :: read(audio *outBuf, long n)
+{
+  if(n==0)
+    return 0;
+  assert(writePos < 2*length);
+  n = min(n,n_readable());
+  n = max(n,(long)0);
+  memcpy(outBuf,buf+readPos,n*sizeof(audio));
+  return n;
+}
+
+long SampleBuf :: n_readable()
+{
+  return max(writePos-delay - readPos,(long)0);
+}
+
+void SampleBuf :: advance(long n) {
+  assert(readPos+n <= writePos);
+  memset(buf+readPos,0,n*sizeof(audio));
+  readPos += n;
+  if(readPos >= length) {
+    long endPos;
+    if(N==0)
+      endPos = 2*length;
+    else 
+      endPos = min(2*length,writePos+N);
+    memcpy(buf,buf+readPos,(endPos-readPos)*sizeof(audio));
+    memset(buf+readPos,0,(endPos-readPos)*sizeof(audio));
+    writePos -= readPos;
+    readPos = 0;
+  }
+}
+
+audio *SampleBuf :: getReadBuf() 
+{
+  return (buf+readPos);
+}
+
+void SampleBuf :: clear()
+{
+  advance(writePos-readPos);
+}
+
+/****************
+
+ GrainBuf
+
+****************/
+
+GrainBuf :: GrainBuf(int N, int h) 
+{
+  init(N,h,1,SBSMS_HANN);
+}
+
+GrainBuf :: GrainBuf(int N, int h, real pad, int wintype) 
+{
+  init(N,h,pad,wintype);
+}
+
+void GrainBuf :: init(int N, int h, real pad, int wintype)
+{
+  this->length = INIT_GRAINBUF_LENGTH;
+  this->buf = (grain**) calloc(2*length,sizeof(grain*));
+  this->iBuf = (audio*) calloc(N,sizeof(audio));
+  
+  this->wintype = wintype;
+  this->pad = pad;
+  this->N = N;
+  this->h = h;
+  this->iBufWritePos = 0;
+  this->readPos = 0;
+  this->writePos = 0;
+  
+}
+
+GrainBuf :: ~GrainBuf() 
+{
+  clear();
+  free(buf);
+  free_audio_buf(iBuf);
+}
+
+long GrainBuf :: write(audio *buf2, long n)
+{
+  if(n==0) {
+    return 0;
+  }
+  long ng = 0;
+  int overlap = N - h;
+  long bufReadPos = 0;
+
+  while(bufReadPos<n) {
+    long nToCopy = min((n-bufReadPos),N-iBufWritePos);
+    memcpy(iBuf+iBufWritePos, buf2+bufReadPos, nToCopy*sizeof(audio));
+
+    if(nToCopy+iBufWritePos == N) {
+      convert(iBuf);
+      ng++;
+      memcpy(iBuf,iBuf+h,overlap*sizeof(audio));
+      iBufWritePos = overlap;
+      bufReadPos += nToCopy;
+    } else break;
+  }
+
+  // copy the remainder to the iBuf
+  long nToCopy = min((n-bufReadPos),N-iBufWritePos);
+  memcpy(iBuf+iBufWritePos, buf2+bufReadPos, nToCopy*sizeof(audio));
+  iBufWritePos += nToCopy;
+    
+  return ng;
+}
+
+void GrainBuf :: convert(audio *timebuf) 
+{
+  grain *g = grain::create(N,pad,wintype);
+  memcpy(g->time,timebuf,N*sizeof(audio));
+  g->analyze();
+  g->h = h;
+  write(g);
+}
+
+void GrainBuf :: advance(long n)
+{
+  assert(readPos+n <= writePos);
+  for(int k=readPos;k<readPos+n;k++) {
+    grain :: forget(buf[k]);
+  }
+  readPos += n;
+
+  //grain::count-=n;
+  if(readPos >= length) {
+    memcpy(buf,buf+readPos,(writePos-readPos)*sizeof(grain*));
+    writePos = writePos - readPos;
+    readPos = 0;
+  }
+}
+
+grain* GrainBuf :: read(long k) 
+{
+  return buf[k];
+}
+
+void GrainBuf :: write(grain *g) 
+{
+  if(writePos >= 2*length) {
+    length *= 2;
+    grain **newBuf = (grain**)calloc(2*length,sizeof(grain*));
+    memcpy(newBuf,buf+readPos,(writePos-readPos)*sizeof(grain*));
+    free(buf);
+    buf = newBuf;
+    writePos -= readPos;
+    readPos = 0;
+  }
+
+  grain :: referenced(g);
+  buf[writePos++] = g;
+}
+
+void GrainBuf :: clear()
+{
+  memset(iBuf,0,N*sizeof(audio));
+  iBufWritePos = 0;
+  advance(n_readable());
+}
+
+/****************
+
+ Mixer
+
+****************/
+
+Mixer :: Mixer(SampleBufBase *b1, SampleBuf *b2)
+{
+  this->b1 = b1;
+  this->b2 = b2;
+}
+
+long Mixer :: read(audio *outBuf, long n)
+{
+  if(n==0)
+    return 0;
+  n = min(n,n_readable());
+
+  b1->read(outBuf,n);
+  audio *buf2 = b2->getReadBuf();
+
+  for(int k=0;k<n;k++) {
+    for(int c=0;c<2;c++) 
+      outBuf[k][c] += buf2[k][c];
+  }
+  return n;
+}
+
+void Mixer::advance(long n)
+{
+  b1->advance(n);
+  b2->advance(n);
+}
+
+long Mixer::n_readable()
+{
+  return min(b1->n_readable(), b2->n_readable());
+}
+
+/********************
+ TrackPointListBuffer
+********************/
+
+TrackPointListBuffer :: TrackPointListBuffer() {
+  length = INIT_TPLBUF_LENGTH;
+  buf = (tplist**) calloc(2*length,sizeof(tplist*));
+  readPos = 0;
+  writePos = 0;
+}
+
+TrackPointListBuffer :: ~TrackPointListBuffer() {
+  for(int k=readPos;k<writePos;k++)
+    delete buf[k];
+  free(buf);
+}
+
+long TrackPointListBuffer :: write(tplist *tpl) 
+{
+  if(writePos >= 2*length) {
+    length *= 2;
+    tplist **newBuf = (tplist**) calloc(2*length,sizeof(tplist*));
+    memcpy(newBuf,buf+readPos,(writePos-readPos)*sizeof(tplist*));
+    free(buf);
+    buf = newBuf;
+    writePos -= readPos;
+    readPos = 0;
+  }
+
+  buf[writePos++] = tpl;
+  return 1;
+}
+
+long TrackPointListBuffer :: n_readable()
+{
+  return writePos-readPos;
+}
+
+tplist *TrackPointListBuffer :: read(long k) 
+{
+  return buf[k];
+}
+
+void TrackPointListBuffer :: advance(long n)
+{
+  assert(readPos+n <= writePos);
+  for(int k=readPos;k<readPos+n;k++) {
+    delete buf[k];
+  }
+  readPos += n;
+  if(readPos >= length) {
+    memcpy(buf,buf+readPos,(writePos-readPos)*sizeof(tplist*));
+    writePos = writePos - readPos;
+    readPos = 0;
+  }
+}
+
+}
diff --git a/lib-src/sbsms/src/buffer.h b/lib-src/sbsms/src/buffer.h
new file mode 100644
index 0000000..67821f8
--- /dev/null
+++ b/lib-src/sbsms/src/buffer.h
@@ -0,0 +1,166 @@
+#ifndef BUFFER_H
+#define BUFFER_H
+
+#include <assert.h>
+#include <cstring>
+#include <cstdlib>
+#include "sbsms.h"
+#include "grain.h"
+#include "trackpoint.h"
+#include <list>
+using namespace std;
+
+namespace _sbsms_ {
+
+typedef list<trackpoint*> tplist;
+
+template <class T>
+class RingBuffer {
+ public:
+  RingBuffer();
+  ~RingBuffer();
+  
+  long write(T a);
+  T read(long k);
+  long n_readable();
+  void advance(long n);
+  void clear();
+
+  long readPos;
+  long writePos;
+ protected:
+  T *buf;
+  long length;
+};
+
+#define INIT_RINGBUF_LENGTH 128
+
+/********************
+ RingBuffer
+********************/
+
+template <class T>
+RingBuffer<T> :: RingBuffer()
+{
+  length = INIT_RINGBUF_LENGTH;
+  buf = (T*) calloc(2*length,sizeof(T));
+  readPos = 0;
+  writePos = 0;
+}
+
+template <class T>
+RingBuffer<T> :: ~RingBuffer()
+{
+  free(buf);
+}
+  
+template <class T>
+long RingBuffer<T> :: write(T a)
+{
+  if(writePos >= 2*length) {
+    length *= 2;
+    T *newBuf = (T*) calloc(2*length,sizeof(T));
+    memcpy(newBuf,buf+readPos,(writePos-readPos)*sizeof(T));
+    free(buf);
+    buf = newBuf;
+    writePos -= readPos;
+    readPos = 0;
+  }
+  buf[writePos++] = a;
+  return 1;
+}
+
+template <class T>
+T RingBuffer<T> :: read(long k)
+{
+  return buf[k];
+}
+
+template <class T>
+long RingBuffer<T> :: n_readable()
+{
+  return writePos-readPos;
+}
+
+template <class T>
+void RingBuffer<T> :: advance(long n)
+{
+  assert(readPos+n <= writePos);
+  readPos += n;
+  if(readPos >= length) {
+    memcpy(buf,buf+readPos,(writePos-readPos)*sizeof(T));
+    writePos = writePos - readPos;
+    readPos = 0;
+  }
+}
+
+template <class T>
+void RingBuffer<T> :: clear()
+{
+  readPos = 0;
+  writePos = 0;
+}
+
+class TrackPointListBuffer {
+ public:
+  TrackPointListBuffer();
+  ~TrackPointListBuffer();
+  
+  long write(tplist *tpl);
+  tplist *read(long k);
+  long n_readable();
+  void advance(long n);
+  
+  long readPos;
+  long writePos;
+
+ protected:
+  tplist **buf;  
+  long length;
+};
+
+class GrainBuf {
+ public:
+  GrainBuf(int N, int h);
+  GrainBuf(int N, int h, real pad, int type);
+  ~GrainBuf();
+
+  void init(int N, int h, real pad, int type);
+  long write(audio *buf, long n);
+  void write(grain *g);
+  void advance(long n);
+  long n_readable() { return writePos - readPos; }
+  void clear();
+  grain* read(long k);
+
+  long length;
+  long readPos, writePos;
+  int N,h,wintype;
+  real pad;
+
+ protected:
+  void convert(audio *buf);
+  audio *iBuf;
+  long iBufWritePos;
+  grain **buf;
+  
+};
+
+class Mixer : public SampleBufBase {
+ public:
+  Mixer(SampleBufBase *, SampleBuf *);
+  long read(audio *buf, long n);
+  void advance(long n);
+  long n_readable();
+  ~Mixer() {}
+
+protected:
+  SampleBuf *buf;
+  SampleBufBase *b1;
+  SampleBuf *b2;
+ 
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/config.h.in b/lib-src/sbsms/src/config.h.in
new file mode 100644
index 0000000..300f8d2
--- /dev/null
+++ b/lib-src/sbsms/src/config.h.in
@@ -0,0 +1,101 @@
+/* src/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define to 1 if you have the `calloc' function. */
+#undef HAVE_CALLOC
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `floor' function. */
+#undef HAVE_FLOOR
+
+/* Define to 1 if you have the `free' function. */
+#undef HAVE_FREE
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the `log' function. */
+#undef HAVE_LOG
+
+/* Define if you have C99's lrint function. */
+#undef HAVE_LRINT
+
+/* Define if you have C99's lrintf function. */
+#undef HAVE_LRINTF
+
+/* Define to use libmad */
+#undef HAVE_MAD
+
+/* Define to 1 if you have the `malloc' function. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to use libportaudio */
+#undef HAVE_PORTAUDIO
+
+/* Define to use libsndfile */
+#undef HAVE_SNDFILE
+
+/* Define to 1 if you have the `sqrt' function. */
+#undef HAVE_SQRT
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Define to compile multithreaded sbsms */
+#undef MULTITHREADED
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff --git a/lib-src/sbsms/src/convert.cpp b/lib-src/sbsms/src/convert.cpp
new file mode 100644
index 0000000..6e4439c
--- /dev/null
+++ b/lib-src/sbsms/src/convert.cpp
@@ -0,0 +1,320 @@
+#include "config.h"
+
+#include <math.h>
+#include "convert.h"
+#include "sbsms.h"
+#include <stdlib.h>
+#include "audio.h"
+#ifdef HAVE_SNDFILE
+#include "import.h"
+#include "pcm.h"
+#define BWAV 1
+#endif
+
+struct resampleBuf {
+  float *buf;
+  audio *abuf;
+  double ratio;
+  long samplesIn;
+  long block;
+#ifdef BWAV
+  AudioDecoder *decoder;
+#else
+  FILE *decoder;
+#endif
+};
+
+long resampleCB(void *cb_data, sbsms_resample_frame *data) 
+{
+  resampleBuf *r = (resampleBuf*) cb_data;
+#ifdef BWAV
+  long n_read_in = r->decoder->read(r->buf,r->block);
+  audio_convert_to(r->abuf,0,r->buf,0,n_read_in);
+#else
+  long n_read_in = 0;
+  for(int k=0;k<r->block;k++) {
+    if(fscanf(r->decoder,"%g %g\n",&(r->abuf[k][0]),&(r->abuf[k][1])) == EOF)
+      break;
+    n_read_in++;
+  }
+#endif  
+  r->samplesIn += n_read_in;
+  data->size = n_read_in;
+  data->ratio0 = r->ratio;
+  data->ratio1 = r->ratio;
+  data->in = r->abuf;
+
+  return n_read_in;
+}
+
+long samplesCB(audio *chdata, long numFrames, void *userData)
+{ 
+  sbsmsInfo *si = (sbsmsInfo*) userData;
+  long n_read = si->rs->read(chdata, numFrames);
+  return n_read;
+}
+
+#ifndef BWAV
+long lineCount(FILE *fp) {
+  long n = 0;
+  char c = 0;
+  do {
+    c = fgetc(fp);
+    if (c == '\n') n++;
+  } while (c != EOF);
+  fseek(fp,0,SEEK_SET);
+  return n;
+}
+#endif
+
+bool sbsms_convert(const char *filenameIn, const char *filenameOut, bool bAnalyzeOnly, bool bSynthesizeOnly, bool bPreAnalyze, int quality, progress_cb progressCB, void *data, real stretch0, real stretch1, real ratio0, real ratio1, real volume)
+{  
+  bool status = true;
+  
+  real srOut = 44100.0f;
+  int channels;
+  long samplesToProcess;
+  long samplesIn;
+  sbsmsInfo si;
+  sbsms *sbsmser = NULL;
+  Resampler *resampler = NULL;
+  Resampler *resamplerPre = NULL;
+  resampleBuf rb;
+  rb.buf = NULL;
+  rb.abuf = NULL;
+  resampleBuf rbPre;
+  rbPre.buf = NULL;
+  rbPre.abuf = NULL;
+  FILE *sbsmsIn = NULL;
+  FILE *sbsmsOut = NULL;
+  float *fbuf = NULL;
+  audio *abuf = NULL;
+  pitcher *pitch = NULL;
+  float srIn;
+  real stretch2;
+  long samplesOut;
+
+#ifdef BWAV
+  AudioDecoder *decoder = NULL;
+  AudioDecoder *decoderPre = NULL;
+#else
+  FILE *decoder = NULL;
+  FILE *decoderPre = NULL;
+#endif
+  if(bSynthesizeOnly) {
+    sbsmsIn = sbsms_open_read(filenameIn);
+    if(!sbsmsIn) {
+      printf("Cannot open file: :%s\n",filenameIn);
+      status = false;
+      goto cleanup;
+    }
+    samplesIn = 0;
+    samplesToProcess = sbsms_get_samples_to_process(sbsmsIn);
+    channels = sbsms_get_channels(sbsmsIn);
+    quality = sbsms_get_quality(sbsmsIn);
+    sbsmser = sbsms_create(sbsmsIn,&stretchCBLinear,&ratioCBLinear);
+    decoder = NULL;
+  } else {
+#ifdef BWAV
+    decoder = import(filenameIn);
+    if(!decoder) {
+      printf("File: %s cannot be opened\n",filenameIn);
+      exit(-1);
+    }
+    srIn = (float) decoder->getSampleRate();
+    channels = decoder->getChannels();
+    samplesIn = decoder->getFrames();
+#else
+    decoder = fopen(filenameIn,"r");
+    if(!decoder) {
+      printf("File: %s cannot be opened\n",filenameIn);
+      status = false;
+      goto cleanup;
+    }
+    srIn = 44100.0;
+    channels = 2;
+    samplesIn = lineCount(decoder);
+#endif
+    samplesToProcess = (long) (samplesIn*srOut/srIn);
+    
+    rb.ratio = (float)srOut / (float)srIn;
+    rb.decoder = decoder;
+    rb.block = SBSMS_FRAME_SIZE[quality];
+    rb.samplesIn = 0;
+    rb.buf = (float*)calloc(rb.block*2,sizeof(float));
+    rb.abuf = (audio*)calloc(rb.block,sizeof(audio));
+    resampler = new Resampler(resampleCB, &rb);
+    si.rs = resampler;
+    sbsmser = sbsms_create(&samplesCB,&stretchCBLinear,&ratioCBLinear,channels,quality,bPreAnalyze,!bAnalyzeOnly);
+  }
+  
+  if(bPreAnalyze && !bSynthesizeOnly) {
+#ifdef BWAV
+    decoderPre = import(filenameIn);
+    if(!decoderPre) {
+      printf("File: %s cannot be opened\n",filenameIn);
+      status = false;
+      goto cleanup;
+    }
+#else
+    decoderPre = fopen(filenameIn,"r");
+    if(!decoderPre) {
+      printf("File: %s cannot be opened\n",filenameIn);
+      status = false;
+      goto cleanup;
+    }
+#endif
+    rbPre.ratio = (float)srOut / (float)srIn;
+    rbPre.decoder = decoderPre;
+    rbPre.block = SBSMS_FRAME_SIZE[quality];
+    rbPre.samplesIn = 0;
+    rbPre.buf = (float*)calloc(rbPre.block*2,sizeof(float));
+    rbPre.abuf = (audio*)calloc(rbPre.block,sizeof(audio));
+    resamplerPre = new Resampler(resampleCB, &rbPre);
+    si.rs = resamplerPre;
+  }
+  if(stretch0 == stretch1)
+    stretch2 = 1.0/stretch0;
+  else
+    stretch2 = log(stretch1/stretch0)/(stretch1-stretch0);
+  samplesOut = samplesToProcess * stretch2;
+  si.samplesToProcess = samplesToProcess;
+  si.samplesToGenerate = samplesOut;
+  si.stretch0 = stretch0;
+  si.stretch1 = stretch1;
+  si.ratio0 = ratio0;
+  si.ratio1 = ratio1;
+
+  if(bPreAnalyze && !bSynthesizeOnly) {
+    long pos = 0;
+    long lastPos = 0;
+    long ret = 0;
+    while(lastPos<samplesToProcess) {
+      long lastPercent=0;
+      
+      ret = sbsms_pre_analyze(&samplesCB,&si,sbsmser);
+      lastPos = pos;
+      pos += ret;
+      
+      int percent = 100.*(real)lastPos/(real)samplesToProcess;
+      //progressCB(percent,"Analysis",data);
+    }
+    sbsms_pre_analyze_complete(sbsmser);
+    sbsms_reset(sbsmser);
+    si.rs = resampler;
+  }
+
+  if(bAnalyzeOnly) {
+    long pos = 0;
+    long lastPos = 0;
+    long ret = -1;
+    sbsmsOut = sbsms_open_write(filenameOut, sbsmser, samplesToProcess);
+    if(!sbsmsOut) {
+      printf("File: %s cannot be opened\n",filenameOut);
+      status = false;
+      goto cleanup;
+    }
+    
+    while(lastPos<samplesToProcess && ret) {
+      long lastPercent=0;
+      
+      ret = sbsms_write_frame(sbsmsOut,&si,sbsmser);
+      lastPos = pos;
+      pos += ret;
+      
+      int percent = 100.*(real)lastPos/(real)samplesToProcess;
+      progressCB(percent,"Progress",data);
+    }
+  } else {
+    fbuf = (float*)calloc(SBSMS_MAX_FRAME_SIZE[quality]*2,sizeof(float));
+    abuf = (audio*)calloc(SBSMS_MAX_FRAME_SIZE[quality],sizeof(audio));
+    
+    pitch = pitch_create(sbsmser,&si,1.0);
+    long blockSize = SBSMS_FRAME_SIZE[quality]; 
+    
+#ifdef BWAV
+    PcmWriter writer(filenameOut,samplesOut,(int)srOut,channels);
+    if(writer.isError()) {
+      printf("File: %s cannot be opened\n",filenameOut);
+      status = false;
+      goto cleanup;
+    }
+#else
+    FILE *OUT = fopen(filenameOut,"w");
+    if(!OUT) {
+      printf("File: %s cannot be opened\n",filenameOut);
+      status = false;
+      goto cleanup;
+    }
+#endif
+    
+    long pos = 0;
+    long ret = -1;
+    
+    while(pos<samplesOut && ret) {
+      long frames;
+      long lastPercent=0;
+      
+      if(pos+blockSize>samplesOut) {
+        frames = samplesOut - pos;
+      } else {
+        frames = blockSize;
+      }
+      
+      ret = pitch_process(abuf, frames, pitch);
+      audio_convert_from(fbuf,0,abuf,0,ret);
+      if(channels==1) {
+        for(int k=0;k<ret;k++) {
+          int k2 = k<<1;
+          fbuf[k] = volume*fbuf[k2];
+        }
+      } else if(channels==2) {
+        for(int k=0;k<ret;k++) {
+          int k2 = k<<1;
+          fbuf[k2] = volume*fbuf[k2];
+          fbuf[k2+1] = volume*fbuf[k2+1];
+        }
+      }
+      
+#ifdef BWAV
+      writer.write(fbuf, ret);
+#else
+      for(int k=0;k<ret;k++)
+        fprintf(OUT,"%g %g\n",fbuf[2*k],fbuf[2*k+1]);
+#endif
+      pos += ret;
+      
+      int percent = 100.*(real)pos / (real)samplesOut;
+      progressCB(percent,"Progress",data);
+    }
+    
+#ifdef BWAV
+    writer.close();
+#else
+    if(OUT) fclose(OUT);
+#endif
+  }
+  
+ cleanup:
+#ifdef BWAV
+  if(decoderPre) delete decoderPre;
+  if(decoder) delete decoder;
+#else
+  if(decoderPre) fclose(decoderPre);
+  if(decoder) fclose(decoder);
+#endif
+  if(fbuf) free(fbuf);
+  if(abuf) free(abuf);
+  if(pitch) pitch_destroy(pitch);
+  if(sbsmsIn) sbsms_close_read(sbsmsIn);
+  if(sbsmsOut) sbsms_close_write(sbsmsOut,sbsmser);
+  if(resampler) delete resampler;
+  if(resamplerPre) delete resamplerPre;
+  if(rb.buf) free(rb.buf);
+  if(rb.abuf) free(rb.abuf);
+  if(rbPre.buf) free(rbPre.buf);
+  if(rbPre.abuf) free(rbPre.abuf);
+  if(sbsmser) sbsms_destroy(sbsmser);
+
+  return status;
+}
diff --git a/lib-src/sbsms/src/convert.h b/lib-src/sbsms/src/convert.h
new file mode 100644
index 0000000..2aa2982
--- /dev/null
+++ b/lib-src/sbsms/src/convert.h
@@ -0,0 +1,10 @@
+#ifndef CONVERT_H
+#define CONVERT_H
+
+#include "sbsms.h"
+
+typedef bool (*progress_cb)(int progress, const char *msg, void *data);
+
+bool sbsms_convert(const char *filenameIn, const char *filenameOut, bool bAnalyzeOnly, bool bSynthesizeOnly, bool bPreAnalyze, int quality, progress_cb progressCB, void *data, real stretch0, real stretch1, real ratio0, real ratio1, real volume);
+
+#endif 
diff --git a/lib-src/sbsms/src/defs.h b/lib-src/sbsms/src/defs.h
new file mode 100644
index 0000000..4301bd4
--- /dev/null
+++ b/lib-src/sbsms/src/defs.h
@@ -0,0 +1,16 @@
+#ifndef SBSMS_DEFS_H
+#define SBSMS_DEFS_H
+
+#ifdef SBSMS_REAL_FLOAT
+#define ONEOVERPI 0.31830988618379f
+#define ONEOVERTWOPI 0.15915494309190f
+#define PI    3.14159265358979323846264338327950288f
+#define TWOPI 6.28318530717958647692528676655900576f
+#else
+#define ONEOVERPI 0.31830988618379
+#define ONEOVERTWOPI 0.15915494309190
+#define PI    3.14159265358979323846264338327950288
+#define TWOPI 6.28318530717958647692528676655900576
+#endif
+
+#endif
diff --git a/lib-src/sbsms/src/fft.cpp b/lib-src/sbsms/src/fft.cpp
new file mode 100644
index 0000000..37a3811
--- /dev/null
+++ b/lib-src/sbsms/src/fft.cpp
@@ -0,0 +1,737 @@
+#include "fft.h"
+#define _USE_MATH_DEFINES
+#include <math.h>
+#include <stdlib.h>
+#include "utils.h"
+
+namespace _sbsms_ {
+
+#define REAL(tr,ti,r,i) (tr*r - ti*i)
+#define IMAG(tr,ti,r,i) (tr*i + ti*r)
+
+t_fft *make_fft_buf(int N) 
+{
+  return (t_fft*) malloc(N*sizeof(t_fft));
+}
+
+void free_fft_buf(t_fft *buf)
+{
+  free(buf);
+}
+
+void optimizeFactors(int *f)
+{
+  int n = 0;
+  for(int k=0;;k++) {
+    if(f[k]==0) break;
+    n++;
+  }
+  int *g = (int*)calloc(n+1,sizeof(int));
+  for(int k=0;k<n;k++) {
+    g[k] = f[k];
+  }
+
+  int m = 0;
+  for(int k=0;k<n;k++) {
+    int f2 = g[k] * g[k+1];
+    if(f2 == 6) {
+      f[m++] = 6;
+      k++;
+    } else if(f2 == 4) {
+      f[m++] = 4;
+      k++;
+    } else {
+      f[m++] = g[k];
+    }
+  }
+  f[m] = 0;
+  free(g);
+}
+
+int *getOrder(int n, int *N1, int *N2)
+{
+  int N = N1[0]*N2[0];
+  int *order = (int*)calloc(N,sizeof(int));
+  for(int k=0;k<N;k++) {
+    int kr = 0;
+    int k0 = k;
+    for(int i=0;i<n;i++) {
+      int k2 = k0%N2[i];
+      k0 /= N2[i];
+      kr += N1[i]*k2;
+    }
+    order[k] = kr;
+  }
+    
+  return order;
+}
+
+t_fft **calcTwiddles(int n, int *N1, int *N2, int *order, int sign)
+{
+  t_fft **t = (t_fft**)calloc(n,sizeof(t_fft*));
+
+  for(int i=0;i<n;i++) {
+    int Np = N1[i]*N2[i];
+    t[i] = (t_fft*)calloc(Np,sizeof(t_fft));
+    for(int k=0;k<Np;k++) {
+      t[i][k][0] = cos((real)(-sign)*2.0*M_PI*(real)k/(real)Np);
+      t[i][k][1] = sin((real)(-sign)*2.0*M_PI*(real)k/(real)Np);
+    }
+  }
+  return t;
+}
+
+fft_func *getFuncs(int *f)
+{
+  int n = 0;
+  for(int k=0;;k++) {
+    if(f[k] == 0) break;
+    n++;
+  }
+
+  fft_func *func = (fft_func*)calloc(n,sizeof(fft_func));
+  for(int k=0;k<n;k++) {
+    switch(f[k]) {
+    case 2 : func[k] = fft2; break;
+    case 3 : func[k] = fft3; break;
+    case 4 : func[k] = fft4; break;
+    case 5 : func[k] = fft5; break;
+    case 6 : func[k] = fft6; break;
+    case 7 : func[k] = fft7; break;
+    }
+  }
+  return func;
+}
+
+int *getN1(int *f, int N)
+{
+  int n = 0;
+  for(int k=0;;k++) {
+    if(f[k] == 0) break;
+    n++;
+  }
+  
+  int *N1 = (int*)calloc(n,sizeof(int));
+  for(int k=0;k<n;k++) {
+    N /= f[k];
+    N1[k] = N;
+  }
+  return N1;
+}
+
+int getNFactors(int *f)
+{
+  int n = 0;
+  for(int k=0;;k++) {
+    if(f[k] == 0) break;
+    n++;
+  }
+  return n;
+}
+
+fftplan *planFFT(int N) 
+{
+  int *factors = factor(N);
+  optimizeFactors(factors);
+
+  fftplan *plan = new fftplan;
+  plan->dir = 1;
+  plan->n = getNFactors(factors);
+  plan->N2 = factors;
+  plan->N1 = getN1(factors,N);
+  plan->order = getOrder(plan->n,plan->N1,plan->N2);
+  plan->reorder = (t_fft*)malloc(N*sizeof(t_fft));
+  plan->t = calcTwiddles(plan->n,plan->N1,plan->N2,plan->order,1);
+  plan->f = getFuncs(factors);
+  plan->N = N;
+  plan->norm = 1.0;
+  return plan;
+}
+
+fftplan *planIFFT(int N) 
+{
+  int *factors = factor(N);
+  optimizeFactors(factors);
+  fftplan *plan = new fftplan;
+  plan->dir = -1;
+  plan->n = getNFactors(factors);
+  plan->N2 = factors;
+  plan->N1 = getN1(factors,N);
+  plan->order = getOrder(plan->n,plan->N1,plan->N2);
+  plan->reorder = (t_fft*)malloc(N*sizeof(t_fft));
+  plan->t = calcTwiddles(plan->n,plan->N1,plan->N2,plan->order,-1);
+  plan->f = getFuncs(factors);
+  plan->N = N;
+  plan->norm = 1.0/(real)N;
+  return plan;
+}
+
+void destroy_fftplan(fftplan *plan)
+{
+  free(plan->reorder);
+  free(plan->order);
+  free(plan->f);
+  for(int i=0;i<plan->n;i++)
+    free(plan->t[i]);
+  free(plan->t);
+  free(plan->N1);
+  free(plan->N2);
+  free(plan);
+}
+
+void FFT(fftplan *plan, t_fft *x) 
+{
+  fft(plan,x,0,0);
+  
+  for(int k=0;k<plan->N;k++) {
+    plan->reorder[k][0] = x[k][0];
+    plan->reorder[k][1] = x[k][1];
+  } 
+  for(int k=0;k<plan->N;k++) {
+    int kr = plan->order[k];
+    if(k != kr) {
+      x[k][0] = plan->reorder[kr][0];
+      x[k][1] = plan->reorder[kr][1];
+    }
+  }
+
+}
+
+void IFFT(fftplan *plan, t_fft *x) 
+{
+  FFT(plan,x);
+  /*
+  real norm = plan->norm;
+  for(int k=0;k<plan->N;k++) {
+    x[k][0] *= norm;
+    x[k][1] *= norm;
+  }
+  */
+}
+
+void fft(fftplan *plan, t_fft *x, int r, int i)
+{
+  int N1 = plan->N1[i];
+  int N2 = plan->N2[i];
+  for(int n1=0;n1<N1;n1++) {
+    (plan->f[i])(x,n1,N1,r,plan->t[i],plan->dir);
+  }
+  if(N1==1) return;
+  for(int k2=0;k2<N2;k2++) {
+    fft(plan,x,r,i+1);
+    r += N1;
+  }
+}
+
+void fft2(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
+{
+  int i = r+n1;
+  real *x0 = x[i]; i+= N1;
+  real *x1 = x[i];
+
+  real y0 = x0[0] - x1[0];
+  real y1 = x0[1] - x1[1];
+
+  x0[0] += x1[0];
+  x0[1] += x1[1];
+
+  real *t1 = t[n1];
+  real t10 = t1[0];
+  real t11 = t1[1];
+  x1[0] = REAL(t10,t11,y0,y1);
+  x1[1] = IMAG(t10,t11,y0,y1);
+}
+
+#define T300 (real)0.5
+#define T301 (real)0.86602540378444
+void fft3(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
+{
+  int i = r+n1;
+  real *x0 = x[i]; i+=N1;
+  real *x1 = x[i]; i+=N1;
+  real *x2 = x[i];
+
+  real z00 = x1[0] + x2[0];
+  real z01 = x1[1] + x2[1];
+  
+  real z10 = x0[0] - T300*z00;
+  real z11 = x0[1] - T300*z01;
+
+  real z20;
+  real z21;
+  if(dir==1) {
+    z20 = T301*(x2[0] - x1[0]);
+    z21 = T301*(x2[1] - x1[1]);
+  } else {
+    z20 = T301*(x1[0] - x2[0]);
+    z21 = T301*(x1[1] - x2[1]);
+  }
+
+  x0[0] = z00 + x0[0];
+  x0[1] = z01 + x0[1];
+
+  real z30 = z10 - z21;
+  real z31 = z11 + z20;
+  real *t1 = t[n1];
+  real t10 = t1[0];
+  real t11 = t1[1];
+  x1[0] = REAL(t10,t11,z30,z31);
+  x1[1] = IMAG(t10,t11,z30,z31);
+
+  real z40 = z10 + z21;
+  real z41 = z11 - z20;
+  real *t2 = t[n1<<1];
+  real t20 = t2[0];
+  real t21 = t2[1];
+  x2[0] = REAL(t20,t21,z40,z41);
+  x2[1] = IMAG(t20,t21,z40,z41);
+}
+
+void fft4(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
+{
+  int i = r+n1;
+  real *x0 = x[i]; i+=N1;
+  real *x1 = x[i]; i+=N1;
+  real *x2 = x[i]; i+=N1;
+  real *x3 = x[i];
+
+  real z20 = x0[0] - x2[0];
+  real z21 = x0[1] - x2[1];
+  real z00 = x0[0] + x2[0];
+  real z01 = x0[1] + x2[1];
+  
+  real z10 = x1[0] + x3[0];
+  real z11 = x1[1] + x3[1];
+  
+  x0[0] = z00 + z10;
+  x0[1] = z01 + z11;
+  
+  real y20 = z00 - z10;
+  real y21 = z01 - z11;
+  real *t2 = t[n1<<1];
+  real t20 = t2[0];
+  real t21 = t2[1];
+  x2[0] = REAL(t20,t21,y20,y21);
+  x2[1] = IMAG(t20,t21,y20,y21);
+
+  real z30;
+  real z31;
+  if(dir==1) {
+    z30 = (x3[0] - x1[0]);
+    z31 = (x3[1] - x1[1]);  
+  } else {
+    z30 = (x1[0] - x3[0]);
+    z31 = (x1[1] - x3[1]);  
+  }
+
+  real y10 = z20 - z31;
+  real y11 = z21 + z30;
+  real *t1 = t[n1];
+  real t10 = t1[0];
+  real t11 = t1[1];
+  x1[0] = REAL(t10,t11,y10,y11);
+  x1[1] = IMAG(t10,t11,y10,y11);
+
+  real y30 = z20 + z31;
+  real y31 = z21 - z30;
+  real *t3 = t[n1*3];
+  real t30 = t3[0];
+  real t31 = t3[1];
+  x3[0] = REAL(t30,t31,y30,y31);
+  x3[1] = IMAG(t30,t31,y30,y31);
+}
+
+#define T500 (real)0.95105651629515
+#define T501 (real)0.58778525229247
+#define T510 (real)0.55901699437495
+#define T511 (real)0.25
+
+void fft5(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
+{
+  int i = r+n1;
+  real *x0 = x[i]; i+=N1;
+  real *x1 = x[i]; i+=N1;
+  real *x2 = x[i]; i+=N1;
+  real *x3 = x[i]; i+=N1;
+  real *x4 = x[i];
+
+  real z00 = x1[0] + x4[0];
+  real z01 = x1[1] + x4[1];
+
+  real z10 = x2[0] + x3[0];
+  real z11 = x2[1] + x3[1];
+
+  real z20 = x1[0] - x4[0];
+  real z21 = x1[1] - x4[1];
+
+  real z30 = x2[0] - x3[0];
+  real z31 = x2[1] - x3[1];
+
+  real z40 = z00 + z10;
+  real z41 = z01 + z11;
+ 
+  real z50 = T510*(z00 - z10);
+  real z51 = T510*(z01 - z11);
+
+  real z60 = x0[0] - T511*z40;
+  real z61 = x0[1] - T511*z41;
+
+  real z70 = z50 + z60;
+  real z71 = z51 + z61;
+
+  real z80 = z60 - z50;
+  real z81 = z61 - z51;
+  
+  real z90;
+  real z91;
+  if(dir==1) {
+    z90 = -(T500*z20 + T501*z30);
+    z91 = -(T500*z21 + T501*z31);
+  } else {
+    z90 = (T500*z20 + T501*z30);
+    z91 = (T500*z21 + T501*z31);
+  }
+  
+  real z100;
+  real z101;
+  if(dir==1) {
+    z100 = (T500*z30 - T501*z20);
+    z101 = (T500*z31 - T501*z21);
+  } else {
+    z100 = (T501*z20 - T500*z30);
+    z101 = (T501*z21 - T500*z31);
+  }
+
+  x0[0] = x0[0] + z40;
+  x0[1] = x0[1] + z41;
+
+  real y10 = z70 - z91;
+  real y11 = z71 + z90;
+  real *t1 = t[n1];
+  real t10 = t1[0];
+  real t11 = t1[1];
+  x1[0] = REAL(t10,t11,y10,y11);
+  x1[1] = IMAG(t10,t11,y10,y11);
+
+  real y20 = z80 - z101;
+  real y21 = z81 + z100;
+  real *t2 = t[n1<<1];
+  real t20 = t2[0];
+  real t21 = t2[1];
+  x2[0] = REAL(t20,t21,y20,y21);
+  x2[1] = IMAG(t20,t21,y20,y21);
+
+  real y30 = z80 + z101;
+  real y31 = z81 - z100;
+  real *t3 = t[n1*3];
+  real t30 = t3[0];
+  real t31 = t3[1];
+  x3[0] = REAL(t30,t31,y30,y31);
+  x3[1] = IMAG(t30,t31,y30,y31);
+
+  real y40 = z70 + z91;
+  real y41 = z71 - z90;
+  real *t4 = t[n1<<2];
+  real t40 = t4[0];
+  real t41 = t4[1];
+  x4[0] = REAL(t40,t41,y40,y41);
+  x4[1] = IMAG(t40,t41,y40,y41);
+}
+
+#define T600 (real)0.86602540378444
+#define T601 (real)0.5
+void fft6(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
+{
+  int i = r+n1;
+  real *x0 = x[i]; i+=N1;
+  real *x1 = x[i]; i+=N1;
+  real *x2 = x[i]; i+=N1;
+  real *x3 = x[i]; i+=N1;
+  real *x4 = x[i]; i+=N1;
+  real *x5 = x[i];
+
+  real za00 = x2[0] + x4[0];
+  real za01 = x2[1] + x4[1];
+  
+  real za10 = x0[0] - T601*za00;
+  real za11 = x0[1] - T601*za01;
+
+  real za20;
+  real za21;
+  if(dir==1) {
+    za20 = T600*(x4[0] - x2[0]);
+    za21 = T600*(x4[1] - x2[1]);
+  } else {
+    za20 = T600*(x2[0] - x4[0]);
+    za21 = T600*(x2[1] - x4[1]);
+  }
+
+  real a00 = x0[0] + za00;
+  real a01 = x0[1] + za01;
+
+  real a10 = za10 - za21;
+  real a11 = za11 + za20;
+
+  real a20 = za10 + za21;
+  real a21 = za11 - za20;
+
+  real zb00 = x1[0] + x5[0];
+  real zb01 = x1[1] + x5[1];
+  
+  real zb10 = x3[0] - T601*zb00;
+  real zb11 = x3[1] - T601*zb01;
+
+  real zb20;
+  real zb21;
+  if(dir==1) {
+    zb20 = T600*(x1[0] - x5[0]);
+    zb21 = T600*(x1[1] - x5[1]);
+  } else {
+    zb20 = T600*(x5[0] - x1[0]);
+    zb21 = T600*(x5[1] - x1[1]);
+  }
+
+  real b00 = x3[0] + zb00;
+  real b01 = x3[1] + zb01;
+
+  real b10 = zb10 - zb21;
+  real b11 = zb11 + zb20;
+
+  real b20 = zb10 + zb21;
+  real b21 = zb11 - zb20;
+
+  x0[0] = a00 + b00;
+  x0[1] = a01 + b01;
+
+  real y10 = a10 - b10;
+  real y11 = a11 - b11;
+  real *t1 = t[n1];
+  real t10 = t1[0];
+  real t11 = t1[1];
+  x1[0] = REAL(t10,t11,y10,y11);
+  x1[1] = IMAG(t10,t11,y10,y11);
+
+  real y20 = a20 + b20;
+  real y21 = a21 + b21;
+  real *t2 = t[n1<<1];
+  real t20 = t2[0];
+  real t21 = t2[1];
+  x2[0] = REAL(t20,t21,y20,y21);
+  x2[1] = IMAG(t20,t21,y20,y21);
+
+  real y30 = a00 - b00;
+  real y31 = a01 - b01;
+  real *t3 = t[n1*3];
+  real t30 = t3[0];
+  real t31 = t3[1];
+  x3[0] = REAL(t30,t31,y30,y31);
+  x3[1] = IMAG(t30,t31,y30,y31);
+
+  real y40 = a10 + b10;
+  real y41 = a11 + b11;
+  real *t4 = t[n1<<2];
+  real t40 = t4[0];
+  real t41 = t4[1];
+  x4[0] = REAL(t40,t41,y40,y41);
+  x4[1] = IMAG(t40,t41,y40,y41);
+
+  real y50 = a20 - b20;
+  real y51 = a21 - b21;
+  real *t5 = t[n1*5];
+  real t50 = t5[0];
+  real t51 = t5[1];
+  x5[0] = REAL(t50,t51,y50,y51);
+  x5[1] = IMAG(t50,t51,y50,y51);
+}
+
+#define C71 (real)-1.16666666666667
+#define C72 (real)0.79015646852540
+#define C73 (real)0.05585426728965
+#define C74 (real)0.73430220123575
+#define C75 (real)0.44095855184410
+#define C76 (real)0.34087293062393
+#define C77 (real)-0.53396936033773
+#define C78 (real)0.87484229096166
+
+void fft7(t_fft *x, int n1, int N1, int r, t_fft *t, int dir)
+{
+  int i = r+n1;
+  real *x0 = x[i]; i+=N1;
+  real *x1 = x[i]; i+=N1;
+  real *x2 = x[i]; i+=N1;
+  real *x3 = x[i]; i+=N1;
+  real *x4 = x[i]; i+=N1;
+  real *x5 = x[i]; i+=N1;
+  real *x6 = x[i];
+
+  real u00 = x1[0] + x6[0];
+  real u01 = x1[1] + x6[1];
+
+  real u10 = x1[0] - x6[0];
+  real u11 = x1[1] - x6[1];
+
+  real u20 = x2[0] + x5[0];
+  real u21 = x2[1] + x5[1];
+
+  real u30 = x2[0] - x5[0];
+  real u31 = x2[1] - x5[1];
+
+  real u40 = x4[0] + x3[0];
+  real u41 = x4[1] + x3[1];
+
+  real u50 = x4[0] - x3[0];
+  real u51 = x4[1] - x3[1];
+
+  real u60 = u20 + u00;
+  real u61 = u21 + u01;
+
+  real u70 = u50 + u30;
+  real u71 = u51 + u31;
+
+  real b00 = x0[0] + u60 + u40;
+  real b01 = x0[1] + u61 + u41;
+
+  real b10 = C71*(u60 + u40);
+  real b11 = C71*(u61 + u41);
+  
+  real b20 = C72*(u00 - u40);
+  real b21 = C72*(u01 - u41);
+
+  real b30 = C73*(u40 - u20);
+  real b31 = C73*(u41 - u21);
+
+  real b40 = C74*(u20 - u00);
+  real b41 = C74*(u21 - u01);
+  
+  real b50;
+  real b51;
+  if(dir==1) {
+    b50 = C75*(u70 + u10);
+    b51 = C75*(u71 + u11);
+  } else {
+    b50 = -C75*(u70 + u10);
+    b51 = -C75*(u71 + u11);
+  }
+
+  real b60;
+  real b61;
+  if(dir==1) {
+    b60 = C76*(u10 - u50);
+    b61 = C76*(u11 - u51);
+  } else {
+    b60 = C76*(u50 - u10);
+    b61 = C76*(u51 - u11);
+  }
+  
+  real b70;
+  real b71;
+  if(dir==1) {
+    b70 = C77*(u50 - u30);
+    b71 = C77*(u51 - u31);
+  } else {
+    b70 = C77*(u30 - u50);
+    b71 = C77*(u31 - u51);
+  }
+
+  real b80;
+  real b81;
+  if(dir==1) {
+    b80 = C78*(u30 - u10);
+    b81 = C78*(u31 - u11);
+  } else {
+    b80 = C78*(u10 - u30);
+    b81 = C78*(u11 - u31);
+  }
+
+  real T00 = b00 + b10;
+  real T01 = b01 + b11;
+
+  real T10 = b20 + b30;
+  real T11 = b21 + b31;
+
+  real T20 = b40 - b30;
+  real T21 = b41 - b31;
+
+  real T30 = -b20 - b40;
+  real T31 = -b21 - b41;
+
+  real T40 = b60 + b70;
+  real T41 = b61 + b71;
+
+  real T50 = b80 - b70;
+  real T51 = b81 - b71;
+
+  real T60 = -b80 - b60;
+  real T61 = -b81 - b61;
+
+  real T70 = T00 + T10;
+  real T71 = T01 + T11;
+
+  real T80 = T00 + T20;
+  real T81 = T01 + T21;
+
+  real T90 = T00 + T30;
+  real T91 = T01 + T31;
+
+  real T100 = T40 + b50;
+  real T101 = T41 + b51;
+
+  real T110 = T50 + b50;
+  real T111 = T51 + b51;
+
+  real T120 = T60 + b50;
+  real T121 = T61 + b51;
+
+  x0[0] = b00;
+  x0[1] = b01;
+
+  real y10 = T70 + T101;
+  real y11 = T71 - T100;
+  real *t1 = t[n1];
+  real t10 = t1[0];
+  real t11 = t1[1];
+  x1[0] = REAL(t10,t11,y10,y11);
+  x1[1] = IMAG(t10,t11,y10,y11);
+
+  real y20 = T90 + T121;
+  real y21 = T91 - T120;
+  real *t2 = t[n1<<1];
+  real t20 = t2[0];
+  real t21 = t2[1];
+  x2[0] = REAL(t20,t21,y20,y21);
+  x2[1] = IMAG(t20,t21,y20,y21);
+
+  real y30 = T80 - T111;
+  real y31 = T81 + T110;
+  real *t3 = t[n1*3];
+  real t30 = t3[0];
+  real t31 = t3[1];
+  x3[0] = REAL(t30,t31,y30,y31);
+  x3[1] = IMAG(t30,t31,y30,y31);
+
+  real y40 = T80 + T111;
+  real y41 = T81 - T110;
+  real *t4 = t[n1<<2];
+  real t40 = t4[0];
+  real t41 = t4[1];
+  x4[0] = REAL(t40,t41,y40,y41);
+  x4[1] = IMAG(t40,t41,y40,y41);
+
+  real y50 = T90 - T121;
+  real y51 = T91 + T120;
+  real *t5 = t[n1*5];
+  real t50 = t5[0];
+  real t51 = t5[1];
+  x5[0] = REAL(t50,t51,y50,y51);
+  x5[1] = IMAG(t50,t51,y50,y51);
+
+  real y60 = T70 - T101;
+  real y61 = T71 + T100;
+  real *t6 = t[n1*6];
+  real t60 = t6[0];
+  real t61 = t6[1];
+  x6[0] = REAL(t60,t61,y60,y61);
+  x6[1] = IMAG(t60,t61,y60,y61);
+}
+
+}
diff --git a/lib-src/sbsms/src/fft.h b/lib-src/sbsms/src/fft.h
new file mode 100644
index 0000000..2bc11f0
--- /dev/null
+++ b/lib-src/sbsms/src/fft.h
@@ -0,0 +1,51 @@
+#ifndef FFT_H
+#define FFT_H
+
+#include "sbsms.h"
+
+namespace _sbsms_ {
+
+typedef real t_fft[2];
+
+typedef void (*fft_func)(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+
+struct fftplan {
+  fft_func *f;
+  int *order;
+  t_fft *reorder;
+  int *N1;
+  int *N2;
+  int N;
+  int n;
+  int dir;
+  real norm;
+  t_fft **t;
+};
+
+t_fft *make_fft_buf(int N);
+void free_fft_buf(t_fft *buf);
+fftplan *planFFT(int N);
+fftplan *planIFFT(int N);
+void destroy_fftplan(fftplan *plan);
+void FFT(fftplan *plan, t_fft *x);
+void IFFT(fftplan *plan, t_fft *x);
+
+void fft(fftplan *plan, t_fft *x, int r, int i);
+void optimizeFactors(int *f);
+int *getOrder(int n, int *N1, int *N2);
+t_fft **calcTwiddles(int n, int *N1, int *N2, int dir);
+fft_func *getFuncs(int *f);
+int *getN1(int *f, int N);
+int getNFactors(int *f);
+
+void fft2(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+void fft3(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+void fft4(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+void fft5(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+void fft6(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+void fft7(t_fft *x, int n1, int N1, int r, t_fft *t, int dir);
+
+}
+
+#endif
+
diff --git a/lib-src/sbsms/src/grain.cpp b/lib-src/sbsms/src/grain.cpp
new file mode 100644
index 0000000..022abb9
--- /dev/null
+++ b/lib-src/sbsms/src/grain.cpp
@@ -0,0 +1,182 @@
+#include <math.h>
+#include <cstdlib>
+#include <cstring>
+#include "grain.h"
+#include "sbsms.h"
+#include "defs.h"
+#include "real.h"
+
+#include <map>
+using namespace std;
+using namespace _sbsms_;
+
+map<int, map<int, map<real, real*> > > wwMap;
+map<int, map<int, map<real, audio*> > > peakMap;
+
+map<int, fftplan*> fftPlanMap;
+map<int, fftplan*> ifftPlanMap;
+
+long grain :: count = 0;
+
+grain* grain :: create(int N,real pad,int wintype)
+{
+  grain *g = new grain(N,pad,wintype);
+  
+  g->refCount = 0;
+  g->time = (audio*) malloc(N*sizeof(audio));
+  g->freq = (audio*) malloc(N*sizeof(audio));
+  return g;
+}
+
+void grain :: referenced(grain *g)
+{
+  g->refCount++;
+}
+
+void grain :: forget(grain *g)
+{
+  g->refCount--;
+  if(g->refCount <= 0) {
+    destroy(g);
+  }
+}
+
+void grain :: destroy(grain *g)
+{
+  free_audio_buf(g->time);
+  free_audio_buf(g->freq);
+  delete g;
+}
+
+grain :: grain(int N, real pad, int type)
+{ 
+  this->type = type;
+  this->N = N;
+  this->pad = pad;
+  calc_plans();
+  calc_windows();
+}
+
+void grain :: analyze() 
+{
+  for(int k=0;k<N;k++) {
+    for(int c=0;c<2;c++) {
+      freq[k][c] = time[k][c] * ww[k];
+    }
+  }
+  FFT(fftPlan,freq);
+}
+
+void grain :: synthesize() 
+{
+  memcpy(time,freq,N*sizeof(audio));
+
+  IFFT(ifftPlan,time);
+
+  real f = pad/(real)N;
+    
+  for(int c=0;c<2;c++) {
+    for(int k=0;k<N;k++) {
+      time[k][c] *= ww[k] * f;
+    }
+  }
+}
+
+void grain :: calc_plans()
+{
+  fftPlan = fftPlanMap[N];
+  if(fftPlan == NULL) {
+    fftPlanMap[N] = (fftPlan = planFFT(N)); 
+  }
+     
+  ifftPlan = ifftPlanMap[N];
+  if(ifftPlan == NULL) {
+    ifftPlanMap[N] = (ifftPlan = planIFFT(N)); 
+  }
+}
+ 
+void grain :: calc_windows() 
+{  
+  int N2 = round2int(N/pad);
+  ww = wwMap[type][N][pad];
+  if(ww == NULL) {
+    wwMap[type][N][pad] = (ww = (real*)calloc(N,sizeof(real)));   
+    for(int k=0;k<N2;k++) {
+      if(type==SBSMS_HANN)
+	ww[k+(N-N2)/2] = .5*(1.0 - cos((real)k/(real)N2*TWOPI));
+      else if(type==SBSMS_HAMMING)
+	ww[k+(N-N2)/2] = .53836 - .46164*cos((real)k/(real)N2*TWOPI);
+    }
+  }
+
+  peak = peakMap[type][N][pad];
+  if(peak == NULL) {
+    peakMap[type][N][pad] = (peak = (audio*) malloc(N*sizeof(audio)));
+    for(int k=0;k<N;k++) {
+      peak[k][0] = ww[k]/(real)(N2/2);
+      peak[k][1] = 0;
+    }
+    FFT(fftPlan,peak);
+  }
+}
+
+grain* grain :: upsample()
+{
+  grain *g2 = grain::create(2*N,pad,type);
+  grain *g = this;
+
+  for(int c=0;c<2;c++) {
+    for(int k=0;k<=N/2;k++)
+      g2->freq[k][c] = g->freq[k][c];
+
+    for(int k=N/2+1;k<=N/2+N;k++)
+      g2->freq[k][c] = 0;
+
+    for(int k=N/2+N+1;k<2*N;k++)
+      g2->freq[k][c] = g->freq[k-N][c];
+  }
+  return g2;
+}
+
+grain* grain :: downsample()
+{
+  grain *g2 = grain::create(N/2,pad,type);
+  grain *g = this;
+
+  for(int c=0;c<2;c++) {
+    for(int k=0;k<=N/4-1;k++)
+      g2->freq[k][c] = g->freq[k][c];
+    
+    g2->freq[N/4][c] = 0.5*(g->freq[N/4][c] + g->freq[N-N/4][c] );
+    
+    for(int k=N/4+1;k<N/2;k++)
+      g2->freq[k][c] = g->freq[k+N/2][c];
+  }
+
+  return g2;
+}
+
+grain *grain :: lpfilter()
+{
+  grain *g = this;
+  for(int c=0;c<2;c++) {
+    for(int k=N/4+1;k<=N-N/4-1;k++)
+      g->freq[k][c] = 0;
+  }
+  return this;
+}
+
+
+//destructive
+grain *grain :: hpfilter()
+{
+  grain *g = this;
+  for(int c=0;c<2;c++) {
+    for(int k=0;k<=N/4;k++)
+      g->freq[k][c] = 0;
+    
+    for(int k=N-N/4;k<N;k++)
+      g->freq[k][c] = 0;
+  }
+  return this;
+}
diff --git a/lib-src/sbsms/src/grain.h b/lib-src/sbsms/src/grain.h
new file mode 100644
index 0000000..3c805b2
--- /dev/null
+++ b/lib-src/sbsms/src/grain.h
@@ -0,0 +1,48 @@
+#ifndef GRAIN_H
+#define GRAIN_H
+
+#include "fft.h"
+#include "audio.h"
+#include "sbsms.h"
+
+#define SBSMS_HANN 0
+#define SBSMS_HAMMING 1
+
+namespace _sbsms_ {
+
+class grain {
+
+ public:
+
+  static long count;
+  static grain* create(int N, real pad, int wintype);
+  static void destroy(grain *g);
+  static void referenced(grain *g);
+  static void forget(grain *g);
+
+  t_fft *time;
+  t_fft *freq;
+  int N, type, h;
+  real pad;
+  int refCount;
+ 
+  void analyze();
+  void synthesize();
+
+  grain* upsample();
+  grain* downsample();
+  grain* lpfilter();
+  grain* hpfilter();
+  audio *peak;
+  
+ protected:
+  grain(int N,real q,int wintype);
+  void calc_windows();
+  void calc_plans();
+  real *ww;
+  fftplan *fftPlan, *ifftPlan;
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/import.cpp b/lib-src/sbsms/src/import.cpp
new file mode 100644
index 0000000..9154edd
--- /dev/null
+++ b/lib-src/sbsms/src/import.cpp
@@ -0,0 +1,48 @@
+#include <iostream>
+#include "sbsms.h"
+#include "import.h"
+#include "config.h"
+
+#include "pcm.h"
+#ifdef HAVE_MAD
+#include "mp3.h"
+#endif
+
+#include <map>
+#include <string>
+
+using namespace std;
+
+namespace _sbsms_ {
+string lower(string strToConvert)
+{
+  for(unsigned int i=0;i<strToConvert.length();i++) {
+    strToConvert[i] = tolower(strToConvert[i]);
+  }
+  return strToConvert;
+}
+ 
+AudioDecoder *import(const char *filename)
+{
+  string fname(filename);
+  int i = fname.find(".");
+  AudioDecoder *decoder = NULL;
+
+  if(i) {
+    string ext = fname.substr(i+1);
+    string extl = lower(ext);
+  
+    if(!extl.compare("wav") || !extl.compare("aif") || !extl.compare("aiff")) {
+      decoder = new PcmReader(filename);
+#ifdef HAVE_MAD
+    } else if (!extl.compare("mp3")) {
+      decoder = new MP3Reader(filename);
+#endif
+    } else {
+      perror("Error importing file");
+      return NULL;
+    }
+  }
+  return decoder;
+}
+}
diff --git a/lib-src/sbsms/src/import.h b/lib-src/sbsms/src/import.h
new file mode 100644
index 0000000..a27c977
--- /dev/null
+++ b/lib-src/sbsms/src/import.h
@@ -0,0 +1,23 @@
+#ifndef IMPORT_H
+#define IMPORT_H
+
+namespace _sbsms_ {
+
+typedef int (*audio_in_cb)(float *buf, long n, int Fs, void *data);
+
+class AudioDecoder {
+ public:
+  virtual long read(float *buf, long block_size) = 0 ;
+  virtual bool done() = 0;
+  virtual int getSampleRate() = 0;
+  virtual long getFrames() = 0;
+  virtual int getChannels() = 0;
+  virtual bool isError() = 0;
+  virtual ~AudioDecoder() {};
+};
+
+AudioDecoder *import(const char *filename);
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/mp3.cpp b/lib-src/sbsms/src/mp3.cpp
new file mode 100644
index 0000000..d10cf96
--- /dev/null
+++ b/lib-src/sbsms/src/mp3.cpp
@@ -0,0 +1,247 @@
+# include <stdio.h>
+//# include <unistd.h>
+# include <sys/stat.h>
+
+#include "mp3tech.h"
+#include "audio.h"
+#include "import.h"
+#include "audiobuffer.h"
+
+#include <iostream>
+#include <fstream>
+
+#include "mp3.h"
+
+namespace _sbsms_ {
+#define MP3_INPUT_BUFFER_SIZE 4096
+#define MP3_OUTPUT_BUFFER_SIZE 4096
+#define MP3_OUTPUT_OVERFLOW_BUFFER_SIZE 4096
+#define MP3_AUDIO_BUFFER_SIZE 65536
+
+using namespace std;
+
+static
+enum mad_flow input(void *_data,
+		    struct mad_stream *stream)
+{
+  MP3Reader *data = (MP3Reader*) _data;
+  long input_buffer_size = MP3_INPUT_BUFFER_SIZE;
+
+  if(data->file->eof()) {
+    data->rb->writingComplete();
+    return MAD_FLOW_STOP;
+  }
+
+   /* "Each time you refill your buffer, you need to preserve the data in
+    *  your existing buffer from stream.next_frame to the end.
+    *
+    *  This usually amounts to calling memmove() on this unconsumed portion
+    *  of the buffer and appending new data after it, before calling
+    *  mad_stream_buffer()"
+    *           -- Rob Leslie, on the mad-dev mailing list */
+
+  unsigned int unconsumedBytes;
+  if(stream->next_frame) {
+    unconsumedBytes = data->inputBuffer + input_buffer_size - stream->next_frame;
+    memmove(data->inputBuffer, stream->next_frame, unconsumedBytes);
+  }
+  else
+    unconsumedBytes = 0;
+
+  //use read instead of readsome so eof is reached
+  long start = data->file->tellg();
+  data->file->read((char*)data->inputBuffer + unconsumedBytes,
+		   (input_buffer_size - unconsumedBytes));
+  long end = data->file->tellg();
+  long read = end - start;
+
+  mad_stream_buffer(stream, data->inputBuffer, read + unconsumedBytes);
+  
+  return MAD_FLOW_CONTINUE;
+}
+
+
+inline float scale(mad_fixed_t sample)
+{
+   return (float) (sample / (float) (1L << MAD_F_FRACBITS));
+}
+
+static long copy_mad_audio(float *out, struct mad_pcm *pcm, unsigned int nsamples) 
+{
+  unsigned int nchannels = pcm->channels;
+
+  mad_fixed_t *ch;
+  ch = pcm->samples[0];
+  
+  for(unsigned int k = 0;k<nsamples;k++) {
+    out[2*k] = scale( *(ch++) ); 
+  }
+  if(nchannels==2) {
+    ch = pcm->samples[1];
+    for(unsigned int k = 0;k<nsamples;k++) {
+      out[2*k+1] = scale( *(ch++) ); 
+    }
+  } else {
+    ch = pcm->samples[0];
+    for(unsigned int k = 0;k<nsamples;k++) {
+      out[2*k+1] = scale( *(ch++) ); 
+    }
+  }
+  return nsamples;
+}
+
+/*
+ * This is the output callback function. It is called after each frame of
+ * MPEG audio data has been completely decoded. The purpose of this callback
+ * is to output (or play) the decoded PCM audio.
+ */
+
+static
+enum mad_flow output(void *_data,
+		     struct mad_header const *header,
+		     struct mad_pcm *pcm)
+{
+  MP3Reader *data = (MP3Reader*) _data;
+  data->channels = pcm->channels;
+  audio_in_cb cb = data->cb;
+  unsigned int nsamples = pcm->length;
+  float *out = data->getOutputBuffer(nsamples);
+  copy_mad_audio(out,pcm,nsamples);
+
+  if(cb) {
+    cb(out,nsamples,pcm->samplerate,data->data); 
+  }
+  return MAD_FLOW_CONTINUE;
+}
+
+/*
+ * This is the error callback function. It is called whenever a decoding
+ * error occurs. The error is indicated by stream->error; the list of
+ * possible MAD_ERROR_* errors can be found in the mad.h (or stream.h)
+ * header file.
+ */
+
+static
+enum mad_flow error(void *_data,
+		    struct mad_stream *stream,
+		    struct mad_frame *frame)
+{
+  fprintf(stderr, "decoding error 0x%04x (%s) at stream frame %u\n",
+	  stream->error, mad_stream_errorstr(stream),
+	  (unsigned int)stream->this_frame );
+
+  /* return MAD_FLOW_BREAK here to stop decoding (and propagate an error) */
+  return MAD_FLOW_CONTINUE;
+}
+
+
+
+/*
+ * It instantiates a decoder object and configures it with the input,
+ * output, and error callback functions above. A single call to
+ * mad_decoder_run() continues until a callback function returns
+ * MAD_FLOW_STOP (to stop decoding) or MAD_FLOW_BREAK (to stop decoding and
+ * signal an error).
+ */
+
+
+int read_cb(float *buf, long n, int Fs, void *data) 
+{
+  MP3Reader *decoder = (MP3Reader*)data;
+  return decoder->rb->write(buf,n);
+}
+
+void *mp3importThreadCB(void *data) 
+{
+  /* start decoding */
+  MP3Reader *reader = (MP3Reader*)data;
+  mad_decoder_run(&(reader->decoder), MAD_DECODER_MODE_SYNC);
+  reader->bDone = true;
+  return NULL;
+}
+
+long MP3Reader :: read(float *outputBuffer, long block_size) 
+{
+  // on first call, start the decoder
+  if(bFirst) {
+    bFirst = false;
+    this->data = this;
+    this->cb = read_cb;
+    pthread_create(&importThread, NULL, mp3importThreadCB, this);
+  }  
+
+  return rb->read(outputBuffer, block_size);
+}
+
+float* MP3Reader :: getOutputBuffer(long nsamples)
+{
+  return outputBuffer;
+}
+
+bool MP3Reader :: done()
+{
+  return bDone;
+}
+
+bool MP3Reader :: isError()
+{
+  return bError;
+}
+
+MP3Reader :: MP3Reader(const char *filename) 
+{
+  bError = false;
+  file = new ifstream();
+  file->open(filename, ios::in | ios::binary);
+  if (!file->is_open()) {
+    bError = true;
+  }
+
+  mp3info mp3;
+  mp3.file = fopen(filename,"rb");
+  mp3.filename = filename;
+  get_mp3_info(&mp3);
+  this->samples = mp3.samples;
+  this->sampleRate = mp3.sample_rate;
+  fclose(mp3.file);
+
+  this->n_done = 0;
+  this->bFirst = true;
+  this->bDone = false;
+
+  /* configure input, output, and error functions */
+  mad_decoder_init(&decoder, this,
+		   input, 0 /* header */, 0 /* filter */, output,
+		   error, 0 /* message */);
+
+  this->outputBuffer = new float[MP3_OUTPUT_BUFFER_SIZE<<1];
+  this->inputBuffer = new unsigned char [MP3_INPUT_BUFFER_SIZE];
+  this->rb = new AudioBuffer(MP3_AUDIO_BUFFER_SIZE,2);
+}
+
+long MP3Reader :: getFrames()
+{
+  return samples;
+}
+
+int MP3Reader :: getSampleRate()
+{
+  return sampleRate;
+}
+
+int MP3Reader :: getChannels()
+{
+  return 2;
+}
+
+MP3Reader :: ~MP3Reader()
+{
+  file->close();  
+  delete file;
+  mad_decoder_finish(&decoder);
+  delete outputBuffer;
+  delete inputBuffer; 
+  delete rb;
+}
+
+}
diff --git a/lib-src/sbsms/src/mp3.h b/lib-src/sbsms/src/mp3.h
new file mode 100644
index 0000000..6eb8da7
--- /dev/null
+++ b/lib-src/sbsms/src/mp3.h
@@ -0,0 +1,45 @@
+#ifndef MP3_H
+#define MP3_H
+
+#include <iostream>
+#include <fstream>
+#include "import.h"
+#include "mad.h"
+#include "audiobuffer.h"
+using namespace std;
+#include <pthread.h>
+
+namespace _sbsms_ {
+
+class MP3Reader : public AudioDecoder {
+ public:
+  MP3Reader(const char *filename);
+  ~MP3Reader();
+  bool isError();
+  long read(float *buf, long block_size);
+  int getSampleRate();
+  int getChannels();
+  long getFrames();
+  bool done();
+  float* getOutputBuffer(long nsamples);
+
+  bool bError;
+  int channels;
+  int sampleRate;
+  long samples;
+  float *outputBuffer;
+  unsigned char *inputBuffer;
+  bool bFirst;
+  long n_done;
+  AudioBuffer *rb;
+  bool bDone;
+  struct mad_decoder decoder;
+  pthread_t importThread;
+  ifstream *file;
+  audio_in_cb cb;
+  void *data;
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/mp3tech.cpp b/lib-src/sbsms/src/mp3tech.cpp
new file mode 100644
index 0000000..5711834
--- /dev/null
+++ b/lib-src/sbsms/src/mp3tech.cpp
@@ -0,0 +1,304 @@
+/*
+    mp3tech.c - Functions for handling MP3 files and most MP3 data
+                structure manipulation.
+
+    Copyright (C) 2000-2006 Cedric Tefft <cedric at phreaker.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+  ***************************************************************************
+
+  This file is based in part on:
+
+	* MP3Info 0.5 by Ricardo Cerqueira <rmc at rccn.net>
+	* MP3Stat 0.9 by Ed Sweetman <safemode at voicenet.com> and 
+			 Johannes Overmann <overmann at iname.com>
+
+*/
+
+#include "mp3tech.h"
+#include <sys/stat.h>
+#include <string.h>
+#include <ctype.h>
+
+namespace _sbsms_ {
+int layer_tab[4]= {0, 3, 2, 1};
+
+int frequencies[3][4] = {
+   {22050,24000,16000,50000},  /* MPEG 2.0 */
+   {44100,48000,32000,50000},  /* MPEG 1.0 */
+   {11025,12000,8000,50000}    /* MPEG 2.5 */
+};
+
+int bitrate[2][3][15] = { 
+  { /* MPEG 2.0 */
+    {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256},  /* layer 1 */
+    {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160},       /* layer 2 */
+    {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160}        /* layer 3 */
+
+  },
+
+  { /* MPEG 1.0 */
+    {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448}, /* layer 1 */
+    {0,32,48,56,64,80,96,112,128,160,192,224,256,320,384},    /* layer 2 */
+    {0,32,40,48,56,64,80,96,112,128,160,192,224,256,320}      /* layer 3 */
+  }
+};
+
+int frame_samples_index[] = {384,1152,1152};
+
+int frame_size_index[] = {24000, 72000, 72000};
+
+
+char *mode_text[] = {
+   "stereo", "joint stereo", "dual channel", "mono"
+};
+
+char *emphasis_text[] = {
+  "none", "50/15 microsecs", "reserved", "CCITT J 17"
+};
+
+
+int get_mp3_info(mp3info *mp3)
+{
+  int had_error = 0;
+  int frame_type[15]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+  int samples = 0;
+  int bitrate;
+  int frames=0,frame_types=0,frames_so_far=0;
+  int counter=0;
+  mp3header header;
+  struct stat filestat;
+  off_t data_start=0;
+
+  int scantype = SCAN_FULL;
+
+  stat(mp3->filename,&filestat);
+  mp3->datasize=filestat.st_size;
+  get_id3(mp3);
+
+  if(scantype == SCAN_FULL) {
+    if(get_first_header(mp3,0L)) {
+      data_start=ftell(mp3->file);
+      while((bitrate=get_next_header(mp3))) {
+	frame_type[15-bitrate]++;
+	frames++;
+      }
+      memcpy(&header,&(mp3->header),sizeof(mp3header));
+      for(counter=0;counter<15;counter++) {
+	if(frame_type[counter]) {
+	  frame_types++;
+	  header.bitrate=counter;
+	  frames_so_far += frame_type[counter];
+	  samples += frame_samples(&mp3->header)*frame_type[counter];
+	  mp3->sample_rate = header_frequency(&mp3->header);
+	}
+      }
+      mp3->samples = samples - frame_samples_index[2];
+    }
+  }
+ 
+  return had_error;
+}
+
+
+int get_first_header(mp3info *mp3, long startpos) 
+{
+  int k, l=0,c;
+  mp3header h, h2;
+  long valid_start=0;
+  
+  fseek(mp3->file,startpos,SEEK_SET);
+  while (1) {
+    while((c=fgetc(mp3->file)) != 255 && (c != EOF));
+    if(c == 255) {
+      ungetc(c,mp3->file);
+      valid_start=ftell(mp3->file);
+      if((l=get_header(mp3->file,&h))) {
+	fseek(mp3->file,l-FRAME_HEADER_SIZE,SEEK_CUR);
+	for(k=1; (k < MIN_CONSEC_GOOD_FRAMES) && (mp3->datasize-ftell(mp3->file) >= FRAME_HEADER_SIZE); k++) {
+	  if(!(l=get_header(mp3->file,&h2))) break;
+	  if(!sameConstant(&h,&h2)) break;
+	  fseek(mp3->file,l-FRAME_HEADER_SIZE,SEEK_CUR);
+	}
+	if(k == MIN_CONSEC_GOOD_FRAMES) {
+	  fseek(mp3->file,valid_start,SEEK_SET);
+	  memcpy(&(mp3->header),&h2,sizeof(mp3header));
+	  mp3->header_isvalid=1;
+	  return 1;
+	} 
+      }
+    } else {
+      return 0;
+    }
+  }
+  
+  return 0;  
+}
+
+/* get_next_header() - read header at current position or look for 
+   the next valid header if there isn't one at the current position
+*/
+int get_next_header(mp3info *mp3) 
+{
+  int l=0,c,skip_bytes=0;
+  mp3header h;
+  
+  while(1) {
+    while((c=fgetc(mp3->file)) != 255 && (ftell(mp3->file) < mp3->datasize)) skip_bytes++;
+    if(c == 255) {
+      ungetc(c,mp3->file);
+      if((l=get_header(mp3->file,&h))) {
+	fseek(mp3->file,l-FRAME_HEADER_SIZE,SEEK_CUR);
+	return 15-h.bitrate;
+      } else {
+	skip_bytes += FRAME_HEADER_SIZE;
+      }
+    } else {
+      return 0;
+    }
+  }
+}
+
+/* Get next MP3 frame header.
+   Return codes:
+   positive value = Frame Length of this header
+   0 = No, we did not retrieve a valid frame header
+*/
+
+int get_header(FILE *file,mp3header *header)
+{
+  unsigned char buffer[FRAME_HEADER_SIZE];
+  int fl;
+  
+  if(fread(&buffer,FRAME_HEADER_SIZE,1,file)<1) {
+    header->sync=0;
+    return 0;
+  }
+  header->sync=(((int)buffer[0]<<4) | ((int)(buffer[1]&0xE0)>>4));
+  if(buffer[1] & 0x10) header->version=(buffer[1] >> 3) & 1;
+  else header->version=2;
+  header->layer=(buffer[1] >> 1) & 3;
+  header->bitrate=(buffer[2] >> 4) & 0x0F;
+  if((header->sync != 0xFFE) || (header->layer != 1) || (header->bitrate == 0xF)) {
+    header->sync=0;
+    return 0;
+  }
+  header->crc=buffer[1] & 1;
+  header->freq=(buffer[2] >> 2) & 0x3;
+  header->padding=(buffer[2] >>1) & 0x1;
+  header->extension=(buffer[2]) & 0x1;
+  header->mode=(buffer[3] >> 6) & 0x3;
+  header->mode_extension=(buffer[3] >> 4) & 0x3;
+  header->copyright=(buffer[3] >> 3) & 0x1;
+  header->original=(buffer[3] >> 2) & 0x1;
+  header->emphasis=(buffer[3]) & 0x3;
+  
+  /* Final sanity checks: bitrate 1111b and frequency 11b are reserved (invalid) */
+  if (header->bitrate == 0x0F || header->freq == 0x3) {
+    return 0;
+  }
+  
+  return ((fl=frame_length(header)) >= MIN_FRAME_SIZE ? fl : 0); 
+}
+
+int frame_samples(mp3header *header) {
+  return frame_samples_index[3-header->layer];
+}
+
+int frame_length(mp3header *header) {
+  return header->sync == 0xFFE ? 
+    (frame_size_index[3-header->layer]*((header->version&1)+1)*
+     header_bitrate(header)/header_frequency(header))+
+    header->padding : 1;
+}
+
+int header_layer(mp3header *h) {return layer_tab[h->layer];}
+
+int header_bitrate(mp3header *h) {
+  return bitrate[h->version & 1][3-h->layer][h->bitrate];
+}
+
+int header_frequency(mp3header *h) {
+  return frequencies[h->version][h->freq];
+}
+
+char *header_emphasis(mp3header *h) {
+  return emphasis_text[h->emphasis];
+}
+
+char *header_mode(mp3header *h) {
+  return mode_text[h->mode];
+}
+
+int sameConstant(mp3header *h1, mp3header *h2) {
+  if((*(uint*)h1) == (*(uint*)h2)) return 1;
+  
+  if((h1->version       == h2->version         ) &&
+     (h1->layer         == h2->layer           ) &&
+     (h1->crc           == h2->crc             ) &&
+     (h1->freq          == h2->freq            ) &&
+     (h1->mode          == h2->mode            ) &&
+     (h1->copyright     == h2->copyright       ) &&
+     (h1->original      == h2->original        ) &&
+     (h1->emphasis      == h2->emphasis        )) 
+    return 1;
+  else return 0;
+}
+
+
+int get_id3(mp3info *mp3) {
+  int retcode=0;
+  char fbuf[4];
+  
+  if(mp3->datasize >= 128) {
+    if(fseek(mp3->file, -128, SEEK_END )) {
+      fprintf(stderr,"ERROR: Couldn't read last 128 bytes of %s!!\n",mp3->filename);
+      retcode |= 4;
+    } else {
+      fread(fbuf,1,3,mp3->file); fbuf[3] = '\0';
+      mp3->id3.genre[0]=255;
+      
+      if (!strcmp((const char *)"TAG",(const char *)fbuf)) {
+	mp3->id3_isvalid=1;
+	mp3->datasize -= 128;
+	fseek(mp3->file, -125, SEEK_END);
+	fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0';
+	fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0';
+	fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0';
+	fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0';
+	fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0';
+	if(mp3->id3.comment[28] == '\0') {
+	  mp3->id3.track[0] = mp3->id3.comment[29];
+	}
+	fread(mp3->id3.genre,1,1,mp3->file);
+	unpad(mp3->id3.title);
+	unpad(mp3->id3.artist);
+	unpad(mp3->id3.album);
+	unpad(mp3->id3.year);
+	unpad(mp3->id3.comment);
+      }
+    }
+  }
+  return retcode;
+}
+
+char *unpad(char *string) {
+  char *pos=string+strlen(string)-1;
+  while(isspace(pos[0])) (pos--)[0]=0;
+  return string;
+}
+
+}
\ No newline at end of file
diff --git a/lib-src/sbsms/src/mp3tech.h b/lib-src/sbsms/src/mp3tech.h
new file mode 100644
index 0000000..c3923af
--- /dev/null
+++ b/lib-src/sbsms/src/mp3tech.h
@@ -0,0 +1,103 @@
+/*
+    mp3tech.h - Headers for mp3tech.c
+
+    Copyright (C) 2000-2006 Cedric Tefft <cedric at phreaker.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+  ***************************************************************************
+
+  This file is based in part on:
+
+	* MP3Info 0.5 by Ricardo Cerqueira <rmc at rccn.net>
+	* MP3Stat 0.9 by Ed Sweetman <safemode at voicenet.com> and 
+			 Johannes Overmann <overmann at iname.com>
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+namespace _sbsms_ {
+
+typedef unsigned int uint;
+
+/* MIN_CONSEC_GOOD_FRAMES defines how many consecutive valid MP3 frames
+   we need to see before we decide we are looking at a real MP3 file */
+#define MIN_CONSEC_GOOD_FRAMES 4
+#define FRAME_HEADER_SIZE 4
+#define MIN_FRAME_SIZE 21
+#define NUM_SAMPLES 4
+
+enum VBR_REPORT { VBR_VARIABLE, VBR_AVERAGE, VBR_MEDIAN };
+enum SCANTYPE { SCAN_NONE, SCAN_QUICK, SCAN_FULL };
+
+typedef struct {
+	unsigned long	sync;
+	unsigned int	version;
+	unsigned int	layer;
+	unsigned int	crc;
+	unsigned int	bitrate;
+	unsigned int	freq;
+	unsigned int	padding;
+	unsigned int	extension;
+	unsigned int	mode;
+	unsigned int	mode_extension;
+	unsigned int	copyright;
+	unsigned int	original;
+	unsigned int	emphasis;
+} mp3header;
+
+typedef struct {
+	char title[31];
+	char artist[31];
+	char album[31];
+	char year[5];
+	char comment[31];
+	unsigned char track[1];
+	unsigned char genre[1];
+} id3tag;
+
+class mp3info {
+public:
+  const char *filename;
+  FILE *file;
+  off_t datasize;
+  int header_isvalid;
+  mp3header header;
+  int id3_isvalid;
+  id3tag id3;
+  int samples;
+  int sample_rate;
+};
+
+
+int get_header(FILE *file,mp3header *header);
+int frame_samples(mp3header *header);
+int frame_length(mp3header *header);
+int header_layer(mp3header *h);
+int header_bitrate(mp3header *h);
+int sameConstant(mp3header *h1, mp3header *h2);
+int get_mp3_info(mp3info *mp3);
+int get_id3(mp3info *mp3);
+int header_frequency(mp3header *h);
+char *header_emphasis(mp3header *h);
+char *header_mode(mp3header *h);
+int get_first_header(mp3info *mp3,long startpos);
+int get_next_header(mp3info *mp3);
+char *unpad(char *string);
+
+}
diff --git a/lib-src/sbsms/src/pcm.cpp b/lib-src/sbsms/src/pcm.cpp
new file mode 100644
index 0000000..312e559
--- /dev/null
+++ b/lib-src/sbsms/src/pcm.cpp
@@ -0,0 +1,125 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "pcm.h"
+#include "utils.h"
+
+namespace _sbsms_ {
+long PcmReader :: read(float *buf, long block_size) {
+  if(info.channels == 1) {
+    float srcbuf[2*PCM_READ_BUF_SIZE];
+    long nread = -1;
+    long nreadTotal = 0;
+    while(nreadTotal < block_size && nread) {
+      long ntoread = min((long)PCM_READ_BUF_SIZE,block_size-nreadTotal);
+      nread = sf_readf_float(in, srcbuf, ntoread);
+      for(int i=0;i<nread;i++) {
+	int i2 = (nreadTotal+i)<<1;
+	buf[i2] = buf[i2+1] = srcbuf[i];
+      }
+      nreadTotal += nread;
+    }
+    if(nreadTotal == 0)
+      bDone = true;
+    return nreadTotal;
+  } else if(info.channels == 2) {
+    long nread = sf_readf_float(in, buf, block_size);
+    if(nread == 0)
+      bDone = true;
+    return nread;
+  } else {
+    abort();
+	return 0;
+  }
+}
+
+bool PcmReader :: done()
+{
+  return bDone;
+}
+
+PcmReader :: PcmReader(const char *filename) 
+{
+  total = 0;
+  bDone = false;
+  in = sf_open(filename, SFM_READ, &info);
+  
+  bError = false;
+  if (!in) {
+    perror("cannot open file for reading");
+    bError = true;
+  }
+}
+
+bool PcmReader :: isError()
+{
+  return bError;
+}
+
+int PcmReader :: getSampleRate()
+{
+  return info.samplerate;
+}
+
+long PcmReader :: getFrames()
+{
+  return info.frames;
+}
+
+int PcmReader :: getChannels()
+{
+  return info.channels;
+}
+
+PcmReader :: ~PcmReader() 
+{  
+  sf_close(in);
+}
+
+PcmWriter :: PcmWriter(const char *filename, long size, int samplerate, int channels) 
+{
+
+  total = 0;
+  info.format = SF_FORMAT_WAV | SF_FORMAT_FLOAT;
+  info.frames = size;
+  info.samplerate = samplerate;
+  info.channels = channels;
+  info.sections = 1;
+  info.seekable = 0;
+
+  if (!sf_format_check(&info))
+    info.format = (info.format & SF_FORMAT_TYPEMASK);
+
+  out = sf_open(filename, SFM_WRITE, &info);
+
+  bError = false;
+  if (!sf_format_check(&info)) {
+    bError = true;
+    perror("bad format for writing pcm");
+  }
+  if (!out) {
+    perror("cannot open file for writing");
+    bError = true;
+  }
+}
+
+bool PcmWriter :: isError()
+{
+  return bError;
+}
+
+long PcmWriter :: write(float *data, long n)
+{
+  return sf_writef_float(out, (float *)data, n);
+}
+ 
+PcmWriter :: ~PcmWriter()
+{
+}
+
+void PcmWriter :: close() 
+{
+  if(out) sf_close(out);
+}
+
+}
diff --git a/lib-src/sbsms/src/pcm.h b/lib-src/sbsms/src/pcm.h
new file mode 100644
index 0000000..ba13407
--- /dev/null
+++ b/lib-src/sbsms/src/pcm.h
@@ -0,0 +1,57 @@
+#ifndef PCM_H
+#define PCM_H
+
+#include "config.h"
+
+#ifdef HAVE_SNDFILE
+
+#include <sndfile.h>
+#include "import.h"
+
+namespace _sbsms_ {
+
+#define PCM_READ_BUF_SIZE 4096
+#define PCM_WRITE_BUF_SIZE 4096
+
+class PcmReader : public AudioDecoder {
+ public:
+  PcmReader(const char *filename);
+  ~PcmReader();
+  long decode(audio_in_cb, long block_size, void *data);
+  long read(float *buf, long block_size);
+  int getChannels();
+  int getSampleRate();
+  long getFrames();
+  bool isError();
+
+  bool done();
+
+ protected:
+  bool bError;
+  bool bDone;
+  long total;
+  SF_INFO info;
+  SNDFILE *in;
+};
+
+class PcmWriter  {
+ public:
+  PcmWriter(const char *filename,long,int,int);
+  ~PcmWriter();
+  long write(float *buf, long block_size);
+  void close();
+  bool isError();
+
+ protected:
+  bool bError;
+  long total;
+  SF_INFO info;
+  SNDFILE *out;
+
+};
+
+}
+
+#endif
+
+#endif
diff --git a/lib-src/sbsms/src/peak.cpp b/lib-src/sbsms/src/peak.cpp
new file mode 100644
index 0000000..8970465
--- /dev/null
+++ b/lib-src/sbsms/src/peak.cpp
@@ -0,0 +1,47 @@
+#include "peak.h"
+#include <stdlib.h>
+#include <string.h>
+
+namespace _sbsms_ {
+
+PeakAllocator :: PeakAllocator()
+{
+  size = 0;
+  count = 0;
+  peaks = NULL;
+}
+
+PeakAllocator :: ~PeakAllocator()
+{
+  if(peaks) free(peaks);
+}
+
+peak *PeakAllocator :: create() 
+{
+  if(count >= size) {
+    if(size == 0)
+      size = 1024;
+    else
+      size *= 2;
+    
+    peak *newpeaks = (peak*)malloc(size*sizeof(peak));
+    if(peaks) {
+      memcpy(newpeaks,peaks,count*sizeof(peak));
+      free(peaks);
+    }
+    peaks = newpeaks;
+  }
+  return peaks+(count++);
+}
+
+void PeakAllocator :: destroy(peak *p)
+{
+  count--;
+}
+
+void PeakAllocator :: destroyAll()
+{
+  count = 0;
+}
+
+}
diff --git a/lib-src/sbsms/src/peak.h b/lib-src/sbsms/src/peak.h
new file mode 100644
index 0000000..8727451
--- /dev/null
+++ b/lib-src/sbsms/src/peak.h
@@ -0,0 +1,41 @@
+#ifndef PEAK_H
+#define PEAK_H
+
+/* 
+Semantics are such that if destroy(p) or destroyAll() is called then all peaks create()'d after p are invalid.  It is OK to create() a peak, destroy it before calling create() again, then create() another, or to create() a set of peaks, then destroy them ALL in any order, and repeat.
+ */
+
+#include "sbsms.h"
+
+namespace _sbsms_ {
+
+class peak {
+ public:  
+  peak *tp;
+  peak *tn;
+  peak *tp2;
+  peak *tn2;
+  real x;
+  real y;
+  real y2;
+  int k;
+  real m;
+};
+
+class PeakAllocator {
+ public:
+  PeakAllocator();
+  ~PeakAllocator();
+  peak *create();
+  void destroy(peak *p);
+  void destroyAll();
+
+ protected:
+  long count;
+  long size;
+  peak *peaks;
+
+};
+}
+
+#endif
diff --git a/lib-src/sbsms/src/pitch.cpp b/lib-src/sbsms/src/pitch.cpp
new file mode 100644
index 0000000..ac61850
--- /dev/null
+++ b/lib-src/sbsms/src/pitch.cpp
@@ -0,0 +1,51 @@
+#include <stdlib.h>
+#include <string.h>
+#include "sbsms.h"
+
+using namespace _sbsms_;
+long pitchCB(void *cb_data, sbsms_resample_frame *frame) 
+{
+  pitcher *pitch = (pitcher*) cb_data;
+  long n_read = sbsms_read_frame(pitch->buf,pitch->sbsmsData,pitch->sbsmser,&(frame->ratio0),&(frame->ratio1));
+  frame->ratio0 *= pitch->ratio;
+  frame->ratio1 *= pitch->ratio;
+  frame->size = n_read;
+  frame->in = pitch->buf;
+  return n_read;
+}
+
+pitcher *pitch_create(sbsms *sbsmser, void *sbsmsData, real ratio)
+{
+  pitcher *pitch = (pitcher*)calloc(1,sizeof(pitcher));
+  pitch->ratio = ratio;
+  pitch->bufsize = sbsmser->bufsize;
+  pitch->buf = (audio*)calloc(pitch->bufsize,sizeof(audio));
+  pitch->postResampler = new Resampler(&pitchCB, pitch);
+  pitch->sbsmsData = sbsmsData;
+  pitch->sbsmser = sbsmser;
+  return pitch;
+}
+
+void pitch_destroy(pitcher *pitch) 
+{
+  delete pitch->postResampler;
+  free(pitch->buf);
+  free(pitch);
+}
+
+void pitch_reset(pitcher *pitch)
+{
+  pitch->postResampler->reset();
+}
+
+long pitch_process(audio *out, long n, pitcher *pitch)
+{
+  return pitch->postResampler->read(out, n);
+}
+
+long pitch_get_samples_queued(pitcher *pitch)
+{
+  long queued = sbsms_get_samples_queued(pitch->sbsmser);
+  long output = pitch->postResampler->samplesInOutput();
+  return queued + output;
+}
diff --git a/lib-src/sbsms/src/play.cpp b/lib-src/sbsms/src/play.cpp
new file mode 100644
index 0000000..2e5fdab
--- /dev/null
+++ b/lib-src/sbsms/src/play.cpp
@@ -0,0 +1,485 @@
+#include "config.h"
+#ifdef HAVE_PORTAUDIO
+
+#include "sbsms.h"
+#include "play.h"
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "audiobuffer.h"
+
+void *writeThreadCB(void *data) {
+  sbsmsplayer *player = (sbsmsplayer*)data;
+  
+  while(player->isPlaying()) {
+    player->writeframe();
+  }
+
+  player->rb->flush();
+  player->rb->writingComplete();
+  pitch_reset(player->pitch);
+  sbsms_reset(player->sbsmser);
+  pthread_exit(NULL);
+  return NULL;
+}
+
+static int audioCB(const void *inputBuffer, void *outputBuffer,
+		   unsigned long framesPerBuffer,
+		   const PaStreamCallbackTimeInfo* timeInfo,
+		   PaStreamCallbackFlags statusFlags,
+		   void *userData )
+{
+  sbsmsplayer *player = (sbsmsplayer*)userData;
+  float *out = (float*)outputBuffer;
+  int channels = player->channels;
+  unsigned long pos = 0;
+  long ret = player->isStarted()?1:0;
+  long chunk = framesPerBuffer;
+  while(pos<framesPerBuffer && ret) {
+    chunk = framesPerBuffer-pos;
+    ret = player->readframe(out+pos*channels,chunk);
+    pos += ret;
+  }
+  if(!ret) {
+    memset(out+pos*channels,0,sizeof(float)*chunk*channels);
+  }
+  return paContinue;
+}
+
+sbsmsplayer :: sbsmsplayer()
+{
+  init();
+  bLinear = false;
+}
+
+void sbsmsplayer :: init()
+{
+  rb = NULL;
+  fbuf = NULL;
+  abuf = NULL;
+  nullBuf = NULL;
+  sbsmsIn = NULL;
+  Fs = 44100;
+  sbsms_init(4096);
+  PaError err;
+  err = Pa_Initialize();
+  if( err != paNoError ) abort();
+  frameOffset = 0;
+  bPlaying = false;
+  bStarted = false;
+  bOpen = false;
+  stream = NULL;
+  bWriteThread = false;
+  pthread_mutex_init(&playMutex, NULL);
+  pthread_mutex_init(&writeMutex, NULL);
+  playPos = 0;
+  stopPos = 0;
+  volume = 0.9f;
+  rate = 1.0f;
+  ratio = 1.0f;
+}
+
+sbsmsplayer :: sbsmsplayer(const char *filenameIn, real stretch0, real stretch1, real ratio0, real ratio1)
+{
+  init();
+  si.stretch0 = stretch0;
+  si.stretch1 = stretch1;
+  si.ratio0 = ratio0;
+  si.ratio1 = ratio1;
+  bLinear = true;
+  open(filenameIn);
+}
+
+sbsmsplayer :: ~sbsmsplayer()
+{
+  PaError err;
+  err = Pa_Terminate();
+  if( err != paNoError ) abort();
+}
+
+void sbsmsplayer :: writeframe()
+{
+  long n_towrite = 0;
+  long n_todrop = 0;
+  if(pthread_mutex_lock(&writeMutex) == 0) {
+    frameSize = pitch_process(abuf, blockSize, pitch);
+    n_towrite = frameSize;
+    n_todrop = 0;
+    if(frameOffset) {
+      n_todrop = min(frameOffset,frameSize);
+      frameOffset -= n_todrop;
+      n_towrite -= n_todrop;
+    }
+
+    pthread_mutex_unlock(&writeMutex);
+    if(n_towrite) {
+      audio_convert_from(fbuf,0,abuf+n_todrop,0,n_towrite);
+      if(channels==1) {
+	for(int k=0;k<n_towrite;k++) {
+	  int k2 = k<<1;
+	  fbuf[k] = volume*fbuf[k2];
+	}
+      } else if(channels==2) {
+	for(int k=0;k<n_towrite;k++) {
+	  int k2 = k<<1;
+	  fbuf[k2] = volume*fbuf[k2];
+	  fbuf[k2+1] = volume*fbuf[k2+1];
+	}
+      }
+      rb->write(fbuf,n_towrite);
+    }
+  }
+
+}
+
+bool sbsmsplayer :: play()
+{
+  if(!bOpen) return false;
+  if(isPlaying()) {
+    return false;
+  }
+  bDonePlaying = false;
+  bPlaying = true;
+  stopPos = samplesOut;
+  int rc = pthread_create(&writeThread, NULL, writeThreadCB, (void*)this);
+  if(rc) {
+    fprintf(stderr,"ERROR; return code from pthread_create() is %d\n", rc);
+    exit(-1);
+  }
+  bWriteThread = true;
+  while(!rb->isFull()) {
+    Pa_Sleep(64);
+  }
+  bStarted = true;
+  return true;
+}
+
+bool sbsmsplayer :: pause()
+{
+  if(!isPlaying()) 
+    return false;
+  if(pthread_mutex_lock(&playMutex) == 0) {
+    stopPos = playPos;
+    pthread_mutex_unlock(&playMutex);
+  }
+  if(bWriteThread) {
+    pthread_join(writeThread,NULL);
+    bWriteThread = false;
+  }
+  bStarted = false;
+  bPlaying = false;
+  setPos(getPos());
+  return true;
+}
+
+void sbsmsplayer :: close()
+{
+  if(rb) { delete rb; rb = NULL; }
+  if(fbuf) { free(fbuf); fbuf = NULL; }
+  if(abuf) { free(abuf); abuf = NULL; }
+  if(nullBuf) { free(nullBuf); nullBuf = NULL; }
+  if(sbsmsIn) { fclose(sbsmsIn); sbsmsIn = NULL; }
+
+  if(stream) {
+    PaError err;
+    err = Pa_StopStream( stream );
+    if( err != paNoError ) abort();
+    err = Pa_CloseStream( stream );
+    if( err != paNoError ) abort();
+    stream = NULL;
+  }
+  vSamples.clear();
+  vSampleOffset.clear();
+  vByteOffset.clear();
+  bOpen = false;
+  bPlaying = false;
+  bStarted = false;
+}
+
+bool sbsmsplayer :: open(const char *filenameIn)
+{
+  sbsmsIn = sbsms_open_read(filenameIn);
+  if(!sbsmsIn) {
+    printf("Cannot open file %s\n",filenameIn);
+    return false;
+  }
+
+  samplesToProcess = sbsms_get_samples_to_process(sbsmsIn);
+  framesToProcess = sbsms_get_frames_to_process(sbsmsIn);
+  channels = sbsms_get_channels(sbsmsIn);
+  quality = sbsms_get_quality(sbsmsIn);
+  rb = new AudioBuffer(Fs/2,channels);
+  bDonePlaying = false;
+
+  if(bLinear) {
+    real stretch2;
+    if(si.stretch0 == si.stretch1)
+      stretch2 = 1.0/si.stretch0;
+    else
+      stretch2 = log(si.stretch1/si.stretch0)/(si.stretch1-si.stretch0);    
+    samplesOut = (long)(samplesToProcess * stretch2);
+    si.samplesToProcess = samplesToProcess;
+    si.samplesToGenerate = samplesOut;
+    sbsmser = sbsms_create(sbsmsIn,&stretchCBLinear,&ratioCBLinear);
+  } else {
+    samplesOut = samplesToProcess;
+    si.stretch0 = 1.0f;
+    si.ratio0 = 1.0f;
+    sbsmser = sbsms_create(sbsmsIn,&stretchCBConstant,&ratioCBConstant);
+    readFooter(sbsmsIn);
+  }
+  sbsms_seek_start_data(sbsmsIn);
+  pitch = pitch_create(sbsmser,&si,1.0);
+
+  fbuf = (float*)calloc(SBSMS_MAX_FRAME_SIZE[quality]*2,sizeof(float));
+  abuf = (audio*)calloc(SBSMS_MAX_FRAME_SIZE[quality],sizeof(audio));
+  nullBuf = (float*)calloc(SBSMS_MAX_FRAME_SIZE[quality]*2,sizeof(float));
+
+  blockSize = SBSMS_FRAME_SIZE[quality]; 
+
+  bOpen = true;
+  playPos = 0;
+  frameOffset = 0;
+  
+  PaError err;
+  PaStreamParameters outputParameters;
+  outputParameters.device = Pa_GetDefaultOutputDevice();
+  outputParameters.channelCount = channels;
+  outputParameters.sampleFormat = paFloat32;
+  outputParameters.suggestedLatency = .1;
+  outputParameters.hostApiSpecificStreamInfo = NULL;
+
+  PaStreamFlags flags = paNoFlag;
+
+  err = Pa_OpenStream( &stream,
+		       NULL,
+		       &outputParameters,
+		       Fs,
+		       blockSize,
+		       flags,
+		       audioCB,
+		       this);
+
+  if( err != paNoError ) {
+    printf("pa error %d\n",err);
+    exit(-1);
+  }
+
+  err = Pa_StartStream( stream );
+  
+  if( err != paNoError ) {
+    printf("pa error %d\n",err);
+    exit(-1);
+  }
+
+  setRate(rate);
+  setRatio(ratio);
+  
+  return true;
+}
+
+long sbsmsplayer :: readframe(float *buf, long n)
+{
+  long ret = 0;
+  if(pthread_mutex_lock(&playMutex) == 0) {
+    ret = rb->read(buf,n);
+    playPos += ret;
+    if(playPos >= stopPos) {
+      bPlaying = false;
+      bDonePlaying = true;
+    }
+    pthread_mutex_unlock(&playMutex);
+  }
+  return ret;
+}
+
+bool sbsmsplayer :: isStarted()
+{
+  return bStarted;
+}
+
+bool sbsmsplayer :: isPlaying()
+{  
+  return bPlaying;
+}
+
+bool sbsmsplayer :: isDonePlaying()
+{
+  return bDonePlaying;
+}
+
+real sbsmsplayer :: getPos()
+{
+  real pos = 0.0f;
+  if(pthread_mutex_lock(&playMutex) == 0) {
+    pos = (real)playPos/(real)samplesOut;
+    pthread_mutex_unlock(&playMutex);
+  }
+  return pos;
+}
+
+real sbsmsplayer :: getTime()
+{
+  real t = 0.0f;
+  if(pthread_mutex_lock(&playMutex) == 0) {
+    t = (real)playPos/(real)Fs;
+    pthread_mutex_unlock(&playMutex);
+  }
+
+  return t;
+}
+
+void sbsmsplayer :: readFooter(FILE *fp)
+{
+  long frames = sbsms_get_frames_to_process(fp);
+  long footerFrameSize = 2*sizeof(long);
+  long footerSize = frames*footerFrameSize;
+  fseek(fp,-footerSize,SEEK_END);
+  long samplesAcc = 0;
+  for(int k=0;k<frames;k++) {
+    long offset;
+    long samples;
+    fread(&offset,sizeof(long),1,fp);
+    fread(&samples,sizeof(long),1,fp);
+    vByteOffset.push_back(offset);
+    vSamples.push_back(samples);
+    vSampleOffset.push_back(samplesAcc);
+    samplesAcc += samples;
+  }
+}
+
+long sbsmsplayer :: getFrameIndexForSamplePos(long samplePos)
+{
+  if(samplePos<0) samplePos = 0;
+  else if(samplePos>=samplesToProcess) samplePos = samplesToProcess-1;
+  long i = vSampleOffset.size()>>1;
+  long imin = 0;
+  long imax = (long)vSampleOffset.size()-1;
+  bool bDone = false;
+  do {
+    bDone = (i==0 || i==(long)vSampleOffset.size()-1 || 
+	     (vSampleOffset[i]<=samplePos && vSampleOffset[i+1] > samplePos));
+    if(!bDone) {
+      if(vSampleOffset[i] < samplePos) {
+	imin = i;
+	if(imin+1==imax)
+	  i = imax;
+	else
+	  i = (imin+imax)>>1;
+      } else {
+	imax = i;
+	if(imin+1==imax)
+	  i = imin;
+	else
+	  i = (imin+imax)>>1;
+      }
+    }
+  } while(!bDone);
+  return i;
+}
+
+bool sbsmsplayer :: setPos(real pos)
+{
+  if(isPlaying())
+    return false;
+  
+  bDonePlaying = false;
+  bStarted = false;
+  if(bOpen) {
+    long samplePos = (long)(pos*samplesToProcess);
+    long i = getFrameIndexForSamplePos(samplePos);
+    if(bWriteThread) {
+      pthread_join(writeThread,NULL);
+      bWriteThread = false;
+    }
+    sbsms_seek(sbsmser,i,vSampleOffset[i]);
+    fseek(sbsmsIn,vByteOffset[i],SEEK_SET);
+    real stretch = 1.0f;
+    if(pthread_mutex_lock(&writeMutex) == 0) {
+      stretch = 1.0f/si.stretch0;
+      frameOffset = (long)(stretch*(real)(samplePos - vSampleOffset[i]));
+      pthread_mutex_unlock(&writeMutex);
+    }
+    if(pthread_mutex_lock(&playMutex) == 0) {
+      samplesOut =(long)(samplesToProcess*stretch);
+      stopPos = samplesOut;
+      playPos = (long)(pos*samplesToProcess*stretch);
+      pthread_mutex_unlock(&playMutex);
+    }
+  }
+  return true;
+}
+
+void sbsmsplayer :: setLength() 
+{
+  real stretch = 1.0f;
+  long nFramesQueued = 0;
+  long nSamplesQueued = 0;
+  long nSamplesReadable = 0;
+  long inputFrameSize = 0;
+  long framePos = 0;
+  if(pthread_mutex_lock(&writeMutex) == 0) {
+    stretch = 1.0f/si.stretch0;
+    nFramesQueued = sbsms_get_frames_queued(sbsmser);
+    nSamplesQueued = pitch_get_samples_queued(pitch);
+    nSamplesReadable = rb->n_readable();
+    inputFrameSize = sbsms_get_last_input_frame_size(sbsmser);
+    framePos = sbsms_get_frame_pos(sbsmser);
+    pthread_mutex_unlock(&writeMutex);
+  }
+
+  long nSamplesLeft = (long)((samplesToProcess-(framePos+nFramesQueued)*inputFrameSize)*stretch);
+  long newSamplesOut = playPos + nSamplesReadable + nSamplesQueued + nSamplesLeft;
+  if(pthread_mutex_lock(&playMutex) == 0) {
+    samplesOut = newSamplesOut;
+    stopPos = newSamplesOut;
+    pthread_mutex_unlock(&playMutex);
+  }
+}
+
+real sbsmsplayer :: getDuration()
+{
+  return (real)(samplesOut)/(real)(Fs);
+}
+
+void sbsmsplayer :: setVolume(real vol)
+{
+  this->volume = vol;
+}
+  
+void sbsmsplayer :: setRate(real rate)
+{
+  this->rate = rate;
+  if(pthread_mutex_lock(&writeMutex) == 0) {
+	this->si.stretch0 = rate;
+    pthread_mutex_unlock(&writeMutex);
+  }
+  setLength();
+}
+
+void sbsmsplayer :: setRatio(real ratio)
+{
+  this->ratio = ratio;
+  if(pthread_mutex_lock(&writeMutex) == 0) {	 
+    this->si.ratio0 = ratio;
+    this->si.ratio1 = ratio;
+    pthread_mutex_unlock(&writeMutex);
+  }
+}
+
+real sbsmsplayer :: getVolume()
+{
+  return volume;
+}
+
+real sbsmsplayer :: getRate()
+{
+  return rate;
+}
+
+real sbsmsplayer :: getRatio()
+{
+  return ratio;
+}
+
+#endif
diff --git a/lib-src/sbsms/src/play.h b/lib-src/sbsms/src/play.h
new file mode 100644
index 0000000..b9d6f9d
--- /dev/null
+++ b/lib-src/sbsms/src/play.h
@@ -0,0 +1,95 @@
+#include "config.h"
+#ifdef HAVE_PORTAUDIO
+
+#ifndef SBSMSPLAY_H
+#define SBSMSPLAY_H
+
+#include "portaudio.h"
+#include "audio.h"
+#include "utils.h"
+#include <pthread.h>
+#include "audiobuffer.h"
+#include <stdio.h>
+#include "sbsms.h"
+#include <vector>
+using namespace std;
+
+class sbsmsplayer {
+ public:
+  sbsmsplayer();
+  sbsmsplayer(const char *filenameIn, real stretch0, real stretch1, real ratio0, real ratio1);
+  ~sbsmsplayer();
+
+  bool play();
+  bool pause();
+  void close();
+  bool open(const char *filename);
+  real getPos();
+  bool setPos(real pos);
+  real getTime();
+  real getDuration();
+  void setVolume(real vol);
+  void setRate(real rate);
+  void setRatio(real ratio);
+  real getVolume();
+  real getRate();
+  real getRatio();
+  void readFooter(FILE *fp);
+  long getFrameIndexForSamplePos(long samplePos);
+  long readframe(float *buf, long n);
+  bool isPlaying();
+  bool isStarted();
+  bool isDonePlaying();
+  void writeframe();
+
+  int channels;
+  AudioBuffer *rb;
+  sbsms *sbsmser;
+  pitcher *pitch;
+
+ protected:
+  void setLength();
+  real ratio;
+  real volume;
+  real rate;
+  long playPos;
+  long stopPos;
+  long frameSize;
+  long frameOffset;
+  long samplesToProcess;
+  long framesToProcess;
+  long samplesOut;
+
+  bool bWriteThread;
+  bool bOpen;
+  bool bStarted;
+  bool bPlaying;
+  bool bDonePlaying;
+  bool bLinear;
+
+  FILE *sbsmsIn;
+  void init();
+  PaStream *stream;
+  int quality;
+  int Fs;
+  pthread_t writeThread;
+
+
+  pthread_mutex_t playMutex;
+  pthread_mutex_t writeMutex;
+
+  vector<long> vByteOffset;
+  vector<long> vSampleOffset;
+  vector<long> vSamples;
+  
+  long blockSize;
+  float *fbuf;
+  audio *abuf;
+  float *nullBuf;
+  sbsmsInfo si;
+};
+
+
+#endif
+
+#endif
diff --git a/lib-src/sbsms/src/real.h b/lib-src/sbsms/src/real.h
new file mode 100644
index 0000000..c121b03
--- /dev/null
+++ b/lib-src/sbsms/src/real.h
@@ -0,0 +1,212 @@
+/*
+** Copyright (C) 2001-2003 Erik de Castro Lopo <erikd at mega-nerd.com>
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef REAL_H
+#define REAL_H
+
+/* Version 1.3 */
+
+
+/*============================================================================
+**	On Intel Pentium processors (especially PIII and probably P4), converting
+**	from float to int is very slow. To meet the C specs, the code produced by
+**	most C compilers targeting Pentium needs to change the FPU rounding mode
+**	before the float to int conversion is performed.
+**
+**	Changing the FPU rounding mode causes the FPU pipeline to be flushed. It
+**	is this flushing of the pipeline which is so slow.
+**
+**	Fortunately the ISO C99 specifications define the functions lrint, lrintf,
+**	llrint and llrintf which fix this problem as a side effect.
+**
+**	On Unix-like systems, the configure process should have detected the
+**	presence of these functions. If they weren't found we have to replace them
+**	here with a standard C cast.
+*/
+
+/*
+**	The C99 prototypes for lrint and lrintf are as follows:
+**
+**		long int lrintf (float x) ;
+**		long int lrint  (double x) ;
+*/
+
+#include "config.h"
+#include "sbsms.h"
+
+/*
+**	The presence of the required functions are detected during the configure
+**	process and the values HAVE_LRINT and HAVE_LRINTF are set accordingly in
+**	the config.h file.
+*/
+
+#define		HAVE_LRINT_REPLACEMENT	0
+
+#if (HAVE_LRINT && HAVE_LRINTF)
+
+	/*
+	**	These defines enable functionality introduced with the 1999 ISO C
+	**	standard. They must be defined before the inclusion of math.h to
+	**	engage them. If optimisation is enabled, these functions will be
+	**	inlined. With optimisation switched off, you have to link in the
+	**	maths library using -lm.
+	*/
+
+	#define	_ISOC9X_SOURCE	1
+	#define _ISOC99_SOURCE	1
+
+	#define	__USE_ISOC9X	1
+	#define	__USE_ISOC99	1
+
+	#include	<math.h>
+
+#elif (defined (WIN32) || defined (_WIN32))
+
+	#undef		HAVE_LRINT_REPLACEMENT
+	#define		HAVE_LRINT_REPLACEMENT	1
+	#include	<math.h>
+
+	/*
+	**	Win32 doesn't seem to have these functions.
+	**	Therefore implement inline versions of these functions here.
+	*/
+
+	__inline long int
+	lrint (double flt)
+	{	int intgr ;
+
+		_asm
+		{	fld flt
+			fistp intgr
+			} ;
+
+		return intgr ;
+	}
+
+	__inline long int
+	lrintf (float flt)
+	{	int intgr ;
+
+		_asm
+		{	fld flt
+			fistp intgr
+			} ;
+
+		return intgr ;
+	}
+
+#elif (defined (__MWERKS__) && defined (macintosh))
+
+	/* This MacOS 9 solution was provided by Stephane Letz */
+
+	#undef		HAVE_LRINT_REPLACEMENT
+	#define		HAVE_LRINT_REPLACEMENT	1
+	#include	<math.h>
+
+	#undef	lrint
+	#undef	lrintf
+
+	#define	lrint	double2int
+	#define	lrintf	float2int
+
+	inline int
+	float2int (register float in)
+	{	long res [2] ;
+
+		asm
+		{	fctiw	in, in
+			stfd	 in, res
+		}
+		return res [1] ;
+	} /* float2int */
+
+	inline int
+	double2int (register double in)
+	{	long res [2] ;
+
+		asm
+		{	fctiw	in, in
+			stfd	 in, res
+		}
+		return res [1] ;
+	} /* double2int */
+
+#elif (defined (__MACH__) && defined (__APPLE__))
+
+	/* For Apple MacOSX. */
+
+	#undef		HAVE_LRINT_REPLACEMENT
+	#define		HAVE_LRINT_REPLACEMENT	1
+	#include	<math.h>
+
+	#undef lrint
+	#undef lrintf
+
+	#define lrint	double2int
+	#define lrintf	float2int
+
+	inline static long int
+	float2int (register float in)
+	{	int res [2] ;
+
+		__asm__ __volatile__
+		(	"fctiw	%1, %1\n\t"
+			"stfd	%1, %0"
+			: "=m" (res)	/* Output */
+			: "f" (in)		/* Input */
+			: "memory"
+			) ;
+
+		return res [1] ;
+	} /* lrintf */
+
+	inline static long int
+	double2int (register double in)
+	{	int res [2] ;
+
+		__asm__ __volatile__
+		(	"fctiw	%1, %1\n\t"
+			"stfd	%1, %0"
+			: "=m" (res)	/* Output */
+			: "f" (in)		/* Input */
+			: "memory"
+			) ;
+
+		return res [1] ;
+	} /* lrint */
+
+#else
+	#ifndef __sgi
+	#warning "Don't have the functions lrint() and lrintf()."
+	#warning "Replacing these functions with a standard C cast."
+	#endif
+
+	#include	<math.h>
+
+	#define	lrint(dbl)		((long) (dbl))
+	#define	lrintf(flt)		((long) (flt))
+
+#endif
+
+#ifdef SBSMS_REAL_FLOAT
+#define round2int(x) lrintf(x)
+#else
+#define round2int(x) lrint(x)
+#endif
+
+#endif
diff --git a/lib-src/sbsms/src/resample.cpp b/lib-src/sbsms/src/resample.cpp
new file mode 100644
index 0000000..f3ea4e5
--- /dev/null
+++ b/lib-src/sbsms/src/resample.cpp
@@ -0,0 +1,226 @@
+#include "sbsms.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include "sincCoeffs.h"
+#include "real.h"
+#include "utils.h"
+
+using namespace _sbsms_;
+
+#define SBSMS_RESAMPLE_CHUNK_SIZE ((long)8192)
+
+Resampler :: Resampler(sbsms_resample_cb cb, void *data)
+{
+  init();
+  this->cb = cb;
+  this->data = data;
+  bPull = true;
+  bInput = true;
+  frame.size = 0;
+}
+
+Resampler :: Resampler(SampleBuf *in, real ratio)
+{
+  init();
+  bPull = false;
+  this->in = in;
+  bInput = true;
+  frame.ratio0 = ratio;
+  frame.ratio1 = ratio;
+}
+
+void Resampler :: init()
+{
+  inOffset = 0;
+  startAbs = 0;
+  midAbs = 0;
+  endAbs = 0;
+  writePosAbs = 0;
+  midAbsf = 0.0;
+  out = new SampleBuf(0);
+  bWritingComplete = false;
+  sincZeros = SBSMS_SINC_SAMPLES;
+}
+
+void Resampler :: reset()
+{
+  delete out;
+  init();
+  frame.size = 0;
+  bInput = true;
+}
+
+long Resampler :: read(audio *audioOut, long samples)
+{
+  if(!bPull) {
+    frame.in = in->getReadBuf();
+    frame.size = in->n_readable();
+    if(frame.size) bInput = true;
+  }
+
+  long nRead = out->n_readable();
+  while(nRead < samples && bInput) {
+    if(bInput && inOffset == frame.size) {
+      if(!bPull) {
+	in->advance(frame.size);
+	bInput = false;
+      } else {
+	cb(data,&frame);
+	if(!frame.size) 
+	  bWritingComplete = true;
+      }
+      if(bWritingComplete) {
+	bInput = false;
+	out->grow(midAbs - writePosAbs);
+	out->writePos += midAbs - writePosAbs;
+	out->delay = 0;
+      }
+      inOffset = 0;
+    }
+    if(frame.size) {
+      real dratio = 1.0f/(real)frame.size*(frame.ratio1-frame.ratio0);
+
+      real ratio = frame.ratio0 + (real)inOffset*dratio;
+      real ratiorec = ratio<1.0f?1.0f:1.0f/ratio;
+      real f = ratiorec*SBSMS_SINC_RES;
+      int fi = round2int(f-0.5f);
+      real ff = f - fi;
+      if(ff<0.0f) {
+	ff += 1.0f;
+	fi--;
+      }
+      real scale = ratio<1.0f?ratio:1.0f;
+      int maxDist = round2int(sincZeros*ratio-0.5f);
+      // absolute start position
+      startAbs = max((long)0,midAbs-maxDist);
+      // samples to advance
+      long advance = max((long)0,startAbs - maxDist - writePosAbs);
+      writePosAbs += advance;
+      // absolute end position
+      endAbs = midAbs + maxDist;
+      // starting position in output
+      int start = startAbs - writePosAbs;
+      assert(start>=0);
+      // zero point in output
+      int mid = midAbs - writePosAbs;
+      // ending position in output
+      int end = endAbs - writePosAbs;
+      // provide extra delay for variable rate ratio
+      out->delay = maxDist<<1;
+      out->writePos += advance;
+
+      if(fabs(ratio-1.0f) < 1e-6f && fabs(dratio) < 1e-8f ) {
+	// how far ahead to write
+	int nAhead = mid+frame.size;
+	out->N = nAhead;
+	out->grow(nAhead);
+	long nWrite = min(SBSMS_RESAMPLE_CHUNK_SIZE,frame.size-inOffset);
+	for(int j=0;j<nWrite;j++) {
+	  out->buf[out->writePos+mid+j][0] += frame.in[j+inOffset][0];
+	  out->buf[out->writePos+mid+j][1] += frame.in[j+inOffset][1];
+	}
+	inOffset += nWrite;
+	midAbsf += ratio*nWrite;
+	int nWritten = round2int(midAbsf);
+	midAbsf -= nWritten;
+	midAbs += nWritten;
+      } else {
+	long nWrite = min(SBSMS_RESAMPLE_CHUNK_SIZE,frame.size-inOffset);
+	audio *i = &(frame.in[inOffset]);
+	for(int j=0;j<nWrite;j++) {
+	  // how far ahead to write
+	  int nAhead = end;
+	  out->N = nAhead;
+	  out->grow(nAhead);
+	  audio *o = &(out->buf[out->writePos+start]);
+	  real d = (start-mid-midAbsf)*f;
+	  int di = round2int(d-0.5f);
+	  real df = d-di;
+	  if(df<0.0f) {
+	    df += 1.0f;
+	    di--;
+	  }
+	  real i0 = (*i)[0];
+	  real i1 = (*i)[1];
+	  for(int k=start;k<end;k++) {
+	    int k0 = (di<0)?-di:di; 
+	    int k1 = (di<0)?k0-1:k0+1;
+	    real sinc;
+	    if(k1>=SBSMS_SINC_SIZE) {
+	      if(k0>=SBSMS_SINC_SIZE) {
+		sinc = 0.0f;
+	      } else {
+		sinc = scale*sincTable[k0];
+	      }
+	    } else if(k0>=SBSMS_SINC_SIZE) {
+	      sinc = scale*sincTable[k1];
+	    } else {
+	      sinc = scale*((1.0f-df)*sincTable[k0] + df*sincTable[k1]);
+	    }
+	    (*o)[0] += i0 * sinc;
+	    (*o)[1] += i1 * sinc;
+	    di += fi;
+	    df += ff;
+	    if(!(df<1.0f)) {
+	      df -= 1.0f;
+	      di++;
+	    }
+	    o++;
+	  }
+	  i++;
+	  midAbsf += ratio;
+	
+	  if(dratio != 0.0f) {
+	    ratio += dratio;
+	    ratiorec = ratio<1.0f?1.0f:1.0f/ratio;
+	    f = ratiorec*SBSMS_SINC_RES;
+	    fi = round2int(f-0.5f);
+	    ff = f - fi;
+	    if(ff<0.0f) {
+	      ff += 1.0f;
+	      fi--;
+	    }
+	    scale = ratio<1.0f?ratio:1.0f;
+	    maxDist = round2int(sincZeros*ratio-0.5f);
+	  }
+
+	  int nWritten = round2int(midAbsf);
+	  midAbsf -= nWritten;
+	  midAbs += nWritten;
+	  startAbs = max((long)0,midAbs-maxDist);
+	  endAbs = midAbs + maxDist;
+	  start = startAbs - writePosAbs;
+	  mid = midAbs - writePosAbs;
+	  end = endAbs - writePosAbs;
+	}
+	inOffset += nWrite;
+      }
+    }
+    nRead = out->n_readable();
+  }
+
+  nRead = min(samples,out->n_readable());
+  if(nRead) {
+    out->read(audioOut,nRead);
+    out->advance(nRead);
+  }
+
+  return nRead;
+}
+
+long Resampler :: samplesInOutput()
+{
+  long samplesFromBuffer = round2int(0.5f*(frame.ratio0+frame.ratio1)*(frame.size-inOffset));
+  return out->writePos + midAbs - writePosAbs - out->readPos + samplesFromBuffer;
+}
+
+void Resampler :: writingComplete()
+{
+  bWritingComplete = true;
+}
+
+Resampler :: ~Resampler()
+{
+  delete out;
+}
diff --git a/lib-src/sbsms/src/sbsms.cpp b/lib-src/sbsms/src/sbsms.cpp
new file mode 100644
index 0000000..7a5d4c3
--- /dev/null
+++ b/lib-src/sbsms/src/sbsms.cpp
@@ -0,0 +1,745 @@
+#include "sbsms.h"
+#include "real.h"
+#include "subband.h"
+#include "track.h"
+#include "utils.h"
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#ifdef MULTITHREADED
+#ifdef _WIN32
+#include <windows.h>
+#include <winbase.h>
+#else
+#include <unistd.h>
+#endif
+#include <pthread.h>
+#endif
+
+using namespace _sbsms_;
+
+real SBSMS_P1 = 2.0f;
+real SBSMS_Q1 = (4.0f/3.0f);
+int SBSMS_FRAME_SIZE[SBSMS_QUALITIES] = {512,512,512};
+int SBSMS_BANDS[SBSMS_QUALITIES] = {7,7,7};
+int SBSMS_MAX_FRAME_SIZE[SBSMS_QUALITIES] = {SBSMS_MAX_STRETCH*512,SBSMS_MAX_STRETCH*512,SBSMS_MAX_STRETCH*512};
+int SBSMS_H[SBSMS_QUALITIES][5] = {{8,12,16,24,32},{6,8,8,8,12},{4,6,8,12,16}};
+int SBSMS_M_MAX[SBSMS_QUALITIES] = {64,64,64};
+int SBSMS_RES[SBSMS_QUALITIES][SBSMS_MAX_BANDS]  = {{1,1,1,2,2,1,1}, {1,1,2,2,1,2,1}, {1,1,2,2,2,2,1}};
+real SBSMS_PAD[SBSMS_QUALITIES][SBSMS_MAX_BANDS]  = {{2,2,4,4,4,4,4},{2,2,4,4,4,4,6},{4,4,4,4,4,6}};
+int SBSMS_N[SBSMS_QUALITIES][SBSMS_MAX_BANDS] = {{384,384,576,480,384,288,252},{384,384,576,480,384,288,336},{768,768,576,480,384,288,288}};
+
+
+#ifdef MULTITHREADED
+
+struct assign_data {
+  sbsms *sbsmser;
+  int c;
+  bool bFirst;
+  bool bLast;
+};
+
+struct thread_data {
+  pthread_mutex_t writeMutex;
+  pthread_cond_t writeCond;
+
+  pthread_t addThread;
+  pthread_mutex_t addMutex;
+  pthread_cond_t addCond;
+  bool bAddThread;
+
+  pthread_t assignThread[2];
+  pthread_mutex_t assignMutex;
+  pthread_cond_t assignCond;
+  bool bAssignThread;
+  assign_data assignData[2];
+
+  pthread_t synthThread;
+  pthread_mutex_t synthMutex;
+  pthread_cond_t synthCond;
+  bool bSynthThread;
+
+  // hack to break out of possible (but very rare) deadlocks caused by checking 
+  // condition predicates after broadcasting conditions
+  pthread_t pollThread;
+  
+  bool bActive;
+};
+
+void *pollThreadCB(void *data) {
+  sbsms *sbsmser = (sbsms*)data;
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+  subband *top = sbsmser->top;
+  
+  while(threadData->bActive) {
+    if(top->isWriteReady()) {
+      pthread_mutex_lock(&threadData->writeMutex);
+      pthread_cond_broadcast(&threadData->writeCond);    
+      pthread_mutex_unlock(&threadData->writeMutex);
+    }
+    if(top->isAddReady()) {
+      pthread_mutex_lock(&threadData->addMutex);
+      pthread_cond_broadcast(&threadData->addCond);
+      pthread_mutex_unlock(&threadData->addMutex);
+    } 
+    if(top->isMarkReady()) {
+      pthread_mutex_lock(&threadData->assignMutex);
+      pthread_cond_broadcast(&threadData->assignCond);
+      pthread_mutex_unlock(&threadData->assignMutex);
+    }
+    if(top->isSynthReady()) {
+      if(threadData->bSynthThread) {
+	pthread_mutex_lock(&threadData->synthMutex);
+	pthread_cond_broadcast(&threadData->synthCond);
+	pthread_mutex_unlock(&threadData->synthMutex);
+      }
+      pthread_mutex_lock(&threadData->writeMutex);
+      pthread_cond_broadcast(&threadData->writeCond);
+      pthread_mutex_unlock(&threadData->writeMutex);
+    }
+#ifdef _WIN32
+    Sleep(100);
+#else
+    usleep(100000);
+#endif
+  }
+  
+  pthread_exit(NULL);
+  return NULL;
+}
+
+void *addThreadCB(void *data) {
+  sbsms *sbsmser = (sbsms*)data;
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+  subband *top = sbsmser->top;
+
+  while(threadData->bActive) {
+    if(!top->isAddReady()) {
+      pthread_mutex_lock(&threadData->addMutex);
+      pthread_cond_wait(&threadData->addCond,&threadData->addMutex);
+      pthread_mutex_unlock(&threadData->addMutex);
+    }
+    while(top->addInit(true)) {
+      top->addTrackPoints();
+      top->stepAddFrame();
+      if(top->isMarkReady()) {
+	pthread_mutex_lock(&threadData->assignMutex);
+	pthread_cond_broadcast(&threadData->assignCond);
+	pthread_mutex_unlock(&threadData->assignMutex);
+      }
+      if(top->isWriteReady()) {
+	pthread_mutex_lock(&threadData->writeMutex);
+	pthread_cond_broadcast(&threadData->writeCond);
+	pthread_mutex_unlock(&threadData->writeMutex);
+      }
+    }
+  }
+  pthread_exit(NULL);
+  return NULL;
+}
+
+void *assignThreadCB(void *data) {
+  assign_data *assignData = (assign_data*)data;
+  sbsms *sbsmser = assignData->sbsmser;
+  int c = assignData->c;
+  bool bFirst = assignData->bFirst;
+  bool bLast = assignData->bLast;
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+  subband *top = sbsmser->top;
+
+  while(threadData->bActive) {
+    if(!top->markInit(false,c)) {
+      pthread_mutex_lock(&threadData->assignMutex);
+      pthread_cond_wait(&threadData->assignCond,&threadData->assignMutex);
+      pthread_mutex_unlock(&threadData->assignMutex);
+    }
+    while(top->markInit(true,c)) {
+      top->markDuplicates(c);
+      top->stepMarkFrame(c);      
+      if(top->isAddReady()) {
+	pthread_mutex_lock(&threadData->addMutex);
+	pthread_cond_broadcast(&threadData->addCond);
+	pthread_mutex_unlock(&threadData->addMutex);
+      }
+    }      
+    while(top->assignInit(true,c)) {
+      top->assignTrackPoints(c);
+      top->advanceTrackPoints(c);
+      top->stepAssignFrame(c);
+      if(top->isSynthReady()) {
+	if(threadData->bSynthThread) {
+	  pthread_mutex_lock(&threadData->synthMutex);
+	  pthread_cond_broadcast(&threadData->synthCond);
+	  pthread_mutex_unlock(&threadData->synthMutex);
+	}
+	pthread_mutex_lock(&threadData->writeMutex);
+	pthread_cond_broadcast(&threadData->writeCond);
+	pthread_mutex_unlock(&threadData->writeMutex);
+      }
+    }	
+  }
+  pthread_exit(NULL);
+  return NULL;
+}
+
+void *synthThreadCB(void *data) {
+  sbsms *sbsmser = (sbsms*)data;
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+  subband *top = sbsmser->top;
+
+  while(threadData->bActive) {
+    if(!top->isSynthReady()) {
+      pthread_mutex_lock(&threadData->synthMutex);
+      pthread_cond_wait(&threadData->synthCond,&threadData->synthMutex);
+      pthread_mutex_unlock(&threadData->synthMutex);
+    }
+    while(top->synthInit(true)) {
+      top->synthTracks();
+      top->stepSynthFrame();
+      if(top->isAssignReady()) {
+	pthread_mutex_lock(&threadData->assignMutex);
+	pthread_cond_wait(&threadData->assignCond,&threadData->assignMutex);
+	pthread_mutex_unlock(&threadData->assignMutex);		
+      }
+    }
+  }
+  pthread_exit(NULL);
+  return NULL;
+}
+
+void sbsms_init_threads(sbsms *sbsmser, bool bAnalyze, bool bSynthesize)
+{
+  thread_data *threadData = (thread_data*)calloc(1,sizeof(thread_data));
+  sbsmser->threadData = threadData;
+  threadData->bActive = true;
+
+  pthread_cond_init(&threadData->writeCond, NULL);
+  pthread_mutex_init(&threadData->writeMutex, NULL);
+
+  if(bAnalyze) {
+    pthread_cond_init(&threadData->addCond, NULL);
+    pthread_mutex_init(&threadData->addMutex, NULL);
+    threadData->bAddThread = true;
+
+    pthread_cond_init(&threadData->assignCond, NULL);    
+    pthread_mutex_init(&threadData->assignMutex, NULL);
+    threadData->bAssignThread = true;
+
+    for(int c=0;c<sbsmser->channels;c++) {
+      threadData->assignData[c].sbsmser = sbsmser;
+      threadData->assignData[c].c = c;
+      threadData->assignData[c].bFirst = (c==0);
+      threadData->assignData[c].bLast = (c==sbsmser->channels-1);
+    }
+  } else {
+    threadData->bAddThread = false;
+    threadData->bAssignThread = false;
+  }
+
+  if(!bAnalyze) bSynthesize = false;
+
+  if(bSynthesize) {
+    pthread_cond_init(&threadData->synthCond, NULL);
+    pthread_mutex_init(&threadData->synthMutex, NULL);
+    threadData->bSynthThread = true;
+  } else {
+    threadData->bSynthThread = false;
+  }
+
+  if(bAnalyze) {
+    pthread_create(&threadData->addThread, NULL, addThreadCB, (void*)sbsmser);
+    for(int c=0;c<sbsmser->channels;c++) {
+      pthread_create(&threadData->assignThread[c], NULL, assignThreadCB, (void*)(&threadData->assignData[c]));
+    }
+  }
+  if(bSynthesize) {
+    pthread_create(&threadData->synthThread, NULL, synthThreadCB, (void*)sbsmser);
+  }
+
+  pthread_create(&threadData->pollThread, NULL, pollThreadCB, (void*)sbsmser);
+}
+
+void sbsms_destroy_threads(sbsms *sbsmser)
+{
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+  threadData->bActive = false;
+  if(threadData->bAddThread) {
+    pthread_mutex_lock(&threadData->addMutex);
+    pthread_cond_broadcast(&threadData->addCond);
+    pthread_mutex_unlock(&threadData->addMutex);
+    pthread_join(threadData->addThread,NULL);
+  }
+  if(threadData->bAssignThread) {
+    pthread_mutex_lock(&threadData->assignMutex);
+    pthread_cond_broadcast(&threadData->assignCond);
+    pthread_mutex_unlock(&threadData->assignMutex);
+    for(int c=0;c<sbsmser->channels;c++) {
+      pthread_join(threadData->assignThread[c],NULL);
+    }
+  }
+  if(threadData->bSynthThread) {
+    pthread_mutex_lock(&threadData->synthMutex);
+    pthread_cond_broadcast(&threadData->synthCond);
+    pthread_mutex_unlock(&threadData->synthMutex);
+    pthread_join(threadData->synthThread,NULL);
+  }
+  pthread_join(threadData->pollThread,NULL);
+}
+#else
+void sbsms_init_threads(sbsms *sbsmser, bool bAnalyze, bool bSynthesize)
+{
+  sbsmser->threadData = NULL;
+}
+void sbsms_destroy_threads(sbsms *sbsmser)
+{
+}
+#endif
+
+void sbsms_init(int n) {
+  cosinit(n);
+}
+
+void sbsms_private_init(sbsms *sbsmser, bool bAnalyze, bool bSynthesize)
+{
+  sbsmser->bufsize = SBSMS_MAX_FRAME_SIZE[sbsmser->quality];
+  sbsmser->chunksize = SBSMS_FRAME_SIZE[sbsmser->quality];
+  sbsmser->n_postpad = LONG_MAX;
+  sbsmser->ina = make_audio_buf(sbsmser->bufsize);
+  sbsms_init_threads(sbsmser,bAnalyze,bSynthesize);
+}
+
+void sbsms_reset(sbsms *sbsmser)
+{
+  sbsmser->ta->init();
+  sbsmser->n_processed = 0;
+  sbsmser->bWritingComplete = false;
+  if(sbsmser->getSamplesCB) {
+    sbsmser->n_prepad = SBSMS_N[sbsmser->quality][SBSMS_BANDS[sbsmser->quality]-1]*SBSMS_M_MAX[sbsmser->quality];
+    sbsmser->n_prespent = SBSMS_N[sbsmser->quality][SBSMS_BANDS[sbsmser->quality]-1]/SBSMS_H[sbsmser->quality][2]/2;
+  } else {
+    sbsmser->n_prepad = SBSMS_N[sbsmser->quality][SBSMS_BANDS[sbsmser->quality]-1]/SBSMS_H[sbsmser->quality][2]/2;
+    sbsmser->n_prespent = SBSMS_N[sbsmser->quality][SBSMS_BANDS[sbsmser->quality]-1]/SBSMS_H[sbsmser->quality][2]/2;
+  }
+  sbsmser->top->reset();
+}
+
+void sbsms_seek(sbsms *sbsmser, long framePos, long samplePos)
+{
+  sbsmser->n_processed = samplePos;
+  sbsmser->top->seek(framePos);
+}
+
+sbsms* sbsms_create(FILE *fp, sbsms_stretch_cb getStretchCB, sbsms_ratio_cb getRatioCB)
+{
+  sbsms *sbsmser = (sbsms*) calloc(1,sizeof(sbsms));
+  // samples, frames
+  fseek(fp,0,SEEK_SET);
+  long samples, frames;
+  fread(&samples,sizeof(long),1,fp);
+  fread(&frames,sizeof(long),1,fp);
+  fread(&(sbsmser->channels),sizeof(int),1,fp);
+  fread(&(sbsmser->quality),sizeof(int),1,fp);
+  unsigned short maxtrackindex;
+  fread(&maxtrackindex,sizeof(unsigned short),1,fp);
+  sbsmser->fp = fp;
+  sbsmser->getSamplesCB = NULL;
+  sbsmser->getStretchCB = getStretchCB;
+  sbsmser->getRatioCB = getRatioCB;
+  sbsmser->ta = new TrackAllocator(false,maxtrackindex);
+  sbsmser->pa = new PeakAllocator();
+  sbsmser->top = new subband(NULL,1,sbsmser->channels,sbsmser->quality,2,false,sbsmser->ta,sbsmser->pa);
+  sbsmser->top->setFramesInFile(frames);
+  sbsms_private_init(sbsmser,false,false);
+  sbsms_reset(sbsmser);
+  return sbsmser;
+}
+
+sbsms* sbsms_create(sbsms_cb getSamplesCB, sbsms_stretch_cb getStretchCB, sbsms_ratio_cb getRatioCB, int channels, int quality, bool bPreAnalyze, bool bSynthesize)
+{
+  sbsms *sbsmser = (sbsms*) calloc(1,sizeof(sbsms));
+  sbsmser->channels = channels;
+  sbsmser->quality = quality;
+  sbsmser->getSamplesCB = getSamplesCB;
+  sbsmser->getStretchCB = getStretchCB;
+  sbsmser->getRatioCB = getRatioCB;
+  sbsmser->ta = new TrackAllocator(true);
+  sbsmser->pa = new PeakAllocator();
+  sbsmser->top = new subband(NULL,1,sbsmser->channels,sbsmser->quality,6,bPreAnalyze,sbsmser->ta,sbsmser->pa);
+  sbsms_private_init(sbsmser,true,bSynthesize);
+  sbsms_reset(sbsmser);
+  return sbsmser;
+}
+
+void sbsms_destroy(sbsms* sbsmser)
+{
+  free_audio_buf((audio*)sbsmser->ina);
+  sbsms_destroy_threads(sbsmser);
+  if(sbsmser->threadData)
+    free(sbsmser->threadData);
+  delete sbsmser->top;
+  delete sbsmser->ta;
+  delete sbsmser->pa;
+  free(sbsmser);
+}
+
+void sbsms_pre_analyze_complete(sbsms *sbsmser) 
+{
+  sbsmser->top->preAnalyzeComplete();
+}
+
+long sbsms_pre_analyze(sbsms_cb getSamplesCB, void *data, sbsms *sbsmser)
+{
+  long n_towrite = 0;
+  real stretch = (sbsmser->getStretchCB)(sbsmser->n_processed,data);
+  real ratio = (sbsmser->getRatioCB)(sbsmser->n_processed,data);
+  real a = 1.0/(ratio*stretch);
+
+  if(sbsmser->n_prepad) {
+    a = 1.0;
+    n_towrite = min(sbsmser->chunksize,sbsmser->n_prepad);
+    memset(sbsmser->ina,0,n_towrite*sizeof(audio));
+    sbsmser->n_prepad -= n_towrite;
+  } else {
+    n_towrite = getSamplesCB(sbsmser->ina,sbsmser->chunksize,data);
+    sbsmser->n_processed += n_towrite;
+    if(n_towrite == 0) {
+      if(sbsmser->n_postpad) {
+	n_towrite = min(sbsmser->chunksize,sbsmser->n_postpad);
+	memset(sbsmser->ina,0,n_towrite*sizeof(audio));
+	sbsmser->n_postpad -= n_towrite;
+      }
+    }
+    if(n_towrite==0) {
+      sbsmser->bWritingComplete = true;
+      sbsmser->top->writingComplete();
+    }
+  }
+  return sbsmser->top->preAnalyze(sbsmser->ina, n_towrite, a, ratio);
+}
+
+long sbsms_read_frame(audio *buf, void *data, sbsms *sbsmser, real *ratio0, real *ratio1)
+{
+  long n_read = 0;
+  long n_write = 0;
+#ifdef MULTITHREADED
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+#endif
+
+  do {
+    real stretch = (sbsmser->getStretchCB)(sbsmser->n_processed,data);
+    real ratio = (sbsmser->getRatioCB)(sbsmser->n_processed,data);
+    real a = 1.0/(ratio*stretch);
+
+    if(sbsmser->n_prespent) {
+      n_read = sbsmser->top->read(NULL, ratio0, ratio1);
+      if(n_read) sbsmser->n_prespent--;
+      n_read = 0;
+    } else {
+      n_read = sbsmser->top->read(buf, ratio0, ratio1);
+    }
+
+    n_write = 0;    
+#ifdef MULTITHREADED
+    if(threadData->bAddThread && sbsmser->top->isAddReady()) {
+      pthread_mutex_lock(&threadData->addMutex);
+      pthread_cond_broadcast(&threadData->addCond);
+      pthread_mutex_unlock(&threadData->addMutex);
+    }
+#endif
+    if(n_read == 0) {
+#ifdef MULTITHREADED
+      if(!sbsmser->top->isWriteReady()) {
+	pthread_mutex_lock(&threadData->writeMutex);
+	pthread_cond_wait(&threadData->writeCond,&threadData->writeMutex);
+	pthread_mutex_unlock(&threadData->writeMutex);
+      }
+#endif
+      long n_towrite = 0;
+      if(sbsmser->getSamplesCB) {
+	if(sbsmser->n_prepad) {
+	  a = 1.0;
+	  n_towrite = min(sbsmser->chunksize,sbsmser->n_prepad);
+	  memset(sbsmser->ina,0,n_towrite*sizeof(audio));
+	  sbsmser->n_prepad -= n_towrite;
+	} else {
+	  n_towrite = (sbsmser->getSamplesCB)(sbsmser->ina,sbsmser->chunksize,data);
+	  sbsmser->n_processed += n_towrite;
+	  if(n_towrite == 0) {
+	    if(sbsmser->n_postpad) {
+	      n_towrite = min(sbsmser->chunksize,sbsmser->n_postpad);
+	      memset(sbsmser->ina,0,n_towrite*sizeof(audio));
+	      sbsmser->n_postpad -= n_towrite;
+	    }
+	  }
+	  if(n_towrite==0) {
+	    sbsmser->bWritingComplete = true;
+ 	    sbsmser->top->writingComplete();
+	  }
+	}
+	n_write = sbsmser->top->write(sbsmser->ina, n_towrite, a, ratio);
+      } else {
+	if(sbsmser->n_prepad) {
+	  n_write = sbsmser->top->zeroPad();
+	  sbsmser->n_prepad--;
+	} else {
+	  n_write = sbsmser->top->readFromFile(sbsmser->fp, a, ratio);
+	  sbsmser->n_processed += n_write;
+	  if(n_write == 0) {
+	    sbsmser->bWritingComplete = true;
+	    sbsmser->top->writingComplete();
+	  }
+	}
+      }
+    }
+#ifdef MULTITHREADED
+    if(threadData->bSynthThread && sbsmser->top->isSynthReady()) {
+      pthread_mutex_lock(&threadData->synthMutex);
+      pthread_cond_broadcast(&threadData->synthCond);
+      pthread_mutex_unlock(&threadData->synthMutex);
+    }
+#endif
+    bool bProcess = true;
+    bool bSynth = true;
+#ifdef MULTITHREADED
+    if(threadData->bAddThread && threadData->bAssignThread) bProcess = false;
+    if(threadData->bSynthThread) bSynth = false;
+#endif
+    if(bProcess) sbsmser->top->process();
+    if(bSynth) sbsmser->top->synth();
+#ifdef MULTITHREADED
+    if(threadData->bAssignThread && sbsmser->top->isAssignReady()) {
+      pthread_mutex_lock(&threadData->assignMutex);
+      pthread_cond_broadcast(&threadData->assignCond);
+      pthread_mutex_unlock(&threadData->assignMutex);
+    }
+#endif
+    if(sbsmser->bWritingComplete && 
+       !sbsmser->top->isframe_readable() && 
+       sbsmser->top->getFramesAtBack() == 0) {
+      n_write = sbsmser->top->zeroPad();
+    }
+  } while(!n_read);
+  return n_read;
+}
+
+long sbsms_write_frame(FILE *fp, void *data, sbsms *sbsmser)
+{
+  long n_tofile = 0;
+  long n_write = 0;
+#ifdef MULTITHREADED
+  thread_data *threadData = (thread_data*)sbsmser->threadData;
+#endif
+
+  do {
+    real stretch = (sbsmser->getStretchCB)(sbsmser->n_processed,data);
+    real ratio = (sbsmser->getRatioCB)(sbsmser->n_processed,data);
+    real a = 1.0/(ratio*stretch);
+
+    n_tofile = sbsmser->top->getFramesWrittenToFile();
+
+    n_write = 0;
+#ifdef MULTITHREADED
+    if(threadData->bAddThread && sbsmser->top->isAddReady()) {
+      pthread_mutex_lock(&threadData->addMutex);
+      pthread_cond_broadcast(&threadData->addCond);
+      pthread_mutex_unlock(&threadData->addMutex);
+    }
+#endif
+    if(n_tofile == 0) {
+#ifdef MULTITHREADED
+      if(!sbsmser->top->isWriteReady()) {
+	pthread_mutex_lock(&threadData->writeMutex);
+	pthread_cond_wait(&threadData->writeCond,&threadData->writeMutex);
+	pthread_mutex_unlock(&threadData->writeMutex);
+      }
+#endif
+      if(sbsmser->top->isWriteReady()) {
+	long n_towrite = 0;
+	if(sbsmser->n_prepad) {
+	  a = 1.0;
+	  n_towrite = min(sbsmser->chunksize,sbsmser->n_prepad);
+	  memset(sbsmser->ina,0,n_towrite*sizeof(audio));
+	  sbsmser->n_prepad -= n_towrite;
+	} else {
+	  n_towrite = (sbsmser->getSamplesCB)(sbsmser->ina,sbsmser->chunksize,data);
+	  sbsmser->n_processed += n_towrite;
+	  if(n_towrite == 0) {
+	    if(sbsmser->n_postpad) {
+	      n_towrite = min(sbsmser->chunksize,sbsmser->n_postpad);
+	      memset(sbsmser->ina,0,n_towrite*sizeof(audio));
+	      sbsmser->n_postpad -= n_towrite;
+	    }
+	  }
+	  if(!sbsmser->n_postpad)
+	    sbsmser->top->writingComplete();
+	}
+	n_write = sbsmser->top->write(sbsmser->ina, n_towrite, a, ratio);
+      }
+    }
+#ifdef MULTITHREADED
+    if(threadData->bAddThread && sbsmser->top->isAddReady()) {
+      pthread_mutex_lock(&threadData->addMutex);
+      pthread_cond_broadcast(&threadData->addCond);
+      pthread_mutex_unlock(&threadData->addMutex);
+    }
+#endif    
+#ifndef MULTITHREADED
+    sbsmser->top->process();	
+#endif
+    long n_written = 0;
+    if(sbsmser->n_prespent) {
+      n_written = sbsmser->top->writeToFile(NULL);
+      if(n_written) sbsmser->n_prespent--;
+      n_written = 0;
+    } else {
+      n_written = sbsmser->top->writeToFile(fp);
+    }
+#ifdef MULTITHREADED
+    if(threadData->bAssignThread && sbsmser->top->isAssignReady()) {
+      pthread_mutex_lock(&threadData->assignMutex);
+      pthread_cond_broadcast(&threadData->assignCond);
+      pthread_mutex_unlock(&threadData->assignMutex);
+    }
+#endif
+  } while(!n_tofile);
+  return n_tofile;
+}
+
+FILE *sbsms_open_read(const char *fileName)
+{
+  FILE *fp = fopen(fileName,"rb");
+  return fp;
+}
+
+void sbsms_close_read(FILE *fp)
+{
+  fclose(fp);
+}
+
+FILE *sbsms_open_write(const char *fileName, sbsms *sbsmser, long samples_to_process)
+{
+  FILE *fp = fopen(fileName,"wb");
+  if(!fp)
+    return NULL;
+  fwrite(&samples_to_process,sizeof(long),1,fp);
+  long nframes = 0;
+  fwrite(&nframes,sizeof(long),1,fp);
+  fwrite(&(sbsmser->channels),sizeof(int),1,fp);
+  fwrite(&(sbsmser->quality),sizeof(int),1,fp);
+  unsigned short maxtrackindex = 0;
+  fwrite(&maxtrackindex,sizeof(unsigned short),1,fp);
+  sbsmser->top->fp = fp;
+  return fp;
+}
+
+void sbsms_close_write(FILE *fp, sbsms *sbsmser)
+{
+  sbsmser->top->writeFramePositionsToFile(fp);
+  fclose(fp);
+}
+
+long sbsms_get_samples_to_process(FILE *fp)
+{
+  fseek(fp,0,SEEK_SET);
+  long samples;
+  fread(&samples,sizeof(long),1,fp);
+  return samples;
+}
+
+long sbsms_get_frames_to_process(FILE *fp)
+{
+  // samples
+  long offset = sizeof(long);
+  fseek(fp,offset,SEEK_SET);
+  long frames;
+  fread(&frames,sizeof(long),1,fp);
+  return frames;
+}
+
+long sbsms_get_channels(FILE *fp)
+{
+  //samples, frames
+  long offset = 2*sizeof(long);
+  fseek(fp,offset,SEEK_SET);
+  int channels;
+  fread(&channels,sizeof(int),1,fp);
+  return channels;
+}
+
+long sbsms_get_quality(FILE *fp)
+{
+  //samples, frames, channels
+  long offset = 2*sizeof(long) + sizeof(int);
+  fseek(fp,offset,SEEK_SET);
+  int quality;
+  fread(&quality,sizeof(int),1,fp);
+  return quality;
+}
+
+void sbsms_seek_start_data(FILE *fp)
+{
+  // samples, frames, channels, quality, maxtrackindex
+  long offset = 2*sizeof(long) + 2*sizeof(int) + sizeof(unsigned short);
+  fseek(fp,offset,SEEK_SET);
+}
+
+long sbsms_samples_processed(sbsms *sbsmser)
+{
+  return sbsmser->n_processed;
+}
+
+long sbsms_get_samples_queued(sbsms *sbsmser)
+{
+  return sbsmser->top->getSamplesQueued();
+}
+
+long sbsms_get_frames_queued(sbsms *sbsmser)
+{
+  return sbsmser->top->getFramesQueued();
+}
+
+long sbsms_get_last_input_frame_size(sbsms *sbsmser)
+{
+  return sbsmser->top->getLastInputFrameSize();
+}
+
+long sbsms_get_frame_pos(sbsms *sbsmser)
+{
+  return sbsmser->top->getFramePos();
+}
+
+real stretchCBLinear(long nProcessed, void *userData)
+{
+  sbsmsInfo *si = (sbsmsInfo*) userData;
+  real t0 = (real)nProcessed/(real)si->samplesToProcess;
+  real stretch = si->stretch0 + (si->stretch1-si->stretch0)*t0;
+  return stretch;
+}
+
+real stretchCBConstant(long nProcessed, void *userData)
+{
+  sbsmsInfo *si = (sbsmsInfo*) userData;
+  return si->stretch0;
+}
+
+real ratioCBLinear(long nProcessed, void *userData)
+{
+  sbsmsInfo *si = (sbsmsInfo*) userData;
+  real t0 = (real)nProcessed/(real)si->samplesToProcess;
+  real stretch = si->stretch0 + (si->stretch1-si->stretch0)*t0;
+  real t1;
+  if(stretch == si->stretch0)
+    t1 = 1.0/stretch;
+  else
+    t1 = log(stretch/si->stretch0)/(stretch-si->stretch0);
+
+  real ratio = si->ratio0 + (si->ratio1-si->ratio0)*t1*(real)nProcessed/(real)si->samplesToGenerate;
+  
+  return ratio;
+}
+
+real ratioCBConstant(long nProcessed, void *userData)
+{
+  sbsmsInfo *si = (sbsmsInfo*) userData;
+  return si->ratio0;
+}
diff --git a/lib-src/sbsms/src/sincCoeffs.h b/lib-src/sbsms/src/sincCoeffs.h
new file mode 100644
index 0000000..0d0e6dc
--- /dev/null
+++ b/lib-src/sbsms/src/sincCoeffs.h
@@ -0,0 +1,5307 @@
+#ifndef SBSMS_SINCCOEFFS_H
+#define SBSMS_SINCCOEFFS_H
+
+#include "sbsms.h"
+#define SBSMS_SINC_SIZE 5286
+#ifdef SBSMS_REAL_FLOAT
+#define SBSMS_SINC_RES 128.0f
+#define SBSMS_SINC_SAMPLES 41.0f
+#else
+#define SBSMS_SINC_RES 128.0
+#define SBSMS_SINC_SAMPLES 41.0
+#endif
+
+namespace _sbsms_ {
+real sincTable[SBSMS_SINC_SIZE] = 
+{
+0.920381425342433f,
+0.920302993473145f,
+0.920067721990721f,
+0.919675683262634f,
+0.919126997871811f,
+0.918421834572361f,
+0.91756041022763f,
+0.916542989730571f,
+0.915369885906517f,
+0.914041459398341f,
+0.912558118534085f,
+0.910920319177104f,
+0.909128564558774f,
+0.907183405093832f,
+0.905085438178449f,
+0.902835307971073f,
+0.900433705156165f,
+0.897881366690907f,
+0.895179075534992f,
+0.892327660363588f,
+0.889327995263616f,
+0.886180999413434f,
+0.882887636746086f,
+0.879448915596223f,
+0.87586588833086f,
+0.8721396509641f,
+0.868271342755988f,
+0.864262145795659f,
+0.860113284568922f,
+0.855826025510501f,
+0.851401676541053f,
+0.846841586589208f,
+0.842147145098761f,
+0.837319781521271f,
+0.832360964794223f,
+0.827272202804995f,
+0.822055041840814f,
+0.816711066024967f,
+0.811241896739414f,
+0.805649192034132f,
+0.799934646023336f,
+0.794099988268876f,
+0.788146983151029f,
+0.782077429226949f,
+0.775893158577015f,
+0.769596036139359f,
+0.763187959032823f,
+0.756670855868614f,
+0.750046686050943f,
+0.74331743906691f,
+0.736485133765944f,
+0.729551817629037f,
+0.722519566028119f,
+0.715390481475825f,
+0.708166692865973f,
+0.700850354705043f,
+0.693443646334978f,
+0.685948771147588f,
+0.678367955790895f,
+0.670703449367724f,
+0.662957522626847f,
+0.655132467147014f,
+0.647230594514183f,
+0.639254235492289f,
+0.631205739187853f,
+0.623087472208794f,
+0.614901817817741f,
+0.606651175080214f,
+0.598337958007979f,
+0.589964594697926f,
+0.581533526466823f,
+0.573047206982255f,
+0.56450810139012f,
+0.555918685439004f,
+0.54728144460179f,
+0.538598873194839f,
+0.529873473495092f,
+0.521107754855427f,
+0.512304232818645f,
+0.503465428230394f,
+0.494593866351407f,
+0.48569207596938f,
+0.476762588510854f,
+0.467807937153435f,
+0.458830655938691f,
+0.449833278886095f,
+0.440818339108329f,
+0.431788367928309f,
+0.422745893998278f,
+0.413693442421282f,
+0.404633533875401f,
+0.395568683741051f,
+0.386501401231699f,
+0.377434188528327f,
+0.368369539917981f,
+0.359309940936732f,
+0.350257867517365f,
+0.341215785142159f,
+0.332186148001037f,
+0.323171398155437f,
+0.314173964708215f,
+0.305196262979899f,
+0.296240693691588f,
+0.287309642154844f,
+0.278405477468841f,
+0.269530551725108f,
+0.260687199220141f,
+0.251877735676207f,
+0.243104457470604f,
+0.234369640873684f,
+0.225675541295929f,
+0.217024392544336f,
+0.208418406088417f,
+0.199859770336071f,
+0.191350649919593f,
+0.182893184992099f,
+0.17448949053461f,
+0.166141655674063f,
+0.157851743012483f,
+0.149621787967589f,
+0.141453798125034f,
+0.133349752602549f,
+0.125311601426209f,
+0.117341264919035f,
+0.109440633102171f,
+0.101611565108827f,
+0.0938558886112235f,
+0.0861753992607111f,
+0.0785718601412871f,
+0.0710470012366835f,
+0.0636025189112218f,
+0.0562400754046094f,
+0.0489612983408536f,
+0.0417677802514581f,
+0.0346610781130688f,
+0.027642712899719f,
+0.0207141691498255f,
+0.0138768945480801f,
+0.00713229952237053f,
+0.000481756855863834f,
+-0.00607339868562557f,
+-0.0125318707108654f,
+-0.0188924015449201f,
+-0.0251537725552469f,
+-0.0313148044620756f,
+-0.03737435763298f,
+-0.0433313323615559f,
+-0.0491846691301276f,
+-0.054933348856413f,
+-0.0605763931240776f,
+-0.0661128643971269f,
+-0.0715418662180771f,
+-0.0768625433898662f,
+-0.0820740821414636f,
+-0.0871757102771481f,
+-0.0921666973094308f,
+-0.0970463545756019f,
+-0.101814035337896f,
+-0.106469134867263f,
+-0.111011090510758f,
+-0.115439381742549f,
+-0.119753530198566f,
+-0.123953099694804f,
+-0.128037696229328f,
+-0.132006967967991f,
+-0.135860605213926f,
+-0.13959834036086f,
+-0.143219947830288f,
+-0.146725243992596f,
+-0.150114087072177f,
+-0.153386377036634f,
+-0.156542055470134f,
+-0.159581105431021f,
+-0.162503551293762f,
+-0.165309458575341f,
+-0.167998933746201f,
+-0.170572124025849f,
+-0.173029217163239f,
+-0.175370441202068f,
+-0.177596064231103f,
+-0.179706394119684f,
+-0.181701778238549f,
+-0.183582603166115f,
+-0.185349294380385f,
+-0.187002315936636f,
+-0.188542170131047f,
+-0.189969397150449f,
+-0.191284574708361f,
+-0.192488317667501f,
+-0.193581277648966f,
+-0.194564142628253f,
+-0.195437636518337f,
+-0.19620251874f,
+-0.196859583779615f,
+-0.197409660734602f,
+-0.197853612846779f,
+-0.1981923370238f,
+-0.198426763348949f,
+-0.19855785457948f,
+-0.198586605633759f,
+-0.198514043067442f,
+-0.198341224538922f,
+-0.198069238264313f,
+-0.197699202462185f,
+-0.197232264788348f,
+-0.1966696017609f,
+-0.196012418175829f,
+-0.195261946513421f,
+-0.19441944633574f,
+-0.193486203675456f,
+-0.192463530416289f,
+-0.191352763665353f,
+-0.190155265117665f,
+-0.188872420413117f,
+-0.187505638486185f,
+-0.186056350908662f,
+-0.18452601122571f,
+-0.182916094285512f,
+-0.181228095562824f,
+-0.179463530476727f,
+-0.177623933702856f,
+-0.17571085848043f,
+-0.173725875914356f,
+-0.171670574272733f,
+-0.169546558280039f,
+-0.167355448406313f,
+-0.165098880152636f,
+-0.162778503333212f,
+-0.160395981354361f,
+-0.15795299049072f,
+-0.155451219158975f,
+-0.15289236718941f,
+-0.150278145095599f,
+-0.147610273342536f,
+-0.144890481613517f,
+-0.142120508076075f,
+-0.139302098647282f,
+-0.136437006258713f,
+-0.133526990121391f,
+-0.130573814991001f,
+-0.127579250433698f,
+-0.12454507009279f,
+-0.121473050956606f,
+-0.118364972627861f,
+-0.115222616594795f,
+-0.112047765504399f,
+-0.108842202438022f,
+-0.105607710189641f,
+-0.102346070547107f,
+-0.0990590635766376f,
+-0.0957484669108493f,
+-0.0924160550406252f,
+-0.0890635986110882f,
+-0.0856928637219669f,
+-0.082305611232631f,
+-0.0789035960720733f,
+-0.0754885665541077f,
+-0.072062263698056f,
+-0.0686264205551892f,
+-0.0651827615411846f,
+-0.0617330017748624f,
+-0.058278846423457f,
+-0.0548219900546751f,
+-0.0513641159957935f,
+-0.0479068957000384f,
+-0.044451988120494f,
+-0.0410010390917734f,
+-0.0375556807196898f,
+-0.0341175307791583f,
+-0.0306881921205521f,
+-0.0272692520847378f,
+-0.0238622819270072f,
+-0.0204688362501168f,
+-0.017090452446647f,
+-0.0137286501508832f,
+-0.0103849307004177f,
+-0.00706077660767134f,
+-0.00375765104151933f,
+-0.000476997319211795f,
+0.00277976159123424f,
+0.00601122355799482f,
+0.00921600776157955f,
+0.0123927551599898f,
+0.0155401289427332f,
+0.0186568149735395f,
+0.0217415222216296f,
+0.0247929831813924f,
+0.0278099542803314f,
+0.0307912162751492f,
+0.0337355746358384f,
+0.0366418599176616f,
+0.0395089281209001f,
+0.0423356610382613f,
+0.0451209665898422f,
+0.0478637791455434f,
+0.0505630598348475f,
+0.0532177968438653f,
+0.0558270056995736f,
+0.0583897295411674f,
+0.0609050393784495f,
+0.0633720343372027f,
+0.0657898418914747f,
+0.0681576180827297f,
+0.070474547725818f,
+0.0727398446017178f,
+0.0749527516370186f,
+0.0771125410701129f,
+0.0792185146040738f,
+0.0812700035461998f,
+0.0832663689342141f,
+0.0852070016491116f,
+0.0870913225146552f,
+0.0889187823835221f,
+0.0906888622101165f,
+0.0924010731100602f,
+0.0940549564063881f,
+0.0956500836624715f,
+0.0971860567017111f,
+0.0986625076140278f,
+0.10007909874921f,
+0.101435522697154f,
+0.102731502255068f,
+0.103966790381692f,
+0.1051411701386f,
+0.106254454618665f,
+0.107306486861763f,
+0.108297139757793f,
+0.109226315937109f,
+0.110093947648454f,
+0.110899996624499f,
+0.11164445393509f,
+0.112327339828307f,
+0.112948703559463f,
+0.113508623208143f,
+0.11400720548343f,
+0.114444585517426f,
+0.114820926647216f,
+0.11513642018541f,
+0.115391285179402f,
+0.115585768159498f,
+0.115720142876066f,
+0.11579471002586f,
+0.115809796967682f,
+0.11576575742755f,
+0.115662971193528f,
+0.115501843800413f,
+0.115282806204435f,
+0.115006314448161f,
+0.114672849315792f,
+0.114282915979024f,
+0.113837043633693f,
+0.113335785127364f,
+0.1127797165781f,
+0.112169436984582f,
+0.111505567827804f,
+0.110788752664544f,
+0.110019656712823f,
+0.109198966429571f,
+0.108327389080707f,
+0.107405652303865f,
+0.106434503663974f,
+0.105414710201933f,
+0.104347057976597f,
+0.103232351600301f,
+0.102071413768163f,
+0.100865084781398f,
+0.0996142220648654f,
+0.0983196996791074f,
+0.0969824078270986f,
+0.0956032523559593f,
+0.0941831542538693f,
+0.0927230491424269f,
+0.0912238867646962f,
+0.089686630469191f,
+0.0881122566900392f,
+0.0865017544235756f,
+0.0848561247016157f,
+0.0831763800616523f,
+0.0814635440142294f,
+0.079718650507745f,
+0.0779427433909264f,
+0.076136875873236f,
+0.0743021099834537f,
+0.0724395160266886f,
+0.070550172040069f,
+0.0686351632473628f,
+0.0666955815127786f,
+0.0647325247941936f,
+0.062747096596062f,
+0.0607404054222478f,
+0.0587135642290348f,
+0.056667689878554f,
+0.0546039025928779f,
+0.0525233254090291f,
+0.0504270836351378f,
+0.048316304307999f,
+0.0461921156522659f,
+0.044055646541517f,
+0.0419080259614387f,
+0.0397503824753537f,
+0.037583843692335f,
+0.0354095357381317f,
+0.0332285827291375f,
+0.0310421062496354f,
+0.028851224832534f,
+0.0266570534438273f,
+0.024460702970993f,
+0.0222632797155505f,
+0.0200658848899929f,
+0.0178696141193048f,
+0.0156755569472778f,
+0.0134847963478306f,
+0.0112984082415343f,
+0.00911746101754993f,
+0.00694301506117043f,
+0.00477612228716621f,
+0.00261782567912161f,
+0.000469158834953931f,
+-0.00166885448120184f,
+-0.00379520078056329f,
+-0.0059088772845451f,
+-0.00800889235270582f,
+-0.0100942659036281f,
+-0.0121640298285632f,
+-0.0142172283976796f,
+-0.0162529186587561f,
+-0.0182701708281668f,
+-0.0202680686740045f,
+-0.0222457098911985f,
+-0.0242022064684846f,
+-0.0261366850470883f,
+-0.0280482872709882f,
+-0.0299361701286295f,
+-0.0317995062859638f,
+-0.0336374844106956f,
+-0.0354493094876133f,
+-0.0372342031249026f,
+-0.0389914038513265f,
+-0.0407201674041749f,
+-0.0424197670078825f,
+-0.0440894936432238f,
+-0.0457286563069959f,
+-0.0473365822621031f,
+-0.0489126172779674f,
+-0.0504561258611889f,
+-0.0519664914763842f,
+-0.053443116757141f,
+-0.0548854237070259f,
+-0.0562928538905927f,
+-0.0576648686143374f,
+-0.0590009490975559f,
+-0.0603005966330639f,
+-0.0615633327377405f,
+-0.062788699292866f,
+-0.0639762586742272f,
+-0.065125593871967f,
+-0.0662363086001637f,
+-0.0673080273961252f,
+-0.0683403957093937f,
+-0.0693330799804545f,
+-0.0702857677091563f,
+-0.071198167512846f,
+-0.0720700091742301f,
+-0.0729010436789824f,
+-0.0736910432431144f,
+-0.07443980133014f,
+-0.0751471326580581f,
+-0.0758128731961966f,
+-0.0764368801519492f,
+-0.0770190319474562f,
+-0.0775592281862733f,
+-0.0780573896100858f,
+-0.078513458045522f,
+-0.0789273963411314f,
+-0.0792991882945931f,
+-0.0796288385702248f,
+-0.0799163726068679f,
+-0.08016183651623f,
+-0.0803652969717649f,
+-0.0805268410881817f,
+-0.0806465762916719f,
+-0.0807246301809524f,
+-0.0807611503792238f,
+-0.080756304377146f,
+-0.0807102793669423f,
+-0.0806232820677406f,
+-0.0804955385422674f,
+-0.0803272940050135f,
+-0.0801188126219959f,
+-0.0798703773022373f,
+-0.0795822894810978f,
+-0.0792548688955872f,
+-0.0788884533517974f,
+-0.0784833984845914f,
+-0.0780400775096938f,
+-0.0775588809683272f,
+-0.0770402164645425f,
+-0.0764845083953963f,
+-0.0758921976741284f,
+-0.0752637414464976f,
+-0.0745996128004336f,
+-0.0739003004691713f,
+-0.0731663085280283f,
+-0.0723981560849959f,
+-0.0715963769653113f,
+-0.0707615193901859f,
+-0.0698941456498595f,
+-0.0689948317711623f,
+-0.0680641671797574f,
+-0.0671027543572484f,
+-0.0661112084933319f,
+-0.065090157133178f,
+-0.0640402398202279f,
+-0.0629621077345898f,
+-0.0618564233272276f,
+-0.0607238599501279f,
+-0.0595651014826367f,
+-0.058380841954162f,
+-0.0571717851634285f,
+-0.0559386442944869f,
+-0.0546821415296655f,
+-0.053403007659665f,
+-0.0521019816909916f,
+-0.0507798104509244f,
+-0.0494372481902171f,
+-0.0480750561837305f,
+-0.046694002329195f,
+-0.045294860744302f,
+-0.0438784113623226f,
+-0.0424454395264524f,
+-0.040996735583082f,
+-0.0395330944741913f,
+-0.038055315329066f,
+-0.0365642010555345f,
+-0.0350605579309239f,
+-0.0335451951929297f,
+-0.032018924630599f,
+-0.030482560175621f,
+-0.0289369174941192f,
+-0.0273828135791425f,
+-0.0258210663440446f,
+-0.0242524942169475f,
+-0.0226779157364766f,
+-0.0210981491489598f,
+-0.0195140120072785f,
+-0.0179263207715556f,
+-0.016335890411869f,
+-0.0147435340131726f,
+-0.0131500623826067f,
+-0.0115562836593809f,
+-0.00996300292740479f,
+-0.00837102183084636f,
+-0.00678113819279113f,
+-0.00519414563717416f,
+-0.00361083321415952f,
+-0.00203198502912983f,
+-0.000458379875457017f,
+0.00110920912878408f,
+0.00267001489999789f,
+0.00422327674398739f,
+0.00576824070645193f,
+0.00730415991891263f,
+0.00883029493991307f,
+0.0103459140913472f,
+0.0118502937897689f,
+0.0133427188725395f,
+0.0148224829186761f,
+0.016288888564263f,
+0.0177412478122899f,
+0.0191788823367922f,
+0.0206011237811589f,
+0.0220073140504912f,
+0.0233968055978847f,
+0.024768961704522f,
+0.02612315675346f,
+0.0274587764969989f,
+0.0287752183175303f,
+0.0300718914817559f,
+0.0313482173881796f,
+0.0326036298077742f,
+0.0338375751177299f,
+0.0350495125281968f,
+0.0362389143019323f,
+0.0374052659667743f,
+0.0385480665208594f,
+0.0396668286305131f,
+0.0407610788207385f,
+0.0418303576582401f,
+0.0428742199269153f,
+0.0438922347957571f,
+0.0448839859791099f,
+0.0458490718892285f,
+0.0467871057810913f,
+0.0476977158894239f,
+0.0485805455578928f,
+0.0494352533604325f,
+0.0502615132146747f,
+0.0510590144874505f,
+0.0518274620923405f,
+0.0525665765792537f,
+0.0532760942160162f,
+0.05395576706196f,
+0.0546053630334999f,
+0.0552246659616955f,
+0.0558134756417962f,
+0.0563716078747733f,
+0.0568988945008436f,
+0.0573951834249974f,
+0.0578603386345438f,
+0.0582942402086914f,
+0.0586967843201877f,
+0.0590678832290408f,
+0.0594074652683551f,
+0.0597154748223121f,
+0.0599918722963358f,
+0.0602366340794796f,
+0.0604497524990823f,
+0.0606312357677403f,
+0.0607811079226447f,
+0.0608994087573431f,
+0.0609861937459786f,
+0.0610415339600736f,
+0.06106551597792f,
+0.0610582417866455f,
+0.0610198286770287f,
+0.0609504091311374f,
+0.0608501307028684f,
+0.0607191558914731f,
+0.0605576620081493f,
+0.060365841035792f,
+0.0601438994819913f,
+0.0598920582253713f,
+0.0596105523553696f,
+0.0592996310055547f,
+0.0589595571805846f,
+0.0585906075769136f,
+0.058193072397353f,
+0.0577672551595986f,
+0.0573134724988378f,
+0.0568320539645518f,
+0.0563233418116318f,
+0.0557876907859302f,
+0.0552254679043692f,
+0.0546370522297332f,
+0.0540228346402718f,
+0.0533832175942438f,
+0.052718614889534f,
+0.0520294514184752f,
+0.0513161629180134f,
+0.0505791957153526f,
+0.0498190064692186f,
+0.0490360619068818f,
+0.0482308385570846f,
+0.0474038224790149f,
+0.0465555089874726f,
+0.0456864023743757f,
+0.0447970156267561f,
+0.0438878701413918f,
+0.0429594954362301f,
+0.0420124288587509f,
+0.0410472152914242f,
+0.0400644068544164f,
+0.0390645626056997f,
+0.0380482482387189f,
+0.0370160357777762f,
+0.0359685032712855f,
+0.0349062344830575f,
+0.0338298185817733f,
+0.0327398498288029f,
+0.0316369272645303f,
+0.0305216543933421f,
+0.0293946388674391f,
+0.0282564921696315f,
+0.0271078292952748f,
+0.025949268433509f,
+0.0247814306479556f,
+0.0236049395570361f,
+0.0224204210140672f,
+0.0212285027872916f,
+0.0200298142400041f,
+0.0188249860109281f,
+0.0176146496949992f,
+0.0163994375247132f,
+0.0151799820521929f,
+0.0139569158321289f,
+0.0127308711057459f,
+0.0115024794859494f,
+0.0102723716438035f,
+0.00904117699648874f,
+0.00780952339689282f,
+0.0065780368249771f,
+0.00534734108107065f,
+0.00411805748123312f,
+0.00289080455483251f,
+0.00166619774448026f,
+0.000444849108462394f,
+-0.000772632974192619f,
+-0.00198564409587129f,
+-0.00319358410962516f,
+-0.00439585741537519f,
+-0.00559187324294384f,
+-0.00678104593178024f,
+-0.00796279520725374f,
+-0.00913654645338902f,
+-0.0103017309819179f,
+-0.0114577862975281f,
+-0.0126041563591889f,
+-0.0137402918374363f,
+-0.0148656503675044f,
+-0.0159796967981879f,
+-0.0170819034363292f,
+-0.0181717502868205f,
+-0.0192487252880176f,
+-0.0203123245424604f,
+-0.021362052542804f,
+-0.0223974223928606f,
+-0.0234179560236593f,
+-0.024423184404432f,
+-0.0254126477484354f,
+-0.0263858957135253f,
+-0.0273424875973972f,
+-0.0282819925274153f,
+-0.0292039896449517f,
+-0.0301080682841611f,
+-0.0309938281451183f,
+-0.0318608794612527f,
+-0.0327088431610127f,
+-0.0335373510236956f,
+-0.0343460458293886f,
+-0.0351345815029585f,
+-0.0359026232520415f,
+-0.0366498476989807f,
+-0.0373759430066653f,
+-0.0380806089982259f,
+-0.0387635572705482f,
+-0.0394245113015638f,
+-0.0400632065512871f,
+-0.040679390556566f,
+-0.0412728230195162f,
+-0.0418432758896181f,
+-0.0423905334394522f,
+-0.042914392334055f,
+-0.043414661693881f,
+-0.0438911631513571f,
+-0.0443437309010235f,
+-0.044772211743252f,
+-0.0451764651215424f,
+-0.0455563631533958f,
+-0.0459117906547692f,
+-0.0462426451581186f,
+-0.046548836924042f,
+-0.0468302889465326f,
+-0.0470869369518625f,
+-0.0473187293911136f,
+-0.0475256274263798f,
+-0.0477076049106652f,
+-0.0478646483615089f,
+-0.0479967569283661f,
+-0.0481039423537814f,
+-0.0481862289283918f,
+-0.048243653439801f,
+-0.0482762651153661f,
+-0.048284125558947f,
+-0.0482673086816636f,
+-0.0482259006267172f,
+-0.0481599996883274f,
+-0.0480697162248445f,
+-0.0479551725660973f,
+-0.0478165029150386f,
+-0.0476538532437558f,
+-0.047467381183913f,
+-0.0472572559116971f,
+-0.0470236580273408f,
+-0.0467667794292976f,
+-0.0464868231831489f,
+-0.0461840033853221f,
+-0.0458585450217043f,
+-0.0455106838212355f,
+-0.0451406661045703f,
+-0.0447487486278968f,
+-0.0443351984220054f,
+-0.0439002926267012f,
+-0.0434443183206557f,
+-0.0429675723467969f,
+-0.0424703611333365f,
+-0.0419530005105377f,
+-0.0414158155233246f,
+-0.0408591402398425f,
+-0.0402833175560728f,
+-0.0396886989966126f,
+-0.0390756445117305f,
+-0.0384445222708086f,
+-0.0377957084522857f,
+-0.0371295870302152f,
+-0.036446549557556f,
+-0.0357469949463107f,
+-0.0350313292446328f,
+-0.0342999654110218f,
+-0.0335533230857263f,
+-0.0327918283594782f,
+-0.0320159135396809f,
+-0.0312260169141752f,
+-0.0304225825127069f,
+-0.0296060598662241f,
+-0.028776903764128f,
+-0.0279355740096047f,
+-0.0270825351731674f,
+-0.026218256344534f,
+-0.0253432108829717f,
+-0.024457876166236f,
+-0.0235627333382326f,
+-0.0226582670555347f,
+-0.0217449652328814f,
+-0.0208233187877915f,
+-0.0198938213844194f,
+-0.0189569691767836f,
+-0.0180132605515006f,
+-0.0170631958701489f,
+-0.016107277211399f,
+-0.015146008113033f,
+-0.0141798933139869f,
+-0.0132094384965427f,
+-0.0122351500287978f,
+-0.0112575347075429f,
+-0.0102770995016708f,
+-0.00929435129624721f,
+-0.00830979663736668f,
+-0.00732394147791956f,
+-0.00633729092439598f,
+-0.00535034898484767f,
+-0.0043636183181326f,
+-0.00337759998456234f,
+-0.00239279319807447f,
+-0.00140969508004874f,
+-0.000428800414884482f,
+0.000549398592542026f,
+0.00152441255742493f,
+0.00249575515346705f,
+0.00346294334909421f,
+0.00442549764133481f,
+0.00538294228725485f,
+0.00633480553283812f,
+0.00728061983920615f,
+0.00821992210606954f,
+0.00915225389230991f,
+0.0100771616335885f,
+0.0109941968568804f,
+0.011902916391837f,
+0.0128028825788794f,
+0.0136936634739278f,
+0.0145748330496735f,
+0.0154459713933036f,
+0.0163066649005877f,
+0.0171565064662419f,
+0.0179950956704824f,
+0.0188220389616894f,
+0.019636949835098f,
+0.0204394490074385f,
+0.0212291645874509f,
+0.0220057322421994f,
+0.0227687953591133f,
+0.0235180052036899f,
+0.0242530210727861f,
+0.0249735104434401f,
+0.0256791491171583f,
+0.0263696213596067f,
+0.0270446200356535f,
+0.0277038467397033f,
+0.0283470119212749f,
+0.0289738350057704f,
+0.02958404451039f,
+0.030177378155147f,
+0.0307535829689406f,
+0.0313124153906489f,
+0.0318536413652032f,
+0.0323770364346098f,
+0.0328823858238901f,
+0.0333694845219051f,
+0.0338381373570427f,
+0.0342881590677419f,
+0.0347193743678329f,
+0.0351316180066747f,
+0.0355247348240743f,
+0.0358985797999757f,
+0.0362530180989058f,
+0.0365879251091717f,
+0.0369031864768027f,
+0.0371986981342348f,
+0.0374743663237385f,
+0.0377301076155912f,
+0.0379658489210016f,
+0.038181527499791f,
+0.0383770909628458f,
+0.0385524972693506f,
+0.0387077147188212f,
+0.0388427219379517f,
+0.038957507862301f,
+0.0390520717128379f,
+0.0391264229673738f,
+0.0391805813269093f,
+0.0392145766769267f,
+0.0392284490436607f,
+0.0392222485453834f,
+0.0391960353387427f,
+0.0391498795601926f,
+0.0390838612625587f,
+0.0389980703467861f,
+0.0388926064889138f,
+0.0387675790623279f,
+0.0386231070553441f,
+0.0384593189841745f,
+0.038276352801333f,
+0.038074355799542f,
+0.0378534845111942f,
+0.0376139046034402f,
+0.0373557907689584f,
+0.0370793266124798f,
+0.0367847045331337f,
+0.0364721256026844f,
+0.0361417994397319f,
+0.0357939440799517f,
+0.0354287858424473f,
+0.0350465591922946f,
+0.0346475065993586f,
+0.0342318783934602f,
+0.0337999326159794f,
+0.033351934867976f,
+0.0328881581549164f,
+0.0324088827280907f,
+0.0319143959228117f,
+0.0314049919934835f,
+0.030880971945632f,
+0.0303426433649903f,
+0.029790320243732f,
+0.0292243228039485f,
+0.0286449773184645f,
+0.0280526159290918f,
+0.0274475764624172f,
+0.0268302022432251f,
+0.0262008419056547f,
+0.0255598492021924f,
+0.0249075828106016f,
+0.0242444061388932f,
+0.0235706871284385f,
+0.022886798055331f,
+0.0221931153300989f,
+0.021490019295875f,
+0.0207778940251304f,
+0.0200571271150767f,
+0.0193281094818434f,
+0.0185912351535375f,
+0.017846901062294f,
+0.0170955068354215f,
+0.0163374545857532f,
+0.0155731487013096f,
+0.0148029956343802f,
+0.0140274036901342f,
+0.0132467828148645f,
+0.0124615443839753f,
+0.0116721009898197f,
+0.010878866229494f,
+0.0100822544926968f,
+0.00928268074975849f,
+0.00848056033994836f,
+0.00767630876016376f,
+0.00687034145410842f,
+0.00606307360206417f,
+0.00525491991135925f,
+0.00444629440763855f,
+0.00363761022703795f,
+0.00282927940936458f,
+0.00202171269238638f,
+0.00121531930732854f,
+0.000410506775680379f,
+-0.000392319292591773f,
+-0.00119275539932617f,
+-0.0019904003568439f,
+-0.0027848554849301f,
+-0.00357572480602225f,
+-0.00436261523851059f,
+-0.0051451367880615f,
+-0.0059229027368688f,
+-0.00669552983074627f,
+-0.00746263846397085f,
+-0.00822385286178995f,
+-0.00897880126050736f,
+-0.00972711608506233f,
+-0.0104684341240196f,
+-0.0112023967018897f,
+-0.0119286498486974f,
+-0.0126468444667235f,
+-0.0133566364943391f,
+-0.0140576870668615f,
+-0.0147496626743549f,
+-0.0154322353163073f,
+-0.0161050826531121f,
+-0.0167678881542856f,
+-0.0174203412433572f,
+-0.0180621374393646f,
+-0.0186929784948938f,
+-0.0193125725306023f,
+-0.0199206341661661f,
+-0.0205168846475966f,
+-0.0211010519708691f,
+-0.0216728710018125f,
+-0.0222320835922094f,
+-0.0227784386920557f,
+-0.0233116924579366f,
+-0.0238316083574713f,
+-0.0243379572697852f,
+-0.0248305175819706f,
+-0.0253090752814939f,
+-0.0257734240445179f,
+-0.0262233653201023f,
+-0.0266587084102499f,
+-0.0270792705457726f,
+-0.0274848769579454f,
+-0.0278753609459267f,
+-0.0282505639399193f,
+-0.0286103355600531f,
+-0.02895453367097f,
+-0.029283024432094f,
+-0.0295956823435738f,
+-0.029892390287885f,
+-0.0301730395670819f,
+-0.0304375299356923f,
+-0.0306857696292481f,
+-0.0309176753884519f,
+-0.0311331724789745f,
+-0.0313321947068879f,
+-0.0315146844297365f,
+-0.0316805925632501f,
+-0.03182987858371f,
+-0.0319625105259754f,
+-0.0320784649771836f,
+-0.0321777270661381f,
+-0.0322602904484012f,
+-0.0323261572871093f,
+-0.0323753382295314f,
+-0.0324078523793953f,
+-0.0324237272650037f,
+-0.0324229988031694f,
+-0.0324057112589975f,
+-0.0323719172015455f,
+-0.0323216774553951f,
+-0.0322550610481696f,
+-0.0321721451540349f,
+-0.0320730150332222f,
+-0.0319577639676131f,
+-0.0318264931924307f,
+-0.0316793118240799f,
+-0.0315163367841841f,
+-0.0313376927198668f,
+-0.0311435119203262f,
+-0.0309339342297567f,
+-0.0307091069566693f,
+-0.0304691847796661f,
+-0.0302143296497258f,
+-0.0299447106890591f,
+-0.0296605040865921f,
+-0.029361892990141f,
+-0.0290490673953409f,
+-0.0287222240313915f,
+-0.028381566243687f,
+-0.0280273038733983f,
+-0.0276596531340729f,
+-0.0272788364853266f,
+-0.0268850825036951f,
+-0.0264786257507203f,
+-0.0260597066383421f,
+-0.0256285712916748f,
+-0.0251854714092403f,
+-0.0247306641207374f,
+-0.0242644118424243f,
+-0.0237869821301947f,
+-0.0232986475304263f,
+-0.0227996854286841f,
+-0.0222903778963592f,
+-0.021771011535327f,
+-0.0212418773207075f,
+-0.0207032704418132f,
+-0.0201554901413684f,
+-0.019598839553086f,
+-0.0190336255376889f,
+-0.0184601585174618f,
+-0.0178787523094215f,
+-0.017289723957194f,
+-0.0166933935616847f,
+-0.0160900841106333f,
+-0.0154801213071404f,
+-0.0148638333972561f,
+-0.0142415509967193f,
+-0.0136136069169392f,
+-0.0129803359903073f,
+-0.0123420748949298f,
+-0.0116991619788734f,
+-0.011051937084011f,
+-0.0104007413695593f,
+-0.00974591713539885f,
+-0.00908780764526554f,
+-0.00842675694990374f,
+-0.00776310971027038f,
+-0.00709721102088f,
+-0.0064294062333792f,
+-0.00576004078043931f,
+-0.00508946000005613f,
+-0.0044180089603443f,
+-0.00374603228491339f,
+-0.00307387397891339f,
+-0.00240187725583507f,
+-0.00173038436515273f,
+-0.00105973642089168f,
+-0.000390273231208218f,
+0.000277666870936983f,
+0.000943747195927376f,
+0.00160763286437935f,
+0.00226899097268967f,
+0.00292749075716241f,
+0.00358280375663249f,
+0.00423460397351205f,
+0.00488256803317746f,
+0.00552637534162358f,
+0.00616570824130806f,
+0.00680025216511183f,
+0.00742969578834302f,
+0.00805373117871052f,
+0.0086720539441988f,
+0.00928436337877218f,
+0.00989036260584077f,
+0.010489758719422f,
+0.0110822629229305f,
+0.0116675906655331f,
+0.0122454617760051f,
+0.0128156005940267f,
+0.0133777360988594f,
+0.0139316020353439f,
+0.0144769370371622f,
+0.015013484747307f,
+0.0155409939357074f,
+0.0160592186139548f,
+0.0165679181470811f,
+0.0170668573623377f,
+0.0175558066549289f,
+0.0180345420906533f,
+0.0185028455054086f,
+0.0189605046015186f,
+0.0194073130408385f,
+0.0198430705346032f,
+0.0202675829299774f,
+0.0206806622932754f,
+0.0210821269898129f,
+0.0214718017603625f,
+0.0218495177941796f,
+0.0222151127985721f,
+0.0225684310649855f,
+0.022909323531581f,
+0.023237647842281f,
+0.0235532684022619f,
+0.0238560564298757f,
+0.0241458900049818f,
+0.0244226541136733f,
+0.0246862406893854f,
+0.0249365486503725f,
+0.0251734839335446f,
+0.0253969595246556f,
+0.0256068954848355f,
+0.0258032189734641f,
+0.0259858642673823f,
+0.0261547727764399f,
+0.0263098930553838f,
+0.0264511808120857f,
+0.0265785989121173f,
+0.0266921173796785f,
+0.0267917133948868f,
+0.0268773712874393f,
+0.0269490825266584f,
+0.0270068457079359f,
+0.0270506665355912f,
+0.0270805578021602f,
+0.0270965393641366f,
+0.0270986381141831f,
+0.0270868879498387f,
+0.027061329738745f,
+0.0270220112804172f,
+0.0269689872645892f,
+0.0269023192261613f,
+0.0268220754967821f,
+0.0267283311530974f,
+0.0266211679617004f,
+0.02650067432082f,
+0.0263669451987833f,
+0.0262200820692939f,
+0.0260601928435634f,
+0.0258873917993413f,
+0.0257017995068857f,
+0.0255035427519194f,
+0.0252927544556185f,
+0.0250695735916822f,
+0.0248341451005308f,
+0.0245866198006853f,
+0.0243271542973778f,
+0.0240559108884488f,
+0.0237730574675825f,
+0.0234787674249386f,
+0.0231732195452361f,
+0.0228565979033475f,
+0.0225290917574612f,
+0.0221908954398751f,
+0.0218422082454798f,
+0.0214832343179955f,
+0.0211141825340239f,
+0.0207352663849829f,
+0.0203467038569849f,
+0.0199487173087275f,
+0.0195415333474633f,
+0.0191253827031149f,
+0.0187005001006056f,
+0.018267124130473f,
+0.0178254971178374f,
+0.0173758649897937f,
+0.0169184771412997f,
+0.0164535862996304f,
+0.0159814483874738f,
+0.0155023223847373f,
+0.0150164701891418f,
+0.0145241564756738f,
+0.0140256485549719f,
+0.0135212162307227f,
+0.0130111316561379f,
+0.0124956691895912f,
+0.0119751052494879f,
+0.0114497181684446f,
+0.0109197880468538f,
+0.0103855966059087f,
+0.00984742704016562f,
+0.00930556386971926f,
+0.00876029279206605f,
+0.00821190053373426f,
+0.00766067470175299f,
+0.00710690363503945f,
+0.00655087625577791f,
+0.00599288192086684f,
+0.0054332102735096f,
+0.00487215109502279f,
+0.00430999415693893f,
+0.00374702907347535f,
+0.00318354515444554f,
+0.00261983125868588f,
+0.00205617564807024f,
+0.00149286584218636f,
+0.000930188473745678f,
+0.000368429144797911f,
+-0.000192127716177123f,
+-0.00075119899623179f,
+-0.00130850303889563f,
+-0.00186375978403549f,
+-0.00241669090655966f,
+-0.00296701995390177f,
+-0.00351447248221492f,
+-0.00405877619121137f,
+-0.00459966105758125f,
+-0.00513685946692752f,
+-0.00567010634415242f,
+-0.00619913928223348f,
+-0.00672369866932763f,
+-0.00724352781414226f,
+-0.00775837306951439f,
+-0.00826798395413882f,
+-0.0087721132723888f,
+-0.00927051723217174f,
+-0.00976295556076585f,
+-0.0102491916185829f,
+-0.010728992510805f,
+-0.0112021291968433f,
+-0.011668376597568f,
+-0.012127513700262f,
+-0.0125793236612476f,
+-0.0130235939061431f,
+-0.0134601162277011f,
+-0.0138886868811863f,
+-0.01430910667725f,
+-0.0147211810722588f,
+-0.0151247202560408f,
+-0.0155195392370066f,
+-0.0159054579246124f,
+-0.016282301209127f,
+-0.0166498990386691f,
+-0.0170080864934834f,
+-0.0173567038574233f,
+-0.0176955966866107f,
+-0.0180246158752456f,
+-0.0183436177185377f,
+-0.0186524639727363f,
+-0.0189510219122339f,
+-0.0192391643837213f,
+-0.0195167698573758f,
+-0.0197837224750605f,
+-0.0200399120955206f,
+-0.020285234336558f,
+-0.0205195906141727f,
+-0.0207428881786562f,
+-0.0209550401476275f,
+-0.0211559655360013f,
+-0.0213455892828807f,
+-0.0215238422753687f,
+-0.021690661369293f,
+-0.0218459894068419f,
+-0.0219897752311082f,
+-0.0221219736975437f,
+-0.0222425456823232f,
+-0.022351458087623f,
+-0.0224486838438175f,
+-0.0225342019086017f,
+-0.0226079972630452f,
+-0.0226700609045897f,
+-0.0227203898369986f,
+-0.0227589870572723f,
+-0.0227858615395437f,
+-0.022801028215968f,
+-0.022804507954624f,
+-0.0227963275344473f,
+-0.0227765196172116f,
+-0.0227451227165837f,
+-0.0227021811642712f,
+-0.0226477450732896f,
+-0.0225818702983737f,
+-0.0225046183935598f,
+-0.0224160565669675f,
+-0.022316257632811f,
+-0.0222052999606713f,
+-0.0220832674220598f,
+-0.02195024933431f,
+-0.02180634040183f,
+-0.021651640654752f,
+-0.0214862553850185f,
+-0.0213102950799412f,
+-0.0211238753532741f,
+-0.0209271168738413f,
+-0.0207201452917622f,
+-0.0205030911623162f,
+-0.0202760898674933f,
+-0.0200392815352739f,
+-0.0197928109566856f,
+-0.0195368275006853f,
+-0.0192714850269128f,
+-0.0189969417963675f,
+-0.0187133603800582f,
+-0.0184209075656767f,
+-0.018119754262348f,
+-0.0178100754035098f,
+-0.0174920498479764f,
+-0.0171658602792401f,
+-0.016831693103066f,
+-0.0164897383434382f,
+-0.0161401895369109f,
+-0.0157832436254263f,
+-0.0154191008476533f,
+-0.0150479646289088f,
+-0.01467004146972f,
+-0.0142855408330878f,
+-0.0138946750305117f,
+-0.0134976591068377f,
+-0.0130947107239892f,
+-0.0126860500436456f,
+-0.0122718996089275f,
+-0.0118524842251538f,
+-0.0114280308397327f,
+-0.0109987684212487f,
+-0.0105649278378112f,
+-0.0101267417347275f,
+-0.0096844444115627f,
+-0.0092382716986541f,
+-0.00878846083313997f,
+-0.0083352503345707f,
+-0.00787887988016375f,
+-0.00741959017977004f,
+-0.00695762285061262f,
+-0.00649322029186454f,
+-0.00602662555912889f,
+-0.00555808223888623f,
+-0.00508783432297227f,
+-0.00461612608315054f,
+-0.0041432019458434f,
+-0.00366930636708469f,
+-0.00319468370775774f,
+-0.00271957810918098f,
+-0.00224423336910424f,
+-0.00176889281817742f,
+-0.00129379919695379f,
+-0.000819194533489142f,
+-0.000345320021597831f,
+0.000127584100174339f,
+0.000599278668799195f,
+0.00106952571617924f,
+0.00153808858766556f,
+0.00200473205962055f,
+0.00246922245597072f,
+0.00293132776369035f,
+0.00339081774716058f,
+0.00384746406134855f,
+0.00430104036375061f,
+0.00475132242504707f,
+0.00519808823841396f,
+0.00564111812743961f,
+0.00608019485259522f,
+0.00651510371620631f,
+0.00694563266587838f,
+0.00737157239632471f,
+0.00779271644955021f,
+0.00820886131334328f,
+0.00861980651802962f,
+0.00902535473144288f,
+0.00942531185206835f,
+0.00981948710031542f,
+0.0102076931078787f,
+0.0105897460051442f,
+0.0109654655066033f,
+0.0113346749942337f,
+0.0116972015988115f,
+0.012052876279115f,
+0.0124015338989891f,
+0.0127430133022313f,
+0.013077157385271f,
+0.0134038131676064f,
+0.0137228318599706f,
+0.014034068930197f,
+0.0143373841667557f,
+0.014632641739935f,
+0.01491971026064f,
+0.0151984628367875f,
+0.0154687771272713f,
+0.0157305353934762f,
+0.0159836245483238f,
+0.0162279362028256f,
+0.01646336671013f,
+0.0166898172070445f,
+0.0169071936530183f,
+0.0171154068665722f,
+0.0173143725591621f,
+0.0175040113664656f,
+0.0176842488770823f,
+0.0178550156586383f,
+0.0180162472812887f,
+0.018167884338611f,
+0.018309872465887f,
+0.0184421623557679f,
+0.0185647097713225f,
+0.0186774755564665f,
+0.0187804256437758f,
+0.0188735310596837f,
+0.0189567679270676f,
+0.019030117465229f,
+0.0190935659872729f,
+0.0191471048948949f,
+0.0191907306705839f,
+0.0192244448672514f,
+0.0192482540952976f,
+0.0192621700071291f,
+0.0192662092791391f,
+0.0192603935911679f,
+0.0192447496034598f,
+0.0192193089311318f,
+0.0191841081161767f,
+0.0191391885970174f,
+0.0190845966756357f,
+0.0190203834822978f,
+0.0189466049378991f,
+0.0188633217139549f,
+0.0187705991902617f,
+0.0186685074102565f,
+0.0185571210341025f,
+0.0184365192895309f,
+0.0183067859204682f,
+0.0181680091334815f,
+0.0180202815420732f,
+0.0178637001088602f,
+0.0176983660856705f,
+0.0175243849515933f,
+0.0173418663490196f,
+0.01715092401771f,
+0.016951675726928f,
+0.016744243205679f,
+0.0165287520710933f,
+0.016305331754996f,
+0.0160741154287042f,
+0.0158352399260948f,
+0.0155888456649855f,
+0.0153350765668743f,
+0.0150740799750811f,
+0.0148060065713377f,
+0.0145310102908722f,
+0.0142492482360351f,
+0.0139608805885139f,
+0.0136660705201842f,
+0.0133649841026483f,
+0.0130577902155067f,
+0.0127446604534163f,
+0.0124257690319824f,
+0.0121012926925373f,
+0.0117714106058561f,
+0.0114363042748611f,
+0.0110961574363676f,
+0.010751155961922f,
+0.0104014877577871f,
+0.0100473426641261f,
+0.00968891235343915f,
+0.00932639022830554f,
+0.00895997131848668f,
+0.00858985217744296f,
+0.00821623077831776f,
+0.00783930640944577f,
+0.00745927956943648f,
+0.00707635186189118f,
+0.00669072588980389f,
+0.00630260514970595f,
+0.00591219392560345f,
+0.00551969718276637f,
+0.00512532046142244f,
+0.00472926977040892f,
+0.00433175148083997f,
+0.0039329722198398f,
+0.00353313876439927f,
+0.00313245793540826f,
+0.00273113649191582f,
+0.00232938102567641f,
+0.00192739785602901f,
+0.00152539292516795f,
+0.00112357169385325f,
+0.000722139037616026f,
+0.000321299143509566f,
+-7.87445925439102e-05f,
+-0.000477789667756481f,
+-0.000875634573781077f,
+-0.00127207889726798f,
+-0.00166692341962379f,
+-0.00205997021592246f,
+-0.0024510227529216f,
+-0.00283988598613406f,
+-0.00322636645590846f,
+-0.00361027238247303f,
+-0.00399141375989388f,
+-0.00436960244890573f,
+-0.00474465226856735f,
+-0.00511637908669945f,
+-0.00548460090906132f,
+-0.00584913796722293f,
+-0.00620981280509261f,
+-0.00656645036405622f,
+-0.00691887806669127f,
+-0.00726692589901343f,
+-0.0076104264912184f,
+-0.0079492151968822f,
+-0.00828313017058056f,
+-0.00861201244389523f,
+-0.00893570599976737f,
+-0.00925405784516927f,
+-0.00956691808205708f,
+-0.00987413997657404f,
+-0.0101755800264738f,
+-0.0104710980267317f,
+-0.0107605571333162f,
+-0.011043823925092f,
+-0.0113207684638271f,
+-0.0115912643522783f,
+-0.0118551887903295f,
+-0.012112422629159f,
+-0.0123628504234125f,
+-0.0126063604813613f,
+-0.0128428449130214f,
+-0.0130721996762183f,
+-0.0132943246205751f,
+-0.0135091235294078f,
+-0.0137165041595128f,
+-0.013916378278827f,
+-0.0141086617019519f,
+-0.014293274323524f,
+-0.0144701401494217f,
+-0.014639187325798f,
+-0.0148003481659278f,
+-0.0149535591748634f,
+-0.0150987610718883f,
+-0.0152358988107658f,
+-0.0153649215977745f,
+-0.015485782907529f,
+-0.0155984404965815f,
+-0.0157028564148031f,
+-0.0157989970145448f,
+-0.0158868329575775f,
+-0.0159663392198137f,
+-0.0160374950938136f,
+-0.016100284189079f,
+-0.0161546944301414f,
+-0.0162007180524483f,
+-0.0162383515960573f,
+-0.0162675958971449f,
+-0.0162884560773407f,
+-0.0163009415308957f,
+-0.0163050659096987f,
+-0.0163008471061524f,
+-0.0162883072339218f,
+-0.016267472606573f,
+-0.0162383737141145f,
+-0.0162010451974609f,
+-0.0161555258208357f,
+-0.0161018584421317f,
+-0.0160400899812505f,
+-0.0159702713864408f,
+-0.0158924575986573f,
+-0.0158067075139647f,
+-0.0157130839440085f,
+-0.0156116535745792f,
+-0.0155024869222945f,
+-0.015385658289426f,
+-0.0152612457168996f,
+-0.015129330935495f,
+-0.0149899993152762f,
+-0.0148433398132821f,
+-0.0146894449195071f,
+-0.0145284106012046f,
+-0.0143603362455461f,
+-0.0141853246006673f,
+-0.014003481715137f,
+-0.0138149168758828f,
+-0.0136197425446085f,
+-0.0134180742927402f,
+-0.013210030734937f,
+-0.0129957334612042f,
+-0.0127753069676474f,
+-0.0125488785859041f,
+-0.0123165784112954f,
+-0.0120785392297338f,
+-0.0118348964434313f,
+-0.0115857879954438f,
+-0.0113313542930995f,
+-0.0110717381303458f,
+-0.0108070846090634f,
+-0.0105375410593866f,
+-0.0102632569590728f,
+-0.009984383851968f,
+-0.00970107526560753f,
+-0.00941348662799972f,
+-0.00912177518363594f,
+-0.00882609990877025f,
+-0.00852662142601712f,
+-0.0082235019183083f,
+-0.00791690504225832f,
+-0.00760699584098105f,
+-0.00729394065640554f,
+-0.00697790704113637f,
+-0.00665906366990342f,
+-0.00633758025065011f,
+-0.00601362743530315f,
+-0.00568737673027296f,
+-0.0053590004067294f,
+-0.0050286714107004f,
+-0.00469656327303836f,
+-0.00436285001930248f,
+-0.0040277060796026f,
+-0.00369130619844927f,
+-0.0033538253446594f,
+-0.00301543862135968f,
+-0.00267632117613655f,
+-0.00233664811137679f,
+-0.00199659439484433f,
+-0.00165633477053924f,
+-0.00131604366988201f,
+-0.000975895123270568f,
+-0.000636062672051198f,
+-0.000296719280950014f,
+4.19627489923029e-05f,
+0.000379811866940294f,
+0.000716657358192284f,
+0.00105232942947911f,
+0.00138665929358587f,
+0.00171947925326048f,
+0.00205062278436349f,
+0.00237992461822022f,
+0.00270722082313579f,
+0.00303234888503091f,
+0.0033551477871623f,
+0.00367545808888596f,
+0.00399312200342837f,
+0.00430798347462561f,
+0.00461988825259516f,
+0.00492868396830372f,
+0.00523422020699499f,
+0.00553634858044424f,
+0.00583492279800283f,
+0.00612979873640211f,
+0.00642083450828168f,
+0.00670789052941064f,
+0.00699082958457223f,
+0.00726951689207744f,
+0.00754382016688266f,
+0.00781360968227803f,
+0.0080787583301217f,
+0.00833914167959037f,
+0.00859463803442024f,
+0.00884512848861381f,
+0.0090904969805854f,
+0.00933063034572383f,
+0.00956541836734724f,
+0.00979475382602877f,
+0.0100185325472712f,
+0.0102366534475113f,
+0.010449018578432f,
+0.0106555331695659f,
+0.0108561056691723f,
+0.0110506477833682f,
+0.0112390745135014f,
+0.0114213041917481f,
+0.0115972585149209f,
+0.0117668625764763f,
+0.0119300448967067f,
+0.012086737451109f,
+0.0122368756969161f,
+0.0123803985977855f,
+0.0125172486466337f,
+0.0126473718866118f,
+0.0127707179302138f,
+0.0128872399765134f,
+0.0129968948265257f,
+0.0130996428966874f,
+0.0131954482304574f,
+0.0132842785080317f,
+0.0133661050541769f,
+0.0134409028441778f,
+0.013508650507905f,
+0.0135693303320019f,
+0.0136229282601955f,
+0.0136694338917359f,
+0.0137088404779684f,
+0.0137411449170453f,
+0.0137663477467848f,
+0.013784453135684f,
+0.013795468872096f,
+0.0137994063515803f,
+0.0137962805624378f,
+0.0137861100694423f,
+0.0137689169957797f,
+0.0137447270032108f,
+0.0137135692704695f,
+0.0136754764699141f,
+0.0136304847424457f,
+0.0135786336707118f,
+0.013519966250613f,
+0.0134545288611308f,
+0.0133823712324961f,
+0.0133035464127194f,
+0.0132181107325022f,
+0.0131261237685533f,
+0.0130276483053306f,
+0.0129227502952339f,
+0.0128114988172705f,
+0.01269396603422f,
+0.0125702271483237f,
+0.0124403603555234f,
+0.0123044467982785f,
+0.0121625705169872f,
+0.0120148184000414f,
+0.0118612801325425f,
+0.0117020481437095f,
+0.0115372175530078f,
+0.0113668861150299f,
+0.01119115416316f,
+0.0110101245520525f,
+0.0108239025989582f,
+0.0106325960239306f,
+0.0104363148889449f,
+0.0102351715359648f,
+0.0100292805239893f,
+0.0098187585651169f,
+0.00960372445965929f,
+0.00938429903034274f,
+0.00916060505563078f,
+0.00893276720220603f,
+0.00870091195664717f,
+0.00846516755633744f,
+0.00822566391964303f,
+0.00798253257539762f,
+0.00773590659173174f,
+0.0074859205042846f,
+0.0072327102438365f,
+0.00697641306340084f,
+0.00671716746481301f,
+0.00645511312485713f,
+0.00619039082096706f,
+0.00592314235654277f,
+0.00565351048592053f,
+0.00538163883903519f,
+0.00510767184581618f,
+0.00483175466035329f,
+0.0045540330848758f,
+0.00427465349357983f,
+0.0039937627563468f,
+0.00371150816239089f,
+0.00342803734387407f,
+0.00314349819952992f,
+0.00285803881833284f,
+0.00257180740325433f,
+0.00228495219514193f,
+0.00199762139676367f,
+0.00170996309705199f,
+0.00142212519558895f,
+0.00113425532736956f,
+0.000846500787880119f,
+0.000559008458531536f,
+0.000271924732482214f,
+-1.46045591101362e-05f,
+-0.000300434220371862f,
+-0.000585419763496916f,
+-0.00086941748099089f,
+-0.00115228451734445f,
+-0.00143387894009652f,
+-0.00171405981025575f,
+-0.00199268725204318f,
+-0.00226962252192313f,
+-0.0025447280768894f,
+-0.0028178676419714f,
+-0.00308890627693019f,
+-0.00335771044210987f,
+-0.00362414806341412f,
+-0.00388808859637569f,
+-0.00414940308928949f,
+-0.00440796424537761f,
+-0.0046636464839576f,
+-0.00491632600058568f,
+-0.00516588082614467f,
+-0.00541219088485123f,
+-0.00565513805115323f,
+-0.00589460620549209f,
+-0.00613048128890367f,
+-0.00636265135643233f,
+-0.00659100662933489f,
+-0.00681543954604841f,
+-0.00703584481190112f,
+-0.00725211944754226f,
+-0.00746416283606952f,
+-0.00767187676883409f,
+-0.00787516548990105f,
+-0.00807393573914805f,
+-0.00826809679398036f,
+-0.00845756050964779f,
+-0.0086422413581431f,
+-0.00882205646566693f,
+-0.00899692564864383f,
+-0.00916677144827267f,
+-0.00933151916359955f,
+-0.00949109688309758f,
+-0.00964543551474288f,
+-0.00979446881457346f,
+-0.00993813341372092f,
+-0.0100763688439045f,
+-0.010209117561378f,
+-0.0103363249693214f,
+-0.0104579394386686f,
+-0.0105739123273658f,
+-0.0106841979980529f,
+-0.0107887538341635f,
+-0.0108875402544387f,
+-0.0109805207258519f,
+-0.0110676617749403f,
+-0.0111489329975425f,
+-0.0112243070669403f,
+-0.0112937597404047f,
+-0.0113572698641464f,
+-0.0114148193766721f,
+-0.0114663933105489f,
+-0.0115119797925796f,
+-0.0115515700423923f,
+-0.0115851583694502f,
+-0.0116127421684842f,
+-0.011634321913358f,
+-0.0116499011493693f,
+-0.0116594864839974f,
+-0.0116630875761036f,
+-0.0116607171235953f,
+-0.0116523908495633f,
+-0.0116381274869016f,
+-0.0116179487614245f,
+-0.01159187937349f,
+-0.011559946978144f,
+-0.0115221821637997f,
+-0.0114786184294646f,
+-0.0114292921605328f,
+-0.0113742426031564f,
+-0.0113135118372135f,
+-0.0112471447478901f,
+-0.0111751889958936f,
+-0.0110976949863162f,
+-0.0110147158361677f,
+-0.010926307340598f,
+-0.0108325279378291f,
+-0.0107334386728173f,
+-0.010629103159669f,
+-0.0105195875428304f,
+-0.010404960457075f,
+-0.0102852929863125f,
+-0.0101606586212424f,
+-0.0100311332158768f,
+-0.00989679494295863f,
+-0.0097577242482986f,
+-0.00961400380405963f,
+-0.00946571846101251f,
+-0.00931295519979207f,
+-0.00915580308117954f,
+-0.00899435319544003f,
+-0.00882869861074312f,
+-0.00865893432069448f,
+-0.00848515719100898f,
+-0.00830746590535331f,
+-0.00812596091038898f,
+-0.00794074436004472f,
+-0.00775192005904976f,
+-0.00755959340575842f,
+-0.00736387133429605f,
+-0.00716486225605968f,
+-0.00696267600060248f,
+-0.00675742375593618f,
+-0.00654921800828116f,
+-0.00633817248129907f,
+-0.00612440207483747f,
+-0.00590802280322156f,
+-0.00568915173312446f,
+-0.00546790692104879f,
+-0.00524440735045367f,
+-0.00501877286855874f,
+-0.00479112412285956f,
+-0.00456158249738753f,
+-0.00433027004874617f,
+-0.00409730944195998f,
+-0.00386282388616572f,
+-0.00362693707018273f,
+-0.00338977309799299f,
+-0.003151456424166f,
+-0.0029121117892613f,
+-0.00267186415524059f,
+-0.00243083864092491f,
+-0.00218916045752725f,
+-0.00194695484429555f,
+-0.00170434700429766f,
+-0.00146146204038147f,
+-0.0012184248913417f,
+-0.000975360268326886f,
+-0.000732392591517812f,
+-0.000489645927108687f,
+-0.000247243924624318f,
+-5.30975460243513e-06f,
+0.000236033953325795f,
+0.000476665171927516f,
+0.000716462537401301f,
+0.000955305409921098f,
+0.00119307393366231f,
+0.00142964909627861f,
+0.00166491278780243f,
+0.00189874785893866f,
+0.00213103817872366f,
+0.00236166869152247f,
+0.00259052547333456f,
+0.00281749578738374f,
+0.00304246813896196f,
+0.00326533232950441f,
+0.00348597950986719f,
+0.00370430223278326f,
+0.00392019450447253f,
+0.00413355183537976f,
+0.00434427129001857f,
+0.00455225153589615f,
+0.00475739289149763f,
+0.00495959737330628f,
+0.00515876874183869f,
+0.00535481254667346f,
+0.00554763617045255f,
+0.00573714887183583f,
+0.00592326182738836f,
+0.00610588817238264f,
+0.0062849430404968f,
+0.00646034360239086f,
+0.0066320091031453f,
+0.00679986089854376f,
+0.00696382249018553f,
+0.00712381955941148f,
+0.00727978000003043f,
+0.00743163394983033f,
+0.00757931382086227f,
+0.00772275432848474f,
+0.00786189251915527f,
+0.00799666779695974f,
+0.00812702194886731f,
+0.00825289916870263f,
+0.00837424607982448f,
+0.00849101175650416f,
+0.0086031477439945f,
+0.00871060807728278f,
+0.00881334929852171f,
+0.00891133047313174f,
+0.00900451320457065f,
+0.00909286164776552f,
+0.00917634252120344f,
+0.00925492511767886f,
+0.00932858131369381f,
+0.00939728557751129f,
+0.00946101497585938f,
+0.00951974917928708f,
+0.00957347046617182f,
+0.00962216372537994f,
+0.00966581645758253f,
+0.00970441877522852f,
+0.009737963401179f,
+0.00976644566600632f,
+0.0097898635039628f,
+0.00980821744762438f,
+0.00982151062121513f,
+0.00982974873261936f,
+0.00983294006408858f,
+0.00983109546165142f,
+0.00982422832323481f,
+0.00981235458550606f,
+0.00979549270944552f,
+0.00977366366466025f,
+0.00974689091245019f,
+0.00971520038763806f,
+0.00967862047917592f,
+0.00963718200954081f,
+0.00959091821293355f,
+0.00953986471229418f,
+0.00948405949514948f,
+0.00942354288830723f,
+0.00935835753141334f,
+0.00928854834938809f,
+0.00921416252375845f,
+0.0091352494629039f,
+0.0090518607712336f,
+0.00896405021731353f,
+0.00887187370096227f,
+0.0087753892193352f,
+0.00867465683201655f,
+0.00856973862514042f,
+0.0084606986745602f,
+0.00834760300808965f,
+0.00823051956683513f,
+0.00810951816564266f,
+0.00798467045268168f,
+0.00785604986818808f,
+0.00772373160239066f,
+0.00758779255264339f,
+0.00744831127978855f,
+0.00730536796377458f,
+0.00715904435855267f,
+0.00700942374627865f,
+0.00685659089084313f,
+0.00670063199075772f,
+0.00654163463142106f,
+0.00637968773679228f,
+0.00621488152049734f,
+0.00604730743639451f,
+0.00587705812862679f,
+0.00570422738118674f,
+0.00552891006702204f,
+0.00535120209670837f,
+0.00517120036671732f,
+0.00498900270730639f,
+0.00480470783005945f,
+0.00461841527510535f,
+0.00443022535804147f,
+0.00424023911659229f,
+0.00404855825702851f,
+0.00385528510037713f,
+0.00366052252844892f,
+0.00346437392971236f,
+0.0032669431450421f,
+0.00306833441336933f,
+0.00286865231726372f,
+0.00266800172847322f,
+0.00246648775345124f,
+0.00226421567889881f,
+0.00206129091734865f,
+0.001857818952821f,
+0.00165390528657631f,
+0.00144965538299551f,
+0.00124517461561208f,
+0.00104056821332573f,
+0.000835941206823879f,
+0.000631398375237409f,
+0.000427044193058939f,
+0.000222982777348388f,
+1.93178352541884e-05f,
+-0.000183847388125652f,
+-0.000386410161515063f,
+-0.000588268318839344f,
+-0.000789320310186792f,
+-0.000989465252327088f,
+-0.00118860297876263f,
+-0.00138663408928657f,
+-0.00158345999902536f,
+-0.00177898298694016f,
+-0.00197310624376432f,
+-0.00216573391935424f,
+-0.00235677116942952f,
+-0.00254612420168104f,
+-0.00273370032122396f,
+-0.00291940797537506f,
+-0.00310315679773186f,
+-0.00328485765153321f,
+-0.00346442267228144f,
+-0.00364176530960462f,
+-0.00381680036834099f,
+-0.00398944404882473f,
+-0.00415961398635617f,
+-0.00432722928983605f,
+-0.00449221057954843f,
+-0.00465448002407309f,
+-0.0048139613763114f,
+-0.00497058000860979f,
+-0.00512426294696376f,
+-0.0052749389042889f,
+-0.00542253831274242f,
+-0.00556699335508204f,
+-0.00570823799504863f,
+-0.00584620800675817f,
+-0.00598084100309234f,
+-0.00611207646307367f,
+-0.00623985575821544f,
+-0.00636412217783413f,
+-0.00648482095331432f,
+-0.00660189928131711f,
+-0.00671530634592089f,
+-0.00682499333968802f,
+-0.00693091348364723f,
+-0.00703302204618568f,
+-0.00713127636084265f,
+-0.00722563584299943f,
+-0.00731606200545875f,
+-0.00740251847290887f,
+-0.007484970995268f,
+-0.00756338745990427f,
+-0.00763773790272864f,
+-0.00770799451815706f,
+-0.00777413166794024f,
+-0.00783612588885893f,
+-0.00789395589928373f,
+-0.00794760260459901f,
+-0.00799704910149072f,
+-0.00804228068109908f,
+-0.00808328483103711f,
+-0.00812005123627679f,
+-0.00815257177890557f,
+-0.00818084053675577f,
+-0.00820485378091061f,
+-0.00822460997209095f,
+-0.0082401097559274f,
+-0.008251355957123f,
+-0.00825835357251226f,
+-0.00826110976302289f,
+-0.00825963384454712f,
+-0.00825393727773002f,
+-0.00824403365668277f,
+-0.00822993869662941f,
+-0.0082116702204961f,
+-0.00818924814445231f,
+-0.00816269446241429f,
+-0.00813203322952095f,
+-0.00809729054459371f,
+-0.00805849453159143f,
+-0.0080156753200729f,
+-0.00796886502467894f,
+-0.0079180977236477f,
+-0.00786340943637592f,
+-0.00780483810004095f,
+-0.00774242354529683f,
+-0.0076762074710605f,
+-0.00760623341840202f,
+-0.00753254674355573f,
+-0.00745519459006761f,
+-0.00737422586009549f,
+-0.00728969118487935f,
+-0.00720164289439836f,
+-0.00711013498623295f,
+-0.00701522309364934f,
+-0.00691696445292533f,
+-0.00681541786993564f,
+-0.0067106436860163f,
+-0.00660270374312707f,
+-0.00649166134833156f,
+-0.00637758123761547f,
+-0.0062605295390625f,
+-0.00614057373540916f,
+-0.00601778262599883f,
+-0.0058922262881563f,
+-0.00576397603800424f,
+-0.00563310439074258f,
+-0.00549968502041355f,
+-0.00536379271917322f,
+-0.00522550335609256f,
+-0.00508489383551021f,
+-0.00494204205495889f,
+-0.00479702686268925f,
+-0.00464992801481257f,
+-0.00450082613208717f,
+-0.00434980265636944f,
+-0.00419693980675458f,
+-0.00404232053542953f,
+-0.00388602848326118f,
+-0.00372814793514442f,
+-0.00356876377513224f,
+-0.00340796144137294f,
+-0.00324582688087654f,
+-0.00308244650413554f,
+-0.00291790713962266f,
+-0.00275229598818971f,
+-0.00258570057739144f,
+-0.00241820871575722f,
+-0.00224990844703554f,
+-0.00208088800443331f,
+-0.00191123576487488f,
+-0.00174104020330362f,
+-0.00157038984704899f,
+-0.00139937323028345f,
+-0.0012280788485914f,
+-0.00105659511367404f,
+-0.000885010308212022f,
+-0.000713412540909905f,
+-0.000541889701744389f,
+-0.000370529417438411f,
+-0.000199419007184688f,
+-2.86454386391724e-05f,
+0.000141704715791932f,
+0.000311545322351528f,
+0.000480790728994517f,
+0.000649355808093498f,
+0.000817155998766742f,
+0.000984107348806231f,
+0.00115012655618751f,
+0.00131513101013779f,
+0.00147903883174615f,
+0.00164176891409281f,
+0.00180324096188044f,
+0.00196337553054684f,
+0.00212209406484084f,
+0.00227931893684354f,
+0.00243497348341522f,
+0.00258898204305202f,
+0.00274126999213338f,
+0.00289176378054382f,
+0.00304039096665289f,
+0.00318708025163551f,
+0.00333176151311843f,
+0.00347436583813595f,
+0.00361482555538014f,
+0.00375307426673132f,
+0.00388904687805323f,
+0.00402267962924054f,
+0.00415391012350339f,
+0.00428267735587738f,
+0.00440892174094537f,
+0.00453258513975951f,
+0.00465361088595093f,
+0.00477194381101678f,
+0.0048875302687727f,
+0.00500031815896078f,
+0.00511025695000341f,
+0.00521729770089245f,
+0.005321393082206f,
+0.00542249739624305f,
+0.00552056659626851f,
+0.00561555830486112f,
+0.00570743183135652f,
+0.00579614818837955f,
+0.00588167010745905f,
+0.00596396205371965f,
+0.00604299023964567f,
+0.006118722637912f,
+0.0061911289932778f,
+0.00626018083353982f,
+0.00632585147954145f,
+0.00638811605423505f,
+0.00644695149079577f,
+0.0065023365397841f,
+0.00655425177535714f,
+0.00660267960052678f,
+0.00664760425146518f,
+0.00668901180085765f,
+0.00672689016030345f,
+0.00676122908176597f,
+0.00679202015807388f,
+0.0068192568224754f,
+0.00684293434724847f,
+0.00686304984136987f,
+0.00687960224724698f,
+0.00689259233651608f,
+0.00690202270491214f,
+0.00690789776621478f,
+0.00691022374527592f,
+0.00690900867013539f,
+0.00690426236323048f,
+0.00689599643170657f,
+0.00688422425683606f,
+0.00686896098255334f,
+0.00685022350311395f,
+0.00682803044988654f,
+0.00680240217728674f,
+0.00677336074786232f,
+0.00674092991653943f,
+0.00670513511404041f,
+0.00666600342948348f,
+0.00662356359217583f,
+0.00657784595261114f,
+0.00652888246268357f,
+0.00647670665513047f,
+0.00642135362221613f,
+0.00636285999366974f,
+0.00630126391389078f,
+0.00623660501843537f,
+0.00616892440979761f,
+0.00609826463250009f,
+0.00602466964750847f,
+0.0059481848059844f,
+0.00586885682239295f,
+0.00578673374697901f,
+0.00570186493762922f,
+0.00561430103113523f,
+0.00552409391387439f,
+0.00543129669192503f,
+0.0053359636606324f,
+0.00523815027364322f,
+0.00513791311142525f,
+0.00503530984929013f,
+0.00493039922493699f,
+0.00482324100553433f,
+0.00471389595435921f,
+0.00460242579701116f,
+0.00448889318721966f,
+0.0043733616722642f,
+0.00425589565802507f,
+0.004136560373684f,
+0.00401542183609403f,
+0.00389254681383765f,
+0.00376800279099204f,
+0.00364185793062176f,
+0.00351418103801726f,
+0.00338504152369975f,
+0.00325450936621163f,
+0.00312265507471182f,
+0.00298954965139679f,
+0.00285526455376563f,
+0.00271987165675057f,
+0.00258344321473122f,
+0.00244605182345363f,
+0.00230777038187339f,
+0.0021686720539424f,
+0.00202883023036007f,
+0.00188831849030696f,
+0.00174721056318321f,
+0.00160558029036844f,
+0.00146350158702526f,
+0.00132104840396418f,
+0.00117829468959045f,
+0.0010353143519519f,
+0.000892181220906407f,
+0.000748969010429438f,
+0.000605751281079199f,
+0.000462601402639519f,
+0.000319592516958703f,
+0.000176797501002549f,
+3.42889301410701e-05f,
+-0.000107860958314117f,
+-0.000249580301302546f,
+-0.000390797645920318f,
+-0.000531441985020898f,
+-0.000671442792492635f,
+-0.000810730058197295f,
+-0.000949234322550692f,
+-0.00108688671073022f,
+-0.00122361896649147f,
+-0.00135936348557853f,
+-0.00149405334871076f,
+-0.00162762235413137f,
+-0.00176000504970118f,
+-0.00189113676452272f,
+-0.00202095364007996f,
+-0.00214939266087792f,
+-0.00227639168456902f,
+-0.0024018894715508f,
+-0.00252582571402182f,
+-0.00264814106448246f,
+-0.0027687771636664f,
+-0.00288767666789124f,
+-0.00300478327581456f,
+-0.00312004175458374f,
+-0.00323339796536792f,
+-0.00334479888826015f,
+-0.00345419264653828f,
+-0.00356152853027509f,
+-0.00366675701928568f,
+-0.00376982980540297f,
+-0.00387069981407155f,
+-0.00396932122525004f,
+-0.00406564949361391f,
+-0.00415964136804923f,
+-0.0042512549104298f,
+-0.00434044951367f,
+-0.00442718591904523f,
+-0.00451142623277396f,
+-0.00459313394185402f,
+-0.00467227392914711f,
+-0.00474881248770633f,
+-0.00482271733434035f,
+-0.0048939576224102f,
+-0.00496250395385362f,
+-0.00502832839043273f,
+-0.00509140446420189f,
+-0.00515170718719161f,
+-0.00520921306030623f,
+-0.0052639000814326f,
+-0.00531574775275781f,
+-0.00536473708729396f,
+-0.00541085061460937f,
+-0.00545407238576448f,
+-0.00549438797745298f,
+-0.00553178449534731f,
+-0.00556625057664943f,
+-0.00559777639184753f,
+-0.00562635364567969f,
+-0.00565197557730641f,
+-0.00567463695969378f,
+-0.00569433409820979f,
+-0.00571106482843655f,
+-0.00572482851320177f,
+-0.00573562603883286f,
+-0.00574345981063785f,
+-0.00574833374761739f,
+-0.00575025327641265f,
+-0.00574922532449426f,
+-0.00574525831259774f,
+-0.00573836214641151f,
+-0.00572854820752344f,
+-0.00571582934363289f,
+-0.00570021985803501f,
+-0.00568173549838472f,
+-0.00566039344474815f,
+-0.00563621229694942f,
+-0.00560921206122126f,
+-0.00557941413616825f,
+-0.00554684129805166f,
+-0.00551151768540502f,
+-0.00547346878299081f,
+-0.00543272140510751f,
+-0.00538930367825778f,
+-0.00534324502318837f,
+-0.00529457613631248f,
+-0.00524332897052591f,
+-0.00518953671542864f,
+-0.00513323377696331f,
+-0.00507445575648276f,
+-0.00501323942925908f,
+-0.00494962272244652f,
+-0.0048836446925111f,
+-0.00481534550214016f,
+-0.00474476639664476f,
+-0.00467194967986881f,
+-0.00459693868961849f,
+-0.00451977777262569f,
+-0.00444051225906017f,
+-0.00435918843660394f,
+-0.00427585352410332f,
+-0.0041905556448125f,
+-0.00410334379924412f,
+-0.00401426783764162f,
+-0.00392337843208837f,
+-0.00383072704826952f,
+-0.00373636591690094f,
+-0.0036403480048426f,
+-0.00354272698590992f,
+-0.00344355721140095f,
+-0.00334289368035381f,
+-0.00324079200955149f,
+-0.00313730840328953f,
+-0.00303249962292274f,
+-0.00292642295620788f,
+-0.0028191361864577f,
+-0.00271069756152356f,
+-0.00260116576262272f,
+-0.00249059987302637f,
+-0.00237905934662593f,
+-0.00226660397639285f,
+-0.00215329386274949f,
+-0.00203918938186721f,
+-0.00192435115390781f,
+-0.00180884001122575f,
+-0.00169271696654636f,
+-0.00157604318113799f,
+-0.00145887993299307f,
+-0.00134128858503559f,
+-0.00122333055337023f,
+-0.00110506727559064f,
+-0.000986560179161664f,
+-0.000867870649892684f,
+-0.000749060000517654f,
+-0.000630189439397319f,
+-0.000511320039360377f,
+-0.000392512706698102f,
+-0.000273828150328942f,
+-0.000155326851148112f,
+-3.70690315771188e-05f,
+8.08853746707291e-05f,
+0.000198476752594946f,
+0.000315645835666874f,
+0.000432333735328773f,
+0.000548481970218808f,
+0.000664032495107181f,
+0.000778927729529055f,
+0.000893110586101436f,
+0.00100652449850903f,
+0.0011191134491462f,
+0.00123082199640187f,
+0.00134159530157362f,
+0.001451379155399f,
+0.00156012000419063f,
+0.00166776497556304f,
+0.00177426190373947f,
+0.00187955935442585f,
+0.00198360664924134f,
+0.00208635388969324f,
+0.00218775198068548f,
+0.00228775265355017f,
+0.00238630848859078f,
+0.00248337293712777f,
+0.00257890034303573f,
+0.00267284596376264f,
+0.0027651659908224f,
+0.00285581756975022f,
+0.00294475881951347f,
+0.00303194885136837f,
+0.00311734778715523f,
+0.00320091677702331f,
+0.00328261801657889f,
+0.00336241476344813f,
+0.00344027135324884f,
+0.00351615321496371f,
+0.00359002688570914f,
+0.00366186002489375f,
+0.00373162142776056f,
+0.00379928103830807f,
+0.00386480996158482f,
+0.00392818047535296f,
+0.00398936604111683f,
+0.00404834131451196f,
+0.00410508215505164f,
+0.00415956563522717f,
+0.00421177004895933f,
+0.00426167491939793f,
+0.00430926100606804f,
+0.00435451031136012f,
+0.00439740608636304f,
+0.00443793283603874f,
+0.00447607632373735f,
+0.00451182357505271f,
+0.00454516288101758f,
+0.00457608380063932f,
+0.00460457716277593f,
+0.00463063506735364f,
+0.00465425088592729f,
+0.00467541926158465f,
+0.00469413610819695f,
+0.00471039860901749f,
+0.00472420521463094f,
+0.00473555564025633f,
+0.00474445086240651f,
+0.00475089311490802f,
+0.00475488588428478f,
+0.00475643390451008f,
+0.00475554315113093f,
+0.00475222083476989f,
+0.00474647539400919f,
+0.0047383164876626f,
+0.0047277549864407f,
+0.00471480296401554f,
+0.00469947368749088f,
+0.00468178160728458f,
+0.00466174234643012f,
+0.00463937268930397f,
+0.00461469056978683f,
+0.00458771505886558f,
+0.00455846635168474f,
+0.0045269657540549f,
+0.00449323566842705f,
+0.00445729957934127f,
+0.00441918203835878f,
+0.00437890864848652f,
+0.00433650604810388f,
+0.00429200189440092f,
+0.00424542484633809f,
+0.00419680454713777f,
+0.00414617160631751f,
+0.00409355758127593f,
+0.0040389949584418f,
+0.0039825171339971f,
+0.00392415839418544f,
+0.00386395389521697f,
+0.00380193964278122f,
+0.00373815247117977f,
+0.00367263002209005f,
+0.00360541072297291f,
+0.00353653376513537f,
+0.00346603908146142f,
+0.00339396732382295f,
+0.00332035984018316f,
+0.00324525865140576f,
+0.00316870642778174f,
+0.00309074646528777f,
+0.00301142266158806f,
+0.00293077949179369f,
+0.00284886198399182f,
+0.00276571569455874f,
+0.0026813866832694f,
+0.0025959214882174f,
+0.00250936710055862f,
+0.00242177093909173f,
+0.00233318082468987f,
+0.00224364495459622f,
+0.00215321187659778f,
+0.00206193046309074f,
+0.00196984988505084f,
+0.00187701958592308f,
+0.00178348925544365f,
+0.00168930880340844f,
+0.00159452833340149f,
+0.00149919811649696f,
+0.00140336856494826f,
+0.0013070902058786f,
+0.00121041365498514f,
+0.00111338959027166f,
+0.00101606872582252f,
+0.000918501785631088f,
+0.000820739477496859f,
+0.000722832467003396f,
+0.00062483135159124f,
+0.000526786634738467f,
+0.000428748700261665f,
+0.000330767786750949f,
+0.000232893962150942f,
+0.000135177098501165f,
+3.76668468481058e-05f,
+-5.95873876588744e-05f,
+-0.00015653647047473f,
+-0.000253131562157722f,
+-0.00034932414264742f,
+-0.000445066035310076f,
+-0.000540309430740104f,
+-0.000635006910305014f,
+-0.000729111469423506f,
+-0.000822576540564631f,
+-0.000915356015957641f,
+-0.00100740427000084f,
+-0.00109867618135962f,
+-0.00118912715474223f,
+-0.00127871314234389f,
+-0.00136739066494837f,
+-0.00145511683267735f,
+-0.00154184936537829f,
+-0.00162754661264048f,
+-0.00171216757343079f,
+-0.00179567191533962f,
+-0.00187801999342816f,
+-0.00195917286866889f,
+-0.0020390923259702f,
+-0.00211774089177778f,
+-0.00219508185124424f,
+-0.00227107926495982f,
+-0.00234569798523625f,
+-0.00241890367193749f,
+-0.00249066280784943f,
+-0.00256094271358263f,
+-0.00262971156200169f,
+-0.00269693839217459f,
+-0.00276259312283698f,
+-0.00282664656536508f,
+-0.00288907043625251f,
+-0.00294983736908551f,
+-0.00300892092601204f,
+-0.00306629560870053f,
+-0.00312193686878331f,
+-0.00317582111778178f,
+-0.00322792573650879f,
+-0.00327822908394536f,
+-0.00332671050558862f,
+-0.00337335034126783f,
+-0.00341812993242641f,
+-0.00346103162886747f,
+-0.00350203879496073f,
+-0.00354113581530953f,
+-0.00357830809987641f,
+-0.00361354208856589f,
+-0.00364682525526395f,
+-0.00367814611133359f,
+-0.00370749420856603f,
+-0.00373486014158784f,
+-0.0037602355497241f,
+-0.00378361311831824f,
+-0.00380498657950949f,
+-0.00382435071246891f,
+-0.00384170134309564f,
+-0.00385703534317483f,
+-0.00387035062899941f,
+-0.00388164615945781f,
+-0.00389092193359018f,
+-0.00389817898761587f,
+-0.00390341939143523f,
+-0.00390664624460901f,
+-0.00390786367181894f,
+-0.00390707681781324f,
+-0.00390429184184127f,
+-0.00389951591158146f,
+-0.00389275719656734f,
+-0.0038840248611162f,
+-0.00387332905676573f,
+-0.00386068091422367f,
+-0.00384609253483634f,
+-0.0038295769815814f,
+-0.00381114826959134f,
+-0.00379082135621343f,
+-0.00376861213061302f,
+-0.00374453740292646f,
+-0.00371861489297091f,
+-0.00369086321851783f,
+-0.00366130188313755f,
+-0.00362995126362248f,
+-0.00359683259699653f,
+-0.00356196796711878f,
+-0.00352538029088928f,
+-0.00348709330406542f,
+-0.00344713154669716f,
+-0.00340552034818985f,
+-0.00336228581200324f,
+-0.00331745479999584f,
+-0.0032710549164236f,
+-0.00322311449160199f,
+-0.00317366256524133f,
+-0.00312272886946436f,
+-0.00307034381151609f,
+-0.00301653845617577f,
+-0.00296134450788043f,
+-0.00290479429257074f,
+-0.00284692073926871f,
+-0.00278775736139795f,
+-0.00272733823785673f,
+-0.0026656979938541f,
+-0.00260287178151994f,
+-0.00253889526029965f,
+-0.00247380457714373f,
+-0.00240763634650355f,
+-0.00234042763014414f,
+-0.00227221591678448f,
+-0.00220303910157702f,
+-0.00213293546543682f,
+-0.00206194365423175f,
+-0.00199010265784497f,
+-0.00191745178912041f,
+-0.00184403066270314f,
+-0.00176987917378505f,
+-0.0016950374767678f,
+-0.00161954596385396f,
+-0.00154344524357734f,
+-0.0014667761192845f,
+-0.00138957956757772f,
+-0.00131189671673157f,
+-0.00123376882509378f,
+-0.00115523725948149f,
+-0.00107634347358468f,
+-0.000997128986387144f,
+-0.000917635360616649f,
+-0.000837904181234896f,
+-0.000757977033978788f,
+-0.000677895483963236f,
+-0.000597701054357152f,
+-0.00051743520514265f,
+-0.000437139311968778f,
+-0.00035685464511021f,
+-0.000276622348541154f,
+-0.000196483419135613f,
+-0.00011647868600357f,
+-3.66487899740423e-05f,
+4.29658367651342e-05f,
+0.000122324990860947f,
+0.000201388717811738f,
+0.000280117331797545f,
+0.000358471435313893f,
+0.000436411938600041f,
+0.000513900078851591f,
+0.000590897439209056f,
+0.000667365967512407f,
+0.000743267994812951f,
+0.000818566253633951f,
+0.000893223895970637f,
+0.000967204511021862f,
+0.00104047214264425f,
+0.0011129913065214f,
+0.00118472700703947f,
+0.00125564475386154f,
+0.00132571057819342f,
+0.00139489104873263f,
+0.00146315328729405f,
+0.00153046498410463f,
+0.00159679441276025f,
+0.00166211044483839f,
+0.00172638256415947f,
+0.00178958088069117f,
+0.00185167614408906f,
+0.00191263975686786f,
+0.00197244378719761f,
+0.00203106098131931f,
+0.00208846477557452f,
+0.00214462930804392f,
+0.00219952942979019f,
+0.0022531407157002f,
+0.00230543947492238f,
+0.00235640276089498f,
+0.00240600838096101f,
+0.0024542349055667f,
+0.00250106167703914f,
+0.00254646881794065f,
+0.00259043723899602f,
+0.00263294864659046f,
+0.00267398554983521f,
+0.00271353126719851f,
+0.00275156993270003f,
+0.00278808650166653f,
+0.00282306675604716f,
+0.00285649730928709f,
+0.00288836561075817f,
+0.00291865994974546f,
+0.00294736945898929f,
+0.0029744841177818f,
+0.00299999475461814f,
+0.00302389304940205f,
+0.00304617153520602f,
+0.00306682359958636f,
+0.00308584348545405f,
+0.00310322629150201f,
+0.00311896797218987f,
+0.00313306533728775f,
+0.00314551605098039f,
+0.00315631863053355f,
+0.00316547244452441f,
+0.00317297771063858f,
+0.00317883549303572f,
+0.00318304769928661f,
+0.00318561707688457f,
+0.00318654720933417f,
+0.00318584251182051f,
+0.00318350822646264f,
+0.00317955041715474f,
+0.00317397596399889f,
+0.00316679255733362f,
+0.00315800869136253f,
+0.00314763365738724f,
+0.00313567753664972f,
+0.00312215119278839f,
+0.00310706626391349f,
+0.00309043515430657f,
+0.00307227102574976f,
+0.00305258778849026f,
+0.00303140009184578f,
+0.00300872331445699f,
+0.00298457355419297f,
+0.00295896761771582f,
+0.002931923009711f,
+0.00290345792178987f,
+0.00287359122107116f,
+0.00284234243844816f,
+0.00280973175654866f,
+0.0027757799973949f,
+0.00274050860977058f,
+0.00270393965630239f,
+0.00266609580026379f,
+0.00262700029210838f,
+0.00258667695574077f,
+0.00254515017453283f,
+0.00250244487709332f,
+0.00245858652279897f,
+0.00241360108709495f,
+0.00236751504657361f,
+0.00232035536383918f,
+0.00227214947216735f,
+0.00222292525996793f,
+0.00217271105505976f,
+0.00212153560876561f,
+0.00206942807983706f,
+0.0020164180182168f,
+0.00196253534864859f,
+0.00190781035414268f,
+0.0018522736593062f,
+0.00179595621354771f,
+0.0017388892741645f,
+0.00168110438932177f,
+0.00162263338093348f,
+0.00156350832745304f,
+0.00150376154658367f,
+0.00144342557791727f,
+0.00138253316551136f,
+0.00132111724041281f,
+0.00125921090313771f,
+0.00119684740611688f,
+0.00113406013611575f,
+0.00107088259663795f,
+0.00100734839032173f,
+0.000943491201338451f,
+0.000879344777802133f,
+0.000814942914198998f,
+0.000750319433846045f,
+0.000685508171388118f,
+0.000620542955341617f,
+0.000555457590694125f,
+0.000490285841569116f,
+0.000425061413963795f,
+0.000359817938569106f,
+0.000294588953680933f,
+0.000229407888210246f,
+0.000164308044801349f,
+9.93225830661221e-05f,
+3.4484502943216e-05f,
+-3.01733718103323e-05f,
+-9.46184099865878e-05f,
+-0.000158818189144902f,
+-0.000222740511673599f,
+-0.000286353420686934f,
+-0.000349625215749474f,
+-0.000412524468420491f,
+-0.000475020037611034f,
+-0.000537081084745967f,
+-0.000598677088724102f,
+-0.00065977786066875f,
+-0.000720353558462379f,
+-0.000780374701058222f,
+-0.000839812182561742f,
+-0.000898637286076073f,
+-0.000956821697304657f,
+-0.00101433751790445f,
+-0.00107115727858425f,
+-0.00112725395194157f,
+-0.00118260096503266f,
+-0.00123717221166939f,
+-0.00129094206443821f,
+-0.00134388538643542f,
+-0.00139597754271322f,
+-0.00144719441143245f,
+-0.00149751239471598f,
+-0.00154690842919921f,
+-0.00159535999627204f,
+-0.00164284513200889f,
+-0.001689342436782f,
+-0.00173483108455442f,
+-0.00177929083184826f,
+-0.0018227020263853f,
+-0.00186504561539609f,
+-0.00190630315359405f,
+-0.00194645681081197f,
+-0.0019854893792978f,
+-0.00202338428066662f,
+-0.00206012557250691f,
+-0.00209569795463822f,
+-0.00213008677501847f,
+-0.00216327803529848f,
+-0.00219525839602226f,
+-0.00222601518147149f,
+-0.00225553638415245f,
+-0.0022838106689244f,
+-0.00231082737676847f,
+-0.00233657652819601f,
+-0.00236104882629575f,
+-0.00238423565941947f,
+-0.00240612910350581f,
+-0.00242672192404204f,
+-0.00244600757766397f,
+-0.00246398021339438f,
+-0.00248063467352028f,
+-0.00249596649410965f,
+-0.00250997190516865f,
+-0.00252264783044025f,
+-0.00253399188684541f,
+-0.00254400238356826f,
+-0.00255267832078691f,
+-0.0025600193880516f,
+-0.00256602596231194f,
+-0.00257069910559561f,
+-0.0025740405623407f,
+-0.002576052756384f,
+-0.00257673878760806f,
+-0.00257610242824963f,
+-0.00257414811887259f,
+-0.00257088096400837f,
+-0.00256630672746716f,
+-0.00256043182732342f,
+-0.00255326333057917f,
+-0.00254480894750898f,
+-0.00253507702569033f,
+-0.00252407654372366f,
+-0.00251181710464613f,
+-0.00249830892904353f,
+-0.00248356284786476f,
+-0.0024675902949436f,
+-0.00245040329923257f,
+-0.00243201447675358f,
+-0.00241243702227061f,
+-0.00239168470068965f,
+-0.00236977183819085f,
+-0.00234671331309871f,
+-0.00232252454649548f,
+-0.00229722149258377f,
+-0.00227082062880381f,
+-0.00224333894571131f,
+-0.00221479393662224f,
+-0.00218520358703004f,
+-0.00215458636380176f,
+-0.00212296120415961f,
+-0.0020903475044537f,
+-0.00205676510873304f,
+-0.00202223429712087f,
+-0.00198677577400133f,
+-0.0019504106560238f,
+-0.00191316045993189f,
+-0.00187504709022398f,
+-0.00183609282665203f,
+-0.00179632031156572f,
+-0.00175575253710895f,
+-0.00171441283227574f,
+-0.00167232484983292f,
+-0.00162951255311623f,
+-0.00158600020270753f,
+-0.00154181234300042f,
+-0.00149697378866115f,
+-0.00145150961099237f,
+-0.00140544512420743f,
+-0.00135880587162187f,
+-0.00131161761177007f,
+-0.00126390630445442f,
+-0.00121569809673419f,
+-0.00116701930886167f,
+-0.001117896420173f,
+-0.00106835605494138f,
+-0.00101842496819956f,
+-0.000968130031539443f,
+-0.000917498218896291f,
+-0.000866556592324564f,
+-0.000815332287772979f,
+-0.000763852500866257f,
+-0.00071214447270082f,
+-0.000660235475661517f,
+-0.000608152799267011f,
+-0.00055592373605068f,
+-0.000503575567484774f,
+-0.000451135549954316f,
+-0.000398630900788171f,
+-0.000346088784354618f,
+-0.000293536298227805f,
+-0.000241000459432348f,
+-0.000188508190773214f,
+-0.000136086307257084f,
+-8.37615026124415e-05f,
+-3.15603359146759e-05f,
+2.04907816767024e-05f,
+7.23656000628413e-05f,
+0.0001240380432256f,
+0.000175482222116205f,
+0.000226672447407072f,
+0.000277583242099614f,
+0.000328189353983021f,
+0.000378465767937006f,
+0.000428387718073508f,
+0.000477930699711027f,
+0.000527070481176294f,
+0.00057578311542722f,
+0.000624044951492278f,
+0.000671832645720684f,
+0.000719123172837889f,
+0.000765893836801815f,
+0.000812122281454607f,
+0.000857786500964707f,
+0.000902864850055145f,
+0.000947336054012924f,
+0.000991179218475345f,
+0.00103437383898851f,
+0.00107689981033425f,
+0.00111873743562118f,
+0.00115986743513579f,
+0.00120027095494985f,
+0.00123992957528063f,
+0.00127882531860024f,
+0.00131694065749045f,
+0.00135425852224024f,
+0.00139076230818267f,
+0.00142643588276789f,
+0.00146126359237004f,
+0.00149523026882479f,
+0.00152832123569548f,
+0.00156052231426489f,
+0.00159181982925111f,
+0.001622200614245f,
+0.00165165201686719f,
+0.00168016190364333f,
+0.00170771866459553f,
+0.00173431121754877f,
+0.00175992901215077f,
+0.0017845620336043f,
+0.00180820080611095f,
+0.0018308363960253f,
+0.00185246041471891f,
+0.00187306502115368f,
+0.00189264292416398f,
+0.00191118738444733f,
+0.00192869221626373f,
+0.00194515178884347f,
+0.00196056102750367f,
+0.00197491541447399f,
+0.00198821098943196f,
+0.00200044434974861f,
+0.0020116126504451f,
+0.00202171360386142f,
+0.0020307454790383f,
+0.00203870710081329f,
+0.0020455978486328f,
+0.00205141765508121f,
+0.00205616700412915f,
+0.00205984692910231f,
+0.0020624590103731f,
+0.00206400537277705f,
+0.00206448868275625f,
+0.00206391214523208f,
+0.00206227950020991f,
+0.00205959501911819f,
+0.00205586350088484f,
+0.00205109026775366f,
+0.00204528116084394f,
+0.00203844253545627f,
+0.00203058125612779f,
+0.00202170469144041f,
+0.00201182070858521f,
+0.00200093766768696f,
+0.00198906441589211f,
+0.00197621028122439f,
+0.00196238506621177f,
+0.00194759904128888f,
+0.00193186293797901f,
+0.00191518794185986f,
+0.0018975856853177f,
+0.00187906824009385f,
+0.00185964810962852f,
+0.00183933822120627f,
+0.00181815191790804f,
+0.00179610295037442f,
+0.00177320546838494f,
+0.00174947401225873f,
+0.00172492350408103f,
+0.00169956923876105f,
+0.00167342687492633f,
+0.00164651242565861f,
+0.00161884224907681f,
+0.00159043303877221f,
+0.00156130181410158f,
+0.00153146591034349f,
+0.00150094296872334f,
+0.00146975092631301f,
+0.00143790800581039f,
+0.00140543270520465f,
+0.00137234378733302f,
+0.00133866026933477f,
+0.00130440141200819f,
+0.00126958670907637f,
+0.00123423587636768f,
+0.00119836884091695f,
+0.00116200572999299f,
+0.00112516686005846f,
+0.00108787272566835f,
+0.00105014398831246f,
+0.00101200146520825f,
+0.000973466118049983f,
+0.000934559041719948f,
+0.000895301452967916f,
+0.000855714679064593f,
+0.000815820146435422f,
+0.000775639369280204f,
+0.000735193938184692f,
+0.000694505508730361f,
+0.000653595790107611f,
+0.000612486533739071f,
+0.000571199521918073f,
+0.000529756556468897f,
+0.000488179447433948f,
+0.000446490001794051f,
+0.000404710012227306f,
+0.00036286124591261f,
+0.000320965433382993f,
+0.00027904425743464f,
+0.000237119342097373f,
+0.000195212241671637f,
+0.000153344429837704f,
+0.000111537288842719f,
+6.98120987704314e-05f,
+2.81900268993453e-05f,
+-1.3307882845838e-05f,
+-5.46607203438826e-05f,
+-9.58477196232063e-05f,
+-0.000136848269099311f,
+-0.00017764192169843f,
+-0.00021820840486263f,
+-0.000258527630431677f,
+-0.000298579704396867f,
+-0.000338344936521953f,
+-0.000377803849827059f,
+-0.000416937189930904f,
+-0.00045572593424674f,
+-0.000494151301028183f,
+-0.000532194758260365f,
+-0.000569838032392598f,
+-0.000607063116908157f,
+-0.000643852280727742f,
+-0.000680188076442613f,
+-0.00071605334837345f,
+-0.000751431240451819f,
+-0.000786305203920364f,
+-0.000820659004848588f,
+-0.000854476731460626f,
+-0.000887742801272211f,
+-0.00092044196803358f,
+-0.000952559328475277f,
+-0.00098408032885413f,
+-0.00101499077129672f,
+-0.00104527681993767f,
+-0.00107492500685012f,
+-0.00110392223776623f,
+-0.00113225579758539f,
+-0.00115991335566776f,
+-0.00118688297091152f,
+-0.00121315309661151f,
+-0.00123871258509779f,
+-0.00126355069215219f,
+-0.00128765708120147f,
+-0.00131102182728573f,
+-0.00133363542080036f,
+-0.00135548877101096f,
+-0.00137657320933959f,
+-0.00139688049242181f,
+-0.0014164028049334f,
+-0.00143513276218638f,
+-0.00145306341249335f,
+-0.00147018823930013f,
+-0.00148650116308605f,
+-0.00150199654303181f,
+-0.00151666917845485f,
+-0.00153051431001216f,
+-0.00154352762067078f,
+-0.00155570523644628f,
+-0.00156704372690944f,
+-0.00157754010546189f,
+-0.00158719182938116f,
+-0.00159599679963599f,
+-0.00160395336047267f,
+-0.00161106029877347f,
+-0.00161731684318833f,
+-0.00162272266304074f,
+-0.0016272778670095f,
+-0.00163098300158753f,
+-0.00163383904931939f,
+-0.00163584742681915f,
+-0.00163700998257036f,
+-0.00163732899451001f,
+-0.00163680716739847f,
+-0.00163544762997745f,
+-0.00163325393191825f,
+-0.00163023004056244f,
+-0.00162638033745758f,
+-0.00162170961469021f,
+-0.00161622307101895f,
+-0.00160992630781018f,
+-0.00160282532477919f,
+-0.00159492651553961f,
+-0.00158623666296417f,
+-0.00157676293435966f,
+-0.00156651287645942f,
+-0.00155549441023638f,
+-0.00154371582554014f,
+-0.00153118577556128f,
+-0.00151791327112649f,
+-0.00150390767482801f,
+-0.00148917869499094f,
+-0.00147373637948218f,
+-0.00145759110936466f,
+-0.00144075359240074f,
+-0.00142323485640868f,
+-0.00140504624247599f,
+-0.00138619939803382f,
+-0.00136670626979641f,
+-0.00134657909656967f,
+-0.00132583040193301f,
+-0.00130447298679897f,
+-0.00128251992185438f,
+-0.00125998453988796f,
+-0.00123688042800817f,
+-0.00121322141975631f,
+-0.00118902158711868f,
+-0.0011642952324428f,
+-0.00113905688026205f,
+-0.00111332126903301f,
+-0.00108710334279067f,
+-0.00106041824272541f,
+-0.00103328129868705f,
+-0.00100570802062011f,
+-0.000977714089935322f,
+-0.00094931535082176f,
+-0.000920527801504691f,
+-0.000891367585453493f,
+-0.000861850982544499f,
+-0.000831994400183724f,
+-0.000801814364393843f,
+-0.000771327510870363f,
+-0.000740550576011879f,
+-0.000709500387928816f,
+-0.000678193857435693f,
+-0.000646647969031396f,
+-0.000614879771872516f,
+-0.000582906370744061f,
+-0.000550744917032462f,
+-0.000518412599705564f,
+-0.00048592663630423f,
+-0.000453304263950078f,
+-0.000420562730374023f,
+-0.000387719284970424f,
+-0.00035479116988102f,
+-0.000321795611113349f,
+-0.000288749809698345f,
+-0.000255670932891157f,
+-0.000222576105419947f,
+-0.000189482400786798f,
+-0.000156406832625385f,
+-0.000123366346119315f,
+-9.03778094855688e-05f,
+-5.74580055274083e-05f,
+-2.46236232605249e-05f,
+8.10875038316639e-06f,
+4.07226387702898e-05f,
+7.32016836950175e-05f,
+0.000105529653418793f,
+0.000137690450616703f,
+0.000169668120226624f,
+0.000201446857197505f,
+0.000233011014133184f,
+0.000264345108828066f,
+0.000295433831690941f,
+0.000326262053053822f,
+0.000356814830362236f,
+0.000387077415243467f,
+0.000417035260449873f,
+0.00044667402667381f,
+0.000475979589231275f,
+0.000504938044610982f,
+0.000533535716886269f,
+0.000561759163986836f,
+0.000589595183827354f,
+0.000617030820290652f,
+0.00064405336906253f,
+0.000670650383315963f,
+0.000696809679241917f,
+0.000722519341424928f,
+0.000747767728060642f,
+0.000772543476013703f,
+0.000796835505713404f,
+0.000820633025885535f,
+0.000843925538118381f,
+0.000866702841260925f,
+0.000888955035651854f,
+0.000910672527177615f,
+0.000931846031157871f,
+0.00095246657605724f,
+0.000972525507021732f,
+0.000992014489238878f,
+0.00101092551112014f,
+0.0010292508873049f,
+0.00104698326148488f,
+0.00106411560904814f,
+0.00108064123954212f,
+0.00109655379895475f,
+0.0011118472718135f,
+0.00112651598310146f,
+0.00114055459999043f,
+0.00115395813339071f,
+0.00116672193931726f,
+0.00117884172007231f,
+0.00119031352524443f,
+0.00120113375252423f,
+0.00121129914833667f,
+0.00122080680829065f,
+0.00122965417744607f,
+0.00123783905039883f,
+0.00124535957118451f,
+0.00125221423300136f,
+0.00125840187775329f,
+0.00126392169541391f,
+0.00126877322321233f,
+0.00127295634464211f,
+0.00127647128829414f,
+0.00127931862651491f,
+0.00128149927389139f,
+0.001283014485564f,
+0.00128386585536898f,
+0.00128405531381196f,
+0.00128358512587417f,
+0.00128245788865312f,
+0.00128067652883962f,
+0.00127824430003285f,
+0.00127516477989559f,
+0.00127144186715168f,
+0.00126707977842767f,
+0.00126208304494094f,
+0.00125645650903667f,
+0.00125020532057575f,
+0.00124333493317623f,
+0.00123585110031071f,
+0.0012277598712622f,
+0.00121906758694106f,
+0.0012097808755657f,
+0.00119990664820978f,
+0.00118945209421861f,
+0.00117842467649774f,
+0.0011668321266765f,
+0.0011546824401495f,
+0.00114198387099919f,
+0.00112874492680237f,
+0.00111497436332383f,
+0.00110068117910045f,
+0.0010858746099186f,
+0.00107056412318845f,
+0.00105475941221828f,
+0.00103847039039214f,
+0.0010217071852543f,
+0.00100448013250386f,
+0.000986799769902909f,
+0.000968676831101775f,
+0.000950122239384843f,
+0.000931147101340517f,
+0.0009117627004588f,
+0.000891980490660107f,
+0.000871812089758989f,
+0.000851269272866356f,
+0.00083036396573377f,
+0.00080910823804354f,
+0.000787514296648406f,
+0.000765594478764287f,
+0.00074336124511991f,
+0.000720827173067144f,
+0.000698004949655534f,
+0.000674907364674944f,
+0.000651547303669901f,
+0.000627937740929579f,
+0.000604091732456894f,
+0.000580022408920566f,
+0.000555742968593997f,
+0.000531266670284408f,
+0.000506606826256191f,
+0.000481776795151971f,
+0.000456789974915333f,
+0.000431659795718582f,
+0.000406399712899355f,
+0.000381023199909761f,
+0.000355543741281616f,
+0.000329974825611307f,
+0.000304329938567905f,
+0.000278622555928233f,
+0.000252866136642139f,
+0.000227074115931597f,
+0.000201259898427255f,
+0.000175436851345555f,
+0.000149618297710086f,
+0.000123817509620333f,
+9.80477015714137e-05f,
+7.23220238277868e-05f,
+4.665355585432e-05f,
+2.10552998080745e-05f,
+-4.45982590633637e-06f,
+-2.98789930144383e-05f,
+-5.51894696797388e-05f,
+-8.03786267385361e-05f,
+-0.000105433943858797f,
+-0.00013034301562024f,
+-0.000155093557512704f,
+-0.000179673411849814f,
+-0.00020407055359547f,
+-0.000228273096100299f,
+-0.000252269296745275f,
+-0.000276047562490194f,
+-0.00029959645532431f,
+-0.000322904697616544f,
+-0.000345961177363105f,
+-0.00036875495332996f,
+-0.000391275260088007f,
+-0.00041351151293851f,
+-0.000435453312726917f,
+-0.000457090450542803f,
+-0.000478412912303817f,
+-0.000499410883221916f,
+-0.000520074752149767f,
+-0.000540395115805737f,
+-0.000560362782875298f,
+-0.000579968777987699f,
+-0.000599204345565892f,
+-0.000618060953548384f,
+-0.000636530296981365f,
+-0.000654604301479925f,
+-0.000672275126556943f,
+-0.000689535168818291f,
+-0.000706377065023391f,
+-0.000722793695009926f,
+-0.000738778184481572f,
+-0.00075432390765802f,
+-0.000769424489786242f,
+-0.000784073809512325f,
+-0.000798266001112986f,
+-0.000811995456586321f,
+-0.000825256827601124f,
+-0.000838045027304191f,
+-0.000850355231985366f,
+-0.000862182882599891f,
+-0.000873523686147765f,
+-0.00088437361690996f,
+-0.000894728917541413f,
+-0.00090458610002068f,
+-0.000913941946456356f,
+-0.000922793509750267f,
+-0.000931138114117751f,
+-0.000938973355465201f,
+-0.000946297101625169f,
+-0.000953107492449535f,
+-0.00095940293976115f,
+-0.000965182127164484f,
+-0.000970444009715949f,
+-0.000975187813454563f,
+-0.000979413034793724f,
+-0.000983119439774883f,
+-0.000986307063184082f,
+-0.000988976207532292f,
+-0.000991127441900545f,
+-0.000992761600651051f,
+-0.000993879782005379f,
+-0.000994483346490993f,
+-0.000994573915257406f,
+-0.000994153368263331f,
+-0.000993223842336247f,
+-0.00099178772910585f,
+-0.000989847672812951f,
+-0.000987406567995412f,
+-0.000984467557052783f,
+-0.000981034027691368f,
+-0.000977109610251478f,
+-0.000972698174918704f,
+-0.000967803828821116f,
+-0.000962430913014279f,
+-0.000956583999356123f,
+-0.00095026788727365f,
+-0.000943487600423628f,
+-0.000936248383249343f,
+-0.000928555697435623f,
+-0.000920415218264346f,
+-0.000911832830872734f,
+-0.000902814626416679f,
+-0.000893366898141494f,
+-0.000883496137362504f,
+-0.000873209029357859f,
+-0.000862512449176021f,
+-0.00085141345736053f,
+-0.000839919295594453f,
+-0.000828037382267177f,
+-0.000815775307966064f,
+-0.000803140830895734f,
+-0.000790141872227454f,
+-0.000776786511381427f,
+-0.00076308298124471f,
+-0.000749039663327391f,
+-0.000734665082859875f,
+-0.000719967903833962f,
+-0.000704956923990644f,
+-0.000689641069757283f,
+-0.000674029391137055f,
+-0.000658131056553546f,
+-0.000641955347653323f,
+-0.000625511654069285f,
+-0.000608809468147721f,
+-0.000591858379642031f,
+-0.00057466807037584f,
+-0.000557248308878483f,
+-0.000539608944995842f,
+-0.000521759904479256f,
+-0.000503711183555555f,
+-0.000485472843480995f,
+-0.000467055005082172f,
+-0.000448467843286586f,
+-0.000429721581645849f,
+-0.000410826486854523f,
+-0.000391792863267231f,
+-0.000372631047417096f,
+-0.000353351402538234f,
+-0.000333964313095239f,
+-0.000314480179322442f,
+-0.000294909411775696f,
+-0.000275262425899514f,
+-0.000255549636612444f,
+-0.00023578145291323f,
+-0.00021596827251059f,
+-0.000196120476479426f,
+-0.000176248423945934f,
+-0.000156362446804383f,
+-0.000136472844468305f,
+-0.000116589878658459f,
+-9.67237682303544e-05f,
+-7.68846840437216e-05f,
+-5.70827438766377e-05f,
+-3.73280073865604e-05f,
+-1.76304711208226e-05f,
+1.99993642088864e-06f,
+2.15533596699293e-05f,
+4.10200208154243e-05f,
+6.03902245722434e-05f,
+7.96543628875891e-05f,
+9.88029195844659e-05f,
+0.000117826474939476f,
+0.000136715710193024f,
+0.000155461411989631f,
+0.000174054476746553f,
+0.00019248591494857f,
+0.000210746855366906f,
+0.000228828549200576f,
+0.000246722374138184f,
+0.000264419838338276f,
+0.00028191258432668f,
+0.00029919239280896f,
+0.000316251186396444f,
+0.00033308103324404f,
+0.000349674150598494f,
+0.000366022908255491f,
+0.000382119831924034f,
+0.000397957606496918f,
+0.000413529079225828f,
+0.000428827262799762f,
+0.000443845338325565f,
+0.00045857665820947f,
+0.000473014748938413f,
+0.000487153313760161f,
+0.000500986235261103f,
+0.000514507577840938f,
+0.000527711590083255f,
+0.000540592707021129f,
+0.000553145552297088f,
+0.000565364940216666f,
+0.000577245877694798f,
+0.000588783566094627f,
+0.00059997340295804f,
+0.000610810983627539f,
+0.000621292102758917f,
+0.000631412755724494f,
+0.000641169139906554f,
+0.000650557655880657f,
+0.000659574908488804f,
+0.000668217707802125f,
+0.000676483069973211f,
+0.000684368217977891f,
+0.00069187058224664f,
+0.000698987801185635f,
+0.000705717721587661f,
+0.000712058398933015f,
+0.000718008097580768f,
+0.000723565290850654f,
+0.000728728660995955f,
+0.000733497099067867f,
+0.000737869704671835f,
+0.000741845785616332f,
+0.000745424857454791f,
+0.000748606642921268f,
+0.000751391071260577f,
+0.000753778277453638f,
+0.000755768601338869f,
+0.000757362586630487f,
+0.000758560979834606f,
+0.000759364729064122f,
+0.000759774982753388f,
+0.000759793088273753f,
+0.000759420590451042f,
+0.000758659229986178f,
+0.000757510941780111f,
+0.000755977853164323f,
+0.000754062282038195f,
+0.000751766734914573f,
+0.000749093904874909f,
+0.000746046669435407f,
+0.00074262808832562f,
+0.000738841401181018f,
+0.000734690025151058f,
+0.000730177552424333f,
+0.000725307747672431f,
+0.000720084545414129f,
+0.000714512047301645f,
+0.000708594519330652f,
+0.000702336388975791f,
+0.000695742242253508f,
+0.000688816820714019f,
+0.000681565018364236f,
+0.000673991878523528f,
+0.000666102590614281f,
+0.00065790248688911f,
+0.000649397039096707f,
+0.000640591855088355f,
+0.000631492675367041f,
+0.00062210536958124f,
+0.000612435932965378f,
+0.000602490482729133f,
+0.000592275254397531f,
+0.00058179659810402f,
+0.00057106097483868f,
+0.000560074952653592f,
+0.000548845202827616f,
+0.000537378495992672f,
+0.000525681698223757f,
+0.000513761767094866f,
+0.000501625747702958f,
+0.000489280768662212f,
+0.00047673403807084f,
+0.000463992839452548f,
+0.000451064527674926f,
+0.000437956524847057f,
+0.000424676316198432f,
+0.000411231445941475f,
+0.000397629513119953f,
+0.000383878167445365f,
+0.000369985105123653f,
+0.000355958064674343f,
+0.000341804822744478f,
+0.000327533189919382f,
+0.00031315100653253f,
+0.000298666138476795f,
+0.000284086473019086f,
+0.000269419914620704f,
+0.000254674380765407f,
+0.000239857797797613f,
+0.000224978096772517f,
+0.000210043209320516f,
+0.000195061063527882f,
+0.000180039579835931f,
+0.000164986666960563f,
+0.000149910217834334f,
+0.00013481810557314f,
+0.000119718179469377f,
+0.000104618261013641f,
+8.95261399470058e-05f,
+7.4449570345654e-05f,
+5.93962667399167e-05f,
+4.43739002695007e-05f,
+2.93900948769175e-05f,
+1.44524235407681e-05f,
+-4.31595449223616e-07f,
+-1.52545021735662e-05f,
+-3.00088987191677e-05f,
+-4.46874527685018e-05f,
+-5.92829011400602e-05f,
+-7.3788053278475e-05f,
+-8.81957946927382e-05f,
+-0.000102499090340838f,
+-0.00011669098795936f,
+-0.000130764621336393f,
+-0.000144713213526427f,
+-0.000158530080005721f,
+-0.000172208631766647f,
+-0.000185742378349807f,
+-0.000199124930812505f,
+-0.000212350004632196f,
+-0.00022541142254385f,
+-0.000238303117309837f,
+-0.000251019134421297f,
+-0.000263553634729709f,
+-0.000275900897007726f,
+-0.000288055320438154f,
+-0.000300011427029989f,
+-0.000311763863960726f,
+-0.000323307405843803f,
+-0.000334636956920518f,
+-0.000345747553175349f,
+-0.000356634364374106f,
+-0.000367292696023986f,
+-0.000377717991254969f,
+-0.000387905832621729f,
+-0.000397851943825609f,
+-0.000407552191355999f,
+-0.000417002586050548f,
+-0.000426199284573831f,
+-0.000435138590813965f,
+-0.000443816957196748f,
+-0.000452230985917062f,
+-0.000460377430087148f,
+-0.000468253194801565f,
+-0.000475855338118517f,
+-0.000483181071957495f,
+-0.000490227762913035f,
+-0.000496992932984516f,
+-0.000503474260221955f,
+-0.000509669579287852f,
+-0.000515576881935093f,
+-0.000521194317400983f,
+-0.000526520192717614f,
+-0.000531552972938706f,
+-0.000536291281283125f,
+-0.0005407338991954f,
+-0.000544879766323497f,
+-0.000548727980414254f,
+-0.000552277797126791f,
+-0.000555528629764419f,
+-0.000558480048925469f,
+-0.000561131782073551f,
+-0.000563483713027852f,
+-0.000565535881373998f,
+-0.000567288481796188f,
+-0.000568741863331196f,
+-0.000569896528545036f,
+-0.000570753132632961f,
+-0.000571312482443646f,
+-0.000571575535428335f,
+-0.000571543398515829f,
+-0.000571217326914227f,
+-0.000570598722840296f,
+-0.000569689134177504f,
+-0.000568490253063648f,
+-0.000567003914409159f,
+-0.000565232094347103f,
+-0.000563176908616006f,
+-0.000560840610876602f,
+-0.000558225590963676f,
+-0.000555334373074176f,
+-0.000552169613892796f,
+-0.000548734100656311f,
+-0.000545030749157866f,
+-0.000541062601692577f,
+-0.000536832824945712f,
+-0.000532344707824832f,
+-0.000527601659237243f,
+-0.000522607205814143f,
+-0.000517364989582876f,
+-0.000511878765588764f,
+-0.000506152399467916f,
+-0.000500189864972511f,
+-0.000493995241450079f,
+-0.00048757271127824f,
+-0.000480926557256444f,
+-0.000474061159956302f,
+-0.000466980995031985f,
+-0.000459690630492344f,
+-0.000452194723936275f,
+-0.000444498019752994f,
+-0.000436605346288768f,
+-0.000428521612981758f,
+-0.000420251807466637f,
+-0.000411800992650551f,
+-0.000403174303762153f,
+-0.000394376945375264f,
+-0.000385414188409004f,
+-0.000376291367105835f,
+-0.000367013875989376f,
+-0.000357587166803538f,
+-0.000348016745434793f,
+-0.000338308168819116f,
+-0.000328467041835364f,
+-0.000318499014186804f,
+-0.000308409777272385f,
+-0.000298205061049476f,
+-0.00028789063088981f,
+-0.000277472284430191f,
+-0.000266955848419733f,
+-0.000256347175565217f,
+-0.000245652141376339f,
+-0.000234876641012366f,
+-0.000224026586131915f,
+-0.000213107901747537f,
+-0.000202126523086631f,
+-0.000191088392460357f,
+-0.000179999456142179f,
+-0.000168865661257607f,
+-0.000157692952686687f,
+-0.000146487269980865f,
+-0.000135254544295716f,
+-0.000124000695341185f,
+-0.000112731628350718f,
+-0.000101453231070878f,
+-9.01713707729725e-05f,
+-7.88918912880573e-05f,
+-6.76206100668248e-05f,
+-5.63633152658753e-05f,
+-4.51257628616543e-05f,
+-3.39136737935609e-05f,
+-2.2732731137515e-05f,
+-1.1588577311449e-05f,
+-4.86811313915871e-07f,
+1.05670140028143e-05f,
+2.15673946238211e-05f,
+3.25088780256781e-05f,
+4.33860657922279e-05f,
+5.41936161910016e-05f,
+6.49262467088871e-05f,
+7.55787365460706e-05f,
+8.6145929067006e-05f,
+9.6622734207392e-05f,
+0.000107004130835977f,
+0.000117285169070277f,
+0.000127460972545122f,
+0.000137526740632994f,
+0.000147477750615314f,
+0.000157309359803685f,
+0.000167017007610151f,
+0.000176596217565704f,
+0.00018604259928613f,
+0.000195351850384441f,
+0.000204519758329025f,
+0.000213542202246907f,
+0.000222415154671328f,
+0.000231134683232959f,
+0.000239696952294124f,
+0.000248098224525462f,
+0.000256334862424394f,
+0.000264403329774837f,
+0.000272300193047718f,
+0.000280022122741781f,
+0.000287565894664179f,
+0.000294928391150552f,
+0.000302106602224122f,
+0.000309097626693513f,
+0.000315898673188933f,
+0.000322507061136496f,
+0.00032892022167043f,
+0.000335135698482898f,
+0.000341151148611358f,
+0.000346964343163231f,
+0.000352573167977838f,
+0.000357975624225448f,
+0.000363169828943501f,
+0.000368154015509882f,
+0.00037292653405339f,
+0.000377485851801332f,
+0.000381830553364452f,
+0.000385959340959241f,
+0.000389871034567797f,
+0.000393564572035445f,
+0.000397039009106331f,
+0.0004002935193972f,
+0.000403327394309709f,
+0.000406140042881527f,
+0.000408730991576614f,
+0.00041109988401501f,
+0.00041324648064257f,
+0.000415170658341089f,
+0.000416872409979226f,
+0.000418351843904798f,
+0.000419609183378899f,
+0.000420644765952442f,
+0.000421459042785672f,
+0.000422052577911267f,
+0.000422426047441668f,
+0.000422580238721292f,
+0.000422516049424304f,
+0.000422234486598678f,
+0.000421736665657269f,
+0.000421023809316662f,
+0.000420097246484597f,
+0.00041895841109675f,
+0.000417608840903734f,
+0.000416050176209156f,
+0.000414284158559614f,
+0.000412312629387525f,
+0.000410137528607722f,
+0.00040776089316874f,
+0.000405184855559753f,
+0.000402411642274163f,
+0.000399443572230807f,
+0.000396283055153818f,
+0.00039293258991216f,
+0.000389394762819914f,
+0.000385672245898332f,
+0.000381767795100793f,
+0.000377684248501704f,
+0.00037342452445052f,
+0.000368991619691937f,
+0.00036438860745344f,
+0.000359618635501352f,
+0.00035468492416652f,
+0.000349590764340821f,
+0.000344339515445694f,
+0.000338934603373839f,
+0.00033337951840533f,
+0.000327677813099311f,
+0.000321833100162537f,
+0.000315849050295926f,
+0.00030972939002039f,
+0.000303477899483179f,
+0.000297098410245953f,
+0.000290594803055835f,
+0.000283971005600701f,
+0.000277230990249963f,
+0.000270378771782053f,
+0.00026341840509992f,
+0.000256353982935729f,
+0.000249189633546102f,
+0.000241929518399064f,
+0.000234577829853977f,
+0.000227138788835771f,
+0.000219616642504624f,
+0.00021201566192238f,
+0.000204340139716987f,
+0.00019659438774611f,
+0.00018878273476121f,
+0.000180909524073276f,
+0.000172979111221486f,
+0.000164995861645939f,
+0.000156964148365684f,
+0.000148888349663314f,
+0.000140772846777168f,
+0.000132622021602488f,
+0.000124440254402532f,
+0.000116231921530969f,
+0.000108001393166544f,
+9.97530310612701e-05f,
+9.14911863031805e-05f,
+8.32201970948495e-05f,
+7.49443865486734e-05f,
+6.66680605000458e-05f,
+5.83955053395394e-05f,
+5.01309858650572e-05f,
+4.18787431550387e-05f,
+3.36429924637897e-05f,
+2.5427921139845e-05f,
+1.72376865684373e-05f,
+9.07641413898225e-06f,
+9.48195238618906e-07f,
+-7.14291472735571e-06f,
+-1.51928982871869e-05f,
+-2.3197777825582e-05f,
+-3.11536174769895e-05f,
+-3.9056524988396e-05f,
+-4.69026535507839e-05f,
+-5.46882035983796e-05f,
+-6.24094245749816e-05f,
+-7.00626166665431e-05f,
+-7.76441324992083e-05f,
+-8.51503788021583e-05f,
+-9.25778180344744e-05f,
+-9.99229699753843e-05f,
+-0.000107182413277144f,
+-0.000114352786980001f,
+-0.000121430791988571f,
+-0.000128413192508979f,
+-0.000135296817446292f,
+-0.000142078561761593f,
+-0.000148755387788244f,
+-0.000155324326506732f,
+-0.000161782478777755f,
+-0.000168127016532938f,
+-0.000174355183922887f,
+-0.000180464298422044f,
+-0.000186451751890066f,
+-0.000192315011589317f,
+-0.00019805162115811f,
+-0.000203659201539462f,
+-0.000209135451865035f,
+-0.000214478150293975f,
+-0.000219685154806484f,
+-0.000224754403951855f,
+-0.000229683917550825f,
+-0.000234471797352043f,
+-0.000239116227642562f,
+-0.00024361547581224f,
+-0.000247967892871911f,
+-0.000252171913925349f,
+-0.000256226058594915f,
+-0.000260128931400936f,
+-0.000263879222094778f,
+-0.000267475705945676f,
+-0.000270917243981399f,
+-0.000274202783182808f,
+-0.00027733135663242f,
+-0.00028030208361713f,
+-0.000283114169685247f,
+-0.000285766906657991f,
+-0.000288259672595703f,
+-0.000290591931718978f,
+-0.000292763234284939f,
+-0.000294773216418979f,
+-0.00029662159990223f,
+-0.000298308191915087f,
+-0.000299832884737118f,
+-0.000301195655403732f,
+-0.000302396565319991f,
+-0.000303435759831934f,
+-0.000304313467755884f,
+-0.000305030000866148f,
+-0.000305585753341585f,
+-0.00030598120117152f,
+-0.000306216901521509f,
+-0.000306293492059488f,
+-0.000306211690242816f,
+-0.000305972292566803f,
+-0.00030557617377527f,
+-0.000305024286033762f,
+-0.000304317658065994f,
+-0.000303457394254184f,
+-0.000302444673703895f,
+-0.000301280749274063f,
+-0.000299966946572862f,
+-0.000298504662920124f,
+-0.000296895366276984f,
+-0.000295140594143504f,
+-0.000293241952424973f,
+-0.000291201114267648f,
+-0.000289019818864695f,
+-0.000286699870233075f,
+-0.000284243135962188f,
+-0.000281651545935046f,
+-0.000278927091022785f,
+-0.000276071821753329f,
+-0.000273087846955029f,
+-0.000269977332376106f,
+-0.000266742499280753f,
+-0.000263385623022736f,
+-0.000259909031597333f,
+-0.000256315104172533f,
+-0.0002526062696003f,
+-0.000248785004908818f,
+-0.000244853833776615f,
+-0.000240815324989414f,
+-0.000236672090880646f,
+-0.00023242678575649f,
+-0.000228082104306389f,
+-0.000223640779999902f,
+-0.00021910558347082f,
+-0.00021447932088949f,
+-0.000209764832324188f,
+-0.000204964990092552f,
+-0.000200082697103894f,
+-0.000195120885193399f,
+-0.00019008251344906f,
+-0.000184970566532297f,
+-0.000179788052993172f,
+-0.000174538003581127f,
+-0.000169223469552129f,
+-0.000163847520973146f,
+-0.000158413245024881f,
+-0.000152923744303642f,
+-0.000147382135123237f,
+-0.000141791545817854f,
+-0.000136155115046731f,
+-0.000130475990101566f,
+-0.000124757325217511f,
+-0.000119002279888661f,
+-0.000113214017188868f,
+-0.000107395702098747f,
+-0.000101550499839755f,
+-9.56815742161737e-05f,
+-8.9792085965815e-05f,
+-8.38851911202859e-05f,
+-7.79640393756771e-05f,
+-7.20317724744153e-05f,
+-6.60915225991129e-05f,
+-6.01464107792395e-05f,
+-5.41995453113257e-05f,
+-4.8254020193526e-05f,
+-4.23129135752554e-05f,
+-3.6379286222704e-05f,
+-3.04561800008946e-05f,
+-2.45466163730381e-05f,
+-1.86535949179281e-05f,
+-1.27800918660038e-05f,
+-6.9290586548193e-06f,
+-1.10342050454853e-06f,
+4.69392498575835e-06f,
+1.04601092206202e-05f,
+1.6192293968531e-05f,
+2.1887672699831e-05f,
+2.75434719013334e-05f,
+3.31569523672129e-05f,
+3.87254104655552e-05f,
+4.4246179379982e-05f,
+4.97166303258814e-05f,
+5.51341737406908e-05f,
+6.04962604476993e-05f,
+6.58003827929482e-05f,
+7.10440757547034e-05f,
+7.62249180250887e-05f,
+8.13405330633889e-05f,
+8.63885901206669e-05f,
+9.13668052352641e-05f,
+9.6272942198768e-05f,
+0.000101104813492143f,
+0.000105860281191626f,
+0.00011053725784408f,
+0.000115133707311479f,
+0.00011964764558422f,
+0.000124077141563023f,
+0.000128420317809118f,
+0.000132675351262483f,
+0.000136840473927933f,
+0.000140913973528842f,
+0.000144894194128284f,
+0.000148779536717474f,
+0.000152568459771325f,
+0.000156259479770981f,
+0.00015985117169324f,
+0.000163342169466755f,
+0.000166731166394932f,
+0.000170016915545461f,
+0.000173198230106457f,
+0.000176273983709174f,
+0.000179243110717271f,
+0.000182104606482673f,
+0.000184857527568029f,
+0.000187500991935842f,
+0.000190034179104279f,
+0.000192456330269823f,
+0.000194766748396795f,
+0.000196964798273909f,
+0.000199049906537954f,
+0.000201021561664791f,
+0.000202879313927801f,
+0.000204622775323984f,
+0.000206251619467897f,
+0.000207765581453664f,
+0.000209164457685255f,
+0.000210448105675328f,
+0.000211616443812851f,
+0.000212669451099813f,
+0.000213607166857295f,
+0.000214429690401231f,
+0.000215137180688158f,
+0.000215729855931309f,
+0.000216207993187386f,
+0.000216571927914394f,
+0.000216822053500895f,
+0.00021695882076709f,
+0.000216982737438119f,
+0.000216894367590012f,
+0.000216694331068704f,
+0.000216383302882574f,
+0.000215962012568937f,
+0.000215431243534989f,
+0.000214791832373643f,
+0.000214044668154779f,
+0.000213190691692376f,
+0.000212230894788063f,
+0.000211166319451582f,
+0.000209998057098713f,
+0.000208727247727179f,
+0.000207355079071099f,
+0.000205882785734526f,
+0.000204311648304645f,
+0.0002026429924452f,
+0.000200878187970726f,
+0.000199018647902181f,
+0.000197065827504565f,
+0.000195021223307131f,
+0.000192886372106789f,
+0.000190662849955323f,
+0.000188352271131036f,
+0.000185956287095444f,
+0.000183476585435659f,
+0.000180914888793067f,
+0.00017827295377898f,
+0.000175552569877859f,
+0.000172755558338776f,
+0.000169883771055775f,
+0.000166939089437739f,
+0.000163923423268465f,
+0.000160838709557554f,
+0.000157686911382826f,
+0.00015447001672486f,
+0.00015119003729435f,
+0.000147849007352939f,
+0.000144448982528169f,
+0.000140992038623225f,
+0.000137480270422103f,
+0.000133915790490909f,
+0.000130300727975883f,
+0.000126637227398849f,
+0.000122927447450727f,
+0.000119173559783752f,
+0.000115377747803056f,
+0.000111542205458249f,
+0.000107669136035655f,
+0.000103760750951826f,
+9.98192685489614e-05f,
+9.58469128929004e-05f,
+9.18459125742598e-05f,
+8.7818499513379e-05f,
+8.3766907769656e-05f,
+7.96933723559266e-05f,
+7.5600128058426e-05f,
+7.14894082630084e-05f,
+6.7363443788134e-05f,
+6.32244617252883e-05f,
+5.90746842873462e-05f,
+5.49163276654788e-05f,
+5.07516008951872e-05f,
+4.65827047319742e-05f,
+4.24118305372229e-05f,
+3.82411591748463e-05f,
+3.40728599191875e-05f,
+2.99090893747362e-05f,
+2.5751990408141e-05f,
+2.16036910930649e-05f,
+1.7466303668328e-05f,
+1.33419235098453e-05f,
+9.23262811685928e-06f,
+5.1404761128809e-06f,
+1.06750626183723e-06f,
+-2.98426350016023e-06f,
+-7.01283701696615e-06f,
+-1.10162408480615e-05f,
+-1.49925251873214e-05f,
+-1.89397647644821e-05f,
+-2.28560597288928e-05f,
+-2.67395365152196e-05f,
+-3.0588348690713e-05f,
+-3.44006777836603e-05f,
+-3.81747340927275e-05f,
+-4.19087574768357e-05f,
+-4.56010181252311e-05f,
+-4.92498173074901e-05f,
+-5.28534881031252e-05f,
+-5.64103961105393e-05f,
+-5.99189401350207e-05f,
+-6.33775528555675e-05f,
+-6.67847014702765e-05f,
+-7.01388883200426e-05f,
+-7.34386514903965e-05f,
+-7.66825653912348e-05f,
+-7.98692413142891e-05f,
+-8.29973279680875e-05f,
+-8.60655119903289e-05f,
+-8.90725184374467e-05f,
+-9.2017111251262e-05f,
+-9.48980937025603e-05f,
+-9.77143088115188e-05f,
+-0.000100464639744859f,
+-0.000103148010189625f,
+-0.000105763384703537f,
+-0.000108309769041847f,
+-0.000110786210460631f,
+-0.000113191797996502f,
+-0.000115525662722708f,
+-0.000117786977981613f,
+-0.000119974959593534f,
+-0.000122088866041986f,
+-0.000124127998635343f,
+-0.000126091701644931f,
+-0.000127979362419654f,
+-0.000129790411477168f,
+-0.000131524322571709f,
+-0.000133180612738637f,
+-0.000134758842315834f,
+-0.000136258614942016f,
+-0.000137679577532133f,
+-0.000139021420229953f,
+-0.000140283876337993f,
+-0.000141466722224963f,
+-0.000142569777210869f,
+-0.000143592903429972f,
+-0.000144536005671797f,
+-0.000145399031200369f,
+-0.000146181969551922f,
+-0.000146884852311273f,
+-0.000147507752867119f,
+-0.000148050786146473f,
+-0.000148514108328524f,
+-0.000148897916538149f,
+-0.000149202448519377f,
+-0.000149427982289073f,
+-0.000149574835771129f,
+-0.000149643366411474f,
+-0.000149633970774194f,
+-0.000149547084119101f,
+-0.000149383179961048f,
+-0.000149142769611348f,
+-0.000148826401701622f,
+-0.000148434661690426f,
+-0.000147968171353023f,
+-0.000147427588254649f,
+-0.00014681360520765f,
+-0.000146126949712865f,
+-0.000145368383385639f,
+-0.000144538701366849f,
+-0.000143638731719352f,
+-0.00014266933481023f,
+-0.000141631402679272f,
+-0.000140525858394076f,
+-0.000139353655392192f,
+-0.000138115776810751f,
+-0.000136813234803966f,
+-0.000135447069848973f,
+-0.000134018350040413f,
+-0.000132528170374222f,
+-0.000130977652021046f,
+-0.000129367941589733f,
+-0.000127700210381361f,
+-0.000125975653634229f,
+-0.000124195489760284f,
+-0.000122360959573422f,
+-0.000120473325510131f,
+-0.000118533870842929f,
+-0.000116543898887054f,
+-0.000114504732200872f,
+-0.000112417711780454f,
+-0.000110284196248804f,
+-0.00010810556104017f,
+-0.000105883197579935f,
+-0.000103618512460518f,
+-0.000101312926613771f,
+-9.89678744803232e-05f,
+-9.65848031763287e-05f,
+-9.41651716580905e-05f,
+-9.17104498849976e-05f,
+-8.92221179812628e-05f,
+-8.67016653968825e-05f,
+-8.41505900682881e-05f,
+-8.15703975791493e-05f,
+-7.89626003217505e-05f,
+-7.63287166594104e-05f,
+-7.36702700903664e-05f,
+-7.09887884135878e-05f,
+-6.82858028969257e-05f,
+-6.55628474480433e-05f,
+-6.2821457788569e-05f,
+-6.00631706318681e-05f,
+-5.72895228648757e-05f,
+-5.45020507343893e-05f,
+-5.17022890382489e-05f,
+-4.88917703218012e-05f,
+-4.60720240800406e-05f,
+-4.32445759658306e-05f,
+-4.04109470046086e-05f,
+-3.75726528159311e-05f,
+-3.47312028422512e-05f,
+-3.18880995853173e-05f,
+-2.90448378505281e-05f,
+-2.62029039996194e-05f,
+-2.33637752120534e-05f,
+-2.05289187554216e-05f,
+-1.76997912652335e-05f,
+-1.48778380343994e-05f,
+-1.20644923127653e-05f,
+-9.26117461698226e-06f,
+-6.46929205104167e-06f,
+-3.69023763779291e-06f,
+-9.25389661709246e-07f,
+1.82388897678174e-06f,
+4.55625139514286e-06f,
+7.27036735044587e-06f,
+9.96492384873171e-06f,
+1.26386257417392e-05f,
+1.52901963107384e-05f,
+1.79183778372582e-05f,
+2.05219321604611e-05f,
+2.30996412209252e-05f,
+2.56503075906517e-05f,
+2.81727549890619e-05f,
+3.06658287848129e-05f,
+3.3128396483204e-05f,
+3.55593481990333e-05f,
+3.7957597114714e-05f,
+4.03220799234942e-05f,
+4.26517572576078e-05f,
+4.49456141012435e-05f,
+4.72026601881683e-05f,
+4.94219303839002e-05f,
+5.16024850522866e-05f,
+5.37434104064079e-05f,
+5.58438188436954e-05f,
+5.79028492651571e-05f,
+5.991966737866e-05f,
+6.18934659861721e-05f,
+6.38234652549182e-05f,
+6.57089129723729e-05f,
+6.75490847850721e-05f,
+6.93432844211934e-05f,
+7.10908438968675e-05f,
+7.27911237062256e-05f,
+7.4443512995159e-05f,
+7.60474297187844e-05f,
+7.76023207826403e-05f,
+7.91076621676173e-05f,
+8.05629590386577e-05f,
+8.19677458372436e-05f,
+8.33215863577353e-05f,
+8.46240738076028e-05f,
+8.58748308515986e-05f,
+8.70735096399619e-05f,
+8.82197918207153e-05f,
+8.93133885361372e-05f,
+9.03540404035137e-05f,
+9.13415174802592e-05f,
+9.2275619213524e-05f,
+9.31561743743901e-05f,
+9.39830409767967e-05f,
+9.47561061813166e-05f,
+9.54752861839191e-05f,
+9.61405260898756e-05f,
+9.67517997729505e-05f,
+9.73091097200466e-05f,
+9.78124868614686e-05f,
+9.82619903869737e-05f,
+9.86577075477993e-05f,
+9.89997534448506e-05f,
+9.92882708032378e-05f,
+9.95234297333714e-05f,
+9.9705427478815e-05f,
+9.98344881511113e-05f,
+9.9910862451795e-05f,
+9.99348273818228e-05f,
+9.99066859386447e-05f,
+9.98267668011501e-05f,
+9.96954240027345e-05f,
+9.95130365927253e-05f,
+9.92800082864198e-05f,
+9.89967671039888e-05f,
+9.86637649985054e-05f,
+9.82814774733607e-05f,
+9.78504031893375e-05f,
+9.73710635616094e-05f,
+9.68440023469432e-05f,
+9.62697852213859e-05f,
+9.56489993487134e-05f,
+9.49822529399338e-05f,
+9.42701748041286e-05f,
+9.35134138909306e-05f,
+9.27126388249273e-05f,
+9.18685374322918e-05f,
+9.09818162599413e-05f,
+9.00532000875255e-05f,
+8.90834314325463e-05f,
+8.80732700489246e-05f,
+8.70234924193122e-05f,
+8.59348912414666e-05f,
+8.4808274908995e-05f,
+8.36444669867889e-05f,
+8.24443056814471e-05f,
+8.12086433070261e-05f,
+7.99383457464085e-05f,
+7.86342919086182e-05f,
+7.72973731824044e-05f,
+7.59284928863964e-05f,
+7.45285657161543e-05f,
+7.30985171884367e-05f,
+7.16392830829907e-05f,
+7.01518088821841e-05f,
+6.86370492088033e-05f,
+6.70959672623157e-05f,
+6.55295342539231e-05f,
+6.39387288407062e-05f,
+6.23245365591873e-05f,
+6.06879492586023e-05f,
+5.90299645341967e-05f,
+5.73515851608611e-05f,
+5.56538185273923e-05f,
+5.39376760716902e-05f,
+5.22041727171986e-05f,
+5.04543263108675e-05f,
+4.8689157062949e-05f,
+4.6909686988904e-05f,
+4.51169393537251e-05f,
+4.33119381189442e-05f,
+4.14957073926132e-05f,
+3.96692708825497e-05f,
+3.78336513531005e-05f,
+3.59898700857156e-05f,
+3.41389463435848e-05f,
+3.22818968406223e-05f,
+3.04197352150379e-05f,
+2.8553471507761e-05f,
+2.66841116459819e-05f,
+2.48126569320371e-05f,
+2.2940103537894e-05f,
+2.10674420054833e-05f,
+1.91956567530948e-05f,
+1.73257255880833e-05f,
+1.54586192260934e-05f,
+1.35953008170508e-05f,
+1.17367254781075e-05f,
+9.88383983376397e-06f,
+8.03758156337068e-06f,
+6.19887895622112e-06f,
+4.36865047440966e-06f,
+2.5478043236621e-06f,
+7.37238032308926e-07f,
+-1.06216196140182e-06f,
+-2.8495207135011e-06f,
+-4.6239751698272e-06f,
+-6.38467455271441e-06f,
+-8.1307807387077e-06f,
+-9.86146862713565e-06f,
+-1.15759264994109e-05f,
+-1.32733563689023e-05f,
+-1.49529743212685e-05f,
+-1.66140108451148e-05f,
+-1.82557111528465e-05f,
+-1.98773354916211e-05f,
+-2.14781594442845e-05f,
+-2.30574742201769e-05f,
+-2.46145869357363e-05f,
+-2.61488208847895e-05f,
+-2.76595157984633e-05f,
+-2.91460280946187e-05f,
+-3.06077311167596e-05f,
+-3.20440153623401e-05f,
+-3.34542887004033e-05f,
+-3.48379765785163e-05f,
+-3.61945222189482e-05f,
+-3.75233868040389e-05f,
+-3.8824049650746e-05f,
+-4.00960083743248e-05f,
+-4.13387790411312e-05f,
+-4.25518963105175e-05f,
+-4.37349135658282e-05f,
+-4.48874030344821e-05f,
+-4.60089558971416e-05f,
+-4.70991823859845e-05f,
+-4.81577118720844e-05f,
+-4.91841929419275e-05f,
+-5.01782934630889e-05f,
+-5.11397006390925e-05f,
+-5.20681210535035e-05f,
+-5.29632807032924e-05f,
+-5.38249250215107e-05f,
+-5.46528188893462e-05f,
+-5.5446746637607e-05f,
+-5.62065120377057e-05f,
+-5.69319382822058e-05f,
+-5.76228679550161e-05f,
+-5.82791629913088e-05f,
+-5.89007046272429e-05f,
+-5.94873933395923e-05f,
+-6.00391487753712e-05f,
+-6.05559096715516e-05f,
+-6.10376337649892e-05f,
+-6.14842976926593e-05f,
+-6.18958968823238e-05f,
+-6.22724454337409e-05f,
+-6.26139759905511e-05f,
+-6.29205396029613e-05f,
+-6.31922055813587e-05f,
+-6.34290613409974e-05f,
+-6.36312122378911e-05f,
+-6.37987813960626e-05f,
+-6.39319095262928e-05f,
+-6.40307547365266e-05f,
+-6.4095492334089e-05f,
+-6.41263146198697e-05f,
+-6.41234306746412e-05f,
+-6.40870661376763e-05f,
+-6.40174629778309e-05f,
+-6.391487925727e-05f,
+-6.37795888880065e-05f,
+-6.36118813814352e-05f,
+-6.34120615910403e-05f,
+-6.31804494484614e-05f,
+-6.29173796931019e-05f,
+-6.26232015954722e-05f,
+-6.22982786744525e-05f,
+-6.19429884086736e-05f,
+-6.15577219422071e-05f,
+-6.11428837847619e-05f,
+-6.06988915065879e-05f,
+-6.02261754282833e-05f,
+-5.97251783057106e-05f,
+-5.91963550102224e-05f,
+-5.86401722044023e-05f,
+-5.80571080135255e-05f,
+-5.74476516929464e-05f,
+-5.68123032916221e-05f,
+-5.61515733119774e-05f,
+-5.54659823663212e-05f,
+-5.47560608300273e-05f,
+-5.40223484916847e-05f,
+-5.32653942004291e-05f,
+-5.24857555106721e-05f,
+-5.16839983244288e-05f,
+-5.08606965314632e-05f,
+-5.00164316474562e-05f,
+-4.91517924504131e-05f,
+-4.8267374615513e-05f,
+-4.73637803486132e-05f,
+-4.64416180186218e-05f,
+-4.5501501788938e-05f,
+-4.45440512481755e-05f,
+-4.35698910403686e-05f,
+-4.25796504948758e-05f,
+-4.15739632561745e-05f,
+-4.05534669137558e-05f,
+-3.95188026323246e-05f,
+-3.84706147824963e-05f,
+-3.74095505721944e-05f,
+-3.63362596789495e-05f,
+-3.52513938832866e-05f,
+-3.41556067034013e-05f,
+-3.30495530313092e-05f,
+-3.19338887706706e-05f,
+-3.08092704764648e-05f,
+-2.96763549967043e-05f,
+-2.85357991163705e-05f,
+-2.73882592037593e-05f,
+-2.62343908594003e-05f,
+-2.50748485677371e-05f,
+-2.39102853517339e-05f,
+-2.27413524305865e-05f,
+-2.15686988806958e-05f,
+-2.0392971300071e-05f,
+-1.92148134763324e-05f,
+-1.80348660584579e-05f,
+-1.68537662324395e-05f,
+-1.56721474009943e-05f,
+-1.44906388674902e-05f,
+-1.33098655242169e-05f,
+-1.21304475451533e-05f,
+-1.09530000833746e-05f,
+-9.77813297322283e-06f,
+-8.60645043737829e-06f,
+-7.43855079896758e-06f,
+-6.27502619881872e-06f,
+-5.11646231799598e-06f,
+-3.96343810572349e-06f,
+-2.81652551282231e-06f,
+-1.67628923075757e-06f,
+-5.43286436407872e-07f,
+5.81933457334323e-07f,
+1.69882904504592e-06f,
+2.80686716623921e-06f,
+3.90552313671397e-06f,
+4.99428097372264e-06f,
+6.07263361485467e-06f,
+7.14008313057028e-06f,
+8.19614093029787e-06f,
+9.24032796203801e-06f,
+1.02721749054007e-05f,
+1.12912223580112e-05f,
+1.22970210152324e-05f,
+1.32891318431441e-05f,
+1.42671262447348e-05f,
+1.52305862192578e-05f,
+1.61791045147037e-05f,
+1.71122847733627e-05f,
+1.80297416704377e-05f,
+1.89311010456724e-05f,
+1.98160000279816e-05f,
+2.06840871530522e-05f,
+2.15350224739038e-05f,
+2.23684776643877e-05f,
+2.31841361156243e-05f,
+2.39816930253701e-05f,
+2.47608554803058e-05f,
+2.55213425312607e-05f,
+2.62628852613713e-05f,
+2.69852268471836e-05f,
+2.76881226127196e-05f,
+2.83713400765207e-05f,
+2.90346589916937e-05f,
+2.9677871378978e-05f,
+3.03007815528719e-05f,
+3.0903206140848e-05f,
+3.1484974095687e-05f,
+3.20459267009823e-05f,
+3.25859175698492e-05f,
+3.31048126368919e-05f,
+3.36024901434722e-05f,
+3.40788406163417e-05f,
+3.45337668396904e-05f,
+3.49671838206697e-05f,
+3.53790187484599e-05f,
+3.57692109469452e-05f,
+3.61377118210647e-05f,
+3.64844847969168e-05f,
+3.68095052556901e-05f,
+3.71127604615012e-05f,
+3.73942494832179e-05f,
+3.76539831103606e-05f,
+3.78919837631567e-05f,
+3.81082853968512e-05f,
+3.83029334003579e-05f,
+3.84759844893474e-05f,
+3.86275065938727e-05f,
+3.87575787406302e-05f,
+3.8866290929957e-05f,
+3.89537440076728e-05f,
+3.90200495318706e-05f,
+3.90653296347648e-05f,
+3.90897168797088e-05f,
+3.9093354113495e-05f,
+3.90763943140511e-05f,
+3.90390004336481e-05f,
+3.89813452377419e-05f,
+3.89036111395636e-05f,
+3.88059900305833e-05f,
+3.86886831069695e-05f,
+3.85519006921668e-05f,
+3.83958620557194e-05f,
+3.82207952284668e-05f,
+3.80269368142382e-05f,
+3.78145317981768e-05f,
+3.75838333518232e-05f,
+3.73351026350876e-05f,
+3.70686085952445e-05f,
+3.67846277630824e-05f,
+3.64834440463399e-05f,
+3.61653485205641e-05f,
+3.58306392175243e-05f,
+3.54796209113175e-05f,
+3.51126049022989e-05f,
+3.47299087989734e-05f,
+3.43318562979864e-05f,
+3.39187769623452e-05f,
+3.34910059980102e-05f,
+3.30488840289915e-05f,
+3.25927568710847e-05f,
+3.21229753043848e-05f,
+3.16398948447076e-05f,
+3.11438755140624e-05f,
+3.06352816103032e-05f,
+3.01144814760946e-05f,
+2.95818472673267e-05f,
+2.90377547211135e-05f,
+2.84825829235032e-05f,
+2.79167140770348e-05f,
+2.73405332682702e-05f,
+2.67544282354346e-05f,
+2.61587891362892e-05f,
+2.55540083163661e-05f,
+2.49404800776967e-05f,
+2.43186004481496e-05f,
+2.36887669515123e-05f,
+2.30513783784305e-05f,
+2.24068345583368e-05f,
+2.17555361324792e-05f,
+2.10978843281734e-05f,
+2.04342807343983e-05f,
+1.97651270788444e-05f,
+1.9090825006532e-05f,
+1.84117758601162e-05f,
+1.77283804619801e-05f,
+1.70410388982337e-05f,
+1.63501503047186e-05f,
+1.56561126551312e-05f,
+1.495932255136e-05f,
+1.42601750161419e-05f,
+1.35590632881393e-05f,
+1.28563786195292e-05f,
+1.21525100762026e-05f,
+1.14478443406704e-05f,
+1.07427655177589e-05f,
+1.00376549431904e-05f,
+9.33289099512935e-06f,
+8.62884890878591e-06f,
+7.92590059414905e-06f,
+7.22441445693406e-06f,
+6.52475522282227e-06f,
+5.82728376506355e-06f,
+5.13235693551779e-06f,
+4.44032739920081e-06f,
+3.75154347240349e-06f,
+3.06634896445296e-06f,
+2.38508302317038e-06f,
+1.70807998408878e-06f,
+1.03566922349158e-06f,
+3.68175015318385e-07f,
+-2.94083608003316e-07f,
+-9.50792990756429e-07f,
+-1.60164498510903e-06f,
+-2.24633707822957e-06f,
+-2.88457251529726e-06f,
+-3.51606041836508e-06f,
+-4.1405159010472e-06f,
+-4.75766017899044e-06f,
+-5.3672206761039e-06f,
+-5.96893112651197e-06f,
+-6.56253167221256e-06f,
+-7.14776895641407e-06f,
+-7.72439621252695e-06f,
+-8.29217334879925e-06f,
+-8.85086702857723e-06f,
+-9.40025074617521e-06f,
+-9.94010489835156e-06f,
+-1.04702168513777e-05f,
+-1.09903810036992e-05f,
+-1.15003988441811e-05f,
+-1.20000790059446e-05f,
+-1.24892373157939e-05f,
+-1.29676968392356e-05f,
+-1.34352879211057e-05f,
+-1.38918482218078e-05f,
+-1.43372227491768e-05f,
+-1.47712638859842e-05f,
+-1.51938314131016e-05f,
+-1.56047925283423e-05f,
+-1.60040218609995e-05f,
+-1.63914014821138e-05f,
+-1.67668209104844e-05f,
+-1.71301771144641e-05f,
+-1.74813745095637e-05f,
+-1.78203249518961e-05f,
+-1.81469477275018e-05f,
+-1.84611695375892e-05f,
+-1.87629244797279e-05f,
+-1.90521540250401e-05f,
+-1.93288069914307e-05f,
+-1.95928395129016e-05f,
+-1.98442150049985e-05f,
+-2.00829041264386e-05f,
+-2.03088847369704e-05f,
+-2.05221418515167e-05f,
+-2.07226675906579e-05f,
+-2.09104611275098e-05f,
+-2.10855286310533e-05f,
+-2.12478832059766e-05f,
+-2.13975448290908e-05f,
+-2.15345402823792e-05f,
+-2.16589030827471e-05f,
+-2.17706734085351e-05f,
+-2.18698980228636e-05f,
+-2.19566301938759e-05f,
+-2.20309296119499e-05f,
+-2.20928623039478e-05f,
+-2.21425005445764e-05f,
+-2.21799227649299e-05f,
+-2.22052134582896e-05f,
+-2.22184630832555e-05f,
+-2.22197679642845e-05f,
+-2.2209230189713e-05f,
+-2.21869575073415e-05f,
+-2.21530632176586e-05f,
+-2.21076660647849e-05f,
+-2.20508901252157e-05f,
+-2.19828646944433e-05f,
+-2.19037241715403e-05f,
+-2.1813607941786e-05f,
+-2.17126602574166e-05f,
+-2.16010301165839e-05f,
+-2.14788711406045e-05f,
+-2.13463414495824e-05f,
+-2.1203603536491e-05f,
+-2.10508241397953e-05f,
+-2.08881741147018e-05f,
+-2.07158283031179e-05f,
+-2.05339654024071e-05f,
+-2.03427678330235e-05f,
+-2.01424216051101e-05f,
+-1.99331161841466e-05f,
+-1.97150443557299e-05f,
+-1.94884020895713e-05f,
+-1.92533884027966e-05f,
+-1.90102052226299e-05f,
+-1.87590572485474e-05f,
+-1.85001518139831e-05f,
+-1.82336987476685e-05f,
+-1.79599102346913e-05f,
+-1.76790006773523e-05f,
+-1.73911865559027e-05f,
+-1.7096686289245e-05f,
+-1.67957200956739e-05f,
+-1.64885098537403e-05f,
+-1.61752789633143e-05f,
+-1.58562522069298e-05f,
+-1.55316556114829e-05f,
+-1.52017163103648e-05f,
+-1.48666624061034e-05f,
+-1.45267228335893e-05f,
+-1.41821272239585e-05f,
+-1.38331057692082e-05f,
+-1.34798890876143e-05f,
+-1.31227080900243e-05f,
+-1.27617938470932e-05f,
+-1.23973774575348e-05f,
+-1.20296899174529e-05f,
+-1.16589619908198e-05f,
+-1.12854240811699e-05f,
+-1.09093061045694e-05f,
+-1.05308373639279e-05f,
+-1.01502464247116e-05f,
+-9.76776099211927e-06f,
+-9.38360778978138e-06f,
+-8.99801244003842e-06f,
+-8.61119934585469e-06f,
+-8.22339157442569e-06f,
+-7.83481074252834e-06f,
+-7.44567690366961e-06f,
+-7.05620843708182e-06f,
+-6.66662193861727e-06f,
+-6.27713211358587e-06f,
+-5.88795167158395e-06f,
+-5.49929122336098e-06f,
+-5.11135917976332e-06f,
+-4.72436165279992e-06f,
+-4.33850235886763e-06f,
+-3.95398252417812e-06f,
+-3.57100079241897e-06f,
+-3.18975313468634e-06f,
+-2.81043276172504e-06f,
+-2.43323003850373e-06f,
+-2.05833240115816e-06f,
+-1.685924276333e-06f,
+-1.31618700294526e-06f,
+-9.49298756398598e-07f,
+-5.85434475269598e-07f,
+-2.24765790491996e-07f,
+1.32539042944795e-07f,
+4.86315211761806e-07f,
+8.36401407601896e-07f,
+1.18263988767471e-06f,
+1.52487653281903e-06f,
+1.86296090296814e-06f,
+2.1967462900115e-06f,
+2.52608976803993e-06f,
+2.85085224096945e-06f,
+3.17089848753367e-06f,
+3.48609720364737e-06f,
+3.79632104212865e-06f,
+4.10144664978819e-06f,
+4.40135470188026e-06f,
+4.69592993391713e-06f,
+4.98506117085352e-06f,
+5.26864135364426e-06f,
+5.54656756317972e-06f,
+5.81874104161062e-06f,
+6.08506721106972e-06f,
+6.34545568979961e-06f,
+6.59982030570251e-06f,
+6.84807910732276e-06f,
+7.09015437227939e-06f,
+7.32597261316241e-06f,
+7.55546458091406e-06f,
+7.77856526571272e-06f,
+7.99521389537843e-06f,
+8.205353931325e-06f,
+8.40893306208027e-06f,
+8.60590319439753e-06f,
+8.79622044198664e-06f,
+8.97984511188938e-06f,
+9.15674168852855e-06f,
+9.32687881545793e-06f,
+9.49022927484591e-06f,
+9.64676996472302e-06f,
+9.79648187402453e-06f,
+9.9393500554642e-06f,
+1.00753635962716e-05f,
+1.02045155868301e-05f,
+1.03268030872496e-05f,
+1.04422270919149e-05f,
+1.0550792492045e-05f,
+1.06525080363035e-05f,
+1.07473862895008e-05f,
+1.08354435894281e-05f,
+1.0916700001865e-05f,
+1.09911792738028e-05f,
+1.10589087849281e-05f,
+1.11199194974072e-05f,
+1.11742459040199e-05f,
+1.12219259746839e-05f,
+1.12630011014179e-05f,
+1.12975160417894e-05f,
+1.13255188608912e-05f,
+1.13470608718987e-05f,
+1.13621965752502e-05f,
+1.13709835965034e-05f,
+1.13734826229118e-05f,
+1.13697573387741e-05f,
+1.13598743596031e-05f,
+1.13439031651642e-05f,
+1.13219160314341e-05f,
+1.12939879615282e-05f,
+1.12601966156489e-05f,
+1.12206222401028e-05f,
+1.11753475954396e-05f,
+1.11244578837615e-05f,
+1.10680406752548e-05f,
+1.10061858339947e-05f,
+1.09389854430728e-05f,
+1.08665337290994e-05f,
+1.07889269861305e-05f,
+1.07062634990703e-05f,
+1.06186434666002e-05f,
+1.05261689236834e-05f,
+1.04289436636974e-05f,
+1.03270731602418e-05f,
+1.02206644886739e-05f,
+1.01098262474198e-05f,
+9.9946684791103e-06f,
+9.87530259159214e-06f,
+9.75184127886139e-06f,
+9.62439844196833e-06f,
+9.49308910994118e-06f,
+9.35802936077671e-06f,
+9.21933624254407e-06f,
+9.07712769464879e-06f,
+8.93152246930308e-06f,
+8.78264005324777e-06f,
+8.6306005897712e-06f,
+8.47552480106908e-06f,
+8.31753391098936e-06f,
+8.15674956820604e-06f,
+7.9932937698635e-06f,
+7.82728878573374e-06f,
+7.65885708292867e-06f,
+7.48812125120668e-06f,
+7.31520392891465e-06f,
+7.14022772960352e-06f,
+6.96331516935742e-06f,
+6.78458859487235e-06f,
+6.60417011232209e-06f,
+6.42218151704837e-06f,
+6.23874422410882e-06f,
+6.05397919971873e-06f,
+5.86800689361913e-06f,
+5.68094717240549e-06f,
+5.49291925384727e-06f,
+5.30404164223008e-06f,
+5.11443206475166e-06f,
+4.9242074089991e-06f,
+4.73348366153649e-06f,
+4.54237584763148e-06f,
+4.35099797214519e-06f,
+4.15946296161273e-06f,
+3.96788260753768e-06f,
+3.7763675109258e-06f,
+3.58502702807881e-06f,
+3.39396921767065e-06f,
+3.20330078912824e-06f,
+3.01312705233424e-06f,
+2.82355186867183e-06f,
+2.63467760343009e-06f,
+2.44660507958479e-06f,
+2.25943353297212e-06f,
+2.0732605688689e-06f,
+1.88818211999487e-06f,
+1.70429240594667e-06f,
+1.52168389407997e-06f,
+1.3404472618458e-06f,
+1.16067136059361e-06f,
+9.82443180850183e-07f,
+8.05847819080474e-07f,
+6.30968445938114e-07f,
+4.57886276012498e-07f,
+2.86680539075395e-07f,
+1.17428452831953e-07f,
+-4.97948028199512e-08f,
+-2.14916110022078e-07f,
+-3.77864435677152e-07f,
+-5.38570852660314e-07f,
+-6.96968559519905e-07f,
+-8.5299289867131e-07f,
+-1.00658137308564e-06f,
+-1.15767366147596e-06f,
+-1.30621163198739e-06f,
+-1.45213935439567e-06f,
+-1.59540311081939e-06f,
+-1.73595140495523e-06f,
+-1.87373496984243e-06f,
+-2.00870677416658e-06f,
+-2.14082202711105e-06f,
+-2.27003818176826e-06f,
+-2.39631493712127e-06f,
+-2.51961423860721e-06f,
+-2.63990027727693e-06f,
+-2.75713948756333e-06f,
+-2.87130054367384e-06f,
+-2.98235435462072e-06f,
+-3.0902740579069e-06f,
+-3.19503501188303e-06f,
+-3.29661478679242e-06f,
+-3.39499315452328e-06f,
+-3.4901520770861e-06f,
+-3.58207569383478e-06f,
+-3.67075030745277e-06f,
+-3.75616436872432e-06f,
+-3.83830846011025e-06f,
+-3.91717527815299e-06f,
+-3.99275961473001e-06f,
+-4.06505833718047e-06f,
+-4.13407036732752e-06f,
+-4.19979665941946e-06f,
+-4.2622401770152e-06f,
+-4.32140586883761e-06f,
+-4.37730064362061e-06f,
+-4.42993334397458e-06f,
+-4.47931471929708e-06f,
+-4.52545739775463e-06f,
+-4.56837585736177e-06f,
+-4.60808639618528e-06f,
+-4.6446071017002e-06f,
+-4.67795781932549e-06f,
+-4.708160120167e-06f,
+-4.73523726799615e-06f,
+-4.75921418549266e-06f,
+-4.78011741977943e-06f,
+-4.79797510727911e-06f,
+-4.81281693792078e-06f,
+-4.82467411872586e-06f,
+-4.83357933680285e-06f,
+-4.83956672177993e-06f,
+-4.84267180770512e-06f,
+-4.84293149444328e-06f,
+-4.84038400859978e-06f,
+-4.8350688640006e-06f,
+-4.82702682175797e-06f,
+-4.81629984995191e-06f,
+-4.80293108295687e-06f,
+-4.7869647804432e-06f,
+-4.76844628608298e-06f,
+-4.74742198598981e-06f,
+-4.72393926692185e-06f,
+-4.69804647427729e-06f,
+-4.66979286991169e-06f,
+-4.63922858980587e-06f,
+-4.60640460161349e-06f,
+-4.57137266211669e-06f,
+-4.53418527461856e-06f,
+-4.49489564630047e-06f,
+-4.45355764557233e-06f,
+-4.41022575944365e-06f,
+-4.36495505094286e-06f,
+-4.317801116612e-06f,
+-4.26882004410401e-06f,
+-4.21806836990897e-06f,
+-4.16560303723581e-06f,
+-4.11148135407526e-06f,
+-4.05576095146995e-06f,
+-3.99849974201672e-06f,
+-3.9397558786259e-06f,
+-3.87958771356254e-06f,
+-3.81805375779311e-06f,
+-3.75521264066175e-06f,
+-3.691123069919e-06f,
+-3.6258437921263e-06f,
+-3.55943355345803e-06f,
+-3.49195106092336e-06f,
+-3.42345494402937e-06f,
+-3.35400371690615e-06f,
+-3.28365574091442e-06f,
+-3.21246918775589e-06f,
+-3.14050200310536e-06f,
+-3.06781187078387e-06f,
+-2.99445617749092e-06f,
+-2.9204919781143e-06f,
+-2.84597596163407e-06f,
+-2.77096441763785e-06f,
+-2.69551320346391e-06f,
+-2.61967771198731e-06f,
+-2.54351284006418e-06f,
+-2.46707295764928e-06f,
+-2.39041187760002e-06f,
+-2.31358282618093e-06f,
+-2.23663841428083e-06f,
+-2.15963060935584e-06f,
+-2.08261070810835e-06f,
+-2.00562930991492e-06f,
+-1.92873629101175e-06f,
+-1.85198077944851e-06f,
+-1.77541113081986e-06f,
+-1.69907490478283e-06f,
+-1.62301884236816e-06f,
+-1.54728884409369e-06f,
+-1.47192994888574e-06f,
+-1.39698631381516e-06f,
+-1.32250119465413e-06f,
+-1.24851692725776e-06f,
+-1.17507490977595e-06f,
+-1.10221558569852e-06f,
+-1.02997842773779e-06f,
+-9.58401922550402e-07f,
+-8.87523556300847e-07f,
+-8.17379801068637e-07f,
+-7.48006102099267e-07f,
+-6.79436865899722e-07f,
+-6.1170544917867e-07f,
+-5.44844148629826e-07f,
+-4.78884191557767e-07f,
+-4.13855727343869e-07f,
+-3.49787819750523e-07f,
+-2.8670844005994e-07f,
+-2.24644461044386e-07f,
+-1.63621651764123e-07f,
+-1.03664673187799e-07f,
+-4.4797074630806e-08f,
+0.0f
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/sms.cpp b/lib-src/sbsms/src/sms.cpp
new file mode 100644
index 0000000..cde7125
--- /dev/null
+++ b/lib-src/sbsms/src/sms.cpp
@@ -0,0 +1,1959 @@
+#include "real.h"
+#include "utils.h"
+#include <math.h>
+#include "sms.h"
+#include "buffer.h"
+#include "defs.h"
+#include "limits.h"
+
+using namespace std;
+namespace _sbsms_ {
+
+#define SMS_BUF_SIZE 4096
+
+sms :: sms(int N, unsigned short M, unsigned short  M_MAX, int res, int latency, real p, real q, real pad, int Nlo, int channels, TrackAllocator *ta, PeakAllocator *pa) {
+  this->N = N;
+  this->M = M;
+  Nover2 = N/2;
+  this->p = 1.0/p;
+  this->q = q;
+  this->res = res;
+  this->m = (real)M/(real)M_MAX;
+  this->channels = channels;
+  this->ta = ta;
+  this->pa = pa;
+  terminal = (M == M_MAX);
+
+  datasize = sizeof(char) + 6*sizeof(unsigned short);
+  pData = (char*)calloc(datasize,sizeof(char));
+
+  // Phase lock channels
+  bPhaseLock = 0;
+  // Stitch bands together
+  bStitch = 1;
+  // Threshold (relative to maximum magnitude) for finding peaks
+  peakThresh = .000005;
+  // Threshold (in trackpoint units) for starting a track
+  startThresh = 8.0*sqrt(pad/(real)N) * peakThresh;
+  // Maximum figure of merit for continuing a track (see merit)
+  maxMerit2 = square(.11);
+  // Maximum differency in frequency for continuing a track
+  maxDF2 = square(.08);
+  // Coefficient for dB magnitude changes in figure of merit for continuing a track
+  dMCoeff = 0.01;
+  // Maximum increase in dB for continuing a track
+  maxdBIncr = (12.0 - 6.0*m);
+  // Maximum difference in dB for stitching two subband tracks together
+  maxdBIncrStitch = (12.0 - 6.0*m);
+  // Maximum figure of merit for matching tracks for phase locking
+  maxMerit2PhaseLock = square(.01);
+  // Maximum differene in frequency for matching tracks for phase locking
+  maxDF2PhaseLock = square(.005);
+  // Coefficient for dB magnitude changes in figure of merit for phase locking
+  dMCoeffPhaseLock = 0.0005;
+  // Maximum figure of merit for matching peaks for band stitching
+  maxMerit2Match = square(.08);
+  // Maximum difference in frequency for matching peaks for band stitching
+  maxDF2Match = square(.04);
+  // Coefficient for dB magnitude changes in figure of merit for band stitching
+  dMCoeffMatch = 0.02;
+    // Minimum number of trackpoints in a track for synthesis
+  minNpts = 4;
+  // Maximum width of a peak for determining spectral energy
+  peakWidth = 2*((round2int(pad*(real)N/96.0)+1)/2);
+  // Beginning and end of band
+  if(terminal) kStart = 1; 
+  else kStart = N/4-(int)(0.5*round2int((real)peakWidth*(real)N/(real)Nlo)+6);
+  if(M==1) kEnd = N/2;
+  else kEnd = N/2-peakWidth;
+  // Maximum frequency for matching peaks for band stitching
+  maxFMatch = (0.5*kEnd+8.0)*TWOPI/(real)N;
+  // Minimum frequency for matching peaks for band stitching
+  minFMatch = (2.0*kStart-16.0)*TWOPI/(real)N;
+  // Minimum ratio of peak "top" to total peak energy
+  minPeakTopRatio = 0.05;
+  // Minimum ratio of low frequency resolution/high frequency resolution peaks for determining peaks
+  // Ratio for favoring continuing a track in local band over stitching to another band
+  localFavorRatio = 1.1;
+  // Maximum ratio of (peak energy given to other peaks) to (peak energy)
+  maxDecRatio = 1.5;
+
+  // Normalization from spectrum energy to peak amplitude
+  if(SBSMS_WINDOW == SBSMS_HANN)
+    mNorm = 1.0/6.0 * pad * square(8.0 / (real)(N));
+  else if(SBSMS_WINDOW == SBSMS_HAMMING)
+    mNorm = 0.18141196440283 * pad * square(8.0 / (real)(N));
+  else
+    abort();
+
+  // maximum magnitude (for determining peaks)
+  magmax = 0;
+
+  assigntime[0] = 0;
+  assigntime[1] = 0;
+  marktime[0] = 0;
+  marktime[1] = 0;
+  currtime = 0;
+  synthtime = 0;
+
+  trax = (list<track*>**)calloc(2,sizeof(list<track*>*));
+  trax[0] = new list<track*>;
+  trax[1] = new list<track*>;
+  peak1 = (real*)calloc(2*N,sizeof(real));
+  dec = (real*)calloc(N,sizeof(real));
+  mag0[0] = (real*)calloc(N,sizeof(real));
+  mag0[1] = (real*)calloc(N,sizeof(real));
+  mag1[0] = (real*)calloc(N,sizeof(real));
+  mag1[1] = (real*)calloc(N,sizeof(real));
+  mag2[0] = (real*)calloc(N,sizeof(real));
+  mag2[1] = (real*)calloc(N,sizeof(real));
+  trackPointListBuffer[0] = new TrackPointListBuffer();
+  trackPointListBuffer[1] = new TrackPointListBuffer();
+
+  h2cum = 0;    
+  sines2 = new SampleBuf(0);
+  outMixer = sines2;
+  
+  x0[0] = grain :: create(N,1,SBSMS_WINDOW);
+  x0[1] = grain :: create(N,1,SBSMS_WINDOW);
+
+  x1[0] = grain :: create(N,1,SBSMS_WINDOW);
+  x1[1] = grain :: create(N,1,SBSMS_WINDOW);
+
+  x2[0] = grain :: create(N,1,SBSMS_WINDOW);
+  x2[1] = grain :: create(N,1,SBSMS_WINDOW);
+
+  bPeakSet = false;
+
+#ifdef MULTITHREADED
+  pthread_mutex_init(&dataMutex,NULL);
+  pthread_mutex_init(&tplbMutex[0],NULL);
+  pthread_mutex_init(&tplbMutex[1],NULL);
+  pthread_mutex_init(&bufferMutex,NULL);
+  pthread_mutex_init(&trackMutex[0],NULL);
+  pthread_mutex_init(&trackMutex[1],NULL);
+#endif
+}
+
+sms :: ~sms()
+{
+  reset();
+  free(pData);
+  free(mag0[0]);
+  free(mag0[1]);
+  free(mag1[0]);
+  free(mag1[1]);
+  free(mag2[0]);
+  free(mag2[1]);
+  free(dec);
+  free(peak1);
+  grain :: destroy(x0[0]);
+  grain :: destroy(x0[1]);
+  grain :: destroy(x1[0]);
+  grain :: destroy(x1[1]);
+  grain :: destroy(x2[0]);
+  grain :: destroy(x2[1]);
+  delete sines2;
+  for(int c=0;c<channels;c++) {
+    for(long k=trackPointListBuffer[c]->readPos; k<trackPointListBuffer[c]->writePos; k++) {
+      tplist *tpl = trackPointListBuffer[c]->read(k);
+      for(tplist::iterator tpi = tpl->begin();
+	  tpi != tpl->end();
+	  tpi++) {
+	delete (*tpi);
+      }
+    }
+  }
+  delete trackPointListBuffer[0];
+  delete trackPointListBuffer[1];
+  delete trax[0];
+  delete trax[1];
+  free(trax);
+}
+
+void sms :: reset()
+{
+  assigntime[0] = 0;
+  assigntime[1] = 0;
+  marktime[0] = 0;
+  marktime[1] = 0;
+  currtime = 0;
+  synthtime = 0;
+  h2cum = 0;
+  samplePos = 0;
+
+  for(int c=0;c<channels;c++) {
+    for(list<track*>::iterator tt=trax[c]->begin(); 
+	tt != trax[c]->end(); 
+	) {
+      track *t = (*tt);      
+      list<track*>::iterator eraseMe = tt;
+      tt++;
+      trax[c]->erase(eraseMe);
+      ta->destroy(t);
+    }
+  }
+  
+  hSynth.clear();
+  hAssign[0].clear();
+  hAssign[1].clear();
+  sines2->clear();
+}
+
+
+//1/65535
+#define LOG_MIN (-11.09033963005365f)
+//4
+#define LOG_MAX 1.38629436111989f
+
+unsigned short sms :: encodeRealLog(real x)
+{
+  x = log(x);
+  if(x<LOG_MIN) return 0;
+  else if(x>LOG_MAX) return USHRT_MAX;
+  else return (unsigned short)round2int((real)USHRT_MAX*(x-LOG_MIN)/(LOG_MAX-LOG_MIN));
+}
+
+real sms :: decodeRealLog(unsigned short x)
+{
+  return exp(LOG_MIN + (LOG_MAX-LOG_MIN)*(real)x/(real)USHRT_MAX);
+}
+
+unsigned short sms :: encodeReal(real x, real min, real max)
+{
+  if(x<min) return 0;
+  else if(x>max) return USHRT_MAX;
+  else return (unsigned short)round2int((real)USHRT_MAX*(x-min)/(max-min));
+}
+
+real sms :: decodeReal(unsigned short x, real min, real max)
+{
+  return min + (max-min)*(real)x/(real)USHRT_MAX;
+}
+
+void sms :: readTrackPointsFromFile(FILE *fp)
+{
+  unsigned short h1;
+  char *data = pData;
+  fread(data,sizeof(unsigned short)+sizeof(char),1,fp);
+  h1 = *((unsigned short*)data); data += sizeof(unsigned short);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  hSynth.write(h1);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  char ch = *((char*)data);
+  channels = ch;
+  for(int c=0;c<channels;c++) {
+    unsigned short nTracks = 0;
+    fread(&nTracks,sizeof(unsigned short),1,fp);
+    for(int k=0;k<nTracks;k++) {
+      unsigned short index;
+      unsigned short precursorIndex;
+      char flags;
+      bool tailStart;
+      bool tailEnd;
+      bool bStart;
+      bool bEnd;
+      tpoint *tp = new tpoint();
+      
+      char *data = pData;
+      fread(data,datasize,1,fp);
+      flags = *((char*)data); data += sizeof(char);
+      index = *((unsigned short*)data); data += sizeof(unsigned short);
+      precursorIndex = *((unsigned short*)data); data += sizeof(unsigned short);
+      unsigned short f;
+      unsigned short y;
+      unsigned short y0;
+      unsigned short ph;
+      f = *((unsigned short*)data); data += sizeof(unsigned short);
+      y = *((unsigned short*)data); data += sizeof(unsigned short);
+      y0 = *((unsigned short*)data); data += sizeof(unsigned short);
+      ph = *((unsigned short*)data);
+      tp->f = decodeReal(f,0.0f,PI);
+      tp->y = decodeRealLog(y)*(real)M;
+      tp->y0 = decodeRealLog(y0)*(real)M;
+      tp->ph = decodeReal(ph,-PI,PI);
+      
+      bStart = (flags & 1)?true:false;
+      tailStart = (flags & 2)?true:false;
+      bEnd = (flags & 4)?true:false;
+      tailEnd = (flags & 8)?true:false;
+      tp->h = h1;
+      tp->M = M;
+      
+      track *t = ta->getTrack(index);
+      if(t && !bStart) {
+	t->push_back_tpoint(tp);
+	if(bEnd) {
+	  t->end = assigntime[c];
+	}
+	if(tailEnd) {
+	  t->tailEnd = true;
+	}
+      } else {
+	track *t1;
+	if(precursorIndex != USHRT_MAX) {
+	  track *precursor = ta->getTrack(precursorIndex);
+	  t1 = ta->create(precursor,this,res,index);
+	  if(precursor) precursor->descendant = t1;
+	} else {
+	  t1 = ta->create(NULL,this,res,index);
+	}
+	if(tailStart)
+	  t1->tailStart = true;
+	t1->push_back_tpoint(tp);
+	t1->m_p = tp->ph;
+	t1->m_pDescendant = tp->ph;
+	t1->currtime = assigntime[c];
+	t1->start = assigntime[c];
+	addTrack(c,t1);
+      }
+    }
+    assigntime[c]++;
+  }
+}
+
+void sms :: zeroPad(long n)
+{
+  sines2->grow(n);
+  sines2->writePos += n;
+}
+
+int sms :: writeTrackPointsToFile(FILE *fp)
+{
+  int bytes = 0;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  unsigned short h1 = hSynth.read(hSynth.readPos);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  if(fp) {
+    fwrite(&h1,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+    char c = channels;
+    fwrite(&c,sizeof(char),1,fp); bytes += sizeof(char);
+    for(int c=0;c<channels;c++) {
+      unsigned short nTracks = 0;
+      long start = ftell(fp);
+      fwrite(&nTracks,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&trackMutex[c]);
+#endif
+      for(list<track*>::iterator tt=trax[c]->begin(); 
+	  tt != trax[c]->end(); 
+	  ) {
+	track *t = (*tt);      
+	if(t->end < synthtime) {
+	  if(!t->descendant||t->descendant->isDone()) {
+	    list<track*>::iterator eraseMe = tt;
+	    tt++;
+	    trax[c]->erase(eraseMe);
+	    ta->destroy(t);
+	  } else {
+	    tt++;
+	  }
+	} else if(synthtime >= t->start) {
+	  track *t = (*tt);      
+	  t->currtime = synthtime;
+	  trackpoint *tp = t->getTrackPoint(synthtime);
+	  if(tp) {
+	    char flags = 0;
+	    bool bStart;
+	    bool bEnd;
+	    bool tailStart;
+	    bool tailEnd;
+	    if(t->isStart(synthtime))
+	      bStart = true;
+	    else
+	      bStart = false;
+	    if(t->tailStart && t->isStart(synthtime))
+	      tailStart = true;
+	    else
+	      tailStart = false;
+	    if(t->isEnd(synthtime))
+	      bEnd = true;
+	    else
+	      bEnd = false;
+	    if(t->tailEnd && t->isEnd(synthtime))
+	      tailEnd = true;
+	    else
+	      tailEnd = false;
+	    
+	    if(bStart)
+	      flags += 1;
+	    if(tailStart)
+	      flags += 2;
+	    if(bEnd)
+	      flags += 4;
+	    if(tailEnd)
+	      flags += 8;
+	    
+	    fwrite(&flags,sizeof(char),1,fp); bytes += sizeof(char);
+	    fwrite(&(t->index),sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    if(t->precursor) {
+	      fwrite(&(t->precursor->index),sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    } else {
+	      unsigned short none = USHRT_MAX;
+	      fwrite(&none,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    }
+	    unsigned short f = encodeReal(tp->f,0.0f,PI);
+	    unsigned short y = encodeRealLog(tp->y/(real)M);
+	    unsigned short y0 = encodeRealLog(tp->y0/(real)M);
+	    unsigned short ph = encodeReal(tp->ph,-PI,PI);
+	    fwrite(&f,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    fwrite(&y,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    fwrite(&y0,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    fwrite(&ph,sizeof(unsigned short),1,fp); bytes += sizeof(unsigned short);
+	    nTracks++;
+	  }
+	  tt++;
+	} else {
+	  break;
+	}
+      }
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&trackMutex[c]);
+#endif
+      long end = ftell(fp);
+      fseek(fp,start,SEEK_SET);
+      fwrite(&nTracks,sizeof(unsigned short),1,fp);
+      fseek(fp,end,SEEK_SET);    
+    }
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  hSynth.advance(1);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  synthtime++;
+  return bytes;
+}
+
+void sms :: setH(unsigned short h)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  hAssign[0].write(h);
+  hAssign[1].write(h);
+  hSynth.write(h);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+}
+
+long sms :: addTrackPoints(grain *g0, grain *g1, grain *g2)
+{
+  // set magnitude profile of signel constant frequency peak
+  if(!bPeakSet) {
+    for(int k=-Nover2;k<=Nover2;k++) {
+      peak1[k+N] = norm2(g1->peak[(k+N)%N]);
+    }
+    bPeakSet = true;
+  }
+
+  setH(g1->h);
+  // split channels
+  c2evenodd(g0, x0[0], x0[1]);
+  c2evenodd(g1, x1[0], x1[1]);
+  c2evenodd(g2, x2[0], x2[1]);
+
+  for(int c=0;c<channels;c++) {
+    calcmags(mag0[c], x0[c],p);
+    calcmags(mag1[c], x1[c],1);
+    calcmags(mag2[c], x2[c],q);
+    extractTrackPoints(x1[c],mag0[c],mag1[c],mag2[c],currtime,trackPointListBuffer[c],g1->h,c);
+  }
+  currtime++;
+  return 1;
+}
+
+real sms :: merit(trackpoint *tp0, trackpoint *tp1, real m0, real m1, real dti2, real dMCoeff, real *df, real maxDF2)
+{
+  (*df) = m1*tp1->f - m0*tp0->f;
+  real df2 = square(*df);
+  if(df2 > maxDF2) return df2;
+  real dM = dBApprox((m1*tp1->y)/(m0*tp0->y));
+  return (df2+square(dMCoeff*dM));
+}
+
+bool sms :: nearestTrackPoint(tplist *tpl, trackpoint *tp0, real m0, real m1, real dti2, tplist::iterator *minpos, real *minMerit2, real maxMerit2, real maxDF2) 
+{
+  (*minMerit2) = 1e9;
+  if(tpl == NULL) return false;
+  bool bSet = false;
+
+  for(tplist::iterator tpi=tpl->begin(); 
+      tpi!=tpl->end();
+      ++tpi) {
+
+    trackpoint *tp1 = (*tpi);
+    real df;
+    real Merit2 = merit(tp0,tp1,m0,m1,dti2,dMCoeff,&df,maxDF2);
+    if(m0!=m1) Merit2*=localFavorRatio;
+    if(Merit2 < (*minMerit2) && Merit2 < maxMerit2 && square(df) < maxDF2) {
+      (*minMerit2) = Merit2;
+      (*minpos) = tpi;
+      bSet = true;
+    }
+  }
+  return bSet;
+}
+
+bool sms :: contTrack(track *t, trackpoint *tp, int c)
+{
+  bool allowCont = true;
+  trackpoint *last = t->back();
+  real dbIncr = dBApprox(tp->y/last->y);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  if(dbIncr > maxdBIncr) {
+    tp->y0 = last->y;
+    t->push_back(tp);
+  } else {
+    t->push_back(tp);
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif
+  return allowCont;
+}      
+
+bool sms :: adoptTrack(track *precursor, 
+		       sms *lender,
+		       trackpoint *tp,
+		       real m,
+		       real dt,
+		       int c)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&lender->trackMutex[c]);
+#endif
+  trackpoint *last = precursor->back();
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&lender->trackMutex[c]);
+#endif
+  real dbIncr = dBApprox((m*tp->y)/last->y);
+
+  bool bDiscont;
+  if(dbIncr > maxdBIncrStitch) {
+    bDiscont = true;
+  } else {
+    bDiscont = false;
+  }
+  if(tp->M>last->M) {
+    if(dt==1.0) {
+      if(lender->res==2) {
+	trackpoint *tp0 = new trackpoint();
+	tp0->h = tp->h*2/lender->res;
+	tp0->y = 0.5*tp->y;
+	if(bDiscont)
+	  tp0->y0 = last->y;
+	else 
+	  tp0->y0 = tp0->y;
+	tp0->f = 0.5*tp->f;
+	tp0->ph = tp->ph;
+	tp0->time = last->time+1;
+	tp0->M = last->M;
+#ifdef MULTITHREADED
+	pthread_mutex_lock(&lender->trackMutex[c]);
+#endif
+	precursor->push_back(tp0);
+#ifdef MULTITHREADED
+	pthread_mutex_unlock(&lender->trackMutex[c]);
+#endif
+	if(!tp->owner) 
+	  tp->bDelete = true;
+      } else {
+	trackpoint *tpend = new trackpoint();
+	tpend->h = tp->h*2/lender->res;
+	tpend->y = 0;
+	tpend->y0 = 0;
+	tpend->f = 0.5*tp->f;
+	tpend->ph = tp->ph;
+	tpend->time = last->time+1;
+	tpend->M = last->M;
+	
+	trackpoint *tp0 = new trackpoint();
+	tp0->h = last->h*lender->res/2;
+	tp0->y = 0;
+	tp0->y0 = 0;
+	tp0->f = last->f*2.0;
+	tp0->ph = last->ph;
+	tp0->time = last->time/lender->res;
+	tp0->M = M;
+	track *t = ta->create(precursor,this,res);
+#ifdef MULTITHREADED
+	pthread_mutex_lock(&lender->trackMutex[c]);
+#endif
+	precursor->push_back(tpend);
+	precursor->endTrack(false);
+	precursor->descendant = t;
+#ifdef MULTITHREADED
+	pthread_mutex_unlock(&lender->trackMutex[c]);
+#endif
+	t->startTrack(tp0,false);
+	if(bDiscont)
+	  tp->y0 = 2.0*last->y;
+	t->push_back(tp);
+	addTrack(c,t);
+      }
+    } else if(dt==2.0) {
+      track *t = ta->create(precursor,this,res);
+      trackpoint *tpend0 = new trackpoint();
+      trackpoint *tpend1 = new trackpoint();
+      trackpoint *tp0 = new trackpoint();
+
+      if(bDiscont)
+	tp->y0 = 2.0*last->y;
+
+      tp0->h = (last->h*lender->res)/2;
+      tp0->y = 0;
+      tp0->y0 = 0;
+      tp0->f = last->f*2.0f;
+      tp0->ph = last->ph;
+      tp0->M = M;
+      tp0->time = last->time/lender->res;
+      
+      tpend0->h = last->h;
+      tpend0->y = 0.5f*last->y;
+      tpend0->y0 = tpend0->y;
+      tpend0->f = 0.5f*(last->f+0.5f*tp->f);
+      tpend0->ph = canon(last->ph + 0.5f*(last->f+tpend0->f)*last->h);
+      tpend0->time = last->time+1;
+      tpend0->M = last->M;
+      
+      tpend1->h = (tp->h*2)/lender->res;
+      tpend1->y = 0;
+      tpend1->y0 = 0;
+      tpend1->f = 0.5f*tp->f;
+      tpend1->ph = tp->ph;
+      tpend1->time = last->time+2;
+      tpend1->M = last->M;
+      
+      t->startTrack(tp0,false);
+      t->push_back(tp);
+#ifdef MULTITHREADED
+      pthread_mutex_lock(&lender->trackMutex[c]);
+#endif
+      precursor->push_back(tpend0);
+      precursor->push_back(tpend1);
+      precursor->endTrack(false);
+      precursor->descendant = t;
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&lender->trackMutex[c]);
+#endif
+      addTrack(c,t);
+    } else {
+      abort();
+    }
+  } else {
+    track *t = ta->create(precursor,this,res);
+
+    if(bDiscont)
+      tp->y0 = 0.5f*last->y;
+
+    trackpoint *tp0 = new trackpoint();
+    trackpoint *tpend = new trackpoint();
+    
+    tp0->h = (last->h*2)/res;
+    tp0->y = 0;
+    tp0->y0 = 0;
+    tp0->f = 0.5f*last->f;
+    tp0->ph = last->ph;
+    tp0->time = last->time*res;
+    tp0->M = M;
+    
+    tpend->h = (tp->h*res)/2;
+    tpend->y = 0;
+    tpend->y0 = 0;
+    tpend->f = tp->f*2.0f;
+    tpend->time = last->time+1;
+    tpend->ph = tp->ph;
+    tpend->M = last->M;
+    
+    t->startTrack(tp0,false);
+    if(res==2) {
+      trackpoint *tp1 = new trackpoint();
+      tp1->h = (last->h*2)/res;
+      tp1->y = 0.5f*tp->y0;
+      tp1->y0 = tp1->y;
+      tp1->f = 0.5f*(0.5f*last->f+tp->f);
+      tp1->ph = canon(tp0->ph + 0.5f*(tp0->f + tp1->f)*last->h);
+      tp1->time = last->time*res+1;
+      tp1->M = M;
+      t->push_back(tp1);
+    }
+    t->push_back(tp);
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&lender->trackMutex[c]);
+#endif
+    precursor->push_back(tpend);
+    precursor->endTrack(false);
+    precursor->descendant = t;
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&lender->trackMutex[c]);
+#endif
+    addTrack(c,t);
+  }
+  return true;
+}
+
+void sms :: markDuplicatesLo(long offset, sms *lo, long offsetlo, int c)
+{
+  if(!lo) return;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  unsigned short ha = hAssign[c].read(hAssign[c].readPos);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&lo->tplbMutex[c]);
+#endif
+  tplist *trackPointsL1 = 
+    lo->trackPointListBuffer[c]->read(lo->trackPointListBuffer[c]->readPos+offset/res+offsetlo);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&lo->tplbMutex[c]);
+#endif
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&tplbMutex[c]);
+#endif
+  tplist *trackPointsM1 = 
+    trackPointListBuffer[c]->read(trackPointListBuffer[c]->readPos+offset);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&tplbMutex[c]);
+#endif
+  
+  tplist trackPoints0;
+  
+  for(tplist::iterator tpi=trackPointsM1->begin(); 
+      tpi!=trackPointsM1->end();
+      tpi++) {
+    
+    if((*tpi)->f > maxFMatch) break;
+    trackPoints0.push_back((*tpi));
+  }
+  
+  bool bDone = false;
+  bool bLastDitch = false;
+  
+  while(!bDone) {      
+    int nToCont = 0;
+    int nCont = 0;
+    
+    for(tplist::iterator tpi = trackPoints0.begin(); 
+	tpi!=trackPoints0.end();
+	tpi++) {
+      real F;
+      tplist::iterator minL0; bool minL0Set = nearestTrackPoint(trackPointsL1,*tpi,1.0,0.5,1.0,&minL0,&F,maxMerit2Match, maxDF2Match);
+      if(minL0Set) {
+	nToCont++;
+	(*tpi)->cont = (*minL0);
+      } else {
+	(*tpi)->cont = NULL;
+      }
+    }
+      
+    if(trackPointsL1 && bStitch) {
+      for(tplist::reverse_iterator tpi = trackPointsL1->rbegin(); 
+	  tpi!=trackPointsL1->rend();
+	  tpi++) {      
+	real F;
+	(*tpi)->cont = NULL;
+	if((*tpi)->f < minFMatch) break;
+	tplist::iterator minL1; bool minL1Set = nearestTrackPoint(&trackPoints0,*tpi,0.5,1.0,1.0,&minL1,&F,maxMerit2Match, maxDF2Match);
+	if(minL1Set) (*tpi)->cont = *minL1;
+      }
+    }
+    
+    for(tplist::iterator tpi = trackPoints0.begin(); 
+	tpi!=trackPoints0.end();
+	) {
+      trackpoint *tp0 = (*tpi);
+      trackpoint *tp1 = tp0->cont;
+      if(tp1 != NULL) {
+	if(bLastDitch || tp1->cont == tp0) {
+	  nCont++;
+	  bool bAlreadyMarked = false;
+	  if(offset%res == 0) {
+	    if(tp1->dup[1] != NULL || tp0->dup[1] != NULL)
+	      bAlreadyMarked = true;
+	  } else {
+	    if(tp1->dup[2-2*offsetlo] != NULL || tp0->dup[2*offsetlo] != NULL)
+	      bAlreadyMarked = true;
+	  }
+	  if(!bAlreadyMarked) {
+	    if(offset%res == 0) {
+	      tp1->dup[1] = tp0;
+	      tp0->dup[1] = tp1;
+	    } else {
+	      tp1->dup[2-2*offsetlo] = tp0;
+	      tp0->dup[2*offsetlo] = tp1;
+	    }
+	  }
+	  tplist::iterator eraseMe = tpi;
+	  tpi++;
+	  trackPoints0.erase(eraseMe);	    
+	  continue;
+	}
+      }
+      tpi++;
+    }
+    
+    bDone = (nToCont-nCont == 0);
+    bLastDitch = (!bDone && nCont==0);
+  }
+  marktime[c]++;
+}
+
+void sms :: markDuplicates(long offset, sms *hi, sms *lo, int c)
+{
+  if(offset%res==0) {
+    markDuplicatesLo(offset,lo,offset%res,c);
+  } else {
+    markDuplicatesLo(offset,lo,0,c);
+    markDuplicatesLo(offset,lo,1,c);
+  }
+}
+
+void sms :: addTrack(int c, track *t)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  list<track*>::reverse_iterator i=trax[c]->rbegin();
+  while(i!=trax[c]->rend()) {
+    track *t0 = *i;
+    if(t->start >= t0->start) {
+      break;
+    }
+    i++;
+  }
+  trax[c]->insert(i.base(),t);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif
+}
+
+void sms :: deleteTrackPoint(trackpoint *tp)
+{
+  delete tp;
+}
+
+bool sms :: connectTrackPoints(trackpoint *tp0, trackpoint *tp1, sms *hi, sms *lo, real dtlo, int c)
+{
+  bool isConn;
+  bool allowCont;
+  if(tp0->M == tp1->M) {
+    allowCont = contTrack(tp0->owner, tp1, c);
+    isConn = allowCont;
+  } else if(tp0->M < tp1->M) {
+    isConn = true;
+    allowCont = lo->adoptTrack(tp0->owner, this, tp1, 0.5, dtlo, c);
+  } else {
+    isConn = true;
+    allowCont = hi->adoptTrack(tp0->owner, this, tp1, 2.0, 1.0, c);
+  }
+  tp0->bConnected = true;
+  if(isConn) {
+    tp1->bConnected = true;
+    if(tp0->dupcont != NULL) {
+      trackpoint *dup = tp0->dupcont;
+      dup->bConnected = true;
+      if(!dup->owner)
+	dup->bDelete = true;
+    }
+    
+    trackpoint *dup2 = tp0->dup[2];
+    if(dup2 && dup2 != tp1 && !dup2->owner) {
+      dup2->bDelete = true;
+    }
+
+    for(int d=0;d<3;d++) {
+      if(tp1->dup[d] && !tp1->dup[d]->owner && (d<2 || tp1->dup[d]->M < tp1->M)) {
+	tp1->dup[d]->bDelete = true;
+      }
+    }
+  }
+  return allowCont;
+}
+
+void sms :: advanceTrackPoints(int c)
+{
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&tplbMutex[c]);
+#endif
+    trackPointListBuffer[c]->advance(1);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&tplbMutex[c]);
+#endif
+}
+
+long sms :: assignTrackPoints(long offset, sms *hi, sms *lo, int c)
+{  
+  if(offset%res == 0)
+    return assignTrackPoints_(offset,hi,lo,1.0,0,c);
+  else
+    return assignTrackPoints_(offset,hi,lo,2.0,1,c);
+}
+
+long sms :: assignTrackPoints_(long offset, sms *hi, sms *lo, real dtlo, long offsetlo, int c)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  unsigned short ha = hAssign[c].read(hAssign[c].readPos);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+
+#ifdef MULTITHREADED
+  if(hi) pthread_mutex_lock(&hi->tplbMutex[c]);
+#endif
+  tplist *trackPointsH1 = 
+    hi?hi->trackPointListBuffer[c]->read(hi->trackPointListBuffer[c]->readPos+hi->res*offset):NULL;  
+#ifdef MULTITHREADED 
+  if(hi) pthread_mutex_unlock(&hi->tplbMutex[c]);
+#endif
+
+#ifdef MULTITHREADED
+  if(lo) pthread_mutex_lock(&lo->tplbMutex[c]);
+#endif
+    tplist *trackPointsL1 = 
+    lo?lo->trackPointListBuffer[c]->read(lo->trackPointListBuffer[c]->readPos+offset/res+offsetlo):NULL;
+#ifdef MULTITHREADED
+	if(lo) pthread_mutex_unlock(&lo->tplbMutex[c]);
+#endif
+
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&tplbMutex[c]);
+#endif
+  tplist *trackPointsM1 = 
+    trackPointListBuffer[c]->read(trackPointListBuffer[c]->readPos+offset);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&tplbMutex[c]);	
+#endif
+  
+  tplist trackPoints0;
+  
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  for(list<track*>::iterator tt=trax[c]->begin(); 
+      tt != trax[c]->end(); ) {
+    track *t = (*tt);
+    t->bEnd = true;
+    if(t->isEnded() || t->back()->time+1 != assigntime[c]) { t->bEnd = false; tt++; continue; }
+    trackPoints0.push_back(t->back());
+    tt++;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif
+
+  for(tplist::iterator tpi=trackPointsM1->begin(); 
+      tpi!=trackPointsM1->end();
+      ) {
+    trackpoint *tp = (*tpi);
+    if(tp->bDelete) {
+      tplist::iterator eraseMe = tpi;
+      tpi++;
+      trackPointsM1->erase(eraseMe);
+      deleteTrackPoint(tp);
+    } else {
+      tpi++;
+    }
+  }
+  
+  if(trackPointsL1) {
+    for(tplist::iterator tpi=trackPointsL1->begin(); 
+	tpi!=trackPointsL1->end();
+	) {
+      trackpoint *tp = (*tpi);
+      if(tp->bDelete) {
+	tplist::iterator eraseMe = tpi;
+	tpi++;
+	trackPointsL1->erase(eraseMe);
+	deleteTrackPoint(tp);
+      } else {
+	tpi++;
+      }
+    }
+  }
+
+  if(trackPointsH1) {
+    for(tplist::iterator tpi=trackPointsH1->begin(); 
+	tpi!=trackPointsH1->end();
+	) {
+      trackpoint *tp = (*tpi);
+      if(tp->bDelete) {
+	tplist::iterator eraseMe = tpi;
+	tpi++;
+	trackPointsH1->erase(eraseMe);
+	deleteTrackPoint(tp);
+      } else {
+	tpi++;
+	}
+    }
+  }
+
+  bool bDone = false;
+  bool bLastDitch = false;
+  
+  while(!bDone) {
+    int nToCont = 0;
+    int nCont = 0;
+    
+    for(tplist::iterator tpi=trackPointsM1->begin(); 
+	tpi!=trackPointsM1->end();
+	tpi++) {
+      real F;	
+      (*tpi)->bConnect = false;
+      (*tpi)->bConnected = false;
+      tplist::iterator minM1; bool minM1Set = nearestTrackPoint(&trackPoints0,*tpi,1.0,1.0,1.0,&minM1,&F,maxMerit2,maxDF2);
+      if(minM1Set) (*tpi)->cont = *minM1;
+      else (*tpi)->cont = NULL;
+    }
+    
+    if(trackPointsL1 && bStitch) {
+      for(tplist::reverse_iterator tpi = trackPointsL1->rbegin(); 
+	  tpi!=trackPointsL1->rend();
+	  tpi++) {      
+	(*tpi)->cont = NULL;
+	(*tpi)->bConnect = false;
+	(*tpi)->bConnected = false;
+	if((*tpi)->f < minFMatch) break;
+	real F;
+	tplist::iterator minL1; bool minL1Set = nearestTrackPoint(&trackPoints0,*tpi,0.5,1.0,square(1.0/dtlo),&minL1,&F,maxMerit2,maxDF2);
+	if(minL1Set) (*tpi)->cont = *minL1;
+      }
+    }
+    
+    if(trackPointsH1 && bStitch) {
+      for(tplist::iterator tpi = trackPointsH1->begin(); 
+	  tpi!=trackPointsH1->end();
+	  tpi++) {      
+	(*tpi)->cont = NULL;
+	(*tpi)->bConnect = false;
+	(*tpi)->bConnected = false;
+	real F;
+	if((*tpi)->f < maxFMatch) {
+	  tplist::iterator minH1; bool minH1Set = nearestTrackPoint(&trackPoints0,*tpi,2.0,1.0,1.0,&minH1,&F,maxMerit2,maxDF2);
+	  if(minH1Set) (*tpi)->cont = *minH1;
+	}
+      }
+    }
+    
+    for(tplist::iterator tpi = trackPoints0.begin(); 
+	tpi!=trackPoints0.end();
+	tpi++) {
+      
+      (*tpi)->dupcont = NULL;
+      (*tpi)->bConnected = false;
+      real FM0, FL0, FH0;
+      tplist::iterator minM0; bool minM0Set = nearestTrackPoint(trackPointsM1,*tpi,1.0,1.0,1.0,&minM0,&FM0,maxMerit2,maxDF2);
+      tplist::iterator minL0; bool minL0Set = nearestTrackPoint(trackPointsL1,*tpi,1.0,0.5,square(1.0/dtlo),&minL0,&FL0,maxMerit2,maxDF2);
+      tplist::iterator minH0; bool minH0Set = nearestTrackPoint(trackPointsH1,*tpi,1.0,2.0,1.0,&minH0,&FH0,maxMerit2,maxDF2);
+      
+      if(minM0Set &&
+	 (!bStitch
+	  ||(FM0<=FH0 && FM0<=FL0)
+	  ||(minL0Set && FL0<=FH0 && FL0<=FM0 && (*minL0)->dup[1-offsetlo] == (*minM0))
+	  ||(minH0Set && FH0<=FL0 && FH0<=FM0 && (*minH0)->dup[1] == (*minM0)))
+	 ) {
+	if(offsetlo == 0 && minL0Set && (*minL0)->dup[1] == (*minM0)) {	    
+	  (*tpi)->dupcont = *minL0;
+	} else if(minH0Set && (*minH0)->dup[1] == (*minM0)) {
+	  (*tpi)->dupcont = *minH0;
+	}
+	(*tpi)->contF = FM0;
+	(*tpi)->cont = *minM0;
+	nToCont++;
+      } else if(bStitch && minL0Set && FL0<=FM0 && FL0<=FH0) {
+	if(minM0Set && (*minL0)->dup[1-offsetlo] == (*minM0)) {
+	  (*tpi)->dupcont = *minM0;
+	}
+	(*tpi)->contF = FL0;
+	(*tpi)->cont = *minL0;
+	nToCont++;
+      } else if(bStitch && minH0Set && FH0<=FM0 && FH0<=FL0) {
+	if(minM0Set && (*minH0)->dup[1] == (*minM0)) {
+	  (*tpi)->dupcont = *minM0;
+	}
+	(*tpi)->contF = FH0;
+	(*tpi)->cont = *minH0;
+	nToCont++;
+      } else {
+	(*tpi)->cont = NULL;
+      }
+    }
+
+    // Nominal connections - may be conflicts to be resolved
+    for(tplist::iterator tpi = trackPoints0.begin(); 
+	tpi!=trackPoints0.end();
+	tpi++
+	) {
+      trackpoint *tp0 = (*tpi);
+      trackpoint *tp1 = tp0->cont;
+      if(tp1 != NULL) {
+	if(bLastDitch || (tp1->cont == tp0)) {
+	  tp1->bConnect = true;
+	}
+      }
+    }
+    
+    // Make connections and resolve conflicts between duplicates and between last ditch connections
+    for(tplist::iterator tpi = trackPoints0.begin(); 
+	tpi!=trackPoints0.end();
+	) {
+      
+      trackpoint *tp0 = (*tpi);
+      trackpoint *tp1 = tp0->cont;
+      
+      if(tp0->bDelete) { 
+	tplist::iterator eraseMe = tpi;
+	tpi++;
+	trackPoints0.erase(eraseMe);
+	continue;
+      }
+      if(tp1 != NULL && tp1->bConnect) {
+	if(tp0->dupcont != NULL && tp0->dupcont->bConnect) {
+	  if(!tp1->bConnected && !tp0->dupcont->bConnected) {
+	    if(!tp0->bConnected && !tp1->bDelete && (tp0->dupcont->cont == NULL || tp0->contF <= tp0->dupcont->cont->contF)) {
+	      nCont++;
+	      if(connectTrackPoints(tp0,tp1,hi,lo,dtlo,c))
+		tp0->owner->bEnd = false;
+	      tp0->dupcont->bConnect = false;
+	    } else if(tp0->dupcont->cont != NULL && !tp0->dupcont->cont->bConnected && !tp0->dupcont->bDelete && !tp0->dupcont->cont->bDelete) {
+	      nCont++;
+	      if(connectTrackPoints(tp0->dupcont->cont,tp0->dupcont,hi,lo,dtlo,c))
+		tp0->dupcont->cont->owner->bEnd = false;
+	      tp1->bConnect = false;
+	    }
+	  }
+	} else if(!tp0->bConnected && !tp1->bConnected && !tp1->bDelete) {
+	  nCont++;
+	  if(connectTrackPoints(tp0,tp1,hi,lo,dtlo,c)) {
+	    tp0->owner->bEnd = false;
+	  }
+	}
+      }
+      if(tp0->bConnected || tp0->bDelete) {
+	tplist::iterator eraseMe = tpi;
+	tpi++;
+	trackPoints0.erase(eraseMe);
+      } else {
+	tpi++;
+      }
+    }
+    
+    for(tplist::iterator tpi=trackPointsM1->begin(); 
+	tpi!=trackPointsM1->end();
+	) {
+      trackpoint *tp = (*tpi);
+      if(tp->bConnected ||tp->bDelete) {
+	tplist::iterator eraseMe = tpi;
+	tpi++;
+	trackPointsM1->erase(eraseMe);
+      } else {
+	tpi++;
+      }
+      if(tp->bDelete) {
+	deleteTrackPoint(tp);
+      }
+    }
+    
+    if(trackPointsL1) {
+      for(tplist::iterator tpi=trackPointsL1->begin(); 
+	  tpi!=trackPointsL1->end();
+	  ) {      
+	trackpoint *tp = (*tpi);
+	if(tp->bConnected||tp->bDelete) {
+	  tplist::iterator eraseMe = tpi;
+	  tpi++;
+	  trackPointsL1->erase(eraseMe);
+	} else {
+	  tpi++;
+	}
+	if(tp->bDelete) {
+	  deleteTrackPoint(tp);
+	}
+      }
+    }
+    
+    if(trackPointsH1) {
+      for(tplist::iterator tpi=trackPointsH1->begin(); 
+	  tpi!=trackPointsH1->end();
+	  ) {    
+	trackpoint *tp = (*tpi);
+	if(tp->bConnected || tp->bDelete) {
+	  tplist::iterator eraseMe = tpi;
+	  tpi++;
+	  trackPointsH1->erase(eraseMe);
+	} else {
+	  tpi++;
+	}
+	if(tp->bDelete) {
+	  deleteTrackPoint(tp);
+	}
+      }
+    }
+    
+    bDone = (nToCont-nCont == 0);
+    bLastDitch = (!bDone && nCont==0);
+  }
+  
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&trackMutex[c]);
+#endif
+  for(list<track*>::iterator tt=trax[c]->begin(); 
+      tt != trax[c]->end(); ) {
+    track *t = (*tt);      
+    if(t->bEnd) {
+      t->endTrack(true);
+    }
+    if(t->size() < minNpts && !t->descendant) {
+      list<track*>::iterator eraseMe = tt;
+      tt++;
+      trax[c]->erase(eraseMe);
+      ta->destroy(t);  
+    } else {
+      tt++;
+    }
+  }
+
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&trackMutex[c]);
+#endif
+  
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  hAssign[c].advance(1);
+  assigntime[c]++;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+
+  return 1;
+}
+
+void sms :: stereoPhaseLock()
+{
+  if(bPhaseLock && channels==2) {
+    // Stereo phase locking
+    tplist trackPoints0;
+    tplist trackPoints1;
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&trackMutex[0]);
+    pthread_mutex_lock(&trackMutex[1]);
+#endif
+    for(list<track*>::iterator tt=trax[0]->begin(); 
+	tt != trax[0]->end(); 
+	tt++) {
+      track *t = (*tt);
+      trackpoint *tp = t->getTrackPoint(assigntime[0]);
+      if(tp)
+	trackPoints0.push_back(tp);
+    }
+    for(list<track*>::iterator tt=trax[1]->begin(); 
+	tt != trax[1]->end(); 
+	tt++) {
+      track *t = (*tt);
+      trackpoint *tp = t->getTrackPoint(assigntime[1]);
+      if(tp)
+	trackPoints1.push_back(tp);
+    }
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&trackMutex[0]);
+    pthread_mutex_unlock(&trackMutex[1]);
+#endif
+    
+    bool bDone = false;
+    bool bLastDitch = false;
+    while(!bDone) {
+      int nToCont = 0;
+      int nCont = 0;
+      
+      for(tplist::iterator tpi = trackPoints0.begin(); 
+	  tpi!=trackPoints0.end();
+	  tpi++) {
+	real F;
+	tplist::iterator min1; bool min1Set = nearestTrackPoint(&trackPoints1,*tpi,1.0,1.0,1.0,&min1,&F,maxMerit2PhaseLock,maxDF2PhaseLock);
+	(*tpi)->bConnected = false;
+	if(min1Set) {
+	  nToCont++;
+	  (*tpi)->cont = (*min1);
+	} else {
+	  (*tpi)->cont = NULL;
+	}
+      }
+      
+      for(tplist::iterator tpi = trackPoints1.begin(); 
+	  tpi!=trackPoints1.end();
+	  tpi++) {
+	real F;
+	tplist::iterator min0; bool min0Set = nearestTrackPoint(&trackPoints0,*tpi,1.0,1.0,1.0,&min0,&F,maxMerit2PhaseLock,maxDF2PhaseLock);
+	(*tpi)->bConnected = false;
+	if(min0Set) {
+	  (*tpi)->cont = (*min0);
+	} else {
+	  (*tpi)->cont = NULL;
+	}
+      }
+      
+      for(tplist::iterator tpi = trackPoints0.begin(); 
+	  tpi!=trackPoints0.end();
+	  ) {
+	
+	trackpoint *tp0 = (*tpi);
+	trackpoint *tp1 = tp0->cont;
+	
+	if(tp1 != NULL && (bLastDitch || tp1->cont == tp0)) {
+	  nCont++;
+	  phaseLock(tp0,tp1,assigntime[0]);
+	  tp0->bConnected = true;
+	  tp1->bConnected = true;
+	}
+	if(tp0->bConnected) {
+	  tplist::iterator eraseMe = tpi;
+	  tpi++;
+	  trackPoints0.erase(eraseMe);
+	} else {
+	  tpi++;
+	}
+      }
+      
+      for(tplist::iterator tpi=trackPoints1.begin(); 
+	  tpi!=trackPoints1.end();
+	  ) {
+	trackpoint *tp = (*tpi);
+	if(tp->bConnected) {
+	  tplist::iterator eraseMe = tpi;
+	  tpi++;
+	  trackPoints1.erase(eraseMe);
+	} else {
+	  tpi++;
+	}
+      }
+
+      bDone = (nToCont == nCont);
+      bLastDitch = (!bDone && nCont==0);
+    }
+  }
+}
+
+long sms :: startNewTracks(long offset, int c)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&tplbMutex[c]);
+#endif
+  tplist *trackPoints = trackPointListBuffer[c]->read(trackPointListBuffer[c]->readPos+offset);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&tplbMutex[c]);
+#endif
+
+  for(tplist::iterator tpi=trackPoints->begin(); 
+      tpi!=trackPoints->end();
+      ) {
+    trackpoint *tp = (*tpi);
+    
+    if(!tp->bDelete
+       &&
+       tp->y > startThresh*sqrtmagmax) {
+      track *t = ta->create(NULL,this,res);
+      t->startTrack(tp,true);
+      addTrack(c,t);	
+      for(int d=0;d<2;d++) {
+	if(tp->dup[d])
+	  if(!tp->dup[d]->owner)
+	    tp->dup[d]->bDelete = true;
+      }
+    } else {
+      deleteTrackPoint(tp);
+    }                 
+    tplist::iterator eraseMe = tpi;
+    tpi++;
+    trackPoints->erase(eraseMe);
+  }
+  return 1;
+}
+
+void sms :: phaseLock(trackpoint *tp0, trackpoint *tp1, long time)
+{
+  track *t0 = tp0->owner;
+  track *t1 = tp1->owner;
+    if(t0->isStart(time)) {
+    t0->m_p = canon(t1->m_p + tp1->ph - tp0->ph);
+  } else if(t1->isStart(time)) {
+    t1->m_p = canon(t0->m_p + tp0->ph - tp1->ph);
+  } 
+  real f = 0.5*(tp1->f + tp0->f);
+  tp0->f = f;
+  tp1->f = f;
+}
+
+void sms :: synthTracks(real a)
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  unsigned short h1 = hSynth.read(hSynth.readPos);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  real h2 = (a*(real)h1);			  
+  h2cum += h2;
+  int h2i = round2int(h2cum);
+  h2cum -= h2i;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  // extra slack for long fall times
+  int grow = h2i<<1;
+  sines2->N = grow;
+  sines2->grow(grow);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+
+  for(int c=0;c<channels;c++) {
+    list<track*> tracks;
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&trackMutex[c]);
+#endif
+    for(list<track*>::iterator tt=trax[c]->begin();
+	tt!=trax[c]->end(); ) {  
+      track *t = (*tt);
+      if(t->end <= synthtime) {
+	if(!t->descendant||t->descendant->isDone()) {
+	  list<track*>::iterator eraseMe = tt;
+	  tt++;
+	  trax[c]->erase(eraseMe);
+	  ta->destroy(t);
+	} else {
+	  tt++;
+	}
+      } else if(synthtime >= t->start) {
+	trackpoint *tp = t->getTrackPoint(synthtime);
+	t->synth(sines2,sines2->writePos,c,synthtime,h2i);
+	tt++;
+      } else {
+	break;
+      }
+    }
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&trackMutex[c]);
+#endif   
+  }
+
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  sines2->writePos += h2i;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+  samplePos += h2i;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  hSynth.advance(1);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  synthtime++;
+}
+
+long sms :: n_readable()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  long n = outMixer->n_readable();
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+  return n;
+}
+
+long sms :: read(audio *out, long n)
+{
+  long n_read;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  n_read = outMixer->read(out, n); 
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+  return n_read;
+}
+
+void sms :: advance(long n) 
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  outMixer->advance(n);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+}
+
+void sms :: c2evenodd(grain *eo, grain *even, grain *odd) {
+  _c2evenodd(eo->freq, even->freq, odd->freq, eo->N);
+}
+
+void sms :: calcmags(real *mag, grain *g, real q) {
+  real q2 = 1.0/q;
+  for(int k=0;k<=Nover2;k++) {
+    real m = norm2(g->freq[k])*q2;
+    mag[k] = m;
+    if(magmax < m) magmax = m;
+  }
+  sqrtmagmax = sqrt(magmax);
+}
+
+peak *sms :: makePeak(real *mag, real *mag2, int k)
+{
+  real v0,v1,v2;
+  v0 = mag2[k-1];
+  v1 = mag2[k];
+  v2 = mag2[k+1];
+  real y1 = v1-v0;
+  real y2 = v2-v0;
+  real a = 0.5*(y2 - 2*y1);
+  real b = a==0?2.0:1-y1/a;
+      
+  peak *p = pa->create();
+  p->x = k-1+0.5*b;
+  p->k = k;
+  p->y2 = v0-0.25*a*b*b;
+  int k0 = round2int(p->x);
+  real kf = k0<p->x?p->x-k0:k0-p->x;
+  int k1 = k0<p->x?k0+1:k0-1;
+  p->y = (1.0-kf)*mag[k0] + kf*mag[k1];
+  p->tp = NULL;
+  p->tp2 = NULL;
+  p->tn = NULL;
+  p->tn2 = NULL;
+  return p;
+}
+
+void sms :: adjustPeaks(list<peak*> &peaks,
+			real *mag0,
+			real *mag1,
+			real *mag2,
+			real *dec,
+			int peakWidth
+			) {
+
+  for(int k=0;k<N;k++) {
+    dec[k] = 0.0;
+  }
+
+  // determine troughs and remove peaks based on minPeakTopRatio
+  // don't determine maginitude yet
+  for(list<peak *>::iterator tpi = peaks.begin();
+      tpi != peaks.end();
+      ) {
+    list<peak*>::iterator eraseMe = tpi;
+    peak *p = (*tpi);
+
+    peak *pp = NULL;
+    if(tpi!=peaks.begin()) {
+      pp = *(--tpi);
+      tpi++;
+    }
+
+    peak *pn = NULL;
+    tpi++;
+    if(tpi != peaks.end()) {
+      pn = (*tpi);
+    }
+
+    if(p->tp && pp && pp->tn
+       &&
+       p->x - p->tp->x > p->x - p->tp2->x
+       &&
+       pp->tn->x - pp->x > pp->tn2->x - pp->x) {
+    } else {
+      p->tp = p->tp2;
+    }
+    
+    if(p->tn && pn && pn->tp
+       &&
+       p->tn->x - p->x > p->tn2->x - p->x
+       &&
+       pn->x - pn->tp->x > pn->x - pn->tp2->x) {
+    } else {
+      p->tn = p->tn2;
+    }
+
+    peak *tp = p->tp;
+    peak *tn = p->tn;
+
+    int k1 = p->k;
+    int k0 = tp->k;
+    real kf0;
+    if(k0 < k1-peakWidth) {
+      k0 = k1-peakWidth;
+      kf0 = 0;
+    } else {
+      kf0 = k0 > tp->x ? k0 - tp->x : tp->x - k0;
+    }
+    int k2 = tn->k;
+    real kf2;
+    if(k2 > k1+peakWidth) {
+      k2 = k1+peakWidth;
+      kf2 = 0;
+    } else {
+      kf2 = k2 > tn->x ? k2 - tn->x : tn->x - k2;
+    }
+
+    real m = 0.0f;
+    real mtop = 0.0f;
+
+    real mbase = mag2[k0] + mag2[k2];
+    if(k0 < tp->x) {
+      real m0 = ((mag2[k0])+(mag2[k0+1]))*(1.0-kf0);
+      m += m0;
+      mtop += max(0.0f,(m0 - mbase)*(1.0-kf0));
+    } else {
+      real m0 = ((mag2[k0])+(mag2[k0+1]));
+      m += m0;
+      mtop += max(0.0f,m0 - mbase);
+      m0 = ((mag2[k0-1])+(mag2[k0]))*kf0;
+      m += m0;
+      mtop += max(0.0f,(m0 - mbase)*kf0);
+    }
+    
+    if(k2 < tn->x) {
+      real m0 = ((mag2[k2-1])+(mag2[k2]));
+      m += m0;
+      mtop += max(0.0,m0 - mbase);
+      m0 = ((mag2[k2])+(mag2[k2+1]))*kf2;
+      m += m0;
+      mtop += max(0.0f,(m0 - mbase)*kf2);
+    } else {
+      real m0 = ((mag2[k2-1])+(mag2[k2]))*(1.0-kf2);
+      m += m0;
+      mtop += max(0.0f,(m0 - mbase)*(1.0-kf2));
+    }
+    
+    for(int k=k0+1;k<k2-1;k++) {
+      real m0 = ((mag2[k])+(mag2[k+1]));
+      m += m0;
+      mtop += max(0.0f,m0 - mbase);
+    }
+
+    if(mtop < minPeakTopRatio*m) {
+      peaks.erase(eraseMe);
+      if(pp && (!pn || pp->y > pn->y)) {
+	pp->tn = p->tn;
+	pp->tn2 = p->tn2;
+      } else if(pn && (!pp || pn->y > pp->y)) {
+	pn->tp = p->tp;
+	pn->tp2 = p->tp2;
+      }
+    }
+  }
+
+  // determine magnitude
+  for(list<peak *>::iterator tpi = peaks.begin();
+      tpi != peaks.end();
+      tpi++
+      ) {
+    peak *p = (*tpi);
+    
+    peak *tp = p->tp;
+    peak *tn = p->tn;
+       
+    int k1 = p->k;
+    int ko1 = k1 > p->x ? -1 : 1;
+    real kf1 = k1 > p->x ? k1 - p->x : p->x - k1; 
+    int k0 = tp->k;
+    real kf0;
+    if(k0 < k1-peakWidth) {
+      k0 = k1-peakWidth;
+      kf0 = 0;
+    } else {
+      kf0 = k0 > tp->x ? k0 - tp->x : tp->x - k0;
+    }
+    int k2 = tn->k;
+    real kf2;
+    if(k2 > k1+peakWidth) {
+      k2 = k1+peakWidth;
+      kf2 = 0;
+    } else {
+      kf2 = k2 > tn->x ? k2 - tn->x : tn->x - k2;
+    }
+
+    real m1 = 0;
+
+    if(k0 < tp->x) {
+      m1 += ((mag1[k0])+(mag1[k0+1]))*(1.0-kf0);
+    } else {
+      m1 += ((mag1[k0])+(mag1[k0+1]));
+      m1 += ((mag1[k0-1])+(mag1[k0]))*kf0;
+    }
+    
+    if(k2 < tn->x) {
+      m1 += ((mag1[k2-1])+(mag1[k2]));
+      m1 += ((mag1[k2])+(mag1[k2+1]))*kf2;
+    } else {
+      m1 += ((mag1[k2-1])+(mag1[k2]))*(1.0-kf2);
+    }
+    
+    for(int k=k0+1;k<k2-1;k++) {
+      m1 += ((mag1[k])+(mag1[k+1]));
+    }
+    
+    m1 *= 0.5;
+
+    for(int k=max(1,k1-peakWidth+1);k<=k0;k++) {
+      real d = (1.0-kf1)*peak1[k-k1+N] + kf1*peak1[k-k1+N+ko1];
+      real m = d*(p->y);
+      m1 += m;
+      dec[k] += m;
+    }
+    for(int k=k2;k<min(k1+peakWidth,Nover2-1);k++) {
+      real d = (1.0-kf1)*peak1[k-k1+N] + kf1*peak1[k-k1+N+ko1];
+      real m = d*(p->y);
+      m1 += m;
+      dec[k] += m;
+    }
+    p->m = m1;
+  }
+
+  for(list<peak *>::iterator tpi = peaks.begin();
+      tpi != peaks.end();
+      ) {
+    peak *p = (*tpi);
+
+    list<peak*>::iterator eraseMe = tpi;
+    peak *pp = NULL;
+    if(tpi!=peaks.begin()) {
+      pp = *(--tpi);
+      tpi++;
+    }
+    peak *pn = NULL;
+    tpi++;
+    if(tpi != peaks.end()) {
+      pn = (*tpi);
+    }
+
+    peak *tp;
+    peak *tn;
+    tp = p->tp;
+    tn = p->tn;
+
+    int k1 = p->k;
+    int k0 = tp->k;
+    real kf0;
+    if(k0 < k1-peakWidth) {
+      k0 = k1-peakWidth;
+      kf0 = 0;
+    } else {
+      kf0 = k0 > tp->x ? k0 - tp->x : tp->x - k0;
+    }
+    int k2 = tn->k;
+    real kf2;
+    if(k2 > k1+peakWidth) {
+      k2 = k1+peakWidth;
+      kf2 = 0;
+    } else {
+      kf2 = k2 > tn->x ? k2 - tn->x : tn->x - k2;
+    }
+
+    real m = p->m;
+    real mdec = 0;
+
+    if(k0 < tp->x) {
+      mdec += (dec[k0]+dec[k0+1])*(1.0-kf0);
+    } else {
+      mdec += (dec[k0]+dec[k0+1]);
+      mdec += (dec[k0-1]+dec[k0])*kf0;
+    }
+    
+    if(k2 < tn->x) {
+      mdec += (dec[k2-1]+dec[k2]);
+      mdec += (dec[k2]+dec[k2+1])*kf2;
+    } else {
+      mdec += (dec[k2-1]+dec[k2])*(1.0-kf2);
+    }
+    
+    for(int k=k0+1;k<k2-1;k++) {
+      mdec += (dec[k]+dec[k+1]);
+    }
+
+    mdec *= 0.5;
+
+    if(mdec > maxDecRatio*m) {
+      peaks.erase(eraseMe);
+      m -= mdec;
+      if(pp && pn) {
+	real d = square(pn->x - p->x) + square(pp->x - p->x);
+	pp->m += m*square(pn->x - p->x)/d;
+	pn->m += m*square(pp->x - p->x)/d;
+      } else if(pp) {
+	pp->m += m;
+      } else if(pn) {
+	pn->m += m;
+      }
+      pa->destroy(p);
+      continue;
+    } else {
+      m -= mdec;
+      p->m = m;
+    }
+  }
+}
+
+void sms :: extractTrackPoints(grain *g, 
+			       real *mag0, real *mag1, real *mag2,
+			       long currtime,
+			       TrackPointListBuffer *trackPointListBuffer,
+			       unsigned short h1,
+			       int c)
+{
+  real thmin = square(peakThresh)*magmax;
+  list<peak*> peaks;
+  list<peak*> troughs1;
+  list<peak*> troughs2;
+
+  peak *t0 = pa->create();
+  t0->k = 1;
+  t0->x = 1;
+  t0->y = mag1[0];
+  t0->y2 = mag2[0];
+  t0->tp = NULL;
+  t0->tp2 = NULL;
+  t0->tn = NULL;
+  t0->tn2 = NULL;
+
+  peak *t1 = pa->create();
+  t1->k = Nover2-1;
+  t1->x = Nover2-1;
+  t1->y = mag1[Nover2-1];
+  t1->y2 = mag2[Nover2-1];
+  t1->tp = NULL;
+  t1->tp2 = NULL;
+  t1->tn = NULL;
+  t1->tn2 = NULL;
+
+  troughs2.push_back(t0);
+
+  int k00=0;
+  int k01=Nover2-1;
+  int k10=0;
+  int k11=Nover2-1;
+  int kp = -1;
+
+  for(int k=1;k<Nover2-1;k++) {
+    if( (mag2[k] > thmin)
+	&&
+	(mag2[k] > mag2[k-1])
+	&&
+	(mag2[k] >= mag2[k+1])
+	) {
+      kp = k;
+      if(k>=kStart-peakWidth && k<=kEnd+peakWidth) {
+	peak *p = makePeak(mag1,mag2,k);
+	p->tn2 = t1;
+	if(!troughs1.empty() && troughs1.back()->tn == NULL) {
+	  p->tp = troughs1.back();
+	  troughs1.back()->tn = p;
+	}
+	if(!troughs2.empty() && troughs2.back()->tn2 == NULL) {
+	  p->tp2 = troughs2.back();
+	  troughs2.back()->tn2 = p;
+	}
+	peaks.push_back(p);
+      }
+    } else if((mag2[k] <= mag2[k-1])
+	      &&
+	      (mag2[k] <= mag2[k+1])
+	      ) {
+      peak *p = makePeak(mag1,mag2,k);
+      troughs2.push_back(p);
+      if(!peaks.empty()) { 
+	peaks.back()->tn2 = p;
+	p->tp2 = peaks.back();
+      }
+    }
+    if((mag0[k] <= mag0[k-1])
+       &&
+       (mag0[k] <= mag0[k+1])
+       ) {   
+      if(peaks.empty())
+	k00 = k;
+      if(kp <= kEnd)
+	k01 = k;
+    }
+    if((mag1[k] <= mag1[k-1])
+       &&
+       (mag1[k] <= mag1[k+1])
+       ) {      
+      if(peaks.empty())
+	k10 = k;
+      if(kp <= kEnd)
+	k11 = k;
+      peak *p = makePeak(mag1,mag1,k);
+      troughs1.push_back(p);
+      if(!peaks.empty() && peaks.back()->tn == NULL) {
+	peaks.back()->tn = p;
+	p->tp = peaks.back();
+      }
+    }
+  }
+  real m0=0.0f;
+  real m1=0.0f;
+  for(int k=k00;k<=k01;k++) {
+    m0 += mag0[k];
+    m1 += mag1[k];
+  }
+  real f = (m1==0.0f)?1.0f:min(1.0f,m0/m1);
+
+  adjustPeaks(peaks,
+	      mag0,
+	      mag1,
+	      mag2,
+	      dec,
+	      peakWidth);
+
+  tplist *trackPoints = new tplist;
+  for(list<peak*>::iterator pp=peaks.begin();
+      pp!=peaks.end();
+      pp++) {
+
+    peak *p = (*pp);
+    if(p->x>=kStart-0.5 && p->x<=kEnd+0.5 && p->m>0) {
+      real y = sqrt(f*p->m*mNorm);
+      trackpoint *tp = new trackpoint(g,p->x,y,N,M,h1,currtime);
+      trackPoints->push_back(tp);
+    }
+  }
+
+  pa->destroyAll();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&tplbMutex[c]);
+#endif
+  trackPointListBuffer->write(trackPoints);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&tplbMutex[c]);
+#endif
+}
+
+}
diff --git a/lib-src/sbsms/src/sms.h b/lib-src/sbsms/src/sms.h
new file mode 100644
index 0000000..1df4ee5
--- /dev/null
+++ b/lib-src/sbsms/src/sms.h
@@ -0,0 +1,149 @@
+#ifndef SMS_H
+#define SMS_H
+
+#include "track.h"
+#include "grain.h"
+#include "buffer.h"
+#include "peak.h"
+#include "sbsms.h"
+#include "config.h"
+#ifdef MULTITHREADED
+#include "pthread.h"
+#endif
+
+#include <list>
+using namespace std;
+
+namespace _sbsms_ {
+
+class sms : public SampleBufBase {
+ public:
+  sms(int N, unsigned short M, unsigned short M_MAX, int res, int latency, real p, real q, real pad, int Nlo, int channels, TrackAllocator *ta, PeakAllocator *pa);
+  void reset();
+  void readTrackPointsFromFile(FILE *fp);
+  int writeTrackPointsToFile(FILE *fp);
+  void setH(unsigned short h);
+  long addTrackPoints(grain *g0, grain *g1, grain *g2);
+  long assignTrackPoints(long offset, sms *hi, sms *lo, int c);
+  long startNewTracks(long offset, int c);
+  void markDuplicates(long offset, sms *hi, sms *lo, int c);
+  bool connectTrackPoints(trackpoint *tp0, trackpoint *tp1, sms *hi, sms *lo, real dtlo, int c);
+  bool adoptTrack(track *precursor, sms *lender, trackpoint *tp, real m, real dt, int c);
+  void synthTracks(real a);
+  void advanceTrackPoints(int c);
+  long nTrackPoints();
+  long read(audio *out, long n);
+  long n_readable();
+  void advance(long n);
+  void zeroPad(long n);
+  void addTrack(int c, track *t);
+  ~sms();
+
+
+  bool bPhaseLock;
+  bool bStitch;
+  bool bConserveEnergy;
+  int res;
+  int N;
+  unsigned short M;
+  real m;
+  int Nover2;
+  RingBuffer<unsigned short> hAssign[2];
+  RingBuffer<unsigned short> hSynth;
+  real h2cum;
+  long samplePos;
+  TrackPointListBuffer* trackPointListBuffer[2];
+
+  
+#ifdef MULTITHREADED
+  pthread_mutex_t dataMutex;
+  pthread_mutex_t tplbMutex[2];
+  pthread_mutex_t bufferMutex;
+  pthread_mutex_t trackMutex[2];
+#endif
+
+ protected:
+  unsigned short encodeReal(real x, real min, real max);
+  float decodeReal(unsigned short x, real min, real max);
+  unsigned short encodeRealLog(real x);
+  float decodeRealLog(unsigned short x);
+  bool terminal;
+  void markDuplicatesLo(long offset, sms *lo, long offsetlo, int c);
+  long assignTrackPoints_(long offset, sms *hi, sms *lo, real dtlo, long offsetlo, int c);
+  void deleteTrackPoint(trackpoint *tp);
+  void adjustPeaks(list<peak*> &peaks,
+		   real *mag0,
+		   real *mag1,
+		   real *mag2,
+		   real *dec,
+		   int peakWidth);
+  void phaseLock(trackpoint *tp0, trackpoint *tp1, long time);
+  long assignTrackPoints(long offset, sms *hi, sms *lo, real dtlo, long offsetlo, int c);
+  void stereoPhaseLock();
+  bool contTrack(track *t, trackpoint *tp, int c);
+  void extractTrackPoints(grain *g, real *mag0, real *mag1, real *mag2, long currtime, TrackPointListBuffer *tplb, unsigned short h1, int c);
+  bool nearestTrackPoint(tplist *tpl, trackpoint *tp0, real m0, real m1, real dt, tplist::iterator *minpos, real *minFx, real maxMerit2, real maxDF2);
+  int prune(trackpoint *tp);
+  real merit(trackpoint *tp0, trackpoint *tp1, real m0, real m1, real dt, real dMCoeff, real *df, real maxDF2);
+  void calcmags(real *mag, grain *g, real q);
+  peak *makePeak(real *mag, real *mag2, int k);
+
+  TrackAllocator *ta;
+  PeakAllocator *pa;
+  char *pData;
+  int datasize;
+  int channels;
+  real p,q;
+  int peakWidth;
+  int maxPrunes;
+  real peakThresh;
+  real startThresh;
+  real maxMerit2;
+  real maxDF2;
+  real dMCoeff;
+  real maxMerit2PhaseLock;
+  real maxDF2PhaseLock;
+  real dMCoeffPhaseLock;
+  real maxMerit2Match;
+  real maxDF2Match;
+  real dMCoeffMatch;
+  int minNpts;
+  real maxdBIncr;
+  real maxdBIncrStitch;
+  real maxFMatch;
+  real minFMatch;
+  int kStart;
+  int kEnd;
+  real mNorm;
+  real minPeakTopRatio;
+  real localFavorRatio;
+  real maxDecRatio;
+  
+  list<track*> **trax;
+  long currtime;
+  long assigntime[2];
+  long marktime[2];
+  long synthtime;
+
+  SampleBuf *sines2, *outMixer;
+  grain* x0[2];
+  grain* x1[2];
+  grain* x2[2];
+  
+  void c2evenodd(grain *g, grain *, grain *);
+
+  real* dec;
+  real* dec2;
+  real* mag0[2];
+  real* mag1[2];
+  real* mag2[2];
+  real *peak1;
+  bool bPeakSet;
+  real sqrtmagmax;
+  real magmax;
+
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/subband.cpp b/lib-src/sbsms/src/subband.cpp
new file mode 100644
index 0000000..43d4502
--- /dev/null
+++ b/lib-src/sbsms/src/subband.cpp
@@ -0,0 +1,1229 @@
+#include "subband.h"
+#include "real.h"
+#include "sbsms.h"
+#include "utils.h"
+
+namespace _sbsms_ {
+
+#define SUB_BUF_SIZE 4096
+
+bool subband :: isWriteReady()
+{
+  return (getFramesAtFront() <= 8);
+}
+
+bool subband :: isAddReady()
+{
+  return addInit(false)?true:false;
+}
+
+bool subband :: isMarkReady()
+{
+  bool bReady = false;
+  for(int c=0;c<channels;c++) {
+    if(markInit(false,c)) 
+      bReady = true;
+  }
+  return bReady;
+}
+
+bool subband :: isAssignReady()
+{
+  bool bReady = false;
+  for(int c=0;c<channels;c++) {
+    if(assignInit(false,c)) 
+      bReady = true;
+  }
+  return bReady;
+}
+
+bool subband :: isSynthReady()
+{
+  return synthInit(false)?true:false;
+}
+
+subband :: subband(subband *parent, unsigned short M, int channels, int quality, int latency, bool bPreAnalyze, TrackAllocator *ta, PeakAllocator *pa)
+{
+  this->ta = ta;
+  this->pa = pa;
+  this->fp = NULL;
+
+  int k = ilog2(M);
+  this->channels = channels;
+  this->quality = quality;
+  this->parent = parent;
+  this->N = SBSMS_N[quality][k];
+  this->M = M;
+  this->s = SBSMS_S;
+  this->res = SBSMS_RES[quality][k];
+  real pad = SBSMS_PAD[quality][k];
+  if(M<SBSMS_M_MAX[quality]) 
+    sub = new subband(this,M*2,channels,quality,latency,bPreAnalyze,ta,pa);
+  else 
+    sub = NULL;
+  int Nlo = sub?SBSMS_N[quality][k+1]:0;
+  
+  nGrainsPerFrame = res;
+  if(sub) nGrainsPerFrame *= sub->nGrainsPerFrame;
+  
+  if(sub) resTotal = 2*sub->resTotal;
+  else resTotal = 1;
+
+  nLatencyOriginal = latency;
+  gPrev = NULL;
+
+  init();
+
+  // sms 
+  in0 = new GrainBuf(N, h, pad*SBSMS_P1, SBSMS_WINDOW);
+  in1 = new GrainBuf(N, h, pad, SBSMS_WINDOW);
+  in2 = new GrainBuf(N, h, pad/SBSMS_Q1, SBSMS_WINDOW);
+
+  // synthesize
+  smser = new sms(N,(short)M,(short)(SBSMS_M_MAX[quality]),res,latency,SBSMS_P1,SBSMS_Q1,pad,Nlo,channels,ta,pa);
+
+  if(!parent && bPreAnalyze) {
+    this->bPreAnalyze = true;
+    inPre = new GrainBuf(N, h, 2, SBSMS_WINDOW);
+    x1[0] = grain :: create(N,pad,SBSMS_WINDOW);
+    x1[1] = grain :: create(N,pad,SBSMS_WINDOW);
+    x2[0] = grain :: create(N,pad,SBSMS_WINDOW);
+    x2[1] = grain :: create(N,pad,SBSMS_WINDOW);
+  } else {
+    this->bPreAnalyze = false;
+    inPre = NULL;
+  }
+
+  if(sub) {
+    subOut = new GrainBuf(N, N/s, 1, SBSMS_HANN);
+    usSubOut = new SampleBuf(2*N);
+
+    // receive
+    in = new GrainBuf(N, N/s, 1, SBSMS_HANN);
+
+    // samples to sub
+    subIn = new SampleBuf(N/2);
+
+    // output samples
+    outMixer = new Mixer(smser,usSubOut);
+  } else {
+    outMixer = smser;
+  }
+
+#ifdef MULTITHREADED
+  pthread_mutex_init(&dataMutex, NULL);
+  pthread_mutex_init(&bufferMutex, NULL);
+#endif
+  
+}
+
+long subband :: getFramePos()
+{
+  return nFramesRead;  
+}
+
+void subband :: seek(long framePos) {
+  if(sub) sub->seek(framePos);
+  nFramesWritten = framePos;
+  nFramesAdded = framePos;
+  nFramesMarked[0] = framePos;
+  nFramesMarked[1] = framePos;
+  nFramesAssigned[0] = framePos;
+  nFramesAssigned[1] = framePos;
+  nFramesSynthed = framePos;
+  nFramesRead = framePos;
+}
+
+void subband :: reset() {
+  if(sub) sub->reset();
+  init();
+  inputFrameSize.clear();
+  outputFrameSize.clear();
+  aForH.clear();
+  aSynth.clear();
+  frameRatio.clear();
+  in0->clear();
+  in1->clear();
+  in2->clear();
+  if(sub) {
+    in->clear();
+    subIn->clear();
+    subOut->clear();
+    usSubOut->clear();
+  }
+  smser->reset();
+}
+
+void subband :: init()
+{
+  int ssms = (N*nGrainsPerFrame)/(resTotal*SBSMS_H[quality][2]);
+  h = N/ssms;
+
+  lastInputFrameSize = h*nGrainsPerFrame;
+  lastFrameA = 1.0;
+  lastFrameRatio = 1.0;
+
+  nLatency = nLatencyOriginal;
+
+  nToDrop = (SBSMS_N[quality][SBSMS_BANDS[quality]-1]/SBSMS_H[quality][2]*nGrainsPerFrame-ssms)/2;
+  nDropped = 0;
+  nFramesSkipped = 0;
+  nFramesWritten = 0;
+  nFramesAdded = 0;
+  nFramesMarked[0] = 0;
+  nFramesMarked[1] = 0;
+  nFramesAssigned[0] = 0;
+  nFramesAssigned[1] = 0;
+  nFramesSynthed = 0;
+  nFramesRead = 0;
+  nTrackPointsWritten = 0;
+  nTrackPointsMarked[0] = 0;
+  nTrackPointsMarked[1] = 0;
+  nTrackPointsAssigned[0] = 0;
+  nTrackPointsAssigned[1] = 0;
+  nTrackPointsStarted[0] = 0;
+  nTrackPointsStarted[1] = 0;
+  nTrackPointsAdvanced[0] = 0;
+  nTrackPointsAdvanced[1] = 0;
+
+  samplesQueued = 0;
+
+  bWritingComplete = false;
+  
+  totalSizef = 0.0;
+}
+
+subband :: ~subband() 
+{
+  delete in0;
+  delete in1;
+  delete in2;
+  delete smser;
+
+  if(inPre) {
+    delete inPre;
+    grain ::destroy(x1[0]);
+    grain ::destroy(x1[1]);
+    grain ::destroy(x2[0]);
+    grain ::destroy(x2[1]);
+  }
+  if(sub) {
+    delete sub;
+    delete in;
+    delete subIn;
+    delete subOut;
+    delete usSubOut;
+    delete outMixer;
+  }
+}
+
+void subband :: setFrameSize(int iFrameSize, real a, real ratio)
+{
+  real oFrameSizef = a*(real)iFrameSize;
+  totalSizef += oFrameSizef;
+  long oFrameSizei = round2int(totalSizef);
+  totalSizef -= oFrameSizei;
+  inputFrameSize.write(iFrameSize);
+  outputFrameSize.write(oFrameSizei);
+  lastInputFrameSize = iFrameSize;
+  lastOutputFrameSize = oFrameSizei;
+  samplesQueued += oFrameSizei * ratio;
+}
+
+void subband :: setH(real ratio)
+{
+  real a = aForH.read(aForH.readPos);
+  if(a > 4.0)
+    h = SBSMS_H[quality][0];
+  else if(a > 2.0 && a <= 4.0)
+    h = SBSMS_H[quality][1];
+  else if(a >= 0.5 && a <= 2.0)
+    h = SBSMS_H[quality][2];
+  else if(a >= 0.25 && a < 0.5)
+    h = SBSMS_H[quality][3];
+  else
+    h = SBSMS_H[quality][4];
+
+  h = (h*resTotal)/nGrainsPerFrame;
+  in0->h = h;
+  in1->h = h;
+  in2->h = h;
+  if(inPre) inPre->h = h;
+  if(!parent) 
+    setFrameSize(h*nGrainsPerFrame,a,ratio);
+  aForH.advance(1);
+}
+
+void subband :: setAForH(real a)
+{
+  aForH.write(a);
+  if(sub) sub->setAForH(a);
+}
+
+void subband :: setA(real a)
+{
+  aSynth.write(a);
+  if(sub) sub->setA(a);
+  lastFrameA = a;
+}
+
+void subband :: setAMod(real a)
+{
+  aMod.write(a);
+}
+
+void subband :: setRatio(real ratio)
+{
+  frameRatio.write(ratio);
+  lastFrameRatio = ratio;
+}
+
+void subband :: write_(audio *inBuf, long n, real a, real ratio) 
+{
+  long nwritten = 0;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+
+  while(nwritten<n) {
+    long ntowrite = min((long)h,n-nwritten);
+    long ng = in1->write(inBuf+nwritten, ntowrite);
+    in0->write(inBuf+nwritten, ntowrite);
+    in2->write(inBuf+nwritten, ntowrite);
+    nwritten += ntowrite;
+    long n_advance = 0;
+    for(int k=0;k<ng;k++) {
+      if(nDropped < nToDrop) {
+	n_advance++;
+	nDropped++;
+      } else {
+	if(!parent && nTrackPointsWritten%nGrainsPerFrame == 0) {
+	  if(bPreAnalyze) {
+	    if(aPreAnalysis.n_readable()) {
+	      real aMod = aPreAnalysis.read(aPreAnalysis.readPos);
+	      setAMod(aMod);
+	      setA(1.0f+aMod*(a-1.0f));
+	      aPreAnalysis.advance(1);
+	    } else {
+	      setAMod(1.0f);
+	      setA(a);
+	    }
+	  } else {
+	    setA(a);
+	  }
+	  setRatio(ratio);
+	}
+	if(!parent && (nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
+	  setAForH(a);
+	}
+	if((nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
+	  setH(ratio);
+	  nFramesWritten++;
+	}
+	nTrackPointsWritten++;
+      }
+    }
+    if(n_advance) {
+      in0->advance(n_advance);
+      in1->advance(n_advance);
+      in2->advance(n_advance);
+    }
+  }
+
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  
+  if(sub) {
+    in->write(inBuf, n);
+    long ng_read = 0;
+    for(int k=in->readPos;k<in->writePos;k++) {
+      grain *gdown = in->read(k)->downsample();
+      subIn->write(gdown, N/2/s);
+      grain :: destroy(gdown);
+      ng_read++;
+    }
+    in->advance(ng_read);  
+    long n_tosub = subIn->n_readable();
+    audio *subBuf = subIn->getReadBuf();
+    n_tosub = subIn->read(subBuf,n_tosub);
+    sub->write_(subBuf,n_tosub,a,ratio);
+    subIn->advance(n_tosub);
+  }
+}
+
+void subband :: stepAddFrame()
+{
+  if(sub) sub->stepAddFrame();
+  nFramesAdded++;
+}
+
+void subband :: stepMarkFrame(int c)
+{
+  if(sub) sub->stepMarkFrame(c);
+  nFramesMarked[c]++;
+}
+
+void subband :: stepAssignFrame(int c)
+{
+  if(sub) sub->stepAssignFrame(c);
+  nFramesAssigned[c]++;
+}
+
+void subband :: stepSynthFrame()
+{
+  if(sub) sub->stepSynthFrame();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  aSynth.advance(1);
+  nFramesSynthed++;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+}
+
+void subband :: stepReadFrame()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  nFramesRead++;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+}
+
+long subband :: addInit(bool bSet)
+{
+  long n;
+  if(sub) n = res*sub->addInit(bSet);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  if(!sub) n = max((long)0,min((long)1,min(in1->n_readable(),4-(nFramesAdded-getFramesMarked()))));
+  if(bSet) {
+    nTrackPointsToAdd = n;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+void subband :: addTrackPoints()
+{
+  if(sub) sub->addTrackPoints();
+  vector<grain*> g0V;
+  vector<grain*> g1V;
+  vector<grain*> g2V;
+
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  for(int k=in1->readPos;k<in1->readPos+nTrackPointsToAdd;k++) {
+    grain *g0 = in0->read(k);
+    grain *g1 = in1->read(k);
+    grain *g2 = in2->read(k);
+    g0V.push_back(g0);
+    g1V.push_back(g1);
+    g2V.push_back(g2);
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+
+  for(int k=0;k<g1V.size();k++) {
+    smser->addTrackPoints(g0V[k],g1V[k],g2V[k]);
+  }
+
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  in0->advance(nTrackPointsToAdd);
+  in1->advance(nTrackPointsToAdd);
+  in2->advance(nTrackPointsToAdd);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+
+}
+
+long subband :: markInit(bool bSet, int c)
+{
+  long n;
+  if(sub) n = res*sub->markInit(bSet,c);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  if(!sub) n = max((long)0,min((long)1,min(nFramesAdded-nFramesMarked[c]-1,4-(nFramesMarked[c]-nFramesAssigned[c]))));
+  if(bSet) {
+    nTrackPointsToMark[c] = n;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+void subband :: markDuplicates(int c)
+{
+  long ntodo = parent?1:nTrackPointsToMark[c];
+  long ndone = 0;
+  while(ndone<ntodo) {  
+    smser->markDuplicates(nTrackPointsMarked[c],
+			  parent?parent->smser:NULL,
+			  sub?sub->smser:NULL,
+			  c);
+    if(nTrackPointsMarked[c]%res==1 || res==1) {
+      if(sub) sub->markDuplicates(c);
+    }
+    ndone++;
+    nTrackPointsMarked[c]++;
+  }
+}
+
+long subband :: assignInit(bool bSet, int c)
+{
+  long n;
+  if(sub) n = res*sub->assignInit(bSet,c);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  if(!sub) n = max((long)0,min((long)1,min(nFramesMarked[c]-nFramesAssigned[c]-1,4+nLatency-(nFramesAssigned[c]-nFramesSynthed))));
+  if(bSet) {
+    nTrackPointsToAdvance[c] = n;
+    nTrackPointsToAssign[c] = n;
+    if(nTrackPointsToAssign[c]) {
+      if(nFramesAssigned[c]==0) {
+	smser->assignTrackPoints(nTrackPointsAssigned[c]++,
+				 parent?parent->smser:NULL,
+				 sub?sub->smser:NULL,
+				 c);
+	smser->startNewTracks(nTrackPointsStarted[c]++,c);
+      }      
+    }
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+long subband :: assignTrackPoints(int c) 
+{
+  long ntodo = parent?1:nTrackPointsToAssign[c];
+  long ndone = 0;
+  while(ndone<ntodo) {  
+    if(nTrackPointsAssigned[c]%res==0) {
+      if(sub) sub->assignTrackPoints(c);
+      smser->assignTrackPoints(nTrackPointsAssigned[c]++,
+			       parent?parent->smser:NULL,
+			       sub?sub->smser:NULL,
+			       c);
+      if(!parent) startNewTracks(c);
+    } else {
+      smser->assignTrackPoints(nTrackPointsAssigned[c]++,
+			       parent?parent->smser:NULL,
+			       sub?sub->smser:NULL,
+			       c);
+    }
+    if(parent && parent->res != 1)
+      parent->smser->startNewTracks(parent->nTrackPointsStarted[c]++,c);
+
+    ndone++;
+  }
+  
+  return nTrackPointsAssigned[c];
+}
+
+void subband :: startNewTracks(int c)
+{
+  if(!parent||!sub||nTrackPointsAssigned[c]%2==1||res==1) {
+    smser->startNewTracks(nTrackPointsStarted[c]++,c);
+  }
+  if(sub&&(nTrackPointsAssigned[c]%2==1||res==1)) {
+    sub->startNewTracks(c);
+  }
+}
+
+void subband :: advanceTrackPoints(int c)
+{
+  long ntodo = parent?1:nTrackPointsToAdvance[c];
+  long ndone = 0;
+
+  while(ndone<ntodo) {
+    if(nTrackPointsAdvanced[c]%res==0)
+      if(sub) sub->advanceTrackPoints(c);
+    smser->advanceTrackPoints(c);
+	nTrackPointsMarked[c]--;
+	nTrackPointsAssigned[c]--;
+	nTrackPointsStarted[c]--;
+    nTrackPointsAdvanced[c]++;
+    ndone++;
+  }
+}
+
+long subband :: getFramesAssigned()
+{
+  long assigned = LONG_MAX;
+  for(int c=0;c<channels;c++) {
+    if(nFramesAssigned[c] < assigned)
+      assigned = nFramesAssigned[c];
+  }
+  return assigned;
+}
+
+long subband :: getFramesMarked()
+{
+  long marked = LONG_MAX;
+  for(int c=0;c<channels;c++) {
+    if(nFramesMarked[c] < marked)
+      marked = nFramesMarked[c];
+  }
+  return marked;
+}
+
+long subband :: readInit(bool bSet)
+{
+  long n;
+  if(sub) n = res*sub->readInit(bSet);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  if(!sub) n = max((long)0,min((long)1,nFramesInFile-getFramesAssigned()));
+  if(bSet) {
+    nTrackPointsToAssign[0] = n;
+    nTrackPointsToAssign[1] = n;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+
+  return n;
+}
+
+void subband :: readTrackPointsFromFile(FILE *fp)
+{
+  long ntodo = parent?1:nTrackPointsToAssign[0];
+  long ndone = 0;
+
+  while(ndone<ntodo) {
+    if(nTrackPointsAssigned[0]%res==0)
+      if(sub) sub->readTrackPointsFromFile(fp);
+    smser->readTrackPointsFromFile(fp);
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&dataMutex);
+#endif
+    nTrackPointsAssigned[0]++;
+    nTrackPointsAssigned[1]++;
+    nTrackPointsStarted[0]++;
+    nTrackPointsStarted[1]++;
+    nTrackPointsMarked[0]++;
+    nTrackPointsMarked[1]++;
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&dataMutex);
+#endif
+    ndone++;
+  }
+}
+
+long subband :: writeTrackPointsToFile(FILE *fp) 
+{
+  long ntodo = parent?1:nTrackPointsToSynth;
+  long ndone = 0;
+  long frameBytes = 0;
+
+  while(ndone<ntodo) {
+    if(nTrackPointsSynthed%res==0)
+      if(sub) frameBytes += sub->writeTrackPointsToFile(fp);
+    
+    frameBytes += smser->writeTrackPointsToFile(fp);
+    nTrackPointsSynthed++;
+    ndone++;
+  }
+  return frameBytes;
+}
+
+long subband :: synthInit(bool bSet) 
+{
+  long n;
+  if(sub) n = res*sub->synthInit(bSet);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  if(!sub) n = max((long)0,min((long)1,getFramesAssigned()-nFramesSynthed-nLatency));
+  if(bSet) {
+    nTrackPointsSynthed = 0;
+    nTrackPointsToSynth = n;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+void subband :: synthTracks() 
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  real a = aSynth.read(aSynth.readPos);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  long ntodo = parent?1:nTrackPointsToSynth;
+  long ndone = 0;
+
+  while(ndone<ntodo) {
+    if(nTrackPointsSynthed%res==0)
+      if(sub) sub->synthTracks();
+    smser->synthTracks(a);
+    nTrackPointsSynthed++;
+    ndone++;
+  }
+}
+
+void subband :: readSubSamples()
+{
+  if(sub) sub->readSubSamples();
+  if(sub) {
+    audio fromSub[SUB_BUF_SIZE];
+    long n_fromsub = 0;
+
+    do {
+      n_fromsub = min((long)SUB_BUF_SIZE,sub->n_readable());
+      n_fromsub = sub->read(fromSub,n_fromsub);
+      //write samples to grains
+      subOut->write(fromSub, n_fromsub);
+    } while(n_fromsub>0);
+    
+    // upsample grains to samples 
+    long ng_read_subOut = 0;
+    for(int k=subOut->readPos;k<subOut->writePos;k++) {
+      ng_read_subOut++;
+      int h = 2*N/s;
+      grain *gup = subOut->read(k)->upsample();
+      usSubOut->write(gup,h);
+      grain :: destroy(gup);
+    }
+    subOut->advance(ng_read_subOut);
+  }
+}
+
+long subband :: write(audio *inBuf, long n, real a, real ratio)
+{
+  write_(inBuf, n, a, ratio);
+  return n;
+}
+
+void subband :: process()
+{
+  do { 
+    addInit(true);
+    addTrackPoints();
+    if(nTrackPointsToAdd) stepAddFrame();
+  } while(nTrackPointsToAdd);
+
+
+  for(int c=0;c<channels;c++) {
+    do { 
+      markInit(true,c);
+      markDuplicates(c);
+      if(nTrackPointsToMark[c]) stepMarkFrame(c);
+    } while(nTrackPointsToMark[c]);
+    
+    do {
+      assignInit(true,c);
+      assignTrackPoints(c);
+      advanceTrackPoints(c);
+      if(nTrackPointsToAssign[c]) stepAssignFrame(c);
+    } while(nTrackPointsToAssign[c]);
+  }
+}
+
+void subband :: setFramesInFile(long frames) 
+{
+  if(sub) sub->setFramesInFile(frames);
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  nFramesInFile = frames;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+}
+
+long subband :: readFromFile(FILE *fp, real a, real ratio)
+{
+  long samples = 0; 
+  if(readInit(true)) {
+    int framesize;
+    real amod;
+    fread(&framesize,sizeof(int),1,fp);
+    fread(&amod,sizeof(real),1,fp);
+    readTrackPointsFromFile(fp);
+    for(int c=0;c<channels;c++)
+      stepAssignFrame(c);
+    samples += framesize;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif    
+    setA(1.0f+amod*(a-1.0f));
+    setRatio(ratio);
+    setFrameSize(framesize,a,ratio);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&dataMutex);
+#endif    
+  }
+  return samples;
+}
+
+void subband :: writeFramePositionsToFile(FILE *fp)
+{
+  long frames = 0;
+  // samples, frames, channels, quality
+  long offset = 2*sizeof(long) + 2*sizeof(int);
+  unsigned short maxtrackindex = ta->size();
+  fseek(fp,offset,SEEK_SET);
+  fwrite(&maxtrackindex,sizeof(unsigned short),1,fp); offset += sizeof(unsigned short);
+  fseek(fp,0,SEEK_END);
+  for(int k=frameBytes.readPos+nFramesSkipped; k<frameBytes.writePos;k++) {
+    long samples = inputFrameSize.read(k);
+    int bytes = frameBytes.read(k);
+    fwrite(&offset,sizeof(long),1,fp);
+    fwrite(&samples,sizeof(long),1,fp);
+    offset += bytes;
+    frames++;
+  }
+  //samples
+  offset = sizeof(long);
+  fseek(fp,offset,SEEK_SET);
+  fwrite(&frames,sizeof(long),1,fp);
+}
+
+long subband :: getFramesWrittenToFile()
+{
+  long samples = 0;
+  bool bRead;
+  do {
+#ifdef MULTITHREADED
+    pthread_mutex_lock(&dataMutex);
+#endif    
+    bRead = (nFramesSynthed > nFramesRead);
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&dataMutex);
+#endif    
+    if(bRead) {
+      stepReadFrame();
+      if(nFramesRead > nFramesSkipped)
+	samples += inputFrameSize.read(nFramesSynthed);
+    }
+  } while(bRead);
+  return samples;
+}
+
+long subband :: writeTracksToFile(FILE *fp)
+{
+  long samples = 0;
+  bool bReady = false;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif    
+  if(inputFrameSize.n_readable() > nFramesSynthed) bReady = true;
+  if(!bReady) {
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&dataMutex);
+#endif    
+    return 0;
+  }
+  int framesize = inputFrameSize.read(nFramesSynthed);
+  real amod;
+  if(aMod.n_readable()) {
+    amod = aMod.read(aMod.readPos);
+    aMod.advance(1);
+  } else {
+    amod = 1.0f;
+  }
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif    
+  samples += framesize;
+  int bytes = 0;
+  if(fp) {
+    fwrite(&framesize,sizeof(int),1,fp); bytes += sizeof(int);
+    fwrite(&amod,sizeof(real),1,fp); bytes += sizeof(real);
+  } else {
+    nFramesSkipped++;
+  }
+  bytes += writeTrackPointsToFile(fp);
+  frameBytes.write(bytes);
+
+  return samples;
+}
+
+long subband :: writeToFile(FILE *fp)
+{
+  long samples = 0; 
+  if(synthInit(true)) {
+    samples = writeTracksToFile(fp);
+    stepSynthFrame();
+  }
+  return samples;
+}
+
+long subband :: synth()
+{
+  long frames = 0;
+  do {
+    if(synthInit(true)) {
+      synthTracks();
+      stepSynthFrame();
+      frames++;
+    }
+  } while(nTrackPointsToSynth);
+  return frames;
+}
+
+long subband :: zeroPad()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  frameRatio.write(lastFrameRatio);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  long samples = zeroPad_();
+  return samples;
+}
+
+long subband :: zeroPad_()
+{
+  if(sub) sub->zeroPad_();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  setFrameSize(lastInputFrameSize,lastFrameA,lastFrameRatio);
+  smser->zeroPad(lastOutputFrameSize);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return lastOutputFrameSize;
+}
+
+bool subband :: isframe_readable()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  if(!outputFrameSize.n_readable())
+    return false;
+  long n = outputFrameSize.read(outputFrameSize.readPos);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return (n_readable()>=n);
+}
+
+long subband :: getSamplesQueued()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  long n = (long)round2int(samplesQueued);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+long subband :: getFramesQueued()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  long n = outputFrameSize.n_readable();
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+long subband :: getFramesAtFront()
+{
+  if(sub) return sub->getFramesAtFront();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  long n = in1->n_readable();
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+long subband :: getFramesAtBack()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  long n =  getFramesAssigned() - nFramesSynthed;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+long subband :: getLastInputFrameSize()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  long n = lastInputFrameSize;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+  return n;
+}
+
+long subband :: n_readable()
+{
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  long n = outMixer->n_readable();
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+  return n;
+}
+
+long subband :: read(audio *buf, real *ratio0, real *ratio1) 
+{
+  readSubSamples();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  long n = 0;
+  if(outputFrameSize.n_readable() >= 2) {
+    n = outputFrameSize.read(outputFrameSize.readPos);
+    if(n_readable()>=n) {
+      real rat0 = frameRatio.read(frameRatio.readPos);
+      real rat1 = frameRatio.read(frameRatio.readPos+1);
+      if(ratio0 != NULL) *ratio0 = rat0;
+      if(ratio1 != NULL) *ratio1 = rat1;
+      samplesQueued -= n*0.5f*(rat0+rat1);
+      outputFrameSize.advance(1);
+      inputFrameSize.advance(1);
+      frameRatio.advance(1);
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&dataMutex);
+#endif
+      if(buf) {
+	stepReadFrame();
+      }
+      n = read(buf, n);
+    } else {
+      n = 0;
+#ifdef MULTITHREADED
+      pthread_mutex_unlock(&dataMutex);
+#endif
+    }
+  } else {
+#ifdef MULTITHREADED
+    pthread_mutex_unlock(&dataMutex);
+#endif
+  }
+
+  return n;
+}
+
+long subband :: read(audio *buf, long n)
+{
+  if(n==0)
+    return 0;
+  long n_read = n;
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&bufferMutex);
+#endif
+  if(buf) n_read = outMixer->read(buf, n_read);
+  outMixer->advance(n_read);
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&bufferMutex);
+#endif
+
+  return n_read;
+}
+
+void subband :: writingComplete()
+{
+  if(sub) sub->writingComplete();
+#ifdef MULTITHREADED
+  pthread_mutex_lock(&dataMutex);
+#endif
+  nLatency = 0;
+  bWritingComplete = true;
+#ifdef MULTITHREADED
+  pthread_mutex_unlock(&dataMutex);
+#endif
+}
+
+long subband :: preAnalyze(audio *buf, long n, real a, real ratio)
+{
+  long nwritten = 0;
+  while(nwritten<n) {
+    long ntowrite = min((long)(inPre->h),n-nwritten);
+    inPre->write(buf+nwritten,ntowrite);
+
+    nwritten += ntowrite;
+    
+    long ng_read = 0;
+    for(int k=inPre->readPos;k<inPre->writePos;k++) {
+      if(nDropped < nToDrop) {
+	nDropped++;
+      } else {
+	if(!parent && (nTrackPointsWritten)%nGrainsPerFrame == 0) {
+	  grain *g = inPre->read(k);
+	  grain::referenced(g);
+	  real o = calculateOnset(gPrev,g);
+	  onset.write(o);
+	  if(gPrev) grain::forget(gPrev);
+	  gPrev = g;
+	  setA(a);
+	}
+	if(!parent && (nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
+	  setAForH(a);
+	}
+	if((nTrackPointsWritten+1)%nGrainsPerFrame == 0) {
+	  setH(ratio);
+	}
+	nTrackPointsWritten++;
+      }
+      ng_read++;
+    }
+    inPre->advance(ng_read);
+  }
+  long samples = 0;
+  while(inputFrameSize.n_readable()) {
+    samples += inputFrameSize.read(inputFrameSize.readPos);
+    inputFrameSize.advance(1);
+    outputFrameSize.advance(1);
+  }
+  return samples;
+}
+
+real subband :: getOnset(long k)
+{
+  real tot = 2.0f*onset.read(k);
+  real c = 2.0f;
+  if(k-1>=onset.readPos) {
+    tot += onset.read(k-1);
+    c += 1.0f;
+  }
+  if(k+1<onset.writePos) {
+    tot += onset.read(k+1);
+    c += 1.0f;
+  }
+  return tot / c;
+}
+
+void subband :: preAnalyzeComplete()
+{
+  long k0 = onset.readPos;
+  long k1 = onset.writePos;
+  long kstart = 0;
+  long kend = 0;
+
+  for(long k=k0;k<k1;k++) {
+    bool bOnset = false;
+    if(k==k0) 
+      bOnset = true;
+    else {
+      real o0 = getOnset(k);
+      if(o0 < 0.1f) continue;
+      real o1 = getOnset(k-1);
+      if(o0 < 1.1f*o1) continue;
+      if(o0 < 0.22f) continue;
+      bOnset = ((o0 > 0.4f) || (o0>1.4f*o1));
+      if(!bOnset && k>k0+1) {
+	real o2 = getOnset(k-2);
+	bOnset = ((o0 > 1.2f*o1) && (o1 > 1.2f * o2));
+	if(!bOnset && k>k0+2) {
+	  real o3 = getOnset(k-3);
+	  bOnset = ((o0 > 0.3f) && (o1 > 1.1f * o2) && (o2 > 1.1f * o3));
+	}
+      }
+    }
+    if(bOnset) {
+      if(kend != 0) {
+	calculateA(kstart,kend);
+      }
+      kstart = kend;
+      kend = k;
+    }
+  }
+  calculateA(kstart,k1);
+}
+
+void subband :: calculateA(long kstart, long kend)
+{
+  real oMax = 0.0f;
+  real dTotal = 0.0f;
+
+  for(long k=kstart;k<kend;k++) {
+    real o = getOnset(k);
+    if(o > oMax) oMax = o;
+  }
+
+  for(long k=kstart;k<kend;k++) {
+    real o = getOnset(k);
+    real d = oMax - o;
+    dTotal += d;
+  }
+
+  real aAllot = (real)(kend-kstart);
+  for(long k=kstart;k<kend;k++) {
+    real o = getOnset(k);
+    real d = oMax - o;
+    real da;
+    if(dTotal == 0.0 || k+1==kend) {
+      da = aAllot;
+    } else {
+      da = d/dTotal*aAllot;
+    }
+    
+    dTotal -= d;
+    aAllot -= da;
+    aPreAnalysis.write(da);
+  }
+
+}
+
+real subband :: calculateOnset(grain *g1, grain *g2)
+{  
+  _c2evenodd(g2->freq, x2[0]->freq, x2[1]->freq, g2->N);
+  real o = 1.0f;
+  if(g1!=NULL) {
+    int Nover2 = N/2;
+    int nOnset = 0;
+    int nThresh = 0;
+    for(int k=0;k<Nover2;k++) {
+      real m2 = norm2(x2[0]->freq[k]) + norm2(x2[1]->freq[k]);
+      real m1 = norm2(x1[0]->freq[k]) + norm2(x1[1]->freq[k]);
+      bool bThresh = (m2 > 1e-6);
+      bool bOnset = (m2 > 2.0f*m1) && bThresh;
+      if(bOnset) nOnset++;
+      if(bThresh) nThresh++;
+    }
+    if(nThresh == 0)
+      o = 0.0f;
+    else
+      o = (real)nOnset/(real)nThresh;
+  } 
+  memcpy(x1[0]->freq,x2[0]->freq,g2->N*sizeof(audio));
+  memcpy(x1[1]->freq,x2[1]->freq,g2->N*sizeof(audio));
+  return o;
+}
+
+}
diff --git a/lib-src/sbsms/src/subband.h b/lib-src/sbsms/src/subband.h
new file mode 100644
index 0000000..619ac20
--- /dev/null
+++ b/lib-src/sbsms/src/subband.h
@@ -0,0 +1,174 @@
+#ifndef SUBBAND_H
+#define SUBBAND_H
+
+#include "real.h"
+#include "buffer.h"
+#include "audio.h"
+#include "sms.h"
+#include <stdio.h>
+#include "config.h"
+#ifdef MULTITHREADED
+#include "pthread.h"
+#endif
+
+namespace _sbsms_ {
+
+class subband {
+ public:
+  subband(subband *parent, unsigned short M, int channels, int quality, int latency, bool bPreAnalysis, TrackAllocator *ta, PeakAllocator *pa);
+  ~subband();
+
+  long write(audio *buf, long n, real a, real ratio);
+  void process();
+  long read(audio *buf, real *ratio0, real *ratio1);
+  long n_readable();
+  bool isframe_readable();
+  void writingComplete();
+  long readFromFile(FILE *fp, real a, real ratio);
+  long synth();
+  long getFramesWrittenToFile();
+  long writeToFile(FILE *fp);
+  void init();
+  void reset();
+  void seek(long framePos);
+  long getSamplesQueued();
+  long getFramesQueued();
+  long getFramesAtFront();
+  long getFramesAtBack();
+  long getLastInputFrameSize();
+  long getFramePos();
+  void write_(audio *buf, long n, real a, real ratio);
+
+  void writeFramePositionsToFile(FILE *fp);
+  long addInit(bool);
+  void addTrackPoints();
+  long markInit(bool, int c);
+  void markDuplicates(int c);
+  long assignInit(bool,int c);
+  long assignTrackPoints(int c);
+  void startNewTracks(int c);
+  void advanceTrackPoints(int c);
+  long synthInit(bool);
+  void synthTracks();
+  long readInit(bool);
+  long writeTracksToFile(FILE *fp);
+  void readTrackPointsFromFile(FILE *fp);
+  long writeTrackPointsToFile(FILE *fp); 
+  void stepAddFrame();
+  void stepMarkFrame(int c);
+  void stepAssignFrame(int c);
+  void stepSynthFrame();
+  void stepReadFrame();
+  void readSubSamples();
+  void setA(real a);
+  void setAMod(real a);
+  void setAForH(real a);
+  void setH(real ratio);
+  void setFrameSize(int inputSize, real a, real ratio);
+  void setRatio(real ratio);
+  void setFramesInFile(long frames);
+  long zeroPad();
+  long zeroPad_();
+
+  long preAnalyze(audio *buf, long n, real a, real ratio);
+  void preAnalyzeComplete();
+
+  FILE *fp;
+
+  long getFramesAssigned();
+  long getFramesMarked();
+
+  bool isWriteReady();
+  bool isAddReady();
+  bool isMarkReady();
+  bool isAssignReady();
+  bool isSynthReady();
+#ifdef MULTITHREADED
+  pthread_mutex_t dataMutex;
+  pthread_mutex_t bufferMutex;
+#endif
+
+  long nLatency;
+  long nLatencyOriginal;
+
+ protected:
+  long read(audio *buf, long n);
+  void calculateA(long kstart, long kend);
+  real calculateOnset(grain *g1, grain *g2);
+
+  TrackAllocator *ta;
+  PeakAllocator *pa;
+  
+  RingBuffer<real> aPreAnalysis;
+  RingBuffer<real> aMod;
+  RingBuffer<real> aSynth;
+  RingBuffer<real> aForH;
+  RingBuffer<int> inputFrameSize;
+  RingBuffer<int> outputFrameSize;
+  RingBuffer<real> frameRatio;
+  RingBuffer<int> frameBytes;
+  RingBuffer<real> onset;
+  grain *gPrev;
+
+  real getOnset(long k);
+  int lastInputFrameSize;
+  int lastOutputFrameSize;
+  real samplesQueued;
+  real lastFrameA;
+  real lastFrameRatio;
+  real totalSizef;
+  bool bPreAnalyze;
+  int quality;
+  int channels;
+  int N;
+  int h;
+  unsigned short M;
+  int s;
+  int res;
+  int nGrainsPerFrame;
+  int resTotal;
+  long nDropped;
+  long nToDrop;
+
+  long nTrackPointsToAdd;
+  long nTrackPointsToMark[2];
+  long nTrackPointsToAssign[2];
+  long nTrackPointsToAdvance[2];
+  long nTrackPointsToSynth;
+
+  long nTrackPointsMarked[2];
+  long nTrackPointsAssigned[2];
+  long nTrackPointsStarted[2];
+  long nTrackPointsAdvanced[2];
+  long nTrackPointsSynthed;
+  long nTrackPointsRead;
+  long nFramesSkipped;
+  long nFramesWritten;
+  long nFramesAdded;
+  long nFramesMarked[2];
+  long nFramesAssigned[2];
+  long nFramesRead;
+  long nFramesSynthed;
+  long nFramesInFile;
+  long nTrackPointsWritten;
+
+  bool bWritingComplete;
+  subband *parent;
+  subband *sub;
+  GrainBuf *in0,*in1,*in2;
+  SampleBuf *usSubOut;
+  SampleBufBase *outMixer;
+  sms *smser;
+  SampleBuf *subIn;
+  GrainBuf *subOut;
+  GrainBuf *in;
+  GrainBuf *inPre;
+  
+  grain *x1[2];
+  grain *x2[2];
+
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/test.cpp b/lib-src/sbsms/src/test.cpp
new file mode 100644
index 0000000..7fb9d3b
--- /dev/null
+++ b/lib-src/sbsms/src/test.cpp
@@ -0,0 +1,76 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "convert.h"
+
+#include <unistd.h>
+
+bool progressCB(int percent, const char *msg, void *data) {
+  static int lastPercent = 0;
+  if (lastPercent != percent) {
+    printf("\r%s: %3i%% [%-40s] ", msg, percent>100?100:percent, &"||||||||||||||||||||||||||||||||||||||||"[40 - ((percent>100)?40:(2*percent/5))] );
+    lastPercent = percent;
+    fflush(stdout);
+  }
+  return true;
+}
+
+int main(int argc, char **argv)
+{
+  if(argc<7) {
+    printf("usage: sbsms infile<.wav|.aif|.mp3|.sbsms> outfile<.wav|.aif|.mp3|.sbsms> rate-start[0.2:5] rate-end[0.2:5] halfsteps-start[-12:12] halfsteps-end[-12:12] <quality[0-2](default 1) <0:1 for pre-analysis>\n");
+    exit(-1);
+  }
+  float srOut = 44100.0;
+
+  bool bAnalyzeOnly = false;
+  bool bSynthesizeOnly = false;
+  char *filenameIn = argv[1];
+  char *filenameOut = argv[2];
+  
+  if(strstr(filenameIn,".sbsms")) {
+    bSynthesizeOnly = true;
+  }
+  if(strstr(filenameOut,".sbsms")) {
+    bAnalyzeOnly = true;
+  }
+  if(bAnalyzeOnly && bSynthesizeOnly) {
+    printf("Can't convert from .sbsms to .sbsms format\n");
+    exit(-1);
+  }
+  
+  float stretch0 = atof(argv[3]);
+  float stretch1 = atof(argv[4]);
+  float halfsteps0 = atof(argv[5]);
+  float halfsteps1 = atof(argv[6]);
+  if(stretch0 < 0.2 || stretch0 > 5) {
+    printf("rate-start out of bounds\n");
+    exit(-1);
+  }
+  if(stretch1 < 0.2 || stretch1 > 5) {
+    printf("rate-end out of bounds\n");
+    exit(-1);
+  }
+  if(halfsteps0 < -12 || halfsteps0 > 12) {
+    printf("halfsteps-start out of bounds\n");
+    exit(-1);
+  }
+  if(halfsteps1 < -12 || halfsteps1 > 12) {
+    printf("halfsteps-end out of bounds\n");
+    exit(-1);
+  }
+  
+  int quality = 1;
+  if(argc >= 8) quality = atoi(argv[7]);
+
+  bool bPreAnalyze = false;
+  if(argc >= 9) bPreAnalyze = atoi(argv[8])?true:false;
+  
+  real ratio0 = pow(2.0,-halfsteps0/12.0);
+  real ratio1 = pow(2.0,-halfsteps1/12.0);
+
+  sbsms_init(4096);
+  sbsms_convert(filenameIn, filenameOut, bAnalyzeOnly, bSynthesizeOnly, bPreAnalyze, quality, progressCB, NULL, stretch0, stretch1, ratio0, ratio1, 1.0f);
+  printf("\n");
+}
diff --git a/lib-src/sbsms/src/testplay.cpp b/lib-src/sbsms/src/testplay.cpp
new file mode 100644
index 0000000..3613540
--- /dev/null
+++ b/lib-src/sbsms/src/testplay.cpp
@@ -0,0 +1,52 @@
+#include "config.h"
+#ifdef HAVE_PORTAUDIO
+
+#include "play.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+int main(int argc, char **argv)
+{
+  if(argc<6) {
+    printf("usage: sbsmsplay infile.sbsms rate-start[0.2:5] rate-end[0.2:5] halfsteps-start[-12:12] halfsteps-end[-12:12] <quality[0-2](default 2 highest)>\n");
+    exit(-1);
+  }
+  char *filenameIn = argv[1];
+
+  float stretch0 = atof(argv[2]);
+  float stretch1 = atof(argv[3]);
+  float halfsteps0 = atof(argv[4]);
+  float halfsteps1 = atof(argv[5]);
+  if(stretch0 < 0.2 || stretch0 > 5) {
+    printf("rate-start out of bounds\n");
+    exit(-1);
+  }
+  if(stretch1 < 0.2 || stretch1 > 5) {
+    printf("rate-end out of bounds\n");
+    exit(-1);
+  }
+  if(halfsteps0 < -12 || halfsteps0 > 12) {
+    printf("halfsteps-start out of bounds\n");
+    exit(-1);
+  }
+  if(halfsteps1 < -12 || halfsteps1 > 12) {
+    printf("halfsteps-end out of bounds\n");
+    exit(-1);
+  }
+  
+  int quality = 1;
+  if(argc == 7) quality = atoi(argv[6]);
+  
+  real ratio0 = pow(2.0,-halfsteps0/12.0);
+  real ratio1 = pow(2.0,-halfsteps1/12.0);
+
+  sbsmsplayer *player = new sbsmsplayer(filenameIn,stretch0,stretch1,ratio0,ratio1);
+  player->play();
+  while(player->isPlaying())
+    Pa_Sleep(100);
+  player->close();
+  delete player;
+}
+
+#endif
diff --git a/lib-src/sbsms/src/track.cpp b/lib-src/sbsms/src/track.cpp
new file mode 100644
index 0000000..b869b19
--- /dev/null
+++ b/lib-src/sbsms/src/track.cpp
@@ -0,0 +1,313 @@
+#include "track.h"
+#include <math.h>
+#include "utils.h"
+#include "real.h"
+#include "sbsms.h"
+#include "sms.h"
+#include <assert.h>
+#include <stack>
+#include <vector>
+using namespace std;
+
+namespace _sbsms_ {
+
+#define SBSMS_TRACK_BLOCK 2048
+
+TrackAllocator :: TrackAllocator(bool bManageIndex)
+{
+  this-> bManageIndex = bManageIndex;
+}
+
+TrackAllocator :: TrackAllocator(bool bManageIndex, unsigned short maxtrackindex)
+{
+  this-> bManageIndex = bManageIndex;
+  gTrack.resize(maxtrackindex);
+  init();
+}
+
+TrackAllocator :: ~TrackAllocator()
+{
+}
+
+void TrackAllocator :: init()
+{
+  for(unsigned short k=0;k<gTrack.size();k++)
+    gTrack[k] = NULL;
+  while(!gTrackIndex.empty())
+    gTrackIndex.pop();
+#ifdef MULTITHREADED
+	pthread_mutex_init(&taMutex,NULL);
+#endif
+}
+
+track *TrackAllocator :: getTrack(unsigned short index)
+{
+  return gTrack[index];
+}
+
+int TrackAllocator :: size()
+{
+  return gTrack.size();
+}
+
+track *TrackAllocator :: create(track *precursor, sms *owner, int res, unsigned short index) 
+{
+  track *t = new track(precursor,owner,res);
+  t->index = index;
+  gTrack[index] = t;
+  return t;
+}
+
+track *TrackAllocator :: create(track *precursor, sms *owner, int res) 
+{
+#ifdef MULTITHREADED
+	pthread_mutex_lock(&taMutex);
+#endif
+  if(gTrackIndex.empty()) {
+    unsigned short n = gTrack.size();
+    gTrack.resize(n+SBSMS_TRACK_BLOCK);
+    for(int k=n+SBSMS_TRACK_BLOCK-1;k>=n;k--) {
+      gTrackIndex.push(k);
+      gTrack[k] = NULL;
+    }
+  }
+  unsigned short index = gTrackIndex.top();
+  gTrackIndex.pop();
+#ifdef MULTITHREADED
+	pthread_mutex_unlock(&taMutex);
+#endif
+  return create(precursor, owner, res, index);
+}
+
+void TrackAllocator :: destroy(track *t)
+{
+#ifdef MULTITHREADED
+	pthread_mutex_lock(&taMutex);
+#endif
+  gTrack[t->index] = NULL;
+  if(bManageIndex) 
+    gTrackIndex.push(t->index);
+  delete t;
+#ifdef MULTITHREADED
+	pthread_mutex_unlock(&taMutex);
+#endif
+}
+
+track :: track(track *precursor, sms *owner, int res) 
+{
+  this->owner = owner;
+  this->res = res;
+  this->descendant = NULL;
+  this->precursor = precursor;
+  this->end = LONG_MAX;
+  this->rise = 0.3f;
+  this->fall = 0.5f;
+  tailEnd = 0;
+  tailStart = 0;
+  m_p = 0.0;
+  currtime = 0;
+}
+
+
+void track :: endTrack(bool bTail)
+{
+  end = back()->time;
+  if(bTail) {
+    this->fall = min(1.5f,.25 + back()->y / point[point.size()-2]->y);
+    tailEnd = 1;
+    end++;
+    trackpoint *f = new trackpoint(back());
+    f->time = back()->time + 1;
+    point.push_back(f);
+  }
+}
+
+real track :: advance(long synthtime, int steps)
+{
+  long k = synthtime - start;
+  tpoint *tp0 = point[k];
+  tpoint *tp1 = point[k+1];
+  real w0 = tp0->f;
+  real w1 = tp1->f;
+  real ph0 = tp0->ph;
+  real ph1 = tp1->ph;
+  real h = tp0->h;
+
+  real dp = ph1 - ph0;
+  if(dp>PI) dp-=TWOPI;
+  else if(dp<-PI) dp+=TWOPI;
+  real dp0 = 0.5f*h*(w0 + w1);
+  real deltadp = canon(dp - dp0);
+
+  if(k==0) {
+    if(precursor) {
+      m_p = precursor->m_pDescendant;
+    }  else {    
+      deltadp = 0;
+    }
+  }
+  dp = (real)steps/h*(dp0+deltadp);
+  return dp;
+}
+
+void track :: synth(SampleBuf *out,
+		    long writePos,
+		    int c,
+		    long synthtime,
+		    int steps) {
+  if(point.size()==0) return;
+  long k = synthtime - start;
+  if(k>=(long)point.size()-1) return;
+  currtime = synthtime;
+  if(k<0) return;
+  int k1 = k + 1;  
+
+  tpoint *tp0 = point[k];
+  tpoint *tp1 = point[k1];
+
+  real w0 = tp0->f;
+  real w1 = tp1->f;
+  real dp = advance(synthtime,steps);  
+  real dt = (real)steps;
+  w1 = 2.0f/dt*dp - w0;
+  real b = (w1 - w0)/(2.0f*dt);
+  
+  bool bEnd = (k1==(long)point.size()-1);
+  bool bStart = (k==0);
+
+  if(bStart && tailStart) {
+    real ph = m_p;
+    int rise = round2int(this->rise * (real)steps);
+    real dm = tp1->y/(real)rise;
+    real m = tp1->y - dm;
+    for(int i=steps-1;i>=steps-rise+1;i--) {
+      ph -= w0;
+      if(ph>PI) ph -= TWOPI;
+      else if(ph<-PI) ph += TWOPI;
+      out->buf[writePos+i][c] += m * COS(ph);
+      m -= dm;
+    }
+  } else if(bEnd && tailEnd) {
+    real ph = m_p;
+    int fall = round2int(this->fall * (real)steps);
+    real dm = tp0->y/(real)fall;
+    real m = tp0->y;
+    for(int i=0;i<fall;i++) {
+      out->buf[writePos+i][c] += m * COS(ph); 
+      ph += w0;
+      if(ph>PI) ph -= TWOPI;
+      else if(ph<-PI) ph += TWOPI;
+      m -= dm;
+    }
+  } else  {
+    real m = tp0->y;
+    real dm;
+    dm = (tp1->y0 - tp0->y)/dt;
+    real ph = m_p;
+    real b2tt1 = b;
+    real b2 = 2.0f*b;
+    
+    audio *o = &(out->buf[writePos]);
+    for(int i=0;i<steps;i++) {
+      (*o)[c] += m * COS(ph);
+      ph += w0 + b2tt1;
+      if(ph>PI) ph -= TWOPI;
+      else if(ph<-PI) ph += TWOPI;
+      b2tt1 += b2;
+      m += dm;
+      o++;
+    }
+
+  }
+  //}
+  if(bEnd) {
+    if(descendant && descendant->back()->M < tp0->M) {
+      m_pDescendant = canon(m_p + dp/dt*(real)(descendant->owner->samplePos/2 + 0.5f*(descendant->owner->samplePos%2) - owner->samplePos));
+    }
+  } else if(bStart && tailStart) {
+  } else {
+    m_p = canon(m_p + dp);
+    if(descendant && descendant->back()->M > tp0->M && (k1+res==(long)point.size()-1)) {
+      m_pDescendant = canon(m_p + dp/dt*(real)(descendant->owner->samplePos*2 - (owner->samplePos+steps)));
+    }
+  }
+}
+
+bool track :: isEnded()
+{
+  return (end!=LONG_MAX);
+}
+
+void track :: push_back_tpoint(tpoint *p)
+{
+  point.push_back(p);
+}
+
+void track :: push_back(trackpoint *p)
+{
+  point.push_back(p);
+  p->owner = this;
+}
+  
+void track :: startTrack(trackpoint *p, bool bTail)
+{
+  push_back(p);
+  start = p->time;
+  m_pDescendant = p->ph;
+  if(bTail) {
+    tailStart = 1;
+    start--;
+    trackpoint *s = new trackpoint(p);
+    s->time = p->time - 1;
+    point.insert(point.begin(),s);
+    m_p = p->ph;
+  }
+  currtime = p->time-1;
+}
+
+trackpoint *track :: back() 
+{
+  return (trackpoint*)point.back(); 
+}
+
+trackpoint *track :: getTrackPoint(long time)
+{
+  long k = time-start;
+  if(k<0 || k >= (long)point.size())
+    return NULL;
+  else
+    return (trackpoint*)point[k];
+}
+
+bool track :: isStart(long synthtime)
+{
+  return (synthtime == start);
+}
+
+bool track :: isEnd(long synthtime)
+{
+  return (synthtime == end);
+}
+
+bool track :: isDone() 
+{
+  return (currtime-start+1 >= (long)point.size()-1);
+}
+
+long track :: size()
+{
+  return 1+end-start-tailEnd-tailStart;
+}
+
+track :: ~track() {
+  static long i = 0;
+  if(precursor) precursor->descendant = NULL;
+  if(descendant) descendant->precursor = NULL;
+  for(vector<tpoint*>::iterator i = point.begin();
+      i != point.end();
+      i++) {
+    delete (*i);
+  }
+}
+
+}
diff --git a/lib-src/sbsms/src/track.h b/lib-src/sbsms/src/track.h
new file mode 100644
index 0000000..41996e5
--- /dev/null
+++ b/lib-src/sbsms/src/track.h
@@ -0,0 +1,88 @@
+#ifndef TRACK_H
+#define TRACK_H
+
+#include "buffer.h"
+#include "trackpoint.h"
+#include "config.h"
+#ifdef MULTITHREADED
+#include "pthread.h"
+#endif
+#include <stack>
+#include <vector>
+using namespace std;
+
+namespace _sbsms_ {
+
+class sms;
+
+class track {
+ public:
+  void endTrack(bool bTail);
+  bool isEnded();
+  bool isDone();
+  void startTrack(trackpoint *p, bool bTail);
+  void push_back(trackpoint *p);
+  void push_back_tpoint(tpoint *p);
+  real advance(long time, int steps);
+  long size();
+  void synth(SampleBuf *out,
+	     long writePos,
+	     int c,
+	     long synthtime,
+	     int steps);
+  trackpoint *getTrackPoint(long time);
+  bool isStart(long synthtime);
+  bool isEnd(long synthtime);
+  trackpoint *back();
+
+  vector<tpoint*> point;
+
+  unsigned short index;
+  bool bEnd;
+  track *descendant;
+  track *precursor;
+  long tailEnd;
+  long tailStart;
+  long currtime;
+  real rise;
+  real fall;
+  long start;
+  long end;
+  real m_p;
+  real m_pDescendant;
+  int res;
+  sms *owner;
+
+ protected:
+  friend class TrackAllocator;
+  track(track *precursor,sms *owner,int res);
+  ~track();
+};
+
+class TrackAllocator {
+ public:
+  TrackAllocator(bool bManageIndex);
+  TrackAllocator(bool bManageIndex, unsigned short maxtrackindex);
+  void init();
+  int size();
+  ~TrackAllocator();
+
+  track *getTrack(unsigned short index);
+  track *create(track *precursor,sms *owner, int res, unsigned short index);
+  track *create(track *precursor,sms *owner, int res);
+  void destroy(track *t);
+
+ protected:
+#ifdef MULTITHREADED
+  pthread_mutex_t taMutex;
+#endif
+  long gIdCount;
+  stack<unsigned short> gTrackIndex;
+  vector<track*> gTrack;
+  bool bManageIndex;
+
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/trackpoint.cpp b/lib-src/sbsms/src/trackpoint.cpp
new file mode 100644
index 0000000..34d49bf
--- /dev/null
+++ b/lib-src/sbsms/src/trackpoint.cpp
@@ -0,0 +1,100 @@
+#include <math.h>
+#include "real.h"
+#include "utils.h"
+#include "track.h"
+#include "trackpoint.h"
+#include "grain.h"
+#include "defs.h"
+
+namespace _sbsms_ {
+
+trackpoint :: trackpoint(trackpoint *tp)
+{
+  init();
+  f = tp->f;
+  y = tp->y;
+  y0 = tp->y0;
+  h = tp->h;
+  M = tp->M;
+  ph = tp->ph;
+  owner = tp->owner;
+}
+
+trackpoint :: ~trackpoint()
+{
+  for(int d=0;d<3;d++) {
+    if(dup[d]) {
+      dup[d]->dup[2-d] = NULL;
+    }
+  }
+}
+
+trackpoint :: trackpoint(grain *g, real x, real y, int N, short M, short h, long time)
+{
+  init();
+  real k = x;
+  int ki = round2int(k);
+  real kf = ki<k?k-ki:ki-k;
+
+  real norm0 = square(g->freq[ki][0]) + square(g->freq[ki][1]); 
+  real ph0;
+  if(norm0 > 0.0f) {
+    ph0 = atan2(g->freq[ki][1],g->freq[ki][0]);
+  } else {
+    ph0 = 0.0f;
+  }
+
+  int ki1 = ki<k?ki+1:ki-1;
+  real norm1, ph1;
+  if(ki == N-1) {
+    norm1 = norm0;
+    ph1 = ph0;
+  } else {
+    norm1 = square(g->freq[ki1][0]) + square(g->freq[ki1][1]);
+    if(norm1 > 0.0f) {
+      ph1 = atan2(g->freq[ki1][1],g->freq[ki1][0]);
+    } else { 
+      ph1 = 0.0f;
+    }
+  }
+
+  real ifreq = TWOPI*k/(real)N;
+  ph0 = ph0 + (real)ki*PI;
+  ph1 = ph1 + (real)ki1*PI;
+  if(kf < 0.5) {
+    real dp = canon(ph1 - ph0);
+    ph1 = ph0 + dp;
+  } else {
+    real dp = canon(ph0 - ph1);
+    ph0 = ph1 + dp;
+  }
+  real ph = ((1.0-kf)*ph0 + kf*ph1);
+
+  this->time = time;
+  this->y = y;
+  this->y0 = y;
+  this->M = M;
+  this->h = h;
+  this->f = ifreq;
+  this->ph = canon(ph);
+}
+
+trackpoint :: trackpoint()
+{
+  init();
+}
+
+void trackpoint :: init()
+{
+  for(int d=0;d<3;d++) 
+    dup[d] = NULL; 
+  contF = 1e9;
+  cont = NULL;
+  dupcont = NULL;
+  bConnect = false;
+  bConnected = false;
+  bDelete = false;
+  owner = NULL;
+}
+
+}
diff --git a/lib-src/sbsms/src/trackpoint.h b/lib-src/sbsms/src/trackpoint.h
new file mode 100644
index 0000000..74253b0
--- /dev/null
+++ b/lib-src/sbsms/src/trackpoint.h
@@ -0,0 +1,48 @@
+#ifndef TRACKPOINT_H
+#define TRACKPOINT_H
+
+#include "grain.h"
+#include "sbsms.h"
+
+namespace _sbsms_ {
+
+class track;
+
+class tpoint {
+ public:
+  tpoint() {}
+  virtual ~tpoint() {}
+  real f;
+  real y;
+  real ph;
+  short h;
+  short M;
+  real y0;
+};
+
+class trackpoint : public tpoint {
+ public:
+  trackpoint();
+  trackpoint(trackpoint *tp);
+  trackpoint(grain *g, real x, real y, int N, short M, short h, long time);
+  ~trackpoint();
+
+  track *owner;
+  long time;
+
+  real contF;
+  bool bConnect;
+  bool bConnected;
+  bool bDelete;
+
+  trackpoint *dupcont;
+  trackpoint *cont;
+  trackpoint *dup[3];
+
+ protected:
+  void init();
+};
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/utils.cpp b/lib-src/sbsms/src/utils.cpp
new file mode 100644
index 0000000..f869c2d
--- /dev/null
+++ b/lib-src/sbsms/src/utils.cpp
@@ -0,0 +1,90 @@
+#include <math.h>
+#include "utils.h"
+#include "real.h"
+#include "defs.h"
+
+namespace _sbsms_ {
+real *COSTABLE_ = NULL;
+real *COSTABLE = NULL;
+real COSFACTOR;
+
+int *factor(int n)
+{
+  int *f = (int*)calloc(ilog2(n)+1,sizeof(int));
+  factor(n,f,0);
+  return f;
+}
+
+void factor(int n, int *f, int m)
+{
+  for(int k=2;k<=n;k++) {
+    if(n%k==0) {
+      f[m++] = k;
+      n /= k;
+      break;
+    }
+  }
+  if(n>1)
+	  factor(n,f,m);
+}
+
+void _evenodd2c(audio *eo, audio *even, audio *odd, int N)
+{
+  for(int k=0;k<N;k++) {
+    eo[k][0] = (even[k][0] - odd[k][1]);
+    eo[k][1] = (even[k][1] + odd[k][0]);
+  }
+}
+
+void _c2evenodd(audio *eo, audio *even, audio *odd, int N)
+{
+  int Nover2 = N/2;
+  for(int k=0;k<=Nover2;k++) {
+    int fk = (k==0)?0:N-k;
+
+    real eok0 = eo[k][0];
+    real eok1 = eo[k][1];
+    real eofk0 = eo[fk][0];
+    real eofk1 = eo[fk][1];
+    
+    even[k][0] = 0.5f*(eok0 + eofk0);
+    even[k][1] = 0.5f*(eok1 - eofk1);
+    
+    odd[k][0] = 0.5f*(eok1 + eofk1);
+    odd[k][1] = 0.5f*(-eok0 + eofk0);
+  }
+}
+
+void cosinit(int size) {
+  COSFACTOR = (real)(size-1)/PI;
+  if(COSTABLE_) free(COSTABLE_);
+  COSTABLE_ = (real*)malloc(size*sizeof(real));
+  for(int k=0;k<size;k++)
+    COSTABLE_[k] = cos((real)k/(real)(size-1)*PI);
+  COSTABLE = COSTABLE_;
+}
+
+void _c2magphase(audio *g, int N)
+{
+  for(int k=0;k<N;k++) {
+    real mag = norm(g[k]);
+    real phase = atan2(g[k][1],g[k][0]);
+    g[k][0] = mag;
+    g[k][1] = phase;
+  }
+}
+
+void _magphase2c(audio *g, int N)
+{
+ for(int k=0;k<N;k++) {
+   real mag = g[k][0];
+   real phi = g[k][1];
+   real re = mag * COS(phi);
+   real im = mag * SIN(phi);
+
+   g[k][0] = re;
+   g[k][1] = im;
+  }
+}
+
+}
diff --git a/lib-src/sbsms/src/utils.h b/lib-src/sbsms/src/utils.h
new file mode 100644
index 0000000..ac668e4
--- /dev/null
+++ b/lib-src/sbsms/src/utils.h
@@ -0,0 +1,119 @@
+#ifndef FFTUTILS_H
+#define FFTUTILS_H
+
+#include "real.h"
+#include "sbsms.h"
+#include "defs.h"
+#include <math.h>
+#include <limits.h>
+#include <stdlib.h>
+
+namespace _sbsms_ {
+
+extern real COSFACTOR;
+extern real *COSTABLE_;
+extern real *COSTABLE;
+
+void cosinit(int size);
+void _evenodd2c(audio *eo, audio *even, audio *odd, int N);
+void _c2evenodd(audio *eo, audio *even, audio *odd, int N);
+inline real SIN(real x);
+inline real COS(real x);
+inline real square(real x);
+void _c2magphase(audio *g, int N);
+void _magphase2c(audio *g, int N);
+inline real canon(real ph);
+inline real norm(audio x);
+inline real norm2(audio x);
+inline real sign(real x);
+inline real min(real a, real b);
+inline long min(long a, long b);
+inline real dBApprox(real x);
+int *factor(int n);
+void factor(int n, int *f, int m);
+
+inline int ilog2(int x)
+{
+	int n = 0;
+	while(x>1) {
+		x>>=1;
+		n++;
+	}
+	return n;
+}
+
+inline real dBApprox(real x) 
+{
+  real u = (x-1.0)/(x+1.0);
+  real u2 = u*u;
+  return 17.37177927613007*u*(1.0 + u2*(0.333333333333333 + u2*(0.2 + u2*0.14285714285714)));
+}
+
+inline real min(real a, real b)
+{
+  return ((a)<(b)?(a):(b));
+}
+
+inline real max(real a, real b)
+{
+  return ((a)>(b)?(a):(b));
+}
+
+inline long min(long a, long b)
+{
+  return ((a)<(b)?(a):(b));
+}
+
+inline long max(long a, long b)
+{
+  return ((a)>(b)?(a):(b));
+}
+
+inline int min(int a, int b)
+{
+  return ((a)<(b)?(a):(b));
+}
+
+inline int max(int a, int b)
+{
+  return ((a)>(b)?(a):(b));
+}
+
+inline real sign(real x)
+{
+  return x<0?-1:1;
+}
+
+inline real canon(real ph) 
+{
+  return ph - TWOPI*(real)round2int(ph*ONEOVERTWOPI);
+}
+
+inline real norm2(audio x)
+{
+  return square(x[0]) + square(x[1]);
+}
+
+inline real norm(audio x)
+{
+  return sqrt(norm2(x));
+}
+
+inline real SIN(real x)
+{
+  return sin(x);
+}
+
+inline real COS(real x)
+{
+  return COSTABLE[round2int(COSFACTOR*fabsf(x))];
+}
+
+inline real square(real x)
+{ 
+  return x*x;
+}
+
+}
+
+#endif
diff --git a/lib-src/sbsms/src/wxconvertdlg.cpp b/lib-src/sbsms/src/wxconvertdlg.cpp
new file mode 100644
index 0000000..c416c2b
--- /dev/null
+++ b/lib-src/sbsms/src/wxconvertdlg.cpp
@@ -0,0 +1,45 @@
+#include "wxconvertdlg.h"
+
+#define QUALITY 9998
+#define QUALITYTEXT 9997
+#define PREANALYZE 9996
+
+ConvertDialog :: ConvertDialog(wxWindow *parent) : 
+  wxDialog(parent, wxID_ANY, _("Convert"), wxDefaultPosition, wxDefaultSize)
+{
+  mQualityText = new wxStaticText(this,QUALITYTEXT,_("Quality"));
+  mQuality = new wxSlider(this,QUALITY,1,0,2);
+  mPreAnalyze = new wxCheckBox(this,PREANALYZE,_("Pre-Analysis"));
+  wxBoxSizer *mSizer = new wxBoxSizer(wxVERTICAL);
+
+  wxStdDialogButtonSizer *bs = new wxStdDialogButtonSizer();
+  wxButton *b;
+  b = new wxButton( this, wxID_OK );
+  b->SetDefault();
+  bs->AddButton( b );
+  bs->AddButton( new wxButton( this, wxID_CANCEL ) );
+  bs->AddStretchSpacer();
+  bs->Realize();
+
+  mSizer->Add(mQualityText);
+  mSizer->Add(mQuality);
+  mSizer->Add(mPreAnalyze);
+  mSizer->Add(bs);
+  SetSizer(mSizer);
+  mSizer->Fit(this);
+}
+
+ConvertDialog :: ~ConvertDialog()
+{
+}
+
+int ConvertDialog :: getQuality()
+{
+  return mQuality->GetValue();
+}
+
+bool ConvertDialog :: getPreAnalyze()
+{
+  return mPreAnalyze->GetValue();
+}
+ 
diff --git a/lib-src/sbsms/src/wxconvertdlg.h b/lib-src/sbsms/src/wxconvertdlg.h
new file mode 100644
index 0000000..0e339ba
--- /dev/null
+++ b/lib-src/sbsms/src/wxconvertdlg.h
@@ -0,0 +1,20 @@
+#ifndef CONVERTDLG_H
+#define CONVERTDLG_H
+
+#include "wx/wx.h"
+
+class ConvertDialog : public wxDialog 
+{
+ public:
+  ConvertDialog(wxWindow *parent);
+  ~ConvertDialog();
+
+  wxStaticText *mQualityText;
+  wxSlider *mQuality;
+  wxCheckBox *mPreAnalyze;
+
+  int getQuality();
+  bool getPreAnalyze();
+};
+
+#endif
diff --git a/lib-src/sbsms/src/wxplayctrl.cpp b/lib-src/sbsms/src/wxplayctrl.cpp
new file mode 100644
index 0000000..073e061
--- /dev/null
+++ b/lib-src/sbsms/src/wxplayctrl.cpp
@@ -0,0 +1,281 @@
+#include "wxplayctrl.h"
+#include "wxplayer.h"
+#include "wxplayerframe.h"
+
+#include "../resource/Play.xpm"
+#include "../resource/PlayDown.xpm"
+#include "../resource/Pause.xpm"
+#include "../resource/PauseDown.xpm"
+
+#define PLAYPAUSE 10000
+#define TIMER 10001
+#define SEEK 10002
+#define RATE 10003
+#define PITCH 10004
+#define VOLUME 10005
+
+#define RATE_MAX 200
+#define RATE_MIN 25
+#define RATE_DEFAULT 100
+#define PITCH_MIN -12
+#define PITCH_DEFAULT 0
+#define PITCH_MAX 12
+
+#define SEEK_MAX 512
+
+BEGIN_EVENT_TABLE(PlayCtrl, wxPanel)
+  EVT_BUTTON(PLAYPAUSE,PlayCtrl::OnPlayPause)
+  EVT_TIMER(TIMER,PlayCtrl::OnTimer)
+  EVT_SCROLL_THUMBTRACK(PlayCtrl::OnTrack)
+  EVT_SCROLL_THUMBRELEASE(PlayCtrl::OnRelease)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(wxStaticText_NoFlicker,wxStaticText)
+EVT_ERASE_BACKGROUND(wxStaticText_NoFlicker::OnEraseBackground)
+END_EVENT_TABLE()
+
+PlayCtrl :: PlayCtrl(wxWindow *parent, sbsmsplayer *player)
+  : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN| wxTAB_TRAVERSAL )
+{
+  this->parent = (wxPlayerFrame*)parent;
+  this->player = player;
+  bmPlay = wxBitmap(Play_xpm);
+  bmPlayDown = wxBitmap(PlayDown_xpm);
+  bmPause = wxBitmap(Pause_xpm);
+  bmPauseDown = wxBitmap(PlayDown_xpm);
+
+  btnPlayPause = new wxBitmapButton(this, PLAYPAUSE, bmPlay,wxDefaultPosition,wxDefaultSize,0);
+
+#ifndef __WXMSW__
+  btnPlayPause->SetBitmapFocus( bmPlayDown );
+#else
+  pPlayEvt = new CBtnDownEvt( btnPlayPause, &bmPlayDown, &bmPlay );
+  pPauseEvt = new CBtnDownEvt( btnPlayPause, &bmPauseDown, &bmPause );
+  btnPlayPause->PushEventHandler( pPlayEvt );
+#endif
+  
+  slVolume = new wxSlider( this,VOLUME,90,0,100);
+  slSeek = new wxSlider( this,SEEK,0,0,SEEK_MAX);
+  slSeek->Connect(wxEVT_RIGHT_DOWN,wxMouseEventHandler(PlayCtrl::OnClickTimeDisplay),NULL,this);
+
+  slRate = new wxSlider( this,RATE,RATE_DEFAULT,RATE_MIN,RATE_MAX);
+  slPitch = new wxSlider( this,PITCH,PITCH_DEFAULT,PITCH_MIN,PITCH_MAX);
+
+  stVolume = new wxStaticText_NoFlicker( this, -1, wxT("Volume: 90\%"), wxDefaultPosition, wxDefaultSize, 0 );
+  stRate = new wxStaticText_NoFlicker( this, -1, wxT("Rate: 100\%"), wxDefaultPosition, wxDefaultSize, 0 );
+  stPitch = new wxStaticText_NoFlicker( this, -1, wxT("Pitch: 0   "), wxDefaultPosition, wxDefaultSize, 0 );
+
+  wxGridSizer *hsButtons = new wxGridSizer(1);
+  hsButtons->Add( btnPlayPause ,0,wxALIGN_CENTRE_HORIZONTAL | wxLEFT ,1);
+  
+  stCurtime = new wxStaticText_NoFlicker( this, -1, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
+  nTimeDisplayMode = 0;
+
+  wxBoxSizer *hsPlay = new wxBoxSizer( wxHORIZONTAL );
+  wxBoxSizer *vsPlay = new wxBoxSizer( wxVERTICAL );
+  hsPlay->Add( hsButtons, 1, wxEXPAND|wxALL, 2 );
+  hsPlay->AddSpacer(10);
+  hsPlay->Add( slSeek, 0, wxALIGN_CENTER );
+  hsPlay->AddSpacer(10);
+  hsPlay->Add( stCurtime );
+
+  wxFlexGridSizer *gsControls = new wxFlexGridSizer(3,2,10,10);
+  gsControls->Add(stVolume);
+  gsControls->Add(slVolume);
+  gsControls->Add(stRate);
+  gsControls->Add(slRate);
+  gsControls->Add(stPitch);
+  gsControls->Add(slPitch);
+
+  vsPlay->AddSpacer(10);
+  vsPlay->Add(gsControls);
+  vsPlay->AddSpacer(10);
+  vsPlay->Add(hsPlay);
+  vsPlay->AddSpacer(10);
+  
+  SetSizer( vsPlay);
+
+  pSecTimer = NULL;
+  UpdateTime();
+  StartTimer();
+  bPlay = false;
+  bWasPlaying = false;
+  vsPlay->Fit(this);
+  Layout();
+}
+
+PlayCtrl::~PlayCtrl()
+{
+  KillTimer();
+
+#ifdef __WXMSW__
+  btnPlayPause->PopEventHandler();
+  delete pPlayEvt;
+  delete pPauseEvt;
+#endif
+}
+
+void PlayCtrl::OnTrack(wxScrollEvent &event)
+{
+  if(event.GetId() == SEEK) {
+    if(player->isPlaying()) {
+      bWasPlaying = true;
+      KillTimer();
+      player->pause();
+    }
+  } else if(event.GetId() == RATE) {
+    int intval = slVolume->GetValue();
+    stVolume->SetLabel( wxString::Format( wxT("volume: %d"),intval) + wxT("\%") );
+  } else if(event.GetId() == RATE) {
+    int intval = slRate->GetValue();
+    stRate->SetLabel( wxString::Format( wxT("Rate: %d"),intval) + wxT("\%") );
+  } else if(event.GetId() == PITCH) {
+    int intval = slPitch->GetValue();
+    stPitch->SetLabel( wxString::Format( wxT("Pitch: %s%d"),intval>0?wxT("+"):wxT(""),intval) );
+  }
+}
+
+void PlayCtrl::OnRelease(wxScrollEvent &event)
+{
+  if(event.GetId() == SEEK) {
+    real fPos = (real)slSeek->GetValue()/SEEK_MAX;
+    player->setPos(fPos);
+    if(bWasPlaying) {
+      player->play();
+      StartTimer();
+      bWasPlaying = false;
+    }
+  } else if(event.GetId() == VOLUME) {
+    int intval = slVolume->GetValue();
+    real val = (real)intval*.01f;
+    player->setVolume(val);
+    stVolume->SetLabel( wxString::Format( wxT("Volume: %d"),intval) + wxT("\%") );
+  } else if(event.GetId() == RATE) {
+    int intval = slRate->GetValue();
+    real val = (real)intval*.01f;
+    player->setRate(val);
+    stRate->SetLabel( wxString::Format( wxT("Rate: %d"),intval) + wxT("\%") );
+  } else if(event.GetId() == PITCH) {
+    int intval = slPitch->GetValue();
+    real val = (real)intval;
+    real ratio = pow(2.0,-val/12.0);
+    player->setRatio(ratio);
+    stPitch->SetLabel( wxString::Format( wxT("Pitch: %s%d"),intval>0?wxT("+"):wxT(""),intval) );
+  }
+}
+
+void PlayCtrl::OnTimer( wxTimerEvent& WXUNUSED(event) )
+{
+  if( player->isPlaying() ) {
+    UpdateTime();
+  } else if( player->isDonePlaying() ){
+    parent->OnPause();
+    player->setPos(0.0f);
+    UpdateTime();
+    PauseBtnToPlayBtn();
+    bPlay = false;
+  }
+}
+
+void PlayCtrl::StartTimer()
+{
+  if ( pSecTimer == NULL ) {
+    pSecTimer = new wxTimer(this, TIMER );
+    pSecTimer->Start( 100, false );
+  }
+}
+
+void PlayCtrl::KillTimer()
+{
+  if(pSecTimer) {
+    pSecTimer->Stop();
+    delete pSecTimer;
+    pSecTimer = NULL;
+  }
+}
+
+void PlayCtrl::PlayBtnToPauseBtn()
+{
+#ifndef __WXMSW__
+  btnPlayPause->SetBitmapLabel( bmPause );
+  btnPlayPause->SetBitmapFocus( bmPauseDown );
+#else
+  btnPlayPause->SetBitmapLabel( bmPause );
+  btnPlayPause->PopEventHandler();
+  btnPlayPause->PushEventHandler( pPauseEvt );
+#endif
+  btnPlayPause->Refresh();
+}
+
+void PlayCtrl::PauseBtnToPlayBtn()
+{
+#ifndef __WXMSW__
+  btnPlayPause->SetBitmapLabel( bmPlay );
+  btnPlayPause->SetBitmapFocus( bmPlayDown );
+#else
+  btnPlayPause->SetBitmapLabel( bmPlay );
+  btnPlayPause->PopEventHandler();
+  btnPlayPause->PushEventHandler( pPlayEvt );
+#endif
+  btnPlayPause->Refresh();
+}
+
+void PlayCtrl::OnPlayPause( wxCommandEvent& WXUNUSED(event) )	
+{	
+  if(bPlay) {
+    if(player->pause()) {
+      parent->OnPause();
+      bPlay = false;
+      PauseBtnToPlayBtn();
+      KillTimer();
+    }
+  } else {
+    if(player->play()) {
+      parent->OnPlay();
+      bPlay = true;
+      PlayBtnToPauseBtn();
+      StartTimer();
+    }
+  }
+}
+
+void PlayCtrl::OnClickTimeDisplay(wxMouseEvent & WXUNUSED(event))
+{
+  ++nTimeDisplayMode %= 2;
+}
+
+wxString PlayCtrl::getTime(real time)
+{
+  int h = (int)(time/3600.0f);
+  time -= h*3600.0f;
+  int m = (int)(time/60.0f);
+  time -= m*60.0f;
+  int s = (int)time;
+  time -= s;
+  int cs = (int)(time*100.0f);
+  return wxString::Format( wxT("%.2d:%.2d:%.2d"),m,s,cs);
+}
+
+wxString PlayCtrl::getTimeLeft(real time, real duration)
+{
+  return getTime(duration-time);
+}
+
+void PlayCtrl::UpdateTime()
+{
+  real duration = player->getDuration(); 
+  real time = player->getTime();
+  real fPos = duration?SEEK_MAX*time/duration : 0;
+	    
+#ifdef __WXGTK__
+  if ( fPos < 2.0f )
+    fPos = 2.0f;
+#endif
+  
+  slSeek->SetValue( (int)fPos );
+  if(nTimeDisplayMode == 0) {
+    stCurtime->SetLabel(wxT(" ") + getTime(time));
+  } else {
+    stCurtime->SetLabel(wxT("-") + getTimeLeft(time,duration));
+  }
+}
diff --git a/lib-src/sbsms/src/wxplayctrl.h b/lib-src/sbsms/src/wxplayctrl.h
new file mode 100644
index 0000000..200e54b
--- /dev/null
+++ b/lib-src/sbsms/src/wxplayctrl.h
@@ -0,0 +1,74 @@
+#ifndef PLAYCTRL_H
+#define PLAYCTRL_H
+
+#include "wx/wx.h"
+#include "btndown.h"
+#include "play.h"
+class wxPlayerFrame;
+
+class wxStaticText_NoFlicker : public wxStaticText
+{
+ public:
+  wxStaticText_NoFlicker(wxWindow* parent,
+			 wxWindowID id,
+			 const wxString& label,
+			 const wxPoint& pos = wxDefaultPosition,
+			 const wxSize& size = wxDefaultSize,
+			 long style = 0,
+			 const wxString& name= wxStaticTextNameStr )
+    :wxStaticText(parent,id,label,pos,size,style,name){}
+  void OnEraseBackground(wxEraseEvent& ) {}
+  DECLARE_EVENT_TABLE()
+};
+
+class PlayCtrl : public wxPanel 
+{
+ public:
+  PlayCtrl(wxWindow *parent, sbsmsplayer *player);
+  ~PlayCtrl();
+
+  void OnPlayPause( wxCommandEvent& WXUNUSED(event) );
+  void OnTrack( wxScrollEvent &event);
+  void OnRelease( wxScrollEvent &event);
+  void OnTimer( wxTimerEvent& WXUNUSED(event) );
+  void OnClickTimeDisplay( wxMouseEvent& event );
+  wxBitmap	bmPlay,		bmPlayDown;
+  wxBitmap	bmPause,	bmPauseDown;
+
+  wxPlayerFrame *parent;
+
+  wxBitmapButton *btnPlayPause;  
+  wxSlider *slVolume;
+  wxSlider *slSeek;
+  wxSlider *slRate;
+  wxSlider *slPitch;
+  wxStaticText_NoFlicker *stVolume;
+  wxStaticText_NoFlicker *stRate;
+  wxStaticText_NoFlicker *stPitch;
+  wxStaticText_NoFlicker *stCurtime;
+
+#ifdef __WXMSW__
+  CBtnDownEvt *pPlayEvt;
+  CBtnDownEvt *pPauseEvt;
+#endif
+
+  DECLARE_EVENT_TABLE()
+
+protected:
+  wxString getTime(real time);
+  wxString getTimeLeft(real time, real duration);
+
+  bool bWasPlaying;
+  bool bPlay;
+  sbsmsplayer *player;
+  int nTimeDisplayMode;
+  void PlayBtnToPauseBtn();
+  void PauseBtnToPlayBtn();
+  
+  void UpdateTime();
+  void StartTimer();
+  void KillTimer();
+  wxTimer *pSecTimer;
+};
+
+#endif
diff --git a/lib-src/sbsms/src/wxplayer.cpp b/lib-src/sbsms/src/wxplayer.cpp
new file mode 100644
index 0000000..6ddd579
--- /dev/null
+++ b/lib-src/sbsms/src/wxplayer.cpp
@@ -0,0 +1,27 @@
+#include "wxplayer.h"
+#include "wxplayerframe.h"
+#include "wx/filename.h"
+
+IMPLEMENT_APP(wxPlayerApp)
+  
+bool wxPlayerApp::OnInit()
+{
+#ifdef _WIN32
+	int status = pthread_win32_process_attach_np();
+#endif
+
+  sbsmsplayer *player = new sbsmsplayer();
+  wxImage::AddHandler(new wxPNGHandler);
+  wxPlayerFrame *pMain = new wxPlayerFrame(player);
+  SetTopWindow( pMain );
+  pMain->Show();
+  return true;
+}
+
+int wxPlayerApp::OnExit()
+{
+#ifdef _WIN32
+	int status = pthread_win32_process_detach_np();
+#endif
+  return 0;
+}
diff --git a/lib-src/sbsms/src/wxplayer.h b/lib-src/sbsms/src/wxplayer.h
new file mode 100644
index 0000000..d43d300
--- /dev/null
+++ b/lib-src/sbsms/src/wxplayer.h
@@ -0,0 +1,19 @@
+#ifndef WXPLAYER_H
+#define WXPLAYER_H
+
+#include "wx/wx.h"
+#include "play.h"
+
+class wxPlayerApp  : public wxApp
+{
+ public:
+  wxPlayerApp() {}
+  ~wxPlayerApp() {};
+  bool OnInit();
+  int OnExit();
+};
+
+
+DECLARE_APP(wxPlayerApp);
+
+#endif
diff --git a/lib-src/sbsms/src/wxplayerframe.cpp b/lib-src/sbsms/src/wxplayerframe.cpp
new file mode 100644
index 0000000..26e4ce0
--- /dev/null
+++ b/lib-src/sbsms/src/wxplayerframe.cpp
@@ -0,0 +1,122 @@
+#include "wxplayerframe.h"
+#include <wx/progdlg.h>
+#include <wx/filename.h>
+#include "wxconvertdlg.h"
+#include "convert.h"
+
+BEGIN_EVENT_TABLE(wxPlayerFrame, wxFrame)
+  EVT_MENU(wxID_OPEN,wxPlayerFrame::OnOpen)
+  EVT_MENU(wxID_SAVE,wxPlayerFrame::OnSave)
+  EVT_MENU(wxID_EXIT,wxPlayerFrame::OnExit)
+END_EVENT_TABLE()
+
+bool progressCB(int progress, const char *msg, void *data)
+{
+  wxProgressDialog *progressDlg = (wxProgressDialog*)data;
+  return progressDlg->Update(progress);
+}
+
+void wxPlayerFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
+{
+  wxFileDialog dlg(this, wxT("Choose a file"), wxT("."), wxT(""), wxT("All filetypes (*.sbsms;*.mp3;*.wav;*.aif;*.aiff;*.pcm)|*.sbsms;*.mp3;*.wav;*.aif;*.aiff;*.pcm"),wxOPEN);
+  if(dlg.ShowModal() == wxID_OK) {
+    wxString pathStr = dlg.GetPath();
+    wxFileName path(pathStr);
+    
+    player->close();
+    if(path.GetExt().Cmp(wxT("sbsms")) == 0) {
+      if(player->open(path.GetFullPath().fn_str()))
+	openFileName = path.GetFullPath();
+    } else {
+      ConvertDialog convertDlg(this);
+      if(convertDlg.ShowModal() == wxID_OK) {
+	bool bPreAnalyze = convertDlg.getPreAnalyze();
+	int quality = convertDlg.getQuality();
+	
+	wxFileName sbsmsPath(path.GetPath(wxPATH_GET_VOLUME|wxPATH_GET_SEPARATOR) + path.GetName() + wxT(".sbsms"));
+	wxProgressDialog progress(wxT("Progress"),wxT("Converting to ") + sbsmsPath.GetFullName());
+	bool status = sbsms_convert(path.GetFullPath().fn_str(),sbsmsPath.GetFullPath().fn_str(),true,false,bPreAnalyze,quality,progressCB,&progress,1.0f,1.0f,1.0f,1.0f,1.0f);
+	if(status) {
+	  if(player->open(sbsmsPath.GetFullPath().fn_str()))
+	    openFileName = sbsmsPath.GetFullPath();
+	} else {
+	  wxMessageDialog msg(this,wxT("Conversion Failed"),wxT(""),wxOK);
+	}
+      }
+    }
+  }
+}
+
+void wxPlayerFrame::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+  if(openFileName.Cmp(wxT("")) != 0) {
+    wxFileDialog dlg(this, wxT("Choose a file"), wxT("."), wxT(""), wxT("*.wav"),wxSAVE|wxOVERWRITE_PROMPT);
+    if(dlg.ShowModal() == wxID_OK) {
+      wxString pathStr = dlg.GetPath();
+      wxFileName path(pathStr);
+      
+      wxProgressDialog progress(wxT("Progress"),wxT("Converting to ") + path.GetFullName());
+      real rate = player->getRate();
+      real ratio = player->getRatio(); 
+      real volume = player->getVolume();
+      bool status = sbsms_convert(openFileName.fn_str(),path.GetFullPath().fn_str(),false,true,false,1,progressCB,&progress,rate,rate,ratio,ratio,volume);
+      if(!status) {
+      wxMessageDialog msg(this,wxT("Conversion Failed"),wxT(""),wxOK);
+      }
+    }
+  }
+}
+
+void wxPlayerFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+  Close();
+}
+
+wxPlayerFrame::wxPlayerFrame(sbsmsplayer *player) 
+  : wxFrame( (wxFrame*)NULL, -1, wxT("SBSMS"))
+{
+  this->player = player;
+  openFileName = wxT("");
+  
+  wxMenu* file_menu = new wxMenu;
+  file_menu->Append( wxID_OPEN, _("Open") );
+  file_menu->AppendSeparator();
+  file_menu->Append( wxID_SAVE, _("Save") );
+  file_menu->AppendSeparator();
+  file_menu->Append( wxID_EXIT, _("Exit") );
+
+  wxMenuBar *menu_bar = new wxMenuBar;
+  menu_bar->Append( file_menu,	_("&File") );
+  
+  SetMenuBar( menu_bar );
+#ifdef __WXMSW__
+      wxIcon ic(wxICON(SBSMSLogo));
+	  SetIcon(ic);
+#endif 
+  wxBoxSizer *hs = new wxBoxSizer( wxHORIZONTAL );
+  playCtrl = new PlayCtrl(this,player);
+  playCtrl->Show(true);
+  hs->Add(playCtrl);
+
+  SetSizer(hs);
+  hs->Fit(this);
+  Layout();
+}
+
+void wxPlayerFrame :: OnPause()
+{
+  GetMenuBar()->Enable(wxID_OPEN,true);
+  GetMenuBar()->Enable(wxID_SAVE,true);
+  GetMenuBar()->Enable(wxID_EXIT,true);
+}
+
+void wxPlayerFrame :: OnPlay()
+{
+  GetMenuBar()->Enable(wxID_OPEN,false);
+  GetMenuBar()->Enable(wxID_SAVE,false);
+  GetMenuBar()->Enable(wxID_EXIT,false);
+}
+
+wxPlayerFrame::~wxPlayerFrame() 
+{
+}
diff --git a/lib-src/sbsms/src/wxplayerframe.h b/lib-src/sbsms/src/wxplayerframe.h
new file mode 100644
index 0000000..5e9f920
--- /dev/null
+++ b/lib-src/sbsms/src/wxplayerframe.h
@@ -0,0 +1,27 @@
+#ifndef WXPLAYERFRAME_H
+#define WXPLAYERFRAME_H
+
+#include "wx/wx.h"
+#include "play.h"
+#include "wxplayctrl.h"
+
+class wxPlayerFrame : public wxFrame 
+{
+ public:
+  wxPlayerFrame(sbsmsplayer *player);
+  ~wxPlayerFrame();
+
+  void OnPause();
+  void OnPlay();
+  void OnOpen(wxCommandEvent& WXUNUSED(event));
+  void OnSave(wxCommandEvent& WXUNUSED(event));
+  void OnExit(wxCommandEvent& WXUNUSED(event));
+
+  DECLARE_EVENT_TABLE()
+ protected:
+  wxString openFileName;
+  sbsmsplayer *player;
+  PlayCtrl *playCtrl;
+};
+
+#endif
diff --git a/lib-src/sbsms/stamp-h1 b/lib-src/sbsms/stamp-h1
new file mode 100644
index 0000000..4547fe1
--- /dev/null
+++ b/lib-src/sbsms/stamp-h1
@@ -0,0 +1 @@
+timestamp for config.h
diff --git a/lib-src/sbsms/win/config.h b/lib-src/sbsms/win/config.h
new file mode 100644
index 0000000..1cf1b21
--- /dev/null
+++ b/lib-src/sbsms/win/config.h
@@ -0,0 +1,97 @@
+/* Windows specific config.h */
+
+/* Define to 1 if you have the `calloc' function. */
+#define HAVE_CALLOC 1
+
+/* Define to 1 if you have the `ceil' function. */
+#define HAVE_CEIL 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+// #define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `floor' function. */
+#define HAVE_FLOOR 1
+
+/* Define to 1 if you have the `free' function. */
+#define HAVE_FREE 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+// #define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+// #define HAVE_LIBM 1
+
+/* Define to 1 if you have the `lrint' function. */
+// #define HAVE_LRINT 1
+
+/* Define to 1 if you have the `lrintf' function. */
+// #define HAVE_LRINTF 1
+
+/* Define to 1 if you have the `malloc' function. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `sqrt' function. */
+#define HAVE_SQRT 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+// #define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "libsbsms"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "sbsms"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "sbsms 1.5.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "sbsms"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.5.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.5.0"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  define WORDS_BIGENDIAN 1
+# endif
+#endif
diff --git a/lib-src/sbsms/win/libmad/libmad.vcproj b/lib-src/sbsms/win/libmad/libmad.vcproj
new file mode 100644
index 0000000..fa7cb4f
--- /dev/null
+++ b/lib-src/sbsms/win/libmad/libmad.vcproj
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libmad"
+	ProjectGUID="{74635DE6-DD14-4BAD-B820-A7531766D78E}"
+	RootNamespace="libmad"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\libmad\msvc++"
+				PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN32;_DEBUG;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\Debug/libmad.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Debug\libmad.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/libmad.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\libmad\msvc++"
+				PreprocessorDefinitions="NDEBUG;FPM_INTEL;WIN32;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/libmad.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\libmad.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/libmad.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="c"
+			>
+			<File
+				RelativePath="..\..\..\libmad\bit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\decoder.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\fixed.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\frame.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\huffman.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\layer12.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\layer3.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\stream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\synth.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\timer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\version.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h"
+			>
+			<File
+				RelativePath="..\..\..\libmad\bit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\decoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\fixed.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\frame.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\global.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\huffman.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\layer12.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\layer3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\mad.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\stream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\synth.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\timer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Data Files"
+			Filter="dat"
+			>
+			<File
+				RelativePath="..\..\..\libmad\D.dat"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\imdct_s.dat"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\qc_table.dat"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\rq_table.dat"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libmad\sf_table.dat"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/sbsms/win/libsndfile/libsndfile.vcproj b/lib-src/sbsms/win/libsndfile/libsndfile.vcproj
new file mode 100644
index 0000000..1d41b3e
--- /dev/null
+++ b/lib-src/sbsms/win/libsndfile/libsndfile.vcproj
@@ -0,0 +1,945 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libsndfile"
+	ProjectGUID="{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}"
+	RootNamespace="libsndfile"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\$(ConfigurationName)"
+			IntermediateDirectory=".\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\libsndfile\Win32;..\..\..\libsndfile\include;..\..\..\libsndfile\src"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfiled.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\$(ConfigurationName)"
+			IntermediateDirectory=".\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/O2"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\libsndfile\Win32;..\..\..\libsndfile\include;..\..\..\libsndfile\src"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfile.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode_Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,include,../src"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfileud.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode_Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/O2"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories=".,include,../src"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfileu.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,include,../src"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfiled.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug wx284|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,include,../src"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfiled.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Modular_Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/O2"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories=".,include,../src"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\$(ConfigurationName)/libsndfile.pch"
+				AssemblerListingLocation=".\$(ConfigurationName)/"
+				ObjectFile=".\$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="sndfile.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\libsndfile\src\aiff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\alaw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\au.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\avr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\broadcast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\caf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\command.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\dither.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\double64.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\dwd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\dwvw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\file_io.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\flac.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\float32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\g72x.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode_Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode_Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug DLL|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug wx284|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Modular_Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\gsm610.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\htk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\ima_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\interleave.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\ircam.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\macbinary3.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\macos.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\mat4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\mat5.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\ms_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\nist.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\ogg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\paf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\pcm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\pvf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\raw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\rx2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\sd2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\sds.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\sndfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\strings.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\svx.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\txw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\ulaw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\voc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\vox_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\w64.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\wav.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\wav_w64.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\wve.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\xi.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\libsndfile\src\common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\float_cast.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\sf_unistd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\sfconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\sfendian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\wav_w64.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="G72X"
+			>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g721.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g723_16.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g723_24.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g723_40.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g72x.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g72x.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\G72x\g72x_priv.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="GSM610"
+			>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\add.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\code.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\decode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm610_priv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm_create.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm_decode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm_destroy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm_encode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\gsm_option.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\long_term.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\lpc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\preprocess.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\rpe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\short_term.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\libsndfile\src\GSM610\table.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/sbsms/win/portaudio-v19/portaudio-v19.vcproj b/lib-src/sbsms/win/portaudio-v19/portaudio-v19.vcproj
new file mode 100644
index 0000000..a8fb5f6
--- /dev/null
+++ b/lib-src/sbsms/win/portaudio-v19/portaudio-v19.vcproj
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="portaudio-v19"
+	ProjectGUID="{7ABA0F80-94AE-4E82-AB89-2E1258212D59}"
+	RootNamespace="portaudio-v19"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Unicode Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="echo // Automatically generated file &gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portaudio-v19\src\common"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="set BASE=&quot;../../../lib-src/portaudio-v19&quot;&#x0D;&#x0A;set CFLAGS=/O2 /GL /I &quot;%BASE%/include&quot; /I &quot;%BASE%/src/common&quot; /I &quot;%BASE%/src/os/win&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /Gy /Fo&quot;$(IntDir)/&quot; /Fd&quot;$(IntDir)/&quot; /W3 /nologo /c /wd4996 /FI &quot;$(InputDir)/$(ConfigurationName)/config.h&quot; /errorReport:prompt&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%/lib/x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/common/asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/pc/asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;$(IntDir)/*.obj&quot; %LIBS%&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="echo // Automatically generated file &gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portaudio-v19\src\common"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				StringPooling="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="set BASE=&quot;../../../lib-src/portaudio-v19&quot;&#x0D;&#x0A;set CFLAGS=/Od /I &quot;%BASE%/include&quot; /I &quot;%BASE%/src/common&quot; /I &quot;%BASE%/src/os/win&quot; /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /RTC1 /MDd /Gy  /Fo&quot;$(IntDir)/&quot; /Fd&quot;$(IntDir)/&quot; /W3 /nologo /c /ZI /wd4996 /FI &quot;$(InputDir)/$(ConfigurationName)/config.h&quot; /errorReport:prompt&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%/lib/x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/common/asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/pc/asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;$(IntDir)/*.obj&quot; %LIBS%&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="echo // Automatically generated file &gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\portaudio-v19\include&quot;;&quot;..\..\..\portaudio-v19\src\common&quot;;&quot;..\..\..\portaudio-v19\src\os\win&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				StringPooling="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="set BASE=&quot;../../../portaudio-v19&quot;&#x0D;&#x0A;set CFLAGS=/O2 /GL /I &quot;%BASE%/include&quot; /I &quot;%BASE%/src/common&quot; /I &quot;%BASE%/src/os/win&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /Gy /Fo&quot;$(IntDir)/&quot; /Fd&quot;$(IntDir)/&quot; /W3 /nologo /c /wd4996 /FI &quot;$(InputDir)/$(ConfigurationName)/config.h&quot; /errorReport:prompt&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%/lib/x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/common/asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/pc/asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;$(IntDir)/*.obj&quot; %LIBS%&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="echo // Automatically generated file &gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_DS &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;IF &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_NO_ASIO &gt;&gt;&quot;$(InputDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;..\..\..\portaudio-v19\include&quot;;&quot;..\..\..\portaudio-v19\src\common&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+				ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="set BASE=&quot;../../../portaudio-v19&quot;&#x0D;&#x0A;set CFLAGS=/O2 /GL /I &quot;%BASE%/include&quot; /I &quot;%BASE%/src/common&quot; /I &quot;%BASE%/src/os/win&quot; /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /Gy /Fo&quot;$(IntDir)/&quot; /Fd&quot;$(IntDir)/&quot; /W3 /nologo /c /wd4996 /FI &quot;$(InputDir)/$(ConfigurationName)/config.h&quot; /errorReport:prompt&#x0D;&#x0A;set LIBS=&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%DXSDK_DIR%&quot;==&quot;&quot; goto NoDX&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds.c&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%DXSDK_DIR%/include&quot; &quot;%BASE%/src/hostapi/dsound/pa_win_ds_dynlink.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;set LIBS=&quot;%DXSDK_DIR%/lib/x86\dxguid.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoDX&#x0D;&#x0A;&#x0D;&#x0A;if &quot;%ASIOSDK_DIR%&quot;==&quot;&quot; goto NoASIO&#x0D;&#x0A;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/pa_asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%BASE%/src/hostapi/asio/iasiothiscallresolver.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/common/asio.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/asiodrivers.cpp&quot;&#x0D;&#x0A;cl %CFLAGS% /I &quot;%ASIOSDK_DIR%/common&quot; /I &quot;%ASIOSDK_DIR%/host&quot; /I &quot;%ASIOSDK_DIR%/host/pc&quot; &quot;%ASIOSDK_DIR%/host/pc/asiolist.cpp&quot;&#x0D;&#x0A;&#x0D;&#x0A;:NoASIO&#x0D;&#x0A;&#x0D;&#x0A;lib /OUT:&quot;$(TargetPath)&quot; &quot;$(IntDir)/*.obj&quot; %LIBS%&#x0D;&#x0A;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_allocation.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_allocation.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_converters.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_converters.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_cpuload.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_cpuload.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_debugprint.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_debugprint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_dither.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_dither.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_endianness.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_front.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_hostapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_memorybarrier.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_process.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_process.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_ringbuffer.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_ringbuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_skeleton.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_stream.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_stream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_trace.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_trace.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_types.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\common\pa_util.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="hostapi"
+				>
+				<Filter
+					Name="wmme"
+					>
+					<File
+						RelativePath="..\..\..\portaudio-v19\src\hostapi\wmme\pa_win_wmme.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="wdmks"
+					>
+				</Filter>
+				<Filter
+					Name="dsound"
+					>
+					<File
+						RelativePath="..\..\..\portaudio-v19\src\hostapi\dsound\pa_win_ds.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\..\..\portaudio-v19\src\hostapi\dsound\pa_win_ds_dynlink.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\..\..\portaudio-v19\src\hostapi\dsound\pa_win_ds_dynlink.h"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+				<Filter
+					Name="asio"
+					>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="os"
+				>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_win_hostapis.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_win_util.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_win_waveformat.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\include\pa_win_waveformat.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_win_wdmks_utils.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_win_wdmks_utils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_x86_plain_converters.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\portaudio-v19\src\os\win\pa_x86_plain_converters.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\..\..\portaudio-v19\include\pa_win_ds.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\portaudio-v19\include\pa_win_wmme.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\portaudio-v19\include\portaudio.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name=".Has Custom Build."
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/sbsms/win/pthread/pthread.vcproj b/lib-src/sbsms/win/pthread/pthread.vcproj
new file mode 100644
index 0000000..46a09d8
--- /dev/null
+++ b/lib-src/sbsms/win/pthread/pthread.vcproj
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pthread"
+	ProjectGUID="{2D6A5EE8-179C-43AB-B92F-00057911E102}"
+	RootNamespace="pthread"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\."
+			IntermediateDirectory=".\."
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\./pthread.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\pthread\pthreads.2"
+				PreprocessorDefinitions="__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;PTW32_STATIC_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\./pthread.pch"
+				AssemblerListingLocation=".\./"
+				ObjectFile=".\./"
+				ProgramDataBaseFileName=".\./"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,PTW32_RC_MSC"
+				Culture="1033"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\./pthread.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\."
+			IntermediateDirectory=".\."
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\./pthread.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\pthread\pthreads.2"
+				PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;PTW32_STATIC_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=".\./pthread.pch"
+				AssemblerListingLocation=".\./"
+				ObjectFile=".\./"
+				ProgramDataBaseFileName=".\./"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,PTW32_RC_MSC"
+				Culture="1033"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\./pthread.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\pthread\pthreads.2\pthread.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\pthread\pthreads.2\implement.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pthread\pthreads.2\pthread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pthread\pthreads.2\sched.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pthread\pthreads.2\semaphore.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="..\..\..\pthread\pthreads.2\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/sbsms/win/sbsms/sbsms.ICO b/lib-src/sbsms/win/sbsms/sbsms.ICO
new file mode 100755
index 0000000..c1c3342
Binary files /dev/null and b/lib-src/sbsms/win/sbsms/sbsms.ICO differ
diff --git a/lib-src/sbsms/win/sbsms/sbsms.rc b/lib-src/sbsms/win/sbsms/sbsms.rc
new file mode 100755
index 0000000..7acf8bc
--- /dev/null
+++ b/lib-src/sbsms/win/sbsms/sbsms.rc
@@ -0,0 +1,37 @@
+SBSMSLogo ICON "sbsms.ico"
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,7,0,0
+ PRODUCTVERSION 1,7,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Mune"
+            VALUE "FileDescription", "SBSMS wxPlayer"
+            VALUE "FileVersion", "1.7.0"
+            VALUE "InternalName", "SBSMS"
+            VALUE "LegalCopyright", "Copyright © 2008. All rights reserved."
+            VALUE "OriginalFilename", "sbsms.exe"
+            VALUE "ProductName", "SBSMS wxPlayer"
+            VALUE "ProductVersion", "1.7.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/lib-src/sbsms/win/sbsms/sbsms.sln b/lib-src/sbsms/win/sbsms/sbsms.sln
new file mode 100644
index 0000000..f2f37c9
--- /dev/null
+++ b/lib-src/sbsms/win/sbsms/sbsms.sln
@@ -0,0 +1,127 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sbsms", "sbsms.vcproj", "{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59} = {7ABA0F80-94AE-4E82-AB89-2E1258212D59}
+		{2D6A5EE8-179C-43AB-B92F-00057911E102} = {2D6A5EE8-179C-43AB-B92F-00057911E102}
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952} = {F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}
+		{74635DE6-DD14-4BAD-B820-A7531766D78E} = {74635DE6-DD14-4BAD-B820-A7531766D78E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmad", "..\libmad\libmad.vcproj", "{74635DE6-DD14-4BAD-B820-A7531766D78E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "..\libsndfile\libsndfile.vcproj", "{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio-v19", "..\portaudio-v19\portaudio-v19.vcproj", "{7ABA0F80-94AE-4E82-AB89-2E1258212D59}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "..\pthread\pthread.vcproj", "{2D6A5EE8-179C-43AB-B92F-00057911E102}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug DLL|Win32 = Debug DLL|Win32
+		Debug wx284|Win32 = Debug wx284|Win32
+		Debug|Win32 = Debug|Win32
+		Modular_Release|Win32 = Modular_Release|Win32
+		Release|Win32 = Release|Win32
+		Unicode Debug|Win32 = Unicode Debug|Win32
+		Unicode Release|Win32 = Unicode Release|Win32
+		Unicode_Debug|Win32 = Unicode_Debug|Win32
+		Unicode_Release|Win32 = Unicode_Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Debug DLL|Win32.Build.0 = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Debug wx284|Win32.ActiveCfg = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Debug wx284|Win32.Build.0 = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Debug|Win32.Build.0 = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Modular_Release|Win32.ActiveCfg = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Modular_Release|Win32.Build.0 = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Release|Win32.ActiveCfg = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Release|Win32.Build.0 = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode Debug|Win32.Build.0 = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode Release|Win32.ActiveCfg = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode Release|Win32.Build.0 = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode_Debug|Win32.ActiveCfg = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode_Debug|Win32.Build.0 = Debug|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode_Release|Win32.ActiveCfg = Release|Win32
+		{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}.Unicode_Release|Win32.Build.0 = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Debug DLL|Win32.Build.0 = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Debug wx284|Win32.ActiveCfg = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Debug wx284|Win32.Build.0 = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Debug|Win32.Build.0 = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Modular_Release|Win32.ActiveCfg = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Modular_Release|Win32.Build.0 = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Release|Win32.ActiveCfg = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Release|Win32.Build.0 = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode Debug|Win32.Build.0 = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode Release|Win32.ActiveCfg = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode Release|Win32.Build.0 = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode_Debug|Win32.ActiveCfg = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode_Debug|Win32.Build.0 = Debug|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode_Release|Win32.ActiveCfg = Release|Win32
+		{74635DE6-DD14-4BAD-B820-A7531766D78E}.Unicode_Release|Win32.Build.0 = Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug DLL|Win32.Build.0 = Debug DLL|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug wx284|Win32.ActiveCfg = Debug wx284|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug wx284|Win32.Build.0 = Debug wx284|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug|Win32.Build.0 = Debug|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Modular_Release|Win32.ActiveCfg = Modular_Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Modular_Release|Win32.Build.0 = Modular_Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Release|Win32.ActiveCfg = Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Release|Win32.Build.0 = Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode Debug|Win32.Build.0 = Debug|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode Release|Win32.ActiveCfg = Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode Release|Win32.Build.0 = Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode_Debug|Win32.ActiveCfg = Unicode_Debug|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode_Debug|Win32.Build.0 = Unicode_Debug|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode_Release|Win32.ActiveCfg = Unicode_Release|Win32
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Unicode_Release|Win32.Build.0 = Unicode_Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug DLL|Win32.Build.0 = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug wx284|Win32.ActiveCfg = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug wx284|Win32.Build.0 = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug|Win32.Build.0 = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Modular_Release|Win32.ActiveCfg = Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Modular_Release|Win32.Build.0 = Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Release|Win32.ActiveCfg = Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Release|Win32.Build.0 = Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode_Debug|Win32.ActiveCfg = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode_Debug|Win32.Build.0 = Debug|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode_Release|Win32.ActiveCfg = Release|Win32
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Unicode_Release|Win32.Build.0 = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Debug DLL|Win32.Build.0 = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Debug wx284|Win32.ActiveCfg = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Debug wx284|Win32.Build.0 = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Debug|Win32.Build.0 = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Modular_Release|Win32.ActiveCfg = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Modular_Release|Win32.Build.0 = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Release|Win32.ActiveCfg = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Release|Win32.Build.0 = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode Debug|Win32.Build.0 = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode Release|Win32.ActiveCfg = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode Release|Win32.Build.0 = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode_Debug|Win32.ActiveCfg = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode_Debug|Win32.Build.0 = Debug|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode_Release|Win32.ActiveCfg = Release|Win32
+		{2D6A5EE8-179C-43AB-B92F-00057911E102}.Unicode_Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/lib-src/sbsms/win/sbsms/sbsms.vcproj b/lib-src/sbsms/win/sbsms/sbsms.vcproj
new file mode 100644
index 0000000..180b09d
--- /dev/null
+++ b/lib-src/sbsms/win/sbsms/sbsms.vcproj
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="sbsms"
+	ProjectGUID="{772B2532-A638-4E55-83D4-A2F6DCEEBAA5}"
+	RootNamespace="sbsms"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_lib\msw&quot;;&quot;$(WXWIN)\include&quot;;..\..\win;..\..\include;..\..\..\pthread\pthreads.2;..\..\..\libmad;..\..\..\libsndfile\Win32;&quot;..\..\..\portaudio-v19\include&quot;"
+				PreprocessorDefinitions="MULTITHREADED;HAVE_MAD;HAVE_PORTAUDIO;HAVE_SNDFILE;HAVE_WX;PTW32_STATIC_LIB;_WIN32;__WXDEBUG__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="true"
+				AdditionalDependencies="User32.lib uuid.lib rpcrt4.lib winmm.lib ws2_32.lib wxbase28d.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxmsw28d_html.lib wxexpatd.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib comctl32.lib"
+				AdditionalLibraryDirectories="&quot;$(WXWIN)\lib\vc_lib&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="C:\wix\candle.exe sbsms.wxs -out sbsms.wixobj&#x0D;&#x0A;C:\wix\light.exe sbsms.wixobj -out sbsms.msi&#x0D;&#x0A;"
+				AdditionalDependencies="sbsms.wxs;sbsms.wxi"
+				Outputs="sbsms.msi"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_lib\msw&quot;;&quot;$(WXWIN)\include&quot;;..\..\win;..\..\include;..\..\..\pthread\pthreads.2;..\..\..\libmad;..\..\..\libsndfile\Win32;&quot;..\..\..\portaudio-v19\include&quot;"
+				PreprocessorDefinitions="MULTITHREADED;HAVE_MAD;HAVE_PORTAUDIO;HAVE_SNDFILE;HAVE_WX;PTW32_STATIC_LIB;_WIN32;__WXMSW__"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib wxbase28.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_core.lib wxmsw28_html.lib wxexpat.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib comctl32.lib"
+				AdditionalLibraryDirectories="&quot;$(WXWIN)\lib\vc_lib&quot;"
+				IgnoreAllDefaultLibraries="false"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\src\audio.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\audiobuffer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\btndown.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\buffer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\convert.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\fft.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\grain.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\import.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mp3.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mp3tech.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\pcm.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\peak.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\pitch.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\play.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="HAVE_SNDFILE HAVE_MAD HAVE_PORTAUDIO HAVE_WX"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\resample.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sbsms.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sms.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\subband.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\track.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\trackpoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxconvertdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxplayctrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxplayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxplayerframe.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\src\audio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\audiobuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\btndown.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\convert.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\defs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\fft.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\grain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\import.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mp3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mp3tech.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\pcm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\peak.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\play.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\real.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\sbsms.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sincCoeffs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\sms.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\subband.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\track.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\trackpoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxconvertdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxplayctrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wxplayer.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\sbsms.ICO"
+				>
+			</File>
+			<File
+				RelativePath=".\sbsms.rc"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\sbsms.wxs"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib-src/sbsms/win/sbsms/sbsms.wxs b/lib-src/sbsms/win/sbsms/sbsms.wxs
new file mode 100755
index 0000000..ccfeeef
--- /dev/null
+++ b/lib-src/sbsms/win/sbsms/sbsms.wxs
@@ -0,0 +1,78 @@
+<?xml version='1.0'?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<Product Name='SBSMS wxPlayer'
+		 Id='7f61c8e4-cc63-4128-934a-a2fc5ed2ffaa'
+         UpgradeCode='e7dc7219-11b2-4b2e-bddf-6b266796a7ec'
+		 Language='1033' 
+         Version='1.7.0.0'
+         Manufacturer='Mune'>
+  <Package Description='sbsms'
+           Manufacturer='Mune'
+           InstallerVersion='300'
+		   Compressed='yes' />
+  <Media Id='1' Cabinet='sbsms.cab' EmbedCab='yes' />
+  <Property Id='DiskPrompt' Value="SBSMS wxPlayer 1.7.0 Installation" />
+
+
+  <Directory Id='TARGETDIR' Name='SourceDir'>
+	  <Merge Id='CRT'
+		  Language='0'
+		  SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\microsoft_vc90_crt_x86.msm'
+		  DiskId='1' />
+
+	  <Merge Id='CRT Policy'
+			 Language='0'
+			 SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm'
+			 DiskId='1' />
+
+	  <Directory Id='ProgramFilesFolder' Name='PFiles'>
+  <Directory Id='Mune' Name='Mune'>
+  <Directory Id='INSTALLDIR' Name='SBSMS wxPlayer 1.7.0'>   
+    <Component Id='sbsmsexe' DiskId='1' Guid='326553d2-2ab4-4a8b-8da2-062c6b3dd0b3'>
+		<File Id='sbsmsexe'
+			  Name='sbsms.exe'
+			  DiskId='1'
+			  Source='Release\sbsms.exe'>
+		  <Shortcut Id="startmenushortcut"
+					   Directory="ProgramMenuDir"
+					   Name="SBSMS wxPlayer 1.7.0"
+					   WorkingDirectory='INSTALLDIR'
+					/>		
+		  <Shortcut Id="desktopshortcut"
+					Directory="DesktopFolder"
+					Name="SBSMS wxPlayer 1.7.0"
+					WorkingDirectory='INSTALLDIR'
+				
+					/>
+	  </File>
+    </Component>
+ 
+  </Directory>
+  </Directory>
+  </Directory>
+
+  <Directory Id="ProgramMenuFolder" Name="Programs">
+    <Directory Id="ProgramMenuDir" Name="SBSMS wxPlayer 1.7.0" />
+    </Directory>
+  <Directory Id="DesktopFolder" Name="Desktop" />
+
+  </Directory>
+
+
+  <Feature Id='sbsms' Title='SBSMS wxPlayer' Description='SBSMS wxPlayer package' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
+	  <MergeRef Id='CRT' />
+	  <MergeRef Id='CRT Policy' />
+	  <ComponentRef Id='sbsmsexe' />
+  </Feature>
+
+
+	<InstallExecuteSequence>
+		<RemoveRegistryValues/>
+		<RemoveFiles/>
+		<InstallFiles/>
+		<WriteRegistryValues/>
+	</InstallExecuteSequence>
+	
+</Product>
+</Wix>
\ No newline at end of file
diff --git a/locale/Makefile.in b/locale/Makefile.in
index f942a60..3a70852 100644
--- a/locale/Makefile.in
+++ b/locale/Makefile.in
@@ -8,13 +8,15 @@
 # This makefile may be invoked to build either audacity.pot or any lang.mo
 
 PROGNAME=audacity
-LINGUAS=af ar bn bg ca cb cs cy da de el es eu fa fi fr ga gl he hu it ja ko lt mk nb nl oc pl pt_BR ro ru sk sl sv tg tr uk vi zh zh_TW
+LINGUAS=af ar bn bg bs ca ca at valencia cs cy da de el es eu fa fi fr ga gl he hu id it ja ka km ko lt mk nb nl oc pl pt_BR ro ru sk sl sv tg tr uk vi zh zh_TW
 # these languages are not generated because they are currently unmaintained and
 # overlapped by another one:
 # pt - Cleber maintains pt_BR, and we do not have a pt_PT maintainer.
 
 prefix=@prefix@
+datarootdir=@datarootdir@
 DATADIR=@datadir@
+DATAROOTDIR=@datarootdir@
 # this is where locale-dependant stuff (i.e. .mo files) goes
 LOCALEDIR=@localedir@
 INSTALL=@INSTALL@
@@ -77,7 +79,7 @@ $(POTFILE):
 	  | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) \
 	  -o ../locale/$(POTFILE).template
 	cd ../locale && sed \
-	  -e 's/PACKAGE VERSION/Audacity 1.3.6/' \
+	  -e 's/PACKAGE VERSION/Audacity 1.3.7/' \
 	  -e 's/SOME DESCRIPTIVE TITLE/Audacity Strings for Translation/' \
 	  -e 's/YEAR-MO-DA HO:MI+ZONE/1999 and beyond/' \
 	  -e 's/THE PACKAGE.S COPYRIGHT HOLDER/Audacity Development Team/' \
diff --git a/locale/af.po b/locale/af.po
index 870eabd..2504786 100644
--- a/locale/af.po
+++ b/locale/af.po
@@ -2,8 +2,7 @@
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # F Wolff <friedel at translate.org.za>, 2006.
 msgid ""
-msgstr ""
-"Project-Id-Version: audacity-af\n"
+msgstr "Project-Id-Version: audacity-af\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2007-10-18 22:39+0100\n"
 "PO-Revision-Date: 2007-10-27 23:04+0200\n"
@@ -18,58 +17,24 @@ msgstr ""
 msgid "&About Audacity..."
 msgstr "&Aangaande Audacity..."
 
-#: AboutDialog.cpp:165 effects/AvcCompressor.cpp:674
-msgid "Enabled"
-msgstr "Geaktiveer"
-
-#: AboutDialog.cpp:166
-msgid "Disabled"
-msgstr "Gedeaktiveer"
-
-#: AboutDialog.cpp:229
-msgid "Program build date: "
-msgstr "Program gebou op:"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
+msgstr ""
 
-#: AboutDialog.cpp:234
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:239
-msgid ""
-"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."
-msgstr ""
-"Audacity is 'n Vrye program wat geskryf word deur 'n span vrywillige "
-"programmeerders van regoor die wêreld.  Koördinasie geskied danksy "
-"SourceForge.net, 'n aanlyn diens wat gratis gereedskap verskaf vir oopbron-"
-"sagtewareprojekte.  Audacity is beskikbaar vir Windows 98 en nuwer, Mac OS "
-"X, Linux en ander Unix-tipe bedryfstelsels.  Ouer weergawes van Audacity is "
-"beskikbaar vir Mac OS 9."
-
-#: AboutDialog.cpp:243
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"Hierdie is 'n beta-weergawe van die program.  Dit kan foute en onvoltooide "
-"aspekte hê. Ons maak staat op u terugvoer. Besoek dus gerus ons werf met "
-"foutverslae en funksionaliteitsversoeke."
 
-#: AboutDialog.cpp:246
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"Hierdie is 'n stabiele, voltooide vrystelling van Audacity.  As u egter 'n "
-"fout teëkom of 'n voorstel het, kontak ons gerus.  Ons maak staat op "
-"terugvoer van gebruikers vir volgehoue verbetering van Audacity.  Vir meer "
-"inligting, besoek gerus on webwerf."
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -81,13 +46,9 @@ msgstr ""
 msgid "translator_credits"
 msgstr "Afrikaanse vertaling deur Friedel Wolff <friedel BY translate.org.za>"
 
-#: AboutDialog.cpp:271
-msgid "A Free Digital Audio Editor"
-msgstr "'n Vrye digitale oudioredigeerder"
-
-#: AboutDialog.cpp:275
-msgid "Information"
-msgstr "Inligting"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:277
 msgid "Credits"
@@ -123,25 +84,117 @@ msgstr "Audacity is gebaseer op kode van die volgende projekte:"
 msgid "Special thanks:"
 msgstr "Spesiale dank aan:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr "Audacity"
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: AboutDialog.cpp:165 effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Geaktiveer"
+
+#: AboutDialog.cpp:166
+msgid "Disabled"
+msgstr "Gedeaktiveer"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:229
+msgid "Program build date: "
+msgstr "Program gebou op:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:234
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr "GPL-lisensie"
 
-#: AboutDialog.cpp:688 FreqWindow.cpp:209 widgets/ErrorDialog.cpp:135
-msgid "Close"
-msgstr "Sluit"
-
 #: AudacityApp.cpp:458 Project.cpp:1751
 #, c-format
 msgid "%s is already open in another window."
@@ -154,12 +207,10 @@ msgstr "Fout met oopmaak van projek"
 
 #: AudacityApp.cpp:492
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s bestaan nie en kon nie geopen word nie.\n"
+msgstr "%s bestaan nie en kon nie geopen word nie.\n"
 "\n"
 "Dit is uit die geskiedenislys verwyder."
 
@@ -192,37 +243,27 @@ msgid "Unknown command line option: %s\n"
 msgstr "Onbekende opdraglyn-opsie: %s\n"
 
 #: AudacityApp.cpp:1027
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity kon nie 'n plek vind om tydelike lêers te stoor nie.\n"
+msgstr "Audacity kon nie 'n plek vind om tydelike lêers te stoor nie.\n"
 "Spesifiseer die verlangde gids by die voorkeure."
 
 #: AudacityApp.cpp:1033
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
-msgstr ""
-"Audacity gaan nou afsluit. Laat loop Audacity weer om die nuwe tydelike "
-"gids te gebruik."
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity gaan nou afsluit. Laat loop Audacity weer om die nuwe tydelike gids te gebruik."
 
 #: AudacityApp.cpp:1065
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Twee kopieë van Audacity wat gelyktydig loop kan dataverlies\n"
+msgstr "Twee kopieë van Audacity wat gelyktydig loop kan dataverlies\n"
 "of onstabiliteit veroorsaak.\n"
 "\n"
 
 #: AudacityApp.cpp:1072
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audcity kon nie die gids vir tydelike lêers sluit nie.\n"
+msgstr "Audcity kon nie die gids vir tydelike lêers sluit nie.\n"
 "Miskien gebruik 'n ander kopie van Audacity dié gids.\n"
 
 #: AudacityApp.cpp:1074
@@ -238,11 +279,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Die stelsel rapporteer dat Audacity reeds loop.\n"
 
 #: AudacityApp.cpp:1116
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Gebruik die 'Nuut'- of 'Open'-opdragte in die Audacity wat reeds loop\n"
+msgstr "Gebruik die 'Nuut'- of 'Open'-opdragte in die Audacity wat reeds loop\n"
 "om projekte gelyktydig oop te maak.\n"
 
 #: AudacityApp.cpp:1117
@@ -280,21 +319,15 @@ msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "-blocksize nnn (maksimum skyfblokgrootte in grepe)"
 
 #: AudacityApp.cpp:1149
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
-msgstr ""
-"Verder, spesifiseer die naam van 'n oudiolêer of Audacity-projek om dit te "
-"open."
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "Verder, spesifiseer die naam van 'n oudiolêer of Audacity-projek om dit te open."
 
 #: AudacityApp.cpp:1421
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Audacity-projeklêers (.aup) word nie tans\n"
+msgstr "Audacity-projeklêers (.aup) word nie tans\n"
 "geassosieer met Audacity nie.\n"
 "\n"
 "Assosieer hulle sodat hulle met 'n dubbelklik oopmaak?"
@@ -308,11 +341,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Kon nie enige oudiotoestelle vind nie.\n"
 
 #: AudioIO.cpp:220
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"U sal nie oudio kan speel of opneem nie.\n"
+msgstr "U sal nie oudio kan speel of opneem nie.\n"
 "\n"
 
 #: AudioIO.cpp:223
@@ -328,11 +359,9 @@ msgid "Latency problem"
 msgstr ""
 
 #: AudioIO.cpp:1236
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
 msgstr ""
 
 #: AutoRecovery.cpp:54
@@ -340,11 +369,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Outomatiese herstel na omval"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Sommige projekte is nie korrek gestoor toe Audacity laas gebruik is nie.\n"
+msgstr "Sommige projekte is nie korrek gestoor toe Audacity laas gebruik is nie.\n"
 "Die volgende projekte kan gelukkig outomaties herwin word:"
 
 #: AutoRecovery.cpp:75
@@ -356,37 +383,30 @@ msgid "Name"
 msgstr "Naam"
 
 #: AutoRecovery.cpp:84
-msgid ""
-"Recovering a project will not change any files on disk before you save it."
-msgstr ""
-"Die herwinnig van 'n projek sal geen skyflêers verander voordat mens dit "
-"stoor nie."
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "Die herwinnig van 'n projek sal geen skyflêers verander voordat mens dit stoor nie."
 
 #: AutoRecovery.cpp:88
 msgid "Quit Audacity"
 msgstr "Sluit Audacity af"
 
 #: AutoRecovery.cpp:89
-msgid "Don't recover"
-msgstr "Moenie herwin nie"
+msgid "Do Not Recover"
+msgstr ""
 
 #: AutoRecovery.cpp:90
-msgid "Recover projects"
+#, fuzzy
+msgid "Recover Projects"
 msgstr "Herwin projekte"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"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?"
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
-"U het gekies om nié projekte te herwin nie. Hierdie projekte sal nie later "
-"herwin kan word as mens dan so wil maak nie. Wil u definitief voortgaan met "
-"herwinning?"
 
 #: AutoRecovery.cpp:128
-msgid "Question"
-msgstr "Vraag"
+msgid "Confirm?"
+msgstr ""
 
 #: AutoRecovery.cpp:146 AutoRecovery.cpp:183
 msgid "Could not enumerate files in auto save directory"
@@ -423,8 +443,9 @@ msgstr "&Parameters"
 msgid "C&hoose command"
 msgstr "&Kies opdrag"
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
 msgstr "Stereo-na-mono-effek nie gevind nie"
 
 #: BatchCommands.cpp:497
@@ -442,11 +463,9 @@ msgstr "Die opdrag '%s' is nog nie geïmplementeer nie"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Kon nie die effek '%s' se parameters\n"
+msgstr "Kon nie die effek '%s' se parameters\n"
 "stel na '%s' nie."
 
 #: BatchCommands.cpp:583
@@ -456,12 +475,10 @@ msgstr "Die gegewe bondelopdrag, '%s', is nie erken nie."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Pas '%s' toe met parameter(s)\n"
+msgstr "Pas '%s' toe met parameter(s)\n"
 "\n"
 "%s"
 
@@ -479,6 +496,10 @@ msgstr "Pas '%s' toe"
 msgid "Apply Chain"
 msgstr "Pas ketting toe"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Kies ketting"
@@ -516,19 +537,21 @@ msgstr "'%s' word op die huidige projek toegepas"
 msgid "Please save and close the current project first."
 msgstr "Stoor en sluit die huidige projek eers af."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Kies lêer(s) vir bondelverwerking..."
 
-#: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
 msgstr ""
-"Alle lêers (*.*)|*.*|WAV-lêers (*.wav)|*.wav|AIFF-lêers "
-"(*.aif)|*.aif|AU-lêers (*.au)|*.au|MP3-lêers (*.mp3)|*.mp3|Ogg Vorbis-lêers "
-"(*.ogg)|*.ogg|FLAC-lêers (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Alle lêers (*.*)|*.*|WAV-lêers (*.wav)|*.wav|AIFF-lêers (*.aif)|*.aif|AU-lêers (*.au)|*.au|MP3-lêers (*.mp3)|*.mp3|Ogg Vorbis-lêers (*.ogg)|*.ogg|FLAC-lêers (*.flac)|*.flac"
 
 #: BatchProcessDialog.cpp:231
 msgid "Applying..."
@@ -629,13 +652,10 @@ msgid "Copying audio data into project..."
 msgstr "Oudiodata word in projek in gekopieer..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"U projek benodig ander lêers.  Moet die oudio van die volgende\n"
+msgstr "U projek benodig ander lêers.  Moet die oudio van die volgende\n"
 "lêers in die projek ingekopieer word om dit self-bevattend is?\n"
 "Dis veiliger, maar benodig meer skyfspasie."
 
@@ -663,13 +683,13 @@ msgstr "Kopieer gekose oudio in projek in"
 msgid "Cancel Save"
 msgstr "Kanselleer stoor"
 
-#: Dependencies.cpp:306
-msgid "Don't Copy any Audio"
-msgstr "Moenie enige oudio kopieer nie"
+#: Dependencies.cpp:310
+msgid "Do Not Copy Any Audio"
+msgstr ""
 
-#: Dependencies.cpp:308
-msgid "Copy All Audio Into Project (safer)"
-msgstr "Kopieer alle oudio in projek in (veiliger)"
+#: Dependencies.cpp:312
+msgid "Copy All Audio into Project (Safer)"
+msgstr ""
 
 #: Dependencies.cpp:317 Dependencies.cpp:322
 msgid "Ask me"
@@ -688,30 +708,21 @@ msgid "Whenever a project depends on other files:"
 msgstr "Wanneer 'n projek van ander lêers afhanklik is:"
 
 #: Dependencies.cpp:409
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
-msgstr ""
-"Indien u voortgaan, word ie projek nie gestoor nie. Is dit wat u wil hê?"
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "Indien u voortgaan, word ie projek nie gestoor nie. Is dit wat u wil hê?"
 
 #: Dependencies.cpp:449
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
-msgstr ""
-"U projek is selfbevattend; dit is nie afhanklik van enige eksterne "
-"oudiolêers nie."
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "U projek is selfbevattend; dit is nie afhanklik van enige eksterne oudiolêers nie."
 
 #: Dependencies.cpp:450
 msgid "Dependency check"
 msgstr "Afhanklikheidstoets"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Waarskuwing: daar is baie min skyfspasie oor op hierdie skyf.\n"
+msgstr "Waarskuwing: daar is baie min skyfspasie oor op hierdie skyf.\n"
 "Kies asseblief 'n ander tydelike gids by die voorkeure."
 
 #: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
@@ -732,10 +743,8 @@ msgstr "Kasgidse word skoonbemaak"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
 msgstr ""
 
 #. i18n-hint: This is the pattern for filenames that are created
@@ -760,17 +769,16 @@ msgstr "Kon nie '%s' skrap nie"
 msgid "Renamed file: %s\n"
 msgstr "Lêer hernoem: %s\n"
 
-# s.nw.?
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Aanpas van blok %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Kon nie '%s' na '%s' hernoem nie"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr "Projeklêerdata word geïnspekteer..."
@@ -796,16 +804,13 @@ msgid "Missing data file: (%s.au)"
 msgstr ""
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 msgstr ""
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr ""
@@ -830,8 +835,7 @@ msgstr "Waarskuwing"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
@@ -853,8 +857,7 @@ msgstr "Sluit projek onmiddelik af sonder verdere veranderings"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
 msgstr ""
@@ -869,8 +872,7 @@ msgstr ""
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
@@ -907,6 +909,95 @@ msgstr "Opgeneemde oudio word na skyf gestoor..."
 msgid "Rectangular"
 msgstr "Reghoekig"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr "Ligging van %s:"
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Om %s op te spoor, klik hier -->"
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr "Blaai..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:546
+#, c-format
+msgid "Where is %s?"
+msgstr "Waar is %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Frekwensieanalise"
@@ -934,8 +1025,9 @@ msgstr "Verbeterde outokorrelasie"
 msgid "Cepstrum"
 msgstr "Sepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algoritme:"
 
 #: FreqWindow.cpp:168 HistoryWindow.cpp:79
@@ -948,9 +1040,9 @@ msgstr "Grootte"
 msgid " window"
 msgstr " venster"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Funksie:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -960,14 +1052,22 @@ msgstr "Lineêre frekwensie"
 msgid "Log frequency"
 msgstr "Log-frekwensie"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "As:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:202 Menus.cpp:231
 msgid "&Export..."
 msgstr "&Voer uit..."
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr "Uitvoer"
+
+#: AboutDialog.cpp:688 FreqWindow.cpp:209 widgets/ErrorDialog.cpp:135
+msgid "Close"
+msgstr "Sluit"
+
 #: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:489
 #: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:791
 #: effects/Compressor.cpp:352 effects/Compressor.cpp:360
@@ -1000,10 +1100,8 @@ msgstr "Merker: %d Hz (%s) = %d dB    Piek: %d Hz (%s) = %.1f dB"
 
 #: FreqWindow.cpp:788
 #, c-format
-msgid ""
-"Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
-msgstr ""
-"Merker: %.4f sek (%d Hz) (%s) = %f,    Piek: %.4f sek (%d Hz) (%s) = %.3f"
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "Merker: %.4f sek (%d Hz) (%s) = %f,    Piek: %.4f sek (%d Hz) (%s) = %.3f"
 
 #: FreqWindow.cpp:1059
 msgid "spectrum.txt"
@@ -1026,16 +1124,8 @@ msgstr "Frekwensie (Hz)\tVolume (dB)"
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Vertraging (sekondes)\tFrekwensie (Hz)\tVolume"
 
-#: HelpText.cpp:53
-msgid " page."
-msgstr ""
-
-#: HelpText.cpp:53
-msgid "Back to "
-msgstr ""
-
-#: HelpText.cpp:53
-msgid "Welcome"
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -1051,497 +1141,100 @@ msgstr ""
 msgid "Recording Audio"
 msgstr "Opgeneemde oudio"
 
-#: HelpText.cpp:73
-msgid "Greyed Out Items"
-msgstr ""
-
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr "Uitvoer"
-
-#: HelpText.cpp:81
-msgid "Supported Formats"
-msgstr ""
-
-#: HelpText.cpp:85
-msgid "Burn to CD"
-msgstr ""
-
-#: HelpText.cpp:89
-msgid "No Local Help"
-msgstr ""
-
-#: HelpText.cpp:101
-msgid "Welcome to Audacity "
-msgstr ""
-
-#: HelpText.cpp:102
-msgid "Let's get started!"
-msgstr ""
-
-#: HelpText.cpp:104
-msgid "You can click on the links below to learn how to:"
-msgstr ""
-
-#: HelpText.cpp:106
-msgid " an existing sound file."
-msgstr ""
-
-#: HelpText.cpp:106
-#, fuzzy
-msgid "play back"
-msgstr "Terugspeel"
-
-#: HelpText.cpp:108
-msgid " a new sound file."
-msgstr ""
-
-#: HelpText.cpp:108 HelpText.cpp:110
-msgid "How to "
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
-#: HelpText.cpp:108
-#, fuzzy
-msgid "record"
-msgstr "Neem op"
-
-#: HelpText.cpp:110
-msgid " sound and "
-msgstr ""
-
-#: HelpText.cpp:110
-msgid "edit"
-msgstr ""
-
-#: HelpText.cpp:111
-msgid " to a sound file like MP3."
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
 msgstr ""
 
-#: HelpText.cpp:111
-#, fuzzy
-msgid "export"
-msgstr "Uitvoer"
-
 #: HelpText.cpp:113
-msgid "Those links will help if you find a problem such as a "
-msgstr ""
-
-#: HelpText.cpp:114
-msgid " or that Audacity "
-msgstr ""
-
-#: HelpText.cpp:114
-msgid "menu option greyed out"
-msgstr ""
-
-#: HelpText.cpp:115
-msgid " or that you "
-msgstr ""
-
-#: HelpText.cpp:115
-msgid "isn't recording properly"
-msgstr ""
-
-#: HelpText.cpp:116
-msgid "burn to a CD"
-msgstr ""
-
-#: HelpText.cpp:116
-msgid "can't "
+msgid "Recording - Setting the Input Level"
 msgstr ""
 
 #: HelpText.cpp:117
-msgid ""
-". You can always get back to these instructions by clicking the 'Help' menu, "
-"then 'Show Welcome Message.' "
-msgstr ""
-
-#: HelpText.cpp:119
-msgid "Welcome again to Audacity."
-msgstr ""
-
-#: HelpText.cpp:127
-msgid ""
-"You can either drag existing files into Audacity, or use the File > Import > "
-"Audio command."
-msgstr ""
-
-#: HelpText.cpp:128
-msgid ""
-"File > Open does the same, but opens a new Audacity window for any file "
-"after the first."
-msgstr ""
-
-#: HelpText.cpp:130
-msgid ""
-"These are the main formats Audacity will import for you: <b>AIFF, AU, FLAC, "
-"M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis, WAV</b>."
+msgid "Editing and greyed out Menus"
 msgstr ""
 
-#: HelpText.cpp:131
-msgid ""
-"If your file is in some other format see (format help). If you want to "
-"import an audio CD, see "
-msgstr ""
-
-#: HelpText.cpp:133
-msgid "To start playing your audio, press the green Play button. "
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
 msgstr ""
 
-#: HelpText.cpp:134
-msgid "To stop, press the yellow Stop button. "
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:135
-msgid "You can also use spacebar to either play or stop. "
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
-#: HelpText.cpp:136
-msgid ""
-"When you start playing again after stopping, playback resumes from its "
-"previous starting point."
-msgstr ""
-
-#: HelpText.cpp:137
-msgid ""
-"To change the starting point, use the |<< and |>> buttons to skip to the "
-"start or end respectively, or click anywhere in the track to restart from "
-"that point."
-msgstr ""
-
-#: HelpText.cpp:149
-msgid ""
-"<b>To start recording, press the red Record button</b>. Before doing so "
-"however, there are three crucial settings you must check:"
+#: HelpText.cpp:85
+msgid "Burn to CD"
 msgstr ""
 
-#: HelpText.cpp:152
-msgid ""
-"(1) The <b>Recording Device</b>, set in the Audio I/O tab of Preferences. "
+#: HelpText.cpp:89
+msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:153
-msgid ""
-"By default Audacity will use the current system device, which is usually "
-"your inbuilt sound device, so you may not need to set this. "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
 msgstr ""
 
-#: HelpText.cpp:154
-msgid ""
-"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. "
+#: HelpText.cpp:101
+msgid "Welcome to Audacity "
 msgstr ""
 
-#. i18n-hint: 2nd item in the list
-#: HelpText.cpp:157
-msgid ""
-"(2) The <b>input source</b> for your device, such as microphone or line-in. "
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
 #: HelpText.cpp:159
-msgid ""
-"<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>"
-msgstr ""
-
-#: HelpText.cpp:161
-msgid ""
-"<b>On a Mac</b>, you normally choose input sources outside Audacity, in "
-"Apple Audio-MIDI Setup."
-msgstr ""
-
-#: HelpText.cpp:163
-msgid ""
-"<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. "
-msgstr ""
-
-#. i18n-hint: Third and final item in list
-#: HelpText.cpp:166
-msgid ""
-"(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."
-msgstr ""
-
-#. i18n-hint: introduction to a set of steps to do something we have already
-#. * talked about
-#: HelpText.cpp:169
-msgid "To do this: "
-msgstr ""
-
-#: HelpText.cpp:171
-msgid ""
-"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"
-"\". "
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
 #: HelpText.cpp:172
-msgid ""
-"If you do not see the meters, click View > Toolbars and check \"Meter Toolbar"
-"\". "
-msgstr ""
-
-#: HelpText.cpp:174
-msgid ""
-"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. "
-msgstr ""
-
-#: HelpText.cpp:175
-msgid ""
-"If you can't hear the sound, go to the Audio I/O tab of Preferences and "
-"check \"Software Playthrough\". "
-msgstr ""
-
-#: HelpText.cpp:177
-msgid ""
-"There is more help if you're stuck: our Recording FAQs, our Tutorial  "
-"<b>Your First Recording </b> in the Manual, and our Wiki "
-msgstr ""
-
-#: HelpText.cpp:178
-msgid " section. "
-msgstr ""
-
-#: HelpText.cpp:178
-msgid ", especially the "
-msgstr ""
-
-#: HelpText.cpp:187
-msgid ""
-"Editing: Audacity is a powerful editor, so you'll want to see what it can do "
-"with your imported file or recording.  "
-msgstr ""
-
-#: HelpText.cpp:188
-msgid ""
-"The main commands you will use are under the Edit menu (such as cut, copy "
-"and paste) and under the Effect menu (you can do things like boost the bass, "
-"change pitch or tempo, or remove noise). "
-msgstr ""
-
-#: HelpText.cpp:190
-msgid ""
-"Audacity applies edits to areas of the audio track. You can select a "
-"particular area of audio by clicking in the track and dragging the shaded "
-"area with your mouse. "
-msgstr ""
-
-#: HelpText.cpp:191
-msgid ""
-"If you don't select any audio, Audacity will select all that you have on the "
-"screen."
-msgstr ""
-
-#: HelpText.cpp:193
-msgid "Two important points when editing:"
-msgstr ""
-
-#: HelpText.cpp:195
-msgid ""
-"(1) If you're still playing or recording, use the yellow Stop button, "
-"because you can't edit or export a moving track! "
-msgstr ""
-
-#: HelpText.cpp:197
-msgid ""
-"(2) On occasion, some of the menus or buttons are greyed out or say "
-"\"Disabled\" -  this is normal. "
-msgstr ""
-
-#: HelpText.cpp:198
-msgid ""
-"For example, because you can't edit audio while playing or recording, we "
-"grey out or disable commands until you press Stop. "
-msgstr ""
-
-#: HelpText.cpp:199
-msgid ""
-"Commands can sometimes be unavailable for other reasons - for example you "
-"can't run effects until you have audio on the screen, and you obviously "
-"can't paste audio until you've cut or copied it to Audacity's clipboard. "
-msgstr ""
-
-#: HelpText.cpp:208
-msgid "Exporting and Saving. have different purposes."
-msgstr ""
-
-#: HelpText.cpp:209
-msgid ""
-"You \" save\" an Audacity project file when you want to return to your work "
-"in Audacity later."
-msgstr ""
-
-#: HelpText.cpp:210
-msgid ""
-"This means you don't then have to re-import or re-record audio, or redo "
-"editing you have done so far."
-msgstr ""
-
-#: HelpText.cpp:211
-msgid ""
-"When you want to listen to your work in other computer programs or burn it "
-"to CD, you \"export\" it as an audio file such as a WAV, AIFF or MP3. "
-msgstr ""
-
-#: HelpText.cpp:213
-msgid ""
-"To save an Audacity project, use <b>File > Save Project</b>. This will save "
-"an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the "
-"actual audio. "
-msgstr ""
-
-#: HelpText.cpp:214
-msgid ""
-"Make sure you don't rename or move either of these, because Audacity needs "
-"to refer to both."
-msgstr ""
-
-#: HelpText.cpp:215
-msgid ""
-"Only use File > Save Project As. when you either need to save an empty "
-"Project, or if you want to save an existing Project to a <i> new</i> name. "
-msgstr ""
-
-#: HelpText.cpp:216
-msgid ""
-"When you want to re-open a saved Project, simply click File > Open and open "
-"the .aup file. "
-msgstr ""
-
-#: HelpText.cpp:218
-msgid ""
-"When you want to export your work to an audio file, use <b>File > Export</b> "
-"and choose your desired format in the \"Save as type\" dropdown."
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:219
-msgid ""
-"Click the Options button for advanced choices, such as the bit rate to use "
-"for MP3 export."
-msgstr ""
-
-#: HelpText.cpp:220
-msgid "There are two other Export commands under the File menu."
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
 #: HelpText.cpp:221
-msgid "\"Export Selection\" exports only a selected area of audio."
-msgstr ""
-
-#: HelpText.cpp:222
-msgid ""
-"\"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. "
-msgstr ""
-
-#: HelpText.cpp:224
-msgid ""
-"Before you can export as <b>MP3</b>, you need to add the LAME MP3 encoder to "
-"your computer."
-msgstr ""
-
-#: HelpText.cpp:225
-msgid "For help with LAME, see "
-msgstr ""
-
-#: HelpText.cpp:227
-msgid "There is also some help on how to "
-msgstr ""
-
-#: HelpText.cpp:227
-msgid "burn to a CD."
-msgstr ""
-
-#: HelpText.cpp:239
-msgid "Can Audacity import file formats like WMA, AAC, RealAudio  etc.?"
-msgstr ""
-
-#: HelpText.cpp:241
-msgid ""
-"Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</"
-"b>, or most other proprietary formats, because of licensing and patent "
-"restrictions."
-msgstr ""
-
-#: HelpText.cpp:242
-msgid ""
-"Audacity also cannot import any kind of Digital Rights Management (DRM) "
-"protected file, including most purchased online such as from iTunes or "
-"Napster."
-msgstr ""
-
-#: HelpText.cpp:243
-msgid ""
-"If you are on a Mac, you can import <b>AAC</b>  encoded files (such as "
-"<b>M4A</b>) as long as they are not DRM protected, but you cannot export to "
-"these formats."
-msgstr ""
-
-#: HelpText.cpp:245
-msgid ""
-"Some open formats are not yet supported by Audacity, including <b>Ogg Speex</"
-"b> and <b>Musepack</b>."
-msgstr ""
-
-#: HelpText.cpp:246
-msgid "We hope to support these formats in future versions of Audacity."
-msgstr ""
-
-#: HelpText.cpp:248
-msgid ""
-"If you cannot import your file into Audacity, you can as a workround convert "
-"it to WAV or AIFF."
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:251
-msgid ""
-"As long as it's not a DRM-protected file, you could do this with iTunes or "
-"with "
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:253
-msgid ""
-"If it's a DRM-protected file, you can burn it to an audio CD in the "
-"application that is licensed to play it, then extract (rip) the CD track to "
-"WAV or AIFF."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid ""
-"You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 "
-"or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows."
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:255
-msgid ""
-"Or you can play the file on your computer and record it - see <a href="
-"\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">. "
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:263
-msgid "If you want to burn your work to an audio CD, you must first "
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:264
-msgid "export as WAV or AIFF"
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:265
-msgid " and then burn that file to CD - for more help, see "
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:279
-msgid "<p>You don't appear to have Audacity help files on your machine. "
-msgstr ""
-
-#: HelpText.cpp:280
-msgid ""
-"You can download the help files and then access them from Audacity or you "
-"can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: HistoryWindow.cpp:53
@@ -1636,13 +1329,11 @@ msgstr "Nuwe..."
 
 #: LabelDialog.cpp:352
 #, fuzzy
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Daar is leë etiketname gelos.  Hierdies sal\n"
+msgstr "Daar is leë etiketname gelos.  Hierdies sal\n"
 "oorgeslaan word ...."
 
 #: LabelDialog.cpp:353
@@ -1697,11 +1388,9 @@ msgstr "Kies die taal wat Audacity moet gebruik:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"'n Weergawe 1.0-lêer is omgeskakel na die nuwe formaat.\n"
+msgstr "'n Weergawe 1.0-lêer is omgeskakel na die nuwe formaat.\n"
 "Die ou lêer is gestoor as '%s'"
 
 #: Legacy.cpp:357
@@ -1732,6 +1421,10 @@ msgstr "&Stoor projek\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Stoor projek &as..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Gaan &afhanklikhede na..."
@@ -1740,6 +1433,11 @@ msgstr "Gaan &afhanklikhede na..."
 msgid "Open Me&tadata Editor..."
 msgstr "Open Me&tadataredigeerder..."
 
+# Opdrag of s.nw.?
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "Voer &in"
+
 #: Menus.cpp:194
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Oudio...\tCtrl+Shift+I"
@@ -1768,10 +1466,26 @@ msgstr "Voer &etikette uit..."
 msgid "Export &Multiple..."
 msgstr "&Veelvuldige uitvoer..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:246 Menus.cpp:260
 msgid "Edit C&hains..."
 msgstr "Wysig &kettings..."
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:258
 msgid "Appl&y Chain..."
 msgstr "Pas ketting &toe..."
@@ -1832,9 +1546,9 @@ msgstr "&Skrap\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: Menus.cpp:335
-msgid "&Silence\tCtrl+L"
-msgstr "&Stilte\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:337
 msgid "Sp&lit\tCtrl+I"
@@ -1848,21 +1562,21 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr "&Voeg saam\tCtrl+J"
 
-#: Menus.cpp:348
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:350
 msgid "Duplic&ate\tCtrl+D"
 msgstr "&Dupliseer\tCtrl+D"
 
-#: Menus.cpp:356 Menus.cpp:556 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
-msgstr "&Stereo na mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:363
-msgid "Labeled Re&gions..."
-msgstr "Streke met &etikette..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:365
@@ -1905,13 +1619,13 @@ msgid "&Join\tAlt+J"
 msgstr "&Voeg saam\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:407
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
-msgstr "&Kies..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:414
 msgid "&All\tCtrl+A"
@@ -1921,65 +1635,67 @@ msgstr "&Alles\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Niks\tCtrl+Shift+A"
 
-#: Menus.cpp:419
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:420
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: Menus.cpp:424
-msgid "Start to Cursor"
-msgstr "Van begin tot merker"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: Menus.cpp:425
-msgid "Cursor to End"
-msgstr "Merker tot einde"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:431
 msgid "Find &Zero Crossings\tZ"
 msgstr "Soek n&ulpunte\tZ"
 
-#: Menus.cpp:433
-msgid "Mo&ve Cursor..."
-msgstr "Skuif &merker..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: Menus.cpp:435
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "na begin van seleksie"
 
-#: Menus.cpp:436
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "na einde van seleksie"
 
-#: Menus.cpp:440
-msgid "to Track Start"
-msgstr "na begin van baan"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: Menus.cpp:441
-msgid "to Track End"
-msgstr "na einde van baan"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: Menus.cpp:448
-msgid "Selection Save"
-msgstr "Stoor seleksie"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: Menus.cpp:449
-msgid "Selection Restore"
-msgstr "Herstel seleksie"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:454
-msgid "Play &Region..."
-msgstr "Speel st&reek..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
-#: Menus.cpp:455
-msgid "Lock"
-msgstr "Sluit vas"
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr ""
 
-#: Menus.cpp:456
-msgid "Unlock"
-msgstr "Sluit los"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr ""
 
 #: Menus.cpp:462
 msgid "Turn Snap-To On"
@@ -1997,9 +1713,14 @@ msgstr "Aktiveer rooster-inglip"
 msgid "Turn Grid Snap Off"
 msgstr "Deaktiveer rooster-inglip"
 
-#: Menus.cpp:474
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Voorkeure...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:484
 msgid "&View"
@@ -2037,61 +1758,133 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+#, fuzzy
+msgid "&Show Clipping"
 msgstr "Wys aftopping"
 
 #: Menus.cpp:511
 msgid "&History..."
 msgstr "&Ontdoengeheue..."
 
-#: Menus.cpp:517
-msgid "&Toolbars..."
-msgstr "Kon&trolebalke..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
-#: Menus.cpp:518
-msgid "Control Toolbar"
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
 msgstr "Beheerbalk"
 
-#: Menus.cpp:519
-msgid "Device Toolbar"
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
 msgstr "Toestelbalk"
 
-#: Menus.cpp:520
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
 msgstr "Wysigbalk"
 
-#: Menus.cpp:521
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
 msgstr "Meterbalk"
 
-#: Menus.cpp:522
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
 msgstr "Mengbalk"
 
-#: Menus.cpp:523
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
 msgstr "Seleksiebalk"
 
-#: Menus.cpp:524
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
 msgstr "Gereedskapbalk"
 
-#: Menus.cpp:525
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
 msgstr "Transkripsiebalk"
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:576
+#, fuzzy
+msgid "&Reset Toolbars"
 msgstr "Herstel balke"
 
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:786
+msgid "Skip to Start\tHome"
+msgstr "Spring na begin\tHome"
+
+#: Menus.cpp:787
+msgid "Skip to End\tEnd"
+msgstr "Spring na einde\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:537
 msgid "&Tracks"
 msgstr "&Bane"
 
-#: Menus.cpp:544
-msgid "Add &New..."
-msgstr "Voeg &nuwe by..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:545
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -2105,12 +1898,8 @@ msgstr "&Stereobaan"
 msgid "&Time Track"
 msgstr "&Tydbaan"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:560 Menus.cpp:3698 Mix.cpp:120
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -2125,6 +1914,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "&Verwyder bane"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: Menus.cpp:585
 msgid "Align with &Zero"
 msgstr "Belyn met &nulpunt"
@@ -2141,31 +1938,41 @@ msgstr "Belyn met seleksie&begin"
 msgid "Align with Selection &End"
 msgstr "Belyn met seleksie-&einde"
 
-#: Menus.cpp:589
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Belyn einde met merker"
 
-#: Menus.cpp:590
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Belyn einde met seleksiebegin"
 
-#: Menus.cpp:591
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Belyn einde met seleksie-einde"
 
-#: Menus.cpp:592
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Belyn bane saam"
 
-#: Menus.cpp:594
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Belyn bane..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
 
-#: Menus.cpp:603
-#, fuzzy
-msgid "Ali&gn And Move Cursor..."
-msgstr "Belyn en skuif merker..."
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:611
 #, fuzzy
@@ -2177,22 +1984,26 @@ msgstr "Voeg etiket by by seleksie\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Voeg etiket by by speelpunt\tCtrl+M"
 
-#: Menus.cpp:618
-msgid "S&ort tracks by..."
-msgstr "S&orteer bane volgens..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:619
-msgid "&Start time"
-msgstr "&Begintyd"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:621
-msgid "&Name"
-msgstr "&Naam"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:631
 msgid "&Generate"
 msgstr "&Genereer"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:654
 msgid "Effe&ct"
 msgstr "&Effek"
@@ -2225,6 +2036,10 @@ msgstr "&Wys welkomboodskap..."
 msgid "&Index..."
 msgstr "&Indeks..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -2237,13 +2052,12 @@ msgstr "Laat loop &normtoets..."
 msgid "&Audio Device Info..."
 msgstr "&Oudiotoestel-inligting"
 
-#: Menus.cpp:758
-msgid ""
-"Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:759
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: Menus.cpp:762
@@ -2278,9 +2092,9 @@ msgstr "Volgende gereedskapstuk\tD"
 msgid "Previous Tool\tA"
 msgstr "Vorige gereedskap\tA"
 
-#: Menus.cpp:772
-msgid "Play/Stop\tSpacebar"
-msgstr "Speel/Stop\tSpasiebalk"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:773
 msgid "Stop\tS"
@@ -2294,12 +2108,12 @@ msgstr "Pouseer\tP"
 msgid "Record\tR"
 msgstr "Neem op\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:778
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: Menus.cpp:780
@@ -2314,22 +2128,14 @@ msgstr "Speel tot by seleksie\tB"
 msgid "Play Looped\tL"
 msgstr "Speel in 'n lus\tL"
 
-#: Menus.cpp:783
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Speel in 'n Lus\tShift+Spasie"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:784
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: Menus.cpp:786
-msgid "Skip to Start\tHome"
-msgstr "Spring na begin\tHome"
-
-#: Menus.cpp:787
-msgid "Skip to End\tEnd"
-msgstr "Spring na einde\tEnd"
-
 #: Menus.cpp:789
 msgid "Selection to Start\tShift+Home"
 msgstr "Seleksie na begin\tShift+Home"
@@ -2388,8 +2194,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:816
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: Menus.cpp:818
@@ -2490,15 +2296,19 @@ msgstr "[Inskiet aan]"
 msgid "Snap To Off"
 msgstr "[Inskiet af]"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:860
 msgid "Open Recent"
 msgstr ""
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:863
-msgid "Recent &Files..."
-msgstr "Onlangse &lêers..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:910
 #, c-format
@@ -2555,6 +2365,23 @@ msgstr "Herhaal %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Daar is geen etiketbane om uit te voer nie."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2241
 msgid "Nothing to undo"
 msgstr "Niks om te ontdoen nie"
@@ -2594,6 +2421,10 @@ msgstr "Geplak van het knipbord"
 msgid "Pasted from the clipboard"
 msgstr "Geplak van het knipbord"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2544
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2748,12 +2579,8 @@ msgstr "Om die spektrum te teken moet alle bane die selfde monstertempo hê."
 
 #: Menus.cpp:3420
 #, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
-msgstr ""
-"Te veel oudio is gekies.  Slegs die eersste %.1f sekondes sal geanaliseer "
-"word."
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "Te veel oudio is gekies.  Slegs die eersste %.1f sekondes sal geanaliseer word."
 
 #: Menus.cpp:3546
 #, c-format
@@ -2768,11 +2595,9 @@ msgstr "Voer etikette in"
 msgid "Select a MIDI file..."
 msgstr "Kies 'n MIDI-lêer"
 
-#: Menus.cpp:3561
-msgid ""
-"All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
 msgstr ""
-"Alle lêers (*.*)|*.*|MIDI-lêers (*.mid)|*.mid|Allegro-lêers (*.gro)|*.gro"
 
 #: Menus.cpp:3577
 #, c-format
@@ -2792,12 +2617,6 @@ msgstr "Kies enige oudiolêer wat nie saamepers is nie..."
 msgid "All files (*)|*"
 msgstr "Alle lêers (*)|*"
 
-# Opdrag of s.nw.?
-#: Menus.cpp:3611 Project.cpp:2525 Project.cpp:2550 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Voer in"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2829,6 +2648,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:560 Menus.cpp:3698 Mix.cpp:120
+msgid "&Mix and Render"
+msgstr ""
+
 #: Menus.cpp:3828
 msgid "Aligned with zero"
 msgstr "Belyn met nulpunt"
@@ -2866,6 +2689,14 @@ msgstr "Belyn"
 msgid "Align"
 msgstr "Belyn"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3912
 msgid "Created new audio track"
 msgstr "Nuwe oudiobaan gemaak"
@@ -2883,8 +2714,7 @@ msgid "Created new label track"
 msgstr "Nuwe etiketbaan gemaak"
 
 #: Menus.cpp:3959
-msgid ""
-"The version of Audacity you are using does not support multiple time tracks."
+msgid "The version of Audacity you are using does not support multiple time tracks."
 msgstr "Hierdie weergawe van Audacity werk nie met meer as een tydbaan nie."
 
 #: Menus.cpp:3970
@@ -2927,14 +2757,14 @@ msgstr "Verwyder baan"
 msgid "Removed audio track(s)"
 msgstr "Oudiobane verwyder"
 
-#: Menus.cpp:4437
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4437 Menus.cpp:4456 export/ExportMP3.cpp:1871
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4443
 msgid "The entered value is invalid"
 msgstr ""
@@ -2998,15 +2828,13 @@ msgstr "Opgeneemde oudio"
 msgid "Save changes before closing?"
 msgstr "Stoor wysigings voor afsluiting?"
 
-#: Project.cpp:1493
-msgid ""
-"\n"
+#: Project.cpp:1570
+msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: Project.cpp:1496
@@ -3025,14 +2853,32 @@ msgstr "Kies een of meer oudiolêers..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2143
+msgid "Opening old project file"
+msgstr "Ou projeklêer word geopen"
+
 #: Project.cpp:1801 Project.cpp:1809
 msgid "Error opening file"
 msgstr "Fout met oopmaak van lêer"
 
 #: Project.cpp:1815
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
 msgstr ""
 
@@ -3041,11 +2887,8 @@ msgid "Error opening file or project"
 msgstr ""
 
 #: Project.cpp:1833
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
-msgstr ""
-"Audacity kon nie 'n Audacity 1.0-projek na die nuwe formaat omskakel nie."
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity kon nie 'n Audacity 1.0-projek na die nuwe formaat omskakel nie."
 
 #: Project.cpp:1936
 msgid "Could not remove old auto save file"
@@ -3074,12 +2917,10 @@ msgstr "Kon nie die projek se datagids, \"%s\" vind nie."
 
 #: Project.cpp:2116
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Hierdie lêer is gestoor met Audacity %s.\n"
+msgstr "Hierdie lêer is gestoor met Audacity %s.\n"
 "U gebruik Audacity %s - u moet opgradeer na 'n\n"
 "nuwer weergawe om hierdie lêer oop te maak.."
 
@@ -3087,52 +2928,34 @@ msgstr ""
 msgid "Can't open project file"
 msgstr "Kan nie projeklêer open nie"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
-msgstr ""
-"Hierdie lêer is gestoor met Audacity %s, 'n heelwat\n"
-"ouer weergawe van Audacity.  Die formaat het verander.\n"
-"Audacity sal waarskynlik die lêer beskadig in 'n poging\n"
-"om dit oop te maak.  Vir veiligheid, maak eers 'n\n"
-"rugsteunkopie.\n"
-"\n"
-"Wil in elkgeval nou probeer om die lêer te open?"
+"Open this file now?"
+msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid ""
-"This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:2143
-msgid "Opening old project file"
-msgstr "Ou projeklêer word geopen"
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
 
-#: Project.cpp:2364
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Kon nie projek stoor nie.  Miskien is %s nie\n"
-"skryfbaar nie of die skyf is vol."
 
 #: Project.cpp:2366 Project.cpp:2380
 msgid "Error saving project"
@@ -3143,22 +2966,17 @@ msgstr "Fout met stoor van projek"
 msgid "Saved %s"
 msgstr "%s gestoor"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2458
-msgid "Raw"
-msgstr "Rou"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr "%s word ingevoer..."
-
 #: Project.cpp:2524
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' is ingevoer"
 
+# Opdrag of s.nw.?
+#: Menus.cpp:3611 Project.cpp:2525 Project.cpp:2550 import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Voer in"
+
 #: Project.cpp:2577 Project.cpp:2585
 msgid "Error importing"
 msgstr "Fout met invoer"
@@ -3171,23 +2989,23 @@ msgstr "Stoor spraak as:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM-oudiolêer (*.wav)|*.wav"
 
-#: Project.cpp:2627
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Audacity-projeklêers (.aup) laat mens toe om alles waaraan gewerk word\n"
-"presies te stoor soos dit op die skerm is. Meeste ander programme kan\n"
-"egter nie Audacity-projeklêers open nie.\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"As u 'n lêer wil stoor om oop te maak in 'n ander program, gebruik een\n"
-"van die uitvoeropdragte."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2630
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3231,6 +3049,16 @@ msgstr "Hardeskyfplek is oor om %d sekondes op te neem."
 msgid "Out of disk space"
 msgstr "Geen skyfspasie"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3280
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -3314,47 +3142,12 @@ msgstr "&Voorskou"
 msgid "&Debug"
 msgstr "&Ontfout"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start: "
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid ""
-"\n"
-"\n"
-"Recording end:   "
-msgstr ""
-
-#: SmartRecordDialog.cpp:225
-msgid "          Duration: "
-msgstr ""
-
-#: SmartRecordDialog.cpp:228
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:269
-msgid "Start Date and Time"
-msgstr "Begintyd en -datum"
-
-#: SmartRecordDialog.cpp:286
-msgid "End Date and Time"
-msgstr "Eindtyd en -datum"
-
-#: SmartRecordDialog.cpp:303
-msgid "Duration"
-msgstr "Duur"
-
-#: SmartRecordDialog.cpp:376
-msgid "Waiting to start recording at "
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:377
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -3394,9 +3187,9 @@ msgstr "Genre"
 msgid "Comments"
 msgstr "Opmerkings"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
-msgstr "Druk F2 of dubbelklik op te wysig."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:769
 msgid "Tag Name"
@@ -3414,12 +3207,12 @@ msgstr "&Maak skoon"
 msgid "Genres"
 msgstr "Genres"
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
-msgstr "Redigeer"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:801 Tags.cpp:1427 Tags.cpp:1955
@@ -3434,8 +3227,9 @@ msgstr "&Laai..."
 msgid "&Save..."
 msgstr "&Stoor..."
 
-#: Tags.cpp:808 Tags.cpp:1434 Tags.cpp:1962
-msgid "S&et default"
+#: Tags.cpp:852 Tags.cpp:1477 Tags.cpp:2004
+#, fuzzy
+msgid "S&et Default"
 msgstr "St&el verstek"
 
 #: Tags.cpp:958 Tags.cpp:1597 Tags.cpp:2326
@@ -3461,178 +3255,130 @@ msgstr "Wil u definitief die genre-lys na verstekwaardes terugstel?"
 msgid "Unable to open genre file."
 msgstr "Kon nie genre-lêer open nie."
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
-msgstr "Stoor metadata as:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 #, fuzzy
 msgid "Error loading metadata"
 msgstr "Kon nie metadata laai nie"
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr "Titel:"
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr "Kunstenaar:"
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr "Komponis:"
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr "Liriekskrywer:"
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr "Opmerkings:"
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr "Kopiereg:"
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr "Baannommer:"
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr "Jaar:"
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr "Genre:"
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr "Geen genres"
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr "Herstel verstekwaardes"
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr "Eenvoudig"
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr "Gevorderd"
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr "Waarde"
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr "&Maak skoon"
-
-#: Tags.cpp:2069
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maksimum lengte van eienskap '%s' is %d karakters. Data is afgekap."
-
-#: Tags.cpp:2075
-msgid "Title"
-msgstr "Titel"
-
-#: Tags.cpp:2085
-msgid "Artist"
-msgstr "Kunstenaar"
-
-#: Tags.cpp:2095
-msgid "Album"
-msgstr "Album"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
+msgstr "Stoor metadata as:"
 
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
 msgstr ""
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
 msgstr ""
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
 msgstr ""
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
 msgstr ""
 
 #: Theme.cpp:807 Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
 msgstr ""
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
 msgstr ""
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
 msgstr ""
 
 #: Theme.cpp:942 effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
 msgstr ""
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
 msgstr ""
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "Spesifiseer tyd"
+#: SmartRecordDialog.cpp:303
+msgid "Duration"
+msgstr "Duur"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr ""
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:269
+msgid "Start Date and Time"
+msgstr "Begintyd en -datum"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Eindtyd en -datum"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: TrackPanel.cpp:448 TrackPanel.cpp:449
 msgid "Track Panel"
@@ -3662,6 +3408,10 @@ msgstr "Golfvorm"
 msgid "Waveform (dB)"
 msgstr "Golfvorm (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: TrackPanel.cpp:508
 msgid "Pitch (EAC)"
 msgstr "Toonhoogte (EAC)"
@@ -3716,12 +3466,8 @@ msgid "Copy"
 msgstr "Kopieer"
 
 #: TrackPanel.cpp:1239
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
-msgstr ""
-"Klik om vertikaal in te zoem,  Shift-klik om uit te zoem,  Sleep om 'n "
-"spesifieke  zoemstreek te maak."
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "Klik om vertikaal in te zoem,  Shift-klik om uit te zoem,  Sleep om 'n spesifieke  zoemstreek te maak."
 
 #: TrackPanel.cpp:1244
 msgid "Drag the label vertically to change the order of the tracks."
@@ -3803,17 +3549,13 @@ msgstr "Baan '%s' %s met %.02f sekondes verskuif"
 msgid "Time-Shift"
 msgstr "Tydverskuiwing"
 
-#: TrackPanel.cpp:2737
-#, fuzzy
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "Teken werk tans net met golfvorms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: TrackPanel.cpp:2754
-msgid ""
-"You are not zoomed in enough. Zoom in until you can see the individual "
-"samples."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr ""
-"Nie ver genoeg ingezoem nie. Zoem in totdat induwiduele monsters sigbaar is."
 
 #: TrackPanel.cpp:3025
 msgid "Moved Sample"
@@ -3896,6 +3638,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5658
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3953,14 +3703,6 @@ msgstr "Tempoverandering"
 msgid "Format Change"
 msgstr "Formaatverandering"
 
-#: TrackPanel.cpp:6047
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Gee 'n monstertempo in Hz (per sekonde) tussen 1 en 100000:"
-
-#: TrackPanel.cpp:6057
-msgid "Invalid rate."
-msgstr "Ongeldige tempo."
-
 #: TrackPanel.cpp:6077
 msgid "Change lower speed limit (%) to:"
 msgstr "Stel spoed se ondergrens (%) na:"
@@ -4093,19 +3835,17 @@ msgstr "Inprop 1 tot %i"
 msgid "Plugins %i to %i"
 msgstr "Inprop %i tot %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
 msgstr ""
 
 #: commands/CommandManager.cpp:726
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
 msgstr ""
 
@@ -4114,13 +3854,12 @@ msgid "You must first select some audio for this to use."
 msgstr ""
 
 #: commands/CommandManager.cpp:730
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: commands/CommandManager.cpp:915
@@ -4141,14 +3880,19 @@ msgstr "\"%s\"-effek toegepas (%.1f dB)"
 msgid "Amplify"
 msgstr "Versterk"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Versterking, deur Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Versterking (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Nuwe piekamplitude (dB):"
@@ -4157,6 +3901,10 @@ msgstr "Nuwe piekamplitude (dB):"
 msgid "Allow clipping"
 msgstr "Laat aftopping toe"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "Versterk..."
@@ -4166,9 +3914,7 @@ msgid "Amplifying"
 msgstr "Besig om te versterk"
 
 #: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
 msgstr ""
 
 #: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:453
@@ -4177,9 +3923,7 @@ msgid "Auto Duck"
 msgstr ""
 
 #: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
 msgstr ""
 
 #: effects/AutoDuck.cpp:465
@@ -4263,10 +4007,18 @@ msgstr "deur Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Frekwensie (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Versterker (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Basversterking..."
@@ -4308,8 +4060,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "m.b.v. SoundTouch, deur Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Toonhoogte:    vanaf"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Halftone (halwe stappies):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
 #: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
@@ -4317,19 +4110,20 @@ msgstr "Toonhoogte:    vanaf"
 msgid "to"
 msgstr "na"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Halftone (halwe stappies):"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frekwensie (Hz):   vanaf"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
 #: effects/ChangeTempo.cpp:198
 msgid "Percent Change:"
 msgstr "Persentasie verandering:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Wysig toonhoogte..."
@@ -4347,6 +4141,14 @@ msgstr "\"%s\"-effek toegepas ( %.1f%%)"
 msgid "Change Speed"
 msgstr "Wysig spoed"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "n.v.t."
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Wysig spoed (verander tempo en toonhoogte)"
@@ -4355,17 +4157,17 @@ msgstr "Wysig spoed (verander tempo en toonhoogte)"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "m.b.v. SampleRate, deur Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "n.v.t."
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standaard viniel RPM:   van"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4383,13 +4185,29 @@ msgstr "Wysig tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Wysig tempo (toonhoogte onveranderd)"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Slae per minuut:    vanaf"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Lengte (sekondes):   Vanaf"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4399,8 +4217,9 @@ msgstr "Wysig tempo..."
 msgid "Changing Tempo"
 msgstr "Tempo word aangepas"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Klikverwydering"
 
 #: effects/ClickRemoval.cpp:336
@@ -4411,10 +4230,18 @@ msgstr "Klik- en klapverwydering, deur Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Kies drempel (laer is meer sensitief):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Maks piekwydte (hoër is meer sensitief):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Klikverwydering..."
@@ -4427,50 +4254,85 @@ msgstr "Pop- klikklanke word verwyder..."
 msgid "Dynamic Range Compressor"
 msgstr "Dinamiese omvangkompressor"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dinamiese omvangkompressor, deur Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Verhouding: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Saamdruktyd: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Normaliseer op 0dB ná komprimering"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Drempel: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Verhouding: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Verhouding: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Saamdruktyd: %.1f sek"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
 #, fuzzy
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr "Saamdruktyd: %.1f sek"
 
 #: effects/Compressor.h:36
@@ -4481,6 +4343,247 @@ msgstr "Kompressor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Dinamiese omvangkompressie word toegepas..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:338 toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Begin"
+
+#: effects/ToneGen.cpp:339 toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:141 toolbars/SelectionBar.cpp:242
+msgid "End"
+msgstr "Einde"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: AboutDialog.cpp:275
+msgid "Information"
+msgstr "Inligting"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -4498,8 +4601,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Amplitude (0-1)"
 
-#: effects/DtmfGen.cpp:446
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:464
@@ -4577,12 +4680,8 @@ msgid "Previewing"
 msgstr ""
 
 #: effects/Effect.cpp:420
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"Fout met oopmaak van klanktoestel. Gaan asseblief die opstelling vir "
-"afvoertoestel en projektempo na."
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "Fout met oopmaak van klanktoestel. Gaan asseblief die opstelling vir afvoertoestel en projektempo na."
 
 #: effects/Effect.h:107
 #, c-format
@@ -4735,16 +4834,12 @@ msgstr "Spieëlgolf"
 msgid "Inverting"
 msgstr "Besig met spieëlgolf"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4757,31 +4852,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:213
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:216
-msgid "Equalize soft and loud sections"
-msgstr ""
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "deur Lynn Allan"
 
 #: effects/Leveller.cpp:219 effects/Leveller.cpp:224
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:235
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
 #: effects/Leveller.cpp:238
-msgid "Threshold for Noise: "
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4792,6 +4891,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "Mengbank"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Ruisverwydering"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4809,10 +5060,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr "Toongenerator"
 
-#: effects/Noise.cpp:235
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4835,8 +5082,7 @@ msgstr "Toon word gegenereer"
 #: effects/NoiseRemoval.cpp:192
 #, c-format
 #, fuzzy
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
 msgstr "Kon nie lêer \"%s\" open nie."
 
@@ -4844,21 +5090,15 @@ msgstr "Kon nie lêer \"%s\" open nie."
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Ruisverwydering"
-
 #: effects/NoiseRemoval.cpp:812
 msgid "Step 1"
 msgstr "Stap 1"
 
 #: effects/NoiseRemoval.cpp:813
 #, fuzzy
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Selekteer 'n paar sekondes met slegs ruis\n"
+msgstr "Selekteer 'n paar sekondes met slegs ruis\n"
 "sodat Audacity weet wat om uit te filter.  Klik\n"
 "dan 'Kry ruisprofiel':"
 
@@ -4868,11 +5108,9 @@ msgstr "Stap 2"
 
 #: effects/NoiseRemoval.cpp:815
 #, fuzzy
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Selekteer die oudio wat gefilter moet word,\n"
+msgstr "Selekteer die oudio wat gefilter moet word,\n"
 "kies hoeveel ruis uitgefilter moet word, en \n"
 "klik 'Verwyder ruis'.\n"
 
@@ -4888,14 +5126,26 @@ msgstr "Kry ruisprofiel"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:847
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:855
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Ruisverwydering..."
@@ -4930,24 +5180,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normaliseer"
 
-#: effects/Normalize.cpp:337
-#, fuzzy
-msgid "Normalize by Dominic Mazzoni\n"
-msgstr "Versterking, deur Dominic Mazzoni"
-
-#: effects/Normalize.cpp:344
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Verwyder GS-verplasing (sentreer vertikaal op 0)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:349
-#, fuzzy
-msgid "Normalize maximum amplitude to"
-msgstr "Normaliseer maksimum amplitude op -3 dB"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:357
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Normaliseer..."
@@ -4958,49 +5206,57 @@ msgstr "Normaliseer..."
 
 #: effects/Phaser.cpp:65
 #, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"\"%s\"-effek toegepas (%d stappe, %.0f%% nat, frekwensie = %.1f Hz, beginfase "
-"= %.0f °, bereik = %d, terugvoer = %.0f%%)"
-
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser, deur Nasca Octavian Paul"
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "\"%s\"-effek toegepas (%d stappe, %.0f%% nat, frekwensie = %.1f Hz, beginfase = %.0f °, bereik = %d, terugvoer = %.0f%%)"
 
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Stappe:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "DROOG"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "NAT"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO-frekwensie (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO-beginfase (grade):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Bereik:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Terugvoer (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -5010,13 +5266,19 @@ msgid "Applying Phaser"
 msgstr "Phaser word toegepas... "
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr ""
@@ -5034,29 +5296,22 @@ msgstr "Bane is te lank om seleksie te herhaal."
 msgid "Repeat"
 msgstr "Herhaal"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Herhaling, deur Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Aantal herhalings: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207 effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Nuwe seleksielengte: "
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minute, %d sekondes"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d seondes"
+#: widgets/TimeTextCtrl.cpp:202
+msgid "hh:mm:ss"
+msgstr ""
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5092,12 +5347,8 @@ msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Stilte genereer (%.6lf sekondes)"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Jammer, hierdie effek werk nie op stereo bane waar die individuele kanale "
-"van die baan nie ooreenstem nie."
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Jammer, hierdie effek werk nie op stereo bane waar die individuele kanale van die baan nie ooreenstem nie."
 
 #: effects/SpikeCleaner.cpp:69
 msgid "Spike Cleaner"
@@ -5108,8 +5359,7 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr ""
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
 msgstr ""
 
@@ -5125,20 +5375,73 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "&Stereo na mono"
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 # Ons wil einlik die %s vas hê aan golf. TODO
 #: effects/ToneGen.cpp:59
 #, c-format
 #, fuzzy
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "\"%s\"-effek toegepas (genereer %s-golf, frekwensie = %.2f Hz, amplitude = %.2f, %.6lf secondes"
+
+#: widgets/Meter.cpp:362
+msgid "Linear"
+msgstr "Lineêr"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
 msgstr ""
-"\"%s\"-effek toegepas (genereer %s-golf, frekwensie = %.2f Hz, amplitude = "
-"%.2f, %.6lf secondes"
 
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
@@ -5168,23 +5471,29 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr "Frekwensie (Hz)"
 
-#: effects/ToneGen.cpp:307 effects/ToneGen.cpp:348
-#: toolbars/SelectionBar.cpp:147 toolbars/SelectionBar.cpp:241
-msgid "Length"
-msgstr "Lengte"
-
 #: effects/ToneGen.cpp:331
 msgid "Waveform:"
 msgstr "Golfvorm:"
 
-#: effects/ToneGen.cpp:338 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Begin"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:339 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:141 toolbars/SelectionBar.cpp:242
-msgid "End"
-msgstr "Einde"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr ""
 
 #: effects/ToneGen.h:39
 msgid "Chirp..."
@@ -5210,10 +5519,6 @@ msgstr "Alle bane moet dieselfde monstertempo hê"
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "deur Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -5240,12 +5545,8 @@ msgid "Truncating Silence..."
 msgstr ""
 
 #: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Jammer, VST-effekte werk nie op stereo bane waar die individuele kanale van "
-"die baan nie ooreenstem nie."
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Jammer, VST-effekte werk nie op stereo bane waar die individuele kanale van die baan nie ooreenstem nie."
 
 #: effects/VST/VSTEffect.cpp:180
 msgid "Can't process replacing"
@@ -5257,21 +5558,13 @@ msgstr "Parameters vir VST-inprop:"
 
 #: effects/Wahwah.cpp:61
 #, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"\"%s\"-effek toegepas (frekwensie = %.1f Hz, beginfase = %.0f d°, bereik = "
-"%.0f%%, resonansie = %.1f, frekwensieverskuiwing = %.0f%%)"
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "\"%s\"-effek toegepas (frekwensie = %.1f Hz, beginfase = %.0f d°, bereik = %.0f%%, resonansie = %.1f, frekwensieverskuiwing = %.0f%%)"
 
 #: effects/Wahwah.cpp:72
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah, deur Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Bereik (%):"
@@ -5280,10 +5573,18 @@ msgstr "Bereik (%):"
 msgid "Resonance:"
 msgstr "Resonansie:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Wahwah-frekwensieverplasing (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5299,12 +5600,8 @@ msgid "Performing Effect: %s"
 msgstr "\"%s\"-effek word toegepas"
 
 #: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
-msgstr ""
-"Jammer, inprop-effekte werk nie op stereo bane waar die individuele kanale "
-"van die baan nie ooreenstem nie."
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Jammer, inprop-effekte werk nie op stereo bane waar die individuele kanale van die baan nie ooreenstem nie."
 
 #: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
 #: prefs/QualityPrefs.cpp:72
@@ -5323,6 +5620,18 @@ msgstr "Effek-opstelling"
 msgid "Length (seconds)"
 msgstr "Lengte (sekondes)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist-effek word toegepas..."
@@ -5336,11 +5645,8 @@ msgid "Enter Nyquist Command: "
 msgstr "Gee Nyquist-opdrag:"
 
 #: effects/nyquist/Nyquist.cpp:412
-msgid ""
-"Sorry, cannot apply effect on stereo tracks where the tracks don't match."
-msgstr ""
-"Jammer, kan nie effek toepas op stereo bane waar die individuele kanale van "
-"die baan nie ooreenstem nie."
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "Jammer, kan nie effek toepas op stereo bane waar die individuele kanale van die baan nie ooreenstem nie."
 
 #: effects/nyquist/Nyquist.cpp:440
 msgid "Nyquist"
@@ -5363,23 +5669,14 @@ msgstr "Geen oudio van Nyquist ontvang nie.\n"
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist het te veel oudiokanale teruggegee.\n"
 
-#: effects/vamp/LoadVamp.cpp:53 effects/vamp/VampEffect.cpp:238
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
 #: effects/vamp/VampEffect.cpp:75
 #, c-format
 msgid "Extracting features: %s"
 msgstr ""
 
 #: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Jammer, Vamp-inproppe werk nie op stereo bane waar die individuele kanale "
-"van die baan nie ooreenstem nie."
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Jammer, Vamp-inproppe werk nie op stereo bane waar die individuele kanale van die baan nie ooreenstem nie."
 
 #: effects/vamp/VampEffect.cpp:120
 msgid "Sorry, failed to load Vamp Plug-in."
@@ -5401,10 +5698,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:401
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -5421,18 +5720,14 @@ msgstr "Wil u definitief die lêer stoor as \""
 
 #: export/Export.cpp:495
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"U wil 'n '%s'-lêer stoor met die naam \"%s\".\n"
+msgstr "U wil 'n '%s'-lêer stoor met die naam \"%s\".\n"
 "\n"
-"Hierdie lêers eindig gewoonlik met \".%s\", en party programme maak nie lêers "
-"met niestandaard name oop nie.\n"
+"Hierdie lêers eindig gewoonlik met \".%s\", en party programme maak nie lêers met niestandaard name oop nie.\n"
 "\n"
 "Wil u definitief die lêer met hierdie naam stoor?"
 
@@ -5442,16 +5737,12 @@ msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "'n Lêer genaamd \"%s\" bestaan reeds.  Oorskryf?"
 
 #: export/Export.cpp:598
-msgid ""
-"Your tracks will be mixed down to two stereo channels in the exported file."
-msgstr ""
-"Die bane sal afgemeng word na twee stereo kanale in die uitgevoerde lêer."
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "Die bane sal afgemeng word na twee stereo kanale in die uitgevoerde lêer."
 
 #: export/Export.cpp:603
-msgid ""
-"Your tracks will be mixed down to a single mono channel in the exported file."
-msgstr ""
-"Die bane sal afgemeng word na 'n enkele monokanaal in die uitgevoerde lêer."
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "Die bane sal afgemeng word na 'n enkele monokanaal in die uitgevoerde lêer."
 
 #: export/Export.cpp:613
 msgid "Advanced Mixing Options"
@@ -5470,6 +5761,10 @@ msgstr " - Links"
 msgid " - Right"
 msgstr " - Regs"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:961 export/Export.cpp:1006
 #, c-format
 msgid "Output Channels: %2d"
@@ -5493,9 +5788,7 @@ msgstr "Wys afvoer"
 
 #: export/ExportCL.cpp:87
 #, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
 msgstr ""
 
 #: export/ExportCL.cpp:219
@@ -5519,6 +5812,478 @@ msgstr "Die hele projek word d.m.v. die opdraglyn-enkodeerder uitgevoer"
 msgid "Command Output"
 msgstr "Opdrag se afvoer"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+#, fuzzy
+msgid "Sample Rates"
+msgstr "Monsterfrekwensie:"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bistempo:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Formaat:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:109
+msgid "Language:"
+msgstr "Taal:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kwaliteit:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML-lêers (*.xml)|*.xml|Alle lêers (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Spesifiseer FLAC-keuses"
@@ -5591,10 +6356,6 @@ msgstr "Die seleksie word as FLAC uitgevoer"
 msgid "Exporting the entire project as FLAC"
 msgstr "Die hele projek word as FLAC uitgevoer"
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr "Wysig die metadata vir die FLAC-lêer"
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr "Spesifiseer MP2-keuses"
@@ -5603,10 +6364,6 @@ msgstr "Spesifiseer MP2-keuses"
 msgid "MP2 Export Setup"
 msgstr "Opstelling vir MP2-uitvoer"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Bistempo:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "MP2-lêers"
@@ -5615,10 +6372,6 @@ msgstr "MP2-lêers"
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "Kan nie na MP2 uitvoer met hierdie monstertempo en bistempo nie"
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr "Wysig die ID3-etikette vir die MP2-lêer"
-
 #: export/ExportMP2.cpp:243 export/ExportMP3.cpp:1713 export/ExportOGG.cpp:183
 msgid "Unable to open target file for writing"
 msgstr "Kon nie teikenlêer vir skryf open nie."
@@ -5643,45 +6396,13 @@ msgstr ""
 msgid "kbps"
 msgstr "kbps"
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "0, 220-260 kbps (beste kwaliteit)"
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr "1, 200-250 kbps"
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr "2, 170-210 kbps"
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr "3, 155-195 kbps"
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr "4, 145-185 kbps"
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr "5, 110-150 kbps"
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr "6, 95-135 kbps"
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr "7, 80-120 kbps"
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
-msgstr "9, 45-85 kbps (kleiner lêers)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr ""
 
 #: export/ExportMP3.cpp:178
 msgid "Fast"
@@ -5691,20 +6412,16 @@ msgstr "Vinnig"
 msgid "Standard"
 msgstr "Standaard"
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5735,6 +6452,10 @@ msgstr "Gemiddeld"
 msgid "Constant"
 msgstr "Konstant"
 
+#: prefs/QualityPrefs.cpp:42 prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Kwaliteit"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5760,57 +6481,28 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity benodig die lêer %s op MP3's te skep."
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr "Ligging van %s:"
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Om %s op te spoor, klik hier -->"
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr "Blaai..."
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Vir 'n gratis kopie van Lame, klik hier -->"
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr "Laai af..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:546
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Waar is %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1038
-msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
-msgstr ""
-"Slegs lame_enc.dll|lame_enc.dll|Biblioteke wat dinamies bind "
-"(*.dll)|*.dll|Alle lêers (*.*)|*"
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Slegs lame_enc.dll|lame_enc.dll|Biblioteke wat dinamies bind (*.dll)|*.dll|Alle lêers (*.*)|*"
 
 #: export/ExportMP3.cpp:1493
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: export/ExportMP3.cpp:1510
-msgid ""
-"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"Slegs libmp3lame.so|libmp3lame.so|Gedeelte objeklêers "
-"(*.so)|*.so|Uitgebreide biblioteke (*.so)|*.so*|Alle lêers (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Slegs libmp3lame.so|libmp3lame.so|Gedeelte objeklêers (*.so)|*.so|Uitgebreide biblioteke (*.so)|*.so*|Alle lêers (*)|*"
 
 #: export/ExportMP3.cpp:1592
 msgid "MP3 Files"
@@ -5828,10 +6520,6 @@ msgstr "Biblioteek ongeldig of nie geondersteun vir MP3-enkodering nie!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: export/ExportMP3.cpp:1706
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Wysig die ID3-etikette vir die MP3-lêer"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5867,52 +6555,33 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr ""
 
 #: export/ExportMP3.cpp:1879
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: export/ExportMP3.cpp:1905
-#, fuzzy
-msgid "Sample Rates"
-msgstr "Monsterfrekwensie:"
-
-#: export/ExportMP3.cpp:2053
-msgid "MP3 exporting plugin not found"
-msgstr "MP3-uitvoerinprop nie gevind nie"
-
 #: export/ExportMultiple.cpp:88 export/ExportMultiple.cpp:362
 #: export/ExportMultiple.cpp:609 export/ExportMultiple.cpp:717
 msgid "Export Multiple"
 msgstr "Veelvuldige uitvoer"
 
 #: export/ExportMultiple.cpp:152
-msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
-msgstr ""
-"Indien daar meer as een oudiobaan is, kan elke baan as aparte\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "Indien daar meer as een oudiobaan is, kan elke baan as aparte\n"
 "lêer uitgevoer word, of met 'n etiketbaan kan 'n nuwe lêer vir\n"
 "elke etiket uitgevoer word.\n"
 "\n"
@@ -5959,6 +6628,10 @@ msgstr "Sluit oudio voor eerste etiket in"
 msgid "First file name:"
 msgstr "Eerste lêernaam:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:246
 msgid "Tracks"
 msgstr "Bane"
@@ -5979,14 +6652,14 @@ msgstr "Nommer opeenvolgend"
 msgid "File name prefix:"
 msgstr "Lêernaamvoorvoegsel:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:294
 msgid "Overwrite existing files"
 msgstr "Oorskryf bestaande lêers"
 
-#: export/ExportMultiple.cpp:300
-msgid "E&xport"
-msgstr "&Uitvoer"
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5996,21 +6669,19 @@ msgstr "\"%s\" suksesvol geskep."
 msgid "Choose a location to save the exported files"
 msgstr "Kies 'n ligging vir die uitvoer van lêers"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr "Wysig die metadata"
-
 #: export/ExportMultiple.cpp:480
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" bestaan nie.\n"
+msgstr "\"%s\" bestaan nie.\n"
 "\n"
 "Wil u dit skep?"
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:606 export/ExportMultiple.cpp:714
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -6021,6 +6692,12 @@ msgstr "%d lêer(s) suksesvol uitgevoer."
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Iets het verkeerd geloop na %d lêer(s) uitgevoer is."
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -6029,10 +6706,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Kwaliteit:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis-lêers"
@@ -6045,12 +6718,8 @@ msgstr "Die seleksie word as Ogg Vorbis uitgevoer"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Die hele projek word as Ogg Vorbis uitgevoer"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
@@ -6058,10 +6727,6 @@ msgstr ""
 msgid "Uncompressed Export Setup"
 msgstr "Uitvoer sonder saampersing"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Formaat:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Kop:"
@@ -6074,9 +6739,21 @@ msgstr "Karakterstel:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Nie alle kombinasies van koppe en enkoderings is moontlik nie.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF en ander tipes sonder saampersing"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -6094,14 +6771,43 @@ msgstr "Die seleksie word as Ogg Vorbis uitgevoer"
 msgid "Exporting the entire project as %s"
 msgstr "Die hele projek word as Ogg Vorbis uitgevoer"
 
-#: export/ExportPCM.cpp:435
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:531
 #, c-format
 #, fuzzy
-msgid "Error (file may not have been written): %hs"
+msgid "Error (file may not have been written): %s"
 msgstr "Fout (lêer is dalk nie geskryf nie): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr "MP3-lêers"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: import/Import.cpp:154
@@ -6109,75 +6815,128 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Hierdie weergawe van Audacity is nie met %s-ondersteuning gebou nie."
 
-#: import/Import.cpp:167
-msgid ""
-" is an audio CD track. \n"
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:250
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:174
+#: import/Import.cpp:256
+#, c-format
 #, fuzzy
-msgid ""
-" is a playlist file. \n"
-"Audacity cannot open this file because it only contains links to other "
-"files. \n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
-msgstr ""
-" is 'n speellyslêer. \n"
-"Audacity kan nie hierdie lêer oopmaak nie want dit bevat slegs skakels na "
-"ander lêers.\n"
-"U kan dit dalk in 'n teksredigeerder oopmaak en die werklike oudiolêers "
-"aflaai."
-
-#: import/Import.cpp:180
-msgid ""
-" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr " is 'n speellyslêer. \n"
+"Audacity kan nie hierdie lêer oopmaak nie want dit bevat slegs skakels na ander lêers.\n"
+"U kan dit dalk in 'n teksredigeerder oopmaak en die werklike oudiolêers aflaai."
+
+#: import/Import.cpp:261
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:186
-msgid ""
-" is an Advanced Audio Coding file. \n"
+#: import/Import.cpp:266
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:192
-msgid ""
-" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+#: import/Import.cpp:271
+#, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:198
-msgid ""
-" is a RealPlayer media file. \n"
+#: import/Import.cpp:276
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
 msgstr ""
 
-#: import/Import.cpp:237
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity herken nie hierdie lêertipe nie.\n"
-"Solank dit nie saamgepers is nie, kan u \"Voer rou in\" probeer."
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6213,17 +6972,18 @@ msgstr "MIDI-bane kan nie individueel verplaas word nie, slegs oudio-lêers kan.
 msgid "Invalid track offset in LOF file."
 msgstr "Ongeldige baanverplasing in LOF-lêer."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Fout met oomaak van Allegro-lêer"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Fout met lees van MIDI-lêer"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr "MP3-lêers"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:35
 msgid "Ogg Vorbis files"
@@ -6249,15 +7009,23 @@ msgstr "Ongeldige Vorbis-bisstroom-kop"
 msgid "Internal logic fault"
 msgstr "Interne logikafout"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF en ander tipes sonder saampersing"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "%s-lêer word ingevoer..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime-lêers"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Voer rou data in"
@@ -6299,6 +7067,14 @@ msgstr "2 kanale (stereo)"
 msgid "%d Channels"
 msgstr "%d kanale"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Beginverplasing:"
@@ -6311,10 +7087,18 @@ msgstr "Hoeveelheid om in te voer:"
 msgid "Sample rate:"
 msgstr "Monsterfrekwensie:"
 
-# Opdrag of s.nw.?
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "Voer &in"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
 msgid "Audio I/O"
@@ -6359,10 +7143,9 @@ msgstr "Kanaal"
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Speel ander bane tydens nuwe opname"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 #, fuzzy
@@ -6374,10 +7157,12 @@ msgstr "Speel opname regstreeks tydens opname d.m.v. hardeware"
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Speel opname regstreeks tydens opname d.m.v.sagteware"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
@@ -6404,12 +7189,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:189
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:192
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6436,22 +7223,10 @@ msgstr ""
 msgid "&Don't apply effects in batch mode"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:83
-msgid "&Normalize on load"
-msgstr ""
-
 #: prefs/BatchPrefs.cpp:85
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:89 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how MP3-ID3 Dialog"
-msgstr ""
-
 #: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
 #: prefs/PrefsDialog.cpp:279
 msgid "Directories"
@@ -6478,7 +7253,7 @@ msgid "Auto save a copy of the project in a separate folder"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:104
-msgid "Auto save every:"
+msgid "Auto save interval:"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:105
@@ -6490,7 +7265,7 @@ msgid "Audio cache"
 msgstr "Oudiokasgeheue"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
@@ -6513,49 +7288,87 @@ msgstr "Gids %s is nie skryfbaar nie"
 
 # Punt aan einde van sin?
 #: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "Verandering aan die tydelike gids word eers effektief wanneer Audacity oor begin"
+
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
-"Verandering aan die tydelike gids word eers effektief wanneer Audacity oor "
-"begin"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "File Formats"
-msgstr "Lêerformate"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files into Audacity"
-msgstr "Met die invoer van lêers sonder samepersing"
+#: prefs/FileFormatPrefs.cpp:104
+msgid "MP3 Library Version:"
+msgstr "MP3-biblioteekweergawe:"
 
-#: prefs/FileFormatPrefs.cpp:79
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Maak 'n kopie van die lêer voor wysiging (veiliger)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:80
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Lees direk vanaf oorspronklike lêer (vinniger)"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:84
 msgid "When saving a project that depends on other audio files"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:87
-msgid "&Ask user"
+#: prefs/FileFormatPrefs.cpp:151
+msgid "Always &copy all audio into project (safest)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:88
-msgid "Always &copy all audio (safest)"
+#: prefs/FileFormatPrefs.cpp:152
+msgid "&Do not copy any audio"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Never copy any audio"
+#: prefs/FileFormatPrefs.cpp:87
+msgid "&Ask user"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:93
-msgid "When exporting tracks"
+#: prefs/FileFormatPrefs.cpp:157
+msgid "When exporting tracks to an audio file"
 msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:96
@@ -6566,51 +7379,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:104
-msgid "MP3 Library Version:"
-msgstr "MP3-biblioteekweergawe:"
-
-#: prefs/FileFormatPrefs.cpp:110
-#, fuzzy
-msgid "&Find Library"
-msgstr "Soek biblioteek"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download free copy of LAME"
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:33 prefs/GUIPrefs.cpp:34
 msgid "Interface"
 msgstr "Koppelvlak"
 
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:76
-#, fuzzy
-msgid "&Dragging of left and right selection edges"
-msgstr "Aktiveer die sleep van linker- en regterkante van seleksie"
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:78
-#, fuzzy
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Aktiveer ergonomiese volgorde van Oudio-T/A-knoppies"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:84
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:86
@@ -6625,6 +7435,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:89 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -6633,25 +7447,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:107
-msgid "Language"
-msgstr "Taal"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:109
-msgid "Language:"
-msgstr "Taal:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:112
-msgid "Minimum of dB mode display range"
-msgstr "Minimum van dB-modus-vertoonomvang"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:115
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6661,6 +7475,10 @@ msgstr "-36 dB (oppervlakkige omvang vir hoë-amplitude-redigeerwerk)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM-omvang van 8-bis-monsters)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:117
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM-omvang van 16-bis-monsters)"
@@ -6673,10 +7491,34 @@ msgstr "-120 dB (omtrent tot waar 'n mens hoor)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM-omvang van 24-bis-monsters)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:64 prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "Sleutelbord"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr ""
@@ -6709,18 +7551,13 @@ msgstr "Fout met stoor van sleutelbord-kortpaaie"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Kies 'n XML-lêer wat Audacity-snelsleutels bevat..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML-lêers (*.xml)|*.xml|Alle lêers (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Fout met sleutelbord-kortpaaie"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
 msgstr ""
@@ -6729,6 +7566,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Ontdoen"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Speel ander bane tydens nuwe opname"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:189
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:192
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Muis"
@@ -6943,10 +7817,6 @@ msgstr "Zoem in of uit"
 msgid "Audacity Preferences"
 msgstr "Audacity-voorkeure"
 
-#: prefs/QualityPrefs.cpp:42 prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "Kwaliteit"
-
 #: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "Reghoek"
@@ -7011,12 +7881,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:36 prefs/SpectrumPrefs.cpp:37
@@ -7036,6 +7906,10 @@ msgstr "64 - wyeband"
 msgid "256 - default"
 msgstr "256 - standaard"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:84
 msgid "4096 - most narrowband"
 msgstr "4096 - smalband"
@@ -7044,6 +7918,10 @@ msgstr "4096 - smalband"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -7060,6 +7938,26 @@ msgstr "Minimum frekwensie (Hz):"
 msgid "Maximum Frequency (Hz):"
 msgstr "Maksimum frekwensie (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:134
 msgid "The maximum frequency must be an integer"
 msgstr "Die maksimum frekwensie moet 'n heelgetal wees"
@@ -7076,6 +7974,14 @@ msgstr "Die minimum frekwensie moet 'n heelgetal wees"
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr "Minimum frekwensie moet ten minste 0 Hz wees"
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+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 "Tema"
@@ -7115,8 +8021,7 @@ msgid "Info"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7132,32 +8037,25 @@ msgid ""
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Pouseer"
@@ -7166,9 +8064,9 @@ msgstr "Pouseer"
 msgid "Play"
 msgstr "Speel"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Speel (Shift vir lusherhaling)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7182,6 +8080,10 @@ msgstr "Spring na begin"
 msgid "Skip to End"
 msgstr "Spring na einde"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr ""
@@ -7191,9 +8093,7 @@ msgid "Error while opening sound device. "
 msgstr ""
 
 #: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
 msgstr ""
 
 #: toolbars/ControlToolBar.cpp:697
@@ -7217,6 +8117,10 @@ msgid "Silence selection"
 msgstr "Maak seleksie stil"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Zoem in"
 
@@ -7272,24 +8176,20 @@ msgstr "Afvoermeter"
 msgid "Input level meter - click to monitor input"
 msgstr "Toevoermeter - klik om toevoer te monitor"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "Mengbank"
-
 #: toolbars/MixerToolBar.cpp:91
 msgid "Output Volume"
 msgstr "Afvoervolume"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:102
 msgid "Input Volume"
 msgstr "Toevoervolume"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:117
@@ -7309,6 +8209,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr "na begin van seleksie"
 
+#: effects/ToneGen.cpp:307 effects/ToneGen.cpp:348
+#: toolbars/SelectionBar.cpp:147 toolbars/SelectionBar.cpp:241
+msgid "Length"
+msgstr "Lengte"
+
 #: toolbars/SelectionBar.cpp:157
 msgid "hidden"
 msgstr ""
@@ -7571,6 +8476,22 @@ msgstr "Regs"
 msgid "Help"
 msgstr "Hulp"
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr "Hulp op die Internet"
@@ -7617,17 +8538,16 @@ msgstr "Horisontale stereo"
 msgid "Vertical Stereo"
 msgstr "Vertikale stereo"
 
-#: widgets/Meter.cpp:362
-msgid "Linear"
-msgstr "Lineêr"
-
 #: widgets/Meter.cpp:371
 msgid "Preferences..."
 msgstr "Voorkeure..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1061
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
@@ -7645,6 +8565,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1138 widgets/Ruler.cpp:1139
 msgid "Vertical Ruler"
 msgstr ""
@@ -7656,10 +8592,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:202
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:203
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -7672,6 +8604,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:206
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7789,12 +8736,12 @@ msgstr "Kon nie lêer \"%s\" open nie."
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Fout: \"%s\" by lyn %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 #, fuzzy
 msgid "Could not load file: \"%s\""
 msgstr "Kon nie lêer \"%s\" open nie."
+
diff --git a/locale/ar.po b/locale/ar.po
index 3f7c1c3..0007466 100644
--- a/locale/ar.po
+++ b/locale/ar.po
@@ -6,8 +6,7 @@
 # Audacity Team <audacity-translation at lists.sourceforge.net>, YEAR.
 # Djalel Chefrour <cdjalel at gmail.com>, 2008.
 msgid ""
-msgstr ""
-"Project-Id-Version: audacity\n"
+msgstr "Project-Id-Version: audacity\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
 "PO-Revision-Date: 2008-04-30 21:38+0200\n"
@@ -27,39 +26,16 @@ msgid "OK... Audacious!"
 msgstr "موافق... جريئ!"
 
 #: AboutDialog.cpp:175
-msgid ""
-"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."
-msgstr ""
-"جُرأة برنامج مجاني كتبه فريق من المُطورين المتطوعين حول العالم. "
-"يتم التنسيق بين هؤلاء عن طريق SourceForge.net، و هو موقع على الشبكة "
-" يوفر أدوات مجانية لمشاريع البرمجة ذات المصادر المفتوحة. جُرأة تعمل "
-"على أنظمة ويندوز 98 وما بعده، ماك أواس أكس، لينيكس، و على أنظمة تشغيل "
-"أخرى شبيهة بـيونيكس. هناك إصدارات قديمة لجُرأة من أجل ماك أواس 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"هذا إصدار تجريبي للبرنامج، يمكن أن يحتوي على أعطاب أو خدمات غير مكتملة. نحن "
-"نعتمد على مساعدتك لتطويره، فمن فضلك زر موقعنا على الشبكة و أخبرنا عن اﻷعطاب "
-"و خدمات البرنامج التي ترغب فيها. "
 
 #: AboutDialog.cpp:182
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"هذا إصدار ثابت و كامل لبرنامج  جُرأة. لكن إذا وجدت خلل أو كان لديك اقتراح، من "
-"فضلك إتصل بنا. نحن نعتمد على مساعدات المستخدمين لتحسين البرنامج. للمزيد من "
-"المعلومات زُر موقعنا على الشبكة."
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -72,8 +48,8 @@ msgid "translator_credits"
 msgstr "المترجم إلى العربية : جلال شفرور"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "محرر مجاني للأصوات الرقمية"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -109,6 +85,10 @@ msgstr "جُرأة تستخدم نصوص برامج من المشاريع الت
 msgid "Special thanks:"
 msgstr "شكر خاص:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "جُرأة"
@@ -228,12 +208,10 @@ msgstr "خطأ في فتح المشروع"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s غير موجود و لا يمكن فتحه.\n"
+msgstr "%s غير موجود و لا يمكن فتحه.\n"
 "\n"
 "تم حذفه من قائمة التاريخ. "
 
@@ -266,35 +244,27 @@ msgid "Unknown command line option: %s\n"
 msgstr "خيار سطر اﻷوامر غير معروف: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"جُرأة لم تجد مكان لتخزين الملفات المؤقتة.\n"
+msgstr "جُرأة لم تجد مكان لتخزين الملفات المؤقتة.\n"
 "من فضلك أدخل دليلا لهذه الملفات في علبة حوار الخيارات. "
 
 #: AudacityApp.cpp:1050
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
 msgstr "سيتم توقيف جُرأة الآن. من فضلك أعد تشغيل جُرأة لكي تستخدم الدليل المؤقت الجديد."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"قد يؤدي تشغيل نسختين من جُرأة في نفس الوقت\n"
+msgstr "قد يؤدي تشغيل نسختين من جُرأة في نفس الوقت\n"
 "إلى فقدان البيانات أو إلى تحطم النظام.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"لم تتمكن جُرأة من إقفال دليل الملفات المؤقتة.\n"
+msgstr "لم تتمكن جُرأة من إقفال دليل الملفات المؤقتة.\n"
 "يُحتمل أن نسخة أخرى من جُرأة تستخدم هذا الدليل.\n"
 
 #: AudacityApp.cpp:1091
@@ -310,11 +280,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "هناك نسخة أخرى من برنامج جُرأة قيد الاستخدام.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"لفتح عدة مشاريع في نفس الوقت استعمل الأمر جديد \n"
+msgstr "لفتح عدة مشاريع في نفس الوقت استعمل الأمر جديد \n"
 " أو اﻷمر فتح في برنامج جُرأة الجاري.\n"
 
 #: AudacityApp.cpp:1134
@@ -352,19 +320,15 @@ msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (تحديد الحجم الأقصى لكتل القرص بالبايت)"
 
 #: AudacityApp.cpp:1166
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
 msgstr "أضف إلى الخيارات اسم ملف صوتي أو مشروع جُرأة لفتحه."
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"حاليا ملفات مشاريع جُرأة (.AUP) ليست \n"
+msgstr "حاليا ملفات مشاريع جُرأة (.AUP) ليست \n"
 "مرتبطة بجُرأة. \n"
 "\n"
 "هل تريد ربطها حتى يمكن فتحها بنقرة مزدوجة؟"
@@ -378,11 +342,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "لا يمكن العثور على أية أجهزة صوتية.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"لن يكون بإمكانك قراءة أو تسجيل الصوت.\n"
+msgstr "لن يكون بإمكانك قراءة أو تسجيل الصوت.\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -398,27 +360,21 @@ msgid "Latency problem"
 msgstr "مشكل في الكمون"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
-msgstr ""
-"إعداد الكمون تسبب في إخفاء الصوت المسجل قبل الصفر.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "إعداد الكمون تسبب في إخفاء الصوت المسجل قبل الصفر.\n"
 "قام برنامج جُرأة بإرجاعه ليبدأ من الصفر.\n"
-"ربما تحتاج لاستخدام أداة تحريك الوقت (<---> أو F5) لسحب "
-"المسار للمكان الصحيح."
+"ربما تحتاج لاستخدام أداة تحريك الوقت (<---> أو F5) لسحب المسار للمكان الصحيح."
 
 #: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
 msgstr "استعادة تلقائية بعد التحطم"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"بعض المشاريع لم تُحفظ بشكل نظيف عند آخر استخدام لجُرأة.\n"
+msgstr "بعض المشاريع لم تُحفظ بشكل نظيف عند آخر استخدام لجُرأة.\n"
 "لحسن الحظ، يمكن استرجاع المشاريع التالية تلقائيا:"
 
 #: AutoRecovery.cpp:75
@@ -446,11 +402,9 @@ msgid "Recover Projects"
 msgstr "استرجع المشاريع"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"هل أنت متأكد أنك لا تريد استرجاع أي مشروع ؟\n"
+msgstr "هل أنت متأكد أنك لا تريد استرجاع أي مشروع ؟\n"
 "لا يمكن استرجاعها فيما بعد."
 
 #: AutoRecovery.cpp:128
@@ -511,11 +465,9 @@ msgstr "الأمر %s ليس مُبرمج بعد"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"لا يمكن تبديل متغيرات التأثير %s\n"
+msgstr "لا يمكن تبديل متغيرات التأثير %s\n"
 "  إلى %s."
 
 #: BatchCommands.cpp:583
@@ -525,12 +477,10 @@ msgstr "لا يمكن التعرف على دفعة أوامرك %s."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"تطبيق %s بالمتغيرات \n"
+msgstr "تطبيق %s بالمتغيرات \n"
 "\n"
 "%s"
 
@@ -548,6 +498,10 @@ msgstr "تطبيق %s"
 msgid "Apply Chain"
 msgstr "تطبيق السلسلة"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "ا&ختيار السلسلة"
@@ -585,19 +539,21 @@ msgstr "تطبيق '%s' على المشروع الحالي"
 msgid "Please save and close the current project first."
 msgstr "من فضلك احفظ و أغلق المشروع الحالي أولا."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "اختيار الملفات للمعالجة في دفعة واحدة..."
 
-#: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
 msgstr ""
-"كل الملفات (*.*)|*.*|  ملفات وايف (*.wav)|*.wav ملفات آيف (*.aif)|*.aif| "
-"ملفات آيو (*.au)|*.au| ملفات أم.بي.3 (*.mp3)|*.mp3|ملفات أوق فوربيس (*.ogg)|"
-"*.ogg|ملفات فلاك (*.flac)|*.flacc"
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "كل الملفات (*.*)|*.*|  ملفات وايف (*.wav)|*.wav ملفات آيف (*.aif)|*.aif| ملفات آيو (*.au)|*.au| ملفات أم.بي.3 (*.mp3)|*.mp3|ملفات أوق فوربيس (*.ogg)|*.ogg|ملفات فلاك (*.flac)|*.flacc"
 
 #: BatchProcessDialog.cpp:231
 msgid "Applying..."
@@ -698,15 +654,11 @@ msgid "Copying audio data into project..."
 msgstr "نسخ الصوت إلى المشروع..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"إن مشروعك يعتمد حاليا على وجود ملفات أخرى.\n"
-"انسخ الصوت من الملفات التالية إلى مشروعك حتى "
-"تجعله مستقلا بذاته؟\n"
+msgstr "إن مشروعك يعتمد حاليا على وجود ملفات أخرى.\n"
+"انسخ الصوت من الملفات التالية إلى مشروعك حتى تجعله مستقلا بذاته؟\n"
 "سيتطلب هذا مساحة  أكبر على القرص و لكنه أسلم."
 
 #: Dependencies.cpp:266
@@ -758,15 +710,11 @@ msgid "Whenever a project depends on other files:"
 msgstr "كلما كان المشروع يعتمد على ملفات أخرى:"
 
 #: Dependencies.cpp:409
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
 msgstr "إذا واصلت فلن يتم حفظ المشروع على القرص. هل هذا ما تريده؟"
 
 #: Dependencies.cpp:449
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
+msgid "Your project is self-contained; it does not depend on any external audio files."
 msgstr "إن مشروعك مستقل بذاته و لا يعتمد على أي ملفات صوتية خارجية."
 
 #: Dependencies.cpp:450
@@ -774,11 +722,9 @@ msgid "Dependency check"
 msgstr "فحص الارتباطات"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"إنذار: المساحة الفارغة على هذا القرص ضئيلة جدا.\n"
+msgstr "إنذار: المساحة الفارغة على هذا القرص ضئيلة جدا.\n"
 "من فضلك إختر دليلا مؤقتا آخر في التفضيلات."
 
 #: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
@@ -799,12 +745,9 @@ msgstr "تنظيف الأدلة المخبئية"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
-msgstr ""
-"لقد عثر جُرأة على كتلة ملف يتيمة %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "لقد عثر جُرأة على كتلة ملف يتيمة %s! \n"
 "من فضلك فكر في حفظ المشروع ثم إعادة تحميله ليتم فحصه بالكامل.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
@@ -829,16 +772,16 @@ msgstr "غير قادر على حذف '%s'"
 msgid "Renamed file: %s\n"
 msgstr "تم إعادة تسمية الملف: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "تغيير الكتلة %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "غير قادر على إعادة تسمية '%s' إلى '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr "تفتيش بيانات ملف المشروع..."
@@ -864,23 +807,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "ملف البيانات مفقود: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
-msgstr ""
-"أظهر الفحص وجود أخطاء في بيانات المشروع المُحمَّل.\n"
-"انقر 'تفاصيل' لإظهار القائمة الكاملة للأخطاء، أو انقر 'نعم' للتنقل إلى "
-"خيارات أخرى. "
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "أظهر الفحص وجود أخطاء في بيانات المشروع المُحمَّل.\n"
+"انقر 'تفاصيل' لإظهار القائمة الكاملة للأخطاء، أو انقر 'نعم' للتنقل إلى خيارات أخرى. "
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"أدى فحص المشروع إلى العثور على %d كتلة ملف يتيمة، هذه الكُتل \n"
+msgstr "أدى فحص المشروع إلى العثور على %d كتلة ملف يتيمة، هذه الكُتل \n"
 "غير مستخدمة و يُحتمل أن تكون بقايا تحطم البرنامج أو خلل ما.\n"
 "يجب حذفها لتفادي حشو القرص بها."
 
@@ -904,15 +841,13 @@ msgstr "إنذار"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"أدى فحص المشروع إلى العثور على %d ملف دخول قيد\n"
+msgstr "أدى فحص المشروع إلى العثور على %d ملف دخول قيد\n"
 "الاستخدام، ملفات الكنية مفقودة الآن. لا يستطيع\n"
 "جُرأة أن يسترجع هذه الملفات تلقائيا. يمكنك اختيار\n"
 "تعويض الملفات المفقودة بالصمت بشكل دائم،\n"
@@ -933,12 +868,10 @@ msgstr "إغلاق المشروع فورا دون أي تغيير"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"أظهر فحص المشروع أن هناك %d ملف مُلخَص (.auf)\n"
+msgstr "أظهر فحص المشروع أن هناك %d ملف مُلخَص (.auf)\n"
 " مفقود. يستطيع جُرأة إعادة إنشاء هذه الملفات الملخصة\n"
 "كاملة انطلاقا من البيانات الصوتية اﻷصلية في المشروع."
 
@@ -952,16 +885,14 @@ msgstr "تعويض بيانات العرض المفقودة بالصمت [لهذ
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"أظهر فحص المشروع أن هناك %d كتل ملفات لبيانات \n"
+msgstr "أظهر فحص المشروع أن هناك %d كتل ملفات لبيانات \n"
 "صوتية (.auf)، يُحتمل أن تكون بقايا تحطم البرنامج\n"
 " أو خلل ما أو حذف عن طريق الخطأ. لا يستطيع جُرأة\n"
 "أن يسترجع هذه البيانات المفقودة تلقائيا. يمكنك اختيار\n"
@@ -997,6 +928,95 @@ msgstr "حفظ الصوت المُسجل في القرص..."
 msgid "Rectangular"
 msgstr "مستطيل"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "مكان %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "للبحث على %s، أنقر هنا -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "تصفح..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "أين هو %s؟"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "تحليل التردد"
@@ -1024,8 +1044,9 @@ msgstr "ارتباط ذاتي مُطوَّر"
 msgid "Cepstrum"
 msgstr "كابستروم"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "خوارزم:"
 
 #: FreqWindow.cpp:168 HistoryWindow.cpp:79
@@ -1038,9 +1059,9 @@ msgstr "حجم"
 msgid " window"
 msgstr "نافذة"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "دالة:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1050,14 +1071,18 @@ msgstr "تردد خطي"
 msgid "Log frequency"
 msgstr "انشر التردد"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "محور:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:204 Menus.cpp:233
 msgid "&Export..."
 msgstr "ت&صدير..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "تصدير"
+
 #: FreqWindow.cpp:209 widgets/ErrorDialog.cpp:159
 msgid "Close"
 msgstr "إغلاق"
@@ -1180,357 +1205,56 @@ msgid "Welcome to Audacity "
 msgstr "مرحبا بك في برنامج جُرأة"
 
 #: HelpText.cpp:151
-msgid ""
-"Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|"
-"record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or "
-"open an Audacity project]] <li>[[export|export]] to an MP3 or other audio "
-"file, or [[burncd|burn to a CD]]  </ul></p><p>"
-msgstr ""
-"تعلم كيفية: <ul><li>[[play|قراءة]] مف صوتي موجود <li>[[record|"
-"تسجيل]] صوتك، أو شريط <li>[[edit|تحرير]] اﻷصوات <li>[[save| "
-"حفظ أو فتح مشروع جُرأة]] <li>[[export|تصدير]] إلى ملف أم.بي.3 أو ملف من نوع "
-" آخر ، أو [[burncd|نسخ الصوت إلى قرص مضغوط]]  </ul></p><p>"
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "تعلم كيفية: <ul><li>[[play|قراءة]] مف صوتي موجود <li>[[record|تسجيل]] صوتك، أو شريط <li>[[edit|تحرير]] اﻷصوات <li>[[save| حفظ أو فتح مشروع جُرأة]] <li>[[export|تصدير]] إلى ملف أم.بي.3 أو ملف من نوع  آخر ، أو [[burncd|نسخ الصوت إلى قرص مضغوط]]  </ul></p><p>"
 
 #: HelpText.cpp:159
-msgid ""
-"This screen can be viewed at any time by clicking the <i>Help</i> menu, then "
-"<i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus "
-"and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a "
-"href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf"
-"\">full Manual</a> in PDF format.</p>"
-msgstr ""
-"يمكن عرض هذه الشاشة في أي وقت بالنقر على "
-"قائمة <i>المساعدة </i>، ثم <i>عرض الكلمة الترحيبية</i>. "
-"للوصول إلى الدليل التفصيلي لقوائم و واجهة التحكم "
-"في جُرأة، انقر على <i>مساعدة</i> ثم <i>دليل</i>، "
-"أو قم بتنزيل <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf"
-"\">الدليل الكامل</a> بصيغة بي.دي.أف PDF.</p>"
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "يمكن عرض هذه الشاشة في أي وقت بالنقر على قائمة <i>المساعدة </i>، ثم <i>عرض الكلمة الترحيبية</i>. للوصول إلى الدليل التفصيلي لقوائم و واجهة التحكم في جُرأة، انقر على <i>مساعدة</i> ثم <i>دليل</i>، أو قم بتنزيل <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">الدليل الكامل</a> بصيغة بي.دي.أف PDF.</p>"
 
 #: HelpText.cpp:172
-msgid ""
-"<p><b>Opening audio files:</b> Either drag the files into the current "
-"project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be "
-"opened into a new project window with <i>File &gt; Open</i>. The main "
-"formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), "
-"<b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if "
-"your file is in some other format. <b>To import a CD:</b> extract it to WAV "
-"or AIFF using iTunes, Windows Media Player 11 or similar. See our online "
-"guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:"
-"</b> Press the green Play button to start playback. Press the blue Pause "
-"button once to pause playback, and again to resume. To stop, press the "
-"yellow Stop button. Spacebar can be used to either play or stop. After "
-"stopping, playback resumes from its last starting point. To change the "
-"starting point, click in the track at your desired starting point. The <b>|"
-"&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start "
-"or end of the track respectively. </p><br><br>"
-msgstr ""
-"<p><b>فتح الملفات الصوتية:</b> اسحب الملف إلى نافذة المشروع الحالي "
-"أو انقر على <i>ملف &gt; استيراد &gt; صوت</i>. يمكن فتح الملفات  "
-"في نافذة مشروع جديد عن طريق <i>ملف &gt; فتح</i>. الصيغ الرئيسية "
-"التي يقرؤها برنامج جُرأة هي <b>آيف، آيو، فلاك، أم.4.آي</b> (فقط على الماك)، "
-"<b>أم.بي.2/أم.بي.3، أوق فوربيس</b> و <b>وايف</b>. انقر هذا [[wma-proprietary|الرابط]] "
-"إذا كان لملفك صيغة أخرى. <b>لاستيراد قرص مضغوط:</b> استخرجه إلى صيغة وايف "
-"أو آيف باستخدام آيتيونز ، ويندوز ميديا بلاير 11 أو برنامج مماثل. انظر دليلنا على "
-"اﻷنترنت: [[wiki:How_to_import_CDs|استيراد اﻷقراص المضغوطة]].</p><p> <p><b> "
-"قراءة الصوت:</b> اضغط على زر القراءة اﻷخضر لبدئها. اضغط على زر الوقوف "
-"اﻷزرق مرة واحدة لوقف القراءة مؤقتا، ثم اضغط عليه ثانيا لاستكمال القراءة. "
-"لتوقيف القراءة اضغط على زر التوقف اﻷصفر. يمكن استخدام مفتاح المسافة "
-"للقراءة أو التوقف. بعد التوقف، القراءة تستأنف من نقطة البداية السابقة. "
-"لتغيير نقطة البداية،  استخدم الأزرار <b>| "
-"&lt;&lt;</b. و <b>&gt;&gt;|</b>  للقفز نحو البداية أو نحو النهاية."
-"</p><br><br>"
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>فتح الملفات الصوتية:</b> اسحب الملف إلى نافذة المشروع الحالي أو انقر على <i>ملف &gt; استيراد &gt; صوت</i>. يمكن فتح الملفات  في نافذة مشروع جديد عن طريق <i>ملف &gt; فتح</i>. الصيغ الرئيسية التي يقرؤها برنامج جُرأة هي <b>آيف، آيو، فلاك، أم.4.آي</b> (فقط على الماك)، <b>أم.بي.2/أم.بي.3، أوق فوربيس</b> و <b>وايف</b>. انقر هذا [[wma-proprietary|الرابط]] إذا كان لملفك صيغة أخرى. <b>لاستيراد قرص مضغوط:</b> استخرجه إلى صيغة وايف أو آيف باستخدام آيتيونز ، ويندوز ميديا بلاير 11 أو برنامج مماثل. انظر دليلنا على اﻷنترنت: [[wiki:How_to_import_CDs|استيراد اﻷقراص المضغوطة]].</p><p> <p><b> قراءة الصوت:</b> اضغط على زر القراءة اﻷخضر لبدئها. اضغط على زر الوقوف اﻷزرق مرة واحدة لوقف القراءة مؤقتا، ثم اضغط عليه ثانيا لاستكمال القراءة. لتوقيف القراءة اضغط على زر التوقف اﻷصفر. يمكن استخدام مفتاح المسافة للقراءة أو التوقف. بعد التوقف، القراءة تستأنف من نقطة البداية السابقة. لتغيير نقطة البداية،  استخدم الأزرار <b>| &lt;&lt;</b. و <b>&gt;&gt;|</b>  للقفز نحو البداية أو نحو النهاية.</p><br><br>"
 
 #: HelpText.cpp:194
-msgid ""
-"<p><b>To record:</b> Set the recording device and input source, adjust the "
-"input level, then press the red Record button.</b></p><p> 1) [[inputdevice|"
-"Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or "
-"in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo "
-"recording if required.<br> 2) [[inputsource|Set input source]] for that "
-"device (for example, microphone or line-in) in the dropdown selector of the "
-"<i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the "
-"<i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) "
-"[[inputlevel|Adjust input level]] using the right-hand slider on the "
-"<i>Mixer Toolbar</i>. Correct adjustment of level before recording is "
-"essential to avoid noise or distortion. </p><p> More help at: \"Recording\" "
-"<a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial "
-"<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-"
-"_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://"
-"www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our "
-"Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:"
-"Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
-msgstr ""
-"<p><b>للتسجيل: </b> عرف جهاز التسجيل و مصدر اﻹدخال و عدل "
-"مستوى اﻹدخال ثم اضغط على زر التسجيل . </b></p><p> 1) [[inputdevice|"
-"إعداد جهاز التسجيل]] من خلال <i>لسان منافذ الصوت في التفضيلات</i> "
-"أو من خلال <i>شريط اﻷجهزة</i>. تفضيلات منافذ الصوت تسمح لك باختيار "
-"التسجيل الثنائي إذا كنت تريد ذلك. <br> 2) [[inputsource|إعداد مصدر اﻹدخال]] لذلك "
-"الجهاز (مثلا الميكروفون أو الخط-الداخل) من خلال القائمة المنسدلة في <i>شريط المازج</i>، "
-" أو (على بعض اﻷنظمة) من خلال جهاز التسجيل عند <i>لسان منافذ الصوت في التفضيلات</i> "
-"أو من خلال  <i>شريط اﻷجهزة</i>.<br> 3) [[inputlevel|تعديل مستوى اﻹدخال]] باستعمال "
-"المتزحلق اﻷيمن في <i>شريط المازج</i>. تصحيح المستوى قبل بدأ التسجيل ضروري لتجنب الضجيج "
-"و  التشوهات. </p><p> للمزيد من المساعدة انظر <a href=\"http://audacity.sourceforge.net/help/faq\">الأسئلة المتكررة</a> "
-"حول \"التسجيل\"، و كذلك الدرس التعليمي "
-" <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\">تسجيلك اﻷول</a> في "
-" <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\"> الدليل </a>، و أيضا صفحات الويكي "
-"[[wiki:Recording_Tips|نصائح حول التسجيل]] و [[wiki:"
-"Troubleshooting_Recordings|حل مشاكل التسجيل]]. </p><br><br>"
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>للتسجيل: </b> عرف جهاز التسجيل و مصدر اﻹدخال و عدل مستوى اﻹدخال ثم اضغط على زر التسجيل . </b></p><p> 1) [[inputdevice|إعداد جهاز التسجيل]] من خلال <i>لسان منافذ الصوت في التفضيلات</i> أو من خلال <i>شريط اﻷجهزة</i>. تفضيلات منافذ الصوت تسمح لك باختيار التسجيل الثنائي إذا كنت تريد ذلك. <br> 2) [[inputsource|إعداد مصدر اﻹدخال]] لذلك الجهاز (مثلا الميكروفون أو الخط-الداخل) من خلال القائمة المنسدلة في <i>شريط المازج</i>،  أو (على بعض اﻷنظمة) من خلال جهاز التسجيل عند <i>لسان منافذ الصوت في التفضيلات</i> أو من خلال  <i>شريط اﻷجهزة</i>.<br> 3) [[inputlevel|تعديل مستوى اﻹدخال]] باستعمال المتزحلق اﻷيمن في <i>شريط المازج</i>. تصحيح المستوى قبل بدأ التسجيل ضروري لتجنب الضجيج و  التشوهات. </p><p> للمزيد من المساعدة انظر <a href=\"http://audacity.sourceforge.net/help/faq\">الأسئلة المتكررة</a> حول \"التسجيل\"، و كذلك الدرس التعليمي  <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\">تسجيلك اﻷول</a> في  <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\"> الدليل </a>، و أيضا صفحات الويكي [[wiki:Recording_Tips|نصائح حول التسجيل]] و [[wiki:Troubleshooting_Recordings|حل مشاكل التسجيل]]. </p><br><br>"
 
 #: HelpText.cpp:221
-msgid ""
-"<p>The input device is the actual physical sound device you are recording "
-"from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of "
-"Preferences</i>, On Windows and Linux, Preferences are at the bottom of the "
-"<i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also "
-"conveniently select Recording Device in the <i>Device Toolbar</i>, which can "
-"be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity "
-"uses the device currently being used by the system, (usually your inbuilt "
-"sound device), so it is often not necessary to change the input device. On "
-"Windows, this current system device can be selected as \"Microsoft Sound "
-"Mapper\". If you are recording from an external USB or Firewire device such "
-"as a USB turntable, select it explicitly by name as recording device after "
-"conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
-"<p>جهاز اﻹدخال هو الجهاز الصوت الحالي على حاسوبك الذي تسجل عليه."
-"يتم اختيار  \"جهاز التسجيل\" من خلال <i> لسان منافذ الصوت في "
-"التفضيلات </i>، على لينيكس و ويندوز تكون التفضيلات في آخر قائمة<i> "
-"التحرير</i>. على الماك، ستجد التفضيلات في القائمة <i>جُرأة</i>. يمكنك أيضا "
-"اختيار جهاز التسجيل بشكل ملائم من خلال <i>شريط اﻷجهزة</i> الذي يمكن "
-"تفعيله من القائمة <i>عرض &lt; أشرطة الأدوات...</i>. </p><p>  في الحالة "
-"الافتراضية، سيختار جُرأة جهاز الصوت الذي يستعمله النظام (و هو عادة جهاز "
-"الصوت المُدمَج في الحاسوب)، لذا في الغالب لا تحتاج إلى تغيير جهاز اﻹدخال."
-"على ويندوز يمكن اختيار الجهاز الحالي للنظام كـ\"كمنظم صوت ميكروسوفت\". "
-"إذا كنت تسجل من جهاز يو.أس.بي خارجي مثل قرص دوار يو.أس.بي أو من جهاز "
-"فايرواير، قم باختياره باسمه كجهاز تسجيل بعد ربطه بالحاسوب.  </p><p> "
-"عودة إلى [[record|تسجيل الصوت]] <br></p>"
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>جهاز اﻹدخال هو الجهاز الصوت الحالي على حاسوبك الذي تسجل عليه.يتم اختيار  \"جهاز التسجيل\" من خلال <i> لسان منافذ الصوت في التفضيلات </i>، على لينيكس و ويندوز تكون التفضيلات في آخر قائمة<i> التحرير</i>. على الماك، ستجد التفضيلات في القائمة <i>جُرأة</i>. يمكنك أيضا اختيار جهاز التسجيل بشكل ملائم من خلال <i>شريط اﻷجهزة</i> الذي يمكن تفعيله من القائمة <i>عرض &lt; أشرطة الأدوات...</i>. </p><p>  في الحالة الافتراضية، سيختار جُرأة جهاز الصوت الذي يستعمله النظام (و هو عادة جهاز الصوت المُدمَج في الحاسوب)، لذا في الغالب لا تحتاج إلى تغيير جهاز اﻹدخال.على ويندوز يمكن اختيار الجهاز الحالي للنظام كـ\"كمنظم صوت ميكروسوفت\". إذا كنت تسجل من جهاز يو.أس.بي خارجي مثل قرص دوار يو.أس.بي أو من جهاز فايرواير، قم باختياره باسمه كجهاز تسجيل بعد ربطه بالحاسوب.  </p><p> عودة إلى [[record|تسجيل الصوت]] <br></p>"
 
 #: HelpText.cpp:244
-msgid ""
-"<p>Select the input source (such as microphone or line-in) for your "
-"[[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and "
-"<b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</"
-"i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the "
-"<i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source "
-"will be shown as part of the parent device (for example, <i>High Def Audio "
-"Card: Microphone</i>). If necessary, Mac users can choose the input source "
-"at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire "
-"recording devices don't have a choice of inputs, so this step is not "
-"necessary. If in doubt, see the documentation for your device. </i></p><p> "
-"<b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&i=streaming\">record audio playing on the computer</a>, Windows "
-"and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or "
-"comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
-"<p>اختر مصدر اﻹدخال (مثل الميكروفون أو الخط-الداخل) لـ [[inputdevice| "
-"جهاز التسجيل]]:<br> - على <b>لينيكس</b> و على <b> ويندوز (باستثناء فيستا)</b>، "
-"من القائمة المنسدلة على يمين <i>شريط المازج</i>.<br> - <b> "
-"على ويندوز فيستا</b> و <b>ماك</b>من جهاز التسجيل في <i> "
-"لسان منافذ الصوت في التفضيلات </i> أو من <i>شريط اﻷجهزة</i>.  "
-"سيتم عرض المصدر كجزء من الجهاز اﻷب (مثلا <i>بطاقة الصوت بتعريف عالي:"
-"الميكروفون</i>). عند الحاجة، يمكن لمستخدمي الماك اختيار مصدر اﻹدخال"
-"من إعدادات صوت ميدي لآيبل. <br><i><b>ملاحظة:</b> العديد من أجهزة "
-"التسجيل عبر اليو.أس.بي أو الفايرواير ليس لها خيارات للإدخال، فهي إذا لا تحتاج "
-"لهذه الخطوة. إذا لم تكن متأكدا راجع دليل جهازك. </i></p><p> <b> "
-"نصيحة:</b> <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&i=streaming\">لتسجيل الصوت الصادر من الحاسوب نفسه</a>، "
-" يمكن لمستخدمي لينيكس و ويندوز اختيار \"المزج الثنائي\"، \"إخراج الوايف\"، \"المجموع\" "
-"أو مصدر إدخال مماثل. </p><p> العودة إلى [[record|تسجيل الصوت]] <br></p>"
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>اختر مصدر اﻹدخال (مثل الميكروفون أو الخط-الداخل) لـ [[inputdevice| جهاز التسجيل]]:<br> - على <b>لينيكس</b> و على <b> ويندوز (باستثناء فيستا)</b>، من القائمة المنسدلة على يمين <i>شريط المازج</i>.<br> - <b> على ويندوز فيستا</b> و <b>ماك</b>من جهاز التسجيل في <i> لسان منافذ الصوت في التفضيلات </i> أو من <i>شريط اﻷجهزة</i>.  سيتم عرض المصدر كجزء من الجهاز اﻷب (مثلا <i>بطاقة الصوت بتعريف عالي:الميكروفون</i>). عند الحاجة، يمكن لمستخدمي الماك اختيار مصدر اﻹدخالمن إعدادات صوت ميدي لآيبل. <br><i><b>ملاحظة:</b> العديد من أجهزة التسجيل عبر اليو.أس.بي أو الفايرواير ليس لها خيارات للإدخال، فهي إذا لا تحتاج لهذه الخطوة. إذا لم تكن متأكدا راجع دليل جهازك. </i></p><p> <b> نصيحة:</b> <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">لتسجيل الصوت الصادر من الحاسوب نفسه</a>،  يمكن لمستخدمي لينيكس و ويندوز اختيار \"المزج الثنائي\"، \"إخراج الوايف\"، \"المجموع\" أو مصدر إدخال مماثل. </p><p> العودة إلى [[record|تسجيل الصوت]] <br></p>"
 
 #: HelpText.cpp:267
-msgid ""
-"<p>The input level must be set correctly. If the level is too low, there "
-"will be background noise. If the level is too high, there will be distortion "
-"in the loud parts. </p><p>To set the level, either see this [[wiki:"
-"Recording_levels|illustrated online guide]] or follow these steps: "
-"<ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two "
-"<i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If "
-"the meters are not visible, click <i>View &gt; Toolbars</i> and check "
-"\"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</"
-"i> (by the microphone symbol), so that the red bars in the meter come close "
-"to <b>but do not touch</b> the right edge of the scale. If you can't hear "
-"the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check "
-"\"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording "
-"Audio]] <br></p>"
-msgstr ""
-"<p>يجب تحديد مستوى اﻹدخال بشكل صحيح. إذا كان المستوى منخفض جدا،"
-"سينتج عنه ضجيج في خلفية الصوت و  إذا كان عاليا جدا  سيسبب تشوهات "
-"في اﻷجزاء المرتفعة من الصوت. </p><p>لتحديد هذا المستوى انظر [[wiki:"
-"Recording_levels|الدليل الذي يوضح هذا على اﻷنترنت]] أو اتبع الخطوات التالية: "
-"<ol><li>قم بتشغيل <b>المراقبة</b> بالنقر مرتين على الجهة اليمنى "
-"<i>لعدادي مستوى الصوت</i> (أو بالنقر عليها بالزر الأيمن) ثم اختيار \"بدأ المراقبة\". "
-" إذا كنت لاترى العدادان، انقر <i>عرض &lt; أشرطة اﻷدوات</i> ثم اختر"
-"\"شريط العداد\". </li><li>عدل متزلج مستوى الصوت الداخل على <i>شريط المازج</i> "
-" (عند رمز الميكروفون)، بحيث تصبح أشرطة العداد الحمراء قريبة من حافة السُلم اليمنى <b>"
-"دون أن تلمسها</b>. إذا لم تتمكن من سماع الصوت، اذهب إلى <i>تفضيلات منافذ "
-"الصوت</i> و اختر \"القراءة بواسطة البرنامج\".</li></ol></p><p>العودة إلى [[record|تسجيل "
-"الصوت]] <br></p>"
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>يجب تحديد مستوى اﻹدخال بشكل صحيح. إذا كان المستوى منخفض جدا،سينتج عنه ضجيج في خلفية الصوت و  إذا كان عاليا جدا  سيسبب تشوهات في اﻷجزاء المرتفعة من الصوت. </p><p>لتحديد هذا المستوى انظر [[wiki:Recording_levels|الدليل الذي يوضح هذا على اﻷنترنت]] أو اتبع الخطوات التالية: <ol><li>قم بتشغيل <b>المراقبة</b> بالنقر مرتين على الجهة اليمنى <i>لعدادي مستوى الصوت</i> (أو بالنقر عليها بالزر الأيمن) ثم اختيار \"بدأ المراقبة\".  إذا كنت لاترى العدادان، انقر <i>عرض &lt; أشرطة اﻷدوات</i> ثم اختر\"شريط العداد\". </li><li>عدل متزلج مستوى الصوت الداخل على <i>شريط المازج</i>  (عند رمز الميكروفون)، بحيث تصبح أشرطة العداد الحمراء قريبة من حافة السُلم اليمنى <b>دون أن تلمسها</b>. إذا لم تتمكن من سماع الصوت، اذهب إلى <i>تفضيلات منافذ الصوت</i> و اختر \"القراءة بواسطة البرنامج\".</li></ol></p><p>العودة إلى [[record|تسجيل الصوت]] <br></p>"
 
 #: HelpText.cpp:292
-msgid ""
-"<p>The main commands for editing audio are under the <i>Edit</i> menu (such "
-"as cut, copy and paste) and the <i>Effect</i> menu (you can do things like "
-"boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity "
-"applies edits to selected areas of the audio track. To select a particular "
-"area, click in the track and drag the shaded area with the mouse. If no "
-"audio is selected, Audacity selects all the audio in the project window.</"
-"p><p> When playing or recording, the Edit and Effect menus will appear "
-"greyed out, because a moving track can't be edited. Commands can sometimes "
-"be unavailable for other reasons too. For example, you can't run effects "
-"until you have audio on the screen, and you can't paste audio until you've "
-"cut or copied it to Audacity's clipboard. </p><br><br>"
-msgstr ""
-"<p>الأوامر الرئيسية لتحرير الصوت موجودة في القائمة <b>تحرير</b> "
-"(مثل قص، نسخ و لصق) و القائمة <b>تأثيرات</b> (أين يمكنك مثلا "
-"القيام بتعزيز الباس، تغيير الحدة أو الإيقاع، أو حذف الضجيج). </p><p> "
-"جُرأة يطبق أوامر التحرير على المناطق المختارة في المسار الصوتي."
-"لاختيار منطقة معينة انقر على المسار و اسحب المنطقة المظللة بواسطة"
-" الفأرة. إذا لم تختر أي منطقة، سيقوم جُرأة باختيار كل الصوت في نافذة"
-" المشروع. </p><p>أثناء القراءة أو التسجيل تكون قائمتا التحرير و التأثيرات"
-" مُظللتان لأنه لا يمكن تحرير مسار  مُتحرك. أحيانا تكون الأوامر مُعطلة لأسباب"
-" أخرى . مثلا، لا يمكنك تطبيق التأثيرات حتى يكون هناك صوت على الشاشة،"
-" كذلك لا يمكنك لصق الصوت حتى تقوم بقصه أو نسخه إلى لوحة الحفظ"
-" في برنامج جُرأة.</p><br><br>"
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>الأوامر الرئيسية لتحرير الصوت موجودة في القائمة <b>تحرير</b> (مثل قص، نسخ و لصق) و القائمة <b>تأثيرات</b> (أين يمكنك مثلا القيام بتعزيز الباس، تغيير الحدة أو الإيقاع، أو حذف الضجيج). </p><p> جُرأة يطبق أوامر التحرير على المناطق المختارة في المسار الصوتي.لاختيار منطقة معينة انقر على المسار و اسحب المنطقة المظللة بواسطة الفأرة. إذا لم تختر أي منطقة، سيقوم جُرأة باختيار كل الصوت في نافذة المشروع. </p><p>أثناء القراءة أو التسجيل تكون قائمتا التحرير و التأثيرات مُظللتان لأنه لا يمكن تحرير مسار  مُتحرك. أحيانا تكون الأوامر مُعطلة لأسباب أخرى . مثلا، لا يمكنك تطبيق التأثيرات حتى يكون هناك صوت على الشاشة، كذلك لا يمكنك لصق الصوت حتى تقوم بقصه أو نسخه إلى لوحة الحفظ في برنامج جُرأة.</p><br><br>"
 
 #: HelpText.cpp:311
-msgid ""
-"<p>To return later to your unfinished work in Audacity with all tracks and "
-"edits as you left them, save an Audacity project. To play your current work "
-"in other media programs or send it to others, [[export|export]] an audio "
-"file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>."
-"aup</b> project file and  a <b>_data</b> folder containing the actual audio. "
-"To re-open a saved project, click <i>File &gt; Open</i> and open the .aup "
-"file. If you save and exit more than once, an .aup.bak backup file is "
-"created, but the .aup file should always be opened if present. When your "
-"final exported file is exactly as you want, delete the project files and "
-"_data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> "
-"is for saving an empty project. It also lets you save an existing Project to "
-"a <b> new</b> name. This is the only safe way to rename a project. The .aup "
-"file and _data folder should not be moved or renamed manually. </p><p>"
-msgstr ""
-"<p>إذا كنت ترغب في إكمال عملك لاحقا مع استعادة كل المسارات و التغييرات "
-"التي أحدثتها قم بحفظه كملف مشروع جُرأة. أما إذا أردت الاستماع لعملك"
-"في برنامج آخر للوسائط المتعددة أو إرساله إلى شخص ما، قم [[export|بتصديره]] "
-" إلى ملف صوتي من نوع وايف أو أم.بي.3</p><p> .الأمر <i>ملف &lt; حفظ المشروع</i> "
-"يُنتج ملف مشروع بامتداد <b>.aup</b و  مُجلد <b>_data</b> يحتوى على بيانات  الصوت. "
-"لفتح مشروع محفوظ مرة أخرى استخدم <i>ملف &lt; فتح</i> و اختر الملف .aup. "
-"بعد الحفظ و الخروج من البرنامج أكثر من مرة سيُنتج هذا اﻷخير ملف احتياطي "
-"بامتداد .aup.bak، يجب دائما فتح الملف الذي امتداده .aup إذا كان موجودا. "
-"عندما تنتهي تماما من تصدير الصوت إلى الملف الذي تريده، احذف ملفات المشروع "
-"و المجلد _data لتوفير مساحة القرص. </p><p> اﻷمر<i> ملف &lt; حفظ المشروع "
-"كـ...</i>يستخدم لحفظ مشروع فارغ، و يمكن كذلك استعماله لحفظ مشروع موجود "
-"تحت <b> اسم</b> جديد و هذه هي الطريقة الوحيدة اﻵمنة لتغيير اسم مشروع جُرأة. "
-"لاحظ أنه لا ينبغي نقل أو إعادة تسمية الملف .aup و المجلد _data يدويا.</p><p>."
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>إذا كنت ترغب في إكمال عملك لاحقا مع استعادة كل المسارات و التغييرات التي أحدثتها قم بحفظه كملف مشروع جُرأة. أما إذا أردت الاستماع لعملكفي برنامج آخر للوسائط المتعددة أو إرساله إلى شخص ما، قم [[export|بتصديره]]  إلى ملف صوتي من نوع وايف أو أم.بي.3</p><p> .الأمر <i>ملف &lt; حفظ المشروع</i> يُنتج ملف مشروع بامتداد <b>.aup</b و  مُجلد <b>_data</b> يحتوى على بيانات  الصوت. لفتح مشروع محفوظ مرة أخرى استخدم <i>ملف &lt; فتح</i> و اختر الملف .aup. بعد الحفظ و الخروج من البرنامج أكثر من مرة سيُنتج هذا اﻷخير ملف احتياطي بامتداد .aup.bak، يجب دائما فتح الملف الذي امتداده .aup إذا كان موجودا. عندما تنتهي تماما من تصدير الصوت إلى الملف الذي تريده، احذف ملفات المشروع و المجلد _data لتوفير مساحة القرص. </p><p> اﻷمر<i> ملف &lt; حفظ المشروع كـ...</i>يستخدم لحفظ مشروع فارغ، و يمكن كذلك استعماله لحفظ مشروع موجود تحت <b> اسم</b> جديد و هذه هي الطريقة الوحيدة اﻵمنة لتغيير اسم مشروع جُرأة. لاحظ أنه لا ينبغي نقل أو إعادة تسمية الملف .aup و المجلد _data يدويا.</p><p>."
 
 #: HelpText.cpp:335
-msgid ""
-"To hear your work in other media programs, export it to an audio file such "
-"as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|"
-"Saving an Audacity project]] creates a project file (and linked _data "
-"folder) containing all your edited tracks, so you can return to your work "
-"later. However, other programs can't read Audacity projects. </p><p> To "
-"export, click <i>File &gt; Export</i> then choose the file format you want "
-"to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for "
-"standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:"
-"Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; "
-"Export Selection</i> exports only a selected area of audio. <i>Use File &gt; "
-"Export Multiple</i> to export multiple files at the same time, either one "
-"for each audio track, or one for each labeled area in a single track. "
-"<i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:"
-"Splitting_recordings_into_separate_tracks|split the tracks]] from an album "
-"for multiple export as separate files. </p><br><br>"
-msgstr ""
-"للاستماع لعملك على برامج وسائط متعددة أخرى، قم بتصديره إلى ملف صوتي "
-"من نوع  وايف أو أم.بي.3 (بعض الصيغ [[wma-proprietary|غير مدعومة]]).[[save|"
-"حفظ مشروع جُرأة]] يُنتج ملف مشروع (مع مجلد _data تابع له) يحتوي على "
-"كل المسارات التي حررتها بحيث يمكنك الرجوع للعمل عليها لاحقا. لكن البرامج اﻷخرى "
-"لا تستطيع قراءة ملفات مشاريع جُرأة. </p><p> لتصدير المشروع، انقر على <i> "
-"ملف &lt; تصدير</i> ثم اختر صيغة ملف التصدير التي تريدها من القائمة المنسدلة "
-"\"حفظ كـ\". لـ [[burncd|نسخ الصوت إلى قرص مضغوط]] يمكن سماعه على قارئ "
-"أقراص مستقل اختر صيغة وايف أو آيف. للتصدير بصيغة أم.بي.3 يجب تثبيت [[wiki:"
-"Lame_Installation|مشفر لايم]]. </p><p> اﻷمر <i>ملف &lt; تصدير الاختيار</i> يقتصر "
-"على تصدير المنطقة المختارة من الصوت فقط.  استعمل <i>ملف &lt; تصدير متعدد</i> "
-"لتصدير عدة ملفات في نفس الوقت، سواءا لوضع كل مسار صوتي في ملف لوحده "
-"أو لوضع كل منطقة مُعلَمة من مناطق مسار واحد في ملف لوحدها. اﻷمر <i>مسارات &lt; "
-" إضافة علامة على الاختيار</i> يسمح لك [[wiki:"
-"Splitting_recordings_into_separate_tracks|بتقسيم مسارات]] ألبوم معين"
-"لتصديرها في ملفات منفصلة. </p><br><br>"
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "للاستماع لعملك على برامج وسائط متعددة أخرى، قم بتصديره إلى ملف صوتي من نوع  وايف أو أم.بي.3 (بعض الصيغ [[wma-proprietary|غير مدعومة]]).[[save|حفظ مشروع جُرأة]] يُنتج ملف مشروع (مع مجلد _data تابع له) يحتوي على كل المسارات التي حررتها بحيث يمكنك الرجوع للعمل عليها لاحقا. لكن البرامج اﻷخرى لا تستطيع قراءة ملفات مشاريع جُرأة. </p><p> لتصدير المشروع، انقر على <i> ملف &lt; تصدير</i> ثم اختر صيغة ملف التصدير التي تريدها من القائمة المنسدلة \"حفظ كـ\". لـ [[burncd|نسخ الصوت إلى قرص مضغوط]] يمكن سماعه على قارئ أقراص مستقل اختر صيغة وايف أو آيف. للتصدير بصيغة أم.بي.3 يجب تثبيت [[wiki:Lame_Installation|مشفر لايم]]. </p><p> اﻷمر <i>ملف &lt; تصدير الاختيار</i> يقتصر على تصدير المنطقة المختارة من الصوت فقط.  استعمل <i>ملف &lt; تصدير متعدد</i> لتصدير عدة ملفات في نفس الوقت، سواءا لوضع كل مسار صوتي في ملف لوحده أو لوضع كل منطقة مُعلَمة من مناطق مسار واحد في ملف لوحدها. اﻷمر <i>مسارات &lt;  إضافة علامة على الاختيار</i> يسمح لك [[wiki:Splitting_recordings_into_separate_tracks|بتقسيم مسارات]] ألبوم معينلتصديرها في ملفات منفصلة. </p><br><br>"
 
 #: HelpText.cpp:359
-msgid ""
-"<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in "
-"<b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due "
-"to licensing and patent restrictions.  On a Mac computer, unprotected "
-"<b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are "
-"not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files "
-"protected by any kind of Digital Rights Management (DRM), including most "
-"purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</"
-"p><p> If you can't import your file into Audacity, then if it is not DRM-"
-"protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, "
-"burn it to an audio CD in the program licensed to play it, then extract the "
-"CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos."
-"sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could "
-"also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-"i=streaming\">record</a> the CD to your computer. <i>To export to an "
-"unsupported format, export to WAV or AIFF and convert it to the desired "
-"format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">SUPER</a>. </i></p><p>"
-msgstr ""
-"<p>لا يستطيع جُرأة [[play|قراءة]] أو [[export|تصدير]] صيغ الملفات "
-"<b>دابليو.أم.آي، ريل أوديو، شورتن (SHN)،</b> أو أغلب الصيغ الخاصة اﻷخرى، "
-" بسبب القيود التي تضعها الرُخص و براءات الاختراع. على الماك، يمكنك استيراد "
-"ملفات <b>آي.آي.سي</b> مثل <b>أم.4.آي</b> إذا لم تكن محمية. بعض "
-" الصيغ المفتوحة ليست مدعومة في جُرأة لحد الآن، منها <b>أوق سبيكس</b> و <b> "
-"ميوزباك</b>. <b>لا يمكن</b> أيضا استيراد الملفات المحمية بأي نوع من "
-"إدارة الحقوق الرقمية (دي.أر.أم)، بما فيها الكثير من الملفات المباعة على الانترت "
-" مثل آيتيونز أو نابستر. </p><p> إذا لم تستطع استيراد ملفك في جُرأة، حاول "
-"تحويله إلى صيغة وايف أو آيف إذا لم يكن محميا بالحقوق الرقمية، و ذلك باستخدام "
-" آيتيونز أو <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">سوبر</a>. إذا كان الملف محميا بالحقوق الرقمية، قم بنسخه إلى قرص مضغوط "
-"صوتي باستخدام البرنامج المُرخص لقراءته، ثم استخرج مسار القرص المضغوط إلى "
-" وايف أو آيف باستعمال آيتيونز أو <a href=\"http://cdexos."
-"sourceforge.net/?q=download\">سيدياكس</a>(على الويندوز) أو ويندوز ميديا بلاير 11. "
-"يمكنك أيضا <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-"i=streaming\">تسجيل</a> القرص المضغوط على حاسوبك.<i> لتصدير الصوت إلى صيغة "
-"غير مدعومة، قم أولا بتصديره إلى وايف أو آيف ثم حوله إلى الصيغة التي تريدها "
-" باستعمال آيتيونز أو <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">سوبر</a>. </i></p><p>"
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>لا يستطيع جُرأة [[play|قراءة]] أو [[export|تصدير]] صيغ الملفات <b>دابليو.أم.آي، ريل أوديو، شورتن (SHN)،</b> أو أغلب الصيغ الخاصة اﻷخرى،  بسبب القيود التي تضعها الرُخص و براءات الاختراع. على الماك، يمكنك استيراد ملفات <b>آي.آي.سي</b> مثل <b>أم.4.آي</b> إذا لم تكن محمية. بعض  الصيغ المفتوحة ليست مدعومة في جُرأة لحد الآن، منها <b>أوق سبيكس</b> و <b> ميوزباك</b>. <b>لا يمكن</b> أيضا استيراد الملفات المحمية بأي نوع من إدارة الحقوق الرقمية (دي.أر.أم)، بما فيها الكثير من الملفات المباعة على الانترت  مثل آيتيونز أو نابستر. </p><p> إذا لم تستطع استيراد ملفك في جُرأة، حاول تحويله إلى صيغة وايف أو آيف إذا لم يكن محميا بالحقوق الرقمية، و ذلك باستخدام  آيتيونز أو <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">سوبر</a>. إذا كان الملف محميا بالحقوق الرقمية، قم بنسخه إلى قرص مضغوط صوتي باستخدام البرنامج المُرخص لقراءته، ثم استخرج مسار القرص المضغوط إلى  وايف أو آيف باستعمال آيتيونز أو <a href=\"http://cdexos.sourceforge.net/?q=download\">سيدياكس</a>(على الويندوز) أو ويندوز ميديا بلاير 11. يمكنك أيضا <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">تسجيل</a> القرص المضغوط على حاسوبك.<i> لتصدير الصوت إلى صيغة غير مدعومة، قم أولا بتصديره إلى وايف أو آيف ثم حوله إلى الصيغة التي تريدها  باستعمال آيتيونز أو <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">سوبر</a>. </i></p><p>"
 
 #: HelpText.cpp:383
-msgid ""
-"<p>To burn your work to an audio CD for standalone CD players, first "
-"[[export|export]] it as WAV or AIFF. The exported file should be stereo, "
-"44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in "
-"the \"Options\" button in the file export dialog). These are Audacity's "
-"default settings, so normally you will not need to change these before "
-"exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" "
-"or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media "
-"Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. "
-"</p><p>"
-msgstr ""
-"لنسخ عملك على قرص مضغوط صوتي بغرض سماعه على قارئ أقراص مستقل،"
-"يجب أولا [[export|تصدير]] الصوت إلى وايف أو آيف.  ملف التصدير يكون ثنائي "
-"بتردد 44100 هرتز (المحدد في الزر  \"معدل المشروع\" على اليسار في اﻷسفل) "
-"و عينة 16 بت (المحددة في زر  \"الخيارات\" في علبة تصدير الملف). هذه هي "
-"الإعدادت الافتراضية في جُرأة، لذا لا تحتاج إلى تغييرها قبل التصدير. بعد التصدير "
-" انسخ الملف إلى قرص  مضغوط صوتي و ليس إلى قرص بيانات أو قرص أم.بي.3، "
-"و ذلك باستخدام برنامج لنسخ الأقراص مثل آيتيونز أو ويندوز ميديا بلاير. "
-"للمزيد من المساعدة انظر [[wiki:How_to_burn_CDs|كيفية النسخ إلى قرص مضغوط]].<br><br>"
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "لنسخ عملك على قرص مضغوط صوتي بغرض سماعه على قارئ أقراص مستقل،يجب أولا [[export|تصدير]] الصوت إلى وايف أو آيف.  ملف التصدير يكون ثنائي بتردد 44100 هرتز (المحدد في الزر  \"معدل المشروع\" على اليسار في اﻷسفل) و عينة 16 بت (المحددة في زر  \"الخيارات\" في علبة تصدير الملف). هذه هي الإعدادت الافتراضية في جُرأة، لذا لا تحتاج إلى تغييرها قبل التصدير. بعد التصدير  انسخ الملف إلى قرص  مضغوط صوتي و ليس إلى قرص بيانات أو قرص أم.بي.3، و ذلك باستخدام برنامج لنسخ الأقراص مثل آيتيونز أو ويندوز ميديا بلاير. للمزيد من المساعدة انظر [[wiki:How_to_burn_CDs|كيفية النسخ إلى قرص مضغوط]].<br><br>"
 
 #: HelpText.cpp:403
-msgid ""
-"<p>You don't appear to have Audacity help files on your machine. Either <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the "
-"help files and then access them again from Audacity by clicking <i>Help</i> "
-"then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr ""
-"<p>يظهر أن ملفات المساعدة لبرنامج جُرأة غير موجودة على جهازك. يمكنك "
-"<a href=\"http://audacity.sourceforge.net/help/documentation\"> "
-"تنزيل</a> هذه الملفات و قراءتها في برنامج جُرأة بالنقر ثانية على <i> "
-"مساعدة</i> ثم <i>الدليل</i>، كما يمكنك قراءة الدليل الكامل "
-"على الأنترت من <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">هنا</a>."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1623,13 +1347,11 @@ msgid "New..."
 msgstr "جديد..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"لقد تركت أسماء العلامة بيضاء. سوف يتم تخطيها\n"
+msgstr "لقد تركت أسماء العلامة بيضاء. سوف يتم تخطيها\n"
 "عند إعادة تأهيل مسارات العلامة.\n"
 "\n"
 "هل تريد الرجوع لإدخال الأسماء؟"
@@ -1685,11 +1407,9 @@ msgstr "اختر اللغة التي تستخدمها جُرأة:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"تم تحويل ملف مشروع 1.0 إلى الصيغة الجديدة.\n"
+msgstr "تم تحويل ملف مشروع 1.0 إلى الصيغة الجديدة.\n"
 "الملف القديم محفوظ تحت اسم '%s'"
 
 #: Legacy.cpp:357
@@ -1720,6 +1440,10 @@ msgstr "حف&ظ المشروع\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "حف&ظ المشروع باسم..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "فح&ص الارتباطات..."
@@ -1728,6 +1452,10 @@ msgstr "فح&ص الارتباطات..."
 msgid "Open Me&tadata Editor..."
 msgstr "فتح محرر ال&ميتا بيانات..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&استيراد"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "ال&صوت...\tCtrl+Shift+I"
@@ -1756,6 +1484,10 @@ msgstr "تصدير ال&علامات..."
 msgid "Export &Multiple..."
 msgstr "تصدير متعـ&دد..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "&سلسلة الخطاب النظيف..."
@@ -1832,9 +1564,9 @@ msgstr "&حذف\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "تقسيم و &حذف\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&صمت\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1848,21 +1580,21 @@ msgstr "تقسيم &جديد\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&ضمّ\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "&فصل\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "م&ضاعفة\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&ثنائي إلى أحادي"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "منا&طق مُعلَّمة..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1905,13 +1637,13 @@ msgid "&Join\tAlt+J"
 msgstr "&ضمّ\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "&فصل\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "ا&ختيار..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1941,9 +1673,9 @@ msgstr "المؤشر إلى آ&خر المسار\tShift+K"
 msgid "Find &Zero Crossings\tZ"
 msgstr "البحث عن التقاطعات مع ال&صفر\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "ت&حريك المُؤشر..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1969,9 +1701,9 @@ msgstr "&حفظ المنطقة"
 msgid "Regio&n Restore"
 msgstr "ا&سترجاع المنطقة"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "&قراءة المنطقة..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1997,9 +1729,14 @@ msgstr "تشغيل شبكة الحصر"
 msgid "Turn Grid Snap Off"
 msgstr "إيقاف شبكة الحصر"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "تف&ضيلات...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -2045,9 +1782,9 @@ msgstr "&عرض القطع"
 msgid "&History..."
 msgstr "&تاريخ..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&أشرطة الأدوات..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -2089,13 +1826,71 @@ msgstr "إ&عادة أشرطة الأدوات"
 msgid "!Simplified View"
 msgstr "!عرض مُبسَّط"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "تخطي إلى البداية\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "تخطي إلى النهاية\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "&مسارات"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "إضافة &جديد..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -2109,10 +1904,6 @@ msgstr "م&سار ثنائي"
 msgid "&Time Track"
 msgstr "مسار الو&قت"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&تسجيل الوقت..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "مز&ج و تقديم"
@@ -2169,13 +1960,21 @@ msgstr "صف ال&نهاية مع آخر الاختيار"
 msgid "Align Tracks To&gether"
 msgstr "صف المسارات مع بعضها ال&بعض"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&صف مسارات..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "ص&ف و تحريك المؤشر..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -2185,22 +1984,26 @@ msgstr "إضافة &علامة عند الاختيار\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "إضافة &علامة عند موضع القراءة\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "&رتب المسارات حسب..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&وقت البداية"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "الا&سم"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "\t&إنتاج"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "تأ&ثير"
@@ -2233,6 +2036,10 @@ msgstr "&عرض الكلمة الترحيبية..."
 msgid "&Index..."
 msgstr "&دليل..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "أدوات &تصوير الشاشة..."
@@ -2245,13 +2052,13 @@ msgstr "تشغيل الم&قارن..."
 msgid "&Audio Device Info..."
 msgstr "معلومات جهاز ال&صوت"
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "دوران إلى الخلف عبر المرفأ، عرض المسار و شريط الاختيار\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "دوران إلى الأمام عبر المرفأ، عرض المسار و شريط الاختيار\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2285,9 +2092,9 @@ msgstr "الأداة التالية\tD"
 msgid "Previous Tool\tA"
 msgstr "الأداة السابقة\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "قراءة/توقف\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2321,22 +2128,14 @@ msgstr "قراءة حتى الاختيار\tB"
 msgid "Play Looped\tL"
 msgstr "القراءة متكررة\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "القراءة متكررة\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "قراءة العرض المسبق للقص\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "تخطي إلى البداية\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "تخطي إلى النهاية\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "اختيار إلى البداية\tShift+Home"
@@ -2393,9 +2192,9 @@ msgstr "قلب المسار الذي عليه التركيز\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "قلب المسار الذي عليه التركيز\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "قلب المسار الذي عليه التركيز\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2493,15 +2292,19 @@ msgstr "تشغيل الحصر"
 msgid "Snap To Off"
 msgstr "توقيف الحصر"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "فتح الحديث"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "&ملفات حديثة..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2558,6 +2361,23 @@ msgstr "إعادة %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "ليس هناك مسارات علامات للتصدير."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "لا شئ يُتراجع عنه"
@@ -2595,6 +2415,10 @@ msgstr "تم لصق نص من لوحة الحفظ"
 msgid "Pasted from the clipboard"
 msgstr "تم اللصق من لوحة الحفظ"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "لا يسمح بنسخ صوت ثنائي إلى مسار أحادي."
@@ -2745,9 +2569,7 @@ msgstr "لرسم منحنى الطيف، يجب أن يكون لكل المسا
 
 #: Menus.cpp:3451
 #, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
 msgstr "الجزء المختار من الصوت كبير جدا. سوف تُحلّل منه الثواني %.1f اﻷولى فقط."
 
 #: Menus.cpp:3584
@@ -2763,9 +2585,9 @@ msgstr "استيراد علامات"
 msgid "Select a MIDI file..."
 msgstr "اختيار ملف ميدي..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "كل الملفات (*.*)|*.*|ملفات ميدي (*.mid)|*.mid|ملفات ألقرو (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2784,11 +2606,6 @@ msgstr "اختر أي ملف صوتي غير مضغوط..."
 msgid "All files (*)|*"
 msgstr "كل الملفات (*)|*"
 
-#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "استيراد"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "تحرير علامات الميتابيانات"
@@ -2860,6 +2677,14 @@ msgstr "مصفوف"
 msgid "Align"
 msgstr "صف"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "تم إنشاء مسار صوتي جديد"
@@ -2920,14 +2745,14 @@ msgstr "حذف المسار"
 msgid "Removed audio track(s)"
 msgstr "المسارات الصوتية المحذوفة"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "معدل العيّنة الجديد (هرتز):"
-
 #: Menus.cpp:4508 Menus.cpp:4527 export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "إعادة أخذ العيّنات"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "معدل العيّنة الجديد (هرتز):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "القيمة المُدخلة ليست صحيحة"
@@ -2991,15 +2816,13 @@ msgid "Save changes before closing?"
 msgstr "حفظ التغييرات قبل الإغلاق؟"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "إذا حُفظ هذا المشروع، سيكون خالي من المسارات.\n"
 "\n"
 "لحفظ أي مسار فتحته من قبل قم بـ:\n"
@@ -3024,17 +2847,14 @@ msgstr "مشاريع جُرأة|*.aup|"
 
 #: Project.cpp:1799 Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"هذا ملف تم حفظه ببرنامج جُرأة %s، و هو "
-"إصدار قديم جدا. صيغة الملفات اﻵن تغيرت.\n"
+msgstr "هذا ملف تم حفظه ببرنامج جُرأة %s، و هو إصدار قديم جدا. صيغة الملفات اﻵن تغيرت.\n"
 "\n"
 "قد يفسد جُرأة هذا الملف عند محاولة فتحه،\n"
 "لذا يجب عليك حفظ نسخة منه أولا.\n"
@@ -3055,11 +2875,9 @@ msgstr "خطأ في فتح الملف"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"يُحتمل أن الملف غير صحيح أو أن محتواه فاسد: \n"
+msgstr "يُحتمل أن الملف غير صحيح أو أن محتواه فاسد: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -3067,9 +2885,7 @@ msgid "Error opening file or project"
 msgstr "خطأ في فتح الملف أو المشروع"
 
 #: Project.cpp:1867
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
 msgstr "لم يتمكن البرنامج من تحويل مشروع جُرأة إصدار 1.0 إلى الصيغة الجديدة للمشاريع."
 
 #: Project.cpp:1970
@@ -3099,12 +2915,10 @@ msgstr "لم أتمكن من العثور على مجلد بيانات المش
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"تم حفظ هذا الملف ببرنامج جُرأة %s.\n"
+msgstr "تم حفظ هذا الملف ببرنامج جُرأة %s.\n"
 "أنت اﻵن تستخدم برنامج جُرأة %s، فأنت بحاجة إلى تحديثه إلى\n"
 "إصدار جديد لتتمكن من فتح هذا الملف."
 
@@ -3114,26 +2928,34 @@ msgstr "لا أستطيع فتح ملف المشروع"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
-"You 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"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"هذا ملف تم حفظه ببرنامج جُرأة %s.\n"
-"يمكنك فتحه بهذا اﻹصدار الحالي لجُرأة و لكن إذا حفظته "
-"بهذا اﻹصدار فلا يمكنك فتحه باﻹصدارات اﻷقدم\n"
+msgstr "هذا ملف تم حفظه ببرنامج جُرأة %s.\n"
+"يمكنك فتحه بهذا اﻹصدار الحالي لجُرأة و لكن إذا حفظته بهذا اﻹصدار فلا يمكنك فتحه باﻹصدارات اﻷقدم\n"
 "افتح هذا الملف اﻵن ؟"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"لم أتمكن من حفظ المشروع. ربما %s محمي ضد الكتابة، \n"
-"أو قد يكون القرص ممتلئ."
 
 #: Project.cpp:2428 Project.cpp:2442
 msgid "Error saving project"
@@ -3144,22 +2966,16 @@ msgstr "خطأ في حفظ المشروع"
 msgid "Saved %s"
 msgstr "تم حفظ %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "خام"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "استيراد %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "تم استيراد '%s'"
 
+#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "استيراد"
+
 #: Project.cpp:2639 Project.cpp:2647
 msgid "Error importing"
 msgstr "خطأ استيراد"
@@ -3172,24 +2988,23 @@ msgstr "حفظ الخطاب كـ:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "ملف صوت ويندوز بي.سي.أم (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"ملفات مشاريع جُرأة (.aup) تمكنك من حفظ كل شيء اشتغلت عليه تماما "
-" كما يظهر على الشاشة، \n"
-"و لكن أغلب البرامج اﻷخرى لا يمكنها قراءة هذه الملفات."
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"إذا أردت حفظ ملف يمكن فتحه ببرامج أخرى، اختر إحدى أوامر التصدير."
-" \n"
-" "
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3233,6 +3048,16 @@ msgstr "يبقى في القرص مساحة لتسجيل %d ثانية."
 msgid "Out of disk space"
 msgstr "لقد نفذت مساحة القرص"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "لم أتمكن من حذف ملف حفظ تلقائي قديم: "
@@ -3315,45 +3140,13 @@ msgstr "ع&رض مسبق"
 msgid "&Debug"
 msgstr "ت&صحيح الأخطاء"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "مُسجِل مُؤقت جُرأة"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "بداية التسجيل"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "نهاية التسجيل"
-
-#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
-#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "المدة"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "تَقدُم التسجيل الذكي لجُرأة"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "يوم و ساعة البداية"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "يوم و ساعة النهاية"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "انتظار لبدأ التسجيل عند %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "التسجيل الذكي لجُرأة - انتظار البدأ"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3391,9 +3184,9 @@ msgstr "نوع"
 msgid "Comments"
 msgstr "تعليقات"
 
-#: Tags.cpp:778 Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "اضغط F2 أو قم بنقر مزدوج للتحرير."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3411,13 +3204,13 @@ msgstr "&تنظيف"
 msgid "Genres"
 msgstr "أنواع"
 
-#: Tags.cpp:828 Tags.cpp:1439 Tags.cpp:1980
-msgid "Edit"
-msgstr "تحرير"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829 Tags.cpp:1981
-msgid "Reset"
-msgstr "إعادة تعيين"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834 Tags.cpp:1460 Tags.cpp:1988
 msgid "Template"
@@ -3458,199 +3251,146 @@ msgstr "هل أنت متأكد من إعادة تعيين قائمة النوع
 msgid "Unable to open genre file."
 msgstr "غير قادر على فتح ملف النوع."
 
-#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "حفظ الميتابيانات كـ:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
 #: Tags.cpp:1112 Tags.cpp:1763 Tags.cpp:2486
 msgid "Error loading metadata"
 msgstr "خطأ في تحميل الميتابيانات"
 
-#: Tags.cpp:1409 Tags.cpp:1968
-msgid "Title:"
-msgstr "العنوان:"
-
-#: Tags.cpp:1410 Tags.cpp:1969
-msgid "Artist:"
-msgstr "الفنان:"
-
-#: Tags.cpp:1411 Tags.cpp:1970
-msgid "Album:"
-msgstr "الألبوم:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "الملحن:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "مؤلف الكلمات:"
-
-#: Tags.cpp:1414 Tags.cpp:1973
-msgid "Comments:"
-msgstr "الملاحظات:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "مُشفر بـ:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "الحقوق:"
-
-#: Tags.cpp:1424 Tags.cpp:1971
-msgid "Track Number:"
-msgstr "رقم المسار:"
-
-#: Tags.cpp:1428 Tags.cpp:1972
-msgid "Year:"
-msgstr "العام:"
-
-#: Tags.cpp:1432 Tags.cpp:1974
-msgid "Genre:"
-msgstr "النوع:"
-
-#: Tags.cpp:1490 Tags.cpp:2089
-msgid "No Genres"
-msgstr "ليس هناك أنواع"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "إعادة تعيين القيم الافتراضية"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "أساسي"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "متقدم"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "قيمة"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "مس&ح"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "الحد الأقصى لطول الصفة '%s' هو %d حرفا. لقد تم بتر البيانات."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "عنوان"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "فنان"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "ألبوم"
+#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
+#: Tags.cpp:2501
+msgid "Save Metadata As:"
+msgstr "حفظ الميتابيانات كـ:"
 
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"لم يتمكن جُرأة من كتابة الملف:\n"
+msgstr "لم يتمكن جُرأة من كتابة الملف:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"لم يتمكن جُرأة من فتح الملف:\n"
+msgstr "لم يتمكن جُرأة من فتح الملف:\n"
 "  %s\n"
 "للكتابة."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"لم يتمكن جُرأة من كتابة الصور في الملف:\n"
+msgstr "لم يتمكن جُرأة من كتابة الصور في الملف:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"لم يتمكن جُرأة من العثور على الملف:\n"
+msgstr "لم يتمكن جُرأة من العثور على الملف:\n"
 "  %s.\n"
 "لم يتم تحميل الموضوع."
 
 #: Theme.cpp:807 Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"لم يتمكن جُرأة من تحميل الملف:\n"
+msgstr "لم يتمكن جُرأة من تحميل الملف:\n"
 "  %s.\n"
 "ربما تكون صيغة بي.أن.جي سيئة؟"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"لم يتمكن جُرأة من قراءة الموضوع الافتراضي.\n"
+msgstr "لم يتمكن جُرأة من قراءة الموضوع الافتراضي.\n"
 "من فضلك أخبر عن هذا المشكل."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"لم أعثر على أي من ملفات مكونات \n"
+msgstr "لم أعثر على أي من ملفات مكونات \n"
 "المواضيع المتوقعة في:\n"
 " %s."
 
 #: Theme.cpp:942 effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"لم أتمكن من إنشاء الدليل:\n"
+msgstr "لم أتمكن من إنشاء الدليل:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"لم يتمكن جُرأة من حفظ الملف:\n"
+msgstr "لم يتمكن جُرأة من حفظ الملف:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"كل الملفات المطلوبة في:\n"
+msgstr "كل الملفات المطلوبة في:\n"
 "  %s\n"
 "كانت موجودة من قبل."
 
+#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
+#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "المدة"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "مُسجِل مُؤقت جُرأة"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "بداية التسجيل"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "نهاية التسجيل"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "يوم و ساعة البداية"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "يوم و ساعة النهاية"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "انتظار لبدأ التسجيل عند %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464 TrackPanel.cpp:465
 msgid "Track Panel"
 msgstr "لوح المسار"
@@ -3736,12 +3476,8 @@ msgid "Copy"
 msgstr "نسخ"
 
 #: TrackPanel.cpp:1272
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
-msgstr ""
-"انقر للتكبير العمودي، انقر و اضغط على Shift للتصغير، اسحب لإنشاء منطقة تكبير "
-"أو تصغير خاصة."
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "انقر للتكبير العمودي، انقر و اضغط على Shift للتصغير، اسحب لإنشاء منطقة تكبير أو تصغير خاصة."
 
 #: TrackPanel.cpp:1277
 msgid "Drag the label vertically to change the order of the tracks."
@@ -3824,15 +3560,11 @@ msgstr "تحويل الوقت"
 
 #: TrackPanel.cpp:2953
 msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
-msgstr ""
-"لاستعمال الرسم، اختر 'شكل الموجة' من القائمة "
-"المنسدلة للمسار."
+msgstr "لاستعمال الرسم، اختر 'شكل الموجة' من القائمة المنسدلة للمسار."
 
 #: TrackPanel.cpp:2970
 msgid "To use Draw, zoom in further until you can see the individual samples."
-msgstr ""
-"لاستعمال الرسم، قم بالتكبير حتى ترى "
-"العيّنات الفردية."
+msgstr "لاستعمال الرسم، قم بالتكبير حتى ترى العيّنات الفردية."
 
 #: TrackPanel.cpp:3241
 msgid "Moved Sample"
@@ -3914,6 +3646,14 @@ msgstr "تم تعديل البانوراما"
 msgid "Adjusted gain"
 msgstr "تم تعديل مستوى الصوت"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "لا يمكن حذف مسار الصوت الفعّال"
@@ -3970,14 +3710,6 @@ msgstr "تغيير المعدل"
 msgid "Format Change"
 msgstr "تغيير الصيغة"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "أدخل معدل العيّنة بالهرتز (في الثانية) بين 1 و 100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "معدل غير صحيح."
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "تغيير حد السرعة الدنيا (%) إلى:"
@@ -4110,24 +3842,21 @@ msgstr "البرامج المساعدة من 1 إلى %i"
 msgid "Plugins %i to %i"
 msgstr "البرامج المساعدة من %i إلى %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "ممنوع لسبب ما. حاول اختيار بعض الصوت أولا؟"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"يمكنك فقط فعل هذا إذا كانت القراءة و التسجيل متوقفان.\n"
+msgstr "يمكنك فقط فعل هذا إذا كانت القراءة و التسجيل متوقفان.\n"
 "[التوقف المؤقت لا يكفي.]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"يجب أولا أن تختار بعض الصوت الثنائي لاستخدامه.\n"
+msgstr "يجب أولا أن تختار بعض الصوت الثنائي لاستخدامه.\n"
 "[لا يمكن استخدام هذا مع الأحادي.]"
 
 #: commands/CommandManager.cpp:785
@@ -4135,16 +3864,14 @@ msgid "You must first select some audio for this to use."
 msgstr "يجب أولا أن تختار بعض الصوت لاستخدامه."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"يجب أولا أن تختار بعض الصوت لاستخدامه.\n"
+msgstr "يجب أولا أن تختار بعض الصوت لاستخدامه.\n"
 "[اختيار نوع آخر من المسارات لن يعمل.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "رسالة"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4164,14 +3891,19 @@ msgstr "التأثير المُطبَّق: %s %.1f ديسيبل"
 msgid "Amplify"
 msgstr "توسيع"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "توسيع من طرف دومينيك مازوني"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "توسيع (ديسيبل):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "ذروة سِعة جديدة (ديسيبل):"
@@ -4193,12 +3925,8 @@ msgid "Amplifying"
 msgstr "توسيع"
 
 #: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
-msgstr ""
-"لقد اخترت مسار ليس فيه صوت. تأثير الغمر التلقائي يعمل فقط على المسارات "
-"الصوتية."
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "لقد اخترت مسار ليس فيه صوت. تأثير الغمر التلقائي يعمل فقط على المسارات الصوتية."
 
 #: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:453
 #: effects/AutoDuck.cpp:570
@@ -4206,12 +3934,8 @@ msgid "Auto Duck"
 msgstr "غمر تلقائي للصوت"
 
 #: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
-msgstr ""
-"تأثير الغمر التلقائي يحتاج إلى مسار تحكم يجب وضعه تحت المسار أو المسارات "
-"المختارة."
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "تأثير الغمر التلقائي يحتاج إلى مسار تحكم يجب وضعه تحت المسار أو المسارات المختارة."
 
 #: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
@@ -4294,10 +4018,18 @@ msgstr "من طرف ناسكا أوكتافيان بول"
 msgid "Frequency (Hz):"
 msgstr "التردد (هرتز):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "الرفع (ديسيبل):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "رفع الباس..."
@@ -4339,8 +4071,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "استخدام  لمسة الصوت، من طرف أولي بارفاينين"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "حدّة:   من"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "أنصاف نبرات (أنصاف خطوات):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
 #: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
@@ -4348,19 +4121,20 @@ msgstr "حدّة:   من"
 msgid "to"
 msgstr "إلى"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "أنصاف نبرات (أنصاف خطوات):"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "التردد (هرتز):  من"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
 #: effects/ChangeTempo.cpp:198
 msgid "Percent Change:"
 msgstr "تغيير بنسبة:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "تغيير الحدّة..."
@@ -4378,6 +4152,14 @@ msgstr "التأثير المُطبَّق:  %s %.1f%%"
 msgid "Change Speed"
 msgstr "تغيير السرعة"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "غير متوفر"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "تغيير السرعة، يؤثر على الإيقاع و الحدّة معا"
@@ -4386,17 +4168,17 @@ msgstr "تغيير السرعة، يؤثر على الإيقاع و الحدّة
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "استخدام معدل العيّنة، من طرف إيريك دي كاسترو لوبو"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "غير متوفر"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "قياس فينيل أر.بي.أم:   من"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4414,13 +4196,29 @@ msgstr "تغيير الإيقاع"
 msgid "Change Tempo without Changing Pitch"
 msgstr "تغيير الإيقاع دون تغيير الحدّة"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "نبضة في الدقيقة (ن.ف.د):   من"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "الطول (بالثانية):  من"
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4430,8 +4228,9 @@ msgstr "تغيير الإيقاع..."
 msgid "Changing Tempo"
 msgstr "تغيير الإيقاع"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "حذف النقرة"
 
 #: effects/ClickRemoval.cpp:336
@@ -4442,10 +4241,18 @@ msgstr "حذف النقرة و الفرقعة من طرف كريغ ديفورا
 msgid "Select threshold (lower is more sensitive):"
 msgstr "اختيار العتبة (العتبة الأقل هي اﻷكثر حساسية):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "أقصى عرض للشوكة (العرض اﻷعلى هو اﻷكثر حساسية):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "حذف النقرة..."
@@ -4458,49 +4265,86 @@ msgstr "حذف النقرة و الفرقعة..."
 msgid "Dynamic Range Compressor"
 msgstr "ضاغط المجال الديناميكي"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "ضاغط المجال الديناميكي من طرف دومينيك مازوني"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "النسبة: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "وقت الهجمة: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "وقت الإنحطاط: "
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "تطبيع لـ 0 ديسيبل بعد الضغط"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "العتبة: %d ديسيبل"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "النسبة: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "النسبة: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "وقت الهجمة:  %.1f ثانية"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "وقت الإنحطاط: %.1f ثانية"
 
 #: effects/Compressor.h:36
@@ -4511,6 +4355,247 @@ msgstr "الضاغط..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "تطبيق ضغط المجال الديناميكي..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "بداية"
+
+#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "نهاية"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829 Tags.cpp:1981
+msgid "Reset"
+msgstr "إعادة تعيين"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "التحكم"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "مُوّلِد نبرة دي.تي.أم.أف"
@@ -4606,12 +4691,8 @@ msgid "Previewing"
 msgstr "عرض مسبق"
 
 #: effects/Effect.cpp:435
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"خطأ عند فتح جهاز الصوت. من فضلك تفقد إعدادات جهاز المخرج و معدل العيّنة في "
-"هذا المشروع."
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "خطأ عند فتح جهاز الصوت. من فضلك تفقد إعدادات جهاز المخرج و معدل العيّنة في هذا المشروع."
 
 #: effects/Effect.h:107
 #, c-format
@@ -4765,6 +4846,10 @@ msgstr "عكس"
 msgid "Inverting"
 msgstr "عكس"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "المُسوِّي"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr " لا شيئ - تخطي"
@@ -4789,28 +4874,25 @@ msgstr "أثقل"
 msgid "Heaviest"
 msgstr "اﻷثقل"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "المُسوِّي"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "المُسوِّي من طرف لين آلن"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "تسوية القطع الخافتة و الصاخبة"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "من طرف لين ألان"
 
 #: effects/Leveller.cpp:226 effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "درجة المُساوات"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "عتبة الضجيج (هسهسة/دندنة/ضجيج مطيف)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "عتبة الضجيج: "
 
 #: effects/Leveller.h:28
@@ -4821,6 +4903,158 @@ msgstr "المُسوِّي..."
 msgid "Applying Leveller..."
 msgstr "تطبيق المُسوِّي..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "المازج"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "إشارة إلكترونية صوتية"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "حذف الضجيج"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "أبيض"
@@ -4856,31 +5090,23 @@ msgstr "توليد الضجيج"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"لا أستطيع فتح الملف:\n"
+msgstr "لا أستطيع فتح الملف:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "محاولة حذف الضجيج من دون وصف له.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "حذف الضجيج"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "خطوة 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"اختر بضعة ثواني من الضجيج فقط حتى يعرف البرنامج ماذا يصفي،\n"
+msgstr "اختر بضعة ثواني من الضجيج فقط حتى يعرف البرنامج ماذا يصفي،\n"
 "ثم انقر وصف الضجيج:"
 
 #: effects/NoiseRemoval.cpp:815
@@ -4888,11 +5114,9 @@ msgid "Step 2"
 msgstr "خطوة 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"اختر كل الصوت الذي تريد تصفيته، و اختر كمية الضجيج الذي ترغب في حذفه،\n"
+msgstr "اختر كل الصوت الذي تريد تصفيته، و اختر كمية الضجيج الذي ترغب في حذفه،\n"
 "ثم انقر 'موافق' لحذف الضجيج.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4907,14 +5131,26 @@ msgstr "وصف الضجيج"
 msgid "Noise reduction (dB):"
 msgstr "خفض الضجيج (ديسيبل):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "تنعيم التردد (هرتز):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "وقت الهجمة/الإنحطاط (بالثانية):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "حذف الضجيج..."
@@ -4953,22 +5189,22 @@ msgstr "، السعة القصوى =  %.1f ديسيبل"
 msgid "Normalize"
 msgstr "تطبيع"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "تطبيع من طرف دومينيك مازوني"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "حذف أي فرع دي.سي (توسط الـصفر عموديا)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "تطبيع السعة القصوى إلى"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "تطبيع..."
@@ -4979,49 +5215,57 @@ msgstr "جاري التطبيع..."
 
 #: effects/Phaser.cpp:65
 #, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"التأثير المُطبَّق: %s %d طور، %.0f%% رطب، تردد = %.1f هرتز، المرحلة الأولى  = "
-"%.0f درجة، عمق = %d، تغذية خلفية = %.0f%%"
-
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "إشارة إلكترونية صوتية"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "إشارة إلكترونية صوتية من طرف ناسكا أوكتافيان بول"
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "التأثير المُطبَّق: %s %d طور، %.0f%% رطب، تردد = %.1f هرتز، المرحلة الأولى  = %.0f درجة، عمق = %d، تغذية خلفية = %.0f%%"
 
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "أطوار:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "جاف"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "رطب"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "تردد ألفو (هرتز):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "مرحلة بداية ألفو (درجة):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "العمق:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "تغذية خلفية (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "إشارة إلكترونية صوتية..."
@@ -5031,16 +5275,21 @@ msgid "Applying Phaser"
 msgstr "تطبيق إشارة إلكترونية صوتية"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"تأثير الإصلاح مخصص للمقاطع الصوتية المتضررة القصيرة جداً (حتى 128 عينة).\n"
+msgstr "تأثير الإصلاح مخصص للمقاطع الصوتية المتضررة القصيرة جداً (حتى 128 عينة).\n"
 "\n"
 "قم بالتكبير و اختر جزء ضئيل من الثانية لإصلاحه."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "إصلاح الصوت المتضرر"
@@ -5058,29 +5307,24 @@ msgstr "لا يمكن إعادة الاختيار لأن المسارات طوي
 msgid "Repeat"
 msgstr "إعادة"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "إعادة من طرف دومينيك مازوني و فوغان جونسون"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "عدد مرات التكرار: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207 effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "طول جديد للاختيار: "
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d دقيقة ،%d ثانية"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d ثانية"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "سا:دق:ثا"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5116,12 +5360,8 @@ msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "التأثير المُطبَّق: إنتاج الصمت، %.6lf ثانية"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"عفوا، لا يمكن إجراء هذا التأثير على المسارات الثنائية التي تكون فيها القنوات "
-"الفردية للمسار غير متوافقة."
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "عفوا، لا يمكن إجراء هذا التأثير على المسارات الثنائية التي تكون فيها القنوات الفردية للمسار غير متوافقة."
 
 #: effects/SpikeCleaner.cpp:69
 msgid "Spike Cleaner"
@@ -5132,11 +5372,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "ماسح الشوكة من طرف لين ألان"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"المدة القصوى للشوكة (بالملي ثانية): \n"
+msgstr "المدة القصوى للشوكة (بالملي ثانية): \n"
 "(99999 أو أكبر تعني الغلق)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5151,15 +5389,61 @@ msgstr "ماسح الشوكة..."
 msgid "Applying Spike Cleaner..."
 msgstr "تطبيق ماسح الشوكة..."
 
+#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&ثنائي إلى أحادي"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "تطبيق من الثنائي إلى الأحادي"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr "التأثير المُطبَّق: توليد %s موجة %s، تردد = %.2f هرتز، سعة = %.2f، %.6lf ثانية"
 
 #: effects/ToneGen.cpp:75 widgets/Meter.cpp:379
@@ -5202,14 +5486,21 @@ msgstr "تردد (هرتز)"
 msgid "Waveform:"
 msgstr "شكل الموجة:"
 
-#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "بداية"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "نهاية"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5239,10 +5530,6 @@ msgstr "يجب أن يكون لكل المسارات نفس معدل العيّ
 msgid "Truncate Silence"
 msgstr "قطع الصمت"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "من طرف لين ألان"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "المدة القصوى للصمت:"
@@ -5269,12 +5556,8 @@ msgid "Truncating Silence..."
 msgstr "قطع الصمت..."
 
 #: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"عفوا، لايمكن إجراء تأثيرات في.أس.تي على المسارات الثنائية التي تكون فيها "
-"القنوات الفردية للمسار غير متوافقة."
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "عفوا، لايمكن إجراء تأثيرات في.أس.تي على المسارات الثنائية التي تكون فيها القنوات الفردية للمسار غير متوافقة."
 
 #: effects/VST/VSTEffect.cpp:180
 msgid "Can't process replacing"
@@ -5286,21 +5569,13 @@ msgstr "متغيرات البرنامج المساعد في.أس.تي:"
 
 #: effects/Wahwah.cpp:61
 #, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"التأثير المُطبَّق: %s  تردد = %.1f هرتز، المرحلة اﻷولى =  %.0f درجة، عُمق = %.0f%"
-"%،  رنين = %.1f، تعديل التردد = %.0f%%"
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "التأثير المُطبَّق: %s  تردد = %.1f هرتز، المرحلة اﻷولى =  %.0f درجة، عُمق = %.0f%%،  رنين = %.1f، تعديل التردد = %.0f%%"
 
 #: effects/Wahwah.cpp:72
 msgid "Wahwah"
 msgstr "واه واه"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "واه واه من طرف ناسكا أوكتافيان بول"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "العمق (%):"
@@ -5309,10 +5584,18 @@ msgstr "العمق (%):"
 msgid "Resonance:"
 msgstr "رنين:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "فرع تردد واه (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "واه واه..."
@@ -5328,12 +5611,8 @@ msgid "Performing Effect: %s"
 msgstr "إجراء تأثير: %s"
 
 #: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
-msgstr ""
-"عفوا، لايمكن إجراء تأثيرات البرامج المساعدة على المسارات الثنائية التي تكون "
-"فيها القنوات الفردية للمسار غير متوافقة."
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "عفوا، لايمكن إجراء تأثيرات البرامج المساعدة على المسارات الثنائية التي تكون فيها القنوات الفردية للمسار غير متوافقة."
 
 #: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
 #: prefs/GUIPrefs.cpp:51 prefs/QualityPrefs.cpp:72
@@ -5352,6 +5631,18 @@ msgstr "إعدادات التأثير"
 msgid "Length (seconds)"
 msgstr "الطول (بالثانية)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr " تطبيق تأثير نايكويست..."
@@ -5394,12 +5685,8 @@ msgid "Extracting features: %s"
 msgstr "خدمات الاستخراج: %s"
 
 #: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"عفوا، لا يمكن إجراء البرنامج المساعد فامب على المسارات الثنائية التي تكون "
-"فيها القنوات الفردية للمسار غير متوافقة."
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "عفوا، لا يمكن إجراء البرنامج المساعد فامب على المسارات الثنائية التي تكون فيها القنوات الفردية للمسار غير متوافقة."
 
 #: effects/vamp/VampEffect.cpp:120
 msgid "Sorry, failed to load Vamp Plug-in."
@@ -5421,13 +5708,13 @@ msgstr "إعدادات البرامج المساعدة"
 msgid "Program"
 msgstr "البرنامج"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"ليس هناك مسارات مختارة! استخدم أمر اختيار الكل\n"
-"اختر تصدير... لتصدير كل المسارات."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5443,18 +5730,14 @@ msgstr "هل أنت متأكد من حفظ الملف كـ \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"أنت على وشك حفظ ملف %s بالاسم  \"%s\".\n"
+msgstr "أنت على وشك حفظ ملف %s بالاسم  \"%s\".\n"
 "\n"
-"من المفروض أن تختم هذه الملفات بـ \".%s\"، بعض البرامج لا تفتح الملفات "
-"بإمتداد غير قياسي.\n"
+"من المفروض أن تختم هذه الملفات بـ \".%s\"، بعض البرامج لا تفتح الملفات بإمتداد غير قياسي.\n"
 "\n"
 "هل أنت متأكد من حفظ الملف بهذا الاسم؟"
 
@@ -5488,6 +5771,10 @@ msgstr "- يسار"
 msgid " - Right"
 msgstr "- يمين"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976 export/Export.cpp:1021
 #, c-format
 msgid "Output Channels: %2d"
@@ -5511,12 +5798,8 @@ msgstr "عرض المخرج"
 
 #: export/ExportCL.cpp:87
 #, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
-msgstr ""
-"سيتم ارسال البيانات عبر أنبوب إلى المدخل المعياري. سيتم تعويض \"%f\" باسم "
-"ملف المخرج المختار."
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "سيتم ارسال البيانات عبر أنبوب إلى المدخل المعياري. سيتم تعويض \"%f\" باسم ملف المخرج المختار."
 
 #: export/ExportCL.cpp:220
 msgid "(external program)"
@@ -5527,10 +5810,6 @@ msgstr "(برنامج خارجي)"
 msgid "Cannot export audio to %s"
 msgstr "لا أستطيع تصدير الصوت إلى %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "تصدير"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "تصدير الصوت المختار باستخدام مُشفِر سطر اﻷوامر"
@@ -5543,6 +5822,477 @@ msgstr "تصدير كل المشروع باستخدام مُشفِر سطر ا
 msgid "Command Output"
 msgstr "أمر المخرج"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "معدل عيّنة غير صحيح"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "يمكن إعادة أخذ العيّنة بأحد المعدلات في اﻷسفل."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "معدلات العيّنة"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "معدل البت:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "الصيغة:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "اللغة:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "الجودة:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "ملفات أكس.أم.أل (*.xml)|*.xml| كل الملفات (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "حدد خيارات صيغة فلاك"
@@ -5623,10 +6373,6 @@ msgstr "حدد خيارات أم.بي.2"
 msgid "MP2 Export Setup"
 msgstr "إعداد تصدير أم.بي.2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "معدل البت:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "ملفات أم.بي.2"
@@ -5740,60 +6486,27 @@ msgstr "حدد مكان لايم Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "جُرأة يحتاج الملف %s لإنتاج أم.بي.3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "مكان %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "للبحث على %s، أنقر هنا -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "تصفح..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "للحصول على نسخة مجانية من لايم (Lame)، أنقر هنا -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "تنزيل..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "أين هو %s؟"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
-msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
-msgstr ""
-"فقط lame_enc.dll|lame_enc.dll|المكتبات المربوطة ديناميكيا (*.dll)|*.dll|كل "
-"الملفات (*.*)|*"
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "فقط lame_enc.dll|lame_enc.dll|المكتبات المربوطة ديناميكيا (*.dll)|*.dll|كل الملفات (*.*)|*"
 
 #: export/ExportMP3.cpp:1550
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
-msgstr ""
-"فقط libmp3lame.dylib|libmp3lame.dylib|المكتبات المربوطة ديناميكيا (*.dylib)|"
-"*.dylib|كل الملفات (*)|*"
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "فقط libmp3lame.dylib|libmp3lame.dylib|المكتبات المربوطة ديناميكيا (*.dylib)|*.dylib|كل الملفات (*)|*"
 
 #: export/ExportMP3.cpp:1567
-msgid ""
-"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"فقط libmp3lame.so.0|libmp3lame.so.0| ملفات "
-"البرامج المشتركة الابتدائية (*.so)|*.so| "
-" المكتبات الموسّعة (*.so*)|*.so*|كل الملفات (*)|*"
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "فقط libmp3lame.so.0|libmp3lame.so.0| ملفات البرامج المشتركة الابتدائية (*.so)|*.so|  المكتبات الموسّعة (*.so*)|*.so*|كل الملفات (*)|*"
 
 #: export/ExportMP3.cpp:1650
 msgid "MP3 Files"
@@ -5846,39 +6559,23 @@ msgstr "تصدير كامل الملف  بــ %d ك.ب.ف.ث"
 msgid "Error %d returned from MP3 encoder"
 msgstr "مُشفِر أم.بي.3 أرجع الخطأ %d"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "معدل عيّنة غير صحيح"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"معدل العيّنة للمشروع (%d) غير مدعوم في صيغة\n"
+msgstr "معدل العيّنة للمشروع (%d) غير مدعوم في صيغة\n"
 "ملف أم.بي.3.  "
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"تركيبة معدل العيّنة (%d) و معدل البِت (%d) في المشروع غير\n"
+msgstr "تركيبة معدل العيّنة (%d) و معدل البِت (%d) في المشروع غير\n"
 "مدعومة في صيغة ملف أم.بي.3.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "يمكن إعادة أخذ العيّنة بأحد المعدلات في اﻷسفل."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "معدلات العيّنة"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "لم أعثر على البرنامج المساعد لتصدير أم.بي.3"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95 export/ExportMultiple.cpp:374
 #: export/ExportMultiple.cpp:598 export/ExportMultiple.cpp:765
@@ -5886,19 +6583,14 @@ msgid "Export Multiple"
 msgstr "تصدير متعدد"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
-msgstr ""
-"لديك عدة مسارات صوتية، يمكنك تصدير كل مسار في ملف منفصل،\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "لديك عدة مسارات صوتية، يمكنك تصدير كل مسار في ملف منفصل،\n"
 "إذا كان لديك مسار علامة، يمكنك تصدير ملف جديد لكل علامة.\n"
 "\n"
-"هذا المشروع ليس فيه عدة مسارات أو ليس فيه مسار علامة، لذلك لا يمكن تصدير عدة "
-"ملفات."
+"هذا المشروع ليس فيه عدة مسارات أو ليس فيه مسار علامة، لذلك لا يمكن تصدير عدة ملفات."
 
 #: export/ExportMultiple.cpp:165
 msgid "Can't export multiple files"
@@ -5940,6 +6632,10 @@ msgstr "تضمين الصوت قبل العلامة الأولى"
 msgid "First file name:"
 msgstr "اسم الملف اﻷول:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "مسارات"
@@ -5960,14 +6656,14 @@ msgstr "تعداد متتالي"
 msgid "File name prefix:"
 msgstr "بادئة اسم الملف:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "استبدال الملفات الموجودة"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "ت&صدير"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5979,12 +6675,10 @@ msgstr "اختيار مكان لحفظ الملفات المُصدّرة"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" غير موجود.\n"
+msgstr "\"%s\" غير موجود.\n"
 "\n"
 "هل تريد إنشائه؟"
 
@@ -6004,12 +6698,9 @@ msgstr "حدث خطأ بعد تصدير %d ملف."
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"العلامة %s ليست اسم ملف مقبول. لا يمكنك "
-"استخدام أيّا من:   %s\n"
+msgstr "العلامة %s ليست اسم ملف مقبول. لا يمكنك استخدام أيّا من:   %s\n"
 "استخدم ..."
 
 #: export/ExportOGG.cpp:64
@@ -6020,10 +6711,6 @@ msgstr "حدد خيارات أوق فوربيس"
 msgid "Ogg Vorbis Export Setup"
 msgstr "إعداد تصدير أوق فوربيس"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "الجودة:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "ملفات أوق فوربيس"
@@ -6044,10 +6731,6 @@ msgstr "حدد خيارات فك الضغط"
 msgid "Uncompressed Export Setup"
 msgstr "إعداد التصدير غير المضغوط"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "الصيغة:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "الرأسية:"
@@ -6060,9 +6743,21 @@ msgstr "التشفير:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(ليس كل تركيب للرأسيات و التشفيرات ممكن.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "وايف، آيف، و الأنواع الأخرى غير المضغوطة"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -6084,184 +6779,190 @@ msgstr "تصدير كل المشروع كـ %s"
 msgid "Error (file may not have been written): %s"
 msgstr "خطأ (يُحتمل أن الملف لم يُحفظ): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "ملفات أم.بي.3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "هذا الإصدار من جُرأة لم يُبنى مع دعم %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو مسار قرص مضغوط صوتي. \n"
+msgstr "\"%s\" هو مسار قرص مضغوط صوتي. \n"
 "لا يستطيع جُرأة فتح الأقراص المضوطة الصوتية مباشرة. \n"
 "استخرج مسارات القرص المضغوط إلى صيغة صوتية يمكن \n"
 "لجُرأة استيرادها، مثل وايف أو آيف."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
-"Audacity cannot open this file because it only contains links to other "
-"files. \n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
-msgstr ""
-"\"%s\" هو ملف قائمة قراءة. \n"
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr "\"%s\" هو ملف قائمة قراءة. \n"
 "جُرأة لا تستطيع فتح هذا الملف لأنه يحتوي فقط على روابط لملفات أخرى. \n"
 "يمكنك فتحه في برنامج لتحرير النصوص ثم تنزيل الملفات الصوتية الموجودة."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف ويندوز ميديا أوديو. \n"
+msgstr "\"%s\" هو ملف ويندوز ميديا أوديو. \n"
 "جُرأة لا تستطيع فتح هذا النوع من الملفات بسبب قيود براءة الاختراع.\n"
 "أنت بحاجة لتحويله إلى صيغة مدعومة في جُرأة، مثل وايف أو آيف."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف تشفير صوتي متطور. \n"
+msgstr "\"%s\" هو ملف تشفير صوتي متطور. \n"
 "جُرأة لا تستطيع فتح هذا النوع من الملفات. \n"
 "أنت بحاجة لتحويله إلى صيغة مدعومة في جُرأة، مثل وايف أو آيف."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف صوتي مُشفر، عادة يكون مصدره موقع بيع على "
-"الأنترنت. \n"
+msgstr "\"%s\" هو ملف صوتي مُشفر، عادة يكون مصدره موقع بيع على الأنترنت. \n"
 "جُرأة لا تستطيع فتح هذا النوع من الملفات بسبب التشفير. \n"
 "حاول تسجيل الملف باستخدام جُرأة، أو انسخه إلى قرص مضغوط صوتي ثم استخرج\n"
 "مسار القرص المضغوط إلى صيغة مدعومة في جُرأة مثل وايف أو آيف."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"  هو ملف وسيط ريلبلاير. \n"
+msgstr "\"%s\"  هو ملف وسيط ريلبلاير. \n"
 "جُرأة لا تستطيع فتح هذه الصيغة المملوكة. \n"
 "أنت بحاجة لتحويله إلى صيغة مدعومة في جُرأة، مثل وايف أو آيف."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" هو ملف ميدي و ليس ملف صوتي. \n"
-"جُرأة لا يستطيع فتح هذا النوع من الملفات للقراءة أو التسجيل، "
-"لكن يمكنك عرضه بالنقر على ملف > استيراد > ميدي."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" هو ملف نغمات و ليس ملف صوتي. \n"
+msgstr "\"%s\" هو ملف نغمات و ليس ملف صوتي. \n"
 "جُرأة لا يستطيع فتح هذا النوع من الملفات.\n"
 "حاول تحويله إلى ملف صوتي من نوع وايف أو آيف\n"
 "ثم استورده أو سجله باستخدام جُرأة."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
-"and try importing it again. Otherwise you need to convert it to a supported "
-"audio \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف ميوزباك و ليس ملف صوتي. \n"
+msgstr "\"%s\" هو ملف ميوزباك و ليس ملف صوتي. \n"
 "جُرأة لا يستطيع فتح هذا النوع من الملفات.\n"
 "إذا كنت تظن أنه ملف أم.بي.3، حاول تسميته بامتداد \".mp3\" \n"
-"و استيراده مرة ثانية. عدا هذا أنت تحتاج إلى تحويله إلى صيغة "
-" صوتية مدعومة\n"
+"و استيراده مرة ثانية. عدا هذا أنت تحتاج إلى تحويله إلى صيغة  صوتية مدعومة\n"
 "مثل وايف أو آيف."
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف وايفباك و ليس ملف صوتي. \n"
+msgstr "\"%s\" هو ملف وايفباك و ليس ملف صوتي. \n"
 "جُرأة لا يستطيع فتح هذا النوع من الملفات.\n"
-"أنت تحتاج إلى تحويله إلى صيغة صوتية مدعومة،"
-"مثل وايف أو آيف."
+"أنت تحتاج إلى تحويله إلى صيغة صوتية مدعومة،مثل وايف أو آيف."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف دولبي رقمي و ليس ملف صوتي. \n"
+msgstr "\"%s\" هو ملف دولبي رقمي و ليس ملف صوتي. \n"
 "جُرأة لا يستطيع فتح حاليا هذا النوع من الملفات.\n"
-"أنت تحتاج إلى تحويله إلى صيغة صوتية مدعومة،"
-"مثل وايف أو آيف."
+"أنت تحتاج إلى تحويله إلى صيغة صوتية مدعومة،مثل وايف أو آيف."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" هو ملف أوق سبيكس و ليس ملف صوتي. \n"
+msgstr "\"%s\" هو ملف أوق سبيكس و ليس ملف صوتي. \n"
 "جُرأة لا يستطيع حاليا فتح هذا النوع من الملفات.\n"
-"أنت تحتاج إلى تحويله إلى صيغة صوتية مدعومة،"
-"مثل وايف أو آيف."
+"أنت تحتاج إلى تحويله إلى صيغة صوتية مدعومة،مثل وايف أو آيف."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"جُرأة بحاجة لتخمين نوع الملف.\n"
-"ربما يكون الصوت تالف.\n"
-"\n"
-"إذا كان الصوت تالف، حاول إعادة تسمية الملف\n"
-"بحيث يكون امتداده صحيحا قبل فتحه."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"جُرأة لم تتعرف على نوع هذا الملف.\n"
-"إذا كان غير مضغوط، حاول استيراده بواسطة \"استيراد خام \""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6296,17 +6997,18 @@ msgstr "لايمكن تفريع مسارات ميدي على انفراد، هذ
 msgid "Invalid track offset in LOF file."
 msgstr "فرع مسار غير صالح في ملف لوف."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "خطأ في قراءة ملف ألقرو."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "خطأ في قراءة ملف ميدي."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "ملفات أم.بي.3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6332,15 +7034,23 @@ msgstr "رأسية تيار بِت فوربيس غير صالحة"
 msgid "Internal logic fault"
 msgstr "خطأ منطقي داخلي"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "وايف، آيف، و الأنواع الأخرى غير المضغوطة"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "استيراد ملف %s..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "ملفات كويك تايم"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "استيراد بيانات خام"
@@ -6382,6 +7092,14 @@ msgstr " قناتان (ثنائي)"
 msgid "%d Channels"
 msgstr "%d قنوات"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "فرع البداية:"
@@ -6394,9 +7112,18 @@ msgstr "المقدار الذي سيستورد:"
 msgid "Sample rate:"
 msgstr "معدل العيّنة:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&استيراد"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
 msgid "Audio I/O"
@@ -6439,9 +7166,9 @@ msgstr "قنوات"
 msgid "Playthrough"
 msgstr "قراءة بواسطة"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&قراءة المسارات الأخرى أثناء تسجيل مسار جديد"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6451,13 +7178,13 @@ msgstr "قراءة بواسطة الآ&لة: قراءة المسار الجدي
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "قراءة &بواسطة البرنامج: قراءة المسار الجديد أثناء تسجيله"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
-"قراءة بواسطة ال&برنامج: قراءة المسار الجديد أثناء تسجيله (أزل الاختيار عند تسجيل "
-"\"المزج الثنائي\")"
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6484,19 +7211,15 @@ msgid "Latency"
 msgstr "الكمون"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"الصوت إلى الواقي:\n"
+msgstr "الصوت إلى الواقي:\n"
 "(أعلى = كمون أكثر)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"تصحيح الكمون:\n"
+msgstr "تصحيح الكمون:\n"
 "(سالب = إلى الخلف)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6565,8 +7288,8 @@ msgid "Audio cache"
 msgstr "مخبأ تلقائي"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "أبق البيانات المسجلة في الذاكرة حتى توقيف التسجيل"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6587,9 +7310,7 @@ msgid "Directory %s is not writable"
 msgstr "لا يمن الكتابة في الدليل %s"
 
 #: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "تغيير الدليل المؤقت سيكون فعّالا عند إعادة تشغيل جُرأة من جديد"
 
 #: prefs/FileFormatPrefs.cpp:48 prefs/FileFormatPrefs.cpp:49
@@ -6608,9 +7329,9 @@ msgstr "إصدار مكتبة أم.بي.3:"
 msgid "MP3 Library:"
 msgstr "مكتبة أم.بي.3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&بحث عن مكتبة"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6620,13 +7341,22 @@ msgstr "مكتبة لايم أم.بي.3"
 msgid "&Download"
 msgstr "&تنزيل"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid ""
-"Note: Export quality options can be chosen by clicking the Options button in "
-"the Export dialog."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
 msgstr ""
-"ملاحظة: يمكن تغيير خيارات جودة التصدير بالنقر على زر "
-"الخيارات في علبة حوار التصدير."
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "ملاحظة: يمكن تغيير خيارات جودة التصدير بالنقر على زر الخيارات في علبة حوار التصدير.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6697,7 +7427,8 @@ msgid "&Update display while playing"
 msgstr "&تحديث العرض أثناء القراءة"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "الخروج من جُرأة عند غلق آخر نافذة "
 
 #: prefs/GUIPrefs.cpp:98
@@ -6705,15 +7436,16 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "تفعيل &سحب حافتي الاختيار اليسرى و اليمنى"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "ترتيب &مريح لأزرار منافذ الصوت"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "&صف تلقائي للمسارات مع التكبير عموديا"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "\"تحريك نقطة التركيز على المسارات\" &بشكل دوران متكرر على المسارات"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6741,17 +7473,22 @@ msgid "Show warnings about &temp files"
 msgstr "أظهر الإنذارات حول الملفات ال&مؤقتة"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&عرض سؤال الحفظ، حتى إذا كان المشروع فارغا"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "عرض الكلمة الترحيبية عند بدأ البرنامج"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "أنماط"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "عرض الحد اﻷدنى للمجال: أمتار و 'شكل الموجة (ديسيبل)'"
@@ -6784,34 +7521,10 @@ msgstr "- 145 ديسيبل (مجال بي.سي.أم لعيّنات 24 بت)"
 msgid "Default View Mode"
 msgstr "نمط العرض الافتراضي"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "عرض شكل الموجة"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "عرض شكل الموجة بالديسيبل"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "عرض الطيف"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "عرض الطيف اللوغارتمي"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "عرض الحدّة"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "خيارات أخرى للواجهة"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "اللغة:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "مساعدة:"
@@ -6824,6 +7537,14 @@ msgstr "زر وحيد:"
 msgid "Keyboard"
 msgstr "لوحة المفاتيح"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "ارتباطات المفاتيح"
@@ -6856,22 +7577,16 @@ msgstr "خطأ  في حفظ اختصارات لوحة المفاتيح"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "اختر ملف أكس.أم.أل يحتوي على اختصارات لوحة مفاتيح جُرأة..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "ملفات أكس.أم.أل (*.xml)|*.xml| كل الملفات (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "خطأ في تحميل اختصارات لوحة المفاتيح"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"اختصار لوحة المفاتيح '%s' مخصص من قبل لـ:\n"
+msgstr "اختصار لوحة المفاتيح '%s' مخصص من قبل لـ:\n"
 "\n"
 "'%s'"
 
@@ -6879,6 +7594,42 @@ msgstr ""
 msgid "Undo"
 msgstr "تراجع"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&قراءة المسارات الأخرى أثناء تسجيل مسار جديد"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "الفأرة"
@@ -7153,13 +7904,13 @@ msgstr "جودة عالية:"
 msgid "Smart Recording"
 msgstr "التسجيل الذكي"
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "توقف مؤقت للتسجيل عند الصمت"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "مستوى الصمت (ديسيبل):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
@@ -7292,8 +8043,7 @@ msgid "Info"
 msgstr "معلومة"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7306,8 +8056,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"الموضوعية هي خدمة تجريبية.\n"
+msgstr "الموضوعية هي خدمة تجريبية.\n"
 "\n"
 "لتجريبها، انقر \"حفظ مخبأ الموضوع\" ثم\n"
 "ابحث عن الصور و اﻷلوان في \n"
@@ -7322,41 +8071,31 @@ msgstr ""
 "يحتوي على أيكونات أخرى.]\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"لقد قمت ببناء جُرأة مع زر إضافي، \n"
+msgstr "لقد قمت ببناء جُرأة مع زر إضافي، \n"
 "'ناتج سوركيري'. سيقوم هذا بحفظ نسخة سي C من \n"
 "مخبأ الصورة يمكن دمجها في البناء كصورة افتراضية.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"إذا كان 'تحميل مخبأ الموضوع مع إنطلاق البرنامج' مُفعّل،\n"
+msgstr "إذا كان 'تحميل مخبأ الموضوع مع إنطلاق البرنامج' مُفعّل،\n"
 "فإن مخبأ الموضوع سيُحمَّل عند بدأ البرنامج.\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"حفظ و تحميل ملفات مواضيع فردية يستخدم \n"
+msgstr "حفظ و تحميل ملفات مواضيع فردية يستخدم \n"
 "ملف منفصل لكل صورة، عدا هذا فالفكرة هي نفسها.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "التحكم"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "توقف مؤقت"
@@ -7365,9 +8104,9 @@ msgstr "توقف مؤقت"
 msgid "Play"
 msgstr "قراءة"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "قراءة (Shift للقراءة المتكررة)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7381,6 +8120,10 @@ msgstr "تخطي إلى البداية"
 msgid "Skip to End"
 msgstr "تخطي إلى النهاية"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "الخطاب النظيف"
@@ -7390,12 +8133,8 @@ msgid "Error while opening sound device. "
 msgstr "حدث خطأ أثناء فتح جهاز الصوت. "
 
 #: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
-msgstr ""
-"التسجيل بنمط الخطاب النظيف غير ممكن إذا كان هناك مسار مفتوح من قبل، أو هناك "
-"أكثر من مشروع واحد مفتوح."
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "التسجيل بنمط الخطاب النظيف غير ممكن إذا كان هناك مسار مفتوح من قبل، أو هناك أكثر من مشروع واحد مفتوح."
 
 #: toolbars/ControlToolBar.cpp:697
 msgid "Recording not permitted"
@@ -7418,6 +8157,10 @@ msgid "Silence selection"
 msgstr "كتم الاختيار"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "تكبير"
 
@@ -7473,16 +8216,13 @@ msgstr "عداد مستوى المخرج"
 msgid "Input level meter - click to monitor input"
 msgstr "عداد مستوى المدخل - انقر لمراقبة المدخل"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "المازج"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "مستوى المخرج"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "متزلج-المخرج"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7490,7 +8230,8 @@ msgid "Input Volume"
 msgstr "مستوى المدخل"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "متزلج-المدخل"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7836,14 +8577,16 @@ msgstr "ثنائي عمودي"
 msgid "Preferences..."
 msgstr "تفضيلات..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"هذا يحدد كم مرة يتم فيها تجديد العداد.\n"
+msgstr "هذا يحدد كم مرة يتم فيها تجديد العداد.\n"
 "إذا كان حاسوبك بطيئ يمكنك اختيار \n"
 "معدل تجديد صغير (30 في الثانية أو أقل)، حتى\n"
 "لا تتأثر جودة الصوت بعرض العداد."
@@ -7860,6 +8603,22 @@ msgstr "تفضيلات العداد"
 msgid " Please select an action "
 msgstr "من فضلك اختر عملية "
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478 widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
 msgstr "مسطرة عمودية"
@@ -7871,12 +8630,6 @@ msgstr "مسطرة عمودية"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 ثانية"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "سا:دق:ثا"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7902,6 +8655,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 يوم 024 سا 060 دق 060 ثا"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8087,8 +8855,8 @@ msgstr "لم أتمكن من فتح ملف: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "خطأ:  %hs في السطر %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/bg.po b/locale/bg.po
index 8307f03..f7b8602 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -15,36 +15,24 @@ msgstr "Project-Id-Version: Audacity 1.23\n"
 msgid "&About Audacity..."
 msgstr "&Относно Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Включено"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Дата на компилация:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity е свободна програма, разработвана от екип от програмисти - доброволци от цял свят. Проектът се координира чрез SourceForge.net - мрежова услуга за софтуерни проекти с отворен код.  Програмата има версии за ОС Windows 98 или по-нова, MacOS X, Linux и други съвместими с Unix операционни системи. По-стари версии на Audacity има и за Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Тази програма е бета-версия. Тя може да съдържа грешки и недовършени компоненти.  Разчитаме на обратната връзка от вас - моля, посетете сайта ни и ни уведомете за открити грешки или предложете нови възможности."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Това е стабилна, завършена версия на Audacity.  Ако все пак обаче откриете грешка или ако имате предложения, моля, свържете се с нас.  Ние се нуждаем от обратната връзка от потребителите, за да продължаваме да подобряваме програмата.  За повече информация посетете сайта ни."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: ../src/AboutDialog.cpp:127
@@ -52,13 +40,9 @@ msgstr "Това е стабилна, завършена версия на Audac
 msgid "translator_credits"
 msgstr "Превод на български: Михаил Балабанов"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Свободен редактор за цифров звук"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Информация"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -94,28 +78,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Специални благодарности:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Включено"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Дата на компилация:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Затваряне"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -323,12 +397,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -364,8 +439,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -413,6 +488,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -461,10 +540,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -679,16 +766,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Преименуван бе файлът %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Променя се блок %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -817,6 +904,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Правоъгълен"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Къде е %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Честотен анализ"
@@ -843,8 +1017,8 @@ msgstr "Подобрена автокорелация"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -856,8 +1030,8 @@ msgstr "Размер"
 msgid " window"
 msgstr " прозорец"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -868,14 +1042,25 @@ msgstr "Линейна честота"
 msgid "Log frequency"
 msgstr "Логаритмична честота"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Затваряне"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
@@ -929,7 +1114,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Закъснение (секунди)\tЧестота (Хц)\tСила"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -945,15 +1130,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -964,40 +1165,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1193,6 +1418,10 @@ msgstr "&Съхраняване на проект\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Съхраняване на проект к&ато..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1201,6 +1430,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1229,10 +1462,26 @@ msgstr "Експорт на &надписи..."
 msgid "Export &Multiple..."
 msgstr "Експорт на н&яколко файла..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1294,9 +1543,9 @@ msgstr "Из&триване\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Нулиране\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1310,22 +1559,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1369,12 +1616,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1385,66 +1632,67 @@ msgstr "&Всичко\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "От началото до курсора"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "От курсора до края"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Пресечни точки с нулата\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Преместване на курсора..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "към началото на селекцията"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "към края на селекцията"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "към началото на писта"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "към края на писта"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Съхраняване на селекция"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Възстановяване на селекция"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1463,10 +1711,14 @@ msgstr "Включване на прилепването към мрежата"
 msgid "Turn Grid Snap Off"
 msgstr "Изключване на прилепването към мрежата"
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "Нас&тройка...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1504,60 +1756,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Хронология..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:578
+msgid "!Simplified View"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Превъртане до началото\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Превъртане до края\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1573,12 +1887,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Времева писта"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1593,6 +1903,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Пре&махване на писти"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Подравняване с &началото"
@@ -1609,29 +1927,40 @@ msgstr "Подравняване по &началото на селекцият
 msgid "Align with Selection &End"
 msgstr "Подравняване по к&рая на селекцията"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Подравняване на края по курсора"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Подравняване на края по началото на селекцията"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Подравняване на края по края на селекцията"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Подравняване на писти"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Подравняване на писти..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1644,22 +1973,26 @@ msgstr "Нов надпис върху селекцията\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Нов надпис в текущата позиция\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Генериране"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "&Ефект"
@@ -1694,6 +2027,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1706,12 +2043,12 @@ msgstr "&Измерване на скоростта..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1746,9 +2083,9 @@ msgstr "Следващ инструмент\tD"
 msgid "Previous Tool\tA"
 msgstr "Предишен инструмент\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Възпроизвеждане/стоп\tИнтервал"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1762,12 +2099,12 @@ msgstr "Пауза\tP"
 msgid "Record\tR"
 msgstr "Запис\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1782,22 +2119,14 @@ msgstr "Възпроизвеждане до селекцията\tB"
 msgid "Play Looped\tL"
 msgstr "Зациклено възпроизвеждане\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Циклично възпроизвеждане\tShift+Интервал"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Превъртане до началото\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Превъртане до края\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Маркиране до началото\tShift+Home"
@@ -1854,8 +2183,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1954,14 +2283,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "Скорошни &файлове..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2018,6 +2352,23 @@ msgstr "Повтаряне на %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Няма писти с надписи за експорт."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Няма действия за анулиране"
@@ -2058,6 +2409,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Извършено бе поставяне от клипборда"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2226,9 +2581,9 @@ msgstr "Импорт на надписи"
 msgid "Select a MIDI file..."
 msgstr "Избор на MIDI файл..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Всички файлове (*.*)|*.*|MIDI файлове (*.mid)|*.mid|Файлове на Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2247,14 +2602,6 @@ msgstr "Избор на некомпресиран звуков файл..."
 msgid "All files (*)|*"
 msgstr "Всички файлове (*)|*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Импорт"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2286,6 +2633,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Извършено бе подравняване с началото"
@@ -2322,6 +2673,14 @@ msgstr "Извършено бе подравняване"
 msgid "Align"
 msgstr "Подравняване"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Създадена бе нова аудиописта"
@@ -2385,14 +2744,14 @@ msgstr "Премахване на писта"
 msgid "Removed audio track(s)"
 msgstr "Премахнати бяха аудиописти"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2459,14 +2818,13 @@ msgstr "Записан бе звук"
 msgid "Save changes before closing?"
 msgstr "Желаете ли съхраняване на промените преди затваряне?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2486,6 +2844,25 @@ msgstr "Избор на звуков(и) файл(ове)..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2543,42 +2920,34 @@ msgstr "Този файл е бил записан с Audacity %s.\n"
 msgid "Can't open project file"
 msgstr "Не е възможно отварянето на файл с проект"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Не бе възможно съхраняването на проект.\n"
-"Може би в %s не може да се записва или дискът е пълен."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2590,21 +2959,19 @@ msgstr "Грешка при съхраняване на проект"
 msgid "Saved %s"
 msgstr "%s бе съхранен"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Неформатирани данни"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Импортиран бе \"%s\""
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Импорт"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Грешка при импортиране"
@@ -2617,18 +2984,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Проектните файлове на Audacity (.aup) позволяват съхраняване на целия\n"
-"материал във вида, в който го виждате на екрана, но повечето други\n"
-"програми не могат да отварят тези файлове.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Ако желаете да съхраните файл, който може да бъде отварян с други\n"
-"програми, изберете някоя от командите за експорт."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2671,6 +3043,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Дисковото пространство е недостатъчно"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2754,43 +3136,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2830,8 +3181,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Коментари"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2850,12 +3201,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2897,100 +3248,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Максималната дължина на атрибута \"%s\" е %d знака. Данните бяха скъсени."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Заглавие"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Изпълнител"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Албум"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3055,8 +3325,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3099,6 +3412,10 @@ msgstr "Вълнова форма"
 msgid "Waveform (dB)"
 msgstr "Вълнова форма (дБ)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Височина (EAC)"
@@ -3232,13 +3549,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Изместване във времето"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Увеличението не е достатъчно. Увеличете мащаба така, че да се виждат отделните отчети."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3324,6 +3641,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3381,15 +3706,6 @@ msgstr "Промяна на честота"
 msgid "Format Change"
 msgstr "Промяна на формата"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Честота на дискретизация в Хц (в секунда) между 1 и 100 000:"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Грешна честота на дискретизация."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Нова долна граница на скоростта (%):"
@@ -3524,8 +3840,8 @@ msgstr "Приставки 1 - %i"
 msgid "Plugins %i to %i"
 msgstr "Приставки %i - %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3547,8 +3863,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3569,14 +3885,19 @@ msgstr "Приложен бе ефект: %s %.1f дБ"
 msgid "Amplify"
 msgstr "Усилване"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Усилване от Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Усилване (дБ):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Нова пикова амплитуда (дБ):"
@@ -3585,6 +3906,10 @@ msgstr "Нова пикова амплитуда (дБ):"
 msgid "Allow clipping"
 msgstr "Разрешаване на кадрирането"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Усилване..."
@@ -3708,10 +4033,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Честота (Хц):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Усилване (дБ):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3753,9 +4086,50 @@ msgstr "от Vaughan Johnson и Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "ползва SoundTouch от Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Височина:   от"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Полутонове:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284
 #: ../src/effects/ChangePitch.cpp:330
@@ -3765,13 +4139,9 @@ msgstr "Височина:   от"
 msgid "to"
 msgstr "до"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Полутонове:"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Честота (Хц):   от"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
@@ -3779,6 +4149,11 @@ msgstr "Честота (Хц):   от"
 msgid "Percent Change:"
 msgstr "Промяна в проценти:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Промяна на височината..."
@@ -3797,6 +4172,11 @@ msgstr "Приложен бе ефект: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Промяна на скоростта"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "-"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Промяна на скоростта, влияе върху темпото и височината"
@@ -3805,14 +4185,17 @@ msgstr "Промяна на скоростта, влияе върху темпо
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "ползва SampleRate от Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "-"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Грамофонни обороти в минута:   от"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3830,13 +4213,29 @@ msgstr "Промяна на темпото"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Промяна на темпото без промяна на височината"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Темпо (удари/мин):   от"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Дължина (в секунди): от"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3846,8 +4245,8 @@ msgstr "Промяна на темпото..."
 msgid "Changing Tempo"
 msgstr "Променя се темпото"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3858,10 +4257,18 @@ msgstr "Премахване на пукане от Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Премахване на пукане..."
@@ -3874,49 +4281,84 @@ msgstr "Премахва се пукане..."
 msgid "Dynamic Range Compressor"
 msgstr "Компресор на динамичния обхват"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Компресор на динамичния обхват от Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Съотношение:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Време за атака:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Нормализиране до 0 дБ след компресирането"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Праг: %d дБ"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Съотношение: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Съотношение: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Време за атака: %.1f с"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3927,6 +4369,247 @@ msgstr "Компресор..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Извършва се компресиране на динамичния обхват..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Информация"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3943,8 +4626,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Амплитуда (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4173,16 +4856,12 @@ msgstr "Инвертиране"
 msgid "Inverting"
 msgstr "Извършва се инвертиране"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4194,31 +4873,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4229,6 +4912,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Фазер"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Премахване на шум"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4245,10 +5080,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4276,10 +5107,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Премахване на шум"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Стъпка 1"
@@ -4310,14 +5137,26 @@ msgstr "Профилиране на шум"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Премахване на шум..."
@@ -4352,22 +5191,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Нормализиране"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Центриране на сигнала около нулата"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Нормализиране.."
@@ -4381,44 +5220,56 @@ msgstr "Извършва се нормализиране..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Приложен бе ефект: %s %d стъпки, %.0f%% wet, честота = %.1f Хц, начална фаза = %.0f градуса, дълбочина = %d, обр. връзка = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Фазер"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Фазер от Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Етапи:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
 #: ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "Честота на НЧО (Хц):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "Нач. фаза на НЧО (градуси):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Дълбочина:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Обратна връзка (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Фазер..."
@@ -4433,6 +5284,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4451,28 +5310,23 @@ msgstr "Пистите са твърде дълги за повтаряне на
 msgid "Repeat"
 msgstr "Повтаряне"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Повторения от Dominic Mazzoni и Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Брой повторения:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Нова дължина на селекцията:"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d минути, %d секунди"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d секунди"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4536,8 +5390,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4545,6 +5447,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Линейно"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4573,22 +5483,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Вълнова форма:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4615,10 +5531,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4664,10 +5576,6 @@ msgstr "Приложен бе ефект: %s честота = %.1f Хц, нач
 msgid "Wahwah"
 msgstr "Ефект \"Уа-уа\""
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Ефект \"Уа-уа\" от Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Дълбочина (%):"
@@ -4676,10 +5584,18 @@ msgstr "Дълбочина (%):"
 msgid "Resonance:"
 msgstr "Резонанс:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Честотно отместване (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Ефект \"Уа-уа\"..."
@@ -4716,6 +5632,18 @@ msgstr "Настройки на ефекта"
 msgid "Length (seconds)"
 msgstr "Дължина (секунди)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Прилага се ефект на Nyquist..."
@@ -4781,9 +5709,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4837,6 +5768,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4872,10 +5807,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Не е възможен експортът на звук в %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Маркираният звук се експортира чрез кодер за командния ред"
@@ -4888,6 +5819,477 @@ msgstr "Целият проект се експортира чрез кодер
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Битове в секунда:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Език:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML файлове (*.xml)|*.xml|Всички файлове (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4960,10 +6362,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4972,10 +6370,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Битове в секунда:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4984,10 +6378,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -5013,44 +6403,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5061,20 +6419,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5105,6 +6459,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Качество"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5130,33 +6488,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Къде е %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5166,8 +6506,9 @@ msgstr "Само lame_enc.dll|lame_enc.dll|Библиотеки за динам.
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Само libmp3lame.so|libmp3lame.so|Първични споделени обектни файлове (*.so)|*.so|Разширени библиотеки (*.so*)|*.so*|Всички файлове (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5186,10 +6527,6 @@ msgstr "Кодиращата библиотека за MP3 е невалидна
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Редакция на етикети ID3 за MP3 файла"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5225,10 +6562,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5241,18 +6574,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Не бе открита приставката за експорт в MP3"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5311,6 +6636,10 @@ msgstr "Вкл. звука преди първия надпис"
 msgid "First file name:"
 msgstr "Име на първия файл:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Писти"
@@ -5331,15 +6660,14 @@ msgstr "Последователно номериране"
 msgid "File name prefix:"
 msgstr "Префикс за имената:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Презаписване на съществуващи файлове"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5349,10 +6677,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Изберете местоположение за експортираните файлове"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5360,6 +6684,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5370,6 +6698,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5378,10 +6712,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5394,22 +6724,14 @@ msgstr "Маркираният звук се експортира във фор
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Целият проект се експортира във формат Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5425,8 +6747,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Не всички комбинации от загл.\n"
 "блок и кодиране са възможни.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5450,8 +6784,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Грешка (файлът може да не е записан): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5459,6 +6821,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Тази версия на Audacity не е компилирана с поддръжка за %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5489,9 +6859,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5504,19 +6875,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity не разпознава типа на този файл.\n"
-"Ако е некомпресиран, опитайте с \"Импорт на неформатирани данни\""
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5555,16 +6978,17 @@ msgstr "MIDI пистите не могат да се отместват поо
 msgid "Invalid track offset in LOF file."
 msgstr "Невалидно отместване на писта в LOF файл."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Грешка при анализ на файл на Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Грешка при анализ на файл във формат MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5591,15 +7015,23 @@ msgstr "Невалиден заглавен блок на двоичен пот
 msgid "Internal logic fault"
 msgstr "Вътрешна логическа грешка"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Импортира се файл във формат %s..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Импорт на неформатирани данни"
@@ -5637,6 +7069,14 @@ msgstr "2 канала (стерео)"
 msgid "%d Channels"
 msgstr "%d канала"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Начално отместване:"
@@ -5649,8 +7089,17 @@ msgstr "Количество за импортиране:"
 msgid "Sample rate:"
 msgstr "Честота на дискретизация:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5694,10 +7143,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Просвирване на останалите писти по време на запис на нова"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5707,8 +7155,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5735,12 +7187,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5768,21 +7222,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5821,7 +7263,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5846,23 +7288,65 @@ msgstr "В директорията %s не може да се записва"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Смяната на временната директория влиза в сила след рестартиране на Audacity"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Създаване на копие на файла за редактиране (по-безопасно)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Версия на библиотеката за MP3"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Четене директно от оригиналния файл (по-бързо)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5892,53 +7376,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Версия на библиотеката за MP3"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Интерфейс"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Търсене"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Интерфейс"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5953,6 +7432,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5961,25 +7444,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Език:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Долен праг в дБ на изобразявания обхват"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5989,6 +7472,10 @@ msgstr "-36 дБ (плитък обхват за редактиране на г
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 дБ (обхват за PCM с 8-битови отчети)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 дБ (обхват за PCM с 16-битови отчети)"
@@ -6001,10 +7488,34 @@ msgstr "-120 дБ (приблизителна граница на човешки
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 дБ (обхват за PCM с 24-битови отчети)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Клавиатура"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6037,10 +7548,6 @@ msgstr "Грешка при съхраняване на клавишните к
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Избор на XML файл с клавишни комбинации на Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML файлове (*.xml)|*.xml|Всички файлове (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Грешка при зареждане на клавишните комбинации"
@@ -6056,6 +7563,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Отмяна"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Просвирване на останалите писти по време на запис на нова"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Мишка"
@@ -6280,10 +7824,6 @@ msgstr "Увеличение на изгледа"
 msgid "Audacity Preferences"
 msgstr "Настройка на Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Качество"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Правоъгълник"
@@ -6348,12 +7888,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6372,6 +7912,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - по подразбиране"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - най-тясна честотна лента"
@@ -6380,6 +7924,10 @@ msgstr "4096 - най-тясна честотна лента"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6396,6 +7944,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Максимална честота (Хц):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Максималната честота трябва да е цяло число"
@@ -6412,6 +7980,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6484,10 +8060,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Пауза"
@@ -6496,9 +8068,9 @@ msgstr "Пауза"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Възпроизвеждане (Shift за зацикляне)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6512,6 +8084,10 @@ msgstr "Превъртане до началото"
 msgid "Skip to End"
 msgstr "Превъртане до края"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6544,6 +8120,10 @@ msgstr "Подрязване около селекцията"
 msgid "Silence selection"
 msgstr "Нулиране на селекцията"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Увеличаване"
@@ -6600,24 +8180,20 @@ msgstr "Сила на изхода"
 msgid "Input level meter - click to monitor input"
 msgstr "Сила на входа - щракнете за следене"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Сила на изхода"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Сила на входа"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6636,6 +8212,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6893,6 +8474,22 @@ msgstr "Дясно"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6939,14 +8536,14 @@ msgstr "Хоризонтално стерео"
 msgid "Vertical Stereo"
 msgstr "Вертикално стерео"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Линейно"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6966,6 +8563,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6974,10 +8587,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6990,6 +8599,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7103,11 +8727,10 @@ msgstr "Прескачане на това предупреждение за в
 msgid "Could not open file: \"%s\""
 msgstr "Не бе възможно отварянето на файл: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Грешка: %s на ред %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/bn.po b/locale/bn.po
index dd46b7a..e95617d 100644
--- a/locale/bn.po
+++ b/locale/bn.po
@@ -18,32 +18,23 @@ msgstr "Project-Id-Version: Audacity 1.2.4\n"
 msgid "&About Audacity..."
 msgstr "&অডিওসিটি পরিচিতি..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "সক্রিয়"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
-msgstr ""
-
-#: AboutDialog.cpp:204
-msgid "Program build date: "
-msgstr ""
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:214
-msgid "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."
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 
-#: AboutDialog.cpp:221
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
@@ -57,13 +48,9 @@ msgstr ""
 msgid "translator_credits"
 msgstr "অঙ্কুর প্রকল্পের পক্ষে মাহে আলম খান (makl10n at yahoo.com)"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "একটি ফ্রি ডিজিটাল অডিও সম্পাদক"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "তথ্য"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -99,27 +86,117 @@ msgstr ""
 msgid "Special thanks:"
 msgstr ""
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "সক্রিয়"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+msgid "Program build date: "
+msgstr ""
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "বন্ধ"
-
 #: ../src/Project.cpp:1766
 #, c-format
 msgid "%s is already open in another window."
@@ -316,12 +393,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -357,8 +435,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -406,6 +484,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -454,10 +536,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -673,14 +763,14 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr ""
 
-#: ../src/DirManager.cpp:660
+#: DirManager.cpp:1051
 #, c-format
-msgid "Changing block %s\n"
+msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
-#: DirManager.cpp:1051
+#: DirManager.cpp:1183
 #, c-format
-msgid "Unable to rename '%s' to '%s'"
+msgid "Changed block %s to new alias name\n"
 msgstr ""
 
 #: DirManager.cpp:1115 DirManager.cpp:1403
@@ -812,6 +902,95 @@ msgstr ""
 msgid "Rectangular"
 msgstr "আয়তকার"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr ""
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr ""
@@ -840,8 +1019,8 @@ msgstr ""
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:63
@@ -854,8 +1033,8 @@ msgstr ""
 msgid " window"
 msgstr "উইন্ডো"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -866,14 +1045,24 @@ msgstr ""
 msgid "Log frequency"
 msgstr ""
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "বন্ধ"
+
 #: ../src/widgets/Meter.cpp:293
 msgid "dB"
 msgstr ""
@@ -926,7 +1115,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr ""
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -942,15 +1131,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -961,40 +1166,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:49
@@ -1187,6 +1416,10 @@ msgstr ""
 msgid "Save Project &As..."
 msgstr ""
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1195,6 +1428,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1223,10 +1460,26 @@ msgstr ""
 msgid "Export &Multiple..."
 msgstr ""
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1287,8 +1540,8 @@ msgstr ""
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:252
-msgid "&Silence\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
 msgstr ""
 
 #: Menus.cpp:432
@@ -1303,22 +1556,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1362,12 +1613,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:260
@@ -1378,64 +1629,66 @@ msgstr ""
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:263
-msgid "Start to Cursor"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
 msgstr ""
 
-#: ../src/Menus.cpp:264
-msgid "Cursor to End"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
 msgstr ""
 
 #: Menus.cpp:525
 msgid "Find &Zero Crossings\tZ"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Mo&ve Cursor..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
 msgstr ""
 
-#: ../src/Menus.cpp:283
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "নির্বাচনের শুরুতে"
 
-#: ../src/Menus.cpp:284
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "নির্বাচনের শেষে"
 
-#: ../src/Menus.cpp:279
-msgid "to Track Start"
-msgstr "ট্র্যাক এর শুরুতে"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "to Track End"
-msgstr "ট্র্যাক এর শেষে"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:271
-msgid "Selection Save"
+#: Menus.cpp:491
+msgid "Re&gion Save"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Selection Restore"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
 msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:302
@@ -1454,9 +1707,13 @@ msgstr ""
 msgid "Turn Grid Snap Off"
 msgstr ""
 
-#: ../src/Menus.cpp:201
-#: ../src/Menus.cpp:207
-msgid "&Preferences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
 msgstr ""
 
 #: ../src/Menus.cpp:313
@@ -1495,60 +1752,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:332
 msgid "&History..."
 msgstr ""
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:567
+msgid "&Control Toolbar"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:568
+msgid "&Device Toolbar"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:533
+msgid "Skip to Start\tHome"
+msgstr ""
+
+#: ../src/Menus.cpp:534
+msgid "Skip to End\tEnd"
+msgstr ""
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1563,12 +1882,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr ""
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1583,6 +1898,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr ""
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:377
 msgid "Align with &Zero"
 msgstr ""
@@ -1599,28 +1922,36 @@ msgstr ""
 msgid "Align with Selection &End"
 msgstr ""
 
-#: ../src/Menus.cpp:381
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+msgid "Align End with Cu&rsor"
+msgstr ""
+
+#: Menus.cpp:677
+msgid "Align End with Selection Star&t"
 msgstr ""
 
-#: ../src/Menus.cpp:382
-msgid "Align End with Selection Start"
+#: Menus.cpp:678
+msgid "Align End with Selection En&d"
 msgstr ""
 
-#: ../src/Menus.cpp:383
-msgid "Align End with Selection End"
+#: Menus.cpp:679
+msgid "Align Tracks To&gether"
 msgstr ""
 
-#: ../src/Menus.cpp:384
-msgid "Align Tracks Together"
+#: Menus.cpp:681
+msgid "&Align Tracks"
 msgstr ""
 
-#: Menus.cpp:688
-msgid "&Align Tracks..."
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
 msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1631,22 +1962,26 @@ msgstr ""
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr ""
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:413
 msgid "&Generate"
 msgstr ""
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:436
 msgid "Effe&ct"
 msgstr ""
@@ -1681,6 +2016,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1693,12 +2032,12 @@ msgstr ""
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:513
@@ -1733,8 +2072,8 @@ msgstr ""
 msgid "Previous Tool\tA"
 msgstr ""
 
-#: ../src/Menus.cpp:523
-msgid "Play/Stop\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
 msgstr ""
 
 #: ../src/Menus.cpp:524
@@ -1749,12 +2088,12 @@ msgstr ""
 msgid "Record\tR"
 msgstr ""
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:528
@@ -1769,22 +2108,14 @@ msgstr ""
 msgid "Play Looped\tL"
 msgstr ""
 
-#: ../src/Menus.cpp:531
-msgid "Play Looped\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
 msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:533
-msgid "Skip to Start\tHome"
-msgstr ""
-
-#: ../src/Menus.cpp:534
-msgid "Skip to End\tEnd"
-msgstr ""
-
 #: ../src/Menus.cpp:536
 msgid "Selection to Start\tShift+Home"
 msgstr ""
@@ -1841,8 +2172,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1941,14 +2272,18 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:942
-msgid "Recent &Files..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
 msgstr ""
 
 #: ../src/Menus.cpp:584
@@ -2006,6 +2341,23 @@ msgstr ""
 msgid "There are no label tracks to export."
 msgstr ""
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1600
 msgid "Nothing to undo"
 msgstr ""
@@ -2046,6 +2398,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr ""
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2214,9 +2570,9 @@ msgstr ""
 msgid "Select a MIDI file..."
 msgstr "একটি মিডি ফাইল নির্বাচন করুন"
 
-#: ../src/Menus.cpp:2640
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "সকল ফাইল (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2658
 #, c-format
@@ -2235,14 +2591,6 @@ msgstr ""
 msgid "All files (*)|*"
 msgstr "সকল ফাইল (*)|*"
 
-#: ../src/Project.cpp:2197
-#: ../src/Project.cpp:2244
-#: ../src/import/ImportRaw.cpp:408
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-msgid "Import"
-msgstr "আমদানী"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2274,6 +2622,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2856
 msgid "Aligned with zero"
 msgstr ""
@@ -2310,6 +2662,14 @@ msgstr ""
 msgid "Align"
 msgstr ""
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2941
 msgid "Created new audio track"
 msgstr ""
@@ -2373,14 +2733,14 @@ msgstr ""
 msgid "Removed audio track(s)"
 msgstr ""
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2447,14 +2807,13 @@ msgstr ""
 msgid "Save changes before closing?"
 msgstr ""
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1713
@@ -2474,6 +2833,25 @@ msgstr ""
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1815
 #: ../src/Project.cpp:1823
 msgid "Error opening file"
@@ -2529,39 +2907,33 @@ msgstr ""
 msgid "Can't open project file"
 msgstr ""
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
 
 #: ../src/Project.cpp:2109
@@ -2574,22 +2946,19 @@ msgstr ""
 msgid "Saved %s"
 msgstr "সংরক্ষিত %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2189
-msgid "Raw"
-msgstr "খাঁটি (raw)"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2243
 #, c-format
 msgid "Imported '%s'"
 msgstr ""
 
+#: ../src/Project.cpp:2197
+#: ../src/Project.cpp:2244
+#: ../src/import/ImportRaw.cpp:408
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+msgid "Import"
+msgstr "আমদানী"
+
 #: ../src/Project.cpp:2285
 msgid "Error importing"
 msgstr ""
@@ -2602,14 +2971,24 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2313
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
 
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
 #: ../src/Project.cpp:2323
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr ""
@@ -2651,6 +3030,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr ""
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2734,43 +3123,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2809,8 +3167,8 @@ msgstr ""
 msgid "Comments"
 msgstr "মন্তব্য"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2829,12 +3187,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2876,100 +3234,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr ""
-
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr ""
-
-#: ../src/Tags.cpp:435
-msgid "Title"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "শিল্পী"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "এ্যালবাম"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3034,8 +3311,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3078,6 +3398,10 @@ msgstr ""
 msgid "Waveform (dB)"
 msgstr ""
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr ""
@@ -3211,12 +3535,12 @@ msgstr ""
 msgid "Time-Shift"
 msgstr ""
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
@@ -3304,6 +3628,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3361,15 +3693,6 @@ msgstr ""
 msgid "Format Change"
 msgstr ""
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr ""
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr ""
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr ""
@@ -3504,8 +3827,8 @@ msgstr ""
 msgid "Plugins %i to %i"
 msgstr ""
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3527,8 +3850,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:638
@@ -3549,14 +3872,19 @@ msgstr ""
 msgid "Amplify"
 msgstr ""
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
 msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr ""
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr ""
@@ -3565,6 +3893,10 @@ msgstr ""
 msgid "Allow clipping"
 msgstr ""
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr ""
@@ -3687,10 +4019,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr ""
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "গতি বৃদ্ধি"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: ../src/effects/BassBoost.h:44
 msgid "BassBoost..."
 msgstr ""
@@ -3731,8 +4071,49 @@ msgstr ""
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr ""
 
-#: ../src/effects/ChangePitch.cpp:264
-msgid "Pitch:   from"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:301
+msgid "Semitones (half-steps):"
+msgstr ""
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
 msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:286
@@ -3743,12 +4124,8 @@ msgstr ""
 msgid "to"
 msgstr "অভিমুখে"
 
-#: ../src/effects/ChangePitch.cpp:301
-msgid "Semitones (half-steps):"
-msgstr ""
-
-#: ../src/effects/ChangePitch.cpp:320
-msgid "Frequency (Hz):   from"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
 msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:355
@@ -3757,6 +4134,11 @@ msgstr ""
 msgid "Percent Change:"
 msgstr ""
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr ""
@@ -3775,6 +4157,14 @@ msgstr ""
 msgid "Change Speed"
 msgstr "গতি পরিবর্তন"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: ../src/effects/ChangeSpeed.cpp:339
+msgid "n/a"
+msgstr "প্র/ন"
+
 #: ../src/effects/ChangeSpeed.cpp:283
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr ""
@@ -3783,16 +4173,16 @@ msgstr ""
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr ""
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:339
-msgid "n/a"
-msgstr "প্র/ন"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:342
-msgid "Standard Vinyl RPM:   from"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
 msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
@@ -3811,12 +4201,28 @@ msgstr ""
 msgid "Change Tempo without Changing Pitch"
 msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:212
-msgid "Beats per Minute (BPM):   from"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
 msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:242
-msgid "Length (seconds):   from"
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
 msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
@@ -3827,8 +4233,8 @@ msgstr ""
 msgid "Changing Tempo"
 msgstr ""
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: effects/ClickRemoval.cpp:359
@@ -3839,10 +4245,18 @@ msgstr ""
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr ""
@@ -3855,49 +4269,81 @@ msgstr ""
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:417
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:435
-msgid "Ratio: "
-msgstr "অনুপাত:"
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:442
-msgid "Attack Time: "
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
 msgstr ""
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:509
+#: effects/Compressor.cpp:563
+#, c-format
+msgid "Threshold %d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Threshold: %d dB"
+msgid "%3d dB"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:512
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.0f:1"
+msgid "Ratio %.0f to 1"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:514
+#: effects/Compressor.cpp:568
 #, c-format
-msgid "Ratio: %.1f:1"
+msgid "%.0f:1"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:516
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "Ratio %.1f to 1"
 msgstr ""
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3908,6 +4354,247 @@ msgstr "সংকোচক..."
 msgid "Applying Dynamic Range Compression..."
 msgstr ""
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "তথ্য"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3924,8 +4611,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr ""
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4155,16 +4842,12 @@ msgstr "ইনভার্ট"
 msgid "Inverting"
 msgstr ""
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4176,31 +4859,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4211,6 +4898,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "ফেজার"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr ""
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4227,10 +5066,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4258,10 +5093,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr ""
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr ""
@@ -4292,14 +5123,26 @@ msgstr ""
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr ""
@@ -4334,22 +5177,22 @@ msgstr ""
 msgid "Normalize"
 msgstr ""
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr ""
-
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr ""
@@ -4363,24 +5206,20 @@ msgstr ""
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr ""
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "ফেজার"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr ""
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr ""
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "ডি-আর-ওয়াই"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
 msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
@@ -4388,19 +5227,35 @@ msgstr ""
 msgid "LFO Frequency (Hz):"
 msgstr ""
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr ""
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "গভীরতা"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr ""
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "ফেজার..."
@@ -4415,6 +5270,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4433,12 +5296,12 @@ msgstr ""
 msgid "Repeat"
 msgstr "পুনরাবৃত্তি"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
 msgstr ""
 
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
 msgstr ""
 
 #: ../src/effects/Repeat.cpp:241
@@ -4446,14 +5309,8 @@ msgstr ""
 msgid "New selection length: "
 msgstr ""
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr ""
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
 msgstr ""
 
 #: ../src/effects/Repeat.h:34
@@ -4518,8 +5375,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4527,6 +5432,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "লিনিয়ার"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4555,22 +5468,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:278
 msgid "Waveform:"
 msgstr ""
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4597,10 +5516,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4646,10 +5561,6 @@ msgstr ""
 msgid "Wahwah"
 msgstr ""
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr ""
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "গভীরতা (%):"
@@ -4658,10 +5569,18 @@ msgstr "গভীরতা (%):"
 msgid "Resonance:"
 msgstr "রেজোনেন্স:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr ""
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr ""
@@ -4697,6 +5616,18 @@ msgstr ""
 msgid "Length (seconds)"
 msgstr ""
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr ""
@@ -4762,9 +5693,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4818,6 +5752,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4853,10 +5791,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr ""
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr ""
@@ -4869,6 +5803,477 @@ msgstr ""
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "ভাষা (Language):"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4941,10 +6346,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4953,10 +6354,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr ""
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4965,10 +6362,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -4994,44 +6387,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5042,20 +6403,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5086,6 +6443,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "মান"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5111,34 +6472,14 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
 msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
@@ -5149,8 +6490,8 @@ msgstr ""
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr ""
 
 #: export/ExportMP3.cpp:1592
@@ -5169,10 +6510,6 @@ msgstr ""
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr ""
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5208,10 +6545,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5224,16 +6557,8 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
-msgstr ""
-
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
 #: ../src/export/ExportMultiple.cpp:367
@@ -5290,6 +6615,10 @@ msgstr ""
 msgid "First file name:"
 msgstr ""
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:631
 msgid "Tracks"
 msgstr ""
@@ -5310,13 +6639,12 @@ msgstr ""
 msgid "File name prefix:"
 msgstr ""
 
-#: ../src/export/ExportMultiple.cpp:672
-msgid "Overwrite existing files"
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
 msgstr ""
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
+#: ../src/export/ExportMultiple.cpp:672
+msgid "Overwrite existing files"
 msgstr ""
 
 #: export/ExportMultiple.cpp:360
@@ -5328,10 +6656,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr ""
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5339,6 +6663,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5349,6 +6677,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5357,10 +6691,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5373,22 +6703,14 @@ msgstr ""
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr ""
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5402,8 +6724,20 @@ msgstr "এনকোডিং:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr ""
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5426,8 +6760,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr ""
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5435,6 +6797,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr ""
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5465,9 +6835,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5480,17 +6851,70 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
 
 #: import/ImportFLAC.cpp:35
@@ -5529,16 +6953,17 @@ msgstr ""
 msgid "Invalid track offset in LOF file."
 msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
 msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
 msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5565,15 +6990,23 @@ msgstr ""
 msgid "Internal logic fault"
 msgstr ""
 
-#: ../src/Project.cpp:2194
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
+msgid "Importing %s"
 msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr ""
@@ -5615,6 +7048,14 @@ msgstr ""
 msgid "%d Channels"
 msgstr "%d চ্যানেল"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr ""
@@ -5627,8 +7068,17 @@ msgstr ""
 msgid "Sample rate:"
 msgstr ""
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5672,8 +7122,8 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
@@ -5684,8 +7134,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5712,12 +7166,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5745,21 +7201,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5798,7 +7242,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5823,20 +7267,64 @@ msgstr ""
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-msgid "&Make a copy of the file before editing (safer)"
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:128
-msgid "&Read directly from the original file (faster)"
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
 msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
@@ -5867,52 +7355,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr ""
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "ইন্টারফেস"
 
-#: prefs/FileFormatPrefs.cpp:185
-msgid "&Find Library"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "ইন্টারফেস"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5927,6 +7411,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5935,24 +7423,24 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "ভাষা (Language):"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
@@ -5963,6 +7451,10 @@ msgstr ""
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr ""
@@ -5975,10 +7467,34 @@ msgstr ""
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "কী-বোর্ড"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6011,10 +7527,6 @@ msgstr ""
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr ""
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr ""
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr ""
@@ -6030,6 +7542,42 @@ msgstr ""
 msgid "Undo"
 msgstr ""
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "মাউস"
@@ -6253,10 +7801,6 @@ msgstr ""
 msgid "Audacity Preferences"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "মান"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 #, fuzzy
 msgid "Rectangle"
@@ -6322,12 +7866,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6346,6 +7890,10 @@ msgstr ""
 msgid "256 - default"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr ""
@@ -6354,6 +7902,10 @@ msgstr ""
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6370,6 +7922,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr ""
@@ -6386,6 +7958,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6458,10 +8038,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "বিরতি"
@@ -6470,8 +8046,8 @@ msgstr "বিরতি"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
 msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
@@ -6486,6 +8062,10 @@ msgstr ""
 msgid "Skip to End"
 msgstr ""
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6518,6 +8098,10 @@ msgstr ""
 msgid "Silence selection"
 msgstr ""
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr ""
@@ -6574,24 +8158,20 @@ msgstr ""
 msgid "Input level meter - click to monitor input"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6610,6 +8190,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6871,6 +8456,22 @@ msgstr "ডান"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6917,14 +8518,14 @@ msgstr ""
 msgid "Vertical Stereo"
 msgstr ""
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "লিনিয়ার"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6944,6 +8545,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6952,10 +8569,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6968,6 +8581,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7081,9 +8709,9 @@ msgstr ""
 msgid "Could not open file: \"%s\""
 msgstr ""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
+msgid "Error: %hs at line %lu"
 msgstr ""
 
 #: xml/XMLFileReader.cpp:79
diff --git a/locale/bs.po b/locale/bs.po
new file mode 100644
index 0000000..ff41ca5
--- /dev/null
+++ b/locale/bs.po
@@ -0,0 +1,9138 @@
+# translation of audacity.po to
+# Copyright (C) 2008 Free Software Foundation, Inc.
+#
+# BHLD Localisation <bhld at list.linux.org.ba>, 2008.
+msgid ""
+msgstr "Project-Id-Version: audacity\n"
+"POT-Creation-Date: 2003-07-04 00:53-0700\n"
+"PO-Revision-Date: 2008-11-22 21:47-0500\n"
+"Last-Translator: Samir Ribic <megaribi at epn.ba>\n"
+"Language-Team: Bosnian <bhld at lists.linux.org.ba>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Bosnian\n"
+"X-Poedit-Country: BOSNIA HERZEGOVINA\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: AboutDialog.cpp:141
+#: AudacityApp.cpp:732
+#: Menus.cpp:733
+msgid "&About Audacity..."
+msgstr "&O programu Audacity ..."
+
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:371
+#: SplashDialog.cpp:111
+msgid "OK... Audacious!"
+msgstr "Audaciozno!"
+
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
+
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
+
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
+
+#. i18n-hint: The translation of "translator_credits" will appear
+#. i the credits i the About Audacity window.  Use this to add
+#. your own name(s) to the credits.
+#.
+#. For example:  "English translation by Dominic Mazzoni."
+#.
+#: AboutDialog.cpp:256
+#: AboutDialog.cpp:258
+msgid "translator_credits"
+msgstr "Bosanski prijevod: \n"
+" dr. Samir Ribić "
+
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
+
+#: AboutDialog.cpp:277
+msgid "Credits"
+msgstr "Zasluge"
+
+#: AboutDialog.cpp:281
+#, c-format
+msgid "Audacity %s Development Team"
+msgstr "Razvojna ekipa Audacity %s"
+
+#: AboutDialog.cpp:286
+#, c-format
+msgid "Audacity %s Support Team"
+msgstr "Ekipa Audacity %s za podršku"
+
+#: AboutDialog.cpp:291
+msgid "Emeritus Developers"
+msgstr "Zaslužni programeri"
+
+#: AboutDialog.cpp:296
+msgid "Other Emeritus Team Members"
+msgstr "Drugi zaslužni članovi ekipe"
+
+#: AboutDialog.cpp:301
+msgid "Other Contributors"
+msgstr "Drugi doprinosi"
+
+#: AboutDialog.cpp:306
+msgid "Audacity is based on code from the following projects:"
+msgstr "Audacity temelji na kodu sljedećih projekat:"
+
+#: AboutDialog.cpp:311
+msgid "Special thanks:"
+msgstr "Posebna zahvala:"
+
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:320
+msgid "Audacity"
+msgstr "Audacity"
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: AboutDialog.cpp:165
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Omogućeno"
+
+#: AboutDialog.cpp:166
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:229
+msgid "Program build date: "
+msgstr "Datum izrade programa: "
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:234
+msgid "Settings folder: "
+msgstr "Direktorijum s postavkama:"
+
+#: AboutDialog.cpp:388
+msgid "GPL License"
+msgstr "Licenca GPL"
+
+#: AudacityApp.cpp:458
+#: Project.cpp:1751
+#, c-format
+msgid "%s is already open in another window."
+msgstr "Projekt %s je već otvoren u drugom prozoru."
+
+#: AudacityApp.cpp:460
+#: Project.cpp:1753
+#: Project.cpp:1834
+#: Project.cpp:1978
+#: Project.cpp:2080
+msgid "Error opening project"
+msgstr "Greška pri otvaranju projekta"
+
+#: AudacityApp.cpp:492
+#, c-format
+msgid "%s does not exist and could not be opened.\n"
+"\n"
+"It has been removed from the history list."
+msgstr "%s ne postoji i nije je moguće otvoriti.\n"
+"\n"
+"Odstranjeno iz liste istorije."
+
+#: AudacityApp.cpp:544
+msgid "Master Gain Control"
+msgstr "Glavna kontrola pojačanja"
+
+#: AudacityApp.cpp:545
+msgid "Input Meter"
+msgstr "Ulazni mjerač"
+
+#: AudacityApp.cpp:546
+msgid "Output Meter"
+msgstr "Izlazni mjerač"
+
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: AudacityApp.cpp:734
+#: Menus.cpp:470
+msgid "&Preferences...\tCtrl+,"
+msgstr "&Postavke ...\tCtrl+,"
+
+#: AudacityApp.cpp:816
+#: AudacityApp.cpp:893
+#, c-format
+msgid "Using block size of %ld\n"
+msgstr "Koristeći veličinu bloka %ld\n"
+
+#: AudacityApp.cpp:838
+#: AudacityApp.cpp:908
+#, c-format
+msgid "Unknown command line option: %s\n"
+msgstr "Nepoznata opcija komandne linije: %s\n"
+
+#: AudacityApp.cpp:1027
+msgid "Audacity could not find a place to store temporary files.\n"
+"Please enter an appropriate directory in the preferences dialog."
+msgstr "Audacity nije našao prostora za privremene datoteke.\n"
+"Molim, da unesete ispravan put do direktorija u dijalogu postavki."
+
+#: AudacityApp.cpp:1033
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity se zatvara. Molimo, ponovo pokrenite Audacity, da biste mogli koristiti novi privremeni direktorij."
+
+#: AudacityApp.cpp:1065
+msgid "Running two copies of Audacity simultaneously may cause\n"
+"data loss or cause your system to crash.\n"
+"\n"
+msgstr "Pokretanje dvije kopije Audacity istovremeno može izazvatii\n"
+"gubitak podatak ili krah vašeg sistema.\n"
+"\n"
+
+#: AudacityApp.cpp:1072
+msgid "Audacity was not able to lock the temporary files directory.\n"
+"This folder may be in use by another copy of Audacity.\n"
+msgstr "Audacity ne može zaključti direktorije privremenih datoteka.\n"
+"Taj direktorij možda koristi drugi Audacity.\n"
+
+#: AudacityApp.cpp:1074
+msgid "Do you still want to start Audacity?"
+msgstr "Želite li i dalje pokrenuti Audacity?"
+
+#: AudacityApp.cpp:1076
+msgid "Error locking temporary folder"
+msgstr "Greška pri zaključavanju privremenog direktorija"
+
+#: AudacityApp.cpp:1114
+msgid "The system has detected that another copy of Audacity is running.\n"
+msgstr "Sistem je detektovao, da se druga kopija Audacity već izvršava.\n"
+
+#: AudacityApp.cpp:1116
+msgid "Use the New or Open commands in the currently running Audacity\n"
+"process to open multiple projects simultaneously.\n"
+msgstr "Upotrijebite naredbu Novi ilii Otvori u trenutno pokrenutom procesu Audacity,\n"
+"da otvorite više projekat istovremeno.\n"
+
+#: AudacityApp.cpp:1117
+msgid "Audacity is already running"
+msgstr "Audacity je već pokrenut."
+
+#: AudacityApp.cpp:1134
+msgid "Command-line options supported:"
+msgstr "Poddržavamo opcije komandne linije:"
+
+#. i18n-hint: '-help' is the option and needs to stay in
+#. * English. This displays a list of available options
+#: AudacityApp.cpp:1137
+msgid "\t-help (this message)"
+msgstr "\t-help (ova poruka)"
+
+#. i18n-hint '-version' needs to stay in English.
+#: AudacityApp.cpp:1139
+msgid "\t-version (display Audacity version)"
+msgstr "\t-version (prikaži verziju Audacity)"
+
+#. i18n-hint '-test' is the option and needs to stay in
+#. * English. This runs a set of automatic tests on audacity
+#. * itself
+#: AudacityApp.cpp:1143
+msgid "\t-test (run self diagnostics)"
+msgstr "\t-test (pokreni samodijagnostiku)"
+
+#. i18n-hint '-blocksize' is the option and needs to stay in
+#. * English. 'nnn' is any integer number. This controls the
+#. * size pieces that audacity uses when writing files to the
+#. * disk
+#: AudacityApp.cpp:1148
+msgid "\t-blocksize nnn (set max disk block size in bytes)"
+msgstr "\t-blocksize nnn (postavlja najveću veličinu diskovnog bloka u bajtim)"
+
+#: AudacityApp.cpp:1149
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "Dodatno navedite ime zvučne datoteke ili projekta Audacity, kojega želite otvoriti."
+
+#: AudacityApp.cpp:1421
+msgid "Audacity project (.AUP) files are not currently \n"
+"associated with Audacity. \n"
+"\n"
+"Associate them, so they open on double-click?"
+msgstr "Projektne datoteke Audacity (.AUP) trenutno \n"
+"nisu povezane s Audacity.\n"
+"\n"
+"Dali ih želite povezati, tako da bi ih otvarali s dvojnim klikom?"
+
+#: AudacityApp.cpp:1422
+msgid "Audacity Project Files"
+msgstr "Projektne datoteke Audacity"
+
+#: AudioIO.cpp:219
+msgid "Could not find any audio devices.\n"
+msgstr "Ni jedan zvučni uređaj nije moguće naći.\n"
+
+#: AudioIO.cpp:220
+msgid "You will not be able to play or record audio.\n"
+"\n"
+msgstr "Ne biste mogli reprodukovati ili snimati zvuk.\n"
+"\n"
+
+#: AudioIO.cpp:223
+msgid "Error: "
+msgstr "Greška:"
+
+#: AudioIO.cpp:226
+msgid "Error Initializing Audio"
+msgstr "Greška pri inicializaciji zvuka"
+
+#: AudioIO.cpp:1236
+msgid "Latency problem"
+msgstr "Problem s latencijom"
+
+#: AudioIO.cpp:1236
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "Postavka latencije je prouzrokovala, da je snimljeni zvuk sakriven pred vrijednošću nula.\n"
+"Audacity je snimak vratio nazad na vrijednost nula.\n"
+"Možda ćete morati koristiti alat vremenski pomak (<---> ili F5), da povučete traku na pravo mjesto."
+
+#: AutoRecovery.cpp:54
+msgid "Automatic Crash Recovery"
+msgstr "Automatska obnova nakon kraha"
+
+#: AutoRecovery.cpp:73
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
+"Fortunately, the following projects can automatically be recovered:"
+msgstr "Zadnji put, kada je upotrebljavan Audacity, neki projekti nisu bili pravilno sačuvani.\n"
+"Srećom. sljedeći projekti će biti obnovljeni automatski:"
+
+#: AutoRecovery.cpp:75
+msgid "Recoverable projects"
+msgstr "Obnovljivi projekti"
+
+#: AutoRecovery.cpp:78
+#: Tags.cpp:1999
+msgid "Name"
+msgstr "Ime"
+
+#: AutoRecovery.cpp:84
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "Obnova projekta neće promijeniti nijednu datoteku na disku, sve dok ga ne snimite."
+
+#: AutoRecovery.cpp:88
+msgid "Quit Audacity"
+msgstr "Zatvori Audacity"
+
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr "Ne obnavljaj"
+
+#: AutoRecovery.cpp:90
+msgid "Recover Projects"
+msgstr "Obnovi projekte"
+
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
+
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr ""
+
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
+msgid "Could not enumerate files in auto save directory"
+msgstr "Datoteke u direktoriju automatskog snimanja nije moguće numerisati"
+
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:2545
+#: Menus.cpp:4443
+#: Project.cpp:1937
+#: Project.cpp:3281
+#: Project.cpp:3360
+#: WaveTrack.cpp:548
+#: WaveTrack.cpp:567
+#: WaveTrack.cpp:1656
+#: effects/Effect.cpp:421
+#: export/ExportMP2.cpp:230
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:245
+#: toolbars/ControlToolBar.cpp:532
+#: toolbars/ControlToolBar.cpp:841
+msgid "Error"
+msgstr "Greška"
+
+#: BatchCommandDialog.cpp:56
+#: BatchCommandDialog.cpp:60
+#: BatchCommandDialog.cpp:61
+msgid "Select Command"
+msgstr "Izaberite naredbu"
+
+#: BatchCommandDialog.cpp:80
+#: BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
+msgid "&Command"
+msgstr "&Naredba"
+
+#: BatchCommandDialog.cpp:82
+msgid "&Edit Parameters"
+msgstr "&Uredi parametre"
+
+#: BatchCommandDialog.cpp:89
+#: BatchProcessDialog.cpp:455
+msgid "&Parameters"
+msgstr "&Parametri"
+
+#: BatchCommandDialog.cpp:94
+msgid "C&hoose command"
+msgstr "&Izaberi naredbu"
+
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
+msgstr "Efekat Stereo u mono nije nađen"
+
+#: BatchCommands.cpp:497
+msgid "Ogg Vorbis support is not included in this build of Audacity"
+msgstr "U ovoj verziji Audacity podrška za Ogg Vorbis nije uključena."
+
+#: BatchCommands.cpp:509
+msgid "FLAC support is not included in this build of Audacity"
+msgstr "U ovoj verziji Audacity podrška za FLAC nije uključena."
+
+#: BatchCommands.cpp:513
+#, c-format
+msgid "Command %s not implemented yet"
+msgstr "Komanda %s još nije implementirana"
+
+#: BatchCommands.cpp:529
+#, c-format
+msgid "Could not set parameters of effect %s\n"
+" to %s."
+msgstr "Parametre efekta %s nije moguće postaviti\n"
+" na %s."
+
+#: BatchCommands.cpp:583
+#, c-format
+msgid "Your batch command of %s was not recognised."
+msgstr "Vaša grupna naredba za %s nije prepoznata."
+
+#: BatchCommands.cpp:674
+#, c-format
+msgid "Apply %s with parameter(s)\n"
+"\n"
+"%s"
+msgstr "Upotrijebi %s s parametr(ima)\n"
+"\n"
+"%s"
+
+#: BatchCommands.cpp:675
+#: BatchCommands.cpp:680
+msgid "Test Mode"
+msgstr "Testni režim"
+
+#: BatchCommands.cpp:679
+#, c-format
+msgid "Apply %s"
+msgstr "Primjeni %s"
+
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
+msgid "Apply Chain"
+msgstr "Lančano primjeni"
+
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
+#: BatchProcessDialog.cpp:94
+msgid "&Select chain"
+msgstr "&Izaberi lanac"
+
+#: BatchProcessDialog.cpp:99
+msgid "Chain"
+msgstr "Lanac"
+
+#: BatchProcessDialog.cpp:106
+msgid "Apply to Current &Project"
+msgstr "Primjeni na trenutnem &projektu"
+
+#: BatchProcessDialog.cpp:107
+msgid "Apply to &Files..."
+msgstr "Primjeni na &datotekama ..."
+
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2038
+#: Tags.cpp:2042
+#: Tags.cpp:2342
+#: Tags.cpp:2346
+#: UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732
+#: effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188
+#: effects/VST/VSTEffect.cpp:446
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/vamp/VampEffect.cpp:411
+msgid "&Cancel"
+msgstr "Pre&kini"
+
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
+msgid "No chain selected"
+msgstr "Nijedan lanac nije izabran"
+
+#: BatchProcessDialog.cpp:159
+#, c-format
+msgid "Applying '%s' to current project"
+msgstr "Primjenjuje se '%s' na trenutnem projektu"
+
+#: BatchProcessDialog.cpp:200
+msgid "Please save and close the current project first."
+msgstr "Molimo, najprije snimite i zavorite trenutni projekat."
+
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
+#: BatchProcessDialog.cpp:207
+msgid "Select file(s) for batch processing..."
+msgstr "Izberite datoteke za grupnu obradu ..."
+
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Sve datoteke (*.*)|*.*|Datoteke WAV (*.wav)|*.wav|Datoteke AIFF (*.aif)|*.aif|Datoteke AU (*.au)|*.au|Datoteke MP3 (*.mp3)|*.mp3|Datoteke Ogg Vorbis (*.ogg)|*.ogg|Datoteke FLAC (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:231
+msgid "Applying..."
+msgstr "Primjena ..."
+
+#: BatchProcessDialog.cpp:241
+msgid "File"
+msgstr "Datoteka"
+
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
+msgid "Edit Chains"
+msgstr "Uredi lance"
+
+#: BatchProcessDialog.cpp:416
+msgid "&Chains"
+msgstr "&Lanci"
+
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:782
+#: Tags.cpp:1422
+#: Tags.cpp:2022
+msgid "&Add"
+msgstr "&Dodaj"
+
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:126
+#: Tags.cpp:783
+#: Tags.cpp:1423
+#: Tags.cpp:2023
+#: TrackPanel.cpp:3985
+msgid "&Remove"
+msgstr "&Odstrani"
+
+#: BatchProcessDialog.cpp:437
+msgid "Re&name"
+msgstr "&Preimenuj"
+
+#: BatchProcessDialog.cpp:443
+msgid "C&hain (Double-Click or press SPACE to edit)"
+msgstr "L&anac (dvokliknite ili pritisnite razmaknicu za uređivanje)"
+
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
+msgid "No"
+msgstr "Ne"
+
+#: BatchProcessDialog.cpp:459
+msgid "&Insert"
+msgstr "&Ubaci"
+
+#: BatchProcessDialog.cpp:460
+msgid "De&lete"
+msgstr "&Izbriši"
+
+#: BatchProcessDialog.cpp:461
+msgid "Move &Up"
+msgstr "Pomakni &gore"
+
+#: BatchProcessDialog.cpp:462
+msgid "Move &Down"
+msgstr "Pomakni &dolje"
+
+#: BatchProcessDialog.cpp:463
+msgid "De&faults"
+msgstr "Pod&razumijevano"
+
+#: BatchProcessDialog.cpp:507
+msgid "- END -"
+msgstr "- KRAJ -"
+
+#: BatchProcessDialog.cpp:540
+#, c-format
+msgid "%s changed"
+msgstr "%s je promjenjena"
+
+#: BatchProcessDialog.cpp:541
+msgid "Do you want to save the changes?"
+msgstr "Želite sačuvati promjene?"
+
+#: BatchProcessDialog.cpp:623
+msgid "Enter name of new chain"
+msgstr "Unesite ime novog lanca"
+
+#: BatchProcessDialog.cpp:634
+msgid "Name must not be blank"
+msgstr "Ime ne smije biti prazno"
+
+#: BatchProcessDialog.cpp:643
+#, c-format
+msgid "Names may not contain '%c' and '%c'"
+msgstr "Imena ne smiju sadržavati '%c'i '%c'"
+
+#: BatchProcessDialog.cpp:673
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Da li ste sigurni, da želite izbrisati %s?"
+
+#: Dependencies.cpp:139
+msgid "Removing Dependencies"
+msgstr "Odstranjivanje zavisnosti"
+
+#: Dependencies.cpp:140
+msgid "Copying audio data into project..."
+msgstr "Kopiranje zvučnih podatak u projekt ..."
+
+#: Dependencies.cpp:219
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
+"This will need more disc space but is safer."
+msgstr "Vaš projekt je trenutno ovisan o prisutnosti drugih datoteka.\n"
+"Želite li kopirati zvuk sljedećih datoteka u svoj projekt, da ga učinite samostalnim?\n"
+"Zahtijeva više prostora na disku, ali je sigurnije."
+
+#: Dependencies.cpp:266
+msgid "Project depends on other audio files"
+msgstr "Projekt je ovisi od drugih zvučnih datoteka"
+
+#: Dependencies.cpp:287
+msgid "Project Dependencies"
+msgstr "Ovisnosti projekta"
+
+#: Dependencies.cpp:290
+msgid "Audio file"
+msgstr "Zvučna datoteka"
+
+#: Dependencies.cpp:292
+msgid "Disk space"
+msgstr "Prostor na disku"
+
+#: Dependencies.cpp:297
+msgid "Copy Selected Audio Into Project"
+msgstr "Kopiraj izabrane zvuke u projekt"
+
+#: Dependencies.cpp:304
+#: Dependencies.cpp:410
+msgid "Cancel Save"
+msgstr "Obustavi snimanje"
+
+#: Dependencies.cpp:306
+msgid "Do Not Copy Any Audio"
+msgstr "Ne kopiraj nikakve zvučne podatke"
+
+#: Dependencies.cpp:308
+msgid "Copy All Audio into Project (Safer)"
+msgstr "Kopiraj sve zvučne podatke u projekt (Sigurnije)"
+
+#: Dependencies.cpp:317
+#: Dependencies.cpp:322
+msgid "Ask me"
+msgstr "Pitaj me"
+
+#: Dependencies.cpp:318
+msgid "Always copy all audio (safest)"
+msgstr "Uvijek kopiraj sve zvukove (najsigurnije)"
+
+#: Dependencies.cpp:319
+msgid "Never copy any audio"
+msgstr "Nikada ne kopiraj zvukove"
+
+#: Dependencies.cpp:321
+msgid "Whenever a project depends on other files:"
+msgstr "Kad god, je projekat ovisan od drugih datoteka:"
+
+#: Dependencies.cpp:409
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "Ako nastavite, vaš projekt neće biti sačuvan na disk. Da li  to zaista želite?"
+
+#: Dependencies.cpp:449
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "Vaš projekt je samostalan; ne ovisi ni od jedne spoljnje  zvučne datoteke."
+
+#: Dependencies.cpp:450
+msgid "Dependency check"
+msgstr "Provjera ovisnosti"
+
+#: DirManager.cpp:136
+msgid "Warning: there is very little free disk space left on this volume.\n"
+"Please select another temporary directory in your preferences."
+msgstr "Upozorenje: ponestaje prostora na ovom disku.\n"
+"Moliimo, da izaberete drugi privremeni direktorij u prozoru Postavke."
+
+#: DirManager.cpp:221
+#: DirManager.cpp:251
+#: DirManager.cpp:332
+msgid "Progress"
+msgstr "Napredak"
+
+#: DirManager.cpp:285
+msgid "Cleaning up temporary files"
+msgstr "Čiščenje privremenih datoteka"
+
+#: DirManager.cpp:333
+msgid "Saving project data files"
+msgstr "Spremanje projektnih datoteka"
+
+#: DirManager.cpp:406
+msgid "Cleaning up cache directories"
+msgstr "Čišćenje direktorija međumemorije"
+
+#: DirManager.cpp:493
+#, c-format
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "Audacity je našao nikom pripadajuću blokovnu datoteku %s! \n"
+"Predlažemo snimanje i ponovno otvaranje projekta, da izvedete potpunu provjeru projekta.\n"
+
+#. i18n-hint: This is the pattern for filenames that are created
+#. when a file needs to be backed up to a different name.  For
+#. example, mysong would become mysong-old1, mysong-old2, etc.
+#: DirManager.cpp:985
+#, c-format
+msgid "%s-old%d"
+msgstr "%s-stari%d"
+
+#: DirManager.cpp:993
+msgid "Unable to open/create test file"
+msgstr "Testne datoteke nije moguće otvoriti/kreirati"
+
+#: DirManager.cpp:1002
+#, c-format
+msgid "Unable to remove '%s'"
+msgstr "'%s' nije moguće odstraniti"
+
+#: DirManager.cpp:1007
+#, c-format
+msgid "Renamed file: %s\n"
+msgstr "Preimenovana datoteka: %s\n"
+
+#: DirManager.cpp:1051
+#, c-format
+msgid "Unable to rename '%s' to '%s'"
+msgstr "'%s' nije moguće preimenovati u '%s'"
+
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1115
+#: DirManager.cpp:1403
+msgid "Inspecting project file data..."
+msgstr "Pregled podatak projektne datoteke ..."
+
+#: DirManager.cpp:1128
+#, c-format
+msgid "Orphaned blockfile: (%s)"
+msgstr "Nikom pripadajuća blokovna datoteka: (%s)"
+
+#: DirManager.cpp:1153
+#, c-format
+msgid "Missing alias file: (%s)"
+msgstr "Nedostaje preimenujuća datoteka: (%s)"
+
+#: DirManager.cpp:1173
+#, c-format
+msgid "Missing summary file: (%s.auf)"
+msgstr "Nedostaje sumarna datoteka: (%s.auf)"
+
+#: DirManager.cpp:1193
+#, c-format
+msgid "Missing data file: (%s.au)"
+msgstr "Nedostaje  datoteka s podacima: (%s.au)"
+
+#: DirManager.cpp:1207
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "Provjera projekta je pokazala na nekonsistentnost  učitanih podataka projekta;\n"
+"kliknite 'Detalji' za potpuni spisak grešaka ili 'U redu' za nastavak k više opcija."
+
+#: DirManager.cpp:1219
+#, c-format
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
+"unused and probably left over from a crash or some other bug.\n"
+"They should be deleted to avoid disk contention."
+msgstr "Provjera projekta je našla %d nikom pripadajućih blokovnih datoteka. Te datoteke\n"
+"nisu u upotrebi i vjerovatno su ostale od kraha ili kakve druge greške.\n"
+"Trebalo bi ih obrisati, da se izbjegne prepunjivanje diska."
+
+#: DirManager.cpp:1224
+msgid "Delete orphaned files [safe and recommended]"
+msgstr "Izbriši nikom pripadajuće datoteke [sigurno i preporučeno]"
+
+#: DirManager.cpp:1225
+msgid "Continue without deleting; silently work around the extra files"
+msgstr "Nastavi bez brisanja; tiho radi s dodatnim datotekama"
+
+#: DirManager.cpp:1226
+msgid "Close project immediately with no changes"
+msgstr "Odmah zatvori projekt bez izmjena"
+
+#: DirManager.cpp:1228
+#: DirManager.cpp:1263
+#: DirManager.cpp:1309
+#: DirManager.cpp:1351
+#: export/Export.cpp:484
+#: export/Export.cpp:501
+#: export/Export.cpp:520
+#: widgets/Warning.cpp:55
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: DirManager.cpp:1254
+#, c-format
+msgid "Project check detected %d input file[s] being used in place\n"
+"('alias files') are now missing.  There is no way for Audacity\n"
+"to recover these files automatically; you may choose to\n"
+"permanently fill in silence for the missing files, temporarily\n"
+"fill in silence for this session only, or close the project now\n"
+"and try to restore the missing files by hand."
+msgstr "Provjera projekta je detektovala, da %d zamjenskih ulaznih datoteka\n"
+"('preimenujuće datoteke') nedostaje.  Audacity ni na koji način ne može\n"
+"te datoteka automatski obnoviti; možete izabrati, da se nedostajuće\n"
+"datoteke stalno popune tišinom, privremeno popune tišinom samo za tu sesiju ili zatvorite projekt odmah i pokušate\n"
+"ručno obnoviti nedostajuće datoteke."
+
+#: DirManager.cpp:1259
+msgid "Replace missing data with silence [permanent upon save]"
+msgstr "Zamijeni nedostajuće podatke tišinom [stalno nakon snimanja]"
+
+#: DirManager.cpp:1260
+#: DirManager.cpp:1348
+msgid "Temporarily replace missing data with silence [this session only]"
+msgstr "Privremeno zamijeni nedostajuće podatke tišinom  [samo za tu sesiju]"
+
+#: DirManager.cpp:1261
+#: DirManager.cpp:1307
+#: DirManager.cpp:1349
+msgid "Close project immediately with no further changes"
+msgstr "Odmah zatvori projekt bez daljnjih promjena"
+
+#: DirManager.cpp:1300
+#, c-format
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
+"Audacity can fully regenerate these summary files from the\n"
+"original audio data in the project."
+msgstr "Provjera projekta je detektovala %d nedostajućih sumarnih datoteka (.auf).\n"
+"Audacity može u cjelosti regenerirati te sumarne datoteke  iz\n"
+"izvornih zvučnih podatka projekta."
+
+#: DirManager.cpp:1305
+msgid "Regenerate summary files [safe and recommended]"
+msgstr "Ponovno kreiraj sumarne datoteke [sigurno i preporučeno]"
+
+#: DirManager.cpp:1306
+msgid "Fill in silence for missing display data [this session only]"
+msgstr "Popuni tišinom nedostajuće podatke za prikaz [samo za tu sesiju]"
+
+#: DirManager.cpp:1342
+#, c-format
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
+"probably due to a bug, system crash or accidental deletion.\n"
+"There is no way for Audacity to recover this lost data\n"
+"automatically; you may choose to permanently fill in silence\n"
+"for the missing data, temporarily fill in silence for this\n"
+"session only, or close the project now and try to restore the\n"
+"missing data by hand."
+msgstr "Provjera projekta je detektovala da nedostaju %d zvučne  blok-datoteke (.au), \n"
+"najvjerovatnje zbog greške, kraha sistema ili slučajnog brisanja.\n"
+" Audacity ni na koji način ne može\n"
+"te podatke automatski obnoviti; možete izabrati, da se nedostajući\n"
+"podaci stalno popune tišinom, privremeno popune tišinom samo za tu sesiju ili zatvorite projekt odmah i pokušate\n"
+"ručno obnoviti nedostajuće podatke."
+
+#: DirManager.cpp:1347
+msgid "Replace missing data with silence [permanent immediately]"
+msgstr "Zamijeni nedostajuće podatke s tišinom [od sada stalno]"
+
+#: DirManager.cpp:1375
+msgid "Cleaning up unused directories in project data..."
+msgstr "Čišćenje neupotrebljenih direktorija u podacima projekta ..."
+
+#: DirManager.cpp:1448
+msgid "Caching audio"
+msgstr "Smještanje zvuka u međumemoriju"
+
+#: DirManager.cpp:1449
+msgid "Caching audio into memory..."
+msgstr "Smještanje zvuka u međumemoriju ..."
+
+#: DirManager.cpp:1486
+msgid "Saving recorded audio"
+msgstr "Smještanje snimljenog zvuka"
+
+#: DirManager.cpp:1487
+msgid "Saving recorded audio to disk..."
+msgstr "Smještanje snimljenog zvuka na disk ..."
+
+#: FFT.cpp:379
+msgid "Rectangular"
+msgstr "Pravougaono"
+
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:112
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:172
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:192
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr "Lokacija za %s:"
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Ako želite potražiti %s, kliknite ovdje -->"
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr "Pregledaj ..."
+
+#: FFmpeg.cpp:214
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:546
+#, c-format
+msgid "Where is %s?"
+msgstr "Gdje je %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:87
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:242
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:104
+msgid "Frequency Analysis"
+msgstr "Analiza frekvencije"
+
+#: FreqWindow.cpp:140
+#: TrackPanel.cpp:507
+msgid "Spectrum"
+msgstr "Spektar"
+
+#: FreqWindow.cpp:141
+msgid "Standard Autocorrelation"
+msgstr "Standardna autokorelacija"
+
+#: FreqWindow.cpp:142
+msgid "Cuberoot Autocorrelation"
+msgstr "Cuberoot autokorelacija"
+
+#: FreqWindow.cpp:143
+msgid "Enhanced Autocorrelation"
+msgstr "Proširena autokorelacija"
+
+#. i18n-hint: This is a technical term, derived from the word
+#. "spectrum".  Do not translate it unless you are sure you
+#. know the correct technical word in your language.
+#: FreqWindow.cpp:147
+msgid "Cepstrum"
+msgstr "Cepstrum"
+
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
+msgstr "Algoritam:"
+
+#: FreqWindow.cpp:168
+#: HistoryWindow.cpp:79
+msgid "Size"
+msgstr "Veličina"
+
+#. i18n-hint: This refers to a "window function", used in the
+#. Frequency analyze dialog box.
+#: FreqWindow.cpp:181
+msgid " window"
+msgstr " prozor"
+
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
+
+#: FreqWindow.cpp:192
+msgid "Linear frequency"
+msgstr "Linearna frekvencija"
+
+#: FreqWindow.cpp:193 Da li je oo učestalost zapisa ili logaritamska frekvencija
+msgid "Log frequency"
+msgstr "Logaritamska frekvencija"
+
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
+
+#: FreqWindow.cpp:206
+#: LabelDialog.cpp:128
+#: Menus.cpp:202
+#: Menus.cpp:231
+msgid "&Export..."
+msgstr "&Izvezi ..."
+
+#: HelpText.cpp:77
+#: export/ExportCL.cpp:320
+msgid "Export"
+msgstr "Izvezi"
+
+#: AboutDialog.cpp:688
+#: FreqWindow.cpp:209
+#: widgets/ErrorDialog.cpp:135
+msgid "Close"
+msgstr "Zatvori"
+
+#: FreqWindow.cpp:272
+#: FreqWindow.cpp:402
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:791
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1103
+#: effects/Equalization.cpp:1105
+#: effects/Equalization.cpp:1113
+#: effects/Equalization.cpp:1179
+#: effects/Equalization.cpp:1388
+#: effects/Equalization.cpp:1399
+#: effects/Normalize.cpp:361
+#: widgets/Meter.cpp:363
+msgid "dB"
+msgstr "dB"
+
+#. i18n-hint: This is the abbreviation for "Hertz", or
+#. cycles per second.
+#: FreqWindow.cpp:287
+#: FreqWindow.cpp:442
+#: effects/Equalization.cpp:1144
+#: effects/Equalization.cpp:1175
+#: import/ImportRaw.cpp:416
+msgid "Hz"
+msgstr "Hz"
+
+#: FreqWindow.cpp:386
+msgid "Not enough data selected."
+msgstr "Nedovoljno izabranih podataka."
+
+#: FreqWindow.cpp:450
+#: effects/AutoDuck.cpp:793
+msgid "s"
+msgstr "s"
+
+#: FreqWindow.cpp:779
+#, c-format
+msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
+msgstr "Kazaljka: %d Hz (%s) = %d dB    Vrh: %d Hz (%s) = %.1f dB"
+
+#: FreqWindow.cpp:788
+#, c-format
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "Kazaljka: %.4f s (%d Hz) (%s) = %f,    Vrh: %.4f s (%d Hz) (%s) = %.3f"
+
+#: FreqWindow.cpp:1059
+msgid "spectrum.txt"
+msgstr "spectrum.txt"
+
+#: FreqWindow.cpp:1061
+msgid "Export Spectral Data As:"
+msgstr "Izvozi spektralne podatke kao:"
+
+#: FreqWindow.cpp:1077
+#: LabelDialog.cpp:599
+#: Menus.cpp:2177
+#: Project.cpp:2379
+#: Project.cpp:3333
+#: prefs/KeyConfigPrefs.cpp:180
+msgid "Couldn't write to file: "
+msgstr "Ne može se upisati u datoteku: "
+
+#: FreqWindow.cpp:1082
+msgid "Frequency (Hz)\tLevel (dB)"
+msgstr "Frekvencija (Hz)\tNivo (dB)"
+
+#: FreqWindow.cpp:1088
+msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
+msgstr "Zaostajanje (sekunde)\tFrekvencija (Hz)\tNivo"
+
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
+msgstr ""
+
+#: HelpText.cpp:60
+msgid "Welcome!"
+msgstr "Dobrodošli!"
+
+#: HelpText.cpp:65
+msgid "Playing Audio"
+msgstr "Emitovanje zvuka"
+
+#: HelpText.cpp:69
+msgid "Recording Audio"
+msgstr "Snimanje zvuka"
+
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
+msgstr ""
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+#, fuzzy
+msgid "Editing and greyed out Menus"
+msgstr "Zasjenčeni i meniji za uređivanje"
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr ""
+
+#: HelpText.cpp:85
+msgid "Burn to CD"
+msgstr "Zapeci na CD"
+
+#: HelpText.cpp:89
+msgid "No Local Help"
+msgstr "Nema lokalne pomoći"
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
+
+#: HistoryWindow.cpp:53
+msgid "Undo History"
+msgstr "Istorija za opoziv"
+
+#: HistoryWindow.cpp:72
+msgid "Manage History"
+msgstr "Upravljanje istorijom "
+
+#: HistoryWindow.cpp:78
+msgid "Action"
+msgstr "Akcija"
+
+#: HistoryWindow.cpp:86
+msgid "&Undo Levels Available"
+msgstr "&Broj nivoa za opoziv"
+
+#: HistoryWindow.cpp:92
+msgid "Levels To Discard"
+msgstr "Nivoi za odustajanje"
+
+#: HistoryWindow.cpp:102
+msgid "&Discard"
+msgstr "&Odustani"
+
+#: HistoryWindow.cpp:111
+#: Tags.cpp:2039
+#: Tags.cpp:2041
+#: Tags.cpp:2343
+#: Tags.cpp:2345
+#: effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191
+#: effects/vamp/VampEffect.cpp:414
+#: export/ExportCL.cpp:396
+msgid "&OK"
+msgstr "U &redu"
+
+#: Internat.cpp:176
+msgid "Unable to determine"
+msgstr "Nemoguće odrediti"
+
+#: Internat.cpp:180
+#: import/ImportRaw.cpp:392
+msgid "bytes"
+msgstr "bajta"
+
+#: Internat.cpp:182
+msgid "KB"
+msgstr "KB"
+
+#: Internat.cpp:185
+msgid "MB"
+msgstr "MB"
+
+#: Internat.cpp:188
+msgid "GB"
+msgstr "GB"
+
+#: LabelDialog.cpp:52
+msgid "Track"
+msgstr "Traka"
+
+#: LabelDialog.cpp:53
+#: Menus.cpp:4019
+#: Menus.cpp:4047
+msgid "Label"
+msgstr "Oznaka"
+
+#: LabelDialog.cpp:54
+msgid "Start Time"
+msgstr "Početno vrijeme"
+
+#: LabelDialog.cpp:55
+msgid "End Time"
+msgstr "Krajnje vrijeme"
+
+#: LabelDialog.cpp:98
+#: Menus.cpp:615
+msgid "&Edit Labels"
+msgstr "&Uredi oznake"
+
+#: LabelDialog.cpp:113
+msgid "Press F2 or double click to edit cell contents."
+msgstr "Pritisnite F2 ili dvokliknite za uređivanje sadržaja ćelija."
+
+#: LabelDialog.cpp:124
+msgid "Insert &After"
+msgstr "Ubaci Nak&on"
+
+#: LabelDialog.cpp:125
+msgid "Insert &Before"
+msgstr "Ubaci p&rije"
+
+#: LabelDialog.cpp:127
+#: Menus.cpp:192
+msgid "&Import..."
+msgstr "&Uvezi ..."
+
+#: LabelDialog.cpp:155
+msgid "New..."
+msgstr "Novi ..."
+
+#: LabelDialog.cpp:352
+msgid "You have left blank label names.  These will be\n"
+"skipped when repopulating the Label Tracks.\n"
+"\n"
+"Would you like to go back and provide names?"
+msgstr "Imate prazna imena oznaka.  One će biti\n"
+"preskoćene pri ponovnom punjenju traka s oznakama.\n"
+"\n"
+"Da li se želite vratiti i unijeti imena?"
+
+#: LabelDialog.cpp:353
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#: LabelDialog.cpp:514
+#: Menus.cpp:3517
+msgid "Select a text file containing labels..."
+msgstr "Izaberite datoteku s oznakama ..."
+
+#: LabelDialog.cpp:518
+#: Menus.cpp:3521
+msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
+msgstr "Datoteke s tekstom (*.txt)|*.txt|Sve datoteke (*.*)|*.*"
+
+#: LabelDialog.cpp:532
+#: Menus.cpp:3533
+#: Project.cpp:1800
+#: Project.cpp:1808
+#: import/ImportMIDI.cpp:31
+msgid "Could not open file: "
+msgstr "Greška pri otvaranju datoteke: "
+
+#: LabelDialog.cpp:558
+msgid "No labels to export."
+msgstr "Nema oznaka za izvoz."
+
+#: LabelDialog.cpp:564
+#: Menus.cpp:2142
+msgid "Export Labels As:"
+msgstr "Izvezi oznake kao:"
+
+#: LabelDialog.cpp:566
+#: Menus.cpp:2140
+msgid "labels.txt"
+msgstr "labels.txt"
+
+#: LabelDialog.cpp:699
+msgid "New Label Track"
+msgstr "Nova traka s oznakama"
+
+#: LabelDialog.cpp:700
+msgid "Enter track name"
+msgstr "Unesite ime trake"
+
+#: LabelDialog.cpp:701
+#: LabelDialog.h:52
+#: LabelTrack.cpp:88
+#: Menus.cpp:547
+msgid "&Label Track"
+msgstr "&Traka s oznakama"
+
+#: LangChoice.cpp:57
+msgid "Audacity First Run"
+msgstr "Prvo pokretanje programa Audacity"
+
+#: LangChoice.cpp:84
+msgid "Choose Language for Audacity to use:"
+msgstr "Izaberite jezik programa Audacity:"
+
+#: Legacy.cpp:356
+#, c-format
+msgid "Converted a 1.0 project file to the new format.\n"
+"The old file has been saved as '%s'"
+msgstr "Datoteka projekta 1.0 je sačuvana u novom formatu.\n"
+"Stara datoteka je sačuvana pod imenom '%s'"
+
+#: Legacy.cpp:357
+msgid "Opening Audacity Project"
+msgstr "Otvaranje projekta Audacity"
+
+#: Menus.cpp:162
+msgid "&File"
+msgstr "&Datoteka"
+
+#: Menus.cpp:164
+msgid "&New\tCtrl+N"
+msgstr "&Nova\tCtrl+N"
+
+#: Menus.cpp:166
+msgid "&Open...\tCtrl+O"
+msgstr "&Otvori ...\tCtrl+O"
+
+#: Menus.cpp:171
+msgid "&Close\tCtrl+W"
+msgstr "&Zatvori\tCtrl+W"
+
+#: Menus.cpp:174
+msgid "&Save Project\tCtrl+S"
+msgstr "&Sačuvaj projekt\tCtrl+S"
+
+#: Menus.cpp:178
+#: Project.cpp:2628
+msgid "Save Project &As..."
+msgstr "Sačuvaj projekt &kao ..."
+
+#: Menus.cpp:213
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
+#: Menus.cpp:181
+msgid "Chec&k Dependencies..."
+msgstr "Provjeri &ovisnosti ..."
+
+#: Menus.cpp:185
+msgid "Open Me&tadata Editor..."
+msgstr "Otvori uređivač me&tapodataka ..."
+
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Uvezi"
+
+#: Menus.cpp:194
+msgid "&Audio...\tCtrl+Shift+I"
+msgstr "&Zvuk ...\tCtrl+Shift+I"
+
+#: Menus.cpp:195
+msgid "&Labels..."
+msgstr "&Oznake ..."
+
+#: Menus.cpp:196
+msgid "&MIDI..."
+msgstr "&MIDI ..."
+
+#: Menus.cpp:197
+msgid "&Raw Data..."
+msgstr "&Sirovi podaci ..."
+
+#: Menus.cpp:208
+#: Menus.cpp:237
+msgid "Expo&rt Selection..."
+msgstr "Izvezi iz&bor ..."
+
+#: Menus.cpp:215
+msgid "Export &Labels..."
+msgstr "Izvezi oz&nake ..."
+
+#: Menus.cpp:216
+msgid "Export &Multiple..."
+msgstr "Izvezi &više datoteka ..."
+
+#: Menus.cpp:258
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:291
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
+#: Menus.cpp:246
+#: Menus.cpp:260
+msgid "Edit C&hains..."
+msgstr "Uredi &lance ..."
+
+#: Menus.cpp:293
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:294
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
+#: Menus.cpp:258
+msgid "Appl&y Chain..."
+msgstr "&Lančano primjeni ..."
+
+#: Menus.cpp:265
+msgid "&Upload File..."
+msgstr "Prenesi datoteku &na server ..."
+
+#: Menus.cpp:271
+msgid "Pa&ge Setup..."
+msgstr "&Priprema strane ..."
+
+#: Menus.cpp:272
+msgid "&Print..."
+msgstr "&Å tampaj ..."
+
+#: Menus.cpp:285
+msgid "E&xit\tCtrl+Q"
+msgstr "&Zatvori\tCtrl+Q"
+
+#: Menus.cpp:293
+#: toolbars/EditToolBar.cpp:76
+msgid "&Edit"
+msgstr "&Uredi"
+
+#: Menus.cpp:297
+msgid "&Undo\tCtrl+Z"
+msgstr "&Opozovi\tCtrl+Z"
+
+#: Menus.cpp:305
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:146
+msgid "&Redo"
+msgstr "&Ponovi"
+
+#: Menus.cpp:318
+msgid "Cu&t\tCtrl+X"
+msgstr "I&zreži\tCtrl+X"
+
+#: Menus.cpp:322
+msgid "Spl&it Cut\tCtrl+Alt+X"
+msgstr "&Razdvoji s rezom\tCtrl+Alt+X"
+
+#: Menus.cpp:323
+msgid "&Copy\tCtrl+C"
+msgstr "&Kopiraj\tCtrl+C"
+
+#: Menus.cpp:327
+msgid "&Paste\tCtrl+V"
+msgstr "&Umetni\tCtrl+V"
+
+#: Menus.cpp:331
+msgid "Tri&m\tCtrl+T"
+msgstr "Skrati\tCtrl+T"
+
+#: Menus.cpp:333
+msgid "&Delete\tCtrl+K"
+msgstr "&Obriši\tCtrl+K"
+
+#: Menus.cpp:334
+msgid "Split D&elete\tCtrl+Alt+K"
+msgstr "Razdvoji s &brisanjem\tCtrl+Alt+K"
+
+#: Menus.cpp:381
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
+
+#: Menus.cpp:337
+msgid "Sp&lit\tCtrl+I"
+msgstr "Raz&dvoji\tCtrl+I"
+
+#: Menus.cpp:342
+msgid "Split Ne&w\tCtrl+Alt+I"
+msgstr "Razdvoji u n&ovu\tCtrl+Alt+I"
+
+#: Menus.cpp:347
+msgid "&Join\tCtrl+J"
+msgstr "&Spoji\tCtrl+J"
+
+#: Menus.cpp:394
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
+
+#: Menus.cpp:350
+msgid "Duplic&ate\tCtrl+D"
+msgstr "U&dvostruči\tCtrl+D"
+
+#: Menus.cpp:401 Menus.cpp:641
+msgid "Stereo Trac&k to Mono"
+msgstr ""
+
+#: Menus.cpp:408
+msgid "La&beled Regions"
+msgstr ""
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:365
+msgid "&Cut\tAlt+X"
+msgstr "I&zreži\tAlt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:370
+msgid "&Split Cut\tShift+Alt+X"
+msgstr "&Razdvoji i izreži\tShift+Alt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:375
+msgid "Co&py\tShift+Alt+C"
+msgstr "Ko&piraj\tShift+Alt+C"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:381
+msgid "&Delete\tAlt+K"
+msgstr "&Izbriši\tAlt+D"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:386
+msgid "Sp&lit Delete\tShift+Alt+K"
+msgstr "Razdvo&ji s brisanjem\tShift+Alt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:391
+msgid "Sile&nce\tAlt+L"
+msgstr "Ti&Å¡ina\tALT+L"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:397
+msgid "Spli&t\tAlt+I"
+msgstr "&Razdijeli\tAlt+T"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:402
+msgid "&Join\tAlt+J"
+msgstr "S&poji\tAlt+J"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:452
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
+
+#: Menus.cpp:457
+msgid "&Select"
+msgstr ""
+
+#: Menus.cpp:414
+msgid "&All\tCtrl+A"
+msgstr "S&ve\tCtrl+A"
+
+#: Menus.cpp:415
+msgid "&None\tCtrl+Shift+A"
+msgstr "&Ništa\tCtrl+Shift+A"
+
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Left at Playback Position\t["
+msgstr "Lijevo od mjesta izvođenja\t["
+
+#: Menus.cpp:464
+#, fuzzy
+msgid "&Right at Playback Position\t]"
+msgstr "Desno od mjesta izvođenja\t]"
+
+#: Menus.cpp:468
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
+
+#: Menus.cpp:469
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
+
+#: Menus.cpp:431
+msgid "Find &Zero Crossings\tZ"
+msgstr "Nađi &nulte presjeke\tZ"
+
+#: Menus.cpp:478
+msgid "Mo&ve Cursor"
+msgstr ""
+
+#: Menus.cpp:480
+#, fuzzy
+msgid "to Selection Star&t"
+msgstr "na početak izbora"
+
+#: Menus.cpp:481
+#, fuzzy
+msgid "to Selection En&d"
+msgstr "na kraj izbora"
+
+#: Menus.cpp:485
+msgid "to Track &Start\tJ"
+msgstr ""
+
+#: Menus.cpp:486
+msgid "to Track &End\tK"
+msgstr ""
+
+#: Menus.cpp:493
+msgid "Re&gion Save"
+msgstr ""
+
+#: Menus.cpp:494
+msgid "Regio&n Restore"
+msgstr ""
+
+#: Menus.cpp:505
+msgid "Pla&y Region"
+msgstr ""
+
+#: Menus.cpp:506
+msgid "&Lock"
+msgstr ""
+
+#: Menus.cpp:507
+msgid "&Unlock"
+msgstr ""
+
+#: Menus.cpp:462
+msgid "Turn Snap-To On"
+msgstr "Uključi skoči-na"
+
+#: Menus.cpp:463
+msgid "Turn Snap-To Off"
+msgstr "Isključi skoči-na"
+
+#: Menus.cpp:464
+msgid "Turn Grid Snap On"
+msgstr "Uključi pozicioniranje preko mrežice"
+
+#: Menus.cpp:465
+msgid "Turn Grid Snap Off"
+msgstr "Isključi pozicioniranje preko mrežice"
+
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:521
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:525
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
+
+#: Menus.cpp:484
+msgid "&View"
+msgstr "&Pogled"
+
+#: Menus.cpp:486
+msgid "Zoom &In\tCtrl+1"
+msgstr "Pove&ćaj\tCtrl+1"
+
+#: Menus.cpp:489
+msgid "Zoom &Normal\tCtrl+2"
+msgstr "&Normalna veličina\tCtrl+2"
+
+#: Menus.cpp:490
+msgid "Zoom &Out\tCtrl+3"
+msgstr "U&manji\tCtrl+3"
+
+#: Menus.cpp:493
+msgid "&Fit in Window\tCtrl+F"
+msgstr "Na veličinu pr&ozora\tCtrl+G"
+
+#: Menus.cpp:494
+msgid "Fit &Vertically\tCtrl+Shift+F"
+msgstr "Prilagodi vertikal&no\tCtrl+Shift+F"
+
+#: Menus.cpp:495
+msgid "&Zoom to Selection\tCtrl+E"
+msgstr "&Povećaj do izbora\tCtrl+E"
+
+#: Menus.cpp:498
+msgid "&Collapse All Tracks\tCtrl+Shift+C"
+msgstr "&Sažmi sve trake\tCtrl+Shift+C"
+
+#: Menus.cpp:499
+msgid "E&xpand All Tracks\tCtrl+Shift+X"
+msgstr "&Raširi sve trake\tCtrl+Shift+X"
+
+#: Menus.cpp:553
+#, fuzzy
+msgid "&Show Clipping"
+msgstr "Pokaži rezanje"
+
+#: Menus.cpp:511
+msgid "&History..."
+msgstr "&Istorija ..."
+
+#: Menus.cpp:568
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Control Toolbar"
+msgstr "Kontrolna alatna traka"
+
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Device Toolbar"
+msgstr "Alatna traka uređaja"
+
+#: Menus.cpp:571
+#, fuzzy
+msgid "&Edit Toolbar"
+msgstr "Alatna traka za uređivanje"
+
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Meter Toolbar"
+msgstr "Alatna traka za mjerenje"
+
+#: Menus.cpp:573
+#, fuzzy
+msgid "Mi&xer Toolbar"
+msgstr "Alatna traka miksera"
+
+#: Menus.cpp:574
+#, fuzzy
+msgid "&Selection Toolbar"
+msgstr "Alatna traka za izbor"
+
+#: Menus.cpp:575
+#, fuzzy
+msgid "T&ools Toolbar"
+msgstr "Alatna traka s alatima"
+
+#: Menus.cpp:576
+#, fuzzy
+msgid "Transcri&ption Toolbar"
+msgstr "Alatna traka prepisa"
+
+#: Menus.cpp:578
+#, fuzzy
+msgid "&Reset Toolbars"
+msgstr "Obnovi alatne trake"
+
+#: Menus.cpp:580
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:589
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:595
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:786
+msgid "Skip to Start\tHome"
+msgstr "Skoči na početak\tHome"
+
+#: Menus.cpp:787
+msgid "Skip to End\tEnd"
+msgstr "Skoči na kraj\tEnd"
+
+#: Menus.cpp:602
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:606
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:611
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:616
+msgid "Sound Activation Level..."
+msgstr ""
+
+#: Menus.cpp:537
+msgid "&Tracks"
+msgstr "&Trake"
+
+#: Menus.cpp:631
+msgid "Add &New"
+msgstr ""
+
+#: Menus.cpp:545
+msgid "&Audio Track\tCtrl+Shift+N"
+msgstr "&Zvučna traka\tCtrl+Shift+N"
+
+#: Menus.cpp:546
+msgid "&Stereo Track"
+msgstr "&Stereo traka"
+
+#: Menus.cpp:548
+#: TimeTrack.cpp:44
+msgid "&Time Track"
+msgstr "&vremenska traka"
+
+#: Menus.cpp:645
+msgid "Mi&x and Render"
+msgstr ""
+
+#: Menus.cpp:564
+msgid "Mix and Render to New Track\tCtrl+Shift+M"
+msgstr "Miješanje i obrada u novu traku\tCtrl+Shift+M"
+
+#: Menus.cpp:568
+msgid "&Resample..."
+msgstr "&Ponovno uzimanje uzorka ..."
+
+#: Menus.cpp:578
+msgid "Remo&ve Tracks"
+msgstr "O&dstrani trake:"
+
+#: Menus.cpp:669
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:670
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
+#: Menus.cpp:585
+msgid "Align with &Zero"
+msgstr "&Poravnaj s nulom"
+
+#: Menus.cpp:586
+msgid "Align with &Cursor"
+msgstr "Poravnaj s &kazaljkom"
+
+#: Menus.cpp:587
+msgid "Align with Selection &Start"
+msgstr "Poravnaj s &početkom izbora"
+
+#: Menus.cpp:588
+msgid "Align with Selection &End"
+msgstr "Poravnaj s &krajem izbora"
+
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Cu&rsor"
+msgstr "Poravnaj kraj s kazaljkom"
+
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align End with Selection Star&t"
+msgstr "Poravnaj kraj s početkom izbora"
+
+#: Menus.cpp:680
+#, fuzzy
+msgid "Align End with Selection En&d"
+msgstr "Poravnaj kraj s krajem izbora"
+
+#: Menus.cpp:681
+#, fuzzy
+msgid "Align Tracks To&gether"
+msgstr "Poravnaj trake zajedno"
+
+#: Menus.cpp:683
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:692
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:699
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:708
+msgid "Link Audio and Label Tracks"
+msgstr ""
+
+#: Menus.cpp:611
+msgid "Add &Label At Selection\tCtrl+B"
+msgstr "Dodaj oz&naku izboru\tCtrl+B"
+
+#: Menus.cpp:612
+msgid "Add Label At &Playback Position\tCtrl+M"
+msgstr "Dodaj oznaku na mjestu &emitovanja\tCtrl+M"
+
+#: Menus.cpp:718
+msgid "S&ort tracks"
+msgstr ""
+
+#: Menus.cpp:719
+msgid "by &Start time"
+msgstr ""
+
+#: Menus.cpp:721
+msgid "by &Name"
+msgstr ""
+
+#: Menus.cpp:631
+msgid "&Generate"
+msgstr "&Generisanje"
+
+#: Menus.cpp:778 Menus.cpp:862 Menus.cpp:924
+msgid "Unsorted"
+msgstr ""
+
+#: Menus.cpp:654
+msgid "Effe&ct"
+msgstr "Efe&kt"
+
+#: Menus.cpp:658
+msgid "Repeat Last Effect\tCtrl+R"
+msgstr "Ponovi zadnji efekt\tCtrl+R"
+
+#: Menus.cpp:690
+msgid "&Analyze"
+msgstr "&Analiziraj"
+
+#: Menus.cpp:692
+msgid "Plot Spectrum..."
+msgstr "Crtaj spektar ..."
+
+#: Menus.cpp:725
+#: Menus.cpp:728
+msgid "&Help"
+msgstr "&Pomoć"
+
+#: Menus.cpp:731
+msgid "&About Audacity CleanSpeech..."
+msgstr "&O Audacity CleanSpeech ..."
+
+#: Menus.cpp:735
+msgid "&Show Welcome Message..."
+msgstr "&Prikaži poruku dobrodošlice ..."
+
+#: Menus.cpp:736
+msgid "&Index..."
+msgstr "&Indeks ..."
+
+#: Menus.cpp:961
+msgid "Show &Log..."
+msgstr ""
+
+#: Menus.cpp:744
+msgid "&Screenshot Tools..."
+msgstr "&Slika ekrana ..."
+
+#: Menus.cpp:747
+msgid "&Run Benchmark..."
+msgstr "&Pokreni test brzine ..."
+
+#: Menus.cpp:749
+msgid "&Audio Device Info..."
+msgstr "Podaci o zvu&čnom uređaju ..."
+
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
+
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
+
+#: Menus.cpp:762
+msgid "Selection Tool\tF1"
+msgstr "Alat za izbor\tF1"
+
+#: Menus.cpp:763
+msgid "Envelope Tool\tF2"
+msgstr "Alat za ovojnicu\tF2"
+
+#: Menus.cpp:764
+msgid "Draw Tool\tF3"
+msgstr "Alat za crtanje\tF3"
+
+#: Menus.cpp:765
+msgid "Zoom Tool\tF4"
+msgstr "Alat za povećanje\tF4"
+
+#: Menus.cpp:766
+msgid "Time Shift Tool\tF5"
+msgstr "Alat za vremenski pomak\tF5"
+
+#: Menus.cpp:767
+msgid "Multi Tool\tF6"
+msgstr "Višenamjenski alat\tF6"
+
+#: Menus.cpp:769
+msgid "Next Tool\tD"
+msgstr "Naredni alat\tD"
+
+#: Menus.cpp:770
+msgid "Previous Tool\tA"
+msgstr "Predhodni alat\tA"
+
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:773
+msgid "Stop\tS"
+msgstr "Zaustavi\tS"
+
+#: Menus.cpp:774
+msgid "Pause\tP"
+msgstr "Pauza\tP"
+
+#: Menus.cpp:775
+msgid "Record\tR"
+msgstr "Snimi\tR"
+
+#: Menus.cpp:1001
+msgid "Record Append\tShift+R"
+msgstr ""
+
+#: Menus.cpp:1003
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr ""
+
+#: Menus.cpp:780
+msgid "Play One Second\t1"
+msgstr "Izvedi jednu sekundu\t1"
+
+#: Menus.cpp:781
+msgid "Play To Selection\tB"
+msgstr "Izvedi do izbora\tB"
+
+#: Menus.cpp:782
+msgid "Play Looped\tL"
+msgstr "Izvodi kružno\tZ"
+
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:784
+msgid "Play Cut Preview\tC"
+msgstr "Izvodi predslušanje reza\tC"
+
+#: Menus.cpp:789
+msgid "Selection to Start\tShift+Home"
+msgstr "Izbor do početka\tShift+Home"
+
+#: Menus.cpp:790
+msgid "Selection to End\tShift+End"
+msgstr "Izbor do kraja\tShift+End"
+
+#: Menus.cpp:792
+msgid "DeleteKey\tBackspace"
+msgstr "DeleteKey\tBackspace"
+
+#: Menus.cpp:797
+msgid "DeleteKey2\tDelete"
+msgstr "DeleteKey2\tDelete"
+
+#: Menus.cpp:803
+msgid "Seek left short period during playback\tLeft"
+msgstr "Potraži lijevo kratak period pri izvođenju\tLeft"
+
+#: Menus.cpp:804
+msgid "Seek right short period during playback\tRight"
+msgstr "Potraži desno kratak period pri izvođenju\tRight"
+
+#: Menus.cpp:805
+msgid "Seek left long period during playback\tShift+Left"
+msgstr "Potraži lijevo dugi period pri izvođenju\tShift+Left"
+
+#: Menus.cpp:806
+msgid "Seek right long period during playback\tShift+Right"
+msgstr "Potraži desno dugi period pri izvođenju\tShift+Right"
+
+#: Menus.cpp:810
+msgid "Move Focus to Previous Track\tUp"
+msgstr "Pomjeri fokus na prehodnu traku\tUp"
+
+#: Menus.cpp:811
+msgid "Move Focus to Previous and Change Selection\tShift+Up"
+msgstr "Pomjeri fokus na prehodnu traku i promjeni izbor\tShift+Up"
+
+#: Menus.cpp:812
+msgid "Move Focus to Next Track\tDown"
+msgstr "Pomjeri fokus na narednu traku\tDown"
+
+#: Menus.cpp:813
+msgid "Move Focus to Next and Change Selection\tShift+Down"
+msgstr "Pomjeri fokus na prehodnu traku i promjeni izbor\tShift+Down"
+
+#: Menus.cpp:814
+msgid "Toggle Focused Track\tReturn"
+msgstr "Uključi/isključi fokusiranu traku\tReturn"
+
+#: Menus.cpp:815
+msgid "Toggle Focused Track\tNUMPAD_ENTER"
+msgstr "Uključi/isključi fokusiranu traku\tNUMPAD_ENTER"
+
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
+
+#: Menus.cpp:818
+msgid "Cursor Left\tLeft"
+msgstr "Kazaljka lijevo\tLeft"
+
+#: Menus.cpp:819
+msgid "Cursor Right\tRight"
+msgstr "Kazaljka desno\tRight"
+
+#: Menus.cpp:820
+msgid "Cursor Short Jump Left\t,"
+msgstr "Kratak skok kazaljke lijevo\t,"
+
+#: Menus.cpp:821
+msgid "Cursor Short Jump Right\t."
+msgstr "Kratak skok kazaljke desno\t."
+
+#: Menus.cpp:822
+msgid "Cursor Long Jump Left\tShift+,"
+msgstr "Dugi skok kazaljke lijevo\tShift+,"
+
+#: Menus.cpp:823
+msgid "Cursor Long Jump Right\tShift+."
+msgstr "Dugi skok kazaljke desno\tShift+."
+
+#: Menus.cpp:825
+msgid "Selection Extend Left\tShift+Left"
+msgstr "Proširi izbor na lijevo\tShift+Left"
+
+#: Menus.cpp:826
+msgid "Selection Extend Right\tShift+Right"
+msgstr "Proširi izbor na desno\tShift+Right"
+
+#: Menus.cpp:828
+msgid "Set (or Extend) Left Selection"
+msgstr "Postavi (ili proširi) lijevu granicu izbora"
+
+#: Menus.cpp:829
+msgid "Set (or Extend) Right Selection"
+msgstr "Postavi (ili proširi) desnu granicu izbora"
+
+#: Menus.cpp:831
+msgid "Selection Contract Left\tCtrl+Shift+Right"
+msgstr "Skupi izbor s lijeva\tCtrl+Shift+Right"
+
+#: Menus.cpp:832
+msgid "Selection Contract Right\tCtrl+Shift+Left"
+msgstr "Skupi izbor s desna\tCtrl+Shift+Left"
+
+#: Menus.cpp:834
+msgid "Change pan on focused track\tShift+P"
+msgstr "Promijeni pomak na fokusiranoj traci\tShift+P"
+
+#: Menus.cpp:835
+msgid "Pan left on focused track\tAlt+Shift+Left"
+msgstr "Pomakni lijevo na fokusiranoj traci\tAlt+Shift+Left"
+
+#: Menus.cpp:836
+msgid "Pan right on focused track\tAlt+Shift+Right"
+msgstr "Pomakni desno na fokusiranoj traci\tAlt+Shift+Right"
+
+#: Menus.cpp:837
+msgid "Change gain on focused track\tShift+G"
+msgstr "Promijeni pojačanje na fokusiranoj traci\tShift+G"
+
+#: Menus.cpp:838
+msgid "Increase gain on focused track\tAlt+Shift+Up"
+msgstr "Povećaj  pojačanje na fokusiranoj traci\tAlt+Shift+Up"
+
+#: Menus.cpp:839
+msgid "Decrease gain on focused track\tAlt+Shift+Down"
+msgstr "Smanji pojačanje na fokusiranoj traci\tAlt+Shift+Down"
+
+#: Menus.cpp:840
+msgid "Open menu on focused track\tShift+M"
+msgstr "Otvori meni na fokusiranoj traci\tShift+M"
+
+#: Menus.cpp:841
+msgid "Mute/Unmute focused track\tShift+U"
+msgstr "Utišaj/odvrni fokusiranu traku\tShift+U"
+
+#: Menus.cpp:842
+msgid "Solo/Unsolo focused track\tShift+S"
+msgstr "Solo/poništi solo na fokusiranoj traci\tShift+S"
+
+#: Menus.cpp:843
+msgid "Close focused track\tShift+C"
+msgstr "Zatvori fokusiranu traku\tShift+C"
+
+#: Menus.cpp:845
+msgid "Snap To On"
+msgstr "Uključi Skoči-na"
+
+#: Menus.cpp:846
+msgid "Snap To Off"
+msgstr "Isključi Skoči-na"
+
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
+#. i18n-hint: This is the name of the menu item on Mac OS X only
+#: Menus.cpp:860
+msgid "Open Recent"
+msgstr "Otvori nedavne"
+
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1158
+msgid "Recent &Files"
+msgstr ""
+
+#: Menus.cpp:910
+#, c-format
+msgid "&Undo %s"
+msgstr "Poništi %s"
+
+#: Menus.cpp:936
+msgid "Can't Undo"
+msgstr "Nije moguće poništiti"
+
+#: Menus.cpp:945
+#, c-format
+msgid "&Redo %s"
+msgstr "P&onovi %s"
+
+#: Menus.cpp:951
+msgid "Can't Redo"
+msgstr "Nije moguće ponoviti"
+
+#: Menus.cpp:1498
+msgid "Sort By Time"
+msgstr "Razvrstaj po vremenu"
+
+#: Menus.cpp:1498
+msgid "Tracks sorted by time"
+msgstr "Trake, razvrstane po vremenu"
+
+#: Menus.cpp:1524
+msgid "Sort By Name"
+msgstr "Razvrstaj po imenu"
+
+#: Menus.cpp:1524
+msgid "Tracks sorted by name"
+msgstr "Trake, razvrstane po imenu"
+
+#: Menus.cpp:1675
+msgid "Set Left Selection Bound"
+msgstr "Postavi lijevu granicu izbora"
+
+#: Menus.cpp:1709
+msgid "Set Right Selection Bound"
+msgstr "Postavi desnu granicu izbora"
+
+#: Menus.cpp:1976
+msgid "You must select a track first."
+msgstr "Molimo, da prvo izaberete traku."
+
+#: Menus.cpp:2005
+#, c-format
+msgid "Repeat %s\tCtrl+R"
+msgstr "Ponovi %s\tCtrl+R"
+
+#: Menus.cpp:2136
+msgid "There are no label tracks to export."
+msgstr "Nema traka s oznakama za izvoz."
+
+#: Menus.cpp:2619
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2623
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2655
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2656
+msgid "Export MIDI"
+msgstr ""
+
+#: Menus.cpp:2241
+msgid "Nothing to undo"
+msgstr "Nema ništa da se poništi"
+
+#: Menus.cpp:2261
+msgid "Nothing to redo"
+msgstr "Nema ništa da se ponovi"
+
+#: Menus.cpp:2336
+#: TrackPanel.cpp:546
+#: toolbars/EditToolBar.cpp:133
+msgid "Cut"
+msgstr "Izreži"
+
+#: Menus.cpp:2336
+msgid "Cut to the clipboard"
+msgstr "Izreži u odlagalište"
+
+#: Menus.cpp:2374
+msgid "Split Cut"
+msgstr "Razdvoji i izreži"
+
+#: Menus.cpp:2374
+msgid "Split-cut to the clipboard"
+msgstr "Razdvoji i izreži u klipord"
+
+#: Menus.cpp:2439
+#: Menus.cpp:2510
+#: Menus.cpp:2604
+#: TrackPanel.cpp:548
+#: toolbars/EditToolBar.cpp:137
+msgid "Paste"
+msgstr "Umetni"
+
+#: Menus.cpp:2439
+msgid "Pasted text from the clipboard"
+msgstr "Umetnuti tekst iz odlagališta"
+
+#: Menus.cpp:2510
+#: Menus.cpp:2604
+msgid "Pasted from the clipboard"
+msgstr "Umetnuto iz odlagališta"
+
+#: Menus.cpp:3094
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
+#: Menus.cpp:2544
+msgid "Copying stereo audio into a mono track is not allowed."
+msgstr "Kopiranje stereo zvuka u mono traku nije dozvoljeno."
+
+#: Menus.cpp:2640
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim"
+msgstr "Odsjeci"
+
+#: Menus.cpp:2640
+msgid "Trim file to selection"
+msgstr "Odsjeci datoteku na izbor"
+
+#: Menus.cpp:2669
+#, c-format
+msgid "Split-deleted %.2f seconds at t=%.2f"
+msgstr "Razdvojeno s brisanjem %.2f sekundi pri t=%.2f"
+
+#: Menus.cpp:2672
+msgid "Split Delete"
+msgstr "Razdvoji s brisanjem"
+
+#: Menus.cpp:2693
+#, c-format
+msgid "Disjoined %.2f seconds at t=%.2f"
+msgstr "Odvojeno %.2f sekundi pri t=%.2f"
+
+#: Menus.cpp:2696
+msgid "Disjoin"
+msgstr "Odvoji"
+
+#: Menus.cpp:2717
+#, c-format
+msgid "Joined %.2f seconds at t=%.2f"
+msgstr "Spojeno %.2f sekundi pri t=%.2f"
+
+#: Menus.cpp:2720
+msgid "Join"
+msgstr "Spoji"
+
+#: Menus.cpp:2739
+#, c-format
+msgid "Silenced selected tracks for %.2f seconds at %.2f"
+msgstr "Utišane izbrane trake za %.2f sekundu pri %.2f"
+
+#: Menus.cpp:2741
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence"
+msgstr "Tišina"
+
+#: Menus.cpp:2775
+msgid "Duplicate"
+msgstr "Udvostruči"
+
+#: Menus.cpp:2775
+msgid "Duplicated"
+msgstr "Udvostručeno"
+
+#: Menus.cpp:2794
+msgid "Cut Labels"
+msgstr "Izreži označeno"
+
+#: Menus.cpp:2794
+msgid "Cut labeled regions to the clipboard"
+msgstr "Izreži oznažena pudručja u odlagalište"
+
+#: Menus.cpp:2808
+msgid "SplitCut labeled regions to the clipboard"
+msgstr "Razvoji s izrezivanjem označena područja u odlagalište"
+
+#: Menus.cpp:2809
+msgid "Split Cut Labels"
+msgstr "Razdvoji s izrezom oznake"
+
+#: Menus.cpp:2823
+msgid "Copied labeled regions to the clipboard"
+msgstr "Kopirana označena područja u odlagalište"
+
+#: Menus.cpp:2823
+msgid "Copy Labels"
+msgstr "Kopiraj oznake"
+
+#: Menus.cpp:2835
+msgid "Delete Labels"
+msgstr "Izbriši oznake"
+
+#: Menus.cpp:2835
+msgid "Deleted labeled regions"
+msgstr "Izbrisana označena područja"
+
+#: Menus.cpp:2847
+msgid "Split Delete Labels"
+msgstr "Razdvoji s brisanjem označeno"
+
+#: Menus.cpp:2847
+msgid "Split Deleted labeled regions"
+msgstr "Razdvoji s brisanjem označena područja"
+
+#: Menus.cpp:2859
+msgid "Silence Labels"
+msgstr "Oznake utišanoga"
+
+#: Menus.cpp:2859
+msgid "Silenced labeled regions"
+msgstr "Označena područja utišanja"
+
+#: Menus.cpp:2871
+msgid "Split Labels"
+msgstr "Oznake razdvajanja"
+
+#: Menus.cpp:2871
+msgid "Split labeled regions"
+msgstr "Razdvoji označena područja"
+
+#: Menus.cpp:2883
+msgid "Join Labels"
+msgstr "Oznake spajanja"
+
+#: Menus.cpp:2883
+msgid "Joined labeled regions"
+msgstr "Spoji označena područja"
+
+#: Menus.cpp:2895
+msgid "Disjoin Labels"
+msgstr "Oznake odvajanja"
+
+#: Menus.cpp:2895
+msgid "Disjoined labeled regions"
+msgstr "Odvojena označena područja"
+
+#: Menus.cpp:2917
+#: TrackPanel.cpp:5861
+msgid "Split"
+msgstr "Razdvoji"
+
+#: Menus.cpp:3011
+msgid "Split New"
+msgstr "Razdvoji u novu"
+
+#: Menus.cpp:3011
+msgid "Split to new track"
+msgstr "Razdvoji u novu traku"
+
+#: Menus.cpp:3094
+msgid "Split at labels"
+msgstr "Razdvoji po oznakama"
+
+#: Menus.cpp:3394
+msgid "To plot the spectrum, all selected tracks must be the same sample rate."
+msgstr "Za crtanje spektra sve izabrane trake moraju imati jednak stepen uzorkovanja."
+
+#: Menus.cpp:3420
+#, c-format
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "Izbrano je previše zvuka. Samo prvih %.1f sekundi zvuka će biti analizirano."
+
+#: Menus.cpp:3546
+#, c-format
+msgid "Imported labels from '%s'"
+msgstr "Uvezene oznake iz '%s'"
+
+#: Menus.cpp:3547
+msgid "Import Labels"
+msgstr "Uvezi oznaku"
+
+#: Menus.cpp:3557
+msgid "Select a MIDI file..."
+msgstr "Izaberite datoteku MIDI ..."
+
+#: Menus.cpp:4196
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
+
+#: Menus.cpp:3577
+#, c-format
+msgid "Imported MIDI from '%s'"
+msgstr "Uvezen MIDI iz '%s'"
+
+#: Menus.cpp:3579
+msgid "Import MIDI"
+msgstr "Uvezi MIDI"
+
+#: Menus.cpp:3592
+msgid "Select any uncompressed audio file..."
+msgstr "Izaberite bilo koju nekompresovanu zvučnu datoteku ..."
+
+#: Menus.cpp:3596
+msgid "All files (*)|*"
+msgstr "Sve datoteke (*)|*"
+
+#: Menus.cpp:3630
+msgid "Edit the metadata tags"
+msgstr "Uredi oznake metapodataka"
+
+#: Menus.cpp:3631
+msgid "Edit Metadata"
+msgstr "Uredi metapodatke"
+
+#: Menus.cpp:3631
+msgid "Edit Metadata tags"
+msgstr "Uredi oznake metapodataka"
+
+#: Menus.cpp:4312
+#, c-format
+#, fuzzy
+msgid "Rendered all audio in track '%s'"
+msgstr "Sav zvuk je obrađen u traci '%s'"
+
+#: Menus.cpp:3688
+msgid "Render"
+msgstr "Obradi"
+
+#: Menus.cpp:3693
+#, c-format
+msgid "Mixed and rendered %d tracks into one new stereo track"
+msgstr "Miksovano i obrađeno %d traka u novu stereo traku"
+
+#: Menus.cpp:3696
+#, c-format
+msgid "Mixed and rendered %d tracks into one new mono track"
+msgstr "Miksovano i obrađeno %d traka u novu mono traku"
+
+#: Menus.cpp:560
+#: Menus.cpp:3698
+#: Mix.cpp:120
+msgid "&Mix and Render"
+msgstr "&Miješanje i obrada"
+
+#: Menus.cpp:3828
+msgid "Aligned with zero"
+msgstr "Poravnato s nulom"
+
+#: Menus.cpp:3832
+msgid "Aligned cursor"
+msgstr "Poravnato s kazaljkom"
+
+#: Menus.cpp:3836
+msgid "Aligned with selection start"
+msgstr "Poravnato s početkom izbora"
+
+#: Menus.cpp:3840
+msgid "Aligned with selection end"
+msgstr "Poravnato s krajem izbora"
+
+#: Menus.cpp:3844
+msgid "Aligned end with cursor"
+msgstr "Poravnat kraj s kazaljkom"
+
+#: Menus.cpp:3848
+msgid "Aligned end with selection start"
+msgstr "Poravnat kraj s početkom izbora"
+
+#: Menus.cpp:3852
+msgid "Aligned end with selection end"
+msgstr "Poravnat kraj s krajem izbora"
+
+#: Menus.cpp:3856
+msgid "Aligned"
+msgstr "Poravnato"
+
+#: Menus.cpp:3889
+msgid "Align"
+msgstr "Poravnaj"
+
+#: Menus.cpp:4599
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4603
+msgid "Alignment completed."
+msgstr ""
+
+#: Menus.cpp:3912
+msgid "Created new audio track"
+msgstr "Stvorena nova zvučna traka"
+
+#: Menus.cpp:3912
+#: Menus.cpp:3935
+#: Menus.cpp:3950
+#: Menus.cpp:3970
+msgid "New Track"
+msgstr "Nova traka"
+
+#: Menus.cpp:3935
+msgid "Created new stereo audio track"
+msgstr "Stvorena nova stereo zvučna traka"
+
+#: Menus.cpp:3950
+msgid "Created new label track"
+msgstr "Stvorena nova datoteka s oznakama"
+
+#: Menus.cpp:3959
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "Verzija programa Audacity, koju koristite, ne podržava više vremenskih traka."
+
+#: Menus.cpp:3970
+msgid "Created new time track"
+msgstr "Stvorena nova vremenska traka"
+
+#: Menus.cpp:4019
+msgid "Added label"
+msgstr "Dodana oznaka"
+
+#: Menus.cpp:4047
+msgid "Edited labels"
+msgstr "Uređene oznake"
+
+#: Menus.cpp:4074
+msgid "Save CleanSpeech Preset File As:"
+msgstr "Spremi datoteku postavki CleanSpeech kao:"
+
+#: Menus.cpp:4078
+msgid "CleanSpeech Presets (*.csp)|*.csp"
+msgstr "Postavke CleanSpeech (*.csp)|*.csp"
+
+#: Menus.cpp:4085
+#: export/Export.cpp:509
+msgid "Sorry, pathnames longer than 256 characters not supported."
+msgstr "Oprostite, imena staza do datoteka ne smiju preći 256 znakova."
+
+#: Menus.cpp:4131
+msgid "Problem encountered exporting presets."
+msgstr "Nastopio je problem pri izvozu postavki."
+
+#: Menus.cpp:4132
+#: export/Export.cpp:402
+msgid "Unable to export"
+msgstr "Nije moguće izvoziti"
+
+#: Menus.cpp:4316
+msgid "Remove Track"
+msgstr "Odstrani traku"
+
+#: Menus.cpp:4316
+msgid "Removed audio track(s)"
+msgstr "Odstrani zvučne trake"
+
+#: Menus.cpp:4437
+#: Menus.cpp:4456
+#: export/ExportMP3.cpp:1871
+msgid "Resample"
+msgstr "Ponovo uzmi uzorke"
+
+#: Menus.cpp:5208 TrackPanel.cpp:6400
+msgid "New sample rate (Hz):"
+msgstr ""
+
+#: Menus.cpp:4443
+msgid "The entered value is invalid"
+msgstr "Unesena vrijednost nije ispravna"
+
+#: Menus.cpp:4454
+#, c-format
+msgid "Resampling track %d"
+msgstr "Ponovno uzimanje uzoraka trake %d"
+
+#: Menus.cpp:4465
+msgid "Resample Track"
+msgstr "Ponovno uzmi uzorke trake"
+
+#: Menus.cpp:4465
+msgid "Resampled audio track(s)"
+msgstr "Trake s ponovljenim uzorcima"
+
+#: Mix.cpp:94
+#: Mix.cpp:101
+msgid "Mix"
+msgstr "Miješanje"
+
+#: Mix.cpp:121
+msgid "Mixing and rendering tracks"
+msgstr "Miješanje i obrada traka"
+
+#: NoteTrack.cpp:36
+msgid "Note Track"
+msgstr "Notiraj traku"
+
+#: Printing.cpp:187
+msgid "There was a problem printing."
+msgstr "Pri štampanju je došlo do problema."
+
+#: Printing.cpp:188
+msgid "Print"
+msgstr "Å tampaj"
+
+#: Project.cpp:635
+msgid "Main Mix"
+msgstr "Glavni miješani zvuk"
+
+#: Project.cpp:760
+#, c-format
+msgid "Welcome to Audacity version %s"
+msgstr "Dobrodošli u Audacity verzije %s"
+
+#: Project.cpp:912
+msgid "(Recovered)"
+msgstr "(obnovljeno)"
+
+#: Project.cpp:1472
+#: TrackPanel.cpp:772
+#: toolbars/ControlToolBar.cpp:191
+msgid "Record"
+msgstr "Snimi"
+
+#: Project.cpp:1472
+#: TrackPanel.cpp:772
+msgid "Recorded Audio"
+msgstr "Snimljeni zvuk"
+
+#: Project.cpp:1490
+msgid "Save changes before closing?"
+msgstr "Želite li spremiti promjene prije izlaza?"
+
+#: Project.cpp:1604
+msgid "\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr ""
+
+#: Project.cpp:1496
+msgid "Save changes?"
+msgstr "Želite li spremiti promjene?"
+
+#: Project.cpp:1684
+msgid "All files|*.*|All supported files|"
+msgstr "Sve datoteke|*.*|Sve podržane datoteke|"
+
+#: Project.cpp:1709
+msgid "Select one or more audio files..."
+msgstr "Izaberite jednu ili više zvučnih datoteka ..."
+
+#: Project.cpp:1736
+msgid "Audacity projects|*.aup|"
+msgstr "Projekti Audacity|*.aup"
+
+#: Project.cpp:1928 Project.cpp:2350
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1929
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2143
+msgid "Opening old project file"
+msgstr "Otvaranje stare projektne datoteke"
+
+#: Project.cpp:1801
+#: Project.cpp:1809
+msgid "Error opening file"
+msgstr "Greška pri otvaranju datoteke."
+
+#: Project.cpp:1815
+#, c-format
+msgid "File may be invalid or corrupted: \n"
+"%s"
+msgstr "Datoteka je možda neispravna ili oštećena: \n"
+"%s"
+
+#: Project.cpp:1816
+msgid "Error opening file or project"
+msgstr "Greška pri otvaranju datoteke ili projekta"
+
+#: Project.cpp:1833
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity nije uspio pretvoriti projekt Audacity 1.0 u novi zapis projekta."
+
+#: Project.cpp:1936
+msgid "Could not remove old auto save file"
+msgstr "Stare datoteke automatskog spremanja nije mogoće odstraniti"
+
+#: Project.cpp:1938
+msgid "Project was recovered"
+msgstr "Projekt je bio obnovljen"
+
+#: Project.cpp:1938
+msgid "Recover"
+msgstr "Obnovi"
+
+#: Project.cpp:1967
+msgid "Project checker repaired file"
+msgstr "Kontrolor projekta je popravio datoteku"
+
+#: Project.cpp:1967
+#: effects/Repair.h:29
+msgid "Repair"
+msgstr "Popravi"
+
+#: Project.cpp:2078
+#, c-format
+msgid "Couldn't find the project data folder: \"%s\""
+msgstr "Datoteke s podacima projekta nije moguće naći: \"%s\""
+
+#: Project.cpp:2116
+#, c-format
+msgid "This file was saved using Audacity %s.\n"
+"You are using Audacity %s - you need to upgrade to\n"
+"a newer version to open this file."
+msgstr "Tu datoteku ste sremili koristeći Audacity %s.\n"
+"Upotrebljavate Audacity %s - da bi mogli otvoriti tu datoteku,\n"
+"morate nadograditi program na noviju verziju."
+
+#: Project.cpp:2120
+msgid "Can't open project file"
+msgstr "Nije moguće otvoriti datoteke projekta"
+
+#: Project.cpp:2357
+#, c-format
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2647
+#, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
+
+#: Project.cpp:2366
+#: Project.cpp:2380
+msgid "Error saving project"
+msgstr "Greška pri spremanju projekta"
+
+#: Project.cpp:2442
+#, c-format
+msgid "Saved %s"
+msgstr "Snimljeno %s"
+
+#: Project.cpp:2524
+#, c-format
+msgid "Imported '%s'"
+msgstr "Uvezeno '%s'"
+
+#: Menus.cpp:3611
+#: Project.cpp:2525
+#: Project.cpp:2550
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Uvezi"
+
+#: Project.cpp:2577
+#: Project.cpp:2585
+msgid "Error importing"
+msgstr "Greška pri uvozu"
+
+#: Project.cpp:2619
+msgid "Save Speech As:"
+msgstr "Spremi govor kao:"
+
+#: Project.cpp:2621
+msgid "Windows PCM Audio file (*.wav)|*.wav"
+msgstr "Zvučna datoteka Windows PCM (*.wav)|*.wav"
+
+#: Project.cpp:2938
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
+"\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
+"Export commands."
+msgstr ""
+
+#: Project.cpp:2941
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
+#: Project.cpp:2630
+msgid "Audacity projects (*.aup)|*.aup"
+msgstr "Projekti Audacity (*.aup)|*.aup"
+
+#: Project.cpp:2674
+msgid "Created new project"
+msgstr "Kreiran nov projekt"
+
+#: Project.cpp:2794
+#, c-format
+msgid "Deleted %.2f seconds at t=%.2f"
+msgstr "Izbrisanih %.2f sekundi u t=%.2f"
+
+#: Project.cpp:2797
+#: effects/Equalization.cpp:1256
+#: effects/Equalization.cpp:2511
+msgid "Delete"
+msgstr "Izbriši"
+
+#: Project.cpp:2990
+#, c-format
+msgid "Disk space remains for recording %d hours and %d minutes."
+msgstr "Preostali prostor na disku dovoljan je za snimanje %d sati i %d minuta."
+
+#: Project.cpp:2993
+#, c-format
+msgid "Disk space remains for recording 1 hour and %d minutes."
+msgstr "Preostali prostor na disku dovoljan je za snimanje 1 sat i %d minut."
+
+#: Project.cpp:2996
+#, c-format
+msgid "Disk space remains for recording %d minutes."
+msgstr "Preostali prostor na disku dovoljan je za snimanje %d minuta."
+
+#: Project.cpp:2999
+#, c-format
+msgid "Disk space remains for recording %d seconds."
+msgstr "Preostali prostor na disku dovoljan je za snimanje %d sekundi."
+
+#: Project.cpp:3002
+msgid "Out of disk space"
+msgstr "Prostora na disku je premalo"
+
+#: Project.cpp:3380
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3383
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3280
+msgid "Could not remove old autosave file: "
+msgstr "Stare datoteke automatskog spremanja nije moguće odstraniti: "
+
+#: Project.cpp:3321
+msgid "New Project"
+msgstr "Novi projekt"
+
+#: Project.cpp:3334
+msgid "Error writing autosave file"
+msgstr "Greška pri upisivanju automatski spremljene datoteke"
+
+#: Project.cpp:3359
+msgid "Could not create autosave file: "
+msgstr "Datoteke automatskog spremanja nije moguće kreirati: "
+
+#: Project.cpp:3385
+#, c-format
+msgid "Actual Rate: %d"
+msgstr "Stvarna frekvencija: %d"
+
+#: Resample.cpp:42
+msgid "Libresample by Dominic Mazzoni and Julius Smith"
+msgstr "Libresample, Dominic Mazzoni i Julius Smith"
+
+#: Resample.cpp:53
+msgid "High-quality Sinc Interpolation"
+msgstr "Visokokvalitetna sinhrona interpolacija:"
+
+#: Resample.cpp:55
+msgid "Fast Sinc Interpolation"
+msgstr "Brza sinhrona interpolacija"
+
+#: Resample.cpp:125
+msgid "Libsamplerate by Erik de Castro Lopo"
+msgstr "Libsamplerate, Erik de Castro Lopo"
+
+#: Resample.cpp:218
+#, c-format
+msgid "Libsamplerate error: %d\n"
+msgstr "Greška Libsamplerate: %d\n"
+
+#: Resample.cpp:240
+#: Resample.cpp:250
+msgid "Resampling disabled."
+msgstr "Ponovno uzimanje uzoraka onemogućeno."
+
+#. i18n-hint: Audio data bit depth (precison): 16-bit integers
+#: SampleFormat.cpp:66
+msgid "16-bit PCM"
+msgstr "16-bitni PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 24-bit integers
+#: SampleFormat.cpp:69
+msgid "24-bit PCM"
+msgstr "24-bitni PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 32-bit floating point
+#: SampleFormat.cpp:72
+msgid "32-bit float"
+msgstr "32-bitni realni"
+
+#: Screenshot.cpp:384
+msgid "Saved "
+msgstr "Spremljeno "
+
+#: Screenshot.cpp:387
+msgid "Error trying to save file: "
+msgstr "Greška pri spremanju datoteke: "
+
+#: Sequence.cpp:732
+#: Sequence.cpp:742
+#: Sequence.cpp:749
+msgid "Gap detected in project file\n"
+msgstr "U projektnoj datoteci je opažena rupa/razmak\n"
+
+#: ShuttleGui.cpp:1852
+#: effects/Effect.cpp:330
+#: effects/audiounits/AudioUnitEffect.cpp:872
+msgid "Pre&view"
+msgstr "Pre&gled"
+
+#: ShuttleGui.cpp:1859
+msgid "&Debug"
+msgstr "Nađi g&reške"
+
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
+
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
+
+#: SplashDialog.cpp:58
+msgid "&Welcome to Audacity!"
+msgstr "&Dobrodošli u Audacity!"
+
+#: SplashDialog.cpp:110
+msgid "Don't show this again at start up"
+msgstr "Ne prikazuj ovo više pri startu"
+
+#: Tags.cpp:621
+msgid "Artist Name"
+msgstr "Ime izvođača"
+
+#: Tags.cpp:622
+msgid "Track Title"
+msgstr "Ime trake"
+
+#: Tags.cpp:623
+msgid "Album Title"
+msgstr "Naslov albuma"
+
+#: Tags.cpp:624
+msgid "Track Number"
+msgstr "Broj trake"
+
+#: Tags.cpp:625
+#: Tags.cpp:2105
+msgid "Year"
+msgstr "Godina"
+
+#: Tags.cpp:626
+msgid "Genre"
+msgstr "Žanr"
+
+#: Tags.cpp:627
+#: Tags.cpp:2115
+#: prefs/MousePrefs.cpp:96
+msgid "Comments"
+msgstr "Komentari"
+
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
+
+#: Tags.cpp:769
+msgid "Tag Name"
+msgstr "Ime oznake"
+
+#: Tags.cpp:770
+msgid "Tag Value"
+msgstr "Vrijednost oznake"
+
+#: Tags.cpp:785
+#: Tags.cpp:1443
+#: prefs/KeyConfigPrefs.cpp:116
+msgid "&Clear"
+msgstr "O&čisti"
+
+#: Tags.cpp:791
+msgid "Genres"
+msgstr "Žanrovi"
+
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
+
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
+
+#: Tags.cpp:801
+#: Tags.cpp:1427
+#: Tags.cpp:1955
+msgid "Template"
+msgstr "Å ablon"
+
+#: Tags.cpp:805
+#: Tags.cpp:1431
+#: Tags.cpp:1959
+#: prefs/KeyConfigPrefs.cpp:126
+msgid "&Load..."
+msgstr "&Učitaj ..."
+
+#: Tags.cpp:806
+#: Tags.cpp:1432
+#: Tags.cpp:1960
+#: prefs/KeyConfigPrefs.cpp:125
+msgid "&Save..."
+msgstr "&Spremi ..."
+
+#: Tags.cpp:808 Tags.cpp:1434 Tags.cpp:1962
+msgid "S&et Default"
+msgstr "&Postavi podrazumijevano"
+
+#: Tags.cpp:958
+#: Tags.cpp:1597
+#: Tags.cpp:2326
+msgid "Edit Genres"
+msgstr "Uredi žanrove"
+
+#: Tags.cpp:991
+#: Tags.cpp:1003
+#: Tags.cpp:1019
+#: Tags.cpp:1032
+#: Tags.cpp:1635
+#: Tags.cpp:1647
+#: Tags.cpp:1663
+#: Tags.cpp:1676
+#: Tags.cpp:2369
+#: Tags.cpp:2381
+#: Tags.cpp:2397
+#: Tags.cpp:2410
+msgid "Reset Genres"
+msgstr "Ponovo postavi žanrove "
+
+#: Tags.cpp:991
+#: Tags.cpp:1032
+#: Tags.cpp:1635
+#: Tags.cpp:1676
+#: Tags.cpp:2369
+#: Tags.cpp:2410
+msgid "Unable to save genre file."
+msgstr "Datoteku žanrova nije moguće spremiti."
+
+#: Tags.cpp:1002
+#: Tags.cpp:1646
+#: Tags.cpp:2380
+msgid "Are you sure you want to reset the genre list to defaults?"
+msgstr "Da li ste sigurni da želite datoteku žanrova ponovo postaviti na podrazumijevano?"
+
+#: Tags.cpp:1019
+#: Tags.cpp:1663
+#: Tags.cpp:2397
+msgid "Unable to open genre file."
+msgstr "Datoteku žanrova nije moguće otvoriti."
+
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1079
+#: Tags.cpp:1730
+#: Tags.cpp:2453
+msgid "Error loading metadata"
+msgstr "Greška pri učitavanju metapodataka"
+
+#: Tags.cpp:1054
+#: Tags.cpp:1108
+#: Tags.cpp:1709
+#: Tags.cpp:1745
+#: Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
+msgstr "Spremi metapodatke kao:"
+
+#: Theme.cpp:638
+#, c-format
+msgid "Audacity could not write file:\n"
+"  %s."
+msgstr "Audacity ne može pisati u datoteku:\n"
+"  %s."
+
+#: Theme.cpp:656
+#, c-format
+msgid "Audacity could not open file:\n"
+"  %s\n"
+"for writing."
+msgstr "S Audacity nije moguće otvoriti datoteku\n"
+"  %s\n"
+"za pisanje."
+
+#: Theme.cpp:664
+#, c-format
+msgid "Audacity could not write images to file:\n"
+"  %s."
+msgstr "Audacity nije mogao zapisati slike u datoteku:\n"
+"  %s."
+
+#: Theme.cpp:799
+#, c-format
+msgid "Audacity could not find file:\n"
+"  %s.\n"
+"Theme not loaded."
+msgstr "Audacity nije mogao naći datoteku:\n"
+"  %s.\n"
+"Tema nije bila učitana."
+
+#: Theme.cpp:807
+#: Theme.cpp:896
+#, c-format
+msgid "Audacity could not load file:\n"
+"  %s.\n"
+"Bad png format perhaps?"
+msgstr "Audacity nije mogao učitati datoteku:\n"
+"  %s.\n"
+"Možda je nepravilan zapis png?"
+
+#: Theme.cpp:823
+msgid "Audacity could not read its default theme.\n"
+"Please report the problem."
+msgstr "S Audacity nije bilo moguće pročitati podrazumijevanu temu.\n"
+"Molim, prijavite problem."
+
+#: Theme.cpp:918
+#, c-format
+msgid "None of the expected theme component files\n"
+" were found in:\n"
+"  %s."
+msgstr "Nijednu od očekivanih datoteka komponenti teme\n"
+" nije bilo moguće naći v:\n"
+"  %s."
+
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
+#, c-format
+msgid "Could not create directory:\n"
+"  %s"
+msgstr "Nije moguće kreirati direktorij:\n"
+"  %s"
+
+#: Theme.cpp:963
+#, c-format
+msgid "Audacity could not save file:\n"
+"  %s"
+msgstr "Nije moguće spremiti datoteku:\n"
+"  %s"
+
+#: Theme.cpp:975
+#, c-format
+msgid "All required files in:\n"
+"  %s\n"
+"were already present."
+msgstr "Sve potrebne datoteke u:\n"
+"  %s\n"
+"su bile već prisutne."
+
+#: SmartRecordDialog.cpp:303
+msgid "Duration"
+msgstr "Trajanje"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Vremensko snimanje Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Početak snimanja"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Kraj snimanja"
+
+#: TimerRecordDialog.cpp:231
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:269
+msgid "Start Date and Time"
+msgstr "Datum i vrijeme početka"
+
+#: TimerRecordDialog.cpp:324
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Datum i vrijeme završetka"
+
+#: TimerRecordDialog.cpp:344
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Čeka se na početak snimanja u %s. \n"
+
+#: TimerRecordDialog.cpp:432
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
+#: TrackPanel.cpp:448
+#: TrackPanel.cpp:449
+msgid "Track Panel"
+msgstr "Podprozor s trakom"
+
+#: TrackPanel.cpp:492
+#: export/ExportPCM.cpp:133
+#: prefs/QualityPrefs.cpp:97
+msgid "Other..."
+msgstr "Drugo ..."
+
+#: TrackPanel.cpp:500
+#: TrackPanel.cpp:521
+#: TrackPanel.cpp:530
+#: TrackPanel.cpp:538
+msgid "Name..."
+msgstr "Ime ..."
+
+#: TrackPanel.cpp:502
+#: TrackPanel.cpp:523
+#: TrackPanel.cpp:534
+#: TrackPanel.cpp:540
+msgid "Move Track Up"
+msgstr "Pomakni traku gore"
+
+#: TrackPanel.cpp:503
+#: TrackPanel.cpp:524
+#: TrackPanel.cpp:535
+#: TrackPanel.cpp:541
+msgid "Move Track Down"
+msgstr "Pomakni traku dolje"
+
+#: TrackPanel.cpp:505
+#: effects/ToneGen.cpp:303
+msgid "Waveform"
+msgstr "Talasni oblik"
+
+#: TrackPanel.cpp:506
+msgid "Waveform (dB)"
+msgstr "Talasni oblik (dB)"
+
+#: TrackPanel.cpp:554 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
+#: TrackPanel.cpp:508
+msgid "Pitch (EAC)"
+msgstr "Visina tona (EAC)"
+
+#: TrackPanel.cpp:510
+#: TrackPanel.cpp:5831
+msgid "Mono"
+msgstr "Mono"
+
+#: TrackPanel.cpp:511
+#: TrackPanel.cpp:5830
+msgid "Left Channel"
+msgstr "Lijevi kanal"
+
+#: TrackPanel.cpp:512
+#: TrackPanel.cpp:5830
+msgid "Right Channel"
+msgstr "Desni kanal"
+
+#: TrackPanel.cpp:513
+msgid "Make Stereo Track"
+msgstr "Napravi stereo traku"
+
+#: TrackPanel.cpp:514
+msgid "Split Stereo Track"
+msgstr "Razdvoji stereo traku"
+
+#: TrackPanel.cpp:516
+msgid "Set Sample Format"
+msgstr "Postavi oblik uzorka"
+
+#: TrackPanel.cpp:518
+#: TrackPanel.cpp:6048
+msgid "Set Rate"
+msgstr "Postavi frekvenciju"
+
+#: TrackPanel.cpp:526
+msgid "Up Octave"
+msgstr "Povisi za oktavu"
+
+#: TrackPanel.cpp:527
+msgid "Down Octave"
+msgstr "Snizi za oktavu"
+
+#: TrackPanel.cpp:532
+msgid "Font..."
+msgstr "Vrsta slova ..."
+
+#: TrackPanel.cpp:543
+msgid "Set Range..."
+msgstr "Postavi opseg ..."
+
+#: TrackPanel.cpp:547
+#: toolbars/EditToolBar.cpp:135
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: TrackPanel.cpp:1239
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "Kliknite za vertikalno povećanje, kliknite s Shift-om za umanjenje, povlačite za kreiranje odgovarajućega područja za uvećanje."
+
+#: TrackPanel.cpp:1244
+msgid "Drag the label vertically to change the order of the tracks."
+msgstr "Povucite oznaku vertikalno, da bi ste pomijenili redoslijed traka."
+
+#: TrackPanel.cpp:1264
+msgid "Click and drag to adjust relative size of stereo tracks."
+msgstr "Kliknite i povucite, da poboljšate relativnu veličinu stereo traka."
+
+#: TrackPanel.cpp:1267
+msgid "Click and drag to resize the track."
+msgstr "Kliknite i povucite, da bi promijenili veličinu trake."
+
+#: TrackPanel.cpp:1298
+msgid "Drag one or more label boundaries"
+msgstr "Povucite jednu ili više granica oznaka"
+
+#: TrackPanel.cpp:1299
+msgid "Drag label boundary"
+msgstr "Povucite granicu oznake"
+
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1315
+msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
+msgstr "Višealatni režim: Cmd-, za postavke miša i tastature"
+
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1318
+msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
+msgstr "Višealatni režim: Ctrl-P za postavke miša i tastature"
+
+#: TrackPanel.cpp:1338
+msgid "Click and drag to move left selection boundary."
+msgstr "Kliknite i povucite, da bi pomjerili lijevi okvir izbora."
+
+#: TrackPanel.cpp:1343
+msgid "Click and drag to move right selection boundary."
+msgstr "Kliknite i povucite, da bi pomjerili desni okvir izbora."
+
+#: TrackPanel.cpp:1669
+#: TrackPanel.cpp:3777
+#: TrackPanel.cpp:3809
+#: TrackPanel.cpp:4064
+#: TrackPanel.cpp:6160
+#: TrackPanel.cpp:6180
+msgid "Modified Label"
+msgstr "Promijenjena oznaka"
+
+#: TrackPanel.cpp:1670
+#: TrackPanel.cpp:3778
+#: TrackPanel.cpp:3810
+#: TrackPanel.cpp:4065
+#: TrackPanel.cpp:6161
+#: TrackPanel.cpp:6181
+msgid "Label Edit"
+msgstr "Uredi oznaku"
+
+#: TrackPanel.cpp:1897
+msgid "Adjusted envelope."
+msgstr "Prilagođena ovojnica."
+
+#: TrackPanel.cpp:1898
+#: prefs/MousePrefs.cpp:115
+msgid "Envelope"
+msgstr "Ovojnica"
+
+#: TrackPanel.cpp:2034
+msgid "Moved clip to another track"
+msgstr "Snimak premješten na drugu traku"
+
+#: TrackPanel.cpp:2038
+msgid "left"
+msgstr "lijevo"
+
+#: TrackPanel.cpp:2038
+msgid "right"
+msgstr "desno"
+
+#. i18n-hint: %s is a direction like left or right
+#: TrackPanel.cpp:2040
+#, c-format
+msgid "Time shifted tracks/clips %s %.02f seconds"
+msgstr "Vremenski pomjerene trake/snimci %s  %.02f sekundi"
+
+#: TrackPanel.cpp:2044
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
+msgid "Time-Shift"
+msgstr "Vremenski pomak"
+
+#: TrackPanel.cpp:2921
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
+
+#: TrackPanel.cpp:2938
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
+
+#: TrackPanel.cpp:3025
+msgid "Moved Sample"
+msgstr "Pomjeren uzorak"
+
+#: TrackPanel.cpp:3026
+msgid "Sample Edit"
+msgstr "Uređivanje uzorka"
+
+#: TrackPanel.cpp:3125
+#, c-format
+msgid "Removed track '%s.'"
+msgstr "Odstranjena traka '%s.'"
+
+#: TrackPanel.cpp:3127
+msgid "Track Remove"
+msgstr "Odstrani traku"
+
+#: TrackPanel.cpp:3268
+msgid "Moved gain slider"
+msgstr "Pomjeren potenciometar pojačanja"
+
+#: TrackPanel.cpp:3268
+msgid "Moved pan slider"
+msgstr "Pomjeren potenciometar poravnanja"
+
+#. i18n-hint: Title of the Gain slider, used to adjust the volume
+#: TrackPanel.cpp:3269
+#: TrackPanel.cpp:5478
+#: TrackPanel.cpp:6829
+msgid "Gain"
+msgstr "Pojačanje"
+
+#. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
+#: TrackPanel.cpp:3269
+#: TrackPanel.cpp:5416
+#: TrackPanel.cpp:6836
+msgid "Pan"
+msgstr "Pomjeranje"
+
+#: TrackPanel.cpp:3394
+#: TrackPanel.cpp:6113
+#: effects/ChangePitch.cpp:284
+msgid "up"
+msgstr "gore"
+
+#: TrackPanel.cpp:3398
+#: TrackPanel.cpp:6114
+#: effects/ChangePitch.cpp:284
+msgid "down"
+msgstr "dolje"
+
+#: TrackPanel.cpp:3405
+#: TrackPanel.cpp:6109
+#, c-format
+msgid "Moved '%s' %s"
+msgstr "Pomjereno '%s' %s"
+
+#: TrackPanel.cpp:3408
+#: TrackPanel.cpp:6115
+msgid "Move Track"
+msgstr "Pomjeri traku"
+
+#: TrackPanel.cpp:3964
+msgid "Expand"
+msgstr "Proširi"
+
+#: TrackPanel.cpp:3964
+msgid "Expanded Cut Line"
+msgstr "Proširena linija reza"
+
+#: TrackPanel.cpp:3973
+msgid "Merge"
+msgstr "Spoji"
+
+#: TrackPanel.cpp:3973
+msgid "Merged Clips"
+msgstr "Spojeni snimci"
+
+#: TrackPanel.cpp:3985
+msgid "Removed Cut Line"
+msgstr "Linija reza odstranjena"
+
+#: TrackPanel.cpp:5416
+msgid "Adjusted Pan"
+msgstr "Prilagođeni pomak"
+
+#: TrackPanel.cpp:5478
+msgid "Adjusted gain"
+msgstr "Prilagođeno pojačanje"
+
+#: TrackPanel.cpp:5796
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5797
+msgid "Clear any grouping"
+msgstr ""
+
+#: TrackPanel.cpp:5658
+msgid "Can't delete track with active audio"
+msgstr "Traku s aktivnim zvukom nije moguće izbrisati"
+
+#: TrackPanel.cpp:5811
+msgid "Stereo, "
+msgstr "Stereo, "
+
+#: TrackPanel.cpp:5814
+msgid "Mono, "
+msgstr "Mono, "
+
+#: TrackPanel.cpp:5816
+msgid "Left, "
+msgstr "Lijevo, "
+
+#: TrackPanel.cpp:5818
+msgid "Right, "
+msgstr "Desno, "
+
+#: TrackPanel.cpp:5840
+#: TrackPanel.cpp:5953
+#, c-format
+msgid "Changed '%s' to %s"
+msgstr "Promijenjeno: '%s' v %s"
+
+#: TrackPanel.cpp:5845
+msgid "Channel"
+msgstr "Kanal"
+
+#: TrackPanel.cpp:5858
+#, c-format
+msgid "Split stereo track '%s'"
+msgstr "Razdvoji stereo traku '%s'"
+
+#: TrackPanel.cpp:5879
+#, c-format
+msgid "Made '%s' a stereo track"
+msgstr "Stereo traka '%s' napravljena."
+
+#: TrackPanel.cpp:5882
+msgid "Make Stereo"
+msgstr "Napravi stereo"
+
+#: TrackPanel.cpp:5917
+#, c-format
+msgid "Changed '%s' to %d Hz"
+msgstr "Promijenjeno: '%s' u %d Hz"
+
+#: TrackPanel.cpp:5919
+msgid "Rate Change"
+msgstr "Promjena tempa"
+
+#: TrackPanel.cpp:5957
+msgid "Format Change"
+msgstr "Promjena formata:"
+
+#: TrackPanel.cpp:6077
+msgid "Change lower speed limit (%) to:"
+msgstr "Promijeni donju granicu brzine (%) na:"
+
+#: TrackPanel.cpp:6078
+#: TrackPanel.cpp:6079
+msgid "Lower speed limit"
+msgstr "Donja granica brzine"
+
+#: TrackPanel.cpp:6084
+msgid "Change upper speed limit (%) to:"
+msgstr "Promijeni gornju granicu brzine (%) na:"
+
+#: TrackPanel.cpp:6085
+#: TrackPanel.cpp:6086
+msgid "Upper speed limit"
+msgstr "Gornja granica brzine"
+
+#: TrackPanel.cpp:6094
+#, c-format
+msgid "Set range to '%d' - '%d'"
+msgstr "Postavi opseg na '%d' - '%d'"
+
+#: TrackPanel.cpp:6097
+msgid "Set Range"
+msgstr "Postavi opseg"
+
+#: TrackPanel.cpp:6142
+msgid "Change track name to:"
+msgstr "Promijeni oznaku trake u:"
+
+#: TrackPanel.cpp:6143
+msgid "Track Name"
+msgstr "Ime trake"
+
+#: TrackPanel.cpp:6146
+#, c-format
+msgid "Renamed '%s' to '%s'"
+msgstr "Preimenovano '%s' u '%s'"
+
+#: TrackPanel.cpp:6149
+msgid "Name Change"
+msgstr "Promjena imena"
+
+#: TrackPanel.cpp:6215
+msgid "Label Track Font"
+msgstr "Vrsta slova oznake trake"
+
+#: TrackPanel.cpp:6227
+msgid "Face name"
+msgstr "Ime vrste slova"
+
+#: TrackPanel.cpp:6236
+msgid "Face size"
+msgstr "Veličina vrste slova"
+
+#: TrackPanel.cpp:6756
+msgid "Mute"
+msgstr "Utišaj"
+
+#: TrackPanel.cpp:6756
+msgid "Solo"
+msgstr "Solo"
+
+#: TrackPanelAx.cpp:265
+msgid "TrackView"
+msgstr "Pogled traka"
+
+#: TrackPanelAx.cpp:273
+msgid "Track Accessible out of sync"
+msgstr "Dosegljiva traka je asinhrona"
+
+#: TrackPanelAx.cpp:281
+#, c-format
+msgid "Track %d"
+msgstr "traka %d"
+
+#: TrackPanelAx.cpp:287
+msgid " Mute On"
+msgstr " Nijemo uključeno"
+
+#: TrackPanelAx.cpp:292
+msgid " Solo On"
+msgstr " Solo uključeno"
+
+#: TrackPanelAx.cpp:296
+msgid " Select On"
+msgstr " Izabrano"
+
+#: VoiceKey.cpp:88
+#: VoiceKey.cpp:238
+#: VoiceKey.cpp:376
+#: VoiceKey.cpp:517
+msgid "Selection is too small to use voice key."
+msgstr "Izbor je premli za upotrebo glasovnog ključa."
+
+#: VoiceKey.cpp:843
+msgid "Calibration Results\n"
+msgstr "Rezultati kalibracije\n"
+
+#: VoiceKey.cpp:844
+#, c-format
+msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Energija              -- sr.vred.: %1.4f  st.dev.: (%1.4f)\n"
+
+#: VoiceKey.cpp:845
+#, c-format
+msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Promjene predznaka    -- sr.vred: %1.4f  st.dev.: (%1.4f)\n"
+
+#: VoiceKey.cpp:846
+#, c-format
+msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Promjene pravca    -- sr.vred.: %1.4f  st.dev.: (%1.4f)\n"
+
+#: WaveTrack.cpp:81
+msgid "Audio Track"
+msgstr "Zvučna traka"
+
+#: WaveTrack.cpp:547
+#: WaveTrack.cpp:566
+msgid "There is not enough room available to paste the selection"
+msgstr "Nema dovoljno prostora, da bi priljepili izbor"
+
+#: WaveTrack.cpp:1655
+msgid "There is not enough room available to expand the cut line"
+msgstr "Nema dovoljno prostora, da bi raširili liniju reza"
+
+#: commands/CommandManager.cpp:395
+#, c-format
+msgid "Plugins 1 to %i"
+msgstr "Priključci 1 do %i"
+
+#: commands/CommandManager.cpp:409
+#, c-format
+msgid "Plugins %i to %i"
+msgstr "Priključci %i do %i"
+
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "Iz nekog razloga to nije dozvoljeno.  Probajte prvoj izabrati neki zvuk?"
+
+#: commands/CommandManager.cpp:724
+msgid "You can only do this when playing and recording are\n"
+" stopped.  [Pausing is not sufficient.]"
+msgstr "To možete izvesti samo, ako su izvođenje i snimanje\n"
+" zaustavljeni.  [Pauza nije dovoljna.]"
+
+#: commands/CommandManager.cpp:726
+msgid "You must first select some stereo audio for this\n"
+" to use.  [You can't use this with mono.]"
+msgstr "Morate prvo izabrati neki stereo-zvuk.\n"
+" [Ovo ne možete koristiti za mono.]"
+
+#: commands/CommandManager.cpp:728
+msgid "You must first select some audio for this to use."
+msgstr "Molimo, da prvo izaberete neki zvučni snimak."
+
+#: commands/CommandManager.cpp:730
+msgid "You must first select some audio for this\n"
+" to use. [Selecting other kinds of track won't work.]"
+msgstr "Morate prvo izabrati neki zvuk.\n"
+" [Izbor drugih vrsta traka neće raditi.]"
+
+#: commands/CommandManager.cpp:872
+msgid "Disallowed"
+msgstr ""
+
+#: commands/CommandManager.cpp:915
+#, c-format
+msgid "Loaded %d keyboard shortcuts\n"
+msgstr "Učitano %d tastaturnih prečica\n"
+
+#: commands/CommandManager.cpp:917
+msgid "Loading keyboard shortcuts"
+msgstr "Učitavanje tastaturnih prečica"
+
+#: effects/Amplify.cpp:52
+#, c-format
+msgid "Applied effect: %s %.1f dB"
+msgstr "Primjenjen efekt: %s %1f dB"
+
+#: effects/Amplify.cpp:87
+msgid "Amplify"
+msgstr "Pojačaj"
+
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
+
+#: effects/Amplify.cpp:159
+msgid "Amplification (dB):"
+msgstr "Pojačanje (dB):"
+
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:179
+msgid "New Peak Amplitude (dB):"
+msgstr "Nova vršna amplituda (dB):"
+
+#: effects/Amplify.cpp:191
+msgid "Allow clipping"
+msgstr "Dozvoli rezanje"
+
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
+#: effects/Amplify.h:46
+msgid "Amplify..."
+msgstr "Pojačaj ..."
+
+#: effects/Amplify.h:54
+msgid "Amplifying"
+msgstr "Pojačavanje"
+
+#: effects/AutoDuck.cpp:125
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "Izbrali ste traku, koja ne sadrži zvuk. Automatsko spuštanje može procesirati samo zvučne trake."
+
+#: effects/AutoDuck.cpp:126
+#: effects/AutoDuck.cpp:138
+#: effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:570
+msgid "Auto Duck"
+msgstr "Automatski spusti"
+
+#: effects/AutoDuck.cpp:137
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Automatski spusti treba kontrolnu traku, koja se mora nalaziti ispod izabranih traka."
+
+#: effects/AutoDuck.cpp:465
+msgid "Auto Duck by Markus Meyer"
+msgstr "Automatsko spuštanje autora Markusa Meyerja"
+
+#: effects/AutoDuck.cpp:487
+msgid "Duck amount:"
+msgstr "Količina spusta:"
+
+#: effects/AutoDuck.cpp:492
+msgid "Maximum pause:"
+msgstr "Maksimalna pauza:"
+
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: prefs/AudioIOPrefs.cpp:166
+#: prefs/AudioIOPrefs.cpp:174
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/AudioIOPrefs.cpp:201
+#: prefs/AudioIOPrefs.cpp:203
+#: widgets/TimeTextCtrl.cpp:197
+msgid "seconds"
+msgstr "sekundi"
+
+#: effects/AutoDuck.cpp:497
+msgid "Outer fade down length:"
+msgstr "Dužina spoljnjeg oslabljenja:"
+
+#: effects/AutoDuck.cpp:502
+msgid "Outer fade up length:"
+msgstr "Dužina spoljenjeg jačanja:"
+
+#: effects/AutoDuck.cpp:507
+msgid "Inner fade down length:"
+msgstr "Dužina unutrašnjeg poslabljenja:"
+
+#: effects/AutoDuck.cpp:512
+msgid "Inner fade up length:"
+msgstr "Dužina unutrašnjeg jačanja:"
+
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:484
+msgid "Threshold:"
+msgstr "Prag:"
+
+#: effects/AutoDuck.cpp:570
+msgid "Please enter valid values."
+msgstr "Molim, unesite važeće vrijednosti."
+
+#: effects/AutoDuck.cpp:704
+msgid "Preview not available"
+msgstr "Predposlušanje nije raspoloživo"
+
+#: effects/AutoDuck.h:97
+msgid "Auto Duck..."
+msgstr "Automatski spusti ..."
+
+#: effects/AutoDuck.h:107
+msgid "Processing Auto Duck..."
+msgstr "Procesiranje automatskog spuštanja ..."
+
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:448
+#: effects/audiounits/AudioUnitEffect.cpp:877
+#: effects/nyquist/Nyquist.cpp:1040
+#: widgets/ErrorDialog.cpp:74
+#: widgets/ErrorDialog.cpp:100
+#: widgets/Warning.cpp:67
+msgid "OK"
+msgstr "U redu"
+
+#: effects/BassBoost.cpp:52
+#, c-format
+msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
+msgstr "Primjenjen efekt: frekvencijaa %s = %.0f Hz, pojačanje ? %.0f dB"
+
+#: effects/BassBoost.cpp:169
+msgid "Bass Boost"
+msgstr "Pojačanje niskih tonova"
+
+#: effects/BassBoost.cpp:182
+msgid "by Nasca Octavian Paul"
+msgstr "avtor Nasce Octavian Paul"
+
+#: effects/BassBoost.cpp:196
+msgid "Frequency (Hz):"
+msgstr "Frekvencija (Hz):"
+
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
+msgid "Boost (dB):"
+msgstr "Pojačanje (dB):"
+
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
+#: effects/BassBoost.h:35
+msgid "BassBoost..."
+msgstr "Pojačanje niskih tonova ..."
+
+#: effects/BassBoost.h:43
+msgid "Boosting Bass Frequencies"
+msgstr "Pojačanje niskih frekvencija"
+
+#: effects/ChangeLength.h:26
+msgid "Change Length..."
+msgstr "Promijeni dužinu ..."
+
+#: effects/ChangeLength.h:34
+msgid "Changing Length..."
+msgstr "Promjena dužine ..."
+
+#: effects/ChangePitch.cpp:55
+#, c-format
+msgid "Applied effect: %s %.2f semitones"
+msgstr "Primjenjen efekt: %s %.2f polutonova"
+
+#: effects/ChangePitch.cpp:118
+msgid "Change Pitch"
+msgstr "Promijeni visinu tona"
+
+#: effects/ChangePitch.cpp:247
+msgid "Change Pitch without Changing Tempo"
+msgstr "Promijeni visinu tona brez spremembe tempa"
+
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/ChangePitch.cpp:254
+#: effects/ChangeSpeed.cpp:313
+#: effects/ChangeTempo.cpp:180
+msgid "by Vaughan Johnson && Dominic Mazzoni"
+msgstr "avtorja Vauhgan Johnson i Dominic Mazzoni"
+
+#: effects/ChangePitch.cpp:259
+#: effects/ChangeTempo.cpp:185
+msgid "using SoundTouch, by Olli Parviainen"
+msgstr "uporabljen SoundTouch Ollija Parvianena"
+
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Poltoni:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
+
+#: effects/ChangePitch.cpp:291
+#: effects/ChangePitch.cpp:337
+#: effects/ChangeSpeed.cpp:377
+#: effects/ChangeTempo.cpp:239
+#: effects/ChangeTempo.cpp:270
+msgid "to"
+msgstr "do"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
+
+#: effects/ChangePitch.cpp:360
+#: effects/ChangeSpeed.cpp:331
+#: effects/ChangeTempo.cpp:198
+msgid "Percent Change:"
+msgstr "Sprememba v odstotkih"
+
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
+#: effects/ChangePitch.h:31
+msgid "Change Pitch..."
+msgstr "Promijeni visinu tona ..."
+
+#: effects/ChangePitch.h:39
+msgid "Changing Pitch"
+msgstr "Promjena visine tona"
+
+#: effects/ChangeSpeed.cpp:53
+#: effects/ChangeTempo.cpp:55
+#, c-format
+msgid "Applied effect: %s %.1f%%"
+msgstr "Primjenjen efekt: %s %1f%%"
+
+#: effects/ChangeSpeed.cpp:60
+msgid "Change Speed"
+msgstr "Promijeni brzinu"
+
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "Nije raspoloživo"
+
+#: effects/ChangeSpeed.cpp:308
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Promijeni brzinu s uticajem na tempo i visinu tona"
+
+#: effects/ChangeSpeed.cpp:318
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "Upotrijebljen SampleRate, autor Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.h:32
+msgid "Change Speed..."
+msgstr "Promijeni brzinu ..."
+
+#: effects/ChangeSpeed.h:40
+msgid "Changing Speed"
+msgstr "Promjena brzine"
+
+#: effects/ChangeTempo.cpp:74
+msgid "Change Tempo"
+msgstr "Promijeni tempo"
+
+#: effects/ChangeTempo.cpp:175
+msgid "Change Tempo without Changing Pitch"
+msgstr "Promijena tempa bez promjene visine tona"
+
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.h:35
+msgid "Change Tempo..."
+msgstr "Promijeni tempo ..."
+
+#: effects/ChangeTempo.h:43
+msgid "Changing Tempo"
+msgstr "Promjena tempa"
+
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
+msgstr "Odstranjivanje kliktanja"
+
+#: effects/ClickRemoval.cpp:336
+msgid "Click and Pop Removal by Craig DeForest"
+msgstr "Odstranjivanje kliktanja autora Craiga DeForesta"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold (lower is more sensitive):"
+msgstr "Izaberite prag (niže znači veća osjetljivost):"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:362
+msgid "Max spike width (higher is more sensitive):"
+msgstr "Najveća širina šiljka (više znači veću osjetljivost):"
+
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
+#: effects/ClickRemoval.h:42
+msgid "Click Removal..."
+msgstr "Odstranjivanje kliktanja ..."
+
+#: effects/ClickRemoval.h:50
+msgid "Removing clicks and pops..."
+msgstr "Odstranjivanje kliktanja ..."
+
+#: effects/Compressor.cpp:74
+msgid "Dynamic Range Compressor"
+msgstr "Kompresor dinamičkog opsega"
+
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
+msgstr "Vrijeme napada:"
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
+msgstr "Vrijeme opadanja: "
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
+#: effects/Compressor.cpp:516
+msgid "Normalize to 0dB after compressing"
+msgstr "Po kompresiji normaliziraj na 0dB"
+
+#: effects/Compressor.cpp:563
+#, c-format
+#, fuzzy
+msgid "Threshold %d dB"
+msgstr "Prag: %d dB"
+
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
+msgstr "Trajanje napada: %.1f s"
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
+msgstr "Vrijeme opadanja: %.1f s"
+
+#: effects/Compressor.h:36
+msgid "Compressor..."
+msgstr "Kompresor ..."
+
+#: effects/Compressor.h:44
+msgid "Applying Dynamic Range Compression..."
+msgstr "Primjena kompresije dinamičnog opsega ..."
+
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:190
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:277 effects/Contrast.cpp:288 effects/Contrast.cpp:371
+#: effects/Contrast.cpp:415
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:318
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:321
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:338
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Početak"
+
+#: effects/ToneGen.cpp:339
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:141
+#: toolbars/SelectionBar.cpp:242
+msgid "End"
+msgstr "Kraj"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:335
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:378
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:426
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:430
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796
+#: Tags.cpp:1948
+msgid "Reset"
+msgstr "Ponovo postavi"
+
+#: effects/Contrast.cpp:434
+msgid "Difference:"
+msgstr ""
+
+#: AboutDialog.cpp:275
+msgid "Information"
+msgstr "Informacije"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Upravljanje"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:466 effects/Contrast.cpp:472 effects/Contrast.cpp:478
+#: effects/Contrast.cpp:484
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:517 effects/Contrast.cpp:527
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:532
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:534
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr ""
+
+#: effects/DtmfGen.cpp:48
+msgid "DTMF Tone Generator"
+msgstr "DTMF ton generator"
+
+#: effects/DtmfGen.cpp:437
+msgid "by Salvo Ventura (2006)"
+msgstr "autor Salvo Ventura (2006)"
+
+#: effects/DtmfGen.cpp:441
+msgid "DTMF sequence:"
+msgstr "DTMF sekvenca:"
+
+#: effects/DtmfGen.cpp:444
+#: effects/Noise.cpp:255
+#: effects/ToneGen.cpp:306
+#: effects/ToneGen.cpp:342
+msgid "Amplitude (0-1)"
+msgstr "Amplituda (0-1)"
+
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
+
+#: effects/DtmfGen.cpp:464
+msgid "Tone/silence ratio:"
+msgstr "Razmjer ton/tišina:"
+
+#: effects/DtmfGen.cpp:475
+msgid "Duty cycle:"
+msgstr "Ciklus djelovanja:"
+
+#: effects/DtmfGen.cpp:477
+msgid "Tone duration:"
+msgstr "Trajanje tona:"
+
+#: effects/DtmfGen.cpp:478
+#: effects/DtmfGen.cpp:480
+#: effects/DtmfGen.cpp:556
+#: effects/DtmfGen.cpp:557
+msgid "ms"
+msgstr "ms"
+
+#: effects/DtmfGen.cpp:479
+msgid "Silence duration:"
+msgstr "Trajanje tišine:"
+
+#: effects/DtmfGen.h:41
+msgid "DTMF Tones..."
+msgstr "DTMF tonovi..."
+
+#: effects/DtmfGen.h:49
+#, c-format
+msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
+msgstr "Primjenjen efekt: Generisanje tona DTMF, %.6lf sekundi"
+
+#: effects/DtmfGen.h:53
+msgid "Generating DTMF tones"
+msgstr "Generisanje tonova DTMF"
+
+#: effects/Echo.cpp:48
+#, c-format
+msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
+msgstr "Upotrijebljen efekt: kašnjenje %s = %f sekundi, faktor kašnjenja = %f"
+
+#: effects/Echo.cpp:170
+msgid "Echo"
+msgstr "Odjek"
+
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/Echo.cpp:195
+msgid "by Dominic Mazzoni && Vaughan Johnson"
+msgstr "autori Dominic Mazzoni i Vaughan Johnson"
+
+#: effects/Echo.cpp:207
+msgid "Delay time (seconds):"
+msgstr "Kašnjenje (sekundi):"
+
+#: effects/Echo.cpp:212
+msgid "Decay factor:"
+msgstr "Faktor opadanja: "
+
+#: effects/Echo.h:34
+msgid "Echo..."
+msgstr "Odjek ..."
+
+#: effects/Echo.h:42
+msgid "Performing Echo"
+msgstr "Izvođenje odjeka"
+
+#: effects/Effect.cpp:378
+msgid "Preparing preview"
+msgstr "Priprema predslušanja"
+
+#: effects/Effect.cpp:404
+msgid "Previewing"
+msgstr "Predslušanje"
+
+#: effects/Effect.cpp:420
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "Greška pri otvaranju zvučnog uređaja. Molimo provjerite postavke izlaznog uređaja i brzinu uzimanja uzoraka projekta."
+
+#: effects/Effect.h:107
+#, c-format
+msgid "Applied effect: %s"
+msgstr "Primjenjen efekt: %s"
+
+#: effects/Equalization.cpp:300
+msgid "B-spline"
+msgstr "B-splajn"
+
+#: effects/Equalization.cpp:300
+msgid "Cosine"
+msgstr "kosinusni"
+
+#: effects/Equalization.cpp:300
+msgid "Cubic"
+msgstr "kubni"
+
+#: effects/Equalization.cpp:353
+#: effects/Equalization.cpp:404
+msgid "Equalization"
+msgstr "Izjednačavanje"
+
+#: effects/Equalization.cpp:974
+msgid "Error loading EQ curve"
+msgstr "Greška pri učitavanju krivulje izjednačivača (EQ)"
+
+#: effects/Equalization.cpp:1013
+msgid "custom"
+msgstr "Prilagođeno"
+
+#. i18n-hint: && in here is an escape character to get a single &
+#. * on screen, so keep it as is
+#: effects/Equalization.cpp:1081
+msgid "Equalization, by Martyn Shaw && Mitch Golden"
+msgstr "Izjednačavanje, autori Martyn Shaw i Mitch Golden"
+
+#: effects/Equalization.cpp:1102
+msgid "Max dB"
+msgstr "Najveći dB"
+
+#: effects/Equalization.cpp:1104
+msgid "Min dB"
+msgstr "Najmanji dB"
+
+#: effects/Equalization.cpp:1177
+msgid "kHz"
+msgstr "kHz"
+
+#: effects/Equalization.cpp:1194
+msgid "Draw curves"
+msgstr "Nacrtaj krivulje"
+
+#: effects/Equalization.cpp:1199
+msgid "Graphic EQ"
+msgstr "Grafički izjednačivač"
+
+#: effects/Equalization.cpp:1213
+msgid "Linear frequency scale"
+msgstr "Linearna skala frekvencija"
+
+#: effects/Equalization.cpp:1222
+msgid "Length of filter:"
+msgstr "Dužina filtera:"
+
+#: effects/Equalization.cpp:1243
+msgid "Select curve:"
+msgstr "Izaberite krivulju:"
+
+#: effects/Equalization.cpp:1253
+#: effects/Equalization.cpp:2416
+msgid "Save As..."
+msgstr "Spremi kao ..."
+
+#: effects/Equalization.cpp:1259
+msgid "Flat"
+msgstr "Ravan"
+
+#: effects/Equalization.cpp:2415
+msgid "Enter the desired name of the curve"
+msgstr "Unesite željeno ime krivulje"
+
+#: effects/Equalization.cpp:2515
+msgid "Confirm Deletion"
+msgstr "Potvrda brisanja"
+
+#: effects/Equalization.h:87
+msgid "Equalization..."
+msgstr "Izjednačavanje ..."
+
+#: effects/Equalization.h:95
+msgid "Performing Equalization"
+msgstr "Izvođenje izjednačavanja"
+
+#: effects/Fade.h:24
+msgid "Fade In"
+msgstr "Pojačavaj"
+
+#: effects/Fade.h:32
+msgid "Fading In"
+msgstr "Pojačavanje glasnosti"
+
+#: effects/Fade.h:48
+msgid "Fade Out"
+msgstr "Utišavaj"
+
+#: effects/Fade.h:56
+msgid "Fading Out"
+msgstr "Utišavanje glasnosti"
+
+#: effects/FindClipping.cpp:49
+msgid "Detect clipping"
+msgstr "Raspoznaj rezanje"
+
+#: effects/FindClipping.cpp:91
+msgid "Clipping"
+msgstr "Rezanje"
+
+#: effects/FindClipping.cpp:211
+msgid "Find Clipping"
+msgstr "Nađi porezano"
+
+#: effects/FindClipping.cpp:222
+msgid "by Leland Lucius"
+msgstr "avtora Lelanda Luciusa"
+
+#: effects/FindClipping.cpp:234
+msgid "Start threshold (samples):"
+msgstr "Početni prag (uzorci):"
+
+#: effects/FindClipping.cpp:238
+msgid "Stop threshold (samples):"
+msgstr "Krajnji prag (uzorci):"
+
+#: effects/FindClipping.cpp:250
+msgid "Start and stop must be greater than 0."
+msgstr "Početak i kraj moraju biti veći od 0."
+
+#: effects/FindClipping.h:37
+msgid "Find Clipping..."
+msgstr "Nađi rez ..."
+
+#: effects/FindClipping.h:47
+msgid "Detecting clipping"
+msgstr "Raspoznavanje reza"
+
+#: effects/Invert.h:27
+msgid "Invert"
+msgstr "Obrni"
+
+#: effects/Invert.h:35
+msgid "Inverting"
+msgstr "Obrtanje"
+
+#: effects/Leveller.cpp:129
+msgid "Leveller"
+msgstr "Izravnjivač "
+
+#: effects/Leveller.cpp:47
+msgid "None-Skip"
+msgstr "Bez-preskoka"
+
+#: effects/Leveller.cpp:47
+msgid "Light"
+msgstr "Slabo"
+
+#: effects/Leveller.cpp:47
+msgid "Moderate"
+msgstr "Umjereno"
+
+#: effects/Leveller.cpp:47
+msgid "Heavy"
+msgstr "Jako"
+
+#: effects/Leveller.cpp:47
+msgid "Heavier"
+msgstr "Jače"
+
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
+msgstr "Najjače"
+
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "autora Lynna Allana"
+
+#: effects/Leveller.cpp:219
+#: effects/Leveller.cpp:224
+msgid "Degree of Leveling"
+msgstr "Stepen izravnavanja"
+
+#: effects/Leveller.cpp:228
+msgid "Degree of Leveling:"
+msgstr ""
+
+#: effects/Leveller.cpp:235
+msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
+msgstr "Prag Å¡uma (siktanje/Å¡um/zvuk prostora, okolice)"
+
+#: effects/Leveller.cpp:240
+#, fuzzy
+msgid "Threshold for Noise:"
+msgstr "Prag za Å¡um: "
+
+#: effects/Leveller.h:28
+msgid "Leveller..."
+msgstr "Izravnjivač ..."
+
+#: effects/Leveller.h:36
+msgid "Applying Leveller..."
+msgstr "Primjena izravnjivača ..."
+
+#: effects/LoadEffects.cpp:103
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:105
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:107
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:109
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:111
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:113
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "Mikser"
+
+#: effects/LoadEffects.cpp:117
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:119
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:121
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:123
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Fazor"
+
+#: effects/LoadEffects.cpp:127
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:129
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:131
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:133
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:135
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:137
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:139
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:141
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:143
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:145
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:147
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:149
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:151
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:153
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:155
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:157
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:159
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:161
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:163
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:165
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:167
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Odstranjivanje Å¡uma"
+
+#: effects/LoadEffects.cpp:202
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:204
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:206
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:208
+msgid "Onsets"
+msgstr ""
+
+#: effects/Noise.cpp:37
+msgid "White"
+msgstr "bijelo"
+
+#: effects/Noise.cpp:38
+msgid "Pink"
+msgstr "rozo"
+
+#: effects/Noise.cpp:39
+msgid "Brown"
+msgstr "smeđe"
+
+#: effects/Noise.cpp:41
+msgid "Noise Generator"
+msgstr "Genrator Å¡uma"
+
+#: effects/Noise.cpp:256
+msgid "Noise type"
+msgstr "Vrsta Å¡uma"
+
+#: effects/Noise.h:41
+msgid "Noise..."
+msgstr "Å¡um ..."
+
+#: effects/Noise.h:49
+#, c-format
+msgid "Applied effect: Generate Noise, %.6lf seconds"
+msgstr "Primjenjen efekt: Generiši šum, %.6lf sekundi"
+
+#: effects/Noise.h:53
+msgid "Generating Noise"
+msgstr "Generisanje Å¡uma"
+
+#: effects/NoiseRemoval.cpp:192
+#, c-format
+msgid "Could not open file:\n"
+"  %s"
+msgstr "Datoteku nije moguće otvoriti:\n"
+" %s"
+
+#: effects/NoiseRemoval.cpp:277
+msgid "Attempt to run Noise Removal without a noise profile.\n"
+msgstr "Pokušaj odstranjevanja šuma bez profila šuma.\n"
+
+#: effects/NoiseRemoval.cpp:812
+msgid "Step 1"
+msgstr "1. korak"
+
+#: effects/NoiseRemoval.cpp:813
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
+"then click Get Noise Profile:"
+msgstr "Izaberite nekoliko sekundi čistog šuma, da Audacity zna, šta treba odstranit,\n"
+"zatim kliknite \n"
+"Uzmi profil Å¡uma:"
+
+#: effects/NoiseRemoval.cpp:814
+msgid "Step 2"
+msgstr "2. korak"
+
+#: effects/NoiseRemoval.cpp:815
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
+"filtered out, and then click 'OK' to remove noise.\n"
+msgstr "Izaberite sav zvuk, koga želite prefiltrirati, izaberite koliko šuma želite\n"
+"odstraniti i na to kliknite U redu', da odstranite Å¡um.\n"
+
+#: effects/NoiseRemoval.cpp:820
+msgid "Noise Removal by Dominic Mazzoni"
+msgstr "Odstranjivanje Å¡uma Dominica Mazzonija"
+
+#: effects/NoiseRemoval.cpp:828
+msgid "Get Noise Profile"
+msgstr "Uzmi profil Å¡uma"
+
+#: effects/NoiseRemoval.cpp:839
+msgid "Noise reduction (dB):"
+msgstr "Odstranjivanje Å¡uma (dB):"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:847
+msgid "Frequency smoothing (Hz):"
+msgstr "Glađenje frekvencija (Hz):"
+
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:855
+msgid "Attack/decay time (secs):"
+msgstr "Vrijeme napada/opadanja (v sekundama):"
+
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
+msgid "Noise Removal..."
+msgstr "Odstranjivanje Å¡uma ..."
+
+#: effects/NoiseRemoval.h:44
+msgid "Creating Noise Profile"
+msgstr "Stvaranje profila Å¡uma"
+
+#: effects/NoiseRemoval.h:46
+msgid "Removing Noise"
+msgstr "Odstranjivanje Å¡uma"
+
+#: effects/Normalize.cpp:68
+#, c-format
+msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
+msgstr "Primjenjen efekt: %s odstranjivanje dc pomaka = %s, normalizacija amplitude = %s"
+
+#: effects/Normalize.cpp:70
+#: effects/Normalize.cpp:71
+msgid "false"
+msgstr "netačno"
+
+#: effects/Normalize.cpp:70
+#: effects/Normalize.cpp:71
+msgid "true"
+msgstr "tačno"
+
+#: effects/Normalize.cpp:73
+#, c-format
+msgid ", maximum amplitude = %.1f dB"
+msgstr ", najveća amplituda = %.1f dB"
+
+#: effects/Normalize.cpp:109
+msgid "Normalize"
+msgstr "Normaliziraj"
+
+#: effects/Normalize.cpp:351
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
+
+#: effects/Normalize.cpp:354
+#, fuzzy
+msgid "Normalize maximum amplitude to:"
+msgstr "Normaliziraj najveću amplitudu na"
+
+#: effects/Normalize.cpp:357
+msgid "-"
+msgstr "-"
+
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:32
+msgid "Normalize..."
+msgstr "Normaliziraj ..."
+
+#: effects/Normalize.h:41
+msgid "Normalizing..."
+msgstr "Normalizacija u toku ..."
+
+#: effects/Phaser.cpp:65
+#, c-format
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "Primjenjen efekt: %s %d stepeni, %.0f%% mokro, frekvencija = %.1f Hz, početna faza = %.0f stepenij, dubina = %d, odziv = %.0f%%"
+
+#: effects/Phaser.cpp:222
+msgid "Stages:"
+msgstr "Stepeni:"
+
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
+
+#: effects/Phaser.cpp:264
+#: effects/Wahwah.cpp:221
+msgid "LFO Frequency (Hz):"
+msgstr "Frekvencija LFO (Hz):"
+
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
+#: effects/Phaser.cpp:280
+#: effects/Wahwah.cpp:237
+msgid "LFO Start Phase (deg.):"
+msgstr "Početna faza LFO (step.):"
+
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
+#: effects/Phaser.cpp:296
+msgid "Depth:"
+msgstr "Dubina:"
+
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
+#: effects/Phaser.cpp:312
+msgid "Feedback (%):"
+msgstr "Odziv (%):"
+
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
+#: effects/Phaser.h:38
+msgid "Phaser..."
+msgstr "Fazor ..."
+
+#: effects/Phaser.h:46
+msgid "Applying Phaser"
+msgstr "Primjena fazora"
+
+#: effects/Repair.cpp:99
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+"\n"
+"Zoom in and select a tiny fraction of a second to repair."
+msgstr "Efekat Popravi je namijenjen za upotrebu na vrlo kratkim dijelovima oštećenoga zvuka (do 128 uzoraka).\n"
+"\n"
+"Povećajte izbor i izaberite mali dio sekunde za popravku."
+
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
+#: effects/Repair.h:37
+msgid "Repairing damaged audio"
+msgstr "Popravljanje oštećenog zvuka"
+
+#: effects/Repeat.cpp:49
+#, c-format
+msgid "Repeated %d times"
+msgstr "Ponovljeno %d-puta"
+
+#: effects/Repeat.cpp:75
+msgid "Tracks are too long to repeat the selection."
+msgstr "Trake su preduge za ponavljanje izbora."
+
+#: effects/Repeat.cpp:76
+#: effects/Repeat.cpp:80
+msgid "Repeat"
+msgstr "Ponovi"
+
+#: effects/Repeat.cpp:211
+#, fuzzy
+msgid "Number of times to repeat:"
+msgstr "Broj ponavljanja"
+
+#: effects/Repeat.cpp:220
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
+#: effects/Repeat.cpp:207
+#: effects/Repeat.cpp:237
+msgid "New selection length: "
+msgstr "Nova dužina izbora:"
+
+#: widgets/TimeTextCtrl.cpp:202
+msgid "hh:mm:ss"
+msgstr "čč:mm:ss"
+
+#: effects/Repeat.h:32
+msgid "Repeat..."
+msgstr "Ponovi ..."
+
+#: effects/Repeat.h:40
+msgid "Performing Repeat"
+msgstr "Izvođenje ponavljanja"
+
+#: effects/Reverse.h:30
+msgid "Reverse"
+msgstr "Obrnuto"
+
+#: effects/Reverse.h:38
+msgid "Reversing"
+msgstr "Obrtanje"
+
+#: effects/Silence.cpp:32
+msgid "Silence Generator"
+msgstr "Generator tišine"
+
+#: effects/Silence.h:34
+msgid "Silence..."
+msgstr "Tišina ..."
+
+#: effects/Silence.h:42
+msgid "Generating Silence"
+msgstr "Generisanje tišine"
+
+#: effects/Silence.h:47
+#, c-format
+msgid "Applied effect: Generate Silence, %.6lf seconds"
+msgstr "Upotrijebljen efekt: Generiši tišinu, %.6lf sekundi"
+
+#: effects/SimplePairedTwoTrack.h:120
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Nažalost, taj efekt nije moguće izvesti na stereo snimcima, jer se pojedinačni kanali trake ne slažu."
+
+#: effects/SpikeCleaner.cpp:69
+msgid "Spike Cleaner"
+msgstr "Čistač šiljaka"
+
+#: effects/SpikeCleaner.cpp:160
+msgid "SpikeCleaner by Lynn Allan"
+msgstr "Čistač šiljaka Lynna Allana"
+
+#: effects/SpikeCleaner.cpp:165
+msgid "Max Spike Duration (milliseconds): \n"
+"(99999 or greater is off)"
+msgstr "Najveće trajanje šiljka (u milisekundama): \n"
+"(99999 ili više znači isključeno)"
+
+#: effects/SpikeCleaner.cpp:178
+msgid "Theshold for silence: "
+msgstr "Prag tišine: "
+
+#: effects/SpikeCleaner.h:27
+msgid "Spike Cleaner..."
+msgstr "Čistač šiljaka ..."
+
+#: effects/SpikeCleaner.h:35
+msgid "Applying Spike Cleaner..."
+msgstr "Izvođenje čistača šiljaka ..."
+
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "&Stereo u mono"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
+msgstr "Pretvaranje sterea u mono"
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:59
+#, c-format
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "Primjenjen efekt: Generiši %s valova %s, frekvencija = %.2f Hz, amplituda = %.2f, %.6lf sekundi"
+
+#: widgets/Meter.cpp:362
+msgid "Linear"
+msgstr "Linearan"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
+#: effects/ToneGen.cpp:66
+msgid "Chirp Generator"
+msgstr "Generator piska"
+
+#: effects/ToneGen.cpp:66
+msgid "Tone Generator"
+msgstr "Generator tona"
+
+#: effects/ToneGen.cpp:67
+msgid "Sine"
+msgstr "Sinusni"
+
+#: effects/ToneGen.cpp:68
+msgid "Square"
+msgstr "Kvadratni"
+
+#: effects/ToneGen.cpp:69
+msgid "Sawtooth"
+msgstr "Zupčasti"
+
+#: effects/ToneGen.cpp:70
+msgid "Square, no alias"
+msgstr "Kvadratni, bez aliasa"
+
+#: effects/ToneGen.cpp:305
+#: effects/ToneGen.cpp:340
+msgid "Frequency (Hz)"
+msgstr "Frekvencija (Hz)"
+
+#: effects/ToneGen.cpp:331
+msgid "Waveform:"
+msgstr "Talasni oblik:"
+
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:366
+msgid "Interpolation:"
+msgstr ""
+
+#: effects/ToneGen.h:39
+msgid "Chirp..."
+msgstr "Pisak ..."
+
+#: effects/ToneGen.h:39
+msgid "Tone..."
+msgstr "Ton ..."
+
+#: effects/ToneGen.h:47
+msgid "Generating Chirp"
+msgstr "Generisanje piska"
+
+#: effects/ToneGen.h:47
+msgid "Generating Tone"
+msgstr "Generisanje tona"
+
+#: effects/TruncSilence.cpp:113
+msgid "All tracks must have the same sample rate"
+msgstr "Sve trake moraju imati jednaku frekvenciju uzimanja uzoraka."
+
+#: effects/TruncSilence.cpp:113
+#: effects/TruncSilence.cpp:322
+msgid "Truncate Silence"
+msgstr "Presjeci tišinu"
+
+#: effects/TruncSilence.cpp:346
+msgid "Max silence duration:"
+msgstr "Najveće trajanje tišine:"
+
+#: effects/TruncSilence.cpp:349
+#: prefs/AudioIOPrefs.cpp:190
+#: prefs/AudioIOPrefs.cpp:193
+msgid "milliseconds"
+msgstr "milisekundi"
+
+#: effects/TruncSilence.cpp:351
+msgid "Threshold for silence:"
+msgstr "Prag tišine:"
+
+#: effects/TruncSilence.cpp:375
+msgid "   Duration must be at least 1 millisecond"
+msgstr "   Trajanje mora biti najmanje 1 milisekundu."
+
+#: effects/TruncSilence.h:28
+msgid "Truncate Silence..."
+msgstr "Presjeci tišinu ..."
+
+#: effects/TruncSilence.h:36
+msgid "Truncating Silence..."
+msgstr "Presjecanje tišine..."
+
+#: effects/VST/VSTEffect.cpp:165
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Nažalost, VST efekti se ne mogu izvesti na stereo snimcima, jer se pojedinačni kanali ne slažu."
+
+#: effects/VST/VSTEffect.cpp:180
+msgid "Can't process replacing"
+msgstr "Izmjenu nije moguće izvesti"
+
+#: effects/VST/VSTEffect.cpp:403
+msgid "VST Plug-in parameters:"
+msgstr "Parametri priključka VST:"
+
+#: effects/Wahwah.cpp:61
+#, c-format
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "Primjenjen efekt: frekvencija %s = %.1f Hz, početna faza = %.0f stepen, dubina = %.0f%%, rezonanca = %.1f, pomak frekvencije = %.0f%%"
+
+#: effects/Wahwah.cpp:72
+msgid "Wahwah"
+msgstr "Wah-wah"
+
+#: effects/Wahwah.cpp:253
+msgid "Depth (%):"
+msgstr "Dubina (%):"
+
+#: effects/Wahwah.cpp:269
+msgid "Resonance:"
+msgstr "Rezonancija:"
+
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
+#: effects/Wahwah.cpp:285
+msgid "Wah Frequency Offset (%):"
+msgstr "Razlika u frekvenciji wah (%):"
+
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
+#: effects/Wahwah.h:34
+msgid "Wahwah..."
+msgstr "Wah-wah ..."
+
+#: effects/Wahwah.h:42
+msgid "Applying Wahwah"
+msgstr "Primjenjivanje Wah-wah"
+
+#: effects/audiounits/AudioUnitEffect.cpp:133
+#: effects/ladspa/LadspaEffect.cpp:169
+#, c-format
+msgid "Performing Effect: %s"
+msgstr "Izvođenje efekta: %s"
+
+#: effects/ladspa/LadspaEffect.cpp:189
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Nažalost, priključeni efekti se ne mogu izvesti na stereo snimcima, jer se pojedinačni kanali ne slažu."
+
+#: effects/ladspa/LadspaEffect.cpp:573
+#: effects/ladspa/LadspaEffect.cpp:581
+#: prefs/QualityPrefs.cpp:72
+msgid "None"
+msgstr "Prazno"
+
+#: effects/ladspa/LadspaEffect.cpp:575
+#: effects/vamp/VampEffect.cpp:384
+msgid "Author: "
+msgstr "Autor: "
+
+#: effects/ladspa/LadspaEffect.cpp:608
+msgid "Effect Settings"
+msgstr "Postavke efekta"
+
+#: effects/ladspa/LadspaEffect.cpp:699
+msgid "Length (seconds)"
+msgstr "Dužina (u sekundama)"
+
+#: effects/lv2/LV2Effect.cpp:850 effects/lv2/LV2Effect.cpp:853
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:861 effects/lv2/LV2Effect.cpp:864
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:872 effects/lv2/LV2Effect.cpp:875
+msgid "Note key"
+msgstr ""
+
+#: effects/nyquist/Nyquist.cpp:252
+msgid "Applying Nyquist Effect..."
+msgstr "Dodavanje efekta Nyquist ..."
+
+#: effects/nyquist/Nyquist.cpp:259
+#: effects/nyquist/Nyquist.cpp:321
+msgid "Nyquist Prompt..."
+msgstr "Nyquist komanda..."
+
+#: effects/nyquist/Nyquist.cpp:322
+msgid "Enter Nyquist Command: "
+msgstr "Unesi Nyquist komandu:"
+
+#: effects/nyquist/Nyquist.cpp:412
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "Nažalost, efekt se ne može izvesti na stereo trakama, jer se trake ne slažu."
+
+#: effects/nyquist/Nyquist.cpp:440
+msgid "Nyquist"
+msgstr "Nyquist"
+
+#: effects/nyquist/Nyquist.cpp:441
+msgid "Nyquist Output: "
+msgstr "Izlaz Nyquista:"
+
+#: effects/nyquist/Nyquist.cpp:596
+#: effects/nyquist/Nyquist.cpp:607
+msgid "Nyquist returned the value:"
+msgstr "Nyquist je vratio vrijednost:"
+
+#: effects/nyquist/Nyquist.cpp:649
+msgid "Nyquist did not return audio.\n"
+msgstr "Nyquist nije vratio zvuk.\n"
+
+#: effects/nyquist/Nyquist.cpp:660
+msgid "Nyquist returned too many audio channels.\n"
+msgstr "Nyquist je vratio previše zvučnih kanala.\n"
+
+#: effects/vamp/VampEffect.cpp:75
+#, c-format
+msgid "Extracting features: %s"
+msgstr "Mogućnosti izvađivanja: %s"
+
+#: effects/vamp/VampEffect.cpp:106
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Nažalost, efekti Vamp se ne mogu izvesti na stereo snimcima, jer se pojedinačni kanali ne slažu."
+
+#: effects/vamp/VampEffect.cpp:120
+msgid "Sorry, failed to load Vamp Plug-in."
+msgstr "Nažalost, priključak Vamp nije bilo moguće učitati."
+
+#: effects/vamp/VampEffect.cpp:228
+msgid "Sorry, Vamp Plug-in failed to initialize."
+msgstr "Nažalost, priključa Vamp se nije uspio inicijalizirati."
+
+#: effects/vamp/VampEffect.cpp:376
+msgid " - Vamp audio analysis plugin"
+msgstr " - priključnik za zvučnu analizu Vamp"
+
+#: effects/vamp/VampEffect.cpp:423
+msgid "Plugin Settings"
+msgstr "Postavke priključka"
+
+#: effects/vamp/VampEffect.cpp:446
+msgid "Program"
+msgstr "Program"
+
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:445
+msgid "Export File"
+msgstr "Izvezi datoteku"
+
+#: export/Export.cpp:453
+msgid "&Options..."
+msgstr "&Opcije ..."
+
+#: export/Export.cpp:479
+msgid "Are you sure you want to save the file as \""
+msgstr "Da li ste da želite datoteku spremiti kao \""
+
+#: export/Export.cpp:495
+#, c-format
+msgid "You are about to save a %s file with the name \"%s\".\n"
+"\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
+"\n"
+"Are you sure you want to save the file under this name?"
+msgstr "Datoteku %s ćete spremitipod imenom \"%s\".\n"
+"\n"
+"Obično te datoteke imaju ekstenziju \".%s\" i neke aplikacije ne otvarajo datoteke s nestandardnim ekstenzjama.\n"
+"\n"
+"Da li ste sigurni, da želite spremiti datoteku pod tem imenom?"
+
+#: export/Export.cpp:516
+#, c-format
+msgid "A file named \"%s\" already exists.  Replace?"
+msgstr "Datoteka \"%s\" već postoji. Želite li je zamijeniti?"
+
+#: export/Export.cpp:598
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "Vaše trake će biti mješane u dva stereo kanala u izvoznoj datoteci."
+
+#: export/Export.cpp:603
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "Vaše trake će biti miješane u jedan mono kanal u izvoznoj datoteci."
+
+#: export/Export.cpp:613
+msgid "Advanced Mixing Options"
+msgstr "Napredne mogućnosti miješanja"
+
+#: export/Export.cpp:815
+#, c-format
+msgid "Channel: %2d"
+msgstr "Kanal: %2d"
+
+#: export/Export.cpp:938
+msgid " - Left"
+msgstr " - lijevi"
+
+#: export/Export.cpp:939
+msgid " - Right"
+msgstr " - desni"
+
+#: export/Export.cpp:1082
+msgid "Mixer Panel"
+msgstr ""
+
+#: export/Export.cpp:961
+#: export/Export.cpp:1006
+#, c-format
+msgid "Output Channels: %2d"
+msgstr "Izlazni kanali: %2d"
+
+#: export/ExportCL.cpp:55
+msgid "Specify Command Line Encoder"
+msgstr "Navedite koder u komandnoj liniji"
+
+#: export/ExportCL.cpp:70
+msgid "Command Line Export Setup"
+msgstr "Postavke izvoza iz komandne linije"
+
+#: export/ExportCL.cpp:75
+msgid "Command:"
+msgstr "Komanda:"
+
+#: export/ExportCL.cpp:80
+msgid "Show output"
+msgstr "Pokaži izlaz"
+
+#: export/ExportCL.cpp:87
+#, c-format
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "Podaci će biti datotečnim cijevima proslijeđeni na standardni ulaz. \"%f\" će biti zamijenjen s izbranim imenom izlazne datoteke."
+
+#: export/ExportCL.cpp:219
+msgid "(external program)"
+msgstr "(eksterni program)"
+
+#: export/ExportCL.cpp:248
+#: export/ExportPCM.cpp:367
+#, c-format
+msgid "Cannot export audio to %s"
+msgstr "Ne mogu izvesti zvuk u %s"
+
+#: export/ExportCL.cpp:322
+msgid "Exporting the selected audio using command-line encoder"
+msgstr "Izvoz označenog zvuka korištenjem kodera iz komandne linije"
+
+#: export/ExportCL.cpp:323
+msgid "Exporting the entire project using command-line encoder"
+msgstr "Izvoz cijeloga projekta upotrebom kodera komandne linije"
+
+#: export/ExportCL.cpp:387
+msgid "Command Output"
+msgstr "Izlaz komande"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:643
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:644
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr "Nevažeća frekvencija uzimanja uzoraka"
+
+#: export/ExportFFmpeg.cpp:720
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:723
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr "Možete ponovo uzeti uzorke na jednu od donjih vrijednosti."
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr "Frekvencije uzimanja uzoraka"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:112
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bitna brzina:"
+
+#: export/ExportFFmpegDialogs.cpp:157
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:168
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:211
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:230
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:275
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:294
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:341
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:360
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:488
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:489
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:795
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:884
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:885
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:886
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:887
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:888
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:889
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:896
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:903
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:904
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:906
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:109
+msgid "Language:"
+msgstr "Jezik:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:921
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:922
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:925
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kvalitet:"
+
+#: export/ExportFFmpegDialogs.cpp:928
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:930
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:933
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:936
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:952
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:953
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:955
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:956
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:958
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:959
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:961
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:962
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:964
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:967
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:989
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:991
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:992
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1211
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1230
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1270
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Datoteke XML (*.xml)|*.xml|Sve datoteke (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1290
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
+#: export/ExportFLAC.cpp:68
+msgid "Specify FLAC Options"
+msgstr "Postavite FLAC opcije"
+
+#: export/ExportFLAC.cpp:82
+msgid "0 (fastest)"
+msgstr "0 (najbrže)"
+
+#: export/ExportFLAC.cpp:83
+msgid "1"
+msgstr "1"
+
+#: export/ExportFLAC.cpp:84
+msgid "2"
+msgstr "2"
+
+#: export/ExportFLAC.cpp:85
+msgid "3"
+msgstr "3"
+
+#: export/ExportFLAC.cpp:86
+msgid "4"
+msgstr "4"
+
+#: export/ExportFLAC.cpp:87
+msgid "5"
+msgstr "5"
+
+#: export/ExportFLAC.cpp:88
+msgid "6"
+msgstr "6"
+
+#: export/ExportFLAC.cpp:89
+msgid "7"
+msgstr "7"
+
+#: export/ExportFLAC.cpp:90
+msgid "8 (best)"
+msgstr "8 (najbolje)"
+
+#: export/ExportFLAC.cpp:93
+msgid "16 bit"
+msgstr "16-bitno"
+
+#: export/ExportFLAC.cpp:94
+msgid "24 bit"
+msgstr "24-bitno"
+
+#: export/ExportFLAC.cpp:98
+msgid "FLAC Export Setup"
+msgstr "Postavke izvoza FLAC"
+
+#: export/ExportFLAC.cpp:102
+msgid "Level:"
+msgstr "Nivo:"
+
+#: export/ExportFLAC.cpp:104
+msgid "Bit depth:"
+msgstr "Bitovska dubina:"
+
+#: export/ExportFLAC.cpp:208
+msgid "FLAC Files"
+msgstr "Datoteke FLAC"
+
+#: export/ExportFLAC.cpp:310
+msgid "Exporting the selected audio as FLAC"
+msgstr "Izvoženje izbranoga zvuka kao FLAC"
+
+#: export/ExportFLAC.cpp:311
+msgid "Exporting the entire project as FLAC"
+msgstr "Izvoženje cijelog projekta kao FLAC"
+
+#: export/ExportMP2.cpp:108
+msgid "Specify MP2 Options"
+msgstr "Postavite MP2 Opcije"
+
+#: export/ExportMP2.cpp:129
+msgid "MP2 Export Setup"
+msgstr "Postavke izvoza MP2"
+
+#: export/ExportMP2.cpp:200
+msgid "MP2 Files"
+msgstr "Datoteke MP2"
+
+#: export/ExportMP2.cpp:229
+msgid "Cannot export MP2 with this sample rate and bit rate"
+msgstr "Izvoz u MP2 nije moguć pri toj frekvenciji uzimanja uzoraka i bitovske brzine"
+
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1713
+#: export/ExportOGG.cpp:183
+msgid "Unable to open target file for writing"
+msgstr "Nije moguće otvoriti odredišnu datoteku za upis"
+
+#: export/ExportMP2.cpp:274
+#, c-format
+msgid "Exporting selected audio at %d kbps"
+msgstr "Izvoz izabranog zvuka pri %d kb/s"
+
+#: export/ExportMP2.cpp:275
+#, c-format
+msgid "Exporting entire file at %d kbps"
+msgstr "Izvoz cijele datoteke pri %d kb/s"
+
+#. i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second
+#: export/ExportMP3.cpp:142
+#: export/ExportMP3.cpp:143
+#: export/ExportMP3.cpp:144
+#: export/ExportMP3.cpp:145
+#: export/ExportMP3.cpp:146
+#: export/ExportMP3.cpp:147
+#: export/ExportMP3.cpp:148
+#: export/ExportMP3.cpp:149
+#: export/ExportMP3.cpp:150
+#: export/ExportMP3.cpp:151
+#: export/ExportMP3.cpp:152
+#: export/ExportMP3.cpp:153
+#: export/ExportMP3.cpp:154
+#: export/ExportMP3.cpp:155
+#: export/ExportMP3.cpp:156
+#: export/ExportMP3.cpp:157
+#: export/ExportMP3.cpp:158
+#: export/ExportMP3.cpp:159
+msgid "kbps"
+msgstr "kb/s"
+
+#: export/ExportMP3.cpp:242
+msgid "(Best Quality)"
+msgstr ""
+
+#: export/ExportMP3.cpp:243
+msgid "(Smaller files)"
+msgstr ""
+
+#: export/ExportMP3.cpp:178
+msgid "Fast"
+msgstr "Brzo"
+
+#: export/ExportMP3.cpp:179
+msgid "Standard"
+msgstr "Standardno"
+
+#: export/ExportMP3.cpp:250
+msgid "Insane"
+msgstr ""
+
+#: export/ExportMP3.cpp:251
+msgid "Extreme"
+msgstr ""
+
+#: export/ExportMP3.cpp:253
+msgid "Medium"
+msgstr ""
+
+#: export/ExportMP3.cpp:249
+msgid "Specify MP3 Options"
+msgstr "Odredi MP3 opcije"
+
+#: export/ExportMP3.cpp:264
+#: prefs/FileFormatPrefs.cpp:101
+msgid "MP3 Export Setup"
+msgstr "MP3 postavke za Izvoz"
+
+#: export/ExportMP3.cpp:271
+msgid "Bit Rate Mode:"
+msgstr "Režim bitovske brzine:"
+
+#: export/ExportMP3.cpp:276
+msgid "Preset"
+msgstr "Predefinisano"
+
+#: export/ExportMP3.cpp:277
+msgid "Variable"
+msgstr "Promjenjiva"
+
+#: export/ExportMP3.cpp:278
+msgid "Average"
+msgstr "Prosječno"
+
+#: export/ExportMP3.cpp:279
+msgid "Constant"
+msgstr "Konstanta"
+
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Kvalitet"
+
+#: export/ExportMP3.cpp:324
+msgid "Variable Speed:"
+msgstr "Promjenljiva brzina:"
+
+#: export/ExportMP3.cpp:331
+msgid "Channel Mode:"
+msgstr "Kanalski režim:"
+
+#: export/ExportMP3.cpp:336
+msgid "Joint Stereo"
+msgstr "Spojeni stereo"
+
+#: export/ExportMP3.cpp:337
+msgid "Stereo"
+msgstr "Stereo"
+
+#: export/ExportMP3.cpp:481
+msgid "Locate Lame"
+msgstr "Nađi Lame"
+
+#: export/ExportMP3.cpp:501
+#, c-format
+msgid "Audacity needs the file %s to create MP3s."
+msgstr "Audacity zahtijeva datoteku %s za stvaranje datoteke MP3."
+
+#: export/ExportMP3.cpp:523
+msgid "To get a free copy of Lame, click here -->"
+msgstr "Ako želite bezplatnu kopiju programa Lame, kliknite ovdje -->"
+
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
+#: export/ExportMP3.cpp:1038
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Samo lame_enc.dll|lame_enc.dll|Dinamički povezane biblioteke (*.dll)|*.dll|Sve datoteke (*.*)|*"
+
+#: export/ExportMP3.cpp:1493
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Samo libmp3lame.dylib|libmp3lame.dylib|Dinamičke biblioteke (*.dylib)|*.dylib|Sve datoteke (*)|*"
+
+#: export/ExportMP3.cpp:1363
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Samo libmp3lame.so|libmp3lame.so|Dijeljene objektne datoteke (*.so)|*.so|Proširene biblioteke (*.so*)|*.so*|Vse datoteke (*)|*"
+
+#: export/ExportMP3.cpp:1592
+msgid "MP3 Files"
+msgstr "Datoteke MP3"
+
+#: export/ExportMP3.cpp:1615
+msgid "Could not open MP3 encoding library!"
+msgstr "Greška pri otvaranju biblioteke za MP3 kodiranje!"
+
+#: export/ExportMP3.cpp:1622
+msgid "Not a valid or supported MP3 encoding library!"
+msgstr "Nevažeća ili nepodržana biblioteka za MP3 kodiranje!"
+
+#: export/ExportMP3.cpp:1699
+msgid "Unable to initialize MP3 stream"
+msgstr "Nije moguće inicijalizirati MP3 tok"
+
+#: export/ExportMP3.cpp:1744
+#, c-format
+msgid "Exporting selected audio with %s preset"
+msgstr "Izvoz izbranog zvuka s postavkom  %s"
+
+#: export/ExportMP3.cpp:1745
+#, c-format
+msgid "Exporting entire file with %s preset"
+msgstr "Izvoženje cijele datoteke s postavkom %s"
+
+#: export/ExportMP3.cpp:1750
+#, c-format
+msgid "Exporting selected audio with VBR quality %s"
+msgstr "Izvoženje izbranoga zvuka pri kvalitetu VBR %s"
+
+#: export/ExportMP3.cpp:1751
+#, c-format
+msgid "Exporting entire file with VBR quality %s"
+msgstr "Izvoženje cijele datoteke s kvalitetom VBR %s"
+
+#: export/ExportMP3.cpp:1756
+#, c-format
+msgid "Exporting selected audio at %d Kbps"
+msgstr "Izvoženje izbranoga zvuka pri %d Kb/s"
+
+#: export/ExportMP3.cpp:1757
+#, c-format
+msgid "Exporting entire file at %d Kbps"
+msgstr "Izvoženje cijele datoteke pri %d Kb/s"
+
+#: export/ExportMP3.cpp:1790
+#, c-format
+msgid "Error %d returned from MP3 encoder"
+msgstr "Koder za MP3 je vratio grešku %d"
+
+#: export/ExportMP3.cpp:1876
+#, c-format
+msgid "The project sample rate (%d) is not supported by the MP3\n"
+"file format.  "
+msgstr "Frekvenciju uzimanja uzoraka projekta (%d) zapis MP3 ne podpira."
+
+#: export/ExportMP3.cpp:1879
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the MP3 file format.  "
+msgstr "Kombinacije frekvencije uzimanja uzoraka projekta (%d) i bitovskog uzimanja uzoraka (%d kb/s)\n"
+"zapis MP3 ne podpira.  "
+
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
+
+#: export/ExportMultiple.cpp:88
+#: export/ExportMultiple.cpp:362
+#: export/ExportMultiple.cpp:609
+#: export/ExportMultiple.cpp:717
+msgid "Export Multiple"
+msgstr "Izvoz više"
+
+#: export/ExportMultiple.cpp:152
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
+"or if you have a Label Track, you can export a new file for each label.\n"
+"\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "Ako imate više od jedne zvučne trake, možete izvesti svako traku kao posebnu datoteku,\n"
+"ali ako imate trak s oznakama, možete izvesti novu datoteku za svaku oznaku.\n"
+"\n"
+"Ovaj projekt nema višestruke trake ili trake s oznakama, zato ne možete izvoziti više datoteka istovremeno."
+
+#: export/ExportMultiple.cpp:153
+msgid "Can't export multiple files"
+msgstr "Nije moguće izvoziti više datoteka."
+
+#: export/ExportMultiple.cpp:188
+msgid "Export format:"
+msgstr "Oblik zapisa za izvoz:"
+
+#: export/ExportMultiple.cpp:195
+msgid "Options..."
+msgstr "Opcije ..."
+
+#: export/ExportMultiple.cpp:198
+msgid "Export location:"
+msgstr "Lokacija  za izvoz:"
+
+#: export/ExportMultiple.cpp:204
+#: prefs/DirectoriesPrefs.cpp:92
+msgid "Choose..."
+msgstr "Izaberi ..."
+
+#: export/ExportMultiple.cpp:205
+msgid "Create"
+msgstr "Kreiraj"
+
+#: export/ExportMultiple.cpp:212
+msgid "Split files based on:"
+msgstr "Razdijeli datoteke prema:"
+
+#: export/ExportMultiple.cpp:222
+msgid "Labels"
+msgstr "Oznake"
+
+#: export/ExportMultiple.cpp:227
+msgid "Include audio before first label"
+msgstr "Uključi zvuk prije prve oznake"
+
+#: export/ExportMultiple.cpp:233
+msgid "First file name:"
+msgstr "Ime prve datoteke:"
+
+#: export/ExportMultiple.cpp:277
+msgid "First file name"
+msgstr ""
+
+#: export/ExportMultiple.cpp:246
+msgid "Tracks"
+msgstr "Trake"
+
+#: export/ExportMultiple.cpp:253
+msgid "Name files:"
+msgstr "Imenujte datoteke:"
+
+#: export/ExportMultiple.cpp:263
+msgid "Using Label/Track Name"
+msgstr "Upotreba oznake/imena trake"
+
+#: export/ExportMultiple.cpp:270
+msgid "Numbering consecutively"
+msgstr "Brojanje po redu"
+
+#: export/ExportMultiple.cpp:276
+msgid "File name prefix:"
+msgstr "Prefiks imena datoteke:"
+
+#: export/ExportMultiple.cpp:324
+msgid "File name prefix"
+msgstr ""
+
+#: export/ExportMultiple.cpp:294
+msgid "Overwrite existing files"
+msgstr "Prepiši postojeće datoteke"
+
+#: export/ExportMultiple.cpp:360
+#, c-format
+msgid "\"%s\" successfully created."
+msgstr "\"%s\" je bila uspješno kreirana."
+
+#: export/ExportMultiple.cpp:369
+msgid "Choose a location to save the exported files"
+msgstr "Izaberite lokaciju, gdje će biti spremljene izvezene datoteke."
+
+#: export/ExportMultiple.cpp:480
+#, c-format
+msgid "\"%s\" doesn't exist.\n"
+"\n"
+"Would you like to create it?"
+msgstr "\"%s\" ne postoji.\n"
+"\n"
+"Da li je želite kreirati?"
+
+#: export/ExportMultiple.cpp:640 export/ExportMultiple.cpp:785
+msgid "Edit metadata"
+msgstr ""
+
+#: export/ExportMultiple.cpp:606
+#: export/ExportMultiple.cpp:714
+#, c-format
+msgid "Successfully exported %d file(s)."
+msgstr "Uspješno izvezenih %d datoteka."
+
+#: export/ExportMultiple.cpp:607
+#: export/ExportMultiple.cpp:715
+#, c-format
+msgid "Something went wrong after exporting %d file(s)."
+msgstr "Po izvozu %d datotek(e) je nešto bilo neuspješno."
+
+#: export/ExportMultiple.cpp:898
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
+#: export/ExportOGG.cpp:64
+msgid "Specify Ogg Vorbis Options"
+msgstr "Navedite opcije Ogg Vorbis"
+
+#: export/ExportOGG.cpp:81
+msgid "Ogg Vorbis Export Setup"
+msgstr "Postavke izvoza Ogg Vorbis"
+
+#: export/ExportOGG.cpp:155
+msgid "Ogg Vorbis Files"
+msgstr "Datoteke Ogg Vorbis"
+
+#: export/ExportOGG.cpp:254
+msgid "Exporting the selected audio as Ogg Vorbis"
+msgstr "Izvoz izabranog zvuka u Ogg Vorbis"
+
+#: export/ExportOGG.cpp:255
+msgid "Exporting the entire project as Ogg Vorbis"
+msgstr "Izvoz cijelog projekta u Ogg Vorbis"
+
+#: export/ExportPCM.cpp:119
+msgid "Specify Uncompressed Options"
+msgstr ""
+
+#: export/ExportPCM.cpp:171
+msgid "Uncompressed Export Setup"
+msgstr "Postavke nekompresovanog izvoza"
+
+#: export/ExportPCM.cpp:181
+msgid "Header:"
+msgstr "Zaglavlje:"
+
+#: export/ExportPCM.cpp:185
+msgid "Encoding:"
+msgstr "Kodiranje: "
+
+#: export/ExportPCM.cpp:190
+msgid "(Not all combinations of headers and encodings are possible.)"
+msgstr "(Nisu sve kombinacije zaglavlja i kodiranja moguće.)"
+
+#: export/ExportPCM.cpp:359
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:377
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:388
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:399
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "Cannot export audio in this format."
+msgstr "Ne mogu izvoziti zvuk u tom formatu."
+
+#: export/ExportPCM.cpp:400
+#, c-format
+msgid "Exporting the selected audio as %s"
+msgstr "Izvoženje izbranog zvuka kao %s"
+
+#: export/ExportPCM.cpp:402
+#, c-format
+msgid "Exporting the entire project as %s"
+msgstr "Izvoženje cielog projekta kao %s"
+
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:436
+#, c-format
+msgid "Error (file may not have been written): %s"
+msgstr "Greška (datoteka možda nije bila zapisana): %s"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr "Datoteke MP3"
+
+#: import/Import.cpp:176
+msgid "Select stream(s) to import"
+msgstr ""
+
+#: import/Import.cpp:154
+#, c-format
+msgid "This version of Audacity was not compiled with %s support."
+msgstr "U toj verziji Audacity podrška za %s nije prevedena."
+
+#: import/Import.cpp:242
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:167
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
+"Audacity cannot open audio CDs directly. \n"
+"Extract (rip) the CD tracks to an audio format that \n"
+"Audacity can import, such as WAV or AIFF."
+msgstr " \"%s\" je traka zvučnog CD.\n"
+"Audacity ne može direktno otvoriti audio CD.\n"
+"Ekstraktujte CD traku u audio format koji\n"
+"Audacity može otvoriti, kao na primjer WAV ili AIFF."
+
+#: import/Import.cpp:173
+#, c-format
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr "\"%s\" je datoteka spiska izvođenja.\n"
+"Audacity tu datoteke ne može otvoriti, jer sadrži samo veze na druge datoteke.\n"
+"Otvorite je u uređivaču teksta i preuzmite stvarne zvučne datoteke."
+
+#: import/Import.cpp:178
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
+"Audacity cannot open this type of file due to patent restrictions. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" je zvučna datoteka Windows Media Audio. \n"
+"Audacity tu vrstu datoteka ne može otvoriti zbog patentnih ograničenja.\n"
+"Morate je pretvoriti u podržani zvučni zapis, kao što su WAV i AIFF."
+
+#: import/Import.cpp:183
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" je datoteka Advanced Audio Coding. \n"
+"Audacity ne može otvoriti tu vrstu datoteka.\n"
+"Morate je pretvoriti u podržanu vrstu zvučnih datoteka, kao što su WAV i AIFF."
+
+#: import/Import.cpp:273
+#, c-format
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
+"Audacity cannot open this type of file due to the encryption. \n"
+"Try recording the file into Audacity, or burn it to audio CD then \n"
+"extract the CD track to a supported audio format such as WAV or AIFF."
+msgstr "\"%s\" je šifrirana zvučna datoteka, tipično iz Internet muzičke trgovine. \n"
+"Audacity ne može otvoriti tu vrstu datoteka zbog šifriranja.\n"
+"Pokušajte datoteku snimiti u Audacity ili je zapeći na zvučni CD,\n"
+"zatim CD ekstraktovati u  podržanu vrstu zvučnih datoteka, kao što su WAV i AIFF."
+
+#: import/Import.cpp:193
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
+"Audacity cannot open this proprietary format. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" je medijska datoteka RealPlayer. \n"
+"Audacity ne može otvoriti ovaj zaštićeni format.\n"
+"Morate  je pretvoriti u  podržanu vrstu zvučnih datoteka, kao što su WAV i AIFF."
+
+#: import/Import.cpp:284
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:290
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:296
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:302
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:308
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:314
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:319
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:324
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:35
+msgid "FLAC files"
+msgstr "Datoteke FLAC"
+
+#: import/ImportLOF.cpp:92
+msgid "List of Files in basic text format"
+msgstr "Spisak datoteka u osnovnom tekstualnom zapisu"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:318
+msgid "Invalid window offset in LOF file."
+msgstr "Pogrešan pomak prozora u LOF datoteci."
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:320
+#: import/ImportLOF.cpp:341
+#: import/ImportLOF.cpp:415
+#: import/ImportLOF.cpp:435
+msgid "LOF Error"
+msgstr "Greška LOF"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:339
+msgid "Invalid duration in LOF file."
+msgstr "Nepravilna dužina datoteke LOF."
+
+#: import/ImportLOF.cpp:414
+msgid "MIDI tracks cannot be offset individually, only audio files can be."
+msgstr "MIDI trake ne mogu pojedinačno pomjerene, samo zvučne datoteke."
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:434
+msgid "Invalid track offset in LOF file."
+msgstr "Nevažeći pomak trake u datoteci LOF."
+
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
+
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
+
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
+
+#: import/ImportOGG.cpp:35
+msgid "Ogg Vorbis files"
+msgstr "Datoteke Ogg Vorbis"
+
+#: import/ImportOGG.cpp:141
+msgid "Media read error"
+msgstr "Greška pri čitanju"
+
+#: import/ImportOGG.cpp:144
+msgid "Not an Ogg Vorbis file"
+msgstr "Ovo nije datoteka Ogg Vorbis"
+
+#: import/ImportOGG.cpp:147
+msgid "Vorbis version mismatch"
+msgstr "Neusklađenost verzije Vorbis"
+
+#: import/ImportOGG.cpp:150
+msgid "Invalid Vorbis bitstream header"
+msgstr "Nepravilno zaglavlje Vorbis bitstream"
+
+#: import/ImportOGG.cpp:153
+msgid "Internal logic fault"
+msgstr "Interna logička greška"
+
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF i druge nekompresovane vrste"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
+#, c-format
+msgid "Importing %s"
+msgstr ""
+
+#: import/ImportQT.cpp:21
+msgid "QuickTime files"
+msgstr "Datoteke QuickTime"
+
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
+#: import/ImportRaw.cpp:278
+msgid "Import Raw Data"
+msgstr "Uvezi sirove podatke"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:337
+msgid "No endianness"
+msgstr "Nebitan endian"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:340
+msgid "Little-endian"
+msgstr "little-endian"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:343
+msgid "Big-endian"
+msgstr "Big-endian"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:346
+msgid "Default endianness"
+msgstr "Podrazumijevani endian"
+
+#: import/ImportRaw.cpp:370
+msgid "1 Channel (Mono)"
+msgstr "1 kanal (Mono)"
+
+#: import/ImportRaw.cpp:371
+msgid "2 Channels (Stereo)"
+msgstr "2 kanala (Stereo)"
+
+#: import/ImportRaw.cpp:373
+#, c-format
+msgid "%d Channels"
+msgstr "%d kanala"
+
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
+#: import/ImportRaw.cpp:386
+msgid "Start offset:"
+msgstr "Početni pomak:"
+
+#: import/ImportRaw.cpp:397
+msgid "Amount to import:"
+msgstr "Količina za uvoz:"
+
+#: import/ImportRaw.cpp:408
+msgid "Sample rate:"
+msgstr "Brzina uzimanja uzoraka:"
+
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+msgid "Audio I/O"
+msgstr "Zvučni U/I"
+
+#: prefs/AudioIOPrefs.cpp:100
+msgid "1 (Mono)"
+msgstr "1 (mono)"
+
+#: prefs/AudioIOPrefs.cpp:101
+msgid "2 (Stereo)"
+msgstr "2 (stereo)"
+
+#: prefs/AudioIOPrefs.cpp:115
+msgid "Playback"
+msgstr "Reprodukcija"
+
+#: prefs/AudioIOPrefs.cpp:119
+#: prefs/AudioIOPrefs.cpp:137
+#: toolbars/DeviceToolBar.cpp:54
+msgid "Device"
+msgstr "Uređaj"
+
+#: prefs/AudioIOPrefs.cpp:122
+msgid "Using:"
+msgstr "Koristeći:"
+
+#: prefs/AudioIOPrefs.cpp:123
+msgid "Portaudio v"
+msgstr "Portaudio v"
+
+#: prefs/AudioIOPrefs.cpp:133
+msgid "Recording"
+msgstr "Snimanje"
+
+#: prefs/AudioIOPrefs.cpp:139
+msgid "Channels"
+msgstr "Kanali"
+
+#: prefs/AudioIOPrefs.cpp:145
+msgid "Playthrough"
+msgstr "Emituj kroz"
+
+#: prefs/AudioIOPrefs.cpp:150
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:150
+msgid "&Hardware Playthrough: Play new track while recording it"
+msgstr "&Hardversko emitovanje kroz: Emituj novu traku tokom njenog snimanja"
+
+#: prefs/AudioIOPrefs.cpp:152
+msgid "&Software Playthrough: Play new track while recording it"
+msgstr "&Programsko emitovanje kroz: Emituj novu traku u toku njenog snimanja"
+
+#: prefs/AudioIOPrefs.cpp:158
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:161
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:162
+msgid "Effects Preview"
+msgstr "Predslušavanje efekata"
+
+#: prefs/AudioIOPrefs.cpp:165
+msgid "Length of preview:"
+msgstr "Dužina predslušanja:"
+
+#: prefs/AudioIOPrefs.cpp:170
+msgid "Cut Preview"
+msgstr "Predslušanje izrezanog"
+
+#: prefs/AudioIOPrefs.cpp:173
+msgid "Preview before cut region:"
+msgstr "Predslušanje prije izrezanog područja:"
+
+#: prefs/AudioIOPrefs.cpp:175
+msgid "Preview after cut region:"
+msgstr "Predslušanje nakon izrezanog područja:"
+
+#: prefs/AudioIOPrefs.cpp:183
+msgid "Latency"
+msgstr "Latencija"
+
+#: prefs/AudioIOPrefs.cpp:196
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:199
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:197
+msgid "Seek Time when playing"
+msgstr "Vrijeme pretrage pri reprodukciji"
+
+#: prefs/AudioIOPrefs.cpp:200
+msgid "Short period:"
+msgstr "Kraći period:"
+
+#: prefs/AudioIOPrefs.cpp:202
+msgid "Long period:"
+msgstr "Duži period:"
+
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
+msgid "Batch"
+msgstr "Paketni način"
+
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:70
+msgid "Behaviors"
+msgstr "Ponašanja"
+
+#: prefs/BatchPrefs.cpp:80
+msgid "&Don't apply effects in batch mode"
+msgstr "&Ne primjenjuj efekte u paketnom režimu"
+
+#: prefs/BatchPrefs.cpp:85
+msgid "Cl&eanSpeech Mode (Customized GUI)"
+msgstr "Režim Čisti&Govor (prilagođen grafički interfejs)"
+
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:279
+msgid "Directories"
+msgstr "Direktoriji"
+
+#: prefs/DirectoriesPrefs.cpp:87
+msgid "Temporary files directory"
+msgstr "Direktorij privremenih datoteka"
+
+#: prefs/DirectoriesPrefs.cpp:91
+msgid "Location:"
+msgstr "Lokacija:"
+
+#: prefs/DirectoriesPrefs.cpp:93
+msgid "Free Space:"
+msgstr "Slobodni prostor:"
+
+#: prefs/DirectoriesPrefs.cpp:99
+msgid "Auto save"
+msgstr "Automatski spremi"
+
+#: prefs/DirectoriesPrefs.cpp:101
+msgid "Auto save a copy of the project in a separate folder"
+msgstr "Automatski sprema kopiju projekta u odvojeni direktorij"
+
+#: prefs/DirectoriesPrefs.cpp:104
+msgid "Auto save interval:"
+msgstr "Interval za automatsko spremanje"
+
+#: prefs/DirectoriesPrefs.cpp:105
+msgid "minutes"
+msgstr "minuta"
+
+#: prefs/DirectoriesPrefs.cpp:110
+msgid "Audio cache"
+msgstr "Zvučna međumemorija"
+
+#: prefs/DirectoriesPrefs.cpp:112
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
+
+#: prefs/DirectoriesPrefs.cpp:121
+msgid "Choose a location to place the temporary directory"
+msgstr "Izberite lokacijo, gdje će biti privremeni direktorij"
+
+#: prefs/DirectoriesPrefs.cpp:166
+#, c-format
+msgid "Directory %s does not exist. Create it?"
+msgstr "Direktorij %s ne postoji. Želite li ga kreirati?"
+
+#: prefs/DirectoriesPrefs.cpp:168
+msgid "New Temporary Directory"
+msgstr "Novi privremeni direktorij"
+
+#: prefs/DirectoriesPrefs.cpp:187
+#, c-format
+msgid "Directory %s is not writable"
+msgstr "Direktorij %s nije upisiv"
+
+#: prefs/DirectoriesPrefs.cpp:199
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "Promjene u privremenom direktoriju neće biti efektivne do narednog starta Audacityja."
+
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:104
+msgid "MP3 Library Version:"
+msgstr "MP3 verzija biblioteke:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "When saving a project that depends on other audio files"
+msgstr "Pri spremanju projekta, koji je ovisan od drugih zvučnih datoteka"
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "Always &copy all audio into project (safest)"
+msgstr "Uvijek &kopiraj sav zvuk u projekt (najsigurnije)"
+
+#: prefs/FileFormatPrefs.cpp:88
+msgid "&Do not copy any audio"
+msgstr "&Ne kopiraj zvuk"
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "&Ask user"
+msgstr "Pitaj &korisnika"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "When exporting tracks to an audio file"
+msgstr "Prilikom izvoza traka u zvučnu datoteku"
+
+#: prefs/FileFormatPrefs.cpp:96
+msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
+msgstr "Uvijek &miješaj sve trake na stereo ili mono kanal(ima)."
+
+#: prefs/FileFormatPrefs.cpp:97
+msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
+msgstr "&Upotrijebi miješanje po mjeri (npr. za izvoz višekanalne datoteke 5.1)"
+
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
+msgstr "Prikaži &uređivač metapodataka prije izvoza"
+
+#: prefs/GUIPrefs.cpp:33
+#: prefs/GUIPrefs.cpp:34
+msgid "Interface"
+msgstr "Interfejs"
+
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:72
+msgid "&Update display while playing"
+msgstr "&Ažuriraj ekran tokom izvođenja"
+
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:76
+msgid "Enable &dragging of left and right selection edges"
+msgstr "Omogući &prevlačenje lijeve i desne ivice izbora"
+
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:80
+msgid "Automatically &fit tracks vertically zoomed"
+msgstr "Automatski &utisni vrtikalno uvećane trake"
+
+#: prefs/GUIPrefs.cpp:104
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"Pomjeri fokus na trakama\" &ciklično kruži po trakama"
+
+#: prefs/GUIPrefs.cpp:86
+msgid "Editing a &clip can move other clips"
+msgstr "Uređivanje &snimka može pomaći druge snimke"
+
+#: prefs/GUIPrefs.cpp:88
+msgid "&Select all audio in project, if none selected"
+msgstr "&Ako nije ništa izabrano, izaberi sve zvukove projekta."
+
+#: prefs/GUIPrefs.cpp:90
+msgid "&Beep on completion of longer activities"
+msgstr "&Zapiskaj na kraju daljnjih operacija"
+
+#: prefs/BatchPrefs.cpp:89
+#: prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr "Pokaži / Skrij"
+
+#: prefs/GUIPrefs.cpp:96
+msgid "Enable cut &lines"
+msgstr "Omogući &linije rezova"
+
+#: prefs/GUIPrefs.cpp:98
+msgid "Show warnings about &temp files"
+msgstr "Pokaži upozorenja o &privremenim datotekama"
+
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:122
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
+msgstr "Pokaži pozdravnu poruku pri startu programa"
+
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:115
+msgid "-36 dB (shallow range for high-amplitude editing)"
+msgstr "-36 dB (plitak obseg za visoko-amplitudno uređivanje)"
+
+#: prefs/GUIPrefs.cpp:116
+msgid "-48 dB (PCM range of 8 bit samples)"
+msgstr "-48 dB (opseg PCM za 8-bitne uzorke)"
+
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:117
+msgid "-96 dB (PCM range of 16 bit samples)"
+msgstr "-96 dB (opseg PCM za 16-bitn uzorke)"
+
+#: prefs/GUIPrefs.cpp:118
+msgid "-120 dB (approximate limit of human hearing)"
+msgstr "-120 dB (približna granica čovjekovog sluha)"
+
+#: prefs/GUIPrefs.cpp:119
+msgid "-145 dB (PCM range of 24 bit samples)"
+msgstr "-145 dB (opseg PCM za 24-bitne uzorke)"
+
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
+msgid "Keyboard"
+msgstr "Tastatura"
+
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:95
+msgid "Key Bindings"
+msgstr "Tasteri za kratice"
+
+#: prefs/KeyConfigPrefs.cpp:115
+msgid "S&et"
+msgstr "P&ostavi"
+
+#: prefs/KeyConfigPrefs.cpp:120
+msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
+msgstr "Napomena: s pritiskom na Cmd+Q prekidate program. Sve druge tipke so važeće."
+
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
+msgid "&Defaults"
+msgstr "&Podrazumijevano"
+
+#: prefs/KeyConfigPrefs.cpp:143
+msgid "Key Combination"
+msgstr "Kombinacija tastera"
+
+#: prefs/KeyConfigPrefs.cpp:163
+msgid "Export Keyboard Shortcuts As:"
+msgstr "Izvezi kratice kao:"
+
+#: prefs/KeyConfigPrefs.cpp:181
+msgid "Error saving keyboard shortcuts"
+msgstr "Greška pri spremanju kratica"
+
+#: prefs/KeyConfigPrefs.cpp:196
+msgid "Select an XML file containing Audacity keyboard shortcuts..."
+msgstr "Izaberite datoteku XML s kraticama Audacity ..."
+
+#: prefs/KeyConfigPrefs.cpp:213
+msgid "Error loading keyboard shortcuts"
+msgstr "Greška pri učitavanju kratica"
+
+#: prefs/KeyConfigPrefs.cpp:241
+#, c-format
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
+"\n"
+"'%s'"
+msgstr "Kratica tastature '%s' je već dodijeljena za:\n"
+"\n"
+"'%s'"
+
+#: prefs/KeyConfigPrefs.cpp:367
+#: toolbars/EditToolBar.cpp:144
+msgid "Undo"
+msgstr "Poništi"
+
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Emituj &druge trake tokom snimanja nove"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:189
+msgid "Audio to buffer:"
+msgstr "Zvuk u međumemoriju:"
+
+#: prefs/AudioIOPrefs.cpp:192
+msgid "Latency correction:"
+msgstr "Popravak latencije:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
+msgid "Mouse"
+msgstr "Miš"
+
+#: prefs/MousePrefs.cpp:78
+msgid "Mouse Bindings (default values, not configurable)"
+msgstr "Akcije miša (preuzete vrijednosti, ne mogu se konfigurisati)"
+
+#: prefs/MousePrefs.cpp:93
+msgid "Tool"
+msgstr "Alat"
+
+#: prefs/MousePrefs.cpp:94
+msgid "Command Action"
+msgstr "Akcije komandi"
+
+#: prefs/MousePrefs.cpp:95
+msgid "Buttons"
+msgstr "Tasteri"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
+msgid "Left-Click"
+msgstr "Lijevi klik"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
+msgid "Select"
+msgstr "Izaberi"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
+msgid "Set Selection Point"
+msgstr "Postavi tačku izbora"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
+msgid "Left-Drag"
+msgstr "Lijevi-povuci"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
+msgid "Set Selection Range"
+msgstr "Postavi opseg izbora"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Extend Selection Range"
+msgstr "Raširi opseg izbora"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Shift-Left-Click"
+msgstr "Shift-lijevi-klik"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Left-Double-Click"
+msgstr "Lijevi dvoklik"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Select Clip or Entire Track"
+msgstr "Izaberite snimak ili cijelu traku"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Ctrl-Left-Click"
+msgstr "Ctrl-lijevi-klik"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Set Selection Point and Play"
+msgstr "Postavi tačku izbora i emituj"
+
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom"
+msgstr "Povećanje"
+
+#: prefs/MousePrefs.cpp:104
+msgid "Zoom in on Point"
+msgstr "Povećaj na tački"
+
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Zoom in on a Range"
+msgstr "Povećaj na području"
+
+#: prefs/MousePrefs.cpp:105
+msgid "same as right-drag"
+msgstr "jednako kao desno-povlačenje"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Right-Click"
+msgstr "Desni klik"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Zoom out one step"
+msgstr "Umanji za jedan korak"
+
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Right-Drag"
+msgstr "Desni-povuci"
+
+#: prefs/MousePrefs.cpp:107
+msgid "same as left-drag"
+msgstr "jednako kao lijevo-povuci"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Shift-Drag"
+msgstr "Shift-povuci"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Zoom out on a Range"
+msgstr "Umanji na području"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Middle-Click"
+msgstr "Srednji klik"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom default"
+msgstr "Podrazumijevano uvećanje"
+
+#: prefs/MousePrefs.cpp:111
+msgid "Time shift clip or move up/down between tracks"
+msgstr "Vremenski pomakni snimak ili se pomakni gore/dolje među trakama"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Shift-Left-Drag"
+msgstr "Shift-lijevo-povlačenje"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Time shift all clips in track"
+msgstr "Vremenski pomakni sve snimke na traci"
+
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
+msgid "Ctrl-Left-Drag"
+msgstr "Ctrl-lijevi-povuci"
+
+#: prefs/MousePrefs.cpp:113
+msgid "Move clip up/down between tracks"
+msgstr "Pomjeri snimak gore/dolje među trakama"
+
+#: prefs/MousePrefs.cpp:115
+msgid "Change Amplification Envelope"
+msgstr "Promijeni ovojnicu pojačanja"
+
+#: prefs/MousePrefs.cpp:117
+msgid "Change Sample"
+msgstr "Promijeni uzorak"
+
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
+msgid "Pencil"
+msgstr "Olovka"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Alt-Left-Click"
+msgstr "Alt-lijevi-klik"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Smooth at Sample"
+msgstr "Izgladi na uzorku"
+
+#: prefs/MousePrefs.cpp:119
+msgid "Change Several Samples"
+msgstr "Promijeni više uzoraka"
+
+#: prefs/MousePrefs.cpp:120
+msgid "Change ONE Sample only"
+msgstr "Promijeni samo jedan uzorak"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "Multi"
+msgstr "Višestruko"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+msgid "same as select tool"
+msgstr "isto kao alat za izbor"
+
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "same as zoom tool"
+msgstr "isto kao alat za povećanje"
+
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
+msgid "Any"
+msgstr "Bilo koji"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Scroll up or down"
+msgstr "Pomjeri ekran gore ili dolje"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Wheel-Rotate"
+msgstr "Rotacija točkića"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Scroll left or right"
+msgstr "Pomjeri ekran  lijevo ili desno"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Shift-Wheel-Rotate"
+msgstr "Shift-rotacija točkića"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Ctrl-Wheel-Rotate"
+msgstr "Ctrl-rotacija točkića"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Zoom in or out"
+msgstr "Povećaj ili umanji"
+
+#: prefs/PrefsDialog.cpp:89
+msgid "Audacity Preferences"
+msgstr "Postavke Audacity"
+
+#: prefs/QualityPrefs.cpp:73
+msgid "Rectangle"
+msgstr "ÄŒetvorougao"
+
+#: prefs/QualityPrefs.cpp:74
+msgid "Triangle"
+msgstr "Trougao"
+
+#: prefs/QualityPrefs.cpp:75
+msgid "Shaped"
+msgstr "Oblikovano"
+
+#: prefs/QualityPrefs.cpp:122
+msgid "Sampling"
+msgstr "Uzimanje uzoraka"
+
+#: prefs/QualityPrefs.cpp:125
+msgid "Default Sample Rate:"
+msgstr "Podrazumijevana frekvencija uzimanja uzoraka:"
+
+#: prefs/QualityPrefs.cpp:127
+msgid "Default Sample Format:"
+msgstr "Podrazumijevani oblik uzorca:"
+
+#: prefs/QualityPrefs.cpp:136
+msgid "Real-time sample rate converter:"
+msgstr "Pretvarač frekvencije uzimanja uzoraka u realnom vremenu:"
+
+#: prefs/QualityPrefs.cpp:139
+msgid "High-quality sample rate converter:"
+msgstr "Visokokvalitetni pretvarač frekvencije uzimanja uzoraka:"
+
+#: prefs/QualityPrefs.cpp:142
+msgid "Real-time dither:"
+msgstr "Trepet u realnom vremenu:"
+
+#: prefs/QualityPrefs.cpp:145
+msgid "High-quality dither:"
+msgstr "Visokokvalitetni trepet:"
+
+#: prefs/QualityPrefs.cpp:157
+msgid "Conversion"
+msgstr "Konverzija"
+
+#: prefs/QualityPrefs.cpp:163
+msgid "Sample Rate Converter"
+msgstr "Pretvarač frekvence uzimanja uzoraka"
+
+#: prefs/QualityPrefs.cpp:164
+msgid "Dither"
+msgstr "Trepet"
+
+#: prefs/QualityPrefs.cpp:165
+msgid "Real-time:"
+msgstr "U realnom vremenu:"
+
+#: prefs/QualityPrefs.cpp:171
+msgid "High-quality:"
+msgstr "Visokokvalitetno:"
+
+#: prefs/SmartRecordPrefs.cpp:54
+#: prefs/SmartRecordPrefs.cpp:55
+msgid "Smart Recording"
+msgstr "Pametno snimanje"
+
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
+
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:36
+#: prefs/SpectrumPrefs.cpp:37
+msgid "Spectrograms"
+msgstr "Spektogrami"
+
+#: prefs/SpectrumPrefs.cpp:72
+msgid "FFT Size"
+msgstr "Veličina FFT"
+
+#: prefs/SpectrumPrefs.cpp:75
+msgid "8 - most wideband"
+msgstr "8 - najšire"
+
+#: prefs/SpectrumPrefs.cpp:80
+msgid "256 - default"
+msgstr "256 - podrazumijevano"
+
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:84
+msgid "4096 - most narrowband"
+msgstr "4096 - najuže"
+
+#: prefs/SpectrumPrefs.cpp:90
+msgid "Window type:"
+msgstr "Vrsta prozora:"
+
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:96
+msgid "Display"
+msgstr "Prikaz"
+
+#: prefs/SpectrumPrefs.cpp:100
+msgid "&Grayscale"
+msgstr "&crnobijelo"
+
+#: prefs/SpectrumPrefs.cpp:103
+msgid "Minimum Frequency (Hz):"
+msgstr "Najmanja frekvencija (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:108
+msgid "Maximum Frequency (Hz):"
+msgstr "Najviša frekvencija (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:134
+msgid "The maximum frequency must be an integer"
+msgstr "Maksimalna frekvencija mora biti cijeli broj"
+
+#: prefs/SpectrumPrefs.cpp:138
+msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
+msgstr "Najviša frekvencija mora biti između 100 Hz - 100,000 Hz"
+
+#: prefs/SpectrumPrefs.cpp:146
+msgid "The minimum frequency must be an integer"
+msgstr "Najmanja frekvencija mora biti pozitivni cijeli broj"
+
+#: prefs/SpectrumPrefs.cpp:150
+msgid "Minimum frequency must be at least 0 Hz"
+msgstr "Najmanja frekvencija mora biti bar 0 Hz"
+
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+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 "Tema"
+
+#. i18n-hint: && in here is an escape character to get a single & on screen,
+#. * so keep it as is
+#: prefs/ThemePrefs.cpp:93
+msgid "Theme Cache - Images && Color"
+msgstr "Međumemorija tema - Slike i boje"
+
+#: prefs/ThemePrefs.cpp:95
+msgid "Save Theme Cache"
+msgstr "Spremi međumemoriju tema"
+
+#: prefs/ThemePrefs.cpp:96
+msgid "Load Theme Cache"
+msgstr "Učitaj međumemoriju tema"
+
+#: prefs/ThemePrefs.cpp:106
+msgid "Load Theme Cache At Startup"
+msgstr "Učitaj međumemoriju tema pri startu"
+
+#: prefs/ThemePrefs.cpp:118
+msgid "Individual Theme Files"
+msgstr "Samostalne datoteke tema"
+
+#: prefs/ThemePrefs.cpp:120
+msgid "Save Files"
+msgstr "Spremi datoteke"
+
+#: prefs/ThemePrefs.cpp:121
+msgid "Load Files"
+msgstr "Učitaj datoteke"
+
+#: prefs/ThemePrefs.cpp:126
+msgid "Info"
+msgstr "Informacije"
+
+#: prefs/ThemePrefs.cpp:129
+msgid "Themability is an experimental feature.\n"
+"\n"
+"To try it out, click \"Save Theme Cache\" then\n"
+"find and modify the images and colors in \n"
+"ImageCacheVxx.png using an image editor such \n"
+"as the Gimp.\n"
+"\n"
+"Click \"Load Theme Cache\" to load the changed images\n"
+"and colors back into Audacity.\n"
+"\n"
+"[Only the control toolbar and the colors on the \n"
+"wavetrack are currently affected, even though the\n"
+"image file shows other icons too.]\n"
+msgstr "Teme su u eksperimentalnoj fazi.\n"
+"\n"
+"Da jih isprobate, kliknite \"Sprem međumemoriju tema\",\n"
+"onda potražite i promijenite slike i boje u \n"
+"ImageCacheVxx.png koristeći uređivač slika, kao što je \n"
+"je Gimp.\n"
+"\n"
+"Kliknite \"Učitaj međumemoriju tema\", da učitate promijenjene\n"
+"slike i boje nazad v Audacity.\n"
+"\n"
+"[Samo kontrolna alatna traka i boje na \n"
+"traci s talasnim oblikom su trenutno promijenjene, čak i ako slika\n"
+"prikazuje druge ikone.]\n"
+
+#: prefs/ThemePrefs.cpp:134
+msgid "You have compiled Audacity with an extra button, \n"
+"'Output Sourcery'.  This will save a C version of \n"
+"the image cache that can be compiled in as a default.\n"
+msgstr "Audacity je preveden s dodatnim tasterom, \n"
+"'Output Sourcery'.  To će spremiti C-verziju \n"
+"međumemorije slika, koja se može prevesti da bude podrazumijevana.\n"
+
+#: prefs/ThemePrefs.cpp:139
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
+"the Theme Cache will be loaded when the program \n"
+"starts up.\n"
+"\n"
+msgstr "Ako je uključen 'Učitaj međumemoriju tema pri startu', onda \n"
+"će međumemorija za teme biti učitana kada počnete program.\n"
+"\n"
+
+#: prefs/ThemePrefs.cpp:142
+msgid "Saving and loading individual theme files uses a \n"
+"separate file for each image, but is otherwise the \n"
+"same idea.\n"
+"\n"
+msgstr "Shranjevanje i nalaganje posamezne datoteke teme \n"
+"uporablja lo�eno datoteku za vsako sliko, a je sicer \n"
+"zami�ljeno na enak na�in.\n"
+"\n"
+
+#: toolbars/ControlToolBar.cpp:174
+msgid "Pause"
+msgstr "Pauza"
+
+#: toolbars/ControlToolBar.cpp:177
+msgid "Play"
+msgstr "Izvođenje"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:182
+msgid "Stop"
+msgstr "Zaustavi"
+
+#: toolbars/ControlToolBar.cpp:185
+msgid "Skip to Start"
+msgstr "Skoči na početak"
+
+#: toolbars/ControlToolBar.cpp:188
+msgid "Skip to End"
+msgstr "Skoči na kraj"
+
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:194
+msgid "Clean Speech"
+msgstr "ÄŒisti govor"
+
+#: toolbars/ControlToolBar.cpp:530
+#: toolbars/ControlToolBar.cpp:839
+msgid "Error while opening sound device. "
+msgstr "Greška pri otvaranju zvučnog uređaja."
+
+#: toolbars/ControlToolBar.cpp:696
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "Snimanje u režimu ČistiGovor nije moguće, ako je traka (ili više od jednog projekta) već otvorena."
+
+#: toolbars/ControlToolBar.cpp:697
+msgid "Recording not permitted"
+msgstr "Snimanje nije dozvoljeno"
+
+#: toolbars/DeviceToolBar.cpp:113
+#: toolbars/DeviceToolBar.cpp:115
+msgid "Output Device"
+msgstr "Izlazni uređaj"
+
+#: toolbars/DeviceToolBar.cpp:134
+#: toolbars/DeviceToolBar.cpp:136
+msgid "Input Device"
+msgstr "Ulazni uređaj"
+
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim outside selection"
+msgstr "Odsjeci izvan izbora"
+
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence selection"
+msgstr "Izbor tišine"
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Zoom In"
+msgstr "Povećaj"
+
+#: toolbars/EditToolBar.cpp:152
+msgid "Zoom Out"
+msgstr "Umanji"
+
+#: toolbars/EditToolBar.cpp:156
+msgid "Zoom Toggle"
+msgstr "Preklop poćanja"
+
+#: toolbars/EditToolBar.cpp:160
+msgid "Fit Selection"
+msgstr "U izbor"
+
+#: toolbars/EditToolBar.cpp:160
+msgid "Fit selection in window"
+msgstr "Prilagodi označeno prozoru"
+
+#: toolbars/EditToolBar.cpp:162
+msgid "Fit Project"
+msgstr "Prilagodi projekt"
+
+#: toolbars/EditToolBar.cpp:162
+msgid "Fit project in window"
+msgstr "Prilagodi cijeli projekt u prozot"
+
+#: toolbars/MeterToolBar.cpp:50
+msgid "Meter"
+msgstr "Mjerač"
+
+#: toolbars/MeterToolBar.cpp:80
+msgid "Play Meter"
+msgstr "Mjerač izvođenja"
+
+#: toolbars/MeterToolBar.cpp:81
+msgid "Meter-Play"
+msgstr "Mjerač-Izvođenje"
+
+#: toolbars/MeterToolBar.cpp:89
+msgid "Record Meter"
+msgstr "Mjerač snimanja"
+
+#: toolbars/MeterToolBar.cpp:90
+msgid "Meter-Record"
+msgstr "Mjerač-snimanje"
+
+#: toolbars/MeterToolBar.cpp:94
+msgid "Output level meter"
+msgstr "Mjerač nivoa izlaza"
+
+#: toolbars/MeterToolBar.cpp:95
+msgid "Input level meter - click to monitor input"
+msgstr "Mjerač ulaznog nivoa - kliknite za kontrolu ulaza"
+
+#: toolbars/MixerToolBar.cpp:91
+msgid "Output Volume"
+msgstr "Jačina izlaza"
+
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
+msgstr "Klizač-Izlaz"
+
+#: toolbars/MixerToolBar.cpp:102
+msgid "Input Volume"
+msgstr "Ulazna jačina"
+
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
+msgstr "Klizač-ulaz"
+
+#: toolbars/MixerToolBar.cpp:117
+msgid "Input Source"
+msgstr "Ulazni izvor"
+
+#: toolbars/SelectionBar.cpp:80
+msgid "Selection"
+msgstr "Izbor"
+
+#: toolbars/SelectionBar.cpp:120
+#: toolbars/SelectionBar.cpp:177
+msgid "Project Rate (Hz):"
+msgstr "Frekvencija projekta (Hz):"
+
+#: toolbars/SelectionBar.cpp:134
+#: toolbars/SelectionBar.cpp:235
+msgid "Selection Start:"
+msgstr "Početak izbora:"
+
+#: effects/ToneGen.cpp:307
+#: effects/ToneGen.cpp:348
+#: toolbars/SelectionBar.cpp:147
+#: toolbars/SelectionBar.cpp:241
+msgid "Length"
+msgstr "Dužina"
+
+#: toolbars/SelectionBar.cpp:157
+msgid "hidden"
+msgstr "sakriveno"
+
+#: toolbars/SelectionBar.cpp:167
+#: toolbars/SelectionBar.cpp:252
+msgid "Audio Position:"
+msgstr "Položaj zvuka:"
+
+#: toolbars/SelectionBar.cpp:217
+#: toolbars/SelectionBar.cpp:222
+msgid "Snap To"
+msgstr "Skoči na ..."
+
+#: toolbars/SelectionBar.cpp:240
+msgid "Selection "
+msgstr "Izbor"
+
+#: toolbars/SelectionBar.cpp:305
+msgid "Selection Length"
+msgstr "Dužina izbora"
+
+#: toolbars/SelectionBar.cpp:313
+msgid "Selection End"
+msgstr "Kraj izbora"
+
+#: toolbars/ToolBar.cpp:97
+#, c-format
+msgid "Audacity %s ToolBar"
+msgstr "Alatna traka Audacity - %s"
+
+#: toolbars/ToolDock.cpp:74
+#: toolbars/ToolDock.cpp:75
+msgid "ToolDock"
+msgstr "Sidrište alata"
+
+#: toolbars/ToolsToolBar.cpp:63
+msgid "Click and drag to select audio"
+msgstr "Kliknite i povucite, da izaberete zvuk"
+
+#: toolbars/ToolsToolBar.cpp:64
+msgid "Click and drag to edit the amplitude envelope"
+msgstr "Kliknite i povucite, da bi promijenili ovojnicu amplitude"
+
+#: toolbars/ToolsToolBar.cpp:65
+msgid "Click and drag to edit the samples"
+msgstr "Kliknite i povucite, da bi promijenili uzorke"
+
+#: toolbars/ToolsToolBar.cpp:67
+msgid "Click to Zoom In, Shift-Click to Zoom Out"
+msgstr "Kliknite za povećanje, Shift-klik za umanjenje"
+
+#: toolbars/ToolsToolBar.cpp:69
+msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
+msgstr "Povucite za povećanje područja, desno-klikniite za umanjenje"
+
+#: toolbars/ToolsToolBar.cpp:71
+msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
+msgstr "Lijevo=Povećavanje, Desno=Umanjenje, Sredina=Normalno"
+
+#: toolbars/ToolsToolBar.cpp:73
+msgid "Click and drag to move a track in time"
+msgstr "Kliknite i povucite, da bi pomjerili traku u vremenu"
+
+#: toolbars/ToolsToolBar.cpp:90
+msgid "Tools"
+msgstr "Alati"
+
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
+msgid "Selection Tool"
+msgstr "Alat za izbor"
+
+#: toolbars/ToolsToolBar.cpp:148
+msgid "Envelope Tool"
+msgstr "Alat za ovojnicu"
+
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
+msgid "Time Shift Tool"
+msgstr "Alat za pomijeranje vremena"
+
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
+msgid "Zoom Tool"
+msgstr "Alat za povećanje"
+
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
+msgid "Draw Tool"
+msgstr "Crtanje"
+
+#: toolbars/ToolsToolBar.cpp:152
+msgid "Multi-Tool Mode"
+msgstr "Višealatni režim"
+
+#: toolbars/ToolsToolBar.cpp:186
+msgid "Slide Tool"
+msgstr "Alat Pomikaj"
+
+#: toolbars/ToolsToolBar.cpp:187
+msgid "Multi Tool"
+msgstr "Višestruki alat"
+
+#: toolbars/TranscriptionToolBar.cpp:82
+msgid "Transcription"
+msgstr "Prepis"
+
+#: toolbars/TranscriptionToolBar.cpp:163
+msgid "Play at selected speed"
+msgstr "Izvodi pri izbranoj brzini"
+
+#: toolbars/TranscriptionToolBar.cpp:164
+msgid "Play-at-speed"
+msgstr "Izvodi-pri-brzini"
+
+#: toolbars/TranscriptionToolBar.cpp:170
+#: toolbars/TranscriptionToolBar.cpp:175
+msgid "Playback Speed"
+msgstr "Brzina izvođenja"
+
+#: toolbars/TranscriptionToolBar.cpp:180
+msgid "Adjust left selection to next onset"
+msgstr "Prilagodi lijevi izbor narednom početku"
+
+#: toolbars/TranscriptionToolBar.cpp:181
+msgid "Left-to-On"
+msgstr "Lijevo-na-uključeno"
+
+#: toolbars/TranscriptionToolBar.cpp:183
+msgid "Adjust right selection to previous offset"
+msgstr "Prilagodi desni izbor prethodnom pomaku"
+
+#: toolbars/TranscriptionToolBar.cpp:184
+msgid "Right-to-Off"
+msgstr "Desno-na-isključeno"
+
+#: toolbars/TranscriptionToolBar.cpp:186
+msgid "Adjust left selection to next offset"
+msgstr "Prilagodi lijevi izbor narednom pomaku"
+
+#: toolbars/TranscriptionToolBar.cpp:187
+msgid "Left-to-Off"
+msgstr "Lijevo-na-isključeno"
+
+#: toolbars/TranscriptionToolBar.cpp:189
+msgid "Adjust right selection to previous onset"
+msgstr "Prilagodi desni izbor prehodnom početku"
+
+#: toolbars/TranscriptionToolBar.cpp:190
+msgid "Right-to-On"
+msgstr "Desno-na-uključeno"
+
+#: toolbars/TranscriptionToolBar.cpp:192
+msgid "Select region of sound around cursor"
+msgstr "Izberi područje zvuka oko kazaljke"
+
+#: toolbars/TranscriptionToolBar.cpp:193
+msgid "Select-Sound"
+msgstr "Izaberi-Zvuk"
+
+#: toolbars/TranscriptionToolBar.cpp:195
+msgid "Select region of silence around cursor"
+msgstr "Izaberi područje tišine oko kazaljke"
+
+#: toolbars/TranscriptionToolBar.cpp:196
+msgid "Select-Silence"
+msgstr "Izaberi-Tišina"
+
+#: toolbars/TranscriptionToolBar.cpp:198
+msgid "Automatically make labels from words"
+msgstr "Automatski napravi oznake iz riječi"
+
+#: toolbars/TranscriptionToolBar.cpp:199
+msgid "Make Labels"
+msgstr "Napravi oznake"
+
+#: toolbars/TranscriptionToolBar.cpp:201
+msgid "Add label at selection"
+msgstr "Dodaj oznaku na izbor"
+
+#: toolbars/TranscriptionToolBar.cpp:202
+msgid "Add Label"
+msgstr "Dodaj oznaku"
+
+#: toolbars/TranscriptionToolBar.cpp:204
+msgid "Calibrate voicekey"
+msgstr "Kalibracija glasa ključa"
+
+#: toolbars/TranscriptionToolBar.cpp:205
+msgid "Calibrate"
+msgstr "Kalibriraj"
+
+#: toolbars/TranscriptionToolBar.cpp:209
+msgid "Adjust Sensitivity"
+msgstr "Prilagodi ojetljivost"
+
+#: toolbars/TranscriptionToolBar.cpp:214
+msgid "Sensitivity"
+msgstr "Osjetljivost"
+
+#: toolbars/TranscriptionToolBar.cpp:219
+msgid "Energy"
+msgstr "Energija"
+
+#: toolbars/TranscriptionToolBar.cpp:220
+msgid "Sign Changes (Low Threshold)"
+msgstr "Promjene predznaka (nizak prag)"
+
+#: toolbars/TranscriptionToolBar.cpp:221
+msgid "Sign Changes (High Threshold)"
+msgstr "Promjene predznaka (visok prag)"
+
+#: toolbars/TranscriptionToolBar.cpp:222
+msgid "Direction Changes (Low Threshold)"
+msgstr "Promjene smeri (nizki prag)"
+
+#: toolbars/TranscriptionToolBar.cpp:223
+msgid "Direction Changes (High Threshold)"
+msgstr "Promjene smijera (visoki prag)"
+
+#: toolbars/TranscriptionToolBar.cpp:231
+msgid "Key type"
+msgstr "Vrsta tastera"
+
+#: widgets/AButton.cpp:302
+msgid " (disabled)"
+msgstr " (onemogućeno)"
+
+#: widgets/AButton.cpp:447
+msgid "Press"
+msgstr "Pritisnite"
+
+#: widgets/AButton.cpp:526
+msgid "Button"
+msgstr "Dugme"
+
+#. i18n-hint: One-letter abbreviation for Left, in VU Meter
+#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#: widgets/ASlider.cpp:604
+#: widgets/Meter.cpp:211
+msgid "L"
+msgstr "L"
+
+#. i18n-hint: One-letter abbreviation for Right, in VU Meter
+#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#: widgets/ASlider.cpp:607
+#: widgets/Meter.cpp:213
+msgid "R"
+msgstr "D"
+
+#: widgets/ASlider.cpp:670
+msgid "Center"
+msgstr "Srednje"
+
+#: widgets/ASlider.cpp:674
+msgid "Left"
+msgstr "Lijevo"
+
+#: widgets/ASlider.cpp:677
+msgid "Right"
+msgstr "Desno"
+
+#: widgets/ErrorDialog.cpp:73
+#: widgets/ErrorDialog.cpp:97
+msgid "Help"
+msgstr "Pomoć"
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:190
+msgid "Help on the Internet"
+msgstr "Pomoć na Internetu"
+
+#: widgets/Grabber.cpp:62
+msgid "Grabber"
+msgstr "Grabilac"
+
+#: widgets/Grid.cpp:635
+#, c-format
+msgid "%d rows, %d columns"
+msgstr "%d redova, %d kolona"
+
+#: widgets/Grid.cpp:641
+#: widgets/Grid.cpp:768
+#, c-format
+msgid "Row %d"
+msgstr "Red %d"
+
+#: widgets/Grid.cpp:783
+msgid "Empty"
+msgstr "Prazno"
+
+#: widgets/Meter.cpp:342
+msgid "Enable Meter"
+msgstr "Uključi mjerač"
+
+#: widgets/Meter.cpp:344
+msgid "Disable Meter"
+msgstr "Isključi mjerač"
+
+#: widgets/Meter.cpp:347
+msgid "Stop Monitoring"
+msgstr "Zaustavi praćenje"
+
+#: widgets/Meter.cpp:349
+msgid "Start Monitoring"
+msgstr "Počni praćenje"
+
+#: widgets/Meter.cpp:353
+msgid "Horizontal Stereo"
+msgstr "Vodoravni stereo"
+
+#: widgets/Meter.cpp:354
+msgid "Vertical Stereo"
+msgstr "Uspravni stereo"
+
+#: widgets/Meter.cpp:371
+msgid "Preferences..."
+msgstr "Postavke ..."
+
+#: widgets/Meter.cpp:872
+msgid "Mix Volume"
+msgstr ""
+
+#: widgets/Meter.cpp:1061
+msgid "This determines how often the meter is refreshed.\n"
+"If you have a slower PC you may want to select a\n"
+"lower refresh rate (30 per second or lower), so that\n"
+"audio qualtiy is not affected by the meter display."
+msgstr "Ovim određujete koliko često je osvježen mjerač.\n"
+"Ako imate sporiji računar, bolje je izabrati\n"
+"manju frekvenciju osvježavanja (30 na sekundu ili manje),\n"
+"tako da kvalitet zvuka nije ugrožen zbog prikaza mjerača."
+
+#: widgets/Meter.cpp:1062
+msgid "Meter refresh rate per second [1-100]: "
+msgstr "Brzina osvježavanja mjerača na sekundu [1-100]: "
+
+#: widgets/Meter.cpp:1063
+msgid "Meter Preferences"
+msgstr "Postavke mjerača"
+
+#: widgets/MultiDialog.cpp:82
+msgid " Please select an action "
+msgstr " Molimo, izaberite akciju"
+
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1058
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1078
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1095
+msgid "Cancel"
+msgstr ""
+
+#: widgets/Ruler.cpp:1138
+#: widgets/Ruler.cpp:1139
+msgid "Vertical Ruler"
+msgstr "Vertikalno ravnalo"
+
+#. i18n-hint: These strings control the formatting of time units i the
+#. * display. They are fairly complex, see the comments in
+#. * widgets/TimeTextCtrl.cpp for how they work
+#: widgets/TimeTextCtrl.cpp:201
+msgid "01000,01000 seconds"
+msgstr "sekunde 01000,01000"
+
+#: widgets/TimeTextCtrl.cpp:203
+msgid "0100 h 060 m 060 s"
+msgstr "0100 č 060 m 060 s"
+
+#: widgets/TimeTextCtrl.cpp:204
+msgid "dd:hh:mm:ss"
+msgstr "dd:čč:mm:ss"
+
+#: widgets/TimeTextCtrl.cpp:205
+msgid "0100 days 024 h 060 m 060 s"
+msgstr "0100 dana 024 č 060 m 060 s"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#: widgets/TimeTextCtrl.cpp:206
+msgid "hh:mm:ss + milliseconds"
+msgstr "čč:mm:ss + milisekunde"
+
+#: widgets/TimeTextCtrl.cpp:207
+msgid "0100 h 060 m 060.01000 s"
+msgstr "0100 č 060 m 060.01000 s"
+
+#: widgets/TimeTextCtrl.cpp:208
+msgid "hh:mm:ss + samples"
+msgstr "čč:mm:ss + uzorci"
+
+#: widgets/TimeTextCtrl.cpp:209
+msgid "0100 h 060 m 060 s+.# samples"
+msgstr "0100 č 060 m 060 s+.# uzorci"
+
+#: widgets/TimeTextCtrl.cpp:210
+msgid "samples"
+msgstr "uzorci"
+
+#: widgets/TimeTextCtrl.cpp:211
+msgid "01000,01000,01000 samples|#"
+msgstr "uzorci 01000,01000,01000|#"
+
+#: widgets/TimeTextCtrl.cpp:212
+msgid "hh:mm:ss + film frames (24 fps)"
+msgstr "čč:mm:ss + filmski kadrovi (24 kd/s)"
+
+#: widgets/TimeTextCtrl.cpp:213
+msgid "0100 h 060 m 060 s+.24 frames"
+msgstr "0100 č 060 m 060 s+.24 kadra"
+
+#: widgets/TimeTextCtrl.cpp:214
+msgid "film frames (24 fps)"
+msgstr "filmski kadrovi (24 kd/s)"
+
+#: widgets/TimeTextCtrl.cpp:215
+msgid "01000,01000 frames|24"
+msgstr "kadrovi 01000,01000|24"
+
+#: widgets/TimeTextCtrl.cpp:216
+msgid "hh:mm:ss + NTSC drop frames"
+msgstr "čč:mm:ss + izpušteni kadrovi NTSC"
+
+#: widgets/TimeTextCtrl.cpp:217
+msgid "0100 h 060 m 060 s+.30 frames|N"
+msgstr "0100 č 060 m 060 s+.30 kadrovi|N"
+
+#: widgets/TimeTextCtrl.cpp:218
+msgid "hh:mm:ss + NTSC non-drop frames"
+msgstr "čč:mm:ss + neispušteni kadrovi NTSC"
+
+#: widgets/TimeTextCtrl.cpp:219
+msgid "0100 h 060 m 060 s+.030 frames| .999000999"
+msgstr "0100 č 060 m 060 s+.030 kadrovi| .999000999"
+
+#: widgets/TimeTextCtrl.cpp:220
+msgid "NTSC frames"
+msgstr "kadrovi NTSC"
+
+#: widgets/TimeTextCtrl.cpp:221
+msgid "01000,01000 frames|29.97002997"
+msgstr "kadrovi 01000,01000|29.97002997"
+
+#: widgets/TimeTextCtrl.cpp:222
+msgid "hh:mm:ss + PAL frames (25 fps)"
+msgstr "čč:mm:ss + kadrovi PAL (25 kd/s)"
+
+#: widgets/TimeTextCtrl.cpp:223
+msgid "0100 h 060 m 060 s+.25 frames"
+msgstr "0100 u 060 m 060 s+.25 kadrova"
+
+#: widgets/TimeTextCtrl.cpp:224
+msgid "PAL frames (25 fps)"
+msgstr "kadrovi PAL (25 kd/s)"
+
+#: widgets/TimeTextCtrl.cpp:225
+msgid "01000,01000 frames|25"
+msgstr "kadrovi 01000,01000|25"
+
+#: widgets/TimeTextCtrl.cpp:226
+msgid "hh:mm:ss + CDDA frames (75 fps)"
+msgstr "čč:mm:ss + kadrovi CDDA (75 kd/s)"
+
+#: widgets/TimeTextCtrl.cpp:227
+msgid "0100 h 060 m 060 s+.75 frames"
+msgstr "0100 č 060 m 060 s+.75 kadrova"
+
+#: widgets/TimeTextCtrl.cpp:228
+msgid "CDDA frames (75 fps)"
+msgstr "kadrovi CDDA (75 kd/s)"
+
+#: widgets/TimeTextCtrl.cpp:229
+msgid "01000,01000 frames|75"
+msgstr "kadrovi 01000,01000|75"
+
+#: widgets/TimeTextCtrl.cpp:366
+msgid "Use right mouse button or context key to change format"
+msgstr "Za promjenu formata koristite desni taster miša ili taster kontekstnog menija"
+
+#: widgets/TimeTextCtrl.cpp:1380
+msgid "Time Control"
+msgstr "Kontrola vremena"
+
+#: widgets/Warning.cpp:64
+msgid "Don't show this warning again"
+msgstr "Nemoj više prikazivati ovo upozorenje"
+
+#: xml/XMLFileReader.cpp:49
+#, c-format
+msgid "Could not open file: \"%s\""
+msgstr "Greška pri otvaranju datoteke: \"%s\""
+
+#: xml/XMLFileReader.cpp:63
+#, c-format
+msgid "Error: %hs at line %lu"
+msgstr ""
+
+#: xml/XMLFileReader.cpp:79
+#, c-format
+msgid "Could not load file: \"%s\""
+msgstr "Greška pri otvaranju datoteke: \"%s\""
+
diff --git a/locale/ca.po b/locale/ca.po
index d4f8beb..9d2e101 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -2,8 +2,7 @@
 # Francesc Busquets <fbusquets at yahoo.com>, 2007.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: ca\n"
+msgstr "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
 "PO-Revision-Date: 2008-05-13 10:37+0100\n"
@@ -27,16 +26,16 @@ msgid "OK... Audacious!"
 msgstr "Audaciteu-vos!"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "L'Audacity és un programari lliure escrit per un equip de desenvolupadors d'arreu del món. La coordinació és possible gràcies a SourceForge.net, un servei en línia que proporciona recursos als projectes de programari lliure. L'Audacity es troba disponible per a Windows 98 i posteriors, Mac OS X, GNU/Linux, i altres sistemes operatius de tipus Unix. També hi ha versions antigues de l'Audacity per a Mac OS 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Aquesta és una versió beta del programa. Pot contenir errors i funcionalitats inacabades. Per a millorar el programa cal que els usuaris ens feu arribar els vostres comentaris i propostes. Visiteu el nostre lloc web per a enviar informes d'errades i suggerir noves funcionalitats."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Aquesta és una versió estable i completa de l'Audacity. Tanmateix, contacteu-nos si trobeu algun error o voleu fer algun suggeriment. Per a poder seguir millorant l'Audacity necessitem l'opinió dels usuaris.  Per a més informació visiteu el nostre lloc web."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -50,8 +49,8 @@ msgid "translator_credits"
 msgstr "Traducció al català: Pau Bosch i Francesc Busquets"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Programari lliure d'edició de so digital"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -87,6 +86,10 @@ msgstr "L'Audacity està basat en codi dels següents projectes:"
 msgid "Special thanks:"
 msgstr "Agraïments especials:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -230,12 +233,10 @@ msgstr "S'ha produït un error en obrir el projecte"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s no existeix i no es pot obrir.\n"
+msgstr "%s no existeix i no es pot obrir.\n"
 "\n"
 "Ha estat eliminat de l'historial."
 
@@ -271,11 +272,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "Ordre desconeguda: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"L'Audacity no troba cap lloc per a desar-hi els fitxers temporals.\n"
+msgstr "L'Audacity no troba cap lloc per a desar-hi els fitxers temporals.\n"
 "Si us plau, indiqueu un directori adient a les preferències."
 
 #: AudacityApp.cpp:1050
@@ -283,21 +282,17 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr "L'Audacity es tancarà tot seguit. Reinicieu-lo per a poder fer servir el nou directori temporal."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Si feu funcionar simultàniament dues còpies de l'Audacity\n"
+msgstr "Si feu funcionar simultàniament dues còpies de l'Audacity\n"
 "us podeu trobar amb pèrdua de dades, o que falli el sistema.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"L'Audacity no ha estat capaç de bloquejar la carpeta de fitxers\n"
+msgstr "L'Audacity no ha estat capaç de bloquejar la carpeta de fitxers\n"
 "temporals. Pot ser que aquesta carpeta estigui en ús\n"
 "per alguna altra còpia de l'Audacity.\n"
 
@@ -314,11 +309,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "El sistema ha detectat que hi ha una altra còpia de l'Audacity en funcionament.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Feu servir les ordres 'Nou' o 'Obre' del procés actual de l'Audacity\n"
+msgstr "Feu servir les ordres 'Nou' o 'Obre' del procés actual de l'Audacity\n"
 "per a obrir diversos projectes de manera simultània.\n"
 
 #: AudacityApp.cpp:1134
@@ -360,13 +353,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr "A més, heu d'indicar el nom d'un fitxer de so o un projecte Audacity per a obrir-lo."
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Els fitxers de tipus 'projecte Audacity' (.AUP) no es troben actualment \n"
+msgstr "Els fitxers de tipus 'projecte Audacity' (.AUP) no es troben actualment \n"
 "associats a l'Audacity. \n"
 "\n"
 "Voleu associar-los-hi per tal que es puguin obrir amb un doble clic?"
@@ -380,11 +371,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "No s'ha pogut trobar cap dispositiu de so.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"No podreu reproduir ni enregistrar so.\n"
+msgstr "No podreu reproduir ni enregistrar so.\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -400,12 +389,10 @@ msgid "Latency problem"
 msgstr "Hi ha un problema de latència"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"El valor de la latència ha fet que el so que s'ha enregistrat hagi quedat amagat abans del zero.\n"
+msgstr "El valor de la latència ha fet que el so que s'ha enregistrat hagi quedat amagat abans del zero.\n"
 "L'Audacity ha mogut el fragment per tal que comenci al zero.\n"
 "Podeu fer servir l'eina de desplaçament en el temps (<---> o F5) per a arrossegar la pista al lloc que li correspongui."
 
@@ -414,11 +401,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Recuperació automàtica de fallades"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Alguns projectes no es van desar correctament la darrera vegada que es\n"
+msgstr "Alguns projectes no es van desar correctament la darrera vegada que es\n"
 "va fer servir l'Audacity. Per sort els següents projectes poden ser\n"
 "recuperats de manera automàtica:"
 
@@ -448,11 +433,9 @@ msgid "Recover Projects"
 msgstr "Recupera els projectes"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Segur que no voleu recuperar cap projecte?\n"
+msgstr "Segur que no voleu recuperar cap projecte?\n"
 "Més tard ja no els podreu recuperar."
 
 #: AutoRecovery.cpp:128
@@ -527,11 +510,9 @@ msgstr "L'ordre %s encara no està implementada"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"No s'han pogut establir els paràmetres de l'efecte %s\n"
+msgstr "No s'han pogut establir els paràmetres de l'efecte %s\n"
 " a %s."
 
 #: BatchCommands.cpp:583
@@ -541,12 +522,10 @@ msgstr "El procés per lots de %s no ha estat reconegut."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Aplica %s amb els paràmetres\n"
+msgstr "Aplica %s amb els paràmetres\n"
 "\n"
 "%s"
 
@@ -566,6 +545,10 @@ msgstr "Aplica %s"
 msgid "Apply Chain"
 msgstr "Aplica la cadena d'ordres"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Selecciona una cadena d'ordres"
@@ -612,10 +595,18 @@ msgstr "S'està aplicant '%s' al projecte actual"
 msgid "Please save and close the current project first."
 msgstr "Deseu i tanqueu abans el projecte actual."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Selecciona un o més fitxers per al procés per lots..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Tots els fitxers (*.*)|*.*|Fitxers WAV (*.wav)|*.wav|Fitxers AIFF (*.aif)|*.aif|Fitxers AU (*.au)|*.au|Fitxers MP3 (*.mp3)|*.mp3|FitxersOgg Vorbis (*.ogg)|*.ogg|Fitxers FLAC (*.flac)|*.flac"
@@ -727,12 +718,10 @@ msgid "Copying audio data into project..."
 msgstr "S'estan escrivint les dades de so del projecte"
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"El vostre projecte depèn de la presència d'altres fitxers.\n"
+msgstr "El vostre projecte depèn de la presència d'altres fitxers.\n"
 "Voleu copiar el so dels següents fitxers dins del vostre projecte per a fer-lo autònom?\n"
 "Això necessitarà més espai de disc, però serà més segur. "
 
@@ -799,11 +788,9 @@ msgid "Dependency check"
 msgstr "Comprovació de dependències"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Atenció: hi ha molt poc espai de disc lliure en aquest volum.\n"
+msgstr "Atenció: hi ha molt poc espai de disc lliure en aquest volum.\n"
 "Seleccioneu un altre directori temporal a les preferències."
 
 #: DirManager.cpp:221
@@ -826,11 +813,9 @@ msgstr "S'estan netejant els directoris de la memòria cau"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"L'Audacity ha trobat un tros de fitxer %s orfe! \n"
+msgstr "L'Audacity ha trobat un tros de fitxer %s orfe! \n"
 "Si us plau, considereu la possibilitat de desar i tornar a obrir el projecte\n"
 "per a fer-ne una comprovació completa.\n"
 
@@ -856,16 +841,16 @@ msgstr "No s'ha pogut eliminar '%s'"
 msgid "Renamed file: %s\n"
 msgstr "S'ha canviat el nom del fitxer: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "S'està canviant el bloc %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "No s'ha pogut canviar el nom de '%s' a '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -892,21 +877,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "No existeix el fitxer de dades: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"La comprovació del projecte ha trobat inconsistències mentre inspeccionava les dades del projecte;\n"
+msgstr "La comprovació del projecte ha trobat inconsistències mentre inspeccionava les dades del projecte;\n"
 "Feu clic a \"Detalls\" per a veure una llista completa dels errors, o a \"D'acord\" per a més opcions."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"La comprovació del projecte ha trobat %d tros o trossos de fitxers orfes. Aquests fitxers\n"
+msgstr "La comprovació del projecte ha trobat %d tros o trossos de fitxers orfes. Aquests fitxers\n"
 "no s'estan fent servir i probablement són conseqüència d'alguna penjada o d'algun error.\n"
 "S'haurien d'esborrar per a evitar el risc d'esgotar l'espai lliure del disc."
 
@@ -935,15 +916,13 @@ msgstr "Atenció"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"La comprovació del projecte ha detectat que %d fitxers d'entrada que s'estaven fent servir\n"
+msgstr "La comprovació del projecte ha detectat que %d fitxers d'entrada que s'estaven fent servir\n"
 "('fitxers àlies') han desaparegut.  No hi ha manera de que l'Audacity\n"
 "pugui recuperar els fitxers automàticament; heu d'escollir entre\n"
 "omplir amb silencis de manera permanent els espais del projecte corresponents a aquests fitxers,\n"
@@ -966,12 +945,10 @@ msgstr "Tanca el projecte immediatament sense fer-li més canvis"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"La comprovació del projecte ha detectat que hi ha %d fitxer/s de resum (.auf) desaparegut/s.\n"
+msgstr "La comprovació del projecte ha detectat que hi ha %d fitxer/s de resum (.auf) desaparegut/s.\n"
 "L'Audacity pot regenerar totalment aquests fitxers de resum des de les dades de so\n"
 "originals del projecte."
 
@@ -985,16 +962,14 @@ msgstr "Omple les dades perdudes amb silencis [només durant aquesta sessió]"
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"La comprovació del projecte ha detectat que hi ha %d bloc/s de fitxers de so (.au) desaparegut/s, \n"
+msgstr "La comprovació del projecte ha detectat que hi ha %d bloc/s de fitxers de so (.au) desaparegut/s, \n"
 "probablement degut a una errada, una petada del sistema o un esborrament accidental.\n"
 "L'Audacity no té cap manera de recuperar aquestes dades perdudes\n"
 "de manera automàtica; podeu escollir entre omplir amb silencis de manera permanent,\n"
@@ -1028,6 +1003,95 @@ msgstr "S'està desant al disc el so enregistrat..."
 msgid "Rectangular"
 msgstr "Rectangular"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:112
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:172
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:192
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Posició de %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Feu clic aquí per a localitzar el fitxer %s -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Navega..."
+
+#: FFmpeg.cpp:214
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "On és %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:87
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:242
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Anàlisi de freqüències"
@@ -1056,8 +1120,9 @@ msgstr "Autocorrelació millorada"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algorisme: "
 
 #: FreqWindow.cpp:168
@@ -1071,9 +1136,9 @@ msgstr "Mida"
 msgid " window"
 msgstr " finestra"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Funció:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1083,9 +1148,9 @@ msgstr "Freqüència lineal"
 msgid "Log frequency"
 msgstr "Freqüència de registre"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Eix:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1094,6 +1159,10 @@ msgstr "Eix:"
 msgid "&Export..."
 msgstr "&Exporta..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Exporta"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1280,8 +1349,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr "<p>Si voleu enregistrar el vostre treball en un CD d'àudio per a escoltar-lo en un equip de música, haureu de començar per [[export|exportar-lo]] al format WAV or AIFF, en format estèreo a 44100 Hz (ajusteu-ho mitjançant el botó \"Freqüència del projecte\" que hi ha a baix a l'esquerra) i 16 bits (ajusteu-ho mitjançant el botó \"Opcions\" del diàleg d'exportació de fitxers). Aquests són els paràmetres per defecte de l'Audacity, de manera que normalment no haureu de canviar-ho abans d'exportar. <p>Enregistreu el fitxer en un CD de tipus \"audio CD\" - no \"CD de dades\" or \"CD MP3\" - amb una aplicació d'enregistrament de CD com ara l'iTunes o el Windows Media Player. Per a més ajuda, consulteu la pàgina del wiki [[wiki:How_to_burn_CDs|Com enregistrar CDs]]. </p><p>"
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Sembla que no teniu els fitxers d'ajuda de l'Audacity instal·lats al vostre ordinador. Podeu <a href=\"http://audacity.sourceforge.net/help/documentation\">descarregar</a> els fitxers d'ajuda i accedir-hi des de l'Audacity tal com havíeu intentat fer, o fer clic <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">aquí</a> per llegir el manual complet en línia."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1385,13 +1454,11 @@ msgid "New..."
 msgstr "Nou..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Heu deixat alguns noms d'etiquetes en blanc.  Aquests elements\n"
+msgstr "Heu deixat alguns noms d'etiquetes en blanc.  Aquests elements\n"
 "seran ignorats quan es regenerin les pistes d'etiquetes.\n"
 "\n"
 "Voleu tornar enrere i posar noms a aquestes etiquetes?"
@@ -1457,11 +1524,9 @@ msgstr "Trieu l'idioma que farà servir l'Audacity:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"S'ha convertit un projecte 1.0 al nou format.\n"
+msgstr "S'ha convertit un projecte 1.0 al nou format.\n"
 "El fitxer antic ha estat desat amb el nom '%s'"
 
 #: Legacy.cpp:357
@@ -1486,13 +1551,17 @@ msgstr "&Tanca\tCtrl+W"
 
 #: Menus.cpp:174
 msgid "&Save Project\tCtrl+S"
-msgstr "&Desa el projecte\tCrtl+S"
+msgstr "&Desa el projecte\tCtrl+S"
 
 #: Menus.cpp:178
 #: Project.cpp:2690
 msgid "Save Project &As..."
 msgstr "&Anomena i desa el projecte..."
 
+#: Menus.cpp:213
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Compro&va les dependències..."
@@ -1501,9 +1570,13 @@ msgstr "Compro&va les dependències..."
 msgid "Open Me&tadata Editor..."
 msgstr "Obre l'editor de me&tadades..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Importa"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
-msgstr "&So...\tCtrl+Maj+I"
+msgstr "&So...\tCtrl+Shift+I"
 
 #: Menus.cpp:197
 msgid "&Labels..."
@@ -1530,6 +1603,10 @@ msgstr "Exporta les &etiquetes"
 msgid "Export &Multiple..."
 msgstr "Exporta &múltiples fitxers..."
 
+#: Menus.cpp:258
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "En&cadenament de CleanSpeech..."
@@ -1610,9 +1687,9 @@ msgstr "&Elimina\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Divideix i &elimina\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&Silenci\tCtrl+L"
+#: Menus.cpp:381
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1626,23 +1703,21 @@ msgstr "Divideix en un de no&u\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "A&junta\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Se&para\tCtrl+Alt+J"
+#: Menus.cpp:394
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Duplic&a\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "E&stèreo a mono"
+#: Menus.cpp:401 Menus.cpp:641
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Re&gions etiquetades..."
+#: Menus.cpp:408
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1652,12 +1727,12 @@ msgstr "&Retalla\tAlt+X"
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:372
 msgid "&Split Cut\tShift+Alt+X"
-msgstr "Divideix i re&talla\tMaj+Alt+X"
+msgstr "Divideix i re&talla\tShift+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:377
 msgid "Co&py\tShift+Alt+C"
-msgstr "Co&pia\tMaj+Alt+C"
+msgstr "Co&pia\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:383
@@ -1667,7 +1742,7 @@ msgstr "E&limina\tAlt+K"
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:388
 msgid "Sp&lit Delete\tShift+Alt+K"
-msgstr "Di&videix i elimina\tMaj+Alt+K"
+msgstr "Di&videix i elimina\tShift+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:393
@@ -1685,13 +1760,13 @@ msgid "&Join\tAlt+J"
 msgstr "A&junta\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Se&para\tMaj+Alt+J"
+#: Menus.cpp:452
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Selecciona..."
+#: Menus.cpp:457
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1699,7 +1774,7 @@ msgstr "&Tot\tCtrl+A"
 
 #: Menus.cpp:417
 msgid "&None\tCtrl+Shift+A"
-msgstr "&Cap...\tCtrl+Maj+A"
+msgstr "&Cap...\tCtrl+Shift+A"
 
 #: Menus.cpp:421
 msgid "&Left at Playback Position\t["
@@ -1711,19 +1786,19 @@ msgstr "A la &dreta de la posició d'interpretació\t]"
 
 #: Menus.cpp:426
 msgid "Track &Start to Cursor\tShift+J"
-msgstr "De l'&inici de pista fins al cursor\tMaj.+J"
+msgstr "De l'&inici de pista fins al cursor\tShift+J"
 
 #: Menus.cpp:427
 msgid "Cursor to Track &End\tShift+K"
-msgstr "Del cursor fins al final de la pista\tMaj.+K"
+msgstr "Del cursor fins al final de la pista\tShift+K"
 
 #: Menus.cpp:433
 msgid "Find &Zero Crossings\tZ"
 msgstr "Cerca encreuaments amb el &zero\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Mo&u el cursor..."
+#: Menus.cpp:478
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1749,9 +1824,9 @@ msgstr "Desa la &regió"
 msgid "Regio&n Restore"
 msgstr "Restaura la regió"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Interpreta la &regió..."
+#: Menus.cpp:505
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1777,9 +1852,14 @@ msgstr "Habilita l'aproximació a la quadrícula"
 msgid "Turn Grid Snap Off"
 msgstr "Inhabilita l'aproximació a la quadrícula"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Preferències...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:521
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:525
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1811,11 +1891,11 @@ msgstr "Fes &zoom a la selecció\tCrtl+E"
 
 #: Menus.cpp:506
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
-msgstr "Ai&xafa totes les pistes\tCtrl+Maj+C"
+msgstr "Ai&xafa totes les pistes\tCtrl+Shift+C"
 
 #: Menus.cpp:507
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
-msgstr "E&xpandeix totes les pistes\tCtrl+Maj+X"
+msgstr "E&xpandeix totes les pistes\tCtrl+Shift+X"
 
 #: Menus.cpp:510
 msgid "&Show Clipping"
@@ -1825,9 +1905,9 @@ msgstr "Mostra l'&escapçament de pics"
 msgid "&History..."
 msgstr "&Historial..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "Barres d'&eines..."
+#: Menus.cpp:568
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1869,17 +1949,75 @@ msgstr "Restableix les &barres d'eines"
 msgid "!Simplified View"
 msgstr "!Vista simplificada"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:589
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:595
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Vés a l'inici\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Vés a la pista següent i canvia la selecció\tEnd"
+
+#: Menus.cpp:602
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:606
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:611
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:616
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "Pis&tes"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Afe&geix..."
+#: Menus.cpp:631
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
-msgstr "Pista de &so\tCtrl+Maj+N"
+msgstr "Pista de &so\tCtrl+Shift+N"
 
 #: Menus.cpp:554
 msgid "&Stereo Track"
@@ -1890,17 +2028,13 @@ msgstr "Pista e&stereofònica"
 msgid "&Time Track"
 msgstr "Pista de &temps"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "Enregistrament &temporitzat..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "&Mescla i renderitza"
 
 #: Menus.cpp:572
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
-msgstr "Mescla-ho i renderitza-ho en una nova pista\tCtrl+Maj+M"
+msgstr "Mescla-ho i renderitza-ho en una nova pista\tCtrl+Shift+M"
 
 #: Menus.cpp:576
 msgid "&Resample..."
@@ -1916,7 +2050,7 @@ msgstr "Si&lencia totes les pistes\tCtrl+U"
 
 #: Menus.cpp:593
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
-msgstr "&Activa el so a totes les pistes\tCtrl+Maj+U"
+msgstr "&Activa el so a totes les pistes\tCtrl+Shift+U"
 
 #: Menus.cpp:597
 msgid "Align with &Zero"
@@ -1950,13 +2084,21 @@ msgstr "Alinea per darrera amb el &final de la selecció"
 msgid "Align Tracks To&gether"
 msgstr "Alinea les pistes &conjuntament"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Alinea les pistes..."
+#: Menus.cpp:683
+msgid "&Align Tracks"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Alin&ea i mou el cursor..."
+#: Menus.cpp:692
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:699
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:708
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1966,22 +2108,26 @@ msgstr "Afegeix una e&tiqueta a la selecció\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Afegeix una etiqueta al &punt d'interpretació\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "O&rdena les pistes per..."
+#: Menus.cpp:718
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "Temp&s d'inici"
+#: Menus.cpp:719
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Nom"
+#: Menus.cpp:721
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "&Genera"
 
+#: Menus.cpp:778 Menus.cpp:862 Menus.cpp:924
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "Efe&cte"
@@ -2015,6 +2161,10 @@ msgstr "Mo&stra el missatge de benvinguda..."
 msgid "&Index..."
 msgstr "&Índex..."
 
+#: Menus.cpp:961
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Eines de captura de pantalla..."
@@ -2027,13 +2177,13 @@ msgstr "&Executa el test d'eficiència..."
 msgid "&Audio Device Info..."
 msgstr "Informació del dispositiu de &so..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Mou-te enrere entre l'acoblador, la vista de pistes i la barra de selecció\tCtrl+Maj+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Mou-te entre l'acoblador, la vista de pistes i la barra de selecció\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2057,7 +2207,7 @@ msgstr "Eina de desplaçament en el temps\tF5"
 
 #: Menus.cpp:779
 msgid "Multi Tool\tF6"
-msgstr "Multi-eina"
+msgstr "Multi-eina\tF6"
 
 #: Menus.cpp:781
 msgid "Next Tool\tD"
@@ -2067,9 +2217,9 @@ msgstr "Eina següent\tD"
 msgid "Previous Tool\tA"
 msgstr "Eina anterior\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Reprodueix/Atura't\tEspai"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2089,7 +2239,7 @@ msgstr "Enregistra afegint\tShift+R"
 
 #: Menus.cpp:790
 msgid "Play/Stop and Set Cursor\tShift+A"
-msgstr "Engega/Atura i Estableix la posició del cursor\tMaj+A"
+msgstr "Engega/Atura i Estableix la posició del cursor\tShift+A"
 
 #: Menus.cpp:793
 msgid "Play One Second\t1"
@@ -2103,89 +2253,81 @@ msgstr "Reprodueix fins la selecció\tB"
 msgid "Play Looped\tL"
 msgstr "Reprodueix en bucle\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Reprodueix en bucle\tMaj+Espai"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "Interpreta l'exemple d'audició del fragment retallat\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Vés a l'inici\tInici"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Vés a la pista següent i canvia la selecció\tMaj+Avall"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
-msgstr "Selecciona fins a l'inici\tMaj+Inici"
+msgstr "Selecciona fins a l'inici\tShift+Home"
 
 #: Menus.cpp:803
 msgid "Selection to End\tShift+End"
-msgstr "Selecciona fins al final\tMaj+Fi"
+msgstr "Selecciona fins al final\tShift+End"
 
 #: Menus.cpp:805
 msgid "DeleteKey\tBackspace"
-msgstr "Tecla d'eliminació\tRetrocés"
+msgstr "Tecla d'eliminació\tBackspace"
 
 #: Menus.cpp:810
 msgid "DeleteKey2\tDelete"
-msgstr "Tecla d'eliminació 2\tSupr"
+msgstr "Tecla d'eliminació 2\tDelete"
 
 #: Menus.cpp:816
 msgid "Seek left short period during playback\tLeft"
-msgstr "Retrocedeix una mica durant la interpretació"
+msgstr "Retrocedeix una mica durant la interpretació\tLeft"
 
 #: Menus.cpp:817
 msgid "Seek right short period during playback\tRight"
-msgstr "Avança una mica durant la interpretació\tDreta"
+msgstr "Avança una mica durant la interpretació\tRight"
 
 #: Menus.cpp:818
 msgid "Seek left long period during playback\tShift+Left"
-msgstr "Retrocedeix un tros llarg durant la interpretació\tMaj.+Esquera"
+msgstr "Retrocedeix un tros llarg durant la interpretació\tShift+Left"
 
 #: Menus.cpp:819
 msgid "Seek right long period during playback\tShift+Right"
-msgstr "Avança un tros llarg durant la interpretació\tMaj.+Dreta"
+msgstr "Avança un tros llarg durant la interpretació\tShift+Right"
 
 #: Menus.cpp:823
 msgid "Move Focus to Previous Track\tUp"
-msgstr "Vés a la pista anterior\tAmunt"
+msgstr "Vés a la pista anterior\tUp"
 
 #: Menus.cpp:824
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
-msgstr "Vés a la pista anterior i canvia la selecció\tMaj+Amunt"
+msgstr "Vés a la pista anterior i canvia la selecció\tShift+Up"
 
 #: Menus.cpp:825
 msgid "Move Focus to Next Track\tDown"
-msgstr "Vés a la pista següent\tAvall"
+msgstr "Vés a la pista següent\tADown"
 
 #: Menus.cpp:826
 msgid "Move Focus to Next and Change Selection\tShift+Down"
-msgstr "Vés a la pista següent i canvia la selecció\tMaj+Avall"
+msgstr "Vés a la pista següent i canvia la selecció\tShift+Down"
 
 #: Menus.cpp:827
 msgid "Toggle Focused Track\tReturn"
-msgstr "Commuta la pista actual\tRetorn"
+msgstr "Commuta la pista actual\tReturn"
 
 #: Menus.cpp:828
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Commuta la pista actual\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Commuta la pista actual\tCtrl+Espai"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
-msgstr "Cursor a l'esquerra\tEsquerra"
+msgstr "Cursor a l'esquerra\tLeft"
 
 #: Menus.cpp:832
 msgid "Cursor Right\tRight"
-msgstr "Cursor a la dreta\tDreta"
+msgstr "Cursor a la dreta\tRight"
 
 #: Menus.cpp:833
 msgid "Cursor Short Jump Left\t,"
@@ -2197,19 +2339,19 @@ msgstr "Salt curt del cursor a la dreta\t."
 
 #: Menus.cpp:835
 msgid "Cursor Long Jump Left\tShift+,"
-msgstr "Salt llarg del cursor a l'esquerra\tMaj.+,"
+msgstr "Salt llarg del cursor a l'esquerra\tShift.+,"
 
 #: Menus.cpp:836
 msgid "Cursor Long Jump Right\tShift+."
-msgstr "Salt llarg del cursor a la dreta\tMaj.+."
+msgstr "Salt llarg del cursor a la dreta\tShift+."
 
 #: Menus.cpp:838
 msgid "Selection Extend Left\tShift+Left"
-msgstr "Expandeix la selecció a l'esquerra\tMaj+Esquerra"
+msgstr "Expandeix la selecció a l'esquerra\tShift+Left"
 
 #: Menus.cpp:839
 msgid "Selection Extend Right\tShift+Right"
-msgstr "Expandeix la selecció a la dreta\tMaj+Dreta"
+msgstr "Expandeix la selecció a la dreta\tShift+Right"
 
 #: Menus.cpp:841
 msgid "Set (or Extend) Left Selection"
@@ -2221,51 +2363,51 @@ msgstr "Estableix (o estén) el límit dret de la selecció"
 
 #: Menus.cpp:844
 msgid "Selection Contract Left\tCtrl+Shift+Right"
-msgstr "Contreu la selecció a l'esquerra\tCtrl+Maj+Dreta"
+msgstr "Contreu la selecció a l'esquerra\tCtrl+Shift+Right"
 
 #: Menus.cpp:845
 msgid "Selection Contract Right\tCtrl+Shift+Left"
-msgstr "Contreu la selecció a la dreta\tCtrl+Maj+Esquerra"
+msgstr "Contreu la selecció a la dreta\tCtrl+Shift+Left"
 
 #: Menus.cpp:847
 msgid "Change pan on focused track\tShift+P"
-msgstr "Canvia la posició panoràmica de la pista actual\tMaj+P"
+msgstr "Canvia la posició panoràmica de la pista actual\tShift+P"
 
 #: Menus.cpp:848
 msgid "Pan left on focused track\tAlt+Shift+Left"
-msgstr "Mou a l'esquerra la posició panoràmica de la pista actual\tAlt+Maj+Esquerra"
+msgstr "Mou a l'esquerra la posició panoràmica de la pista actual\tAlt+Shift+Left"
 
 #: Menus.cpp:849
 msgid "Pan right on focused track\tAlt+Shift+Right"
-msgstr "Mou a la dreta la posició panoràmica de la pista actual\tAlt+Maj+Dreta"
+msgstr "Mou a la dreta la posició panoràmica de la pista actual\tAlt+Shift+Right"
 
 #: Menus.cpp:850
 msgid "Change gain on focused track\tShift+G"
-msgstr "Canvia el guany a la pista actual\tMaj+G"
+msgstr "Canvia el guany a la pista actual\tShift+G"
 
 #: Menus.cpp:851
 msgid "Increase gain on focused track\tAlt+Shift+Up"
-msgstr "Incrementa el guany a la pista actual\tAlt+Maj+Amunt"
+msgstr "Incrementa el guany a la pista actual\tAlt+Shift+Up"
 
 #: Menus.cpp:852
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
-msgstr "Redueix el guany a la pista actual\tAlt+Maj+Avall"
+msgstr "Redueix el guany a la pista actual\tAlt+Shift+Down"
 
 #: Menus.cpp:853
 msgid "Open menu on focused track\tShift+M"
-msgstr "Obre el menú de la pista actual\tMaj+M"
+msgstr "Obre el menú de la pista actual\tShift+M"
 
 #: Menus.cpp:854
 msgid "Mute/Unmute focused track\tShift+U"
-msgstr "Emmudeix o deixa d'emmudir la pista actual\tMaj+U"
+msgstr "Emmudeix o deixa d'emmudir la pista actual\tShift+U"
 
 #: Menus.cpp:855
 msgid "Solo/Unsolo focused track\tShift+S"
-msgstr "Activa o desactiva el Solo a la pista actual\tMaj+S"
+msgstr "Activa o desactiva el Solo a la pista actual\tShift+S"
 
 #: Menus.cpp:856
 msgid "Close focused track\tShift+C"
-msgstr "Tanca la pista actual\tMaj+C"
+msgstr "Tanca la pista actual\tShift+C"
 
 #: Menus.cpp:858
 msgid "Snap To On"
@@ -2275,15 +2417,19 @@ msgstr "Habilita l'arrodoniment de mesures"
 msgid "Snap To Off"
 msgstr "Inhabilita l'arrodoniment de mesures"
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Obre un fitxer recent"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "&Fitxers recents..."
+#: Menus.cpp:1158
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2340,6 +2486,23 @@ msgstr "Repeteix %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "No hi ha cap pista d'etiquetes per a exportar"
 
+#: Menus.cpp:2619
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2623
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2655
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2656
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "No hi ha res a desfer"
@@ -2383,6 +2546,10 @@ msgstr "Text enganxat des del porta-retalls"
 msgid "Pasted from the clipboard"
 msgstr "Enganxat des del porta-retalls"
 
+#: Menus.cpp:3094
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "No es pot copiar so estereofònic en una pista monofònica."
@@ -2552,9 +2719,9 @@ msgstr "Importa etiquetes"
 msgid "Select a MIDI file..."
 msgstr "Seleccioneu un fitxer MIDI..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Tots els fitxers (*.*)|*.*|Fitxers MIDI (*.mid)|*.mid|Fitxers Allegro (*.gro)|*.gro"
+#: Menus.cpp:4196
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2573,14 +2740,6 @@ msgstr "Seleccioneu qualsevol fitxer de so que no estigui comprimit..."
 msgid "All files (*)|*"
 msgstr "Tots els fitxers (*)|*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importa"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Edita les etiquetes de metadades"
@@ -2654,6 +2813,14 @@ msgstr "Alineat"
 msgid "Align"
 msgstr "Alinea"
 
+#: Menus.cpp:4599
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4603
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "S'ha creat una nova pista de so"
@@ -2720,15 +2887,15 @@ msgid "Removed audio track(s)"
 msgstr "Una o més pistes de so han estat eliminades"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nova freqüència de mostreig (Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Canvia la freqüència de mostreig"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Nova freqüència de mostreig (Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "El valor que heu escrit no és vàlid"
@@ -2796,15 +2963,13 @@ msgid "Save changes before closing?"
 msgstr "Voleu desar els canvis abans de tancar?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Si l'heu desat, el projecte no tindrà cap pista.\n"
 "\n"
@@ -2831,16 +2996,14 @@ msgstr "Projectes de l'Audacity|*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Aquest fitxer va ser desat amb l'Audacity %s, una versió\n"
+msgstr "Aquest fitxer va ser desat amb l'Audacity %s, una versió\n"
 "molt antiga del programa. El format dels fitxers ha canviat.\n"
 "\n"
 "L'Audacity podria fer malbé les dades en intentar obrir-lo,\n"
@@ -2864,11 +3027,9 @@ msgstr "S'ha produït un error en obrir el fitxer"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Aquest fitxer pot haver-se corromput o ser invàlid: \n"
+msgstr "Aquest fitxer pot haver-se corromput o ser invàlid: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -2907,12 +3068,10 @@ msgstr "No s'ha pogut trobar la carpeta de dades del projecte:\"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Aquest fitxer es va desar amb l'Audacity %s.\n"
+msgstr "Aquest fitxer es va desar amb l'Audacity %s.\n"
 "Esteu fent servir l'Audacity %s - heu d'actualitzar\n"
 "el fitxer a una versió més nova per a poder-lo obrir."
 
@@ -2922,25 +3081,35 @@ msgstr "No es pot obrir el fitxer de projecte"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Aquest fitxer va ser desat amb l'Audacity %s.\n"
+msgstr "Aquest fitxer va ser desat amb l'Audacity %s.\n"
 "Podeu obrir-lo amb aquesta versió de l'Audacity, però quan el deseu ja no el podreu tornar a obrir amb versions anteriors del programa.\n"
 "\n"
 "Voleu obrir ara aquest fitxer?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2647
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"No s'ha pogut desar el projecte. Potser no es pot escriure a %s,\n"
-"o potser el disc és ple."
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2952,24 +3121,19 @@ msgstr "S'ha produït un error en desar el projecte"
 msgid "Saved %s"
 msgstr "S'ha desat %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Dades crues"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "S'està important %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "S'ha importat '%s'"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Importa"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -2983,20 +3147,23 @@ msgstr "Enregistra les dades Speech com a:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Fitxer de so Windows PCM (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2938
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Els fitxers de projecte Audacity (.aup) us permeten desar tot el que esteu\n"
-"utilitzant tal com apareix a la pantalla, però no hi ha cap altre\n"
-"programa que els pugui obrir.\n"
+
+#: Project.cpp:2941
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Si voleu desar en un format reconegut per altres programes seleccioneu\n"
-"alguna de les opcions d'exportació."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3041,6 +3208,16 @@ msgstr "La quantitat d'espai lliure del disc us permet enregistrar fins a %d seg
 msgid "Out of disk space"
 msgstr "S'ha exhaurit l'espai lliure del disc"
 
+#: Project.cpp:3380
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3383
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "No s'ha pogut eliminar el fitxer antic de restabliment automàtic:"
@@ -3127,49 +3304,13 @@ msgstr "Pre&visualització"
 msgid "&Debug"
 msgstr "&Depura"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Enregistrament programat de l'Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Inici de l'enregistrament"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Fi de l'enregistrament"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Durada"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Progrés de l'enregistrament intel·ligent"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Data i hora d'inici"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Data i hora d'acabament"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "S'està esperant per a començar l'enregistrament el %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Enregistrament intel·ligent de l'Audacity - S'està esperant per a començar"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3210,10 +3351,9 @@ msgstr "Gènere"
 msgid "Comments"
 msgstr "Comentaris"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Premeu F2 o feu doble clic per a editar-lo."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3233,16 +3373,13 @@ msgstr "&Neteja"
 msgid "Genres"
 msgstr "Gèneres"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Edita"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "Restableix"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3312,6 +3449,16 @@ msgstr "Segur que voleu restablir la llista de gèneres als valors per defecte?"
 msgid "Unable to open genre file."
 msgstr "No s'ha pogut obrir el fitxer de gèneres."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "S'ha produït un error en llegir les metadades"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3321,206 +3468,139 @@ msgstr "No s'ha pogut obrir el fitxer de gèneres."
 msgid "Save Metadata As:"
 msgstr "Enregistra les metadades com a:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "S'ha produït un error en llegir les metadades"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Títol:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Artista:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Àlbum:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Compositor/a:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Lletrista:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Comentaris:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Codificat per:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Número de pista:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Any:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Gènere:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Cap gènere"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Restableix als valors per defecte"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Bàsic"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Avançat"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Valor"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "&Neteja"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "La longitud màxima de l'atribut '%s' és de %d caràcters. S'han truncat les dades."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Títol"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Artista"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Àlbum"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"L'Audacity no ha pogut escriure al fitxer:\n"
+msgstr "L'Audacity no ha pogut escriure al fitxer:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"L'Audacity no ha pogut obrir el fitxer:\n"
+msgstr "L'Audacity no ha pogut obrir el fitxer:\n"
 "  %s\n"
 "per a escriure-hi."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"L'Audacity no ha pogut escriure les imatges al fitxer:\n"
+msgstr "L'Audacity no ha pogut escriure les imatges al fitxer:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"L'Audacity no ha pogut trobar el fitxer:\n"
+msgstr "L'Audacity no ha pogut trobar el fitxer:\n"
 "  %s.\n"
 "El tema no s'ha carregat."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"L'Audacity no pot carregar el fitxer:\n"
+msgstr "L'Audacity no pot carregar el fitxer:\n"
 "  %s.\n"
 "Potser té un format PNG incorrecte?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"L'Audacity no ha pogut carregar el tema per defecte.\n"
+msgstr "L'Audacity no ha pogut carregar el tema per defecte.\n"
 "Si us plau, informeu del problema."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"No s'ha trobat cap dels fitxers que composen\n"
+msgstr "No s'ha trobat cap dels fitxers que composen\n"
 "el tema a:\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"No s'ha pogut crear el directori:\n"
+msgstr "No s'ha pogut crear el directori:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"L'Audacity no ha pogut desar el fitxer:\n"
+msgstr "L'Audacity no ha pogut desar el fitxer:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Tots els fitxers necessaris a:\n"
+msgstr "Tots els fitxers necessaris a:\n"
 "  %s\n"
 "són presents."
 
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Durada"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Enregistrament programat de l'Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Inici de l'enregistrament"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Fi de l'enregistrament"
+
+#: TimerRecordDialog.cpp:231
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Data i hora d'inici"
+
+#: TimerRecordDialog.cpp:324
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Data i hora d'acabament"
+
+#: TimerRecordDialog.cpp:344
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "S'està esperant per a començar l'enregistrament el %s.\n"
+
+#: TimerRecordDialog.cpp:432
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
 msgid "Track Panel"
@@ -3815,6 +3895,14 @@ msgstr "S'ha ajustat la posició panoràmica"
 msgid "Adjusted gain"
 msgstr "S'ha ajustat el guany"
 
+#: TrackPanel.cpp:5796
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5797
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "No es pot eliminar una pista quan és activa"
@@ -3872,14 +3960,6 @@ msgstr "Canvia la freqüència"
 msgid "Format Change"
 msgstr "Canvia el format"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Escriviu una freqüència en Hz (mostres per segon) entre 1 i 100.000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Freqüència incorrecta"
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "Canvia el límit inferior de velocitat (%) a:"
@@ -4018,24 +4098,21 @@ msgstr "Connectors 1 a %i"
 msgid "Plugins %i to %i"
 msgstr "Connectors %i a %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Ha estat rebutjat per alguna raó. Proveu-ho seleccionant abans un fragment de so."
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Això només es pot fer quan la interpretació i l'enregistrament\n"
+msgstr "Això només es pot fer quan la interpretació i l'enregistrament\n"
 "estan aturats.  [No n'hi ha prou posant-se en pausa.]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Per fer això cal seleccionar abans algun fragment de so estereofònic.\n"
+msgstr "Per fer això cal seleccionar abans algun fragment de so estereofònic.\n"
 "[No es pot fer amb pistes monofòniques.]"
 
 #: commands/CommandManager.cpp:785
@@ -4043,16 +4120,14 @@ msgid "You must first select some audio for this to use."
 msgstr "Cal que seleccioneu un fragment de so per a emprar aquesta funcionalitat."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Per fer això cal que seleccioneu abans algun fragment de so.\n"
+msgstr "Per fer això cal que seleccioneu abans algun fragment de so.\n"
 "[No s'hi val a seleccionar fragments d'altres tipus de pistes.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Missatge"
+#: commands/CommandManager.cpp:872
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4072,14 +4147,19 @@ msgstr "S'ha aplicat l'efecte: %s %.1f dB"
 msgid "Amplify"
 msgstr "Amplifica"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplificador, per Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Amplificació (dB)"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Nou pic d'amplitud (dB):"
@@ -4208,10 +4288,18 @@ msgstr "per Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Freqüència (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Accentuació (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Amplificació dels baixos..."
@@ -4255,8 +4343,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "S'està emprant el SoundTouch, d'Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "To: des de"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Semitons:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4266,13 +4395,9 @@ msgstr "To: des de"
 msgid "to"
 msgstr "fins a"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Semitons:"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Freqüència (Hz): des de"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4280,6 +4405,11 @@ msgstr "Freqüència (Hz): des de"
 msgid "Percent Change:"
 msgstr "Canvi percentual:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Canvia el to..."
@@ -4298,6 +4428,14 @@ msgstr "S'ha aplicat l'efecte: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Canvia la velocitat"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "no aplicable"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Canvia la velocitat, afectant tant el temps com el to"
@@ -4306,17 +4444,17 @@ msgstr "Canvia la velocitat, afectant tant el temps com el to"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "s'està fent servir el SampleRate, d'Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "no aplicable"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "RPM de vinil estàndard:   des de"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4334,13 +4472,29 @@ msgstr "Canvia el temps"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Canvia el temps sense canviar el to"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Pulsacions per minut (PPM): des de"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Longitud (segons): des de"
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4350,8 +4504,9 @@ msgstr "Canvia el temps..."
 msgid "Changing Tempo"
 msgstr "S'està canviant el temps"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Eliminació de sorolls \"clic\""
 
 #: effects/ClickRemoval.cpp:336
@@ -4362,10 +4517,18 @@ msgstr "Supressió de sorolls \"clic\" i \"pop\", per Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Seleccioneu el llindar (un valor baix accentua l'efecte):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Seleccioneu l'amplada màxima dels pics (un valor alt accentua l'efecte):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Eliminació de sorolls \"clic\"..."
@@ -4378,49 +4541,86 @@ msgstr "S'estan eliminant sorolls \"clic\" i \"pop\"..."
 msgid "Dynamic Range Compressor"
 msgstr "Compressor d'abast dinàmic"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Compressor d'abast dinàmic, per Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Coeficient:"
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Temps d'atac:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Temps de caiguda:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalitza a 0 dB després de la compressió"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Llindar: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Coeficient: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Coeficient: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Temps d'atac: %.1f segons"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Temps de caiguda: %.1f segons"
 
 #: effects/Compressor.h:36
@@ -4431,6 +4631,251 @@ msgstr "Compressor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "S'està aplicant la compressió de rang dinàmic..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:190
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:277 effects/Contrast.cpp:288 effects/Contrast.cpp:371
+#: effects/Contrast.cpp:415
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:318
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:321
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Inici"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Final"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:335
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:378
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:426
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:430
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "Restableix"
+
+#: effects/Contrast.cpp:434
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:445
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Control"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:466 effects/Contrast.cpp:472 effects/Contrast.cpp:478
+#: effects/Contrast.cpp:484
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:517 effects/Contrast.cpp:527
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:532
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:534
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "Generador de tons DTMF"
@@ -4687,6 +5132,10 @@ msgstr "Inverteix"
 msgid "Inverting"
 msgstr "S'està fent la inversió..."
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Anivellador"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Cap / Saltar-s'ho"
@@ -4711,29 +5160,26 @@ msgstr "Més fort"
 msgid "Heaviest"
 msgstr "El més fort"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Anivellador"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Anivellador per Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Equalitza les seccions més lleugeres i més pesades"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "per Lynn Allan"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Grau d'anivellament"
 
+#: effects/Leveller.cpp:228
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Llindar de soroll (Soroll \"hiss\", \"hum\" o d'ambient)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:240
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Llindar de soroll:"
 
 #: effects/Leveller.h:28
@@ -4744,6 +5190,158 @@ msgstr "Anivellador..."
 msgid "Applying Leveller..."
 msgstr "S'està aplicant l'anivellador..."
 
+#: effects/LoadEffects.cpp:103
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:105
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:107
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:109
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:111
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:113
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mesclador"
+
+#: effects/LoadEffects.cpp:117
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:119
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:121
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:123
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:127
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:129
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:131
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:133
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:135
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:137
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:139
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:141
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:143
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:145
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:147
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:149
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:151
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:153
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:155
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:157
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:159
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:161
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:163
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:165
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:167
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Supressió de soroll"
+
+#: effects/LoadEffects.cpp:202
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:204
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:206
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:208
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Blanc"
@@ -4779,31 +5377,23 @@ msgstr "S'està generant soroll"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"No s'ha pogut obrir el fitxer: \n"
+msgstr "No s'ha pogut obrir el fitxer: \n"
 " %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "S'ha intentat aplicar la reducció de soroll sense haver definit abans el perfil.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Supressió de soroll"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "Pas 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Seleccioneu uns quants segons de so on només hi hagi soroll, de manera que l'Audacity\n"
+msgstr "Seleccioneu uns quants segons de so on només hi hagi soroll, de manera que l'Audacity\n"
 "sàpiga què és el que cal filtrar. Després feu clic a 'Obtenció del perfil de soroll':"
 
 #: effects/NoiseRemoval.cpp:815
@@ -4811,11 +5401,9 @@ msgid "Step 2"
 msgstr "Pas 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Seleccioneu el fragment de so on vulgueu aplicar el filtre, fixeu la quantitat de soroll a filtrar\n"
+msgstr "Seleccioneu el fragment de so on vulgueu aplicar el filtre, fixeu la quantitat de soroll a filtrar\n"
 "i feu clic a 'D'acord' per a executar l'operació.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4830,14 +5418,26 @@ msgstr "Obtenció del perfil de soroll"
 msgid "Noise reduction (dB):"
 msgstr "Reducció de soroll (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Freqüència d'allisament (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Temps d'atac/esmorteïment (segons)"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Treu soroll..."
@@ -4878,22 +5478,23 @@ msgstr ", amplitud màxima = %.1f dB"
 msgid "Normalize"
 msgstr "Normalitza"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalitzador per Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Corregeix qualsevol desviament del DC (centra verticalment al 0)"
+#: effects/Normalize.cpp:351
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:354
+#, fuzzy
+msgid "Normalize maximum amplitude to:"
 msgstr "Normalitza l'amplitud màxima a"
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Normalitza..."
@@ -4907,44 +5508,56 @@ msgstr "S'està normalitzant..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "S'ha aplicat l'efecte: %s %d etapes, %.0f%% humit, freqüència = %.1f Hz, fase inicial = %.0f graus, intensitat = %d, resposta = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser, per Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Etapes:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "SEC"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "HUMIT"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Freqüència LFO (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "Fase d'inici LFO (graus):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Profunditat:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Acoblament (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4954,15 +5567,21 @@ msgid "Applying Phaser"
 msgstr "S'està aplicant l'efecte Phaser"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"L'efecte de reparació és per a fer-lo servir en seccions molt curtes de so danyat (fins a 128 mostres).\n"
+msgstr "L'efecte de reparació és per a fer-lo servir en seccions molt curtes de so danyat (fins a 128 mostres).\n"
 "\n"
 "Feu zoom i seleccioneu una petita fracció de segon per a reparar-la."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "S'està reparant el so danyat"
@@ -4981,30 +5600,25 @@ msgstr "Les pistes són massa llargues per a repetir la selecció."
 msgid "Repeat"
 msgstr "Repeteix"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repetidor, per Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:211
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Nombre de repeticions:"
 
+#: effects/Repeat.cpp:220
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Longitud de selecció nova:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minuts, %d segons"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d segons"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5052,11 +5666,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "SpikeCleaner per Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Durada màxima dels pics (en mil·lisegons): \n"
+msgstr "Durada màxima dels pics (en mil·lisegons): \n"
 "(un valor de 99999 o més els elimina completament)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5071,10 +5683,60 @@ msgstr "Netejador de pics..."
 msgid "Applying Spike Cleaner..."
 msgstr "S'està aplicant el netejador de pics..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "E&stèreo a mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "S'està aplicant la conversió d'estèreo a mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5122,17 +5784,21 @@ msgstr "Freqüència (Hz)"
 msgid "Waveform:"
 msgstr "Forma d'ona:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Inici"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Final"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5163,10 +5829,6 @@ msgstr "Totes les pistes han de tenir la mateixa freqüència de mostreig"
 msgid "Truncate Silence"
 msgstr "Trunca un silenci"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "per Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Durada màxima del silenci:"
@@ -5214,10 +5876,6 @@ msgstr "S'ha aplicat l'efecte: %s freqüència = %.1f Hz, fase inicial = %.0f gr
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah, per Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Profunditat (%):"
@@ -5226,10 +5884,18 @@ msgstr "Profunditat (%):"
 msgid "Resonance:"
 msgstr "Ressonància:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Desplaçament de la freqüència Wah (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5268,6 +5934,18 @@ msgstr "Paràmetres de l'efecte"
 msgid "Length (seconds)"
 msgstr "Longitud (segons)"
 
+#: effects/lv2/LV2Effect.cpp:850 effects/lv2/LV2Effect.cpp:853
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:861 effects/lv2/LV2Effect.cpp:864
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:872 effects/lv2/LV2Effect.cpp:875
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "S'està aplicant l'efecte Nyquist..."
@@ -5335,13 +6013,13 @@ msgstr "Paràmetres del connector"
 msgid "Program"
 msgstr "Programa"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"No hi ha cap pista seleccionada! Feu servir Ctrl+A (Selecciona-ho tot)\n"
-"Feu servir \"Exporta...\" per a exportar totes les pistes."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5357,14 +6035,12 @@ msgstr "Segur que voleu desar el fitxer amb el nom \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Sou a punt de desar un fitxer %s amb el nom \"%s\".\n"
+msgstr "Sou a punt de desar un fitxer %s amb el nom \"%s\".\n"
 "\n"
 "Normalment aquests fitxers acaben en \"%s\", i alguns programes no obriran fitxers amb extensions no estàndard.\n"
 "\n"
@@ -5400,6 +6076,10 @@ msgstr " - Esquerre"
 msgid " - Right"
 msgstr " - Dret"
 
+#: export/Export.cpp:1082
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5437,10 +6117,6 @@ msgstr "(programa extern)"
 msgid "Cannot export audio to %s"
 msgstr "No es port exportar el so a %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Exporta"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "S'està exportant el so seleccionat utilitzant el codificador de línia d'ordres"
@@ -5453,6 +6129,477 @@ msgstr "S'està exportant tot el projecte utilitzant el codificador de línia d'
 msgid "Command Output"
 msgstr "Sortida de l'ordre"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:643
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:644
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Freqüència incorrecta"
+
+#: export/ExportFFmpeg.cpp:720
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:723
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Hauríeu de tornar a mostrejar-ho a algun dels valors que es mostren a continuació."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Freqüències de mostreig"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:112
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Resolució:"
+
+#: export/ExportFFmpegDialogs.cpp:157
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:168
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:211
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:230
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:275
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:294
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:341
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:360
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:488
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:489
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:795
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:884
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:885
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:886
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:887
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:888
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:889
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:896
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:903
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:904
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:906
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Idioma:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:921
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:922
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:925
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Qualitat:"
+
+#: export/ExportFFmpegDialogs.cpp:928
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:930
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:933
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:936
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:952
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:953
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:955
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:956
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:958
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:959
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:961
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:962
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:964
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:967
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:989
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:991
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:992
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1211
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1230
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1270
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Fitxers XML (*.xml)|*.xml|Tots els fitxers (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1290
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Opcions FLAC"
@@ -5533,10 +6680,6 @@ msgstr "Opcions MP2"
 msgid "MP2 Export Setup"
 msgstr "Configuració de l'exportació a MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Resolució:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Fitxers MP2"
@@ -5657,35 +6800,15 @@ msgstr "Localització del LAME"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "L'Audacity necessita trobar el fitxer %s per a poder crear fitxers MP3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Posició de %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Feu clic aquí per a localitzar el fitxer %s -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Navega..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Feu clic aquí per a obtenir una còpia gratuïta del LAME -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Descarrega..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "On és %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5750,39 +6873,23 @@ msgstr "S'està exportant tot el fitxer a %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "El codificador d'MP3 ha retornat l'error %d"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Freqüència incorrecta"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"La freqüència de mostreig del projecte (%d) no està suportada pel\n"
+msgstr "La freqüència de mostreig del projecte (%d) no està suportada pel\n"
 "format de fitxer MP3.  "
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"La combinació de freqüència de mostreig (%d) i cabal de bits (%d kbps) del projecte no està\n"
+msgstr "La combinació de freqüència de mostreig (%d) i cabal de bits (%d kbps) del projecte no està\n"
 "suportada pel format de fitxer MP3.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Hauríeu de tornar a mostrejar-ho a algun dels valors que es mostren a continuació."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Freqüències de mostreig"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "No s'ha trobat el connector d'exportació a MP3"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
@@ -5792,13 +6899,11 @@ msgid "Export Multiple"
 msgstr "Exporta múltiples fitxers"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Si teniu més d'una pista de so podeu exportar-les en fitxers separats,\n"
+msgstr "Si teniu més d'una pista de so podeu exportar-les en fitxers separats,\n"
 "i si teniu una pista d'etiquetes, podeu generar un fitxer a partir de cada etiqueta.\n"
 "\n"
 "Aquest projecte no té ni múltiples pistes ni pista d'etiquetes, o sigui que és impossible fer-ne una exportació múltiple."
@@ -5844,6 +6949,10 @@ msgstr "Inclou el so d'abans de la primera etiqueta"
 msgid "First file name:"
 msgstr "Nom del primer fitxer:"
 
+#: export/ExportMultiple.cpp:277
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Pistes"
@@ -5864,14 +6973,14 @@ msgstr "Numeració consecutiva"
 msgid "File name prefix:"
 msgstr "Prefix dels noms de fitxer:"
 
+#: export/ExportMultiple.cpp:324
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Sobreescriu els fitxers existents"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E%xporta"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5883,12 +6992,10 @@ msgstr "Escull una ubicació per a desar-hi els fitxers exportats"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" no existeix.\n"
+msgstr "\"%s\" no existeix.\n"
 "\n"
 "Voleu crear-lo?"
 
@@ -5911,11 +7018,9 @@ msgstr "Alguna cosa ha anat malament després d'exportar %d fitxer(s)."
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"L'etiqueta %s no té un nom de fitxer vàlid. No podeu fer servir cap dels caràcters:   %s\n"
+msgstr "L'etiqueta %s no té un nom de fitxer vàlid. No podeu fer servir cap dels caràcters:   %s\n"
 "Feu servir..."
 
 #: export/ExportOGG.cpp:64
@@ -5926,10 +7031,6 @@ msgstr "Indiqueu les opcions d'Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Configuració de l'exportació a Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Qualitat:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Fitxers Ogg Vorbis"
@@ -5950,10 +7051,6 @@ msgstr "Indiqueu les opcions per al format no comprimit"
 msgid "Uncompressed Export Setup"
 msgstr "Configuració de l'exportació a format no comprimit"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Format:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Encapçalament:"
@@ -5966,10 +7063,21 @@ msgstr "Codificació:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(No totes les combinacions de capçaleres i codificacions són possibles)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF i altres tipus de fitxers no comprimits"
+#: export/ExportPCM.cpp:359
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:377
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:388
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:399
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -5991,116 +7099,131 @@ msgstr "S'està exportant tot el projecte com a %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Error (podria ser que el fitxer no s'hagués escrit): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "Fitxers MP3"
+
+#: import/Import.cpp:176
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Aquesta versió de l'Audacity no s'ha compilat amb suport per a %s"
 
+#: import/Import.cpp:242
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" és una pista d'un CD d'àudio. \n"
+msgstr "\"%s\" és una pista d'un CD d'àudio. \n"
 "L'Audacity no pot obrir directament aquest tipus de recurs.\n"
 "Heu d'extreure (ripejar) les pistes de so del CD a un format que\n"
 "l'Audacity sigui capaç d'importar, com ara WAV o AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\" és una llista de reproducció.\n"
+msgstr "\"%s\" és una llista de reproducció.\n"
 "L'Audacity no pot obrir aquest fitxer perquè conté únicament enllaços a altres fitxers.\n"
 "Podeu intentar obrir-lo amb un editor de text i descarregar cada un dels fitxers de so."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" és un fitxer de tipus Windows Media Audio. \n"
+msgstr "\"%s\" és un fitxer de tipus Windows Media Audio. \n"
 "L'Audacity no pot obrir aquest tipus de fitxer degut a restriccions de patents.\n"
 "Hauríeu de convertir-lo a un format de so que estigui suportat, com ara WAV o AIFF."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" és un fitxer de tipus Advanced Audio Coding. \n"
+msgstr "\"%s\" és un fitxer de tipus Advanced Audio Coding. \n"
 "L'Audacity no pot obrir fitxers d'aquest tipus.\n"
 "Hauríeu de convertir-lo a algun format de so que estigui suportat, com ara WAV o AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:273
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\"  és un fitxer de so encriptat, probablement adquirit a una botiga de música en línia. \n"
+msgstr "\"%s\"  és un fitxer de so encriptat, probablement adquirit a una botiga de música en línia. \n"
 "L'Audacity no pot obrir aquest fitxer degut a l'encriptació.\n"
 "Intenteu enregistrar el so des de l'Audacity, o enregistrar un CD i\n"
 "extreure les pistes a un format suportat i no encriptat, com ara WAV o AIFF."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" és un fitxer de tipus RealPlayer. \n"
+msgstr "\"%s\" és un fitxer de tipus RealPlayer. \n"
 "L'Audacity no pot obrir aquest format propietari.\n"
 "Hauríeu de convertir-lo a algun format de so suportat, com ara WAV o AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"El fitxer \"%s\" és de tipus MIDI, i no conté so. \n"
-"L'Audacity no pot obrir aquest tipus de fitxer per a reproduir-lo o editar-lo, però podeu\n"
-"representar-lo fent clic a Fitxer > Importa > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"El fitxer \"%s\" està basat en notes, i no conté so.\n"
+msgstr "El fitxer \"%s\" està basat en notes, i no conté so.\n"
 "L'Audacity no pot obrir fitxers d'aquest tipus.\n"
 "Hauríeu de convertir-lo a algun format de so com ara WAV o AIFF,\n"
 "i després importar-lo a l'Audacity."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"El fitxer \"%s\" és de tipus Musepack. \n"
+msgstr "El fitxer \"%s\" és de tipus Musepack. \n"
 "L'Audacity no pot obrir aquest tipus de fitxer.\n"
 "Si penseu que podria tractar-se d'un fitxer mp3, canvieu-li el nom per tal que acabi en \".mp3\" \n"
 "i intenteu importar-lo. Altrament haureu de convertir-lo a\n"
@@ -6108,58 +7231,58 @@ msgstr ""
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"El fitxer \"%s\" és de tipus Wavpack. \n"
+msgstr "El fitxer \"%s\" és de tipus Wavpack. \n"
 "L'Audacity no pot obrir fitxers d'aquest tipus.\n"
 "Hauríeu de convertir-lo a algun format de so suportat, com ara WAV o AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"El fitxer \"%s\" és de tipus Dolby Digital. \n"
+msgstr "El fitxer \"%s\" és de tipus Dolby Digital. \n"
 "L'Audacity no pot obrir fitxers d'aquest tipus.\n"
 "Hauríeu de convertir-lo a algun format de so que estigui suportat, com ara WAV o AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"El fitxer \"%s\" és de tipus Ogg Speex. \n"
+msgstr "El fitxer \"%s\" és de tipus Ogg Speex. \n"
 "L'Audacity no pot obrir fitxers d'aquest tipus.\n"
 "Hauríeu de convertir-lo a algun format de so que estigui suportat, com ara WAV o AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:314
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"L'Audacity ha d'endevinar el tipus de dades del fitxer.\n"
-"Si no l'encerta, el so serà només soroll.\n"
-"\n"
-"Si passa això, canvieu el nom del fitxer\n"
-"per tal que tingui l'extensió que li pertoca, i torneu a obrir-lo."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:319
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:324
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"L'Audacity no reconeix aquest tipus de fitxer.\n"
-"Si conté so no comprimit proveu d'importar-lo amb l'opció \"Importa cru\""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6196,17 +7319,18 @@ msgstr "Les pistes MIDI no es poden desplaçar individualment. Això només es p
 msgid "Invalid track offset in LOF file."
 msgstr "Indicació incorrecta de posició de pista en el fitxer LOF"
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "S'ha produït un error en analitzar el fitxer Allegro"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "S'ha produït un error en analitzar el fitxer MIDI"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Fitxers MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6232,15 +7356,24 @@ msgstr "Encapçalament invàlid de Vorbis bistream"
 msgid "Internal logic fault"
 msgstr "Avaria de lògica interna."
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF i altres tipus de fitxers no comprimits"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "S'està important el fitxer %s..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Fitxers QuickTime"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Importa dades crues"
@@ -6263,7 +7396,7 @@ msgstr "El bit menor darrera (little-endian)"
 #. know the correct technical word.
 #: import/ImportRaw.cpp:343
 msgid "Big-endian"
-msgstr "El bit major darrera (big-endian)"
+msgstr "El bit Shiftor darrera (big-endian)"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
@@ -6284,6 +7417,14 @@ msgstr "2 Canals (Estèreo)"
 msgid "%d Channels"
 msgstr "%d Canals"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Desplaçament inicial:"
@@ -6296,9 +7437,18 @@ msgstr "Quantitat a importar:"
 msgid "Sample rate:"
 msgstr "Freqüència de mostreig:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importa"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6343,9 +7493,9 @@ msgstr "Canals"
 msgid "Playthrough"
 msgstr "Interpreta a través"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Re&produeix les altres pistes mentre se n'enregistra una de nova"
+#: prefs/AudioIOPrefs.cpp:150
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6355,9 +7505,13 @@ msgstr "Reproducció a través del &Maquinari: Interpreta una pista nova mentre
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Reproducció a través del &programari: Interpreta una nova pista mentre s'enregistra"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "Reproducció a través del &programari: Interpreta una nova pista mentre s'enregistra (desmarqueu-ho quan enregistreu des del canal \"mescla estereofònica\")"
+#: prefs/AudioIOPrefs.cpp:158
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:161
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6384,19 +7538,15 @@ msgid "Latency"
 msgstr "Latència"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Àudio a la memòria intermèdia:\n"
+msgstr "Àudio a la memòria intermèdia:\n"
 "(valor més alt = més latència)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Correcció de latència:\n"
+msgstr "Correcció de latència:\n"
 "(valor negatiu = enrere)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6470,8 +7620,8 @@ msgid "Audio cache"
 msgstr "Memòria intermèdia de so"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Conserva les dades enregistrades a la memòria fins que s'aturi l'enregistrament"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6512,9 +7662,9 @@ msgstr "Versió de la biblioteca MP3:"
 msgid "MP3 Library:"
 msgstr "Biblioteca MP3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Cerca la biblioteca"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6524,9 +7674,22 @@ msgstr "Biblioteca MP3 LAME:"
 msgid "&Download"
 msgstr "&Descarrega"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "Nota: Les opcions referents a la qualitat de l'exportació es poden escollir fent clic al botó Opcions del diàleg Exporta."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Nota: Les opcions referents a la qualitat de l'exportació es poden escollir fent clic al botó Opcions del diàleg Exporta.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6598,7 +7761,8 @@ msgid "&Update display while playing"
 msgstr "&Refresca la representació gràfica mentre es reprodueix el so"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Quan tanqueu la darrera finestra es tancarà l'Audacity"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6606,15 +7770,16 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "Habilita l'&arrossegament de les vores dreta i esquerra de la selecció"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Ordena &ergonòmicament els botons d'E/S de so"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Zoom vertical automàtic que permeti &encabir-hi totes les pistes"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "\"Canvia la pista activa\" va passant &cíclicament per totes les pistes del projecte"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6642,17 +7807,22 @@ msgid "Show warnings about &temp files"
 msgstr "Mostra advertiments sobre els fitxers &temporals"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&Pregunta si es vol desar, fins i tot si està buit"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Mostra el missatge de benvinguda en iniciar el programa"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Modes"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Rang mínim de representació: mesuradors i so en forma d'ona (dB)'"
@@ -6685,34 +7855,10 @@ msgstr "-145 dB (rang PCM de les mostres de 24 bits)"
 msgid "Default View Mode"
 msgstr "Mode de visualització per defecte"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "WaveformDisplay"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "WaveformDBDisplay"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "SpectrumDisplay"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "SpectrumLogDisplay"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "PitchDisplay"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Altres opcions de l'interfície"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Idioma:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Ajuda:"
@@ -6726,6 +7872,14 @@ msgstr "Botó Solo:"
 msgid "Keyboard"
 msgstr "Teclat"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Assignacions de tecles"
@@ -6759,22 +7913,16 @@ msgstr "S'ha produït un error en desar les dreceres de teclat"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Seleccioneu un fitxer XML amb les dreceres de teclat de l'Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Fitxers XML (*.xml)|*.xml|Tots els fitxers (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "S'ha produït un error en carregar les dreceres de teclat"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"La drecera de teclat '%s' es troba ja assignada a:\n"
+msgstr "La drecera de teclat '%s' es troba ja assignada a:\n"
 "\n"
 "'%s'"
 
@@ -6783,6 +7931,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Desfés"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Re&produeix les altres pistes mentre se n'enregistra una de nova"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -6844,7 +8028,7 @@ msgstr "Amplia l'abast de la selecció"
 
 #: prefs/MousePrefs.cpp:100
 msgid "Shift-Left-Click"
-msgstr "Maj+clic esquerre"
+msgstr "Shift+clic esquerre"
 
 #: prefs/MousePrefs.cpp:101
 msgid "Left-Double-Click"
@@ -6906,7 +8090,7 @@ msgstr "el mateix que arrossegar a l'esquerra"
 
 #: prefs/MousePrefs.cpp:108
 msgid "Shift-Drag"
-msgstr "Majúscules+Arrossega"
+msgstr "Shiftúscules+Arrossega"
 
 #: prefs/MousePrefs.cpp:108
 msgid "Zoom out on a Range"
@@ -6926,7 +8110,7 @@ msgstr "Desplaça el clip en el temps, o mou-lo amunt o avall entre pistes"
 
 #: prefs/MousePrefs.cpp:112
 msgid "Shift-Left-Drag"
-msgstr "Maj+Arrossega a l'esquerra"
+msgstr "Shift+Arrossega a l'esquerra"
 
 #: prefs/MousePrefs.cpp:112
 msgid "Time shift all clips in track"
@@ -7009,7 +8193,7 @@ msgstr "Desplaça't a l'esquerra o a la dreta"
 
 #: prefs/MousePrefs.cpp:128
 msgid "Shift-Wheel-Rotate"
-msgstr "Majúscules+Roda del ratolí"
+msgstr "Shiftúscules+Roda del ratolí"
 
 #: prefs/MousePrefs.cpp:129
 msgid "Ctrl-Wheel-Rotate"
@@ -7088,14 +8272,13 @@ msgstr "Alta qualitat:"
 msgid "Smart Recording"
 msgstr "Enregistrament intel·ligent"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Posa l'enregistrament en pausa quan hi hagi silenci"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Nivell de silenci (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7231,8 +8414,7 @@ msgid "Info"
 msgstr "Informació"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7245,8 +8427,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"L'ús dels temes és una funcionalitat experimental.\n"
+msgstr "L'ús dels temes és una funcionalitat experimental.\n"
 "\n"
 "Per a provar-la feu clic a \"Desa la mostra del tema\" i després\n"
 "busqueu i modifiqueu les imatges i els colors a\n"
@@ -7261,43 +8442,33 @@ msgstr ""
 "que conté la imatge s'hi vegin altres icones.]\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Heu compilat l'Audacity amb un botó extra, \n"
+msgstr "Heu compilat l'Audacity amb un botó extra, \n"
 "'Sortida de codi font', que serveix per a desar un fitxer en llenguatge C de \n"
 "la imatge de mostra, que podreu fer servir per a una nova compilació.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Si l'opció 'Carrega la mostra del tema a l'inici' es troba habilitada,\n"
+msgstr "Si l'opció 'Carrega la mostra del tema a l'inici' es troba habilitada,\n"
 "la mostra del tema es carregarà quan el programa \n"
 "engegui.\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Desar i carregar els fitxers individuals del tema us obliga a fer servir \n"
+msgstr "Desar i carregar els fitxers individuals del tema us obliga a fer servir \n"
 "un fitxer individual per a cada imatge, però és \n"
 "la mateixa idea.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Control"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Pausa"
@@ -7306,9 +8477,9 @@ msgstr "Pausa"
 msgid "Play"
 msgstr "Interpreta"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Reprodueix (+Maj. per a reproduir en bucle)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7322,6 +8493,10 @@ msgstr "Vés a l'inici"
 msgid "Skip to End"
 msgstr "Vés al final"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "CleanSpeech"
@@ -7358,6 +8533,10 @@ msgid "Silence selection"
 msgstr "Silencia la selecció"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Apropa"
 
@@ -7413,16 +8592,13 @@ msgstr "Picòmetre de sortida"
 msgid "Input level meter - click to monitor input"
 msgstr "Picòmetre d'entrada - feu clic per a observar el senyal"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mesclador"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Volum de sortida"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "Lliscador de sortida"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7430,7 +8606,8 @@ msgid "Input Volume"
 msgstr "Volum d'entrada"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "Lliscador d'entrada"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7506,7 +8683,7 @@ msgstr "Feu clic i arrossegueu per a modificar les mostres"
 
 #: toolbars/ToolsToolBar.cpp:67
 msgid "Click to Zoom In, Shift-Click to Zoom Out"
-msgstr "Feu clic per a apropar i Maj+clic per a allunyar"
+msgstr "Feu clic per a apropar i Shift+clic per a allunyar"
 
 #: toolbars/ToolsToolBar.cpp:69
 msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
@@ -7791,14 +8968,16 @@ msgstr "Estèreo vertical"
 msgid "Preferences..."
 msgstr "Preferències..."
 
+#: widgets/Meter.cpp:872
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Això determina cada quant de temps s'ha de refrescar el picòmetre.\n"
+msgstr "Això determina cada quant de temps s'ha de refrescar el picòmetre.\n"
 "Si teniu un ordinador lent us serà convenient seleccionar una\n"
 "freqüència de refresc baixa (30 per segon o menys), de manera que\n"
 "la qualitat del so no es vegi afectada per la representació gràfica de mesurador."
@@ -7815,6 +8994,22 @@ msgstr "Preferències dels picòmetres"
 msgid " Please select an action "
 msgstr " Seleccioneu una acció"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1058
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1078
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1095
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7827,12 +9022,6 @@ msgstr "Regle vertical"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 segons"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7858,6 +9047,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dies 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8043,231 +9247,11 @@ msgstr "No s'ha pogut obrir el fitxer: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Error: %s a la línia %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
 msgstr "No s'ha pogut carregar el fitxer: \"%s\""
 
-#~ msgid ""
-#~ "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?"
-#~ msgstr ""
-#~ "Heu decidit que no voleu recuperar cap projecte. Més endavant ja no us "
-#~ "serà possible canviar d'opinió. Segur que voleu continuar sense recuperar "
-#~ "cap projecte?"
-#~ msgid "Really not recover projects?"
-#~ msgstr "Realment no voleu recuperar els projectes?"
-#~ msgid "Export and Saving"
-#~ msgstr "Exportar i desar"
-#~ 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>How to [[record|"
-#~ "record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|"
-#~ "export]] to a sound file like MP3.</ul><br><br>Those links will help if "
-#~ "you find a problem such as a [[grey|menu option greyed out]] or that "
-#~ "Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|"
-#~ "burn to a CD]]. 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."
-#~ msgstr ""
-#~ "Som-hi!</p><p>Podeu fer clic en els enllaços que es mostren a continuació "
-#~ "per descobrir com:<ul><li>[[play|interpretar]] un fitxer de so existent."
-#~ "<li>Com [[record|enregistrar]] un fitxer de so nou.<li>Com  [[edit|"
-#~ "editar]] so i [[export|exportar-lo]] a un fitxer de so, com ara un MP3.</"
-#~ "ul><br><br>Aquests enllaços us seran d'ajuda si us trobeu amb un problema "
-#~ "com ara [[grey|opcions de menú inhabilitades]] o que l'Audacity "
-#~ "[[norecord|no enregistri correctament]] o que no pugueu [[burncd|"
-#~ "enregistrar un CD d'àudio]]. Sempre podeu tornar a veure aquesta ajuda "
-#~ "des del menú 'Ajuda' - 'Mostra el missatge de benvinguda'. Per a més "
-#~ "informació vegeu l'ajuda del programa, fent clic a 'Ajuda' - 'Índex', o "
-#~ "<a href=\"http://audacity.sourceforge.net/help/documentation"
-#~ "\">descarregueu-vos el nostre manual</a> en format PDF.<br><br>Sigueu "
-#~ "benvingut/uda a l'Audacity!"
-#~ msgid ""
-#~ "Exporting and Saving have different purposes.You \"save\" an Audacity "
-#~ "project file when you want to return to your work in Audacity later.This "
-#~ "means you don't then have to re-import or re-record audio, or redo "
-#~ "editing you have done so far.When you want to listen to your work in "
-#~ "other computer programs you \"export\" it as an audio file such as a WAV, "
-#~ "AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To "
-#~ "save an Audacity project, use <b>File > Save Project</b>. This will save "
-#~ "an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the "
-#~ "actual audio. Make sure you don't rename or move either of these, because "
-#~ "Audacity needs to refer to both.Only use File > Save Project As... when "
-#~ "you either need to save an empty Project, or if you want to save an "
-#~ "existing Project to a <i> new</i> name. When you want to re-open a saved "
-#~ "Project, simply click File > Open and open the .aup file. <br><br>When "
-#~ "you want to export your work to an audio file, use <b>File > Export</b> "
-#~ "and choose your desired format in the \"Save as type\" dropdown.Click the "
-#~ "Options button for advanced choices, such as the bit rate to use for MP3 "
-#~ "export.There are two other Export commands under the File menu.\"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]]. "
-#~ "<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]]. There is also some help on how to "
-#~ "[[burncd|burn to a CD]].<br><br>"
-#~ msgstr ""
-#~ "Exportar i Desar són coses diferents. Haureu de \"desar\" un projecte "
-#~ "Audacity si teniu pensat tornar a obrir-lo més endavant. Això us "
-#~ "estalviarà haver de tornar-lo a importar i recodificar el so, i haver de "
-#~ "tornar a fer les modificacions que ja hi havíeu efectuat. Si només voleu "
-#~ "escoltar el vostre treball en altres programes podeu \"exportar-lo\" en "
-#~ "algun format de fitxers d'àudio, com ara WAV, AIFF o MP3. Per a "
-#~ "enregistrar un CD haureu d'exportar el so a WAV o AIFF.<br><br>Per a "
-#~ "desar un projecte Audacity feu servir el menú <b>Fitxer > Desa el "
-#~ "projecte</b>. Això crearà un fitxer amb l'etensió <b>.aup</b>, i un "
-#~ "directori anomenat <b>_data</b>, on es desaran tots els fragments de so "
-#~ "del projecte. No canvieu el nom ni desplaceu cap d'aquests dos "
-#~ "components, ja que l'Audacity els necessita per a poder tornar a obrir el "
-#~ "projecte. Feu servir Fitxer > Anomena i desa... només quan deseu per "
-#~ "primera vegada, o quan vulgueu desar el projecte actual amb un nom "
-#~ "<i>nou</i>. Quan vulgueu tornar a obrir un fitxer de projecte desat "
-#~ "prèviament feu Fitxer > Obre i busqueu el fitxer .aup. <br><br>Quan "
-#~ "vulgueu exportar el vostre treball a un fitxer de so feu servir el menú "
-#~ "<b>Fitxer > Exporta</b> i escolliu el format a la llista desplegable "
-#~ "\"Desa com a\". Feu clic al botó d'opcions per a ajustar paràmetres "
-#~ "avançats, com ara la taxa de bits d'una exportació a MP3. Hi ha dues "
-#~ "altres ordres d'exportació al menú Fitxers: \"Exporta la selecció\" "
-#~ "exporta només l'àrea que es trobi seleccionada, i \"Exporta múltiples "
-#~ "fitxers\" serveix quan, per exemple, voleu generar un fitxer d'exportació "
-#~ "independent per a cada pista del projecte. Per a exportar pistes d'un "
-#~ "enregistrament obtingut directament d'un LP o un casset, vegeu [[wiki:"
-#~ "Splitting recordings into separate tracks|ús de les etiquetes en "
-#~ "l'exportació múltiple]]. <br><br>Abans d'exportar a <b>MP3</b>, haureu "
-#~ "d'afegir el codificador LAME MP3 al vostre ordinador. Per a mésinformació "
-#~ "sobre el LAME, vegeu l'article  [[wiki:Lame_Installation|Instal·lació del "
-#~ "Lame]]. Hi ha també una ajuda sobre com [[burncd|enregistrar un CD "
-#~ "d'àudio]].<br><br>"
-#~ msgid ""
-#~ "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> "
-#~ "<p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten "
-#~ "(SHN)</b>, ormost other proprietary formats, because of licensing and "
-#~ "patent restrictions. Audacity also cannot import any kind of Digital "
-#~ "Rights Management (DRM) protected file, including most purchased online "
-#~ "such as from iTunes or Napster.If you are on a Mac, you can import "
-#~ "<b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not "
-#~ "DRM protected, but you cannot export to these formats.</p> <p>Some open "
-#~ "formats are not yet supported by Audacity, including <b>Ogg Speex</b> and "
-#~ "<b>Musepack</b>.We hope to support these formats in future versions of "
-#~ "Audacity.</p> <p>If you cannot import your file into Audacity, you can as "
-#~ "a workround convert it to WAV or AIFF.As long as it's not a DRM-protected "
-#~ "file, you could do this with iTunes or with <a href=\"http://www."
-#~ "erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-"
-#~ "protected file, you can burn it to an audio CD in the application that is "
-#~ "licensed to play it, then extract (rip) the CD track to WAV or AIFF.You "
-#~ "can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or "
-#~ "<a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows."
-#~ "Or you can play the file on your computer and record it - see <a href="
-#~ "\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
-#~ msgstr ""
-#~ "<h2>Pot l'Audacity importar fitxers de tipus WMA, AAC, RealAudio, etc.?</"
-#~ "h2> <p>L'Audacity no pot importar o exportar fitxers <b>WMA, RealAudio, "
-#~ "Shorten (SHN)</b>, o en altres formats propietaris degut a restriccions "
-#~ "derivades de llicències i patents. L'Audacity tampoc pot importar cap "
-#~ "tipus de fitxer protegit amb tècniques de Gestió de Drets Digitals (DRM), "
-#~ "com la majoria dels que han estat adquirits a botigues de música en línia "
-#~ "com iTunes o Napster. Si feu servir un Mac podeu importar fitxers "
-#~ "codificats amb <b>AAC</b> (com ara els <b>M4A</b>) sempre que no estiguin "
-#~ "protegits per DRM, però no podreu exportar a cap d'aquests formats.</p> "
-#~ "<p>Alguns formats oberts encara noe stan suportats per l'Audacity, "
-#~ "incloent l'<b>Ogg Speex</b> i el <b>Musepack</b>. Esperem poder donar "
-#~ "suport a aquests formats en futures versions de l'Audacity.</p> <p>Si no "
-#~ "podeu importar directament un fitxer a l'Audacity, intenteu convertir-lo "
-#~ "prèviament a WAV o AIFF. Si és un fitxer no protegit podreu fer-ho amb "
-#~ "l'iTunes o el <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-#~ "\">SUPER</a>. Si és un fitxer protegit per DRM podeu provar a enregistrar-"
-#~ "lo en un CD d'àudio mitjançant l'aplicació que és capaç d'obrir-lo i "
-#~ "extreure (rip) la pista del CD en format WAV o AIFF. Podeu fer servir "
-#~ "l'iTunes per a extreure pistes de CD a WAV o AIFF, així com el Windows "
-#~ "Media Player 11 o el <a href=\"http://cdexos.sourceforge.net/?q=download"
-#~ "\">CDex</a> per a Windows. O podeu interpretar el fitxer al vostre "
-#~ "ordinador i enregistrar-lo directament a l'Audacity mentre sona. En <a "
-#~ "href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-#~ "i=streaming\">aquest document</a> s'explica com fer-ho."
-#~ msgid ""
-#~ "If you want to burn your work to an audio CD, 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]].<br><br>"
-#~ msgstr ""
-#~ "Si voleu enregistrar el vostre treball en un CD d'àudio haureu de "
-#~ "començar per [[export|exportar el so com a WAV o AIFF]] i incorporar "
-#~ "aquest fitxer al CD en el programari d'enregistrament de CD que estigueu "
-#~ "fent servir, com ara l'iTunes - per a més ajuda vegeu [[wiki:How to burn "
-#~ "CDs|Com enregistrar un CD d'àudio]].<br><br>"
-#~ msgid "Stop and Select\tShift+A"
-#~ msgstr "Atura't i selecciona\tMaj+A"
-#~ msgid "Enter new samplerate:"
-#~ msgstr "Indiqueu la nova freqüència de mostreig:"
-#~ msgid "Specify Time"
-#~ msgstr "Especifiqueu el temps"
-#~ msgid "Draw currently only works with linear-view waveforms."
-#~ msgstr ""
-#~ "La funció de dibuix només funciona amb la vista lineal de formes d'ona."
-#~ msgid "DTMF duration:"
-#~ msgstr "Durada del DTMF:"
-#~ msgid "Noise duration"
-#~ msgstr "Durada del soroll"
-#~ msgid "Edit the metadata for the FLAC file"
-#~ msgstr "Edita les metadades del fitxer FLAC"
-#~ msgid "Edit the ID3 tags for the MP2 file"
-#~ msgstr "Edita les etiquetes ID3 del fitxer MP2"
-#~ msgid "0, 220-260 kbps (Best Quality)"
-#~ msgstr "0, 220-260 kbps (Millor qualitat)"
-#~ msgid "1, 200-250 kbps"
-#~ msgstr "1, 200-250 kbps"
-#~ msgid "2, 170-210 kbps"
-#~ msgstr "2, 170-210 kbps"
-#~ msgid "3, 155-195 kbps"
-#~ msgstr "3, 155-195 kbps"
-#~ msgid "4, 145-185 kbps"
-#~ msgstr "4, 145-185 kbps"
-#~ msgid "5, 110-150 kbps"
-#~ msgstr "5, 110-150 kbps"
-#~ msgid "6, 95-135 kbps"
-#~ msgstr "6, 95-135 kbps"
-#~ msgid "7, 80-120 kbps"
-#~ msgstr "7, 80-120 kbps"
-#~ msgid "8, 65-105 kbps"
-#~ msgstr "8, 65-105 kbps"
-#~ msgid "Insane, 320 kbps"
-#~ msgstr "Passat de rosca, 320 kbps"
-#~ msgid "Extreme, 220-260 kbps"
-#~ msgstr "Extrem, 220-260 kbps"
-#~ msgid "Standard, 170-210 kbps"
-#~ msgstr "Estandard, 170-210 kbps"
-#~ msgid "Medium, 145-185 kbps"
-#~ msgstr "Mitjà, 145-185 kbps"
-#~ msgid "Edit the ID3 tags for the MP3 file"
-#~ msgstr "Edita les etiquetes ID3 per al fitxer MP3"
-#~ msgid "Edit the metadata"
-#~ msgstr "Edita les metadades"
-#~ msgid "Edit the metadata for the OGG file"
-#~ msgstr "Edita les metadades del fitxer OGG"
-#~ msgid "Specify PCM Options"
-#~ msgstr "Especifica les opcions de PCM"
-#~ msgid "Edit the metadata for the uncompressed file"
-#~ msgstr "Edita les metadades per al fitxer de so no comprimit"
-#~ msgid "Audio to buffer:"
-#~ msgstr "So a la memòria intermèdia:"
-#~ msgid "Audio Files"
-#~ msgstr "Fitxers de so"
-#~ msgid "&Download Free Copy of LAME"
-#~ msgstr "&Descarregueu-vos una còpia gratuïta del LAME"
-#~ msgid "&Present track number to accessibility aid"
-#~ msgstr "&Mostra el número de pista al missatge emergent d'accessibilitat"
-#~ msgid "Language"
-#~ msgstr "Idioma"
-#~ msgid "Minimum of dB mode display range"
-#~ msgstr "Rang mínim en el mode de visualització per dB"
-
diff --git a/locale/ca at valencia.po b/locale/ca at valencia.po
new file mode 100644
index 0000000..b0798f9
--- /dev/null
+++ b/locale/ca at valencia.po
@@ -0,0 +1,9256 @@
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Francesc Busquets <fbusquets at yahoo.com>, 2007.
+#
+msgid ""
+msgstr "Project-Id-Version: ca\n"
+"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-04-28 22:24+0100\n"
+"PO-Revision-Date: 2008-05-13 10:37+0100\n"
+"Last-Translator: Robert Millan <rmh at aybabtu.com>\n"
+"Language-Team: Catalan <ca at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"X-Poedit-Language: Catalan\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: AboutDialog.cpp:142
+#: AudacityApp.cpp:749
+#: Menus.cpp:745
+msgid "&About Audacity..."
+msgstr "Quant a l'&Audacity..."
+
+#: AboutDialog.cpp:156
+msgid "OK... Audacious!"
+msgstr "Audaciteu-vos!"
+
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
+
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
+
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
+
+#. i18n-hint: The translation of "translator_credits" will appear
+#. in the credits in the About Audacity window.  Use this to add
+#. your own name(s) to the credits.
+#.
+#. For example:  "English translation by Dominic Mazzoni."
+#.
+#: AboutDialog.cpp:192
+#: AboutDialog.cpp:194
+msgid "translator_credits"
+msgstr "Traducció al català: Pau Bosch i Francesc Busquets"
+
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
+
+#: AboutDialog.cpp:211
+msgid "Credits"
+msgstr "Crèdits"
+
+#: AboutDialog.cpp:215
+#, c-format
+msgid "Audacity %s Development Team"
+msgstr "Equip de desenvolupament de l'Audacity %s"
+
+#: AboutDialog.cpp:220
+#, c-format
+msgid "Audacity %s Support Team"
+msgstr "Equip de suport de l'Audacity %s"
+
+#: AboutDialog.cpp:225
+msgid "Emeritus Developers"
+msgstr "Desenvolupadors emèrits"
+
+#: AboutDialog.cpp:230
+msgid "Other Emeritus Team Members"
+msgstr "Altres membres emèrits de l'equip"
+
+#: AboutDialog.cpp:235
+msgid "Other Contributors"
+msgstr "Altres contribuïdors"
+
+#: AboutDialog.cpp:240
+msgid "Audacity is based on code from the following projects:"
+msgstr "L'Audacity està basat en codi dels següents projectes:"
+
+#: AboutDialog.cpp:245
+msgid "Special thanks:"
+msgstr "Agraïments especials:"
+
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:254
+msgid "Audacity"
+msgstr "Audacity"
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:299
+#: AboutDialog.cpp:312
+#: AboutDialog.cpp:468
+msgid "Build Information"
+msgstr "Informació de compilació"
+
+#: AboutDialog.cpp:305
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: AboutDialog.cpp:306
+msgid "Disabled"
+msgstr "Inhabilitat"
+
+#: AboutDialog.cpp:316
+msgid "File Format Support"
+msgstr "Informació sobre els tipus de fitxers"
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:326
+#: AboutDialog.cpp:328
+msgid "MP3 Importing"
+msgstr "Importació d'MP3"
+
+#: AboutDialog.cpp:335
+#: AboutDialog.cpp:338
+msgid "Ogg Vorbis Import and Export"
+msgstr "Importació i exportació a Ogg Vorbis"
+
+#: AboutDialog.cpp:342
+#: AboutDialog.cpp:345
+msgid "ID3 tag support"
+msgstr "Informació sobre les etiquetes ID3"
+
+#: AboutDialog.cpp:352
+#: AboutDialog.cpp:355
+msgid "FLAC import and export"
+msgstr "Importació i exportació a FLAC"
+
+#: AboutDialog.cpp:360
+#: AboutDialog.cpp:363
+msgid "MP2 export"
+msgstr "Exportació a MP2"
+
+#: AboutDialog.cpp:368
+#: AboutDialog.cpp:371
+msgid "Import via QuickTime"
+msgstr "Importa mitjançant el QuickTime"
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:378
+msgid "Core Libraries"
+msgstr "Biblioteques del nucli"
+
+#: AboutDialog.cpp:384
+#: AboutDialog.cpp:387
+#: AboutDialog.cpp:390
+#: AboutDialog.cpp:392
+msgid "Sample rate conversion"
+msgstr "Conversió de la freqüència de mostreig"
+
+#: AboutDialog.cpp:397
+#: AboutDialog.cpp:400
+msgid "Audio playback and recording"
+msgstr "Reproducció i enregistrament de so"
+
+#: AboutDialog.cpp:413
+msgid "Features"
+msgstr "Funcionalitats"
+
+#: AboutDialog.cpp:417
+#: AboutDialog.cpp:420
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:428
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:436
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:444
+msgid "Plug-in support"
+msgstr "Informació sobre els connectors"
+
+#: AboutDialog.cpp:449
+#: AboutDialog.cpp:452
+msgid "Sound card mixer support"
+msgstr "Informació sobre el mesclador de la targeta de so"
+
+#: AboutDialog.cpp:457
+#: AboutDialog.cpp:460
+msgid "Pitch and Tempo Change support"
+msgstr "Informació sobre els canvis de to i de temps"
+
+#: AboutDialog.cpp:472
+msgid "Program build date: "
+msgstr "Data de compilació del programa:"
+
+#: AboutDialog.cpp:475
+#: AboutDialog.cpp:477
+msgid "Build type:"
+msgstr "Tipus de compilació:"
+
+#: AboutDialog.cpp:475
+msgid "Debug build"
+msgstr "Versió de proves"
+
+#: AboutDialog.cpp:477
+msgid "Release build"
+msgstr "Versió final"
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:482
+msgid "Installation Prefix: "
+msgstr "Directori base d'instal·lació:"
+
+#: AboutDialog.cpp:486
+msgid "Settings folder: "
+msgstr "Carpeta on es guarda la configuració:"
+
+#: AboutDialog.cpp:501
+msgid "GPL License"
+msgstr "Llicència GPL"
+
+#: AudacityApp.cpp:468
+#: Project.cpp:1761
+#, c-format
+msgid "%s is already open in another window."
+msgstr "%s es troba obert en una altra finestra."
+
+#: AudacityApp.cpp:470
+#: Project.cpp:1763
+#: Project.cpp:1868
+#: Project.cpp:2012
+#: Project.cpp:2114
+msgid "Error opening project"
+msgstr "S'ha produït un error en obrir el projecte"
+
+#: AudacityApp.cpp:502
+#, c-format
+msgid "%s does not exist and could not be opened.\n"
+"\n"
+"It has been removed from the history list."
+msgstr "%s no existix i no es pot obrir.\n"
+"\n"
+"Ha estat eliminat de l'historial."
+
+#: AudacityApp.cpp:581
+msgid "Master Gain Control"
+msgstr "Control principal de guany"
+
+#: AudacityApp.cpp:582
+msgid "Input Meter"
+msgstr "Picòmetre d'entrada"
+
+#: AudacityApp.cpp:583
+msgid "Output Meter"
+msgstr "Picòmetre d'eixida"
+
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: AudacityApp.cpp:751
+#: Menus.cpp:478
+msgid "&Preferences...\tCtrl+,"
+msgstr "&Preferències...\tCtrl+,"
+
+#: AudacityApp.cpp:833
+#: AudacityApp.cpp:910
+#, c-format
+msgid "Using block size of %ld\n"
+msgstr "Emprant blocs de %ld\n"
+
+#: AudacityApp.cpp:855
+#: AudacityApp.cpp:925
+#, c-format
+msgid "Unknown command line option: %s\n"
+msgstr "Orde desconeguda: %s\n"
+
+#: AudacityApp.cpp:1044
+msgid "Audacity could not find a place to store temporary files.\n"
+"Please enter an appropriate directory in the preferences dialog."
+msgstr "L'Audacity no troba cap lloc per a alçar-hi els fitxers temporals.\n"
+"Per favor, indiqueu un directori adient a les preferències."
+
+#: AudacityApp.cpp:1050
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "L'Audacity es tancarà tot seguit. Reinicieu-lo per a poder fer servir el nou directori temporal."
+
+#: AudacityApp.cpp:1082
+msgid "Running two copies of Audacity simultaneously may cause\n"
+"data loss or cause your system to crash.\n"
+"\n"
+msgstr "Si feu funcionar simultàniament dues còpies de l'Audacity\n"
+"us podeu trobar amb pèrdua de dades, o que falli el sistema.\n"
+"\n"
+
+#: AudacityApp.cpp:1089
+msgid "Audacity was not able to lock the temporary files directory.\n"
+"This folder may be in use by another copy of Audacity.\n"
+msgstr "L'Audacity no ha estat capaç de bloquejar la carpeta de fitxers\n"
+"temporals. Pot ser que esta carpeta estiga en ús\n"
+"per alguna altra còpia de l'Audacity.\n"
+
+#: AudacityApp.cpp:1091
+msgid "Do you still want to start Audacity?"
+msgstr "Segur que voleu engegar l'Audacity?"
+
+#: AudacityApp.cpp:1093
+msgid "Error locking temporary folder"
+msgstr "S'ha produït un error en bloquejar el directori temporal"
+
+#: AudacityApp.cpp:1131
+msgid "The system has detected that another copy of Audacity is running.\n"
+msgstr "El sistema ha detectat que hi ha una altra còpia de l'Audacity en funcionament.\n"
+
+#: AudacityApp.cpp:1133
+msgid "Use the New or Open commands in the currently running Audacity\n"
+"process to open multiple projects simultaneously.\n"
+msgstr "Feu servir les ordes 'Nou' o 'Obri' del procés actual de l'Audacity\n"
+"per a obrir diversos projectes de manera simultània.\n"
+
+#: AudacityApp.cpp:1134
+msgid "Audacity is already running"
+msgstr "L'Audacity ja es troba en funcionament"
+
+#: AudacityApp.cpp:1151
+msgid "Command-line options supported:"
+msgstr "Opcions admeses a la línia d'ordes:"
+
+#. i18n-hint: '-help' is the option and needs to stay in
+#. * English. This displays a list of available options
+#: AudacityApp.cpp:1154
+msgid "\t-help (this message)"
+msgstr "\t-help (este missatge)"
+
+#. i18n-hint '-version' needs to stay in English.
+#: AudacityApp.cpp:1156
+msgid "\t-version (display Audacity version)"
+msgstr "\t-version (mostra la versió de l'Audacity)"
+
+#. i18n-hint '-test' is the option and needs to stay in
+#. * English. This runs a set of automatic tests on audacity
+#. * itself
+#: AudacityApp.cpp:1160
+msgid "\t-test (run self diagnostics)"
+msgstr "\t-test (executa l'autodiagnòstic)"
+
+#. i18n-hint '-blocksize' is the option and needs to stay in
+#. * English. 'nnn' is any integer number. This controls the
+#. * size pieces that audacity uses when writing files to the
+#. * disk
+#: AudacityApp.cpp:1165
+msgid "\t-blocksize nnn (set max disk block size in bytes)"
+msgstr "\t-blocksize nnn (grandària màxima dels blocs de disc, en bytes)"
+
+#: AudacityApp.cpp:1166
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "A més, heu d'indicar el nom d'un fitxer de so o un projecte Audacity per a obrir-lo."
+
+#: AudacityApp.cpp:1443
+msgid "Audacity project (.AUP) files are not currently \n"
+"associated with Audacity. \n"
+"\n"
+"Associate them, so they open on double-click?"
+msgstr "Els fitxers de tipus 'projecte Audacity' (.AUP) no es troben actualment \n"
+"associats a l'Audacity. \n"
+"\n"
+"Voleu associar-los-hi per tal que es puguen obrir amb un doble clic?"
+
+#: AudacityApp.cpp:1444
+msgid "Audacity Project Files"
+msgstr "Fitxers de projecte de l'Audacity"
+
+#: AudioIO.cpp:241
+msgid "Could not find any audio devices.\n"
+msgstr "No s'ha pogut trobar cap dispositiu de so.\n"
+
+#: AudioIO.cpp:242
+msgid "You will not be able to play or record audio.\n"
+"\n"
+msgstr "No podreu reproduir ni enregistrar so.\n"
+"\n"
+
+#: AudioIO.cpp:245
+msgid "Error: "
+msgstr "Error:"
+
+#: AudioIO.cpp:248
+msgid "Error Initializing Audio"
+msgstr "S'ha produït un error en inicialitzar el so"
+
+#: AudioIO.cpp:1208
+msgid "Latency problem"
+msgstr "Hi ha un problema de latència"
+
+#: AudioIO.cpp:1208
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "El valor de la latència ha fet que el so que s'ha enregistrat hagi quedat amagat abans del zero.\n"
+"L'Audacity ha mogut el fragment per tal que comenci al zero.\n"
+"Podeu fer servir l'eina de desplaçament en el temps (<---> o F5) per a arrossegar la pista al lloc que li correspongui."
+
+#: AutoRecovery.cpp:54
+msgid "Automatic Crash Recovery"
+msgstr "Recuperació automàtica de fallades"
+
+#: AutoRecovery.cpp:73
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
+"Fortunately, the following projects can automatically be recovered:"
+msgstr "Alguns projectes no es van alçar correctament la darrera vegada que es\n"
+"va fer servir l'Audacity. Per sort els següents projectes poden ser\n"
+"recuperats de manera automàtica:"
+
+#: AutoRecovery.cpp:75
+msgid "Recoverable projects"
+msgstr "Projectes recuperables"
+
+#: AutoRecovery.cpp:78
+#: Tags.cpp:2032
+msgid "Name"
+msgstr "Nom"
+
+#: AutoRecovery.cpp:84
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "La recuperació d'un projecte no modificarà cap fitxer del disc fins que no l'alceu."
+
+#: AutoRecovery.cpp:88
+msgid "Quit Audacity"
+msgstr "Ix de l'Audacity"
+
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr "No el recuperis"
+
+#: AutoRecovery.cpp:90
+msgid "Recover Projects"
+msgstr "Recupera els projectes"
+
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr "Segur que no voleu recuperar cap projecte?\n"
+"Més tard ja no els podreu recuperar."
+
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr "Ho confirmeu?"
+
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
+msgid "Could not enumerate files in auto save directory"
+msgstr "No s'ha pogut realitzar l'enumeració dels fitxers de la carpeta d'alçat automàtic"
+
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:2575
+#: Menus.cpp:4514
+#: Project.cpp:1971
+#: Project.cpp:3343
+#: Project.cpp:3422
+#: WaveTrack.cpp:556
+#: WaveTrack.cpp:575
+#: WaveTrack.cpp:1689
+#: effects/Effect.cpp:436
+#: export/ExportMP2.cpp:230
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:245
+#: toolbars/ControlToolBar.cpp:532
+#: toolbars/ControlToolBar.cpp:846
+msgid "Error"
+msgstr "Error"
+
+#: BatchCommandDialog.cpp:56
+#: BatchCommandDialog.cpp:60
+#: BatchCommandDialog.cpp:61
+msgid "Select Command"
+msgstr "Seleccioneu l'orde"
+
+#: BatchCommandDialog.cpp:80
+#: BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
+msgid "&Command"
+msgstr "&Orde"
+
+#: BatchCommandDialog.cpp:82
+msgid "&Edit Parameters"
+msgstr "Paràmetres d'&edició"
+
+#: BatchCommandDialog.cpp:89
+#: BatchProcessDialog.cpp:455
+msgid "&Parameters"
+msgstr "&Paràmetres"
+
+#: BatchCommandDialog.cpp:94
+msgid "C&hoose command"
+msgstr "Selecció d'&orde"
+
+#: BatchCommands.cpp:477
+msgid "Stereo to Mono Effect not found"
+msgstr "No s'ha trobat l'efecte de conversió d'estèreo a mono"
+
+#: BatchCommands.cpp:497
+msgid "Ogg Vorbis support is not included in this build of Audacity"
+msgstr "El suport al format Ogg Vorbis no s'ha inclòs en esta distribució de l'Audacity."
+
+#: BatchCommands.cpp:509
+msgid "FLAC support is not included in this build of Audacity"
+msgstr "El suport al format FLAC no s'ha inclòs en esta distribució de l'Audacity."
+
+#: BatchCommands.cpp:513
+#, c-format
+msgid "Command %s not implemented yet"
+msgstr "L'orde %s encara no està implementada"
+
+#: BatchCommands.cpp:529
+#, c-format
+msgid "Could not set parameters of effect %s\n"
+" to %s."
+msgstr "No s'han pogut establir els paràmetres de l'efecte %s\n"
+" a %s."
+
+#: BatchCommands.cpp:583
+#, c-format
+msgid "Your batch command of %s was not recognised."
+msgstr "El procés per lots de %s no ha estat reconegut."
+
+#: BatchCommands.cpp:674
+#, c-format
+msgid "Apply %s with parameter(s)\n"
+"\n"
+"%s"
+msgstr "Aplica %s amb els paràmetres\n"
+"\n"
+"%s"
+
+#: BatchCommands.cpp:675
+#: BatchCommands.cpp:680
+msgid "Test Mode"
+msgstr "Mode de proves"
+
+#: BatchCommands.cpp:679
+#, c-format
+msgid "Apply %s"
+msgstr "Aplica %s"
+
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
+msgid "Apply Chain"
+msgstr "Aplica la cadena d'ordes"
+
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
+#: BatchProcessDialog.cpp:94
+msgid "&Select chain"
+msgstr "&Selecciona una cadena d'ordes"
+
+#: BatchProcessDialog.cpp:99
+msgid "Chain"
+msgstr "Cadena d'ordes"
+
+#: BatchProcessDialog.cpp:106
+msgid "Apply to Current &Project"
+msgstr "Aplica-la al &projecte actual"
+
+#: BatchProcessDialog.cpp:107
+msgid "Apply to &Files..."
+msgstr "Aplica-la als &fitxers..."
+
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2071
+#: Tags.cpp:2075
+#: Tags.cpp:2375
+#: Tags.cpp:2379
+#: UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732
+#: effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188
+#: effects/VST/VSTEffect.cpp:446
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/vamp/VampEffect.cpp:411
+msgid "&Cancel"
+msgstr "&Cancel·la"
+
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
+msgid "No chain selected"
+msgstr "No s'ha seleccionat cap cadena d'ordes"
+
+#: BatchProcessDialog.cpp:159
+#, c-format
+msgid "Applying '%s' to current project"
+msgstr "S'està aplicant '%s' al projecte actual"
+
+#: BatchProcessDialog.cpp:200
+msgid "Please save and close the current project first."
+msgstr "Alceu i tanqueu abans el projecte actual."
+
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
+#: BatchProcessDialog.cpp:207
+msgid "Select file(s) for batch processing..."
+msgstr "Selecciona un o més fitxers per al procés per lots..."
+
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Tots els fitxers (*.*)|*.*|Fitxers WAV (*.wav)|*.wav|Fitxers AIFF (*.aif)|*.aif|Fitxers AU (*.au)|*.au|Fitxers MP3 (*.mp3)|*.mp3|FitxersOgg Vorbis (*.ogg)|*.ogg|Fitxers FLAC (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:231
+msgid "Applying..."
+msgstr "S'està aplicant..."
+
+#: BatchProcessDialog.cpp:241
+msgid "File"
+msgstr "Fitxer"
+
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
+msgid "Edit Chains"
+msgstr "Edita les cadenes d'ordes"
+
+#: BatchProcessDialog.cpp:416
+msgid "&Chains"
+msgstr "&Cadenes d'ordes"
+
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:815
+#: Tags.cpp:1455
+#: Tags.cpp:2055
+msgid "&Add"
+msgstr "&Afig"
+
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:126
+#: Tags.cpp:816
+#: Tags.cpp:1456
+#: Tags.cpp:2056
+#: TrackPanel.cpp:4201
+msgid "&Remove"
+msgstr "&Elimina"
+
+#: BatchProcessDialog.cpp:437
+msgid "Re&name"
+msgstr "&Canvia el nom"
+
+#: BatchProcessDialog.cpp:443
+msgid "C&hain (Double-Click or press SPACE to edit)"
+msgstr "Ca&dena d'ordes (feu doble clic o premeu ESPAI per a editar-la)"
+
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
+msgid "No"
+msgstr "Núm."
+
+#: BatchProcessDialog.cpp:459
+msgid "&Insert"
+msgstr "&Inserix"
+
+#: BatchProcessDialog.cpp:460
+msgid "De&lete"
+msgstr "E&limina"
+
+#: BatchProcessDialog.cpp:461
+msgid "Move &Up"
+msgstr "Mou am&unt"
+
+#: BatchProcessDialog.cpp:462
+msgid "Move &Down"
+msgstr "Mou a&vall"
+
+#: BatchProcessDialog.cpp:463
+msgid "De&faults"
+msgstr "Valors per de&fecte"
+
+#: BatchProcessDialog.cpp:507
+msgid "- END -"
+msgstr "- FI -"
+
+#: BatchProcessDialog.cpp:540
+#, c-format
+msgid "%s changed"
+msgstr "%s canviats"
+
+#: BatchProcessDialog.cpp:541
+msgid "Do you want to save the changes?"
+msgstr "Voleu alçar els canvis?"
+
+#: BatchProcessDialog.cpp:623
+msgid "Enter name of new chain"
+msgstr "Escriviu el nom de la cadena d'ordes"
+
+#: BatchProcessDialog.cpp:634
+msgid "Name must not be blank"
+msgstr "El nom no es pot deixar en blanc"
+
+#: BatchProcessDialog.cpp:643
+#, c-format
+msgid "Names may not contain '%c' and '%c'"
+msgstr "Els noms no poden contenir '%c' ni '%c'"
+
+#: BatchProcessDialog.cpp:673
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Segur que voleu eliminar %s?"
+
+#: Dependencies.cpp:139
+msgid "Removing Dependencies"
+msgstr "S'estan eliminant les dependències"
+
+#: Dependencies.cpp:140
+msgid "Copying audio data into project..."
+msgstr "S'estan escrivint les dades de so del projecte"
+
+#: Dependencies.cpp:219
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
+"This will need more disc space but is safer."
+msgstr "El vostre projecte depèn de la presència d'altres fitxers.\n"
+"Voleu copiar el so dels següents fitxers dins del vostre projecte per a fer-lo autònom?\n"
+"Això necessitarà més espai de disc, però serà més segur. "
+
+#: Dependencies.cpp:266
+msgid "Project depends on other audio files"
+msgstr "El projecte depèn d'altres fitxers de so"
+
+#: Dependencies.cpp:287
+msgid "Project Dependencies"
+msgstr "Dependències del projecte"
+
+#: Dependencies.cpp:290
+msgid "Audio file"
+msgstr "Fitxer de so"
+
+#: Dependencies.cpp:292
+msgid "Disk space"
+msgstr "Espai de disc"
+
+#: Dependencies.cpp:297
+msgid "Copy Selected Audio Into Project"
+msgstr "Copia al projecte el fragment de so seleccionat"
+
+#: Dependencies.cpp:304
+#: Dependencies.cpp:410
+msgid "Cancel Save"
+msgstr "Cancel·la l'acció d'alçar"
+
+#: Dependencies.cpp:306
+msgid "Do Not Copy Any Audio"
+msgstr "No copiïs cap so"
+
+#: Dependencies.cpp:308
+msgid "Copy All Audio into Project (Safer)"
+msgstr "Copia tot el so dins del projecte (el més segur)"
+
+#: Dependencies.cpp:317
+#: Dependencies.cpp:322
+msgid "Ask me"
+msgstr "Pregunta-m'ho"
+
+#: Dependencies.cpp:318
+msgid "Always copy all audio (safest)"
+msgstr "Copia sempre tot el so (el més segur)"
+
+#: Dependencies.cpp:319
+msgid "Never copy any audio"
+msgstr "No copiïs mai cap so"
+
+#: Dependencies.cpp:321
+msgid "Whenever a project depends on other files:"
+msgstr "Quan el projecte depengui d'altres fitxers:"
+
+#: Dependencies.cpp:409
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "Si ho feu, el vostre projecte no es guardarà al disc. És això el que voleu?"
+
+#: Dependencies.cpp:449
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "El vostre projecte és autònom. No depèn de cap fitxer extern de so."
+
+#: Dependencies.cpp:450
+msgid "Dependency check"
+msgstr "Comprovació de dependències"
+
+#: DirManager.cpp:136
+msgid "Warning: there is very little free disk space left on this volume.\n"
+"Please select another temporary directory in your preferences."
+msgstr "Atenció: hi ha molt poc espai de disc lliure en este volum.\n"
+"Seleccioneu un altre directori temporal a les preferències."
+
+#: DirManager.cpp:221
+#: DirManager.cpp:251
+#: DirManager.cpp:332
+msgid "Progress"
+msgstr "Progrés"
+
+#: DirManager.cpp:285
+msgid "Cleaning up temporary files"
+msgstr "S'està fent neteja dels fitxers temporals"
+
+#: DirManager.cpp:333
+msgid "Saving project data files"
+msgstr "S'estan desant els fitxers de dades del projecte"
+
+#: DirManager.cpp:406
+msgid "Cleaning up cache directories"
+msgstr "S'estan netejant els directoris de la memòria cau"
+
+#: DirManager.cpp:493
+#, c-format
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "L'Audacity ha trobat un tros de fitxer %s orfe! \n"
+"Per favor, considereu la possibilitat d'alçar i tornar a obrir el projecte\n"
+"per a fer-ne una comprovació completa.\n"
+
+#. i18n-hint: This is the pattern for filenames that are created
+#. when a file needs to be backed up to a different name.  For
+#. example, mysong would become mysong-old1, mysong-old2, etc.
+#: DirManager.cpp:985
+#, c-format
+msgid "%s-old%d"
+msgstr "%s-antic%d"
+
+#: DirManager.cpp:993
+msgid "Unable to open/create test file"
+msgstr "No s'ha pogut obrir o crear el fitxer de proves"
+
+#: DirManager.cpp:1002
+#, c-format
+msgid "Unable to remove '%s'"
+msgstr "No s'ha pogut eliminar '%s'"
+
+#: DirManager.cpp:1007
+#, c-format
+msgid "Renamed file: %s\n"
+msgstr "S'ha canviat el nom del fitxer: %s\n"
+
+#: DirManager.cpp:1051
+#, c-format
+msgid "Unable to rename '%s' to '%s'"
+msgstr "No s'ha pogut canviar el nom de '%s' a '%s'"
+
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1115
+#: DirManager.cpp:1403
+msgid "Inspecting project file data..."
+msgstr "S'estan inspeccionant les dades del fitxer de projecte..."
+
+#: DirManager.cpp:1128
+#, c-format
+msgid "Orphaned blockfile: (%s)"
+msgstr "Tros de fitxer orfe: (%s)"
+
+#: DirManager.cpp:1153
+#, c-format
+msgid "Missing alias file: (%s)"
+msgstr "No existix el fitxer representat per l'àlies: (%s)"
+
+#: DirManager.cpp:1173
+#, c-format
+msgid "Missing summary file: (%s.auf)"
+msgstr "No existix el fitxer de resum: (%s.auf)"
+
+#: DirManager.cpp:1193
+#, c-format
+msgid "Missing data file: (%s.au)"
+msgstr "No existix el fitxer de dades: (%s.au)"
+
+#: DirManager.cpp:1207
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "La comprovació del projecte ha trobat inconsistències mentre inspeccionava les dades del projecte;\n"
+"Feu clic a \"Detalls\" per a veure una llista completa dels errors, o a \"D'acord\" per a més opcions."
+
+#: DirManager.cpp:1219
+#, c-format
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
+"unused and probably left over from a crash or some other bug.\n"
+"They should be deleted to avoid disk contention."
+msgstr "La comprovació del projecte ha trobat %d tros o trossos de fitxers orfes. Estos fitxers\n"
+"no s'estan fent servir i probablement són conseqüència d'alguna penjada o d'algun error.\n"
+"S'haurien d'esborrar per a evitar el risc d'esgotar l'espai lliure del disc."
+
+#: DirManager.cpp:1224
+msgid "Delete orphaned files [safe and recommended]"
+msgstr "Elimina els fitxers orfes [el més segur i recomanat]"
+
+#: DirManager.cpp:1225
+msgid "Continue without deleting; silently work around the extra files"
+msgstr "Continua sense eliminar-los; ignora els fitxers extra"
+
+#: DirManager.cpp:1226
+msgid "Close project immediately with no changes"
+msgstr "Tanca el projecte ara mateix sense fer cap canvi"
+
+#: DirManager.cpp:1228
+#: DirManager.cpp:1263
+#: DirManager.cpp:1309
+#: DirManager.cpp:1351
+#: export/Export.cpp:490
+#: export/Export.cpp:507
+#: export/Export.cpp:526
+#: widgets/Warning.cpp:55
+msgid "Warning"
+msgstr "Atenció"
+
+#: DirManager.cpp:1254
+#, c-format
+msgid "Project check detected %d input file[s] being used in place\n"
+"('alias files') are now missing.  There is no way for Audacity\n"
+"to recover these files automatically; you may choose to\n"
+"permanently fill in silence for the missing files, temporarily\n"
+"fill in silence for this session only, or close the project now\n"
+"and try to restore the missing files by hand."
+msgstr "La comprovació del projecte ha detectat que %d fitxers d'entrada que s'estaven fent servir\n"
+"('fitxers àlies') han desaparegut.  No hi ha manera de que l'Audacity\n"
+"puga recuperar els fitxers automàticament; heu d'escollir entre\n"
+"omplir amb silencis de manera permanent els espais del projecte corresponents a estos fitxers,\n"
+"i mirar de restaurar manualment els fitxers que han desaparegut."
+
+#: DirManager.cpp:1259
+msgid "Replace missing data with silence [permanent upon save]"
+msgstr "Substituix les dades perdudes per silencis [de manera permanent si s'alça el projecte]"
+
+#: DirManager.cpp:1260
+#: DirManager.cpp:1348
+msgid "Temporarily replace missing data with silence [this session only]"
+msgstr "Substituix les dades perdudes per silencis [només durant esta sessió] "
+
+#: DirManager.cpp:1261
+#: DirManager.cpp:1307
+#: DirManager.cpp:1349
+msgid "Close project immediately with no further changes"
+msgstr "Tanca el projecte immediatament sense fer-li més canvis"
+
+#: DirManager.cpp:1300
+#, c-format
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
+"Audacity can fully regenerate these summary files from the\n"
+"original audio data in the project."
+msgstr "La comprovació del projecte ha detectat que hi ha %d fitxer/s de resum (.auf) desaparegut/s.\n"
+"L'Audacity pot regenerar totalment estos fitxers de resum des de les dades de so\n"
+"originals del projecte."
+
+#: DirManager.cpp:1305
+msgid "Regenerate summary files [safe and recommended]"
+msgstr "Regenera els fitxers de resum [el més segur i recomanat]"
+
+#: DirManager.cpp:1306
+msgid "Fill in silence for missing display data [this session only]"
+msgstr "Omple les dades perdudes amb silencis [només durant esta sessió]"
+
+#: DirManager.cpp:1342
+#, c-format
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
+"probably due to a bug, system crash or accidental deletion.\n"
+"There is no way for Audacity to recover this lost data\n"
+"automatically; you may choose to permanently fill in silence\n"
+"for the missing data, temporarily fill in silence for this\n"
+"session only, or close the project now and try to restore the\n"
+"missing data by hand."
+msgstr "La comprovació del projecte ha detectat que hi ha %d bloc/s de fitxers de so (.au) desaparegut/s, \n"
+"probablement degut a una errada, una petada del sistema o un esborrament accidental.\n"
+"L'Audacity no té cap manera de recuperar estes dades perdudes\n"
+"de manera automàtica; podeu escollir entre omplir amb silencis de manera permanent,\n"
+"fer-ho només durant esta sessió, o tancar ara el projecte i intentar restaurar manualment les dades perdudes."
+
+#: DirManager.cpp:1347
+msgid "Replace missing data with silence [permanent immediately]"
+msgstr "Substituix les dades perdudes per silencis [de manera permanent i immediata]"
+
+#: DirManager.cpp:1375
+msgid "Cleaning up unused directories in project data..."
+msgstr "S'està fent neteja dels directoris no utilitzats del projecte..."
+
+#: DirManager.cpp:1448
+msgid "Caching audio"
+msgstr "Memòria cau de so"
+
+#: DirManager.cpp:1449
+msgid "Caching audio into memory..."
+msgstr "S'està omplint la memòria cau de so..."
+
+#: DirManager.cpp:1486
+msgid "Saving recorded audio"
+msgstr "S'està desant el so enregistrat"
+
+#: DirManager.cpp:1487
+msgid "Saving recorded audio to disk..."
+msgstr "S'està desant al disc el so enregistrat..."
+
+#: FFT.cpp:389
+msgid "Rectangular"
+msgstr "Rectangular"
+
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Posició de %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Feu clic ací per a localitzar el fitxer %s -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Navega..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "On és %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:104
+msgid "Frequency Analysis"
+msgstr "Anàlisi de freqüències"
+
+#: FreqWindow.cpp:140
+#: TrackPanel.cpp:563
+msgid "Spectrum"
+msgstr "Espectre"
+
+#: FreqWindow.cpp:141
+msgid "Standard Autocorrelation"
+msgstr "Autocorrelació estàndard"
+
+#: FreqWindow.cpp:142
+msgid "Cuberoot Autocorrelation"
+msgstr "Autocorrelació d'arrel cúbica."
+
+#: FreqWindow.cpp:143
+msgid "Enhanced Autocorrelation"
+msgstr "Autocorrelació millorada"
+
+#. i18n-hint: This is a technical term, derived from the word
+#. "spectrum".  Do not translate it unless you are sure you
+#. know the correct technical word in your language.
+#: FreqWindow.cpp:147
+msgid "Cepstrum"
+msgstr "Cepstrum"
+
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
+msgstr "Algorisme: "
+
+#: FreqWindow.cpp:168
+#: HistoryWindow.cpp:79
+msgid "Size"
+msgstr "Grandària"
+
+#. i18n-hint: This refers to a "window function", used in the
+#. Frequency analyze dialog box.
+#: FreqWindow.cpp:181
+msgid " window"
+msgstr " finestra"
+
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
+
+#: FreqWindow.cpp:192
+msgid "Linear frequency"
+msgstr "Freqüència lineal"
+
+#: FreqWindow.cpp:193
+msgid "Log frequency"
+msgstr "Freqüència de registre"
+
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
+
+#: FreqWindow.cpp:206
+#: LabelDialog.cpp:128
+#: Menus.cpp:204
+#: Menus.cpp:233
+msgid "&Export..."
+msgstr "&Exporta..."
+
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Exporta"
+
+#: FreqWindow.cpp:209
+#: widgets/ErrorDialog.cpp:159
+msgid "Close"
+msgstr "Tanca"
+
+#: FreqWindow.cpp:272
+#: FreqWindow.cpp:402
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:791
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1109
+#: effects/Equalization.cpp:1111
+#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:1185
+#: effects/Equalization.cpp:1394
+#: effects/Equalization.cpp:1405
+#: effects/Normalize.cpp:365
+#: widgets/Meter.cpp:380
+msgid "dB"
+msgstr "dB"
+
+#. i18n-hint: This is the abbreviation for "Hertz", or
+#. cycles per second.
+#: FreqWindow.cpp:287
+#: FreqWindow.cpp:442
+#: effects/Equalization.cpp:1150
+#: effects/Equalization.cpp:1181
+#: import/ImportRaw.cpp:416
+msgid "Hz"
+msgstr "Hz"
+
+#: FreqWindow.cpp:386
+msgid "Not enough data selected."
+msgstr "No s'han seleccionat prou dades"
+
+#: FreqWindow.cpp:450
+#: effects/AutoDuck.cpp:793
+msgid "s"
+msgstr "s"
+
+#: FreqWindow.cpp:779
+#, c-format
+msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
+msgstr "Cursor: %d Hz (%s) = %d dB    Pic: %d Hz (%s) = %.1f dB"
+
+#: FreqWindow.cpp:788
+#, c-format
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "Cursor: %.4f segons (%d Hz) (%s) = %f,    Pic: %.4f segons (%d Hz) (%s) = %.3f"
+
+#: FreqWindow.cpp:1061
+msgid "spectrum.txt"
+msgstr "espectre.txt"
+
+#: FreqWindow.cpp:1063
+msgid "Export Spectral Data As:"
+msgstr "Anomena i exporta les dades d'espectre:"
+
+#: FreqWindow.cpp:1079
+#: LabelDialog.cpp:599
+#: Menus.cpp:2207
+#: Project.cpp:2441
+#: Project.cpp:3395
+#: prefs/KeyConfigPrefs.cpp:180
+msgid "Couldn't write to file: "
+msgstr "No s'ha pogut escriure al fitxer:"
+
+#: FreqWindow.cpp:1084
+msgid "Frequency (Hz)\tLevel (dB)"
+msgstr "Freqüència (Hz)\tNivell (dB)"
+
+#: FreqWindow.cpp:1090
+msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
+msgstr "Retard (segons)\tFreqüència (Hz)\tNivell"
+
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
+msgstr "A la [[welcome|pàgina de benvinguda]]."
+
+#: HelpText.cpp:92
+msgid "Welcome!"
+msgstr "Hola!"
+
+#: HelpText.cpp:97
+msgid "Playing Audio"
+msgstr "S'està reproduint el so"
+
+#: HelpText.cpp:101
+msgid "Recording Audio"
+msgstr "S'està enregistrant el so"
+
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
+msgstr "Enregistrament - Elecció del dispositiu d'entrada"
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr "Enregistrament - Elecció de la font d'entrada"
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr "Enregistrament - Establiment del nivell d'entrada"
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr "Per què algunes opcions de menú es mostren en gris"
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr "Exportar fitxers d'àudio"
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr "Alçar projectes Audacity"
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr "Formats no suportats"
+
+#: HelpText.cpp:133
+msgid "Burn to CD"
+msgstr "Enregistra-ho en un CD"
+
+#: HelpText.cpp:137
+msgid "No Local Help"
+msgstr "No hi ha cap ajuda local disponible"
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr "</p><center><h3>Primeres passes</h3></center><br>"
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr "Benvinguts a l'Audacity"
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "Descobriu com: <ul><li>[[play|escoltar]] un fitxer de so existent <li>[[record|enregistrar]] la vostra veu, un disc o una cinta de casset <li>[[edit|editar]] sons <li>[[save|alçar o obrir un projecte de l'Audacity]] <li>[[export|exportar]] un fitxer de so en MP3 o altres formats, o [[burncd|enregistrar un CD]]  </ul></p><p>"
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "Esta finestra es pot veure en qualsevol moment fent clic al menú <i>Ajuda</i> - <i>Mostra el missatge de benvinguda</i>. Per a una guia detallada dels menús i conttols de l'Audacity feu clic a <i>Ajuda</i> - <i>Índex</i>, o descarregueu-vos el <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">manual complet</a> en format PDF.</p>"
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>Com obrir fitxers de so:</b> Es pot fer tant arrossegant-los dins de la finestra del projecte o fent clic al menú <i>Fitxer &gt; Importa &gt; Àudio</i>. Els fitxers es poden obrir també en una finestra nova mitjançant el menú <i>Fitxer &gt; Obri</i>. Els principals formats reconeguts per l'Audacity són <b>AIFF, AU, FLAC, M4A</b> (només en un Mac), <b>MP2/MP3, OGG Vorbis</b> i <b>WAV</b>. Feu clic [[wma-proprietary|ací]] si teniu un fitxer en algun altre format. <b>Per a importar un CD:</b> heu d'extreure el so a un fitxer WAV o AIFF mitjançant l'iTunes, el Windows Media Player 11 o similar. Vegeu la guia d'ajuda en línia: [[wiki:How_to_import_CDs|importació de CD]].</p><p> <p><b>Interpretar el so:</b> Feu clic al botó verd Play per a iniciar la reproducció. Feu clic al botó blau Pausa per a aturar o reprendre l'interpretació. Feu clic al botó groc Stop per aturar-la. També es pot fer servir la barra d'espais per a engegar o aturar la reproducció. Un cop aturada la reproducció, el cursor torna al punt on s'havia iniciat. Per a canviar el punt d'inici feu clic dins de la pista de so al lloc on desitgeu establir-lo. Els botons <b>|&lt;&lt;</b> i <b>&gt;&gt;|</b> es poden fer servir per a saltar a l'inici i al final de la pista. </p><br><br>"
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>Per gravar:</b> Establiu el dispositiu d'enregistrament i la font d'entrada, ajusteu el nivell d'entrada i feu clic al botó vermell Enregistra.</b></p><p> 1) [[inputdevice|Establiment del dispositiu d'enregistrament]] Podeu escollir el dispositiu des de la pestanya <I>E/S d'Àudio de les Preferències</I> o a la <i>Barra d'eines de dispositius</i>. Les preferències d'E/S d'àudio us permeten escollir un tipus d'enregistrament estereofònic o monofònic.<br> 2) [[inputsource|Establiment de la font d'entrada]] per a este dispositiu (per exemple, micròfon o entrada de línia) a la llista desplegable de la <i>Barra d'Eines del Mesclador</i>, o (en alguns sistemes) al camp Dispositiu d'Enregistrament de la <i>Pestanya d'E/S d'Àudio de les Preferències</i> o a la <i>Barra d'Eines de Dispositius</i>.<br> 3) [[inputlevel|Ajustar el nivell d'entrada]] mitjançant el picòmetre que hi ha a la dreta a la <i>Barra d'Eines del Mesclador</i>. Un ajustament correcte del nivell és essencial abans de començar a enregistrar, per tal d'evitar sorolls o distorsions. </p><p> Trobareu més ajuda a l'apartat \"Recording\" de les <a href=\"http://audacity.sourceforge.net/help/faq\">Preguntes Més Freqüents</a>, al tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> del <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a> i a les seccions [[wiki:Recording_Tips|Recording Tips]] i [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] del Wiki. </p><br><br>"
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>El dispositiu d'entrada és el dispositiu físic pel qual esteu enregistrant el so. L'heu d'escollir a la llista \"Dispositiu d'Enregistrament\" de la pestanya <i>E/S d'àudio de les Preferències</i>. Al Windows i al Linux les Preferències són a la part inferior del menú <i>Edita</i>. Als Mac, són al menú <i>Audacity</i>. També podeu seleccionar el dispositiu d'enregistrament a la <i>Barra d'eines de dispositius</i>, que es pot activar des del menú <i>Mostra &gt; Barres d'eines...</i>. </p><p> Per defecte, l'Audacity farà servir el dispositiu actualment seleccionat pel sistema (normalment el dispositiu de so integrat), de manera que no us caldrà canviar-lo. En sistemes Windows, este dispositiu es pot seleccionar al \"Mapejador de so Microsoft\". Si esteu enregistrant des d'un dispositiu extern de tipus USB o Firewire, com ara un tocadiscs USB, l'haureu de seleccionar pel seu nom un cop l'hàgiu connectat. </p><p> Torna a [[record|Enregistrant so]] <br></p>"
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Seleccioneu la font d'entrada (com ara micròfon o entrada de línia) del vostre [[inputdevice|dispositiu d'enregistrament]]:<br> - <b>En sistemes Windows (excepte en el Vista)</b> i a <b>Linux</b>, a la llista desplegable que hi ha a la dreta a la <i>Barra d'eines del mesclador</i>.<br> - <b>En el Windows Vista</b> i el <b>Mac</b>, a la llista Dispositiu d'Enregistrament dins de la pestanya <i>E/S d'àudio de les Preferències</i>, o a la <i>Barra d'eines de dispositius</i>. La font es mostrarà com a part del dispositiu pare (per exemple, <i>High Def Audio Card: Micròfon</i>). Si fos necessari, els usuaris de Mac poden seleccionar la font d'entrada a la configuració MIDI d'Apple. <br><i><b>Nota:</b> molts dispositius USB o Firewire no ofereixen més que una única font d'entrada, per la qual cosa este pas és innecessari. En cas de dubte, vegeu la documentació del vostre dispositiu. </i></p><p> <b>Un consell:</b> Consulteu la pàgina <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">com enregistrar qualsevol so que s'escolti per l'ordinador</a>, on s'explica com els usuaris de Windows i Linux poden escollir les fonts \"Mescla estèreo\", \"Wave Out\", \"Sum\" o similar. </p><p> Torna a [[record|Enregistrant so]] <br></p>"
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>El nivell d'entrada s'ha d'ajustar correctament. Si el nivell és massa baix, tindreu soroll de fons. Si és massa alt, l'enregistrament patirà distorsions en les parts més sorolloses. </p><p>Per a ajustar el nivell podeu optar entre consultar esta [[wiki:Recording_levels|guia en línia il·lustrada]] o seguir estos passos: <ol><li>Activeu la <b>monitorització</b>. Feu doble clic a la dreta dels dos <i>picòmetres d'entrada</i> (o feu clic amb el botó dret damunt seu) i feu clic a  \"Comença a monitoritzar\". Si els picòmetres no fossin visibles, feu clic a <i>Mostra &gt; Barres d'eines</i> i marqueu la \"Barra de picòmetres\". </li><li>Ajusteu el nivell d'entrada a la <i>Barra del mesclador</i> (on hi ha el símbol del micròfon), fins que les barres vermelles del picòmetre estiguen a prop <b>però no toquin</b> el límit dret de l'escala. Si no podeu escoltar el so que esteu monitoritzant, aneu a la pestanya <i>E/S de so de les Preferències</i> i marqueu l'opció \"Reproducció a través del programari\". </li></ol></p><p> Torna a [[record|Enregistrant so]] <br></p>"
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>La majoria d'ordes per a editar sons es troben als menús <i>Edita</i> (com ara retalla, copia i enganxa) i  <i>Efectes</i> (on podeu fer coses com potenciar els baixos, canviar el to o el temps, o netejar el soroll de fons). </p><p> L'Audacity aplica les edicions a la zona seleccionada de la pista de so. Per a seleccionar una determinada àrea feu clic a la pista i arrossegueu el ratolí. Si no seleccioneu cap fragment de so, l'Audacity seleccionarà tot el so de la finestra del projecte.</p><p> Quan interpreteu o enregistreu, els menús Edita i Efecte es mostraran en gris, degut a que una pista que s'està movent no pot ser editada. Les ordes poden també estar no disponibles per altres raons. Per exemple, no es poden executar efectes si el projecte encara no té gens de so, i no es pot enganxar so fins que no l'hàgiu copiat al porta-retalls de l'Audacity. </p><br><br>"
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>Per retornar a un treball no acabat de l'Audacity amb totes les pistes i modificacions tal com les heu deixat, alceu-lo com a Projecte Audacity. Per a interpretar el vostre treball en altres programes, o enviar-lo a altres persones, [[export|exporteu-lo]] a WAV o MP3. </p><p>L'orde <i>Fitxer &gt; Alça el projecte</i> crearà un fitxer de projecte amb extensió <b>.aup</b> i una carpeta <b>_data</b> on es guardarà tot el so. Per a tornar a obrir un projecte feu clic a <i>Fitxer &gt; Obri</i> i obriu el fitxer .aup. Si alceu el fitxer i eixiu més d'una vegada, se'n crearà un altre amb extensió .aup.bak, que actua com a còpia de seguretat. Quan el fitxer que voleu exportar siga exactament igual al que voleu, elimineu els fitxers de projecte i els directoris _data per a estalviar espai de disc.</p><p>El menú <i>Fitxer &gt; Anomena i alça el projecte...</i> servix per a alçar un projecte buit, o per a alçar un projecte existent amb un nom diferent. Esta és la única manera segura de canviar el nom a un projecte. Els fitxers .aup i els directoris _data mai no s'han de moure o canviar de nom manualment.. </p><p>"
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "Per a escoltar el vostre treball en altres programes multimèdia, exporteu-lo a un format d'àudio com ara WAV o MP3 (alguns formats són [[wma-proprietary|no suportats]]). Quan [[save|alceu el projecte Audacity]] es crearà un fitxer de projecte (amb una carpeta anomenada _data) que contindrà totes les pistes que esteu editant, de manera que més avant podreu tornar a reprendre el vostre treball. Amb tot, els altres programes no podran obrir directament els projectes Audacity. </p><p> Per a exportar-los, feu clic a <i>Fitxer &gt; Exporta</i> i escolliu el format a la llista desplegable \"Alça com a\". Per a [[burncd|enregistrar un CD]] que es puga escoltar en un equip de música, escolliu WAV o AIFF. Per a exportar a MP3, haureu d'instal·lar-vos un [[wiki:Lame_Installation|Codificador Lame]]. </p><p> L'opció <i>Fitxer &gt; Exporta la selecció</i> exporta només l'àrea que es trobi seleccionada. <i>Feu sevir Fitxer &gt; Exporta múltiples fitxers</i> per a exportar diversos fitxers en una única operació, un per a cada pista de so, o un per a cada àrea etiquetada en una pista única. La funció <i>Pistes &gt; Afig una etiqueta a la selecció</i> us permet [[wiki:Splitting_recordings_into_separate_tracks|separar les pistes]] d'un àlbum per a alçar-les en fitxers independents. </p><br><br>"
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>L'Audacity <b>no pot</b> [[play|interpretar]] o [[export|exportar]] fitxers en <b>WMA, RealAudio, Shorten (SHN)</b> o altres formats propietaris degut a restriccions de llicències i patents. En els ordinadors Mac es poden importar fitxers en format <b>AAC</b> i <b>M4A</b>. Alguns formats oberts, com l'<b>Ogg Speex</b> o el <b>Musepack</b> tampoc estan suportats. Els fitxers protegits per qualsevol tipus de Gestió de Drets Digitals (DRM), incloent la majoria dels que es compren a les botigues en línia, com ara iTunes o Napster, <b>no es poden</b> importar.</p><p> Si no podeu importa un fixer a l'Audacity i no està protegit per DRM, feu servir l'iTunes o el <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> per convertir-lo a WAV o AIFF. Si està protegit, enregistreu-lo a CD amb el programa llicenciat per a interpretar-lo i extraieu després la pista del CD a WAV o AIFF mitjançant l'ITunes o (en Windows) el <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> o el Windows Media Player 11. També podeu <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">enregistrar</a> el so mentre el feu sonar al vostre ordinador. <i>Per a exportar a un format no suportat, exporteu primer a WAV o AIFF i convertiu-lo al format desitjat amb l'iTunes o el <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "<p>Si voleu enregistrar el vostre treball en un CD d'àudio per a escoltar-lo en un equip de música, haureu de començar per [[export|exportar-lo]] al format WAV or AIFF, en format estèreo a 44100 Hz (ajusteu-ho mitjançant el botó \"Freqüència del projecte\" que hi ha a baix a l'esquerra) i 16 bits (ajusteu-ho mitjançant el botó \"Opcions\" del diàleg d'exportació de fitxers). Estos són els paràmetres per defecte de l'Audacity, de manera que normalment no haureu de canviar-ho abans d'exportar. <p>Enregistreu el fitxer en un CD de tipus \"audio CD\" - no \"CD de dades\" or \"CD MP3\" - amb una aplicació d'enregistrament de CD com ara l'iTunes o el Windows Media Player. Per a més ajuda, consulteu la pàgina del wiki [[wiki:How_to_burn_CDs|Com enregistrar CDs]]. </p><p>"
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
+
+#: HistoryWindow.cpp:53
+msgid "Undo History"
+msgstr "Historial d'accions cancel·lables"
+
+#: HistoryWindow.cpp:72
+msgid "Manage History"
+msgstr "Gestiona l'historial"
+
+#: HistoryWindow.cpp:78
+msgid "Action"
+msgstr "Acció"
+
+#: HistoryWindow.cpp:86
+msgid "&Undo Levels Available"
+msgstr "Nombre d'acci&ons que es poden desfer"
+
+#: HistoryWindow.cpp:92
+msgid "Levels To Discard"
+msgstr "Nivells a descartar"
+
+#: HistoryWindow.cpp:102
+msgid "&Discard"
+msgstr "&Descarta"
+
+#: HistoryWindow.cpp:111
+#: Tags.cpp:2072
+#: Tags.cpp:2074
+#: Tags.cpp:2376
+#: Tags.cpp:2378
+#: effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191
+#: effects/vamp/VampEffect.cpp:414
+#: export/ExportCL.cpp:398
+msgid "&OK"
+msgstr "&D'acord"
+
+#: Internat.cpp:191
+msgid "Unable to determine"
+msgstr "No s'ha pogut determinar"
+
+#: Internat.cpp:195
+#: import/ImportRaw.cpp:392
+msgid "bytes"
+msgstr "octets"
+
+#: Internat.cpp:197
+msgid "KB"
+msgstr "kB"
+
+#: Internat.cpp:200
+msgid "MB"
+msgstr "MB"
+
+#: Internat.cpp:203
+msgid "GB"
+msgstr "GB"
+
+#: LabelDialog.cpp:52
+msgid "Track"
+msgstr "Pista"
+
+#: LabelDialog.cpp:53
+#: Menus.cpp:4057
+#: Menus.cpp:4085
+msgid "Label"
+msgstr "Etiqueta"
+
+#: LabelDialog.cpp:54
+msgid "Start Time"
+msgstr "Temps inicial"
+
+#: LabelDialog.cpp:55
+msgid "End Time"
+msgstr "Temps final"
+
+#: LabelDialog.cpp:98
+#: Menus.cpp:627
+msgid "&Edit Labels"
+msgstr "&Edita les etiquetes"
+
+#: LabelDialog.cpp:113
+msgid "Press F2 or double click to edit cell contents."
+msgstr "Premeu F2 o feu doble clic per a editar el contingut de les cel·les"
+
+#: LabelDialog.cpp:124
+msgid "Insert &After"
+msgstr "Inserix &després"
+
+#: LabelDialog.cpp:125
+msgid "Insert &Before"
+msgstr "Inserix &abans"
+
+#: LabelDialog.cpp:127
+#: Menus.cpp:194
+msgid "&Import..."
+msgstr "&Importa..."
+
+#: LabelDialog.cpp:155
+msgid "New..."
+msgstr "Nou..."
+
+#: LabelDialog.cpp:352
+msgid "You have left blank label names.  These will be\n"
+"skipped when repopulating the Label Tracks.\n"
+"\n"
+"Would you like to go back and provide names?"
+msgstr "Heu deixat alguns noms d'etiquetes en blanc.  Estos elements\n"
+"seran ignorats quan es regenerin les pistes d'etiquetes.\n"
+"\n"
+"Voleu tornar arrere i posar noms a estes etiquetes?"
+
+#: LabelDialog.cpp:353
+msgid "Confirm"
+msgstr "Confirma"
+
+#: LabelDialog.cpp:514
+#: Menus.cpp:3555
+msgid "Select a text file containing labels..."
+msgstr "Seleccioneu un text que contingui les etiquetes..."
+
+#: LabelDialog.cpp:518
+#: Menus.cpp:3559
+msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
+msgstr "Fitxers de text (*.txt)|*.txt|Tots els fitxers (*.*)|*.*"
+
+#: LabelDialog.cpp:532
+#: Menus.cpp:3571
+#: Project.cpp:1831
+#: Project.cpp:1839
+#: import/ImportMIDI.cpp:31
+msgid "Could not open file: "
+msgstr "No s'ha pogut obrir el fitxer:"
+
+#: LabelDialog.cpp:558
+msgid "No labels to export."
+msgstr "No hi ha cap etiqueta per a exportar."
+
+#: LabelDialog.cpp:564
+#: Menus.cpp:2172
+msgid "Export Labels As:"
+msgstr "Anomena i exporta les etiquetes:"
+
+#: LabelDialog.cpp:566
+#: Menus.cpp:2170
+msgid "labels.txt"
+msgstr "etiquetes.txt"
+
+#: LabelDialog.cpp:699
+msgid "New Label Track"
+msgstr "Pista d'etiquetes nova"
+
+#: LabelDialog.cpp:700
+msgid "Enter track name"
+msgstr "Escriviu el nom de la pista"
+
+#: LabelDialog.cpp:701
+#: LabelDialog.h:52
+#: LabelTrack.cpp:89
+#: Menus.cpp:555
+msgid "&Label Track"
+msgstr "Pista d'e&tiquetes"
+
+#: LangChoice.cpp:57
+msgid "Audacity First Run"
+msgstr "És la primera vegada que s'inicia l'Audacity"
+
+#: LangChoice.cpp:84
+msgid "Choose Language for Audacity to use:"
+msgstr "Trieu l'idioma que farà servir l'Audacity:"
+
+#: Legacy.cpp:356
+#, c-format
+msgid "Converted a 1.0 project file to the new format.\n"
+"The old file has been saved as '%s'"
+msgstr "S'ha convertit un projecte 1.0 al nou format.\n"
+"El fitxer antic ha estat alçat amb el nom '%s'"
+
+#: Legacy.cpp:357
+msgid "Opening Audacity Project"
+msgstr "S'està obrint el projecte Audacity"
+
+#: Menus.cpp:162
+msgid "&File"
+msgstr "&Fitxer"
+
+#: Menus.cpp:164
+msgid "&New\tCtrl+N"
+msgstr "&Nou\tCtrl+N"
+
+#: Menus.cpp:166
+msgid "&Open...\tCtrl+O"
+msgstr "&Obri...\tCtrl+O"
+
+#: Menus.cpp:171
+msgid "&Close\tCtrl+W"
+msgstr "&Tanca\tCtrl+W"
+
+#: Menus.cpp:174
+msgid "&Save Project\tCtrl+S"
+msgstr "&Desa el projecte\tCrtl+S"
+
+#: Menus.cpp:178
+#: Project.cpp:2690
+msgid "Save Project &As..."
+msgstr "&Anomena i alça el projecte..."
+
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
+#: Menus.cpp:181
+msgid "Chec&k Dependencies..."
+msgstr "Compro&va les dependències..."
+
+#: Menus.cpp:187
+msgid "Open Me&tadata Editor..."
+msgstr "Obri l'editor de me&tadades..."
+
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Importa"
+
+#: Menus.cpp:196
+msgid "&Audio...\tCtrl+Shift+I"
+msgstr "&So...\tCtrl+Maj+I"
+
+#: Menus.cpp:197
+msgid "&Labels..."
+msgstr "&Etiquetes..."
+
+#: Menus.cpp:198
+msgid "&MIDI..."
+msgstr "&MIDI..."
+
+#: Menus.cpp:199
+msgid "&Raw Data..."
+msgstr "Dades c&rues..."
+
+#: Menus.cpp:210
+#: Menus.cpp:239
+msgid "Expo&rt Selection..."
+msgstr "Anomena i expo&rta la selecció..."
+
+#: Menus.cpp:217
+msgid "Export &Labels..."
+msgstr "Exporta les &etiquetes"
+
+#: Menus.cpp:218
+msgid "Export &Multiple..."
+msgstr "Exporta &múltiples fitxers..."
+
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:247
+msgid "CleanSpeech C&hain..."
+msgstr "En&cadenament de CleanSpeech..."
+
+#: Menus.cpp:248
+#: Menus.cpp:262
+msgid "Edit C&hains..."
+msgstr "Edita les &cadenes d'ordes..."
+
+#: Menus.cpp:249
+msgid "Export CleanSpeech &Presets..."
+msgstr "Exporta &configuracions del CleanSpeech..."
+
+#: Menus.cpp:250
+msgid "I&mport CleanSpeech Presets..."
+msgstr "Importa &configuracions del CleanSpeech..."
+
+#: Menus.cpp:260
+msgid "Appl&y Chain..."
+msgstr "Execu&ta la cadena d'ordes..."
+
+#: Menus.cpp:267
+msgid "&Upload File..."
+msgstr "P&uja el fitxer..."
+
+#: Menus.cpp:273
+msgid "Pa&ge Setup..."
+msgstr "Configuració de la pà&gina..."
+
+#: Menus.cpp:274
+msgid "&Print..."
+msgstr "Im&primix..."
+
+#: Menus.cpp:287
+msgid "E&xit\tCtrl+Q"
+msgstr "&Surt\tCtrl+Q"
+
+#: Menus.cpp:295
+#: toolbars/EditToolBar.cpp:76
+msgid "&Edit"
+msgstr "&Edita"
+
+#: Menus.cpp:299
+msgid "&Undo\tCtrl+Z"
+msgstr "&Desfés\tCtrl+Z"
+
+#: Menus.cpp:307
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:146
+msgid "&Redo"
+msgstr "&Refés"
+
+#: Menus.cpp:320
+msgid "Cu&t\tCtrl+X"
+msgstr "&Retalla\tCtrl+X"
+
+#: Menus.cpp:324
+msgid "Spl&it Cut\tCtrl+Alt+X"
+msgstr "Dividix i re&talla\tCtrl+Alt+X"
+
+#: Menus.cpp:325
+msgid "&Copy\tCtrl+C"
+msgstr "&Copia\tCtrl+C"
+
+#: Menus.cpp:329
+msgid "&Paste\tCtrl+V"
+msgstr "&Enganxa\tCtrl+V"
+
+#: Menus.cpp:333
+msgid "Tri&m\tCtrl+T"
+msgstr "Deixa no&més la selecció\tCtrl+T"
+
+#: Menus.cpp:335
+msgid "&Delete\tCtrl+K"
+msgstr "&Elimina\tCtrl+K"
+
+#: Menus.cpp:336
+msgid "Split D&elete\tCtrl+Alt+K"
+msgstr "Dividix i &elimina\tCtrl+Alt+K"
+
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
+
+#: Menus.cpp:339
+msgid "Sp&lit\tCtrl+I"
+msgstr "Divi&dix\tCtrl+I"
+
+#: Menus.cpp:344
+msgid "Split Ne&w\tCtrl+Alt+I"
+msgstr "Dividix en un de no&u\tCtrl+Alt+I"
+
+#: Menus.cpp:349
+msgid "&Join\tCtrl+J"
+msgstr "A&junta\tCtrl+J"
+
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
+
+#: Menus.cpp:352
+msgid "Duplic&ate\tCtrl+D"
+msgstr "Duplic&a\tCtrl+D"
+
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
+
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:367
+msgid "&Cut\tAlt+X"
+msgstr "&Retalla\tAlt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:372
+msgid "&Split Cut\tShift+Alt+X"
+msgstr "Dividix i re&talla\tMaj+Alt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:377
+msgid "Co&py\tShift+Alt+C"
+msgstr "Co&pia\tMaj+Alt+C"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:383
+msgid "&Delete\tAlt+K"
+msgstr "E&limina\tAlt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:388
+msgid "Sp&lit Delete\tShift+Alt+K"
+msgstr "Di&vidix i elimina\tMaj+Alt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:393
+msgid "Sile&nce\tAlt+L"
+msgstr "Sile&nci\tAlt+L"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:399
+msgid "Spli&t\tAlt+I"
+msgstr "Di&vidix\tAlt+I"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:404
+msgid "&Join\tAlt+J"
+msgstr "A&junta\tAlt+J"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
+
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
+
+#: Menus.cpp:416
+msgid "&All\tCtrl+A"
+msgstr "&Tot\tCtrl+A"
+
+#: Menus.cpp:417
+msgid "&None\tCtrl+Shift+A"
+msgstr "&Cap...\tCtrl+Maj+A"
+
+#: Menus.cpp:421
+msgid "&Left at Playback Position\t["
+msgstr "A l'&esquerra de la posició d'interpretació\t["
+
+#: Menus.cpp:422
+msgid "&Right at Playback Position\t]"
+msgstr "A la &dreta de la posició d'interpretació\t]"
+
+#: Menus.cpp:426
+msgid "Track &Start to Cursor\tShift+J"
+msgstr "De l'&inici de pista fins al cursor\tMaj.+J"
+
+#: Menus.cpp:427
+msgid "Cursor to Track &End\tShift+K"
+msgstr "Del cursor fins al final de la pista\tMaj.+K"
+
+#: Menus.cpp:433
+msgid "Find &Zero Crossings\tZ"
+msgstr "Cerca encreuaments amb el &zero\tZ"
+
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
+
+#: Menus.cpp:437
+msgid "to Selection Star&t"
+msgstr "a l'inici de la &selecció"
+
+#: Menus.cpp:438
+msgid "to Selection En&d"
+msgstr "al &final de la selecció"
+
+#: Menus.cpp:442
+msgid "to Track &Start\tJ"
+msgstr "a l'inici de la &pista\tJ"
+
+#: Menus.cpp:443
+msgid "to Track &End\tK"
+msgstr "al &final de la pista\tK"
+
+#: Menus.cpp:450
+msgid "Re&gion Save"
+msgstr "Alça la &regió"
+
+#: Menus.cpp:451
+msgid "Regio&n Restore"
+msgstr "Restaura la regió"
+
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
+
+#: Menus.cpp:463
+msgid "&Lock"
+msgstr "&Bloca"
+
+#: Menus.cpp:464
+msgid "&Unlock"
+msgstr "&Desbloca"
+
+#: Menus.cpp:470
+msgid "Turn Snap-To On"
+msgstr "Habilita l'arrodoniment de mesures"
+
+#: Menus.cpp:471
+msgid "Turn Snap-To Off"
+msgstr "Inhabilita l'arrodoniment de mesures"
+
+#: Menus.cpp:472
+msgid "Turn Grid Snap On"
+msgstr "Habilita l'aproximació a la quadrícula"
+
+#: Menus.cpp:473
+msgid "Turn Grid Snap Off"
+msgstr "Inhabilita l'aproximació a la quadrícula"
+
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
+
+#: Menus.cpp:492
+msgid "&View"
+msgstr "&Mostra"
+
+#: Menus.cpp:494
+msgid "Zoom &In\tCtrl+1"
+msgstr "A&propa\tCtrl+1"
+
+#: Menus.cpp:497
+msgid "Zoom &Normal\tCtrl+2"
+msgstr "Zoom &normal\tCtrl+2"
+
+#: Menus.cpp:498
+msgid "Zoom &Out\tCtrl+3"
+msgstr "A&llunya\tCtrl+3"
+
+#: Menus.cpp:501
+msgid "&Fit in Window\tCtrl+F"
+msgstr "&Encabix a la finestra\tCrtl+F"
+
+#: Menus.cpp:502
+msgid "Fit &Vertically\tCtrl+Shift+F"
+msgstr "Encabix &Verticalment\tCtrl+Shift+F"
+
+#: Menus.cpp:503
+msgid "&Zoom to Selection\tCtrl+E"
+msgstr "Fes &zoom a la selecció\tCrtl+E"
+
+#: Menus.cpp:506
+msgid "&Collapse All Tracks\tCtrl+Shift+C"
+msgstr "Ai&xafa totes les pistes\tCtrl+Maj+C"
+
+#: Menus.cpp:507
+msgid "E&xpand All Tracks\tCtrl+Shift+X"
+msgstr "E&xpandix totes les pistes\tCtrl+Maj+X"
+
+#: Menus.cpp:510
+msgid "&Show Clipping"
+msgstr "Mostra l'&escapçament de pics"
+
+#: Menus.cpp:519
+msgid "&History..."
+msgstr "&Historial..."
+
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:526
+msgid "&Control Toolbar"
+msgstr "Barra de &control"
+
+#: Menus.cpp:527
+msgid "&Device Toolbar"
+msgstr "Barra de &dispositius"
+
+#: Menus.cpp:528
+msgid "&Edit Toolbar"
+msgstr "Barra d'eines d'&edició"
+
+#: Menus.cpp:529
+msgid "&Meter Toolbar"
+msgstr "Barra de &picòmetres"
+
+#: Menus.cpp:530
+msgid "Mi&xer Toolbar"
+msgstr "Barra de control del &mesclador"
+
+#: Menus.cpp:531
+msgid "&Selection Toolbar"
+msgstr "Barra d'eines de &selecció"
+
+#: Menus.cpp:532
+msgid "T&ools Toolbar"
+msgstr "Barra d'eines d'&utilitats"
+
+#: Menus.cpp:533
+msgid "Transcri&ption Toolbar"
+msgstr "Barra d'eines de &transcripció"
+
+#: Menus.cpp:535
+msgid "&Reset Toolbars"
+msgstr "Restablix les &barres d'eines"
+
+#: Menus.cpp:537
+msgid "!Simplified View"
+msgstr "!Vista simplificada"
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Vés a l'inici\tInici"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Vés a la pista següent i canvia la selecció\tMaj+Avall"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
+#: Menus.cpp:545
+msgid "&Tracks"
+msgstr "Pis&tes"
+
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
+
+#: Menus.cpp:553
+msgid "&Audio Track\tCtrl+Shift+N"
+msgstr "Pista de &so\tCtrl+Maj+N"
+
+#: Menus.cpp:554
+msgid "&Stereo Track"
+msgstr "Pista e&stereofònica"
+
+#: Menus.cpp:556
+#: TimeTrack.cpp:44
+msgid "&Time Track"
+msgstr "Pista de &temps"
+
+#: Menus.cpp:568
+msgid "Mi&x and Render"
+msgstr "&Mescla i renderitza"
+
+#: Menus.cpp:572
+msgid "Mix and Render to New Track\tCtrl+Shift+M"
+msgstr "Mescla-ho i renderitza-ho en una nova pista\tCtrl+Maj+M"
+
+#: Menus.cpp:576
+msgid "&Resample..."
+msgstr "Canvia la f&reqüència de mostreig..."
+
+#: Menus.cpp:586
+msgid "Remo&ve Tracks"
+msgstr "&Elimina pistes"
+
+#: Menus.cpp:592
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr "Si&lencia totes les pistes\tCtrl+U"
+
+#: Menus.cpp:593
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr "&Activa el so a totes les pistes\tCtrl+Maj+U"
+
+#: Menus.cpp:597
+msgid "Align with &Zero"
+msgstr "Alinea amb el &zero"
+
+#: Menus.cpp:598
+msgid "Align with &Cursor"
+msgstr "Alinea amb el &cursor"
+
+#: Menus.cpp:599
+msgid "Align with Selection &Start"
+msgstr "Alinea amb l'&inici de la selecció"
+
+#: Menus.cpp:600
+msgid "Align with Selection &End"
+msgstr "Alinea amb el final de la &selecció"
+
+#: Menus.cpp:601
+msgid "Align End with Cu&rsor"
+msgstr "Alinea per darrera amb el cu&rsor"
+
+#: Menus.cpp:602
+msgid "Align End with Selection Star&t"
+msgstr "Alinea per darrera amb l'inici de la &selecció"
+
+#: Menus.cpp:603
+msgid "Align End with Selection En&d"
+msgstr "Alinea per darrera amb el &final de la selecció"
+
+#: Menus.cpp:604
+msgid "Align Tracks To&gether"
+msgstr "Alinea les pistes &conjuntament"
+
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
+
+#: Menus.cpp:623
+msgid "Add &Label At Selection\tCtrl+B"
+msgstr "Afig una e&tiqueta a la selecció\tCtrl+B"
+
+#: Menus.cpp:624
+msgid "Add Label At &Playback Position\tCtrl+M"
+msgstr "Afig una etiqueta al &punt d'interpretació\tCtrl+M"
+
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
+
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
+
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
+
+#: Menus.cpp:643
+msgid "&Generate"
+msgstr "&Genera"
+
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
+#: Menus.cpp:666
+msgid "Effe&ct"
+msgstr "Efe&cte"
+
+#: Menus.cpp:670
+msgid "Repeat Last Effect\tCtrl+R"
+msgstr "Repetix el darrer efecte\tCtrl+R"
+
+#: Menus.cpp:702
+msgid "&Analyze"
+msgstr "&Analitza"
+
+#: Menus.cpp:704
+msgid "Plot Spectrum..."
+msgstr "Traça l'espectre..."
+
+#: Menus.cpp:737
+#: Menus.cpp:740
+msgid "&Help"
+msgstr "&Ajuda"
+
+#: Menus.cpp:743
+msgid "&About Audacity CleanSpeech..."
+msgstr "&Quant a l'Audacity CleanSpeech..."
+
+#: Menus.cpp:747
+msgid "&Show Welcome Message..."
+msgstr "Mo&stra el missatge de benvinguda..."
+
+#: Menus.cpp:748
+msgid "&Index..."
+msgstr "&Índex..."
+
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
+#: Menus.cpp:756
+msgid "&Screenshot Tools..."
+msgstr "&Eines de captura de pantalla..."
+
+#: Menus.cpp:759
+msgid "&Run Benchmark..."
+msgstr "&Executa el test d'eficiència..."
+
+#: Menus.cpp:761
+msgid "&Audio Device Info..."
+msgstr "Informació del dispositiu de &so..."
+
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
+
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
+
+#: Menus.cpp:774
+msgid "Selection Tool\tF1"
+msgstr "Eina de selecció\tF1"
+
+#: Menus.cpp:775
+msgid "Envelope Tool\tF2"
+msgstr "Eina d'envolupant\tF2"
+
+#: Menus.cpp:776
+msgid "Draw Tool\tF3"
+msgstr "Eina de dibuix\tF3"
+
+#: Menus.cpp:777
+msgid "Zoom Tool\tF4"
+msgstr "Eina de zoom\tF4"
+
+#: Menus.cpp:778
+msgid "Time Shift Tool\tF5"
+msgstr "Eina de desplaçament en el temps\tF5"
+
+#: Menus.cpp:779
+msgid "Multi Tool\tF6"
+msgstr "Multi-eina"
+
+#: Menus.cpp:781
+msgid "Next Tool\tD"
+msgstr "Eina següent\tD"
+
+#: Menus.cpp:782
+msgid "Previous Tool\tA"
+msgstr "Eina anterior\tA"
+
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:785
+msgid "Stop\tS"
+msgstr "Atura't\tS"
+
+#: Menus.cpp:786
+msgid "Pause\tP"
+msgstr "Pausa\tP"
+
+#: Menus.cpp:787
+msgid "Record\tR"
+msgstr "Enregistra\tR"
+
+#: Menus.cpp:788
+msgid "Record Append\tShift+R"
+msgstr "Enregistra afegint\tShift+R"
+
+#: Menus.cpp:790
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr "Engega/Atura i Establix la posició del cursor\tMaj+A"
+
+#: Menus.cpp:793
+msgid "Play One Second\t1"
+msgstr "Reproduix un segon\t1"
+
+#: Menus.cpp:794
+msgid "Play To Selection\tB"
+msgstr "Reproduix fins la selecció\tB"
+
+#: Menus.cpp:795
+msgid "Play Looped\tL"
+msgstr "Reproduix en bucle\tL"
+
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:797
+msgid "Play Cut Preview\tC"
+msgstr "Interpreta l'exemple d'audició del fragment retallat\tC"
+
+#: Menus.cpp:802
+msgid "Selection to Start\tShift+Home"
+msgstr "Selecciona fins a l'inici\tMaj+Inici"
+
+#: Menus.cpp:803
+msgid "Selection to End\tShift+End"
+msgstr "Selecciona fins al final\tMaj+Fi"
+
+#: Menus.cpp:805
+msgid "DeleteKey\tBackspace"
+msgstr "Tecla d'eliminació\tRetrocés"
+
+#: Menus.cpp:810
+msgid "DeleteKey2\tDelete"
+msgstr "Tecla d'eliminació 2\tSupr"
+
+#: Menus.cpp:816
+msgid "Seek left short period during playback\tLeft"
+msgstr "Retrocedix una mica durant la interpretació"
+
+#: Menus.cpp:817
+msgid "Seek right short period during playback\tRight"
+msgstr "Avança una mica durant la interpretació\tDreta"
+
+#: Menus.cpp:818
+msgid "Seek left long period during playback\tShift+Left"
+msgstr "Retrocedix un tros llarg durant la interpretació\tMaj.+Esquera"
+
+#: Menus.cpp:819
+msgid "Seek right long period during playback\tShift+Right"
+msgstr "Avança un tros llarg durant la interpretació\tMaj.+Dreta"
+
+#: Menus.cpp:823
+msgid "Move Focus to Previous Track\tUp"
+msgstr "Vés a la pista anterior\tAmunt"
+
+#: Menus.cpp:824
+msgid "Move Focus to Previous and Change Selection\tShift+Up"
+msgstr "Vés a la pista anterior i canvia la selecció\tMaj+Amunt"
+
+#: Menus.cpp:825
+msgid "Move Focus to Next Track\tDown"
+msgstr "Vés a la pista següent\tAvall"
+
+#: Menus.cpp:826
+msgid "Move Focus to Next and Change Selection\tShift+Down"
+msgstr "Vés a la pista següent i canvia la selecció\tMaj+Avall"
+
+#: Menus.cpp:827
+msgid "Toggle Focused Track\tReturn"
+msgstr "Commuta la pista actual\tRetorn"
+
+#: Menus.cpp:828
+msgid "Toggle Focused Track\tNUMPAD_ENTER"
+msgstr "Commuta la pista actual\tNUMPAD_ENTER"
+
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
+
+#: Menus.cpp:831
+msgid "Cursor Left\tLeft"
+msgstr "Cursor a l'esquerra\tEsquerra"
+
+#: Menus.cpp:832
+msgid "Cursor Right\tRight"
+msgstr "Cursor a la dreta\tDreta"
+
+#: Menus.cpp:833
+msgid "Cursor Short Jump Left\t,"
+msgstr "Salt curt del cursor a l'esquerra\t,"
+
+#: Menus.cpp:834
+msgid "Cursor Short Jump Right\t."
+msgstr "Salt curt del cursor a la dreta\t."
+
+#: Menus.cpp:835
+msgid "Cursor Long Jump Left\tShift+,"
+msgstr "Salt llarg del cursor a l'esquerra\tMaj.+,"
+
+#: Menus.cpp:836
+msgid "Cursor Long Jump Right\tShift+."
+msgstr "Salt llarg del cursor a la dreta\tMaj.+."
+
+#: Menus.cpp:838
+msgid "Selection Extend Left\tShift+Left"
+msgstr "Expandix la selecció a l'esquerra\tMaj+Esquerra"
+
+#: Menus.cpp:839
+msgid "Selection Extend Right\tShift+Right"
+msgstr "Expandix la selecció a la dreta\tMaj+Dreta"
+
+#: Menus.cpp:841
+msgid "Set (or Extend) Left Selection"
+msgstr "Establix (o estén) el límit esquerre de la selecció"
+
+#: Menus.cpp:842
+msgid "Set (or Extend) Right Selection"
+msgstr "Establix (o estén) el límit dret de la selecció"
+
+#: Menus.cpp:844
+msgid "Selection Contract Left\tCtrl+Shift+Right"
+msgstr "Contreu la selecció a l'esquerra\tCtrl+Maj+Dreta"
+
+#: Menus.cpp:845
+msgid "Selection Contract Right\tCtrl+Shift+Left"
+msgstr "Contreu la selecció a la dreta\tCtrl+Maj+Esquerra"
+
+#: Menus.cpp:847
+msgid "Change pan on focused track\tShift+P"
+msgstr "Canvia la posició panoràmica de la pista actual\tMaj+P"
+
+#: Menus.cpp:848
+msgid "Pan left on focused track\tAlt+Shift+Left"
+msgstr "Mou a l'esquerra la posició panoràmica de la pista actual\tAlt+Maj+Esquerra"
+
+#: Menus.cpp:849
+msgid "Pan right on focused track\tAlt+Shift+Right"
+msgstr "Mou a la dreta la posició panoràmica de la pista actual\tAlt+Maj+Dreta"
+
+#: Menus.cpp:850
+msgid "Change gain on focused track\tShift+G"
+msgstr "Canvia el guany a la pista actual\tMaj+G"
+
+#: Menus.cpp:851
+msgid "Increase gain on focused track\tAlt+Shift+Up"
+msgstr "Incrementa el guany a la pista actual\tAlt+Maj+Amunt"
+
+#: Menus.cpp:852
+msgid "Decrease gain on focused track\tAlt+Shift+Down"
+msgstr "Reduïx el guany a la pista actual\tAlt+Maj+Avall"
+
+#: Menus.cpp:853
+msgid "Open menu on focused track\tShift+M"
+msgstr "Obri el menú de la pista actual\tMaj+M"
+
+#: Menus.cpp:854
+msgid "Mute/Unmute focused track\tShift+U"
+msgstr "Emmudix o deixa d'emmudir la pista actual\tMaj+U"
+
+#: Menus.cpp:855
+msgid "Solo/Unsolo focused track\tShift+S"
+msgstr "Activa o desactiva el Solo a la pista actual\tMaj+S"
+
+#: Menus.cpp:856
+msgid "Close focused track\tShift+C"
+msgstr "Tanca la pista actual\tMaj+C"
+
+#: Menus.cpp:858
+msgid "Snap To On"
+msgstr "Habilita l'arrodoniment de mesures"
+
+#: Menus.cpp:859
+msgid "Snap To Off"
+msgstr "Inhabilita l'arrodoniment de mesures"
+
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
+#. i18n-hint: This is the name of the menu item on Mac OS X only
+#: Menus.cpp:873
+msgid "Open Recent"
+msgstr "Obri un fitxer recent"
+
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
+
+#: Menus.cpp:925
+#, c-format
+msgid "&Undo %s"
+msgstr "&Desfés %s"
+
+#: Menus.cpp:951
+msgid "Can't Undo"
+msgstr "No es pot desfer"
+
+#: Menus.cpp:960
+#, c-format
+msgid "&Redo %s"
+msgstr "&Refés %s"
+
+#: Menus.cpp:966
+msgid "Can't Redo"
+msgstr "No es pot refer"
+
+#: Menus.cpp:1528
+msgid "Sort By Time"
+msgstr "Ordena per temps"
+
+#: Menus.cpp:1528
+msgid "Tracks sorted by time"
+msgstr "Pistes ordenades per temps"
+
+#: Menus.cpp:1554
+msgid "Sort By Name"
+msgstr "Ordena per nom"
+
+#: Menus.cpp:1554
+msgid "Tracks sorted by name"
+msgstr "Pistes ordenades per nom"
+
+#: Menus.cpp:1705
+msgid "Set Left Selection Bound"
+msgstr "Establix el límit esquerre de la selecció"
+
+#: Menus.cpp:1739
+msgid "Set Right Selection Bound"
+msgstr "Establix el límit dret de la selecció"
+
+#: Menus.cpp:2006
+msgid "You must select a track first."
+msgstr "Abans heu de seleccionar una pista."
+
+#: Menus.cpp:2035
+#, c-format
+msgid "Repeat %s\tCtrl+R"
+msgstr "Repetix %s\tCtrl+R"
+
+#: Menus.cpp:2166
+msgid "There are no label tracks to export."
+msgstr "No hi ha cap pista d'etiquetes per a exportar"
+
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
+#: Menus.cpp:2271
+msgid "Nothing to undo"
+msgstr "No hi ha res a desfer"
+
+#: Menus.cpp:2291
+msgid "Nothing to redo"
+msgstr "No hi ha res a repetir"
+
+#: Menus.cpp:2366
+#: TrackPanel.cpp:605
+#: toolbars/EditToolBar.cpp:133
+msgid "Cut"
+msgstr "Retalla"
+
+#: Menus.cpp:2366
+msgid "Cut to the clipboard"
+msgstr "Retalla i enganxa al porta-retalls"
+
+#: Menus.cpp:2404
+msgid "Split Cut"
+msgstr "Dividix i retalla"
+
+#: Menus.cpp:2404
+msgid "Split-cut to the clipboard"
+msgstr "Dividix i retalla al porta-retalls"
+
+#: Menus.cpp:2469
+#: Menus.cpp:2540
+#: Menus.cpp:2634
+#: TrackPanel.cpp:607
+#: toolbars/EditToolBar.cpp:137
+msgid "Paste"
+msgstr "Enganxa"
+
+#: Menus.cpp:2469
+msgid "Pasted text from the clipboard"
+msgstr "Text enganxat des del porta-retalls"
+
+#: Menus.cpp:2540
+#: Menus.cpp:2634
+msgid "Pasted from the clipboard"
+msgstr "Enganxat des del porta-retalls"
+
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
+#: Menus.cpp:2574
+msgid "Copying stereo audio into a mono track is not allowed."
+msgstr "No es pot copiar so estereofònic en una pista monofònica."
+
+#: Menus.cpp:2670
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim"
+msgstr "Deixa només la selecció"
+
+#: Menus.cpp:2670
+msgid "Trim file to selection"
+msgstr "Deixa al fitxer només la selecció"
+
+#: Menus.cpp:2699
+#, c-format
+msgid "Split-deleted %.2f seconds at t=%.2f"
+msgstr "S'han dividit i eliminat %.2f segons de so a la posició t=%.2f"
+
+#: Menus.cpp:2702
+msgid "Split Delete"
+msgstr "Dividix i elimina"
+
+#: Menus.cpp:2723
+#, c-format
+msgid "Disjoined %.2f seconds at t=%.2f"
+msgstr "S'han separat %.2f segons a la posició t=%.2f"
+
+#: Menus.cpp:2726
+msgid "Disjoin"
+msgstr "Separa"
+
+#: Menus.cpp:2747
+#, c-format
+msgid "Joined %.2f seconds at t=%.2f"
+msgstr "S'han ajuntat %.2f segons a la posició t=%.2f"
+
+#: Menus.cpp:2750
+msgid "Join"
+msgstr "Ajunta"
+
+#: Menus.cpp:2769
+#, c-format
+msgid "Silenced selected tracks for %.2f seconds at %.2f"
+msgstr "S'han silenciat les pistes seleccionades durant %.2f segons a partir de la posició %.2f"
+
+#: Menus.cpp:2771
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence"
+msgstr "Silencia"
+
+#: Menus.cpp:2805
+msgid "Duplicate"
+msgstr "Duplica"
+
+#: Menus.cpp:2805
+msgid "Duplicated"
+msgstr "Duplicat"
+
+#: Menus.cpp:2824
+msgid "Cut Labels"
+msgstr "Retalla etiquetes"
+
+#: Menus.cpp:2824
+msgid "Cut labeled regions to the clipboard"
+msgstr "Retalla regions etiquetades al porta-retalls"
+
+#: Menus.cpp:2838
+msgid "SplitCut labeled regions to the clipboard"
+msgstr "Dividix i retalla les regions etiquetades al porta-retalls"
+
+#: Menus.cpp:2839
+msgid "Split Cut Labels"
+msgstr "Dividix i retalla les etiquetes"
+
+#: Menus.cpp:2853
+msgid "Copied labeled regions to the clipboard"
+msgstr "Les regions etiquetades s'han copiat al porta-retalls"
+
+#: Menus.cpp:2853
+msgid "Copy Labels"
+msgstr "Copia etiquetes"
+
+#: Menus.cpp:2865
+msgid "Delete Labels"
+msgstr "Elimina etiquetes"
+
+#: Menus.cpp:2865
+msgid "Deleted labeled regions"
+msgstr "Elimina regions etiquetades"
+
+#: Menus.cpp:2877
+msgid "Split Delete Labels"
+msgstr "Dividix i elimina regions etiquetades"
+
+#: Menus.cpp:2877
+msgid "Split Deleted labeled regions"
+msgstr "S'han dividit i eliminat les regions etiquetades"
+
+#: Menus.cpp:2889
+msgid "Silence Labels"
+msgstr "Silencia etiquetes"
+
+#: Menus.cpp:2889
+msgid "Silenced labeled regions"
+msgstr "Silencia regions etiquetades"
+
+#: Menus.cpp:2901
+msgid "Split Labels"
+msgstr "Dividix etiquetes"
+
+#: Menus.cpp:2901
+msgid "Split labeled regions"
+msgstr "Dividix regions etiquetades"
+
+#: Menus.cpp:2913
+msgid "Join Labels"
+msgstr "Ajunta etiquetes"
+
+#: Menus.cpp:2913
+msgid "Joined labeled regions"
+msgstr "S'han ajuntat les regions etiquetades"
+
+#: Menus.cpp:2925
+msgid "Disjoin Labels"
+msgstr "Separa etiquetes"
+
+#: Menus.cpp:2925
+msgid "Disjoined labeled regions"
+msgstr "S'han separat les regions etiquetades"
+
+#: Menus.cpp:2947
+#: TrackPanel.cpp:6121
+msgid "Split"
+msgstr "Dividix"
+
+#: Menus.cpp:3041
+msgid "Split New"
+msgstr "Dividix en un de nou"
+
+#: Menus.cpp:3041
+msgid "Split to new track"
+msgstr "Dividix en una nova pista"
+
+#: Menus.cpp:3124
+msgid "Split at labels"
+msgstr "Dividix a les etiquetes"
+
+#: Menus.cpp:3425
+msgid "To plot the spectrum, all selected tracks must be the same sample rate."
+msgstr "Per a dibuixar l'espectre cal que totes les pistes seleccionades tinguen la mateixa freqüència de mostreig."
+
+#: Menus.cpp:3451
+#, c-format
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "S'ha seleccionat un fragment de so massa llarg. Només s'analitzaran els primers %.1f segons."
+
+#: Menus.cpp:3584
+#, c-format
+msgid "Imported labels from '%s'"
+msgstr "S'han importat les etiquetes de '%s'"
+
+#: Menus.cpp:3585
+msgid "Import Labels"
+msgstr "Importa etiquetes"
+
+#: Menus.cpp:3595
+msgid "Select a MIDI file..."
+msgstr "Seleccioneu un fitxer MIDI..."
+
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
+
+#: Menus.cpp:3615
+#, c-format
+msgid "Imported MIDI from '%s'"
+msgstr "S'ha importat el MIDI des de '%s'"
+
+#: Menus.cpp:3617
+msgid "Import MIDI"
+msgstr "Importa MIDI"
+
+#: Menus.cpp:3630
+msgid "Select any uncompressed audio file..."
+msgstr "Seleccioneu qualsevol fitxer de so que no estiga comprimit..."
+
+#: Menus.cpp:3634
+msgid "All files (*)|*"
+msgstr "Tots els fitxers (*)|*"
+
+#: Menus.cpp:3668
+msgid "Edit the metadata tags"
+msgstr "Edita les etiquetes de metadades"
+
+#: Menus.cpp:3669
+#: export/Export.cpp:298
+msgid "Edit Metadata"
+msgstr "Edita les metadades"
+
+#: Menus.cpp:3669
+msgid "Edit Metadata tags"
+msgstr "Edita les etiquetes de metadades"
+
+#: Menus.cpp:3725
+#, c-format
+msgid "Rendered all audio in track '%s'"
+msgstr "S'ha renderitzat tot el so de la pista '%s'"
+
+#: Menus.cpp:3726
+msgid "Render"
+msgstr "Renderitza"
+
+#: Menus.cpp:3731
+#, c-format
+msgid "Mixed and rendered %d tracks into one new stereo track"
+msgstr "S'han mesclat i renderitzat %d pistes en una nova pista estereofònica"
+
+#: Menus.cpp:3734
+#, c-format
+msgid "Mixed and rendered %d tracks into one new mono track"
+msgstr "S'han mesclat i renderitzat %d pistes en una nova pista monofònica"
+
+#: Menus.cpp:3736
+#: Mix.cpp:120
+msgid "&Mix and Render"
+msgstr "&Mescla i renderitza"
+
+#: Menus.cpp:3866
+msgid "Aligned with zero"
+msgstr "Alineat amb el zero"
+
+#: Menus.cpp:3870
+msgid "Aligned cursor"
+msgstr "Alineat amb el cursor"
+
+#: Menus.cpp:3874
+msgid "Aligned with selection start"
+msgstr "Alineat amb l'inici de la selecció"
+
+#: Menus.cpp:3878
+msgid "Aligned with selection end"
+msgstr "Alineat amb el final de la selecció"
+
+#: Menus.cpp:3882
+msgid "Aligned end with cursor"
+msgstr "Alineat pel darrera amb el cursor"
+
+#: Menus.cpp:3886
+msgid "Aligned end with selection start"
+msgstr "Alineat pel darrera amb l'inici de la selecció"
+
+#: Menus.cpp:3890
+msgid "Aligned end with selection end"
+msgstr "Alineat pel darrera amb el final de la selecció"
+
+#: Menus.cpp:3894
+msgid "Aligned"
+msgstr "Alineat"
+
+#: Menus.cpp:3927
+msgid "Align"
+msgstr "Alinea"
+
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
+#: Menus.cpp:3950
+msgid "Created new audio track"
+msgstr "S'ha creat una nova pista de so"
+
+#: Menus.cpp:3950
+#: Menus.cpp:3973
+#: Menus.cpp:3988
+#: Menus.cpp:4008
+msgid "New Track"
+msgstr "Pista nova"
+
+#: Menus.cpp:3973
+msgid "Created new stereo audio track"
+msgstr "S'ha creat una pista nova de so estereofònic"
+
+#: Menus.cpp:3988
+msgid "Created new label track"
+msgstr "S'ha creat una pista d'etiquetes nova"
+
+#: Menus.cpp:3997
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "La versió de l'Audacity que esteu utilitzant no permet l'ús de múltiples pistes de temps."
+
+#: Menus.cpp:4008
+msgid "Created new time track"
+msgstr "S'ha creat una pista de temps nova"
+
+#: Menus.cpp:4057
+msgid "Added label"
+msgstr "S'ha afegit l'etiqueta"
+
+#: Menus.cpp:4085
+msgid "Edited labels"
+msgstr "S'han editat les etiquetes"
+
+#: Menus.cpp:4112
+msgid "Save CleanSpeech Preset File As:"
+msgstr "Enregistra esta configuració del CleanSpeech com a:"
+
+#: Menus.cpp:4116
+msgid "CleanSpeech Presets (*.csp)|*.csp"
+msgstr "Configuracions del CleanSpeech (*.csp)|*.csp"
+
+#: Menus.cpp:4123
+#: export/Export.cpp:515
+msgid "Sorry, pathnames longer than 256 characters not supported."
+msgstr "No es permet l'ús de noms de camí de més de 256 caràcters"
+
+#: Menus.cpp:4169
+msgid "Problem encountered exporting presets."
+msgstr "Hi ha hagut un problema en exportar les configuracions."
+
+#: Menus.cpp:4170
+#: export/Export.cpp:408
+msgid "Unable to export"
+msgstr "No s'ha pogut exportar"
+
+#: Menus.cpp:4354
+msgid "Remove Track"
+msgstr "Elimina la pista"
+
+#: Menus.cpp:4354
+msgid "Removed audio track(s)"
+msgstr "Una o més pistes de so han estat eliminades"
+
+#: Menus.cpp:4508
+#: Menus.cpp:4527
+#: export/ExportMP3.cpp:1926
+msgid "Resample"
+msgstr "Canvia la freqüència de mostreig"
+
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Nova freqüència de mostreig (Hz):"
+
+#: Menus.cpp:4514
+msgid "The entered value is invalid"
+msgstr "El valor que heu escrit no és vàlid"
+
+#: Menus.cpp:4525
+#, c-format
+msgid "Resampling track %d"
+msgstr "S'està canviant la freqüència de mostreig de la pista %d"
+
+#: Menus.cpp:4536
+msgid "Resample Track"
+msgstr "Canvia la freqüència de mostreig de la pista"
+
+#: Menus.cpp:4536
+msgid "Resampled audio track(s)"
+msgstr "S'ha canviat freqüència de mostreig de la pista/es"
+
+#: Mix.cpp:94
+#: Mix.cpp:101
+msgid "Mix"
+msgstr "Mescla"
+
+#: Mix.cpp:121
+msgid "Mixing and rendering tracks"
+msgstr "S'estan mesclant i renderitzant les pistes"
+
+#: NoteTrack.cpp:36
+msgid "Note Track"
+msgstr "Pista de notes"
+
+#: Printing.cpp:198
+msgid "There was a problem printing."
+msgstr "Hi ha hagut un problema en imprimir."
+
+#: Printing.cpp:199
+msgid "Print"
+msgstr "Imprimix"
+
+#: Project.cpp:636
+msgid "Main Mix"
+msgstr "Mescla principal"
+
+#: Project.cpp:761
+#, c-format
+msgid "Welcome to Audacity version %s"
+msgstr "Benvingut/uda a l'Audacity versió %s"
+
+#: Project.cpp:922
+msgid "(Recovered)"
+msgstr "(Recuperat)"
+
+#: Project.cpp:1482
+#: TrackPanel.cpp:804
+#: toolbars/ControlToolBar.cpp:191
+msgid "Record"
+msgstr "Enregistra"
+
+#: Project.cpp:1482
+#: TrackPanel.cpp:804
+msgid "Recorded Audio"
+msgstr "So enregistrat"
+
+#: Project.cpp:1500
+msgid "Save changes before closing?"
+msgstr "Voleu alçar els canvis abans de tancar?"
+
+#: Project.cpp:1503
+msgid "\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr "\n"
+"\n"
+"Si l'heu alçat, el projecte no tindrà cap pista.\n"
+"\n"
+"Per guardar les pistes que teníeu anteriorment obertes\n"
+"feu Cancel·la, Edita > Desfés fins que totes les pistes\n"
+"estiguen obertes, i després Fitxer > Alça el projecte."
+
+#: Project.cpp:1506
+msgid "Save changes?"
+msgstr "Voleu alçar els canvis?"
+
+#: Project.cpp:1694
+msgid "All files|*.*|All supported files|"
+msgstr "Tots els fitxers|*.*|Tots els fitxers suportats|"
+
+#: Project.cpp:1719
+msgid "Select one or more audio files..."
+msgstr "Seleccioneu un o més fitxers de so..."
+
+#: Project.cpp:1746
+msgid "Audacity projects|*.aup|"
+msgstr "Projectes de l'Audacity|*.aup|"
+
+#: Project.cpp:1799
+#: Project.cpp:2186
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr "Este fitxer va ser alçat amb l'Audacity %s, una versió\n"
+"molt antiga del programa. El format dels fitxers ha canviat.\n"
+"\n"
+"L'Audacity podria fer malbé les dades en intentar obrir-lo,\n"
+"o siga que millor que en feu abans una còpia de seguretat.\n"
+"\n"
+"Voleu obrir ara este fitxer?"
+
+#: Project.cpp:1800
+msgid "1.0 or earlier"
+msgstr "1.0 o anterior"
+
+#: Project.cpp:1806
+#: Project.cpp:2198
+msgid "Opening old project file"
+msgstr "S'està obrint un fitxer de projecte antic"
+
+#: Project.cpp:1832
+#: Project.cpp:1840
+msgid "Error opening file"
+msgstr "S'ha produït un error en obrir el fitxer"
+
+#: Project.cpp:1846
+#, c-format
+msgid "File may be invalid or corrupted: \n"
+"%s"
+msgstr "Este fitxer pot haver-se corromput o ser invàlid: \n"
+"%s"
+
+#: Project.cpp:1847
+msgid "Error opening file or project"
+msgstr "S'ha produït un error en obrir el fitxer o el projecte"
+
+#: Project.cpp:1867
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "No s'ha pogut convertir el projecte de l'Audacity 1.0 al nou format."
+
+#: Project.cpp:1970
+msgid "Could not remove old auto save file"
+msgstr "No s'ha pogut esborrar el fitxer antic de restabliment automàtic"
+
+#: Project.cpp:1972
+msgid "Project was recovered"
+msgstr "S'ha recuperat el projecte"
+
+#: Project.cpp:1972
+msgid "Recover"
+msgstr "Recupera"
+
+#: Project.cpp:2001
+msgid "Project checker repaired file"
+msgstr "Fitxer reparat durant el procés de comprovació de projectes"
+
+#: Project.cpp:2001
+#: effects/Repair.h:29
+msgid "Repair"
+msgstr "Repara"
+
+#: Project.cpp:2112
+#, c-format
+msgid "Couldn't find the project data folder: \"%s\""
+msgstr "No s'ha pogut trobar la carpeta de dades del projecte:\"%s\""
+
+#: Project.cpp:2155
+#, c-format
+msgid "This file was saved using Audacity %s.\n"
+"You are using Audacity %s - you need to upgrade to\n"
+"a newer version to open this file."
+msgstr "Este fitxer es va alçar amb l'Audacity %s.\n"
+"Esteu fent servir l'Audacity %s - heu d'actualitzar\n"
+"el fitxer a una versió més nova per a poder-lo obrir."
+
+#: Project.cpp:2159
+msgid "Can't open project file"
+msgstr "No es pot obrir el fitxer de projecte"
+
+#: Project.cpp:2193
+#, c-format
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
+"\n"
+"Open this file now?"
+msgstr "Este fitxer va ser alçat amb l'Audacity %s.\n"
+"Podeu obrir-lo amb esta versió de l'Audacity, però quan l'alceu ja no el podreu tornar a obrir amb versions anteriors del programa.\n"
+"\n"
+"Voleu obrir ara este fitxer?"
+
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
+#, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
+
+#: Project.cpp:2428
+#: Project.cpp:2442
+msgid "Error saving project"
+msgstr "S'ha produït un error en alçar el projecte"
+
+#: Project.cpp:2504
+#, c-format
+msgid "Saved %s"
+msgstr "S'ha alçat %s"
+
+#: Project.cpp:2586
+#, c-format
+msgid "Imported '%s'"
+msgstr "S'ha importat '%s'"
+
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Importa"
+
+#: Project.cpp:2639
+#: Project.cpp:2647
+msgid "Error importing"
+msgstr "S'ha produït un error en importar"
+
+#: Project.cpp:2681
+msgid "Save Speech As:"
+msgstr "Enregistra les dades Speech com a:"
+
+#: Project.cpp:2683
+msgid "Windows PCM Audio file (*.wav)|*.wav"
+msgstr "Fitxer de so Windows PCM (*.wav)|*.wav"
+
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
+"\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
+"Export commands."
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
+#: Project.cpp:2692
+msgid "Audacity projects (*.aup)|*.aup"
+msgstr "Projectes de l'Audacity (*.aup)|*.aup"
+
+#: Project.cpp:2736
+msgid "Created new project"
+msgstr "S'ha creat un projecte nou"
+
+#: Project.cpp:2856
+#, c-format
+msgid "Deleted %.2f seconds at t=%.2f"
+msgstr "S'han eliminat %.2f segons a t=%.2f"
+
+#: Project.cpp:2859
+#: effects/Equalization.cpp:1262
+#: effects/Equalization.cpp:2593
+msgid "Delete"
+msgstr "Elimina"
+
+#: Project.cpp:3052
+#, c-format
+msgid "Disk space remains for recording %d hours and %d minutes."
+msgstr "La quantitat d'espai lliure del disc us permet enregistrar fins a %d hores i %d minuts."
+
+#: Project.cpp:3055
+#, c-format
+msgid "Disk space remains for recording 1 hour and %d minutes."
+msgstr "La quantitat d'espai lliure del disc us permet enregistrar fins a una hora i %d minuts."
+
+#: Project.cpp:3058
+#, c-format
+msgid "Disk space remains for recording %d minutes."
+msgstr "La quantitat d'espai lliure del disc us permet enregistrar fins a %d minuts."
+
+#: Project.cpp:3061
+#, c-format
+msgid "Disk space remains for recording %d seconds."
+msgstr "La quantitat d'espai lliure del disc us permet enregistrar fins a %d segons."
+
+#: Project.cpp:3064
+msgid "Out of disk space"
+msgstr "S'ha exhaurit l'espai lliure del disc"
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3342
+msgid "Could not remove old autosave file: "
+msgstr "No s'ha pogut eliminar el fitxer antic de restabliment automàtic:"
+
+#: Project.cpp:3383
+msgid "New Project"
+msgstr "Projecte nou"
+
+#: Project.cpp:3396
+msgid "Error writing autosave file"
+msgstr "S'ha produït un error mentre es desava la informació de restabliment automàtic"
+
+#: Project.cpp:3421
+msgid "Could not create autosave file: "
+msgstr "No s'ha pogut crear el fitxer de restabliment automàtic:"
+
+#: Project.cpp:3447
+#, c-format
+msgid "Actual Rate: %d"
+msgstr "Freqüència actual: %d"
+
+#: Resample.cpp:42
+msgid "Libresample by Dominic Mazzoni and Julius Smith"
+msgstr "Libresample, per Dominic Mazzoni i Julius Smith"
+
+#: Resample.cpp:53
+msgid "High-quality Sinc Interpolation"
+msgstr "Interpolació sincronitzada d'alta qualitat"
+
+#: Resample.cpp:55
+msgid "Fast Sinc Interpolation"
+msgstr "Interpolació sincronitzada ràpida"
+
+#: Resample.cpp:125
+msgid "Libsamplerate by Erik de Castro Lopo"
+msgstr "Libsamplerate, per Erik de Castro Lopo"
+
+#: Resample.cpp:218
+#, c-format
+msgid "Libsamplerate error: %d\n"
+msgstr "Error del Libsamplerate: %d\n"
+
+#: Resample.cpp:240
+#: Resample.cpp:250
+msgid "Resampling disabled."
+msgstr "Delmatge inhabilitat"
+
+#. i18n-hint: Audio data bit depth (precison): 16-bit integers
+#: SampleFormat.cpp:66
+msgid "16-bit PCM"
+msgstr "16 bits PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 24-bit integers
+#: SampleFormat.cpp:69
+msgid "24-bit PCM"
+msgstr "24 bits PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 32-bit floating point
+#: SampleFormat.cpp:72
+msgid "32-bit float"
+msgstr "32 bits coma flotant"
+
+#: Screenshot.cpp:384
+msgid "Saved "
+msgstr "S'ha alçat"
+
+#: Screenshot.cpp:387
+msgid "Error trying to save file: "
+msgstr "S'ha produït un error mentre es desava el fitxer: "
+
+#: Sequence.cpp:732
+#: Sequence.cpp:742
+#: Sequence.cpp:749
+msgid "Gap detected in project file\n"
+msgstr "S'ha detectat un forat al fitxer de projecte\n"
+
+#: ShuttleGui.cpp:1852
+#: effects/Effect.cpp:342
+#: effects/audiounits/AudioUnitEffect.cpp:872
+msgid "Pre&view"
+msgstr "Pre&visualització"
+
+#: ShuttleGui.cpp:1859
+msgid "&Debug"
+msgstr "&Depura"
+
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
+
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
+
+#: SplashDialog.cpp:60
+msgid "&Welcome to Audacity!"
+msgstr "&Benvingut/uda a l'Audacity!"
+
+#: SplashDialog.cpp:112
+msgid "Don't show this again at start up"
+msgstr "No mostres més este advertiment a l'inici"
+
+#: Tags.cpp:629
+msgid "Artist Name"
+msgstr "Nom de l'artista"
+
+#: Tags.cpp:630
+msgid "Track Title"
+msgstr "Títol de la pista"
+
+#: Tags.cpp:631
+msgid "Album Title"
+msgstr "Títol de l'àlbum"
+
+#: Tags.cpp:632
+msgid "Track Number"
+msgstr "Número de pista"
+
+#: Tags.cpp:633
+#: Tags.cpp:2138
+msgid "Year"
+msgstr "Any"
+
+#: Tags.cpp:634
+msgid "Genre"
+msgstr "Gènere"
+
+#: Tags.cpp:635
+#: Tags.cpp:2148
+#: prefs/MousePrefs.cpp:96
+msgid "Comments"
+msgstr "Comentaris"
+
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
+
+#: Tags.cpp:802
+msgid "Tag Name"
+msgstr "Nom de l'etiqueta"
+
+#: Tags.cpp:803
+msgid "Tag Value"
+msgstr "Valor de l'etiqueta"
+
+#: Tags.cpp:818
+#: Tags.cpp:1476
+#: prefs/KeyConfigPrefs.cpp:116
+msgid "&Clear"
+msgstr "&Neteja"
+
+#: Tags.cpp:824
+msgid "Genres"
+msgstr "Gèneres"
+
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
+
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
+
+#: Tags.cpp:834
+#: Tags.cpp:1460
+#: Tags.cpp:1988
+msgid "Template"
+msgstr "Plantilla"
+
+#: Tags.cpp:838
+#: Tags.cpp:1464
+#: Tags.cpp:1992
+#: prefs/KeyConfigPrefs.cpp:126
+msgid "&Load..."
+msgstr "&Obri..."
+
+#: Tags.cpp:839
+#: Tags.cpp:1465
+#: Tags.cpp:1993
+#: prefs/KeyConfigPrefs.cpp:125
+msgid "&Save..."
+msgstr "&Desa..."
+
+#: Tags.cpp:841
+#: Tags.cpp:1467
+#: Tags.cpp:1995
+msgid "S&et Default"
+msgstr "&Establix com a opció per defecte"
+
+#: Tags.cpp:991
+#: Tags.cpp:1630
+#: Tags.cpp:2359
+msgid "Edit Genres"
+msgstr "Edita els gèneres"
+
+#: Tags.cpp:1024
+#: Tags.cpp:1036
+#: Tags.cpp:1052
+#: Tags.cpp:1065
+#: Tags.cpp:1668
+#: Tags.cpp:1680
+#: Tags.cpp:1696
+#: Tags.cpp:1709
+#: Tags.cpp:2402
+#: Tags.cpp:2414
+#: Tags.cpp:2430
+#: Tags.cpp:2443
+msgid "Reset Genres"
+msgstr "Restablix els gèneres"
+
+#: Tags.cpp:1024
+#: Tags.cpp:1065
+#: Tags.cpp:1668
+#: Tags.cpp:1709
+#: Tags.cpp:2402
+#: Tags.cpp:2443
+msgid "Unable to save genre file."
+msgstr "No s'ha pogut alçar el fitxer de gèneres."
+
+#: Tags.cpp:1035
+#: Tags.cpp:1679
+#: Tags.cpp:2413
+msgid "Are you sure you want to reset the genre list to defaults?"
+msgstr "Segur que voleu restablir la llista de gèneres als valors per defecte?"
+
+#: Tags.cpp:1052
+#: Tags.cpp:1696
+#: Tags.cpp:2430
+msgid "Unable to open genre file."
+msgstr "No s'ha pogut obrir el fitxer de gèneres."
+
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "S'ha produït un error en llegir les metadades"
+
+#: Tags.cpp:1087
+#: Tags.cpp:1141
+#: Tags.cpp:1742
+#: Tags.cpp:1778
+#: Tags.cpp:2465
+#: Tags.cpp:2501
+msgid "Save Metadata As:"
+msgstr "Enregistra les metadades com a:"
+
+#: Theme.cpp:638
+#, c-format
+msgid "Audacity could not write file:\n"
+"  %s."
+msgstr "L'Audacity no ha pogut escriure al fitxer:\n"
+"  %s."
+
+#: Theme.cpp:656
+#, c-format
+msgid "Audacity could not open file:\n"
+"  %s\n"
+"for writing."
+msgstr "L'Audacity no ha pogut obrir el fitxer:\n"
+"  %s\n"
+"per a escriure-hi."
+
+#: Theme.cpp:664
+#, c-format
+msgid "Audacity could not write images to file:\n"
+"  %s."
+msgstr "L'Audacity no ha pogut escriure les imatges al fitxer:\n"
+"  %s."
+
+#: Theme.cpp:799
+#, c-format
+msgid "Audacity could not find file:\n"
+"  %s.\n"
+"Theme not loaded."
+msgstr "L'Audacity no ha pogut trobar el fitxer:\n"
+"  %s.\n"
+"El tema no s'ha carregat."
+
+#: Theme.cpp:807
+#: Theme.cpp:896
+#, c-format
+msgid "Audacity could not load file:\n"
+"  %s.\n"
+"Bad png format perhaps?"
+msgstr "L'Audacity no pot carregar el fitxer:\n"
+"  %s.\n"
+"Potser té un format PNG incorrecte?"
+
+#: Theme.cpp:823
+msgid "Audacity could not read its default theme.\n"
+"Please report the problem."
+msgstr "L'Audacity no ha pogut carregar el tema per defecte.\n"
+"Per favor, informeu del problema."
+
+#: Theme.cpp:918
+#, c-format
+msgid "None of the expected theme component files\n"
+" were found in:\n"
+"  %s."
+msgstr "No s'ha trobat cap dels fitxers que composen\n"
+"el tema a:\n"
+"  %s."
+
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
+#, c-format
+msgid "Could not create directory:\n"
+"  %s"
+msgstr "No s'ha pogut crear el directori:\n"
+"  %s"
+
+#: Theme.cpp:963
+#, c-format
+msgid "Audacity could not save file:\n"
+"  %s"
+msgstr "L'Audacity no ha pogut alçar el fitxer:\n"
+"  %s"
+
+#: Theme.cpp:975
+#, c-format
+msgid "All required files in:\n"
+"  %s\n"
+"were already present."
+msgstr "Tots els fitxers necessaris a:\n"
+"  %s\n"
+"són presents."
+
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Durada"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Enregistrament programat de l'Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Inici de l'enregistrament"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Fi de l'enregistrament"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Data i hora d'inici"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Data i hora d'acabament"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "S'està esperant per a començar l'enregistrament el %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
+#: TrackPanel.cpp:464
+#: TrackPanel.cpp:465
+msgid "Track Panel"
+msgstr "Quadre de pistes"
+
+#: TrackPanel.cpp:548
+#: export/ExportPCM.cpp:133
+#: prefs/QualityPrefs.cpp:97
+msgid "Other..."
+msgstr "Altres..."
+
+#: TrackPanel.cpp:556
+#: TrackPanel.cpp:580
+#: TrackPanel.cpp:589
+#: TrackPanel.cpp:597
+msgid "Name..."
+msgstr "Nom..."
+
+#: TrackPanel.cpp:558
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:593
+#: TrackPanel.cpp:599
+msgid "Move Track Up"
+msgstr "Mou la pista amunt"
+
+#: TrackPanel.cpp:559
+#: TrackPanel.cpp:583
+#: TrackPanel.cpp:594
+#: TrackPanel.cpp:600
+msgid "Move Track Down"
+msgstr "Mou la pista avall"
+
+#: TrackPanel.cpp:561
+#: effects/ToneGen.cpp:325
+msgid "Waveform"
+msgstr "So en forma d'ona"
+
+#: TrackPanel.cpp:562
+msgid "Waveform (dB)"
+msgstr "So en forma d'ona (dB)"
+
+#: TrackPanel.cpp:565
+msgid "Spectrum log(f)"
+msgstr "Espectre logarítmic"
+
+#: TrackPanel.cpp:567
+msgid "Pitch (EAC)"
+msgstr "To (EAC)"
+
+#: TrackPanel.cpp:569
+#: TrackPanel.cpp:6091
+msgid "Mono"
+msgstr "Mono"
+
+#: TrackPanel.cpp:570
+#: TrackPanel.cpp:6090
+msgid "Left Channel"
+msgstr "Canal esquerre"
+
+#: TrackPanel.cpp:571
+#: TrackPanel.cpp:6090
+msgid "Right Channel"
+msgstr "Canal dret"
+
+#: TrackPanel.cpp:572
+msgid "Make Stereo Track"
+msgstr "Crea una pista estereofònica"
+
+#: TrackPanel.cpp:573
+msgid "Split Stereo Track"
+msgstr "Dividix la pista estereofònica"
+
+#: TrackPanel.cpp:575
+msgid "Set Sample Format"
+msgstr "Especifica el format de les mostres"
+
+#: TrackPanel.cpp:577
+#: TrackPanel.cpp:6320
+msgid "Set Rate"
+msgstr "Especifica la freqüència"
+
+#: TrackPanel.cpp:585
+msgid "Up Octave"
+msgstr "Apuja-ho una octava"
+
+#: TrackPanel.cpp:586
+msgid "Down Octave"
+msgstr "Abaixa-ho una octava"
+
+#: TrackPanel.cpp:591
+msgid "Font..."
+msgstr "Tipus de lletra..."
+
+#: TrackPanel.cpp:602
+msgid "Set Range..."
+msgstr "Especifica el rang..."
+
+#: TrackPanel.cpp:606
+#: toolbars/EditToolBar.cpp:135
+msgid "Copy"
+msgstr "Copia"
+
+#: TrackPanel.cpp:1272
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "Feu clic per a ampliar verticalment, Maj+clic per a allunyar, o arrossegueu per a ampliar una determinada zona."
+
+#: TrackPanel.cpp:1277
+msgid "Drag the label vertically to change the order of the tracks."
+msgstr "Arrossegueu verticalment l'etiqueta per a canviar l'orde de les pistes"
+
+#: TrackPanel.cpp:1297
+msgid "Click and drag to adjust relative size of stereo tracks."
+msgstr "Feu clic i arrossegueu per a ajustar la grandària relativa de les pistes estereofòniques."
+
+#: TrackPanel.cpp:1300
+msgid "Click and drag to resize the track."
+msgstr "Feu clic i arrossegueu per a canviar la grandària de la pista."
+
+#: TrackPanel.cpp:1331
+msgid "Drag one or more label boundaries"
+msgstr "Arrossegueu algun dels límits de l'etiqueta"
+
+#: TrackPanel.cpp:1332
+msgid "Drag label boundary"
+msgstr "Arrossegueu el límit de l'etiqueta"
+
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1348
+msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
+msgstr "Mode multi-eina: Feu Cmd- per a veure les preferències de ratolí i teclat"
+
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1351
+msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
+msgstr "Mode multi-eina: Feu Ctrl-P per a veure les preferències de ratolí i teclat"
+
+#: TrackPanel.cpp:1371
+msgid "Click and drag to move left selection boundary."
+msgstr "Feu clic i arrossegueu per a moure el límit esquerre de la selecció."
+
+#: TrackPanel.cpp:1376
+msgid "Click and drag to move right selection boundary."
+msgstr "Feu clic i arrossegueu per a moure el límit dret de la selecció."
+
+#: TrackPanel.cpp:1702
+#: TrackPanel.cpp:3993
+#: TrackPanel.cpp:4025
+#: TrackPanel.cpp:4280
+#: TrackPanel.cpp:6432
+#: TrackPanel.cpp:6452
+msgid "Modified Label"
+msgstr "S'ha modificat l'etiqueta"
+
+#: TrackPanel.cpp:1703
+#: TrackPanel.cpp:3994
+#: TrackPanel.cpp:4026
+#: TrackPanel.cpp:4281
+#: TrackPanel.cpp:6433
+#: TrackPanel.cpp:6453
+msgid "Label Edit"
+msgstr "Edita l'etiqueta"
+
+#: TrackPanel.cpp:1930
+msgid "Adjusted envelope."
+msgstr "S'ha ajustat l'envolupant."
+
+#: TrackPanel.cpp:1931
+#: prefs/MousePrefs.cpp:115
+msgid "Envelope"
+msgstr "Envolupant"
+
+#: TrackPanel.cpp:2082
+msgid "Moved clip to another track"
+msgstr "El clip ha estat mogut a una altra pista"
+
+#: TrackPanel.cpp:2086
+msgid "left"
+msgstr "esquerra"
+
+#: TrackPanel.cpp:2086
+msgid "right"
+msgstr "dreta"
+
+#. i18n-hint: %s is a direction like left or right
+#: TrackPanel.cpp:2088
+#, c-format
+msgid "Time shifted tracks/clips %s %.02f seconds"
+msgstr "S'han desplaçat les pistes o clips en direcció %s un total de %.02f segons"
+
+#: TrackPanel.cpp:2092
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
+msgid "Time-Shift"
+msgstr "Desplaçament en el temps"
+
+#: TrackPanel.cpp:2953
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr "Per a fer servir l'eina de dibuix seleccioneu 'Forma d'ona' al menú desplegable de la pista."
+
+#: TrackPanel.cpp:2970
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr "Per a fer servir l'eina de dibuix, feu zoom fins que es vegin les mostres individualment."
+
+#: TrackPanel.cpp:3241
+msgid "Moved Sample"
+msgstr "S'ha desplaçat la mostra"
+
+#: TrackPanel.cpp:3242
+msgid "Sample Edit"
+msgstr "Edita la mostra"
+
+#: TrackPanel.cpp:3341
+#, c-format
+msgid "Removed track '%s.'"
+msgstr "S'ha eliminat la pista '%s'"
+
+#: TrackPanel.cpp:3343
+msgid "Track Remove"
+msgstr "Elimina la pista"
+
+#: TrackPanel.cpp:3484
+msgid "Moved gain slider"
+msgstr "S'ha mogut el regulador de guany"
+
+#: TrackPanel.cpp:3484
+msgid "Moved pan slider"
+msgstr "S'ha mogut el regulador de posició estereofònica"
+
+#. i18n-hint: Title of the Gain slider, used to adjust the volume
+#: TrackPanel.cpp:3485
+#: TrackPanel.cpp:5726
+#: TrackPanel.cpp:7149
+msgid "Gain"
+msgstr "Guany"
+
+#. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
+#: TrackPanel.cpp:3485
+#: TrackPanel.cpp:5664
+#: TrackPanel.cpp:7156
+msgid "Pan"
+msgstr "Balanç"
+
+#: TrackPanel.cpp:3610
+#: TrackPanel.cpp:6385
+#: effects/ChangePitch.cpp:284
+msgid "up"
+msgstr "amunt"
+
+#: TrackPanel.cpp:3614
+#: TrackPanel.cpp:6386
+#: effects/ChangePitch.cpp:284
+msgid "down"
+msgstr "avall"
+
+#: TrackPanel.cpp:3621
+#: TrackPanel.cpp:6381
+#, c-format
+msgid "Moved '%s' %s"
+msgstr "S'ha mogut '%s' cap %s"
+
+#: TrackPanel.cpp:3624
+#: TrackPanel.cpp:6387
+msgid "Move Track"
+msgstr "Mou la pista"
+
+#: TrackPanel.cpp:4180
+msgid "Expand"
+msgstr "Expandix"
+
+#: TrackPanel.cpp:4180
+msgid "Expanded Cut Line"
+msgstr "S'ha expandit la línia de tall"
+
+#: TrackPanel.cpp:4189
+msgid "Merge"
+msgstr "Barreja"
+
+#: TrackPanel.cpp:4189
+msgid "Merged Clips"
+msgstr "Clips mesclats"
+
+#: TrackPanel.cpp:4201
+msgid "Removed Cut Line"
+msgstr "S'ha eliminat la línia de tall"
+
+#: TrackPanel.cpp:5664
+msgid "Adjusted Pan"
+msgstr "S'ha ajustat la posició panoràmica"
+
+#: TrackPanel.cpp:5726
+msgid "Adjusted gain"
+msgstr "S'ha ajustat el guany"
+
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
+#: TrackPanel.cpp:5918
+msgid "Can't delete track with active audio"
+msgstr "No es pot eliminar una pista quan és activa"
+
+#: TrackPanel.cpp:6071
+msgid "Stereo, "
+msgstr "Estèreo,"
+
+#: TrackPanel.cpp:6074
+msgid "Mono, "
+msgstr "Mono,"
+
+#: TrackPanel.cpp:6076
+msgid "Left, "
+msgstr "Esquerra,"
+
+#: TrackPanel.cpp:6078
+msgid "Right, "
+msgstr "Dreta,"
+
+#: TrackPanel.cpp:6100
+#: TrackPanel.cpp:6225
+#, c-format
+msgid "Changed '%s' to %s"
+msgstr "S'ha canviat '%s' a %s"
+
+#: TrackPanel.cpp:6105
+msgid "Channel"
+msgstr "Canal"
+
+#: TrackPanel.cpp:6118
+#, c-format
+msgid "Split stereo track '%s'"
+msgstr "Dividix la pista estereofònica '%s'"
+
+#: TrackPanel.cpp:6139
+#, c-format
+msgid "Made '%s' a stereo track"
+msgstr "Convertix '%s' en una pista estereofònica"
+
+#: TrackPanel.cpp:6142
+msgid "Make Stereo"
+msgstr "Fes que siga estereofònica"
+
+#: TrackPanel.cpp:6189
+#, c-format
+msgid "Changed '%s' to %d Hz"
+msgstr "S'ha canviat '%s' a %d Hz"
+
+#: TrackPanel.cpp:6191
+msgid "Rate Change"
+msgstr "Canvia la freqüència"
+
+#: TrackPanel.cpp:6229
+msgid "Format Change"
+msgstr "Canvia el format"
+
+#: TrackPanel.cpp:6349
+msgid "Change lower speed limit (%) to:"
+msgstr "Canvia el límit inferior de velocitat (%) a:"
+
+#: TrackPanel.cpp:6350
+#: TrackPanel.cpp:6351
+msgid "Lower speed limit"
+msgstr "Límit inferior de velocitat"
+
+#: TrackPanel.cpp:6356
+msgid "Change upper speed limit (%) to:"
+msgstr "Canvia el límit superior de velocitat (%) a:"
+
+#: TrackPanel.cpp:6357
+#: TrackPanel.cpp:6358
+msgid "Upper speed limit"
+msgstr "Límit superior de velocitat"
+
+#: TrackPanel.cpp:6366
+#, c-format
+msgid "Set range to '%d' - '%d'"
+msgstr "Fixa el rang entre '%d' i '%d'"
+
+#: TrackPanel.cpp:6369
+msgid "Set Range"
+msgstr "Especifica el rang"
+
+#: TrackPanel.cpp:6414
+msgid "Change track name to:"
+msgstr "Canvia el nom de la pista a:"
+
+#: TrackPanel.cpp:6415
+msgid "Track Name"
+msgstr "Nom de la pista"
+
+#: TrackPanel.cpp:6418
+#, c-format
+msgid "Renamed '%s' to '%s'"
+msgstr "S'ha canviat el nom de '%s' a '%s'"
+
+#: TrackPanel.cpp:6421
+msgid "Name Change"
+msgstr "Canvi de nom"
+
+#: TrackPanel.cpp:6487
+msgid "Label Track Font"
+msgstr "Tipus de lletra per la pista d'etiquetes"
+
+#: TrackPanel.cpp:6499
+msgid "Face name"
+msgstr "Nom de portada"
+
+#: TrackPanel.cpp:6508
+msgid "Face size"
+msgstr "Grandària de portada"
+
+#: TrackPanel.cpp:7076
+msgid "Mute"
+msgstr "Silenci"
+
+#: TrackPanel.cpp:7076
+msgid "Solo"
+msgstr "Solo"
+
+#: TrackPanelAx.cpp:265
+msgid "TrackView"
+msgstr "Vista de pista"
+
+#: TrackPanelAx.cpp:273
+msgid "Track Accessible out of sync"
+msgstr "S'ha perdut la sincronia de la pista accessible"
+
+#: TrackPanelAx.cpp:281
+#, c-format
+msgid "Track %d"
+msgstr "Pista %d"
+
+#: TrackPanelAx.cpp:287
+msgid " Mute On"
+msgstr " Mut"
+
+#: TrackPanelAx.cpp:292
+msgid " Solo On"
+msgstr " Solo"
+
+#: TrackPanelAx.cpp:296
+msgid " Select On"
+msgstr " Selecció activada"
+
+#: VoiceKey.cpp:88
+#: VoiceKey.cpp:238
+#: VoiceKey.cpp:376
+#: VoiceKey.cpp:517
+msgid "Selection is too small to use voice key."
+msgstr "La selecció és massa petita per a fer servir la clau de veu."
+
+#: VoiceKey.cpp:843
+msgid "Calibration Results\n"
+msgstr "Resultat de la cal·libració\n"
+
+#: VoiceKey.cpp:844
+#, c-format
+msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Energia                  -- significa: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:845
+#, c-format
+msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Canvis de signe      -- significa: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:846
+#, c-format
+msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Canvis de direcció   -- significa: %1.4f  sd: (%1.4f)\n"
+
+#: WaveTrack.cpp:85
+msgid "Audio Track"
+msgstr "Pista de so"
+
+#: WaveTrack.cpp:555
+#: WaveTrack.cpp:574
+msgid "There is not enough room available to paste the selection"
+msgstr "No hi ha prou espai per a enganxar la selecció"
+
+#: WaveTrack.cpp:1688
+msgid "There is not enough room available to expand the cut line"
+msgstr "No hi ha prou espai disponible per a expandir la línia de tall"
+
+#: commands/CommandManager.cpp:448
+#, c-format
+msgid "Plugins 1 to %i"
+msgstr "Connectors 1 a %i"
+
+#: commands/CommandManager.cpp:462
+#, c-format
+msgid "Plugins %i to %i"
+msgstr "Connectors %i a %i"
+
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "Ha estat rebutjat per alguna raó. Proveu-ho seleccionant abans un fragment de so."
+
+#: commands/CommandManager.cpp:781
+msgid "You can only do this when playing and recording are\n"
+" stopped.  [Pausing is not sufficient.]"
+msgstr "Això només es pot fer quan la interpretació i l'enregistrament\n"
+"estan aturats.  [No n'hi ha prou posant-se en pausa.]"
+
+#: commands/CommandManager.cpp:783
+msgid "You must first select some stereo audio for this\n"
+" to use.  [You can't use this with mono.]"
+msgstr "Per fer això cal seleccionar abans algun fragment de so estereofònic.\n"
+"[No es pot fer amb pistes monofòniques.]"
+
+#: commands/CommandManager.cpp:785
+msgid "You must first select some audio for this to use."
+msgstr "Cal que seleccioneu un fragment de so per a emprar esta funcionalitat."
+
+#: commands/CommandManager.cpp:787
+msgid "You must first select some audio for this\n"
+" to use. [Selecting other kinds of track won't work.]"
+msgstr "Per fer això cal que seleccioneu abans algun fragment de so.\n"
+"[No s'hi val a seleccionar fragments d'altres tipus de pistes.]"
+
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
+
+#: commands/CommandManager.cpp:972
+#, c-format
+msgid "Loaded %d keyboard shortcuts\n"
+msgstr "S'han llegit %d dreceres de teclat\n"
+
+#: commands/CommandManager.cpp:974
+msgid "Loading keyboard shortcuts"
+msgstr "S'estan llegint les dreceres de teclat"
+
+#: effects/Amplify.cpp:52
+#, c-format
+msgid "Applied effect: %s %.1f dB"
+msgstr "S'ha aplicat l'efecte: %s %.1f dB"
+
+#: effects/Amplify.cpp:87
+msgid "Amplify"
+msgstr "Amplifica"
+
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
+
+#: effects/Amplify.cpp:159
+msgid "Amplification (dB):"
+msgstr "Amplificació (dB)"
+
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:179
+msgid "New Peak Amplitude (dB):"
+msgstr "Nou pic d'amplitud (dB):"
+
+#: effects/Amplify.cpp:191
+msgid "Allow clipping"
+msgstr "Permet l'escapçament de pics"
+
+#: effects/Amplify.cpp:237
+#: effects/Amplify.cpp:287
+#: effects/Amplify.cpp:353
+msgid "-Infinity"
+msgstr "-Infinit"
+
+#: effects/Amplify.h:46
+msgid "Amplify..."
+msgstr "Amplifica..."
+
+#: effects/Amplify.h:54
+msgid "Amplifying"
+msgstr "S'està amplificant"
+
+#: effects/AutoDuck.cpp:125
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "Heu seleccionat una pista que no conté so. L'AutoDuck només pot processar pistes de so."
+
+#: effects/AutoDuck.cpp:126
+#: effects/AutoDuck.cpp:138
+#: effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:570
+msgid "Auto Duck"
+msgstr "Auto Duck"
+
+#: effects/AutoDuck.cpp:137
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "L'Auto Duck necessita una pista de control situada sota la pista o pistes seleccionades."
+
+#: effects/AutoDuck.cpp:465
+msgid "Auto Duck by Markus Meyer"
+msgstr "Auto Duck per Markus Meyer"
+
+#: effects/AutoDuck.cpp:487
+msgid "Duck amount:"
+msgstr "Quantitat de \"Duck\":"
+
+#: effects/AutoDuck.cpp:492
+msgid "Maximum pause:"
+msgstr "Pausa màxima:"
+
+#. i18n-hint: Name of time display format that shows time in seconds
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: prefs/AudioIOPrefs.cpp:166
+#: prefs/AudioIOPrefs.cpp:174
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/AudioIOPrefs.cpp:201
+#: prefs/AudioIOPrefs.cpp:203
+#: widgets/TimeTextCtrl.cpp:263
+msgid "seconds"
+msgstr "segons"
+
+#: effects/AutoDuck.cpp:497
+msgid "Outer fade down length:"
+msgstr "Longitud del fàding final exterior:"
+
+#: effects/AutoDuck.cpp:502
+msgid "Outer fade up length:"
+msgstr "Longitud del fàding inicial exterior:"
+
+#: effects/AutoDuck.cpp:507
+msgid "Inner fade down length:"
+msgstr "Longitud del fàding final interior:"
+
+#: effects/AutoDuck.cpp:512
+msgid "Inner fade up length:"
+msgstr "Longitud del fàding inicial interior:"
+
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:484
+msgid "Threshold:"
+msgstr "Llindar:"
+
+#: effects/AutoDuck.cpp:570
+msgid "Please enter valid values."
+msgstr "Per favor, escriviu valors vàlids."
+
+#: effects/AutoDuck.cpp:704
+msgid "Preview not available"
+msgstr "La previsualització no està disponible"
+
+#: effects/AutoDuck.h:97
+msgid "Auto Duck..."
+msgstr "Auto Duck..."
+
+#: effects/AutoDuck.h:107
+msgid "Processing Auto Duck..."
+msgstr "S'està processant l'Auto Duck..."
+
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:448
+#: effects/audiounits/AudioUnitEffect.cpp:877
+#: effects/nyquist/Nyquist.cpp:1042
+#: widgets/ErrorDialog.cpp:79
+#: widgets/ErrorDialog.cpp:105
+#: widgets/Warning.cpp:67
+msgid "OK"
+msgstr "D'acord"
+
+#: effects/BassBoost.cpp:52
+#, c-format
+msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
+msgstr "S'ha aplicat l'efecte: %s freqüència = %.0f Hz, accentuació = %.0f dB"
+
+#: effects/BassBoost.cpp:169
+msgid "Bass Boost"
+msgstr "Potenciació de baixos"
+
+#: effects/BassBoost.cpp:182
+msgid "by Nasca Octavian Paul"
+msgstr "per Nasca Octavian Paul"
+
+#: effects/BassBoost.cpp:196
+msgid "Frequency (Hz):"
+msgstr "Freqüència (Hz):"
+
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
+msgid "Boost (dB):"
+msgstr "Accentuació (dB):"
+
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
+#: effects/BassBoost.h:35
+msgid "BassBoost..."
+msgstr "Amplificació dels baixos..."
+
+#: effects/BassBoost.h:43
+msgid "Boosting Bass Frequencies"
+msgstr "S'estan accentuant les freqüències baixes"
+
+#: effects/ChangeLength.h:26
+msgid "Change Length..."
+msgstr "Canvia la longitud..."
+
+#: effects/ChangeLength.h:34
+msgid "Changing Length..."
+msgstr "S'està canviant la longitud..."
+
+#: effects/ChangePitch.cpp:55
+#, c-format
+msgid "Applied effect: %s %.2f semitones"
+msgstr "S'ha aplicat l'efecte: %s %.2f semitons"
+
+#: effects/ChangePitch.cpp:118
+msgid "Change Pitch"
+msgstr "Canvia el to"
+
+#: effects/ChangePitch.cpp:247
+msgid "Change Pitch without Changing Tempo"
+msgstr "Canvia el to sense canviar el temps"
+
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/ChangePitch.cpp:254
+#: effects/ChangeSpeed.cpp:313
+#: effects/ChangeTempo.cpp:180
+msgid "by Vaughan Johnson && Dominic Mazzoni"
+msgstr "per Vaughan Johnson && Dominic Mazzoni"
+
+#: effects/ChangePitch.cpp:259
+#: effects/ChangeTempo.cpp:185
+msgid "using SoundTouch, by Olli Parviainen"
+msgstr "S'està emprant el SoundTouch, d'Olli Parviainen"
+
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Semitons:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
+
+#: effects/ChangePitch.cpp:291
+#: effects/ChangePitch.cpp:337
+#: effects/ChangeSpeed.cpp:377
+#: effects/ChangeTempo.cpp:239
+#: effects/ChangeTempo.cpp:270
+msgid "to"
+msgstr "fins a"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
+
+#: effects/ChangePitch.cpp:360
+#: effects/ChangeSpeed.cpp:331
+#: effects/ChangeTempo.cpp:198
+msgid "Percent Change:"
+msgstr "Canvi percentual:"
+
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
+#: effects/ChangePitch.h:31
+msgid "Change Pitch..."
+msgstr "Canvia el to..."
+
+#: effects/ChangePitch.h:39
+msgid "Changing Pitch"
+msgstr "S'està canviant el to"
+
+#: effects/ChangeSpeed.cpp:53
+#: effects/ChangeTempo.cpp:55
+#, c-format
+msgid "Applied effect: %s %.1f%%"
+msgstr "S'ha aplicat l'efecte: %s %.1f%%"
+
+#: effects/ChangeSpeed.cpp:60
+msgid "Change Speed"
+msgstr "Canvia la velocitat"
+
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "no aplicable"
+
+#: effects/ChangeSpeed.cpp:308
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Canvia la velocitat, afectant tant el temps com el to"
+
+#: effects/ChangeSpeed.cpp:318
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "s'està fent servir el SampleRate, d'Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.h:32
+msgid "Change Speed..."
+msgstr "Canvia la velocitat..."
+
+#: effects/ChangeSpeed.h:40
+msgid "Changing Speed"
+msgstr "S'està canviant la velocitat"
+
+#: effects/ChangeTempo.cpp:74
+msgid "Change Tempo"
+msgstr "Canvia el temps"
+
+#: effects/ChangeTempo.cpp:175
+msgid "Change Tempo without Changing Pitch"
+msgstr "Canvia el temps sense canviar el to"
+
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.h:35
+msgid "Change Tempo..."
+msgstr "Canvia el temps..."
+
+#: effects/ChangeTempo.h:43
+msgid "Changing Tempo"
+msgstr "S'està canviant el temps"
+
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
+msgstr "Eliminació de sorolls \"clic\""
+
+#: effects/ClickRemoval.cpp:336
+msgid "Click and Pop Removal by Craig DeForest"
+msgstr "Supressió de sorolls \"clic\" i \"pop\", per Craig DeForest"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold (lower is more sensitive):"
+msgstr "Seleccioneu el llindar (un valor baix accentua l'efecte):"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:362
+msgid "Max spike width (higher is more sensitive):"
+msgstr "Seleccioneu l'amplada màxima dels pics (un valor alt accentua l'efecte):"
+
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
+#: effects/ClickRemoval.h:42
+msgid "Click Removal..."
+msgstr "Eliminació de sorolls \"clic\"..."
+
+#: effects/ClickRemoval.h:50
+msgid "Removing clicks and pops..."
+msgstr "S'estan eliminant sorolls \"clic\" i \"pop\"..."
+
+#: effects/Compressor.cpp:74
+msgid "Dynamic Range Compressor"
+msgstr "Compressor d'abast dinàmic"
+
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
+msgstr "Temps d'atac:"
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
+msgstr "Temps de caiguda:"
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
+#: effects/Compressor.cpp:516
+msgid "Normalize to 0dB after compressing"
+msgstr "Normalitza a 0 dB després de la compressió"
+
+#: effects/Compressor.cpp:563
+#, c-format
+#, fuzzy
+msgid "Threshold %d dB"
+msgstr "Llindar: %d dB"
+
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
+msgstr "Temps d'atac: %.1f segons"
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
+msgstr "Temps de caiguda: %.1f segons"
+
+#: effects/Compressor.h:36
+msgid "Compressor..."
+msgstr "Compressor..."
+
+#: effects/Compressor.h:44
+msgid "Applying Dynamic Range Compression..."
+msgstr "S'està aplicant la compressió de rang dinàmic..."
+
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Inici"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Final"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "Restablix"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Control"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
+#: effects/DtmfGen.cpp:48
+msgid "DTMF Tone Generator"
+msgstr "Generador de tons DTMF"
+
+#: effects/DtmfGen.cpp:439
+msgid "by Salvo Ventura (2006)"
+msgstr "per Salvo Ventura (2006)"
+
+#: effects/DtmfGen.cpp:443
+msgid "DTMF sequence:"
+msgstr "Seqüència DTMF:"
+
+#: effects/DtmfGen.cpp:446
+#: effects/Noise.cpp:255
+#: effects/ToneGen.cpp:328
+#: effects/ToneGen.cpp:365
+msgid "Amplitude (0-1)"
+msgstr "Amplitud (0-1)"
+
+#: effects/DtmfGen.cpp:448
+msgid "Duration:"
+msgstr "Durada:"
+
+#: effects/DtmfGen.cpp:469
+msgid "Tone/silence ratio:"
+msgstr "Coeficient de tons i silencis:"
+
+#: effects/DtmfGen.cpp:479
+msgid "Duty cycle:"
+msgstr "Cicle de treball:"
+
+#: effects/DtmfGen.cpp:481
+msgid "Tone duration:"
+msgstr "Durada dels tons:"
+
+#: effects/DtmfGen.cpp:482
+#: effects/DtmfGen.cpp:484
+#: effects/DtmfGen.cpp:560
+#: effects/DtmfGen.cpp:561
+msgid "ms"
+msgstr "ms"
+
+#: effects/DtmfGen.cpp:483
+msgid "Silence duration:"
+msgstr "Durada dels silencis:"
+
+#: effects/DtmfGen.h:41
+msgid "DTMF Tones..."
+msgstr "Tons DTMF..."
+
+#: effects/DtmfGen.h:49
+#, c-format
+msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
+msgstr "S'ha aplicat l'efecte de generar tons DTMF durant %.6lf segons"
+
+#: effects/DtmfGen.h:53
+msgid "Generating DTMF tones"
+msgstr "S'estan generant els tons DTMF"
+
+#: effects/Echo.cpp:48
+#, c-format
+msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
+msgstr "S'ha aplicat l'efecte: %s retard = %f segons, factor de decaïment= %f"
+
+#: effects/Echo.cpp:170
+msgid "Echo"
+msgstr "Eco"
+
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/Echo.cpp:195
+msgid "by Dominic Mazzoni && Vaughan Johnson"
+msgstr "per  Dominic Mazzoni i Vaughan Johnson"
+
+#: effects/Echo.cpp:207
+msgid "Delay time (seconds):"
+msgstr "Temps de retard (segons):"
+
+#: effects/Echo.cpp:212
+msgid "Decay factor:"
+msgstr "Factor de decaïment"
+
+#: effects/Echo.h:34
+msgid "Echo..."
+msgstr "Eco..."
+
+#: effects/Echo.h:42
+msgid "Performing Echo"
+msgstr "S'està aplicant l'eco"
+
+#: effects/Effect.cpp:390
+msgid "Preparing preview"
+msgstr "S'està preparant la previsualització"
+
+#: effects/Effect.cpp:419
+msgid "Previewing"
+msgstr "Previsualització"
+
+#: effects/Effect.cpp:435
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "S'ha produït un error mentre s'obria el dispositiu de so. Reviseu els paràmetres del dispositiu d'eixida i la freqüència de mostreig emprada en el projecte."
+
+#: effects/Effect.h:107
+#, c-format
+msgid "Applied effect: %s"
+msgstr "S'ha aplicat l'efecte: %s"
+
+#: effects/Equalization.cpp:329
+msgid "B-spline"
+msgstr "B-spline"
+
+#: effects/Equalization.cpp:330
+msgid "Cosine"
+msgstr "Cosinus"
+
+#: effects/Equalization.cpp:331
+msgid "Cubic"
+msgstr "Cúbica"
+
+#: effects/Equalization.cpp:362
+#: effects/Equalization.cpp:412
+msgid "Equalization"
+msgstr "Equalització"
+
+#: effects/Equalization.cpp:980
+msgid "Error loading EQ curve"
+msgstr "S'ha produït un error en llegir la corba d'equalització"
+
+#: effects/Equalization.cpp:1019
+msgid "custom"
+msgstr "personalitzat"
+
+#. i18n-hint: && in here is an escape character to get a single &
+#. * on screen, so keep it as is
+#: effects/Equalization.cpp:1087
+msgid "Equalization, by Martyn Shaw && Mitch Golden"
+msgstr "Equalizació, per Martyn Shaw i Mitch Golden"
+
+#: effects/Equalization.cpp:1108
+msgid "Max dB"
+msgstr "Màx. dB"
+
+#: effects/Equalization.cpp:1110
+msgid "Min dB"
+msgstr "Mín. dB"
+
+#: effects/Equalization.cpp:1183
+msgid "kHz"
+msgstr "kHz"
+
+#: effects/Equalization.cpp:1200
+msgid "Draw curves"
+msgstr "Traça les corbes"
+
+#: effects/Equalization.cpp:1205
+msgid "Graphic EQ"
+msgstr "Equalitzador gràfic"
+
+#: effects/Equalization.cpp:1219
+msgid "Linear frequency scale"
+msgstr "Escala lineal de freqüències"
+
+#: effects/Equalization.cpp:1228
+msgid "Length of filter:"
+msgstr "Longitud del filtre:"
+
+#: effects/Equalization.cpp:1249
+msgid "Select curve:"
+msgstr "Tipus de corba:"
+
+#: effects/Equalization.cpp:1259
+#: effects/Equalization.cpp:2498
+#: export/ExportMultiple.cpp:826
+msgid "Save As..."
+msgstr "Anomena i alça..."
+
+#: effects/Equalization.cpp:1265
+msgid "Flat"
+msgstr "Pla"
+
+#: effects/Equalization.cpp:2497
+msgid "Enter the desired name of the curve"
+msgstr "Escriviu el nom que vulgueu donar a la corba"
+
+#: effects/Equalization.cpp:2597
+msgid "Confirm Deletion"
+msgstr "Confirmeu l'esborrament"
+
+#: effects/Equalization.h:87
+msgid "Equalization..."
+msgstr "Equalització..."
+
+#: effects/Equalization.h:95
+msgid "Performing Equalization"
+msgstr "S'està realitzant l'equalització"
+
+#: effects/Fade.h:24
+msgid "Fade In"
+msgstr "Fosa d'obertura"
+
+#: effects/Fade.h:32
+msgid "Fading In"
+msgstr "S'està fent una fosa d'obertura"
+
+#: effects/Fade.h:48
+msgid "Fade Out"
+msgstr "Fosa de tancament"
+
+#: effects/Fade.h:56
+msgid "Fading Out"
+msgstr "S'està fent una fosa de tancament"
+
+#: effects/FindClipping.cpp:49
+msgid "Detect clipping"
+msgstr "Detecta l'escapçament de pics"
+
+#: effects/FindClipping.cpp:91
+msgid "Clipping"
+msgstr "Escapçament de pics"
+
+#: effects/FindClipping.cpp:211
+msgid "Find Clipping"
+msgstr "Troba pics escapçats (clipping)"
+
+#: effects/FindClipping.cpp:222
+msgid "by Leland Lucius"
+msgstr "per Leland Lucius"
+
+#: effects/FindClipping.cpp:234
+msgid "Start threshold (samples):"
+msgstr "Llindar d'inici (mostres):"
+
+#: effects/FindClipping.cpp:238
+msgid "Stop threshold (samples):"
+msgstr "Llindar final (mostres):"
+
+#: effects/FindClipping.cpp:250
+msgid "Start and stop must be greater than 0."
+msgstr "L'inici i el final han de ser valors més grans que zero."
+
+#: effects/FindClipping.h:37
+msgid "Find Clipping..."
+msgstr "Troba pics escapçats..."
+
+#: effects/FindClipping.h:47
+msgid "Detecting clipping"
+msgstr "S'estan detectant els pics escapçats"
+
+#: effects/Invert.h:27
+msgid "Invert"
+msgstr "Invertix"
+
+#: effects/Invert.h:35
+msgid "Inverting"
+msgstr "S'està fent la inversió..."
+
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Anivellador"
+
+#: effects/Leveller.cpp:52
+msgid "None-Skip"
+msgstr "Cap / Saltar-s'ho"
+
+#: effects/Leveller.cpp:53
+msgid "Light"
+msgstr "Suau"
+
+#: effects/Leveller.cpp:54
+msgid "Moderate"
+msgstr "Moderat"
+
+#: effects/Leveller.cpp:55
+msgid "Heavy"
+msgstr "Fort"
+
+#: effects/Leveller.cpp:56
+msgid "Heavier"
+msgstr "Més fort"
+
+#: effects/Leveller.cpp:57
+msgid "Heaviest"
+msgstr "El més fort"
+
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "per Lynn Allan"
+
+#: effects/Leveller.cpp:226
+#: effects/Leveller.cpp:231
+msgid "Degree of Leveling"
+msgstr "Grau d'anivellament"
+
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
+#: effects/Leveller.cpp:242
+msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
+msgstr "Llindar de soroll (Soroll \"hiss\", \"hum\" o d'ambient)"
+
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
+msgstr "Llindar de soroll:"
+
+#: effects/Leveller.h:28
+msgid "Leveller..."
+msgstr "Anivellador..."
+
+#: effects/Leveller.h:36
+msgid "Applying Leveller..."
+msgstr "S'està aplicant l'anivellador..."
+
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mesclador"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Supressió de soroll"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
+#: effects/Noise.cpp:37
+msgid "White"
+msgstr "Blanc"
+
+#: effects/Noise.cpp:38
+msgid "Pink"
+msgstr "Rosat"
+
+#: effects/Noise.cpp:39
+msgid "Brown"
+msgstr "Marró"
+
+#: effects/Noise.cpp:41
+msgid "Noise Generator"
+msgstr "Generador de soroll"
+
+#: effects/Noise.cpp:256
+msgid "Noise type"
+msgstr "Tipus de soroll"
+
+#: effects/Noise.h:41
+msgid "Noise..."
+msgstr "Soroll..."
+
+#: effects/Noise.h:49
+#, c-format
+msgid "Applied effect: Generate Noise, %.6lf seconds"
+msgstr "S'ha aplicat l'efecte: Genera soroll durant %.6lf segons"
+
+#: effects/Noise.h:53
+msgid "Generating Noise"
+msgstr "S'està generant soroll"
+
+#: effects/NoiseRemoval.cpp:192
+#, c-format
+msgid "Could not open file:\n"
+"  %s"
+msgstr "No s'ha pogut obrir el fitxer: \n"
+" %s"
+
+#: effects/NoiseRemoval.cpp:277
+msgid "Attempt to run Noise Removal without a noise profile.\n"
+msgstr "S'ha intentat aplicar la reducció de soroll sense haver definit abans el perfil.\n"
+
+#: effects/NoiseRemoval.cpp:813
+msgid "Step 1"
+msgstr "Pas 1"
+
+#: effects/NoiseRemoval.cpp:814
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
+"then click Get Noise Profile:"
+msgstr "Seleccioneu uns quants segons de so on només hi hagi soroll, de manera que l'Audacity\n"
+"sàpiga què és el que cal filtrar. Després feu clic a 'Obtenció del perfil de soroll':"
+
+#: effects/NoiseRemoval.cpp:815
+msgid "Step 2"
+msgstr "Pas 2"
+
+#: effects/NoiseRemoval.cpp:816
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
+"filtered out, and then click 'OK' to remove noise.\n"
+msgstr "Seleccioneu el fragment de so on vulgueu aplicar el filtre, fixeu la quantitat de soroll a filtrar\n"
+"i feu clic a 'D'acord' per a executar l'operació.\n"
+
+#: effects/NoiseRemoval.cpp:821
+msgid "Noise Removal by Dominic Mazzoni"
+msgstr "Supressió de soroll, per Dominic Mazzoni"
+
+#: effects/NoiseRemoval.cpp:829
+msgid "Get Noise Profile"
+msgstr "Obtenció del perfil de soroll"
+
+#: effects/NoiseRemoval.cpp:840
+msgid "Noise reduction (dB):"
+msgstr "Reducció de soroll (dB):"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:848
+msgid "Frequency smoothing (Hz):"
+msgstr "Freqüència d'allisament (Hz):"
+
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:856
+msgid "Attack/decay time (secs):"
+msgstr "Temps d'atac/esmorteïment (segons)"
+
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
+msgid "Noise Removal..."
+msgstr "Treu soroll..."
+
+#: effects/NoiseRemoval.h:44
+msgid "Creating Noise Profile"
+msgstr "S'està creant un perfil de soroll"
+
+#: effects/NoiseRemoval.h:46
+msgid "Removing Noise"
+msgstr "S'està traient el soroll"
+
+#. i18n-hint: First %s is the effect name, 2nd and 3rd are either true or
+#. * false (translated below) if those options were selected
+#: effects/Normalize.cpp:70
+#, c-format
+msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
+msgstr "S'ha aplicat l'efecte: %s desplaçament dc eliminat = %s, amplitud normalitzada = %s"
+
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
+msgid "false"
+msgstr "fals"
+
+#. i18n-hint: true here means that the option was
+#. * selected. Opposite false if not selected
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
+msgid "true"
+msgstr "cert"
+
+#: effects/Normalize.cpp:77
+#, c-format
+msgid ", maximum amplitude = %.1f dB"
+msgstr ", amplitud màxima = %.1f dB"
+
+#: effects/Normalize.cpp:113
+msgid "Normalize"
+msgstr "Normalitza"
+
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
+
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
+
+#: effects/Normalize.cpp:361
+msgid "-"
+msgstr "-"
+
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:32
+msgid "Normalize..."
+msgstr "Normalitza..."
+
+#: effects/Normalize.h:41
+msgid "Normalizing..."
+msgstr "S'està normalitzant..."
+
+#: effects/Phaser.cpp:65
+#, c-format
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "S'ha aplicat l'efecte: %s %d etapes, %.0f%% humit, freqüència = %.1f Hz, fase inicial = %.0f graus, intensitat = %d, resposta = %.0f%%"
+
+#: effects/Phaser.cpp:222
+msgid "Stages:"
+msgstr "Etapes:"
+
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
+
+#: effects/Phaser.cpp:264
+#: effects/Wahwah.cpp:221
+msgid "LFO Frequency (Hz):"
+msgstr "Freqüència LFO (Hz):"
+
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
+#: effects/Phaser.cpp:280
+#: effects/Wahwah.cpp:237
+msgid "LFO Start Phase (deg.):"
+msgstr "Fase d'inici LFO (graus):"
+
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
+#: effects/Phaser.cpp:296
+msgid "Depth:"
+msgstr "Profunditat:"
+
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
+#: effects/Phaser.cpp:312
+msgid "Feedback (%):"
+msgstr "Acoblament (%):"
+
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
+#: effects/Phaser.h:38
+msgid "Phaser..."
+msgstr "Phaser..."
+
+#: effects/Phaser.h:46
+msgid "Applying Phaser"
+msgstr "S'està aplicant l'efecte Phaser"
+
+#: effects/Repair.cpp:99
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+"\n"
+"Zoom in and select a tiny fraction of a second to repair."
+msgstr "L'efecte de reparació és per a fer-lo servir en seccions molt curtes de so danyat (fins a 128 mostres).\n"
+"\n"
+"Feu zoom i seleccioneu una petita fracció de segon per a reparar-la."
+
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
+#: effects/Repair.h:37
+msgid "Repairing damaged audio"
+msgstr "S'està reparant el so danyat"
+
+#: effects/Repeat.cpp:49
+#, c-format
+msgid "Repeated %d times"
+msgstr "Repetit %d vegades"
+
+#: effects/Repeat.cpp:75
+msgid "Tracks are too long to repeat the selection."
+msgstr "Les pistes són massa llargues per a repetir la selecció."
+
+#: effects/Repeat.cpp:76
+#: effects/Repeat.cpp:80
+msgid "Repeat"
+msgstr "Repetix"
+
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
+msgstr "Nombre de repeticions:"
+
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
+#: effects/Repeat.cpp:207
+#: effects/Repeat.cpp:237
+msgid "New selection length: "
+msgstr "Longitud de selecció nova:"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
+
+#: effects/Repeat.h:32
+msgid "Repeat..."
+msgstr "Repetix..."
+
+#: effects/Repeat.h:40
+msgid "Performing Repeat"
+msgstr "S'està realitzant la repetició"
+
+#: effects/Reverse.h:30
+msgid "Reverse"
+msgstr "Marxa arrere"
+
+#: effects/Reverse.h:38
+msgid "Reversing"
+msgstr "S'està aplicant la marxa arrere..."
+
+#: effects/Silence.cpp:32
+msgid "Silence Generator"
+msgstr "Generador de silenci"
+
+#: effects/Silence.h:34
+msgid "Silence..."
+msgstr "Silenci..."
+
+#: effects/Silence.h:42
+msgid "Generating Silence"
+msgstr "S'està generant el silenci"
+
+#: effects/Silence.h:47
+#, c-format
+msgid "Applied effect: Generate Silence, %.6lf seconds"
+msgstr "S'ha aplicat l'efecte: Generació d'un silenci de %.6lf segons"
+
+#: effects/SimplePairedTwoTrack.h:120
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Este efecte no es pot aplicar a pistes estereofòniques on els dos canals no coincideixen."
+
+#: effects/SpikeCleaner.cpp:69
+msgid "Spike Cleaner"
+msgstr "Netejador de pics"
+
+#: effects/SpikeCleaner.cpp:160
+msgid "SpikeCleaner by Lynn Allan"
+msgstr "SpikeCleaner per Lynn Allan"
+
+#: effects/SpikeCleaner.cpp:165
+msgid "Max Spike Duration (milliseconds): \n"
+"(99999 or greater is off)"
+msgstr "Durada màxima dels pics (en mil·lisegons): \n"
+"(un valor de 99999 o més els elimina completament)"
+
+#: effects/SpikeCleaner.cpp:178
+msgid "Theshold for silence: "
+msgstr "Llindar de silenci:"
+
+#: effects/SpikeCleaner.h:27
+msgid "Spike Cleaner..."
+msgstr "Netejador de pics..."
+
+#: effects/SpikeCleaner.h:35
+msgid "Applying Spike Cleaner..."
+msgstr "S'està aplicant el netejador de pics..."
+
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "E&stèreo a mono"
+
+#: effects/StereoToMono.h:32
+msgid "Applying Stereo to Mono"
+msgstr "S'està aplicant la conversió d'estèreo a mono"
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:66
+#, c-format
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "S'ha aplicat l'efecte: Genera %s ona o ones %s, de freqüència = %.2f Hz, amplitud = %.2f, %.6lf segons"
+
+#: effects/ToneGen.cpp:75
+#: widgets/Meter.cpp:379
+msgid "Linear"
+msgstr "Lineal"
+
+#: effects/ToneGen.cpp:76
+msgid "Logarithmic"
+msgstr "Logarítmic"
+
+#: effects/ToneGen.cpp:78
+msgid "Chirp Generator"
+msgstr "Generador de supertons"
+
+#: effects/ToneGen.cpp:78
+msgid "Tone Generator"
+msgstr "Generador de tons"
+
+#: effects/ToneGen.cpp:79
+msgid "Sine"
+msgstr "Sinusoïdal"
+
+#: effects/ToneGen.cpp:80
+msgid "Square"
+msgstr "Quadrada"
+
+#: effects/ToneGen.cpp:81
+msgid "Sawtooth"
+msgstr "Dent de serra"
+
+#: effects/ToneGen.cpp:82
+msgid "Square, no alias"
+msgstr "Quadrada, sense àlies"
+
+#: effects/ToneGen.cpp:327
+#: effects/ToneGen.cpp:363
+msgid "Frequency (Hz)"
+msgstr "Freqüència (Hz)"
+
+#: effects/ToneGen.cpp:354
+msgid "Waveform:"
+msgstr "Forma d'ona:"
+
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:372
+msgid "Interpolation:"
+msgstr "Interpolació:"
+
+#: effects/ToneGen.h:40
+msgid "Chirp..."
+msgstr "Supertò..."
+
+#: effects/ToneGen.h:40
+msgid "Tone..."
+msgstr "To..."
+
+#: effects/ToneGen.h:48
+msgid "Generating Chirp"
+msgstr "S'està generant el supertò"
+
+#: effects/ToneGen.h:48
+msgid "Generating Tone"
+msgstr "S'està generant un to"
+
+#: effects/TruncSilence.cpp:113
+msgid "All tracks must have the same sample rate"
+msgstr "Totes les pistes han de tenir la mateixa freqüència de mostreig"
+
+#: effects/TruncSilence.cpp:113
+#: effects/TruncSilence.cpp:322
+msgid "Truncate Silence"
+msgstr "Trunca un silenci"
+
+#: effects/TruncSilence.cpp:346
+msgid "Max silence duration:"
+msgstr "Durada màxima del silenci:"
+
+#: effects/TruncSilence.cpp:349
+#: prefs/AudioIOPrefs.cpp:190
+#: prefs/AudioIOPrefs.cpp:193
+msgid "milliseconds"
+msgstr "mil·lisegons"
+
+#: effects/TruncSilence.cpp:351
+msgid "Threshold for silence:"
+msgstr "Llindar de silenci:"
+
+#: effects/TruncSilence.cpp:376
+msgid "   Duration must be at least 1 millisecond"
+msgstr "   La durada ha de ser d'almenys 1 mil·lisegon"
+
+#: effects/TruncSilence.h:28
+msgid "Truncate Silence..."
+msgstr "Trunca un silenci..."
+
+#: effects/TruncSilence.h:36
+msgid "Truncating Silence..."
+msgstr "S'està truncant el silenci..."
+
+#: effects/VST/VSTEffect.cpp:165
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Els efectes VST no es poden aplicar a les pistes estereofòniques quan els dos canals no coincideixen."
+
+#: effects/VST/VSTEffect.cpp:180
+msgid "Can't process replacing"
+msgstr "No es pot processar la substitució"
+
+#: effects/VST/VSTEffect.cpp:403
+msgid "VST Plug-in parameters:"
+msgstr "Paràmetres del complement VST:"
+
+#: effects/Wahwah.cpp:61
+#, c-format
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "S'ha aplicat l'efecte: %s freqüència = %.1f Hz, fase inicial = %.0f graus, profunditat = %.0f%%, ressonància = %.1f, desplaçament de freqüència = %.0f%%"
+
+#: effects/Wahwah.cpp:72
+msgid "Wahwah"
+msgstr "Wahwah"
+
+#: effects/Wahwah.cpp:253
+msgid "Depth (%):"
+msgstr "Profunditat (%):"
+
+#: effects/Wahwah.cpp:269
+msgid "Resonance:"
+msgstr "Ressonància:"
+
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
+#: effects/Wahwah.cpp:285
+msgid "Wah Frequency Offset (%):"
+msgstr "Desplaçament de la freqüència Wah (%):"
+
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
+#: effects/Wahwah.h:34
+msgid "Wahwah..."
+msgstr "Wahwah..."
+
+#: effects/Wahwah.h:42
+msgid "Applying Wahwah"
+msgstr "S'està aplicant l'efecte Wahwah"
+
+#: effects/audiounits/AudioUnitEffect.cpp:133
+#: effects/ladspa/LadspaEffect.cpp:169
+#, c-format
+msgid "Performing Effect: %s"
+msgstr "S'està aplicant l'efecte: %s"
+
+#: effects/ladspa/LadspaEffect.cpp:189
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Els efectes complementaris no es poden aplicar a pistes estereofòniques quan els dos canals no coincideixen."
+
+#: effects/ladspa/LadspaEffect.cpp:573
+#: effects/ladspa/LadspaEffect.cpp:581
+#: prefs/GUIPrefs.cpp:51
+#: prefs/QualityPrefs.cpp:72
+msgid "None"
+msgstr "Cap"
+
+#: effects/ladspa/LadspaEffect.cpp:575
+#: effects/vamp/VampEffect.cpp:384
+msgid "Author: "
+msgstr "Autor:"
+
+#: effects/ladspa/LadspaEffect.cpp:608
+msgid "Effect Settings"
+msgstr "Paràmetres de l'efecte"
+
+#: effects/ladspa/LadspaEffect.cpp:699
+msgid "Length (seconds)"
+msgstr "Longitud (segons)"
+
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
+#: effects/nyquist/Nyquist.cpp:252
+msgid "Applying Nyquist Effect..."
+msgstr "S'està aplicant l'efecte Nyquist..."
+
+#: effects/nyquist/Nyquist.cpp:259
+#: effects/nyquist/Nyquist.cpp:321
+msgid "Nyquist Prompt..."
+msgstr "Línia d'ordes del Nyquist..."
+
+#: effects/nyquist/Nyquist.cpp:322
+msgid "Enter Nyquist Command: "
+msgstr "Escriviu l'orde del Nyquist:"
+
+#: effects/nyquist/Nyquist.cpp:412
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "No es pot aplicar l'efecte a pistes estereofòniques quan els dos canals no coincideixen."
+
+#: effects/nyquist/Nyquist.cpp:440
+msgid "Nyquist"
+msgstr "Nyquist"
+
+#: effects/nyquist/Nyquist.cpp:441
+msgid "Nyquist Output: "
+msgstr "Eixida del Nyquist:"
+
+#: effects/nyquist/Nyquist.cpp:598
+#: effects/nyquist/Nyquist.cpp:609
+msgid "Nyquist returned the value:"
+msgstr "Valor retornat pel Nyquist:"
+
+#: effects/nyquist/Nyquist.cpp:651
+msgid "Nyquist did not return audio.\n"
+msgstr "El Nyquist no ha retornat cap so.\n"
+
+#: effects/nyquist/Nyquist.cpp:662
+msgid "Nyquist returned too many audio channels.\n"
+msgstr "El Nyquist ha retornat massa canals de so.\n"
+
+#: effects/vamp/VampEffect.cpp:75
+#, c-format
+msgid "Extracting features: %s"
+msgstr "Funcionalitats d'extracció: %s"
+
+#: effects/vamp/VampEffect.cpp:106
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Els efectes Vamp no es poden aplicar a pistes estereofòniques on els dos canals no coincidisquen."
+
+#: effects/vamp/VampEffect.cpp:120
+msgid "Sorry, failed to load Vamp Plug-in."
+msgstr "No s'ha pogut carregar el connector Vamp."
+
+#: effects/vamp/VampEffect.cpp:228
+msgid "Sorry, Vamp Plug-in failed to initialize."
+msgstr "El connector Vamp ha fallat en inicialitzar-se."
+
+#: effects/vamp/VampEffect.cpp:376
+msgid " - Vamp audio analysis plugin"
+msgstr " - connector d'anàlisi d'àudio Vamp"
+
+#: effects/vamp/VampEffect.cpp:423
+msgid "Plugin Settings"
+msgstr "Paràmetres del connector"
+
+#: effects/vamp/VampEffect.cpp:446
+msgid "Program"
+msgstr "Programa"
+
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:451
+msgid "Export File"
+msgstr "Exporta el fitxer"
+
+#: export/Export.cpp:459
+msgid "&Options..."
+msgstr "&Opcions"
+
+#: export/Export.cpp:485
+msgid "Are you sure you want to save the file as \""
+msgstr "Segur que voleu alçar el fitxer amb el nom \""
+
+#: export/Export.cpp:501
+#, c-format
+msgid "You are about to save a %s file with the name \"%s\".\n"
+"\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
+"\n"
+"Are you sure you want to save the file under this name?"
+msgstr "Sou a punt d'alçar un fitxer %s amb el nom \"%s\".\n"
+"\n"
+"Normalment estos fitxers acaben en \"%s\", i alguns programes no obriran fitxers amb extensions no estàndard.\n"
+"\n"
+"Segur que voleu alçar el projecte amb este nom?"
+
+#: export/Export.cpp:522
+#, c-format
+msgid "A file named \"%s\" already exists.  Replace?"
+msgstr "Ja existix un fitxer amb el nom \"%s\".  Voleu substituir-lo?"
+
+#: export/Export.cpp:604
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "Les peces es barrejaran en dos canals estereofònics en exportar el fitxer."
+
+#: export/Export.cpp:609
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "Les pistes es barrejaran en un únic canal monofònic en exportar el fitxer."
+
+#: export/Export.cpp:619
+msgid "Advanced Mixing Options"
+msgstr "Opcions de mescla avançades"
+
+#: export/Export.cpp:821
+#, c-format
+msgid "Channel: %2d"
+msgstr "Canal: %2d"
+
+#: export/Export.cpp:945
+msgid " - Left"
+msgstr " - Esquerre"
+
+#: export/Export.cpp:946
+msgid " - Right"
+msgstr " - Dret"
+
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
+#: export/Export.cpp:976
+#: export/Export.cpp:1021
+#, c-format
+msgid "Output Channels: %2d"
+msgstr "Canals d'eixida: %2d"
+
+#: export/ExportCL.cpp:55
+msgid "Specify Command Line Encoder"
+msgstr "Indiqueu el comandament de línia d'ordes del codificador"
+
+#: export/ExportCL.cpp:70
+msgid "Command Line Export Setup"
+msgstr "Configuració de l'exportació de la línia d'ordes"
+
+#: export/ExportCL.cpp:75
+msgid "Command:"
+msgstr "Orde"
+
+#: export/ExportCL.cpp:80
+msgid "Show output"
+msgstr "Mostra l'eixida"
+
+#: export/ExportCL.cpp:87
+#, c-format
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "Les dades seran canalitzades cap al canal d'entrada estàndard. \"%f\" serà reemplaçat pel fitxer d'eixida que hàgiu seleccionat."
+
+#: export/ExportCL.cpp:220
+msgid "(external program)"
+msgstr "(programa extern)"
+
+#: export/ExportCL.cpp:250
+#: export/ExportPCM.cpp:367
+#, c-format
+msgid "Cannot export audio to %s"
+msgstr "No es port exportar el so a %s"
+
+#: export/ExportCL.cpp:324
+msgid "Exporting the selected audio using command-line encoder"
+msgstr "S'està exportant el so seleccionat utilitzant el codificador de línia d'ordes"
+
+#: export/ExportCL.cpp:325
+msgid "Exporting the entire project using command-line encoder"
+msgstr "S'està exportant tot el projecte utilitzant el codificador de línia d'ordes"
+
+#: export/ExportCL.cpp:389
+msgid "Command Output"
+msgstr "Eixida de l'orde"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Freqüència incorrecta"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Hauríeu de tornar a mostrejar-ho a algun dels valors que es mostren a continuació."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Freqüències de mostreig"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Resolució:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Idioma:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Qualitat:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Fitxers XML (*.xml)|*.xml|Tots els fitxers (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
+#: export/ExportFLAC.cpp:68
+msgid "Specify FLAC Options"
+msgstr "Opcions FLAC"
+
+#: export/ExportFLAC.cpp:82
+msgid "0 (fastest)"
+msgstr "0 (el més ràpid)"
+
+#: export/ExportFLAC.cpp:83
+msgid "1"
+msgstr "1"
+
+#: export/ExportFLAC.cpp:84
+msgid "2"
+msgstr "2"
+
+#: export/ExportFLAC.cpp:85
+msgid "3"
+msgstr "3"
+
+#: export/ExportFLAC.cpp:86
+msgid "4"
+msgstr "4"
+
+#: export/ExportFLAC.cpp:87
+msgid "5"
+msgstr "5"
+
+#: export/ExportFLAC.cpp:88
+msgid "6"
+msgstr "6"
+
+#: export/ExportFLAC.cpp:89
+msgid "7"
+msgstr "7"
+
+#: export/ExportFLAC.cpp:90
+msgid "8 (best)"
+msgstr "8 (el millor)"
+
+#: export/ExportFLAC.cpp:93
+msgid "16 bit"
+msgstr "16 bits"
+
+#: export/ExportFLAC.cpp:94
+msgid "24 bit"
+msgstr "24 bits"
+
+#: export/ExportFLAC.cpp:98
+msgid "FLAC Export Setup"
+msgstr "Configuració de l'exportació a FLAC"
+
+#: export/ExportFLAC.cpp:102
+msgid "Level:"
+msgstr "Nivell:"
+
+#: export/ExportFLAC.cpp:104
+msgid "Bit depth:"
+msgstr "Resolució:"
+
+#: export/ExportFLAC.cpp:208
+msgid "FLAC Files"
+msgstr "Fitxers FLAC"
+
+#: export/ExportFLAC.cpp:310
+msgid "Exporting the selected audio as FLAC"
+msgstr "S'està exportant el so seleccionat com a FLAC"
+
+#: export/ExportFLAC.cpp:311
+msgid "Exporting the entire project as FLAC"
+msgstr "S'està exportant el projecte sencer com a FLAC"
+
+#: export/ExportMP2.cpp:108
+msgid "Specify MP2 Options"
+msgstr "Opcions MP2"
+
+#: export/ExportMP2.cpp:129
+msgid "MP2 Export Setup"
+msgstr "Configuració de l'exportació a MP2"
+
+#: export/ExportMP2.cpp:200
+msgid "MP2 Files"
+msgstr "Fitxers MP2"
+
+#: export/ExportMP2.cpp:229
+msgid "Cannot export MP2 with this sample rate and bit rate"
+msgstr "No es pot exportar a MP2 amb estos valors de freqüència de mostreig i cabal de bits"
+
+#: export/ExportMP2.cpp:240
+#: export/ExportMP3.cpp:1768
+#: export/ExportOGG.cpp:183
+msgid "Unable to open target file for writing"
+msgstr "No s'ha pogut obrir el fitxer de destinació per a escriure-hi"
+
+#: export/ExportMP2.cpp:271
+#, c-format
+msgid "Exporting selected audio at %d kbps"
+msgstr "S'està exportant el so seleccionat a %d kbps"
+
+#: export/ExportMP2.cpp:272
+#, c-format
+msgid "Exporting entire file at %d kbps"
+msgstr "S'està exportant tot el fitxer a %d kbps"
+
+#: export/ExportMP3.cpp:221
+#: export/ExportMP3.cpp:239
+#: export/ExportMP3.cpp:253
+msgid "kbps"
+msgstr "kbps"
+
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr "(La millor qualitat)"
+
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr "(Fitxers més petits)"
+
+#: export/ExportMP3.cpp:243
+msgid "Fast"
+msgstr "Ràpid"
+
+#: export/ExportMP3.cpp:244
+#: export/ExportMP3.cpp:250
+#: prefs/GUIPrefs.cpp:41
+#: prefs/GUIPrefs.cpp:49
+msgid "Standard"
+msgstr "Estàndard"
+
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr "Boig"
+
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr "Extrem"
+
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr "Mitjà"
+
+#: export/ExportMP3.cpp:303
+msgid "Specify MP3 Options"
+msgstr "Opcions MP3"
+
+#: export/ExportMP3.cpp:319
+msgid "MP3 Export Setup"
+msgstr "Configuració dels paràmetres d'exportació a MP3"
+
+#: export/ExportMP3.cpp:326
+msgid "Bit Rate Mode:"
+msgstr "Mode de resolució:"
+
+#: export/ExportMP3.cpp:331
+msgid "Preset"
+msgstr "Configuració"
+
+#: export/ExportMP3.cpp:332
+msgid "Variable"
+msgstr "Variable"
+
+#: export/ExportMP3.cpp:333
+msgid "Average"
+msgstr "Mitjana"
+
+#: export/ExportMP3.cpp:334
+msgid "Constant"
+msgstr "Constant"
+
+#: export/ExportMP3.cpp:373
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Qualitat"
+
+#: export/ExportMP3.cpp:379
+msgid "Variable Speed:"
+msgstr "Velocitat variable:"
+
+#: export/ExportMP3.cpp:386
+msgid "Channel Mode:"
+msgstr "Tipus de canal:"
+
+#: export/ExportMP3.cpp:391
+msgid "Joint Stereo"
+msgstr "Estèreo unificat"
+
+#: export/ExportMP3.cpp:392
+msgid "Stereo"
+msgstr "Estèreo"
+
+#: export/ExportMP3.cpp:536
+msgid "Locate Lame"
+msgstr "Localització del LAME"
+
+#: export/ExportMP3.cpp:556
+#, c-format
+msgid "Audacity needs the file %s to create MP3s."
+msgstr "L'Audacity necessita trobar el fitxer %s per a poder crear fitxers MP3."
+
+#: export/ExportMP3.cpp:578
+msgid "To get a free copy of Lame, click here -->"
+msgstr "Feu clic ací per a obtenir una còpia gratuïta del LAME -->"
+
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
+#: export/ExportMP3.cpp:1094
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Només lame_enc.dll|lame_enc.dll|Biblioteques enllaçades dinàmicament (*.dll)|*.dll|Tots els fitxers (*.*)|*"
+
+#: export/ExportMP3.cpp:1550
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Només libmp3lame.dylib|libmp3lame.dylib|Biblioteques dinàmiques (*.dylib)|*.dylib|Tots els fitxers (*)|*"
+
+#: export/ExportMP3.cpp:1567
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Només libmp3lame.so.0|libmp3lame.so.0|Fitxers d'objectes primaris compartits (*.so)|*.so|Biblioteques esteses (*.so*)|*.so*|Tots els fitxers (*)|*"
+
+#: export/ExportMP3.cpp:1650
+msgid "MP3 Files"
+msgstr "Fitxers MP3"
+
+#: export/ExportMP3.cpp:1673
+msgid "Could not open MP3 encoding library!"
+msgstr "No s'ha pogut obrir la biblioteca de codificació MP3!"
+
+#: export/ExportMP3.cpp:1680
+msgid "Not a valid or supported MP3 encoding library!"
+msgstr "No és una biblioteca de codificació d'MP3 vàlida o suportada!"
+
+#: export/ExportMP3.cpp:1757
+msgid "Unable to initialize MP3 stream"
+msgstr "No s'ha pogut iniciar el corrent de dades MP3"
+
+#: export/ExportMP3.cpp:1799
+#, c-format
+msgid "Exporting selected audio with %s preset"
+msgstr "S'està exportant el so seleccionat amb la configuració %s"
+
+#: export/ExportMP3.cpp:1800
+#, c-format
+msgid "Exporting entire file with %s preset"
+msgstr "S'està exportant tot el fitxer amb la configuració %s"
+
+#: export/ExportMP3.cpp:1805
+#, c-format
+msgid "Exporting selected audio with VBR quality %s"
+msgstr "S'està exportant el so amb qualitat VBR de %s"
+
+#: export/ExportMP3.cpp:1806
+#, c-format
+msgid "Exporting entire file with VBR quality %s"
+msgstr "S'està exportant tot el fitxer amb una qualitat VBR de %s"
+
+#: export/ExportMP3.cpp:1811
+#, c-format
+msgid "Exporting selected audio at %d Kbps"
+msgstr "S'està exportant el so seleccionat a %d Kbps"
+
+#: export/ExportMP3.cpp:1812
+#, c-format
+msgid "Exporting entire file at %d Kbps"
+msgstr "S'està exportant tot el fitxer a %d Kbps"
+
+#: export/ExportMP3.cpp:1845
+#, c-format
+msgid "Error %d returned from MP3 encoder"
+msgstr "El codificador d'MP3 ha retornat l'error %d"
+
+#: export/ExportMP3.cpp:1931
+#, c-format
+msgid "The project sample rate (%d) is not supported by the MP3\n"
+"file format.  "
+msgstr "La freqüència de mostreig del projecte (%d) no està suportada pel\n"
+"format de fitxer MP3.  "
+
+#: export/ExportMP3.cpp:1934
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the MP3 file format.  "
+msgstr "La combinació de freqüència de mostreig (%d) i cabal de bits (%d kbps) del projecte no està\n"
+"suportada pel format de fitxer MP3.  "
+
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
+
+#: export/ExportMultiple.cpp:95
+#: export/ExportMultiple.cpp:374
+#: export/ExportMultiple.cpp:598
+#: export/ExportMultiple.cpp:765
+msgid "Export Multiple"
+msgstr "Exporta múltiples fitxers"
+
+#: export/ExportMultiple.cpp:164
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
+"or if you have a Label Track, you can export a new file for each label.\n"
+"\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "Si teniu més d'una pista de so podeu exportar-les en fitxers separats,\n"
+"i si teniu una pista d'etiquetes, podeu generar un fitxer a partir de cada etiqueta.\n"
+"\n"
+"Este projecte no té ni múltiples pistes ni pista d'etiquetes, o siga que és impossible fer-ne una exportació múltiple."
+
+#: export/ExportMultiple.cpp:165
+msgid "Can't export multiple files"
+msgstr "No es poden exportar múltiples fitxers"
+
+#: export/ExportMultiple.cpp:200
+msgid "Export format:"
+msgstr "Format d'exportació:"
+
+#: export/ExportMultiple.cpp:207
+msgid "Options..."
+msgstr "Opcions..."
+
+#: export/ExportMultiple.cpp:210
+msgid "Export location:"
+msgstr "Ubicació de l'exportació:"
+
+#: export/ExportMultiple.cpp:216
+#: prefs/DirectoriesPrefs.cpp:92
+msgid "Choose..."
+msgstr "Navega..."
+
+#: export/ExportMultiple.cpp:217
+msgid "Create"
+msgstr "Crea"
+
+#: export/ExportMultiple.cpp:224
+msgid "Split files based on:"
+msgstr "Dividix els fitxers a partir de:"
+
+#: export/ExportMultiple.cpp:234
+msgid "Labels"
+msgstr "Etiquetes"
+
+#: export/ExportMultiple.cpp:239
+msgid "Include audio before first label"
+msgstr "Inclou el so d'abans de la primera etiqueta"
+
+#: export/ExportMultiple.cpp:245
+msgid "First file name:"
+msgstr "Nom del primer fitxer:"
+
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
+#: export/ExportMultiple.cpp:258
+msgid "Tracks"
+msgstr "Pistes"
+
+#: export/ExportMultiple.cpp:265
+msgid "Name files:"
+msgstr "Anomena els fitxers:"
+
+#: export/ExportMultiple.cpp:275
+msgid "Using Label/Track Name"
+msgstr "S'està emprant el nom de pista o etiqueta"
+
+#: export/ExportMultiple.cpp:282
+msgid "Numbering consecutively"
+msgstr "Numeració consecutiva"
+
+#: export/ExportMultiple.cpp:288
+msgid "File name prefix:"
+msgstr "Prefix dels noms de fitxer:"
+
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
+#: export/ExportMultiple.cpp:306
+msgid "Overwrite existing files"
+msgstr "Sobreescriu els fitxers existents"
+
+#: export/ExportMultiple.cpp:372
+#, c-format
+msgid "\"%s\" successfully created."
+msgstr "S'ha creat \"%s\" amb èxit."
+
+#: export/ExportMultiple.cpp:381
+msgid "Choose a location to save the exported files"
+msgstr "Trieu una ubicació per a alçar-hi els fitxers exportats"
+
+#: export/ExportMultiple.cpp:470
+#, c-format
+msgid "\"%s\" doesn't exist.\n"
+"\n"
+"Would you like to create it?"
+msgstr "\"%s\" no existix.\n"
+"\n"
+"Voleu crear-lo?"
+
+#: export/ExportMultiple.cpp:568
+#: export/ExportMultiple.cpp:703
+msgid "Edit metadata"
+msgstr "Edita les metadades"
+
+#: export/ExportMultiple.cpp:595
+#: export/ExportMultiple.cpp:762
+#, c-format
+msgid "Successfully exported %d file(s)."
+msgstr "S'ha realitzat correctament l'exportació de %d fitxer(s)."
+
+#: export/ExportMultiple.cpp:596
+#: export/ExportMultiple.cpp:763
+#, c-format
+msgid "Something went wrong after exporting %d file(s)."
+msgstr "Alguna cosa ha anat malament després d'exportar %d fitxer(s)."
+
+#: export/ExportMultiple.cpp:825
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr "L'etiqueta %s no té un nom de fitxer vàlid. No podeu fer servir cap dels caràcters:   %s\n"
+"Feu servir..."
+
+#: export/ExportOGG.cpp:64
+msgid "Specify Ogg Vorbis Options"
+msgstr "Indiqueu les opcions d'Ogg Vorbis"
+
+#: export/ExportOGG.cpp:81
+msgid "Ogg Vorbis Export Setup"
+msgstr "Configuració de l'exportació a Ogg Vorbis"
+
+#: export/ExportOGG.cpp:155
+msgid "Ogg Vorbis Files"
+msgstr "Fitxers Ogg Vorbis"
+
+#: export/ExportOGG.cpp:254
+msgid "Exporting the selected audio as Ogg Vorbis"
+msgstr "S'està exportant el fragment de so seleccionat com a Ogg Vorbis"
+
+#: export/ExportOGG.cpp:255
+msgid "Exporting the entire project as Ogg Vorbis"
+msgstr "S'està exportant tot el projecte com a Ogg Vorbis"
+
+#: export/ExportPCM.cpp:115
+msgid "Specify Uncompressed Options"
+msgstr "Indiqueu les opcions per al format no comprimit"
+
+#: export/ExportPCM.cpp:171
+msgid "Uncompressed Export Setup"
+msgstr "Configuració de l'exportació a format no comprimit"
+
+#: export/ExportPCM.cpp:181
+msgid "Header:"
+msgstr "Encapçalament:"
+
+#: export/ExportPCM.cpp:185
+msgid "Encoding:"
+msgstr "Codificació:"
+
+#: export/ExportPCM.cpp:190
+msgid "(Not all combinations of headers and encodings are possible.)"
+msgstr "(No totes les combinacions de capçaleres i codificacions són possibles)"
+
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "Cannot export audio in this format."
+msgstr "No es pot exportar el so en este format"
+
+#: export/ExportPCM.cpp:401
+#, c-format
+msgid "Exporting the selected audio as %s"
+msgstr "Exporta el so seleccionat com a %s"
+
+#: export/ExportPCM.cpp:403
+#, c-format
+msgid "Exporting the entire project as %s"
+msgstr "S'està exportant tot el projecte com a %s"
+
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:437
+#, c-format
+msgid "Error (file may not have been written): %s"
+msgstr "Error (podria ser que el fitxer no s'hagués escrit): %s"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "Fitxers MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
+#: import/Import.cpp:155
+#, c-format
+msgid "This version of Audacity was not compiled with %s support."
+msgstr "Esta versió de l'Audacity no s'ha compilat amb suport per a %s"
+
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:168
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
+"Audacity cannot open audio CDs directly. \n"
+"Extract (rip) the CD tracks to an audio format that \n"
+"Audacity can import, such as WAV or AIFF."
+msgstr "\"%s\" és una pista d'un CD d'àudio. \n"
+"L'Audacity no pot obrir directament este tipus de recurs.\n"
+"Heu d'extreure (ripejar) les pistes de so del CD a un format que\n"
+"l'Audacity siga capaç d'importar, com ara WAV o AIFF."
+
+#: import/Import.cpp:174
+#, c-format
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr "\"%s\" és una llista de reproducció.\n"
+"L'Audacity no pot obrir este fitxer perquè conté únicament enllaços a altres fitxers.\n"
+"Podeu intentar obrir-lo amb un editor de text i descarregar cada un dels fitxers de so."
+
+#: import/Import.cpp:179
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
+"Audacity cannot open this type of file due to patent restrictions. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" és un fitxer de tipus Windows Media Audio. \n"
+"L'Audacity no pot obrir este tipus de fitxer degut a restriccions de patents.\n"
+"Hauríeu de convertir-lo a un format de so que estiga suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:184
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" és un fitxer de tipus Advanced Audio Coding. \n"
+"L'Audacity no pot obrir fitxers d'este tipus.\n"
+"Hauríeu de convertir-lo a algun format de so que estiga suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:271
+#, c-format
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
+"Audacity cannot open this type of file due to the encryption. \n"
+"Try recording the file into Audacity, or burn it to audio CD then \n"
+"extract the CD track to a supported audio format such as WAV or AIFF."
+msgstr "\"%s\"  és un fitxer de so encriptat, probablement adquirit a una botiga de música en línia. \n"
+"L'Audacity no pot obrir este fitxer degut a l'encriptació.\n"
+"Intenteu enregistrar el so des de l'Audacity, o enregistrar un CD i\n"
+"extreure les pistes a un format suportat i no encriptat, com ara WAV o AIFF."
+
+#: import/Import.cpp:194
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
+"Audacity cannot open this proprietary format. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" és un fitxer de tipus RealPlayer. \n"
+"L'Audacity no pot obrir este format propietari.\n"
+"Hauríeu de convertir-lo a algun format de so suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:206
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr "El fitxer \"%s\" està basat en notes, i no conté so.\n"
+"L'Audacity no pot obrir fitxers d'este tipus.\n"
+"Hauríeu de convertir-lo a algun format de so com ara WAV o AIFF,\n"
+"i després importar-lo a l'Audacity."
+
+#: import/Import.cpp:212
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr "El fitxer \"%s\" és de tipus Musepack. \n"
+"L'Audacity no pot obrir este tipus de fitxer.\n"
+"Si penseu que podria tractar-se d'un fitxer mp3, canvieu-li el nom per tal que acabi en \".mp3\" \n"
+"i intenteu importar-lo. Altrament haureu de convertir-lo a\n"
+"algun format de so suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:218
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "El fitxer \"%s\" és de tipus Wavpack. \n"
+"L'Audacity no pot obrir fitxers d'este tipus.\n"
+"Hauríeu de convertir-lo a algun format de so suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:224
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "El fitxer \"%s\" és de tipus Dolby Digital. \n"
+"L'Audacity no pot obrir fitxers d'este tipus.\n"
+"Hauríeu de convertir-lo a algun format de so que estiga suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:230
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "El fitxer \"%s\" és de tipus Ogg Speex. \n"
+"L'Audacity no pot obrir fitxers d'este tipus.\n"
+"Hauríeu de convertir-lo a algun format de so que estiga suportat, com ara WAV o AIFF."
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:35
+msgid "FLAC files"
+msgstr "Fitxers FLAC"
+
+#: import/ImportLOF.cpp:92
+msgid "List of Files in basic text format"
+msgstr "Llistat de fitxers en un format bàsic de text"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:318
+msgid "Invalid window offset in LOF file."
+msgstr "Indicació incorrecta de posició de finestra en el fitxer LOF"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:320
+#: import/ImportLOF.cpp:341
+#: import/ImportLOF.cpp:415
+#: import/ImportLOF.cpp:435
+msgid "LOF Error"
+msgstr "Error de LOF"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:339
+msgid "Invalid duration in LOF file."
+msgstr "Indicació incorrecta de durada en el fitxer LOF"
+
+#: import/ImportLOF.cpp:414
+msgid "MIDI tracks cannot be offset individually, only audio files can be."
+msgstr "Les pistes MIDI no es poden desplaçar individualment. Això només es pot fer amb les de so."
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:434
+msgid "Invalid track offset in LOF file."
+msgstr "Indicació incorrecta de posició de pista en el fitxer LOF"
+
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
+
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
+
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
+
+#: import/ImportOGG.cpp:36
+msgid "Ogg Vorbis files"
+msgstr "Fitxers Ogg Vorbis"
+
+#: import/ImportOGG.cpp:142
+msgid "Media read error"
+msgstr "Error de lectura"
+
+#: import/ImportOGG.cpp:145
+msgid "Not an Ogg Vorbis file"
+msgstr "No és un fitxer Ogg Vorbis"
+
+#: import/ImportOGG.cpp:148
+msgid "Vorbis version mismatch"
+msgstr "No coincideixen les versions de Vorbis"
+
+#: import/ImportOGG.cpp:151
+msgid "Invalid Vorbis bitstream header"
+msgstr "Encapçalament invàlid de Vorbis bistream"
+
+#: import/ImportOGG.cpp:154
+msgid "Internal logic fault"
+msgstr "Avaria de lògica interna."
+
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF i altres tipus de fitxers no comprimits"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
+#, c-format
+msgid "Importing %s"
+msgstr ""
+
+#: import/ImportQT.cpp:21
+msgid "QuickTime files"
+msgstr "Fitxers QuickTime"
+
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
+#: import/ImportRaw.cpp:278
+msgid "Import Raw Data"
+msgstr "Importa dades crues"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:337
+msgid "No endianness"
+msgstr "Orde de bits no significatiu (endianness)"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:340
+msgid "Little-endian"
+msgstr "El bit menor darrera (little-endian)"
+
+#  i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#  know the correct technical word.
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:343
+msgid "Big-endian"
+msgstr "El bit major darrera (big-endian)"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:346
+msgid "Default endianness"
+msgstr "Orde de bits (endianness) per defecte"
+
+#: import/ImportRaw.cpp:370
+msgid "1 Channel (Mono)"
+msgstr "1 Canal (Mono)"
+
+#: import/ImportRaw.cpp:371
+msgid "2 Channels (Stereo)"
+msgstr "2 Canals (Estèreo)"
+
+#: import/ImportRaw.cpp:373
+#, c-format
+msgid "%d Channels"
+msgstr "%d Canals"
+
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
+#: import/ImportRaw.cpp:386
+msgid "Start offset:"
+msgstr "Desplaçament inicial:"
+
+#: import/ImportRaw.cpp:397
+msgid "Amount to import:"
+msgstr "Quantitat a importar:"
+
+#: import/ImportRaw.cpp:408
+msgid "Sample rate:"
+msgstr "Freqüència de mostreig:"
+
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+msgid "Audio I/O"
+msgstr "E/S de so"
+
+#: prefs/AudioIOPrefs.cpp:100
+msgid "1 (Mono)"
+msgstr "1 (Mono)"
+
+#: prefs/AudioIOPrefs.cpp:101
+msgid "2 (Stereo)"
+msgstr "2 (Estèreo)"
+
+#: prefs/AudioIOPrefs.cpp:115
+msgid "Playback"
+msgstr "Reproducció"
+
+#: prefs/AudioIOPrefs.cpp:119
+#: prefs/AudioIOPrefs.cpp:137
+#: toolbars/DeviceToolBar.cpp:57
+msgid "Device"
+msgstr "Dispositiu"
+
+#: prefs/AudioIOPrefs.cpp:122
+msgid "Using:"
+msgstr "Emprant:"
+
+#: prefs/AudioIOPrefs.cpp:123
+msgid "Portaudio v"
+msgstr "Portaudio v"
+
+#: prefs/AudioIOPrefs.cpp:133
+msgid "Recording"
+msgstr "Enregistrament"
+
+#: prefs/AudioIOPrefs.cpp:139
+msgid "Channels"
+msgstr "Canals"
+
+#: prefs/AudioIOPrefs.cpp:145
+msgid "Playthrough"
+msgstr "Interpreta a través"
+
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:150
+msgid "&Hardware Playthrough: Play new track while recording it"
+msgstr "Reproducció a través del &Maquinari: Interpreta una pista nova mentre s'està enregistrant."
+
+#: prefs/AudioIOPrefs.cpp:152
+msgid "&Software Playthrough: Play new track while recording it"
+msgstr "Reproducció a través del &programari: Interpreta una nova pista mentre s'enregistra"
+
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:162
+msgid "Effects Preview"
+msgstr "Previsualització d'efectes"
+
+#: prefs/AudioIOPrefs.cpp:165
+msgid "Length of preview:"
+msgstr "Longitud de la vista preliminar:"
+
+#: prefs/AudioIOPrefs.cpp:170
+msgid "Cut Preview"
+msgstr "Previsualitza el tall"
+
+#: prefs/AudioIOPrefs.cpp:173
+msgid "Preview before cut region:"
+msgstr "Vista preliminar abans de la regió retallada:"
+
+#: prefs/AudioIOPrefs.cpp:175
+msgid "Preview after cut region:"
+msgstr "Vista preliminar després de la regió retallada:"
+
+#: prefs/AudioIOPrefs.cpp:183
+msgid "Latency"
+msgstr "Latència"
+
+#: prefs/AudioIOPrefs.cpp:189
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr "Àudio a la memòria intermèdia:\n"
+"(valor més alt = més latència)"
+
+#: prefs/AudioIOPrefs.cpp:192
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr "Correcció de latència:\n"
+"(valor negatiu = arrere)"
+
+#: prefs/AudioIOPrefs.cpp:197
+msgid "Seek Time when playing"
+msgstr "Desplaçament en el temps mentre s'interpreta"
+
+#: prefs/AudioIOPrefs.cpp:200
+msgid "Short period:"
+msgstr "Període curt:"
+
+#: prefs/AudioIOPrefs.cpp:202
+msgid "Long period:"
+msgstr "Període llarg:"
+
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
+msgid "Batch"
+msgstr "Processos en cadena"
+
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:92
+msgid "Behaviors"
+msgstr "Comportaments"
+
+#: prefs/BatchPrefs.cpp:80
+#: prefs/GUIPrefs.cpp:129
+msgid "&Don't apply effects in batch mode"
+msgstr "&No apliquis els efectes quan estiguis en mode de procés per lots"
+
+#: prefs/BatchPrefs.cpp:83
+#: prefs/GUIPrefs.cpp:132
+msgid "Cl&eanSpeech Mode (Customized GUI)"
+msgstr "Mode Cl&eanSpeech (Entorn personalitzat)"
+
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:279
+msgid "Directories"
+msgstr "Directoris"
+
+#: prefs/DirectoriesPrefs.cpp:87
+msgid "Temporary files directory"
+msgstr "Directori per a fitxers temporals"
+
+#: prefs/DirectoriesPrefs.cpp:91
+msgid "Location:"
+msgstr "Posició:"
+
+#: prefs/DirectoriesPrefs.cpp:93
+msgid "Free Space:"
+msgstr "Espai lliure:"
+
+#: prefs/DirectoriesPrefs.cpp:99
+msgid "Auto save"
+msgstr "Alça automàticament"
+
+#: prefs/DirectoriesPrefs.cpp:101
+msgid "Auto save a copy of the project in a separate folder"
+msgstr "Alça automàticament una còpia del projecte en una altra carpeta"
+
+#: prefs/DirectoriesPrefs.cpp:104
+msgid "Auto save interval:"
+msgstr "Alça automàticament cada:"
+
+#: prefs/DirectoriesPrefs.cpp:105
+msgid "minutes"
+msgstr "minuts"
+
+#: prefs/DirectoriesPrefs.cpp:110
+msgid "Audio cache"
+msgstr "Memòria intermèdia de so"
+
+#: prefs/DirectoriesPrefs.cpp:112
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
+
+#: prefs/DirectoriesPrefs.cpp:121
+msgid "Choose a location to place the temporary directory"
+msgstr "Trieu la ubicació del directori temporal"
+
+#: prefs/DirectoriesPrefs.cpp:166
+#, c-format
+msgid "Directory %s does not exist. Create it?"
+msgstr "El directori %s no existix. Desitgeu crear-lo?"
+
+#: prefs/DirectoriesPrefs.cpp:168
+msgid "New Temporary Directory"
+msgstr "Directori temporal nou"
+
+#: prefs/DirectoriesPrefs.cpp:187
+#, c-format
+msgid "Directory %s is not writable"
+msgstr "No es pot escriure al directori %s"
+
+#: prefs/DirectoriesPrefs.cpp:199
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "Els canvis en el directori temporal tindran efecte en reiniciar l'Audacity"
+
+#: prefs/FileFormatPrefs.cpp:48
+#: prefs/FileFormatPrefs.cpp:49
+msgid "Import / Export"
+msgstr "Importa / Exporta"
+
+#: prefs/FileFormatPrefs.cpp:77
+msgid "MP3 Export Library"
+msgstr "Biblioteca d'exportació a MP3"
+
+#: prefs/FileFormatPrefs.cpp:80
+msgid "MP3 Library Version:"
+msgstr "Versió de la biblioteca MP3:"
+
+#: prefs/FileFormatPrefs.cpp:86
+msgid "MP3 Library:"
+msgstr "Biblioteca MP3:"
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:91
+msgid "LAME MP3 Library:"
+msgstr "Biblioteca MP3 LAME:"
+
+#: prefs/FileFormatPrefs.cpp:94
+msgid "&Download"
+msgstr "&Descarrega"
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Nota: Les opcions referents a la qualitat de l'exportació es poden escollir fent clic al botó Opcions del diàleg Exporta.\n"
+
+#: prefs/FileFormatPrefs.cpp:100
+msgid "When importing audio files"
+msgstr "Quan importis fitxers de so"
+
+#: prefs/FileFormatPrefs.cpp:103
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr "&Fes una còpia del fitxer sense comprimir abans d'editar-lo (més segur)"
+
+#: prefs/FileFormatPrefs.cpp:104
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr "&Llig directament el so sense comprimir del fitxer original (més ràpid)"
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "&Normalize all tracks in project"
+msgstr "&Normalitza totes les pistes del projecte"
+
+#: prefs/FileFormatPrefs.cpp:111
+msgid "When saving a project that depends on other audio files"
+msgstr "En alçar un projecte que depèn d'altres fitxers de so"
+
+#: prefs/FileFormatPrefs.cpp:114
+msgid "Always &copy all audio into project (safest)"
+msgstr "&Copia sempre tot el so dins del projecte (el més segur)"
+
+#: prefs/FileFormatPrefs.cpp:115
+msgid "&Do not copy any audio"
+msgstr "&No copiïs cap so"
+
+#: prefs/FileFormatPrefs.cpp:116
+msgid "&Ask user"
+msgstr "Pregunt&a a l'usuari/ària"
+
+#: prefs/FileFormatPrefs.cpp:120
+msgid "When exporting tracks to an audio file"
+msgstr "Quan s'exportin pistes a un fitxer de so"
+
+#: prefs/FileFormatPrefs.cpp:123
+msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
+msgstr "Mescla sempre totes les pistes en un canal estereofònic o monofònic"
+
+#: prefs/FileFormatPrefs.cpp:124
+msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
+msgstr "&Fes servir una mescla personalitzada (per exemple, per a exportar a un fitxer multicanal 5.1)"
+
+#: prefs/FileFormatPrefs.cpp:126
+msgid "S&how Metadata Editor prior to export step"
+msgstr "Mo&stra l'editor de metadades abans d'iniciar l'exportació"
+
+#: prefs/GUIPrefs.cpp:34
+#: prefs/GUIPrefs.cpp:35
+msgid "Interface"
+msgstr "Interfície"
+
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr "Al navegador"
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr "D'Internet"
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr "Simple"
+
+#: prefs/GUIPrefs.cpp:94
+msgid "&Update display while playing"
+msgstr "&Refresca la representació gràfica mentre es reproduix el so"
+
+#: prefs/GUIPrefs.cpp:96
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
+msgstr "Quan tanqueu la darrera finestra es tancarà l'Audacity"
+
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr "Habilita l'&arrossegament de les vores dreta i esquerra de la selecció"
+
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:102
+msgid "Automatically &fit tracks vertically zoomed"
+msgstr "Zoom vertical automàtic que permeta &encabir-hi totes les pistes"
+
+#: prefs/GUIPrefs.cpp:104
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"Canvia la pista activa\" va passant &cíclicament per totes les pistes del projecte"
+
+#: prefs/GUIPrefs.cpp:106
+msgid "Editing a &clip can move other clips"
+msgstr "L'edició d'un &clip pot moure altres clips"
+
+#: prefs/GUIPrefs.cpp:108
+msgid "&Select all audio in project, if none selected"
+msgstr "&Selecciona tot el so del projecte si no hi ha res seleccionat"
+
+#: prefs/GUIPrefs.cpp:110
+msgid "&Beep on completion of longer activities"
+msgstr "&Fes 'bip' quan es completi una acció de llarga durada"
+
+#: prefs/GUIPrefs.cpp:114
+msgid "Show / Hide"
+msgstr "Mostra / Amaga"
+
+#: prefs/GUIPrefs.cpp:116
+msgid "Enable cut &lines"
+msgstr "Habilita les &línies de tall"
+
+#: prefs/GUIPrefs.cpp:118
+msgid "Show warnings about &temp files"
+msgstr "Mostra advertiments sobre els fitxers &temporals"
+
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:122
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
+msgstr "Mostra el missatge de benvinguda en iniciar el programa"
+
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr "Modes"
+
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr "Rang mínim de representació: mesuradors i so en forma d'ona (dB)'"
+
+#: prefs/GUIPrefs.cpp:141
+msgid "-36 dB (shallow range for high-amplitude editing)"
+msgstr "-36 dB (rang estret de valors, per a editar sons amb molta amplitud)"
+
+#: prefs/GUIPrefs.cpp:142
+msgid "-48 dB (PCM range of 8 bit samples)"
+msgstr "-48 dB (rang PCM de les mostres de 8 bits)"
+
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr "-60 dB (rang PCM de les mostres de 10 bits)"
+
+#: prefs/GUIPrefs.cpp:144
+msgid "-96 dB (PCM range of 16 bit samples)"
+msgstr "-96 dB (rang PCM de les mostres de 16 bits)"
+
+#: prefs/GUIPrefs.cpp:145
+msgid "-120 dB (approximate limit of human hearing)"
+msgstr "-120 dB (límit aproximat de percepció de l'oïda humana)"
+
+#: prefs/GUIPrefs.cpp:146
+msgid "-145 dB (PCM range of 24 bit samples)"
+msgstr "-145 dB (rang PCM de les mostres de 24 bits)"
+
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr "Mode de visualització per defecte"
+
+#: prefs/GUIPrefs.cpp:166
+msgid "Other interface choices"
+msgstr "Altres opcions de l'interfície"
+
+#: prefs/GUIPrefs.cpp:169
+msgid "Help:"
+msgstr "Ajuda:"
+
+#: prefs/GUIPrefs.cpp:170
+msgid "Solo Button:"
+msgstr "Botó Solo:"
+
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
+msgid "Keyboard"
+msgstr "Teclat"
+
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:95
+msgid "Key Bindings"
+msgstr "Assignacions de tecles"
+
+#: prefs/KeyConfigPrefs.cpp:115
+msgid "S&et"
+msgstr "&Establix"
+
+#: prefs/KeyConfigPrefs.cpp:120
+msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
+msgstr "Nota: Prement Cmd+Q es tancarà el programa. Totes les altres tecles són vàlides."
+
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
+msgid "&Defaults"
+msgstr "Valors per &defecte"
+
+#: prefs/KeyConfigPrefs.cpp:143
+msgid "Key Combination"
+msgstr "Combinació de tecles"
+
+#: prefs/KeyConfigPrefs.cpp:163
+msgid "Export Keyboard Shortcuts As:"
+msgstr "Anomena i exporta les dreceres de teclat:"
+
+#: prefs/KeyConfigPrefs.cpp:181
+msgid "Error saving keyboard shortcuts"
+msgstr "S'ha produït un error en alçar les dreceres de teclat"
+
+#: prefs/KeyConfigPrefs.cpp:196
+msgid "Select an XML file containing Audacity keyboard shortcuts..."
+msgstr "Seleccioneu un fitxer XML amb les dreceres de teclat de l'Audacity..."
+
+#: prefs/KeyConfigPrefs.cpp:213
+msgid "Error loading keyboard shortcuts"
+msgstr "S'ha produït un error en carregar les dreceres de teclat"
+
+#: prefs/KeyConfigPrefs.cpp:241
+#, c-format
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
+"\n"
+"'%s'"
+msgstr "La drecera de teclat '%s' es troba ja assignada a:\n"
+"\n"
+"'%s'"
+
+#: prefs/KeyConfigPrefs.cpp:367
+#: toolbars/EditToolBar.cpp:144
+msgid "Undo"
+msgstr "Desfés"
+
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Re&produix les altres pistes mentre se n'enregistra una de nova"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
+msgid "Mouse"
+msgstr "Ratolí"
+
+#: prefs/MousePrefs.cpp:78
+msgid "Mouse Bindings (default values, not configurable)"
+msgstr "Vinculacions del ratolí (valors predeterminats, no configurable)"
+
+#: prefs/MousePrefs.cpp:93
+msgid "Tool"
+msgstr "Eina"
+
+#: prefs/MousePrefs.cpp:94
+msgid "Command Action"
+msgstr "Acció d'orde"
+
+#: prefs/MousePrefs.cpp:95
+msgid "Buttons"
+msgstr "Botons"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
+msgid "Left-Click"
+msgstr "Clic esquerre"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
+msgid "Select"
+msgstr "Selecciona"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
+msgid "Set Selection Point"
+msgstr "Especifica el punt de selecció"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
+msgid "Left-Drag"
+msgstr "Arrossegament amb el botó principal"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
+msgid "Set Selection Range"
+msgstr "Especifica el rang de selecció"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Extend Selection Range"
+msgstr "Amplia l'abast de la selecció"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Shift-Left-Click"
+msgstr "Maj+clic esquerre"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Left-Double-Click"
+msgstr "Doble clic esquerre"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Select Clip or Entire Track"
+msgstr "Selecciona un clip o una pista sencera"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Ctrl-Left-Click"
+msgstr "Ctrl+clic esquerre"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Set Selection Point and Play"
+msgstr "Establix el punt de selecció i interpreta"
+
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom"
+msgstr "Zoom"
+
+#: prefs/MousePrefs.cpp:104
+msgid "Zoom in on Point"
+msgstr "Zoom en un punt"
+
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Zoom in on a Range"
+msgstr "Zoom en un rang"
+
+#: prefs/MousePrefs.cpp:105
+msgid "same as right-drag"
+msgstr "el mateix que arrossegar a la dreta"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Right-Click"
+msgstr "Clic amb el botó secundari"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Zoom out one step"
+msgstr "Allunya un pas"
+
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Right-Drag"
+msgstr "Arrossegament amb el botó secundari"
+
+#: prefs/MousePrefs.cpp:107
+msgid "same as left-drag"
+msgstr "el mateix que arrossegar a l'esquerra"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Shift-Drag"
+msgstr "Majúscules+Arrossega"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Zoom out on a Range"
+msgstr "Zoom en un rang"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Middle-Click"
+msgstr "Clic del mig"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom default"
+msgstr "Zoom per defecte"
+
+#: prefs/MousePrefs.cpp:111
+msgid "Time shift clip or move up/down between tracks"
+msgstr "Desplaça el clip en el temps, o mou-lo amunt o avall entre pistes"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Shift-Left-Drag"
+msgstr "Maj+Arrossega a l'esquerra"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Time shift all clips in track"
+msgstr "Desplaça en el temps tots els clips d'una pista"
+
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
+msgid "Ctrl-Left-Drag"
+msgstr "Ctrl+Arrossega a l'esquerra"
+
+#: prefs/MousePrefs.cpp:113
+msgid "Move clip up/down between tracks"
+msgstr "Mou el clip amunt o avall entre pistes"
+
+#: prefs/MousePrefs.cpp:115
+msgid "Change Amplification Envelope"
+msgstr "Canvia l'envolupant d'amplificació"
+
+#: prefs/MousePrefs.cpp:117
+msgid "Change Sample"
+msgstr "Canvia la mostra"
+
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
+msgid "Pencil"
+msgstr "Llapis"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Alt-Left-Click"
+msgstr "Alt+clic esquerre"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Smooth at Sample"
+msgstr "Suavitza a la mostra"
+
+#: prefs/MousePrefs.cpp:119
+msgid "Change Several Samples"
+msgstr "Canvia diverses mostres"
+
+#: prefs/MousePrefs.cpp:120
+msgid "Change ONE Sample only"
+msgstr "Canvia només UNA mostra"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "Multi"
+msgstr "Diverses"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+msgid "same as select tool"
+msgstr "el mateix que l'eina de seleccionar"
+
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "same as zoom tool"
+msgstr "el mateix que l'eina de zoom"
+
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
+msgid "Any"
+msgstr "Qualsevol"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Scroll up or down"
+msgstr "Desplaça amunt o avall"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Wheel-Rotate"
+msgstr "Roda del ratolí"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Scroll left or right"
+msgstr "Desplaça't a l'esquerra o a la dreta"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Shift-Wheel-Rotate"
+msgstr "Majúscules+Roda del ratolí"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Ctrl-Wheel-Rotate"
+msgstr "Ctrl+Roda del ratolí"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Zoom in or out"
+msgstr "Apropa o allunya"
+
+#: prefs/PrefsDialog.cpp:89
+msgid "Audacity Preferences"
+msgstr "Preferències de l'Audacity"
+
+#: prefs/QualityPrefs.cpp:73
+msgid "Rectangle"
+msgstr "Rectangle"
+
+#: prefs/QualityPrefs.cpp:74
+msgid "Triangle"
+msgstr "Triangle"
+
+#: prefs/QualityPrefs.cpp:75
+msgid "Shaped"
+msgstr "Retallat"
+
+#: prefs/QualityPrefs.cpp:122
+msgid "Sampling"
+msgstr "Mostreig"
+
+#: prefs/QualityPrefs.cpp:125
+msgid "Default Sample Rate:"
+msgstr "Freqüència de mostreig per defecte:"
+
+#: prefs/QualityPrefs.cpp:127
+msgid "Default Sample Format:"
+msgstr "Format per defecte de les mostres:"
+
+#: prefs/QualityPrefs.cpp:136
+msgid "Real-time sample rate converter:"
+msgstr "Convertidor de freqüència en temps real:"
+
+#: prefs/QualityPrefs.cpp:139
+msgid "High-quality sample rate converter:"
+msgstr "Convertidor de freqüència de mostreig d'alta qualitat:"
+
+#: prefs/QualityPrefs.cpp:142
+msgid "Real-time dither:"
+msgstr "Arrodoniment en temps real:"
+
+#: prefs/QualityPrefs.cpp:145
+msgid "High-quality dither:"
+msgstr "Arrodoniment d'alta qualitat:"
+
+#: prefs/QualityPrefs.cpp:157
+msgid "Conversion"
+msgstr "Conversió"
+
+#: prefs/QualityPrefs.cpp:163
+msgid "Sample Rate Converter"
+msgstr "Convertidor de la freqüència de mostreig"
+
+#: prefs/QualityPrefs.cpp:164
+msgid "Dither"
+msgstr "Arrodoniment"
+
+#: prefs/QualityPrefs.cpp:165
+msgid "Real-time:"
+msgstr "Temps real:"
+
+#: prefs/QualityPrefs.cpp:171
+msgid "High-quality:"
+msgstr "Alta qualitat:"
+
+#: prefs/SmartRecordPrefs.cpp:54
+#: prefs/SmartRecordPrefs.cpp:55
+msgid "Smart Recording"
+msgstr "Enregistrament intel·ligent"
+
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
+
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
+msgid "Spectrograms"
+msgstr "Espectrogrames"
+
+#: prefs/SpectrumPrefs.cpp:91
+msgid "FFT Size"
+msgstr "Grandària FFT"
+
+#: prefs/SpectrumPrefs.cpp:94
+msgid "8 - most wideband"
+msgstr "8 - banda més ampla"
+
+#: prefs/SpectrumPrefs.cpp:99
+msgid "256 - default"
+msgstr "256 - per defecte"
+
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr "32768 - banda més estreta"
+
+#: prefs/SpectrumPrefs.cpp:109
+msgid "4096 - most narrowband"
+msgstr "4096 - banda més estreta"
+
+#: prefs/SpectrumPrefs.cpp:116
+msgid "Window type:"
+msgstr "Tipus de finestra:"
+
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr "Punts d'omissió FFT"
+
+#: prefs/SpectrumPrefs.cpp:140
+msgid "Display"
+msgstr "Pantalla"
+
+#: prefs/SpectrumPrefs.cpp:144
+msgid "&Grayscale"
+msgstr "Escala de &grisos"
+
+#: prefs/SpectrumPrefs.cpp:147
+msgid "Minimum Frequency (Hz):"
+msgstr "Freqüència mínima (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:152
+msgid "Maximum Frequency (Hz):"
+msgstr "Freqüència màxima (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr "Graella-&Y"
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr "&Localitza notes"
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr "&Arrodonix notes"
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr "Amplitud mínima (dB):"
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr "Nombre màx. de notes (1..128):"
+
+#: prefs/SpectrumPrefs.cpp:197
+msgid "The maximum frequency must be an integer"
+msgstr "La freqüència màxima ha de ser un nombre enter"
+
+#: prefs/SpectrumPrefs.cpp:201
+msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
+msgstr "La freqüència màxima ha de trobar-se entre 100 Hz i 100.000 Hz"
+
+#: prefs/SpectrumPrefs.cpp:209
+msgid "The minimum frequency must be an integer"
+msgstr "La freqüència mínima ha de ser un nombre enter"
+
+#: prefs/SpectrumPrefs.cpp:213
+msgid "Minimum frequency must be at least 0 Hz"
+msgstr "La freqüència mínima ha de ser d'almenys 0 Hz"
+
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr "L'amplitud mínima (dB) ha de ser un nombre enter"
+
+#: prefs/SpectrumPrefs.cpp:226
+#: prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr "El nombre màxim de notes ha de ser un nombre enter entre 1 i 128"
+
+#: prefs/ThemePrefs.cpp:62
+#: prefs/ThemePrefs.cpp:63
+msgid "Theme"
+msgstr "Tema"
+
+#. i18n-hint: && in here is an escape character to get a single & on screen,
+#. * so keep it as is
+#: prefs/ThemePrefs.cpp:93
+msgid "Theme Cache - Images && Color"
+msgstr "Mostres - Imatges i color"
+
+#: prefs/ThemePrefs.cpp:95
+msgid "Save Theme Cache"
+msgstr "Alça una mostra del tema"
+
+#: prefs/ThemePrefs.cpp:96
+msgid "Load Theme Cache"
+msgstr "Carrega la mostra del tema"
+
+#: prefs/ThemePrefs.cpp:106
+msgid "Load Theme Cache At Startup"
+msgstr "Carrega la mostra del tema a l'inici"
+
+#: prefs/ThemePrefs.cpp:118
+msgid "Individual Theme Files"
+msgstr "Fitxers individuals del tema"
+
+#: prefs/ThemePrefs.cpp:120
+msgid "Save Files"
+msgstr "Alça els fitxers"
+
+#: prefs/ThemePrefs.cpp:121
+msgid "Load Files"
+msgstr "Carrega els fitxers"
+
+#: prefs/ThemePrefs.cpp:126
+msgid "Info"
+msgstr "Informació"
+
+#: prefs/ThemePrefs.cpp:129
+msgid "Themability is an experimental feature.\n"
+"\n"
+"To try it out, click \"Save Theme Cache\" then\n"
+"find and modify the images and colors in \n"
+"ImageCacheVxx.png using an image editor such \n"
+"as the Gimp.\n"
+"\n"
+"Click \"Load Theme Cache\" to load the changed images\n"
+"and colors back into Audacity.\n"
+"\n"
+"[Only the control toolbar and the colors on the \n"
+"wavetrack are currently affected, even though the\n"
+"image file shows other icons too.]\n"
+msgstr "L'ús dels temes és una funcionalitat experimental.\n"
+"\n"
+"Per a provar-la feu clic a \"Alça la mostra del tema\" i després\n"
+"busqueu i modifiqueu les imatges i els colors a\n"
+"ImageCacheVxx.png mitjançant un editor d'imatges com \n"
+"ara el Gimp.\n"
+"\n"
+"Feu clic a \"Carrega la mostra del tema\" per a veure els canvis fets en les imatges \n"
+"i als colors.\n"
+"\n"
+"[Només la barra d'eines de control i els colors de les \n"
+"pistes de so es veuran afectats pels canvis, encara que al fitxer \n"
+"que conté la imatge s'hi vegin altres icones.]\n"
+
+#: prefs/ThemePrefs.cpp:134
+msgid "You have compiled Audacity with an extra button, \n"
+"'Output Sourcery'.  This will save a C version of \n"
+"the image cache that can be compiled in as a default.\n"
+msgstr "Heu compilat l'Audacity amb un botó extra, \n"
+"'Eixida de codi font', que servix per a alçar un fitxer en llenguatge C de \n"
+"la imatge de mostra, que podreu fer servir per a una nova compilació.\n"
+
+#: prefs/ThemePrefs.cpp:139
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
+"the Theme Cache will be loaded when the program \n"
+"starts up.\n"
+"\n"
+msgstr "Si l'opció 'Carrega la mostra del tema a l'inici' es troba habilitada,\n"
+"la mostra del tema es carregarà quan el programa \n"
+"engegui.\n"
+"\n"
+
+#: prefs/ThemePrefs.cpp:142
+msgid "Saving and loading individual theme files uses a \n"
+"separate file for each image, but is otherwise the \n"
+"same idea.\n"
+"\n"
+msgstr "Alçar i carregar els fitxers individuals del tema us obliga a fer servir \n"
+"un fitxer individual per a cada imatge, però és \n"
+"la mateixa idea.\n"
+"\n"
+
+#: toolbars/ControlToolBar.cpp:174
+msgid "Pause"
+msgstr "Pausa"
+
+#: toolbars/ControlToolBar.cpp:177
+msgid "Play"
+msgstr "Interpreta"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:182
+msgid "Stop"
+msgstr "Atura't"
+
+#: toolbars/ControlToolBar.cpp:185
+msgid "Skip to Start"
+msgstr "Vés a l'inici"
+
+#: toolbars/ControlToolBar.cpp:188
+msgid "Skip to End"
+msgstr "Vés al final"
+
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:194
+msgid "Clean Speech"
+msgstr "CleanSpeech"
+
+#: toolbars/ControlToolBar.cpp:530
+#: toolbars/ControlToolBar.cpp:844
+msgid "Error while opening sound device. "
+msgstr "S'ha produït un error en obrir el dispositiu."
+
+#: toolbars/ControlToolBar.cpp:696
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "L'enregistrament en la modalitat CleanSpeech no és possible quan una pista, o més d'un projecte, es troben oberts alhora."
+
+#: toolbars/ControlToolBar.cpp:697
+msgid "Recording not permitted"
+msgstr "L'enregistrament no és permès"
+
+#: toolbars/DeviceToolBar.cpp:113
+#: toolbars/DeviceToolBar.cpp:115
+msgid "Output Device"
+msgstr "Dispositiu d'eixida"
+
+#: toolbars/DeviceToolBar.cpp:134
+#: toolbars/DeviceToolBar.cpp:136
+msgid "Input Device"
+msgstr "Dispositiu d'entrada"
+
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim outside selection"
+msgstr "Deixa només la selecció"
+
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence selection"
+msgstr "Silencia la selecció"
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Zoom In"
+msgstr "Apropa"
+
+#: toolbars/EditToolBar.cpp:152
+msgid "Zoom Out"
+msgstr "Allunya"
+
+#: toolbars/EditToolBar.cpp:156
+msgid "Zoom Toggle"
+msgstr "Commuta el zoom"
+
+#: toolbars/EditToolBar.cpp:160
+msgid "Fit Selection"
+msgstr "Encabix la selecció"
+
+#: toolbars/EditToolBar.cpp:160
+msgid "Fit selection in window"
+msgstr "Encabix la selecció a la finestra"
+
+#: toolbars/EditToolBar.cpp:162
+msgid "Fit Project"
+msgstr "Encabix el projecte"
+
+#: toolbars/EditToolBar.cpp:162
+msgid "Fit project in window"
+msgstr "Encabix el projecte a la finestra"
+
+#: toolbars/MeterToolBar.cpp:50
+msgid "Meter"
+msgstr "Picòmetre"
+
+#: toolbars/MeterToolBar.cpp:80
+msgid "Play Meter"
+msgstr "Picòmetre d'eixida"
+
+#: toolbars/MeterToolBar.cpp:81
+msgid "Meter-Play"
+msgstr "Picòmetre d'eixida"
+
+#: toolbars/MeterToolBar.cpp:89
+msgid "Record Meter"
+msgstr "Picòmetre d'enregistrament"
+
+#: toolbars/MeterToolBar.cpp:90
+msgid "Meter-Record"
+msgstr "Picòmetre d'enregistrament"
+
+#: toolbars/MeterToolBar.cpp:94
+msgid "Output level meter"
+msgstr "Picòmetre d'eixida"
+
+#: toolbars/MeterToolBar.cpp:95
+msgid "Input level meter - click to monitor input"
+msgstr "Picòmetre d'entrada - feu clic per a observar el senyal"
+
+#: toolbars/MixerToolBar.cpp:90
+msgid "Output Volume"
+msgstr "Volum d'eixida"
+
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
+msgstr "Lliscador d'eixida"
+
+#: toolbars/MixerToolBar.cpp:101
+msgid "Input Volume"
+msgstr "Volum d'entrada"
+
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
+msgstr "Lliscador d'entrada"
+
+#: toolbars/MixerToolBar.cpp:134
+msgid "Input Source"
+msgstr "Font d'entrada"
+
+#: toolbars/SelectionBar.cpp:80
+msgid "Selection"
+msgstr "Selecció"
+
+#: toolbars/SelectionBar.cpp:128
+#: toolbars/SelectionBar.cpp:185
+msgid "Project Rate (Hz):"
+msgstr "Freqüència del projecte (Hz):"
+
+#: toolbars/SelectionBar.cpp:142
+#: toolbars/SelectionBar.cpp:247
+msgid "Selection Start:"
+msgstr "Inici de la selecció:"
+
+#: toolbars/SelectionBar.cpp:155
+#: toolbars/SelectionBar.cpp:253
+msgid "Length"
+msgstr "Longitud"
+
+#: toolbars/SelectionBar.cpp:165
+msgid "hidden"
+msgstr "amagat"
+
+#: toolbars/SelectionBar.cpp:175
+#: toolbars/SelectionBar.cpp:264
+msgid "Audio Position:"
+msgstr "Posició de so:"
+
+#: toolbars/SelectionBar.cpp:225
+#: toolbars/SelectionBar.cpp:230
+msgid "Snap To"
+msgstr "Arrodonix"
+
+#: toolbars/SelectionBar.cpp:252
+msgid "Selection "
+msgstr "Selecció"
+
+#: toolbars/SelectionBar.cpp:317
+msgid "Selection Length"
+msgstr "Longitud de la selecció"
+
+#: toolbars/SelectionBar.cpp:325
+msgid "Selection End"
+msgstr "Fi de la selecció"
+
+#: toolbars/ToolBar.cpp:97
+#, c-format
+msgid "Audacity %s ToolBar"
+msgstr "Barra d'eines de %s de l'Audacity"
+
+#: toolbars/ToolDock.cpp:74
+#: toolbars/ToolDock.cpp:75
+msgid "ToolDock"
+msgstr "Plafó d'eines"
+
+#: toolbars/ToolsToolBar.cpp:63
+msgid "Click and drag to select audio"
+msgstr "Feu clic i arrossegueu per a seleccionar el so"
+
+#: toolbars/ToolsToolBar.cpp:64
+msgid "Click and drag to edit the amplitude envelope"
+msgstr "Feu clic i arrossegueu per a modificar l'envolupant d'amplitud"
+
+#: toolbars/ToolsToolBar.cpp:65
+msgid "Click and drag to edit the samples"
+msgstr "Feu clic i arrossegueu per a modificar les mostres"
+
+#: toolbars/ToolsToolBar.cpp:67
+msgid "Click to Zoom In, Shift-Click to Zoom Out"
+msgstr "Feu clic per a apropar i Maj+clic per a allunyar"
+
+#: toolbars/ToolsToolBar.cpp:69
+msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
+msgstr "Arrossegueu per a ampliar la regió, feu clic amb el botó secundari per a allunyar-la"
+
+#: toolbars/ToolsToolBar.cpp:71
+msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
+msgstr "Esquerra=Apropa, Dreta=Allunya, Mig=Normal"
+
+#: toolbars/ToolsToolBar.cpp:73
+msgid "Click and drag to move a track in time"
+msgstr "Feu clic i arrossegueu per a moure una pista en el temps"
+
+#: toolbars/ToolsToolBar.cpp:90
+msgid "Tools"
+msgstr "Eines"
+
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
+msgid "Selection Tool"
+msgstr "Eina de selecció"
+
+#: toolbars/ToolsToolBar.cpp:148
+msgid "Envelope Tool"
+msgstr "Eina d'envolupant"
+
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
+msgid "Time Shift Tool"
+msgstr "Eina de desplaçament en el temps"
+
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
+msgid "Zoom Tool"
+msgstr "Eina de zoom"
+
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
+msgid "Draw Tool"
+msgstr "Eina de dibuix"
+
+#: toolbars/ToolsToolBar.cpp:152
+msgid "Multi-Tool Mode"
+msgstr "Mode multi-eina"
+
+#: toolbars/ToolsToolBar.cpp:186
+msgid "Slide Tool"
+msgstr "Eina de desplaçament"
+
+#: toolbars/ToolsToolBar.cpp:187
+msgid "Multi Tool"
+msgstr "Eina múltiple"
+
+#: toolbars/TranscriptionToolBar.cpp:84
+msgid "Transcription"
+msgstr "Transcripció"
+
+#: toolbars/TranscriptionToolBar.cpp:171
+msgid "Play at selected speed"
+msgstr "Reproduix a la velocitat seleccionada"
+
+#: toolbars/TranscriptionToolBar.cpp:172
+msgid "Play-at-speed"
+msgstr "Reproduix-a-velocitat"
+
+#: toolbars/TranscriptionToolBar.cpp:178
+#: toolbars/TranscriptionToolBar.cpp:183
+msgid "Playback Speed"
+msgstr "Velocitat de reproducció"
+
+#: toolbars/TranscriptionToolBar.cpp:196
+msgid "Adjust left selection to next onset"
+msgstr "Ajusta la selecció esquerra al següent punt d'inici"
+
+#: toolbars/TranscriptionToolBar.cpp:197
+msgid "Left-to-On"
+msgstr "Esquerra-a-PuntInici"
+
+#: toolbars/TranscriptionToolBar.cpp:199
+msgid "Adjust right selection to previous offset"
+msgstr "Ajusta la selecció dreta a l'anterior punt final"
+
+#: toolbars/TranscriptionToolBar.cpp:200
+msgid "Right-to-Off"
+msgstr "Dreta-a-PuntFinal"
+
+#: toolbars/TranscriptionToolBar.cpp:202
+msgid "Adjust left selection to next offset"
+msgstr "Ajusta la selecció esquerra al següent punt final"
+
+#: toolbars/TranscriptionToolBar.cpp:203
+msgid "Left-to-Off"
+msgstr "Esquerra-a-PuntFinal"
+
+#: toolbars/TranscriptionToolBar.cpp:205
+msgid "Adjust right selection to previous onset"
+msgstr "Ajusta la selecció dreta a l'anterior punt inicial"
+
+#: toolbars/TranscriptionToolBar.cpp:206
+msgid "Right-to-On"
+msgstr "Dreta-a-PuntInicial"
+
+#: toolbars/TranscriptionToolBar.cpp:208
+msgid "Select region of sound around cursor"
+msgstr "Selecciona la regió de so al voltant del cursor"
+
+#: toolbars/TranscriptionToolBar.cpp:209
+msgid "Select-Sound"
+msgstr "Selecciona-So"
+
+#: toolbars/TranscriptionToolBar.cpp:211
+msgid "Select region of silence around cursor"
+msgstr "Selecciona una regió de silenci al voltant del cursor"
+
+#: toolbars/TranscriptionToolBar.cpp:212
+msgid "Select-Silence"
+msgstr "Selecciona-Silenci"
+
+#: toolbars/TranscriptionToolBar.cpp:214
+msgid "Automatically make labels from words"
+msgstr "Crea etiquetes de manera automàtica des de les paraules"
+
+#: toolbars/TranscriptionToolBar.cpp:215
+msgid "Make Labels"
+msgstr "Crea etiquetes"
+
+#: toolbars/TranscriptionToolBar.cpp:217
+msgid "Add label at selection"
+msgstr "Afig una etiqueta a la selecció"
+
+#: toolbars/TranscriptionToolBar.cpp:218
+msgid "Add Label"
+msgstr "Afig una etiqueta"
+
+#: toolbars/TranscriptionToolBar.cpp:220
+msgid "Calibrate voicekey"
+msgstr "Calibra la clau de veu"
+
+#: toolbars/TranscriptionToolBar.cpp:221
+msgid "Calibrate"
+msgstr "Calibra"
+
+#: toolbars/TranscriptionToolBar.cpp:225
+msgid "Adjust Sensitivity"
+msgstr "Ajusta la sensibilitat"
+
+#: toolbars/TranscriptionToolBar.cpp:230
+msgid "Sensitivity"
+msgstr "Sensitivitat"
+
+#: toolbars/TranscriptionToolBar.cpp:235
+msgid "Energy"
+msgstr "Energia"
+
+#: toolbars/TranscriptionToolBar.cpp:236
+msgid "Sign Changes (Low Threshold)"
+msgstr "Canvis de signe (llindar baix)"
+
+#: toolbars/TranscriptionToolBar.cpp:237
+msgid "Sign Changes (High Threshold)"
+msgstr "Canvis de signe (llindar alt)"
+
+#: toolbars/TranscriptionToolBar.cpp:238
+msgid "Direction Changes (Low Threshold)"
+msgstr "Canvis de direcció (llindar baix)"
+
+#: toolbars/TranscriptionToolBar.cpp:239
+msgid "Direction Changes (High Threshold)"
+msgstr "Canvis de direcció (llindar alt)"
+
+#: toolbars/TranscriptionToolBar.cpp:247
+msgid "Key type"
+msgstr "Tipus de clau"
+
+#: widgets/AButton.cpp:302
+msgid " (disabled)"
+msgstr " (inhabilitat)"
+
+#: widgets/AButton.cpp:452
+msgid "Press"
+msgstr "Premsa"
+
+#: widgets/AButton.cpp:531
+msgid "Button"
+msgstr "Botó"
+
+#. i18n-hint: One-letter abbreviation for Left, in VU Meter
+#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#: widgets/ASlider.cpp:604
+#: widgets/Meter.cpp:212
+msgid "L"
+msgstr "E"
+
+#. i18n-hint: One-letter abbreviation for Right, in VU Meter
+#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#: widgets/ASlider.cpp:607
+#: widgets/Meter.cpp:214
+msgid "R"
+msgstr "D"
+
+#: widgets/ASlider.cpp:670
+msgid "Center"
+msgstr "Centre"
+
+#: widgets/ASlider.cpp:674
+msgid "Left"
+msgstr "Esq."
+
+#: widgets/ASlider.cpp:677
+msgid "Right"
+msgstr "Dreta"
+
+#: widgets/ErrorDialog.cpp:78
+#: widgets/ErrorDialog.cpp:102
+msgid "Help"
+msgstr "Ajuda"
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr "<"
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ">"
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr "Cap a avant"
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr "Cap arrere"
+
+#: widgets/ErrorDialog.cpp:249
+msgid "Help on the Internet"
+msgstr "Ajuda a Internet"
+
+#: widgets/Grabber.cpp:62
+msgid "Grabber"
+msgstr "Agafador"
+
+#: widgets/Grid.cpp:643
+#, c-format
+msgid "%d rows, %d columns"
+msgstr "%d files, %d columnes"
+
+#: widgets/Grid.cpp:649
+#: widgets/Grid.cpp:776
+#, c-format
+msgid "Row %d"
+msgstr "Fila %d"
+
+#: widgets/Grid.cpp:791
+msgid "Empty"
+msgstr "Buit"
+
+#: widgets/Meter.cpp:359
+msgid "Enable Meter"
+msgstr "Habilita el picòmetre"
+
+#: widgets/Meter.cpp:361
+msgid "Disable Meter"
+msgstr "Inhabilita el picòmetre"
+
+#: widgets/Meter.cpp:364
+msgid "Stop Monitoring"
+msgstr "Atura el monitoratge"
+
+#: widgets/Meter.cpp:366
+msgid "Start Monitoring"
+msgstr "Inicia el monitoratge"
+
+#: widgets/Meter.cpp:370
+msgid "Horizontal Stereo"
+msgstr "Estèreo horitzontal"
+
+#: widgets/Meter.cpp:371
+msgid "Vertical Stereo"
+msgstr "Estèreo vertical"
+
+#: widgets/Meter.cpp:388
+msgid "Preferences..."
+msgstr "Preferències..."
+
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
+#: widgets/Meter.cpp:1078
+msgid "This determines how often the meter is refreshed.\n"
+"If you have a slower PC you may want to select a\n"
+"lower refresh rate (30 per second or lower), so that\n"
+"audio qualtiy is not affected by the meter display."
+msgstr "Això determina cada quant de temps s'ha de refrescar el picòmetre.\n"
+"Si teniu un ordinador lent us serà convenient seleccionar una\n"
+"freqüència de refresc baixa (30 per segon o menys), de manera que\n"
+"la qualitat del so no es vegi afectada per la representació gràfica de mesurador."
+
+#: widgets/Meter.cpp:1079
+msgid "Meter refresh rate per second [1-100]: "
+msgstr "Freqüència de refresc del picòmetre [1-100 vegades per segon]"
+
+#: widgets/Meter.cpp:1080
+msgid "Meter Preferences"
+msgstr "Preferències dels picòmetres"
+
+#: widgets/MultiDialog.cpp:82
+msgid " Please select an action "
+msgstr " Seleccioneu una acció"
+
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
+#: widgets/Ruler.cpp:1478
+#: widgets/Ruler.cpp:1479
+msgid "Vertical Ruler"
+msgstr "Regle vertical"
+
+#. i18n-hint: Format string for displaying time in seconds. Change the comma
+#. * in the middle to the 1000s separator for your locale, and the 'seconds'
+#. * on the end to the word for seconds. Don't change the numbers.
+#: widgets/TimeTextCtrl.cpp:267
+msgid "01000,01000 seconds"
+msgstr "01000,01000 segons"
+
+#. i18n-hint: Format string for displaying time in hours, minutes and
+#. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
+#. * change the numbers unless there aren't 60 seconds in a minute in your
+#. * locale
+#: widgets/TimeTextCtrl.cpp:276
+msgid "0100 h 060 m 060 s"
+msgstr "0100 h 060 m 060 s"
+
+#. i18n-hint: Name of time display format that shows time in days, hours,
+#. * minutes and seconds
+#: widgets/TimeTextCtrl.cpp:279
+msgid "dd:hh:mm:ss"
+msgstr "dd:hh:mm:ss"
+
+#. i18n-hint: Format string for displaying time in days, hours, minutes and
+#. * seconds. Change the 'days' to the word for days, 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes and 's' to the
+#. * abbreviation for seconds. Don't change the numbers unless there aren't
+#. * 24 hours in a day in your locale
+#: widgets/TimeTextCtrl.cpp:285
+msgid "0100 days 024 h 060 m 060 s"
+msgstr "0100 dies 024 h 060 m 060 s"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and milliseconds (1/1000 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + milliseconds"
+msgstr "hh:mm:ss + mil·lisegons"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * milliseconds are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.01000 s"
+msgstr "0100 h 060 m 060.01000 s"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and samples (at the current project sample rate)
+#: widgets/TimeTextCtrl.cpp:297
+msgid "hh:mm:ss + samples"
+msgstr "hh:mm:ss + mostres"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and samples. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes, 's' to the abbreviation for seconds and
+#. * translate samples . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:303
+msgid "0100 h 060 m 060 s+.# samples"
+msgstr "0100 h 060 m 060 s+.# mostres"
+
+#. i18n-hint: Name of time display format that shows time in samples (at the
+#. * current project sample rate)
+#: widgets/TimeTextCtrl.cpp:306
+msgid "samples"
+msgstr "mostres"
+
+#. i18n-hint: Format string for displaying time in samples (lots of samples).
+#. * Change the ',' to the 1000s separator for your locale, and translate
+#. * samples. If 1000s aren't a base multiple for your number system, then you
+#. * can change the numbers to an appropriate one, and put a 0 on the front
+#: widgets/TimeTextCtrl.cpp:311
+msgid "01000,01000,01000 samples|#"
+msgstr "01000,01000,01000 mostres|#"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:314
+msgid "hh:mm:ss + film frames (24 fps)"
+msgstr "hh:mm:ss + fotogrames (24 fps)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames at 24 frames per second. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames' . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:320
+msgid "0100 h 060 m 060 s+.24 frames"
+msgstr "0100 h 060 m 060 s+.24 quadres"
+
+#. i18n-hint: Name of time display format that shows time in frames (lots of
+#. * frames) at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:323
+msgid "film frames (24 fps)"
+msgstr "fotogrames (24 fps)"
+
+#. i18n-hint: Format string for displaying time in frames at 24 frames per
+#. * second. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:326
+msgid "01000,01000 frames|24"
+msgstr "01000,01000 quadres|24"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV drop-frame rate (used for American /
+#. * Japananese TV, and very odd)
+#: widgets/TimeTextCtrl.cpp:330
+msgid "hh:mm:ss + NTSC drop frames"
+msgstr "hh:mm:ss + quadres NTSC perduts"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the |N alone, it's important!
+#: widgets/TimeTextCtrl.cpp:335
+msgid "0100 h 060 m 060 s+.30 frames|N"
+msgstr "0100 h 060 m 060 s+.30 quadres|N"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV non-drop-frame rate (used for American /
+#. * Japananese TV, and doesn't quite match wall time
+#: widgets/TimeTextCtrl.cpp:339
+msgid "hh:mm:ss + NTSC non-drop frames"
+msgstr "hh:mm:ss + quadres NTSC no perduts"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the | .999000999 alone,
+#. * the whole things really is slightly off-speed!
+#: widgets/TimeTextCtrl.cpp:345
+msgid "0100 h 060 m 060 s+.030 frames| .999000999"
+msgstr "0100 h 060 m 060 s+.030 quadres| .999000999"
+
+#. i18n-hint: Name of time display format that shows time in frames at NTSC
+#. * TV frame rate (used for American / Japananese TV
+#: widgets/TimeTextCtrl.cpp:348
+msgid "NTSC frames"
+msgstr "Quadres NTSC"
+
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone. That really is the frame
+#. * rate!
+#: widgets/TimeTextCtrl.cpp:352
+msgid "01000,01000 frames|29.97002997"
+msgstr "01000,01000 quadres|29.97002997"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at PAL TV frame rate (used for European TV)
+#: widgets/TimeTextCtrl.cpp:355
+msgid "hh:mm:ss + PAL frames (25 fps)"
+msgstr "hh:mm:ss + quadres PAL (25 fps)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with PAL TV frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Nice simple time code!
+#: widgets/TimeTextCtrl.cpp:360
+msgid "0100 h 060 m 060 s+.25 frames"
+msgstr "0100 h 060 m 060 s+.25 quadres"
+
+#. i18n-hint: Name of time display format that shows time in frames at PAL
+#. * TV frame rate (used for European TV
+#: widgets/TimeTextCtrl.cpp:363
+msgid "PAL frames (25 fps)"
+msgstr "quadres PAL (25 fps)"
+
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone.
+#: widgets/TimeTextCtrl.cpp:366
+msgid "01000,01000 frames|25"
+msgstr "01000,01000 quadres|25"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at CD Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:369
+msgid "hh:mm:ss + CDDA frames (75 fps)"
+msgstr "hh:mm:ss + quadres CDDA (75 fps)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with CD Audio frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'.
+#: widgets/TimeTextCtrl.cpp:374
+msgid "0100 h 060 m 060 s+.75 frames"
+msgstr "0100 h 060 m 060 s+.75 quadres"
+
+#. i18n-hint: Name of time display format that shows time in frames at CD
+#. * Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:377
+msgid "CDDA frames (75 fps)"
+msgstr "quadres CDDA (75 fps)"
+
+#. i18n-hint: Format string for displaying time in frames with CD Audio
+#. * frames. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:380
+msgid "01000,01000 frames|75"
+msgstr "01000,01000 quadres|75"
+
+#: widgets/TimeTextCtrl.cpp:451
+msgid "Use right mouse button or context key to change format"
+msgstr "Feu servir el botó dret del ratolí o la tecla de context per a canviar el format"
+
+#: widgets/TimeTextCtrl.cpp:1485
+msgid "Time Control"
+msgstr "Control de temps"
+
+#: widgets/Warning.cpp:64
+msgid "Don't show this warning again"
+msgstr "No mostres més este advertiment"
+
+#: xml/XMLFileReader.cpp:49
+#, c-format
+msgid "Could not open file: \"%s\""
+msgstr "No s'ha pogut obrir el fitxer: \"%s\""
+
+#: xml/XMLFileReader.cpp:63
+#, c-format
+msgid "Error: %hs at line %lu"
+msgstr ""
+
+#: xml/XMLFileReader.cpp:79
+#, c-format
+msgid "Could not load file: \"%s\""
+msgstr "No s'ha pogut carregar el fitxer: \"%s\""
+
diff --git a/locale/cb.po b/locale/cb.po
deleted file mode 100644
index 19f14cc..0000000
--- a/locale/cb.po
+++ /dev/null
@@ -1,7778 +0,0 @@
-# translation of audacity.po to Khmer
-# Khoem Sokhem <khoemsokhem at khmeros.info>, 2007, 2008.
-# Eng Vannak <evannak at khmeros.info>, 2008.
-# translation of audacity.po to
-msgid ""
-msgstr ""
-"Project-Id-Version: audacity\n"
-"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-10-01 22:40+0100\n"
-"PO-Revision-Date: 2008-07-09 13:48+0700\n"
-"Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
-"Language-Team: Khmer <en at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: AboutDialog.cpp:141 AudacityApp.cpp:726 Menus.cpp:733
-msgid "&About Audacity..."
-msgstr "អំពី Audacity..."
-
-#: AboutDialog.cpp:165 effects/AvcCompressor.cpp:674
-msgid "Enabled"
-msgstr "បាន​អនុញ្ញាត"
-
-#: AboutDialog.cpp:166
-msgid "Disabled"
-msgstr "មិន​បាន​អនុញ្ញាត"
-
-#: AboutDialog.cpp:229
-msgid "Program build date: "
-msgstr "កាល​បរិច្ឆេទ​ស្ថាបនា​កម្មវិធី ៖"
-
-#: AboutDialog.cpp:234
-msgid "Settings folder: "
-msgstr "ការ​កំណត់​ថត ៖ "
-
-#: AboutDialog.cpp:239
-msgid ""
-"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."
-msgstr "Audacity គឺ​ជា​កម្មវិធី​ឥតគិត​ថ្លៃ​ដែល​ត្រូវ​បាន​សរសេរ​ដោយ​ក្រុម​អ្នក​អភិវឌ្ឍន៍​ស្ម័គ្រចិត្ត​ជុំវិញ​ពិភពលោក ។ សូម​ថ្លែង​អំណរគុណ​ចំពោះ SourceForge.net ជា​សេវា​លើ​បណ្ដាញ ដែល​ផ្ដល់​ឧបករណ៍​ឥតគិតថ្លៃ​ដល់​គម្រោង​កម្មវិធី​ប្រភព​កូដ​ចំហ ។ Audacity អាច​ប្រើ​បាន​សម្រាប់​វីនដូ ៩៨ និង​ខ្ពស់​ជាង​នេះ Mac OS X លីនុច និង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ផ្សេងៗ​ដូច​ជា​យូនីក ។ កំណែ​ចាស់ៗ​របស់ Audacity អាច​ប្រើ​បាន​សម្រាប់ Mac OS 9 ។"
-
-#: AboutDialog.cpp:243
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
-msgstr "នេះ​គឺ​ជា​កំណែ​បែតា​របស់​កម្មវិធី ។ វា​អាច​មាន​កំហុស និង​លក្ខណៈពិសេស​ជា​ច្រើន​ទៀត​មិន​ទាន់​ត្រូវ​បាន​បញ្ចប់ ។ យើង​រង់ចាំ​មតិរិះគន់​របស់​អ្នក ដូច្នេះ សូមទស្សនា​តំបន់បណ្ដាញ​របស់​យើង និង​ផ្ដល់​របាយការណ៍​កំហុស និង​សំណើ​ផ្សេង ។"
-
-#: AboutDialog.cpp:246
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
-msgstr ""
-"នេះ​ជា​កំណែ​មាន​លំនឹង ការ​ចេញ​ផ្សាយ​ពេញលេញ​របស់ Audacity ។ "
-"ទោះ​ជាយ៉ាង​ណា​ក៏​ដោយ ប្រសិន​បើ​អ្នក​រក​ឃើញ​កំហុស ឬ​មាន​សំណើ "
-"សូម​ទាក់ទង​មក​យើង​ខ្ញុំ ។ យើង​រង់ចាំ​មតិរិះគន់​​ពី​អ្នក​ប្រើ "
-"ដើម្បី​បន្ត​កែលម្អ​ Audacity ។ ចំពោះ​ព័ត៌មានបន្ថែម "
-"សូម​ទស្សនា​តំបន់​បណ្ដាញ​របស់​យើង​ខ្ញុំ ។"
-
-#. i18n-hint: The translation of "translator_credits" will appear
-#. in the credits in the About Audacity window.  Use this to add
-#. your own name(s) to the credits.
-#.
-#. For example:  "English translation by Dominic Mazzoni."
-#.
-#: AboutDialog.cpp:256 AboutDialog.cpp:258
-msgid "translator_credits"
-msgstr "ខឹម សុខែម, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
-
-#: AboutDialog.cpp:271
-msgid "A Free Digital Audio Editor"
-msgstr "កម្មវិធី​​កែសម្រួល​​អូឌីយ៉ូ​​ឌីជីថល​​ឥតគិត​ថ្លៃ"
-
-#: AboutDialog.cpp:275
-msgid "Information"
-msgstr "ព័ត៌មាន"
-
-#: AboutDialog.cpp:277
-msgid "Credits"
-msgstr "អ្នក​ចូលរួម"
-
-#: AboutDialog.cpp:281
-#, c-format
-msgid "Audacity %s Development Team"
-msgstr "ក្រុម​​អភិវឌ្ឍន៍​របស់​ Audacity %s"
-
-#: AboutDialog.cpp:286
-#, c-format
-msgid "Audacity %s Support Team"
-msgstr "ក្រុម​​​គាំទ្រ​​របស់ Audacity %s"
-
-#: AboutDialog.cpp:291
-msgid "Emeritus Developers"
-msgstr "អ្នក​អភិវឌ្ឍន៍​​ដែល​​ចូល​និវត្តន៍"
-
-#: AboutDialog.cpp:296
-msgid "Other Emeritus Team Members"
-msgstr "សមាជិក​​​ក្រុម​​ដែល​​ចូល​​និវត្តន៍​​ផ្សេង​ទៀត"
-
-#: AboutDialog.cpp:301
-msgid "Other Contributors"
-msgstr "អ្នក​ចូលរួម​​ផ្សេងៗ​ទៀត"
-
-#: AboutDialog.cpp:306
-msgid "Audacity is based on code from the following projects:"
-msgstr "Audacity មាន​មូលដ្ឋាន​លើ​កូដ​ពី​គម្រោង​ដូច​ខាង​ក្រោម ៖"
-
-#: AboutDialog.cpp:311
-msgid "Special thanks:"
-msgstr "អរគុណ​ជា​ពិសេស​ ៖"
-
-#: AboutDialog.cpp:320
-msgid "Audacity"
-msgstr "Audacity"
-
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:95
-msgid "Audacious!"
-msgstr "បិទ !"
-
-#: AboutDialog.cpp:388
-msgid "GPL License"
-msgstr "អាជ្ញាបណ្ណ GPL"
-
-#: AboutDialog.cpp:688 Dependencies.cpp:308 FreqWindow.cpp:209
-#: widgets/ErrorDialog.cpp:135
-msgid "Close"
-msgstr "បិទ"
-
-#: AudacityApp.cpp:458 Project.cpp:1751
-#, c-format
-msgid "%s is already open in another window."
-msgstr "%s បើក​រួច​ហើយ​នៅ​ក្នុង​បង្អួច​ផ្សេង ។"
-
-#: AudacityApp.cpp:460 Project.cpp:1753 Project.cpp:1834 Project.cpp:1978
-#: Project.cpp:2080
-msgid "Error opening project"
-msgstr "កំហុស​​ក្នុង​​កា​របើក​​គម្រោង"
-
-#: AudacityApp.cpp:492
-#, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
-"\n"
-"It has been removed from the history list."
-msgstr ""
-"មិន​ទាន់​មាន %s នៅ​ឡើយ​ទេ ហើយ​មិន​អាច​ត្រូវ​បានបើក ទេ ។ \n"
-"\n"
-"វា​ត្រូវ​បាន​យកចេញ​ពី​បញ្ជី​ប្រវត្តិ ។"
-
-#: AudacityApp.cpp:544
-msgid "Master Gain Control"
-msgstr "ការ​ត្រួតពិនិត្យ​​កំណើន​​មេ"
-
-#: AudacityApp.cpp:545
-msgid "Input Meter"
-msgstr "ចូល"
-
-#: AudacityApp.cpp:546
-msgid "Output Meter"
-msgstr "ចេញ"
-
-#. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:728 Menus.cpp:470
-msgid "&Preferences...\tCtrl+,"
-msgstr "ចំណូល​ចិត្ត...\tCtrl+,"
-
-#: AudacityApp.cpp:810 AudacityApp.cpp:887
-#, c-format
-msgid "Using block size of %ld\n"
-msgstr "ប្រើ​ទំហំ​ប្លុក​របស់ %ld\n"
-
-#: AudacityApp.cpp:832 AudacityApp.cpp:902
-#, c-format
-msgid "Unknown command line option: %s\n"
-msgstr "មិនស្គាល់​ជម្រើស​​បន្ទាត់​​ពាក្យ​បញ្ជា ៖ %s\n"
-
-#: AudacityApp.cpp:1021
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
-"Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity មិនអាច​រក​កន្លែង​ដើម្បីទុក​ឯកសា​របណ្ដោះអាសន្ន​បានទេ ។\n"
-"សូម​បញ្ចូល​ថត​ដែលសមរម្យ​នៅ​ក្នុង​ប្រអប់​ចំណូលចិត្ត ។"
-
-#: AudacityApp.cpp:1027
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
-msgstr "Audacity នឹង​បិទ​ឥឡូវ ។ សូម​ចាប់ផ្ដើម Audacity ម្ដង​ទៀត ដើម្បី​ប្រើ​ថត​បណ្ដោះ​អាសន្ន​ថ្មី ។"
-
-#: AudacityApp.cpp:1059
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
-"data loss or cause your system to crash.\n"
-"\n"
-msgstr ""
-"កំពុង​រង់​ច្បាប់​ចម្លង​របស់​ Audacity ពីរ​ដំណាល​គ្នា អាច​បណ្ដាល​ឲ្យ\n"
-"បាត់បង់​ទិន្នន័យ ឬ​បណ្ដាល​ឲ្យ​ប្រព័ន្ធ​របស់​អ្នក​គាំង ។\n"
-"\n"
-
-#: AudacityApp.cpp:1066
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
-"This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity មិនអាច​ចាក់សោ​ថត​ឯកសារ​បណ្ដោះអាសន្ន​បាន​ទេ ។\n"
-"ថត​នេះ​អាច​កំពុង​ប្រើ​ដោ​យ​ច្បាប់​ចម្លង​របស់​ Audacity ផ្សេង ។\n"
-
-#: AudacityApp.cpp:1068
-msgid "Do you still want to start Audacity?"
-msgstr "តើ​អ្នក​នៅ​តែ​ចង់​ចាប់ផ្ដើម Audacity មែន​ទេ ?"
-
-#: AudacityApp.cpp:1070
-msgid "Error locking temporary folder"
-msgstr "កំហុស​ក្នុង​ការ​ចាក់សោ​ថត​បណ្ដោះអាសន្ន"
-
-#: AudacityApp.cpp:1108
-msgid "The system has detected that another copy of Audacity is running.\n"
-msgstr "ប្រព័ន្ធ​បាន​​ដឹង​ថា មាន​ច្បាប់ចម្លង​របស់ Audacity ផ្សេង​កំពុង​រត់ ។\n"
-
-#: AudacityApp.cpp:1110
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
-"process to open multiple projects simultaneously.\n"
-msgstr ""
-"ប្រើ​ពាក្យ​បញ្ជា​ថ្មី ឬ​ពាក្យ​បញ្ជា​ដែល​បើក​​នៅ​ក្នុង​ Audacity "
-"ដែលកំពុង​រត់​បច្ចុប្បន្ន\n"
-"ដំណើរការ​ដើម្បី​បើក​គម្រោង​ច្រើន​ដំណាល​គ្នា ។\n"
-
-#: AudacityApp.cpp:1111
-msgid "Audacity is already running"
-msgstr "Audacity កំពុង​រត់​​រួច​​ហើយ"
-
-#: AudacityApp.cpp:1128
-msgid "Command-line options supported:"
-msgstr "បានគាំទ្រ​ជម្រើស​​បន្ទាត់​​ពាក្យ​​បញ្ជា ៖"
-
-#. i18n-hint: '-help' is the option and needs to stay in
-#. * English. This displays a list of available options
-#: AudacityApp.cpp:1131
-msgid "\t-help (this message)"
-msgstr "\t-help (សារ​នេះ)"
-
-#. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1133
-msgid "\t-version (display Audacity version)"
-msgstr "\t-version (បង្ហាញ​​កំណែ​​របស់ Audacity)"
-
-#. i18n-hint '-test' is the option and needs to stay in
-#. * English. This runs a set of automatic tests on audacity
-#. * itself
-#: AudacityApp.cpp:1137
-msgid "\t-test (run self diagnostics)"
-msgstr "\t-test (រត់​​ការ​វិនិច្ឆ័យ​ដោយ​​ខ្លួន​ឯង)"
-
-#. i18n-hint '-blocksize' is the option and needs to stay in
-#. * English. 'nnn' is any integer number. This controls the
-#. * size pieces that audacity uses when writing files to the
-#. * disk
-#: AudacityApp.cpp:1142
-msgid "\t-blocksize nnn (set max disk block size in bytes)"
-msgstr "\t-blocksize nnn (កំណត់​​ទំហំ​ប្លុក​​ថាស​​អតិបរមា​​គិត​ជា​​បៃ)"
-
-#: AudacityApp.cpp:1143
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
-msgstr "ជា​ការ​បន្ថែម បញ្ជាក់​ឈ្មោះ​របស់​ឯកសារ​អូឌីយ៉ូ គម្រោង​របស់ Audacity ដើម្បី​បើក​វា ។"
-
-#: AudacityApp.cpp:1415
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
-"associated with Audacity. \n"
-"\n"
-"Associate them, so they open on double-click?"
-msgstr ""
-"ឯកសារ​គម្រោង Audacity (.AUP) បច្ចុប្បន្ន​មិន \n"
-"ទាក់ទង​ជាមួយ Audacity ទេ ។\n"
-"\n"
-"ភ្ជាប់​​ពួកវា ដូច្នេះ​ពួកវា​បើ​ក​ដោយ​ចុច​ទ្វេដង ?"
-
-#: AudacityApp.cpp:1416
-msgid "Audacity Project Files"
-msgstr "ឯកសារ​​គម្រោង​​របស់ Audacity"
-
-#: AudioIO.cpp:219
-msgid "Could not find any audio devices.\n"
-msgstr "មិន​អាច​​រក​ឧបករណ៍​អូឌីយ៉ូ​ណាមួយ​បាន​ទេ ។\n"
-
-#: AudioIO.cpp:220
-msgid ""
-"You will not be able to play or record audio.\n"
-"\n"
-msgstr ""
-"អ្នក​នឹង​មិនអាច​ចាក់ ឬ​ថត​អូឌីយ៉ូ​បាន​ទេ ។\n"
-"\n"
-
-#: AudioIO.cpp:223
-msgid "Error: "
-msgstr "កំហុស ៖ "
-
-#: AudioIO.cpp:226
-msgid "Error Initializing Audio"
-msgstr "កំហុស​ក្នុង​កា​រចាប់ផ្ដើម​អូឌីយ៉ូ"
-
-#: AudioIO.cpp:1236
-msgid "Latency problem"
-msgstr "បញ្ហា​​ជាក់ស្ដែង"
-
-#: AudioIO.cpp:1236
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
-"Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
-msgstr ""
-"ការ​កំណត់ជាក់ស្ដែង​បានបណ្ដាល​ឲ្យ​អូឌីយ៉ូ​ដែល​បានថត​លាក់​មុន​សូន្យ ។\n"
-"Audacity បាន​នាំវា​ត្រឡប់ដើម្បី​ចាប់ផ្ដើម​នៅ​សូន្យ ។\n"
-"អ្នក​អាច​ត្រូវ​ប្រើឧបករណ៍​ប្ដូរ​ពេលវេលា (Time Shift Tool) (<---> ឬ F5) "
-"ដើម្បី​អូស​បទ​ទៅ​កន្លែង​ដែល​ត្រឹមត្រូវ ។"
-
-#: AutoRecovery.cpp:54
-msgid "Automatic Crash Recovery"
-msgstr "សង្គ្រោះ​ការគាំង​ដោយ​ស្វ័យ​ប្រវត្តិ"
-
-#: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
-"Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"គម្រោង​មួយ​ចំនួន​មិន​ត្រូវ​បាន​រក្សាទុកត្រឹមត្រូវ​ទេ នៅ​ពេលចុង​ក្រោយដែល Audacity ត្រូវ​បាន​រត់ ។\n"
-"ជា​កុសល គម្រោង​ដូច​ខាង​ក្រោម​អាច​ត្រូវ​បាន​សង្គ្រោះ​ដោយ​ស្វ័យ​ប្រវត្តិ ៖"
-
-#: AutoRecovery.cpp:75
-msgid "Recoverable projects"
-msgstr "គម្រោង​​ដែល​​អាច​​សង្គ្រោះ​បាន"
-
-#: AutoRecovery.cpp:78 Tags.cpp:1999
-msgid "Name"
-msgstr "ឈ្មោះ"
-
-#: AutoRecovery.cpp:84
-msgid "Recovering a project will not change any files on disk before you save it."
-msgstr "កា​រសង្គ្រោះ​គម្រោង​នឹង​មិន​ផ្លាស់ប្ដូរ​ឯកសារ​ណាមួយ​នៅ​លើ​ថាស​ទេ​មុន​ពេល​អ្នក​រក្សា​វា​ទុក ។"
-
-#: AutoRecovery.cpp:88
-msgid "Quit Audacity"
-msgstr "បិទ Audacity"
-
-#: AutoRecovery.cpp:89
-msgid "Don't recover"
-msgstr "កុំ​សង្គ្រោះ"
-
-#: AutoRecovery.cpp:90
-msgid "Recover projects"
-msgstr "សង្គ្រោះ​​គម្រោង"
-
-#: AutoRecovery.cpp:127
-msgid ""
-"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?"
-msgstr ""
-"អ្នក​បាន​ជ្រើស​មិន​ឲ្យ​សង្គ្រោះគម្រោង​ណាមួយ​ទេ ។ "
-"អ្នកនឹង​មិនអាច​សង្គ្រោះ​គម្រោង​ទាំងនោះ​ពេល​ក្រោយ​បាន​ទេ "
-"ប្រសិន​បើ​អ្នកប្ដូរ​ចិត្ត ។ តើ​អ្នក​ពិត​ជា​ចង់​បន្ត​ដោយ​មិន​សង្គ្រោះ​ទេ ?"
-
-#: AutoRecovery.cpp:128
-msgid "Question"
-msgstr "សំណួរ"
-
-#: AutoRecovery.cpp:146 AutoRecovery.cpp:183
-msgid "Could not enumerate files in auto save directory"
-msgstr "មិន​អាច​រាយ​ឈ្មោះ​​ឯកសារ​​នៅ​​ក្នុង​ថត​​រក្សាទុក​​ដោយ​​ស្វ័យ​ប្រវត្តិ​​បានទេ"
-
-#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2545 Menus.cpp:4443
-#: Project.cpp:1937 Project.cpp:3281 Project.cpp:3360 WaveTrack.cpp:542
-#: WaveTrack.cpp:561 WaveTrack.cpp:1650 effects/Effect.cpp:346
-#: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
-#: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
-#: toolbars/ControlToolBar.cpp:840
-msgid "Error"
-msgstr "កំហុស"
-
-#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
-msgid "Select Command"
-msgstr "ជ្រើស​​ពាក្យ​បញ្ជា"
-
-#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:454
-#: prefs/KeyConfigPrefs.cpp:142
-msgid "&Command"
-msgstr "ពាក្យ​បញ្ជា"
-
-#: BatchCommandDialog.cpp:82
-msgid "&Edit Parameters"
-msgstr "កែសម្រួល​ប៉ារ៉ាម៉ែត្រ"
-
-#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:455
-msgid "&Parameters"
-msgstr "ប៉ារ៉ាម៉ែត្រ"
-
-#: BatchCommandDialog.cpp:94
-msgid "C&hoose command"
-msgstr "ជ្រើស​ពាក្យ​បញ្ជា"
-
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
-msgstr "រក​មិន​ឃើញ​​បែបផែន​​ស្តេរ៉េអូ​ទៅ​​ជា​​ម៉ូណូ"
-
-#: BatchCommands.cpp:497
-msgid "Ogg Vorbis support is not included in this build of Audacity"
-msgstr "ការ​គាំទ្រ Ogg Vorbis មិន​ត្រូវ​បាន​រួម​បញ្ចូល​នៅ​ក្នុង​ការ​ស្ថាបនា​របស់ Audacity ទេ"
-
-#: BatchCommands.cpp:509
-msgid "FLAC support is not included in this build of Audacity"
-msgstr "ការ​គាំទ្រ FLAC មិន​ត្រូវ​បាន​រួម​បញ្ចូល​ក្នុង​ការ​ស្ថាបនា​របស់ Audacity ទេ"
-
-#: BatchCommands.cpp:513
-#, c-format
-msgid "Command %s not implemented yet"
-msgstr "មិន​បាន​​អនុវត្ត​​ពាក្យ​បញ្ជា %s នៅ​​ឡើយ​ទេ"
-
-#: BatchCommands.cpp:529
-#, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
-" to %s."
-msgstr ""
-"មិនអាច​កំណត់​ប៉ារ៉ាម៉ែត្រ​របស់បែបផែន %s\n"
-" ទៅ %s បាន​ទេ ។"
-
-#: BatchCommands.cpp:583
-#, c-format
-msgid "Your batch command of %s was not recognised."
-msgstr "មិន​ស្គាល់​ពាក្យ​​បញ្ជា​បាច់​របស់ %s ។"
-
-#: BatchCommands.cpp:674
-#, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
-"\n"
-"%s"
-msgstr ""
-"អនុវត្ត %s ជា​មួយ​ប៉ារ៉ាម៉ែត្រ\n"
-"\n"
-"%s"
-
-#: BatchCommands.cpp:675 BatchCommands.cpp:680
-msgid "Test Mode"
-msgstr "របៀប​​សាកល្បង"
-
-#: BatchCommands.cpp:679
-#, c-format
-msgid "Apply %s"
-msgstr "អនុវត្ត %s"
-
-#: BatchProcessDialog.cpp:60 BatchProcessDialog.cpp:70
-#: BatchProcessDialog.cpp:71
-msgid "Apply Chain"
-msgstr "អនុវត្ត​ច្រវាក់"
-
-#: BatchProcessDialog.cpp:94
-msgid "&Select chain"
-msgstr "ជ្រើស​ច្រវាក់"
-
-#: BatchProcessDialog.cpp:99
-msgid "Chain"
-msgstr "ច្រវាក់"
-
-#: BatchProcessDialog.cpp:106
-msgid "Apply to Current &Project"
-msgstr "អនុវត្ត​ទៅ​គម្រោង​បច្ចុប្បន្ន"
-
-#: BatchProcessDialog.cpp:107
-msgid "Apply to &Files..."
-msgstr "អនុវត្ត​ទៅ​ឯកសារ..."
-
-#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2038
-#: Tags.cpp:2042 Tags.cpp:2342 Tags.cpp:2346 UploadDialog.cpp:180
-#: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:183
-#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:437
-#: effects/audiounits/AudioUnitEffect.cpp:882 effects/vamp/VampEffect.cpp:411
-msgid "&Cancel"
-msgstr "បោះបង់"
-
-#: BatchProcessDialog.cpp:146 BatchProcessDialog.cpp:191
-msgid "No chain selected"
-msgstr "គ្មាន​ស្រវាក់​បានជ្រើស"
-
-#: BatchProcessDialog.cpp:159
-#, c-format
-msgid "Applying '%s' to current project"
-msgstr "អនុវត្ត '%s' ទៅ​គម្រោង​បច្ចុប្បន្ន"
-
-#: BatchProcessDialog.cpp:200
-msgid "Please save and close the current project first."
-msgstr "សូម​រក្សាទុក និង​បិទ​គម្រោង​បច្ចុប្បន្ន​សិន ។"
-
-#: BatchProcessDialog.cpp:207
-msgid "Select file(s) for batch processing..."
-msgstr "ជ្រើស​ឯកសារ​សម្រាប់​ដំណើរការ​បាច់..."
-
-#: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
-msgstr ""
-"ឯកសារ​ទាំងអស់ (*.*)|*.*|ឯកសារ WAV (*.wav)|*.wav|ឯកសារ AIFF (*.aif)|*.aif|ឯកសារ AU "
-"(*.au)|*.au|ឯកសារ MP3 (*.mp3)|*.mp3|ឯកសារ Ogg Vorbis​ (*.ogg)|*.ogg|"
-"ឯកសារ FLAC​ (*.flac)|*.flac"
-
-#: BatchProcessDialog.cpp:231
-msgid "Applying..."
-msgstr "កំពុង​​អនុវត្ត..."
-
-#: BatchProcessDialog.cpp:241
-msgid "File"
-msgstr "ឯកសារ"
-
-#: BatchProcessDialog.cpp:356 BatchProcessDialog.cpp:360
-#: BatchProcessDialog.cpp:361
-msgid "Edit Chains"
-msgstr "កែសម្រួល​​ច្រវាក់"
-
-#: BatchProcessDialog.cpp:416
-msgid "&Chains"
-msgstr "ច្រវាក់"
-
-#: BatchProcessDialog.cpp:435 Tags.cpp:782 Tags.cpp:1422 Tags.cpp:2022
-msgid "&Add"
-msgstr "បន្ថែម"
-
-#: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:783 Tags.cpp:1423
-#: Tags.cpp:2023 TrackPanel.cpp:3985
-msgid "&Remove"
-msgstr "យកចេញ"
-
-#: BatchProcessDialog.cpp:437
-msgid "Re&name"
-msgstr "ប្ដូរ​ឈ្មោះ"
-
-#: BatchProcessDialog.cpp:443
-msgid "C&hain (Double-Click or press SPACE to edit)"
-msgstr "ច្រវាក់ (ចុចទ្វេ​ដង ឬ​ចុច​ចន្លោះ​មិនឃើញ (SPACE) ដើម្បី​កែសម្រួល)"
-
-#. i18n-hint: This is the number of the command in the list
-#: BatchProcessDialog.cpp:453
-msgid "No"
-msgstr "លេខ​រៀង"
-
-#: BatchProcessDialog.cpp:459
-msgid "&Insert"
-msgstr "បញ្ចូល"
-
-#: BatchProcessDialog.cpp:460
-msgid "De&lete"
-msgstr "លុប"
-
-#: BatchProcessDialog.cpp:461
-msgid "Move &Up"
-msgstr "ផ្លាស់ទី​ឡើងលើ"
-
-#: BatchProcessDialog.cpp:462
-msgid "Move &Down"
-msgstr "ផ្លាស់ទី​ចុះក្រោម"
-
-#: BatchProcessDialog.cpp:463
-msgid "De&faults"
-msgstr "លំនាំដើម"
-
-#: BatchProcessDialog.cpp:507
-msgid "- END -"
-msgstr "- ចប់ -"
-
-#: BatchProcessDialog.cpp:540
-#, c-format
-msgid "%s changed"
-msgstr "បាន​ផ្លាស់ប្ដូរ %s"
-
-#: BatchProcessDialog.cpp:541
-msgid "Do you want to save the changes?"
-msgstr "តើ​អ្នក​ពិត​ជា​ចង់​រក្សាទុក​កា​រផ្លាស់ប្ដូរ​មែនទេ ?"
-
-#: BatchProcessDialog.cpp:623
-msgid "Enter name of new chain"
-msgstr "បញ្ចូល​ឈ្មោះ​របស់​ច្រវាក់​ថ្មី"
-
-#: BatchProcessDialog.cpp:634
-msgid "Name must not be blank"
-msgstr "ឈ្មោះ​មិន​អាច​ទទេ​បាន​ទេ"
-
-#: BatchProcessDialog.cpp:643
-#, c-format
-msgid "Names may not contain '%c' and '%c'"
-msgstr "ឈ្មោះ​​មិន​​អាច​​មាន '%c' និង '%c'"
-
-#: BatchProcessDialog.cpp:673
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "តើ​​អ្នក​​ប្រាកដ​​ជា​​ចង់​​លុប %s ឬ ?"
-
-#: Dependencies.cpp:139
-msgid "Removing Dependencies"
-msgstr "យក​​ភាព​អាស្រ័យ​​ចេញ"
-
-#: Dependencies.cpp:140
-msgid "Copying audio data into project..."
-msgstr "កំពុង​​ចម្លង​​ទិន្នន័យ​​អូឌីយ៉ូ​​ទៅ​​គម្រោង..."
-
-#: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
-"This will need more disc space but is safer."
-msgstr ""
-"បច្ចុប្បន្ន​គម្រោង​របស់​អ្នក​អាស្រ័យ​លើ​វត្តមាន​របស់​ឯកសារ​ផ្សេង ។\n"
-"ចម្លង​អូឌីយ៉ូ​ពី​ឯកសារ​ដូច​ខាង​ក្រោម "
-"ទៅ​ក្នុងគម្រោង​របស់​អ្នក​​ដើម្បី​ធ្វើ​ឲ្យ​វាមានដោយ​ខ្លួន​ឯង ?\n"
-"វា​នឹង​ត្រូវការ​ទំហំ​ថាស​បន្ថែម ប៉ុន្តែ​សុវត្ថិភាព​ជាង ។"
-
-#: Dependencies.cpp:266
-msgid "Project depends on other audio files"
-msgstr "គម្រោង​​ផ្អែក​​លើ​​ឯកសារ​​អូឌីយ៉ូ​​ផ្សេង​​ទៀត"
-
-#: Dependencies.cpp:287
-msgid "Project Dependencies"
-msgstr "ភាព​​អាស្រ័យ​​របស់​​គម្រោង"
-
-#: Dependencies.cpp:290
-msgid "Audio file"
-msgstr "ឯកសារ​​អូឌីយ៉ូ"
-
-#: Dependencies.cpp:292
-msgid "Disk space"
-msgstr "ទំហំ​ថាស"
-
-#: Dependencies.cpp:297
-msgid "Copy Selected Audio Into Project"
-msgstr "ចម្លង​​អូឌីយ៉ូ​​ដែល​​បាន​ជ្រើស​​ទៅ​​គម្រោង"
-
-#: Dependencies.cpp:304 Dependencies.cpp:413
-msgid "Cancel Save"
-msgstr "បោះបង់​​ការ​រក្សាទុក"
-
-#: Dependencies.cpp:305
-msgid "Don't Copy any Audio"
-msgstr "កុំ​ចម្លង​​អូឌីយ៉ូ​​ណាមួយ"
-
-#: Dependencies.cpp:311
-msgid "Copy All Audio Into Project (safer)"
-msgstr "ចម្លង​​អូឌីយ៉ូ​​ទាំងអស់​​ទៅ​​គម្រោង (សុវត្ថិភាព​ជាង)"
-
-#: Dependencies.cpp:320 Dependencies.cpp:325
-msgid "Ask me"
-msgstr "សួរ​ខ្ញុំ"
-
-#: Dependencies.cpp:321
-msgid "Always copy all audio (safest)"
-msgstr "ចម្លង​​អូឌីយ៉ូ​​ទាំងអស់​​ជា​និច្ច (សុវត្ថិភាព​បំផុត)"
-
-#: Dependencies.cpp:322
-msgid "Never copy any audio"
-msgstr "កុំ​​​ចម្លង​​​អូឌីយ៉ូ​​​ណាមួយ"
-
-#: Dependencies.cpp:324
-msgid "Whenever a project depends on other files:"
-msgstr "នៅ​​ពេល​ណា​​​ដែល​​គម្រោង​​ផ្អែក​លើ​ឯកសារ​​ផ្សេង​​ទៀត ៖"
-
-#: Dependencies.cpp:412
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
-msgstr ""
-"បើសិនជា​អ្នក​បន្ត គម្រោង​របស់​អ្នក​នឹង​មិន​ត្រូវ​បាន​រក្សាទុក​ក្នុង​ថាស​ទេ ។ "
-"តើនេះ​ជា​អ្វី​ដែលអ្នក​ចង់​បាន​មែនទេ ?"
-
-#: Dependencies.cpp:452
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
-msgstr ""
-"គម្រោង​របស់​អ្នក​មាន​ខ្លួន​ឯង "
-"វា​មិន​អាស្រ័យ​លើ​ឯកសារ​អូឌីយ៉ូ​ខាង​ក្រៅ​ណាមួយ​ទេ ។"
-
-#: Dependencies.cpp:453
-msgid "Dependency check"
-msgstr "ការ​ពិនិត្យ​​ភាព​អាស្រ័យ"
-
-#: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
-"Please select another temporary directory in your preferences."
-msgstr ""
-"ព្រមាន ៖ មាន​ទំហំថាស​ទំនេរ​តិចតួច​បំផុត​ដែល​នៅ​សល់​​នៅ​​លើ​​ភាគ​ថាស​​នេះ ។\n"
-"សូម​​ជ្រើស​​ថត​​បណ្ដោះអាសន្ន​​ផ្សេង​​ទៀត​​នៅ​ក្នុង​​ចំណូល​ចិត្ត​​របស់​អ្នក​ "
-"។"
-
-#: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
-msgid "Progress"
-msgstr "វឌ្ឍនភាព"
-
-#: DirManager.cpp:285
-msgid "Cleaning up temporary files"
-msgstr "ជម្រះ​​ឯកសារ​​បណ្ដោះ​​អាសន្ន"
-
-#: DirManager.cpp:333
-msgid "Saving project data files"
-msgstr "រក្សាទុក​​ឯកសារ​​ទិន្នន័យ​​គម្រោង"
-
-#: DirManager.cpp:406
-msgid "Cleaning up cache directories"
-msgstr "ជម្រះ​​ថត​​ឃ្លាំង​សម្ងាត់"
-
-#: DirManager.cpp:493
-#, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
-msgstr ""
-"Audacity រកឃើញ​ឯកសា​រ​ប្លុក​​ដែល​កំព្រា %s ! \n"
-"សូម​​ពិចារណា​​រក្សាទុក "
-"និង​ផ្ទុក​​គម្រោង​​ឡើងវិញ​​ដើម្បី​​អនុវត្ត​ការ​​ពិនិត្យ​​គម្រោង​​ពេញលេញ ។\n"
-
-#. i18n-hint: This is the pattern for filenames that are created
-#. when a file needs to be backed up to a different name.  For
-#. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:985
-#, c-format
-msgid "%s-old%d"
-msgstr "%s-old%d"
-
-#: DirManager.cpp:993
-msgid "Unable to open/create test file"
-msgstr "មិន​​អាច​​បើក/បង្កើត​​ឯកសារ​​សាកល្បង"
-
-#: DirManager.cpp:1002
-#, c-format
-msgid "Unable to remove '%s'"
-msgstr "មិន​អាច​យក '%s' ចេញ​បាន​ទេ"
-
-#: DirManager.cpp:1007
-#, c-format
-msgid "Renamed file: %s\n"
-msgstr "បាន​​ប្ដូ​រឈ្មោះ​​ឯកសារ ៖ %s\n"
-
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "ផ្លាស់ប្ដូរ​​ប្លុក %s\n"
-
-#: DirManager.cpp:1051
-#, c-format
-msgid "Unable to rename '%s' to '%s'"
-msgstr "មិន​អាច​​ប្ដូរ​ឈ្មោះ '%s' ទៅ​​ជា '%s'"
-
-#: DirManager.cpp:1115 DirManager.cpp:1403
-msgid "Inspecting project file data..."
-msgstr "កំពុង​​ពិនិត្យ​​មើល​​ទិន្នន័យ​​ឯកសារ​​គម្រោង..."
-
-#: DirManager.cpp:1128
-#, c-format
-msgid "Orphaned blockfile: (%s)"
-msgstr "ឯកសារ​ប្លុក​​ដែល​កំព្រា ៖ (%s)"
-
-#: DirManager.cpp:1153
-#, c-format
-msgid "Missing alias file: (%s)"
-msgstr "បាត់​ឯកសារ​​ឈ្មោះ​​ក្លែងក្លាយ ៖ (%s)"
-
-#: DirManager.cpp:1173
-#, c-format
-msgid "Missing summary file: (%s.auf)"
-msgstr "បាត់​​ឯកសារ​​សង្ខេប ៖ (%s.auf)"
-
-#: DirManager.cpp:1193
-#, c-format
-msgid "Missing data file: (%s.au)"
-msgstr "បាត់​​ឯកសារ​​ទិន្នន័យ ៖ (%s.au)"
-
-#: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
-msgstr ""
-"រក​ឃើញ​​កា​រពិនិត្យ​​គម្រោង​​មិន​​ស្ថិតស្ថេរ "
-"ដោយ​ពិនិត្យ​ទិន្នន័យ​គម្រោង​ដែល​បាន​ផ្ទុក\n"
-"ចុច 'សេចក្ដីលម្អិត' សម្រាប់​កំហុស​បញ្ជី​ពេញលេញ ឬ 'យល់ព្រម' "
-"ដើម្បី​​បន្ត​​ទៅ​​ជម្រើស​​ជា​ច្រើន​​ទៀត ។"
-
-#: DirManager.cpp:1219
-#, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
-"unused and probably left over from a crash or some other bug.\n"
-"They should be deleted to avoid disk contention."
-msgstr ""
-"កា​រពិនិត្យ​គម្រោង​រកឃើញ​ឯកសារ​ប្លុក​កំព្រា %d ។ ឯកសារ​ទាំងនេះ​មិន​ត្រូវ​បានប្រើ\n"
-"និង​ត្រូវ​បានពន្យារពេល​ពី​ការគាំង ឬ​កំហុស​ផ្សេង​ទៀត ។\n"
-"ពួកវា​គួរ​ត្រូវ​បានលុប​ដើម្បី​ជៀសវាង​កា​រអះអាង​ថាស ។"
-
-#: DirManager.cpp:1224
-msgid "Delete orphaned files [safe and recommended]"
-msgstr "លុប​​ឯកសារ​​កំព្រា [សុវត្ថិភាព និង​​បានផ្ដល់​​អនុសាសន៍]"
-
-#: DirManager.cpp:1225
-msgid "Continue without deleting; silently work around the extra files"
-msgstr "បន្ត​​ដោយ​​មិន​លុប ដំណើរការ​​ដោយ​​ស្ងាត់​​ជុំវិញ​​ឯកសារ​​បន្ថែម"
-
-#: DirManager.cpp:1226
-msgid "Close project immediately with no changes"
-msgstr "បិទ​​គម្រោង​​ភ្លាមៗ​​ដោយ​​គ្មាន​ការ​ផ្លាស់ប្ដួរ"
-
-#: DirManager.cpp:1228 DirManager.cpp:1263 DirManager.cpp:1309
-#: DirManager.cpp:1351 export/Export.cpp:484 export/Export.cpp:501
-#: export/Export.cpp:520 widgets/Warning.cpp:55
-msgid "Warning"
-msgstr "ការ​ព្រមាន"
-
-#: DirManager.cpp:1254
-#, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
-"('alias files') are now missing.  There is no way for Audacity\n"
-"to recover these files automatically; you may choose to\n"
-"permanently fill in silence for the missing files, temporarily\n"
-"fill in silence for this session only, or close the project now\n"
-"and try to restore the missing files by hand."
-msgstr ""
-"ការ​​ពិនិត្យ​​គម្រោង​​បាន​​រក​ឃើញ​​ឯកសារ​​បញ្ចូល %d "
-"​កំពុង​​ត្រូវ​​បាន​​ប្រើ​​​នៅ​​នឹង​​កន្លែង\n"
-"('ឯកសារ​​ឈ្មោះ​​ក្លែងក្លាយ') ឥឡូវ​​បាត់បង់ ។  គ្មាន​​វិធី​​សម្រាប់ Audacity\n"
-"ដើម្បី​សង្គ្រោះ​ឯកសារ​ទាំងនេះ​ដោយ​ស្វ័យ​ប្រវត្តិ អ្នក​អាច​ជ្រើស​ដើម្បី\n"
-"បំពេញ​អចិន្ត្រៃយ៍​ដោយ​ស្ងាត់ៗ​សម្រាប់​ឯកសារ​ដែលបាត់ ជា​បណ្ដោះ​អាសន្ន\n"
-"កា​របំពេញ​ដោយ​ស្ងាត់​សម្រាប់​សម័យ​នេះ​តែប៉ុណ្ណោះ ឬ​បិទ​គម្រោង​ឥឡូវ\n"
-"និង​ព្យាយាម​ម្ដង​ទៀត​ដើម្បី​ស្ដារ​ឯកសារ​ដែល​បាត់​ដោយ​ដៃ ។"
-
-#: DirManager.cpp:1259
-msgid "Replace missing data with silence [permanent upon save]"
-msgstr "ជំនួស​​ទិន្នន័យ​​ដែល​បាត់​​​ដោយ​​ស្ងាត់ [អចិន្ត្រៃយ៍​​នៅ​​ពេល​រក្សាទុក]"
-
-#: DirManager.cpp:1260 DirManager.cpp:1348
-msgid "Temporarily replace missing data with silence [this session only]"
-msgstr ""
-"ជំនួស​​ទិន្នន័យ​​ដែល​​បាត់​ជា​​បណ្ដោះអាសន្ន​​ដោយ​​ស្ងាត់ "
-"[តែ​សម័យ​នេះ​ប៉ុណ្ណោះ]"
-
-#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
-msgid "Close project immediately with no further changes"
-msgstr "បិទ​​គម្រោង​​ភ្លាមៗ​​ដោយ​​គ្មាន​​កា​រផ្លាស់ប្ដូរ​​ផ្សេង​​ទៀត"
-
-#: DirManager.cpp:1300
-#, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
-"Audacity can fully regenerate these summary files from the\n"
-"original audio data in the project."
-msgstr ""
-"កា​រ​ពិនិត្យ​​គម្រោង​​បាន​រក​ឃើញ​​ឯកសារ​​សង្ខេប​​ដែល​​បាត់ %d (.auf) ។\n"
-"Audacity អាច​​បង្កើត​​ឯកសារ​​សង្ខេប​​ទាំងនេះ​​ពី​​ទិន្នន័យ​​អូឌីយ៉ូ​​ដើម​​នៅ"
-"​​ក្នុង​គម្រោង ។"
-
-#: DirManager.cpp:1305
-msgid "Regenerate summary files [safe and recommended]"
-msgstr "បង្កើត​​ឯកសារ​​សង្ខេប​​ឡើង​វិញ [សុវត្ថិភាព​ និង​បាន​ផ្ដល់​អនុសាសន៍]"
-
-#: DirManager.cpp:1306
-msgid "Fill in silence for missing display data [this session only]"
-msgstr ""
-"បំពេញ​​ដោយ​​ស្ងាត់​​សម្រាប់​​ទិន្នន័យ​​បង្ហាញ​​ដែល​​បាត់ "
-"[តែ​សម័យ​​នេះ​ប៉ុណ្ណោះ]"
-
-#: DirManager.cpp:1342
-#, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
-"probably due to a bug, system crash or accidental deletion.\n"
-"There is no way for Audacity to recover this lost data\n"
-"automatically; you may choose to permanently fill in silence\n"
-"for the missing data, temporarily fill in silence for this\n"
-"session only, or close the project now and try to restore the\n"
-"missing data by hand."
-msgstr ""
-"ការ​​ពិនិត្យ​​គម្រោង​​បាន​​រក​ឃើញ​​ឯកសារ​​ប្លុក​​ទិន្នន័យ​​អូឌីយ៉ូ​​ដែល​​បាត"
-"់ %d (.au)\n"
-"ប្រហែល​​ជា​​ដោយ​សារ​​កំហុស ការ​គាំង​របស់​ប្រព័ន្ធ ឬ​លុប​ដោយ​អចេតនា ។\n"
-"គ្មាន​វិធី​សម្រាប់ Audacity ដើម្បី​សង្គ្រោះ​ទិន្នន័យ​ដែល​បាត់\n"
-"ដោយ​ស្វ័យ​ប្រវត្តិ អ្នក​អាច​ជ្រើស​កា​របំពេញ​អចិន្ត្រៃយ៍​ដោយស្ងាត់\n"
-"សម្រាប់​ទិន្នន័យ​ដែល​បាត់ កា​របំពេញ​បណ្ដោះអាសន្ន​ដោយស្ងាត់​សម្រាប់\n"
-"តែ​សម័យ​ប៉ុណ្ណោះ​ ឬ​បិទ​គម្រោង​ឥឡូវ និង​ព្យាយាម​ស្ដារ​\n"
-"ទិន្នន័យ​ដែល​បាត់​ដោយ​ដៃ ។"
-
-#: DirManager.cpp:1347
-msgid "Replace missing data with silence [permanent immediately]"
-msgstr "ជំនួស​​ទិន្នន័យ​​ដែល​​បាត់​​ដោយ​​ស្ងាត់ [អចិន្ត្រៃយ៍​​ភ្លាម]"
-
-#: DirManager.cpp:1375
-msgid "Cleaning up unused directories in project data..."
-msgstr "កំពុង​​ជម្រះ​​ថត​​ដែល​​មិន​បាន​​ប្រើ​នៅ​​ក្នុង​​ទិន្នន័យ​​គម្រោង..."
-
-#: DirManager.cpp:1448
-msgid "Caching audio"
-msgstr "​​ដាក់​​អូឌីយ៉ូ​​ក្នុង​​ឃ្លាំង​សម្ងាត់"
-
-#: DirManager.cpp:1449
-msgid "Caching audio into memory..."
-msgstr "​​ដាក់​​អូឌីយ៉ូ​​ក្នុង​​ឃ្លាំង​សម្ងាត់​​ទៅ​​ក្នុង​​សតិ..."
-
-#: DirManager.cpp:1486
-msgid "Saving recorded audio"
-msgstr "រក្សាទុក​​អូឌីយ៉ូ​​ដែល​​បាន​ថត"
-
-#: DirManager.cpp:1487
-msgid "Saving recorded audio to disk..."
-msgstr "កំពុង​​រក្សាទុក​​អូឌីយ៉ូ​​ដែល​​បាន​ថត​​ទៅ​​ថាស..."
-
-#: FFT.cpp:379
-msgid "Rectangular"
-msgstr "ចតុកោណកែង"
-
-#: FreqWindow.cpp:104
-msgid "Frequency Analysis"
-msgstr "កា​រវិភាគ​​ប្រេកង់"
-
-#: FreqWindow.cpp:140 TrackPanel.cpp:507
-msgid "Spectrum"
-msgstr "វិសាលគម"
-
-#: FreqWindow.cpp:141
-msgid "Standard Autocorrelation"
-msgstr "ទំនាក់ទំនង​ដោយស្វ័យ​​ប្រវត្តិ​​ស្តង់ដារ"
-
-#: FreqWindow.cpp:142
-msgid "Cuberoot Autocorrelation"
-msgstr "ទំនាក់ទំនង​​ដោយ​ស្វ័យ​​ប្រវត្តិ​របស់ Cuberoot​"
-
-#: FreqWindow.cpp:143
-msgid "Enhanced Autocorrelation"
-msgstr "ទំនាក់ទំនង​​ដោយ​​ស្វ័យ​ប្រវត្តិ​​ដែល​​បាន​​បង្កើន"
-
-#. i18n-hint: This is a technical term, derived from the word
-#. "spectrum".  Do not translate it unless you are sure you
-#. know the correct technical word in your language.
-#: FreqWindow.cpp:147
-msgid "Cepstrum"
-msgstr "Cepstrum"
-
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "ក្បួន​ដោះស្រាយ ៖"
-
-#: FreqWindow.cpp:168 HistoryWindow.cpp:79
-msgid "Size"
-msgstr "ទំហំ"
-
-#. i18n-hint: This refers to a "window function", used in the
-#. Frequency analyze dialog box.
-#: FreqWindow.cpp:181
-msgid " window"
-msgstr " បង្អួច"
-
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "មុខងារ ៖"
-
-#: FreqWindow.cpp:192
-msgid "Linear frequency"
-msgstr "ប្រេកង់​​លីនេអ៊ែរ"
-
-#: FreqWindow.cpp:193
-msgid "Log frequency"
-msgstr "ប្រេកង់​​កំណត់​ហេតុ"
-
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "អ័ក្ស ៖"
-
-#: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:202 Menus.cpp:231
-msgid "&Export..."
-msgstr "នាំចេញ..."
-
-#: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:487
-#: effects/AutoDuck.cpp:521 effects/AutoDuck.cpp:789
-#: effects/Compressor.cpp:349 effects/Compressor.cpp:357
-#: effects/Equalization.cpp:1086 effects/Equalization.cpp:1088
-#: effects/Equalization.cpp:1096 effects/Equalization.cpp:1162
-#: effects/Equalization.cpp:1371 effects/Equalization.cpp:1382
-#: effects/Normalize.cpp:354 widgets/Meter.cpp:363
-msgid "dB"
-msgstr "dB"
-
-#. i18n-hint: This is the abbreviation for "Hertz", or
-#. cycles per second.
-#: FreqWindow.cpp:287 FreqWindow.cpp:442 effects/Equalization.cpp:1127
-#: effects/Equalization.cpp:1158 import/ImportRaw.cpp:416
-msgid "Hz"
-msgstr "Hz"
-
-#: FreqWindow.cpp:386
-msgid "Not enough data selected."
-msgstr "មិន​បាន​​ជ្រើស​​ទិន្នន័យ​​គ្រប់គ្រាន់ ។"
-
-#: FreqWindow.cpp:450 effects/AutoDuck.cpp:791
-msgid "s"
-msgstr "s"
-
-#: FreqWindow.cpp:779
-#, c-format
-msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
-msgstr "ទស្សន៍​ទ្រនិច ៖ %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
-
-#: FreqWindow.cpp:788
-#, c-format
-msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
-msgstr "ទស្សន៍​ទ្រនិច ៖ %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
-
-#: FreqWindow.cpp:1059
-msgid "spectrum.txt"
-msgstr "spectrum.txt"
-
-#: FreqWindow.cpp:1061
-msgid "Export Spectral Data As:"
-msgstr "នាំចេញ​ទិន្នន័យ​វិសាល​គម​​ជា ៖"
-
-#: FreqWindow.cpp:1077 LabelDialog.cpp:599 Menus.cpp:2177 Project.cpp:2379
-#: Project.cpp:3333 prefs/KeyConfigPrefs.cpp:180
-msgid "Couldn't write to file: "
-msgstr "មិន​អាច​សរសេរ​ទៅ​កាន់​ឯកសារ ៖ "
-
-#: FreqWindow.cpp:1082
-msgid "Frequency (Hz)\tLevel (dB)"
-msgstr "ប្រេកង់ (Hz)\tកម្រិត (dB)"
-
-#: FreqWindow.cpp:1088
-msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
-msgstr "រយៈពេល​​ខុស​គ្នា (វិនាទី)\tប្រេកង់ (Hz)\tកម្រិត"
-
-#: HelpText.cpp:53
-msgid " page."
-msgstr " ទំព័រ ។"
-
-#: HelpText.cpp:53
-msgid "Back to "
-msgstr "ត្រឡប់​ទៅ"
-
-#: HelpText.cpp:53
-msgid "Welcome"
-msgstr "ស្វាគមន៍"
-
-#: HelpText.cpp:60
-msgid "Welcome to Audacity!"
-msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity !"
-
-#: HelpText.cpp:65
-msgid "Playing Audio"
-msgstr "កំពុង​ចាក់​​អូឌីយ៉ូ"
-
-#: HelpText.cpp:69
-msgid "Recording Audio"
-msgstr "កំពុង​​ថត​​អូឌីយ៉ូ"
-
-#: HelpText.cpp:73
-msgid "Greyed Out Items"
-msgstr "ធាតុ​ពណ៌​ប្រផះ"
-
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr "នាំចេញ"
-
-#: HelpText.cpp:81
-msgid "Supported Formats"
-msgstr "ទ្រង់ទ្រាយ​​ដែល​​បាន​គាំទ្រ"
-
-#: HelpText.cpp:85
-msgid "No Local Help"
-msgstr "គ្មាន​ជំនួយ​​មូលដ្ឋាន"
-
-#: HelpText.cpp:97
-msgid "Welcome to Audacity 1.4.0! Let's get started!"
-msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity 1.4.0 ! ឥឡូវ​​​ចាប់ផ្ដើម !"
-
-#: HelpText.cpp:100
-msgid "You may want to click on the hyperlinks below to read:"
-msgstr "អ្នក​​ចង់​​ចុច​​លើ​​តំ​​ណ​ខ្ពស់​​ខាង​​ក្រោយ​​ដើម្បី​​អាន ៖"
-
-#: HelpText.cpp:103
-msgid " an existing sound file."
-msgstr " ឯកសារ​​សំឡេង​​ដែល​​មាន​ស្រាប់ ។"
-
-#: HelpText.cpp:103 HelpText.cpp:105 HelpText.cpp:107
-msgid "How to "
-msgstr "​វិធី"
-
-#: HelpText.cpp:103
-msgid "play back"
-msgstr "ចាក់​​ឡើងវិញ"
-
-#: HelpText.cpp:105
-msgid " a new sound file."
-msgstr " ឯកសារ​សំឡេង​ថ្មី ។"
-
-#: HelpText.cpp:105
-msgid "record"
-msgstr "ថត"
-
-#: HelpText.cpp:107
-msgid " sound and "
-msgstr " សំឡេង និង"
-
-#: HelpText.cpp:107
-msgid "edit"
-msgstr "កែសម្រួល"
-
-#: HelpText.cpp:108
-msgid " for an mp3 player."
-msgstr " សម្រាប់​​កម្មវិធីចាក់​ mp3"
-
-#: HelpText.cpp:108
-msgid "export"
-msgstr "នាំចេញ"
-
-#: HelpText.cpp:110
-msgid "This could save you from puzzling over why some functions in the "
-msgstr "វា​អាច​​ជួយ​អ្នក​ពី​កា​រច្រឡំ ហេតុអ្វី​មាន​មុខងារ​មួយ​ចំនួន​នៅ​ក្នុង "
-
-#: HelpText.cpp:111
-msgid " or why Audacity "
-msgstr " ឬ​ហេតុ​អ្វី មាន Audacity "
-
-#: HelpText.cpp:111
-msgid "menus are greyed out"
-msgstr "ម៉ឺនុយ​ត្រូវ​បាន​ធ្វើ​ឲ្យ​​មាន​​ពណ៌​ប្រផះ"
-
-#: HelpText.cpp:112
-msgid " when "
-msgstr " នៅ​ពេល "
-
-#: HelpText.cpp:112
-msgid "isn't recording anything"
-msgstr "មិន​ថត​អ្វី​ទាំង​អស់"
-
-#: HelpText.cpp:113
-msgid "you expect it to.  Or you may prefer to just try using Audacity and see "
-msgstr ""
-"អ្នក​​សង្ឃឹម​​ថា​វា​អញ្ចឹង ។ ឬ​អ្នក​ពេញចិត្ត​ "
-"ដោយ​គ្រាន់​​តែ​​សាក​ល្បង​​ប្រើ​ Audacity និង​​មើល "
-
-#: HelpText.cpp:114
-msgid "what you can do.  You can always get back to these instructions by using "
-msgstr "អ្វី​ដែល​អ្នក​អាចធ្វើ ។ អ្នក​តែងតែ​អាច​ទទួល​បាន​នូវ​សេចក្ដី​ណែនាំ ដោយ​ប្រើ "
-
-#: HelpText.cpp:115
-msgid "the 'Help' option in the menus, and then 'Show Welcome Message...' "
-msgstr "ជម្រើស 'ជំនួយ' នៅ​ក្នុង​ម៉ឺនុយ និង​បន្ទាប់​មក 'បង្ហាញ​សារ​ស្វាគមន៍...' "
-
-#: HelpText.cpp:117
-msgid "Welcome to Audacity."
-msgstr "សូម​ស្វាគមន៍​​មក​កាន់ Audacity ។"
-
-#: HelpText.cpp:125
-msgid "You can import files into Audacity by dragging them in, or use the File > "
-msgstr ""
-"អ្នក​​អាច​​នាំចូល​​ឯកសារ​​ទៅ​ក្នុង Audacity ដោយ​​អូស​ពួក​វា ឬ​ប្រើ​​ម៉ឺនុយ "
-"ឯកសារ > "
-
-#: HelpText.cpp:126
-msgid "Import > Audio command.<br><br>File > Open does the same, but opens a new "
-msgstr "នាំចូល > ពាក្យ​បញ្ជា​អូឌីយ៉ូ ។<br><br>ឯកសារ > បើក​ ធ្វើ​ដូចគ្នា ប៉ុន្តែ​បើកថ្មី"
-
-#: HelpText.cpp:127
-msgid "Audacity window.<br><br>These are the main formats Audacity will import for "
-msgstr "បង្អួច Audacity ។<br><br>មាន​​ទ្រង់ទ្រាយ​​សំខាន់ៗ ដែល Audacity នឹង​​នាំចូល "
-
-#: HelpText.cpp:128
-msgid "you: AIFF, AU, FLAC, [M4A (only on a Mac)], MP2/MP3, OGG Vorbis, WAV. "
-msgstr "អ្នក ៖ AIFF, AU, FLAC, [M4A (only on a Mac)], MP2/MP3, OGG Vorbis, WAV ។ "
-
-#: HelpText.cpp:129
-msgid ""
-"If your file is in some other format see (format help).<br><br>If you want "
-"to import an "
-msgstr ""
-"ប្រសិន​​បើ​​ឯកសារ​​របស់​​អ្នក​​នៅ​ក្នុងទ្រង់ទ្រាយ​​ផ្សេងៗ​មួយ​​ចំនួន សូមមើល "
-"(ជំនួយ​​​ទ្រង់ទ្រាយ) ។<br><br>ប្រសិន​​បើ​​អ្នក​ចង់​នាំ​ចូល "
-
-#: HelpText.cpp:130
-msgid ". To start playing your imported audio, "
-msgstr " ។ ដើម្បី​ចាប់ផ្ដើម​ចាក់​អូឌីយ៉ូ​ដែល​បាន​នាំចូល​របស់​អ្នក"
-
-#: HelpText.cpp:130
-msgid "audio CD, see "
-msgstr "ស៊ីឌី​អូឌីយ៉ូ មើល"
-
-#: HelpText.cpp:131
-msgid "press the green Play button. "
-msgstr "ចុច​ប៊ូតុង​​ចាក់​​ពណ៌​​បៃតង ។​ "
-
-#: HelpText.cpp:140
-msgid "To start recording, press the red Record button. Of course it's not quite "
-msgstr "ដើម្បី​ចាប់ផ្ដើម​ថត ចុច​ប៊ូតុង​ថត​ពណ៌​ក្រហម ។ តាមពិត​ វា​ពិត​ជា​"
-
-#: HelpText.cpp:141
-msgid "that easy. There are three crucial settings you need to make:"
-msgstr "ងាយស្រួល​​ ។ មាន​កា​រកំណត់​ចាំបាច់​ចំនួន​បី ដែល​អ្នក​ត្រូវ​ធ្វើ ៖​"
-
-#: HelpText.cpp:143
-msgid "(1) The \"Recording Device\", set in the Audio I/O tab of Preferences. "
-msgstr "(១) \"ឧបករណ៍​​​ថត\" កំណត់​​នៅ​ក្នុង​​ផ្ទាំង​អូឌីយ៉ូ I/O របស់​ប្រអប់ចូល​ចិត្ត ។ "
-
-#: HelpText.cpp:144
-msgid "By default Audacity will choose the current system device, usually your "
-msgstr "តាម​លំនាំដើម Audacity នឹង​ជ្រើស​ឧបករណ៍​​ប្រព័ន្ធ​​បច្ចុប្បន្ន តាម​ធម្មតា"
-
-#: HelpText.cpp:145
-msgid ""
-"inbuilt sound device, so you may not need to set this. But if you're using "
-"an "
-msgstr ""
-"ឧបករណ៍​​សំឡេង​​ដែល​​ជាប់​​របស់​​អ្នក ដូច្នេះ "
-"អ្នក​មិន​​​ចាំបាច់​​កំណត់​​វា​ទេ ។ ប៉ុន្តែ​ប្រសិន​បើ​អ្នក​កំពុង​ប្រើ"
-
-#: HelpText.cpp:146
-msgid "external USB or Firewire device such as a USB turntable, please check this "
-msgstr ""
-"ឧបករណ៍​​មាន​​ខ្សែ Firewire ឬ​​យូអេសប៊ី (USB) ត​ខាង​ក្រៅ "
-"ដូចជា​ម៉ាស៊ីន​​ចាក់​​ថាស​​យូអេសប៊ី (USB) សូម​ពិនិត្យ​"
-
-#: HelpText.cpp:147
-msgid "device is selected as your recording device. "
-msgstr "ឧបករណ៍​​នេះ ​ត្រូវ​​បាន​​​ជ្រើស​​​ជា​​​ឧបករណ៍​​ថត​​របស់​អ្នក ។"
-
-#: HelpText.cpp:149
-msgid "(2) The input source for your device, such as microphone, line-in [or "
-msgstr ""
-"(២) ប្រភព​​បញ្ចូល​​សម្រាប់​​ឧបករណ៍​របស់​​អ្នក ដូច​ជា ឧគ្ឃោសនា​សព្ទ ខ្សែ​ចូល "
-"[ឬ "
-
-#: HelpText.cpp:150
-msgid "stereo mix]. [If you're on Vista, choose your source in the \"Recording "
-msgstr ""
-"កា​រលាយស្តេរីអូ] ។ [ប្រសិន​បើ​អ្នក​នៅ​លើ​វីស្តា(Vista) "
-"ជ្រើស​ប្រភព​របស់​អ្នក​នៅ​ក្នុង​ \"ថត "
-
-#: HelpText.cpp:151
-msgid "Device\" on the Audio I/O tab as above.] [Mac info]. Otherwise, choose "
-msgstr ""
-"ឧបករណ៍\"​នៅ​​លើ​​ផ្ទាំង​​អូឌីយ៉ូ I/O ដូច​​ខាង​​លើ ។] [ព័ត៌មាន Mac] ។ "
-"បើ​​មិន​​ដូច្នេះ ជ្រើស"
-
-#: HelpText.cpp:152
-msgid "your input in the dropdown selector on the right of the Mixer Toolbar. "
-msgstr ""
-"ការ​បញ្ចូល​​របស់​អ្នក​​នៅ​​ក្នុង​​ឧបករណ៍​​ជ្រើស​​ទម្លាក់ចុះ "
-"នៅ​​ខាង​​ស្ដាំ​​របស់​​របារ​​ឧបករណ៍​​​កម្មវិធី​​លាយ ។"
-
-#: HelpText.cpp:153
-msgid "Note: many USB or Firewire devices won't have a choice of inputs, so "
-msgstr ""
-"ចំណាំ ៖ ឧបករណ៍​​យូអេសប៊ី (USB) ឬ​ Firewire ​នឹង​​គ្មាន​​​ជម្រើស​​​បញ្ចូល​​ទេ "
-"ដូច្នេះ"
-
-#: HelpText.cpp:154
-msgid "you can ignore this step - see the documentation for your device. "
-msgstr "អ្នក​អាច​មិនអើពើ​ជំហាន​នេះ - មើល​ឯកសារ​សម្រាប់​ឧបករណ៍​របស់​អ្នក ។ "
-
-#: HelpText.cpp:156
-msgid "(3) Input Volume: Before recording for real, make a test recording to set "
-msgstr ""
-"(៣) កម្រិត​​សំឡេង​​ចូល ៖ មុន​​នឹង​​ថត​ពិតៗ "
-"ធ្វើ​ការ​​សាកល្បង​​ថត​​ដើម្បី​​កំណត់ "
-
-#: HelpText.cpp:157
-msgid "the input level of your recording so that it's neither too soft or too loud. "
-msgstr ""
-"កម្រិត​​បញ្ចូល​​នៃ​​កា​រ​ថត​​របស់​​អ្នក ដូច្នេះ​​វា​មិន​​ស្រទន់​ពេក ឬ​ឮ​ពេក "
-"។ "
-
-#: HelpText.cpp:158
-msgid "To do this, adjust the input volume slider on the Mixer Toolbar (by the "
-msgstr ""
-"ដើម្បី​ធ្វើ​វា លៃតម្រូវ​​​គ្រាប់​​រំកិល​ក​ម្រិត​សំឡេង​​ចូល​​នៅ​​លើ​​របារ​ឧបក"
-"រណ៍​​កម្មវិធី​លាយ (ដោយ "
-
-#: HelpText.cpp:159
-msgid "microphone symbol) so that when you record, the levels on the red VU "
-msgstr ""
-"និម្មិត​សញ្ញា​​​ឧគ្ឃោសនា​សព្ទ) ដូច្នេះ នៅ​ពេល​អ្នក​ថត កម្រិត​នៅ​លើ VU "
-"ពណ៌​​ក្រហម"
-
-#: HelpText.cpp:160
-msgid "recording meter in the Meter Toolbar are close to (but not touching) "
-msgstr "ម៉ែត្រ​​ថត​​នៅ​ក្នុង​​របារ​ឧបករណ៍​​ម៉ែត្រ​​បិទ (ប៉ុន្តែ​​មិន​​ប៉ះពាល់) "
-
-#: HelpText.cpp:161
-msgid "the right edge of the scale. "
-msgstr "គែម​​ខាង​ស្ដាំ​​របស់​​មាត្រដ្ឋាន ។ "
-
-#: HelpText.cpp:163
-msgid "There is more help if you're stuck: our Recording FAQs, our Tutorial  \"Your "
-msgstr ""
-"មាន​​ជំនួយ​​បន្ថែម បើសិន​ជា​​អ្នកគាំង ៖ "
-"សូម​មើល​​សំណួរ​​ដែល​​សួរ​​ជាញឹកញាប់​​នៃ​​កា​រ​ថត​​របស់​យើង "
-"សូម​មើល​កា​របង្រៀន\""
-
-#: HelpText.cpp:164
-msgid " especially "
-msgstr "ជា​ពិសេស"
-
-#: HelpText.cpp:164
-msgid "First Recording\" in the Manual, and our Wiki "
-msgstr "កា​រ​ថត​ដំបូង\" នៅ​​ក្នុង​​សៀវភៅ និង​នៅ​​វីគី​​របស់​​យើង "
-
-#: HelpText.cpp:165
-msgid " section. "
-msgstr " ផ្នែក ។ "
-
-#: HelpText.cpp:165
-msgid "the "
-msgstr " នៃ"
-
-#: HelpText.cpp:174
-msgid ""
-"Editing: Audacity is a powerful editor, so you'll want to see what it can do "
-"with "
-msgstr ""
-"កែសម្រួល ៖ Audacity គឺ​​ជា​​កម្មវិធី​​កែសម្រួល​​ដ៏​​មាន​​អានុភាព ដូច្នេះ "
-"អ្ន​ក​​នឹង​​ចង់​ឃើញ​​អ្វី​​ដែល​​វា​អាច​​ធ្វើ​​ជា​មួយ"
-
-#: HelpText.cpp:175
-msgid "your imported file or recording.  The main commands you will use are under "
-msgstr ""
-"ឯកសារ​​ដែល​​បាន​នាំចូល ឬ​​ការ​​ថត​​របស់​​អ្នក ។  "
-"ពាក្យ​​បញ្ជា​​ចម្បង​​ដែល​​អ្នក​​នឹង​​ប្រើ​​ស្ថិត​​នៅ​ក្នុង"
-
-#: HelpText.cpp:176
-msgid "the Edit menu (such as cut, copy and paste) and under the Effect menu (you "
-msgstr ""
-"ម៉ឺនុយ​​​កែសម្រួល (ដូចជា កាត់ ចម្លង និង​បិទភ្ជាប់) "
-"និង​នៅ​​ក្នុង​​ម៉ឺនុយ​​បែបផែន (អ្នក "
-
-#: HelpText.cpp:177
-msgid "can do things like boost the bass, change pitch or tempo, or remove noise). "
-msgstr ""
-"អាច​​ធ្វើ​​​បាន​​ដូច​ជា​​ដំឡើង​​បាស ផ្លាស់ប្ដូរ​​កម្ពស់​​សំឡេង "
-"ឬ​ចង្វាក់​​ភ្លេង​ ឬ​យក​កា​រ​រំខាន​​ចេញ) ។ "
-
-#: HelpText.cpp:178
-msgid "There are two rules when editing:"
-msgstr "មាន​​ច្បាប់​​ពីរ​​នៅ​​ពេល​កែសម្រួល ៖"
-
-#: HelpText.cpp:180
-msgid "(1) if you're still playing or recording, use "
-msgstr "(១) បើសិនជា​អ្នក​នៅ​តែ​ចាក់ ឬ​ថត ប្រើ "
-
-#: HelpText.cpp:181
-msgid "the yellow Stop button, because you can't edit a moving track! "
-msgstr ""
-"ប៊ូតុង​​បញ្ឈប់​​ពណ៌​​បៃតង "
-"ពី​​ព្រោះ​អ្នក​​មិន​អាច​​កែសម្រួល​​​កា​រផ្លាស់ទី​​បទ​​បាន​ទេ !"
-
-#: HelpText.cpp:183
-msgid ""
-"(2) You'll see that on occasion some of the menus or buttons are greyed out "
-"or say "
-msgstr ""
-"(២) អ្នក​​នឹង​​ឃើញ​​នៅ​​ពេលខ្លះ​ម៉ឺនុយ "
-"ឬ​ប៊ូតុង​​មួយ​ត្រូ​វ​បាន​​ដាក់​​ពណ៌​ប្រផេះ ឬ​និយាយ "
-
-#: HelpText.cpp:184
-msgid ""
-"\"Disabled\", according to what you are trying to do. This is normal. For "
-"example "
-msgstr ""
-"\"បាន​បិទ\" ដោយយោង​តាម​​អ្វី​ដែល​​អ្នក​​កំពុង​​ព្យាយាម​​ធ្វើវា ។ "
-"វា​ជា​​រឿង​​​ធម្មតា​ទេ ។ ឧទាហរណ៍ "
-
-#: HelpText.cpp:185
-msgid "because you can't edit the audio while playing or recording, we grey out or "
-msgstr "ពីព្រោះ​អ្នក​មិន​អាច​កែសម្រួល​អូឌីយ៉ូ ខណៈពេល​ចាក់ ឬ​ថត យើង​ធ្វើ​វា​ឲ្យ​មានពណ៌​ប្រផេះ ឬ"
-
-#: HelpText.cpp:186
-msgid "disable commands until you press Stop.  Commands can sometimes be greyed "
-msgstr ""
-"បិទ​ពាក្យ​បញ្ជា រហូត​ដល់​អ្នក​ចុច​ បញ្ឈប់ ។  "
-"ពេល​ខ្លះ​ពាក្យ​​បញ្ជា​​​អាច​​ត្រូវ​បាន​​ធ្វើ​​ឲ្យ​​មាន​ពណ៌​ប្រផេះ "
-
-#: HelpText.cpp:187
-msgid "out or disabled for other reasons - for example you can't run effects until "
-msgstr ""
-"ចេញក្រៅ ឬ​បិទ​​​​សម្រាប់​​មូលហេតុ​​ផ្សេង - ឧទាហរណ៍ "
-"អ្នក​​មិន​អាច​​រត់​បែបផែន​​រហូត​​ទាល់​​តែ "
-
-#: HelpText.cpp:188
-msgid ""
-"you have audio on the screen, and you obviously cannot paste audio until "
-"you've "
-msgstr ""
-"អ្នក​មាន​​អូឌីយ៉ូ​​នៅ​​លើ​​អេក្រង់ "
-"និង​​អ្នក​​មិន​អាច​​បិទភ្ជាប់​​អូឌីយ៉ូ​​រហូត​ទាល់​តែ​​​អ្នក​​បាន"
-
-#: HelpText.cpp:189
-msgid "cut or copied it to Audacity's clipboard. "
-msgstr "កាត់ ឬ​ចម្លង​​វា​​ទៅ​ក្ដារ​តម្បៀត​ខ្ទាស់​​របស់ Audacity ។ "
-
-#: HelpText.cpp:199
-msgid "Text about exporting still to be written..."
-msgstr "អត្ថបទ​​រៀប​នឹង​​នាំចូល​​នៅ​​តែ​​ត្រូ​វ​បាន​​សរសេរ..."
-
-#: HelpText.cpp:209
-msgid "<p>Audacity can currently import WAV, AIFF, AU, MP2/MP3 and OGG Vorbis "
-msgstr "<p>Audacity បច្ចុប្បន្ន​​អាច​​នាំចូល WAV, AIFF, AU, MP2/MP3 និង OGG Vorbis"
-
-#: HelpText.cpp:210
-msgid "files."
-msgstr "ឯកសារ ។"
-
-#: HelpText.cpp:211
-msgid "<p>Audacity <b>cannot</b> import or export files in "
-msgstr "<p>Audacity <b>មិន​​អាច</b> នាំចូល ឬ​​នាំចេញ​​ឯកសារ "
-
-#: HelpText.cpp:212
-msgid "<b>WMA, AAC, RealAudio, Shorten (SHN)</b>, "
-msgstr "<b>WMA, AAC, RealAudio, ធ្វើ​ឲ្យខ្លី (SHN)</b>"
-
-#: HelpText.cpp:213
-msgid "or most other proprietary formats, or any kind of Digital Rights "
-msgstr ""
-"ឬ ភាគ​​ច្រើន​​ជា​​ទ្រង់ទ្រាយ​​កម្មវិធី​មាន​កម្មសិទ្ធិ "
-"ឬ​ប្រភេទ​​​​ណាមួយ​​របស់ Digital Rights"
-
-#: HelpText.cpp:214
-msgid "Management (DRM) protected file, including many purchased online such "
-msgstr ""
-"Management (DRM) បាន​ការពារ​​ឯកសារ "
-"រួម​មាន​​អ្វី​ដែល​​បាន​​ទិញ​លើ​​បណ្ដាញ​​​ជា​​ច្រើន​​ដូចជា"
-
-#: HelpText.cpp:215
-msgid "as on iTunes or Napster. Because of licensing and patent restrictions, "
-msgstr "នៅ​លើ iTunes ឬ Napster ។ ដោយ​សារ​តែ​អាជ្ញាបណ្ណ និង​​ការ​​​កម្រិត​​ប៉ាតង់ "
-
-#: HelpText.cpp:216
-msgid "we are not allowed to add these formats to Audacity. Future versions of "
-msgstr ""
-"យើង​​មិន​​ត្រូវ​បាន​​អនុញ្ញាត​​ឲ្យ​​បន្ថែម​​ទ្រង់ទ្រាយ​​ទាំង​នេះ​​​ទៅ "
-"Audacity ទេ។ កំណែ​​បន្ទាប់​​របស់ "
-
-#: HelpText.cpp:217
-msgid "Audacity might be able to support these formats using codecs installed "
-msgstr "Audacity អាច​​គាំទ្រ​ទ្រង់ទ្រាយ​​ទាំងនេះ ដោយ​​​ប្រើ​​កូឌីក​​ដែល​​​បាន​​ដំឡើង"
-
-#: HelpText.cpp:218
-msgid "in your operating system.</p> "
-msgstr "នៅ​​ក្នុង​​ប្រព័ន្ធ​​ប្រតិបត្តិការ​​របស់​​អ្នក ។</p> ​"
-
-#: HelpText.cpp:219
-msgid ""
-"<p>Some open formats are not yet supported by Audacity, including <b>Ogg "
-"Speex</b> "
-msgstr ""
-"<p>ទ្រង់ទ្រាយ​​បើក​​ចំហ​ខ្លះ​​មិន​ត្រូវ​​បាន​គាំទ្រ​​ដោយ Audacity "
-"នៅ​​ឡើយ​​​ទេ​ រួម​មាន <b>Ogg Speex</b> "
-
-#: HelpText.cpp:220
-msgid "and <b>FLAC</b>."
-msgstr "និង <b>FLAC</b> ។"
-
-#: HelpText.cpp:221
-msgid "<p>More information is available on line "
-msgstr "<p>ព័ត៌មាន​បន្ថែម​អាច​រក​បាន​នៅ​​លើ​​បណ្ដាញ "
-
-#: HelpText.cpp:222
-msgid ""
-"<a href=\"http://audacity.sourceforge.net/help/faq?s=files&i=wma-proprietary"
-"\">here</a> "
-msgstr ""
-"<a href=\"http://audacity.sourceforge.net/help/faq?s=files&i=wma-"
-"proprietary\">នៅ​​ទីនេះ</a> "
-
-#: HelpText.cpp:230
-msgid "<p>You don't appear to have Audacity help files on your machine. "
-msgstr "<p>អ្នក​មិន​មាន​ឯកសារ​ជំនួយ​របស់ Audacity នៅ​លើ​ម៉ាស៊ីន​​របស់​​អ្នក ។ "
-
-#: HelpText.cpp:231
-msgid "You can download the help files and then access them from "
-msgstr "អ្នក​​អាច​​ទាញយក​​ឯកសារ​​ជំនួយ ហើយ​​បន្ទាប់​​មក​​ចូល​ដំណើរ​ការ​​ពួកវា​​ពី "
-
-#: HelpText.cpp:232
-msgid "Audacity or you can click <a href=\"*URL*\">here</a> to read "
-msgstr "Audacity ឬ អ្នក​អាច​ចុច <a href=\"*URL*\">នៅ​ទីនេះ</a> ដើម្បី​អាន"
-
-#: HelpText.cpp:233
-msgid "the help online."
-msgstr "ជំនួយ​លើ​បណ្ដាញ ។"
-
-#: HistoryWindow.cpp:53
-msgid "Undo History"
-msgstr "មិនធ្វើ​ប្រវត្តិ​វិញ"
-
-#: HistoryWindow.cpp:72
-msgid "Manage History"
-msgstr "គ្រប់គ្រង​​ប្រវត្តិ"
-
-#: HistoryWindow.cpp:78
-msgid "Action"
-msgstr "សកម្មភាព"
-
-#: HistoryWindow.cpp:86
-msgid "&Undo Levels Available"
-msgstr "មិន​ធ្វើ​កម្រិត​​ដែល​​មាន​វិញ"
-
-#: HistoryWindow.cpp:92
-msgid "Levels To Discard"
-msgstr "កម្រិត​​ត្រូវ​​បោះបង់"
-
-#: HistoryWindow.cpp:102
-msgid "&Discard"
-msgstr "បោះបង់"
-
-#: HistoryWindow.cpp:111 Tags.cpp:2039 Tags.cpp:2041 Tags.cpp:2343
-#: Tags.cpp:2345 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
-#: effects/vamp/VampEffect.cpp:414 export/ExportCL.cpp:396
-msgid "&OK"
-msgstr "យល់ព្រម"
-
-#: Internat.cpp:176
-msgid "Unable to determine"
-msgstr "មិន​អាច​​កំណត់"
-
-#: Internat.cpp:180 import/ImportRaw.cpp:392
-msgid "bytes"
-msgstr "បៃ"
-
-#: Internat.cpp:182
-msgid "KB"
-msgstr "គីឡូបៃ"
-
-#: Internat.cpp:185
-msgid "MB"
-msgstr "មេកាបៃ"
-
-#: Internat.cpp:188
-msgid "GB"
-msgstr "ជីកាបៃ"
-
-#: LabelDialog.cpp:52
-msgid "Track"
-msgstr "បទ"
-
-#: LabelDialog.cpp:53 Menus.cpp:4019 Menus.cpp:4047
-msgid "Label"
-msgstr "ស្លាក"
-
-#: LabelDialog.cpp:54
-msgid "Start Time"
-msgstr "ពេលវេលា​​ចាប់ផ្ដើម"
-
-#: LabelDialog.cpp:55
-msgid "End Time"
-msgstr "ពេលវេលា​​បញ្ចប់"
-
-#: LabelDialog.cpp:98 Menus.cpp:615
-msgid "&Edit Labels"
-msgstr "កែសម្រួល​​ស្លាក"
-
-#: LabelDialog.cpp:113
-msgid "Press F2 or double click to edit cell contents."
-msgstr "ចុច F2 ឬ​​ចុច​​ទ្វេ​ដង​​ដើម្បី​​កែសម្រួល​​មាតិកា​​ក្រឡា ។"
-
-#: LabelDialog.cpp:124
-msgid "Insert &After"
-msgstr "បញ្ចូល​​​​បន្ទាប់"
-
-#: LabelDialog.cpp:125
-msgid "Insert &Before"
-msgstr "បញ្ចូល​​មុន"
-
-#: LabelDialog.cpp:127 Menus.cpp:192
-msgid "&Import..."
-msgstr "នាំចូល..."
-
-#: LabelDialog.cpp:155
-msgid "New..."
-msgstr "ថ្មី..."
-
-#: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
-"skipped when repopulating the Label Tracks.\n"
-"\n"
-"Would you like to go back and provide names?"
-msgstr ""
-"អ្នក​​មាន​​ឈ្មោះ​ស្លាក​​​​ទទេ​​​ដែល​​នៅ​សល់ ។  ទាំងនេះ​​​នឹង​​ត្រូវ​​បាន​\n"
-"រំលង នៅ​ពេល​​គណនា​​បទ​ស្លាក​​ឡើងវិញ ។\n"
-"\n"
-"តើ​​អ្នក​ចង់​​ត្រឡប់​ក្រោយ និង​​ដាក់​​ឈ្មោះ​​ដែរ​​ឬទេ ?"
-
-#: LabelDialog.cpp:353
-msgid "Confirm"
-msgstr "អះអាង"
-
-#: LabelDialog.cpp:514 Menus.cpp:3517
-msgid "Select a text file containing labels..."
-msgstr "ជ្រើស​​ឯកសារ​​អត្ថបទ​​ដែល​​មាន​​ស្លាក..."
-
-#: LabelDialog.cpp:518 Menus.cpp:3521
-msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
-msgstr "ឯកសារ​​អត្ថបទ (*.txt)|*.txt|ឯកសារ​​ទាំង​អស់ (*.*)|*.*"
-
-#: LabelDialog.cpp:532 Menus.cpp:3533 Project.cpp:1800 Project.cpp:1808
-#: import/ImportMIDI.cpp:31
-msgid "Could not open file: "
-msgstr "មិន​​អាច​​បើក​​ឯកសារ ៖ "
-
-#: LabelDialog.cpp:558
-msgid "No labels to export."
-msgstr "គ្មាន​​ស្លាក​​ត្រូវ​នាំចេញ ។"
-
-#: LabelDialog.cpp:564 Menus.cpp:2142
-msgid "Export Labels As:"
-msgstr "នាំចេញ​​ស្លាក​ជា ៖"
-
-#: LabelDialog.cpp:566 Menus.cpp:2140
-msgid "labels.txt"
-msgstr "labels.txt"
-
-#: LabelDialog.cpp:699
-msgid "New Label Track"
-msgstr "បទ​ស្លាក​​ថ្មី"
-
-#: LabelDialog.cpp:700
-msgid "Enter track name"
-msgstr "បញ្ចូល​ឈ្មោះ​​បទ"
-
-#: LabelDialog.cpp:701 LabelDialog.h:52 LabelTrack.cpp:88 Menus.cpp:547
-msgid "&Label Track"
-msgstr "បទ​​ស្លាក"
-
-#: LangChoice.cpp:57
-msgid "Audacity First Run"
-msgstr "ដំបូង​រត់ Audacity"
-
-#: LangChoice.cpp:84
-msgid "Choose Language for Audacity to use:"
-msgstr "ជ្រើស​​ភាសា​​សម្រាប់ Audacity ដើម្បី​​ប្រើ ៖"
-
-#: Legacy.cpp:356
-#, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
-"The old file has been saved as '%s'"
-msgstr ""
-"បាន​បម្លែង​​ឯកសារ​​គម្រោង ១.០ ទៅ​​ជា​​ទ្រង់ទ្រាយ​​ថ្មី ។\n"
-"ឯកសារ​​ចាស់​​ត្រូវ​បាន​​រក្សាទុក​​ជា '%s'"
-
-#: Legacy.cpp:357
-msgid "Opening Audacity Project"
-msgstr "បើក​​គម្រោង Audacity"
-
-#: Menus.cpp:162
-msgid "&File"
-msgstr "ឯកសារ"
-
-#: Menus.cpp:164
-msgid "&New\tCtrl+N"
-msgstr "ថ្មី\tបញ្ជា(Ctrl)+N"
-
-#: Menus.cpp:166
-msgid "&Open...\tCtrl+O"
-msgstr "បើក...\tបញ្ជា(Ctrl)+O"
-
-#: Menus.cpp:171
-msgid "&Close\tCtrl+W"
-msgstr "បិទ\tបញ្ជា(Ctrl)+W"
-
-#: Menus.cpp:174
-msgid "&Save Project\tCtrl+S"
-msgstr "រក្សាទុក​គម្រោង\tបញ្ជា(Ctrl)+S"
-
-#: Menus.cpp:178 Project.cpp:2628
-msgid "Save Project &As..."
-msgstr "រក្សាទុក​គម្រោង​ជា..."
-
-#: Menus.cpp:181
-msgid "Chec&k Dependencies..."
-msgstr "ពិនិត្យ​មើល​ភាព​អាស្រ័យ..."
-
-#: Menus.cpp:185
-msgid "Open Me&tadata Editor..."
-msgstr "បើក​​កម្មវិធី​​កែសម្រួល​​ទិន្នន័យ​​មេតា..."
-
-#: Menus.cpp:194
-msgid "&Audio...\tCtrl+Shift+I"
-msgstr "អូឌីយ៉ូ...\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+I"
-
-#: Menus.cpp:195
-msgid "&Labels..."
-msgstr "ស្លាក..."
-
-#: Menus.cpp:196
-msgid "&MIDI..."
-msgstr "មីឌី..."
-
-#: Menus.cpp:197
-msgid "&Raw Data..."
-msgstr "ទិន្នន័យ​ដើម..."
-
-#: Menus.cpp:208 Menus.cpp:237
-msgid "Expo&rt Selection..."
-msgstr "នាំចេញ​ជម្រើស..."
-
-#: Menus.cpp:215
-msgid "Export &Labels..."
-msgstr "នាំចេញ​ស្លាក..."
-
-#: Menus.cpp:216
-msgid "Export &Multiple..."
-msgstr "នាំចេញ​ច្រើន..."
-
-#: Menus.cpp:246 Menus.cpp:260
-msgid "Edit C&hains..."
-msgstr "កែសម្រួល​ច្រវាក់..."
-
-#: Menus.cpp:258
-msgid "Appl&y Chain..."
-msgstr "អនុវត្ត​ច្រវាក់..."
-
-#: Menus.cpp:265
-msgid "&Upload File..."
-msgstr "ផ្ទុក​ឯកសារ​ឡើង..."
-
-#: Menus.cpp:271
-msgid "Pa&ge Setup..."
-msgstr "រៀបចំ​​ទំព័រ..."
-
-#: Menus.cpp:272
-msgid "&Print..."
-msgstr "បោះពុម្ព..."
-
-#: Menus.cpp:285
-msgid "E&xit\tCtrl+Q"
-msgstr "ចេញ\tបញ្ជា(Ctrl)+Q"
-
-#: Menus.cpp:293 toolbars/EditToolBar.cpp:76
-msgid "&Edit"
-msgstr "កែសម្រួល"
-
-#: Menus.cpp:297
-msgid "&Undo\tCtrl+Z"
-msgstr "មិន​ធ្វើ​វិញ\tបញ្ជា(Ctrl)+Z"
-
-#: Menus.cpp:305 prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:146
-msgid "&Redo"
-msgstr "ធ្វើ​វិញ"
-
-#: Menus.cpp:318
-msgid "Cu&t\tCtrl+X"
-msgstr "កាត់\tបញ្ជា(Ctrl)+X"
-
-#: Menus.cpp:322
-msgid "Spl&it Cut\tCtrl+Alt+X"
-msgstr "បំបែក​ការកាត់\tបញ្ជា(Ctrl)+ជំនួស(Alt)+X"
-
-#: Menus.cpp:323
-msgid "&Copy\tCtrl+C"
-msgstr "ចម្លង\tបញ្ជា(Ctrl)+C"
-
-#: Menus.cpp:327
-msgid "&Paste\tCtrl+V"
-msgstr "បិទភ្ជាប់\tបញ្ជា(Ctrl)+V"
-
-#: Menus.cpp:331
-msgid "Tri&m\tCtrl+T"
-msgstr "កាត់​តម្រឹម\tបញ្ជា(Ctrl)+T"
-
-#: Menus.cpp:333
-msgid "&Delete\tCtrl+K"
-msgstr "លុប\tបញ្ជា(Ctrl)+K"
-
-#: Menus.cpp:334
-msgid "Split D&elete\tCtrl+Alt+K"
-msgstr "បំបែក​ការ​លុប\tបញ្ជា(Ctrl)+ជំនួស(Alt)+K"
-
-#: Menus.cpp:335
-msgid "&Silence\tCtrl+L"
-msgstr "ស្ងាត់\tបញ្ជា(Ctrl)+L"
-
-#: Menus.cpp:337
-msgid "Sp&lit\tCtrl+I"
-msgstr "បំបែក\tបញ្ជា(Ctrl)+I"
-
-#: Menus.cpp:342
-msgid "Split Ne&w\tCtrl+Alt+I"
-msgstr "បំបែក​ថ្មី\tបញ្ជា(Ctrl)+ជំនួស(Alt)+I"
-
-#: Menus.cpp:347
-msgid "&Join\tCtrl+J"
-msgstr "ភ្ជាប់\tបញ្ជា(Ctrl)+J"
-
-#: Menus.cpp:348
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "មិនភ្ជាប់\tបញ្ជា(Ctrl)+ជំនួស(Alt)+J"
-
-#: Menus.cpp:350
-msgid "Duplic&ate\tCtrl+D"
-msgstr "ស្ទួន\tបញ្ជា(Ctrl)+D"
-
-#: Menus.cpp:356 Menus.cpp:556 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
-msgstr "ស្តេរីអូ​ទៅ​ជា​ម៉ូណូ"
-
-#: Menus.cpp:363
-msgid "Labeled Re&gions..."
-msgstr "តំបន់​ដែល​មាន​ស្លាក..."
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:365
-msgid "&Cut\tAlt+X"
-msgstr "កាត់\tជំនួស(Alt)+X"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:370
-msgid "&Split Cut\tShift+Alt+X"
-msgstr "បំបែក​ការ​កាត់\tប្ដូរ(Shift)+ជំនួស(Alt)+X"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:375
-msgid "Co&py\tShift+Alt+C"
-msgstr "ចម្លង\tប្ដូរ(Shift)+ជំនួស(Alt)+C"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:381
-msgid "&Delete\tAlt+K"
-msgstr "លុប\tជំនួស(Alt)+K"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:386
-msgid "Sp&lit Delete\tShift+Alt+K"
-msgstr "បំបែក​កា​រលុប\tប្ដូរ(Shift)+ជំនួស(Alt)+K"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:391
-msgid "Sile&nce\tAlt+L"
-msgstr "ស្ងាត់\tជំនួស(Alt)+L"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:397
-msgid "Spli&t\tAlt+I"
-msgstr "បំបែក\tជំនួស(Alt)+I"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:402
-msgid "&Join\tAlt+J"
-msgstr "ភ្ជាប់\tជំនួស(Alt)+J"
-
-#. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:407
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "មិន​ភ្ជាប់\tប្ដូរ(Shift)+ជំនួស(Alt)+J"
-
-#: Menus.cpp:413
-msgid "&Select..."
-msgstr "ជ្រើស..."
-
-#: Menus.cpp:414
-msgid "&All\tCtrl+A"
-msgstr "ទាំងអស់\tបញ្ជា(Ctrl)+A"
-
-#: Menus.cpp:415
-msgid "&None\tCtrl+Shift+A"
-msgstr "គ្មាន\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+A"
-
-#: Menus.cpp:419
-msgid "Left at Playback Position\t["
-msgstr "ទុក​នៅ​ទីតាំង​ចាក់​ឡើង​វិញ\t["
-
-#: Menus.cpp:420
-msgid "Right at Playback Position\t]"
-msgstr "ខាង​ស្ដាំ​​ទីតាំង​ចាក់​ឡើង​វិញ\t]"
-
-#: Menus.cpp:424
-msgid "Start to Cursor"
-msgstr "ចាប់ផ្ដើម​ទៅ​​ទស្សន៍​​ទ្រនិច"
-
-#: Menus.cpp:425
-msgid "Cursor to End"
-msgstr "ទស្សន៍​​ទ្រនិច​​ទៅចុង"
-
-#: Menus.cpp:431
-msgid "Find &Zero Crossings\tZ"
-msgstr "រក​កា​រ​ខ្វែង​​សូន្យ\tZ"
-
-#: Menus.cpp:433
-msgid "Mo&ve Cursor..."
-msgstr "ផ្លាស់ទី​​​ទស្សន៍​ទ្រនិច..."
-
-#: Menus.cpp:435
-msgid "to Selection Start"
-msgstr "ទៅ​ដើម​​​ជម្រើស"
-
-#: Menus.cpp:436
-msgid "to Selection End"
-msgstr "ទៅ​ចុង​​ជម្រើស"
-
-#: Menus.cpp:440
-msgid "to Track Start"
-msgstr "ទៅ​ដើម​​បទ"
-
-#: Menus.cpp:441
-msgid "to Track End"
-msgstr "ទៅ​ចុង​​បទ"
-
-#: Menus.cpp:448
-msgid "Selection Save"
-msgstr "រក្សាទុក​​ជម្រើស"
-
-#: Menus.cpp:449
-msgid "Selection Restore"
-msgstr "ស្ដារ​​ជម្រើស​"
-
-#: Menus.cpp:454
-msgid "Play &Region..."
-msgstr "ចាក់​​តំបន់..."
-
-#: Menus.cpp:455
-msgid "Lock"
-msgstr "ចាក់សោ"
-
-#: Menus.cpp:456
-msgid "Unlock"
-msgstr "ដោះសោ"
-
-#: Menus.cpp:462
-msgid "Turn Snap-To On"
-msgstr "បើក​ការ​​ខ្ទាស់"
-
-#: Menus.cpp:463
-msgid "Turn Snap-To Off"
-msgstr "បិទ​កា​រ​ខ្ទាស់"
-
-#: Menus.cpp:464
-msgid "Turn Grid Snap On"
-msgstr "បើក​កា​រ​​ខ្ទាស់​​​​ក្រឡាចត្រង្គ"
-
-#: Menus.cpp:465
-msgid "Turn Grid Snap Off"
-msgstr "បិទ​ការ​ខ្ទាស់​​ក្រឡាចត្រង្គ"
-
-#: Menus.cpp:474
-msgid "&Preferences...\tCtrl+P"
-msgstr "ចំណូល​ចិត្ត...\tបញ្ជា(Ctrl)+P"
-
-#: Menus.cpp:484
-msgid "&View"
-msgstr "មើល"
-
-#: Menus.cpp:486
-msgid "Zoom &In\tCtrl+1"
-msgstr "ពង្រីក\tបញ្ជា(Ctrl)+1"
-
-#: Menus.cpp:489
-msgid "Zoom &Normal\tCtrl+2"
-msgstr "ពង្រីក​ធម្មតា\tបញ្ជា(Ctrl)+2"
-
-#: Menus.cpp:490
-msgid "Zoom &Out\tCtrl+3"
-msgstr "បង្រួម​\tបញ្ជា(Ctrl)+3"
-
-#: Menus.cpp:493
-msgid "&Fit in Window\tCtrl+F"
-msgstr "សម​នឹង​បង្អួច\tបញ្ជា(Ctrl)+F"
-
-#: Menus.cpp:494
-msgid "Fit &Vertically\tCtrl+Shift+F"
-msgstr "សម​នឹង​បញ្ឈរ\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+F"
-
-#: Menus.cpp:495
-msgid "&Zoom to Selection\tCtrl+E"
-msgstr "ពង្រីក​សម​នឹង​ជម្រើស\tបញ្ជា(Ctrl)+E"
-
-#: Menus.cpp:498
-msgid "&Collapse All Tracks\tCtrl+Shift+C"
-msgstr "វេញ​​បទ​ទាំងអស់\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+C"
-
-#: Menus.cpp:499
-msgid "E&xpand All Tracks\tCtrl+Shift+X"
-msgstr "ពង្រីក​​បទ​​ទាំង​អស់\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+X"
-
-#: Menus.cpp:502
-msgid "Show Clipping"
-msgstr "បង្ហាញ​​កា​រច្រឹប"
-
-#: Menus.cpp:511
-msgid "&History..."
-msgstr "ប្រវត្តិ..."
-
-#: Menus.cpp:517
-msgid "&Toolbars..."
-msgstr "របារ​​ឧបករណ៍..."
-
-#: Menus.cpp:518
-msgid "Control Toolbar"
-msgstr "របារ​​​ឧបករណ៍​​ត្រួតពិនិត្យ"
-
-#: Menus.cpp:519
-msgid "Device Toolbar"
-msgstr "របារ​​ឧបករណ៍​​ឧបករណ៍"
-
-#: Menus.cpp:520
-msgid "Edit Toolbar"
-msgstr "របារ​ឧបករណ៍​​កែសម្រួល"
-
-#: Menus.cpp:521
-msgid "Meter Toolbar"
-msgstr "របារ​ឧបករណ៍​​ម៉ែត្រ"
-
-#: Menus.cpp:522
-msgid "Mixer Toolbar"
-msgstr "របារ​​ឧបករណ៍​​ឧបករណ៍​​លាយ​​សំឡេង​"
-
-#: Menus.cpp:523
-msgid "Selection Toolbar"
-msgstr "របារ​ឧបករណ៍​​ជម្រើស"
-
-#: Menus.cpp:524
-msgid "Tools Toolbar"
-msgstr "របារ​​ឧបករណ៍​ ឧបករណ៍"
-
-#: Menus.cpp:525
-msgid "Transcription Toolbar"
-msgstr "របារ​​ឧបករណ៍​​​កា​រចម្លង​"
-
-#: Menus.cpp:527
-msgid "Reset Toolbars"
-msgstr "របារ​​ឧបករណ៍​​កំណត់​​ឡើង​វិញ"
-
-#: Menus.cpp:537
-msgid "&Tracks"
-msgstr "បទ"
-
-#: Menus.cpp:544
-msgid "Add &New..."
-msgstr "បន្ថែម​​ថ្មី..."
-
-#: Menus.cpp:545
-msgid "&Audio Track\tCtrl+Shift+N"
-msgstr "បទ​អូឌីយ៉ូ\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+N"
-
-#: Menus.cpp:546
-msgid "&Stereo Track"
-msgstr "បទ​​ស្តេរីអូ"
-
-#: Menus.cpp:548 TimeTrack.cpp:44
-msgid "&Time Track"
-msgstr "បទ​​ពេលវេលា"
-
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr "ឧបករណ៍​​កំណត់​​ពេលថត..."
-
-#: Menus.cpp:560 Menus.cpp:3698 Mix.cpp:120
-msgid "&Mix and Render"
-msgstr "លាយ និង​​បង្ហាញ"
-
-#: Menus.cpp:564
-msgid "Mix and Render to New Track\tCtrl+Shift+M"
-msgstr "លាយ និង​​បង្ហាញ​​ទៅ​​បទ​ថ្មី\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+M"
-
-#: Menus.cpp:568
-msgid "&Resample..."
-msgstr "សាកល្បង​​ឡើងវិញ"
-
-#: Menus.cpp:578
-msgid "Remo&ve Tracks"
-msgstr "យក​បទ​​ចេញ"
-
-#: Menus.cpp:585
-msgid "Align with &Zero"
-msgstr "តម្រឹម​​ដោយ​សូន្យ"
-
-#: Menus.cpp:586
-msgid "Align with &Cursor"
-msgstr "តម្រឹម​​ដោយ​​ទស្សន៍​ទ្រនិច"
-
-#: Menus.cpp:587
-msgid "Align with Selection &Start"
-msgstr "តម្រឹម​​ដោយ​​ដើម​ជម្រើស"
-
-#: Menus.cpp:588
-msgid "Align with Selection &End"
-msgstr "តម្រឹម​​ដោយ​ចុង​ជម្រើស"
-
-#: Menus.cpp:589
-msgid "Align End with Cursor"
-msgstr "តម្រឹម​​ចុង​​ដោយ​​ទស្សន៍​ទ្រនិច"
-
-#: Menus.cpp:590
-msgid "Align End with Selection Start"
-msgstr "តម្រឹម​​ចុង​​ដោយ​​ដើម​​ជម្រើស"
-
-#: Menus.cpp:591
-msgid "Align End with Selection End"
-msgstr "តម្រឹម​​ចុង​​ដោយ​​ចុង​​ជម្រើស"
-
-#: Menus.cpp:592
-msgid "Align Tracks Together"
-msgstr "តម្រឹម​បទ​​ជាមួយ​គ្នា"
-
-#: Menus.cpp:594
-msgid "&Align Tracks..."
-msgstr "តម្រឹម​​បទ..."
-
-#: Menus.cpp:603
-msgid "Ali&gn And Move Cursor..."
-msgstr "តម្រឹម និង​​ផ្លាស់ទី​ទស្សន៍​ទ្រនិច..."
-
-#: Menus.cpp:611
-msgid "Add &Label At Selection\tCtrl+B"
-msgstr "បន្ថែម​​ស្លាក​​នៅ​​ជម្រើស\tបញ្ជា (Ctrl) + B"
-
-#: Menus.cpp:612
-msgid "Add Label At &Playback Position\tCtrl+M"
-msgstr "បន្ថែម​​ស្លាក​​​នៅ​ទីតាំង​ចាក់​​ឡើង​វិញ\tបញ្ជា(Ctrl)+M"
-
-#: Menus.cpp:618
-msgid "S&ort tracks by..."
-msgstr "តម្រៀប​​បទ​តាម..."
-
-#: Menus.cpp:619
-msgid "&Start time"
-msgstr "ពេល​វេលា​​ចាប់ផ្ដើម"
-
-#: Menus.cpp:621
-msgid "&Name"
-msgstr "ឈ្មោះ"
-
-#: Menus.cpp:631
-msgid "&Generate"
-msgstr "បង្កើត"
-
-#: Menus.cpp:654
-msgid "Effe&ct"
-msgstr "បែបផែន"
-
-#: Menus.cpp:658
-msgid "Repeat Last Effect\tCtrl+R"
-msgstr "ធ្វើ​​បែបផែន​​ចុង​ក្រោយ​​ម្ដង​​ទៀត\tបញ្ជា(Ctrl)+R"
-
-#: Menus.cpp:690
-msgid "&Analyze"
-msgstr "ធ្វើ​​វិភាគ"
-
-#: Menus.cpp:692
-msgid "Plot Spectrum..."
-msgstr "វិសាលគម​​គ្រោង..."
-
-#: Menus.cpp:725 Menus.cpp:728
-msgid "&Help"
-msgstr "ជំនួយ"
-
-#: Menus.cpp:731
-msgid "&About Audacity CleanSpeech..."
-msgstr "អំពី Audacity CleanSpeech..."
-
-#: Menus.cpp:735
-msgid "&Show Welcome Message..."
-msgstr "បង្ហាញ​​សារ​ស្វាគមន៍..."
-
-#: Menus.cpp:736
-msgid "&Index..."
-msgstr "លិបិក្រម..."
-
-#: Menus.cpp:744
-msgid "&Screenshot Tools..."
-msgstr "ឧបករណ៍​​រូបថត​​អេក្រង់..."
-
-#: Menus.cpp:747
-msgid "&Run Benchmark..."
-msgstr "រត់ Benchmark..."
-
-#: Menus.cpp:749
-msgid "&Audio Device Info..."
-msgstr "ព័ត៌មាន​​ឧបករណ៍​​អូឌីយ៉ូ..."
-
-#: Menus.cpp:758
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr ""
-"រង្វិល​​​ជុំ​​ថយ​ក្រោយ​​តាម​ការ​ចត ទិដ្ឋភាព​​បទ និង​​របារ​​ជ្រើស\t"
-"បញ្ជា(Ctrl)+ប្ដូរ(Shift)+F6"
-
-#: Menus.cpp:759
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr ""
-"រង្វិល​​ជុំ​​ទៅ​មុខ​​តាម​​ការ​​ចត ទិដ្ឋភាព​​បទ និង​​របារ​ជ្រើស\t"
-"បញ្ជា(Ctrl)+F6"
-
-#: Menus.cpp:762
-msgid "Selection Tool\tF1"
-msgstr "ឧបករណ៍​​ជ្រើស F1"
-
-#: Menus.cpp:763
-msgid "Envelope Tool\tF2"
-msgstr "ឧបករណ៍​​ស្រោម​​សំបុត្រ F2"
-
-#: Menus.cpp:764
-msgid "Draw Tool\tF3"
-msgstr "ឧបករណ៍​គូរ F3"
-
-#: Menus.cpp:765
-msgid "Zoom Tool\tF4"
-msgstr "ឧបករណ៍​ពង្រីក F4"
-
-#: Menus.cpp:766
-msgid "Time Shift Tool\tF5"
-msgstr "ឧបករណ៍​ប្ដូរ​ពេល​វេលា F5"
-
-#: Menus.cpp:767
-msgid "Multi Tool\tF6"
-msgstr "ឧបករណ៍​​ច្រើន\t F6"
-
-#: Menus.cpp:769
-msgid "Next Tool\tD"
-msgstr "ឧបករណ៍​​​បន្ទាប់ D"
-
-#: Menus.cpp:770
-msgid "Previous Tool\tA"
-msgstr "ឧបករណ៍​​មុន A"
-
-#: Menus.cpp:772
-msgid "Play/Stop\tSpacebar"
-msgstr "ចាក់/បញ្ឈប់​របារ​ដក​ឃ្លា"
-
-#: Menus.cpp:773
-msgid "Stop\tS"
-msgstr "បញ្ឈប់ S"
-
-#: Menus.cpp:774
-msgid "Pause\tP"
-msgstr "ផ្អាក P"
-
-#: Menus.cpp:775
-msgid "Record\tR"
-msgstr "ថត R"
-
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
-msgstr "ចាក់/បញ្ឈប់ និង​ជ្រើស​ ប្ដូរ(Shift)+ត្រឡប់"
-
-#: Menus.cpp:778
-msgid "Stop and Select\tShift+A"
-msgstr "បញ្ឈប់ និង​​ជ្រើស​ ប្ដូរ(Shift)+A"
-
-#: Menus.cpp:780
-msgid "Play One Second\t1"
-msgstr "ចាក់​​មួយ​​វិនាទី\t១"
-
-#: Menus.cpp:781
-msgid "Play To Selection\tB"
-msgstr "ចាក់​ដល់​​កន្លែង​​ជ្រើស B"
-
-#: Menus.cpp:782
-msgid "Play Looped\tL"
-msgstr "ចាក់​រង្វិល​ជុំ L"
-
-#: Menus.cpp:783
-msgid "Play Looped\tShift+Spacebar"
-msgstr "ចាក់​​រង្វិល​​ជុំ\tប្ដូរ(Shift)+របារ​ដក​ឃ្លា (Spacebar)"
-
-#: Menus.cpp:784
-msgid "Play Cut Preview\tC"
-msgstr "លេង កាត់ មើល​ជាមុន C"
-
-#: Menus.cpp:786
-msgid "Skip to Start\tHome"
-msgstr "រំលង​ដើម្បី​ចាប់ផ្ដើម ដើម"
-
-#: Menus.cpp:787
-msgid "Skip to End\tEnd"
-msgstr "រំលង​​ដើម្បី​បញ្ចប់ ចុង"
-
-#: Menus.cpp:789
-msgid "Selection to Start\tShift+Home"
-msgstr "ជជ្រើស​ដើម្បី​ចាប់ផ្ដើម ប្ដូរ(Shift)+ដើម(Home)"
-
-#: Menus.cpp:790
-msgid "Selection to End\tShift+End"
-msgstr "ជម្រើស​ទៅ​ចុង ប្ដូរ(Shift)+ចុង(End)"
-
-#: Menus.cpp:792
-msgid "DeleteKey\tBackspace"
-msgstr "គ្រាប់​ចុច​លុប (Delete)\tលុប​ថយ​ក្រោយ (Backspace)"
-
-#: Menus.cpp:797
-msgid "DeleteKey2\tDelete"
-msgstr "គ្រាប់​ចុច​លុប ២ លុប (Delete)"
-
-#: Menus.cpp:803
-msgid "Seek left short period during playback\tLeft"
-msgstr "ស្វែងរក​រយៈ​ពេល​ខ្លី​​ទៅ​ឆ្វេង​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ឆ្វេង"
-
-#: Menus.cpp:804
-msgid "Seek right short period during playback\tRight"
-msgstr "ស្វែងរក​រយៈ​ពេល​ខ្លី​ទៅ​​ស្ដាំ​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ស្ដាំ"
-
-#: Menus.cpp:805
-msgid "Seek left long period during playback\tShift+Left"
-msgstr "ស្វែងរក​​រយៈ​ពេល​​វែង​ទៅ​​ឆ្វេង​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ប្ដូរ(Shift)+ឆ្វេង"
-
-#: Menus.cpp:806
-msgid "Seek right long period during playback\tShift+Right"
-msgstr "ស្វែងរក​រយៈ​ពេល​វែង​ទៅ​​ស្ដាំ​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ប្ដូរ(Shift)+ស្ដាំ"
-
-#: Menus.cpp:810
-msgid "Move Focus to Previous Track\tUp"
-msgstr "ផ្លាស់ទី​​ការ​​ផ្ដោត​​ទៅ​បទ​​មុន ឡើង​​លើ"
-
-#: Menus.cpp:811
-msgid "Move Focus to Previous and Change Selection\tShift+Up"
-msgstr "ផ្លាស់ទី​ការ​ផ្ដោត​ទៅ​បទ​មុខ ហើយ​ផ្លាស់ប្ដូរ​ជម្រើស ប្ដូរ(Shift)+ឡើង​លើ"
-
-#: Menus.cpp:812
-msgid "Move Focus to Next Track\tDown"
-msgstr "ផ្លាស់ទី​​ការ​​ផ្ដោត​​ទៅ​​បទ​​បន្ទាប់\tចុះ​​ក្រោម"
-
-#: Menus.cpp:813
-msgid "Move Focus to Next and Change Selection\tShift+Down"
-msgstr ""
-"ផ្លាស់ទី​​ការ​​ផ្ដោត​​ទៅ​​បទ​បន្ទាប់ និង​ផ្លាស់ប្ដូរ​ជម្រើស​ "
-"ប្ដូរ(Shift)+ចុះ​ក្រោម"
-
-#: Menus.cpp:814
-msgid "Toggle Focused Track\tReturn"
-msgstr "បិទ​​បើក​បទ​​ដែល​​ផ្ដោត\tត្រឡប់"
-
-#: Menus.cpp:815
-msgid "Toggle Focused Track\tNUMPAD_ENTER"
-msgstr "បិទ​បើក​​បទ​​ដែល​ផ្ដោត\tNUMPAD_ENTER"
-
-#: Menus.cpp:816
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "បិទ​បើក​​បទ​​ដែល​ផ្ដោត\tបញ្ជា(Ctrl)+របារ​ដក​ឃ្លា (Spacebar)"
-
-#: Menus.cpp:818
-msgid "Cursor Left\tLeft"
-msgstr "ទស្សន៍​​ទ្រនិច​ឆ្វេង ឆ្វេង"
-
-#: Menus.cpp:819
-msgid "Cursor Right\tRight"
-msgstr "ទស្សន៍​ទ្រនិច​​ស្ដាំ ស្ដាំ"
-
-#: Menus.cpp:820
-msgid "Cursor Short Jump Left\t,"
-msgstr "ទស្សន៍​ទ្រនិច​​ខ្លី​​លោត​​ទៅ​ឆ្វេង\t,"
-
-#: Menus.cpp:821
-msgid "Cursor Short Jump Right\t."
-msgstr "ទស្សន៍​ទ្រនិច​ខ្លីលោត​ទៅ​ស្ដាំ\t."
-
-#: Menus.cpp:822
-msgid "Cursor Long Jump Left\tShift+,"
-msgstr "ទស្សន៍​ទ្រនិច​វែង​​លោត​​ទៅ​ឆ្វេង ប្ដូរ​(Shift)+"
-
-#: Menus.cpp:823
-msgid "Cursor Long Jump Right\tShift+."
-msgstr "ទស្សន៍​ទ្រនិច​​វែង​​លោត​​ទៅ​ស្ដាំ\tប្ដូរ(Shift)+ ។"
-
-#: Menus.cpp:825
-msgid "Selection Extend Left\tShift+Left"
-msgstr "ពង្រីក​ជម្រើស​​ទៅ​ឆ្វេង ប្ដូរ(Shift)+ឆ្វេង"
-
-#: Menus.cpp:826
-msgid "Selection Extend Right\tShift+Right"
-msgstr "ពង្រីក​​ជម្រើស​​ទៅ​ស្ដាំ ប្ដូរ(Shift)+ស្ដាំ"
-
-#: Menus.cpp:828
-msgid "Set (or Extend) Left Selection"
-msgstr "កំណត់ (ឬ​ពង្រីក) ជម្រើស​​ឆ្វេង"
-
-#: Menus.cpp:829
-msgid "Set (or Extend) Right Selection"
-msgstr "កំណត់ (ឬ​ពង្រីក) ជម្រើស​​​ស្ដាំ"
-
-#: Menus.cpp:831
-msgid "Selection Contract Left\tCtrl+Shift+Right"
-msgstr "បង្រួញ​​ជម្រើស​ទៅ​ឆ្វេង បញ្ជា(Ctrl)+ប្ដូរ(Shift)+ស្ដាំ"
-
-#: Menus.cpp:832
-msgid "Selection Contract Right\tCtrl+Shift+Left"
-msgstr "បង្រួញ​ជម្រើស​ទៅ​ស្ដាំ បញ្ជា(Ctrl)+ប្ដូរ(Shift)+ឆ្វេង"
-
-#: Menus.cpp:834
-msgid "Change pan on focused track\tShift+P"
-msgstr "ផ្លាស់ប្ដូរ​​បន្ទះ​​លើ​​បទ​​ដែល​​ផ្ដោត ប្ដូរ(Shift)+P"
-
-#: Menus.cpp:835
-msgid "Pan left on focused track\tAlt+Shift+Left"
-msgstr "បន្ទះ​​ឆ្វេង​​លើ​​បទ​​ដែល​​ផ្ដោត ជំនួស(Alt)+ប្ដូរ(Shift)+ឆ្វេង"
-
-#: Menus.cpp:836
-msgid "Pan right on focused track\tAlt+Shift+Right"
-msgstr "បន្ទះ​​ស្ដាំ​​លើ​បទ​​ដែល​​ផ្ដោត ជំនួស(Alt)+ប្ដូរ(Shift)+ស្ដាំ"
-
-#: Menus.cpp:837
-msgid "Change gain on focused track\tShift+G"
-msgstr "ផ្លាស់ប្តូរ​​កំណើន​​បទ​​ដែល​​ផ្តោត​​លើ ប្តូរ(Shift)+G"
-
-#: Menus.cpp:838
-msgid "Increase gain on focused track\tAlt+Shift+Up"
-msgstr "បង្កើន​​ការ​​ទទួល​​លើ​បទ​ដែល​​ផ្ដោត ជំនួស(Alt)+ប្ដូរ(Shift)+លើ"
-
-#: Menus.cpp:839
-msgid "Decrease gain on focused track\tAlt+Shift+Down"
-msgstr "បន្ថយ​​ការ​​ទទួល​​លើ​​បទ​​ដែល​​ផ្ដោត ជំនួស​(Alt)+ប្ដូរ(Shift)+ចុះ"
-
-#: Menus.cpp:840
-msgid "Open menu on focused track\tShift+M"
-msgstr "បើក​​ម៉ឺនុយ​​លើ​​បទ​​ដែល​​ផ្ដោត ប្ដូរ(Shift)+M"
-
-#: Menus.cpp:841
-msgid "Mute/Unmute focused track\tShift+U"
-msgstr "ស្ងាត់/លឺ​បទ​ដែល​​ផ្ដោត ប្ដូរ(Shift)+U"
-
-#: Menus.cpp:842
-msgid "Solo/Unsolo focused track\tShift+S"
-msgstr "សូឡូ/ដោះ​សូឡូ បទ​ដែល​ផ្ដោត ប្ដូរ(Shift)+S"
-
-#: Menus.cpp:843
-msgid "Close focused track\tShift+C"
-msgstr "បិទ​បទ​​ដែលបាន​​ផ្ដោត ប្ដូរ(Shift)+C"
-
-#: Menus.cpp:845
-msgid "Snap To On"
-msgstr "បើក​ការ​ខ្ទាស់"
-
-#: Menus.cpp:846
-msgid "Snap To Off"
-msgstr "បិទ​កា​រខ្ទាស់"
-
-#. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:860
-msgid "Open Recent"
-msgstr "បើក​​ថ្មីៗ"
-
-#. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:863
-msgid "Recent &Files..."
-msgstr "ឯកសារ​​ថ្មីៗ..."
-
-#: Menus.cpp:910
-#, c-format
-msgid "&Undo %s"
-msgstr "មិន​​ធ្វើ​វិញ %s"
-
-#: Menus.cpp:936
-msgid "Can't Undo"
-msgstr "មិន​អាច​​មិន​​ធ្វើ​វិញ"
-
-#: Menus.cpp:945
-#, c-format
-msgid "&Redo %s"
-msgstr "ធ្វើ​វិញ %s"
-
-#: Menus.cpp:951
-msgid "Can't Redo"
-msgstr "មិន​អាច​​ធ្វើ​​​វិញ"
-
-#: Menus.cpp:1498
-msgid "Sort By Time"
-msgstr "តម្រៀប​​តាម​​ពេល​វេលា"
-
-#: Menus.cpp:1498
-msgid "Tracks sorted by time"
-msgstr "បទ​​បាន​​​តម្រៀប​​តាម​​ពេល​វេលា"
-
-#: Menus.cpp:1524
-msgid "Sort By Name"
-msgstr "តម្រៀប​​តាម​​ឈ្មោះ"
-
-#: Menus.cpp:1524
-msgid "Tracks sorted by name"
-msgstr "បទ​បាន​​តម្រៀប​​តាម​​ឈ្មោះ"
-
-#: Menus.cpp:1675
-msgid "Set Left Selection Bound"
-msgstr "កំណត់​​ស៊ុម​​ជ្រើស​​ខាង​​ឆ្វេង"
-
-#: Menus.cpp:1709
-msgid "Set Right Selection Bound"
-msgstr "កំណត់​​ស៊ុម​​ជ្រើស​ខាង​​ស្ដាំ"
-
-#: Menus.cpp:1976
-msgid "You must select a track first."
-msgstr "អ្នក​ត្រូវ​​តែ​ជ្រើស​​បទ​​ជាមុន ។​​"
-
-#: Menus.cpp:2005
-#, c-format
-msgid "Repeat %s\tCtrl+R"
-msgstr "ធ្វើ %s ម្ដង​ទៀត បញ្ជា(Ctrl)+R"
-
-#: Menus.cpp:2136
-msgid "There are no label tracks to export."
-msgstr "គ្មាន​​បទ​​ស្លាក​​ត្រូវ​​នាំ​ចេញ"
-
-#: Menus.cpp:2241
-msgid "Nothing to undo"
-msgstr "គ្មាន​​អ្វី​​ត្រូវ​​មិន​​ធ្វើ​វិញ​​ទេ"
-
-#: Menus.cpp:2261
-msgid "Nothing to redo"
-msgstr "គ្មាន​​អ្វី​ត្រូវ​​ធ្វើ​វិញ​​ទេ"
-
-#: Menus.cpp:2336 TrackPanel.cpp:546 toolbars/EditToolBar.cpp:133
-msgid "Cut"
-msgstr "កាត់"
-
-#: Menus.cpp:2336
-msgid "Cut to the clipboard"
-msgstr "កាត់​​ទៅ​ក្ដារ​​តម្បៀត​​ខ្ទាស់"
-
-#: Menus.cpp:2374
-msgid "Split Cut"
-msgstr "ពុះ​កា​រកាត់"
-
-#: Menus.cpp:2374
-msgid "Split-cut to the clipboard"
-msgstr "ពុះ​កា​រកាត់​ទៅ​ក្ដារតម្បៀតខ្ទាស់"
-
-#: Menus.cpp:2439 Menus.cpp:2510 Menus.cpp:2604 TrackPanel.cpp:548
-#: toolbars/EditToolBar.cpp:137
-msgid "Paste"
-msgstr "បិទ​ភ្ជាប់"
-
-#: Menus.cpp:2439
-msgid "Pasted text from the clipboard"
-msgstr "បាន​បិទភ្ជាប់​អត្ថបទ​ពី​ក្ដារតម្បៀតខ្ទាស់"
-
-#: Menus.cpp:2510 Menus.cpp:2604
-msgid "Pasted from the clipboard"
-msgstr "បាន​បិទភ្ជាប់​ពី​ក្ដារ​តម្បៀតខ្ទាស់"
-
-#: Menus.cpp:2544
-msgid "Copying stereo audio into a mono track is not allowed."
-msgstr ""
-"ចម្លង​​អូឌីយ៉ូ​​ស្តេរ៉េអូ​​ទៅ​​ក្នុង​​បទ​​ម៉ូណូ​​មិន​​ត្រូវ​​បាន​​អនុញ្ញាត​​"
-"ទេ ។"
-
-#: Menus.cpp:2640 toolbars/EditToolBar.cpp:139
-msgid "Trim"
-msgstr "កាត់​​តម្រឹម"
-
-#: Menus.cpp:2640
-msgid "Trim file to selection"
-msgstr "កាត់​​តម្រឹម​​ឯកសារ​​ទៅ​​ការ​​ជ្រើស"
-
-#: Menus.cpp:2669
-#, c-format
-msgid "Split-deleted %.2f seconds at t=%.2f"
-msgstr "លុប​​ពុះ %.2f វិនាទី នៅ t=%.2f"
-
-#: Menus.cpp:2672
-msgid "Split Delete"
-msgstr "លុប​​ការ​ពុះ"
-
-#: Menus.cpp:2693
-#, c-format
-msgid "Disjoined %.2f seconds at t=%.2f"
-msgstr "បំបែក %.2f វិនាទី នៅ t=%.2f"
-
-#: Menus.cpp:2696
-msgid "Disjoin"
-msgstr "បំបែក"
-
-#: Menus.cpp:2717
-#, c-format
-msgid "Joined %.2f seconds at t=%.2f"
-msgstr "ភ្ជាប់ %.2f វិនាទី នៅ t=%.2f"
-
-#: Menus.cpp:2720
-msgid "Join"
-msgstr "ភ្ជាប់"
-
-#: Menus.cpp:2739
-#, c-format
-msgid "Silenced selected tracks for %.2f seconds at %.2f"
-msgstr "ធ្វើ​​ឲ្យ​​ស្ងាត់​​បទ​​ដែល​​ជ្រើស %.2f វិនាទី នៅ %.2f"
-
-#: Menus.cpp:2741 toolbars/EditToolBar.cpp:141
-msgid "Silence"
-msgstr "ស្ងាត់"
-
-#: Menus.cpp:2775
-msgid "Duplicate"
-msgstr "ស្ទួន"
-
-#: Menus.cpp:2775
-msgid "Duplicated"
-msgstr "បាន​ស្ទួន"
-
-#: Menus.cpp:2794
-msgid "Cut Labels"
-msgstr "កាត់​​ស្លាក"
-
-#: Menus.cpp:2794
-msgid "Cut labeled regions to the clipboard"
-msgstr "កាត់​តំបន់​ដែល​មាន​​ស្លាក​​ទៅ​​ក្ដារ​​តម្បៀត​​ខ្ទាស់"
-
-#: Menus.cpp:2808
-msgid "SplitCut labeled regions to the clipboard"
-msgstr "កាត់​ពុះ​​​តំបន់​​​ដែល​មាន​ស្លាក​​​ទៅ​​​ក្ដារ​​ត​ម្បៀត​​​ខ្ទាស់"
-
-#: Menus.cpp:2809
-msgid "Split Cut Labels"
-msgstr "កាត់​ពុះ​​ស្លាក"
-
-#: Menus.cpp:2823
-msgid "Copied labeled regions to the clipboard"
-msgstr "ចម្លង​​តំបន់​​ស្លាក​ទៅ​​ក្ដារ​​តម្បៀត​ខ្ទាស់"
-
-#: Menus.cpp:2823
-msgid "Copy Labels"
-msgstr "ចម្លង​ស្លាក"
-
-#: Menus.cpp:2835
-msgid "Delete Labels"
-msgstr "លុប​ស្លាក"
-
-#: Menus.cpp:2835
-msgid "Deleted labeled regions"
-msgstr "លុប​តំបន់​​ដែល​មាន​ស្លាក"
-
-#: Menus.cpp:2847
-msgid "Split Delete Labels"
-msgstr "លុប​ការ​ពុះស្លាក"
-
-#: Menus.cpp:2847
-msgid "Split Deleted labeled regions"
-msgstr "ពុះ​តំបន់​​ដែល​មានស្លា​ដែល​បាន​លុប"
-
-#: Menus.cpp:2859
-msgid "Silence Labels"
-msgstr "ស្លាក​​ស្ងាត់"
-
-#: Menus.cpp:2859
-msgid "Silenced labeled regions"
-msgstr "តំបន់​​ដែល​មាន​​ស្លាក​​ដែល​​ស្ងាត់"
-
-#: Menus.cpp:2871
-msgid "Split Labels"
-msgstr "ពុះ​​ស្លាក"
-
-#: Menus.cpp:2871
-msgid "Split labeled regions"
-msgstr "ពុះ​តំបន់​ដែល​មាន​ស្លាក"
-
-#: Menus.cpp:2883
-msgid "Join Labels"
-msgstr "តស្លាក"
-
-#: Menus.cpp:2883
-msgid "Joined labeled regions"
-msgstr "បាន​តតំបន់​ដែល​មាន​ស្លាក"
-
-#: Menus.cpp:2895
-msgid "Disjoin Labels"
-msgstr "មិន​​ត​​ស្លាក"
-
-#: Menus.cpp:2895
-msgid "Disjoined labeled regions"
-msgstr "មិន​បាន​ត​តំបន់​ដែល​មាន​ស្លាក"
-
-#: Menus.cpp:2917 TrackPanel.cpp:5861
-msgid "Split"
-msgstr "ពុះ"
-
-#: Menus.cpp:3011
-msgid "Split New"
-msgstr "ពុះ​​ថ្មី"
-
-#: Menus.cpp:3011
-msgid "Split to new track"
-msgstr "ពុះ​​ទៅ​​បទ​​ថ្មី"
-
-#: Menus.cpp:3094
-msgid "Split at labels"
-msgstr "ពុះ​​នៅ​ស្លាក"
-
-#: Menus.cpp:3394
-msgid "To plot the spectrum, all selected tracks must be the same sample rate."
-msgstr ""
-"ដើម្បី​​គ្រោង​​វិសាលគម "
-"បទ​​ដែល​​ជ្រើស​​ទាំងអស់​ត្រូវ​តែ​មាន​អត្រា​​គំរូ​​ដូច​គ្នា ។"
-
-#: Menus.cpp:3420
-#, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
-msgstr ""
-"មាន​​អូឌីយ៉ូ​​ច្រើន​​ពេក​​ត្រូវ​​បាន​​ជ្រើស ។ មាន​​​តែ %.1f វិនាទី "
-"ដំបូង​​នឹង​​ត្រូវ​បាន​​វិភាគ ។"
-
-#: Menus.cpp:3546
-#, c-format
-msgid "Imported labels from '%s'"
-msgstr "ស្លាក​ដែល​បាន​នាំ​ចូល​ពី '%s'"
-
-#: Menus.cpp:3547
-msgid "Import Labels"
-msgstr "នាំ​ចូល​​ស្លាក"
-
-#: Menus.cpp:3557
-msgid "Select a MIDI file..."
-msgstr "ជ្រើស​​ឯកសារ​​មីឌី..."
-
-#: Menus.cpp:3561
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr ""
-"ឯកសារ​​ទាំងអស់ (*.*)|*.*|ឯកសារ​​មីឌី (*.mid)|*.mid|ឯកសារ Allegro "
-"(*.gro)|*.gro"
-
-#: Menus.cpp:3577
-#, c-format
-msgid "Imported MIDI from '%s'"
-msgstr "មីឌី​ដែល​បាន​នាំចូល​ពី '%s'"
-
-#: Menus.cpp:3579
-msgid "Import MIDI"
-msgstr "នាំ​ចូល​​មីឌី"
-
-#: Menus.cpp:3592
-msgid "Select any uncompressed audio file..."
-msgstr "ជ្រើស​​ឯកសារ​​អូឌីយ៉ូ​​ដែល​​មិន​​បាន​​បង្ហាប់..."
-
-#: Menus.cpp:3596
-msgid "All files (*)|*"
-msgstr "ឯកសារ​​ទាំងអស់ (*)|*"
-
-#: Menus.cpp:3611 Project.cpp:2525 Project.cpp:2550 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "នាំ​ចូល"
-
-#: Menus.cpp:3630
-msgid "Edit the metadata tags"
-msgstr "កែ​សម្រួល​​ស្លាក​​ទិន្នន័យ​​មេតា"
-
-#: Menus.cpp:3631
-msgid "Edit Metadata"
-msgstr "កែ​សម្រួល​​ទិន្នន័យ​​មេតា"
-
-#: Menus.cpp:3631
-msgid "Edit Metadata tags"
-msgstr "កែ​សម្រួល​​ស្លាក​​ទិន្នន័យ​មេតា"
-
-#: Menus.cpp:3687
-#, c-format
-msgid "Rendered all audio in track '%s'"
-msgstr "បាន​បង្ហាញ​​អូឌីយ៉ូ​​ទាំងអស់​​ក្នុង​​បទ '%s'"
-
-#: Menus.cpp:3688
-msgid "Render"
-msgstr "បង្ហាញ"
-
-#: Menus.cpp:3693
-#, c-format
-msgid "Mixed and rendered %d tracks into one new stereo track"
-msgstr "លាយ និង​​បង្ហាញ %d បទ​​ទៅ​​ក្នុង​​បទ​​ស្តេរ៉េអូ​​ថ្មី​​មួយ"
-
-#: Menus.cpp:3696
-#, c-format
-msgid "Mixed and rendered %d tracks into one new mono track"
-msgstr "លាយ និង​បង្ហាញ %d បទ​ទៅ​ក្នុង​បទ​ម៉ូណូ​ថ្មី​មួយ"
-
-#: Menus.cpp:3828
-msgid "Aligned with zero"
-msgstr "តម្រឹម​​​ដោយ​​​សូន្យ"
-
-#: Menus.cpp:3832
-msgid "Aligned cursor"
-msgstr "តម្រឹម​​ទស្សន៍​ទ្រនិច"
-
-#: Menus.cpp:3836
-msgid "Aligned with selection start"
-msgstr "តម្រឹម​​ដោយ​​ដើម​​ជម្រើស​"
-
-#: Menus.cpp:3840
-msgid "Aligned with selection end"
-msgstr "តម្រឹម​​ដោយ​​ចុង​​ជម្រើស"
-
-#: Menus.cpp:3844
-msgid "Aligned end with cursor"
-msgstr "តម្រឹម​​ចុង​​ដោយ​​ទស្សន៍​ទ្រនិច"
-
-#: Menus.cpp:3848
-msgid "Aligned end with selection start"
-msgstr "តម្រឹម​​ចុង​​ដោយ​​ដើម​​ជម្រើស"
-
-#: Menus.cpp:3852
-msgid "Aligned end with selection end"
-msgstr "តម្រឹម​ចុង​ដោយ​ចុង​ជម្រើស"
-
-#: Menus.cpp:3856
-msgid "Aligned"
-msgstr "បាន​តម្រឹម"
-
-#: Menus.cpp:3889
-msgid "Align"
-msgstr "តម្រឹម"
-
-#: Menus.cpp:3912
-msgid "Created new audio track"
-msgstr "បង្កើត​​បទ​​អូឌីយ៉ូ​​ថ្មី"
-
-#: Menus.cpp:3912 Menus.cpp:3935 Menus.cpp:3950 Menus.cpp:3970
-msgid "New Track"
-msgstr "បទ​​ថ្មី"
-
-#: Menus.cpp:3935
-msgid "Created new stereo audio track"
-msgstr "បង្កើត​​បទ​​​អូឌីយ៉ូ​​ស្តេរ៉េអូ​​ថ្មី"
-
-#: Menus.cpp:3950
-msgid "Created new label track"
-msgstr "បាន​បង្កើត​បទ​ស្លាក​ថ្មី"
-
-#: Menus.cpp:3959
-msgid "The version of Audacity you are using does not support multiple time tracks."
-msgstr "កំណែ Audacity ដែល​អ្នក​កំពុង​ប្រើ​​មិន​​គាំទ្រ​​បទ​​ពេល​វេលា​​ច្រើន​​ទេ ។"
-
-#: Menus.cpp:3970
-msgid "Created new time track"
-msgstr "បាន​បង្កើត​​បទ​​ពេល​វេលា​​​ថ្មី"
-
-#: Menus.cpp:4019
-msgid "Added label"
-msgstr "បាន​បន្ថែម​​ស្លាក"
-
-#: Menus.cpp:4047
-msgid "Edited labels"
-msgstr "បាន​កែ​សម្រួល​​ស្លាក"
-
-#: Menus.cpp:4074
-msgid "Save CleanSpeech Preset File As:"
-msgstr "រក្សា​ទុក​​ឯកសារ​កំណត់​ជា​មុន​របស់ CleanSpeech ជា ៖"
-
-#: Menus.cpp:4078
-msgid "CleanSpeech Presets (*.csp)|*.csp"
-msgstr "CleanSpeech កំណត់​​ជា​មុន (*.csp)|*.csp"
-
-#: Menus.cpp:4085 export/Export.cpp:509
-msgid "Sorry, pathnames longer than 256 characters not supported."
-msgstr "សូម​អភ័យ​ទោស ឈ្មោះ​ផ្លូវ​វែង​ជាង  ២៦៥ តួ​អក្សរ​​មិន​ត្រូវ​​បាន​​គាំទ្រ​​ទេ ។"
-
-#: Menus.cpp:4131
-msgid "Problem encountered exporting presets."
-msgstr "មាន​បញ្ហា​ក្នុងកា​រនាំចេញ​ការ​កំណត់​ជា​មុន ។"
-
-#: Menus.cpp:4132 export/Export.cpp:402
-msgid "Unable to export"
-msgstr "មិន​អាច​នាំ​ចេញ"
-
-#: Menus.cpp:4316
-msgid "Remove Track"
-msgstr "យក​បទ​ចេញ"
-
-#: Menus.cpp:4316
-msgid "Removed audio track(s)"
-msgstr "បាន​យក​បទ​អូឌីយ៉ូ​ចេញ"
-
-#: Menus.cpp:4437
-msgid "Enter new samplerate:"
-msgstr "បញ្ចូល​អត្រា​គំរូ​ថ្មី ៖"
-
-#: Menus.cpp:4437 Menus.cpp:4456 export/ExportMP3.cpp:1871
-msgid "Resample"
-msgstr "ធ្វើ​គំរូ​ឡើង​វិញ"
-
-#: Menus.cpp:4443
-msgid "The entered value is invalid"
-msgstr "តម្លៃ​ដែល​បញ្ចូល​មិន​ត្រឹមត្រូវ"
-
-#: Menus.cpp:4454
-#, c-format
-msgid "Resampling track %d"
-msgstr "ធ្វើ​គំរូ​បទ %d ឡើង​វិញ"
-
-#: Menus.cpp:4465
-msgid "Resample Track"
-msgstr "ធ្វើ​គំរូ​បទ​ឡើង​វិញ"
-
-#: Menus.cpp:4465
-msgid "Resampled audio track(s)"
-msgstr "ធ្វើ​គំរូ​បទ​អូឌីយ៉ូ​ឡើង​វិញ"
-
-#: Mix.cpp:94 Mix.cpp:101
-msgid "Mix"
-msgstr "លាយ"
-
-#: Mix.cpp:121
-msgid "Mixing and rendering tracks"
-msgstr "លាយ និង​បង្ហាញ​បទ"
-
-#: NoteTrack.cpp:36
-msgid "Note Track"
-msgstr "កំណត់​ចំណាំ​បទ"
-
-#: Printing.cpp:187
-msgid "There was a problem printing."
-msgstr "មាន​បញ្ហា​ក្នុង​ការ​បោះពុម្ព ។"
-
-#: Printing.cpp:188
-msgid "Print"
-msgstr "បោះពុម្ព"
-
-#: Project.cpp:635
-msgid "Main Mix"
-msgstr "លាយ​មេ"
-
-#: Project.cpp:760
-#, c-format
-msgid "Welcome to Audacity version %s"
-msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity កំណែ %s"
-
-#: Project.cpp:912
-msgid "(Recovered)"
-msgstr "(ការ​សង្គ្រោះ​ឯកសារ)"
-
-#: Project.cpp:1472 TrackPanel.cpp:772 toolbars/ControlToolBar.cpp:191
-msgid "Record"
-msgstr "ថត"
-
-#: Project.cpp:1472 TrackPanel.cpp:772
-msgid "Recorded Audio"
-msgstr "ថត​អូឌីយ៉ូ"
-
-#: Project.cpp:1490
-msgid "Save changes before closing?"
-msgstr "រក្សា​ទុក​ការ​ផ្លាស់ប្ដូរ មុន​ពេល​បិទ ?"
-
-#: Project.cpp:1493
-msgid ""
-"\n"
-"\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks you previously\n"
-"had, click cancel, restore the tracks\n"
-"using undo, and then save."
-msgstr ""
-"\n"
-"\n"
-"គម្រោង​ដែល​បាន​រក្សាទុក​នឹង​ទទេ !!\n"
-"\n"
-"ដើម្បី​រក្សា​បទ​ទុក​ដែល​អ្នក​មាន​ពីមុន\n"
-"ចុច​បោះបង់ ស្ដារបទ​ឡើង​វិញ\n"
-"ដោយ​ប្រើ​មិន​ធ្វើ​វិញ និង​បន្ទាប់​មក​រក្សាទុក ។"
-
-#: Project.cpp:1496
-msgid "Save changes?"
-msgstr "រក្សា​ទុក​ការ​ផ្លាស់ប្ដូរ ?"
-
-#: Project.cpp:1684
-msgid "All files|*.*|All supported files|"
-msgstr "ឯកសារ​ទាំងអស់​|*.*|​ឯកសារ​ដែល​គាំទ្រ​ទាំងអស់|"
-
-#: Project.cpp:1709
-msgid "Select one or more audio files..."
-msgstr "ជ្រើស​ឯកសារ​អូឌីយ៉ូ​មួយ ឬ​ច្រើន..."
-
-#: Project.cpp:1736
-msgid "Audacity projects|*.aup|"
-msgstr "គម្រោង Audacity​|*.aup|"
-
-#: Project.cpp:1801 Project.cpp:1809
-msgid "Error opening file"
-msgstr "កំហុស​ក្នុង​ការ​បើក​ឯកសារ"
-
-#: Project.cpp:1815
-#, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
-"%s"
-msgstr ""
-"ឯកសារ​ប្រហែល​ជា​មិន​ត្រឹមត្រូវ ឬ​ខូច ៖ \n"
-"%s"
-
-#: Project.cpp:1816
-msgid "Error opening file or project"
-msgstr "កំហុស​ក្នុង​ការ​បើក​ឯកសារ ឬ​គម្រោង"
-
-#: Project.cpp:1833
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
-msgstr "Audacity មិន​អាច​បម្លែង​គម្រោង Audacity ១.០ ទៅ​ទ្រង់ទ្រាយ​គម្រោង​ថ្មី​បាន​ទេ ។"
-
-#: Project.cpp:1936
-msgid "Could not remove old auto save file"
-msgstr "មិន​អាច​យក​ចេញ​ឯកសារ​រក្សា​ទុក​ស្វ័យ​ប្រវត្តិ​ចាស់"
-
-#: Project.cpp:1938
-msgid "Project was recovered"
-msgstr "គម្រោង​​ត្រូវ​បាន​សង្គ្រោះ"
-
-#: Project.cpp:1938
-msgid "Recover"
-msgstr "សង្គ្រោះ​"
-
-#: Project.cpp:1967
-msgid "Project checker repaired file"
-msgstr "កម្មវិធី​ពិនិត្យ​គម្រោង​បាន​ជួសជុល​ឯកសារ"
-
-#: Project.cpp:1967 effects/Repair.h:29
-msgid "Repair"
-msgstr "ជួសជុល"
-
-#: Project.cpp:2078
-#, c-format
-msgid "Couldn't find the project data folder: \"%s\""
-msgstr "មិន​អាច​រក​ឃើញ​ថត​ទិន្នន័យ​គម្រោង ៖ \"%s\""
-
-#: Project.cpp:2116
-#, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
-"You are using Audacity %s - you need to upgrade to\n"
-"a newer version to open this file."
-msgstr ""
-"ឯកសារ​នេះ​ត្រូវ​បាន​រក្សា​ទុក​ដោយ​ប្រើ Audacity %s ។\n"
-"អ្នក​កំពុង​ប្រើ Audacity %s - អ្នក​ត្រូវ​ធ្វើ​ឲ្យ​ប្រសើរ​ទៅ\n"
-"កំណែ​ថ្មី​ដើម្បី​បើក​ឯកសារ​នេះ ។"
-
-#: Project.cpp:2120
-msgid "Can't open project file"
-msgstr "មិន​អាច​បើក​ឯកសារ​គម្រោង"
-
-#: Project.cpp:2131
-#, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
-"\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
-msgstr ""
-"ឯកសារ​នេះ​ត្រូវ​បាន​រក្សាទុក​ដោយ %s កំណែ​ចាស់\n"
-"របស់ Audacity ។  ទ្រង់ទ្រាយ​បាន​ផ្លាស់ប្ដូរ ។\n"
-"Audacity ប្រហែលជា​នឹង​បំផ្លាញ​ឯកសារ​ដោយ​ព្យាយាម\n"
-"បើក​វា ។  អ្នក​ត្រូវតែ​បម្រុង​ទុក​គម្រោង​របស់​អ្នក\n"
-"សិន ទើប​មាន​សុវត្ថិភាព ។\n"
-"\n"
-"បើក​អញ្ចឹង​តើ​​អ្នក​ចង់​បើក​ឯកសារនេះ\n"
-"ឥឡូវ​ដែរ​ឬទេ ?"
-
-#: Project.cpp:2138
-#, c-format
-msgid ""
-"This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
-"\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
-msgstr ""
-"ឯកសា​រនេះ​ត្រូវ​បាន​រក្សាទុក​ដោយ Audacity %s ហើយទ្រង់ទ្រាយ\n"
-"បាន​ផ្លាស់ប្ដូរ ។ កំណែ​​របស់​ Audacity អាច​ព្យាយាម​បើក\n"
-"វា ប៉ុន្តែ​អាច​មាន​បញ្ហា ។ អ្នក​គួរ​បម្រុង​ទុក​\n"
-"គម្រោង​របស់​អ្នក​សិន ទើប​មាន​សុវត្ថិភាព ។\n"
-"\n"
-"បន្ទាប់​ពី​អ្នក​រក្សាទុក​ឯកសារ​ជា​មួយ​កំណែ​របស់​ Audacity នេះ\n"
-"អ្នក​នឹង​មិន​អាច​បើក​​ឯកសារ​នៅ​ក្នុង​កំណែ​\n"
-"ចាស់​បាន​ទៀតទេ ។  បើ​អញ្ចឹង​តើ​​អ្នក​ចង់​បើក​វា​\n"
-"ឥឡូវ​ដែរ​ឬទេ ?"
-
-#: Project.cpp:2143
-msgid "Opening old project file"
-msgstr "បើក​ឯកសារ​គម្រោង​ចាស់"
-
-#: Project.cpp:2364
-#, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr ""
-"មិន​អាច​រក្សា​ទុក​គម្រោង ។ ប្រហែល %s មិន​អាច​សរសេរ​បាន\n"
-"ឬ​ថាស​ពេញ ។"
-
-#: Project.cpp:2366 Project.cpp:2380
-msgid "Error saving project"
-msgstr "កំហុស​ក្នុង​ការ​រក្សា​ទុក​គម្រោង"
-
-#: Project.cpp:2442
-#, c-format
-msgid "Saved %s"
-msgstr "បាន​រក្សា​ទុក %s"
-
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2458
-msgid "Raw"
-msgstr "ដើម"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr "កំពុង​នាំ​ចូល %s..."
-
-#: Project.cpp:2524
-#, c-format
-msgid "Imported '%s'"
-msgstr "បាន​នាំ​ចូល '%s'"
-
-#: Project.cpp:2577 Project.cpp:2585
-msgid "Error importing"
-msgstr "កំហុស​ក្នុង​ការ​នាំ​ចូល"
-
-#: Project.cpp:2619
-msgid "Save Speech As:"
-msgstr "រក្សា​ទុក​ការ​និយាយ​ជា ៖"
-
-#: Project.cpp:2621
-msgid "Windows PCM Audio file (*.wav)|*.wav"
-msgstr "ឯកសារ​អូឌីយ៉ូ PCM វីនដូ (*.wav)|*.wav"
-
-#: Project.cpp:2627
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
-"\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
-"Export commands."
-msgstr ""
-"ឯកសារ​គម្រោងរបស់ Audacity (.aup) អនុញ្ញាត​ឲ្យ​អ្នក​រក្សាទុក​អ្វីៗ​ដែល​អ្នក​កំពុង​ធ្វើការ​យ៉ាង​ជាក់លាក់​ ព្រោះ​ថា​\n"
-"បង្ហាញ​លើ​អេក្រង់ ប៉ុន្តែ​កម្មវិធី​ផ្សេងៗ​ជា​ច្រើន​មិនអាច​បើក​ឯកសារ​គម្រោង Audacity បានទេ ។\n"
-"\n"
-"នៅ​ពេល​​​អ្នក​ចង់​រក្សាទុក​ឯកសារ​ដែល​អាច​ត្រូវ​បានបើក​ដោយ​កម្មវិធី​ផ្សេង ជ្រើស "
-"ពាក្យ​បញ្ជា\n"
-"នាំចេញ​មួយ​ក្នុង​ចំណោម​ពាក្យ​បញ្ជា​នាំចេញ ។"
-
-#: Project.cpp:2630
-msgid "Audacity projects (*.aup)|*.aup"
-msgstr "គម្រោង Audacity (*.aup)|*.aup"
-
-#: Project.cpp:2674
-msgid "Created new project"
-msgstr "គម្រោង​ថ្មី​ដែល​បាន​បង្កើត"
-
-#: Project.cpp:2794
-#, c-format
-msgid "Deleted %.2f seconds at t=%.2f"
-msgstr "%.2f seconds at t=%.2f ដែល​បាន​លុប"
-
-#: Project.cpp:2797 effects/Equalization.cpp:1239
-#: effects/Equalization.cpp:2494
-msgid "Delete"
-msgstr "លុប"
-
-#: Project.cpp:2990
-#, c-format
-msgid "Disk space remains for recording %d hours and %d minutes."
-msgstr "នៅ​តែ​មាន​ទំហំ​ថាស​សម្រាប់​ថត %d ម៉ោង និង %d នាទី ។"
-
-#: Project.cpp:2993
-#, c-format
-msgid "Disk space remains for recording 1 hour and %d minutes."
-msgstr "នៅ​មាន​ទំហំ​ថាស​សម្រាប់​ថត ១ ម៉ោង និង %d នាទី ។"
-
-#: Project.cpp:2996
-#, c-format
-msgid "Disk space remains for recording %d minutes."
-msgstr "មាន​ទំហំ​ថាស​សម្រាប់​ថត %d នាទី ។"
-
-#: Project.cpp:2999
-#, c-format
-msgid "Disk space remains for recording %d seconds."
-msgstr "នៅ​មាន​ទំហំ​ថាស​សម្រាប់​ថត %d វិនាទី ។"
-
-#: Project.cpp:3002
-msgid "Out of disk space"
-msgstr "អស់​ទំហំ​ថាស"
-
-#: Project.cpp:3280
-msgid "Could not remove old autosave file: "
-msgstr "មិន​អាច​យក​ឯកសារ​ដែល​រក្សាទុក​ដោយ​ស្វ័យ​ប្រវត្តិ​ចាស់ចេញ​បាន​ទេ ៖"
-
-#: Project.cpp:3321
-msgid "New Project"
-msgstr "គម្រោង​ថ្មី"
-
-#: Project.cpp:3334
-msgid "Error writing autosave file"
-msgstr "កំហុស​ក្នុង​ការ​សរសេរ​ឯកសារ​រក្សា​ទុក​ស្វ័យ​ប្រវត្តិ"
-
-#: Project.cpp:3359
-msgid "Could not create autosave file: "
-msgstr "មិន​អាច​បង្កើត​ឯកសារ​រក្សា​ទុក​ស្វ័យ​ប្រវត្តិ ៖ "
-
-#: Project.cpp:3385
-#, c-format
-msgid "Actual Rate: %d"
-msgstr "អត្រា​ពិត ៖ %d"
-
-#: Resample.cpp:42
-msgid "Libresample by Dominic Mazzoni and Julius Smith"
-msgstr "Libresample ដោយ Dominic Mazzoni និង Julius Smith"
-
-#: Resample.cpp:53
-msgid "High-quality Sinc Interpolation"
-msgstr "ការ​កែខៃ​ធ្វើ​សមកាលកម្ម​គុណភាព​ខ្ពស់"
-
-#: Resample.cpp:55
-msgid "Fast Sinc Interpolation"
-msgstr "ការ​កែខៃ​ធ្វើ​សមកាលកម្ម​រហ័ស"
-
-#: Resample.cpp:125
-msgid "Libsamplerate by Erik de Castro Lopo"
-msgstr "Libsamplerate ដោយ Erik de Castro Lopo"
-
-#: Resample.cpp:218
-#, c-format
-msgid "Libsamplerate error: %d\n"
-msgstr "កំហុស Libsamplerate ៖ %d\n"
-
-#: Resample.cpp:240 Resample.cpp:250
-msgid "Resampling disabled."
-msgstr "បិទ​ការ​ធ្វើ​គំរូ​ឡើង​វិញ ។"
-
-#. i18n-hint: Audio data bit depth (precison): 16-bit integers
-#: SampleFormat.cpp:66
-msgid "16-bit PCM"
-msgstr "១៦ ប៊ីត PCM"
-
-#. i18n-hint: Audio data bit depth (precison): 24-bit integers
-#: SampleFormat.cpp:69
-msgid "24-bit PCM"
-msgstr "២៤ ប៊ីត PCM"
-
-#. i18n-hint: Audio data bit depth (precison): 32-bit floating point
-#: SampleFormat.cpp:72
-msgid "32-bit float"
-msgstr "៣២ ប៊ីត float"
-
-#: Screenshot.cpp:384
-msgid "Saved "
-msgstr "បាន​រក្សាទុក "
-
-#: Screenshot.cpp:387
-msgid "Error trying to save file: "
-msgstr "កំហុស​ក្នុង​ការ​ព្យាយាម​រក្សា​ទុក​ឯកសារ ៖ "
-
-#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
-msgid "Gap detected in project file\n"
-msgstr "ចន្លោះ​រក​ឃើញ​ក្នុង​ឈ្មោះ​គម្រោង\n"
-
-#: ShuttleGui.cpp:1852 effects/Effect.cpp:255
-#: effects/audiounits/AudioUnitEffect.cpp:872
-msgid "Pre&view"
-msgstr "មើល​ជាមុន"
-
-#: ShuttleGui.cpp:1859
-msgid "&Debug"
-msgstr "បំបាត់​កំហុស"
-
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "ឧបករណ៍​កំណត់​ពេល​ថត​របស់ Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start: "
-msgstr "ចាប់ផ្ដើម​ថត ៖"
-
-#: SmartRecordDialog.cpp:224
-msgid ""
-"\n"
-"\n"
-"Recording end:   "
-msgstr ""
-"\n"
-"\n"
-"បញ្ចប់ការ​ថត ៖   "
-
-#: SmartRecordDialog.cpp:225
-msgid "          Duration: "
-msgstr "          ថិរវេលា ៖ "
-
-#: SmartRecordDialog.cpp:228
-msgid "Audacity Smart Record Progress"
-msgstr "វឌ្ឍនភាព​ការ​ថតដ៏​​វៃឆ្លាត Audacity"
-
-#: SmartRecordDialog.cpp:269
-msgid "Start Date and Time"
-msgstr "កាលបរិច្ឆេទ និង​ពេល​វេលា​ចាប់ផ្ដើម"
-
-#: SmartRecordDialog.cpp:286
-msgid "End Date and Time"
-msgstr "កាល​បរិច្ឆេទ និង​ពេល​វេលា​បញ្ចប់"
-
-#: SmartRecordDialog.cpp:303
-msgid "Duration"
-msgstr "ថិរវេលា"
-
-#: SmartRecordDialog.cpp:376
-msgid "Waiting to start recording at "
-msgstr "រង់ចាំ​ដើម្បី​ចាប់ផ្ដើម​ថត​នៅ "
-
-#: SmartRecordDialog.cpp:377
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "ការ​ថតដ៏​​វៃឆ្លាតរបស់ Audacity - រង់ចាំ​ដើម្បី​ចាប់ផ្ដើម"
-
-#: SplashDialog.cpp:57
-msgid "&Welcome to Audacity!"
-msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity !"
-
-#: SplashDialog.cpp:94
-msgid "Don't show this again at start up"
-msgstr "កុំ​បង្ហាញ​វា​​ម្ដង​ទៀត​នៅ​ពេល​ចាប់ផ្ដើម"
-
-#: Tags.cpp:621
-msgid "Artist Name"
-msgstr "ឈ្មោះ​សិល្បករ"
-
-#: Tags.cpp:622
-msgid "Track Title"
-msgstr "ចំណង​ជើង​បទ"
-
-#: Tags.cpp:623
-msgid "Album Title"
-msgstr "ចំណង​ជើង​អាល់ប៊ុម"
-
-#: Tags.cpp:624
-msgid "Track Number"
-msgstr "លេខ​បទ"
-
-#: Tags.cpp:625 Tags.cpp:2105
-msgid "Year"
-msgstr "ឆ្នាំ"
-
-#: Tags.cpp:626
-msgid "Genre"
-msgstr "ចង្វាក់"
-
-#: Tags.cpp:627 Tags.cpp:2115 prefs/MousePrefs.cpp:96
-msgid "Comments"
-msgstr "មតិយោបល់"
-
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
-msgstr "ចុច F2 ឬ​ចុច​ទ្វេរ​ដង​ដើម្បី​កែ​សម្រួល ។"
-
-#: Tags.cpp:769
-msgid "Tag Name"
-msgstr "ឈ្មោះ​ស្លាក"
-
-#: Tags.cpp:770
-msgid "Tag Value"
-msgstr "តម្លៃ​ស្លាក"
-
-#: Tags.cpp:785 Tags.cpp:1443 prefs/KeyConfigPrefs.cpp:116
-msgid "&Clear"
-msgstr "ជម្រះ"
-
-#: Tags.cpp:791
-msgid "Genres"
-msgstr "ចង្វាក់"
-
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
-msgstr "កែ​សម្រួល"
-
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
-msgstr "កំណត់​ឡើង​វិញ"
-
-#: Tags.cpp:801 Tags.cpp:1427 Tags.cpp:1955
-msgid "Template"
-msgstr "ពុម្ព"
-
-#: Tags.cpp:805 Tags.cpp:1431 Tags.cpp:1959 prefs/KeyConfigPrefs.cpp:126
-msgid "&Load..."
-msgstr "ផ្ទុក..."
-
-#: Tags.cpp:806 Tags.cpp:1432 Tags.cpp:1960 prefs/KeyConfigPrefs.cpp:125
-msgid "&Save..."
-msgstr "រក្សា​ទុក..."
-
-#: Tags.cpp:808 Tags.cpp:1434 Tags.cpp:1962
-msgid "S&et default"
-msgstr "កំណត់​លំនាំដើម"
-
-#: Tags.cpp:958 Tags.cpp:1597 Tags.cpp:2326
-msgid "Edit Genres"
-msgstr "កែសម្រួល​ចង្វាក់"
-
-#: Tags.cpp:991 Tags.cpp:1003 Tags.cpp:1019 Tags.cpp:1032 Tags.cpp:1635
-#: Tags.cpp:1647 Tags.cpp:1663 Tags.cpp:1676 Tags.cpp:2369 Tags.cpp:2381
-#: Tags.cpp:2397 Tags.cpp:2410
-msgid "Reset Genres"
-msgstr "កំណត់​ចង្វាក់​ឡើង​វិញ"
-
-#: Tags.cpp:991 Tags.cpp:1032 Tags.cpp:1635 Tags.cpp:1676 Tags.cpp:2369
-#: Tags.cpp:2410
-msgid "Unable to save genre file."
-msgstr "មិនអាច​រក្សាទុក​ឯកសារ​ចង្វាក់"
-
-#: Tags.cpp:1002 Tags.cpp:1646 Tags.cpp:2380
-msgid "Are you sure you want to reset the genre list to defaults?"
-msgstr "តើ​អ្នក​ប្រាកដ​ជា​ចង់​កំណត់​បញ្ជី​ចង្វាក់​​ទៅ​ជា​លំនាំ​ដើម​​ឡើង​វិញ ?"
-
-#: Tags.cpp:1019 Tags.cpp:1663 Tags.cpp:2397
-msgid "Unable to open genre file."
-msgstr "មិន​អាច​បើក​ឯកសារ​ចង្វាក់ ។"
-
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
-msgstr "រក្សាទុក​ទិន្នន័យ​មេតា​ជា ៖"
-
-#: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
-msgid "Error loading metadata"
-msgstr "កំហុស​ក្នុង​ការ​ផ្ទុក​ទិន្នន័យ​មេតា"
-
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr "ចំណង​ជើង ៖"
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr "សិល្បករ ៖"
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr "អាល់ប៊ុម ៖"
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr "កម្មវិធី​តែង ៖​"
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr "អ្នក​កវី​និពន្ធ ៖"
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr "មតិយោបល់ ៖"
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr "បាន​អ៊ីនកូដ​ដោយ ៖"
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr "រក្សា​សិទ្ធិ ៖"
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr "លេខ​បទ ៖"
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr "ឆ្នាំ ៖"
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr "ចង្វាក់ ៖"
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr "គ្មាន​ចង្វាក់"
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr "កំណត់​ទៅ​លំនាំ​ដើម"
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr "មូលដ្ឋាន"
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr "កម្រិត​ខ្ពស់"
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr "តម្លៃ"
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr "ជម្រះ"
-
-#: Tags.cpp:2069
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "ប្រវែង​​អតិបរមា​របស់​​​គុណ​លក្ខណៈ '%s' គឺ %d តួ​អក្សរ ។ ទិន្នន័យ​ត្រូវ​បាន​កាត់​ឲ្យ​ខ្លី ។"
-
-#: Tags.cpp:2075
-msgid "Title"
-msgstr "ចំណងជើង"
-
-#: Tags.cpp:2085
-msgid "Artist"
-msgstr "សិល្បករ"
-
-#: Tags.cpp:2095
-msgid "Album"
-msgstr "អាល់ប៊ុម"
-
-#: Theme.cpp:638
-#, c-format
-msgid ""
-"Audacity could not write file:\n"
-"  %s."
-msgstr ""
-"Audacity មិន​អាច​សរសេរ​ឯកសារ ៖\n"
-"  %s ។"
-
-#: Theme.cpp:656
-#, c-format
-msgid ""
-"Audacity could not open file:\n"
-"  %s\n"
-"for writing."
-msgstr ""
-"Audacity មិន​អាច​បើក​ឯកសារ ៖\n"
-"  %s\n"
-"សម្រាប់​សរសេរ ។"
-
-#: Theme.cpp:664
-#, c-format
-msgid ""
-"Audacity could not write images to file:\n"
-"  %s."
-msgstr ""
-"Audacity មិន​អាច​សរសេរ​រូបភាព​ទៅ​ឯកសារ ៖\n"
-"  %s ។"
-
-#: Theme.cpp:799
-#, c-format
-msgid ""
-"Audacity could not find file:\n"
-"  %s.\n"
-"Theme not loaded."
-msgstr ""
-"Audacity មិន​អាច​រក​ឯកសារ ៖\n"
-"  %s.\n"
-"មិន​បាន​ផ្ទុក​ស្បែក ។"
-
-#: Theme.cpp:807 Theme.cpp:896
-#, c-format
-msgid ""
-"Audacity could not load file:\n"
-"  %s.\n"
-"Bad png format perhaps?"
-msgstr ""
-"Audacity មិន​អាច​ផ្ទុក​ឯកសារ ៖\n"
-"  %s.\n"
-"ប្រហែល​ជា​ទ្រង់ទ្រាយ png មិន​ល្អ ?"
-
-#: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
-"Please report the problem."
-msgstr ""
-"Audacity មិន​អាច​អាន​ស្បែក​លំនាំ​ដើម​របស់​វា ។\n"
-"សូម​រាយការណ៍​អំពី​​បញ្ហា ។"
-
-#: Theme.cpp:918
-#, c-format
-msgid ""
-"None of the expected theme component files\n"
-" were found in:\n"
-"  %s."
-msgstr ""
-"រក​មិន​ឃើញ​ឯកសារ​សមាសភាគ​ស្បែក​ដែល​រំពឹង​ទុក\n"
-" នៅ​ក្នុង ៖\n"
-"  %s."
-
-#: Theme.cpp:942 effects/NoiseRemoval.cpp:173
-#, c-format
-msgid ""
-"Could not create directory:\n"
-"  %s"
-msgstr ""
-"មិន​អាច​បង្កើត​ថត ៖\n"
-"  %s"
-
-#: Theme.cpp:963
-#, c-format
-msgid ""
-"Audacity could not save file:\n"
-"  %s"
-msgstr ""
-"Audacity មិន​អាច​រក្សាទុក​ឯកសារ ៖\n"
-"  %s"
-
-#: Theme.cpp:975
-#, c-format
-msgid ""
-"All required files in:\n"
-"  %s\n"
-"were already present."
-msgstr ""
-"ឯកសារ​ដែល​ត្រូវការ​ទាំងអស់​នៅ​ក្នុង ៖\n"
-"  %s\n"
-"បាន​បង្ហាញ​រួច​ហើយ ។"
-
-#: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "បញ្ជាក់​ពេលវេលា"
-
-#: TrackPanel.cpp:448 TrackPanel.cpp:449
-msgid "Track Panel"
-msgstr "បន្ទះ​បទ"
-
-#: TrackPanel.cpp:492 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
-msgid "Other..."
-msgstr "ផ្សេងៗទៀត..."
-
-#: TrackPanel.cpp:500 TrackPanel.cpp:521 TrackPanel.cpp:530 TrackPanel.cpp:538
-msgid "Name..."
-msgstr "ឈ្មោះ..."
-
-#: TrackPanel.cpp:502 TrackPanel.cpp:523 TrackPanel.cpp:534 TrackPanel.cpp:540
-msgid "Move Track Up"
-msgstr "ផ្លាស់ទី​បទ​ឡើង​លើ"
-
-#: TrackPanel.cpp:503 TrackPanel.cpp:524 TrackPanel.cpp:535 TrackPanel.cpp:541
-msgid "Move Track Down"
-msgstr "ផ្លាស់ទី​បទ​ចុះ​ក្រោម"
-
-#: TrackPanel.cpp:505 effects/ToneGen.cpp:295
-msgid "Waveform"
-msgstr "ទ្រង់ទ្រាយ​រលក"
-
-#: TrackPanel.cpp:506
-msgid "Waveform (dB)"
-msgstr "ទ្រង់ទ្រាយ​រលក (dB)"
-
-#: TrackPanel.cpp:508
-msgid "Pitch (EAC)"
-msgstr "កម្ពស់​សំឡេង (EAC)"
-
-#: TrackPanel.cpp:510 TrackPanel.cpp:5831
-msgid "Mono"
-msgstr "ម៉ូណូ"
-
-#: TrackPanel.cpp:511 TrackPanel.cpp:5830
-msgid "Left Channel"
-msgstr "ឆានែល​ឆ្វេង"
-
-#: TrackPanel.cpp:512 TrackPanel.cpp:5830
-msgid "Right Channel"
-msgstr "ឆានែល​ស្ដាំ"
-
-#: TrackPanel.cpp:513
-msgid "Make Stereo Track"
-msgstr "បង្កើត​បទ​ស្តេរ៉េអូ"
-
-#: TrackPanel.cpp:514
-msgid "Split Stereo Track"
-msgstr "ពុះ​បទ​ស្តេរ៉េអូ"
-
-#: TrackPanel.cpp:516
-msgid "Set Sample Format"
-msgstr "កំណត់​ទ្រង់ទ្រាយ​គំរូ"
-
-#: TrackPanel.cpp:518 TrackPanel.cpp:6048
-msgid "Set Rate"
-msgstr "កំណត់​អត្រា"
-
-#: TrackPanel.cpp:526
-msgid "Up Octave"
-msgstr "Octave ឡើង"
-
-#: TrackPanel.cpp:527
-msgid "Down Octave"
-msgstr "Octave ចុះ"
-
-#: TrackPanel.cpp:532
-msgid "Font..."
-msgstr "ពុម្ពអក្សរ..."
-
-#: TrackPanel.cpp:543
-msgid "Set Range..."
-msgstr "កំណត់​ជួរ..."
-
-#: TrackPanel.cpp:547 toolbars/EditToolBar.cpp:135
-msgid "Copy"
-msgstr "ចម្លង"
-
-#: TrackPanel.cpp:1239
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
-msgstr "ចុច​ដើម្បី​​ពង្រីក​បញ្ឈរ ប្ដូរ​(Shift) - ចុច ដើម្បី​បង្រួម អូស​ដើម្បី​បង្កើត​តំបន់​ពង្រីក​ជាក់លាក់ ។"
-
-#: TrackPanel.cpp:1244
-msgid "Drag the label vertically to change the order of the tracks."
-msgstr "អូស​ស្លាក​បញ្ឈរ​ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​បទ ។"
-
-#: TrackPanel.cpp:1264
-msgid "Click and drag to adjust relative size of stereo tracks."
-msgstr "ចុច និង​អូស​ដើម្បី​លៃ​តម្រូវ​ទំហំ​បទ​ស្តេរ៉េអូ​នីមួយៗ ។"
-
-#: TrackPanel.cpp:1267
-msgid "Click and drag to resize the track."
-msgstr "ចុច និង​អូស​ដើម្បី​ប្ដូរ​ទំហំ​បទ ។"
-
-#: TrackPanel.cpp:1298
-msgid "Drag one or more label boundaries"
-msgstr "អូស​ស៊ុម​ស្លាក​មួយ ឬ​ច្រើន"
-
-#: TrackPanel.cpp:1299
-msgid "Drag label boundary"
-msgstr "អូស​ស៊ុម​ស្លាក"
-
-#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1315
-msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
-msgstr "របៀប​ឧបករណ៍​ច្រើន ៖ Cmd- សម្រាប់​ចំណូល​ចិត្ត​ក្ដារ​ចុច និង​កណ្ដុរ"
-
-#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1318
-msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
-msgstr "របៀប​ឧបករណ៍​ច្រើន ៖ បញ្ជា (Ctrl) - P សម្រាប់​ចំណូល​ចិត្ត​កណ្ដុរ និង​ក្ដារ​ចុច"
-
-#: TrackPanel.cpp:1338
-msgid "Click and drag to move left selection boundary."
-msgstr "ចុច និង​អូស​ដើម្បី​ផ្លាស់ទី​ស៊ុម​ការ​ជ្រើស ។"
-
-#: TrackPanel.cpp:1343
-msgid "Click and drag to move right selection boundary."
-msgstr "ចុច និង​អូស​ដើម្បី​ផ្លាស់ទី​ស៊ុម​ការ​ជ្រើស​ខាង​ស្ដាំ ។"
-
-#: TrackPanel.cpp:1669 TrackPanel.cpp:3777 TrackPanel.cpp:3809
-#: TrackPanel.cpp:4064 TrackPanel.cpp:6160 TrackPanel.cpp:6180
-msgid "Modified Label"
-msgstr "ស្លាក​ដែល​បានកែប្រែ"
-
-#: TrackPanel.cpp:1670 TrackPanel.cpp:3778 TrackPanel.cpp:3810
-#: TrackPanel.cpp:4065 TrackPanel.cpp:6161 TrackPanel.cpp:6181
-msgid "Label Edit"
-msgstr "កែសម្រួល​ស្លាក"
-
-#: TrackPanel.cpp:1897
-msgid "Adjusted envelope."
-msgstr "​ស្រោម​សំបុត្រ​ដែល​បាន​លៃតម្រូវ ។"
-
-#: TrackPanel.cpp:1898 prefs/MousePrefs.cpp:115
-msgid "Envelope"
-msgstr "ស្រោម​សំបុត្រ"
-
-#: TrackPanel.cpp:2034
-msgid "Moved clip to another track"
-msgstr "ផ្លាស់ទី​ឈុត​ទៅ​បទ​មួយផ្សេង​ទៀត"
-
-#: TrackPanel.cpp:2038
-msgid "left"
-msgstr "ឆ្វេង"
-
-#: TrackPanel.cpp:2038
-msgid "right"
-msgstr "ស្ដាំ"
-
-#. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2040
-#, c-format
-msgid "Time shifted tracks/clips %s %.02f seconds"
-msgstr "ពេលវេលា​ប្តូរ​បទ/ឈុត %s %.02f វិនាទី"
-
-#: TrackPanel.cpp:2044 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
-#: prefs/MousePrefs.cpp:113
-msgid "Time-Shift"
-msgstr "អង្កិល​ពេល​វេលា"
-
-#: TrackPanel.cpp:2737
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "ការ​គូរ​បច្ចុប្បន្នដំណើរការ​​តែ​ជាមួយ​ទ្រង់ទ្រាយ​រលក​ទិដ្ឋភាព​លីនេអ៊ែរ ។"
-
-#: TrackPanel.cpp:2754
-msgid ""
-"You are not zoomed in enough. Zoom in until you can see the individual "
-"samples."
-msgstr "អ្នក​មិន​ទាន់​ពង្រីក​ល្មម​នៅ​ឡើយ​ទេ ។ ពង្រីក​ទាល់​តែ​អ្នក​អាច​ឃើញ​គំរូ​នីមួយៗ ។"
-
-#: TrackPanel.cpp:3025
-msgid "Moved Sample"
-msgstr "គំរូ​ដែលបានផ្លាស់ទី"
-
-#: TrackPanel.cpp:3026
-msgid "Sample Edit"
-msgstr "កែសម្រួល​គំរូ"
-
-#: TrackPanel.cpp:3125
-#, c-format
-msgid "Removed track '%s.'"
-msgstr "បទ '%s.' ដែលបាន​យក​ចេញ"
-
-#: TrackPanel.cpp:3127
-msgid "Track Remove"
-msgstr "យក​បទ​ចេញ"
-
-#: TrackPanel.cpp:3268
-msgid "Moved gain slider"
-msgstr "​គ្រាប់​រំកិល​កំណើន​ដែល​បាន​ផ្លាស់ទី"
-
-#: TrackPanel.cpp:3268
-msgid "Moved pan slider"
-msgstr "​គ្រាប់រុញ​រំកិល​ដែល​បាន​ផ្លាស់ទី​"
-
-#. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3269 TrackPanel.cpp:5478 TrackPanel.cpp:6829
-msgid "Gain"
-msgstr "កំណើន"
-
-#. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3269 TrackPanel.cpp:5416 TrackPanel.cpp:6836
-msgid "Pan"
-msgstr "បន្ទះ"
-
-#: TrackPanel.cpp:3394 TrackPanel.cpp:6113 effects/ChangePitch.cpp:282
-msgid "up"
-msgstr "ឡើង​លើ"
-
-#: TrackPanel.cpp:3398 TrackPanel.cpp:6114 effects/ChangePitch.cpp:282
-msgid "down"
-msgstr "ចុះ​ក្រោម"
-
-#: TrackPanel.cpp:3405 TrackPanel.cpp:6109
-#, c-format
-msgid "Moved '%s' %s"
-msgstr "ផ្លាស់ទី '%s' %s"
-
-#: TrackPanel.cpp:3408 TrackPanel.cpp:6115
-msgid "Move Track"
-msgstr "ផ្លាស់ទី​បទ"
-
-#: TrackPanel.cpp:3964
-msgid "Expand"
-msgstr "ពង្រីក"
-
-#: TrackPanel.cpp:3964
-msgid "Expanded Cut Line"
-msgstr "ពង្រីក​បន្ទាត់​កាត់"
-
-#: TrackPanel.cpp:3973
-msgid "Merge"
-msgstr "បញ្ចូល​ចូល​គ្នា"
-
-#: TrackPanel.cpp:3973
-msgid "Merged Clips"
-msgstr "បញ្ចូល​ឈុត​ចូល​គ្នា"
-
-#: TrackPanel.cpp:3985
-msgid "Removed Cut Line"
-msgstr "​បន្ទាត់​កាត់​ដែល​បាន​យកចេញ"
-
-#: TrackPanel.cpp:5416
-msgid "Adjusted Pan"
-msgstr "បន្ទះ​ដែល​បាន​លៃតម្រូវ"
-
-#: TrackPanel.cpp:5478
-msgid "Adjusted gain"
-msgstr "កំណើន​ដែល​បាន​លៃតម្រូវ"
-
-#: TrackPanel.cpp:5658
-msgid "Can't delete track with active audio"
-msgstr "មិន​អាច​លុប​បទ​ដែល​មាន​អូឌីយ៉ូ​សកម្ម"
-
-#: TrackPanel.cpp:5811
-msgid "Stereo, "
-msgstr "ស្តេរ៉េអូ "
-
-#: TrackPanel.cpp:5814
-msgid "Mono, "
-msgstr "ម៉ូណូ "
-
-#: TrackPanel.cpp:5816
-msgid "Left, "
-msgstr "ឆ្វេង "
-
-#: TrackPanel.cpp:5818
-msgid "Right, "
-msgstr "ស្ដាំ "
-
-#: TrackPanel.cpp:5840 TrackPanel.cpp:5953
-#, c-format
-msgid "Changed '%s' to %s"
-msgstr "ផ្លាស់ប្ដូរ '%s' ទៅ %s"
-
-#: TrackPanel.cpp:5845
-msgid "Channel"
-msgstr "ឆានែល"
-
-#: TrackPanel.cpp:5858
-#, c-format
-msgid "Split stereo track '%s'"
-msgstr "ពុះ​បទ​ស្តេរ៉េអូ '%s'"
-
-#: TrackPanel.cpp:5879
-#, c-format
-msgid "Made '%s' a stereo track"
-msgstr "បង្កើត​បទ​ស្តេរ៉េអូ '%s'"
-
-#: TrackPanel.cpp:5882
-msgid "Make Stereo"
-msgstr "បង្កើត​ស្តេរ៉េអូ"
-
-#: TrackPanel.cpp:5917
-#, c-format
-msgid "Changed '%s' to %d Hz"
-msgstr "ផ្លាស់ប្ដូរ '%s' ទៅ %d Hz"
-
-#: TrackPanel.cpp:5919
-msgid "Rate Change"
-msgstr "ផ្លាស់ប្ដូរ​អត្រា"
-
-#: TrackPanel.cpp:5957
-msgid "Format Change"
-msgstr "ផ្លាស់ប្ដូរ​ទ្រង់ទ្រាយ"
-
-#: TrackPanel.cpp:6047
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "បញ្ចូល​អត្រា​គំរូ​ជា Hz (ក្នុង​មួយ​វិនាទី) ចន្លោះ​ពី ១ ទៅ ១០០០០០ ៖"
-
-#: TrackPanel.cpp:6057
-msgid "Invalid rate."
-msgstr "អត្រា​មិន​ត្រឹមត្រូវ ។"
-
-#: TrackPanel.cpp:6077
-msgid "Change lower speed limit (%) to:"
-msgstr "ផ្លាស់ប្ដូរ​ដែន​កំណត់​ល្បឿន​ទាប​ជាង (%) ទៅ ៖"
-
-#: TrackPanel.cpp:6078 TrackPanel.cpp:6079
-msgid "Lower speed limit"
-msgstr "ដែន​កំណត់​ល្បឿន​ទាប​ជាង"
-
-#: TrackPanel.cpp:6084
-msgid "Change upper speed limit (%) to:"
-msgstr "ផ្លាស់ប្ដូរ​ដែន​កំណត់​ល្បឿន​ខ្ពស់​ជាង (%) ទៅ ៖"
-
-#: TrackPanel.cpp:6085 TrackPanel.cpp:6086
-msgid "Upper speed limit"
-msgstr "ដែន​កំណត់​ល្បឿន​ខ្ពស់​ជាង"
-
-#: TrackPanel.cpp:6094
-#, c-format
-msgid "Set range to '%d' - '%d'"
-msgstr "កំណត់​ជួរ​ទៅ '%d' - '%d'"
-
-#: TrackPanel.cpp:6097
-msgid "Set Range"
-msgstr "កំណត់​ជួរ"
-
-#: TrackPanel.cpp:6142
-msgid "Change track name to:"
-msgstr "ផ្លាស់ប្ដូរ​ឈ្មោះ​បទ​ទៅ ៖"
-
-#: TrackPanel.cpp:6143
-msgid "Track Name"
-msgstr "ឈ្មោះ​បទ"
-
-#: TrackPanel.cpp:6146
-#, c-format
-msgid "Renamed '%s' to '%s'"
-msgstr "បាន​ប្ដូរ​ឈ្មោះ '%s' ទៅ '%s'"
-
-#: TrackPanel.cpp:6149
-msgid "Name Change"
-msgstr "ផ្លាស់ប្ដូរ​ឈ្មោះ"
-
-#: TrackPanel.cpp:6215
-msgid "Label Track Font"
-msgstr "ដាក់ស្លាក​ពុម្ពអក្សរ​បទ"
-
-#: TrackPanel.cpp:6227
-msgid "Face name"
-msgstr "ឈ្មោះ​មុខ"
-
-#: TrackPanel.cpp:6236
-msgid "Face size"
-msgstr "ទំហំ​មុខ"
-
-#: TrackPanel.cpp:6756
-msgid "Mute"
-msgstr "ស្ងាត់"
-
-#: TrackPanel.cpp:6756
-msgid "Solo"
-msgstr "សូឡូ"
-
-#: TrackPanelAx.cpp:265
-msgid "TrackView"
-msgstr "ទិដ្ឋភាព​បទ"
-
-#: TrackPanelAx.cpp:273
-msgid "Track Accessible out of sync"
-msgstr "អាច​ចូល​ដំណើរការ​បទ​ក្រៅ sync"
-
-#: TrackPanelAx.cpp:281
-#, c-format
-msgid "Track %d"
-msgstr "បទ %d"
-
-#: TrackPanelAx.cpp:287
-msgid " Mute On"
-msgstr "ស្ងាត់"
-
-#: TrackPanelAx.cpp:292
-msgid " Solo On"
-msgstr " បើក​សូឡូ"
-
-#: TrackPanelAx.cpp:296
-msgid " Select On"
-msgstr "ជ្រើស​បើក"
-
-#: VoiceKey.cpp:88 VoiceKey.cpp:238 VoiceKey.cpp:376 VoiceKey.cpp:517
-msgid "Selection is too small to use voice key."
-msgstr "ជម្រើស​តូច​ពេក​មិន​អាច​ប្រើ​គ្រាប់​ចុច​សំឡេង​បានទេ ។"
-
-#: VoiceKey.cpp:843
-msgid "Calibration Results\n"
-msgstr "លទ្ធផល​កម្រិត​តាមខ្នាត\n"
-
-#: VoiceKey.cpp:844
-#, c-format
-msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
-msgstr "ថាមពល            -- mean: %1.4f  sd: (%1.4f)\n"
-
-#: VoiceKey.cpp:845
-#, c-format
-msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
-msgstr "សញ្ញា​ផ្លាស់ប្តូរ       -- mean: %1.4f  sd: (%1.4f)\n"
-
-#: VoiceKey.cpp:846
-#, c-format
-msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
-msgstr "ទិស​ផ្លាស់ប្តូរ  -- mean: %1.4f  sd: (%1.4f)\n"
-
-#: WaveTrack.cpp:75
-msgid "Audio Track"
-msgstr "បទ​អូឌីយ៉ូ"
-
-#: WaveTrack.cpp:541 WaveTrack.cpp:560
-msgid "There is not enough room available to paste the selection"
-msgstr "មិន​មាន​បន្ទប់​គ្រប់គ្រាន់​ដើម្បី​បិទ​ភ្ជាប់​​ជម្រើស​ទេ"
-
-#: WaveTrack.cpp:1649
-msgid "There is not enough room available to expand the cut line"
-msgstr "មិន​មាន​បន្ទប់​គ្រប់គ្រាន់​ដើម្បី​ពង្រីក​បន្ទាត់​កាត់"
-
-#: commands/CommandManager.cpp:395
-#, c-format
-msgid "Plugins 1 to %i"
-msgstr "កម្មវិធី​ជំនួយ​ពី 1 ដល់ %i"
-
-#: commands/CommandManager.cpp:409
-#, c-format
-msgid "Plugins %i to %i"
-msgstr "កម្មវិធី​ជំនួយពី %i ដល់ %i"
-
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
-msgstr "មិន​អនុញ្ញាត​ចំពោះ​ហេតុផល​មួយ​ចំនួន ។  ព្យាយាម​ជ្រើស​អូឌីយ៉ូ​ខ្លះ​ជាមុន ?"
-
-#: commands/CommandManager.cpp:724
-msgid ""
-"You can only do this when playing and recording are\n"
-" stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"អ្នក​អាច​ធ្វើ​នេះ ពេល​ការ​ចាក់ និង​ថត\n"
-" ត្រូវ​បាន​បញ្ឈប់ ។  [ការ​ផ្អាក​មិន​មាន​ប្រសិទ្ធិភាព ។]"
-
-#: commands/CommandManager.cpp:726
-msgid ""
-"You must first select some stereo audio for this\n"
-" to use.  [You can't use this with mono.]"
-msgstr ""
-"អ្នក​ត្រូវ​តែ​ជ្រើស​អូឌីយ៉ូ និង​ស្តេរ៉េអូ​មួយ​ចំនួន​សម្រាប់​វា\n"
-" ដើម្បី​ប្រើ ។  [អ្នក​មិន​អាច​ប្រើ​វា​ជា​មួយ​ម៉ូណូ​ទេ ។]"
-
-#: commands/CommandManager.cpp:728
-msgid "You must first select some audio for this to use."
-msgstr "អ្នក​ត្រូវ​តែ​ជ្រើស​អូឌីយ៉ូ​ខ្លះ​សម្រាប់​ប្រើ​នេះ ។"
-
-#: commands/CommandManager.cpp:730
-msgid ""
-"You must first select some audio for this\n"
-" to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"អ្នក​ត្រូវ​តែ​ជ្រើស​អូឌីយ៉ូ​មួយ​ចំនួន​ដើម្បី​\n"
-" ប្រើ ។ [ដោយ​ជ្រើស​ប្រភេទ​បទ​ផ្សេងៗ​ដែល​នឹង​មិន​ដំណើរការ ។]"
-
-#: commands/CommandManager.cpp:732
-msgid "Message"
-msgstr "សារ"
-
-#: commands/CommandManager.cpp:912
-#, c-format
-msgid "Loaded %d keyboard shortcuts\n"
-msgstr "បាន​ផ្ទុក​ផ្លូវកាត់​ក្ដារចុច %d\n"
-
-#: commands/CommandManager.cpp:914
-msgid "Loading keyboard shortcuts"
-msgstr "​ផ្ទុក​ផ្លូវកាត់​ក្ដារ​ចុច"
-
-#: effects/Amplify.cpp:52
-#, c-format
-msgid "Applied effect: %s %.1f dB"
-msgstr "បាន​អនុវត្ត​បែបផែន ៖ %s %.1f dB"
-
-#: effects/Amplify.cpp:87
-msgid "Amplify"
-msgstr "ពង្រីក"
-
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "ពង្រីក​ដោយ Dominic Mazzoni"
-
-#: effects/Amplify.cpp:159
-msgid "Amplification (dB):"
-msgstr "ការ​ពង្រីក (dB) ៖"
-
-#: effects/Amplify.cpp:179
-msgid "New Peak Amplitude (dB):"
-msgstr "អាំភ្លី​កំពូល​ថ្មី (dB) ៖"
-
-#: effects/Amplify.cpp:191
-msgid "Allow clipping"
-msgstr "អនុញ្ញាត​ឲ្យ​ច្រឹប"
-
-#: effects/Amplify.h:46
-msgid "Amplify..."
-msgstr "ពង្រីក..."
-
-#: effects/Amplify.h:54
-msgid "Amplifying"
-msgstr "ពង្រីក"
-
-#: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
-msgstr "អ្នក​ជ្រើស​បទ ដែល​មិន​មាន​អូឌីយ៉ូ ។ AutoDuck អាច​ដំណើរ​ការ​បាន​តែ​បទ​អូឌីយ៉ូ​ប៉ុណ្ណោះ ។"
-
-#: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:451
-#: effects/AutoDuck.cpp:568
-msgid "Auto Duck"
-msgstr "Auto Duck"
-
-#: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
-msgstr "Auto Duck ត្រូវតែ​ត្រួតពិនិត្យ​បទ​​ ដែល​ត្រូវ​បាន​ដាក់​ពី​ក្រោម​បទ​ដែល​ជ្រើស ។"
-
-#: effects/AutoDuck.cpp:463
-msgid "Auto Duck by Markus Meyer"
-msgstr "Auto Duck ដោយ Markus Meyer"
-
-#: effects/AutoDuck.cpp:485
-msgid "Duck amount:"
-msgstr "ចំនួន​ Duck សរុប ៖"
-
-#: effects/AutoDuck.cpp:490
-msgid "Maximum pause:"
-msgstr "ការ​ផ្អាក​អតិបរមា ៖"
-
-#: effects/AutoDuck.cpp:492 effects/AutoDuck.cpp:497 effects/AutoDuck.cpp:502
-#: effects/AutoDuck.cpp:507 effects/AutoDuck.cpp:512
-#: prefs/AudioIOPrefs.cpp:166 prefs/AudioIOPrefs.cpp:174
-#: prefs/AudioIOPrefs.cpp:176 prefs/AudioIOPrefs.cpp:201
-#: prefs/AudioIOPrefs.cpp:203 widgets/TimeTextCtrl.cpp:197
-msgid "seconds"
-msgstr "វិនាទី"
-
-#: effects/AutoDuck.cpp:495
-msgid "Outer fade down length:"
-msgstr "ប្រវែង​ផត​ចុះ​ខាង​ក្រៅ​ ៖"
-
-#: effects/AutoDuck.cpp:500
-msgid "Outer fade up length:"
-msgstr "ប្រវែង​ផុសចេញ​ខាង​ក្រៅ ៖"
-
-#: effects/AutoDuck.cpp:505
-msgid "Inner fade down length:"
-msgstr "ប្រវែង​ផតចុះ​ខាង​ក្នុង ៖"
-
-#: effects/AutoDuck.cpp:510
-msgid "Inner fade up length:"
-msgstr "ប្រវែង​ផុសចេញ​ខាង​ក្នុង ៖"
-
-#: effects/AutoDuck.cpp:519 effects/Compressor.cpp:479
-msgid "Threshold:"
-msgstr "កម្រិត​ពន្លឺ ៖"
-
-#: effects/AutoDuck.cpp:568
-msgid "Please enter valid values."
-msgstr "សូម​បញ្ចូល​តម្លៃ​ដែល​​ត្រឹមត្រូវ ។"
-
-#: effects/AutoDuck.cpp:702
-msgid "Preview not available"
-msgstr "មិន​មាន​ការ​មើល​ជាមុន"
-
-#: effects/AutoDuck.h:97
-msgid "Auto Duck..."
-msgstr "Auto Duck..."
-
-#: effects/AutoDuck.h:107
-msgid "Processing Auto Duck..."
-msgstr "កំពុង​ដំណើរ​ការ Auto Duck..."
-
-#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:439
-#: effects/audiounits/AudioUnitEffect.cpp:877 effects/nyquist/Nyquist.cpp:1037
-#: widgets/ErrorDialog.cpp:74 widgets/ErrorDialog.cpp:100
-#: widgets/Warning.cpp:67
-msgid "OK"
-msgstr "យល់ព្រម"
-
-#: effects/BassBoost.cpp:52
-#, c-format
-msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
-msgstr "អនុវត្ត​បែបផែន ៖ %s ប្រេកង់ = %.0f Hz boost = %.0f dB"
-
-#: effects/BassBoost.cpp:169
-msgid "Bass Boost"
-msgstr "ដំឡើង​បាស"
-
-#: effects/BassBoost.cpp:182
-msgid "by Nasca Octavian Paul"
-msgstr "ដោយ Nasca Octavian Paul"
-
-#: effects/BassBoost.cpp:196
-msgid "Frequency (Hz):"
-msgstr "ប្រេកង់ (Hz) ៖"
-
-#: effects/BassBoost.cpp:208
-msgid "Boost (dB):"
-msgstr "ដំឡើង (dB) ៖"
-
-#: effects/BassBoost.h:35
-msgid "BassBoost..."
-msgstr "ដំឡើង​បាស..."
-
-#: effects/BassBoost.h:43
-msgid "Boosting Bass Frequencies"
-msgstr "ប្រេកង់​ដំឡើង​បាស"
-
-#: effects/ChangeLength.h:26
-msgid "Change Length..."
-msgstr "ផ្លាស់ប្ដូរ​ប្រវែង..."
-
-#: effects/ChangeLength.h:34
-msgid "Changing Length..."
-msgstr "កំពុង​ផ្លាស់ប្ដូរ​ប្រវែង..."
-
-#: effects/ChangePitch.cpp:55
-#, c-format
-msgid "Applied effect: %s %.2f semitones"
-msgstr "អនុវត្ត​បែបផែន ៖ %s %.2f សំឡេង​ពាក់​កណ្តាល"
-
-#: effects/ChangePitch.cpp:118
-msgid "Change Pitch"
-msgstr "ផ្លាស់ប្តូរ​កម្ពស់​សំឡេង"
-
-#: effects/ChangePitch.cpp:247
-msgid "Change Pitch without Changing Tempo"
-msgstr "ផ្លាស់ប្តូរ​កម្ពស់​សំឡេង​ដោយ​មិន​ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង"
-
-#: effects/ChangePitch.cpp:252 effects/ChangeSpeed.cpp:304
-#: effects/ChangeTempo.cpp:180
-msgid "by Vaughan Johnson && Dominic Mazzoni"
-msgstr "ដោយ Vaughan Johnson និង Dominic Mazzoni"
-
-#: effects/ChangePitch.cpp:257 effects/ChangeTempo.cpp:185
-msgid "using SoundTouch, by Olli Parviainen"
-msgstr "ប្រើប្រាស់​ SoundTouch ដោយ Olli Parviainen"
-
-#: effects/ChangePitch.cpp:267
-msgid "Pitch:   from"
-msgstr "កម្ពស់​សំឡេង ៖  ពី"
-
-#: effects/ChangePitch.cpp:289 effects/ChangePitch.cpp:335
-#: effects/ChangeSpeed.cpp:368 effects/ChangeTempo.cpp:239
-#: effects/ChangeTempo.cpp:270
-msgid "to"
-msgstr "ទៅ"
-
-#: effects/ChangePitch.cpp:304
-msgid "Semitones (half-steps):"
-msgstr "សំឡេង​ពាក់​កណ្តាល (ជំហាន​ពាក់​កណ្តាល) ៖"
-
-#: effects/ChangePitch.cpp:323
-msgid "Frequency (Hz):   from"
-msgstr "ប្រេកង់ (Hz) ៖   ពី"
-
-#: effects/ChangePitch.cpp:358 effects/ChangeSpeed.cpp:322
-#: effects/ChangeTempo.cpp:198
-msgid "Percent Change:"
-msgstr "ភាគរយ​ផ្លាស់ប្តូរ ៖"
-
-#: effects/ChangePitch.h:31
-msgid "Change Pitch..."
-msgstr "ផ្លាស់ប្តូរ​​កម្ពស់​​សំឡេង..."
-
-#: effects/ChangePitch.h:39
-msgid "Changing Pitch"
-msgstr "ផ្លាស់ប្តូរ​​កម្ពស់​​សំឡេង"
-
-#: effects/ChangeSpeed.cpp:53 effects/ChangeTempo.cpp:55
-#, c-format
-msgid "Applied effect: %s %.1f%%"
-msgstr "អនុវត្ត​បែបផែន ៖ %s %.1f%%"
-
-#: effects/ChangeSpeed.cpp:60
-msgid "Change Speed"
-msgstr "ផ្លាស់ប្តូរ​ល្បឿន"
-
-#: effects/ChangeSpeed.cpp:299
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "ផ្លាស់ប្តូរ​ល្បឿន​ប៉ះពាល់​ទាំង​ចង្វាក់​ភ្លេង និង​កម្ពស់​សំឡេង"
-
-#: effects/ChangeSpeed.cpp:309
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "ប្រើ​អត្រា​គំរូ​ដោយ Erik de Castro Lopo"
-
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:355
-msgid "n/a"
-msgstr "មិនមាន"
-
-#: effects/ChangeSpeed.cpp:358
-msgid "Standard Vinyl RPM:   from"
-msgstr "ស្តង់ដារ Vinyl RPM ៖   ពី"
-
-#: effects/ChangeSpeed.h:32
-msgid "Change Speed..."
-msgstr "ផ្លាស់ប្តូរ​ល្បឿន..."
-
-#: effects/ChangeSpeed.h:40
-msgid "Changing Speed"
-msgstr "កំពុង​ផ្លាស់ប្តូរ​ល្បឿន"
-
-#: effects/ChangeTempo.cpp:74
-msgid "Change Tempo"
-msgstr "ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង"
-
-#: effects/ChangeTempo.cpp:175
-msgid "Change Tempo without Changing Pitch"
-msgstr "ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង​ដោយ​មិន​ផ្លាស់ប្តូរ​កម្ពស់​សំឡេង"
-
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "លោត​ក្នុង​មួយ​នាទី (BPM) ៖   ពី"
-
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "ប្រវែង (វិនាទី) ៖   ពី"
-
-#: effects/ChangeTempo.h:35
-msgid "Change Tempo..."
-msgstr "ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង..."
-
-#: effects/ChangeTempo.h:43
-msgid "Changing Tempo"
-msgstr "កំពុង​ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង"
-
-#: effects/ClickRemoval.cpp:317
-msgid "ClickRemoval"
-msgstr "យក​ក្លីកចេញ"
-
-#: effects/ClickRemoval.cpp:330
-msgid "Click and Pop Removal by Craig DeForest"
-msgstr "ការ​យក​ក្លីក និង​​ផប់​ចេញ​ដោយ Craig DeForest"
-
-#: effects/ClickRemoval.cpp:344
-msgid "Select threshold (lower is more sensitive):"
-msgstr "ជ្រើស​កម្រិត​​ពន្លឺ (កាន់​តែ​ទាប​ កាន់​តែ​​ប្រសើរ) ៖"
-
-#: effects/ClickRemoval.cpp:356
-msgid "Max spike width (higher is more sensitive):"
-msgstr "ទទឹង​ spike អតិបរមា (កាន់​តែ​ខ្ពស់​ កាន់​តែ​ប្រសើរ) ៖"
-
-#: effects/ClickRemoval.h:42
-msgid "Click Removal..."
-msgstr "យក​ក្លីក​ចេញ..."
-
-#: effects/ClickRemoval.h:50
-msgid "Removing clicks and pops..."
-msgstr "កំពុង​យក​ក្លីក និង​ផប់​ចេញ..."
-
-#: effects/Compressor.cpp:73
-msgid "Dynamic Range Compressor"
-msgstr "ឧបករណ៍​បង្ហាប់​ជួរ​ថាមវន្ត"
-
-#: effects/Compressor.cpp:468
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "ឧបករណ៍​បង្ហាប់​ជួរ​ថាមវន្ត​ដោយ Dominic Mazzoni"
-
-#: effects/Compressor.cpp:486
-msgid "Ratio: "
-msgstr "សមាមាត្រ ៖"
-
-#: effects/Compressor.cpp:493
-msgid "Attack Time: "
-msgstr "​ពេល​វេលា​វាយ ៖"
-
-#: effects/Compressor.cpp:504
-msgid "Normalize to 0dB after compressing"
-msgstr "ធ្វើឲ្យ​ទៅ​ជា 0dB ធម្មតាម​បន្ទាប់​ពី​ក​បង្ហាប់​"
-
-#: effects/Compressor.cpp:547
-#, c-format
-msgid "Threshold: %d dB"
-msgstr "កម្រិត​ពន្លឺ ៖ %d dB"
-
-#: effects/Compressor.cpp:550
-#, c-format
-msgid "Ratio: %.0f:1"
-msgstr "សមាមាត្រ ៖ %.0f:1"
-
-#: effects/Compressor.cpp:552
-#, c-format
-msgid "Ratio: %.1f:1"
-msgstr "សមាមាត្រ ៖ %.1f:1"
-
-#: effects/Compressor.cpp:554
-#, c-format
-msgid "Attack Time: %.1f secs"
-msgstr "ពេល​វេលា​វាយ ៖ %.1f វិនាទី"
-
-#: effects/Compressor.h:36
-msgid "Compressor..."
-msgstr "ឧបករណ៍​បង្ហាប់..."
-
-#: effects/Compressor.h:44
-msgid "Applying Dynamic Range Compression..."
-msgstr "កំពុង​​អនុវត្ត​​ការ​​បង្ហាប់​​ជួរ​​ថាមវន្ត..."
-
-#: effects/DtmfGen.cpp:47
-msgid "DTMF Tone Generator"
-msgstr "កម្មវិធី​​បង្កើត​​​សំឡេង DTMF"
-
-#: effects/DtmfGen.cpp:397
-msgid "by Salvo Ventura (2006)"
-msgstr "ដោយ Salvo Ventura (២០០៦)"
-
-#: effects/DtmfGen.cpp:401
-msgid "DTMF sequence:"
-msgstr "លំដាប់ DTMF ៖"
-
-#: effects/DtmfGen.cpp:404
-msgid "DTMF duration:"
-msgstr "ថិរវេលា DTMF ៖"
-
-#: effects/DtmfGen.cpp:422
-msgid "Tone/silence ratio:"
-msgstr "សមាមាត្រ​​​សំឡេង/ស្ងាត់ ៖"
-
-#: effects/DtmfGen.cpp:433
-msgid "Duty cycle:"
-msgstr "ខួបមុខងារ ៖"
-
-#: effects/DtmfGen.cpp:435
-msgid "Tone duration:"
-msgstr "ថិរវេលា​​សំឡេង ៖"
-
-#: effects/DtmfGen.cpp:436 effects/DtmfGen.cpp:438 effects/DtmfGen.cpp:512
-#: effects/DtmfGen.cpp:513
-msgid "ms"
-msgstr "មីល្លីវិនាទី"
-
-#: effects/DtmfGen.cpp:437
-msgid "Silence duration:"
-msgstr "ថិរវេលាស្ងាត់ ៖"
-
-#: effects/DtmfGen.h:41
-msgid "DTMF Tones..."
-msgstr "សំឡេង DTMF..."
-
-#: effects/DtmfGen.h:49
-#, c-format
-msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
-msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ បង្កើតសំឡេង DTMF , %.6lf វិនាទី"
-
-#: effects/DtmfGen.h:53
-msgid "Generating DTMF tones"
-msgstr "​បង្កើត​​សំឡេង DTMF"
-
-#: effects/Echo.cpp:48
-#, c-format
-msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
-msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s ពន្យារ = %f វិនាទី កត្តា​បន្ថយ = %f"
-
-#: effects/Echo.cpp:163
-msgid "Echo"
-msgstr "អេកូ"
-
-#: effects/Echo.cpp:186
-msgid "by Dominic Mazzoni && Vaughan Johnson"
-msgstr "ដោយ Dominic Mazzoni និង Vaughan Johnson"
-
-#: effects/Echo.cpp:198
-msgid "Delay time (seconds):"
-msgstr "ពេលវេលា​ពន្យារ (វិនាទី) ៖"
-
-#: effects/Echo.cpp:203
-msgid "Decay factor:"
-msgstr "កត្តា​បន្ថយ ៖"
-
-#: effects/Echo.h:34
-msgid "Echo..."
-msgstr "អេកូ..."
-
-#: effects/Echo.h:42
-msgid "Performing Echo"
-msgstr "អនុវត្ត​អេកូ"
-
-#: effects/Effect.cpp:303
-msgid "Preparing preview"
-msgstr "រៀបចំការ​​មើល​ជា​មុន"
-
-#: effects/Effect.cpp:329
-msgid "Previewing"
-msgstr "ការ​មើលជា​មុន"
-
-#: effects/Effect.cpp:345
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"កំហុស​​ពេល​​កំពុង​​បើក​​ឧបករណ៍​សំឡេង។ "
-"សូម​ត្រួតពិនិត្យ​មើល​ការ​កំណត់​ឧបករណ៍​លទ្ធផល និង​​អត្រា​​គំរូ​​គម្រោង"
-
-#: effects/Effect.h:107
-#, c-format
-msgid "Applied effect: %s"
-msgstr "បែបផែន​ដែលបានអនុវត្ត ៖ %s"
-
-#: effects/Equalization.cpp:300
-msgid "B-spline"
-msgstr "B-spline"
-
-#: effects/Equalization.cpp:300
-msgid "Cosine"
-msgstr "កូស៊ីនុស"
-
-#: effects/Equalization.cpp:300
-msgid "Cubic"
-msgstr "គូប"
-
-#: effects/Equalization.cpp:353 effects/Equalization.cpp:404
-msgid "Equalization"
-msgstr "អេហ្គុយ"
-
-#: effects/Equalization.cpp:959
-msgid "Error loading EQ curve"
-msgstr "កំហុស​​ក្នុង​ការ​ផ្ទុក​​ខ្សែ​កោង EQ"
-
-#: effects/Equalization.cpp:998
-msgid "custom"
-msgstr "ផ្ទាល់​ខ្លួន"
-
-#: effects/Equalization.cpp:1064
-msgid "Equalization, by Martyn Shaw && Mitch Golden"
-msgstr "អេហ្គុយ​ដោយ Martyn Shaw និង Mitch Golden"
-
-#: effects/Equalization.cpp:1085
-msgid "Max dB"
-msgstr "dB អតិបរមា"
-
-#: effects/Equalization.cpp:1087
-msgid "Min dB"
-msgstr "dB អប្បបរមា"
-
-#: effects/Equalization.cpp:1160
-msgid "kHz"
-msgstr "kHz"
-
-#: effects/Equalization.cpp:1177
-msgid "Draw curves"
-msgstr "គូរ​ខ្សែ​កោង"
-
-#: effects/Equalization.cpp:1182
-msgid "Graphic EQ"
-msgstr "ក្រាហ្វិក EQ"
-
-#: effects/Equalization.cpp:1196
-msgid "Linear frequency scale"
-msgstr "មាត្រដ្ឋាន​ប្រេកង់​លីនេអ៊ែរ"
-
-#: effects/Equalization.cpp:1205
-msgid "Length of filter:"
-msgstr "ប្រវែង​តម្រង ៖"
-
-#: effects/Equalization.cpp:1226
-msgid "Select curve:"
-msgstr "ជ្រើស​ខ្សែ​កោង ៖"
-
-#: effects/Equalization.cpp:1236 effects/Equalization.cpp:2399
-msgid "Save As..."
-msgstr "រក្សាទុក​ជា..."
-
-#: effects/Equalization.cpp:1242
-msgid "Flat"
-msgstr "រាបស្មើ"
-
-#: effects/Equalization.cpp:2398
-msgid "Enter the desired name of the curve"
-msgstr "បញ្ចូល​ឈ្មោះ​ខ្សែ​កោង​ដែល​ចង់​បាន"
-
-#: effects/Equalization.cpp:2498
-msgid "Confirm Deletion"
-msgstr "អះអាង​ការលុប"
-
-#: effects/Equalization.h:87
-msgid "Equalization..."
-msgstr "អេហ្គុយ..."
-
-#: effects/Equalization.h:95
-msgid "Performing Equalization"
-msgstr "អនុវត្ត​អេហ្គុយ"
-
-#: effects/Fade.h:24
-msgid "Fade In"
-msgstr "ផុសចេញ"
-
-#: effects/Fade.h:32
-msgid "Fading In"
-msgstr "កំពុងផុសចេញ"
-
-#: effects/Fade.h:48
-msgid "Fade Out"
-msgstr "ផតចុះ"
-
-#: effects/Fade.h:56
-msgid "Fading Out"
-msgstr "កំពុង​ផតចុះ"
-
-#: effects/FindClipping.cpp:49
-msgid "Detect clipping"
-msgstr "រកឃើញការ​ខ្ទាស់"
-
-#: effects/FindClipping.cpp:86
-msgid "Clipping"
-msgstr "ខ្ទាស់"
-
-#: effects/FindClipping.cpp:199
-msgid "Find Clipping"
-msgstr "រក​កា​ខ្ទាស់"
-
-#: effects/FindClipping.cpp:210
-msgid "by Leland Lucius"
-msgstr "ដោយ Leland Lucius"
-
-#: effects/FindClipping.cpp:222
-msgid "Start threshold (samples):"
-msgstr "កម្រិត​ពន្លឺ​ចាប់ផ្ដើម (គំរូ) ៖"
-
-#: effects/FindClipping.cpp:226
-msgid "Stop threshold (samples):"
-msgstr "កម្រិត​ពន្លឺ​បញ្ចប់ (គំរូ) ៖"
-
-#: effects/FindClipping.cpp:238
-msgid "Start and stop must be positive and greater than 0."
-msgstr "ចាប់ផ្ដើម និង​បញ្ឈប់​ត្រូវ​តែ​វិជ្ជមាន និងធំជាងសូន្យ។"
-
-#: effects/FindClipping.h:37
-msgid "Find Clipping..."
-msgstr "រក​ការ​ខ្ទាស់..."
-
-#: effects/FindClipping.h:47
-msgid "Detecting clipping"
-msgstr "រក​ឃើញ​កា​រខ្ទាស់"
-
-#: effects/Invert.h:27
-msgid "Invert"
-msgstr "ដាក់​បញ្ច្រាស"
-
-#: effects/Invert.h:35
-msgid "Inverting"
-msgstr "ការ​ដាក់​បញ្ច្រាស"
-
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr "ធ្ងន់​ជាង"
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
-msgstr "ធ្ងន់​បំផុត"
-
-#: effects/Leveller.cpp:47
-msgid "Heavy"
-msgstr "ធ្ងន់"
-
-#: effects/Leveller.cpp:47
-msgid "Light"
-msgstr "ស្រាល"
-
-#: effects/Leveller.cpp:47
-msgid "Moderate"
-msgstr "ល្មម"
-
-#: effects/Leveller.cpp:47
-msgid "None-Skip"
-msgstr "មិន​រំលង"
-
-#: effects/Leveller.cpp:129
-msgid "Leveller"
-msgstr "Leveller"
-
-#: effects/Leveller.cpp:213
-msgid "Leveller by Lynn Allan"
-msgstr "Leveller ដោយ Lynn Allan"
-
-#: effects/Leveller.cpp:216
-msgid "Equalize soft and loud sections"
-msgstr "ដាក់អេហ្គុយ​ឲ្យ​ស្រទាន់ និង​លឺ​"
-
-#: effects/Leveller.cpp:219 effects/Leveller.cpp:224
-msgid "Degree of Leveling"
-msgstr "កម្រិត​នៃ Leveling"
-
-#: effects/Leveller.cpp:235
-msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
-msgstr "កម្រិត​ពន្លឺ​ការរំខាន (Hiss/Hum/Ambient Noise)"
-
-#: effects/Leveller.cpp:238
-msgid "Threshold for Noise: "
-msgstr "កម្រិត​​ពន្លឺ​​សម្រាប់​​ការ​រំខាន ៖"
-
-#: effects/Leveller.h:28
-msgid "Leveller..."
-msgstr "Leveller..."
-
-#: effects/Leveller.h:36
-msgid "Applying Leveller..."
-msgstr "កំពុង​​អនុវត្ត​ Leveller..."
-
-#: effects/Noise.cpp:37
-msgid "White"
-msgstr "ពណ៌ស"
-
-#: effects/Noise.cpp:38
-msgid "Pink"
-msgstr "ពណ៌ផ្កាឈូក"
-
-#: effects/Noise.cpp:39
-msgid "Brown"
-msgstr "ពណ៌ត្នោត"
-
-#: effects/Noise.cpp:41
-msgid "Noise Generator"
-msgstr "ឧបករណ៍​​បង្កើត​​ការ​រំខាន"
-
-#: effects/Noise.cpp:225
-msgid "Noise duration"
-msgstr "ថិរវេលា​ការ​រំខាន"
-
-#: effects/Noise.cpp:245
-msgid "Amplitude"
-msgstr "អាំភ្លី"
-
-#: effects/Noise.cpp:246
-msgid "Noise type"
-msgstr "ប្រភេទ​ការរំខាន"
-
-#: effects/Noise.h:41
-msgid "Noise..."
-msgstr "ការ​រំខាន..."
-
-#: effects/Noise.h:49
-#, c-format
-msgid "Applied effect: Generate Noise, %.6lf seconds"
-msgstr "អនុវត្ត​បែបផែន ៖ បង្កើត​ការ​រំខាន %.6lf វិនាទី"
-
-#: effects/Noise.h:53
-msgid "Generating Noise"
-msgstr "បង្កើត​ការ​រំខាន"
-
-#: effects/NoiseRemoval.cpp:192
-#, c-format
-msgid ""
-"Could not open file:\n"
-"  %s"
-msgstr ""
-"មិន​អាច​បើក ៖\n"
-"  %s"
-
-#: effects/NoiseRemoval.cpp:275
-msgid "Attempt to run Noise Removal without a noise profile.\n"
-msgstr "ប៉ុនប៉ង​​រត់​​ការ​​យក​​ការ​​រំខាន​​ចេញ​​ដោយ​គ្មាន​ទម្រង់​ការ​រំខាន ។\n"
-
-#: effects/NoiseRemoval.cpp:715
-msgid "Noise Removal"
-msgstr "ការ​​យក​ការ​​រំខាន​​ចេញ"
-
-#: effects/NoiseRemoval.cpp:804
-msgid "Step 1"
-msgstr "ជំហាន​ ១"
-
-#: effects/NoiseRemoval.cpp:805
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
-"then click Get Noise Profile:"
-msgstr ""
-"ជ្រើស​​វិនាទី​ខ្លះ​​របស់​​ការ​រំខាន ដូច្នេះ Audacity "
-"អាច​ដឹង​ថា​អ្វី​ដែល​ត្រូវ​ត្រង​ចេញ បន្ទាប់​មក​ចុច​យក​ទម្រង់​ការ​រំខាន ៖"
-
-#: effects/NoiseRemoval.cpp:806
-msgid "Step 2"
-msgstr "ជំហាន ២"
-
-#: effects/NoiseRemoval.cpp:807
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
-"filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"ជ្រើស​អូឌីយ៉ូ​ទាំងអស់​ដែល​អ្នក​ចង់​ត្រង​​ "
-"ជ្រើស​​ចំនួន​​ការ​រំខាន​ដែល​អ្នក​ចង់​ត្រង​ចេញ បន្ទាប់​មក​ចុច​ 'យល់ព្រម' "
-"ដើម្បី​យក​​ការ​​រំខាន​ចេញ ។\n"
-
-#: effects/NoiseRemoval.cpp:812
-msgid "Noise Removal by Dominic Mazzoni"
-msgstr "ការ​យក​​​ការ​រំខាន​​ចេញ​​ដោយ Dominic Mazzoni"
-
-#: effects/NoiseRemoval.cpp:820
-msgid "Get Noise Profile"
-msgstr "យក​ទម្រង់​ការ​រំខាន"
-
-#: effects/NoiseRemoval.cpp:831
-msgid "Noise reduction (dB):"
-msgstr "បន្ថយ​ការ​រំខាន (dB) ៖"
-
-#: effects/NoiseRemoval.cpp:839
-msgid "Frequency smoothing (Hz):"
-msgstr "ធ្វើ​ឲ្យ​ប្រេកង់​រលូន (Hz) ៖"
-
-#: effects/NoiseRemoval.cpp:847
-msgid "Attack/decay time (secs):"
-msgstr "ពេល​វេលា​វាយ/បន្ថយ (វិនាទី) ៖"
-
-#: effects/NoiseRemoval.h:35
-msgid "Noise Removal..."
-msgstr "ការយក​ការរំខាន​ចេញ..."
-
-#: effects/NoiseRemoval.h:44
-msgid "Creating Noise Profile"
-msgstr "បង្កើត​ទម្រង់​ការ​រំខាន"
-
-#: effects/NoiseRemoval.h:46
-msgid "Removing Noise"
-msgstr "​យក​ការ​រំខាន​ចេញ"
-
-#: effects/Normalize.cpp:68
-#, c-format
-msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
-msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s យក​អុហ្វសិត dc = %s​ ចេញ ធ្វើ​ឲ្យ​អាំភ្លី​ធម្មតា = %s"
-
-#: effects/Normalize.cpp:70 effects/Normalize.cpp:71
-msgid "false"
-msgstr "មិនពិត"
-
-#: effects/Normalize.cpp:70 effects/Normalize.cpp:71
-msgid "true"
-msgstr "ពិត"
-
-#: effects/Normalize.cpp:73
-#, c-format
-msgid ", maximum amplitude = %.1f dB"
-msgstr " អាំភ្លី​អតិបរមា = %.1f dB"
-
-#: effects/Normalize.cpp:109
-msgid "Normalize"
-msgstr "ធ្វើ​​ឲ្យ​ធម្មតា"
-
-#: effects/Normalize.cpp:330
-msgid "Normalize by Dominic Mazzoni\n"
-msgstr "ធ្វើ​ឲ្យ​ធម្មតា​ដោយ Dominic Mazzoni\n"
-
-#: effects/Normalize.cpp:337
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "យក​អុហ្វសិត DC ​ចេញ (ដាក់​ចំ​កណ្តាល​លើ​ចំណុច​បញ្ឈរ ០)"
-
-#: effects/Normalize.cpp:342
-msgid "Normalize maximum amplitude to"
-msgstr "ធ្វើ​ឲ្យ​អាំភ្លី​អតិបរមា​ធម្មតា​ទៅ"
-
-#: effects/Normalize.cpp:350
-msgid "-"
-msgstr "-"
-
-#: effects/Normalize.h:32
-msgid "Normalize..."
-msgstr "ធ្វើ​ឲ្យ​ធម្មតា..."
-
-#: effects/Normalize.h:41
-msgid "Normalizing..."
-msgstr "កំពុង​ធ្វើ​ឲ្យ​ធម្មតា..."
-
-#: effects/Phaser.cpp:65
-#, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s %d ដំណាក់កាល %.0f%% wet ប្រេកង់ = %.1f Hz ដំណាក់កាល​ចាប់ផ្ដើម = "
-"%.0f deg ជម្រៅ = %d មតិយោបល់ = %.0f%%"
-
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "ឧបករណ៍​កំណត់​ដំណាក់កាល"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "ឧបករណ៍​កំណត់​ដំណាក់​កាល​ដោយ Nasca Octavian Paul"
-
-#: effects/Phaser.cpp:222
-msgid "Stages:"
-msgstr "ដំណាក់កាល ៖"
-
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "ស្ងួត"
-
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "សើម"
-
-#: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
-msgid "LFO Frequency (Hz):"
-msgstr "ប្រេកង់ LFO (Hz) ៖"
-
-#: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
-msgid "LFO Start Phase (deg.):"
-msgstr "ដំណាក់​ចាប់ផ្តើម LFO (deg.) ៖"
-
-#: effects/Phaser.cpp:296
-msgid "Depth:"
-msgstr "ជម្រៅ ៖"
-
-#: effects/Phaser.cpp:312
-msgid "Feedback (%):"
-msgstr "មតិ​អ្នកប្រើ (%) ៖"
-
-#: effects/Phaser.h:38
-msgid "Phaser..."
-msgstr "ឧបករណ៍​កំណត់​ដំណាក់កាល..."
-
-#: effects/Phaser.h:46
-msgid "Applying Phaser"
-msgstr "កំពុង​អនុវត្ត​ដំណាក់កាល"
-
-#: effects/Repair.cpp:94
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
-"\n"
-"Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"ជួសជុល​បែបផែន​ដែល​មាន​បំណង​ត្រូវ​ប្រើ​នៅ​លើ​ផ្នែក​ខ្លី​បំផុត​របស់​អូឌីយ៉ូ​ដែល​ខូច (រហូត​ដល់ ១២៨ គំរូ) ។\n"
-"\n"
-"ពង្រីក និង​ជ្រើស​ប្រភាគ​តូច​នៃ​ទីពីរ​ដើម្បី​ជួសជុល ។"
-
-#: effects/Repair.h:37
-msgid "Repairing damaged audio"
-msgstr "ជួសជុល​អូឌីយ៉ូ​ដែល​ខូច"
-
-#: effects/Repeat.cpp:49
-#, c-format
-msgid "Repeated %d times"
-msgstr "បាន​ធ្វើ​ឡើងវិញ %d ដង"
-
-#: effects/Repeat.cpp:75
-msgid "Tracks are too long to repeat the selection."
-msgstr "ដាន​វែងពេក​ដើម្បី​ធ្វើ​កា​រជ្រើស​ឡើង​វិញ ។"
-
-#: effects/Repeat.cpp:76 effects/Repeat.cpp:80
-msgid "Repeat"
-msgstr "ធ្វើ​​ម្ដង​​ទៀត"
-
-#: effects/Repeat.cpp:171
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "ធ្វើ​ម្ដង​ទៀត​ដោយ Dominic Mazzoni និង Vaughan Johnson"
-
-#: effects/Repeat.cpp:178
-msgid "Number of times to repeat: "
-msgstr "ចំនួន​ដង​ដើម្បី​ធ្វើ​ម្តង​ទៀត ៖"
-
-#: effects/Repeat.cpp:190 effects/Repeat.cpp:220
-msgid "New selection length: "
-msgstr "ប្រវែងជម្រើស​ថ្មី ៖"
-
-#: effects/Repeat.cpp:222
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d នាទី %d វិនាទី"
-
-#: effects/Repeat.cpp:225
-#, c-format
-msgid "%d seconds"
-msgstr "%d វិនាទី"
-
-#: effects/Repeat.h:32
-msgid "Repeat..."
-msgstr "ធ្វើ​​ម្ដង​ទៀត..."
-
-#: effects/Repeat.h:40
-msgid "Performing Repeat"
-msgstr "អនុវត្ត​ការ​​ធ្វើ​ម្តង​ទៀត"
-
-#: effects/Reverse.h:30
-msgid "Reverse"
-msgstr "ដាក់​បញ្ច្រាស"
-
-#: effects/Reverse.h:38
-msgid "Reversing"
-msgstr "កំពុង​​ដាក់​បញ្ច្រាស"
-
-#: effects/Silence.cpp:32
-msgid "Silence Generator"
-msgstr "កម្មវិធី​បង្កើត​ស្ងាត់ៗ"
-
-#: effects/Silence.h:34
-msgid "Silence..."
-msgstr "ស្ងាត់..."
-
-#: effects/Silence.h:42
-msgid "Generating Silence"
-msgstr "កំពុង​បង្កើត​ស្ងាត់ៗ"
-
-#: effects/Silence.h:47
-#, c-format
-msgid "Applied effect: Generate Silence, %.6lf seconds"
-msgstr "បែបផែន​ដែល​បាន​​អនុវត្ត ៖ បង្កើត​ស្ងាត់ៗ %.6lf វិនាទី"
-
-#: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr "សូម​អភ័យទោស បែបផែន​នេះ​មិន​អាច​ត្រូវ​បាន​​អនុវត្ត​លើ​បទ​ស្តេរ៉េអូ ដែល​ឆានែល​នីមួយៗ​របស់​បទ​មិន​ផ្គូផ្គង​គ្នា ។"
-
-#: effects/SpikeCleaner.cpp:69
-msgid "Spike Cleaner"
-msgstr "ឧបករណ៍​ជម្រះ Spike"
-
-#: effects/SpikeCleaner.cpp:160
-msgid "SpikeCleaner by Lynn Allan"
-msgstr "ឧបករណ៍​ជម្រះ Spike ដោយ Lynn Allan"
-
-#: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
-"(99999 or greater is off)"
-msgstr ""
-"ថិរវេលា Spike អតិបរមា (មីល្លីវិនាទី) ៖ \n"
-"(៩៩៩៩៩ ឬ​ធំ​ជាង​នេះ​គឺ​បិទ)"
-
-#: effects/SpikeCleaner.cpp:178
-msgid "Theshold for silence: "
-msgstr "កម្រិត​ពន្លឺ​សម្រាប់​ស្ងាត់ៗ ៖"
-
-#: effects/SpikeCleaner.h:27
-msgid "Spike Cleaner..."
-msgstr "ឧបករណ៍​ជម្រះ Spike..."
-
-#: effects/SpikeCleaner.h:35
-msgid "Applying Spike Cleaner..."
-msgstr "កំពុង​អនុវត្ត​ឧបករណ៍​ជម្រះ Spike..."
-
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
-msgstr "អនុវត្ត​ស្តេរ៉េអូ​ទៅជា​​ម៉ូណូ"
-
-#: effects/ToneGen.cpp:59
-#, c-format
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
-msgstr ""
-"បែបផែន​ដែល​បាន​អនុវត្ត ៖ បង្កើត %s រលក %s ប្រេកង់ = %.2f Hz អាំភ្លី = %.2f, "
-"%.6lf វិនាទី"
-
-#: effects/ToneGen.cpp:66
-msgid "Chirp Generator"
-msgstr "ឧបករណ៍​​បង្កើត Chirp"
-
-#: effects/ToneGen.cpp:66
-msgid "Tone Generator"
-msgstr "ឧបករណ៍​បង្កើត​សំឡេង"
-
-#: effects/ToneGen.cpp:67
-msgid "Sine"
-msgstr "ស៊ីនុស"
-
-#: effects/ToneGen.cpp:68
-msgid "Square"
-msgstr "ការេ"
-
-#: effects/ToneGen.cpp:69
-msgid "Sawtooth"
-msgstr "ធ្មេញ​រណារ"
-
-#: effects/ToneGen.cpp:70
-msgid "Square, no alias"
-msgstr "ការេ គ្មាន​​ឈ្មោះ​ក្លែងក្លាយ"
-
-#: effects/ToneGen.cpp:297
-msgid "Frequency (Hz)"
-msgstr "ប្រេកង់ (Hz)"
-
-#: effects/ToneGen.cpp:298 effects/ToneGen.cpp:334
-msgid "Amplitude (0-1)"
-msgstr "អាំភ្លី (០-១)"
-
-#: effects/ToneGen.cpp:299 effects/ToneGen.cpp:340
-#: toolbars/SelectionBar.cpp:147 toolbars/SelectionBar.cpp:241
-msgid "Length"
-msgstr "ប្រវែង"
-
-#: effects/ToneGen.cpp:323
-msgid "Waveform:"
-msgstr "ទ្រង់ទ្រាយ​រលក ៖"
-
-#: effects/ToneGen.cpp:330 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "ចាប់ផ្ដើម"
-
-#: effects/ToneGen.cpp:331 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:141 toolbars/SelectionBar.cpp:242
-msgid "End"
-msgstr "ចុង"
-
-#: effects/ToneGen.cpp:332
-msgid "Frequency / Hz"
-msgstr "ប្រេកង់ / Hz"
-
-#: effects/ToneGen.h:39
-msgid "Chirp..."
-msgstr "Chirp..."
-
-#: effects/ToneGen.h:39
-msgid "Tone..."
-msgstr "សំឡេង..."
-
-#: effects/ToneGen.h:47
-msgid "Generating Chirp"
-msgstr "កំពុង​បង្កើត Chirp"
-
-#: effects/ToneGen.h:47
-msgid "Generating Tone"
-msgstr "កំពុង​បង្កើត​សំឡេង"
-
-#: effects/TruncSilence.cpp:113
-msgid "All tracks must have the same sample rate"
-msgstr "បទ​ទាំងអស់​ត្រូវ​តែ​មាន​អត្រា​គំរូ​ដូចគ្នា"
-
-#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:318
-msgid "Truncate Silence"
-msgstr "កាត់​ស្ងាត់​ឲ្យ​ខ្លី"
-
-#: effects/TruncSilence.cpp:328
-msgid "by Lynn Allan"
-msgstr "ដោយ Lynn Allan"
-
-#: effects/TruncSilence.cpp:342
-msgid "Max silence duration:"
-msgstr "ថិរវេលា​ស្ងាត់​អតិ. ៖"
-
-#: effects/TruncSilence.cpp:345 prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:193
-msgid "milliseconds"
-msgstr "មីល្លីវិនាទី"
-
-#: effects/TruncSilence.cpp:347
-msgid "Threshold for silence:"
-msgstr "កម្រិត​​ពន្លឺ​សម្រាប់​ស្ងាត់ ៖"
-
-#: effects/TruncSilence.cpp:371
-msgid "   Duration must be at least 1 millisecond"
-msgstr "   ថិរវេលា​ត្រូវ​តែ​តិច​បំផុត ១​ មីល្លីវិនាទី"
-
-#: effects/TruncSilence.h:28
-msgid "Truncate Silence..."
-msgstr "កាត់​ស្ងាត់​ឲ្យ​ខ្លី..."
-
-#: effects/TruncSilence.h:36
-msgid "Truncating Silence..."
-msgstr "កំពុង​កាត់​ស្ងាត់​ឲ្យ​ខ្លី..."
-
-#: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr "សូម​អភយទោស បែបផែន VST មិនអាច​ត្រូវ​បាន​អនុវត្ត​នៅ​លើ​បទ​ស្តេរ៉េអូ​បានទេ ដែល​ឆានែល​នីមួយៗ​របស់​បទ​មិនផ្គូផ្គង​គ្នា​ទេ ។"
-
-#: effects/VST/VSTEffect.cpp:180
-msgid "Can't process replacing"
-msgstr "មិនអាច​ដំណើរការ​ជំនួស​បានទេ"
-
-#: effects/VST/VSTEffect.cpp:394
-msgid "VST Plug-in parameters:"
-msgstr "ប៉ារ៉ាម៉ែត្រ​កម្មវិធី​ជំនួយ VST  ៖"
-
-#: effects/Wahwah.cpp:61
-#, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s ប្រេកង់ = %.1f Hz ដំណាក់កាល​ចាប់ផ្ដើម = %.0f deg ជម្រៅ = %.0f%"
-"% ខ្ទរ = %.1f អុហ្វសិត​ប្រេកង់ = %.0f%%"
-
-#: effects/Wahwah.cpp:72
-msgid "Wahwah"
-msgstr "Wahwah"
-
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah​ ដោយ Nasca Octavian Paul"
-
-#: effects/Wahwah.cpp:253
-msgid "Depth (%):"
-msgstr "ជម្រៅ (%) ៖"
-
-#: effects/Wahwah.cpp:269
-msgid "Resonance:"
-msgstr "សំឡេង​ខ្ទរ ៖"
-
-#: effects/Wahwah.cpp:285
-msgid "Wah Frequency Offset (%):"
-msgstr "អុហ្វសិតប្រេកង់ Wah (%) ៖"
-
-#: effects/Wahwah.h:34
-msgid "Wahwah..."
-msgstr "Wahwah..."
-
-#: effects/Wahwah.h:42
-msgid "Applying Wahwah"
-msgstr "អនុវត្ត Wahwah"
-
-#: effects/audiounits/AudioUnitEffect.cpp:133
-#: effects/ladspa/LadspaEffect.cpp:169
-#, c-format
-msgid "Performing Effect: %s"
-msgstr "អនុវត្ត​បែបផែន ៖ %s"
-
-#: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
-msgstr "សូម​អភ័យ​ទោស បែបផែន​កម្មវិធី​ជំនួយ​​មិនអាច​ត្រូវ​បាន​អនុវត្ត​នៅ​លើ​បទ​ស្តេរ៉េអូ​បានទេ ដែល​ឆានែល​នីមួយៗ​របស់​បទ​មិនផ្គូផ្គង​គ្នា ។"
-
-#: effects/ladspa/LadspaEffect.cpp:572 effects/ladspa/LadspaEffect.cpp:580
-#: prefs/QualityPrefs.cpp:72
-msgid "None"
-msgstr "គ្មាន"
-
-#: effects/ladspa/LadspaEffect.cpp:574 effects/vamp/VampEffect.cpp:384
-msgid "Author: "
-msgstr "អ្នកនិពន្ធ ៖"
-
-#: effects/ladspa/LadspaEffect.cpp:607
-msgid "Effect Settings"
-msgstr "ការ​កំណត់​បែបផែន"
-
-#: effects/ladspa/LadspaEffect.cpp:698
-msgid "Length (seconds)"
-msgstr "ប្រវែង (វិនាទី)"
-
-#: effects/nyquist/Nyquist.cpp:252
-msgid "Applying Nyquist Effect..."
-msgstr "អនុវត្ត​បែបផែន Nyquist..."
-
-#: effects/nyquist/Nyquist.cpp:259 effects/nyquist/Nyquist.cpp:321
-msgid "Nyquist Prompt..."
-msgstr "ប្រអប់​​បញ្ចូល Nyquist..."
-
-#: effects/nyquist/Nyquist.cpp:322
-msgid "Enter Nyquist Command: "
-msgstr "បញ្ចូល​ពាក្យបញ្ជា Nyquist ៖"
-
-#: effects/nyquist/Nyquist.cpp:411
-msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
-msgstr "សូម​អភ័យទោស មិនអាច​អនុវត្ត​បែបផែន​លើ​បទ​ស្តេរ៉េអូ​បានទេ ដែល​បទ​មិនផ្គូផ្គង​គ្នា ។"
-
-#: effects/nyquist/Nyquist.cpp:438
-msgid "Nyquist"
-msgstr "Nyquist"
-
-#: effects/nyquist/Nyquist.cpp:439
-msgid "Nyquist Output: "
-msgstr "លទ្ធផល Nyquist ៖ "
-
-#: effects/nyquist/Nyquist.cpp:593 effects/nyquist/Nyquist.cpp:604
-msgid "Nyquist returned the value:"
-msgstr "Nyquist បាន​ត្រឡប់​តម្លៃ ៖"
-
-#: effects/nyquist/Nyquist.cpp:646
-msgid "Nyquist did not return audio.\n"
-msgstr "Nyquist មិន​បាន​ត្រឡប់​អូឌីយ៉ូ ។\n"
-
-#: effects/nyquist/Nyquist.cpp:657
-msgid "Nyquist returned too many audio channels.\n"
-msgstr "Nyquist បាន​ត្រឡប់​ឆានែល​អូឌីយ៉ូ​ច្រើន​ពេក ។\n"
-
-#: effects/vamp/LoadVamp.cpp:53 effects/vamp/VampEffect.cpp:238
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: effects/vamp/VampEffect.cpp:75
-#, c-format
-msgid "Extracting features: %s"
-msgstr "​ស្រង់​លក្ខណៈ​ពិសេស​ចេញ ៖ %s"
-
-#: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr "សូម​អភ័យ​ទោស កម្មវិធី​ជំនួយ Vamp មិនអាចត្រូវ​បាន​រត់​នៅ​លើបទ​ស្តេរ៉េអូ​បានទេ ដែល​ឆានែល​នីមួយ​របស់​បទ​មិនផ្គូផ្គង​គ្នា ។"
-
-#: effects/vamp/VampEffect.cpp:120
-msgid "Sorry, failed to load Vamp Plug-in."
-msgstr "សូម​អភ័យ​ទោស បាន​បរាជ័យ​ក្នុងការ​ផ្ទុក​កម្មវិធី​ជំនួយ Vamp ។"
-
-#: effects/vamp/VampEffect.cpp:228
-msgid "Sorry, Vamp Plug-in failed to initialize."
-msgstr "សូម​អភ័យ​ទោស កម្មវិធី​ជំនួយ Vamp បាន​បរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម ។"
-
-#: effects/vamp/VampEffect.cpp:376
-msgid " - Vamp audio analysis plugin"
-msgstr " - កម្មវិធី​ជំនួយ​វិភាគ​អូឌីយ៉ូ​ Vamp"
-
-#: effects/vamp/VampEffect.cpp:423
-msgid "Plugin Settings"
-msgstr "ការ​កំណត់​កម្មវិធី​ជំនួយ"
-
-#: effects/vamp/VampEffect.cpp:446
-msgid "Program"
-msgstr "កម្មវិធី"
-
-#: export/Export.cpp:401
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr ""
-"គ្មាន​បទ​ត្រូវ​បាន​ជ្រើស! ប្រើ​​ បញ្ជា(Ctrl)+ A (ជ្រើស​ទាំងអស់)\n"
-"ជ្រើស​នាំចេញ... ​ដើម្បី​នាំចេញ​បទ​ទាំងអស់ ។"
-
-#: export/Export.cpp:445
-msgid "Export File"
-msgstr "នាំ​ឯកសារ​ចេញ"
-
-#: export/Export.cpp:453
-msgid "&Options..."
-msgstr "ជម្រើស..."
-
-#: export/Export.cpp:479
-msgid "Are you sure you want to save the file as \""
-msgstr "តើ​អ្នក​ពិត​ជា​ចង់​រក្សា​ទុក​ឯកសារ​នេះ​ជា \""
-
-#: export/Export.cpp:495
-#, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
-"\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
-"\n"
-"Are you sure you want to save the file under this name?"
-msgstr ""
-"អ្នក​រៀបនឹង​រក្សាទុក​ឯកសារ %s ដោយ​ដាក់​ឈ្មោះ \"%s\" ។\n"
-"\n"
-"តាម​ធម្មតា ឯកសារ​ទាំងនេះ​បញ្ចប់ដោយ \".%s\", និង​កម្មវិធី​មួយ​ចំនួន​នឹង​មិន​បើក​ឯកសារ"
-"ជា​មួយ​ផ្នែកបន្ថែម​ដែល​គ្មាន​ស្តង់ដារ​ទេ ។\n"
-"\n"
-"តើ​អ្នក​ប្រាកដ​ជា​ចង់​រក្សាទុក​ឯកសារ​ដោយ​ដាក់​ឈ្មោះ​នេះ​ឬ ?"
-
-#: export/Export.cpp:516
-#, c-format
-msgid "A file named \"%s\" already exists.  Replace?"
-msgstr "មាន​ឯកសារ​ដែល​មាន​ឈ្មោះ \"%s\" រួច​ហើយ ។ ជំនួសវា​ឬ ?"
-
-#: export/Export.cpp:598
-msgid "Your tracks will be mixed down to two stereo channels in the exported file."
-msgstr "បទ​របស់​អ្នក​នឹង​ត្រូវ​បាន​លាយ​ជា​ឆានែល​ស្តេរ៉េអូ​ពីរ​នៅ​ក្នុង​ឯកសារ​ដែល​បាន​នាំចេញ ។"
-
-#: export/Export.cpp:603
-msgid "Your tracks will be mixed down to a single mono channel in the exported file."
-msgstr "បទ​របស់​អ្នក​នឹង​ត្រូវ​បាន​លាយ​ជា​ឆានែល​ម៉ូណូ​តែ​មួយ​នៅ​ក្នុង​ឯកសារ​ដែល​បាន​នាំចេញ ។"
-
-#: export/Export.cpp:613
-msgid "Advanced Mixing Options"
-msgstr "ជម្រើស​លាយ​កម្រិត​ខ្ពស់"
-
-#: export/Export.cpp:815
-#, c-format
-msgid "Channel: %2d"
-msgstr "ឆានែល ៖ %2d"
-
-#: export/Export.cpp:938
-msgid " - Left"
-msgstr " - ឆ្វេង"
-
-#: export/Export.cpp:939
-msgid " - Right"
-msgstr " - ស្ដាំ"
-
-#: export/Export.cpp:961 export/Export.cpp:1006
-#, c-format
-msgid "Output Channels: %2d"
-msgstr "ឆានែល​លទ្ធផល ៖ %2d"
-
-#: export/ExportCL.cpp:55
-msgid "Specify Command Line Encoder"
-msgstr "បញ្ជាក់​ឧបករណ៍​អ៊ិនកូដ​បន្ទាត់​ពាក្យ​បញ្ជា"
-
-#: export/ExportCL.cpp:70
-msgid "Command Line Export Setup"
-msgstr "រៀបចំ​ការ​នាំចេញ​បន្ទាត់​ពាក្យ​បញ្ជា"
-
-#: export/ExportCL.cpp:75
-msgid "Command:"
-msgstr "ពាក្យបញ្ជា ៖"
-
-#: export/ExportCL.cpp:80
-msgid "Show output"
-msgstr "បង្ហាញ​លទ្ធផល"
-
-#: export/ExportCL.cpp:87
-#, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
-msgstr "ទិន្នន័យ​នឹង​ត្រូវ​បាន​ដាក់ជា​ស្តង់ដារ​ ​​។ \"%f\" នឹង​ត្រូវ​បាន​ជំនួស​ដោយ​លទ្ធផល​ឈ្មោះ​ឯកសារ​ដែល​បាន​ជ្រើស ។"
-
-#: export/ExportCL.cpp:219
-msgid "(external program)"
-msgstr "(កម្មវិធី​ខាងក្រៅ)"
-
-#: export/ExportCL.cpp:248 export/ExportPCM.cpp:367
-#, c-format
-msgid "Cannot export audio to %s"
-msgstr "មិនអាច​នាំចេញ​អូឌីយ៉ូ​ទៅ %s​ បាន​ទេ"
-
-#: export/ExportCL.cpp:322
-msgid "Exporting the selected audio using command-line encoder"
-msgstr "នាំចេញ​អូឌីយ៉ូ​ដែល​បានជ្រើស​ ដោយ​ប្រើ​អ៊ិនកូឌ័រ​​បន្ទាត់​ពាក្យ​បញ្ជា"
-
-#: export/ExportCL.cpp:323
-msgid "Exporting the entire project using command-line encoder"
-msgstr "កំពុង​នាំចេញ​គម្រោង​ទាំងមូល​ដោយ​ប្រើប្រាស់​អ៊ិនកូឌ័រ​បន្ទាត់​ពាក្យ​បញ្ជា"
-
-#: export/ExportCL.cpp:387
-msgid "Command Output"
-msgstr "លទ្ធផល​ពាក្យបញ្ជា"
-
-#: export/ExportFLAC.cpp:68
-msgid "Specify FLAC Options"
-msgstr "បញ្ជាក់​ជម្រើស FLAC"
-
-#: export/ExportFLAC.cpp:82
-msgid "0 (fastest)"
-msgstr "0 (លឿនបំផុត)"
-
-#: export/ExportFLAC.cpp:83
-msgid "1"
-msgstr "១"
-
-#: export/ExportFLAC.cpp:84
-msgid "2"
-msgstr "២"
-
-#: export/ExportFLAC.cpp:85
-msgid "3"
-msgstr "៣"
-
-#: export/ExportFLAC.cpp:86
-msgid "4"
-msgstr "៤"
-
-#: export/ExportFLAC.cpp:87
-msgid "5"
-msgstr "៥"
-
-#: export/ExportFLAC.cpp:88
-msgid "6"
-msgstr "៦"
-
-#: export/ExportFLAC.cpp:89
-msgid "7"
-msgstr "៧"
-
-#: export/ExportFLAC.cpp:90
-msgid "8 (best)"
-msgstr "៨ (ប្រសើរបំផុត)"
-
-#: export/ExportFLAC.cpp:93
-msgid "16 bit"
-msgstr "១៦​​ ប៊ីត"
-
-#: export/ExportFLAC.cpp:94
-msgid "24 bit"
-msgstr "២៤ ប៊ីត"
-
-#: export/ExportFLAC.cpp:98
-msgid "FLAC Export Setup"
-msgstr "រៀបចំការ​​​នាំចេញ FLAC"
-
-#: export/ExportFLAC.cpp:102
-msgid "Level:"
-msgstr "កម្រិត ៖"
-
-#: export/ExportFLAC.cpp:104
-msgid "Bit depth:"
-msgstr "ជម្រៅ​ប៊ីត ៖"
-
-#: export/ExportFLAC.cpp:208
-msgid "FLAC Files"
-msgstr "ឯកសារ FLAC"
-
-#: export/ExportFLAC.cpp:310
-msgid "Exporting the selected audio as FLAC"
-msgstr "កំពុង​នាំ​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស​ចេញ​ជា FLAC"
-
-#: export/ExportFLAC.cpp:311
-msgid "Exporting the entire project as FLAC"
-msgstr "នាំ​គម្រោង​ទាំងមូល​ចេញ​ជា FLAC"
-
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr "កែ​សម្រួល​ទិន្នន័យ​មេតា​សម្រាប់​ឯកសារ FLAC"
-
-#: export/ExportMP2.cpp:108
-msgid "Specify MP2 Options"
-msgstr "បញ្ជាក់​ជម្រើស MP2"
-
-#: export/ExportMP2.cpp:129
-msgid "MP2 Export Setup"
-msgstr "រៀបចំ​នាំចេញ MP2"
-
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "អត្រា​ប៊ីត ៖"
-
-#: export/ExportMP2.cpp:200
-msgid "MP2 Files"
-msgstr "ឯកសារ MP2"
-
-#: export/ExportMP2.cpp:229
-msgid "Cannot export MP2 with this sample rate and bit rate"
-msgstr "មិនអាច​នាំចេញ MP2 ជាមួយ​អត្រា​គំរូ និង​អត្រា​ប៊ីត​នេះ​បាន​ទេ"
-
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr "កែ​សម្រួល​ស្លាក ID3​ សម្រាប់​ឯកសារ MP2"
-
-#: export/ExportMP2.cpp:243 export/ExportMP3.cpp:1713 export/ExportOGG.cpp:183
-msgid "Unable to open target file for writing"
-msgstr "មិន​អាច​បើក​ឯកសារ​គោលដៅ​សម្រាប់​សរសេរ​បាន​ទេ"
-
-#: export/ExportMP2.cpp:274
-#, c-format
-msgid "Exporting selected audio at %d kbps"
-msgstr "នាំចេញ​អូឌីយ៉ូ​ដែលបាន​ជ្រើស​នៅល្បឿន %d kbps"
-
-#: export/ExportMP2.cpp:275
-#, c-format
-msgid "Exporting entire file at %d kbps"
-msgstr "នាំ​ចេញ​ឯកសារ​ទាំងមូល​នៅ​ល្បឿន %d kbps"
-
-#. i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second
-#: export/ExportMP3.cpp:142 export/ExportMP3.cpp:143 export/ExportMP3.cpp:144
-#: export/ExportMP3.cpp:145 export/ExportMP3.cpp:146 export/ExportMP3.cpp:147
-#: export/ExportMP3.cpp:148 export/ExportMP3.cpp:149 export/ExportMP3.cpp:150
-#: export/ExportMP3.cpp:151 export/ExportMP3.cpp:152 export/ExportMP3.cpp:153
-#: export/ExportMP3.cpp:154 export/ExportMP3.cpp:155 export/ExportMP3.cpp:156
-#: export/ExportMP3.cpp:157 export/ExportMP3.cpp:158 export/ExportMP3.cpp:159
-msgid "kbps"
-msgstr "kbps"
-
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "០, ២២០-២៦០ kbps (គុណភាព​ប្រសើរ​បំផុត)"
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr "១, ២០០-២៥០ kbps"
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr "២, ១៧០-២១០ kbps"
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr "៣, ១៥៥-១៩៥ kbps"
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr "៤, ១៤៥-១៨៥ kbps"
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr "៥, ១១០-១៥០ kbps"
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr "៦, ៩៥-១៣៥ kbps"
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr "៧, ៨០-១២០ kbps"
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr "៨, ៦៥-១០៥ kbps"
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
-msgstr "៩, ៤៥-៨៥ kbps (ឯកសារ​តូចជាង)"
-
-#: export/ExportMP3.cpp:178
-msgid "Fast"
-msgstr "លឿន"
-
-#: export/ExportMP3.cpp:179
-msgid "Standard"
-msgstr "ស្តង់ដារ"
-
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr "ហួស​ប្រមាណ ៣២០ kbps"
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr "ធំ​ខ្លាំង ២២០-២៦០ kbps"
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
-msgstr "ស្តង់ដារ ១៧០-២១០ kbps"
-
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
-msgstr "ល្មម ១៤៥-១៨៥ kbps"
-
-#: export/ExportMP3.cpp:249
-msgid "Specify MP3 Options"
-msgstr "បញ្ជាក់​ជម្រើស MP3"
-
-#: export/ExportMP3.cpp:264 prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Setup"
-msgstr "រៀបចំ​​នាំ​ចេញ MP3"
-
-#: export/ExportMP3.cpp:271
-msgid "Bit Rate Mode:"
-msgstr "របៀប​អត្រា​ប៊ីត ៖"
-
-#: export/ExportMP3.cpp:276
-msgid "Preset"
-msgstr "ការ​​កំណត់ជា​​ស្រេច"
-
-#: export/ExportMP3.cpp:277
-msgid "Variable"
-msgstr "អថេរ"
-
-#: export/ExportMP3.cpp:278
-msgid "Average"
-msgstr "មធ្យម"
-
-#: export/ExportMP3.cpp:279
-msgid "Constant"
-msgstr "ថេរ"
-
-#: export/ExportMP3.cpp:324
-msgid "Variable Speed:"
-msgstr "ល្បឿន​អថេរ ៖"
-
-#: export/ExportMP3.cpp:331
-msgid "Channel Mode:"
-msgstr "របៀប​ឆានែល ៖"
-
-#: export/ExportMP3.cpp:336
-msgid "Joint Stereo"
-msgstr "ភ្ជាប់​ស្តេរ៉េអូ"
-
-#: export/ExportMP3.cpp:337
-msgid "Stereo"
-msgstr "ស្តេរ៉េអូ"
-
-#: export/ExportMP3.cpp:481
-msgid "Locate Lame"
-msgstr "រក​ទី​តាំង Lame"
-
-#: export/ExportMP3.cpp:501
-#, c-format
-msgid "Audacity needs the file %s to create MP3s."
-msgstr "Audacity ត្រូវ​ការ​ឯកសារ %s ដើម្បី​បង្កើត MP3 ។"
-
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr "ទី​តាំង​របស់ %s ៖"
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "ដើម្បី​​ស្វែង​រក %s​ ចុច​ទី​នេះ -->"
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr "រក​មើល..."
-
-#: export/ExportMP3.cpp:523
-msgid "To get a free copy of Lame, click here -->"
-msgstr "ដើម្បី​យក​ច្បាប់​ថត​ចម្លង Lame ដោយ​ឥត​គិត​ថ្លៃ​ ចុចត្រង់នេះ -->"
-
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr "ទាញយក..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:546
-#, c-format
-msgid "Where is %s?"
-msgstr "តើឯកសារ %s នៅទីណា ?"
-
-#: export/ExportMP3.cpp:1038
-msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
-msgstr ""
-"មានតែ lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries "
-"(*.dll)|*.dll|ឯកសារទាំងអស់ (*.*)|*"
-
-#: export/ExportMP3.cpp:1493
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
-msgstr ""
-"មានតែ libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries "
-"(*.dylib)|*.dylib|ឯកសារទាំងអស់ (*)|*"
-
-#: export/ExportMP3.cpp:1510
-msgid ""
-"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"មានតែ libmp3lame.so|libmp3lame.so|Primary Shared Object files "
-"(*.so)|*.so|Extended Libraries (*.so*)|*.so*|ឯកសារទាំងអស់ (*)|*"
-
-#: export/ExportMP3.cpp:1592
-msgid "MP3 Files"
-msgstr "ឯកសារ MP3"
-
-#: export/ExportMP3.cpp:1615
-msgid "Could not open MP3 encoding library!"
-msgstr "មិនអាច​បើក​បណ្ណាល័យ​អ៊ិនកូឌីង MP3 បាន​ទេ !"
-
-#: export/ExportMP3.cpp:1622
-msgid "Not a valid or supported MP3 encoding library!"
-msgstr "មិនមែន​​ជា​បណ្ណាល័យ​​អ៊ិនកូឌីង​​ត្រឹមត្រូវ ឬ ​MP3 ដែល​បាន​គាំទ្រ"
-
-#: export/ExportMP3.cpp:1699
-msgid "Unable to initialize MP3 stream"
-msgstr "មិនអាចចាប់ផ្តើមស្ទ្រីម MP3​ បាន​ទេ"
-
-#: export/ExportMP3.cpp:1706
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "កែ​សម្រួល​ស្លាក ID3 សម្រាប់​ឯកសារ MP3"
-
-#: export/ExportMP3.cpp:1744
-#, c-format
-msgid "Exporting selected audio with %s preset"
-msgstr "នាំចេញ​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស​ជាមួយ %s ការ​​កំណត់ជា​​ស្រេច"
-
-#: export/ExportMP3.cpp:1745
-#, c-format
-msgid "Exporting entire file with %s preset"
-msgstr "នាំចេញ​ឯកសារ​ទាំងអស់​ជាមួយ %s ​កំណត់​ជា​ស្រេច"
-
-#: export/ExportMP3.cpp:1750
-#, c-format
-msgid "Exporting selected audio with VBR quality %s"
-msgstr "នាំចេញ​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស​ជាមួយ​គុណភាព VBR %s"
-
-#: export/ExportMP3.cpp:1751
-#, c-format
-msgid "Exporting entire file with VBR quality %s"
-msgstr "នាំចេញ​ឯកសារ​ទាំងអស់​ជា​មួយ​គុណភាព VBR %s"
-
-#: export/ExportMP3.cpp:1756
-#, c-format
-msgid "Exporting selected audio at %d Kbps"
-msgstr "​នាំចេញ​អូឌីយ៉ូ​នៅ​ល្បឿន %d Kbps"
-
-#: export/ExportMP3.cpp:1757
-#, c-format
-msgid "Exporting entire file at %d Kbps"
-msgstr "នាំចេញ​ឯកសារ​ទាំងអស់​នៅ​ល្បឿន %d Kbps"
-
-#: export/ExportMP3.cpp:1790
-#, c-format
-msgid "Error %d returned from MP3 encoder"
-msgstr "កំហុស %d ត្រឡប់​ពី​អ៊ិនកូឌ័រ MP3"
-
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr "អត្រា​គំរូ​មិន​ត្រឹមត្រូវ"
-
-#: export/ExportMP3.cpp:1876
-#, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
-"file format.  "
-msgstr "អត្រា​គំរូ​គម្រោង (%d) មិន​គាំទ្រ​ដោយ​ទ្រង់ទ្រាយ​ឯកសារ MP3។"
-
-#: export/ExportMP3.cpp:1879
-#, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
-"supported by the MP3 file format.  "
-msgstr ""
-"បន្សំ​រវាង​អត្រាគំរូ​គម្រោង (%d) និង​អត្រាប៊ីត (%d kbps)"
-"មិន​គាំទ្រ​ដោយ​ទ្រង់ទ្រាយ​ឯកសារ MP3 ទេ ។  "
-
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr "អ្នក​ប្រហែល​ជា​ប្ដូរ​គុណភាព​ទៅ​អត្រា​ណា​មួយ​ដូច​ខាង​ក្រោម ។"
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
-msgstr "អត្រា​គំរូ"
-
-#: export/ExportMP3.cpp:2053
-msgid "MP3 exporting plugin not found"
-msgstr "រក​មិនឃើញ​កម្មវិធី​ជំនួយ​នាំចេញ​ MP3"
-
-#: export/ExportMultiple.cpp:88 export/ExportMultiple.cpp:362
-#: export/ExportMultiple.cpp:609 export/ExportMultiple.cpp:717
-msgid "Export Multiple"
-msgstr "នាំចេញ​ច្រើន"
-
-#: export/ExportMultiple.cpp:152
-msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
-"or if you have a Label Track, you can export a new file for each label.\n"
-"\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
-msgstr ""
-"ប្រសិនបើ​អ្នក​មាន​បទ​អូឌីយ៉ូ​ច្រើនជា​ង​មួយ អ្នក​អាច​នាំចេញ​បទនីមួយៗ​ជា​ឯកសារ​ដោយឡែក\n"
-"ឬ​ប្រសិន​បើ​អ្នក​មាន​ដាន​ស្លាក អ្នក​អាច​នាំចេញ​ឯកសារ​ថ្មី​សម្រាប់​ស្លាក​នីមួយៗ ។\n"
-"\n"
-"គម្រោង​នេះ​មិន​មាន​បទ​ ឬ​​​ដាន​ស្លាក​ច្រើន​ទេ ដូច្នេះ​អ្នក​មិន​អាច​នាំចេញ​ឯកសារ​ជា​ច្រើន​បានទេ ។"
-
-#: export/ExportMultiple.cpp:153
-msgid "Can't export multiple files"
-msgstr "មិន​អាច​នាំ​ចេញ​ឯកសារជា​​ច្រើន​​បាន​​ទេ"
-
-#: export/ExportMultiple.cpp:188
-msgid "Export format:"
-msgstr "ទ្រង់ទ្រាយ​នាំចេញ ៖"
-
-#: export/ExportMultiple.cpp:195
-msgid "Options..."
-msgstr "ជម្រើស..."
-
-#: export/ExportMultiple.cpp:198
-msgid "Export location:"
-msgstr "ទីតាំង​នាំចេញ ៖"
-
-#: export/ExportMultiple.cpp:204 prefs/DirectoriesPrefs.cpp:92
-msgid "Choose..."
-msgstr "ជ្រើស..."
-
-#: export/ExportMultiple.cpp:205
-msgid "Create"
-msgstr "បង្កើត"
-
-#: export/ExportMultiple.cpp:212
-msgid "Split files based on:"
-msgstr "ពុះ​ឯកសារ​ផ្អែក​លើ ៖"
-
-#: export/ExportMultiple.cpp:222
-msgid "Labels"
-msgstr "ស្លាក"
-
-#: export/ExportMultiple.cpp:227
-msgid "Include audio before first label"
-msgstr "រួម​បញ្ចូល​អូឌីយ៉ូ​មុន​ស្លាក​ដំបូង"
-
-#: export/ExportMultiple.cpp:233
-msgid "First file name:"
-msgstr "ឈ្មោះ​ឯកសារ​ដំបូង ៖"
-
-#: export/ExportMultiple.cpp:246
-msgid "Tracks"
-msgstr "បទ"
-
-#: export/ExportMultiple.cpp:253
-msgid "Name files:"
-msgstr "ឈ្មោះ​ឯកសារ ៖"
-
-#: export/ExportMultiple.cpp:263
-msgid "Using Label/Track Name"
-msgstr "ប្រើប្រាស់​ស្លាក/ឈ្មោះ​បទ"
-
-#: export/ExportMultiple.cpp:270
-msgid "Numbering consecutively"
-msgstr "លេខ​រៀង​ត​គ្នា"
-
-#: export/ExportMultiple.cpp:276
-msgid "File name prefix:"
-msgstr "បុព្វបទ​ឈ្មោះ​ឯកសារ ៖"
-
-#: export/ExportMultiple.cpp:294
-msgid "Overwrite existing files"
-msgstr "សរសេរ​ជាន់​លើ​ឯកសារ​ដែល​មាន​ស្រាប់"
-
-#: export/ExportMultiple.cpp:300
-msgid "E&xport"
-msgstr "នាំចេញ"
-
-#: export/ExportMultiple.cpp:360
-#, c-format
-msgid "\"%s\" successfully created."
-msgstr "\"%s\" បាន​បង្កើត​​ដោយ​ជោគជ័យ ។"
-
-#: export/ExportMultiple.cpp:369
-msgid "Choose a location to save the exported files"
-msgstr "ជ្រើស​ទីតាំង​ដើម្បី​រក្សា​ទុក​ឯកសារ​ដែល​​ដែលបាននាំចេញ"
-
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr "កែ​សម្រួល​ទិន្នន័យ​មេតា"
-
-#: export/ExportMultiple.cpp:480
-#, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
-"\n"
-"Would you like to create it?"
-msgstr ""
-"\"%s\" មិន​ទាន់​មាន\n"
-"\n"
-"តើ​អ្នក​ចង់​បង្កើត​វា​ទេ?"
-
-#: export/ExportMultiple.cpp:606 export/ExportMultiple.cpp:714
-#, c-format
-msgid "Successfully exported %d file(s)."
-msgstr "នាំ​ចេញ​ឯកសារ​ %d ដោយ​ជោគជ័យ ។"
-
-#: export/ExportMultiple.cpp:607 export/ExportMultiple.cpp:715
-#, c-format
-msgid "Something went wrong after exporting %d file(s)."
-msgstr "បញ្ហា​ខ្លះ​បាន​កើត​ឡើង​បន្ទាប់​ពី​នាំ​ចេញ​ឯកសារ %d ។"
-
-#: export/ExportOGG.cpp:64
-msgid "Specify Ogg Vorbis Options"
-msgstr "បញ្ជាក់​ជម្រើស​ Ogg Vorbis"
-
-#: export/ExportOGG.cpp:81
-msgid "Ogg Vorbis Export Setup"
-msgstr "រៀបចំ​​នាំ​ចេញ Ogg Vorbis"
-
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "គុណភាព ៖"
-
-#: export/ExportOGG.cpp:155
-msgid "Ogg Vorbis Files"
-msgstr "ឯកសារ Ogg Vorbis"
-
-#: export/ExportOGG.cpp:254
-msgid "Exporting the selected audio as Ogg Vorbis"
-msgstr "នាំ​ចេញ​អូឌីយ៉ូ​ទៅ​ជា Ogg Vorbis"
-
-#: export/ExportOGG.cpp:255
-msgid "Exporting the entire project as Ogg Vorbis"
-msgstr "​នាំ​ចេញ​គម្រោង​ទាំងមូល​ទៅ​ជា Ogg Vorbis"
-
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr "កែសម្រួល​ទិន្នន័យ​មេតា​សម្រាប់​ឯកសារ OGG"
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
-msgstr "បញ្ជាក់​ជម្រើស PCM"
-
-#: export/ExportPCM.cpp:171
-msgid "Uncompressed Export Setup"
-msgstr "រៀបចំ​នាំចេញ​​ដែល​មិន​បង្ហាប់"
-
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "ទ្រង់ទ្រាយ ៖"
-
-#: export/ExportPCM.cpp:181
-msgid "Header:"
-msgstr "បឋមកថា ៖"
-
-#: export/ExportPCM.cpp:185
-msgid "Encoding:"
-msgstr "អ៊ិនកូឌីង ៖"
-
-#: export/ExportPCM.cpp:190
-msgid "(Not all combinations of headers and encodings are possible.)"
-msgstr "(មិនអាច​ផ្សំ​បឋមកថា និង​ការ​អ៊ិនកូដ​ទាំងអស់​បានទេ ។)"
-
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF និង​ប្រភេទ​ឯកសារ​មិន​បង្ហាប់​ផ្សេង​ទៀត"
-
-#: export/ExportPCM.cpp:361
-msgid "Cannot export audio in this format."
-msgstr "មិន​អាច​នាំចេញ​អូឌីយ៉ូ​ក្នុង​ទ្រង់ទ្រាយ​នេះ ។"
-
-#: export/ExportPCM.cpp:400
-#, c-format
-msgid "Exporting the selected audio as %s"
-msgstr "​នាំចេញ​អូឌីយ៉ូ​ទៅជា %s"
-
-#: export/ExportPCM.cpp:402
-#, c-format
-msgid "Exporting the entire project as %s"
-msgstr "កំពុង​នាំចេញ​គម្រោង​ទាំងមូល​ទៅជា %s"
-
-#: export/ExportPCM.cpp:435
-#, c-format
-msgid "Error (file may not have been written): %hs"
-msgstr "កំហុស (ឯកសារ​អាច​មិន​ទាន់​ត្រូវ​បាន​សរសេរ) ៖ %hs"
-
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
-msgstr "កែសម្រួល​ទិន្នន័យ​មេតា​សម្រាប់​ឯកសារដែល​​មិន​បាន​​បង្ហាប់"
-
-#: import/Import.cpp:154
-#, c-format
-msgid "This version of Audacity was not compiled with %s support."
-msgstr "Audacity កំណែ​នេះ​មិនទាន់​បាន​ចង​ក្រង​ជាមួយ %s គាំទ្រ ។"
-
-#: import/Import.cpp:167
-msgid ""
-" is an audio CD file. \n"
-"Audacity does not open this type of file.\n"
-"Try ripping it to a native audio format that Audacity can import."
-msgstr ""
-" ជា​ឯកសារ​ស៊ីឌី​អូឌីយ៉ូ ។ \n"
-"Audacity មិន​បើក​ប្រភេទ​ឯកសារ​នេះ​ទេ ។\n"
-"ព្យាយាម​ច្រៀក​វា​ទៅជា​ទ្រង់ទ្រាយ​អូឌីយ៉ូ​ដើម​ ដែល Audacity អាច​នាំចូល​បាន ។"
-
-#: import/Import.cpp:174
-msgid ""
-" is a playlist file.\n"
-"Audacity cannot open this file because it only contains links to other "
-"files.\n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
-msgstr ""
-" ជា​ឯកសារ​បញ្ជី​ចាក់ ។\n"
-"Audacity មិនអាច​បើក​ឯកសារ​នេះ​បានទេ ពីព្រោះ​វា​មានតែ​តំណ​ទៅ​ឯកសារ​ផ្សេង​ប៉ុណ្ណោះ ។\n"
-"អ្នក​អាច​បើក​វា​នៅ​ក្នុង​កម្មវិធី​និពន្ធ​អត្ថបទ និង​ទាញ​យក​ឯកសារ​អូឌីយ៉ូ​ពិតប្រាកដ ។"
-
-#: import/Import.cpp:180
-msgid ""
-" is a Windows Media Audio file. \n"
-"Audacity cannot open this type of file to due to patent restrictions.\n"
-"You need to convert it to a supported audio format."
-msgstr ""
-" គឺ​ជា​ឯកសារ​អូឌីយ៉ូ​មេឌៀ​របស់​វីនដូ ។ \n"
-"Audacity មិន​អាច​បើក​​ឯកសារ​ប្រភេទ​នេះ​បានទេ ដោយសារ​តែ​ការ​ដាក់កម្រិត​យ៉ាង​តឹងរ៉ឹង ។\n"
-"អ្នក​ត្រូវ​តែ​បម្លែង​វា​ទៅ​ជា​ទ្រង់ទ្រាយអូឌីយ៉ូ​ដែល​បាន​គាំទ្រ ។"
-
-#: import/Import.cpp:186
-msgid ""
-" is an Advanced Audio Coding file. \n"
-"Audacity cannot open this type of file.\n"
-"You need to convert it to a supported audio format."
-msgstr ""
-" គឺ​ជា​ឯកសារ​កូដឌីង​អូឌីយ៉ូ​កម្រិត​ខ្ពស់ ។ \n"
-"Audacity មិន​អាច​បើក​ឯកសារ​ប្រភេទ​នេះ​បានទេ ។\n"
-"អ្នក​ត្រូវ​តែ​បម្លែង​វា​ទៅជា​ទ្រង់ទ្រាយ​អូឌីយ៉ូ​ដែល​បានគាំទ្រ ។"
-
-#: import/Import.cpp:192
-msgid ""
-" is an encrypted audio file, typically from an online music store. \n"
-"Audacity cannot open this type of file due to the encryption.\n"
-"You need to convert it to a supported, unencrypted audio format."
-msgstr ""
-" គឺ​ជា​​ឯកសារ​អូឌីយ៉ូ​ដែល​បាន​អ៊ីនគ្រិប តាម​ធម្មតា​ពី​ឃ្លាំង​តន្ត្រី​លើបណ្ដាញ ។ \n"
-"Audacity មិនអាច​បើក​ឯកសារ​ប្រភេទ​នេះ​បាន​ទេ ដោយសារ​តែ​កា​រអ៊ីនគ្រិប ។\n"
-"អ្នក​ត្រូវ​តែ​បម្លែង​វា​ទៅជា​ទ្រង់ទ្រាយ​អូឌីយ៉ូ​​ដែល​មិនបានអ៊ីនគ្រិប ដែល​បានគាំទ្រ ។"
-
-#: import/Import.cpp:198
-msgid ""
-" is a RealPlayer media file. \n"
-"Audacity cannot open this proprietary format.\n"
-"You need to convert it to a supported audio format."
-msgstr ""
-" គឺ​ជា​ឯកសារ​មេឌៀ​របស់ RealPlayer ។ \n"
-"Audacity មិនអាច​បើក​ទ្រង់ទ្រាយ​មាន​កម្មសិទ្ធិ​នេះ​បានទេ ។\n"
-"អ្នក​ត្រូវតែ​បម្លែង​វា​ទៅជា​ទ្រង់ទ្រាយ​អូឌីយ៉ូ​ដែល​បានគាំទ្រ ។"
-
-#: import/Import.cpp:221
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
-msgstr ""
-"Audacity ត្រូវតែ​បង្កើត​ភ្ញៀវ​នៅ​ប្រភេទ​ឯកសារ​នេះ ។\n"
-"អូឌីយ៉ូ​អាច​ក្លែងក្លាយ ។\n"
-"\n"
-"ប្រសិន​បើ​អូឌីយ៉ូ​ក្លែងក្លាយ ព្យាយាម​ប្ដូរ​ឈ្មោះ​ឯកសារ\n"
-"ដូច្នេះ​វា​មាន​ផ្នែក​បន្ថែម​ត្រឹមត្រូវ​មុន​នឹង​បើក​វា ។"
-
-#: import/Import.cpp:237
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr ""
-"Audacity មិនស្គាល់​ប្រភេទ​ឯកសារ​នេះ​ទេ ។\n"
-"ប្រសិន​បើ​វា​មិន​ត្រូ​វបាន​បង្ហាប់​ទេ ព្យាយាម​នាំចូល​វា​ដោយ​ប្រើ \"នាំចូល​ដើម\""
-
-#: import/ImportFLAC.cpp:35
-msgid "FLAC files"
-msgstr "ឯកសារ FLAC"
-
-#: import/ImportLOF.cpp:92
-msgid "List of Files in basic text format"
-msgstr "បញ្ជី​ឯកសារ​នៅ​ក្នុង​ទ្រង់ទ្រាយ​អត្ថបទ​មូលដ្ឋាន"
-
-#. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:318
-msgid "Invalid window offset in LOF file."
-msgstr "អុហ្វសិត​បង្អួច​មិន​ត្រឹមត្រូវ​នៅក្នុង​ឯកសារ LOF​ ។"
-
-#. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:320 import/ImportLOF.cpp:341 import/ImportLOF.cpp:415
-#: import/ImportLOF.cpp:435
-msgid "LOF Error"
-msgstr "កំហុស LOF"
-
-#. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:339
-msgid "Invalid duration in LOF file."
-msgstr "ថិរវេលា​មិន​ត្រឹមត្រូវ​នៅ​ក្នុង​ឯកសារ LOF​ ។"
-
-#: import/ImportLOF.cpp:414
-msgid "MIDI tracks cannot be offset individually, only audio files can be."
-msgstr "បទ​មីឌី​មិន​អាច​អុហ្វសិត​​ដោយ​ផ្ទាល់ខ្លួន​បានទេ មានតែ​ឯកសារ​អូឌីយ៉ូ​​ប៉ុណ្ណោះ​ទើប​​អាច​​ធ្វើ​បាន ​​។"
-
-#. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:434
-msgid "Invalid track offset in LOF file."
-msgstr "អុហ្វសិត​បទ​មិន​ត្រឹមត្រូវ​នៅ​ក្នុង​ឯកសារ LOF ។"
-
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "កំហុស​ក្នុងកា​រញែក​ឯកសារ Allegro ។"
-
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "កំហុស​ក្នុង​ការ​ញែក​ឯកសារ​មីឌី ។"
-
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr "ឯកសារ MP3"
-
-#: import/ImportOGG.cpp:35
-msgid "Ogg Vorbis files"
-msgstr "ឯកសារ Ogg Vorbis"
-
-#: import/ImportOGG.cpp:141
-msgid "Media read error"
-msgstr "កំហុស​អាន​មេឌៀ"
-
-#: import/ImportOGG.cpp:144
-msgid "Not an Ogg Vorbis file"
-msgstr "មិនមែន​ជា​ឯកសារ Ogg Vorbis"
-
-#: import/ImportOGG.cpp:147
-msgid "Vorbis version mismatch"
-msgstr "កំណែ Vorbis មិន​ត្រូវគ្នា"
-
-#: import/ImportOGG.cpp:150
-msgid "Invalid Vorbis bitstream header"
-msgstr "បឋមកថា​​ប៊ីត​ស្ទ្រីម Vorbis មិន​ត្រឹមត្រូវ"
-
-#: import/ImportOGG.cpp:153
-msgid "Internal logic fault"
-msgstr "កំហុស​តក្ក​ខាងក្នុង"
-
-#: import/ImportPCM.cpp:396
-#, c-format
-msgid "Importing %s File..."
-msgstr "កំពុង​នាំចូល​ឯកសារ %s..."
-
-#: import/ImportQT.cpp:21
-msgid "QuickTime files"
-msgstr "ឯកសារ QuickTime"
-
-#: import/ImportRaw.cpp:278
-msgid "Import Raw Data"
-msgstr "នាំចូល​ទិន្នន័យ​មិនទាន់​ដើម"
-
-#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
-#. know the correct technical word.
-#: import/ImportRaw.cpp:337
-msgid "No endianness"
-msgstr "គ្មាន endianness"
-
-#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
-#. know the correct technical word.
-#: import/ImportRaw.cpp:340
-msgid "Little-endian"
-msgstr "endian​ តូច"
-
-#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
-#. know the correct technical word.
-#: import/ImportRaw.cpp:343
-msgid "Big-endian"
-msgstr "endian ធំ"
-
-#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
-#. know the correct technical word.
-#: import/ImportRaw.cpp:346
-msgid "Default endianness"
-msgstr "endianness លំនាំដើម"
-
-#: import/ImportRaw.cpp:370
-msgid "1 Channel (Mono)"
-msgstr "ឆានែល ១ (ម៉ូណូ)"
-
-#: import/ImportRaw.cpp:371
-msgid "2 Channels (Stereo)"
-msgstr "ឆានែល ២​ (ស្តេរ៉េអូ)"
-
-#: import/ImportRaw.cpp:373
-#, c-format
-msgid "%d Channels"
-msgstr "ឆានែល %d"
-
-#: import/ImportRaw.cpp:386
-msgid "Start offset:"
-msgstr "អុហ្វសិត​ចាប់ផ្ដើម ៖"
-
-#: import/ImportRaw.cpp:397
-msgid "Amount to import:"
-msgstr "ចំនួន​ត្រូវ​នាំចូល ៖"
-
-#: import/ImportRaw.cpp:408
-msgid "Sample rate:"
-msgstr "អត្រាគំរូ ៖"
-
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "នាំចូល"
-
-#: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
-msgid "Audio I/O"
-msgstr "អូឌីយ៉ូ I/O"
-
-#: prefs/AudioIOPrefs.cpp:100
-msgid "1 (Mono)"
-msgstr "១​ (ម៉ូណូ)"
-
-#: prefs/AudioIOPrefs.cpp:101
-msgid "2 (Stereo)"
-msgstr "២ (ស្តេរ៉េអូ)"
-
-#: prefs/AudioIOPrefs.cpp:115
-msgid "Playback"
-msgstr "ចាក់ឡើងវិញ"
-
-#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
-#: toolbars/DeviceToolBar.cpp:54
-msgid "Device"
-msgstr "ឧបករណ៍"
-
-#: prefs/AudioIOPrefs.cpp:122
-msgid "Using:"
-msgstr "ការ​ប្រើ ៖"
-
-#: prefs/AudioIOPrefs.cpp:123
-msgid "Portaudio v"
-msgstr "ច្រក​អូឌីយ៉ូ v"
-
-#: prefs/AudioIOPrefs.cpp:133
-msgid "Recording"
-msgstr "ថត"
-
-#: prefs/AudioIOPrefs.cpp:139
-msgid "Channels"
-msgstr "ឆានែល"
-
-#: prefs/AudioIOPrefs.cpp:145
-msgid "Playthrough"
-msgstr "ចាក់តាម"
-
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "ចាក់​បទ​ផ្សេងៗ​ខណៈពេល​ថត​ប​ទ​ថ្មី"
-
-#: prefs/AudioIOPrefs.cpp:150
-msgid "&Hardware Playthrough: Play new track while recording it"
-msgstr "ចាក់តាម​ផ្នែក​រឹង​ ៖ ចាក់បទ​ថ្មី​ខណៈពេល​កំពុង​ថត​វា"
-
-#: prefs/AudioIOPrefs.cpp:152
-msgid "&Software Playthrough: Play new track while recording it"
-msgstr "ចាក់តាម​ផ្នែក​ទន់​ ៖ ចាក់បទ​ថ្មី​​ខណៈពេល​​កំពុង​ថត​វា"
-
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
-msgstr ""
-"ចាក់តាម​ផ្នែក​ទន់ ៖ ចាក់​បទ​ថ្មី​ខណៈពេល​កំពុង​ថត​វា (ដោះធីក​ពេលកំពុង​ថត​ "
-"\"លាយស្តេរ៉េអូ\"​)"
-
-#: prefs/AudioIOPrefs.cpp:162
-msgid "Effects Preview"
-msgstr "មើល​បែបផែន​ជាមុន"
-
-#: prefs/AudioIOPrefs.cpp:165
-msgid "Length of preview:"
-msgstr "ប្រវែង​នៃ​ការ​​មើល​ជាមុន"
-
-#: prefs/AudioIOPrefs.cpp:170
-msgid "Cut Preview"
-msgstr "កាត់​មើលជាមុន"
-
-#: prefs/AudioIOPrefs.cpp:173
-msgid "Preview before cut region:"
-msgstr "មើល​ជា​មុន​ មុននឹង​​កាត់​តំបន់ ៖"
-
-#: prefs/AudioIOPrefs.cpp:175
-msgid "Preview after cut region:"
-msgstr "មើល​ជា​មុន​ បន្ទាប់​ពី​កាត់​តំបន់ ៖"
-
-#: prefs/AudioIOPrefs.cpp:183
-msgid "Latency"
-msgstr "គម្លាត​ពេល"
-
-#: prefs/AudioIOPrefs.cpp:189
-msgid "Audio to buffer:"
-msgstr "អូឌីយ៉ូ​ទៅ​សតិ​​បណ្ដោះ​អាសន្ន"
-
-#: prefs/AudioIOPrefs.cpp:192
-msgid "Latency correction:"
-msgstr "កែតម្រូវ​គម្លាត​ពេល ៖"
-
-#: prefs/AudioIOPrefs.cpp:197
-msgid "Seek Time when playing"
-msgstr "ស្វែងរក​ពេលវេលា​ពេល​កំពុង​ចាក់"
-
-#: prefs/AudioIOPrefs.cpp:200
-msgid "Short period:"
-msgstr "កំឡុង​ពេល​ខ្លី ៖"
-
-#: prefs/AudioIOPrefs.cpp:202
-msgid "Long period:"
-msgstr "កំឡុង​ពេល​វែង ៖"
-
-#: prefs/BatchPrefs.cpp:55 prefs/BatchPrefs.cpp:56
-msgid "Batch"
-msgstr "បាច់"
-
-#: prefs/BatchPrefs.cpp:77 prefs/GUIPrefs.cpp:70
-msgid "Behaviors"
-msgstr "ឥរិយាបថ"
-
-#: prefs/BatchPrefs.cpp:80
-msgid "&Don't apply effects in batch mode"
-msgstr "កុំ​អនុវត្ត​បែបផែន​ក្នុង​របៀប​បាច់"
-
-#: prefs/BatchPrefs.cpp:83
-msgid "&Normalize on load"
-msgstr "ធ្វើ​ឲ្យ​ធម្មតា​នៅ​ពេល​ផ្ទុក"
-
-#: prefs/BatchPrefs.cpp:85
-msgid "Cl&eanSpeech Mode (Customized GUI)"
-msgstr "របៀប​ CleanSpeech (GUI ដែល​បាន​ប្តូរតាម​បំណង)"
-
-#: prefs/BatchPrefs.cpp:89 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr "បង្ហាញ/លាក់"
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how MP3-ID3 Dialog"
-msgstr "បង្ហាញ​ប្រអប់​ MP3-ID3"
-
-#: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:279
-msgid "Directories"
-msgstr "ថត"
-
-#: prefs/DirectoriesPrefs.cpp:87
-msgid "Temporary files directory"
-msgstr "ថត​ឯកសារ​បណ្ដោះ​អាសន្ន"
-
-#: prefs/DirectoriesPrefs.cpp:91
-msgid "Location:"
-msgstr "ទីតាំង ៖"
-
-#: prefs/DirectoriesPrefs.cpp:93
-msgid "Free Space:"
-msgstr "ទំហំទំនេរ ៖"
-
-#: prefs/DirectoriesPrefs.cpp:99
-msgid "Auto save"
-msgstr "រក្សាទុក​ដោយ​ស្វ័យប្រវត្តិ"
-
-#: prefs/DirectoriesPrefs.cpp:101
-msgid "Auto save a copy of the project in a separate folder"
-msgstr "រក្សាទុក​ដោយ​​ស្វ័យប្រវត្តិ​ច្បាប់ចម្លង​នៃ​គម្រោង​ក្នុង​ថត​ដាច់​ដោយ​ឡែក"
-
-#: prefs/DirectoriesPrefs.cpp:104
-msgid "Auto save every:"
-msgstr "រក្សាទុកដោយ​​ស្វ័យប្រវត្តិ​​រៀងរាល់ ៖"
-
-#: prefs/DirectoriesPrefs.cpp:105
-msgid "minutes"
-msgstr "នាទី"
-
-#: prefs/DirectoriesPrefs.cpp:110
-msgid "Audio cache"
-msgstr "ឃ្លាំង​សម្ងាត់​អូឌីយ៉ូ"
-
-#: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "ទុក​ទិន្នន័យ​ដែល​បានថត​នៅ​ក្នុង​សតិ​រហូ​តដល់​ការ​​ថត​ត្រូវ​បាន​បញ្ឈប់"
-
-#: prefs/DirectoriesPrefs.cpp:121
-msgid "Choose a location to place the temporary directory"
-msgstr "ជ្រើស​ទីតាំង​ត្រូវ​ដាក់​ថត​បណ្ដោះអាសន្ន"
-
-#: prefs/DirectoriesPrefs.cpp:166
-#, c-format
-msgid "Directory %s does not exist. Create it?"
-msgstr "មិន​ទាន់​មាន​ថត %s ទេ ។ បង្កើត​វា​ឬទេ ?"
-
-#: prefs/DirectoriesPrefs.cpp:168
-msgid "New Temporary Directory"
-msgstr "ថត​បណ្ដោះ​អាសន្ន​ថ្មី"
-
-#: prefs/DirectoriesPrefs.cpp:187
-#, c-format
-msgid "Directory %s is not writable"
-msgstr "ថត %s មិនអាច​សរសេរ​បាន"
-
-#: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
-msgstr "ផ្លាស់ប្ដូរ​ទៅ​ថត​បណ្ដោះអាសន្ន នឹង​គ្មាន​ប្រសិទ្ធភាព​ទេ រហូត​ដល់ Audacity ត្រូវ​បាន​ចាប់ផ្ដើម​ឡើង​វិញ"
-
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "File Formats"
-msgstr "ទ្រង់ទ្រាយ​ឯកសារ"
-
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files into Audacity"
-msgstr "ពេល​នាំចូល​ឯកសារ​អូឌីយ៉ូ​មិនបង្ហាប់​ទៅ​ក្នុង Audacity"
-
-#: prefs/FileFormatPrefs.cpp:79
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "ធ្វើ​ច្បាប់​ចម្លង​នៃ​ឯកសារ​មុនពេល​កែសម្រួល​ (សុវត្ថិភាពជាង)"
-
-#: prefs/FileFormatPrefs.cpp:80
-msgid "&Read directly from the original file (faster)"
-msgstr "អានផ្ទាល់​ពី​ឯកសារ​ដើម (លឿនជាង)"
-
-#: prefs/FileFormatPrefs.cpp:84
-msgid "When saving a project that depends on other audio files"
-msgstr "នៅ​ពេល​រក្សាទុក​គម្រោង ដែល​អាស្រ័យ​លើ​ឯកសារ​អូឌីយ៉ូ​ផ្សេងៗ​ទៀត"
-
-#: prefs/FileFormatPrefs.cpp:87
-msgid "&Ask user"
-msgstr "សួរ​អ្នក​ប្រើ"
-
-#: prefs/FileFormatPrefs.cpp:88
-msgid "Always &copy all audio (safest)"
-msgstr "តែងតែ​​ចម្លង​គ្រប់​អូឌីយ៉ូ (សុវត្ថិភាព​បំផុត)"
-
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Never copy any audio"
-msgstr "កុំ​ចម្លង​អូឌីយ៉ូ"
-
-#: prefs/FileFormatPrefs.cpp:93
-msgid "When exporting tracks"
-msgstr "ពេល​នាំចេញ​បទ"
-
-#: prefs/FileFormatPrefs.cpp:96
-msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
-msgstr "តែងតែ​លាយ​​បទ​ទាំងអស់​​ទៅជាឆានែល​​ស្តេរ៉េអូ ឬ​ម៉ូណូ ។"
-
-#: prefs/FileFormatPrefs.cpp:97
-msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
-msgstr "ប្រើការ​​លាយ​​ផ្លាល់ខ្លួ​ន (ឧទាហរណ៍ នាំចេញ​ឯកសារ​ពហុ​ឆានែល ៥.១)"
-
-#: prefs/FileFormatPrefs.cpp:104
-msgid "MP3 Library Version:"
-msgstr "កំណែ​បណ្ណាល័យ MP3 ៖"
-
-#: prefs/FileFormatPrefs.cpp:110
-msgid "&Find Library"
-msgstr "រក​បណ្ណាល័យ"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download free copy of LAME"
-msgstr "ទាញយក​ច្បាប់​ចម្លង​ឥតគិត​ថ្លៃ​របស់ LAME"
-
-#: prefs/GUIPrefs.cpp:33 prefs/GUIPrefs.cpp:34
-msgid "Interface"
-msgstr "ចំណុច​ប្រទាក់"
-
-#: prefs/GUIPrefs.cpp:72
-msgid "&Update display while playing"
-msgstr "ធ្វើ​ឲ្យ​ការ​បង្ហាញ​ទាន់សម័យ​ ខណៈពេល​ចាក់"
-
-#: prefs/GUIPrefs.cpp:74
-msgid "&Quit Audacity upon closing last window"
-msgstr "ចេញ​ពី Audacity បន្ទាប់​ពី​បិទ​បង្អួច​ចុង​ក្រោយ"
-
-#: prefs/GUIPrefs.cpp:76
-msgid "&Dragging of left and right selection edges"
-msgstr "អូស​គែម​ជម្រើស​ខាង​ឆ្វេង និង​ខាងស្តាំ"
-
-#: prefs/GUIPrefs.cpp:78
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "លំដាប់ Ergonomic នៃ​ប៊ូតុង (I/O) អូឌីយ៉ូ"
-
-#: prefs/GUIPrefs.cpp:80
-msgid "Tracks &fit vertically zoomed"
-msgstr "បទ​សម​នឹង​​ការ​ពង្រីក​បញ្ឈរ"
-
-#: prefs/GUIPrefs.cpp:82
-msgid "&Circular track keyboard navigation"
-msgstr "ការ​រុករក​ក្តារចុច​បទ​ជា​រង្វង់មូល"
-
-#: prefs/GUIPrefs.cpp:84
-msgid "&Present track number to accessibility aid"
-msgstr "បង្ហាញ​លេខ​បទដើម្បីជា​ជំនួយ​ងាយស្រួល"
-
-#: prefs/GUIPrefs.cpp:86
-msgid "Editing a &clip can move other clips"
-msgstr "ការ​កែសម្រួល​ឈុត​អាចផ្លាស់ទី​ឈុត​ដទៃ​ទៀត"
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Select all audio, if none selected, on applying effect"
-msgstr "ប្រសិន​បើ​គ្មាន​អ្វី​បានជ្រើស ជ្រើស​អូឌីយ៉ូ​ទាំងអស់​នៅ​ពេល​អនុវត្ត​បែបផែន"
-
-#: prefs/GUIPrefs.cpp:90
-msgid "&Beep on completion of longer activities"
-msgstr "បន្លឺ​សំឡេង​ប៊ីត​នៅ​ពេល​​បញ្ចប់​សកម្មភាព​វែងៗ"
-
-#: prefs/GUIPrefs.cpp:96
-msgid "Enable cut &lines"
-msgstr "អនុញ្ញាត​ឲ្យ​កាត់​បន្ទាត់"
-
-#: prefs/GUIPrefs.cpp:98
-msgid "Show warnings about &temp files"
-msgstr "បង្ហាញ​ការព្រមាន​អំពី​ឯកសារ​បណ្តោះ​អាសន្ន"
-
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
-msgstr "បង្ហាញ​ប្រអប់​រក្សាទុក បើ​សិន​ជា​គម្រោង​ទទេ"
-
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Splash Screen at program start up"
-msgstr "បង្ហាញ​អេក្រង់​ស្វាគមន៍​នៅ​ពេល​កម្មវិធី​ចាប់ផ្ដើម"
-
-#: prefs/GUIPrefs.cpp:107
-msgid "Language"
-msgstr "ភាសា"
-
-#: prefs/GUIPrefs.cpp:109
-msgid "Language:"
-msgstr "ភាសា ៖"
-
-#: prefs/GUIPrefs.cpp:112
-msgid "Minimum of dB mode display range"
-msgstr "ជួរ​ទិដ្ឋភាព​របៀប​អប្បបរមារបស់ dB"
-
-#: prefs/GUIPrefs.cpp:115
-msgid "-36 dB (shallow range for high-amplitude editing)"
-msgstr "-៣៦ dB (ជួរ​រាក់​សម្រាប់​ការ​កែសម្រួល​អាំភ្លី​ខ្ពស់)"
-
-#: prefs/GUIPrefs.cpp:116
-msgid "-48 dB (PCM range of 8 bit samples)"
-msgstr "-៤៨ dB (ជួរ PCM នៃគំរូ ៨ ប៊ីត)"
-
-#: prefs/GUIPrefs.cpp:117
-msgid "-96 dB (PCM range of 16 bit samples)"
-msgstr "-៩៦ dB (ជួរ PCM នៃ គំរូ ១៦ ប៊ីត)"
-
-#: prefs/GUIPrefs.cpp:118
-msgid "-120 dB (approximate limit of human hearing)"
-msgstr "-១២០ dB (ព្រំដែន​ប្រហែល​នៃ​ការស្តាប់​របស់​មនុស្ស)"
-
-#: prefs/GUIPrefs.cpp:119
-msgid "-145 dB (PCM range of 24 bit samples)"
-msgstr "-145 dB (ជួរ PCM នៃ គំរូ ២៤ ប៊ីត)"
-
-#: prefs/KeyConfigPrefs.cpp:64 prefs/KeyConfigPrefs.cpp:65
-msgid "Keyboard"
-msgstr "ក្ដារចុច"
-
-#: prefs/KeyConfigPrefs.cpp:95
-msgid "Key Bindings"
-msgstr "ចងគ្រាប់ចុច"
-
-#: prefs/KeyConfigPrefs.cpp:115
-msgid "S&et"
-msgstr "កំណត់"
-
-#: prefs/KeyConfigPrefs.cpp:120
-msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
-msgstr "ចំណាំ ៖ ចុច Cmd+Q នឹងចេញ ។ គ្រាប់ចុច​ផ្សេង​ទៀត​ទាំងអស់​​គឺ​ត្រឹមត្រូវ ។"
-
-#: prefs/KeyConfigPrefs.cpp:124 prefs/ThemePrefs.cpp:103
-msgid "&Defaults"
-msgstr "លំនាំដើម"
-
-#: prefs/KeyConfigPrefs.cpp:143
-msgid "Key Combination"
-msgstr "បន្សំ​គ្រាប់ចុច"
-
-#: prefs/KeyConfigPrefs.cpp:163
-msgid "Export Keyboard Shortcuts As:"
-msgstr "នាំចេញ​ផ្លូវកាត់​ក្តារចុច​ជា ៖"
-
-#: prefs/KeyConfigPrefs.cpp:181
-msgid "Error saving keyboard shortcuts"
-msgstr "កំហុស​ក្នុងការ​រក្សាទុក​ផ្លូវកាត់​ក្តារចុច"
-
-#: prefs/KeyConfigPrefs.cpp:196
-msgid "Select an XML file containing Audacity keyboard shortcuts..."
-msgstr "ជ្រើស​ឯកសារ XML ដែល​មាន​ផ្លូវកាត់​ក្តារចុច Audacity"
-
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "ឯកសារ XML (*.xml)|*.xml|All files (*.*)|*.*"
-
-#: prefs/KeyConfigPrefs.cpp:213
-msgid "Error loading keyboard shortcuts"
-msgstr "កំហុស​ក្នុង​ការផ្ទុក​ផ្លូវកាត់​ក្តារចុច"
-
-#: prefs/KeyConfigPrefs.cpp:241
-#, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
-"\n"
-"'%s'"
-msgstr ""
-"ផ្លូវកាត់​ក្ដារចុច '%s' ត្រូវ​បាន​ផ្ដល់​ទៅ ៖\n"
-"\n"
-"'%s' រួច​ហើយ"
-
-#: prefs/KeyConfigPrefs.cpp:367 toolbars/EditToolBar.cpp:144
-msgid "Undo"
-msgstr "មិន​ធ្វើ​វិញ"
-
-#: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
-msgid "Mouse"
-msgstr "កណ្តុរ"
-
-#: prefs/MousePrefs.cpp:78
-msgid "Mouse Bindings (default values, not configurable)"
-msgstr "ការ​ចង​កណ្តុរ (តម្លៃ​លំនាំដើម​មិន​អាច​កំណត់​រចនា​សម្ព័ន្ធ​បានទេ)"
-
-#: prefs/MousePrefs.cpp:93
-msgid "Tool"
-msgstr "ឧបករណ៍"
-
-#: prefs/MousePrefs.cpp:94
-msgid "Command Action"
-msgstr "ពាក្យ​បញ្ជា​អំពើ"
-
-#: prefs/MousePrefs.cpp:95
-msgid "Buttons"
-msgstr "ប៊ូតុង"
-
-#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:104 prefs/MousePrefs.cpp:117
-#: prefs/MousePrefs.cpp:122
-msgid "Left-Click"
-msgstr "ចុចឆ្វេង"
-
-#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:100
-#: prefs/MousePrefs.cpp:101 prefs/MousePrefs.cpp:102
-msgid "Select"
-msgstr "ជ្រើស"
-
-#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:122
-msgid "Set Selection Point"
-msgstr "កំណត់​ចំណុច​ជម្រើស"
-
-#: prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:111
-#: prefs/MousePrefs.cpp:115 prefs/MousePrefs.cpp:119 prefs/MousePrefs.cpp:123
-msgid "Left-Drag"
-msgstr "អូស​ឆ្វេង"
-
-#: prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:123
-msgid "Set Selection Range"
-msgstr "កំណត់ជួរ​ជម្រើស"
-
-#: prefs/MousePrefs.cpp:100
-msgid "Extend Selection Range"
-msgstr "ពង្រើក​ជួរ​ជម្រើស"
-
-#: prefs/MousePrefs.cpp:100
-msgid "Shift-Left-Click"
-msgstr "ប្តូរ(Shift)​ខាង​ឆ្វេង-ចុចស្តាំ"
-
-#: prefs/MousePrefs.cpp:101
-msgid "Left-Double-Click"
-msgstr "ចុច​ខាង​ឆ្វេង​ទ្វេដង"
-
-#: prefs/MousePrefs.cpp:101
-msgid "Select Clip or Entire Track"
-msgstr "ជ្រើស​ច្រឹប ឬ​បទ​ទាំងមូល"
-
-#: prefs/MousePrefs.cpp:102
-msgid "Ctrl-Left-Click"
-msgstr "បញ្ជា(Ctrl) ចុចឆ្វេង"
-
-#: prefs/MousePrefs.cpp:102
-msgid "Set Selection Point and Play"
-msgstr "កំណត់​ចំណុចជ្រើស​ និង​ចាក់"
-
-#: prefs/MousePrefs.cpp:104 prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:106
-#: prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:108 prefs/MousePrefs.cpp:109
-msgid "Zoom"
-msgstr "ពង្រីក"
-
-#: prefs/MousePrefs.cpp:104
-msgid "Zoom in on Point"
-msgstr "ពង្រីក​លើ​ចំណុច"
-
-#: prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:125
-msgid "Zoom in on a Range"
-msgstr "ពង្រីក​លើ​ជួរ"
-
-#: prefs/MousePrefs.cpp:105
-msgid "same as right-drag"
-msgstr "ដូច​ទៅនឹង​អូស​ស្តាំ"
-
-#: prefs/MousePrefs.cpp:106 prefs/MousePrefs.cpp:124
-msgid "Right-Click"
-msgstr "ចុចស្តាំ"
-
-#: prefs/MousePrefs.cpp:106 prefs/MousePrefs.cpp:124
-msgid "Zoom out one step"
-msgstr "បង្រួម​លើ​ជំហាន"
-
-#: prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:125
-msgid "Right-Drag"
-msgstr "អូសស្តាំ"
-
-#: prefs/MousePrefs.cpp:107
-msgid "same as left-drag"
-msgstr "ដូច​ទៅ​នឹង​អូស​ឆ្វេង"
-
-#: prefs/MousePrefs.cpp:108
-msgid "Shift-Drag"
-msgstr "ប្តូរ(Shift) អូស"
-
-#: prefs/MousePrefs.cpp:108
-msgid "Zoom out on a Range"
-msgstr "បង្រួម​លើ​ជួរ"
-
-#: prefs/MousePrefs.cpp:109
-msgid "Middle-Click"
-msgstr "ចុច​កណ្តាល"
-
-#: prefs/MousePrefs.cpp:109
-msgid "Zoom default"
-msgstr "ពង្រីក​លំនាំដើម"
-
-#: prefs/MousePrefs.cpp:111
-msgid "Time shift clip or move up/down between tracks"
-msgstr "អង្កិល​ពេលវេលា​ច្រឹប ឬ​ផ្លាស់ទី​ឡើង​ចុះ​រវាង​បទ"
-
-#: prefs/MousePrefs.cpp:112
-msgid "Shift-Left-Drag"
-msgstr "ប្តូរ(Shift) អូស​ឆ្វេង"
-
-#: prefs/MousePrefs.cpp:112
-msgid "Time shift all clips in track"
-msgstr "អង្កិល​ពេលវេលា​គ្រប់​ឈុត​ក្នុង​បទ"
-
-#: prefs/MousePrefs.cpp:113 prefs/MousePrefs.cpp:120
-msgid "Ctrl-Left-Drag"
-msgstr "បញ្ជា(Ctrl) អូស​ឆ្វេង"
-
-#: prefs/MousePrefs.cpp:113
-msgid "Move clip up/down between tracks"
-msgstr "ផ្លាស់ទី​ឈុត​ឡើងលើ/ចុះក្រោម​រវាង​បទ"
-
-#: prefs/MousePrefs.cpp:115
-msgid "Change Amplification Envelope"
-msgstr "ផ្លាស់ប្ដូរ​ការ​ពង្រីក​ស្រោម​សំបុត្រ​"
-
-#: prefs/MousePrefs.cpp:117
-msgid "Change Sample"
-msgstr "ផ្លាស់ប្តូរ​គំរូ"
-
-#: prefs/MousePrefs.cpp:117 prefs/MousePrefs.cpp:118 prefs/MousePrefs.cpp:119
-#: prefs/MousePrefs.cpp:120
-msgid "Pencil"
-msgstr "ខ្មៅដៃ"
-
-#: prefs/MousePrefs.cpp:118
-msgid "Alt-Left-Click"
-msgstr "ជំនួស(Alt) ចុចឆ្វេង"
-
-#: prefs/MousePrefs.cpp:118
-msgid "Smooth at Sample"
-msgstr "រលោង​នៅ​លើ​គំរូ"
-
-#: prefs/MousePrefs.cpp:119
-msgid "Change Several Samples"
-msgstr "ផ្លាស់ប្ដូរ​គំរូ​ជា​ច្រើន"
-
-#: prefs/MousePrefs.cpp:120
-msgid "Change ONE Sample only"
-msgstr "ផ្លាស់ប្តូ​រគំរូ​តែមួយ"
-
-#: prefs/MousePrefs.cpp:122 prefs/MousePrefs.cpp:123 prefs/MousePrefs.cpp:124
-#: prefs/MousePrefs.cpp:125
-msgid "Multi"
-msgstr "ច្រើន"
-
-#: prefs/MousePrefs.cpp:122 prefs/MousePrefs.cpp:123
-msgid "same as select tool"
-msgstr "ដូច​ទៅនឹង​ឧបករណ៍​ជ្រើស"
-
-#: prefs/MousePrefs.cpp:124 prefs/MousePrefs.cpp:125
-msgid "same as zoom tool"
-msgstr "ដូច​ទៅនឹង​ឧបករណ៍​ពង្រីក"
-
-#: prefs/MousePrefs.cpp:127 prefs/MousePrefs.cpp:128 prefs/MousePrefs.cpp:129
-msgid "Any"
-msgstr "ខ្លះ"
-
-#: prefs/MousePrefs.cpp:127
-msgid "Scroll up or down"
-msgstr "រមូរ​ឡើង ឬ​ចុះ"
-
-#: prefs/MousePrefs.cpp:127
-msgid "Wheel-Rotate"
-msgstr "កង់​បង្វិល"
-
-#: prefs/MousePrefs.cpp:128
-msgid "Scroll left or right"
-msgstr "រមូរ​ឆ្វេង ឬ​ស្តាំ"
-
-#: prefs/MousePrefs.cpp:128
-msgid "Shift-Wheel-Rotate"
-msgstr "ប្តូរ(Shift) ​កង់​បង្វិល"
-
-#: prefs/MousePrefs.cpp:129
-msgid "Ctrl-Wheel-Rotate"
-msgstr "បញ្ជា(Ctrl) កង់​បង្វិល"
-
-#: prefs/MousePrefs.cpp:129
-msgid "Zoom in or out"
-msgstr "ពង្រីក ឬ​បង្រួម"
-
-#: prefs/PrefsDialog.cpp:89
-msgid "Audacity Preferences"
-msgstr "ចំណូល​ចិត្ត Audacity"
-
-#: prefs/QualityPrefs.cpp:42 prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "គុណភាព"
-
-#: prefs/QualityPrefs.cpp:73
-msgid "Rectangle"
-msgstr "ចតុកោណកែង"
-
-#: prefs/QualityPrefs.cpp:74
-msgid "Triangle"
-msgstr "ត្រីកោណ"
-
-#: prefs/QualityPrefs.cpp:75
-msgid "Shaped"
-msgstr "រាង"
-
-#: prefs/QualityPrefs.cpp:122
-msgid "Sampling"
-msgstr "ធ្វើគំរូ"
-
-#: prefs/QualityPrefs.cpp:125
-msgid "Default Sample Rate:"
-msgstr "អត្រា​គំរូ​លំនាំដើម ៖"
-
-#: prefs/QualityPrefs.cpp:127
-msgid "Default Sample Format:"
-msgstr "ទ្រង់ទ្រាយ​គំរូ​លំនាំដើម ៖"
-
-#: prefs/QualityPrefs.cpp:136
-msgid "Real-time sample rate converter:"
-msgstr "កម្មវិធី​បម្លែង​អត្រា​គំរូ​ពេលវេលាពិត ៖"
-
-#: prefs/QualityPrefs.cpp:139
-msgid "High-quality sample rate converter:"
-msgstr "កម្មវិធី​បម្លែង​អត្រាគំរូ​គុណភាព​ខ្ពស់ ៖"
-
-#: prefs/QualityPrefs.cpp:142
-msgid "Real-time dither:"
-msgstr "បំរែបំរួល​ពេលវេលា​ពិត ៖"
-
-#: prefs/QualityPrefs.cpp:145
-msgid "High-quality dither:"
-msgstr "បំរែបំរួល​គុណភាពខ្ពស់ ៖"
-
-#: prefs/QualityPrefs.cpp:157
-msgid "Conversion"
-msgstr "ការ​បម្លែង"
-
-#: prefs/QualityPrefs.cpp:163
-msgid "Sample Rate Converter"
-msgstr "កម្មវិធី​បម្លែង​អត្រា​គំរូ"
-
-#: prefs/QualityPrefs.cpp:164
-msgid "Dither"
-msgstr "ប្រែប្រួល"
-
-#: prefs/QualityPrefs.cpp:165
-msgid "Real-time:"
-msgstr "ពេលវេលាពិត ៖"
-
-#: prefs/QualityPrefs.cpp:171
-msgid "High-quality:"
-msgstr "គុណភាព​ខ្ពស់ ៖"
-
-#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
-msgid "Smart Recording"
-msgstr "ការ​ថត​ដ៏​ឆ្លាត"
-
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "ផ្អាកការ​ថត​នៅ​ពេល​ស្ងាត់"
-
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "កម្រិត​ស្ងាត់ (dB) ៖"
-
-#: prefs/SpectrumPrefs.cpp:36 prefs/SpectrumPrefs.cpp:37
-msgid "Spectrograms"
-msgstr "ក្រាហ្វិក​វិសាលគម"
-
-#: prefs/SpectrumPrefs.cpp:72
-msgid "FFT Size"
-msgstr "ទំហំ FFT"
-
-#: prefs/SpectrumPrefs.cpp:75
-msgid "8 - most wideband"
-msgstr "៨ - ក្រុម​ទូលាយ​បំផុត"
-
-#: prefs/SpectrumPrefs.cpp:80
-msgid "256 - default"
-msgstr "២៥៦ - លំនាំដើម"
-
-#: prefs/SpectrumPrefs.cpp:84
-msgid "4096 - most narrowband"
-msgstr "៤០៩៦ - ក្រុម​ចង្អៀត​​បំផុត"
-
-#: prefs/SpectrumPrefs.cpp:90
-msgid "Window type:"
-msgstr "ប្រភេទ​បង្អួច ៖"
-
-#: prefs/SpectrumPrefs.cpp:96
-msgid "Display"
-msgstr "បង្ហាញ"
-
-#: prefs/SpectrumPrefs.cpp:100
-msgid "&Grayscale"
-msgstr "មាត្រដ្ឋាន​ប្រផេះ"
-
-#: prefs/SpectrumPrefs.cpp:103
-msgid "Minimum Frequency (Hz):"
-msgstr "ប្រេកង់​អប្បបរមា (Hz) ៖"
-
-#: prefs/SpectrumPrefs.cpp:108
-msgid "Maximum Frequency (Hz):"
-msgstr "ប្រេកង់​អតិបរមា (Hz) ៖"
-
-#: prefs/SpectrumPrefs.cpp:134
-msgid "The maximum frequency must be an integer"
-msgstr "ប្រេកង់​អតិបរមា​ត្រូវតែ​ជា​លេខ​គត់"
-
-#: prefs/SpectrumPrefs.cpp:138
-msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
-msgstr "ប្រេកង់​អតិបរមា​ត្រូវតែ​នៅ​ក្នុង​ជួរ​ពី ១០០ Hz - ១០០.០០០ Hz"
-
-#: prefs/SpectrumPrefs.cpp:146
-msgid "The minimum frequency must be an integer"
-msgstr "ប្រេកង់​អប្បបរមា​ត្រូវតែ​ជា​លេខគត់"
-
-#: prefs/SpectrumPrefs.cpp:150
-msgid "Minimum frequency must be at least 0 Hz"
-msgstr "ប្រេកង់​អប្បបរមា​ត្រូវតែ​មាន​តម្លៃ​តូចបំផុត ០ Hz"
-
-#: prefs/ThemePrefs.cpp:62 prefs/ThemePrefs.cpp:63
-msgid "Theme"
-msgstr "ស្បែក"
-
-#: prefs/ThemePrefs.cpp:91
-msgid "Theme Cache - Images && Color"
-msgstr "ឃ្លាំងសម្ងាត់ស្បែក - រូបភាព និង​ពណ៌"
-
-#: prefs/ThemePrefs.cpp:93
-msgid "Save Theme Cache"
-msgstr "រក្សា​ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក"
-
-#: prefs/ThemePrefs.cpp:94
-msgid "Load Theme Cache"
-msgstr "ផ្ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក​"
-
-#: prefs/ThemePrefs.cpp:104
-msgid "Load Theme Cache At Startup"
-msgstr "ផ្ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក​នៅ​ពេល​ចាប់​ផ្តើម​"
-
-#: prefs/ThemePrefs.cpp:116
-msgid "Individual Theme Files"
-msgstr "ឯកសារ​ស្បែក​នីមួយៗ"
-
-#: prefs/ThemePrefs.cpp:118
-msgid "Save Files"
-msgstr "រក្សាទុក​ឯកសារ"
-
-#: prefs/ThemePrefs.cpp:119
-msgid "Load Files"
-msgstr "ផ្ទុក​ឯកសារ"
-
-#: prefs/ThemePrefs.cpp:124
-msgid "Info"
-msgstr "ព័ត៌មាន"
-
-#: prefs/ThemePrefs.cpp:127
-msgid ""
-"Themability is an experimental feature.\n"
-"\n"
-"To try it out, click \"Save Theme Cache\" then\n"
-"find and modify the images and colors in \n"
-"ImageCacheVxx.png using an image editor such \n"
-"as the Gimp.\n"
-"\n"
-"Click \"Load Theme Cache\" to load the changed images\n"
-"and colors back into Audacity.\n"
-"\n"
-"[Only the control toolbar and the colors on the \n"
-"wavetrack are currently affected, even though the\n"
-"image file shows other icons too.]\n"
-msgstr ""
-"Themability គឺ​ជា​លក្ខណៈពិសេស​ពិសោធន៍ ។\n"
-"\n"
-"ដើម្បី​សាកល្បង​វា ចុច \"រក្សា​ទុក​​ឃ្លាំង​សម្ងាត់​ស្បែក\" បន្ទាប់​មក\n"
-"រក​ និង​កែប្រែ​រូបភាព​ និង​ពណ៌​នៅ​ក្នុង \n"
-"ImageCacheVxx.png ដោយ​ប្រើ​កម្មវិធី​កែសម្រួល​រូបភាព​ដូចជា \n"
-"Gimp.\n"
-"\n"
-"ចុច \"ផ្ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក\" ដើម្បី​ផ្ទុក​រូបភាព​ដែល​បាន​ផ្លាស់ប្ដូរ\n"
-"និង​ពណ៌​ត្រឡប់​ទៅ​ក្នុង Audacity ។\n"
-"\n"
-"[មាន​តែ​របារ​ឧបករណ៍​​ត្រួតពិនិត្យ និង​ពណ៌​នៅ​លើ \n"
-"ដាន​រលក​ត្រូវ​បាន​ប៉ះពាល់​បច្ចុប្បន្ន​នេះ ទោះ​បីជា\n"
-"ឯកសារ​រូបភាព​បង្ហាញ​រូបតំណាង​ផ្សេង​ក៏​ដោយ ។]\n"
-
-#: prefs/ThemePrefs.cpp:132
-msgid ""
-"You have compiled Audacity with an extra button, \n"
-"'Output Sourcery'.  This will save a C version of \n"
-"the image cache that can be compiled in as a default.\n"
-msgstr ""
-"អ្នក​បាន​ចង​ក្រង​ Audacity ជាមួយប៊ូតុង​បន្ថែម​ \n"
-"'ប្រភព​លទ្ធផល' ។  នេះនឹងរក្សា​ទុក​កំណែ​ C របស់ \n"
-"ឃ្លាំងសម្ងាត់​​រូបភាព​​ដែល​​អាច​​ត្រូវ​បាន​ចងក្រង​ជា​លំនាំដើម ។\n"
-
-#: prefs/ThemePrefs.cpp:137
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
-"the Theme Cache will be loaded when the program \n"
-"starts up.\n"
-"\n"
-msgstr ""
-"ប្រសិន​បើ​​បាន​​គូសធីក 'ផ្ទុក​ឃ្លាំងសម្ងាត់​ស្បែក​នៅពេល​ចាប់ផ្ដើម' បន្ទាប់​មក \n"
-"ឃ្លាំង​សម្ងាត់​ស្បែក​នឹង​ត្រូវ​បាន​ផ្ទុក​​ នៅ​ពេល​កម្មវិធី \n"
-"ចាប់ផ្ដើម ។\n"
-"\n"
-
-#: prefs/ThemePrefs.cpp:140
-msgid ""
-"Saving and loading individual theme files uses a \n"
-"separate file for each image, but is otherwise the \n"
-"same idea.\n"
-"\n"
-msgstr ""
-"រក្សាទុក​ និង​ផ្ទុក​ឯកសារ​ស្បែក​នីមួយៗ​ ដោយ​ប្រើ \n"
-"ឯកសារ​ផ្សេង​សម្រាប់​រូបភាព​នីមួយៗ ប៉ុន្តែ​ម្យ៉ាងវិញ​ទៀត \n"
-"មាន​គំនិត​ដូចគ្នា ។\n"
-"\n"
-
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "ត្រួតពិនិត្យ"
-
-#: toolbars/ControlToolBar.cpp:174
-msgid "Pause"
-msgstr "ផ្អាក"
-
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play"
-msgstr "ចាក់"
-
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "ចាក់ (ប្តូរ(Shift) សម្រាប់​ចាក់​វិលជុំ)"
-
-#: toolbars/ControlToolBar.cpp:182
-msgid "Stop"
-msgstr "បញ្ឈប់"
-
-#: toolbars/ControlToolBar.cpp:185
-msgid "Skip to Start"
-msgstr "រំលង​ទៅ​ដើម"
-
-#: toolbars/ControlToolBar.cpp:188
-msgid "Skip to End"
-msgstr "រំលង​ទៅ​ចុង"
-
-#: toolbars/ControlToolBar.cpp:194
-msgid "Clean Speech"
-msgstr "Clean Speech"
-
-#: toolbars/ControlToolBar.cpp:530 toolbars/ControlToolBar.cpp:838
-msgid "Error while opening sound device. "
-msgstr "កំហុស​ខណៈពេល​​បើក​ឧបករណ៍​សំឡេង ។ "
-
-#: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
-msgstr ""
-"ការ​ថត​នៅក្នុង​របៀប CleanSpeech មិន​អាច​ធ្វើទៅបាន​​ នៅពេល​ដែល​បទ "
-"ឬ​គម្រោង​ច្រើន​ជាង​មួយ​បានបើក ។"
-
-#: toolbars/ControlToolBar.cpp:697
-msgid "Recording not permitted"
-msgstr "មិន​បាន​អនុញ្ញាត​ឲ្យ​ថត"
-
-#: toolbars/DeviceToolBar.cpp:113 toolbars/DeviceToolBar.cpp:115
-msgid "Output Device"
-msgstr "ឧបករណ៍​លទ្ធផល"
-
-#: toolbars/DeviceToolBar.cpp:134 toolbars/DeviceToolBar.cpp:136
-msgid "Input Device"
-msgstr "ឧបករណ៍​បញ្ចូល"
-
-#: toolbars/EditToolBar.cpp:139
-msgid "Trim outside selection"
-msgstr "កាត់​តម្រឹម​ខាង​ក្រៅ​ជម្រើស"
-
-#: toolbars/EditToolBar.cpp:141
-msgid "Silence selection"
-msgstr "ជម្រើស​ស្ងាត់"
-
-#: toolbars/EditToolBar.cpp:150
-msgid "Zoom In"
-msgstr "ពង្រីក"
-
-#: toolbars/EditToolBar.cpp:152
-msgid "Zoom Out"
-msgstr "បង្រួម"
-
-#: toolbars/EditToolBar.cpp:156
-msgid "Zoom Toggle"
-msgstr "បិទ/បើកការ​ពង្រីក"
-
-#: toolbars/EditToolBar.cpp:160
-msgid "Fit Selection"
-msgstr "ធ្វើ​ឲ្យ​សម​នឹង​ជម្រើស"
-
-#: toolbars/EditToolBar.cpp:160
-msgid "Fit selection in window"
-msgstr "ធ្វើ​ឲ្យ​ជម្រើស​សម​នឹង​បង្អួច"
-
-#: toolbars/EditToolBar.cpp:162
-msgid "Fit Project"
-msgstr "ធ្វើ​ឲ្យ​សម​នឹង​​​​គម្រោង"
-
-#: toolbars/EditToolBar.cpp:162
-msgid "Fit project in window"
-msgstr "ធ្វើ​ឲ្យ​គម្រោង​សម​​នៅ​ក្នុង​បង្អួច"
-
-#: toolbars/MeterToolBar.cpp:50
-msgid "Meter"
-msgstr "ម៉ែត្រ"
-
-#: toolbars/MeterToolBar.cpp:80
-msgid "Play Meter"
-msgstr "ឧបករណ៍​វាស់​ពេលចាក់"
-
-#: toolbars/MeterToolBar.cpp:81
-msgid "Meter-Play"
-msgstr "ម៉ែត្រ-ចាក់"
-
-#: toolbars/MeterToolBar.cpp:89
-msgid "Record Meter"
-msgstr "ឧបករណ៍​ចាក់​ពេលថត"
-
-#: toolbars/MeterToolBar.cpp:90
-msgid "Meter-Record"
-msgstr "ម៉ែត្រ-ថត"
-
-#: toolbars/MeterToolBar.cpp:94
-msgid "Output level meter"
-msgstr "ឧបករណ៍​វាស់​កម្រិត​លទ្ធផល"
-
-#: toolbars/MeterToolBar.cpp:95
-msgid "Input level meter - click to monitor input"
-msgstr "ឧបករណ៍​វាស់​កម្រិត​បញ្ចូល​ - ចុច​ដើម្បី​ត្រួតពិនិត្យ​ការ​បញ្ចូល"
-
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "ឧបករណ៍​លាយ"
-
-#: toolbars/MixerToolBar.cpp:91
-msgid "Output Volume"
-msgstr "សំឡេង​លទ្ធផល"
-
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
-msgstr "គ្រាប់​រំកិល​លទ្ធផល"
-
-#: toolbars/MixerToolBar.cpp:102
-msgid "Input Volume"
-msgstr "សំឡេង​ចូល"
-
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
-msgstr "គ្រាប់​រំកិល​បញ្ចូល"
-
-#: toolbars/MixerToolBar.cpp:117
-msgid "Input Source"
-msgstr "ប្រភព​ចូល"
-
-#: toolbars/SelectionBar.cpp:80
-msgid "Selection"
-msgstr "ជម្រើស"
-
-#: toolbars/SelectionBar.cpp:120 toolbars/SelectionBar.cpp:177
-msgid "Project Rate (Hz):"
-msgstr "អត្រា​គម្រោង (Hz) ៖"
-
-#: toolbars/SelectionBar.cpp:134 toolbars/SelectionBar.cpp:235
-msgid "Selection Start:"
-msgstr "ដើម​ចម្រើស ៖"
-
-#: toolbars/SelectionBar.cpp:157
-msgid "hidden"
-msgstr "បាន​លាក់"
-
-#: toolbars/SelectionBar.cpp:167 toolbars/SelectionBar.cpp:252
-msgid "Audio Position:"
-msgstr "ទីតាំងអូឌីយ៉ូ ៖"
-
-#: toolbars/SelectionBar.cpp:217 toolbars/SelectionBar.cpp:222
-msgid "Snap To"
-msgstr "ខ្ទាស់ទៅ"
-
-#: toolbars/SelectionBar.cpp:240
-msgid "Selection "
-msgstr "ជម្រើស"
-
-#: toolbars/SelectionBar.cpp:305
-msgid "Selection Length"
-msgstr "ប្រវែង​ជម្រើស"
-
-#: toolbars/SelectionBar.cpp:313
-msgid "Selection End"
-msgstr "ចុង​ជម្រើស"
-
-#: toolbars/ToolBar.cpp:97
-#, c-format
-msgid "Audacity %s ToolBar"
-msgstr "របារ​ឧបករណ៍​របស់ Audacity %s"
-
-#: toolbars/ToolDock.cpp:74 toolbars/ToolDock.cpp:75
-msgid "ToolDock"
-msgstr "ToolDock"
-
-#: toolbars/ToolsToolBar.cpp:63
-msgid "Click and drag to select audio"
-msgstr "ចុច និង​អូស​ដើម្បី​ជ្រើស​អូឌីយ៉ូ"
-
-#: toolbars/ToolsToolBar.cpp:64
-msgid "Click and drag to edit the amplitude envelope"
-msgstr "ចុច​ និង​អូស​ដើម្បី​កែសម្រួល​ស្រោមសំបុត្រ​អាំភ្លី"
-
-#: toolbars/ToolsToolBar.cpp:65
-msgid "Click and drag to edit the samples"
-msgstr "ចុច និង​អូស​ដើម្បី​កែសម្រួល​គំរូ"
-
-#: toolbars/ToolsToolBar.cpp:67
-msgid "Click to Zoom In, Shift-Click to Zoom Out"
-msgstr "ចុច​ដើម្បី​ពង្រីក ប្តូរ(Shift)-ចុច ដើម្បី​បង្រួម"
-
-#: toolbars/ToolsToolBar.cpp:69
-msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
-msgstr "អូស​ដើម្បី​ពង្រីក​ទៅ​ក្នុង​តំបន់ ចុច​ខាងស្តាំ​ដើម្បី​បង្រួម"
-
-#: toolbars/ToolsToolBar.cpp:71
-msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
-msgstr "ឆ្វេង=ពង្រីក ស្តាំ=បង្រួម កណ្តាល=ធម្មតា"
-
-#: toolbars/ToolsToolBar.cpp:73
-msgid "Click and drag to move a track in time"
-msgstr "ចុច និង​អូស​ដើម្បី​ផ្លាស់ទី​បទ​នៅ​ក្នុង​ពេលវេលា"
-
-#: toolbars/ToolsToolBar.cpp:90
-msgid "Tools"
-msgstr "ឧបករណ៍"
-
-#: toolbars/ToolsToolBar.cpp:147 toolbars/ToolsToolBar.cpp:182
-msgid "Selection Tool"
-msgstr "ឧបករណ៍​ជម្រើស"
-
-#: toolbars/ToolsToolBar.cpp:148
-msgid "Envelope Tool"
-msgstr "ឧបករណ៍​ស្រោមសំបុត្រ"
-
-#: toolbars/ToolsToolBar.cpp:149 toolbars/ToolsToolBar.cpp:183
-msgid "Time Shift Tool"
-msgstr "ឧបករណ៍​ប្តូរ​ពេលវេលា"
-
-#: toolbars/ToolsToolBar.cpp:150 toolbars/ToolsToolBar.cpp:185
-msgid "Zoom Tool"
-msgstr "ឧបករណ៍​ពង្រីក"
-
-#: toolbars/ToolsToolBar.cpp:151 toolbars/ToolsToolBar.cpp:184
-msgid "Draw Tool"
-msgstr "ឧបករណ៍​គូរ"
-
-#: toolbars/ToolsToolBar.cpp:152
-msgid "Multi-Tool Mode"
-msgstr "របៀប​ពហុ​ឧបករណ៍"
-
-#: toolbars/ToolsToolBar.cpp:186
-msgid "Slide Tool"
-msgstr "ឧបករណ៍​រំកិល"
-
-#: toolbars/ToolsToolBar.cpp:187
-msgid "Multi Tool"
-msgstr "ពហុ​ឧបករណ៍"
-
-#: toolbars/TranscriptionToolBar.cpp:82
-msgid "Transcription"
-msgstr "ការ​ចម្លង"
-
-#: toolbars/TranscriptionToolBar.cpp:163
-msgid "Play at selected speed"
-msgstr "ចាក់​នៅ​ល្បឿន​ដែល​បាន​ជ្រើស"
-
-#: toolbars/TranscriptionToolBar.cpp:164
-msgid "Play-at-speed"
-msgstr "ចាក់​នៅ​ល្បឿន"
-
-#: toolbars/TranscriptionToolBar.cpp:170 toolbars/TranscriptionToolBar.cpp:175
-msgid "Playback Speed"
-msgstr "ល្បឿន​ចាក់​ឡើងវិញ"
-
-#: toolbars/TranscriptionToolBar.cpp:180
-msgid "Adjust left selection to next onset"
-msgstr "​លៃតម្រូវ​ជម្រើស​ឆ្វេង​ទៅនឹង​អនសិត​​បន្ទាប់"
-
-#: toolbars/TranscriptionToolBar.cpp:181
-msgid "Left-to-On"
-msgstr "ឆ្វេង​ដើម្បី​បើក"
-
-#: toolbars/TranscriptionToolBar.cpp:183
-msgid "Adjust right selection to previous offset"
-msgstr "លៃតម្រូវ​ជម្រើស​ស្តាំ​ទៅនឹង​អុហ្វសិត​មុន"
-
-#: toolbars/TranscriptionToolBar.cpp:184
-msgid "Right-to-Off"
-msgstr "ស្តាំ​ដើម្បី​បិទ"
-
-#: toolbars/TranscriptionToolBar.cpp:186
-msgid "Adjust left selection to next offset"
-msgstr "លៃតម្រូវ​ជម្រើស​ឆ្វេង​ទៅនឹង​អុហ្វសិត​បន្ទាប់"
-
-#: toolbars/TranscriptionToolBar.cpp:187
-msgid "Left-to-Off"
-msgstr "ឆ្វេង​ដើម្បី​បិទ"
-
-#: toolbars/TranscriptionToolBar.cpp:189
-msgid "Adjust right selection to previous onset"
-msgstr "លៃតម្រូវ​ជម្រើស​ស្តាំ​ទៅនឹង​អនសិត​មុន"
-
-#: toolbars/TranscriptionToolBar.cpp:190
-msgid "Right-to-On"
-msgstr "ស្ដាំ​ដើម្បី​បើក"
-
-#: toolbars/TranscriptionToolBar.cpp:192
-msgid "Select region of sound around cursor"
-msgstr "ជ្រើស​តំបន់​សំឡេង​នៅ​ជុំវិញ​ទស្សន៍ទ្រនិច"
-
-#: toolbars/TranscriptionToolBar.cpp:193
-msgid "Select-Sound"
-msgstr "ជ្រើស​សំឡេង"
-
-#: toolbars/TranscriptionToolBar.cpp:195
-msgid "Select region of silence around cursor"
-msgstr "ជ្រើស​តំបន់​ស្ងាត់​នៅ​ជុំវិញ​ទស្សន៍​ទ្រនិច"
-
-#: toolbars/TranscriptionToolBar.cpp:196
-msgid "Select-Silence"
-msgstr "ជ្រើស​ស្ងាត់"
-
-#: toolbars/TranscriptionToolBar.cpp:198
-msgid "Automatically make labels from words"
-msgstr "បង្កើត​​ស្លាក​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ពាក្យ"
-
-#: toolbars/TranscriptionToolBar.cpp:199
-msgid "Make Labels"
-msgstr "បង្កើត​ស្លាក"
-
-#: toolbars/TranscriptionToolBar.cpp:201
-msgid "Add label at selection"
-msgstr "បន្ថែម​ស្លាក​នៅ​ជម្រើស"
-
-#: toolbars/TranscriptionToolBar.cpp:202
-msgid "Add Label"
-msgstr "បន្ថែម​ស្លាក"
-
-#: toolbars/TranscriptionToolBar.cpp:204
-msgid "Calibrate voicekey"
-msgstr "ក្រិត​​កូនសោរ​សំឡេង​តាម​ខ្នាត​"
-
-#: toolbars/TranscriptionToolBar.cpp:205
-msgid "Calibrate"
-msgstr "ក្រិត​តាម​ខ្នាត"
-
-#: toolbars/TranscriptionToolBar.cpp:209
-msgid "Adjust Sensitivity"
-msgstr "លៃតម្រូវ​ភាព​យល់ដឹង"
-
-#: toolbars/TranscriptionToolBar.cpp:214
-msgid "Sensitivity"
-msgstr "ភាព​យល់ដឹង"
-
-#: toolbars/TranscriptionToolBar.cpp:219
-msgid "Energy"
-msgstr "ថាមពល"
-
-#: toolbars/TranscriptionToolBar.cpp:220
-msgid "Sign Changes (Low Threshold)"
-msgstr "សញ្ញា​ផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ទាប)"
-
-#: toolbars/TranscriptionToolBar.cpp:221
-msgid "Sign Changes (High Threshold)"
-msgstr "សញ្ញាផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ខ្ពស់)"
-
-#: toolbars/TranscriptionToolBar.cpp:222
-msgid "Direction Changes (Low Threshold)"
-msgstr "ទិសផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ទាប)"
-
-#: toolbars/TranscriptionToolBar.cpp:223
-msgid "Direction Changes (High Threshold)"
-msgstr "ទិសផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ខ្ពស់)"
-
-#: toolbars/TranscriptionToolBar.cpp:231
-msgid "Key type"
-msgstr "ប្រភេទ​គ្រាប់ចុច"
-
-#: widgets/AButton.cpp:302
-msgid " (disabled)"
-msgstr " (បិទ)"
-
-#: widgets/AButton.cpp:447
-msgid "Press"
-msgstr "ចុច"
-
-#: widgets/AButton.cpp:526
-msgid "Button"
-msgstr "ប៊ូតុង"
-
-#. i18n-hint: One-letter abbreviation for Left, in VU Meter
-#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: widgets/ASlider.cpp:604 widgets/Meter.cpp:211
-msgid "L"
-msgstr "ឆ្វេង"
-
-#. i18n-hint: One-letter abbreviation for Right, in VU Meter
-#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: widgets/ASlider.cpp:607 widgets/Meter.cpp:213
-msgid "R"
-msgstr "ស្តាំ"
-
-#: widgets/ASlider.cpp:670
-msgid "Center"
-msgstr "កណ្តាល"
-
-#: widgets/ASlider.cpp:674
-msgid "Left"
-msgstr "ឆ្វេង"
-
-#: widgets/ASlider.cpp:677
-msgid "Right"
-msgstr "ស្តាំ"
-
-#: widgets/ErrorDialog.cpp:73 widgets/ErrorDialog.cpp:97
-msgid "Help"
-msgstr "ជំនួយ"
-
-#: widgets/ErrorDialog.cpp:190
-msgid "Help on the Internet"
-msgstr "ជំនួយ​នៅ​លើ​អ៊ីនធឺណិត"
-
-#: widgets/Grabber.cpp:62
-msgid "Grabber"
-msgstr "ឧបករណ៍​ចាប់​យក"
-
-#: widgets/Grid.cpp:635
-#, c-format
-msgid "%d rows, %d columns"
-msgstr "%d ជួរដេក %d ជួរឈរ"
-
-#: widgets/Grid.cpp:641 widgets/Grid.cpp:768
-#, c-format
-msgid "Row %d"
-msgstr "ជួរ​ដេក %d"
-
-#: widgets/Grid.cpp:783
-msgid "Empty"
-msgstr "ទទេ"
-
-#: widgets/Meter.cpp:342
-msgid "Enable Meter"
-msgstr "អនុញ្ញាត​ម៉ែត្រ"
-
-#: widgets/Meter.cpp:344
-msgid "Disable Meter"
-msgstr "មិន​អនុញ្ញាត​ម៉ែត្រ"
-
-#: widgets/Meter.cpp:347
-msgid "Stop Monitoring"
-msgstr "ឈប់​ត្រួតពិនិត្យ"
-
-#: widgets/Meter.cpp:349
-msgid "Start Monitoring"
-msgstr "ចាប់ផ្តើម​ត្រួតពិនិត្យ"
-
-#: widgets/Meter.cpp:353
-msgid "Horizontal Stereo"
-msgstr "ស្តេរ៉េអូ​ផ្ដេក"
-
-#: widgets/Meter.cpp:354
-msgid "Vertical Stereo"
-msgstr "ស្តេរ៉េអូ​បញ្ឈរ"
-
-#: widgets/Meter.cpp:362
-msgid "Linear"
-msgstr "លីនេអ៊ែរ"
-
-#: widgets/Meter.cpp:371
-msgid "Preferences..."
-msgstr "​ចំណូលចិត្ត..."
-
-#: widgets/Meter.cpp:1061
-msgid ""
-"This determines how often the meter is refreshed.\n"
-"If you have a slower PC you may want to select a\n"
-"lower refresh rate (30 per second or lower), so that\n"
-"audio qualtiy is not affected by the meter display."
-msgstr ""
-"វា​កំណត់​ថាតើ​ម៉ែត្រ​ត្រូវ​បាន​ធ្វើ​ឲ្យ​ស្រស់​ក្នុង​រយៈពេលប៉ុន្មាន ។\n"
-"ប្រសិន​បើ​អ្នក​មាន​កុំព្យូទ័រ​យឺត អ្នក​​ត្រូវ​ជ្រើស\n"
-"អត្រា​ធ្វើ​ឲ្យស្រស់​ទាប (៣០ ក្នុង​មួយ​វិនាទី ឬ​ទាប​ជាង​នេះ) ដូច្នេះ\n"
-"គុណភាព​អូឌីយ៉ូ​មិន​ត្រូវ​បាន​ប៉ះពាល់​ដោយ​ការ​បង្ហាញ​ម៉ែត្រ​ទេ ។"
-
-#: widgets/Meter.cpp:1062
-msgid "Meter refresh rate per second [1-100]: "
-msgstr "អត្រា​ធ្វើ​ឲ្យ​ម៉ែត្រ​ស្រស់ក្នុង​មួយ​វិនាទី​ [១-១០០] ៖ "
-
-#: widgets/Meter.cpp:1063
-msgid "Meter Preferences"
-msgstr "ចំណូលចិត្ត​ម៉ែត្រ"
-
-#: widgets/MultiDialog.cpp:82
-msgid " Please select an action "
-msgstr "សូមជ្រើស​អំពើ"
-
-#: widgets/Ruler.cpp:1138 widgets/Ruler.cpp:1139
-msgid "Vertical Ruler"
-msgstr "បន្ទាត់​បញ្ឈរ"
-
-#. i18n-hint: These strings control the formatting of time units in the
-#. * display. They are fairly complex, see the comments in
-#. * widgets/TimeTextCtrl.cpp for how they work
-#: widgets/TimeTextCtrl.cpp:201
-msgid "01000,01000 seconds"
-msgstr "01000,01000 វិនាទី"
-
-#: widgets/TimeTextCtrl.cpp:202
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
-#: widgets/TimeTextCtrl.cpp:203
-msgid "0100 h 060 m 060 s"
-msgstr "0100 ម៉ោង 060 នាទី 060 វិនាទី"
-
-#: widgets/TimeTextCtrl.cpp:204
-msgid "dd:hh:mm:ss"
-msgstr "dd:hh:mm:ss"
-
-#: widgets/TimeTextCtrl.cpp:205
-msgid "0100 days 024 h 060 m 060 s"
-msgstr "0100 ថ្ងៃ 024 ម៉ោង 060 នាទី 060 វិនាទី"
-
-#: widgets/TimeTextCtrl.cpp:206
-msgid "hh:mm:ss + milliseconds"
-msgstr "hh:mm:ss + មិល្លីវិនាទី"
-
-#: widgets/TimeTextCtrl.cpp:207
-msgid "0100 h 060 m 060.01000 s"
-msgstr "0100 ម៉ោង 060 នាទី 060.01000 វិនាទី"
-
-#: widgets/TimeTextCtrl.cpp:208
-msgid "hh:mm:ss + samples"
-msgstr "hh:mm:ss + គំរូ"
-
-#: widgets/TimeTextCtrl.cpp:209
-msgid "0100 h 060 m 060 s+.# samples"
-msgstr "0100 ម៉ោង 060 នាទី 060 វិនាទី+.# គំរូ"
-
-#: widgets/TimeTextCtrl.cpp:210
-msgid "samples"
-msgstr "គំរូ"
-
-#: widgets/TimeTextCtrl.cpp:211
-msgid "01000,01000,01000 samples|#"
-msgstr "01000,01000,01000 គំរូ|#"
-
-#: widgets/TimeTextCtrl.cpp:212
-msgid "hh:mm:ss + film frames (24 fps)"
-msgstr "hh:mm:ss + ស៊ុម​ហ្វីល (២៤ fps)"
-
-#: widgets/TimeTextCtrl.cpp:213
-msgid "0100 h 060 m 060 s+.24 frames"
-msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វិនាទី+.២៤ ស៊ុម"
-
-#: widgets/TimeTextCtrl.cpp:214
-msgid "film frames (24 fps)"
-msgstr "ស៊ុមហ្វិល (២៤ fps)"
-
-#: widgets/TimeTextCtrl.cpp:215
-msgid "01000,01000 frames|24"
-msgstr "០១០០០,០១០០០ ស៊ុម|២៤"
-
-#: widgets/TimeTextCtrl.cpp:216
-msgid "hh:mm:ss + NTSC drop frames"
-msgstr "hh:mm:ss + NTSC ទម្លាក់​ស៊ុម"
-
-#: widgets/TimeTextCtrl.cpp:217
-msgid "0100 h 060 m 060 s+.30 frames|N"
-msgstr "0100 ម៉ោង 060 នាទី 060 វិនាទី+.30 ស៊ុម|N"
-
-#: widgets/TimeTextCtrl.cpp:218
-msgid "hh:mm:ss + NTSC non-drop frames"
-msgstr "hh:mm:ss + NTSC មិន​ទម្លាក់​ស៊ុម"
-
-#: widgets/TimeTextCtrl.cpp:219
-msgid "0100 h 060 m 060 s+.030 frames| .999000999"
-msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វិនាទី+.០៣០ ស៊ុម| .៩៩៩០០០៩៩៩"
-
-#: widgets/TimeTextCtrl.cpp:220
-msgid "NTSC frames"
-msgstr "ស៊ុម NTSC"
-
-#: widgets/TimeTextCtrl.cpp:221
-msgid "01000,01000 frames|29.97002997"
-msgstr "០១០០០,០១០០០ ស៊ុម|២៩.៩៧០០២៩៩៧"
-
-#: widgets/TimeTextCtrl.cpp:222
-msgid "hh:mm:ss + PAL frames (25 fps)"
-msgstr "hh:mm:ss + ស៊ុម PAL​ (២៥ fps)"
-
-#: widgets/TimeTextCtrl.cpp:223
-msgid "0100 h 060 m 060 s+.25 frames"
-msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វនាទី+.២៥ ស៊ុម"
-
-#: widgets/TimeTextCtrl.cpp:224
-msgid "PAL frames (25 fps)"
-msgstr "ស៊ុម PAL (២៥ fps)"
-
-#: widgets/TimeTextCtrl.cpp:225
-msgid "01000,01000 frames|25"
-msgstr "០១០០០,០១០០០ ស៊ុម|២៥"
-
-#: widgets/TimeTextCtrl.cpp:226
-msgid "hh:mm:ss + CDDA frames (75 fps)"
-msgstr "hh:mm:ss + ស៊ុម​ CDDA (75 fps)"
-
-#: widgets/TimeTextCtrl.cpp:227
-msgid "0100 h 060 m 060 s+.75 frames"
-msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វិនាទី+.75 ស៊ុម"
-
-#: widgets/TimeTextCtrl.cpp:228
-msgid "CDDA frames (75 fps)"
-msgstr "ស៊ុម CDDA (75 fps)"
-
-#: widgets/TimeTextCtrl.cpp:229
-msgid "01000,01000 frames|75"
-msgstr "01000,01000 ស៊ុម|75"
-
-#: widgets/TimeTextCtrl.cpp:366
-msgid "Use right mouse button or context key to change format"
-msgstr "ប្រើ​ប៊ូតុង​កណ្តុរ​​ស្តាំ​​ ឬ​គ្រាប់​ចុច​បរិបទ​ដើម្បី​ផ្លាស់ប្តូរ​ទ្រង់ទ្រាយ"
-
-#: widgets/TimeTextCtrl.cpp:1380
-msgid "Time Control"
-msgstr "គ្រប់គ្រង​ពេលវេលា"
-
-#: widgets/Warning.cpp:64
-msgid "Don't show this warning again"
-msgstr "កុំ​បង្ហាញ​ការ​ព្រមាន​នេះ​ម្តងទៀត"
-
-#: xml/XMLFileReader.cpp:49
-#, c-format
-msgid "Could not open file: \"%s\""
-msgstr "មិន​អាច​បើក​ឯកសារ ៖ \"%s\""
-
-#: xml/XMLFileReader.cpp:63
-#, c-format
-msgid "Error: %hs at line %d"
-msgstr "កំហុស ៖ %hs នៅ​បន្ទាត់ %d"
-
-#: xml/XMLFileReader.cpp:79
-#, c-format
-msgid "Could not load file: \"%s\""
-msgstr "មិនអាច​ផ្ទុក​ឯកសារ ៖ \"%s\""
-
diff --git a/locale/cs.po b/locale/cs.po
index fd2de5c..9a14ab2 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -3,8 +3,7 @@
 # FIRST AUTHOR: ALES TOSOVSKY <ales.tosovsky at gmail.com>, 2004
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity\n"
+msgstr "Project-Id-Version: Audacity\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
 "PO-Revision-Date: 2008-05-07 10:24+0100\n"
@@ -27,16 +26,16 @@ msgid "OK... Audacious!"
 msgstr "OK... Hezky!"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "Audacity je svobodný program psaný skupinou dobrovolníků z celého světa. Jejich spolupráce probíhá díky SourceFore.net, online službě, která poskytuje zdarma nástroje pro vývoj projektů s otevřeným zdrojovým kódem. Audacity lze používat s Windows 98 či novějšími, Mac OS X, Linuxem a ostatními Unix-like operačními systémy. Starší verze Audacity lze používat na Mac OS 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Toto je betaverze programu. Může obsahovat chyby a nedokončené vlastnosti. Naše práce závisí na zpětné vazbě, kterou nám poskytnete. Takže prosím navštivte naši webovou stránku a nahlaste nám chyby a napište žádosti o vlastnosti, které by měly být v budoucích verzích."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Toto je stabilní, dokončené vydání Audacity. Nicméně, pokud najdete chybu, či máte připomínku, prosím, spojte se s námi. Zlepšování Audacity závisí na zpětné vazbě od uživatelů. Více informací najdete na naší domovské stránce."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -54,8 +53,8 @@ msgid "translator_credits"
 msgstr "Český překlad: Aleš Tošovský, Dominik Joe Pantůček, Vladimír Krupka"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Svobodný editor digitálního zvuku"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -91,6 +90,10 @@ msgstr "Audacity je založena na programovém kódu těchto projektů:"
 msgid "Special thanks:"
 msgstr "Zvláštní poděkování:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -234,12 +237,10 @@ msgstr "Chyba při otevírání projektu"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s neexistuje, proto nemůže být otevřen.\n"
+msgstr "%s neexistuje, proto nemůže být otevřen.\n"
 "\n"
 "Záznam byl odstraněn ze seznamu historie."
 
@@ -275,11 +276,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "Neznámá volba řádkového příkazu: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity nemůže najít umístění pro dočasné soubory.\n"
+msgstr "Audacity nemůže najít umístění pro dočasné soubory.\n"
 "Prosím zadejte správný adresář v dialogu pro nastavení."
 
 #: AudacityApp.cpp:1050
@@ -287,21 +286,17 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr "Audacity se nyní ukončí. Aby se použil nový dočasný adresář, prosím spusťte Audacity znovu."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Současný běh dvou kopií Audacity může zapříčinit\n"
+msgstr "Současný běh dvou kopií Audacity může zapříčinit\n"
 "ztrátu dat nebo pád vašeho systému.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity nemůže zajistit adresář pro pracovní soubory.\n"
+msgstr "Audacity nemůže zajistit adresář pro pracovní soubory.\n"
 "Je možné, že tento adresář právě používá jiná kopie Audacity.\n"
 
 #: AudacityApp.cpp:1091
@@ -317,11 +312,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Systém rozpoznal další spuštěnou kopii Audacity.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Více projektů najednou je možné otevřít pomocí příkazů Soubor-Nový\n"
+msgstr "Více projektů najednou je možné otevřít pomocí příkazů Soubor-Nový\n"
 "nebo Otevřít v právě spuštěné Audacity.\n"
 
 #: AudacityApp.cpp:1134
@@ -363,13 +356,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr "Uveďte také jméno zvukového souboru nebo projektu Audacity, který se má otevřít."
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Projektové soubory (.AUP) nejsou \n"
+msgstr "Projektové soubory (.AUP) nejsou \n"
 "asociovány s Audacity. \n"
 "\n"
 "Provést asociaci, aby je bylo možno otevírat dvojkliknutím?"
@@ -383,11 +374,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Není možné najít žádná zvuková zařízení.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Nebudete moci přehrávat nebo nahrávat zvuk.\n"
+msgstr "Nebudete moci přehrávat nebo nahrávat zvuk.\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -403,8 +392,7 @@ msgid "Latency problem"
 msgstr "Problém latence"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
 msgstr ""
@@ -414,11 +402,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Automatická oprava pádu"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Při posledním spuštění Audacity některé projekty nebyly správně uloženy.\n"
+msgstr "Při posledním spuštění Audacity některé projekty nebyly správně uloženy.\n"
 "Následující projekty je možné automaticky obnovit:"
 
 #: AutoRecovery.cpp:75
@@ -447,11 +433,9 @@ msgid "Recover Projects"
 msgstr "Obnovit projekty"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Skutečně nechcete opravit žádné projekty?\n"
+msgstr "Skutečně nechcete opravit žádné projekty?\n"
 "Později už oprava nebude možná."
 
 #: AutoRecovery.cpp:128
@@ -526,11 +510,9 @@ msgstr "Příkaz %s prozatím není implementován"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Nelze nastavit parametry efektu %s\n"
+msgstr "Nelze nastavit parametry efektu %s\n"
 " na %s."
 
 #: BatchCommands.cpp:583
@@ -540,12 +522,10 @@ msgstr ""
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Použít %s s parametry\n"
+msgstr "Použít %s s parametry\n"
 "\n"
 "%s"
 
@@ -565,6 +545,10 @@ msgstr "Použít %s"
 msgid "Apply Chain"
 msgstr "Použít sadu příkazů"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "Vybrat &sadu příkazů"
@@ -611,10 +595,18 @@ msgstr "'%s' se aplikuje na současný projekt"
 msgid "Please save and close the current project first."
 msgstr "Nejprve prosím uložte a uzavřete současný projekt."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Výběr souborů pro dávkové zpracování..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "VÅ¡echny soubory (*.*)|*.*|WAV soubory (*.wav)|*.wav|AIFF soubory (*.aif)|*.aif|AU soubory (*.au)|*.au|MP3 soubory (*.mp3)|*.mp3|Ogg Vorbis soubory (*.ogg)|*.ogg|FLAC soubory (*.flac)|*.flac"
@@ -726,12 +718,10 @@ msgid "Copying audio data into project..."
 msgstr "Do projektu se kopírují zvuková data..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Váš projekt nyní závisí na přítomnosti dalších souborů.\n"
+msgstr "Váš projekt nyní závisí na přítomnosti dalších souborů.\n"
 "Chcete překopírovat zvuková data z následujících souborů do vašeho projektu,\n"
 "aby byl nezávislý? Zabere to víc diskového prostoru, ale je to bezpečnější."
 
@@ -798,8 +788,7 @@ msgid "Dependency check"
 msgstr "Kontrola závislostí"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
 msgstr "Varování: na tomto disku je velmi málo volného místa. Prosím zvolte v nastavení jiný dočasný adresář."
 
@@ -823,11 +812,9 @@ msgstr "Odstraňují se adresáře vyrovnávací paměti"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity našla opuštěný blokovací soubor %s! \n"
+msgstr "Audacity našla opuštěný blokovací soubor %s! \n"
 "Prosím zvažte uložení a nové otevření projektu. Tím dojde k celkové kontrole projektu.\n"
 
 #  i18n-hint: This is the pattern for filenames that are created
@@ -855,16 +842,16 @@ msgstr "'%s' nelze odstranit"
 msgid "Renamed file: %s\n"
 msgstr "Přejmenovaný soubor: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Měním blok%s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "'%s' nelze přejmenovat na '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -891,17 +878,14 @@ msgid "Missing data file: (%s.au)"
 msgstr "Chybějící datový soubor: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"V datech projektu byly zjištěny nesrovnalosti. Nalezené chyby se zobrazí,\n"
+msgstr "V datech projektu byly zjištěny nesrovnalosti. Nalezené chyby se zobrazí,\n"
 "když kliknete na 'Podrobnosti'. Kliknutím na 'OK' se dostanete k dalším možnostem."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr "Při kontrole projektu bylo nalezeno %d nevyužitých blokových souborů,které vznikly pravděpodobně při pádu programu nebo nějakou chybou. Tyto soubory by měly být odstraněny, aby se předešlo konfliktům."
@@ -931,15 +915,13 @@ msgstr "Varování"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Kontrola projektu zjistila že chybí %d vstupních souborů,\n"
+msgstr "Kontrola projektu zjistila že chybí %d vstupních souborů,\n"
 "na které odkazují alias soubory. Audacity nemá možnost\n"
 "je automaticky opravit. Můžete zvolit, jestli se mají nahradit\n"
 "tichem trvale, nebo jen dočasně, nebo nyní zavřít projekt\n"
@@ -962,12 +944,10 @@ msgstr "Nyní bez dalších změn zavřít projekt"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Kontrola projektu zjistila %d chybějících součtových\n"
+msgstr "Kontrola projektu zjistila %d chybějících součtových\n"
 "souborů (.auf). Audacity může tyto soubory zcela\n"
 "obnovit podle původních zvukových dat v projektu."
 
@@ -981,16 +961,14 @@ msgstr "Nahradit ztracená data tichem [jen pro toto otevření]"
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Kontrola projektu zjistila %d chybějících blokových souborů (.au)\n"
+msgstr "Kontrola projektu zjistila %d chybějících blokových souborů (.au)\n"
 "se zvukovými daty. Ke ztrátě došlo pravděpodobně v důsledku chyby\n"
 "programu, pádu systému nebo nechtěným vymazáním. Není způsob,\n"
 " jak by Audacity mohla tyto soubory obnovit automaticky. Ztracená data\n"
@@ -1025,6 +1003,95 @@ msgstr "Nahraný zvuk se ukládá na disk..."
 msgid "Rectangular"
 msgstr "Obdélníkový"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Umístění %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Procházet..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Kde je %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Frekvenční analýza"
@@ -1053,8 +1120,9 @@ msgstr "Vylepšená autokorelace"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algoritmus:"
 
 #: FreqWindow.cpp:168
@@ -1070,9 +1138,9 @@ msgstr "Velikost"
 msgid " window"
 msgstr " okno"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Funkce:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1082,9 +1150,9 @@ msgstr "Lineární frekvence"
 msgid "Log frequency"
 msgstr "Log frekvence"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Osa:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1093,6 +1161,10 @@ msgstr "Osa:"
 msgid "&Export..."
 msgstr "&Exportovat..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr ""
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1281,8 +1353,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr "<p>Aby bylo možno vypálit výsledky vaší práce na CD pro samostatné CD přehrávače, musíte nejprve provést [[export|export]] do formátu WAV nebo AIFF. Vyexportovaný soubor by měl být stereo, 44100 Hz (nastavuje se v roletce \"Vzorkování\" vlevo dole) a 16 bit (nastavuje se pomocí tlačítka \"Nastavení\" v exportním dialogu. V Audacity jsou tyto hodnoty přednastavené a obvykle je nebude třeba měnit. <p>Ve vypalovacím programu (např. iTunes nebo Windows Media Player) vypalujte jako \"audio CD\" - nikoliv \"data CD\" nebo \"MP3 CD\". Další informace najdete on-line v návodu [[wiki:How_to_burn_CDs|Jak vypalovat CD]]."
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Zdá se, že soubory s nápovědou k Audacity nejsou na vašem počítači. Můžete buď <a href=\"http://audacity.sourceforge.net/help/documentation\">stáhnout</a> nápovědu a potom se k ní dostat z menu <i>Nápověda</i>, <i>Obsah</i>, nebo klikněte <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">sem</a> a můžete si přečíst celý manuál on-line."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1386,8 +1458,7 @@ msgid "New..."
 msgstr "Nový..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
@@ -1454,11 +1525,9 @@ msgstr "Zvolte jazyk pro Audacity:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Zkonvertován soubor projektu z Audacity 1.0 do nového formátu.\n"
+msgstr "Zkonvertován soubor projektu z Audacity 1.0 do nového formátu.\n"
 "Starý soubor byl uložen jako '%s'."
 
 #: Legacy.cpp:357
@@ -1490,6 +1559,10 @@ msgstr "&Uložit projekt\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Uložit projekt &jako..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Z&kontrolovat závislosti..."
@@ -1498,6 +1571,10 @@ msgstr "Z&kontrolovat závislosti..."
 msgid "Open Me&tadata Editor..."
 msgstr "Otevřít editor me&tadat..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Import"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Zvuková data...\tCtrl+Shift+I"
@@ -1527,6 +1604,10 @@ msgstr "Exportovat &popisky..."
 msgid "Export &Multiple..."
 msgstr "&Vícenásobný export..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "Sada příkazů Čištění mluveného slova - Clean Speech..."
@@ -1607,9 +1688,9 @@ msgstr "&Smazat\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "R&ozdělit a vymazat\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&Nahradit tichem\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1623,23 +1704,21 @@ msgstr "Rozdělit a &nový\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "Spo&jit\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Rozpo&jit\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Duplikov&at\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&Stereo na mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Obla&sti s popiskami..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1682,13 +1761,13 @@ msgid "&Join\tAlt+J"
 msgstr "Spo&jit\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Rozp&ojit\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "Vybra&t..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1718,9 +1797,9 @@ msgstr "Kurzor na &konec stopy\tShift+K"
 msgid "Find &Zero Crossings\tZ"
 msgstr "Najít průsečíky s &nulou\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Přesuno&ut kurzor..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1746,9 +1825,9 @@ msgstr "&Uložit výběr"
 msgid "Regio&n Restore"
 msgstr "Obnovit výbě&r"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Oblast přeh&rávání..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1774,9 +1853,14 @@ msgstr "Přilínat k mřížce"
 msgid "Turn Grid Snap Off"
 msgstr "Nepřilínat k mřížce"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "N&astavení programu...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1822,9 +1906,9 @@ msgstr "&Ukázat clipping"
 msgid "&History..."
 msgstr "&Historie"
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "Panely nás&trojů..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1866,13 +1950,71 @@ msgstr "&Obnovit panely"
 msgid "!Simplified View"
 msgstr "!Zjednodušený pohled"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Přeskočit na začátek\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Přeskočit na konec\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "S&topy"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Přidat &novou..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1887,10 +2029,6 @@ msgstr "&Stereo stopa"
 msgid "&Time Track"
 msgstr "Časová s&topa"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "Ča&sované nahrávání..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "S&míchat a vykreslit"
@@ -1947,13 +2085,21 @@ msgstr "Zarovnat konec na &konec výběru"
 msgid "Align Tracks To&gether"
 msgstr "Zarovnat stopy na&vzájem "
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "Zarovn&at stopy..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Zarovnat a přesunout kurzor..."
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1963,22 +2109,26 @@ msgstr "V&ložit popisku k výběru\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Vložit popisku na pozici &přehrávání\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "Setřídit stopy p&odle..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "Počáteční ča&s"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Název"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "&Generovat"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "Efe&kty"
@@ -2012,6 +2162,10 @@ msgstr "&Zobrazit uvítací zprávu..."
 msgid "&Index..."
 msgstr "&Obsah..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Nástroje pro snímkování obrazovky..."
@@ -2024,12 +2178,12 @@ msgstr "Spustit &rychlostní test (benchmark)..."
 msgid "&Audio Device Info..."
 msgstr "&Informace o zvukovém zařízení..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: Menus.cpp:774
@@ -2064,9 +2218,9 @@ msgstr "Další nástroj\tD"
 msgid "Previous Tool\tA"
 msgstr "Předchozí nástroj\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Přehrát/Zastavit\tMezerník"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2100,22 +2254,14 @@ msgstr "Přehrát do výběru\tB"
 msgid "Play Looped\tL"
 msgstr "Přehrát ve smyčce\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Hrát ve smyčce\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Přeskočit na začátek\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Přeskočit na konec\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "Rozšíření výběru na začátek\tShift+Home"
@@ -2172,9 +2318,9 @@ msgstr "Přepnout vybranou stopu\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Přepnout vybranou stopu\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Přepnout vybranou stopu\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2272,15 +2418,19 @@ msgstr "Zapnout přilínání"
 msgid "Snap To Off"
 msgstr "Vypnout přilínání"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Otevřít nedávné"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Poslední &soubory..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2337,6 +2487,23 @@ msgstr "Opakovat %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Žádné popisové stopy k exportu."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "Žádná akce k obnovení"
@@ -2380,6 +2547,10 @@ msgstr "Text vložený ze schránky"
 msgid "Pasted from the clipboard"
 msgstr "Vloženo ze schránky"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Není možné kopírovat stereo zvuk do monofonní stopy."
@@ -2549,9 +2720,9 @@ msgstr "Importovat popisy (Labels)..."
 msgid "Select a MIDI file..."
 msgstr "Vyberte MIDI soubor..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "VÅ¡echny soubory (*.*)|*.*|MIDI soubory (*.mid)|*.mid|Allegro soubory (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2570,14 +2741,6 @@ msgstr "Zvolte nějaký nekomprimovaný audio soubor..."
 msgid "All files (*)|*"
 msgstr "VÅ¡echny soubory (*)|*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Import"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Upravit tagy metadat"
@@ -2651,6 +2814,14 @@ msgstr "Zarovnáno"
 msgid "Align"
 msgstr "Zarovnat"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "Nová zvuková stopa vytvořena"
@@ -2717,15 +2888,15 @@ msgid "Removed audio track(s)"
 msgstr "Odstraněné audio stopy"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nová vzorkovací frekvence (Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Převzorkovat"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Nová vzorkovací frekvence (Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "Zadaná hodnota není správná"
@@ -2793,8 +2964,7 @@ msgid "Save changes before closing?"
 msgstr "Uložit změny před uzavřením?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
@@ -2821,8 +2991,7 @@ msgstr "Projekty Audacity|*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
@@ -2847,11 +3016,9 @@ msgstr "Chyba při načítání souboru."
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Soubor může být nesprávný nebo poškozený: \n"
+msgstr "Soubor může být nesprávný nebo poškozený: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -2890,12 +3057,10 @@ msgstr "Nemohu najít složku s daty projektu: \"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Soubor byl uložen Audacity %s.\n"
+msgstr "Soubor byl uložen Audacity %s.\n"
 "Vy používáte %s - jestliže tento soubor chcete\n"
 "otevřít, musíte přejít na novější verzi programu."
 
@@ -2905,21 +3070,32 @@ msgstr "Není možné otevřít soubor projektu"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
 msgstr ""
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Nelze uložit projekt. Je možné, že do %s nelze zapisovat,\n"
-"nebo je plný disk."
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2931,24 +3107,19 @@ msgstr "Chyba při ukládání projektu"
 msgid "Saved %s"
 msgstr "Uloženo %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Neformátovaná data"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Importuje se %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importováno '%s'"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Import"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -2962,19 +3133,23 @@ msgstr "Uložit mluvené slovo jako:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Soubor Windows PCM Audio (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Soubory projektů Audacity (.aup) Vám umožňují uložit vše s čím pracujete přesně tak\n"
-"jak to vypadá na obrazovce, ale většina ostatních programů je neumí přečíst.\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Pokud chcete uložit soubor, který bude čitelný i ostatními programy, zvolte jeden\n"
-"z exportních příkazů."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3019,6 +3194,16 @@ msgstr "Místo na disku dostačuje pro %d sekund nahrávání."
 msgid "Out of disk space"
 msgstr "Nedostatek místa na disku"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "Nelze odstranit záložní soubor: "
@@ -3105,49 +3290,13 @@ msgstr "Vy&zkoušet"
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Časované nahrávání Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Začátek nahrávání"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Konec nahrávání"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Délka"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity inteligentní nahrávání - postup"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Datum a čas začátku"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Datum a čas konce"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Čeká se na začátek nahrávání %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity inteligentní nahrávání - čeká se na začátek"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3188,10 +3337,9 @@ msgstr "Žánr"
 msgid "Comments"
 msgstr "Komentáře"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Obsah buňky editujte stisknutím F2 nebo dvojklikem."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3211,15 +3359,12 @@ msgstr "&Vymazat"
 msgid "Genres"
 msgstr "Žánry"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Úpravy"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:834
@@ -3290,6 +3435,16 @@ msgstr "Opravdu chcete vrátit seznam žánrů do výchozího stavu?"
 msgid "Unable to open genre file."
 msgstr "Není možné otevřít žánrový soubor."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "Chyba při načítání metadat"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3299,206 +3454,139 @@ msgstr "Není možné otevřít žánrový soubor."
 msgid "Save Metadata As:"
 msgstr "Uložit metadata jako:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "Chyba při načítání metadat"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Titul:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Interpret:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Skladatel:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Text:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Komentáře:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Enkódováno:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Autorská práva:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Číslo stopy:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Rok:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Žánr:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Žádné žánry"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Vrátit výchozí nastavení"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Základní"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Rozšířené"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Hodnota"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "&Vymazat"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maximální délka atributu '%s' je %d znaky. Data byla zkrácena."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Titul:"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Interpret:"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album:"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity nemůže zapsat soubor:\n"
+msgstr "Audacity nemůže zapsat soubor:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity nemůže otevřít soubor:\n"
+msgstr "Audacity nemůže otevřít soubor:\n"
 "  %s\n"
 "pro čtení."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity nemůže zapsat obrázky do souboru:\n"
+msgstr "Audacity nemůže zapsat obrázky do souboru:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity nemůže najít soubor:\n"
+msgstr "Audacity nemůže najít soubor:\n"
 "  %s.\n"
 "Téma se nenačetlo."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity nemůže načíst soubor:\n"
+msgstr "Audacity nemůže načíst soubor:\n"
 "  %s.\n"
 "Pravděpodobně špatný png formát?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity nemůže přečíst vlastní výchozí téma.\n"
+msgstr "Audacity nemůže přečíst vlastní výchozí téma.\n"
 "Nahlaste prosím tuto chybu."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Žádná z očekávaných komponent vzhledu\n"
+msgstr "Žádná z očekávaných komponent vzhledu\n"
 "nebyla nalezena:\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Není možné vytvořit adresář:\n"
+msgstr "Není možné vytvořit adresář:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity nemůže uložit soubor:\n"
+msgstr "Audacity nemůže uložit soubor:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Všechny potřebné soubory v:\n"
+msgstr "Všechny potřebné soubory v:\n"
 "  %s\n"
 "už existují."
 
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Délka"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Časované nahrávání Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Začátek nahrávání"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Konec nahrávání"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Datum a čas začátku"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Datum a čas konce"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Čeká se na začátek nahrávání %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
 msgid "Track Panel"
@@ -3794,6 +3882,14 @@ msgstr "Upravené panorama"
 msgid "Adjusted gain"
 msgstr "Upravená citlivost"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "Stopu s aktivním zvukem nelze smazat"
@@ -3851,14 +3947,6 @@ msgstr "Změna rychlosti"
 msgid "Format Change"
 msgstr "Změna formátu"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Vložte rychlost v Hz (vzorků za vteřinu) v rozmezí 1 a 100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Chybná rychlost."
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "Změnit dolní limit rychlosti  (%) na:"
@@ -3997,24 +4085,21 @@ msgstr "Moduly 1 - %i"
 msgid "Plugins %i to %i"
 msgstr "Moduly %i - %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Z nějakého důvodu nepřístupné. Pokuste se nedříve vybrat nějaká zvuková data?"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Toto můžete provést jedině pokud je přehrávání\n"
+msgstr "Toto můžete provést jedině pokud je přehrávání\n"
 "nebo nahrávání zastaveno. [Pozastavit (pauza) nestačí]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"K tomuto musíte nejdřív vybrat nějaký stereo\n"
+msgstr "K tomuto musíte nejdřív vybrat nějaký stereo\n"
 "zvuk. [Na mono se nedá použít.]"
 
 #: commands/CommandManager.cpp:785
@@ -4022,14 +4107,13 @@ msgid "You must first select some audio for this to use."
 msgstr "Před použitím musíte vybrat zvuková data."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Zpráva"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4049,14 +4133,19 @@ msgstr "Použitý efekt: %s %.1f dB"
 msgid "Amplify"
 msgstr "Zesílit"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Zesílení od Dominica Mazzoniho"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Zesílení (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Nová špičková amplituda (dB):"
@@ -4185,10 +4274,18 @@ msgstr "napsal Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Frekvence (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Zdůraznění (boost) (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Zdůraznění basů..."
@@ -4232,8 +4329,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "pomocí SoundTouch od Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Výška: od"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Půltóny:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4243,13 +4381,9 @@ msgstr "Výška: od"
 msgid "to"
 msgstr "na"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Půltóny:"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frekvence (Hz): z"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4257,6 +4391,11 @@ msgstr "Frekvence (Hz): z"
 msgid "Percent Change:"
 msgstr "Procento změny:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Změnit výšku..."
@@ -4275,6 +4414,14 @@ msgstr "Použitý efekt: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Změnit rychlost"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "nemá význam"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Změna rychlosti ovlivní jak rychlost, tak výšku"
@@ -4283,17 +4430,17 @@ msgstr "Změna rychlosti ovlivní jak rychlost, tak výšku"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "pomocí SampleRate od Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "nemá význam"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standardní otáčky vinylové desky:  z"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4311,13 +4458,29 @@ msgstr "Změnit tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Změnit tempo bez změny ladění"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Úderů za minutu (BPM):     Od"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Délka (sekundy):     od"
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4327,8 +4490,9 @@ msgstr "Změnit tempo..."
 msgid "Changing Tempo"
 msgstr "Mění se tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Odstranění praskání"
 
 #: effects/ClickRemoval.cpp:336
@@ -4339,10 +4503,18 @@ msgstr "Odstranění šumu a praskání od Craiga DeForesta"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Nastavit práh (nižší je citlivější)"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Maximální šířka špičky (vyšší je citlivější):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Odstranění praskání..."
@@ -4355,49 +4527,86 @@ msgstr "Odstraňuje se praskot a šum..."
 msgid "Dynamic Range Compressor"
 msgstr "Kompresor dynamického rozsahu"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Kompresor dynamického rozsahu od Dominica Mazzoniho"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Poměr:"
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Délka náběhu:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Čas doběhu:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Po kompresi normalizovat na 0 dB"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Práh: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Poměr: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Poměr: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Čas náběhu: %.1f sek."
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Čas doběhu: %.1f sek."
 
 #: effects/Compressor.h:36
@@ -4408,6 +4617,251 @@ msgstr "Kompresor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Aplikuji kompresi dynamického rozsahu..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Začátek"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Konec"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Ovládání"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "DTMF Tónový generátor"
@@ -4664,6 +5118,10 @@ msgstr "Invertovat"
 msgid "Inverting"
 msgstr "Invertuji"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Úrovně (Leveller)"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Nic-přeskočit"
@@ -4688,29 +5146,26 @@ msgstr "Těžší"
 msgid "Heaviest"
 msgstr "Nejtěžší"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Úrovně (Leveller)"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Úrovně (Leveller) od Lynna Allana"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Vyrovnat tiché a hlasité části"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "od Lynna Allana"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Stupeň vyrovnání"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Práh šumu (sykot/hukot/šum prostředí)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Práh šumu:"
 
 #: effects/Leveller.h:28
@@ -4721,6 +5176,158 @@ msgstr "Úrovně..."
 msgid "Applying Leveller..."
 msgstr "Upravují se úrovně (Leveller)..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mixér"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Fázor (Phaser)"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Odstranění šumu"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Bílý"
@@ -4756,31 +5363,23 @@ msgstr "Generuje se Å¡um"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Nelze otevřít soubor: \n"
+msgstr "Nelze otevřít soubor: \n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Pokus o odstranění šumu bez profilu šumu.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Odstranění šumu"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "Krok 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Vyberte několik sekund samotného šumu, aby Audacity věděla\n"
+msgstr "Vyberte několik sekund samotného šumu, aby Audacity věděla\n"
 "co se má filtrovat. Potom klikněte na Získat profil šumu."
 
 #: effects/NoiseRemoval.cpp:815
@@ -4788,11 +5387,9 @@ msgid "Step 2"
 msgstr "Krok 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Označte všechno co chcete filtrovat,\n"
+msgstr "Označte všechno co chcete filtrovat,\n"
 "zvolte míru filtrování šumu a klikněte na 'OK'.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4807,14 +5404,26 @@ msgstr "Získat profil šumu"
 msgid "Noise reduction (dB):"
 msgstr "Redukce Å¡umu (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Vyhlazení frekvence (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Čas náběhu/dozvuku (sek.):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Odstranění šumu..."
@@ -4855,22 +5464,22 @@ msgstr ", maximální amplituda = %.1f dB"
 msgid "Normalize"
 msgstr "Normalizovat"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalizace od Dominica Mazzoniho"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Odstranit jakýkoliv DC posun (vycentrovat na 0 vertikálně)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Normalizovat maximální amplitudu na"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Normalizovat..."
@@ -4884,44 +5493,56 @@ msgstr "Normalizuje se..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Použitý efekt: %s %d kroků, %.0f%% wet, frekvence = %.1f Hz, startovní fáze = %.0f deg, hloubka = %d, zp. vazba = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Fázor (Phaser)"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Fázor od Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Kroků:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO frekvence (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO Startovní fáze (deg.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Hloubka:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Zpětná vazba (feedback) (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Fázor (Phaser)..."
@@ -4931,15 +5552,21 @@ msgid "Applying Phaser"
 msgstr "Aplikuji Fázor (Phaser)"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Tento opravný efekt je určen k použití na velmi krátkých úsecích poškozeného záznamu (do 128 vzorků).\n"
+msgstr "Tento opravný efekt je určen k použití na velmi krátkých úsecích poškozeného záznamu (do 128 vzorků).\n"
 "\n"
 "Nastavte si velké zvětšení a zvolte malou část k opravě."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Opravují se poškozená zvuková data"
@@ -4958,30 +5585,25 @@ msgstr "Stopy jsou příliš dlouhé pro opakování výběru."
 msgid "Repeat"
 msgstr "Opakovat"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Opakování od Dominica Mazzoniho && Vaughana Johnsona"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Počet opakování:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Nová délka výběru:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minut, %d sekund"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr ""
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5029,8 +5651,7 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Odstranění špiček od Lynna Allana"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
 msgstr ""
 
@@ -5046,10 +5667,60 @@ msgstr "Odstranění špiček..."
 msgid "Applying Spike Cleaner..."
 msgstr "Aplikuje se odstranění špiček..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Stereo na mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Převádí se Stereo na Mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5097,17 +5768,21 @@ msgstr "Frekvence (Hz)"
 msgid "Waveform:"
 msgstr "Křivka:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Začátek"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Konec"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5138,10 +5813,6 @@ msgstr "Všechny stopy musí mít stejnou vzorkovací frekvenci"
 msgid "Truncate Silence"
 msgstr "Ořezat ticho"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "od Lynna Allana"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Maximální délka ticha:"
@@ -5189,10 +5860,6 @@ msgstr "Použitý efekt: %s frekvence = %.1f Hz, startovní fáze = %.0f deg, hl
 msgid "Wahwah"
 msgstr "Kvákadlo (Wahwah)"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Kvákadlo (Wahwah) od Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Hloubka (%):"
@@ -5201,10 +5868,18 @@ msgstr "Hloubka (%):"
 msgid "Resonance:"
 msgstr "Rezonance:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Offset kvákací (wah) frekvence (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Kvákadlo (Wahwah)..."
@@ -5243,6 +5918,18 @@ msgstr "Nastavení efektu"
 msgid "Length (seconds)"
 msgstr "Délka (sekundy)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Aplikuji Nyquist efekt..."
@@ -5310,13 +5997,13 @@ msgstr "Nastavení zásuvného modulu"
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Nejsou vybrány žádné stopy! Všechny stopy vyexportujte\n"
-"použitím Ctrl-A (vybrat vše) a dále příkazem Exportovat... ."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5332,14 +6019,12 @@ msgstr "Opravdu chcete soubor uložit jako \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Chystáte se uložit souboa %s pod jménem \"%s\".\n"
+msgstr "Chystáte se uložit souboa %s pod jménem \"%s\".\n"
 "\n"
 "Obvykle názvy těchto souborů končí na \".%s\" a některé programy neumí otevřít soubory s nestandardními příponami.\n"
 "\n"
@@ -5375,6 +6060,10 @@ msgstr " - Levý"
 msgid " - Right"
 msgstr " - Pravý"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5412,10 +6101,6 @@ msgstr "(externí program)"
 msgid "Cannot export audio to %s"
 msgstr "Audio nelze exportovat do %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr ""
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Exportuji zvolené audio pomocí command-line enkóderu"
@@ -5428,6 +6113,477 @@ msgstr "Exportuji celý projekt pomocí command-line enkóderu"
 msgid "Command Output"
 msgstr "Výstup příkazu"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Nesprávná vzorkovací rychlost"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Rychlosti vzorkování"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Datový tok (Bit Rate):"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Formát:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Jazyk:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kvalita:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML soubory (*.xml)|*.xml|VÅ¡echny soubory (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Upřesnit nastavení FLAC"
@@ -5508,10 +6664,6 @@ msgstr "Upřesnit nastavení MP2"
 msgid "MP2 Export Setup"
 msgstr "Nastavení exportu do MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Datový tok (Bit Rate):"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Soubory MP2"
@@ -5632,35 +6784,15 @@ msgstr "Najít Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "K ukládání formátu MP3 Audacity potřebuje soubor %s ."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Umístění %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Procházet..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Volně dostupnou kopii Lame získáte kliknutím sem  -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Stáhnout..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Kde je %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5725,36 +6857,22 @@ msgstr "Exportuje se celý soubor se vzorkováním %d kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Nesprávná vzorkovací rychlost"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr ""
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Rychlosti vzorkování"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Plugin pro export do MP3 nebyl nalezen"
-
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
 #: export/ExportMultiple.cpp:598
@@ -5763,13 +6881,11 @@ msgid "Export Multiple"
 msgstr "Vícenásobný export"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Jestliže máte více než jednu zvukovou stopu, můžete exportovat každou do zvláštního souboru.\n"
+msgstr "Jestliže máte více než jednu zvukovou stopu, můžete exportovat každou do zvláštního souboru.\n"
 "Pokud existuje popisová stopa, můžete vyexportovat nový soubor pro každou popsanou oblast.\n"
 "\n"
 "Tento projekt neobsahuje více stop ani popisovou stopu, takže vícenásobný export nelze použít."
@@ -5815,6 +6931,10 @@ msgstr "Včetně zvukových dat před první popiskou"
 msgid "First file name:"
 msgstr "První jméno souboru:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Stopy"
@@ -5835,14 +6955,14 @@ msgstr "Postupné číslování"
 msgid "File name prefix:"
 msgstr "Předpona jména souboru:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Přepsat existující soubory"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&xport"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5854,12 +6974,10 @@ msgstr "Zvolte umístění pro exportované soubory"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" neexistuje.\n"
+msgstr "\"%s\" neexistuje.\n"
 "\n"
 "Chcete ho vytvořit?"
 
@@ -5882,8 +7000,7 @@ msgstr "Po exportu %d souborů došlo k chybám."
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
 msgstr ""
 
@@ -5895,10 +7012,6 @@ msgstr "Upřesnit nastavení Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Nastavení exportu do Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Kvalita:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Soubory Ogg Vorgis"
@@ -5919,10 +7032,6 @@ msgstr "Upřesnit nastavení nekomprimovaného formátu"
 msgid "Uncompressed Export Setup"
 msgstr "Nastavení nekomprimovaného exportu"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Formát:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Hlavička:"
@@ -5935,10 +7044,21 @@ msgstr "Kódování:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Ne všechny kombinace hlaviček a kódování jsou možné.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, a další nekomprimované typy"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -5960,116 +7080,131 @@ msgstr "Celý projekt se exportuje jako %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Chyba (soubor možná nebyl zapsán): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "Soubory MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Tato verze Audacity nebyla kompilována s podporou %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvuková stopa CD. \n"
+msgstr "\"%s\" je zvuková stopa CD. \n"
 "Audacity tyto stopy nedokáže  přímo otevřít. \n"
 "Převeďte (rippněte) CD stopy do některého z formátů,  \n"
 "které Audacity umí importovat. Např. WAV nebo AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\"  je seznam souborů k přehrávání (playlist).\n"
+msgstr "\"%s\"  je seznam souborů k přehrávání (playlist).\n"
 "Audacity tento soubor nemůže otevřít protože obsahuje jen odkazy na jiné soubory.\n"
 "Dá se ale otevřít v textovém editoru a jednotlivé soubory stáhnout."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvukový soubor Windows Media. \n"
+msgstr "\"%s\" je zvukový soubor Windows Media. \n"
 "Audacity tento typ souboru nemůže otevřít vinou patentových omezení.\n"
 "Je třeba provést konverzi do některého z podporovaných formátů, např. WAV nebo AIFF."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je soubor Advanced Audio Coding. \n"
+msgstr "\"%s\" je soubor Advanced Audio Coding. \n"
 "Audacity tento typ souboru neumí otevřít.\n"
 "Bude třeba provést převod na některý podporovaný formát, např. WAV nebo AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zakódovaný zvukový soubor, pravděpodobně z on-line obchodu s hudbou. \n"
+msgstr "\"%s\" je zakódovaný zvukový soubor, pravděpodobně z on-line obchodu s hudbou. \n"
 "Kvůli zakódování Audacity nedokáže tento soubor otevřít.\n"
 "Zkuste jej do Audacity nahrát nebo vypálit na CD a následně \n"
 "převést do některého podporovaného formátu, jako je WAV nebo AIFF."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je soubor pro RealPlayer. \n"
+msgstr "\"%s\" je soubor pro RealPlayer. \n"
 "Audacity tento proprietární formát neumí otevřít.\n"
 "Je třeba provést konverzi do některého z podporovaných formátů, např. WAV nebo AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\"  je MIDI soubor, který neobsahuje zvuková data. \n"
-"Audacity  tento typ souboru nedokáže otevřít pro přehrávání nebo editaci, \n"
-"ale můžete jej alespoň zobrazit, když kliknete na Soubor > Importovat > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" je soubor obsahující noty, nikoliv zvuková data. \n"
+msgstr "\"%s\" je soubor obsahující noty, nikoliv zvuková data. \n"
 "Audacity tento typ souboru neumí otevřít. \n"
 "Zkuste jej převést do zvukového formátu např. jako WAV nebo AIFF \n"
 "a potom importovat nebo nahrát do Audacity."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvukový soubor Musepack. \n"
+msgstr "\"%s\" je zvukový soubor Musepack. \n"
 "Audacity tento typ souboru neumí otevřít. \n"
 "Pokud máte za to, že se jedná o mp3 soubor, změňte jeho příponu na \".mp3\" \n"
 "a pokuste se jej importovat znovu. V případě neúspěchu musíte provést převod \n"
@@ -6077,54 +7212,58 @@ msgstr ""
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvukový soubor Wavpack. \n"
+msgstr "\"%s\" je zvukový soubor Wavpack. \n"
 "Audacity tento typ souboru neumí otevřít.\n"
 "Je třeba provést konverzi na podporovaný zvukový formát, např. WAV nebo AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvukový soubor Dolby Digital. \n"
+msgstr "\"%s\" je zvukový soubor Dolby Digital. \n"
 "Audacity tento typ souboru v současné době neumí otevřít.\n"
 "Je třeba provést konverzi na podporovaný zvukový formát, např. WAV nebo AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvukový soubor Ogg Speex. \n"
+msgstr "\"%s\" je zvukový soubor Ogg Speex. \n"
 "Audacity tento typ souboru v současné době neumí otevřít.\n"
 "Je třeba provést konverzi na podporovaný zvukový formát, např. WAV nebo AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity nerozpoznala typ souboru.\n"
-"Pokud se nejedná o komprimovaný soubor,\n"
-"zkuste ho importovat s použitím \"Importovat Raw\"."
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6163,17 +7302,18 @@ msgstr "MIDI stopy nemohou být posunuty zvlášť, to lze udělat jen u zvukov
 msgid "Invalid track offset in LOF file."
 msgstr "Chybná pozice stopy v LOF souboru."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Chyba při načítání (parsování) Allegro souboru."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Chyba při načítání (parsování) MIDI souboru."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Soubory MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6199,15 +7339,24 @@ msgstr "Chybná Vorbis bitstream hlavička"
 msgid "Internal logic fault"
 msgstr "Vnitřní logická chyba"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, a další nekomprimované typy"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importuje se %s soubor..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Soubory QuickTime"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Importovat Raw data"
@@ -6255,6 +7404,14 @@ msgstr "2 kanály (Stereo)"
 msgid "%d Channels"
 msgstr "%d kanálů"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Počáteční posuv:"
@@ -6267,9 +7424,18 @@ msgstr "Rozsah k načtení:"
 msgid "Sample rate:"
 msgstr "Rychlost vzorkování:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6314,9 +7480,9 @@ msgstr "Kanály"
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Během nahrávání nové sto&py přehrávat ostatní"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6326,9 +7492,13 @@ msgstr "&Hardware Playthrough: Během nahrávání novou stopu zároveň přehr
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "&Software Playthrough: Během nahrávání novou stopu zároveň přehrávat"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "&Software Playthrough: Během nahrávání novou stopu zároveň přehrávat (odškrtněte, pokud nahráváte \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6355,16 +7525,13 @@ msgid "Latency"
 msgstr "Latence"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Vyrovnávací paměť:\n"
+msgstr "Vyrovnávací paměť:\n"
 "(vyšší = větší latence)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
 msgstr "Úprava latence:(záporná = nazpět)"
 
@@ -6439,8 +7606,8 @@ msgid "Audio cache"
 msgstr "Zvuková vyrovnávací paměť"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Ponechat data v paměti dokud není nahrávání zastaveno."
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6481,9 +7648,9 @@ msgstr "Verze MP3 knihovny:"
 msgid "MP3 Library:"
 msgstr "MP3 knihovna:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Najít knihovnu"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6493,8 +7660,20 @@ msgstr "Knihovna LAME MP3:"
 msgid "&Download"
 msgstr "&Stáhnout"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
 msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:100
@@ -6567,7 +7746,8 @@ msgid "&Update display while playing"
 msgstr "&Během přehrávání obnovovat zobrazení"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Zavření posledního okna ukončí Audacity"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6575,15 +7755,15 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "&Povolit přetahování levé a pravé hranice výběru"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&Ergonomické uspořádání tlačítek zvukového vstupu a výstupu"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Automaticky při&způsobovat stopy svislému zvětšení"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:106
@@ -6611,17 +7791,22 @@ msgid "Show warnings about &temp files"
 msgstr "Zobrazova&t varování týkající se dočasných souborů"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "Nabídnout uložení i když je projekt &prázdný"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Při startu programu zobrazit uvítací zprávu"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Režimy"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
@@ -6654,34 +7839,10 @@ msgstr "-145 dB (PCM rozsah 24 bitových vzorků)"
 msgid "Default View Mode"
 msgstr "Výchozí režim zobrazení"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "Zobrazení křivky"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "Zobrazení DB křivky"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "Zobrazení spektra"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "Zobrazení logu spektra"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr ""
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Další volby rozhraní"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Jazyk:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Nápověda:"
@@ -6695,6 +7856,14 @@ msgstr "Tlačítko Solo:"
 msgid "Keyboard"
 msgstr "Klávesnice"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Mapování kláves"
@@ -6728,22 +7897,16 @@ msgstr "Chyba při ukládání klávesových zkratek"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Zvolte XML soubor obsahující klávesové zkratky pro Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML soubory (*.xml)|*.xml|VÅ¡echny soubory (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Chyba při načítání klávesových zkratek"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Klávesová zkratka '%s' už je použita pro:\n"
+msgstr "Klávesová zkratka '%s' už je použita pro:\n"
 "\n"
 "'%s'"
 
@@ -6752,6 +7915,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Zpět"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Během nahrávání nové sto&py přehrávat ostatní"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7057,14 +8256,13 @@ msgstr "Vysoká kvalita:"
 msgid "Smart Recording"
 msgstr "Inteligentní nahrávání"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Přerušit na hrávání pokud je ticho"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Úroveň ticha (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7200,8 +8398,7 @@ msgid "Info"
 msgstr "Info"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7217,32 +8414,25 @@ msgid ""
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Ovládání"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Pozastavit (Pause)"
@@ -7251,9 +8441,9 @@ msgstr "Pozastavit (Pause)"
 msgid "Play"
 msgstr "Přehrát"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Přehrát (shift pro přehrání ve smyčce)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7267,6 +8457,10 @@ msgstr "Přeskočit na začátek"
 msgid "Skip to End"
 msgstr "Přeskočit na konec"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "Čištění mluveného slova - Clean Speech"
@@ -7303,6 +8497,10 @@ msgid "Silence selection"
 msgstr "Nahradit výběr tichem"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Zvětšit"
 
@@ -7358,16 +8556,12 @@ msgstr "Ukazatel úrovně výstupu"
 msgid "Input level meter - click to monitor input"
 msgstr "Ukazatel úrovně vstupu - klikněte, pokud chcete monitorovat vstup."
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mixér"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Výstupní hlasitost"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+msgid "Slider Output"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7375,7 +8569,7 @@ msgid "Input Volume"
 msgstr "Vstupní hlasitost"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7737,14 +8931,16 @@ msgstr "Vertikální Stereo"
 msgid "Preferences..."
 msgstr "Nastavení..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Zde se nastavuje jak často se ukazatel obnovuje. Jestliže\n"
+msgstr "Zde se nastavuje jak často se ukazatel obnovuje. Jestliže\n"
 "máte pomalejší počítač, možná bude lepší zvolit nižší\n"
 " obnovovací frekvenci (30 za sekundu nebo méně), aby\n"
 "kvalita zvuku nebyla ovlivňována zobrazováním ukazatele."
@@ -7761,6 +8957,22 @@ msgstr "Předvolby grafického ukazatele"
 msgid " Please select an action "
 msgstr "Zvolte prosím akci"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7773,12 +8985,6 @@ msgstr "Svislé měřítko"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 sekund"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr ""
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7804,6 +9010,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dnů 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -7989,8 +9210,8 @@ msgstr "Nelze otevřít soubor: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Chyba: %s na řádce %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/cy.po b/locale/cy.po
index ca58cdc..0ef3f27 100644
--- a/locale/cy.po
+++ b/locale/cy.po
@@ -19,36 +19,24 @@ msgstr "Project-Id-Version: Audacity 1.24b\n"
 msgid "&About Audacity..."
 msgstr "&Ynglyn â Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Galluogwyd"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Dyddiad Adeiladu'r Rhaglen"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Mae Audacity yn raglen rhad ac am ddim wedi ei ysgrifennu gan dîm o ddatblygwyr o bedwar ban byd.  Mae'r cyd-drefnu â chymorth SourceForge.net, gwasanaeth ar-lein sydd yn darparu offer yn rhad ac am ddim i brosiectau meddalwedd cod agored. Mae Audacity ar gael ar gyfer Windows 98 a fersiynau diweddarach, Mac OS X a Linux a systemau gweithredu tebyg i Unix. Mae fersiynau hŷn o Audacity ar gael ar gyfer Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Mae hwn yn fersiwn beta o'r rhaglen. Mi ellith gynnwys gwallau a anorffenedig. Rydym yn dibynnu ar eich adwaith, felly ymwelwch a'n gewfan os gwelwch yn dda a rhowch i ni eich adroddiadau namau a'ch ceisiau nodweddion."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Mae hwn yn fersiwn sefydlog, gorffenadwy o Audacity. Serch hynny, os ddarganfyddwch gwallau neu os oes gennych awgrymiad, cysllystwch â ni, os gwelwch yn dda. Rydym yn dibynnu ar adwaith defnyddwyr er mwyn parhau i wella Audacity. Am fwy o fanylion, ymwelwch â'n gwefan."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: ../src/AboutDialog.cpp:127
@@ -56,13 +44,9 @@ msgstr "Mae hwn yn fersiwn sefydlog, gorffenadwy o Audacity. Serch hynny, os dda
 msgid "translator_credits"
 msgstr "Cyfieithwyd y fersiwn Gymraeg gan f00."
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Golygydd Sain Digidol Rhad ac Am Ddim"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Gwybodaeth"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -98,28 +82,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Diolchiadau arbennig:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Galluogwyd"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Dyddiad Adeiladu'r Rhaglen"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Cau"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -327,12 +401,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -368,8 +443,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -417,6 +492,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -465,10 +544,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -683,16 +770,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Wedi ailenwi ffeil: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Newid bloc %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -821,6 +908,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Petryalog"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Ble mae %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Dadansoddiad Amledd"
@@ -847,8 +1021,8 @@ msgstr "Awto-gydberthynas Uwch"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -860,8 +1034,8 @@ msgstr "Maint"
 msgid " window"
 msgstr " ffenest"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -872,14 +1046,25 @@ msgstr "Amledd Linellol"
 msgid "Log frequency"
 msgstr "Amledd log"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Cau"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
@@ -933,7 +1118,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Oedi (eiliadau)\tAmledd (Hz)\tLefel"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -949,15 +1134,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -968,40 +1169,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1197,6 +1422,10 @@ msgstr "Ca&dw Cywaith\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Cadw Cywaith &Fel..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1205,6 +1434,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1233,10 +1466,26 @@ msgstr "Allforio &Labeli"
 msgid "Export &Multiple..."
 msgstr "Allforio Nife&r..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1298,9 +1547,9 @@ msgstr "Di&leu\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "Di&stewi\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1314,22 +1563,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1373,12 +1620,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1389,66 +1636,67 @@ msgstr "&Popeth\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "O'r Dechrau i'r Cyrchydd"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "O'r Cyrchydd i'r Diwedd"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Canfod Croesiadau Sero\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Symud Cyrchydd..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "i Ddechrau y Dewisiad"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "i Ddiwedd y Dewisiad"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "i Ddechrau y Trac"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "i Ddiwedd y Trac"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Cadw'r Dewisiad"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Ail-sefydlu'r Dewisiad"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1467,10 +1715,14 @@ msgstr "Troi Snap Grid Ymlaen"
 msgid "Turn Grid Snap Off"
 msgstr "Troi Snap Grid I Ffwrdd"
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Hoffterau...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1508,60 +1760,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Hanes..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:578
+msgid "!Simplified View"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Neidio i'r Dechrau\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Neidio i'r Diwedd\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1577,12 +1891,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Track Amser"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1597,6 +1907,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "&Dileu Traciau"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Alino â &Sero"
@@ -1613,29 +1931,40 @@ msgstr "Alinio â &Dechrau y Dewisiad"
 msgid "Align with Selection &End"
 msgstr "Alinio â Di&wedd y Dewisiad"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Alinio'r Diwedd â'r Cyrchydd"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Alinio'r Diwedd â Dechrau'r Dewisiad"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Alinio'r Diwedd â Diwedd y Dewisiad"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Alinio Traciau at ei gilydd"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "&Alinio Traciau..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1648,22 +1977,26 @@ msgstr "Ychwanegu Label ger y Dewisiad\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Ychwanegu Label ger y Safle Chwarae\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "Cy&nhyrchu"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "&Effeithio"
@@ -1698,6 +2031,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1710,12 +2047,12 @@ msgstr "&Rhedeg Meincnod..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1750,9 +2087,9 @@ msgstr "Erfyn Nesaf\tD"
 msgid "Previous Tool\tA"
 msgstr "Erfyn Blaenorol\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Chwarae/Aros\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1766,12 +2103,12 @@ msgstr "Seibio\tP"
 msgid "Record\tR"
 msgstr "Recordio\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1786,22 +2123,14 @@ msgstr "Chwarae I'r Dewisiad\tB"
 msgid "Play Looped\tL"
 msgstr "Chwarae'n Gylch\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Chwarae'n Gylch\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Neidio i'r Dechrau\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Neidio i'r Diwedd\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Dewisiad i'r Dechrau\tShift+Home"
@@ -1858,8 +2187,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1958,14 +2287,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "Ffeiliau &Diweddar..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2022,6 +2356,23 @@ msgstr "Ailadrodd %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Nid oes labeli traciau i allforio."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Dim i'w ddadwneud"
@@ -2062,6 +2413,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Gludo o'r clipfwrdd"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2230,9 +2585,9 @@ msgstr "Mewnforio Labeli"
 msgid "Select a MIDI file..."
 msgstr "Dewis ffeil MIDI..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Pob Ffeil (*.*)|*.*|Ffeiliau MIDI (*.mid)|*.mid|Ffeiliau Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2251,14 +2606,6 @@ msgstr "Dewisiwch unrhyw ffeil heb ei gywasgu..."
 msgid "All files (*)|*"
 msgstr "Pob ffeil (*)|*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Mewnforio"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2290,6 +2637,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Wedi alinio â sero"
@@ -2326,6 +2677,14 @@ msgstr "Wedi Alinio"
 msgid "Align"
 msgstr "Alinio"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Crëwyd trac sain newydd"
@@ -2389,14 +2748,14 @@ msgstr "Gwaredu Trac"
 msgid "Removed audio track(s)"
 msgstr "Gwaredwyd Trac(iau) sain"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2463,14 +2822,13 @@ msgstr "Sain a Recordwyd"
 msgid "Save changes before closing?"
 msgstr "Cadw'r newidiadau cyn cau?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2490,6 +2848,25 @@ msgstr "Dewis un neu fwy o ffeiliau sain..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2547,42 +2924,34 @@ msgstr "Cadwyd y ffeil gan defnyddio Audacity %s.\n"
 msgid "Can't open project file"
 msgstr "Methu agor ffeil cywaith"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Methwyd cadw'r cywaith.  Efallai fod dim modd ysgrifennu i %s,\n"
-"neu fod y ddisg yn llawnl."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2594,21 +2963,19 @@ msgstr "Gwall wrth gadw'r cywaith"
 msgid "Saved %s"
 msgstr "Cadwyd %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Crai"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Mewnforwyd '%s'"
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Mewnforio"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Gwall wrth fewnforio"
@@ -2621,17 +2988,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Mae ffiliau cywaith Audacity (.aup) yn eich galluogi i gadw i ddisg popeth yr ydych yn\n"
-"ei weithio arno fel y mae ar y sgrin, ond nid yw rhaglenni eraill yn gallu agor ffeiliau Audacity.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Pan mae angen cadw ffeil er mwyn ei agor â rhaglenni eraill,\n"
-"dewisiwch un o'r gorchmynion Allforio."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2674,6 +3047,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Allan o le ar y ddisg"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2757,43 +3140,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2833,8 +3185,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2853,12 +3205,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2900,100 +3252,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Hyd mwyaf y nodwedd '%s' yw %d nod. Tociwyd y data."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Teitl"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artist"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Albwm"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3058,8 +3329,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3102,6 +3416,10 @@ msgstr "Tonffurf"
 msgid "Waveform (dB)"
 msgstr "Tonffurf (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Traw (EAC)"
@@ -3235,13 +3553,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Symud-Sain"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Rydych heb nesáu digon. Rhaid nesáu nes gallu gweld y samplau unigol."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3327,6 +3645,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3384,15 +3710,6 @@ msgstr "Newid Graddfa Sampl"
 msgid "Format Change"
 msgstr "Newid Fformat"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Rhowch raddfa samplo mewn Hz (yr eiliad) rhwng 1 a 100000:"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Graddfa Annilys."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Newid y cyfyngiad cyflymder isaf (%) i:"
@@ -3527,8 +3844,8 @@ msgstr "Ategion 1 i %i"
 msgid "Plugins %i to %i"
 msgstr "Ategion %i i %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3550,8 +3867,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3572,14 +3889,19 @@ msgstr "Gweithredwyd effaith: %s %.1f dB"
 msgid "Amplify"
 msgstr "Chwyddo"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Chwyddo gan Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Chwyddiad (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Osged Frig Newydd (dB):"
@@ -3588,6 +3910,10 @@ msgstr "Osged Frig Newydd (dB):"
 msgid "Allow clipping"
 msgstr "Caniatau Clipio"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Chwyddo..."
@@ -3711,10 +4037,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Amledd (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Chwyddo (dB)"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3756,9 +4090,50 @@ msgstr "gan Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "yn defnyddio SoundTouch, gan Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Traw:   o"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Hanner tonau:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284
 #: ../src/effects/ChangePitch.cpp:330
@@ -3768,13 +4143,9 @@ msgstr "Traw:   o"
 msgid "to"
 msgstr "i"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Hanner tonau:"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Amledd (Hz):   o"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
@@ -3782,6 +4153,11 @@ msgstr "Amledd (Hz):   o"
 msgid "Percent Change:"
 msgstr "Canran Newid:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Newid Traw..."
@@ -3800,6 +4176,11 @@ msgstr "Gweithredwyd effaith: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Newid Cyflymder"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "cdda mun:eil:fframau 75 fye"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Newid Cyflymder, yn effeithio Tempo a Traw"
@@ -3808,14 +4189,17 @@ msgstr "Newid Cyflymder, yn effeithio Tempo a Traw"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "yn defnyddio SampleRate, gan Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "cdda mun:eil:fframau 75 fye"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "RPM Safonol Finyl :   o"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3833,13 +4217,29 @@ msgstr "Newid Tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Newid Tempo heb Newid Traw"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Curiadau y Munud (CYM):   o"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Hyd (eiliadau):   o"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3849,8 +4249,8 @@ msgstr "Newid Tempo..."
 msgid "Changing Tempo"
 msgstr "Yn Newid Tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3861,10 +4261,18 @@ msgstr "Tynnu Cliciau a Popiau gan Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Tynnu Cliciau..."
@@ -3877,49 +4285,84 @@ msgstr "Yn tynnu cliciau a popiau..."
 msgid "Dynamic Range Compressor"
 msgstr "Cywasgydd Amrediad Ddeinamig"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Cywasgydd Amrediad Ddeinamig gan Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Cymhareb:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Amser Ymosod:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Normaleiddio i 0dB ar ôl cywasgu"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Trothwy: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Cymhareb: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Cymhareb: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Amser Ymosod: %.1f eiliad"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3930,6 +4373,247 @@ msgstr "Cywasgydd..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Gweithredu Cywasgiad yr Amrediad Ddeinamig..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Gwybodaeth"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3946,8 +4630,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Osgled (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4176,16 +4860,12 @@ msgstr "Gwrthdroi"
 msgid "Inverting"
 msgstr "Yn Gwrthdroi"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4197,31 +4877,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4232,6 +4916,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Gweddydd"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Tynnu Sŵn"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4248,10 +5084,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4279,10 +5111,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Tynnu Sŵn"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Cam 1"
@@ -4313,14 +5141,26 @@ msgstr "Nôl Proffil Sŵn"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Tynnu Sŵn..."
@@ -4355,22 +5195,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normaleiddio"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Tynnu unrhyw atred 'DC' (canoli ar 0 yn fertigol)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normaleiddio..."
@@ -4384,44 +5224,56 @@ msgstr "Yn Normaleiddio..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Gweithredwyd effaith: %s %d rhan, %.0f%% gwlyb, amledd = %.1f Hz, gwedd gychwyn = %.0f gradd, dyfnder = %d, adlif = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Gweddydd"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Gweddydd gan Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Rhannau:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "SYCH"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "GWLYB"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
 #: ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "Amledd LFO (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "Gwedd Gychwyn LFO (gradd):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Dyfnder:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Adlif (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Gweddydd..."
@@ -4436,6 +5288,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4454,28 +5314,23 @@ msgstr "Traciau yn rhy hir i aildraethu'r dewisiad."
 msgid "Repeat"
 msgstr "Ailadrodd"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Ailadrodd gan Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Nifer o weithiau i ailadrodd: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Hyd dewisiad newydd: "
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d munud, %d eiliad"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d eiliad"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4539,8 +5394,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4548,6 +5451,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Llinellol"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4576,22 +5487,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Tonffurf:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4618,10 +5535,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4667,10 +5580,6 @@ msgstr "Gweithredwyd effaith: %s amledd = %.1f Hz, gwedd gychwyn = %.0f gradd, d
 msgid "Wahwah"
 msgstr "Wa-wa"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wa-wa gan Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Dyfnder (%):"
@@ -4679,10 +5588,18 @@ msgstr "Dyfnder (%):"
 msgid "Resonance:"
 msgstr "Cyseiniant:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Atred Amledd Wa-wa  (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wa-wa..."
@@ -4719,6 +5636,18 @@ msgstr "Gosodiadau'r Effaith"
 msgid "Length (seconds)"
 msgstr "Hyd (eiliadau)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Gweithredu'r Effaith Nyquist..."
@@ -4784,9 +5713,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4840,6 +5772,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4875,10 +5811,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Methu allforio sain i %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Allforio'r sain ddewisiedig gan ddefnyddio'r amgodydd llinell orchymun"
@@ -4891,6 +5823,477 @@ msgstr "Allforio'r cywaith cyfan gan ddefnyddio'r amgodydd llinell orchymun"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Cyfradd Ddidau:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Iaith:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Ffeiliau XML (*.xml)|*.xml|Pob ffeil (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4963,10 +6366,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4975,10 +6374,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Cyfradd Ddidau:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4987,10 +6382,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -5016,44 +6407,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5064,20 +6423,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5108,6 +6463,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Ansawdd"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5133,33 +6492,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Ble mae %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5169,8 +6510,9 @@ msgstr "Dim ond lame_enc.dll|lame_enc.dll|Rhaglengelloedd (*.dll)|*.dll|Pob Ffei
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Dim ond libmp3lame.so|libmp3lame.so|Ffeiliau Prif Wrthrych Cyfrannol (*.so)|*.so|Rhaglengelloedd Estynedig (*.so*)|*.so*|Pob ffeil (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5189,10 +6531,6 @@ msgstr "Nid yw'n lyfrgell amgodio MP3 dilys neu ni'i chynhelir!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Golygu'r Tagiau ID3 ar gyfer y ffeil MP3"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5228,10 +6566,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5244,18 +6578,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Methwyd canfod yr ategyn allforio MP3"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5313,6 +6639,10 @@ msgstr "Cynnwys sain cyn y label cyntaf"
 msgid "First file name:"
 msgstr "Enw'r ffeil gyntaf:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Traciau"
@@ -5333,15 +6663,14 @@ msgstr "Rhifo'n olynol"
 msgid "File name prefix:"
 msgstr "Rhagddodiad enw ffeil:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Ysgrifennu dros ffeiliau cyfredol"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5351,10 +6680,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Dewis lleoliad i gadw'r ffeiliau allforio"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5362,6 +6687,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5372,6 +6701,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5380,10 +6715,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5396,22 +6727,14 @@ msgstr "Allforio'r sain dewisiedig fel Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Allforio'r cywaith cyfan fel Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5427,8 +6750,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Nid yw pob cyfiniad o bennawdau\n"
 "ac amgodiadau yn bosib.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5452,8 +6787,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Gwall (efallai na gadwyd y ffeil): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5461,6 +6824,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Ni grynhöwyd y fersiwn yma o Audacity â chynhaliaeth %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5491,9 +6862,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5506,20 +6878,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Methodd Audacity adnabod y math yma o ffeil.\n"
-"Os yw heb ei gywasgu, ceisiwch ei fewnforio trwy\n"
-"ddefnyddio \"Mewnforio Data Crai\""
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5558,16 +6981,17 @@ msgstr "Ni ellir atredu traciau MIDI yn unigol, dim ond â thraciau sain mae pos
 msgid "Invalid track offset in LOF file."
 msgstr "Atred trac annilys yn y ffeil LOF."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Gwall wrth ddehongli'r ffeil Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Gwall wrth ddehongli'r ffeil MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5594,15 +7018,23 @@ msgstr "Pennawd didlif Vorbis annilys"
 msgid "Internal logic fault"
 msgstr "Nam rhesymeg fewnol"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Mewnforio ffeil %s ..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Mewnforio Data Crai"
@@ -5640,6 +7072,14 @@ msgstr "2 Sianel (Stereo)"
 msgid "%d Channels"
 msgstr "%d Sianel"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Atred gychwyn:"
@@ -5652,8 +7092,17 @@ msgstr "Faint i fewnforio:"
 msgid "Sample rate:"
 msgstr "Graddfa Samplo:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5697,10 +7146,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Chwarae traciau eraill tra'n recordio un newydd"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5710,8 +7158,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5738,12 +7190,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5771,21 +7225,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5824,7 +7266,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5849,23 +7291,65 @@ msgstr "Nid oes posib ysgrifennu i'r ffolder %s"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Ni fydd newidiadau i'r ffolder dros dro yn cael effaith tan ailgychwyn Audacity"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Gwneud copi o'r ffeil cyn golygu (saffach)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Fersiwn Rhaglengell MP3:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Darllen yn uniongyrchol o'r ffeil gwreiddiol (cynt)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5895,53 +7379,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Fersiwn Rhaglengell MP3:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Rhyngwyneb"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Canfod Rhaglengell"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Rhyngwyneb"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5956,6 +7435,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5964,25 +7447,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Iaith:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Lleiafswm amrediad y dangosydd modd dB"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5992,6 +7475,10 @@ msgstr "-36 dB (amrediad bas ar gyfer golygu osgled-uchel)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (amrediad PCM samplau 8 did)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (amrediad PCM samplau 16 did)"
@@ -6004,10 +7491,34 @@ msgstr "-120 dB (bras derfyn clyw dynol)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (amrediad PCM samplau 24 did)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6040,10 +7551,6 @@ msgstr "Gwall tra'n cadw byrlwybrau'r allweddell"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Dewisiwch ffeil XML yn cynnwys byrlwybrau bysellfwrdd Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Ffeiliau XML (*.xml)|*.xml|Pob ffeil (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Gwall tra'n llwytho byrlwybrau'r allweddell."
@@ -6059,6 +7566,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Dadwneud"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Chwarae traciau eraill tra'n recordio un newydd"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Llygoden"
@@ -6283,10 +7827,6 @@ msgstr "Nesáu neu Pellhau"
 msgid "Audacity Preferences"
 msgstr "Hoffterau Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Ansawdd"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Petryal"
@@ -6351,12 +7891,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6375,6 +7915,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - rhagosodedig"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - amrediad mwyaf cul"
@@ -6383,6 +7927,10 @@ msgstr "4096 - amrediad mwyaf cul"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6399,6 +7947,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Amledd Uchaf (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Rhaid i'r amledd uchaf for yn gyfanrif"
@@ -6415,6 +7983,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6487,10 +8063,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Seibio"
@@ -6499,9 +8071,9 @@ msgstr "Seibio"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Chwarae (Shift i gylchu)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6515,6 +8087,10 @@ msgstr "Neidio i'r Dechrau"
 msgid "Skip to End"
 msgstr "Neidio i'r Diwedd"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6547,6 +8123,10 @@ msgstr "Tocio tu allan i'r dewisiad"
 msgid "Silence selection"
 msgstr "Distewi'r dewisiad"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Nesáu"
@@ -6603,24 +8183,20 @@ msgstr "Mesurydd lefel allbwn"
 msgid "Input level meter - click to monitor input"
 msgstr "Mesurydd lefel mewnbwn - cliciwch i arsylwi'r mewnbwn"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Lefel Sain Allbwn"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Lefel Sain Mewnbwn"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6639,6 +8215,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6896,6 +8477,22 @@ msgstr "Dde"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6942,14 +8539,14 @@ msgstr "Stereo Llorweddol"
 msgid "Vertical Stereo"
 msgstr "Stereo Fertigol"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Llinellol"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6969,6 +8566,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6977,10 +8590,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6993,6 +8602,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7106,11 +8730,10 @@ msgstr "Peidio dangos y rhybydd yma eto"
 msgid "Could not open file: \"%s\""
 msgstr "Methwyd agor y ffeil: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Gwall: %s ar linell %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/da.po b/locale/da.po
index b563ab1..8e8fd1d 100644
--- a/locale/da.po
+++ b/locale/da.po
@@ -17,36 +17,24 @@ msgstr "Project-Id-Version: Audacity 1.1\n"
 msgid "&About Audacity..."
 msgstr "&Om Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "I kraft"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Program bygget d.:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity er et frit og gratis program der skrives af et hold udviklere verden over. Koordinationen sker ved hjælp af Sourceforge.net, en online service der yder gratis værktøjer for open source projekter. Audacity kører på Windows 98 og nyere, Mac OS X, Linux og andre Unix-lignende operativsystemer. Der findes ældre udgaver af Audacity til Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Dette er en betaudgave af programmet. Der kan være fejl og uimplementerede faciliteter. Vi har brug for dine tilbagemeldinger, så besøg vores websted og send os fejlrapporter og ønsker om nye muligheder."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Dette er en fuldstændig og stabil udgave af Audacity. Hvis du alligevel skulle finde en fejl - eller har forslag - er du velkommen til at kontakte os. Vi har brug for tilbagemeldinger fra brugerene for at fortsætte med at forbedre Audacity. Du kan finde flere oplysninger på vores hjemmeside."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -58,14 +46,9 @@ msgstr "Dette er en fuldst
 msgid "translator_credits"
 msgstr "Dansk oversættelse af Henrik Ræder Clausen"
 
-# Bedre glose ønskes...
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Et frit digitalt lydredigeringsprogram"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Information"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -101,26 +84,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Særlig tak til:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "I kraft"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Program bygget d.:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
-#: ../src/effects/NoiseRemoval.cpp:463 ../src/effects/ClickRemoval.cpp:371
-msgid "Close"
-msgstr "Luk"
-
 #: ../src/AudacityApp.cpp:304 ../src/Project.cpp:1770
 #, c-format
 msgid "%s is already open in another window."
@@ -320,12 +395,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -359,8 +435,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -408,6 +484,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -456,10 +536,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -676,16 +764,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Omdøbt fil: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Ændrer block %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -814,6 +902,95 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Rektangulær"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Hvor er %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Frekvensanalyse"
@@ -842,8 +1019,8 @@ msgstr "Forbedret autokorrelation"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -856,8 +1033,8 @@ msgstr "St
 msgid " window"
 msgstr " vindue"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 # Mening??
@@ -869,14 +1046,23 @@ msgstr "Line
 msgid "Log frequency"
 msgstr "Log hyppighed"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
+#: ../src/effects/NoiseRemoval.cpp:463 ../src/effects/ClickRemoval.cpp:371
+msgid "Close"
+msgstr "Luk"
+
 #: ../src/widgets/Meter.cpp:293
 msgid "dB"
 msgstr ""
@@ -928,7 +1114,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Forsinkelse (sekunder)\tFrekvens (Hz)\tNiveau"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -944,15 +1130,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -963,40 +1165,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1190,6 +1416,10 @@ msgstr "&Gem projekt\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Gem project som..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1198,6 +1428,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1227,10 +1461,26 @@ msgstr "Eksport
 msgid "Export &Multiple..."
 msgstr "Eksportér &etiketter"
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1292,9 +1542,9 @@ msgstr "&Slet\tCrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Stilhed\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1308,22 +1558,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1367,12 +1615,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1383,66 +1631,67 @@ msgstr "&Alle\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "Start til markør"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Markør til enden"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Find 0-krysninger\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Flyt markør..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "til starten af det markerede"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "til enden af det markerede"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "til begyndelsen af sporet"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "til enden af sporet"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Gem det markerede"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Gendan markering"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1461,9 +1710,14 @@ msgstr "Sl
 msgid "Turn Grid Snap Off"
 msgstr "Slå gitter-hop fra"
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Indstillinger\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1501,60 +1755,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "Historie..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Hop til begyndelsen\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Hop til slutningen\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1570,12 +1886,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Tidsspor"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1590,6 +1902,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Fjern spor"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Sæt ved &nul"
@@ -1606,29 +1926,40 @@ msgstr "S
 msgid "Align with Selection &End"
 msgstr "Sæt ved &markeringsslut"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Sæt afslutningen til markøren"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Sæt slut til begyndelsen af markering"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Sæt slut til enden af markering"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Kombinér spor"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Koordiner spor ..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1641,22 +1972,26 @@ msgstr "Tilf
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Tilføj etiket ved markering"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Generér"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Effe&kt"
@@ -1690,6 +2025,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1702,12 +2041,12 @@ msgstr "&K
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1742,9 +2081,9 @@ msgstr "N
 msgid "Previous Tool\tA"
 msgstr "Foregående værktøj\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Afspil/stop\tMellemruj"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1758,12 +2097,12 @@ msgstr "Pause\tP"
 msgid "Record\tR"
 msgstr "Indspil\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1778,22 +2117,14 @@ msgstr "Spil til markering\tB"
 msgid "Play Looped\tL"
 msgstr "Afspil i loop\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Spil i løkke\tShift+Mellemrum"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Hop til begyndelsen\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Hop til slutningen\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Start markeringen ved begyndelsen\tShift+Home"
@@ -1850,8 +2181,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1950,13 +2281,18 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
 msgstr ""
 
 #: ../src/Menus.cpp:620
@@ -2014,6 +2350,23 @@ msgstr "Gentag %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Der er ingen etiketter at eksportere."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Intet at fortryde"
@@ -2050,6 +2403,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Satte ind fra udklipsholderen"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2217,9 +2574,9 @@ msgstr "Import
 msgid "Select a MIDI file..."
 msgstr "Vælg en MIDI-fil..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Alle filer (*.*)|*.*|MIDI filer (*.mid)|*.mid|Allegro filer (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2238,12 +2595,6 @@ msgstr "V
 msgid "All files (*)|*"
 msgstr "Alle filer (*)|*"
 
-#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Importér"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2275,6 +2626,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Sæt ved nul"
@@ -2312,6 +2667,14 @@ msgstr "Koordineret"
 msgid "Align"
 msgstr "Juster"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Nyt lydspor oprettet"
@@ -2374,14 +2737,14 @@ msgstr "Fjern spor"
 msgid "Removed audio track(s)"
 msgstr "Fjernede lydspor"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2447,14 +2810,13 @@ msgstr "Indspillet lyd"
 msgid "Save changes before closing?"
 msgstr "Gem ændringer inden lukning?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2473,6 +2835,25 @@ msgstr "V
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821 ../src/Project.cpp:1829
 msgid "Error opening file"
 msgstr "Fejl ved åbning af fil"
@@ -2528,42 +2909,34 @@ msgstr ""
 msgid "Can't open project file"
 msgstr "Kan ikke åbne projektfilen"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Kunne ikke gemme projektet. Måske er %s ikke\n"
-"skrivbar, eller disken er fuld."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148 ../src/Project.cpp:2160
 msgid "Error saving project"
@@ -2574,22 +2947,17 @@ msgstr "Fejl under projekt-gemning"
 msgid "Saved %s"
 msgstr "%s gemt"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importerede '%s'"
 
+#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Importér"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Fejl ved import"
@@ -2602,17 +2970,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity projektfiler (.aup) lader dig gemme alt, hvad du arbejder på nøjagtigt som det \n"
-"fremtræder på skærmen, men de fleste andre programmer kan ikke åbne Audacity projektfiler.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"For at lave en fil, der kan åbnes af andre programmer, skal du bruge en af eksport-\n"
-"kommandoerne."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2655,6 +3029,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Ikke mere diskplads"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2737,43 +3121,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2813,8 +3166,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2833,12 +3186,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2880,100 +3233,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Den maksimale længde af attributten '%s' er %d tegn. Data blev skåret væk."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Kunstner"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3038,8 +3310,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3074,6 +3389,10 @@ msgstr "B
 msgid "Waveform (dB)"
 msgstr "Bølgeform (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Pitch (EAC)"
@@ -3216,13 +3535,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Tidsforskydning"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Du er ikke zoomet tilstrækkeligt langt ind. Zoom ind, indtil du kan se den enkelte datapunkter."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3305,6 +3624,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3361,15 +3688,6 @@ msgstr "
 msgid "Format Change"
 msgstr "Formatændring"
 
-# The original states "Hz (per second)". This is incorrect, as Hz already means 'per second' in itself.
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Indtast optageraten i Hz mellem 1 og 100000:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Ugyldig rate."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Ret nederste hastighedsgrænse (%) til:"
@@ -3505,8 +3823,8 @@ msgstr "Udvidelser 1 til %i"
 msgid "Plugins %i to %i"
 msgstr "Udvidelser %i til %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3528,8 +3846,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3550,14 +3868,19 @@ msgstr "Effekt anvendt: %s %.1f dB"
 msgid "Amplify"
 msgstr "Forstærk"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Forstærk af Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Forstærkning (db):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Ny top-styrke (dB):"
@@ -3567,6 +3890,10 @@ msgstr "Ny top-styrke (dB):"
 msgid "Allow clipping"
 msgstr "Tillad ikke klipning"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Forstærk..."
@@ -3679,10 +4006,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Frekvens (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Løft (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3722,9 +4057,50 @@ msgstr "af Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "bruger SoundTouch af Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Tonehøjde:   fra"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Halvtoner (halv-trin):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
 #: ../src/effects/ChangeSpeed.cpp:351 ../src/effects/ChangeTempo.cpp:223
@@ -3732,19 +4108,20 @@ msgstr "Toneh
 msgid "to"
 msgstr "til"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Halvtoner (halv-trin):"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frekvens (Hz):    fra"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
 #: ../src/effects/ChangeTempo.cpp:182
 msgid "Percent Change:"
 msgstr "Procent ændring:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Juster toneleje..."
@@ -3762,6 +4139,14 @@ msgstr "Effekt anvendt: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Juster hastighed"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "(ingen)"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Juster hastighed, med ændring af både tempo og toneleje"
@@ -3770,17 +4155,17 @@ msgstr "Juster hastighed, med 
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "bruger SampleRate af Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "(ingen)"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standard vinyl RPM:   fra"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3798,13 +4183,29 @@ msgstr "
 msgid "Change Tempo without Changing Pitch"
 msgstr "Juster tempo uden at ændre toneleje"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Takter i minuttet (BPM):    fra"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Længde (sekunder):    fra"
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3814,8 +4215,8 @@ msgstr "Juster tempo..."
 msgid "Changing Tempo"
 msgstr "Ændrer tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3826,10 +4227,18 @@ msgstr ""
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 #, fuzzy
 msgid "Click Removal..."
@@ -3844,49 +4253,84 @@ msgstr "Fjerner st
 msgid "Dynamic Range Compressor"
 msgstr "Dynamikkomprimering"
 
-#: ../src/effects/Compressor.cpp:428
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dynamikområde komprimering af Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:446
-msgid "Ratio: "
-msgstr "Forhold:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:453
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Attack tid:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:520
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Tærskel: %d dB"
 
-#: ../src/effects/Compressor.cpp:523
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Forhold: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Forhold: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:527
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Attack tid: %f sek"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3897,6 +4341,247 @@ msgstr "Komprimering..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Brug Dynamikkomprimering"
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Information"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3913,8 +4598,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Styrke (0-1):"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4141,16 +4826,12 @@ msgstr "Omvend"
 msgid "Inverting"
 msgstr "Omvender"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4162,31 +4843,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4197,6 +4882,159 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+# Bøjning?
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Støjfjerning"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4213,10 +5051,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4244,11 +5078,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-# Bøjning?
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Støjfjerning"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Trin 1"
@@ -4279,14 +5108,26 @@ msgstr "Find st
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Støjfjerning..."
@@ -4321,22 +5162,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalisering"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Fjern DC offset (centrér på 0-linjen)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normaliser..."
@@ -4350,44 +5191,54 @@ msgstr "Normaliserer."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Effekt anvendt: %s %d trin, %.0f%% våd, frekvens = %.1f Hz, startfase = %.0f grader, dybde = %d, feedback = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Phaser"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser af Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Trin:"
 
-# Betyder forhåbentlig _ikke_ tør.
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-# ??
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO frekvens (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO startfase (grader):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Dybde:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Feedback (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4402,6 +5253,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4419,27 +5278,22 @@ msgstr "Sporet er for langt til at gentage markeringen."
 msgid "Repeat"
 msgstr "Gentag"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Gentag af Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Antal gentagelser:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Ny markeringslængde:"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutter, %d sekunder"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekunder"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4504,8 +5358,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4513,6 +5415,15 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+#, fuzzy
+msgid "Linear"
+msgstr "År"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4541,22 +5452,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Bølgeform:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4583,10 +5500,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4632,10 +5545,6 @@ msgstr "Effekt anvendt: %s frekvens = %.1f Hz, startfase = %.0f grader, dybde =
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah af Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Dybde (%):"
@@ -4644,10 +5553,18 @@ msgstr "Dybde (%):"
 msgid "Resonance:"
 msgstr "Resonans:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah frekvens offset (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4685,6 +5602,18 @@ msgstr "Effektindstillinger"
 msgid "Length (seconds)"
 msgstr "Længde (sekunder):    fra"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Anvender Nyquist effekt..."
@@ -4752,9 +5681,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4808,6 +5740,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4843,10 +5779,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Kan ikke eksportere lyd til %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Eksporterer det markerede med kommando-linje koder"
@@ -4859,6 +5791,477 @@ msgstr "Eksporterer hele projektet med kommando-linje koder"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bitrate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Sprog:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML filer (*.xml)|*.xml|Alle filer (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4931,10 +6334,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4943,10 +6342,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bitrate:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4955,10 +6350,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345 ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
 msgstr "Kan ikke åbne filen til skrivning"
@@ -4983,44 +6374,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5031,20 +6390,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5075,6 +6430,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Kvalitet"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5100,35 +6459,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Hvor er %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5138,8 +6477,9 @@ msgstr "Kun lame_enc.dll|lame_enc.dll|Dynamisk linkede biblioteker (*.dll)|*.dll
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Kun libmp3lame.so|libmp3lame.so|Primære delte objektfiler (*.so)|*.so|Udvidede biblioteker (*.so*)|*.so*|Alle filer (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5158,10 +6498,6 @@ msgstr "Denne fil er ikke et brugbart mp3-kodnings bibliotek!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Redigér ID3 tags for mp3 filen"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5197,10 +6533,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5213,18 +6545,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Fandt ikke mp3 eksport plugin"
-
 #: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
 #, fuzzy
@@ -5291,6 +6615,10 @@ msgstr ""
 msgid "First file name:"
 msgstr ""
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 # Notes? Cool.
 #: ../src/export/ExportMultiple.cpp:636
 #, fuzzy
@@ -5315,13 +6643,12 @@ msgstr ""
 msgid "File name prefix:"
 msgstr ""
 
-#: ../src/export/ExportMultiple.cpp:677
-msgid "Overwrite existing files"
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
 msgstr ""
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
+#: ../src/export/ExportMultiple.cpp:677
+msgid "Overwrite existing files"
 msgstr ""
 
 #: export/ExportMultiple.cpp:360
@@ -5334,10 +6661,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Vælg en placering for den midlertidige mappe"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5345,6 +6668,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5355,6 +6682,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5363,10 +6696,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5379,22 +6708,14 @@ msgstr "Eksporterer det markerede som Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Eksporterer hele projektet som Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5410,8 +6731,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Ikke alle kombinationer af headere-\n"
 "og kodninger er mulige.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5435,8 +6768,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Fejl (filen er muligvis ikke skrevet): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5444,6 +6805,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Denne udgave af Audacity er ikke bygget med %s understøttelse."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5474,9 +6843,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5489,19 +6859,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity genkendte ikke denne filtype.\n"
-"Hvis den er ukomprimeret, kan du importere den med \"Importer rå\""
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5537,16 +6959,17 @@ msgstr "MIDI-spor kan ikke flyttes individuelt, det kan kun lydfiler."
 msgid "Invalid track offset in LOF file."
 msgstr "Ugyldigt spor offset i LOF fil."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Fejl ved tydning af Allegro-fil."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Fejl ved tydning af MIDI-fil."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5573,15 +6996,23 @@ msgstr "Ugyldig Vorbis bitstream header"
 msgid "Internal logic fault"
 msgstr "Intern logik-fejl"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importerer %s fil..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Importér rå data"
@@ -5625,6 +7056,14 @@ msgstr "2 Kanaler (Stereo)"
 msgid "%d Channels"
 msgstr "%d kanaler"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Start offset:"
@@ -5637,8 +7076,17 @@ msgstr "M
 msgid "Sample rate:"
 msgstr "Datafrekvens:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5682,10 +7130,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Afspil andre spor samtidig med optagelse af nyt"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5695,8 +7142,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5723,12 +7174,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5756,21 +7209,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88 ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
 msgstr "Mapper"
@@ -5808,7 +7249,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5833,23 +7274,65 @@ msgstr "Kan ikke skrive til mappen %s"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Ændringen af den midlertidige mappe træder først i kraft, når Audacity starter næste gang."
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Lav en kopi af den fil, der skal redigeres (sikrest)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Udgave af mp3-bibliotek:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Læs direkte fra den oprindelige fil (hurtigere)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5879,21 +7362,8 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
-msgstr ""
-
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Udgave af mp3-bibliotek:"
-
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Find bibliotek"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
 # This really depends on context.
@@ -5901,32 +7371,40 @@ msgstr ""
 msgid "Interface"
 msgstr "Grænseflade"
 
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5941,6 +7419,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5949,25 +7431,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Sprog:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Minimum dB visning"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5977,6 +7459,10 @@ msgstr "-36 dB (smalt omr
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM område for 8 bit datapunkter)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM område for 16 bit datapunkter)"
@@ -5989,11 +7475,35 @@ msgstr "-120 dB (
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM område for 24 bit datapunkter)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 # If MIDI keyboard, substitute 'Keyboard' in the translation.
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Tastatur"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6026,10 +7536,6 @@ msgstr "Fejl ved skrivning af tastaturgenveje"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Vælg en XML-fil med Audacity tastaturgenveje..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML filer (*.xml)|*.xml|Alle filer (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Fejl ved indlæsning af tastaturgenveje"
@@ -6045,6 +7551,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Fortryd"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Afspil andre spor samtidig med optagelse af nyt"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 # Skal vel ikke oversættes.
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
@@ -6260,10 +7803,6 @@ msgstr "Zoom ind eller ud"
 msgid "Audacity Preferences"
 msgstr "Audacity indstillinger"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Kvalitet"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Rektangel"
@@ -6328,12 +7867,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6352,6 +7891,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - standard"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - mindst båndbredde"
@@ -6360,6 +7903,10 @@ msgstr "4096 - mindst b
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6376,6 +7923,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Maksimal frekvens (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Maksimumfrekvensen skal være et heltal"
@@ -6392,6 +7959,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6464,10 +8039,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pause"
@@ -6476,9 +8047,9 @@ msgstr "Pause"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Afspil (tryk Shift for at aktivere loop)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6492,6 +8063,10 @@ msgstr "Hop til begyndelsen"
 msgid "Skip to End"
 msgstr "Hop til slutningen"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6524,6 +8099,10 @@ msgstr "Besk
 msgid "Silence selection"
 msgstr "Stilhedsmarkering"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Zoom ind"
@@ -6581,24 +8160,20 @@ msgstr "Udgangsmeter"
 msgid "Input level meter - click to monitor input"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Udgangsvolumen"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Indgangsvolumen"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6617,6 +8192,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6876,6 +8456,22 @@ msgstr "H
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6923,15 +8519,14 @@ msgstr ""
 msgid "Vertical Stereo"
 msgstr "Gør til stereo"
 
-#: ../src/widgets/Meter.cpp:292
-#, fuzzy
-msgid "Linear"
-msgstr "År"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6951,6 +8546,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6959,10 +8570,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6975,6 +8582,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7088,11 +8710,10 @@ msgstr "Vis ikke denne advarsel igen"
 msgid "Could not open file: \"%s\""
 msgstr "Kunne ikke åbne fil: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Fejl: %s ved linje %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/de.po b/locale/de.po
index 7d37fff..2a7367c 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -20,34 +20,26 @@ msgstr "Project-Id-Version: Audacity 1.3.3\n"
 msgid "&About Audacity..."
 msgstr "&Über Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:674
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#: AboutDialog.cpp:149
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: ../src/AboutDialog.cpp:189
-msgid "Program build date: "
-msgstr "Programmversion vom: "
-
-# ??? zu langer text? --> Schau Dir den About-Dialog an (Hilfe/Über Audacity), dann siehst Du, wie's aussieht. Würde eher "Einstellungs-Ordner:" schreiben oder so.
-#: ../src/AboutDialog.cpp:194
-msgid "Settings folder: "
-msgstr "Einstellungs-Ordner:"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:371
+#: SplashDialog.cpp:111
+msgid "OK... Audacious!"
+msgstr "OK... Audacious!"
 
-#: ../src/AboutDialog.cpp:199
-msgid "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."
-msgstr "Audacity ist freie Software, geschrieben von einem internationalen Team freiwilliger Entwickler. Dies ist möglich dank SourceForge.net, einer Online-Plattform, die Werkzeuge für Open-Source-Projekte kostenlos zur Verfügung stellt. Audacity ist für Windows, Mac OS X, Linux und andere Unix-ähnliche Betriebssysteme erhältlich."
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
-#: ../src/AboutDialog.cpp:203
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Dies ist eine Beta-Version des Programms. Es kann noch Fehler und unvollständige Erweiterungen haben. Wir benötigen Ihre Rückmeldungen und bitten Sie, unsere Webseite zu besuchen und uns Ihre Fehlerberichte und Erweiterungswünsche mitzuteilen."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: ../src/AboutDialog.cpp:206
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Dies ist eine stabile Programmversion von Audacity. Sollten sie dennoch einen Fehler gefunden oder Anregungen haben, nehmen Sie bitte Kontakt zu uns auf. Wir benötigen Ihre Rückmeldungen, um Audacity auch in Zukunft noch weiter zu entwickeln oder zu verbessern. Sie können uns erreichen unter http://www.audacity.de"
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -60,14 +52,9 @@ msgstr "Dies ist eine stabile Programmversion von Audacity. Sollten sie dennoch
 msgid "translator_credits"
 msgstr "Deutsche Übersetzung von Andreas Klug, Heiko Abler, Pennywize, Edgar M. Franke"
 
-#: ../src/AboutDialog.cpp:231
-msgid "A Free Digital Audio Editor"
-msgstr "Ein freier Audio-Editor"
-
-#: ../src/AboutDialog.cpp:235
-#: ../src/effects/ChangeLength.cpp:131
-msgid "Information"
-msgstr "Programm-Informationen"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:237
 msgid "Credits"
@@ -103,29 +90,118 @@ msgstr "Audacity basiert auf Programmcode von folgenden Projekten"
 msgid "Special thanks:"
 msgstr "Besonderer Dank geht an"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr "Audacity"
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340
-#: AboutDialog.cpp:371
-#: SplashDialog.cpp:111
-msgid "OK... Audacious!"
-msgstr "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: AboutDialog.cpp:149
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:189
+msgid "Program build date: "
+msgstr "Programmversion vom: "
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+# ??? zu langer text? --> Schau Dir den About-Dialog an (Hilfe/Über Audacity), dann siehst Du, wie's aussieht. Würde eher "Einstellungs-Ordner:" schreiben oder so.
+#: ../src/AboutDialog.cpp:194
+msgid "Settings folder: "
+msgstr "Einstellungs-Ordner:"
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr "GPL-Lizenz"
 
-#: ../src/FreqWindow.cpp:206
-#: ../src/Benchmark.cpp:232
-#: ../src/Dependencies.cpp:308
-msgid "Close"
-msgstr "Schließen"
-
 #: ../src/AudacityApp.cpp:276
 #: ../src/Project.cpp:1521
 #, c-format
@@ -329,21 +405,23 @@ msgstr "Die Wiederherstellung 
 msgid "Quit Audacity"
 msgstr "Audacity beenden"
 
-#: ../src/AutoRecovery.cpp:75
-msgid "Don't recover"
-msgstr "Nicht wiederherstellen"
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr ""
 
-#: ../src/AutoRecovery.cpp:76
-msgid "Recover projects"
+#: AutoRecovery.cpp:90
+#, fuzzy
+msgid "Recover Projects"
 msgstr "Wiederherstellen"
 
-#: ../src/AutoRecovery.cpp:113
-msgid "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?"
-msgstr "Sie haben sich entschieden, die Projektwiederherstellung abzubrechen, obwohl Sie diese Gelegenheit nur jetzt haben. Wollen Sie wirklich fortfahren ohne die Wiederherstellung?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
 
-#: ../src/AutoRecovery.cpp:114
-msgid "Question"
-msgstr "Frage"
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr ""
 
 #: ../src/AutoRecovery.cpp:132
 #: ../src/AutoRecovery.cpp:167
@@ -394,8 +472,9 @@ msgstr "&Parameter"
 msgid "C&hoose command"
 msgstr "Befehl auswählen"
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
 msgstr "Stereo-in-Mono-Effekt nicht gefunden"
 
 #: ../src/export/Export.cpp:410
@@ -449,6 +528,10 @@ msgstr "%s anwenden"
 msgid "Apply Chain"
 msgstr "Stapelverarbeitung anwenden"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: ../src/BatchProcessDialog.cpp:91
 msgid "&Select chain"
 msgstr "&Auswählen"
@@ -512,10 +595,18 @@ msgstr "'%s' auf aktuelles Projekt anwenden"
 msgid "Please save and close the current project first."
 msgstr "Bitte speichern und schließen Sie zunächst das Projekt."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: ../src/BatchProcessDialog.cpp:204
 msgid "Select file(s) for batch processing..."
 msgstr "Wählen Sie eine oder mehrere Dateien aus für die Stapelverarbeitung..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: ../src/BatchProcessDialog.cpp:207
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Alle Dateien (*.*)|*.*|WAV-Dateien (*.wav)|*.wav|AIFF-Dateien (*.aif)|*.aif|AU-Dateien (*.au)|*.au|MP3-Dateien (*.mp3)|*.mp3|Ogg-Vorbis-Dateien (*.ogg)|*.ogg|FLAC-Dateien (*.flac)|*.flac"
@@ -651,13 +742,13 @@ msgstr "Nur ausgew
 msgid "Cancel Save"
 msgstr "Speichern abbrechen"
 
-#: Dependencies.cpp:306
-msgid "Don't Copy any Audio"
+#: Dependencies.cpp:310
+msgid "Do Not Copy Any Audio"
 msgstr ""
 
-#: ../src/Dependencies.cpp:311
-msgid "Copy All Audio Into Project (safer)"
-msgstr "Alle Audios ins Projektverzeichnis kopieren (sicherer)"
+#: Dependencies.cpp:312
+msgid "Copy All Audio into Project (Safer)"
+msgstr ""
 
 #: ../src/Dependencies.cpp:320
 #: ../src/Dependencies.cpp:325
@@ -742,16 +833,16 @@ msgstr "'%s' kann nicht entfernt werden"
 msgid "Renamed file: %s\n"
 msgstr "Umbenannt: %s\n"
 
-#: ../src/DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Block verschieben %s\n"
-
 #: ../src/DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "'%s' kann nicht in '%s' umbenannt werden"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: ../src/DirManager.cpp:1115
 #: ../src/DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -907,6 +998,95 @@ msgstr "Aufnahme auf Festplatte speichern..."
 msgid "Rectangular"
 msgstr "Rechteck"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:639
+#, c-format
+msgid "Location of %s:"
+msgstr "%s steht in:"
+
+#: export/ExportMP3.cpp:648
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Um %s zu finden, bitte hier klicken -->"
+
+#: export/ExportMP3.cpp:654
+msgid "Browse..."
+msgstr "Durchsuchen..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:129
+#, c-format
+msgid "Where is %s?"
+msgstr "Wo befindet sich die Datei: \"%s\"?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:102
 msgid "Frequency Analysis"
 msgstr "Frequenzanalyse"
@@ -936,8 +1116,9 @@ msgstr "Erweiterte Autokorrelation"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: ../src/FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algorithmus:"
 
 #: ../src/HistoryWindow.cpp:79
@@ -950,9 +1131,9 @@ msgstr "Gr
 msgid " window"
 msgstr "-Fenster"
 
-#: ../src/FreqWindow.cpp:181
-msgid "Function:"
-msgstr "Funktion:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: ../src/FreqWindow.cpp:189
 msgid "Linear frequency"
@@ -962,14 +1143,25 @@ msgstr "Lineardarstellung"
 msgid "Log frequency"
 msgstr "Log. Darstellung"
 
-#: ../src/FreqWindow.cpp:193
-msgid "Axis:"
-msgstr "X-Achse:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: ../src/LabelDialog.cpp:128
 msgid "&Export..."
 msgstr "&Exportieren..."
 
+#: HelpText.cpp:77
+#: export/ExportCL.cpp:320
+msgid "Export"
+msgstr "Export"
+
+#: ../src/FreqWindow.cpp:206
+#: ../src/Benchmark.cpp:232
+#: ../src/Dependencies.cpp:308
+msgid "Close"
+msgstr "Schließen"
+
 #: ../src/FreqWindow.cpp:269
 #: ../src/FreqWindow.cpp:392
 #: ../src/effects/Compressor.cpp:348
@@ -1034,8 +1226,8 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Verzögerungszeit (s)\tFrequenz (Hz)\tPegel"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
-msgstr "Zurück zur [[welcome|Willkommen]]-Seite."
+msgid "To [[welcome|Welcome screen]]"
+msgstr ""
 
 #: HelpText.cpp:60
 msgid "Welcome!"
@@ -1050,17 +1242,33 @@ msgid "Recording Audio"
 msgstr "Aufnahme"
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
+msgstr ""
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+#, fuzzy
+msgid "Editing and greyed out Menus"
 msgstr "Bearbeitung und ausgegraute Menüs"
 
-#: HelpText.cpp:77
-#: export/ExportCL.cpp:320
-msgid "Export"
-msgstr "Export"
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
-msgstr "Unterstützte Formate"
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr ""
 
 #: HelpText.cpp:85
 msgid "Burn to CD"
@@ -1070,48 +1278,64 @@ msgstr "Brennen einer CD"
 msgid "No Local Help"
 msgstr "Keine lokale Hilfe"
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
-msgstr "<p>Willkommen bei Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. You can always get back to these instructions by clicking the 'Help' menu, then 'Show Welcome Message.' <br><br>Welcome again to Audacity."
-msgstr "Viel Spaß!</p><p>Klicken Sie auf die Links um zu erfahren,<ul><li>wie Sie die [[play|Wiedergabe]] starten können,<li>wie Sie eine [[record|Aufnahme]] erstellen können,<li>wie Sie Töne [[edit|bearbeiten]] und [[export|exportieren]] können.</ul><br><br>Vielleicht sparen Sie sich hierdurch Ärger, etwa über [[grey|ausgegraute Menüs]], weil Ihre [[norecord|erste Aufnahme]] oder das [[burncd|Brennen einer CD]] nicht gelingen will. Natürlich können Sie auch einfach loslegen und jederzeit hierher zurückkehren über das Hilfe-Menü.<br><br>"
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
 
-#: HelpText.cpp:157
-msgid "You can either drag existing files into Audacity, or use the File > Import > Audio command. File > Open does the same, but opens a new Audacity window for any file after the first.<br/><br/>These are the main formats Audacity will import for you: <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 |<< and |>> buttons to skip to the start or end respectively, or click anywhere in the track to restart from that point.<br><br>"
-msgstr "Sie können Dateien <b>importieren</b> indem Sie sie entweder mit der Maus in den Spurbereich ziehen oder über die Menüfolge Datei > Importieren > Audio. Über Datei > Öffnen geht's auch, dann öffnet sich allerdings ein neues Audacity-Fenster.<br/><br/> Die hauptsächlichen Import-Formate sind AIFF, AU, FLAC, M4A (nur beim Mac) MP2/MP3, Ogg-Vorbis sowie WAV. Wenn Ihre Datei in einem anderen Format vorliegt, schauen Sie unter 'format help???'. Wenn Sie eine Audio-CD importieren wollen schauen Sie unter 'how to import CDs???'.<br><br>Um Ihre importierten Töne <b>wiederzugeben</b>, drücken Sie den grünen Wiedergabe-Knopf oder die Leertaste zum starten und stoppen. Bei erneutem Start beginnt die Wiedergabe erneut ab der ursprünglichen Stelle. Um den Start-Punkt zu ändern verwenden Sie die Buttons  << oder >> oder Sie klicken in die Spur, um den Cursor zu versetzen.<br><br>"
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
 
-#: 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: <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|Recordin Tips]], especially the [[wiki:Troubleshooting Recordings|Troubleshooting Recordings]] section. <br><br>"
-msgstr "<b>Mit dem roten Knopf starten Sie direkt die <b>Aufnahme</b>. Auf drei Grundeinstellungen sollten Sie allerdings doch noch einen Blick werfen:<br><br>(1) Sie können das gewünschte <b>Aufnahme-Gerät</b> auswählen unter Bearbeiten > Einstellungen > Audio E/A. Üblicherweise verwendet Audacity die Standard-Soundkarte des Betriebssystems. Wenn Sie jedoch beispielsweise eine externe USB- oder Firewire-Karte verwenden wollen, sollten Sie dieses Gerät auswählen. <br><br>(2) Wählen Sie den gewünschten <b>Eingang</b> dieses Geräts aus, etwa Mikrofon, Line-In oder Summe.  <ul><li>Unter <b>Windows</b> wählen Sie den Eingang normalerweise mit dem Listenpfeil der Mixer-Werkzeugleiste in Audacity. Unter Windows-Vista wählen Sie den Eingang in den Einstellungen des oben beschriebenen Aufnahme-Geräts.</li><li>Beim <b>Mac</b> wählen Sie Aufnahme-Geräte normalerweise außerhalb von Audacity aus, im Apple Audio-MIDI Setup.</li></ul><i>Allerdings verfügen viele USB- oder Firewire-Geräte nicht über die Möglichkeit Eingänge auszuwählen. Schauen Sie ggf. in der Dokumentation Ihres Geräts nach. <br><br>(3) Bevor Sie Ihre Aufnahme tatsächlich starten, stellen Sie die <b>Aussteuerung</b> korrekt ein. Hierzu aktivieren Sie die Aussteuerungsanzeige per Mausklick. Wenn Sie die Anzeige nicht sehen, klicken Sie auf Ansicht > Werkzeugleisten > Aussteuerungsanzeige. <br>Nun stellen Sie die Aussteuerung korrekt ein. Verschieben Sie hierzu den Regler für die Aufnahmelautstärke in der Mixer-Werkzeugleiste (beim Mikrofon-Symbol): Die Aussteuerungsanzeige darf den roten Bereich berühren, aber nie den 0-dB-Wert erreichen. Wenn Sie nichts hören, überprüfen Sie unter Einstellungen > Audio E/A ob  \"Software Playthrough\" aktiviert ist. </ol><br><br>Ausführlichere Hinweise erhalten Sie in der Aufnahme-FAQ, in den Hinweisen zur Aufnahme in der Anleitung, in der Hilfe und unserem WIki [[wiki:Recording Tips|Recording Tips]], insbesondere im Troubleshooting-Bereich [[wiki:Troubleshooting Recordings|Troubleshooting Recordings]]. <br><br>"
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
 
-#: HelpText.cpp:187
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  "
-msgstr "Audacity ist ein leistungsfähiger Audio-Editor, mit dem Sie vielfältige Veränderungen an Ihrem Audiomaterial vornehmen können. "
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
 
-#: HelpText.cpp:222
-msgid "The main commands you will use are under the Edit menu (such as cut, copy and paste) and under the Effect menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
-msgstr "Die meisten Bearbeitungsschritte können Sie unter dem Menüpunkt Bearbeiten vornehmen (schneiden, kopieren) sowie mit den Effekten (Frequenzverlauf, Tonhöhe oder Tempo ändern, Rauschen entfernen). <br><br>Hierzu müssen Sie zunächst einen Bereich auswählen; Sie markieren ihn mit der linken Maustaste. Hierbei gelten <b>zwei Regeln</b>: <br><br>(1) Eine eventuell laufende Wiedergabe oder Aufnahme müssen Sie zunächst mit dem gelben Stop-Knopf anhalten, sonst ist eine Bearbeitung unmöglich. <br><br>(2) Bisweilen sind Menüs ausgegraut oder Sie erhalten eine Meldung, dass der gewünschte Bearbeitungsschritt unmöglich ist. Das ist normal. Menüpunkte (etwa bearbeiten während Wiedergabe), die nicht zur Verfügung stehen, sind eben ausgegraut bis Sie auf Stop drücken. Manchmal gibt's andere Gründe - Sie können beispielsweise keine Effekte anwenden solange Sie noch kein Audiomaterial ausgewählt haben. Oder: Sie können kein Audio einfügen solange Sie noch nichts in die Audacity-Zwischenablage kopiert haben. <br><br>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
 
-#: HelpText.cpp:246
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs or burn it to CD, you \"export\" it as an audio file such as a WAV, AIFF or MP3. <br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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. <br><br>Before you can export as <b>MP3</b>, you need to add the LAME MP3 encoder to your computer.For help with LAME, see [[wiki:Lame_Installation|Lame Installation]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
-msgstr "Exportieren und speichern sind zwei paar Stiefel. Sie speichern ein Audacity-Projekt, wenn Sie es später wieder in Audacity öffnen wollen, ohne Ihre Töne erneut zu importieren oder gar aufzunehmen, auch Ihre bisherigen Bearbeitungsschritte bleiben erhalten. Wenn Sie Ihr Werk jedoch in anderen Computerprogrammen anhören oder es auf eine CD brennen möchten, exportieren Sie es in eine Audio-Datei wie etwa WAV, MP3 oder Ogg. <br><br>(1) Um ein Audacity-Projekt zu speichern, benutzen Sie <b>Datei > Projekt speichern</b>. Dies erzeugt zweierlei: Eine Projekt-Datei (.aup) und zusätzlich einen Ordner (_data), der das aktuelle Audiomaterial enthält. Weder Projekt-Datei noch Ordner sollten Sie umbenennen, denn Audacity benötigt sie beide. Benutzen Sie Projekt speichern unter, wenn Sie ein leeres Projekt speichern möchten, oder wenn Sie ein bereits existierendes Projekt unter einem neuen Namen speichern wollen. Wenn Sie ein schon gespeichertes Projekt wieder öffnen wollen, klicken Sie auf Datei > Öffnen und öffnen Sie die .aup-Datei. <br><br>(2) Wenn Sie Ihr Werk als Audio-Datei exportieren möchten, benutzen Sie <b>Datei > Exportieren</b> und wählen das gewünschte Format aus. Über Optionen können Sie Details wie z. B. die Bitrate bei MP3-Dateien einstellen. Mit Datei > Auswahl exportieren wird nur der vorher ausgewählte Bereich exportiert, mit \"Mehrere Dateien exportieren\" können Sie z.B. bei einem Mehrspurprojekt jede Spur als separate Datei exportieren.<br><br>Bevor Sie eine MP3-Datei exportieren können, müssen Sie auf Ihrem Computer den <b>LAME MP3 Encoder</b> hinzufügen/einbinden. Mehr zu LAME finden Sie unter [[wiki:Lame_Installation|Lame-Installation]]. Außerdem gibt es eine Hilfe zum [[burncd|Brennen einer CD]].<br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
 
-#: HelpText.cpp:280
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, or most other proprietary formats, because of licensing and patent restrictions.Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:301
-msgid "If you want to burn your work to an audio CD, you must first [[export|export as WAV or AIFF]] and then burn that file to CD - for more help, see [[wiki:How to burn CDs|How to burn CDs]].<br><br>"
-msgstr "Wenn Sie Ihre Arbeit auf eine Audio-CD brennen wollen, müssen Sie sie zunächst [[export as WAV or AIFF|exportieren]] und diese Datei dann auf eine CD brennen - mehr Informationen dazu unter [[wiki:How to burn CDs|wie brenne ich CDs]].<br><br>"
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
 
-#: HelpText.cpp:279
-msgid "<p>You don't appear to have Audacity help files on your machine. "
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:280
-msgid "You can download the help files and then access them from Audacity or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:53
@@ -1334,6 +1558,10 @@ msgstr "Projekt &speichern\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Projekt speichern &unter...\tCtrl+Shift+S"
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: ../src/Menus.cpp:211
 msgid "Chec&k Dependencies..."
 msgstr "Abhängigkeiten &überprüfen..."
@@ -1342,6 +1570,10 @@ msgstr "Abh
 msgid "Open Me&tadata Editor..."
 msgstr "Metadaten-Editor..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: ../src/Menus.cpp:224
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audio...\tCtrl+Shift+I"
@@ -1371,11 +1603,27 @@ msgstr "&Textspur exportieren..."
 msgid "Export &Multiple..."
 msgstr "Mehrere Dateien ex&portieren..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: ../src/Menus.cpp:328
 #: ../src/Menus.cpp:342
 msgid "Edit C&hains..."
 msgstr "Stapel&verarbeitung bearbeiten..."
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: ../src/Menus.cpp:340
 msgid "Appl&y Chain..."
 msgstr "Stapel&verarbeitung anwenden..."
@@ -1437,9 +1685,9 @@ msgstr "&L
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "L&öschen und trennen\tCtrl+Alt+K"
 
-#: ../src/Menus.cpp:418
-msgid "&Silence\tCtrl+L"
-msgstr "Auswa&hl in Stille umwandeln\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: ../src/Menus.cpp:420
 msgid "Sp&lit\tCtrl+I"
@@ -1453,21 +1701,21 @@ msgstr "In neue T&onspur verschieben\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "Cl&ips verbinden\tCtrl+J"
 
-#: ../src/Menus.cpp:431
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "&Bei Stille trennen\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: ../src/Menus.cpp:433
 msgid "Duplic&ate\tCtrl+D"
 msgstr "In neue T&onspur kopieren\tCtrl+D"
 
-#: ../src/Menus.cpp:633
-msgid "&Stereo To Mono"
-msgstr "Stereo in &Mono umwandeln "
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: ../src/Menus.cpp:446
-msgid "Labeled Re&gions..."
-msgstr "Auswahl in Te&xtspur..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #: ../src/Menus.cpp:447
 msgid "&Cut\tAlt+X"
@@ -1501,13 +1749,14 @@ msgstr "Au&sschneiden und Clip trennen\tAlt+I"
 msgid "&Join\tAlt+J"
 msgstr "Clips &verbinden\tAlt+J"
 
-#: ../src/Menus.cpp:481
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Bei Stille trennen\tShift+Alt+J"
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
-msgstr "Auswählen"
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: ../src/Menus.cpp:488
 msgid "&All\tCtrl+A"
@@ -1517,65 +1766,69 @@ msgstr "&Alles\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Nichts\tCtrl+Shift+A"
 
-#: ../src/Menus.cpp:492
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
 msgstr "&Links vom Cursor bis...\t["
 
-#: ../src/Menus.cpp:493
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
 msgstr "&Rechts vom Cursor bis...\t]"
 
-#: ../src/Menus.cpp:497
-msgid "Start to Cursor"
-msgstr "&Bis zum Anfang der Spur"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:498
-msgid "Cursor to End"
-msgstr "Bis zum &Ende der Spur"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: ../src/Menus.cpp:504
 msgid "Find &Zero Crossings\tZ"
 msgstr "Null&durchgang finden\tZ"
 
-#: ../src/Menus.cpp:506
-msgid "Mo&ve Cursor..."
-msgstr "Cursor &verschieben..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:508
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "An den &Anfang der Auswahl"
 
-#: ../src/Menus.cpp:509
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "Ans &Ende der Auswahl"
 
-#: ../src/Menus.cpp:513
-msgid "to Track Start"
-msgstr "An den Anfang der &Spur"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:514
-msgid "to Track End"
-msgstr "Ans Ende der S&pur"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:521
-msgid "Selection Save"
-msgstr "Auswahl s&peichern"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:522
-msgid "Selection Restore"
-msgstr "Auswahl &wiederherstellen"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: ../src/Menus.cpp:538
-msgid "Play &Region..."
-msgstr "Im Lineal markierten Bereich&..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
-#: ../src/Menus.cpp:539
-msgid "Lock"
-msgstr "Fixieren"
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr ""
 
-#: ../src/Menus.cpp:540
-msgid "Unlock"
-msgstr "Lösen"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr ""
 
 #: ../src/Menus.cpp:546
 msgid "Turn Snap-To On"
@@ -1593,9 +1846,14 @@ msgstr "Einrasten am Gitter aktivieren"
 msgid "Turn Grid Snap Off"
 msgstr "Einrasten am Gitter deaktivieren"
 
-#: ../src/Menus.cpp:558
-msgid "&Preferences...\tCtrl+P"
-msgstr "Ein&stellungen...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:568
 msgid "&View"
@@ -1633,77 +1891,133 @@ msgstr "Spuren &zusammenfalten\tCtrl+Shift+C"
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "Spuren au&seinanderfalten\tCtrl+Shift+X"
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+#, fuzzy
+msgid "&Show Clipping"
 msgstr "Übersteuerungen anzeigen"
 
 #: ../src/Menus.cpp:591
 msgid "&History..."
 msgstr "&Verlauf..."
 
-#: ../src/Menus.cpp:596
-msgid "&Toolbars..."
-msgstr "&Werkzeugleisten..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
-#: Menus.cpp:624
-#: Menus.cpp:1216
-#: Menus.cpp:1217
-msgid "Control Toolbar"
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
 msgstr "Wiedergabewerkzeuge"
 
-#: Menus.cpp:625
-#: Menus.cpp:1220
-#: Menus.cpp:1221
-msgid "Device Toolbar"
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
 msgstr "Aufnahmegeräte"
 
-#: Menus.cpp:626
-#: Menus.cpp:1224
-#: Menus.cpp:1225
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
 msgstr "Bearbeitungswerkzeuge"
 
-#: Menus.cpp:627
-#: Menus.cpp:1228
-#: Menus.cpp:1229
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
 msgstr "Aussteuerungsanzeige"
 
-#: Menus.cpp:628
-#: Menus.cpp:1232
-#: Menus.cpp:1233
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
 msgstr "Pegelregler"
 
-#: Menus.cpp:629
-#: Menus.cpp:1236
-#: Menus.cpp:1237
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
 msgstr "Zeit-/Projektfrequenzleiste"
 
-#: Menus.cpp:630
-#: Menus.cpp:1240
-#: Menus.cpp:1241
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
 msgstr "Kontrollwerkzeuge"
 
-#: Menus.cpp:631
-#: Menus.cpp:1244
-#: Menus.cpp:1245
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
 msgstr "Transkriptionswerkzeug"
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:576
+#, fuzzy
+msgid "&Reset Toolbars"
 msgstr "Werkzeugleisten zurücksetzen"
 
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:854
+msgid "Skip to Start\tHome"
+msgstr "An den Anfang springen\tHome"
+
+#: ../src/Menus.cpp:855
+msgid "Skip to End\tEnd"
+msgstr "Ans Ende springen\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: ../src/Menus.cpp:614
 msgid "&Tracks"
 msgstr "&Spuren"
 
-#: ../src/Menus.cpp:621
-msgid "Add &New..."
-msgstr "&Neue Spur anlegen..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: ../src/Menus.cpp:622
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1717,13 +2031,9 @@ msgstr "&Stereospur"
 msgid "&Time Track"
 msgstr "&Zeitspur"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr "Zeitgesteuerte Aufnahme..."
-
-#: ../src/Menus.cpp:637
-msgid "&Mix and Render"
-msgstr "Spuren zusammenf&ühren"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
+msgstr ""
 
 #: Menus.cpp:564
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
@@ -1737,6 +2047,14 @@ msgstr "Samplefre&quenz der Spur 
 msgid "Remo&ve Tracks"
 msgstr "Spur(en) ent&fernen"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:658
 msgid "Align with &Zero"
 msgstr "Anfang an &Null ausrichten"
@@ -1753,29 +2071,41 @@ msgstr "Anfang an &Anfang der Auswahl ausrichten"
 msgid "Align with Selection &End"
 msgstr "Anfang an &Ende der Auswahl ausrichten"
 
-#: ../src/Menus.cpp:662
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Ende an C&ursor ausrichten"
 
-#: ../src/Menus.cpp:663
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Ende an An&fang der Auswahl ausrichten"
 
-#: ../src/Menus.cpp:664
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Ende an Ende der Aus&wahl ausrichten"
 
-#: ../src/Menus.cpp:665
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "T&onspuren aneinander ausrichten"
 
-#: ../src/Menus.cpp:667
-msgid "&Align Tracks..."
-msgstr "&Tonspur(en) ausrichten..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
 
-#: ../src/Menus.cpp:676
-msgid "Ali&gn And Move Cursor..."
-msgstr "&Cursor ausrichten..."
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: ../src/Menus.cpp:684
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1785,22 +2115,26 @@ msgstr "Textmarke an Cursor/Auswahl &hinzuf
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Textmarke während &Wiedergabe hinzufügen\tCtrl+M"
 
-#: ../src/Menus.cpp:691
-msgid "S&ort tracks by..."
-msgstr "Spuren s&ortieren nach..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: ../src/Menus.cpp:692
-msgid "&Start time"
-msgstr "Beginn"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: ../src/Menus.cpp:694
-msgid "&Name"
-msgstr "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: ../src/Menus.cpp:704
 msgid "&Generate"
 msgstr "Er&zeugen"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:727
 msgid "Effe&ct"
 msgstr "&Effekt"
@@ -1834,6 +2168,10 @@ msgstr "Willkommen-Text anzeigen..."
 msgid "&Index..."
 msgstr "Inhalt..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr "Screenshot-Werkzeuge..."
@@ -1846,13 +2184,13 @@ msgstr "Benchma&rk ausf
 msgid "&Audio Device Info..."
 msgstr "Sound&karten-Info..."
 
-#: ../src/Menus.cpp:827
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Kreisförmig rückwärts navigieren durch Dock, Spuransicht und Auswahlbalken\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: ../src/Menus.cpp:828
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Kreisförmig navigieren durch Dock, Spuransicht und Auswahlbalken\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: ../src/Menus.cpp:831
 msgid "Selection Tool\tF1"
@@ -1886,9 +2224,9 @@ msgstr "N
 msgid "Previous Tool\tA"
 msgstr "Vorheriges Werkzeug\tA"
 
-#: ../src/Menus.cpp:841
-msgid "Play/Stop\tSpacebar"
-msgstr "Wiedergabe/Stopp\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:842
 msgid "Stop\tS"
@@ -1902,13 +2240,13 @@ msgstr "Pause\tP"
 msgid "Record\tR"
 msgstr "Aufnahme\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: ../src/Menus.cpp:846
-msgid "Stop and Select\tShift+A"
-msgstr "Stoppen und Markierung setzen\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr ""
 
 #: ../src/Menus.cpp:848
 msgid "Play One Second\t1"
@@ -1922,22 +2260,14 @@ msgstr "Wiedergabe bis zur Markierung\tB"
 msgid "Play Looped\tL"
 msgstr "Wiedergabe (endlos)\tL"
 
-#: ../src/Menus.cpp:851
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Loop/Endloswiedergabe\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: ../src/Menus.cpp:852
 msgid "Play Cut Preview\tC"
 msgstr "Schnitt vorhören\tC"
 
-#: ../src/Menus.cpp:854
-msgid "Skip to Start\tHome"
-msgstr "An den Anfang springen\tHome"
-
-#: ../src/Menus.cpp:855
-msgid "Skip to End\tEnd"
-msgstr "Ans Ende springen\tEnd"
-
 #: ../src/Menus.cpp:857
 msgid "Selection to Start\tShift+Home"
 msgstr "Auswahl auf Anfang\tShift+Home"
@@ -1994,9 +2324,9 @@ msgstr "Zwischen ausgew
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Zwischen ausgewählten Spuren umschalten\tNUMPAD_ENTER"
 
-#: ../src/Menus.cpp:884
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Zwischen ausgewählten Spuren umschalten\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: ../src/Menus.cpp:887
 msgid "Cursor Left\tLeft"
@@ -2094,15 +2424,19 @@ msgstr "Einrasten an"
 msgid "Snap To Off"
 msgstr "Einrasten aus"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: ../src/Menus.cpp:918
 msgid "Open Recent"
 msgstr "Zuletzt geöffnete Dateien öffnen"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: ../src/Menus.cpp:921
-msgid "Recent &Files..."
-msgstr "&Zuletzt geöffnete Dateien..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:981
 #, c-format
@@ -2159,6 +2493,23 @@ msgstr "Wiederholen: %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Es gibt keine Textspuren zu exportieren."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:2265
 msgid "Nothing to undo"
 msgstr "Nichts zum Rückgängigmachen"
@@ -2202,6 +2553,10 @@ msgstr "Aus der Zwischenablage eingef
 msgid "Pasted from the clipboard"
 msgstr "Aus der Zwischenablage eingefügt"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: ../src/Menus.cpp:2583
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Stereoclips können nicht in eine Monospur kopiert werden."
@@ -2371,9 +2726,9 @@ msgstr "Textspur importieren"
 msgid "Select a MIDI file..."
 msgstr "MIDI-Datei auswählen..."
 
-#: ../src/Menus.cpp:3583
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Alle Dateien (*.*)|*.*|MIDI (*.mid)|*.mid|Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:3599
 #, c-format
@@ -2392,14 +2747,6 @@ msgstr "Unkomprimierte Audiodatei ausw
 msgid "All files (*)|*"
 msgstr "Alle Dateien (*.*)|*.*"
 
-#: ../src/import/ImportPCM.cpp:405
-#: ../src/import/ImportPCM.cpp:449
-#: ../src/Menus.cpp:3633
-#: ../src/Project.cpp:2285
-#: ../src/Project.cpp:2310
-msgid "Import"
-msgstr "Importieren"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr "Metadaten bearbeiten"
@@ -2431,6 +2778,10 @@ msgstr "%d Spuren in eine neue Stereospur zusammengef
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "%d Spuren in eine neue Monospur zusammengeführt"
 
+#: ../src/Menus.cpp:637
+msgid "&Mix and Render"
+msgstr "Spuren zusammenf&ühren"
+
 #: ../src/Menus.cpp:3832
 msgid "Aligned with zero"
 msgstr "An Null ausgerichtet"
@@ -2467,6 +2818,14 @@ msgstr "Ausgerichtet"
 msgid "Align"
 msgstr "Ausrichten"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:3916
 msgid "Created new audio track"
 msgstr "Neue Tonspur erstellt"
@@ -2534,14 +2893,14 @@ msgid "Removed audio track(s)"
 msgstr "Tonspur(en) entfernt"
 
 #: ../src/Menus.cpp:4435
-msgid "Enter new samplerate:"
-msgstr "Neue Samplefrequenz eingeben:"
-
-#: ../src/Menus.cpp:4435
 #: ../src/Menus.cpp:4454
 msgid "Resample"
 msgstr "Samplefrequenz ändern"
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: ../src/Menus.cpp:4441
 msgid "The entered value is invalid"
 msgstr "Der eingegebene Wert ist ungültig"
@@ -2608,14 +2967,13 @@ msgstr "Audio aufgezeichnet"
 msgid "Save changes before closing?"
 msgstr "Änderungen vor dem Schließen speichern?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1336
@@ -2635,6 +2993,25 @@ msgstr "Datei(en) ausw
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: ../src/Project.cpp:1902
+msgid "Opening old project file"
+msgstr "Alte Projektdatei öffnen"
+
 #: ../src/Project.cpp:1571
 #: ../src/Project.cpp:1579
 msgid "Error opening file"
@@ -2695,41 +3072,34 @@ msgstr "Diese Datei wurde mit Audacity %s gespeichert.\n"
 msgid "Can't open project file"
 msgstr "Kann Projektdatei nicht öffnen."
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: ../src/Project.cpp:1902
-msgid "Opening old project file"
-msgstr "Alte Projektdatei öffnen"
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
 
-#: ../src/Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Konnte Projekt nicht speichern. Mögliche Ursache:\n"
-"%s ist schreibgeschützt oder die Festplatte ist voll."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2126
 #: ../src/Project.cpp:2140
@@ -2741,22 +3111,19 @@ msgstr "Fehler beim Speichern des Projekts."
 msgid "Saved %s"
 msgstr "%s wurde gespeichert"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2218
-msgid "Raw"
-msgstr "Rohdaten"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr "%s importieren..."
-
 #: ../src/Project.cpp:2284
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' importiert"
 
+#: ../src/import/ImportPCM.cpp:405
+#: ../src/import/ImportPCM.cpp:449
+#: ../src/Menus.cpp:3633
+#: ../src/Project.cpp:2285
+#: ../src/Project.cpp:2310
+msgid "Import"
+msgstr "Importieren"
+
 #: ../src/Project.cpp:2324
 msgid "Error importing"
 msgstr "Fehler beim Importieren."
@@ -2769,17 +3136,23 @@ msgstr "Projekt speichern unter:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows-PCM-Audiodatei (*.wav)|*.wav"
 
-#: ../src/Project.cpp:2373
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity Projektdateien (.aup) erlauben ihnen das exakte Speichern\n"
-"ihrer Arbeit, sind in der Regel jedoch nicht in anderen Programmen\n"
-"zu öffnen. Wollen sie Ihre Werke also zur Nutzung in anderer Software\n"
-"weitergeben, exportieren sie Ihr Audacity-Projekt bitte mit Hilfe der\n"
-" Exportfunktionen."
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2376
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2825,6 +3198,16 @@ msgstr "Verbleibende Restzeit f
 msgid "Out of disk space"
 msgstr "Kein Platz mehr auf der Festplatte verfügbar"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: ../src/Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr "Alte Sicherheitskopie konnte nicht entfernt werden:"
@@ -2913,49 +3296,13 @@ msgstr "Vorh
 msgid "&Debug"
 msgstr "&Diagnose"
 
-#: ../src/SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Zeitgesteuerte Aufnahme"
-
-#: ../src/SmartRecordDialog.cpp:212
-msgid "Recording start: "
-msgstr "Beginn der Aufnahme: "
-
-#: ../src/SmartRecordDialog.cpp:213
-msgid "\n"
-"\n"
-"Recording end:   "
-msgstr "\n"
-"\n"
-"Ende der Aufnahme:   "
-
-#: ../src/SmartRecordDialog.cpp:214
-msgid "          Duration: "
-msgstr "          Dauer:"
-
-#: ../src/SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr "Zeitgesteuerte Aufnahme: Fortschritt der Aufnahme"
-
-#: ../src/SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr "Beginn der Aufnahme"
-
-#: ../src/SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr "Ende der Aufnahme"
-
-#: ../src/SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr "Dauer der Aufnahme"
-
-#: ../src/SmartRecordDialog.cpp:361
-msgid "Waiting to start recording at "
-msgstr "Die Aufnahme wird starten "
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: ../src/SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Zeitgesteuerte Aufnahme: Startzeitpunkt abwarten"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:58
 msgid "&Welcome to Audacity!"
@@ -2994,10 +3341,9 @@ msgstr "Genre"
 msgid "Comments"
 msgstr "Bemerkungen"
 
-#: Tags.cpp:745
-#: Tags.cpp:1985
-msgid "Press F2 or double click to edit."
-msgstr "Werte bearbeiten mit Pfeiltasten und F2 oder ins Feld klicken."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:769
 msgid "Tag Name"
@@ -3015,16 +3361,13 @@ msgstr "Zur
 msgid "Genres"
 msgstr "Liste der Genres"
 
-#: Tags.cpp:795
-#: Tags.cpp:1406
-#: Tags.cpp:1947
-msgid "Edit"
-msgstr "Bearbeiten"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:796
-#: Tags.cpp:1948
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: ../src/Tags.cpp:1071
 msgid "Template"
@@ -3040,8 +3383,9 @@ msgstr "Laden..."
 msgid "&Save..."
 msgstr "Speichern..."
 
-#: ../src/Tags.cpp:1086
-msgid "S&et default"
+#: Tags.cpp:852 Tags.cpp:1477 Tags.cpp:2004
+#, fuzzy
+msgid "S&et Default"
 msgstr "Zurücksetzen"
 
 #: Tags.cpp:958
@@ -3086,6 +3430,16 @@ msgstr "Wollen Sie die Liste der Genres wirklich zur
 msgid "Unable to open genre file."
 msgstr "Genre-Datei kann nicht geöffnet werden."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1079
+#: Tags.cpp:1730
+#: Tags.cpp:2453
+msgid "Error loading metadata"
+msgstr "Fehler beim Laden der Metadaten"
+
 #: Tags.cpp:1054
 #: Tags.cpp:1108
 #: Tags.cpp:1709
@@ -3095,105 +3449,6 @@ msgstr "Genre-Datei kann nicht ge
 msgid "Save Metadata As:"
 msgstr "Metadaten speichern unter:"
 
-#: Tags.cpp:1079
-#: Tags.cpp:1730
-#: Tags.cpp:2453
-msgid "Error loading metadata"
-msgstr "Fehler beim Laden der Metadaten"
-
-#: Tags.cpp:1376
-#: Tags.cpp:1935
-msgid "Title:"
-msgstr "Titel:"
-
-#: Tags.cpp:1377
-#: Tags.cpp:1936
-msgid "Artist:"
-msgstr "Künstler:"
-
-#: Tags.cpp:1378
-#: Tags.cpp:1937
-msgid "Album:"
-msgstr "CD:"
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr "Komponist:"
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr "Text:"
-
-#: Tags.cpp:1381
-#: Tags.cpp:1940
-msgid "Comments:"
-msgstr "Kommentare:"
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr "Kodiert von:"
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: Tags.cpp:1391
-#: Tags.cpp:1938
-msgid "Track Number:"
-msgstr "Stück Nummer:"
-
-#: Tags.cpp:1395
-#: Tags.cpp:1939
-msgid "Year:"
-msgstr "Jahr:"
-
-#: Tags.cpp:1399
-#: Tags.cpp:1941
-msgid "Genre:"
-msgstr "Genre:"
-
-#: Tags.cpp:1457
-#: Tags.cpp:2056
-msgid "No Genres"
-msgstr "Kein Genre"
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr "Zurücksetzen"
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr "Wert"
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr ""
-
-#: ../src/Tags.cpp:702
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Die maximale Länge für '%s' beträgt %d Zeichen. Es wurde gekürzt."
-
-#: ../src/Tags.cpp:708
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/Tags.cpp:718
-msgid "Artist"
-msgstr "Künstler"
-
-#: ../src/Tags.cpp:728
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:628
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3274,9 +3529,52 @@ msgstr "All erforderlichen Dateien in:\n"
 "  %s\n"
 "waren schon vorhanden."
 
-#: ../src/TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "Zeiteingabe"
+#: ../src/SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr "Dauer der Aufnahme"
+
+#: ../src/SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Zeitgesteuerte Aufnahme"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr ""
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: ../src/SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr "Beginn der Aufnahme"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: ../src/SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr "Ende der Aufnahme"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: ../src/TrackPanel.cpp:451
 #: ../src/TrackPanel.cpp:452
@@ -3318,6 +3616,10 @@ msgstr "Wellenform"
 msgid "Waveform (dB)"
 msgstr "Wellenform (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:511
 msgid "Pitch (EAC)"
 msgstr "Tonhöhe (EAC)"
@@ -3464,14 +3766,13 @@ msgstr "Spur(en)/Clips wurden um %s %.02f Sekunden verschoben"
 msgid "Time-Shift"
 msgstr "Zeitverschiebung"
 
-#: ../src/TrackPanel.cpp:2694
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "Das Zeichnen funktioniert zur Zeit nur, wenn Sie im \n"
-"Spurkopf \"Wellenform\" als Anzeigeart gewählt haben."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: ../src/TrackPanel.cpp:2711
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Sie haben nicht gengend eingezoomt. Zoomen sie so weit ein, bis sie die einzelnen Samples erkennen können."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2982
 msgid "Moved Sample"
@@ -3563,6 +3864,14 @@ msgstr "Panorama eingestellt"
 msgid "Adjusted gain"
 msgstr "Lautstärke eingestellt"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:5426
 msgid "Can't delete track with active audio"
 msgstr "Spur mit aktivem Audio kann nicht gelöscht werden"
@@ -3620,14 +3929,6 @@ msgstr "
 msgid "Format Change"
 msgstr "Format ändern"
 
-#: ../src/TrackPanel.cpp:5814
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Samplefrequenz (1 bis 100000 Hz):"
-
-#: ../src/TrackPanel.cpp:5824
-msgid "Invalid rate."
-msgstr "Ungültige Samplefrequenz."
-
 #: ../src/TrackPanel.cpp:5844
 msgid "Change lower speed limit (%) to:"
 msgstr "Untere Geschwindigkeitsgrenze in % der Originalgeschwindigkeit:"
@@ -3766,8 +4067,8 @@ msgstr "Plugins 1 bis %i"
 msgid "Plugins %i to %i"
 msgstr "Plugins %i bis %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3789,8 +4090,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:854
@@ -3811,14 +4112,19 @@ msgstr "Effekt angewandt: %s %.1f dB"
 msgid "Amplify"
 msgstr "Verstärken"
 
-#: ../src/effects/Amplify.cpp:153
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Verstärken von Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:160
 msgid "Amplification (dB):"
 msgstr "Verstärkung (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:180
 msgid "New Peak Amplitude (dB):"
 msgstr "Neue Spitzenamplitude (dB):"
@@ -3827,6 +4133,10 @@ msgstr "Neue Spitzenamplitude (dB):"
 msgid "Allow clipping"
 msgstr "Übersteuerung erlauben"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "&Verstärken..."
@@ -3938,10 +4248,18 @@ msgstr "von Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Frequenz (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Anhebung (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: ../src/effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "&Bass-Verstärkung..."
@@ -3982,9 +4300,50 @@ msgstr "(Vaughan Johnson && Dominic Mazzoni)"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "SoundTouch (Olli Parviainen)"
 
-#: ../src/effects/ChangePitch.cpp:268
-msgid "Pitch:   from"
-msgstr "Tonhöhe von"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:305
+msgid "Semitones (half-steps):"
+msgstr "Halbtonschritte:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.cpp:369
 #: ../src/effects/ChangePitch.cpp:290
@@ -3994,13 +4353,9 @@ msgstr "Tonh
 msgid "to"
 msgstr "to"
 
-#: ../src/effects/ChangePitch.cpp:305
-msgid "Semitones (half-steps):"
-msgstr "Halbtonschritte:"
-
-#: ../src/effects/ChangePitch.cpp:324
-msgid "Frequency (Hz):   from"
-msgstr "Frequenz (Hz):   von"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.cpp:323
 #: ../src/effects/ChangePitch.cpp:359
@@ -4009,6 +4364,11 @@ msgstr "Frequenz (Hz):   von"
 msgid "Percent Change:"
 msgstr "Änderung in %:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Tonhöhe &ändern..."
@@ -4027,6 +4387,14 @@ msgstr "Effekt angewandt: %s %.1f %%"
 msgid "Change Speed"
 msgstr "Geschwindigkeit ändern"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: ../src/effects/ChangeSpeed.cpp:356
+msgid "n/a"
+msgstr "nicht wichtig"
+
 #: ../src/effects/ChangeSpeed.cpp:300
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Geschwindigkeit ändern (Tonhöhe und Geschwindigkeit)"
@@ -4035,17 +4403,17 @@ msgstr "Geschwindigkeit 
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "(SampleRate von Erik de Castro Lopo)"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:356
-msgid "n/a"
-msgstr "nicht wichtig"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:359
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standard Vinyl (UPM):   von"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4063,13 +4431,29 @@ msgstr "Tempo 
 msgid "Change Tempo without Changing Pitch"
 msgstr "Tempo ändern (ohne Auswirkung auf die Tonhöhe)"
 
-#: ../src/effects/ChangeTempo.cpp:228
-msgid "Beats per Minute (BPM):   from"
-msgstr "Beats pro Minute (BPM)    ab"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:258
-msgid "Length (seconds):   from"
-msgstr "Länge (Sek):   von"
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4079,8 +4463,9 @@ msgstr "&Tempo 
 msgid "Changing Tempo"
 msgstr "Ändere Tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Klick entfernen"
 
 #: ../src/effects/ClickRemoval.cpp:359
@@ -4091,10 +4476,18 @@ msgstr "Klick-Filter von Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Schwellwert einstellen (niedriger ist empfindlicher):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Maximale Klick-Länge (höher ist empfindlicher):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "&Klick-Filter..."
@@ -4107,49 +4500,86 @@ msgstr "Klicks und Pops entfernen..."
 msgid "Dynamic Range Compressor"
 msgstr "Dynamikkompressor"
 
-#: ../src/effects/Compressor.cpp:468
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dynamikkompressor von Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:486
-msgid "Ratio: "
-msgstr "Kompression:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:493
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Ansprechzeit:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Abkling-Zeit:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: ../src/effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalisieren auf 0dB nach Kompression"
 
-#: ../src/effects/Compressor.cpp:559
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Grenzwert: %d dB"
 
-#: ../src/effects/Compressor.cpp:562
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Kompression: %.0f : 1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:564
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Kompression: %.1f zu 1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:566
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Ansprechzeit: %.1f Sek."
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Abkling-Zeit: %.1f Sekunden"
 
 #: ../src/effects/Compressor.h:36
@@ -4160,6 +4590,252 @@ msgstr "K&ompressor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Dynamikkompression anwenden..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: ../src/effects/ToneGen.cpp:328
+#: ../src/toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Start"
+
+#: ../src/effects/ToneGen.cpp:329
+#: ../src/toolbars/SelectionBar.cpp:129
+#: ../src/toolbars/SelectionBar.cpp:226
+#: ../src/toolbars/ControlToolBar.cpp:189
+msgid "End"
+msgstr "Ende"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796
+#: Tags.cpp:1948
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:235
+#: ../src/effects/ChangeLength.cpp:131
+msgid "Information"
+msgstr "Programm-Informationen"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: ../src/toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Wiedergabewerkzeuge"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: ../src/effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr "Mehrfrequenz-Tongenerator"
@@ -4177,9 +4853,9 @@ msgstr "Ziffernfolge:"
 msgid "Amplitude (0-1)"
 msgstr "Amplitude (0-1)"
 
-#: ../src/effects/DtmfGen.cpp:390
-msgid "DTMF duration:"
-msgstr "Ton-Dauer"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
 
 #: ../src/effects/DtmfGen.cpp:408
 msgid "Tone/silence ratio:"
@@ -4409,17 +5085,14 @@ msgstr "&Invertieren"
 msgid "Inverting"
 msgstr "Invertieren (\"Phasendrehen\")"
 
-#: ../src/effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr "Stärker "
-
-#: ../src/effects/Leveller.cpp:47
-msgid "Heaviest"
-msgstr "Sehr stark"
+#: ../src/effects/Leveller.cpp:129
+#: ../src/BatchCommands.cpp:237
+msgid "Leveller"
+msgstr "Leveller"
 
 #: ../src/effects/Leveller.cpp:47
-msgid "Heavy"
-msgstr "Stark"
+msgid "None-Skip"
+msgstr "Kein"
 
 #: ../src/effects/Leveller.cpp:47
 msgid "Light"
@@ -4430,32 +5103,36 @@ msgid "Moderate"
 msgstr "Mittel"
 
 #: ../src/effects/Leveller.cpp:47
-msgid "None-Skip"
-msgstr "Kein"
+msgid "Heavy"
+msgstr "Stark"
 
-#: ../src/effects/Leveller.cpp:129
-#: ../src/BatchCommands.cpp:237
-msgid "Leveller"
-msgstr "Leveller"
+#: ../src/effects/Leveller.cpp:47
+msgid "Heavier"
+msgstr "Stärker "
 
-#: ../src/effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
-msgstr "Leveller von Lynn Allan"
+#: ../src/effects/Leveller.cpp:47
+msgid "Heaviest"
+msgstr "Sehr stark"
 
-#: effects/Leveller.cpp:216
-msgid "Equalize soft and loud sections"
-msgstr "Leise und laute Bereiche angleichen"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "von Lynn Allan"
 
 #: ../src/effects/Leveller.cpp:220
 msgid "Degree of Leveling"
 msgstr "Grad des Leveling"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: ../src/effects/Leveller.cpp:238
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Rausch-Grenzwert"
 
-#: ../src/effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Grenzwert für Rauschen:"
 
 #: ../src/effects/Leveller.h:28
@@ -4466,6 +5143,159 @@ msgstr "&Leveller..."
 msgid "Applying Leveller..."
 msgstr "Leveller anwenden..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: ../src/toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "Pegelregler"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:78
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:675
+#: ../src/BatchCommands.cpp:235
+msgid "Noise Removal"
+msgstr "Rauschentfernung"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: ../src/effects/Noise.cpp:37
 msgid "White"
 msgstr "Weißes Rauschen"
@@ -4482,10 +5312,6 @@ msgstr "Braunes Rauschen"
 msgid "Noise Generator"
 msgstr "Rauschgenerator"
 
-#: ../src/effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr "Dauer des Rauschens"
-
 #: effects/Noise.cpp:256
 #, fuzzy
 msgid "Noise type"
@@ -4516,11 +5342,6 @@ msgstr "Konnte Datei nicht 
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Audacity versucht die Rausch-Entfernung ohne Rauschprofil.\n"
 
-#: ../src/effects/NoiseRemoval.cpp:675
-#: ../src/BatchCommands.cpp:235
-msgid "Noise Removal"
-msgstr "Rauschentfernung"
-
 #: ../src/effects/NoiseRemoval.cpp:764
 msgid "Step 1"
 msgstr "Schritt 1"
@@ -4558,14 +5379,26 @@ msgstr "Rauschprofil ermitteln"
 msgid "Noise reduction (dB):"
 msgstr "Absenkung (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.cpp:800
 msgid "Frequency smoothing (Hz):"
 msgstr "Frequenz-Glättung (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.cpp:808
 msgid "Attack/decay time (secs):"
 msgstr "Ansprech-/Abklingzeit (s): "
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "&Rauschentfernung..."
@@ -4605,22 +5438,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalisieren"
 
-#: ../src/effects/Normalize.cpp:316
-msgid "Normalize by Dominic Mazzoni\n"
-msgstr "Normalisieren von Dominic Mazzoni\n"
-
-#: ../src/effects/Normalize.cpp:323
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Gleichspannungsanteil entfernen (ausrichten auf vertikal 0)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: ../src/effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
-msgstr "Normalisieren der Spitzenamplitude auf"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: ../src/effects/Normalize.cpp:336
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "N&ormalisieren..."
@@ -4634,44 +5467,56 @@ msgstr "Normalisiere..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Effekt: %s %d Stufen, %.0f%% WET, Frequenz = %.1f Hz, Phase Start = %.0f Grad, Tiefe = %d, Rückkopplung = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:78
-msgid "Phaser"
-msgstr "Phaser"
-
-#: ../src/effects/Phaser.cpp:477
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser von Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:484
 msgid "Stages:"
 msgstr "Stufen:"
 
-#: ../src/effects/Phaser.cpp:505
-msgid "DRY"
-msgstr "Original (\"trocken\")"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:512
-msgid "WET"
-msgstr "Effekt"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Wahwah.cpp:497
 #: ../src/effects/Phaser.cpp:526
 msgid "LFO Frequency (Hz):"
 msgstr "LFO Frequenz (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:513
 #: ../src/effects/Phaser.cpp:542
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO Anfangsphase (Grad):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:558
 msgid "Depth:"
 msgstr "Modulationstiefe:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:574
 msgid "Feedback (%):"
 msgstr "Rückkopplung (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "&Phaser..."
@@ -4688,6 +5533,14 @@ msgstr "Dieser Effekt kann nur auf extrem kurze Passagen angewandt werden.\n"
 "Bitte wählen sie eine stark vergrößerte Darstellung und selektieren\n"
 "dann maximal 128 Samples."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: ../src/effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr "Schadhaftes Audio reparieren"
@@ -4706,28 +5559,23 @@ msgstr "Die Spuren sind zu lang f
 msgid "Repeat"
 msgstr "Wiederholen "
 
-#: ../src/effects/Repeat.cpp:245
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Wiederholen (Dominic Mazzoni und Vaughan Johnson)"
-
-#: ../src/effects/Repeat.cpp:252
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Anzahl der Wiederholungen:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:264
 #: ../src/effects/Repeat.cpp:302
 msgid "New selection length: "
 msgstr "Neue Auswahllänge: "
 
-#: ../src/effects/Repeat.cpp:304
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d Minuten, %d Sekunden"
-
-#: ../src/effects/Repeat.cpp:307
-#, c-format
-msgid "%d seconds"
-msgstr "%d Sekunden"
+#: ../src/widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: ../src/effects/Repeat.h:32
 msgid "Repeat..."
@@ -4793,15 +5641,73 @@ msgstr "Spike-Cleaner..."
 msgid "Applying Spike Cleaner..."
 msgstr "Spike-Cleaner anwenden..."
 
-#: ../src/effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "Stereo in &Mono umwandeln "
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
 msgstr "Stereo in Mono umwandeln"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: ../src/effects/ToneGen.cpp:59
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr "Effekt angewandt: %s %s Ton erzeugt, Frequenz = %.2f Hz, Amplitude = %.2f, %.6lf Sekunden"
 
+#: ../src/widgets/Meter.cpp:356
+msgid "Linear"
+msgstr "Linear"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: ../src/effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr "Tongenerator"
@@ -4830,29 +5736,30 @@ msgstr "Rechteck, kein Aliasing"
 msgid "Frequency (Hz)"
 msgstr "Frequenz (Hz)"
 
-#: ../src/effects/ToneGen.cpp:300
-#: ../src/effects/ToneGen.cpp:338
-#: ../src/toolbars/SelectionBar.cpp:135
-#: ../src/toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr "Länge"
-
 #: ../src/effects/ToneGen.cpp:296
 #: ../src/effects/ToneGen.cpp:321
 msgid "Waveform:"
 msgstr "Wellenform:"
 
-#: ../src/effects/ToneGen.cpp:328
-#: ../src/toolbars/ControlToolBar.cpp:186
-msgid "Start"
-msgstr "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: ../src/effects/ToneGen.cpp:329
-#: ../src/toolbars/SelectionBar.cpp:129
-#: ../src/toolbars/SelectionBar.cpp:226
-#: ../src/toolbars/ControlToolBar.cpp:189
-msgid "End"
-msgstr "Ende"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr ""
 
 #: effects/ToneGen.h:39
 msgid "Chirp..."
@@ -4879,10 +5786,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr "Stille entfernen"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "von Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Maximale Dauer der Stille:"
@@ -4931,10 +5834,6 @@ msgstr "Effekt: %s Frequenz = %.1f Hz, Phase Start = %.0f Grad, Tiefe = %.0f%%,
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:490
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "WahWah von Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:529
 msgid "Depth (%):"
 msgstr "Modulationstiefe (%):"
@@ -4943,10 +5842,18 @@ msgstr "Modulationstiefe (%):"
 msgid "Resonance:"
 msgstr "Resonanzgte (Q):"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:561
 msgid "Wah Frequency Offset (%):"
 msgstr "Frequenzverschiebung (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "&Wahwah..."
@@ -4983,6 +5890,18 @@ msgstr "Effekteinstellungen"
 msgid "Length (seconds)"
 msgstr "Länge (Sek):   "
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:253
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist-Effekt anwenden..."
@@ -5020,12 +5939,6 @@ msgstr "Nyquist gab keine Audiodaten zur
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist gab zu viele Audiokanäle zurück.\n"
 
-#: effects/vamp/LoadVamp.cpp:53
-#: effects/vamp/VampEffect.cpp:238
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
 #: effects/vamp/VampEffect.cpp:75
 #, c-format
 msgid "Extracting features: %s"
@@ -5055,10 +5968,13 @@ msgstr ""
 msgid "Program"
 msgstr "Programm"
 
-#: ../src/export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr "Keine Spuren ausgewählt."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
 
 #: export/Export.cpp:445
 msgid "Export File"
@@ -5111,6 +6027,10 @@ msgstr "- Links"
 msgid " - Right"
 msgstr "- Rechts"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: ../src/export/Export.cpp:775
 #: ../src/export/Export.cpp:829
 #, c-format
@@ -5159,6 +6079,478 @@ msgstr "Gesamtes Projekt per Kommandozeilen Encoder exportieren"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:182
+#: ../src/prefs/FileFormatPrefs.cpp:207
+msgid "Bit Rate:"
+msgstr "Bitrate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:105
+msgid "Language:"
+msgstr "Sprache:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:219
+msgid "Quality:"
+msgstr "Qualität"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:197
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "FLAC-Optionen einstellen"
@@ -5231,10 +6623,6 @@ msgstr "Ausgew
 msgid "Exporting the entire project as FLAC"
 msgstr "Gesamtes Projekt als FLAC exportieren"
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr "Metadaten für die FLAC-Datei bearbeiten"
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr "MP2-Optionen einstellen"
@@ -5243,11 +6631,6 @@ msgstr "MP2-Optionen einstellen"
 msgid "MP2 Export Setup"
 msgstr "MP2-Exporteinstellungen"
 
-#: ../src/prefs/FileFormatPrefs.cpp:182
-#: ../src/prefs/FileFormatPrefs.cpp:207
-msgid "Bit Rate:"
-msgstr "Bitrate:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "MP2-Dateien"
@@ -5256,10 +6639,6 @@ msgstr "MP2-Dateien"
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "MP2 kann mit dieser Sample- bzw. Bitrate nicht exportiert werden."
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr "Metadaten für die MP2-Datei bearbeiten"
-
 #: ../src/export/ExportOGG.cpp:55
 #: ../src/export/ExportMP2.cpp:114
 #: ../src/export/ExportMP3.cpp:1632
@@ -5300,45 +6679,13 @@ msgstr "Gesamte Datei mit einer Bitrate von %d kbit/s exportieren"
 msgid "kbps"
 msgstr "kbit/s"
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "0, 220-260 kbit/s (Höchste Qualität)"
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr "1, 200-250 kbit/s"
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr "2, 170-210 kbit/s"
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr "3, 155-195 kbit/s"
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr "4, 145-185 kbit/s"
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr "5, 110-150 kbit/s"
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr "6, 95-135 kbit/s"
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr "7, 80-120 kbit/s"
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr "8, 65-105 kbit/s"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
-msgstr "9, 45-85 kbit/s (Kleinere Dateien)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr ""
 
 #: export/ExportMP3.cpp:178
 msgid "Fast"
@@ -5348,21 +6695,17 @@ msgstr "Schnell"
 msgid "Standard"
 msgstr "Standard"
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr "Übertrieben, 320 kbit/s"
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr "Extrem, 220-260 kbit/s"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
-msgstr "Standard, 170-210 kbit/s"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
-msgstr "Mittel, 145-185 kbit/s"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr ""
 
 #: export/ExportMP3.cpp:249
 msgid "Specify MP3 Options"
@@ -5392,6 +6735,11 @@ msgstr ""
 msgid "Constant"
 msgstr "Festwert"
 
+#: ../src/prefs/QualityPrefs.cpp:42
+#: ../src/prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Qualität"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr "Variable Geschwindigkeit:"
@@ -5417,35 +6765,15 @@ msgstr "Lame suchen"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity braucht die Datei %s um MP3s zu erzeugen."
 
-#: export/ExportMP3.cpp:639
-#, c-format
-msgid "Location of %s:"
-msgstr "%s steht in:"
-
-#: export/ExportMP3.cpp:648
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Um %s zu finden, bitte hier klicken -->"
-
-#: export/ExportMP3.cpp:654
-msgid "Browse..."
-msgstr "Durchsuchen..."
-
 #: export/ExportMP3.cpp:655
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Um eine freie Version von Lame zu erhalten bitte hier klicken -->"
 
-#: export/ExportMP3.cpp:656
-msgid "Download..."
-msgstr "Herunterladen..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:129
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Wo befindet sich die Datei: \"%s\"?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1407
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5455,8 +6783,9 @@ msgstr "Nur lame_enc.dll|lame_enc.dll|Dynamisch gelinkte Bibliotheken (*.dll)|*.
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:271
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Nur libmp3lame.so|libmp3lame.so|Bibliotheksdateien (*.so)|*.so| Extended Libraries (*.so*)|*.so*|Alle Dateien (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5475,11 +6804,6 @@ msgstr "Ungltige Bibliothek od. nicht untersttzter MP3-Encoder!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP2.cpp:106
-#: ../src/export/ExportMP3.cpp:1643
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "ID3-Tags (MP3) bearbeiten"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5515,10 +6839,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5531,18 +6851,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
-msgstr ""
-
-#: ../src/prefs/FileFormatPrefs.cpp:219
-msgid "MP3 exporting plugin not found"
-msgstr "Plugin nicht gefunden"
-
 #: ../src/export/ExportMultiple.cpp:480
 #: ../src/export/ExportMultiple.cpp:592
 #: ../src/export/ExportMultiple.cpp:599
@@ -5600,6 +6912,10 @@ msgstr "Tondaten vor der ersten Textmarke mit einschliessen"
 msgid "First file name:"
 msgstr "Erster Dateiname:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:784
 msgid "Tracks"
 msgstr "Spuren"
@@ -5620,14 +6936,14 @@ msgstr "Durchgehend numerieren"
 msgid "File name prefix:"
 msgstr "Erster Teil des Dateinamens:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:825
 msgid "Overwrite existing files"
 msgstr "Existierende Dateien überschreiben"
 
-#: ../src/export/ExportMultiple.cpp:847
-msgid "E&xport"
-msgstr "E&xportieren"
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5637,10 +6953,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Wählen Sie einen Ort für das Export-Verzeichnis aus"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5648,6 +6960,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5658,6 +6974,12 @@ msgstr "%d Datei(en) erfolgreich exportiert."
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Es ist ein Fehler aufgetreten beim Export von %d Datei/en."
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr "Ogg-Vorbis-Optionen einstellen"
@@ -5666,10 +6988,6 @@ msgstr "Ogg-Vorbis-Optionen einstellen"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg-Vorbis Export-Setup"
 
-#: prefs/FileFormatPrefs.cpp:219
-msgid "Quality:"
-msgstr "Qualität"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Ogg-Vorbis-Dateien"
@@ -5682,22 +7000,14 @@ msgstr "Auswahl als Ogg-Datei exportieren"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Gesamtes Projekt als Ogg-Datei exportieren"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5712,9 +7022,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Nicht alle Kombinationen aus\n"
 "Headern und Codecs sind möglich.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5731,13 +7052,43 @@ msgstr ""
 msgid "Exporting the entire project as %s"
 msgstr ""
 
-#: ../src/export/ExportPCM.cpp:140
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:531
 #, c-format
-msgid "Error (file may not have been written): %hs"
+#, fuzzy
+msgid "Error (file may not have been written): %s"
 msgstr "Fehler (Datei wurde vermutlich nicht geschrieben): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr "MP3-Dateien"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:177
@@ -5745,16 +7096,27 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Diese Version von Audacity wurde ohne %s Untersttzung kompiliert."
 
-#: import/Import.cpp:167
-msgid " is an audio CD track. \n"
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:250
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:174
+#: import/Import.cpp:256
+#, c-format
 #, fuzzy
-msgid " is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
 msgstr " ist eine Playlist-Datei.\n"
@@ -5764,45 +7126,101 @@ msgstr " ist eine Playlist-Datei.\n"
 "Diese Audiodateien können sie eventuell ausfindig machen,\n"
 "indem Sie die Playlist-Datei in einem Texteditor betrachten."
 
-#: import/Import.cpp:180
-msgid " is a Windows Media Audio file. \n"
+#: import/Import.cpp:261
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:186
-msgid " is an Advanced Audio Coding file. \n"
+#: import/Import.cpp:266
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:192
-msgid " is an encrypted audio file. These typically are from an online music store. \n"
+#: import/Import.cpp:271
+#, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:198
-msgid " is a RealPlayer media file. \n"
+#: import/Import.cpp:276
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
 msgstr ""
 
-#: ../src/import/Import.cpp:226
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity konnte den Datentyp nicht erkennen.\n"
-"Im Falle einer unkomprimierten Datei\n"
-"versuchen sie es mit \"Roh-Daten importieren\""
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5841,17 +7259,18 @@ msgstr "Midi-Spuren k
 msgid "Invalid track offset in LOF file."
 msgstr "Ungltiger Track-Offset in LOF-Datei."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Fehler beim Verarbeiten der Allegro-Datei."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Fehler beim Verarbeiten der MIDI-Datei."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr "MP3-Dateien"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:35
 msgid "Ogg Vorbis files"
@@ -5877,15 +7296,24 @@ msgstr "Ungltiger Vorbis Bitstream Header."
 msgid "Internal logic fault"
 msgstr "Interner Logikfehler"
 
-#: ../src/Project.cpp:2223
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importiere %s..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:277
 msgid "Import Raw Data"
 msgstr "Rohdaten importieren"
@@ -5927,6 +7355,14 @@ msgstr "2 Kan
 msgid "%d Channels"
 msgstr "%d Kanäle"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "0-Byte Offset:"
@@ -5939,8 +7375,17 @@ msgstr "Datenmenge:"
 msgid "Sample rate:"
 msgstr "Samplefrequenz:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/AudioIOPrefs.cpp:41
@@ -5984,9 +7429,9 @@ msgstr "Kan
 msgid "Playthrough"
 msgstr "Wiedergabe während Aufnahme"
 
-#: ../src/prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Multiplay: Bestehende Spuren während der Aufnahme einer neuen wiedergeben"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5996,8 +7441,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: ../src/prefs/AudioIOPrefs.cpp:194
@@ -6024,13 +7473,15 @@ msgstr ""
 msgid "Latency"
 msgstr "Latenz"
 
-#: ../src/prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
-msgstr "Audio-Puffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
 
-#: ../src/prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
-msgstr "Zusätzliche Latenz-Korrektur:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
 msgid "Seek Time when playing"
@@ -6058,23 +7509,10 @@ msgstr "Einstellungen"
 msgid "&Don't apply effects in batch mode"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks"
-msgstr ""
-
 #: ../src/prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "Clean-Speech-Modus (Angepasste Oberfläche)"
 
-#: ../src/prefs/GUIPrefs.cpp:94
-#: ../src/prefs/BatchPrefs.cpp:87
-msgid "Show / Hide"
-msgstr "Anzeigen / Verbergen"
-
-#: ../src/prefs/BatchPrefs.cpp:89
-msgid "S&how MP3-ID3 Dialog"
-msgstr "ID3-Dialog beim MP3-Speichern anzeigen"
-
 #: ../src/prefs/DirectoriesPrefs.cpp:55
 #: ../src/prefs/DirectoriesPrefs.cpp:56
 #: ../src/prefs/PrefsDialog.cpp:276
@@ -6101,9 +7539,9 @@ msgstr "Automatisch Sicherheitskopien anlegen"
 msgid "Auto save a copy of the project in a separate folder"
 msgstr "Sicherheitskopie des Projekts in einem separaten Verzeichnis anlegen"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:104
-msgid "Auto save every:"
-msgstr "Intervall:"
+#: prefs/DirectoriesPrefs.cpp:104
+msgid "Auto save interval:"
+msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:105
 msgid "minutes"
@@ -6114,7 +7552,7 @@ msgid "Audio cache"
 msgstr "Arbeitsspeicher-Verwaltung"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:121
@@ -6139,42 +7577,85 @@ msgstr "Verzeichnis %s ist nicht beschreibbar"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Änderungen am temporären Verzeichnis werden erst nach dem Neustart von Audacity wirksam."
 
-#: ../src/prefs/FileFormatPrefs.cpp:58
-#: ../src/prefs/FileFormatPrefs.cpp:59
-msgid "File Formats"
-msgstr "Dateiformate"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:124
-msgid "When importing uncompressed audio files into Audacity"
-msgstr "Beim Import unkomprimierter Audiodateien"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:127
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Kopie der zu bearbeitenden Datei anlegen (sicherer)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "MP3-Bibliothek:"
 
-#: ../src/prefs/FileFormatPrefs.cpp:128
-msgid "&Read directly from the original file (faster)"
-msgstr "Direkt aus der Originaldatei wiedergeben (schneller)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: ../src/prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
 msgstr "Beim Speichern eines Projekts, das auf andere Audios verweist"
 
+#: prefs/FileFormatPrefs.cpp:151
+msgid "Always &copy all audio into project (safest)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:152
+msgid "&Do not copy any audio"
+msgstr ""
+
 #: ../src/prefs/FileFormatPrefs.cpp:135
 msgid "&Ask user"
 msgstr "&Anwender/-in fragen"
 
-#: ../src/prefs/FileFormatPrefs.cpp:136
-msgid "Always &copy all audio (safest)"
-msgstr "&Immer alle Audios kopieren (sicherer)"
-
-#: ../src/prefs/FileFormatPrefs.cpp:137
-msgid "&Never copy any audio"
-msgstr "Audio &nicht kopieren"
-
-#: ../src/prefs/FileFormatPrefs.cpp:141
-msgid "When exporting tracks"
-msgstr "Beim Export von mehr als zwei Spuren"
+#: prefs/FileFormatPrefs.cpp:157
+msgid "When exporting tracks to an audio file"
+msgstr ""
 
 #: ../src/prefs/FileFormatPrefs.cpp:144
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
@@ -6184,16 +7665,8 @@ msgstr "&Spuren immer als Stereo- bzw. Mono-Datei speichern"
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "MP3-Bibliothek:"
-
-#: ../src/prefs/FileFormatPrefs.cpp:185
-msgid "&Find Library"
-msgstr "Suche Bibliothek"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download free copy of LAME"
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:33
@@ -6201,34 +7674,42 @@ msgstr ""
 msgid "Interface"
 msgstr "Programmoberfläche"
 
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:80
-msgid "&Dragging of left and right selection edges"
-msgstr "Ziehen der Auswahlkanten mit der Maus erlauben"
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Wiedergabewerkzeuge (Start, Stopp ...) ergonomisch anordnen"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
-msgstr "Aktuelle Spurnummer anzeigen (für Blinde)"
-
 #: ../src/prefs/GUIPrefs.cpp:90
 msgid "Editing a &clip can move other clips"
 msgstr "Nachfolgende Clips beim Schneiden verschieben"
@@ -6241,6 +7722,11 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: ../src/prefs/GUIPrefs.cpp:94
+#: ../src/prefs/BatchPrefs.cpp:87
+msgid "Show / Hide"
+msgstr "Anzeigen / Verbergen"
+
 #: ../src/prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr "Schnittlinien anzeigen"
@@ -6249,25 +7735,25 @@ msgstr "Schnittlinien anzeigen"
 msgid "Show warnings about &temp files"
 msgstr "Bei Programmstart ggf. auf temporäre Dateien hinweisen"
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:103
-msgid "Language"
-msgstr "Sprache:"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:105
-msgid "Language:"
-msgstr "Sprache:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:108
-msgid "Minimum of dB mode display range"
-msgstr "Minimaler Anzeigebereich in dB (optische Darstellung der \"leisesten Töne\")"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:111
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6277,6 +7763,10 @@ msgstr "-36 dB (Hochaussteuerung, \"Cassettenqualit
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (8-Bit Samples)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:113
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (16-Bit Samples, \"CD-Qualität\")"
@@ -6289,11 +7779,35 @@ msgstr "-120 dB (Grenze menschlichen Geh
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (24-Bit Samples)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/KeyConfigPrefs.cpp:61
 #: ../src/prefs/KeyConfigPrefs.cpp:62
 msgid "Keyboard"
 msgstr "Tastatur"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: ../src/prefs/KeyConfigPrefs.cpp:92
 msgid "Key Bindings"
 msgstr "Tastatur-Kürzel"
@@ -6326,10 +7840,6 @@ msgstr "Fehler beim Speichern der Tastatur-Shortcuts."
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Wählen sie eine Datei mit Audacity-Tastatur-Shortcuts aus..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:197
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:210
 msgid "Error loading keyboard shortcuts"
 msgstr "Fehler beim Laden der Tastatur-Shortcuts."
@@ -6348,6 +7858,42 @@ msgstr "Die Tastaturbelegung '%s' ist bereits vergeben f
 msgid "Undo"
 msgstr "Rückgängig"
 
+#: ../src/prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Multiplay: Bestehende Spuren während der Aufnahme einer neuen wiedergeben"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: ../src/prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr "Audio-Puffer:"
+
+#: ../src/prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr "Zusätzliche Latenz-Korrektur:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/MousePrefs.cpp:55
 #: ../src/prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -6581,11 +8127,6 @@ msgstr "Ein-/Auszoomen"
 msgid "Audacity Preferences"
 msgstr "Audacity Einstellungen"
 
-#: ../src/prefs/QualityPrefs.cpp:42
-#: ../src/prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "Qualität"
-
 #: ../src/prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "Rechteck"
@@ -6651,13 +8192,12 @@ msgstr "Hochwertig:"
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/SpectrumPrefs.cpp:36
@@ -6677,6 +8217,10 @@ msgstr "8 - Darstellung in sehr grober Aufl
 msgid "256 - default"
 msgstr "256 - Standardeinstellung"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:84
 msgid "4096 - most narrowband"
 msgstr "4096 - Sehr feine Auflösung"
@@ -6686,6 +8230,10 @@ msgstr "4096 - Sehr feine Aufl
 msgid "Window type:"
 msgstr "Fensterfunktion:"
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr "Anzeigen"
@@ -6702,6 +8250,26 @@ msgstr "Minimalfrequenz (Hz):"
 msgid "Maximum Frequency (Hz):"
 msgstr "Maximalfrequenz (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:134
 msgid "The maximum frequency must be an integer"
 msgstr "Der Wert für die Maximalfrequenz muss eine Ganzzahl sein"
@@ -6718,6 +8286,14 @@ msgstr "Die Minimalfrequenz muss eine Ganzzahl sein"
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr "Die Frequenz muss mindestens 0 Hz betragen"
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: ../src/prefs/ThemePrefs.cpp:61
 #: ../src/prefs/ThemePrefs.cpp:62
 msgid "Theme"
@@ -6799,10 +8375,6 @@ msgstr "Wenn Theme-Dateien einzeln gespeichert/geladen \n"
 "das Grundkonzept der Themes bleibt jedoch unverändert.\n"
 "\n"
 
-#: ../src/toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Wiedergabewerkzeuge"
-
 #: ../src/toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Pause (P)"
@@ -6811,9 +8383,9 @@ msgstr "Pause (P)"
 msgid "Play"
 msgstr "Wiedergabe"
 
-#: ../src/toolbars/ControlToolBar.cpp:178
-msgid "Play (Shift for loop-play)"
-msgstr "Wiedergabe (Leertaste; Loop-Wiedergabe mit Shift, Schnitt vorhören mit Strg)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/toolbars/ControlToolBar.cpp:183
 msgid "Stop"
@@ -6827,6 +8399,10 @@ msgstr "An den Anfang springen (Pos 1)"
 msgid "Skip to End"
 msgstr "Ans Ende springen (Ende)"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: ../src/toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Clean-Speech"
@@ -6862,6 +8438,10 @@ msgstr "Trimmen (umgekehrtes Ausschneiden) "
 msgid "Silence selection"
 msgstr "Auswahl in Stille umwandeln"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/toolbars/EditToolBar.cpp:149
 msgid "Zoom In"
 msgstr "Einzoomen"
@@ -6918,26 +8498,22 @@ msgstr "Aussteuerungsanzeige Wiedergabe"
 msgid "Input level meter - click to monitor input"
 msgstr "Aussteuerungsanzeige Eingang - Anklicken zum aktivieren"
 
-#: ../src/toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "Pegelregler"
-
 #: ../src/toolbars/MixerToolBar.cpp:91
 msgid "Output Volume"
 msgstr "Ausgangslautstärke"
 
-# WICHTIG! Das hier ist auch "Mixer-Ausgabelautstärke" (Markus)
-#: ../src/toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
 msgstr "Mixer-Ausgabelautstärke"
 
 #: ../src/toolbars/MixerToolBar.cpp:102
 msgid "Input Volume"
 msgstr "Aufnahmelautstärke"
 
-# stimmt das wort "regler"? -> eher "Mixer-Aufnahmelautstärke" (Markus)
-#: ../src/toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
 msgstr "Mixer-Aufnahmelautstärke"
 
 #: ../src/toolbars/MixerToolBar.cpp:119
@@ -6958,6 +8534,13 @@ msgstr "Projekt-Frequenz (Hz):"
 msgid "Selection Start:"
 msgstr "Anfang der Auswahl:"
 
+#: ../src/effects/ToneGen.cpp:300
+#: ../src/effects/ToneGen.cpp:338
+#: ../src/toolbars/SelectionBar.cpp:135
+#: ../src/toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr "Länge"
+
 #: ../src/toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr "versteckt"
@@ -7223,6 +8806,22 @@ msgstr "Rechts"
 msgid "Help"
 msgstr "Hilfe"
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr "Hilfe im Internet"
@@ -7270,14 +8869,14 @@ msgstr "Horizontal Stereo"
 msgid "Vertical Stereo"
 msgstr "Vertikal Stereo"
 
-#: ../src/widgets/Meter.cpp:356
-msgid "Linear"
-msgstr "Linear"
-
 #: ../src/widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr "Ein&stellungen..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 # irgendwas an diesem fenster (re-klick auf aussteuerungs-anzeige > eigenschaften) ist strange: egal wie kurz man die zeilen umbricht fehlt immer irgendwo das letzte wort ... -> wxWidgets 2.6 Bug, behoben in wxWidgets 2.8. Machs ruhig breiter (mit wxWidgets 2.8 siehst Du besser, was dabei rauskommt) (Markus)
 #: ../src/widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
@@ -7302,6 +8901,22 @@ msgstr "Aussteuerungs-Anzeige"
 msgid " Please select an action "
 msgstr "Bitte eine Aktion auswählen"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: ../src/widgets/Ruler.cpp:1110
 #: ../src/widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
@@ -7312,10 +8927,6 @@ msgstr "Vertikales Lineal"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 Sekunden"
 
-#: ../src/widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #: ../src/widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr "0100 h 060 m 060 s"
@@ -7328,6 +8939,21 @@ msgstr "dd:hh:mm:ss"
 msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 Tage 024 Stunden 060 Minuten 060 Sekunden"
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: ../src/widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr "hh:mm:ss + Millisekunden"
@@ -7441,10 +9067,10 @@ msgstr "Meldung nicht mehr anzeigen"
 msgid "Could not open file: \"%s\""
 msgstr "Konnte Datei nicht öffnen: \"%s\""
 
-#: ../src/xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Fehler: %hs bei Zeile %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/el.po b/locale/el.po
index 58830d0..12c6536 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -24,34 +24,24 @@ msgstr "Project-Id-Version: Audacity 1.3.3 b\n"
 msgid "&About Audacity..."
 msgstr "&Σχετικά με το Audacity..."
 
-#: AboutDialog.cpp:166
-#: effects/AvcCompressor.cpp:674
-msgid "Enabled"
-msgstr "Ενεργοποιημένο"
-
-#: AboutDialog.cpp:167
-msgid "Disabled"
-msgstr "Απενεργοποιημένο"
-
-#: AboutDialog.cpp:223
-msgid "Program build date: "
-msgstr "Ημερομηνία έκδοσης του προγράμματος: "
-
-#: AboutDialog.cpp:228
-msgid "Settings folder: "
-msgstr "Φάκελος ρυθμίσεων: "
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
+msgstr ""
 
-#: AboutDialog.cpp:233
-msgid "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."
-msgstr "Το Audacity είναι ένα ελεύθερο πρόγραμμα γραμμένο από μια ομάδα από εθελοντές από όλο τον κόσμο.  Ο συντονισμός επιτυγχάνεται χάρη στο SourceForge.net, μία διαδικτυακή υπηρεσία που παρέχει δωρεάν εργαλεία για εγχειρήματα ελεύθερου λογισμικού.  Το Audacity διατίθεται για Windows 98 και νεώτερα, Mac OS X, Linux, και άλλα λειτουργικά συστήματα τύπου Unix.  Παλαιότερες εκδόσεις του Audacity υπάρχουν και για Mac OS 9."
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
-#: AboutDialog.cpp:237
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Αυτή είναι μία δοκιμαστική έκδοση του προγράμματος.  Μπορεί να περιέχει σφάλματα και ημιτελή χαρακτηριστικά.  Βασιζόμαστε στην υποστήριξή σου, γι' αυτό σε παρακαλούμε να επισκεφτείς την ιστοσελίδα μας και να μας στείλεις τις αναφορές σφαλμάτων όπως και τις προτάσεις σου για το μέλλον."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:240
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Αυτή είναι μία σταθερή, πλήρης έκδοση του Audacity. Παρ' όλα αυτά, αν βρεις κάποιο σφάλμα ή έχεις κάποια πρόταση παρακαλούμε να επικοινωνήσεις μαζί μας. Βασιζόμαστε στις αναφορές των χρηστών για να συνεχίσουμε να βελτιώνουμε το Audacity.  Για περισσότερες πληροφορίες μπορείς να επισκευασθεί τον ιστοχώρο μας."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -70,13 +60,9 @@ msgstr "Ελληνική μετάφραση από τον Νίκο Παπαδό
 "παρατηρήσεις και προτάσεις στo e-mail: \n"
 "231036448 at freemail.gr"
 
-#: AboutDialog.cpp:265
-msgid "A Free Digital Audio Editor"
-msgstr "Ένα Ελεύθερο Πρόγραμμα Επεξεργασίας Ψηφιακού Ήχου"
-
-#: AboutDialog.cpp:269
-msgid "Information"
-msgstr "Πληροφορίες"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:271
 msgid "Credits"
@@ -112,27 +98,118 @@ msgstr "Το Audacity βασίζεται σε κώδικα από τις ακό
 msgid "Special thanks:"
 msgstr "Ευχαριστούμε Ιδιαίτερα:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:314
 msgid "Audacity"
 msgstr "Audacity"
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: AboutDialog.cpp:166
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
+
+#: AboutDialog.cpp:167
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
 msgstr ""
 
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:223
+msgid "Program build date: "
+msgstr "Ημερομηνία έκδοσης του προγράμματος: "
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:228
+msgid "Settings folder: "
+msgstr "Φάκελος ρυθμίσεων: "
+
 #: AboutDialog.cpp:376
 msgid "GPL License"
 msgstr "Άδεια GPL"
 
-#: AboutDialog.cpp:676
-#: Dependencies.cpp:308
-#: FreqWindow.cpp:209
-msgid "Close"
-msgstr "Κλείσιμο"
-
 #: AudacityApp.cpp:456
 #: Project.cpp:1714
 #, c-format
@@ -346,11 +423,12 @@ msgid "Recover Projects"
 msgstr "Ανάκτηση εργασιών"
 
 #: AutoRecovery.cpp:127
-msgid "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?"
-msgstr "Έχεις επιλέξει να μην ανακτήσεις καμιά εργασία. Δεν θα μπορείς να ανακτήσεις αυτές τις εργασίες αργότερα, αν αλλάξεις τη γνώμη σου. Θέλεις πραγματικά συνεχήσεις χωρίς να κάνεις ανάκτηση;"
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:146
@@ -402,8 +480,9 @@ msgstr "Π&αράμετροι"
 msgid "C&hoose command"
 msgstr "Ε&πιλογή εντολής"
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
 msgstr "Το Εφέ Από Στέρεο Σε Μονό δεν βρέθηκε"
 
 #: BatchCommands.cpp:497
@@ -454,6 +533,10 @@ msgstr "Εφαρμογή %s"
 msgid "Apply Chain"
 msgstr "Εφαρμογή _Μάσκας Επιπέδου"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 #, fuzzy
 msgid "&Select chain"
@@ -502,10 +585,18 @@ msgstr "Εφαρμογή '%s' στο τρέχον έργο"
 msgid "Please save and close the current project first."
 msgstr "Παρακαλώ αποθήκευσε και κλείσε την τρέχουσα εργασία πρώτα."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Επιλογή αρχείων για ομαδική επεξεργασία..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Όλα τα αρχεία (*.*)|*.*|αρχεία WAV (*.wav)|*.wav|αρχεία AIFF (*.aif)|*.aif|αρχεία AU (*.au)|*.au|αρχεία MP3 (*.mp3)|*.mp3|αρχεία Ogg Vorbis (*.ogg)|*.ogg|αρχεία FLAC (*.flac)|*.flac"
@@ -745,16 +836,16 @@ msgstr "Αδύνατη η απομάκρυνση του '%s'"
 msgid "Renamed file: %s\n"
 msgstr "Μετονομασμένο αρχείο: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Αλλαγή τμήματος %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Αδύνατη η μετονομασία του '%s' σε '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -894,6 +985,98 @@ msgstr "Αποθήκευση ηχογραφημένου audio στο δίσκο.
 msgid "Rectangular"
 msgstr "Ορθογώνιο"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr "Τοποθεσία του %s:"
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Για να βρεις το %s, κάνε κλικ εδώ -->"
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr "Αναζήτηση..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#  i18n-hint: It's asking for the location of a file, for
+#  example, "Where is lame_enc.dll?" - you could translate
+#  "Where would I find the file %s" instead if you want.
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:546
+#, c-format
+msgid "Where is %s?"
+msgstr "Πού βρίσκεται το %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Ανάλυση Συχνότητας"
@@ -926,8 +1109,9 @@ msgstr "Βελτιωμένο Autocorrelation"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Αλγόριθμος:"
 
 #: FreqWindow.cpp:168
@@ -943,9 +1127,9 @@ msgstr "Μέγεθος"
 msgid " window"
 msgstr " παράθυρο"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Λειτουργία:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -955,9 +1139,9 @@ msgstr "Γραμμική Συχνότητα"
 msgid "Log frequency"
 msgstr "Λογαριθμική Συχνότητα"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Άξονας:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -966,6 +1150,18 @@ msgstr "Άξονας:"
 msgid "&Export..."
 msgstr "&Εξαγωγή..."
 
+#: export/ExportCL.cpp:320
+#: export/ExportOGG.cpp:252
+#: export/ExportPCM.cpp:398
+msgid "Export"
+msgstr "Εξαγωγή"
+
+#: AboutDialog.cpp:676
+#: Dependencies.cpp:308
+#: FreqWindow.cpp:209
+msgid "Close"
+msgstr "Κλείσιμο"
+
 #: FreqWindow.cpp:272
 #: FreqWindow.cpp:402
 #: effects/AutoDuck.cpp:487
@@ -1041,7 +1237,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Καθυστέρηση (δευτ.)\tΣυχνότητα (Hz)\tΕπίπεδο"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -1057,15 +1253,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -1076,40 +1288,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: HistoryWindow.cpp:53
@@ -1314,6 +1550,10 @@ msgstr "&Αποθήκευση Εργασίας\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "&Αποθήκευση Εργασίας ως..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:179
 msgid "Chec&k Dependencies..."
 msgstr "Έ&λεγχος Εξαρτήσεων..."
@@ -1323,6 +1563,11 @@ msgstr "Έ&λεγχος Εξαρτήσεων..."
 msgid "Open Me&tadata Editor..."
 msgstr "Αποκρυπτογράφηση & άνοιγμα στον επεξεργαστή"
 
+#: import/ImportRaw.cpp:447
+#, fuzzy
+msgid "&Import"
+msgstr "Εισαγωγή"
+
 #: Menus.cpp:192
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audio...\tCtrl+Shift+I"
@@ -1352,11 +1597,27 @@ msgstr "Εξαγωγή &Ετικετών..."
 msgid "Export &Multiple..."
 msgstr "Εξαγωγή &Πολλαπλών..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:244
 #: Menus.cpp:258
 msgid "Edit C&hains..."
 msgstr "Επεξεργασία Αλυ&σίδων..."
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:256
 #, fuzzy
 msgid "Appl&y Chain..."
@@ -1421,9 +1682,9 @@ msgstr "&Διαγραφή\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Διαχωρισμός &Διαγραφή\tCtrl+Alt+K"
 
-#: Menus.cpp:333
-msgid "&Silence\tCtrl+L"
-msgstr "&Σιγή\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:335
 msgid "Sp&lit\tCtrl+I"
@@ -1439,8 +1700,8 @@ msgstr "Διαχωρισμός &Νέο\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&Όλα"
 
-#: Menus.cpp:346
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:348
@@ -1448,16 +1709,13 @@ msgstr ""
 msgid "Duplic&ate\tCtrl+D"
 msgstr "&Εισαγωγή Audio...\tCtrl+IΑ"
 
-#: Menus.cpp:354
-#: Menus.cpp:554
-#: effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
-msgstr "Από Στέρεο &Σε Μονό"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:361
-#, fuzzy
-msgid "Labeled Re&gions..."
-msgstr "Επαναδιαμόρ&φωση κώδικα"
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:363
@@ -1501,13 +1759,13 @@ msgid "&Join\tAlt+J"
 msgstr "&Σύνδεση σε τομέα"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:405
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:411
-msgid "&Select..."
-msgstr "Ε&πιλογή..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:412
 msgid "&All\tCtrl+A"
@@ -1517,66 +1775,69 @@ msgstr "&Όλα"
 msgid "&None\tCtrl+Shift+A"
 msgstr "&NΚανένα\tCtrl+Shift+A"
 
-#: Menus.cpp:417
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
 msgstr "Αριστερά της Θέσης Αναπαραγωγής\t["
 
-#: Menus.cpp:418
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
 msgstr "Δεξιά της Θέσης Αναπαραγωγής\t]"
 
-#: Menus.cpp:422
-msgid "Start to Cursor"
-msgstr "από την Αρχή ως τον Δρομέα"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: Menus.cpp:423
-msgid "Cursor to End"
-msgstr "Δρομέας"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:429
 msgid "Find &Zero Crossings\tZ"
 msgstr "Ανεύρεση &Μηδενικών Διασταυρώσεων\tZ"
 
-#: Menus.cpp:431
-msgid "Mo&ve Cursor..."
-msgstr "&Μετακίνηση Δρομέα..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: Menus.cpp:433
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "στην Αρχή της Επιλογής"
 
-#: Menus.cpp:434
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "στο Τέλος της Επιλογής"
 
-#: Menus.cpp:438
-msgid "to Track Start"
-msgstr "στην Αρχή του Καναλιού"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: Menus.cpp:439
-msgid "to Track End"
-msgstr "στο Τέλος του Καναλιού"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: Menus.cpp:446
-msgid "Selection Save"
-msgstr "Αποθήκευση Επιλογής"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: Menus.cpp:447
-msgid "Selection Restore"
-msgstr "Αποκατάσταση Επιλογής"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:452
-#, fuzzy
-msgid "Play &Region..."
-msgstr "Περιοχή σελίδας"
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
-#: Menus.cpp:453
-msgid "Lock"
-msgstr "Κλείδωμα"
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr ""
 
-#: Menus.cpp:454
-msgid "Unlock"
-msgstr "Ξεκλείδωμα"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr ""
 
 #: Menus.cpp:460
 msgid "Turn Snap-To On"
@@ -1594,9 +1855,14 @@ msgstr "Ενεργοποίηση Έλξης Πλέγματος"
 msgid "Turn Grid Snap Off"
 msgstr "Απενεργοποίηση Έλξης Πλέγματος"
 
-#: Menus.cpp:472
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Προτιμήσεις...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:482
 msgid "&View"
@@ -1634,61 +1900,133 @@ msgstr "&Σύμπτυξη Όλων Των Καναλιών\tCtrl+Shift+C"
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "Ε&πέκταση Όλων Των Καναλιών\tCtrl+Shift+X"
 
-#: Menus.cpp:500
-msgid "Show Clipping"
+#: Menus.cpp:551
+#, fuzzy
+msgid "&Show Clipping"
 msgstr "Προβολή του Ψαλιδίσματος"
 
 #: Menus.cpp:509
 msgid "&History..."
 msgstr "&Ιστορικό..."
 
-#: Menus.cpp:515
-msgid "&Toolbars..."
-msgstr "&Γραμμές Εργαλείων..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
-#: Menus.cpp:516
-msgid "Control Toolbar"
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
 msgstr "Γραμμή Εργαλείων Ελέγχου"
 
-#: Menus.cpp:517
-msgid "Device Toolbar"
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
 msgstr "Γραμμή Εργαλείων Συσκευής"
 
-#: Menus.cpp:518
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
 msgstr "Γραμμή Εργαλείων Επεξεργασίας"
 
-#: Menus.cpp:519
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
 msgstr "Γραμμή Εργαλείων Μέτρησης"
 
-#: Menus.cpp:520
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
 msgstr "Γραμμή Εργαλείων Μίκτη"
 
-#: Menus.cpp:521
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
 msgstr "Γραμμή Εργαλείων Επιλογής"
 
-#: Menus.cpp:522
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
 msgstr "Γραμμή Εργαλείων Εργαλείων"
 
-#: Menus.cpp:523
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
 msgstr "Γραμμή Εργαλείων Διασκευής"
 
-#: Menus.cpp:525
-msgid "Reset Toolbars"
+#: Menus.cpp:576
+#, fuzzy
+msgid "&Reset Toolbars"
 msgstr "Επαναφορά Γραμμών Εργαλείων"
 
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:773
+msgid "Skip to Start\tHome"
+msgstr "Μετάβαση στην Αρχή\tHome"
+
+#: Menus.cpp:774
+msgid "Skip to End\tEnd"
+msgstr "Μετάβαση στο Τέλος\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:535
 msgid "&Tracks"
 msgstr "&Κανάλια"
 
-#: Menus.cpp:542
-msgid "Add &New..."
-msgstr "Προσθήκη &Νέου..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:543
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1703,16 +2041,9 @@ msgstr "Κανάλι &Στέρεο"
 msgid "&Time Track"
 msgstr "Κανάλι &Χρόνου"
 
-#: Menus.cpp:549
-msgid "&Timer Record..."
-msgstr "&Προγραμματισμένη Ηχογράφηση..."
-
-#: Menus.cpp:558
-#: Menus.cpp:3611
-#: Mix.cpp:120
-#, fuzzy
-msgid "&Mix and Render"
-msgstr "&Μίξη και"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
+msgstr ""
 
 #: Menus.cpp:564
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
@@ -1726,6 +2057,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Απο&μάκρυνση Καναλιών"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: Menus.cpp:579
 msgid "Align with &Zero"
 msgstr "Στοίχιση με το &Μηδέν"
@@ -1742,28 +2081,40 @@ msgstr "Στοίχιση με την &Αρχή της Επιλογής"
 msgid "Align with Selection &End"
 msgstr "Στοίχιση με το &Τέλος της Επιλογής"
 
-#: Menus.cpp:583
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Στοίχιση Τέλους με τον Δρομέα"
 
-#: Menus.cpp:584
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Στοίχιση Τέλους με την Αρχή της Επιλογής"
 
-#: Menus.cpp:585
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Στοίχιση Τέλους με το Τέλος της Επιλογής"
 
-#: Menus.cpp:586
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Στοίχιση των Καναλιών μεταξύ τους"
 
-#: Menus.cpp:588
-msgid "&Align Tracks..."
-msgstr "Σ&τοίχιση των Καναλιών..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
-#: Menus.cpp:597
-msgid "Ali&gn And Move Cursor..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:605
@@ -1774,22 +2125,26 @@ msgstr "Προσθήκη Ετικέτας στην &Επιλογή\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Προσθήκη Ετικέτας στην &Θέση Αναπαραγωγής\tCtrl+Μ"
 
-#: Menus.cpp:612
-msgid "S&ort tracks by..."
-msgstr "&Ταξινόμηση καναλιών κατά..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:613
-msgid "&Start time"
-msgstr "&Χρόνος έναρξης"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "&Name"
-msgstr "Ό&νομα"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:625
 msgid "&Generate"
 msgstr "Ε&νεργοποίηση"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:648
 msgid "Effe&ct"
 msgstr "Ε&φέ"
@@ -1825,6 +2180,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:733
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1837,12 +2196,12 @@ msgstr "&Εκτέλεση του Τεστ Απόδοσης..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:746
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:747
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: Menus.cpp:750
@@ -1877,9 +2236,9 @@ msgstr "Επόμενο Εργαλείο\tD"
 msgid "Previous Tool\tA"
 msgstr "Προηγούμενο Εργαλείο\tA"
 
-#: Menus.cpp:760
-msgid "Play/Stop\tSpacebar"
-msgstr "Αναπαραγωγή/Διακοπή\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:761
 msgid "Stop\tS"
@@ -1893,13 +2252,13 @@ msgstr "Παύση\tP"
 msgid "Record\tR"
 msgstr "Ηχογράφηση\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:765
-msgid "Stop and Select\tShift+A"
-msgstr "Σταμάτημα και Επιλογή\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr ""
 
 #: Menus.cpp:767
 msgid "Play One Second\t1"
@@ -1913,22 +2272,14 @@ msgstr "Αναπαραγωγή στην Επιλογή\tB"
 msgid "Play Looped\tL"
 msgstr "Επαναλαμβανόμενη Αναπαραγωγή\tL"
 
-#: Menus.cpp:770
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Επαναλαμβανόμενη Αναπαραγωγή\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:771
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: Menus.cpp:773
-msgid "Skip to Start\tHome"
-msgstr "Μετάβαση στην Αρχή\tHome"
-
-#: Menus.cpp:774
-msgid "Skip to End\tEnd"
-msgstr "Μετάβαση στο Τέλος\tEnd"
-
 #: Menus.cpp:776
 msgid "Selection to Start\tShift+Home"
 msgstr "Επιλογή στην Αρχή\tShift+Home"
@@ -1987,8 +2338,8 @@ msgstr "Εναλλαγή &κατάστασης αναμονής (1 κομμάτ
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:803
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: Menus.cpp:805
@@ -2087,15 +2438,19 @@ msgstr "Ενεργοποιημένη Έλξη Στο"
 msgid "Snap To Off"
 msgstr "Απενεργοποιημένη Έλξη Στο"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:839
 msgid "Open Recent"
 msgstr "Άνοιγμα Πρόσφατου"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:842
-msgid "Recent &Files..."
-msgstr "Πρόσφατα Α&ρχεία..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:889
 #, c-format
@@ -2152,6 +2507,23 @@ msgstr "Επανάληψη %s\t Ctrl+R"
 msgid "There are no label tracks to export."
 msgstr "Δεν υπάρχουν κανάλια ετικέτας για εξαγωγή."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2158
 msgid "Nothing to undo"
 msgstr "Τίποτα για Αναίρεση"
@@ -2195,6 +2567,10 @@ msgstr "Επικολλημένο κείμενο από το πρόχειρο"
 msgid "Pasted from the clipboard"
 msgstr "Επικόλληση από το Πρόχειρο"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2461
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Δεν είναι δυνατή η αντιγραφή από στέρεο σε μονό κανάλι."
@@ -2371,9 +2747,9 @@ msgstr "Εισαγωγή Ετικέτας"
 msgid "Select a MIDI file..."
 msgstr "Επέλεξε ένα αρχείο MIDI..."
 
-#: Menus.cpp:3478
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Όλα τα αρχεία (*.*)|*.*|MIDI αρχεία (*.mid)|*.mid|Allegro αρχεία (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3494
 #, c-format
@@ -2392,14 +2768,6 @@ msgstr "Επέλεξε ένα αρχείο μη συμπιεσμένου audio..
 msgid "All files (*)|*"
 msgstr "Όλα τα αρχεία (*)|*"
 
-#: Menus.cpp:3528
-#: Project.cpp:2477
-#: Project.cpp:2502
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Εισαγωγή"
-
 #: Menus.cpp:3547
 msgid "Edit the metadata tags"
 msgstr "Επεξεργασία των tag μεταδεδομένων"
@@ -2432,6 +2800,13 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:558
+#: Menus.cpp:3611
+#: Mix.cpp:120
+#, fuzzy
+msgid "&Mix and Render"
+msgstr "&Μίξη και"
+
 #: Menus.cpp:3731
 msgid "Aligned with zero"
 msgstr "Στοιχισμένο με το μηδέν"
@@ -2468,6 +2843,14 @@ msgstr "Στοιχισμένο"
 msgid "Align"
 msgstr "Στοίχιση"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3815
 msgid "Created new audio track"
 msgstr "Δημιουργία νέου audio καναλιού"
@@ -2535,15 +2918,15 @@ msgid "Removed audio track(s)"
 msgstr "Απομακρυσμένα audio κανάλια"
 
 #: Menus.cpp:4326
-msgid "Enter new samplerate:"
-msgstr "Εισαγωγή νέου ρυθμού δειγματοληψίας:"
-
-#: Menus.cpp:4326
 #: Menus.cpp:4345
 #: export/ExportMP3.cpp:1871
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4332
 msgid "The entered value is invalid"
 msgstr "Η τιμή που εισήγαγες δεν είναι έγκυρη"
@@ -2613,14 +2996,13 @@ msgstr "Ηχογραφημένο Audio"
 msgid "Save changes before closing?"
 msgstr "Αποθήκευση των αλλαγών πριν το κλείσιμο;"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: Project.cpp:1459
@@ -2639,6 +3021,25 @@ msgstr "Επέλεξε ένα ή περισσότερα αρχεία audio..."
 msgid "Audacity projects|*.aup|"
 msgstr "Εργασίες Audacity (*.aup)|*.aup"
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2095
+msgid "Opening old project file"
+msgstr "Άνοιγμα παλιού αρχείου εργασίας"
+
 #: Project.cpp:1764
 #: Project.cpp:1772
 msgid "Error opening file"
@@ -2698,41 +3099,34 @@ msgstr "Αυτό το αρχείο αποθηκεύτηκε χρησιμοποι
 msgid "Can't open project file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου εργασίας."
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:2095
-msgid "Opening old project file"
-msgstr "Άνοιγμα παλιού αρχείου εργασίας"
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
 
-#: Project.cpp:2316
+#: Project.cpp:2591
 #, c-format
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Αδύνατη η αποθήκευση της εργασίας.  Πιθανόν %s δεν είναι εγγράψιμο,\n"
-"ή ο δίσκος είναι γεμάτος."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: Project.cpp:2318
 #: Project.cpp:2332
@@ -2744,24 +3138,19 @@ msgstr "Σφάλμα στην αποθήκευση της εργασίας"
 msgid "Saved %s"
 msgstr "Αποθηκευμένο %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2410
-msgid "Raw"
-msgstr "Χωρίς Επεξεργασία"
-
-#: Project.cpp:2415
-#, fuzzy, c-format
-msgid "Importing %s..."
-msgstr "Εισαγωγή %s Αρχείου..."
-
 #: Project.cpp:2476
 #, c-format
 msgid "Imported '%s'"
 msgstr "Εισαγόμενα '%s'"
 
+#: Menus.cpp:3528
+#: Project.cpp:2477
+#: Project.cpp:2502
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Εισαγωγή"
+
 #: Project.cpp:2529
 #: Project.cpp:2532
 msgid "Error importing"
@@ -2776,18 +3165,23 @@ msgstr "Αποθήκευση φόρμας '%1' ως"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Αρχείο ήχου Windows PCM (*.wav)|*.wav"
 
-#: Project.cpp:2574
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Τα αρχεία Audacity project(.aup) σου επιτρέπουν να αποθηκεύσεις όλα όσα έχεις κάνει, \n"
-"ακριβώς όπως εμφανίζονται στην οθόνη, \n"
-"όμως τα περισσότερα από τα άλλα προγράμματα δεν μπορούν να αναπαράγουν τα αρχεία Audacity project.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Όταν θέλεις το αρχείο που αποθηκεύεις να ανοίγει και από άλλα προγράμματα, \n"
-"επέλεξε μία από τις εντολές Εξαγωγής."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2577
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2832,6 +3226,16 @@ msgstr "Υπάρχει αρκετός χώρος στο δίσκο για  %d δ
 msgid "Out of disk space"
 msgstr "Όχι αρκετός χώρος στο δίσκο"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3229
 msgid "Could not remove old autosave file: "
 msgstr "Αδύνατη η απομάκρυνση του παλιού αυτόματα αποθηκευμένου αρχείου:"
@@ -2918,43 +3322,12 @@ msgstr "&Προεπισκόπηση"
 msgid "&Debug"
 msgstr "&Αποσφαλμάτωση"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Προγραμματισμένη Εγγραφή του Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:303
-msgid "Duration"
-msgstr "Διάρκεια"
-
-#: SmartRecordDialog.cpp:228
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:269
-msgid "Start Date and Time"
-msgstr "Ημερομηνία και Ώρα Εκκίνησης"
-
-#: SmartRecordDialog.cpp:286
-msgid "End Date and Time"
-msgstr "Ημερομηνία και Ώρα Λήξης"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:377
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2999,9 +3372,8 @@ msgstr "Είδος"
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: Tags.cpp:745
-#: Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -3024,18 +3396,13 @@ msgstr "&Καθαρισμός"
 msgid "Genres"
 msgstr "Είδος"
 
-#: Tags.cpp:795
-#: Tags.cpp:1406
-#: Tags.cpp:1947
-#, fuzzy
-msgid "Edit"
-msgstr "&Επεξεργασία"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:796
-#: Tags.cpp:1948
-#, fuzzy
-msgid "Reset"
-msgstr "Επανάληψη"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:801
 #: Tags.cpp:1427
@@ -3109,6 +3476,16 @@ msgstr "Είσαι σίγουρος ότι θέλεις να αποθηκεύσ
 msgid "Unable to open genre file."
 msgstr "Αδύνατο το άνοιγμα/δημιουργία δοκιμαστικού αρχείου"
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1079
+#: Tags.cpp:1730
+#: Tags.cpp:2453
+msgid "Error loading metadata"
+msgstr "Σφάλμα κατά τη φόρτωση των μεταδεδομένων"
+
 #: Tags.cpp:1054
 #: Tags.cpp:1108
 #: Tags.cpp:1709
@@ -3118,119 +3495,6 @@ msgstr "Αδύνατο το άνοιγμα/δημιουργία δοκιμαστ
 msgid "Save Metadata As:"
 msgstr "Αποθήκευση Μεταδεδομένων Ως:"
 
-#: Tags.cpp:1079
-#: Tags.cpp:1730
-#: Tags.cpp:2453
-msgid "Error loading metadata"
-msgstr "Σφάλμα κατά τη φόρτωση των μεταδεδομένων"
-
-#: Tags.cpp:1376
-#: Tags.cpp:1935
-#, fuzzy
-msgid "Title:"
-msgstr "Τίτλος"
-
-#: Tags.cpp:1377
-#: Tags.cpp:1936
-#, fuzzy
-msgid "Artist:"
-msgstr "Καλλιτέχνης"
-
-#: Tags.cpp:1378
-#: Tags.cpp:1937
-#, fuzzy
-msgid "Album:"
-msgstr "Συλλογή"
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381
-#: Tags.cpp:1940
-#, fuzzy
-msgid "Comments:"
-msgstr "Σχόλια"
-
-#: Tags.cpp:1383
-#, fuzzy
-msgid "Encoded By:"
-msgstr "Κωδικοποίηση:"
-
-#: Tags.cpp:1387
-#, fuzzy
-msgid "Copyright:"
-msgstr "δεξιά"
-
-#: Tags.cpp:1391
-#: Tags.cpp:1938
-#, fuzzy
-msgid "Track Number:"
-msgstr "Αριθμός καναλιού"
-
-#: Tags.cpp:1395
-#: Tags.cpp:1939
-#, fuzzy
-msgid "Year:"
-msgstr "Έτος"
-
-#: Tags.cpp:1399
-#: Tags.cpp:1941
-#, fuzzy
-msgid "Genre:"
-msgstr "Είδος"
-
-#: Tags.cpp:1457
-#: Tags.cpp:2056
-#, fuzzy
-msgid "No Genres"
-msgstr "Είδος"
-
-#: Tags.cpp:1610
-#, fuzzy
-msgid "Reset to Defaults"
-msgstr "Ο&ρισμός  προκαθορισμένου"
-
-#: Tags.cpp:1923
-#, fuzzy
-msgid "Basic"
-msgstr "Ομαδική"
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-#, fuzzy
-msgid "Value"
-msgstr "Μεταβλητή"
-
-#: Tags.cpp:2036
-#, fuzzy
-msgid "Clea&r"
-msgstr "&Καθαρισμός"
-
-#: Tags.cpp:2069
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Μέγιστο μήκος του στοιχείου '%s' είναι %d χαρακτήρες. Τα δεδομένα έχουν αποκοπεί."
-
-#: Tags.cpp:2075
-msgid "Title"
-msgstr "Τίτλος"
-
-#: Tags.cpp:2085
-msgid "Artist"
-msgstr "Καλλιτέχνης"
-
-#: Tags.cpp:2095
-msgid "Album"
-msgstr "Συλλογή"
-
 #: Theme.cpp:634
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3303,9 +3567,52 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "Προσδιορισμός Χρόνου"
+#: SmartRecordDialog.cpp:303
+msgid "Duration"
+msgstr "Διάρκεια"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Προγραμματισμένη Εγγραφή του Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:269
+msgid "Start Date and Time"
+msgstr "Ημερομηνία και Ώρα Εκκίνησης"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Ημερομηνία και Ώρα Λήξης"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: TrackPanel.cpp:448
 #: TrackPanel.cpp:449
@@ -3348,6 +3655,10 @@ msgstr "Κυματομορφή"
 msgid "Waveform (dB)"
 msgstr "Κυματομορφή (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: TrackPanel.cpp:508
 msgid "Pitch (EAC)"
 msgstr "Τόνος (EAC)"
@@ -3500,13 +3811,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Χρονική-Μετατόπιση"
 
-#: TrackPanel.cpp:2737
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: TrackPanel.cpp:2754
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Δεν έχεις μεγεθύνει αρκετά. Μεγέθυνε μέχρι να μπορείς να δεις τα ξεχωριστά δείγματα."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: TrackPanel.cpp:3025
 msgid "Moved Sample"
@@ -3604,6 +3915,14 @@ msgstr "Αυλός του Πανός"
 msgid "Adjusted gain"
 msgstr "&Επαναποστολή..."
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5467
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3661,14 +3980,6 @@ msgstr "Αλλαγή Ρυθμού δειγματοληψίας"
 msgid "Format Change"
 msgstr "Αλλαγή Μορφής"
 
-#: TrackPanel.cpp:5856
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Εισήγαγε ένα ρυθμό δειγματοληψίας σε Hz (ανά δευτ.) ανάμεσα σε 1 και 100000:"
-
-#: TrackPanel.cpp:5866
-msgid "Invalid rate."
-msgstr "Μη αποδεκτός ρυθμός δειγματοληψίας."
-
 #: TrackPanel.cpp:5886
 msgid "Change lower speed limit (%) to:"
 msgstr "Αλλαγή ορίου χαμηλότερης ταχύτητας (%) σε:"
@@ -3809,8 +4120,8 @@ msgstr "Ενθέματα (Plugins) 1 έως %i"
 msgid "Plugins %i to %i"
 msgstr "Ενθέματα (Plugins) %i σε %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3832,9 +4143,9 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:732
-msgid "Message"
-msgstr "Μήνυμα"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:904
 #, c-format
@@ -3854,14 +4165,19 @@ msgstr "Εφαρμοσμένο εφέ: %s %.1f dB"
 msgid "Amplify"
 msgstr "Ενίσχυση"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Ενίσχυση από τον Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Ενίσχυση (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Νέα Κορυφή Πλάτους Σήματος (dB):"
@@ -3870,6 +4186,10 @@ msgstr "Νέα Κορυφή Πλάτους Σήματος (dB):"
 msgid "Allow clipping"
 msgstr "Να επιτραπεί το ψαλίδισμα"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "Ενίσχυση..."
@@ -3988,10 +4308,18 @@ msgstr "από τον Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Συχνότητα (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Ενίσχυση (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Ενίσχυση Χαμηλών Συχνοτήτων..."
@@ -4034,9 +4362,50 @@ msgstr "από τους Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "χρήση του SoundTouch, από τον Olli Parviainen"
 
-#: effects/ChangePitch.cpp:267
-msgid "Pitch:   from"
-msgstr "Τόνος:   από"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:304
+msgid "Semitones (half-steps):"
+msgstr "Ημίτονα (μισά βήματα):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:289
 #: effects/ChangePitch.cpp:335
@@ -4046,13 +4415,9 @@ msgstr "Τόνος:   από"
 msgid "to"
 msgstr "σε"
 
-#: effects/ChangePitch.cpp:304
-msgid "Semitones (half-steps):"
-msgstr "Ημίτονα (μισά βήματα):"
-
-#: effects/ChangePitch.cpp:323
-msgid "Frequency (Hz):   from"
-msgstr "Συχνότητα (Hz):   από"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:358
 #: effects/ChangeSpeed.cpp:322
@@ -4060,6 +4425,11 @@ msgstr "Συχνότητα (Hz):   από"
 msgid "Percent Change:"
 msgstr "Ποσοστιαία Αλλαγή:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Αλλαγή Τόνου..."
@@ -4078,14 +4448,6 @@ msgstr "Εφαρμοσμένο εφέ: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Αλλαγή Ταχύτητας"
 
-#: effects/ChangeSpeed.cpp:299
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Αλλαγή Ταχύτητας, επιδρά το ίδιο στο Ρυθμό και στο Τόνο"
-
-#: effects/ChangeSpeed.cpp:309
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "χρήση του SampleRate, από τον Erik de Castro Lopo"
-
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
@@ -4098,9 +4460,25 @@ msgstr "χρήση του SampleRate, από τον Erik de Castro Lopo"
 msgid "n/a"
 msgstr "μή εφαρμόσιμο"
 
-#: effects/ChangeSpeed.cpp:358
-msgid "Standard Vinyl RPM:   from"
-msgstr "Πρότυπες σ.α.λ Βινυλίου:   από"
+#: effects/ChangeSpeed.cpp:299
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Αλλαγή Ταχύτητας, επιδρά το ίδιο στο Ρυθμό και στο Τόνο"
+
+#: effects/ChangeSpeed.cpp:309
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "χρήση του SampleRate, από τον Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4118,13 +4496,29 @@ msgstr "Αλλαγή Ρυθμού"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Αλλαγή Ρυθμού χωρίς την αλλαγή Τόνου"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Χτύποι ανά Λεπτό (BPM): ... από"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Διάρκεια (δευτ.):   από"
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4134,9 +4528,9 @@ msgstr "Αλλαγή Ρυθμού..."
 msgid "Changing Tempo"
 msgstr "Αλλαγή Ρυθμού"
 
-#: effects/ClickRemoval.cpp:317
+#: effects/ClickRemoval.cpp:314
 #, fuzzy
-msgid "ClickRemoval"
+msgid "Click Removal"
 msgstr "Απομάκρυνση με Κλικ..."
 
 #: effects/ClickRemoval.cpp:330
@@ -4147,10 +4541,18 @@ msgstr "Απομάκρυνση με Κλικ και Pop από τον Craig DeFo
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Επέλεξε κατώφλι (χαμηλότερο είναι πιο ευαίσθητο):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:356
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Μέγιστο πλάτος κορυφών (υψηλότερο είναι πιο ευαίσθητο):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Απομάκρυνση με Κλικ..."
@@ -4163,49 +4565,84 @@ msgstr "Απομάκρυνση των Κλικ και Pop..."
 msgid "Dynamic Range Compressor"
 msgstr "Δυναμική Περιοχή Συμπιεστής"
 
-#: effects/Compressor.cpp:468
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Δυναμική Περιοχή Συμπιεστής από τον  Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:486
-msgid "Ratio: "
-msgstr "Αναλογία: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:493
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Χρόνος Attack: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr "Κανονικοποίηση στα  0dB μετά τη συμπίεση"
 
-#: effects/Compressor.cpp:547
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Κατώφλι: %d dB"
 
-#: effects/Compressor.cpp:550
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Αναλογία: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: effects/Compressor.cpp:552
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Αναλογία: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: effects/Compressor.cpp:554
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Χρόνος Attack: %.1f δευτ."
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: effects/Compressor.h:36
@@ -4216,6 +4653,253 @@ msgstr "Συμπιεστής..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Εφαρμογή Συμπίεση Δυναμικής Περιοχής ..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:330
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Εκκίνηση"
+
+#: effects/ToneGen.cpp:331
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:141
+#: toolbars/SelectionBar.cpp:242
+msgid "End"
+msgstr "Τέλος"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796
+#: Tags.cpp:1948
+#, fuzzy
+msgid "Reset"
+msgstr "Επανάληψη"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: AboutDialog.cpp:269
+msgid "Information"
+msgstr "Πληροφορίες"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+#, fuzzy
+msgid "Control"
+msgstr "Control"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr "Δημιουργία DTMF Τόνων"
@@ -4233,9 +4917,9 @@ msgstr "Συγχνότητα DTMF:"
 msgid "Amplitude (0-1)"
 msgstr "Πλάτος σήματος (0-1)"
 
-#: effects/DtmfGen.cpp:404
-msgid "DTMF duration:"
-msgstr "Διάρκεια DTMF:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
 
 #: effects/DtmfGen.cpp:422
 msgid "Tone/silence ratio:"
@@ -4472,17 +5156,14 @@ msgstr "Αντιστροφή Φάσης"
 msgid "Inverting"
 msgstr "Αντιστροφή Φάσης"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr "Βαρύτερο"
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
-msgstr "Το πιο βαρύ"
+#: effects/Leveller.cpp:129
+msgid "Leveller"
+msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
-msgstr "Βαρύ"
+#, fuzzy
+msgid "None-Skip"
+msgstr "Επιλογή Κανενός"
 
 #: effects/Leveller.cpp:47
 msgid "Light"
@@ -4493,20 +5174,19 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-#, fuzzy
-msgid "None-Skip"
-msgstr "Επιλογή Κανενός"
+msgid "Heavy"
+msgstr "Βαρύ"
 
-#: effects/Leveller.cpp:129
-msgid "Leveller"
-msgstr ""
+#: effects/Leveller.cpp:47
+msgid "Heavier"
+msgstr "Βαρύτερο"
 
-#: effects/Leveller.cpp:213
-msgid "Leveller by Lynn Allan"
-msgstr ""
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
+msgstr "Το πιο βαρύ"
 
-#: effects/Leveller.cpp:216
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:320
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:219
@@ -4515,12 +5195,17 @@ msgstr ""
 msgid "Degree of Leveling"
 msgstr "Ο βαθμός μεγέθυνσης"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:235
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
 #: effects/Leveller.cpp:238
-msgid "Threshold for Noise: "
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Κατώφλι Θορύβου:"
 
 #: effects/Leveller.h:28
@@ -4532,6 +5217,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr "Εφαρμογή στυλ φύλλου"
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "Μείκτης"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:715
+msgid "Noise Removal"
+msgstr "Απομάκρυνση Θορύβου"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Λευκό"
@@ -4548,10 +5385,6 @@ msgstr "Καφέ"
 msgid "Noise Generator"
 msgstr "Δημιουργία Θορύβου"
 
-#: effects/Noise.cpp:225
-msgid "Noise duration"
-msgstr "Διάρκεια Θορύβου"
-
 #: effects/Noise.cpp:246
 msgid "Noise type"
 msgstr "Τύπος θορύβου"
@@ -4580,10 +5413,6 @@ msgstr "Αδύνατο το άνοιγμα αρχείου: \"%s\""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Απόπειρα εκτέλεσης της Απομάκρυνσης Θορύβου χωρίς κάποιο προφίλ θορύβου.\n"
 
-#: effects/NoiseRemoval.cpp:715
-msgid "Noise Removal"
-msgstr "Απομάκρυνση Θορύβου"
-
 #: effects/NoiseRemoval.cpp:804
 msgid "Step 1"
 msgstr "Βήμα 1"
@@ -4616,16 +5445,28 @@ msgstr "Λήψη Προφίλ Θορύβου"
 msgid "Noise reduction (dB):"
 msgstr "Μείωσης θορύβου (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:839
 #, fuzzy
 msgid "Frequency smoothing (Hz):"
 msgstr "Συχνότητα (Hz):   από"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:847
 #, fuzzy
 msgid "Attack/decay time (secs):"
 msgstr "Χρόνος Attack: %.1f δευτ."
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Απομάκρυνση Θορύβου..."
@@ -4660,22 +5501,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Κανονικοποίηση"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: effects/Normalize.cpp:323
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Απομάκρυνση οποιουδήποτε DC μετατόπισης (κέντρο στο 0 κάθετα)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
-msgstr "Κανονικοποίηση μέγιστου πλάτους σήματος στα"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Κανονικοποίηση..."
@@ -4689,44 +5530,56 @@ msgstr "Κανονικοποίηση..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Εφαρμοσμένο εφέ: %s %d, %.0f%% υγρό, συχνότητα = %.1f Hz, αρχή φάσης= %.0f deg, βάθος = %d, ανατροφοδότηση = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser από τον Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Στάδια:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "ΞΕΡΟ"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "ΥΓΡΟ"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Συχνότητα LFO (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO Αρχή Φάσης (deg.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Βάθος:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Ανατροφοδότηση (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4743,6 +5596,14 @@ msgstr "Το εφέ Επισκευής μπορεί να λειτουργήσε
 "\n"
 "Κάνε Μεγέθυνση, και επέλεξε κάποια εκατοστά του δευτερολέπτου για να επισκευαστούν."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Επισκευή φθαρμένου audio"
@@ -4761,28 +5622,23 @@ msgstr "Τα κανάλια είναι πολύ μεγάλα για να επα
 msgid "Repeat"
 msgstr "Επανάληψη"
 
-#: effects/Repeat.cpp:171
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Επανάληψη από τους Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:178
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Αριθμός επαναλήψεων: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:190
 #: effects/Repeat.cpp:220
 msgid "New selection length: "
 msgstr "Νέο μήκος επιλογής: "
 
-#: effects/Repeat.cpp:222
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d λεπτά, %d δευτερόλεπτα"
-
-#: effects/Repeat.cpp:225
-#, c-format
-msgid "%d seconds"
-msgstr "%d δευτερόλεπτα"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr "ώρες:λεπτά:δευτ."
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -4849,15 +5705,73 @@ msgstr "Καθαριστής Κορυφών..."
 msgid "Applying Spike Cleaner..."
 msgstr "<b>Εφαρμογή ενέργειας φίλτρου:</b> %1"
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "Από Στέρεο &Σε Μονό"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
 msgstr "Εφαρμογή Στέρεο σε Μονό"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:59
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr "Εφαρμοσμένο εφέ: Ενεργοποίηση %s %s wave, συχνότητα = %.2f Hz, πλάτος σήματος = %.2f, %.6lf δευτ."
 
+#: widgets/Meter.cpp:362
+msgid "Linear"
+msgstr "Αριθμητικό"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, fuzzy
 msgid "Chirp Generator"
@@ -4888,28 +5802,29 @@ msgstr "Παράγοντας εξομάλυνσης"
 msgid "Frequency (Hz)"
 msgstr "Συχνότητα (Hz)"
 
-#: effects/ToneGen.cpp:299
-#: effects/ToneGen.cpp:340
-#: toolbars/SelectionBar.cpp:147
-#: toolbars/SelectionBar.cpp:241
-msgid "Length"
-msgstr "Διάρκεια"
-
 #: effects/ToneGen.cpp:323
 msgid "Waveform:"
 msgstr "Κυματομορφή:"
 
-#: effects/ToneGen.cpp:330
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Εκκίνηση"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:331
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:141
-#: toolbars/SelectionBar.cpp:242
-msgid "End"
-msgstr "Τέλος"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr ""
 
 #: effects/ToneGen.h:39
 #, fuzzy
@@ -4940,10 +5855,6 @@ msgstr "Όλα τα  κανάλια πρέπει να έχουν τον ίδιο
 msgid "Truncate Silence"
 msgstr "Προσθήκη σιωπής"
 
-#: effects/TruncSilence.cpp:320
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4992,10 +5903,6 @@ msgstr "Εφαρμοσμένο εφέ: %s συχνότητα = %.1f, αρχή φ
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah από τον Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Βάθος (%):"
@@ -5004,10 +5911,18 @@ msgstr "Βάθος (%):"
 msgid "Resonance:"
 msgstr "Αντήχηση:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah Μετατόπιση Συχνότητας(%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5044,6 +5959,18 @@ msgstr "Ρυθμίσεις των Εφέ"
 msgid "Length (seconds)"
 msgstr "Διάρκεια (δευτ.)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Εφαρμογή Εφέ Nyquist..."
@@ -5111,11 +6038,13 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:401
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr "Δεν έχουν επιλεγεί κανάλια. Χρησιμοποίησε Επιλογή Όλων (Ctrl+A)\n"
-"και Εξαγωγή... για να γίνει εξαγωγή όλων των καναλιών."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
 
 #: export/Export.cpp:445
 msgid "Export File"
@@ -5172,6 +6101,10 @@ msgstr "-Αριστερά"
 msgid " - Right"
 msgstr "-Δεξιά"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:961
 #: export/Export.cpp:1006
 #, fuzzy, c-format
@@ -5211,12 +6144,6 @@ msgstr "(εξωτερικό πρόγραμμα)"
 msgid "Cannot export audio to %s"
 msgstr "Αδύνατη η εξαγωγή audio στο  %s"
 
-#: export/ExportCL.cpp:320
-#: export/ExportOGG.cpp:252
-#: export/ExportPCM.cpp:398
-msgid "Export"
-msgstr "Εξαγωγή"
-
 #: export/ExportCL.cpp:322
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Εξαγωγή του επιλεγμένου audio χρησιμοποιώντας command-line κωδικοποίηση"
@@ -5230,6 +6157,477 @@ msgstr "Εξαγωγή ολόκληρης της εργασίας χρησιμο
 msgid "Command Output"
 msgstr "Έξοδος εντολής"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr "Μη αποδεκτός ρυθμός δειγματοληψίας"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr "Ρυθμός Δειγματοληψίας"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Ρυθμός Μεταφοράς Bit:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Μορφή:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:104
+msgid "Language:"
+msgstr "Γλώσσα:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Ποιότητα:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML αρχεία (*.xml)|*.xml|Όλα τα αρχεία (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Ορισμός Επιλογών FLAC"
@@ -5302,10 +6700,6 @@ msgstr "Εξαγωγή του επιλεγμένου audio ως  FLAC"
 msgid "Exporting the entire project as FLAC"
 msgstr "Εξαγωγή ολόκληρης της εργασίας ως FLAC"
 
-#: export/ExportFLAC.cpp:359
-msgid "Edit the metadata for the FLAC file"
-msgstr "Επεξεργασία των μεταδεδομένων για το FLAC αρχείο"
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr "Ορισμός Επιλογών MP2"
@@ -5314,10 +6708,6 @@ msgstr "Ορισμός Επιλογών MP2"
 msgid "MP2 Export Setup"
 msgstr "Ρυθμίσεις Εξαγωγής MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Ρυθμός Μεταφοράς Bit:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Αρχεία MP2"
@@ -5326,10 +6716,6 @@ msgstr "Αρχεία MP2"
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "Αδύνατη η εξαγωγή με μορφή MP2 με αυτό το ρυθμό δειγματοληψίας και ρυθμό bit"
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr "Επεξεργασία των ID3 tags για το MP2 αρχείο"
-
 #: export/ExportMP2.cpp:243
 #: export/ExportMP3.cpp:1713
 #: export/ExportOGG.cpp:183
@@ -5369,45 +6755,13 @@ msgstr "Εξαγωγή ολόκληρου του αρχείου στα %d kbps"
 msgid "kbps"
 msgstr "8 kbps"
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "0, 220-260 kbps (Καλύτερη Ποιότητα)"
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr "1, 200-250 kbps"
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr "2, 170-210 kbps"
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr "3, 155-195 kbps"
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr "4, 145-185 kbps"
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr "5, 110-150 kbps"
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr "6, 95-135 kbps"
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr "7, 80-120 kbps"
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
-msgstr "9, 45-85 kbps (Μικρότερα αρχεία)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr ""
 
 #: export/ExportMP3.cpp:178
 msgid "Fast"
@@ -5417,21 +6771,17 @@ msgstr "Γρήγορο"
 msgid "Standard"
 msgstr "Τυπικός"
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr "Παρανοϊκό, 320 kbps"
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr "Ακραίο, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
-msgstr "Τυπικό, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
-msgstr "Μεσαίο, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr ""
 
 #: export/ExportMP3.cpp:249
 msgid "Specify MP3 Options"
@@ -5462,6 +6812,11 @@ msgstr "Μέσος Όρος"
 msgid "Constant"
 msgstr "Σταθερή"
 
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Πιστότητα"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr "Μεταβλητή ταχύτητα"
@@ -5488,38 +6843,15 @@ msgstr "Εντοπισμός του Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Το Audacity χρειάζεται το αρχείο %s για να δημιουργήσει MP3."
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr "Τοποθεσία του %s:"
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Για να βρεις το %s, κάνε κλικ εδώ -->"
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr "Αναζήτηση..."
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Για να λάβεις ένα δωρεάν αντίγραφο του Lame, κάνε κλικ εδώ -->"
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr "Λήψη αρχείου..."
-
-#  i18n-hint: It's asking for the location of a file, for
-#  example, "Where is lame_enc.dll?" - you could translate
-#  "Where would I find the file %s" instead if you want.
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:546
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Πού βρίσκεται το %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1038
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5529,8 +6861,9 @@ msgstr "Μόνο lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr "Μόνο libmp3lame.dylib|libmp3lame.dylib|Δυναμικές Βιβλιοθήκες (*.dylib)|*.dylib|Όλα τα αρχεία (*)|*"
 
-#: export/ExportMP3.cpp:1510
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Μόνο libmp3lame.so|libmp3lame.so|Primary Shared Object αρχεία (*.so)|*.so|Extended Libraries (*.so*)|*.so*|Όλα τα αρχεία (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5549,10 +6882,6 @@ msgstr "Μη αποδεκτή ή υποστηριζόμενη βιβλιοθήκ
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: export/ExportMP3.cpp:1706
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Επεξεργασία των ID3 tags για το MP3 αρχείο"
-
 #: export/ExportMP3.cpp:1744
 #, fuzzy, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5588,10 +6917,6 @@ msgstr "Εξαγωγή ολόκληρου του αρχείου στα %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr "Μη αποδεκτός ρυθμός δειγματοληψίας"
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5604,18 +6929,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
-msgstr "Ρυθμός Δειγματοληψίας"
-
-#: export/ExportMP3.cpp:2053
-msgid "MP3 exporting plugin not found"
-msgstr "Δεν βρέθηκε το ένθεμα (plugin) εξαγωγής MP3  "
-
 #: export/ExportMultiple.cpp:88
 #: export/ExportMultiple.cpp:362
 #: export/ExportMultiple.cpp:609
@@ -5677,6 +6994,10 @@ msgstr "Περιέλαβε audio πριν την πρώτη ετικέτα"
 msgid "First file name:"
 msgstr "Πρώτο όνομα αρχείου:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:246
 msgid "Tracks"
 msgstr "Κανάλια"
@@ -5697,14 +7018,14 @@ msgstr "Συνεχής Αρίθμηση"
 msgid "File name prefix:"
 msgstr "Πρόθεμα ονόματος αρχείου:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:294
 msgid "Overwrite existing files"
 msgstr "Αντικατάσταση υπαρχόντων αρχείων"
 
-#: export/ExportMultiple.cpp:300
-msgid "E&xport"
-msgstr "Εξα&γωγή"
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5714,10 +7035,6 @@ msgstr "το \"%s\" δημιουργήθηκε με επιτυχία."
 msgid "Choose a location to save the exported files"
 msgstr "Επέλεξε μία τοποθεσία για την αποθήκευση των εξαγόμενων αρχείων"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5727,6 +7044,10 @@ msgstr "το \"%s\" δεν υπάρχει.\n"
 "\n"
 "Θα ήθελες να δημιουργηθεί;"
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:606
 #: export/ExportMultiple.cpp:714
 #, c-format
@@ -5739,6 +7060,12 @@ msgstr "Επιτυχής εξαγωγή %d αρχείων(-ου)."
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Κάτι πήγε στραβά μετά από την εξαγωγή %d αρχείων(-ου)."
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr "Όρισε τις Επιλογές για OGG Vorbis"
@@ -5747,10 +7074,6 @@ msgstr "Όρισε τις Επιλογές για OGG Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Επιλογές Εξαγωγής OGG Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Ποιότητα:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Αρχεία Ogg Vorbis"
@@ -5763,23 +7086,14 @@ msgstr "Εξαγωγή του επιλεγμένου audio ως Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Εξαγωγή ολόκληρης της εργασίας ως Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr "Επεξεργασία των μεταδεδομένων για το αρχείο OGG"
-
-#: export/ExportPCM.cpp:115
-#, fuzzy
-msgid "Specify PCM Options"
-msgstr "Ορισμός Επιλογών MP2"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
+msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr "Ρύθμιση Εξαγωγής Χωρίς Συμπίεση"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Μορφή:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Κεφαλίδα:"
@@ -5792,10 +7106,21 @@ msgstr "Κωδικοποίηση:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Δεν είναι δυνατοί όλοι οι συνδυασμοί από κεφαλίδες και κωδικοποιήσεις .)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, και άλλοι μη συμπιεσμένοι τύποι"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -5818,16 +7143,51 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Σφάλμα (ίσως δεν έχει γίνει εγγραφή του αρχείου): %s"
 
-#: export/ExportPCM.cpp:462
-#, fuzzy
-msgid "Edit the metadata for the uncompressed file"
-msgstr "Επεξεργασία των μεταδεδομένων για το αρχείο OGG"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr "Αρχεία MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
 
 #: import/Import.cpp:154
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Αυτή η έκδοση του Audacity δεν μεταφράστηκε/προσαρμόστηκε με  %s υποστήριξη."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5858,9 +7218,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5873,19 +7234,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
 msgstr ""
 
-#: import/Import.cpp:237
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Το Audacity δεν αναγνώρισε αυτό τον τύπο αρχείου.\n"
-"Αν είναι χωρίς συμπίεση προσπάθησε να το εισάγεις χρησιμοποιώντας \"Εισαγωγή  Ανεπεξέργαστων  Δεδομένων\""
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5926,17 +7339,18 @@ msgstr "Τα MIDI κανάλια δεν μπορούν να μετατοπιστ
 msgid "Invalid track offset in LOF file."
 msgstr "Μη αποδεκτή μετατόπιση καναλιού στο αρχείο LOF."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Σφάλμα στην ανάλυση του αρχείου Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Σφάλμα στην ανάλυση του αρχείου MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr "Αρχεία MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:35
 msgid "Ogg Vorbis files"
@@ -5962,15 +7376,24 @@ msgstr "Μη αποδεκτή Vorbis bitstream κεφαλίδα"
 msgid "Internal logic fault"
 msgstr "Εσωτερικό λογικό σφάλμα"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, και άλλοι μη συμπιεσμένοι τύποι"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Εισαγωγή %s Αρχείου..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Αρχεία QuickTime"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Εισαγωγή  Ανεπεξέργαστων  Δεδομένων"
@@ -6020,6 +7443,14 @@ msgstr "2 Κανάλι (στέρεο)"
 msgid "%d Channels"
 msgstr "%d Κανάλια"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Ξεκίνημα μετατόπισης:"
@@ -6032,10 +7463,18 @@ msgstr "Μέγεθος προς εισαγωγή:"
 msgid "Sample rate:"
 msgstr "Ρυθμός Δειγματοληψίας:"
 
-#: import/ImportRaw.cpp:447
-#, fuzzy
-msgid "&Import"
-msgstr "Εισαγωγή"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6080,9 +7519,9 @@ msgstr "Κανάλια"
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Αναπαραγωγή &καναλιών ενώ ηχογραφείται άλλο"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 #, fuzzy
@@ -6094,10 +7533,13 @@ msgstr "Playthrough &Συσκευής (Αναπαραγωγή του νέου κ
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Playthrough &Λογισμικού (Αναπαραγωγή του νέου κομματιού καθώς αυτό ηχογραφείται)"
 
-#: prefs/AudioIOPrefs.cpp:155
-#, fuzzy
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "Playthrough &Λογισμικού (Αναπαραγωγή του νέου κομματιού καθώς αυτό ηχογραφείται)"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6126,14 +7568,15 @@ msgstr "Αναπαραγωγή μετά την περιοχή αποκοπής:"
 msgid "Latency"
 msgstr "Καθυστέρηση"
 
-#: prefs/AudioIOPrefs.cpp:189
-#, fuzzy
-msgid "Audio to buffer:"
-msgstr "Αλλαγή στην ενδιάμεση μνήμη:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:192
-msgid "Latency correction:"
-msgstr "Διόρθωση καθυστέρησης:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
 msgid "Seek Time when playing"
@@ -6163,23 +7606,10 @@ msgstr "Συμπεριφορές"
 msgid "&Don't apply effects in batch mode"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
 #: prefs/BatchPrefs.cpp:85
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:89
-#: prefs/GUIPrefs.cpp:90
-msgid "Show / Hide"
-msgstr "Εμφάνιση / Απόκρυψη"
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: prefs/DirectoriesPrefs.cpp:55
 #: prefs/DirectoriesPrefs.cpp:56
 #: prefs/PrefsDialog.cpp:279
@@ -6219,7 +7649,7 @@ msgid "Audio cache"
 msgstr "Μικροαποθήκευση (cache) Audio"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
@@ -6244,21 +7674,65 @@ msgstr "Ο φάκελος %s δεν είναι εγγράψιμος"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Οι αλλαγές στο προσωρινό φάκελο δεν θα εφαρμοστούν μέχρι να γίνει επανεκκίνηση του Audacity"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:104
+msgid "MP3 Library Version:"
+msgstr "Έκδοση MP3 Βιβλιοθήκης:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:79
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Να &δημιουργηθεί ένα αντίγραφο του αρχείου πριν την επεξεργασία (ασφαλέστερο)"
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:80
-msgid "&Read directly from the original file (faster)"
-msgstr "&Ανάγνωση κατευθείαν από το αρχικό αρχείο (γρηγορότερα)"
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:84
 msgid "When saving a project that depends on other audio files"
@@ -6288,20 +7762,8 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
-msgstr ""
-
-#: prefs/FileFormatPrefs.cpp:104
-msgid "MP3 Library Version:"
-msgstr "Έκδοση MP3 Βιβλιοθήκης:"
-
-#: prefs/FileFormatPrefs.cpp:110
-msgid "&Find Library"
-msgstr "Ανεύρεση &Βιβλιοθήκης"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:33
@@ -6309,33 +7771,41 @@ msgstr ""
 msgid "Interface"
 msgstr "Περιβάλλον Εργασίας"
 
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:72
 #, fuzzy
 msgid "&Update display while playing"
 msgstr "Α&νανέωση του Φασματογραφήματος κατά τη διάρκεια της αναπαραγωγής"
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:78
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:84
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:86
@@ -6350,6 +7820,11 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:89
+#: prefs/GUIPrefs.cpp:90
+msgid "Show / Hide"
+msgstr "Εμφάνιση / Απόκρυψη"
+
 #: prefs/GUIPrefs.cpp:92
 #, fuzzy
 msgid "Enable cut &lines"
@@ -6359,25 +7834,25 @@ msgstr "Ενεργοποίηση γραμμών πλέγματος"
 msgid "Show warnings about &temp files"
 msgstr "Προβολή προειδοποίησης για &προσωρινά αρχεία"
 
-#: prefs/GUIPrefs.cpp:96
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Language"
-msgstr "Γλώσσα"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:104
-msgid "Language:"
-msgstr "Γλώσσα:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:107
-msgid "Minimum of dB mode display range"
-msgstr "Ελάχιστα dB mode εμφάνισης περιοχή"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:110
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6387,6 +7862,10 @@ msgstr "-36 dB (ρηχό εύρος για υψηλού πλάτους επεξ
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM εύρος για 8 bit δειγματοληψία)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:112
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM εύρος για 16 bit δειγματοληψία)"
@@ -6399,11 +7878,35 @@ msgstr "-120 dB (όριο ανθρώπινης ακοής κατά προσέγ
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM εύρος για 24 bit δειγματοληψία)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:64
 #: prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "Πληκτρολόγιο"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Συντομεύσεις Πληκτρολογίου"
@@ -6437,10 +7940,6 @@ msgstr "Σφάλμα στην αποθήκευση των συντομεύσεω
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Επέλεξε ένα αρχείο XML που να περιέχει  Audacity συντομεύσεις πληκτρολογίου..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML αρχεία (*.xml)|*.xml|Όλα τα αρχεία (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Σφάλμα στο φόρτωμα των συντομεύσεων του πληκτρολογίου"
@@ -6459,6 +7958,43 @@ msgstr "Η συντόμευση πληκτρολογίου '%s'  έχει ήδη
 msgid "Undo"
 msgstr "Αναίρεση"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Αναπαραγωγή &καναλιών ενώ ηχογραφείται άλλο"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:189
+#, fuzzy
+msgid "Audio to buffer:"
+msgstr "Αλλαγή στην ενδιάμεση μνήμη:"
+
+#: prefs/AudioIOPrefs.cpp:192
+msgid "Latency correction:"
+msgstr "Διόρθωση καθυστέρησης:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -6709,11 +8245,6 @@ msgstr "Μεγέθυνση ή Σμίκρυνση"
 msgid "Audacity Preferences"
 msgstr "Προτιμήσεις του Audacity"
 
-#: prefs/QualityPrefs.cpp:42
-#: prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "Πιστότητα"
-
 #: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "Ορθογώνιο"
@@ -6779,14 +8310,13 @@ msgstr "Υψηλή ποιότητα:"
 msgid "Smart Recording"
 msgstr "Έξυπνη Ηχογράφηση"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Παύση Ηχογράφησης στη Σιγή"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Επίπεδο σιγής (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:36
 #: prefs/SpectrumPrefs.cpp:37
@@ -6805,6 +8335,10 @@ msgstr "8 - ευρύτερο φάσμα"
 msgid "256 - default"
 msgstr "256 - προεπιλογή"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:84
 msgid "4096 - most narrowband"
 msgstr "4096 - το πιο μικρό φάσμα"
@@ -6813,6 +8347,10 @@ msgstr "4096 - το πιο μικρό φάσμα"
 msgid "Window type:"
 msgstr "Τύπος παραθύρου:"
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr "Εμφάνιση"
@@ -6829,6 +8367,26 @@ msgstr "Ελάχιστη Συχνότητα (Hz):"
 msgid "Maximum Frequency (Hz):"
 msgstr "Μέγιστη Συχνότητα (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:134
 msgid "The maximum frequency must be an integer"
 msgstr "Η μέγιστη συχνότητα πρέπει να είναι ακέραιος αριθμός"
@@ -6845,6 +8403,14 @@ msgstr "Η ελάχιστη συχνότητα πρέπει να είναι ακ
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr "Η ελάχιστη συχνότητα θα πρέπει να είναι τουλάχιστον 0 Hz"
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+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"
@@ -6921,11 +8487,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-#, fuzzy
-msgid "Control"
-msgstr "Control"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Παύση"
@@ -6934,9 +8495,9 @@ msgstr "Παύση"
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Αναπαραγωγή (Shift για επαναλαμβανόμενη αναπαραγωγή)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -6950,6 +8511,10 @@ msgstr "Μετάβαση στην Αρχή"
 msgid "Skip to End"
 msgstr "Μετάβαση στο Τέλος"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 #, fuzzy
 msgid "Clean Speech"
@@ -6987,6 +8552,10 @@ msgid "Silence selection"
 msgstr "Επιλογή σιγής"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Μεγέθυνση"
 
@@ -7046,26 +8615,22 @@ msgstr "Μετρητής Επιπέδου Σήματος Εξόδου"
 msgid "Input level meter - click to monitor input"
 msgstr "Μετρητής Επιπέδου Σήματος Εισόδου - κάνε κλικ για να παρακολουθήσεις το σήμα"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "Μείκτης"
-
 #: toolbars/MixerToolBar.cpp:91
 msgid "Output Volume"
 msgstr "Ένταση Σήματος Εξόδου"
 
-#: toolbars/MixerToolBar.cpp:93
+#: toolbars/MixerToolBar.cpp:92
 #, fuzzy
-msgid "Slider-Output"
+msgid "Slider Output"
 msgstr "Έξοδος &μεταγλωττιστή:"
 
 #: toolbars/MixerToolBar.cpp:102
 msgid "Input Volume"
 msgstr "Ένταση Σήματος Εισόδου"
 
-#: toolbars/MixerToolBar.cpp:104
+#: toolbars/MixerToolBar.cpp:103
 #, fuzzy
-msgid "Slider-Input"
+msgid "Slider Input"
 msgstr "Φίλτρο εισόδου"
 
 #: toolbars/MixerToolBar.cpp:117
@@ -7086,6 +8651,13 @@ msgstr "Ρυθμός Δειγματοληψίας Εργασίας (Hz):"
 msgid "Selection Start:"
 msgstr "Αρχή Επιλογής:"
 
+#: effects/ToneGen.cpp:299
+#: effects/ToneGen.cpp:340
+#: toolbars/SelectionBar.cpp:147
+#: toolbars/SelectionBar.cpp:241
+msgid "Length"
+msgstr "Διάρκεια"
+
 #: toolbars/SelectionBar.cpp:157
 msgid "hidden"
 msgstr "κρυμμένο"
@@ -7363,6 +8935,22 @@ msgstr "Δεξί"
 msgid "Help"
 msgstr "Βοήθεια"
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -7411,14 +8999,14 @@ msgstr "Οριζόντιο Στέρεο"
 msgid "Vertical Stereo"
 msgstr "Κάθετο Στέρεο"
 
-#: widgets/Meter.cpp:362
-msgid "Linear"
-msgstr "Αριθμητικό"
-
 #: widgets/Meter.cpp:371
 msgid "Preferences..."
 msgstr "Προτιμήσεις..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1061
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7438,6 +9026,22 @@ msgstr "Προτιμήσεις Μετρητή"
 msgid " Please select an action "
 msgstr "Παρακαλώ επέλεξε μια ενέργεια"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1138
 #: widgets/Ruler.cpp:1139
 msgid "Vertical Ruler"
@@ -7447,10 +9051,6 @@ msgstr "Κατακόρυφος Χάρακας"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 δευτερόλεπτα"
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr "ώρες:λεπτά:δευτ."
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr "0100 ώρες 060 λεπτά 060 δευτ."
@@ -7463,6 +9063,21 @@ msgstr "ημερομ.:ώρες:λεπτά:δευτ."
 msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 ημέρες 024 ώρες 060 λεπτά 060 δευτ"
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr "ώρες:λεπτά:δευτ. + χιλιοδευτερόλεπτα"
@@ -7578,8 +9193,8 @@ msgstr "Αδύνατο το άνοιγμα αρχείου: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Σφάλμα: %s στη γραμμή %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/es.po b/locale/es.po
index d92dc9b..f0459ad 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,15 +1,14 @@
-# translation of audacity.nuevo.po to Spanish
-# Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
+# translation of es.commited.po to Spanish
+# Copyright (C) 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
-# Antonio Paniagua Navarro <apaniagua AT edu.juntaextremadura.net>, 2004.
-# Antonio Paniagua Navarro <antpaniagua en gmail.com>, 2007, 2008.
-# Antonio Paniagua Navarro <antpaniagua at gmail.com>, 2008.
+# Antonio Paniagua Navarro <antpaniagua en gmail.com>, 2004, 2008.
+# Antonio Paniagua Navarro <antpaniagua at gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacity.nuevo\n"
+"Project-Id-Version: es.commited\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-04-28 22:24+0100\n"
-"PO-Revision-Date: 2008-10-22 13:43+0200\n"
+"POT-Creation-Date: 2008-10-18 15:20+0100\n"
+"PO-Revision-Date: 2009-01-21 13:21+0100\n"
 "Last-Translator: Antonio Paniagua Navarro <antpaniagua at gmail.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +17,25 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: AboutDialog.cpp:142 AudacityApp.cpp:749 Menus.cpp:745
+#: AboutDialog.cpp:143 AudacityApp.cpp:807 Menus.cpp:953
 msgid "&About Audacity..."
 msgstr "Acerca de &Audacity..."
 
-#: AboutDialog.cpp:156
+#: AboutDialog.cpp:157
 msgid "OK... Audacious!"
 msgstr "Ok... ¡Audaz!"
 
 #: AboutDialog.cpp:175
-msgid ""
-"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."
-msgstr ""
-"Audacity es un programa libre realizado por un grupo de desarrolladores "
-"voluntarios de varios países. La coordinación es posible gracias a "
-"SourceForge.net, un servicio online que proporciona herramientas libres a "
-"proyectos de software de código abierto. Audacity está disponible para "
-"Windows 98 o posterior, Mac OS X, Linux, y otros sistemas operativos Unix. "
-"Las versiones anteriores de Audacity están disponibles también para Mac OS 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Audacity es un programa libre escrito por un equipo de <a href=\"http://audacity.sourceforge.net/community/developers\">desarrolladores</a> voluntarios de todo el mundo. Queremos expresar nuestro agradecimiento a  <a href=\"http://sourceforge.net\">SourceForge.net</a> por alojar nuestro proyecto. Audacity está diponible para  Windows 98 o superior, Mac OS X, Linux y otros sistemas operativos tipo Unix. Hay versiones antiguas de Audacity disponibles también para Mac OS 9."
 
 #: AboutDialog.cpp:179
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
-msgstr ""
-"Ésta es una versión beta del programa. Puede contener errores y funciones "
-"incompletas. Dependemos de sus comentarios. Visite nuestro sitio web y "
-"envíenos los errores que encuentre, así como cualquier otro comentario que "
-"quiera hacer."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Esta es una versión beta del programa. Puede contener errores y características incompletas. Dependemos de la respuesta de nuestros usuarios: envie informes de errores y peticiones de características nuevas a <b>feedback at audacityteam.org</b>. Para obtener ayuda sobre el uso de  Audacity, visite nuestro <a href=\"http://audacityteam.org/forum/\">foro</a>."
 
 #: AboutDialog.cpp:182
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
-msgstr ""
-"Ésta es una versión estable y completa de Audacity. Sin embargo, si "
-"encuentra algún error o tiene alguna sugerencia, contacte con nosotros. "
-"Dependemos de la respuesta de los usuarios para continuar mejorando "
-"Audacity. Para más información, visite nuestro sitio web."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Ésta es una versión estable y completa de Audacity. Sin embargo, si encuentra algún error o tiene alguna sugerencia escríbanos a <b>feedback at audacityteam.org</b>. Para obtener ayuda sobre el uso de Audacity, visite nuestro <a href=\"http://audacityteam.org/forum/\">foro</a>."
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -75,8 +48,8 @@ msgid "translator_credits"
 msgstr "Traducción al Español por Antonio Paniagua Navarro"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Un editor de audio digital libre"
+msgid "A Free Digital Audio Editor<br>"
+msgstr "Un editor de audio digital libre<br>"
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -112,124 +85,128 @@ msgstr "Audacity está basado en código de los siguientes proyectos:"
 msgid "Special thanks:"
 msgstr "Agradecimientos especiales:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr "<b>Audacity&reg;</b> copyright &copy; 1999-2008 Audacity Team. <br>El nombre <b>Audacity&reg;</b> es una marca registrada de  Dominic Mazzoni."
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
 
 #. i18n-hint: Information about when audacity was compiled
-#: AboutDialog.cpp:299 AboutDialog.cpp:312 AboutDialog.cpp:468
+#: AboutDialog.cpp:300 AboutDialog.cpp:313 AboutDialog.cpp:469
 msgid "Build Information"
 msgstr "Información de compilación"
 
-#: AboutDialog.cpp:305 effects/AvcCompressor.cpp:674
+#: AboutDialog.cpp:306 effects/AvcCompressor.cpp:674
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: AboutDialog.cpp:306
+#: AboutDialog.cpp:307
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: AboutDialog.cpp:316
+#: AboutDialog.cpp:317
 msgid "File Format Support"
 msgstr "Soporte de formato de archivo"
 
 #. i18n-hint: This is what the library (libmad) does - imports MP3 files
-#: AboutDialog.cpp:326 AboutDialog.cpp:328
+#: AboutDialog.cpp:327 AboutDialog.cpp:329
 msgid "MP3 Importing"
 msgstr "Importación de MP3"
 
-#: AboutDialog.cpp:335 AboutDialog.cpp:338
+#: AboutDialog.cpp:336 AboutDialog.cpp:339
 msgid "Ogg Vorbis Import and Export"
 msgstr "Importación y exportación de Ogg Vorbis"
 
-#: AboutDialog.cpp:342 AboutDialog.cpp:345
+#: AboutDialog.cpp:343 AboutDialog.cpp:346
 msgid "ID3 tag support"
 msgstr "Soporte de etiquetas ID3"
 
-#: AboutDialog.cpp:352 AboutDialog.cpp:355
+#: AboutDialog.cpp:353 AboutDialog.cpp:356
 msgid "FLAC import and export"
 msgstr "Importación y exportación de FLAC"
 
-#: AboutDialog.cpp:360 AboutDialog.cpp:363
+#: AboutDialog.cpp:361 AboutDialog.cpp:364
 msgid "MP2 export"
 msgstr "Exportación a MP2"
 
-#: AboutDialog.cpp:368 AboutDialog.cpp:371
+#: AboutDialog.cpp:369 AboutDialog.cpp:372
 msgid "Import via QuickTime"
 msgstr "Importación mediante QuickTime"
 
 #. i18n-hint: Libraries that are essential to audacity
-#: AboutDialog.cpp:378
+#: AboutDialog.cpp:379
 msgid "Core Libraries"
 msgstr "Bibliotecas principales"
 
-#: AboutDialog.cpp:384 AboutDialog.cpp:387 AboutDialog.cpp:390
-#: AboutDialog.cpp:392
+#: AboutDialog.cpp:385 AboutDialog.cpp:388 AboutDialog.cpp:391
+#: AboutDialog.cpp:393
 msgid "Sample rate conversion"
 msgstr "Conversión de frecuencia de muestreo"
 
-#: AboutDialog.cpp:397 AboutDialog.cpp:400
+#: AboutDialog.cpp:398 AboutDialog.cpp:401
 msgid "Audio playback and recording"
 msgstr "Reproducción y grabación de audio"
 
-#: AboutDialog.cpp:413
+#: AboutDialog.cpp:414
 msgid "Features"
 msgstr "Características"
 
-#: AboutDialog.cpp:417 AboutDialog.cpp:420 AboutDialog.cpp:425
-#: AboutDialog.cpp:428 AboutDialog.cpp:433 AboutDialog.cpp:436
-#: AboutDialog.cpp:441 AboutDialog.cpp:444
+#: AboutDialog.cpp:418 AboutDialog.cpp:421 AboutDialog.cpp:426
+#: AboutDialog.cpp:429 AboutDialog.cpp:434 AboutDialog.cpp:437
+#: AboutDialog.cpp:442 AboutDialog.cpp:445
 msgid "Plug-in support"
 msgstr "Soporte de plug-in"
 
-#: AboutDialog.cpp:449 AboutDialog.cpp:452
+#: AboutDialog.cpp:450 AboutDialog.cpp:453
 msgid "Sound card mixer support"
 msgstr "Soporte de mezclador de tarjeta de sonido"
 
-#: AboutDialog.cpp:457 AboutDialog.cpp:460
+#: AboutDialog.cpp:458 AboutDialog.cpp:461
 msgid "Pitch and Tempo Change support"
-msgstr "Soporte de cambio de tono y tiempo"
+msgstr "Soporte de cambio de tono y ritmo"
 
-#: AboutDialog.cpp:472
+#: AboutDialog.cpp:473
 msgid "Program build date: "
 msgstr "Fecha de compilación del programa: "
 
-#: AboutDialog.cpp:475 AboutDialog.cpp:477
+#: AboutDialog.cpp:476 AboutDialog.cpp:478
 msgid "Build type:"
 msgstr "Tipo de compilación:"
 
-#: AboutDialog.cpp:475
+#: AboutDialog.cpp:476
 msgid "Debug build"
 msgstr "Compilación de depuración"
 
-#: AboutDialog.cpp:477
+#: AboutDialog.cpp:478
 msgid "Release build"
 msgstr "Compilación final"
 
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
-#: AboutDialog.cpp:482
+#: AboutDialog.cpp:483
 msgid "Installation Prefix: "
 msgstr "Prefijo de instalación: "
 
-#: AboutDialog.cpp:486
+#: AboutDialog.cpp:487
 msgid "Settings folder: "
 msgstr "Carpeta de configuración: "
 
-#: AboutDialog.cpp:501
+#: AboutDialog.cpp:502
 msgid "GPL License"
 msgstr "Licencia GPL"
 
-#: AudacityApp.cpp:468 Project.cpp:1761
+#: AudacityApp.cpp:507 Project.cpp:1844
 #, c-format
 msgid "%s is already open in another window."
 msgstr "%s ya está abierto en otra ventana."
 
-#: AudacityApp.cpp:470 Project.cpp:1763 Project.cpp:1868 Project.cpp:2012
-#: Project.cpp:2114
+#: AudacityApp.cpp:509 Project.cpp:1846 Project.cpp:1951 Project.cpp:2095
+#: Project.cpp:2232
 msgid "Error opening project"
 msgstr "Error al abrir el proyecto"
 
-#: AudacityApp.cpp:502
+#: AudacityApp.cpp:541
 #, c-format
 msgid ""
 "%s does not exist and could not be opened.\n"
@@ -240,35 +217,34 @@ msgstr ""
 "\n"
 "Ha sido eliminado del historial."
 
-#: AudacityApp.cpp:581
+#: AudacityApp.cpp:643
 msgid "Master Gain Control"
 msgstr "Control maestro de ganancia"
 
-#: AudacityApp.cpp:582
+#: AudacityApp.cpp:644
 msgid "Input Meter"
 msgstr "Medidor de entrada"
 
-#: AudacityApp.cpp:583
+#: AudacityApp.cpp:645
 msgid "Output Meter"
 msgstr "Medidor de salida"
 
 #. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:751 Menus.cpp:478
+#: AudacityApp.cpp:809
 msgid "&Preferences...\tCtrl+,"
 msgstr "&Preferencias...\tCtrl+,"
 
-#: AudacityApp.cpp:833 AudacityApp.cpp:910
+#: AudacityApp.cpp:901 AudacityApp.cpp:978
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "Usando tamaño de bloque de %ld\n"
 
-#: AudacityApp.cpp:855 AudacityApp.cpp:925
+#: AudacityApp.cpp:923 AudacityApp.cpp:993
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Opción de línea de comandos desconocida: %s\n"
 
-#: AudacityApp.cpp:1044
+#: AudacityApp.cpp:1127
 msgid ""
 "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
@@ -276,25 +252,20 @@ msgstr ""
 "Audacity no puede encontrar un lugar donde almacenar los archivos temporales.\n"
 "Indique una carpeta apropiada en la ventana de preferencias."
 
-#: AudacityApp.cpp:1050
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
-msgstr ""
-"Audacity se cerrará. Ejecute Audacity de nuevo para usar la nueva carpeta "
-"temporal."
+#: AudacityApp.cpp:1133
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity se cerrará. Ejecute Audacity de nuevo para usar la nueva carpeta temporal."
 
-#: AudacityApp.cpp:1082
+#: AudacityApp.cpp:1165
 msgid ""
 "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
 msgstr ""
-"Ejecutar dos copias de Audacity simultáneamente puede provocar "
-"pérdidas de datos o provocar un bloqueo del sistema.\n"
+"Ejecutar dos copias de Audacity simultáneamente puede provocar pérdidas de datos o provocar un bloqueo del sistema.\n"
 "\n"
 
-#: AudacityApp.cpp:1089
+#: AudacityApp.cpp:1172
 msgid ""
 "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
@@ -302,51 +273,49 @@ msgstr ""
 "Audacity no ha podido bloquear la carpeta de archivos temporales.\n"
 "Esta carpeta puede estar siendo utilizada por otra copia de Audacity.\n"
 
-#: AudacityApp.cpp:1091
+#: AudacityApp.cpp:1174
 msgid "Do you still want to start Audacity?"
 msgstr "¿Aún desea ejecutar Audacity?"
 
-#: AudacityApp.cpp:1093
+#: AudacityApp.cpp:1176
 msgid "Error locking temporary folder"
 msgstr "Error al bloquear la carpeta temporal"
 
-#: AudacityApp.cpp:1131
+#: AudacityApp.cpp:1214
 msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr ""
 "El sistema ha detectado que ya se está ejecutando otra copia de Audacity.\n"
 "\n"
 
-#: AudacityApp.cpp:1133
+#: AudacityApp.cpp:1216
 msgid ""
 "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Utilice la opción Nuevo o Abrir en la copia de Audacity que ya se "
-"está ejecutando para abrir múltiples proyectos simultáneamente.\n"
+msgstr "Utilice la opción Nuevo o Abrir en la copia de Audacity que ya se está ejecutando para abrir múltiples proyectos simultáneamente.\n"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1217
 msgid "Audacity is already running"
 msgstr "Audacity ya se está ejecutando"
 
-#: AudacityApp.cpp:1151
+#: AudacityApp.cpp:1234
 msgid "Command-line options supported:"
 msgstr "Parámetros de la línea de comandos:"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1154
+#: AudacityApp.cpp:1237
 msgid "\t-help (this message)"
 msgstr "\t-help (este mensaje)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1156
+#: AudacityApp.cpp:1239
 msgid "\t-version (display Audacity version)"
 msgstr "\t-version (mostrar la versión de Audacity)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1160
+#: AudacityApp.cpp:1243
 msgid "\t-test (run self diagnostics)"
 msgstr "\t-test (ejecutar diagnósticos internos)"
 
@@ -354,19 +323,15 @@ msgstr "\t-test (ejecutar diagnósticos internos)"
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1165
+#: AudacityApp.cpp:1248
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (establecer el tamaño máximo de bloque de disco en bytes)"
 
-#: AudacityApp.cpp:1166
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
-msgstr ""
-"Además puede especificar el nombre de un archivo de audio o un proyecto "
-"de Audacity para abrirlo."
+#: AudacityApp.cpp:1249
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "Además puede especificar el nombre de un archivo de audio o un proyecto de Audacity para abrirlo."
 
-#: AudacityApp.cpp:1443
+#: AudacityApp.cpp:1529
 msgid ""
 "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
@@ -378,15 +343,15 @@ msgstr ""
 "\n"
 "¿Desea asociarlos para que se abran al hacer doble clic sobre ellos?"
 
-#: AudacityApp.cpp:1444
+#: AudacityApp.cpp:1530
 msgid "Audacity Project Files"
 msgstr "Archivos de proyecto de Audacity"
 
-#: AudioIO.cpp:241
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
 msgstr "No se ha podido encontrar ningún dispositivo de audio.\n"
 
-#: AudioIO.cpp:242
+#: AudioIO.cpp:255
 msgid ""
 "You will not be able to play or record audio.\n"
 "\n"
@@ -394,30 +359,27 @@ msgstr ""
 "No será posible reproducir o grabar audio. \n"
 "\n"
 
-#: AudioIO.cpp:245
+#: AudioIO.cpp:258
 msgid "Error: "
 msgstr "Error: "
 
-#: AudioIO.cpp:248
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
 msgstr "Error al inicializar el audio"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr "Problema de latencia"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid ""
 "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
 msgstr ""
-"La configuración de latencia ha provocado que el audio grabado se oculte "
-"antes que cero.\n"
+"La configuración de latencia ha provocado que el audio grabado se oculte antes que cero.\n"
 "Audacity lo ha reubicado para que comience en cero.\n"
-"Puede utilizar la herramienta de desplazamiento en el tiempo (<--> o F5) "
-"para arrastrar la pista al lugar correcto."
+"Puede utilizar la herramienta de desplazamiento en el tiempo (<--> o F5) para arrastrar la pista al lugar correcto."
 
 #: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
@@ -428,23 +390,20 @@ msgid ""
 "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
 msgstr ""
-"Algunos proyectos no se guardaron correctamente la última vez que se ejecutó "
-"Audacity.\n"
+"Algunos proyectos no se guardaron correctamente la última vez que se ejecutó Audacity.\n"
 "Afortunadamente, los siguientes proyectos se pueden recuperar automáticamente:"
 
 #: AutoRecovery.cpp:75
 msgid "Recoverable projects"
 msgstr "Proyectos recuperables"
 
-#: AutoRecovery.cpp:78 Tags.cpp:2032
+#: AutoRecovery.cpp:78 Tags.cpp:2041
 msgid "Name"
 msgstr "Nombre"
 
 #: AutoRecovery.cpp:84
 msgid "Recovering a project will not change any files on disk before you save it."
-msgstr ""
-"La recuperación de un proyecto no realizará ningún cambio en los archivos "
-"hasta que éste sea guardado."
+msgstr "La recuperación de un proyecto no realizará ningún cambio en los archivos hasta que éste sea guardado."
 
 #: AutoRecovery.cpp:88
 msgid "Quit Audacity"
@@ -474,34 +433,35 @@ msgstr "¿Confirmar?"
 msgid "Could not enumerate files in auto save directory"
 msgstr "No se han podido enumerar los archivos de la carpeta de guardado automático"
 
-#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2575 Menus.cpp:4514
-#: Project.cpp:1971 Project.cpp:3343 Project.cpp:3422 WaveTrack.cpp:556
-#: WaveTrack.cpp:575 WaveTrack.cpp:1689 effects/Effect.cpp:436
-#: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
-#: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
-#: toolbars/ControlToolBar.cpp:846
+#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:3045 Menus.cpp:3057
+#: Menus.cpp:5174 Project.cpp:2054 Project.cpp:3615 Project.cpp:3694
+#: TrackPanel.cpp:6385 WaveTrack.cpp:598 WaveTrack.cpp:617 WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077 WaveTrack.cpp:2053 effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233 prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247 toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "Error"
 
-#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57 BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr "Seleccione un comando"
 
-#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:454
+#: BatchCommandDialog.cpp:82 BatchProcessDialog.cpp:454
 #: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
 msgstr "&Comando"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr "&Editar parámetros"
 
-#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:455
+#: BatchCommandDialog.cpp:91 BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr "&Parámetros"
 
-#: BatchCommandDialog.cpp:94
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr "Seleccionar &comando"
 
@@ -561,6 +521,10 @@ msgstr "Aplicar %s"
 msgid "Apply Chain"
 msgstr "Aplicar secuencia de comandos"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "Ejecución de secuencia de limpieza de locución"
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Seleccionar secuencia"
@@ -577,11 +541,11 @@ msgstr "Aplicar al &proyecto actual"
 msgid "Apply to &Files..."
 msgstr "Aplicar a &archivos..."
 
-#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2071
-#: Tags.cpp:2075 Tags.cpp:2375 Tags.cpp:2379 UploadDialog.cpp:180
+#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2080
+#: Tags.cpp:2084 Tags.cpp:2384 Tags.cpp:2388 UploadDialog.cpp:180
 #: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:183
-#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:446
-#: effects/audiounits/AudioUnitEffect.cpp:882 effects/vamp/VampEffect.cpp:411
+#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -598,19 +562,21 @@ msgstr "Aplicando '%s' al proyecto actual"
 msgid "Please save and close the current project first."
 msgstr "Primero debe guardar y cerrar el proyecto actual."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "Seleccionar archivo(s) vocal para la secuencia de limpieza de locución..."
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Seleccionar archivo(s) para la secuencia..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr "Archivos vocales (*.wav;*.mp3)|*.wav;*.mp3|Archivos WAV (*.wav)|*.wav|Archivos MP3 (*.mp3)|*.mp3"
+
 #: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
-msgstr ""
-"Todos los archivos (*.*)|*.*|Archivos WAV (*.wav)|*.wav|Archivos AIFF (*."
-"aif)|*.aif|Archivos AU (*.au)|*.au|Archivos MP3 (*.mp3)|*.mp3|Archivos Ogg "
-"Vorbis (*.ogg)|*.ogg|Archivos FLAC (*.flac)|*.flac|"
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Todos los archivos (*.*)|*.*|Archivos WAV (*.wav)|*.wav|Archivos AIFF (*.aif)|*.aif|Archivos AU (*.au)|*.au|Archivos MP3 (*.mp3)|*.mp3|Archivos Ogg Vorbis (*.ogg)|*.ogg|Archivos FLAC (*.flac)|*.flac|"
 
 #: BatchProcessDialog.cpp:231
 msgid "Applying..."
@@ -629,12 +595,12 @@ msgstr "Editar secuencias de comandos"
 msgid "&Chains"
 msgstr "&Secuencias de comandos"
 
-#: BatchProcessDialog.cpp:435 Tags.cpp:815 Tags.cpp:1455 Tags.cpp:2055
+#: BatchProcessDialog.cpp:435 Tags.cpp:826 Tags.cpp:1465 Tags.cpp:2064
 msgid "&Add"
 msgstr "&Añadir"
 
-#: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:816 Tags.cpp:1456
-#: Tags.cpp:2056 TrackPanel.cpp:4201
+#: BatchProcessDialog.cpp:436 LabelDialog.cpp:128 Tags.cpp:827 Tags.cpp:1466
+#: Tags.cpp:2065 TrackPanel.cpp:4176
 msgid "&Remove"
 msgstr "&Eliminar"
 
@@ -710,85 +676,77 @@ msgstr "Eliminando dependencias"
 msgid "Copying audio data into project..."
 msgstr "Copiando audio dentro del proyecto..."
 
-#: Dependencies.cpp:219
+#: Dependencies.cpp:223
 msgid ""
 "Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
 msgstr ""
 "Actualmente el proyecto depende de la presencia de otros archivos.\n"
-"¿Desea copiar el audio de los archivos indicados en el interior del "
-"proyecto?\n"
+"¿Desea copiar el audio de los archivos indicados en el interior del proyecto?\n"
 "Esto requiere más espacio en disco, pero resulta más seguro."
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
 msgstr "El proyecto depende de archivos de audio externos"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
 msgstr "Dependencias del proyecto"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
 msgstr "Archivo de audio"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
 msgstr "Espacio de disco"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
 msgstr "Copiar audio seleccionado dentro del proyecto"
 
-#: Dependencies.cpp:304 Dependencies.cpp:410
+#: Dependencies.cpp:308 Dependencies.cpp:414
 msgid "Cancel Save"
 msgstr "Cancelar guardado"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
 msgstr "No copiar ningún audio"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
 msgstr "Copiar todo el audio dentro del proyecto (más seguro)"
 
-#: Dependencies.cpp:317 Dependencies.cpp:322
+#: Dependencies.cpp:321 Dependencies.cpp:326
 msgid "Ask me"
 msgstr "Preguntar"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
 msgstr "Copiar siempre todo el audio (el más seguro)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
 msgstr "Nunca copiar los archivos de audio"
 
-#: Dependencies.cpp:321
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
 msgstr "Cuando un proyecto dependa de archivos externos:"
 
-#: Dependencies.cpp:409
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
+#: Dependencies.cpp:413
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
 msgstr "El proyecto no será guardado en el disco. ¿Es esto lo que desea hacer?"
 
-#: Dependencies.cpp:449
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
-msgstr ""
-"El proyecto contiene todos los archivos de audio; no depende de archivos "
-"externos."
+#: Dependencies.cpp:453
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "El proyecto contiene todos los archivos de audio; no depende de archivos externos."
 
-#: Dependencies.cpp:450
+#: Dependencies.cpp:454
 msgid "Dependency check"
 msgstr "Comprobación de dependencia"
 
-#: DirManager.cpp:136
+#: DirManager.cpp:137
 msgid ""
 "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
@@ -796,100 +754,97 @@ msgstr ""
 "Advertencia: hay muy poco espacio disponible en este disco.\n"
 "Seleccione otra carpeta temporal en la ventana de preferencias."
 
-#: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
+#: DirManager.cpp:223 DirManager.cpp:254 DirManager.cpp:337
 msgid "Progress"
 msgstr "Progreso"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
 msgstr "Eliminando archivos temporales"
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "Guardando archivos de datos del proyecto"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
 msgstr "Eliminando el contenido de las carpetas de caché"
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
 msgid ""
 "Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
 msgstr ""
 "Audacity encontró un bloque huérfano %s \n"
-"Considere la posibilidad de guardar el proyecto y volverlo a cargar para "
-"realizar una comprobación completa del mismo.\n"
+"Considere la posibilidad de guardar el proyecto y volverlo a cargar para realizar una comprobación completa del mismo.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:985
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-antiguo%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr "No se puede abrir o crear el archivo de prueba"
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr "No se puede eliminar '%s'"
 
-#: DirManager.cpp:1007
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "Archivo renombrado: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Cambiando bloque %s\n"
-
-#: DirManager.cpp:1051
+#: DirManager.cpp:1160
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "No se puede renombrar '%s' a '%s'"
 
-#: DirManager.cpp:1115 DirManager.cpp:1403
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr "Bloque %s cambiado al nuevo alias\n"
+
+#: DirManager.cpp:1224 DirManager.cpp:1515
 msgid "Inspecting project file data..."
 msgstr "Inspeccionando los datos de archivos del proyecto..."
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr "Bloque huérfano: (%s)"
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr "Archivo de alias perdido: (%s)"
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr "Archivo de resumen perdido: (%s.auf)"
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
 msgstr "Archivo de datos perdido: (%s.au)"
 
-#: DirManager.cpp:1207
+#: DirManager.cpp:1319
 msgid ""
 "Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 msgstr ""
 "La comprobación del proyecto encontró inconsistencias al revisar \n"
 "los datos del proyecto. Haga clic en 'Detalles' para obtener una \n"
 "lista completa de errores, o 'Aceptar' para acceder a más opciones."
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1331
 #, c-format
 msgid ""
 "Project check found %d orphaned blockfile[s]. These files are\n"
@@ -901,25 +856,25 @@ msgstr ""
 "como residuo de algún bloqueo del sistema o algún otro error. \n"
 "Deben ser borrados para que dejen de ocupar espacio innecesariamente."
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
 msgstr "Borrar archivos huérfanos (seguro y recomendado)"
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "Continuar sin borrar; evitar discretamente los archivos extra"
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr "Cerrar el proyecto inmediatamente sin guardar cambios"
 
-#: DirManager.cpp:1228 DirManager.cpp:1263 DirManager.cpp:1309
-#: DirManager.cpp:1351 export/Export.cpp:490 export/Export.cpp:507
-#: export/Export.cpp:526 widgets/Warning.cpp:55
+#: DirManager.cpp:1340 DirManager.cpp:1375 DirManager.cpp:1421
+#: DirManager.cpp:1463 export/Export.cpp:576 export/Export.cpp:597
+#: export/Export.cpp:616 widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "Advertencia"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1366
 #, c-format
 msgid ""
 "Project check detected %d input file[s] being used in place\n"
@@ -936,19 +891,19 @@ msgstr ""
 "sólo para esta sesión o cerrar el proyecto e intentar recuperar esos\n"
 "archivos a mano."
 
-#: DirManager.cpp:1259
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr "Reemplaza datos perdidos con silencios (permanente al guardar)"
 
-#: DirManager.cpp:1260 DirManager.cpp:1348
+#: DirManager.cpp:1372 DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr "Reemplaza temporalmente datos perdidos con silencio (solo esta sesión)"
 
-#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
+#: DirManager.cpp:1373 DirManager.cpp:1419 DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr "Cerrar el proyecto inmediatamente sin más cambios"
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1412
 #, c-format
 msgid ""
 "Project check detected %d missing summary file[s] (.auf).\n"
@@ -959,15 +914,15 @@ msgstr ""
 "Audacity puede regenerar esos resúmenes a partir de los datos originales del \n"
 "proyecto."
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr "Regenerar archivos de resumen (seguro y recomendado)"
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
 msgstr "Rellena con silencio los datos perdidos (sólo esta sesión)"
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1454
 #, c-format
 msgid ""
 "Project check detected %d missing audio data blockfile[s] (.au), \n"
@@ -985,27 +940,27 @@ msgstr ""
 "sólo para esta sesión o cerrar el proyecto e intentar recuperar esos\n"
 "datos a mano."
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr "Reemplaza datos perdidos con silencios (permanente de inmediato)"
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
 msgstr "Eliminando carpetas no utilizadas en los datos del proyecto..."
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1558
 msgid "Caching audio"
 msgstr "Almacenando audio"
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
 msgstr "Almacenando audio en memoria..."
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
 msgstr "Guardando el audio grabado"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
 msgstr "Guardando en disco el audio grabado..."
 
@@ -1013,124 +968,227 @@ msgstr "Guardando en disco el audio grabado..."
 msgid "Rectangular"
 msgstr "Rectangular"
 
-#: FreqWindow.cpp:104
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr "Soporte de FFmpeg no incluido en la compilación"
+
+#: FFmpeg.cpp:101
+msgid ""
+"FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+"FFmpeg fue configurado en las Preferencias y cargado correctamente,                       \n"
+"pero esta vez Audacity no logro cargarlo al iniciar.                       \n"
+"\n"
+"Acceda a Preferencias > Importar/Exportar para reconfigurarlo."
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr "Fallo al iniciar FFmpeg"
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "Biblioteca FFmpeg no encontrada"
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr "Localizar FFmpeg"
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Audacity necesita el archivo %s para importar y exportar audio mediante FFmpeg."
+
+#: FFmpeg.cpp:196 export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Ubicación de %s:"
+
+#: FFmpeg.cpp:205 export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Para buscar %s, haga clic aquí -->"
+
+#: FFmpeg.cpp:211 export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Explorar..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Para obtener una copia gratuita de FFmpeg, haga clic aquí -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr "Descargar"
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235 export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "¿Dónde está %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr "No se ha podido encontrar bibliotecas compatibles con FFmpeg"
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "FFmpeg no encontrada"
+
+#: FFmpeg.h:101
+msgid ""
+"Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+"Audacity usar las bibiliotecas FFmpeg para importar un archivo de audio,\n"
+"pero no se encontraron.\n"
+"para usar las características de importación de FFmpeg acceda a Preferencias->Importar/Exportar\n"
+"e indique a Audacty dónde encontrar estas bibliotecas."
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr "No volver a mostrar este aviso"
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Sólo avformat.dll|avformat*.dll|Bibliotecas enlazadas dinámicamente (*.dll)|*.dll| Todos los archivos (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Bibliotecas dinámicas (*.dylib)|*.dylib|Todos los archivos (*)|*"
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Sólo libavformat.so|libavformat.so*|Bibliotecas enlazadas dinámicamente (*.so*)|*.so*|Todos los archivos (*)|*"
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "Análisis de frecuencia"
 
-#: FreqWindow.cpp:140 TrackPanel.cpp:563
+#: FreqWindow.cpp:139 TrackPanel.cpp:556 prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: FreqWindow.cpp:141
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "Autocorrelación estándar"
 
-#: FreqWindow.cpp:142
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "Autocorrelación de raíz cúbica"
 
-#: FreqWindow.cpp:143
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "Autocorrelación mejorada"
 
 #. i18n-hint: This is a technical term, derived from the word
 #. "spectrum".  Do not translate it unless you are sure you
 #. know the correct technical word in your language.
-#: FreqWindow.cpp:147
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "Algoritmo:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "Algoritmo"
 
-#: FreqWindow.cpp:168 HistoryWindow.cpp:79
+#: FreqWindow.cpp:169 FreqWindow.cpp:173 HistoryWindow.cpp:79
 msgid "Size"
 msgstr "Tamaño"
 
 #. i18n-hint: This refers to a "window function", used in the
 #. Frequency analyze dialog box.
-#: FreqWindow.cpp:181
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr " (ventana)"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Función:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr "Función"
 
-#: FreqWindow.cpp:192
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "Frecuencia lineal"
 
-#: FreqWindow.cpp:193
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "Frecuencia logarítmica"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Eje:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr "Eje"
 
-#: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:204 Menus.cpp:233
+#: FreqWindow.cpp:212 LabelDialog.cpp:130 Menus.cpp:239 Menus.cpp:274
 msgid "&Export..."
 msgstr "&Exportar..."
 
-#: FreqWindow.cpp:209 widgets/ErrorDialog.cpp:159
+#: FreqWindow.cpp:213 export/ExportCL.cpp:325 export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "Exportar"
+
+#: FreqWindow.cpp:216 FreqWindow.cpp:217 widgets/ErrorDialog.cpp:161
 msgid "Close"
 msgstr "Cerrar"
 
-#: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:489
-#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:791
+#: FreqWindow.cpp:280 FreqWindow.cpp:410 effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:792
 #: effects/Compressor.cpp:352 effects/Compressor.cpp:360
-#: effects/Equalization.cpp:1109 effects/Equalization.cpp:1111
-#: effects/Equalization.cpp:1119 effects/Equalization.cpp:1185
-#: effects/Equalization.cpp:1394 effects/Equalization.cpp:1405
-#: effects/Normalize.cpp:365 widgets/Meter.cpp:380
+#: effects/Equalization.cpp:1123 effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133 effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408 effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367 widgets/Meter.cpp:416
 msgid "dB"
 msgstr "dB"
 
 #. i18n-hint: This is the abbreviation for "Hertz", or
 #. cycles per second.
-#: FreqWindow.cpp:287 FreqWindow.cpp:442 effects/Equalization.cpp:1150
-#: effects/Equalization.cpp:1181 import/ImportRaw.cpp:416
+#: FreqWindow.cpp:295 FreqWindow.cpp:450 effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195 import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Hz"
 
-#: FreqWindow.cpp:386
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
 msgstr "No hay suficientes datos seleccionados."
 
-#: FreqWindow.cpp:450 effects/AutoDuck.cpp:793
+#: FreqWindow.cpp:458 effects/AutoDuck.cpp:794
 msgid "s"
 msgstr "s"
 
-#: FreqWindow.cpp:779
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr "Cursor: %d Hz (%s) = %d dB    Pico: %d Hz (%s) = %.1f dB"
 
-#: FreqWindow.cpp:788
+#: FreqWindow.cpp:796
 #, c-format
 msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
 msgstr "Cursor: %.4f s (%d Hz) (%s) = %f,    Pico: %.4f seg (%d Hz) (%s) = %.3f"
 
-#: FreqWindow.cpp:1061
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "espectro.txt"
 
-#: FreqWindow.cpp:1063
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "Exportar datos del espectro como:"
 
-#: FreqWindow.cpp:1079 LabelDialog.cpp:599 Menus.cpp:2207 Project.cpp:2441
-#: Project.cpp:3395 prefs/KeyConfigPrefs.cpp:180
+#: FreqWindow.cpp:1087 LabelDialog.cpp:603 Menus.cpp:2547 Project.cpp:2604
+#: Project.cpp:3667 prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
 msgstr "No se ha podido escribir en el archivo: "
 
-#: FreqWindow.cpp:1084
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
 msgstr "Frecuencia (Hz)\tvolumen (dB)"
 
-#: FreqWindow.cpp:1090
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Retraso (segundos)\tFrecuencia (Hz)\tVolumen"
 
@@ -1195,386 +1253,56 @@ msgid "Welcome to Audacity "
 msgstr "Bienvenido a Audacity "
 
 #: HelpText.cpp:151
-msgid ""
-"Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|"
-"record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or "
-"open an Audacity project]] <li>[[export|export]] to an MP3 or other audio "
-"file, or [[burncd|burn to a CD]]  </ul></p><p>"
-msgstr ""
-"Aprenda como:<ul><li>[[play|Reproducir]] un archivo existente.<li> Cómo  "
-"[[record|grabar]] su voz, un LP o una cinta. <li>Cómo [[edit|editar]] sonido."
-"<li> Cómo [[save|guardar o abrir un proyecto de Audacity]]. [[export|"
-"Exportar]] en formato MP3 u otro archivo de audio o [[burncd|grabar un CD]] "
-"</ul><br><br>"
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "Aprenda como:<ul><li>[[play|Reproducir]] un archivo existente.<li> Cómo  [[record|grabar]] su voz, un LP o una cinta. <li>Cómo [[edit|editar]] sonido.<li> Cómo [[save|guardar o abrir un proyecto de Audacity]]. [[export|Exportar]] en formato MP3 u otro archivo de audio o [[burncd|grabar un CD]] </ul><br><br>"
 
 #: HelpText.cpp:159
-msgid ""
-"This screen can be viewed at any time by clicking the <i>Help</i> menu, then "
-"<i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus "
-"and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a "
-"href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf"
-"\">full Manual</a> in PDF format.</p>"
-msgstr ""
-"Siempre puede volver a estas instrucciones haciendo clic en la opción "
-"'Mensaje de bienvenida' del menú <i>Ayuda</i>. Para consultar una "
-"guía más completa de todos los menús y controles de Audacity seleccione la "
-"opción 'Índice' del menú <i>Ayuda</i> o <a href=\"http://audacity."
-"sourceforge.net/help/documentation/manual_1.4.pdf\">  descargando el manual</"
-"a> en formato PDF.</p>"
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "Siempre puede volver a estas instrucciones haciendo clic en la opción 'Mensaje de bienvenida' del menú <i>Ayuda</i>. Para consultar una guía más completa de todos los menús y controles de Audacity seleccione la opción 'Índice' del menú <i>Ayuda</i> o <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">  descargando el manual</a> en formato PDF.</p>"
 
 #: HelpText.cpp:172
-msgid ""
-"<p><b>Opening audio files:</b> Either drag the files into the current "
-"project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be "
-"opened into a new project window with <i>File &gt; Open</i>. The main "
-"formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), "
-"<b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if "
-"your file is in some other format. <b>To import a CD:</b> extract it to WAV "
-"or AIFF using iTunes, Windows Media Player 11 or similar. See our online "
-"guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:"
-"</b> Press the green Play button to start playback. Press the blue Pause "
-"button once to pause playback, and again to resume. To stop, press the "
-"yellow Stop button. Spacebar can be used to either play or stop. After "
-"stopping, playback resumes from its last starting point. To change the "
-"starting point, click in the track at your desired starting point. The <b>|"
-"&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start "
-"or end of the track respectively. </p><br><br>"
-msgstr ""
-"<p><b>Abrir archivos de audio:</b> Puede arrastrar archivos existentes "
-"dentro de Audacity o usar el comando <i>Archivo &gt; Importar &gt; Audio</"
-"i>. <i>Archivo &gt; Abrir</i> hace lo mismo pero abre una nueva ventana. "
-"Estos son los principales formatos de Audacity: <b>AIFF, AU, FLAC, M4A</b> "
-"(sólo en Mac), <b>MP2/MP3, Ogg Vorbis</b> y <b>WAV</b>. Haga clic [[wma-"
-"proprietary|aquí]] si tiene archivos en otro formato. <b>Para importar un CD:"
-"</b> extraigalo a WAV o AIFF mediante iTunes, Windows Media Player 11 o "
-"similares. Consulte nuestra guía online [[wiki:How to import CDs|Importando "
-"CD]]</p><p> <p><b>Reproducción de audio: </b>Pulse el botón verde de "
-"reproducción. Pulse el botón de pausa azul para parar momentáneamente y una "
-"vez más para continuar. Para detenerlo. Pulse el botón amarillo para detener "
-"la reproducción. También puede utilizar la barra espaciadora tanto para "
-"reproducir como para parar. Cuando comienza a reproducir después de una "
-"parada, ésta continua desde el desde el punto de inicio anterior. Para "
-"modificar el punto de inicio utilice los botones <b>|&lt;&lt;</b> y <b>&gt;"
-"&gt;|</b> para saltar al punto de inicio y de fin respectivamente. Haga clic "
-"en cualquier lugar de la pista para reiniciar desde ese punto.</p><br><br>"
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>Abrir archivos de audio:</b> Puede arrastrar archivos existentes dentro de Audacity o usar el comando <i>Archivo &gt; Importar &gt; Audio</i>. <i>Archivo &gt; Abrir</i> hace lo mismo pero abre una nueva ventana. Estos son los principales formatos de Audacity: <b>AIFF, AU, FLAC, M4A</b> (sólo en Mac), <b>MP2/MP3, Ogg Vorbis</b> y <b>WAV</b>. Haga clic [[wma-proprietary|aquí]] si tiene archivos en otro formato. <b>Para importar un CD:</b> extraigalo a WAV o AIFF mediante iTunes, Windows Media Player 11 o similares. Consulte nuestra guía online [[wiki:How to import CDs|Importando CD]]</p><p> <p><b>Reproducción de audio: </b>Pulse el botón verde de reproducción. Pulse el botón de pausa azul para parar momentáneamente y una vez más para continuar. Para detenerlo. Pulse el botón amarillo para detener la reproducción. También puede utilizar la barra espaciadora tanto para reproducir como para parar. Cuando comienza a reproducir después de una parada, ésta continua desde el desde el punto de inicio anterior. Para modificar el punto de inicio utilice los botones <b>|&lt;&lt;</b> y <b>&gt;&gt;|</b> para saltar al punto de inicio y de fin respectivamente. Haga clic en cualquier lugar de la pista para reiniciar desde ese punto.</p><br><br>"
 
 #: HelpText.cpp:194
-msgid ""
-"<p><b>To record:</b> Set the recording device and input source, adjust the "
-"input level, then press the red Record button.</b></p><p> 1) [[inputdevice|"
-"Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or "
-"in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo "
-"recording if required.<br> 2) [[inputsource|Set input source]] for that "
-"device (for example, microphone or line-in) in the dropdown selector of the "
-"<i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the "
-"<i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) "
-"[[inputlevel|Adjust input level]] using the right-hand slider on the "
-"<i>Mixer Toolbar</i>. Correct adjustment of level before recording is "
-"essential to avoid noise or distortion. </p><p> More help at: \"Recording\" "
-"<a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial "
-"<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-"
-"_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://"
-"www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our "
-"Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:"
-"Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
-msgstr ""
-"<p><b>Para grabar:</b> Indique el dispositivo de grabación y la fuente de "
-"entrada, ajuste el nivel de entrada y pulse el botón rojo de Grabar.</b></p> "
-"<p> 1) [[inputdevice|Establezca el dispositivo de grabación]] en <i>pestaña "
-"de preferencias Audio E/S</i> o en la <i>barra de herramientas de "
-"dispositivos</i>. Las preferencias de E/S de audio le permite seleccionar "
-"una grabación estéreo si fuese necesario.<br> 2) [[inputsource|Establezca la "
-"fuente de entrada]] para ese dispositivo (por ejemplo, micrófono o entrada "
-"de línea) en el selector desplegable de la <i>barra de herramientas de "
-"mezcla</i>, o (en algunos sistemas) en Dispositivo de grabación en la "
-"<i>pestaña de preferencias Audio E/S</i> o en la <i>barra de herramientas de "
-"dispositivos</i>.<br> 3) [[inputlevel|Ajuste el nivel de entrada]] mediante "
-"el control de la parte derecha de la <i>barra de herramientas de mezcla </"
-"i>Corregir el ajuste de nivel es imprescindible para prevenir la aparición "
-"de ruidos o distorsiones. </p><p> Más ayuda en la sección \"Grabación\" de "
-"nuestra <a href=\"http://audacity.sourceforge.net/help/faq\">FAQ</a>, "
-"nuestro tutorial<a href=\"http://www.audacityteam.org/manual/index.php?"
-"title=Tutorial_-_Your_First_Recording\"> Su primera grabación</a>, en el <a "
-"href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page"
-"\">manual</a> y en nuestro wiki en las páginas [[wiki:Recording_Tips|"
-"Consejos de grabación]] y [[wiki:Troubleshooting_Recordings|Resolución de "
-"problemas al grabar]]. </p><br><br>"
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>Para grabar:</b> Indique el dispositivo de grabación y la fuente de entrada, ajuste el nivel de entrada y pulse el botón rojo de Grabar.</b></p> <p> 1) [[inputdevice|Establezca el dispositivo de grabación]] en <i>pestaña de preferencias Audio E/S</i> o en la <i>barra de herramientas de dispositivos</i>. Las preferencias de E/S de audio le permite seleccionar una grabación estéreo si fuese necesario.<br> 2) [[inputsource|Establezca la fuente de entrada]] para ese dispositivo (por ejemplo, micrófono o entrada de línea) en el selector desplegable de la <i>barra de herramientas de mezcla</i>, o (en algunos sistemas) en Dispositivo de grabación en la <i>pestaña de preferencias Audio E/S</i> o en la <i>barra de herramientas de dispositivos</i>.<br> 3) [[inputlevel|Ajuste el nivel de entrada]] mediante el control de la parte derecha de la <i>barra de herramientas de mezcla </i>Corregir el ajuste de nivel es imprescindible para prevenir la aparición de ruidos o distorsiones. </p><p> Más ayuda en la sección \"Grabación\" de nuestra <a href=\"http://audacity.sourceforge.net/help/faq\">FAQ</a>, nuestro tutorial<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Su primera grabación</a>, en el <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">manual</a> y en nuestro wiki en las páginas [[wiki:Recording_Tips|Consejos de grabación]] y [[wiki:Troubleshooting_Recordings|Resolución de problemas al grabar]]. </p><br><br>"
 
 #: HelpText.cpp:221
-msgid ""
-"<p>The input device is the actual physical sound device you are recording "
-"from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of "
-"Preferences</i>, On Windows and Linux, Preferences are at the bottom of the "
-"<i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also "
-"conveniently select Recording Device in the <i>Device Toolbar</i>, which can "
-"be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity "
-"uses the device currently being used by the system, (usually your inbuilt "
-"sound device), so it is often not necessary to change the input device. On "
-"Windows, this current system device can be selected as \"Microsoft Sound "
-"Mapper\". If you are recording from an external USB or Firewire device such "
-"as a USB turntable, select it explicitly by name as recording device after "
-"conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
-"<p>El dispositivo de entrada es el dispositivo físico de sonido desde el que "
-"se está grabando. Este es elegido en \"Dispositivo de grabación\", en la "
-"<i>pestaña Audio E/S de Preferencias</i>. En Windows y en Linux, la opción "
-"Preferencias se encuentra en la parte inferior del menú Edición. En Mac, "
-"está en el menú <i>Audacity</i> También es posible seleccionar el "
-"dispositivo de grabación en la <i>barra de herramientas de dispositivos</i>, "
-"que se puede mostrar mediante la opción <i>Ver &gt; Barra de herramientas..."
-"</i>. </p><p>De forma predeterminada, Audacity utiliza el dispositivo que "
-"está siendo utilizado por el sistema (normalmente será la tarjeta de sonido "
-"instalada), así que habitualmente no es necesario cambiar el dispositivo de "
-"entrada. En Windows, este dispositivo de entrada actual puede ser "
-"seleccionado como \"Mapeador de sonido de Microsoft\". Si está grabando de "
-"un USB externo o un dispositivo Firewire como una mesa de mezclas USB, "
-"seleccionela explícitamente por su nombre como dispositivo de grabación "
-"después de conectarlo.</p><p>Regresar a [[record|Grabación de Audio]]<br></p>"
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>El dispositivo de entrada es el dispositivo físico de sonido desde el que se está grabando. Este es elegido en \"Dispositivo de grabación\", en la <i>pestaña Audio E/S de Preferencias</i>. En Windows y en Linux, la opción Preferencias se encuentra en la parte inferior del menú Edición. En Mac, está en el menú <i>Audacity</i> También es posible seleccionar el dispositivo de grabación en la <i>barra de herramientas de dispositivos</i>, que se puede mostrar mediante la opción <i>Ver &gt; Barra de herramientas...</i>. </p><p>De forma predeterminada, Audacity utiliza el dispositivo que está siendo utilizado por el sistema (normalmente será la tarjeta de sonido instalada), así que habitualmente no es necesario cambiar el dispositivo de entrada. En Windows, este dispositivo de entrada actual puede ser seleccionado como \"Mapeador de sonido de Microsoft\". Si está grabando de un USB externo o un dispositivo Firewire como una mesa de mezclas USB, seleccionela explícitamente por su nombre como dispositivo de grabación después de conectarlo.</p><p>Regresar a [[record|Grabación de Audio]]<br></p>"
 
 #: HelpText.cpp:244
-msgid ""
-"<p>Select the input source (such as microphone or line-in) for your "
-"[[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and "
-"<b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</"
-"i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the "
-"<i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source "
-"will be shown as part of the parent device (for example, <i>High Def Audio "
-"Card: Microphone</i>). If necessary, Mac users can choose the input source "
-"at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire "
-"recording devices don't have a choice of inputs, so this step is not "
-"necessary. If in doubt, see the documentation for your device. </i></p><p> "
-"<b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&i=streaming\">record audio playing on the computer</a>, Windows "
-"and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or "
-"comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
-"<p>Seleccione el dispositivo de entrada (como micrófono o entrada de línea) "
-"para su [inputdevice|dispositivo de grabación]]:<br> - <b>En Windows "
-"(excepto Vista)</b> y <b>Linux</b>, en el selector desplegable de la "
-"<i>barra de herramientas de mezcla</i>.<br> - <b>En Windows Vista</b> y "
-"<b>en Mac</b>, en Dispositivo de grabación en la <i>pestaña Audio E/S de "
-"Preferencias</i>, o en la<i>barra de herramientas de dispositivos</i>. La "
-"fuente se mostrará como una parte del dispositivo predecesor (por ejemplo, "
-"<i>Tarjeta de audio de alta definición:Micrófono</i>). Si es necesario, los "
-"usuarios de Mac pueden escoger la fuente de entrada en la configuración de "
-"audio MIDI de Apple. <br><i><b>Nota:</b> algunos dispositivos de grabación "
-"USB o Firewire no tienen la opción de seleccionar entradas, así que este "
-"paso no sería necesario. Si tiene alguna duda, consulte la documentación de "
-"su dispositivo. </i></p><p> <b>Consejo:</b> Para <a href=\"http://audacity."
-"sourceforge.net/help/faq?s=recording&i=streaming\">grabar el audio que se "
-"está escuchando en el ordenador</a>, los usuarios de Windows y Linux pueden "
-"escoger \"Mezclador estéreo\", \"salida de onda\", \"Total\" o alguna fuente "
-"de entrada similar. </p><p> Volver a  [[record|Grabación de audio]] <br></p>"
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Seleccione el dispositivo de entrada (como micrófono o entrada de línea) para su [inputdevice|dispositivo de grabación]]:<br> - <b>En Windows (excepto Vista)</b> y <b>Linux</b>, en el selector desplegable de la <i>barra de herramientas de mezcla</i>.<br> - <b>En Windows Vista</b> y <b>en Mac</b>, en Dispositivo de grabación en la <i>pestaña Audio E/S de Preferencias</i>, o en la<i>barra de herramientas de dispositivos</i>. La fuente se mostrará como una parte del dispositivo predecesor (por ejemplo, <i>Tarjeta de audio de alta definición:Micrófono</i>). Si es necesario, los usuarios de Mac pueden escoger la fuente de entrada en la configuración de audio MIDI de Apple. <br><i><b>Nota:</b> algunos dispositivos de grabación USB o Firewire no tienen la opción de seleccionar entradas, así que este paso no sería necesario. Si tiene alguna duda, consulte la documentación de su dispositivo. </i></p><p> <b>Consejo:</b> Para <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">grabar el audio que se está escuchando en el ordenador</a>, los usuarios de Windows y Linux pueden escoger \"Mezclador estéreo\", \"salida de onda\", \"Total\" o alguna fuente de entrada similar. </p><p> Volver a  [[record|Grabación de audio]] <br></p>"
 
 #: HelpText.cpp:267
-msgid ""
-"<p>The input level must be set correctly. If the level is too low, there "
-"will be background noise. If the level is too high, there will be distortion "
-"in the loud parts. </p><p>To set the level, either see this [[wiki:"
-"Recording_levels|illustrated online guide]] or follow these steps: "
-"<ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two "
-"<i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If "
-"the meters are not visible, click <i>View &gt; Toolbars</i> and check "
-"\"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</"
-"i> (by the microphone symbol), so that the red bars in the meter come close "
-"to <b>but do not touch</b> the right edge of the scale. If you can't hear "
-"the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check "
-"\"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording "
-"Audio]] <br></p>"
-msgstr ""
-"<p>El nivel de entrada debe establecerse correctamente. Si el nivel de "
-"entrada es demasiado bajo, se producirán ruidos de fondo. Si éste es "
-"demasiado alto, habrá distorsión en las partes más altas. </p><p>Para "
-"establecer el nivel, consulte la  [[wiki:Recording_levels|guía ilustrada "
-"online]] o siga estos pasos: <ol><li>Active <b>monitorización</b>. Haga "
-"doble clic en el medidor de la derecha de la barra de herramientas de "
-"medición (o haga clic con el botón derecho y seleccione \"Comenzar "
-"monitorización\". Si los medidores no están visibles haga clic en \"Ver&gt;"
-"Barras de herramientas</i> y active \"Barra de herramientas de medición\". </"
-"li><li>Ajuste el control de entrada en la <i>barra de herramientas de "
-"mezcla</i> (con el símbolo de micrófono, hasta que las barras rojas del "
-"medidor se acerquen  <b>pero no toquen</b> el borde derecho de la escala. Si "
-"no puede escuchar el audio monitorizado, acceda a <i>la pestaña Audio E/S de "
-"Preferencias</i> y active \"Reproducción a través del software\". </li></"
-"ol></p><p> Regresar a [[record|Grabación de audio]] <br></p>"
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>El nivel de entrada debe establecerse correctamente. Si el nivel de entrada es demasiado bajo, se producirán ruidos de fondo. Si éste es demasiado alto, habrá distorsión en las partes más altas. </p><p>Para establecer el nivel, consulte la  [[wiki:Recording_levels|guía ilustrada online]] o siga estos pasos: <ol><li>Active <b>monitorización</b>. Haga doble clic en el medidor de la derecha de la barra de herramientas de medición (o haga clic con el botón derecho y seleccione \"Comenzar monitorización\". Si los medidores no están visibles haga clic en \"Ver&gt;Barras de herramientas</i> y active \"Barra de herramientas de medición\". </li><li>Ajuste el control de entrada en la <i>barra de herramientas de mezcla</i> (con el símbolo de micrófono, hasta que las barras rojas del medidor se acerquen  <b>pero no toquen</b> el borde derecho de la escala. Si no puede escuchar el audio monitorizado, acceda a <i>la pestaña Audio E/S de Preferencias</i> y active \"Reproducción a través del software\". </li></ol></p><p> Regresar a [[record|Grabación de audio]] <br></p>"
 
 #: HelpText.cpp:292
-msgid ""
-"<p>The main commands for editing audio are under the <i>Edit</i> menu (such "
-"as cut, copy and paste) and the <i>Effect</i> menu (you can do things like "
-"boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity "
-"applies edits to selected areas of the audio track. To select a particular "
-"area, click in the track and drag the shaded area with the mouse. If no "
-"audio is selected, Audacity selects all the audio in the project window.</"
-"p><p> When playing or recording, the Edit and Effect menus will appear "
-"greyed out, because a moving track can't be edited. Commands can sometimes "
-"be unavailable for other reasons too. For example, you can't run effects "
-"until you have audio on the screen, and you can't paste audio until you've "
-"cut or copied it to Audacity's clipboard. </p><br><br>"
-msgstr ""
-"<p>Los principales comandos para edición de audio se encuentran en el menú "
-"<i>Editar</i> (como cortar, copiar y pegar) y el menú <i>Efecto</i> (para "
-"hacer cosas como potenciar los bajos, cambiar el tono y el tiempo o eliminar "
-"ruido). </p><p> Audacity aplica las ediciones a las zonas seleccionadas de "
-"las pistas de audio. Para seleccionar un área en particular, haga clic sobre "
-"la pista y arrastre la zona sombreada con el ratón. Si no se ha seleccionado "
-"ninguna parte de audio, Audacity selecciona todo el audio del proyecto.</"
-"p><p> Cuando se reproduce o se graba, los menús Edición y Efecto aparecerán "
-"deshabilitados ya que una pista en movimiento no puede ser editada. A veces "
-"algunos comandos no estarán disponibles por otros motivos. Por ejemplo, no "
-"se pueden aplicar efectos hasta que no hay audio en la pantalla, o no se "
-"puede pegar audio hasta que no se ha copiado o cortado una parte en el "
-"portapapeles de Audacity.</p><br><br>"
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>Los principales comandos para edición de audio se encuentran en el menú <i>Editar</i> (como cortar, copiar y pegar) y el menú <i>Efecto</i> (para hacer cosas como potenciar los bajos, cambiar el tono y el ritmo o eliminar ruido). </p><p> Audacity aplica las ediciones a las zonas seleccionadas de las pistas de audio. Para seleccionar un área en particular, haga clic sobre la pista y arrastre la zona sombreada con el ratón. Si no se ha seleccionado ninguna parte de audio, Audacity selecciona todo el audio del proyecto.</p><p> Cuando se reproduce o se graba, los menús Edición y Efecto aparecerán deshabilitados ya que una pista en movimiento no puede ser editada. A veces algunos comandos no estarán disponibles por otros motivos. Por ejemplo, no se pueden aplicar efectos hasta que no hay audio en la pantalla, o no se puede pegar audio hasta que no se ha copiado o cortado una parte en el portapapeles de Audacity.</p><br><br>"
 
 #: HelpText.cpp:311
-msgid ""
-"<p>To return later to your unfinished work in Audacity with all tracks and "
-"edits as you left them, save an Audacity project. To play your current work "
-"in other media programs or send it to others, [[export|export]] an audio "
-"file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>."
-"aup</b> project file and  a <b>_data</b> folder containing the actual audio. "
-"To re-open a saved project, click <i>File &gt; Open</i> and open the .aup "
-"file. If you save and exit more than once, an .aup.bak backup file is "
-"created, but the .aup file should always be opened if present. When your "
-"final exported file is exactly as you want, delete the project files and "
-"_data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> "
-"is for saving an empty project. It also lets you save an existing Project to "
-"a <b> new</b> name. This is the only safe way to rename a project. The .aup "
-"file and _data folder should not be moved or renamed manually. </p><p>"
-msgstr ""
-"<p>Para volver en otro momento a un trabajo no terminado manteniendo todas "
-"las pistas y ediciones tal y como se dejaron, guarde el trabajo como un "
-"proyecto de Audacity. Para reproducir el trabajo en otros programas o "
-"enviárselo a otras personas, [[export|expórtelo]] como un archivo WAV o MP3, "
-"por ejemplo.</p> <p> <i>Archivo &gt; Guardar proyecto</i>crea un archivo de "
-"proyecto <b>aup</b> y una carpeta <b>_data</b> que contiene los archivos de "
-"audio. Para reabrir un proyecto guardado, haga clic en <i>Archivo &gt; "
-"Abrir</i> y escoja el archivo aup. Si guarda y sale del programa más de una "
-"vez, se creará una copia de seguridad terminada en .aup.bak, pero siempre se "
-"debe utilizar el archivo .aup. Cuando el trabajo final exportado sea "
-"exactamente lo que quiere, puede borrar los archivos de proyecto y la "
-"carpeta _data para ahorrar espacio.</p><p><i>Archivo &gt; Guardar proyecto "
-"como...</i> se utiliza para guardar un proyecto nuevo. También permite "
-"guardar un proyecto existente con un <b>nuevo</b> nombre. Este es el único "
-"método efectivo para renombrar un proyecto. El archivo .aup y la carpeta "
-"_data no deben ser movidas o renombradas manualmente. </p><p>"
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>Para volver en otro momento a un trabajo no terminado manteniendo todas las pistas y ediciones tal y como se dejaron, guarde el trabajo como un proyecto de Audacity. Para reproducir el trabajo en otros programas o enviárselo a otras personas, [[export|expórtelo]] como un archivo WAV o MP3, por ejemplo.</p> <p> <i>Archivo &gt; Guardar proyecto</i>crea un archivo de proyecto <b>aup</b> y una carpeta <b>_data</b> que contiene los archivos de audio. Para reabrir un proyecto guardado, haga clic en <i>Archivo &gt; Abrir</i> y escoja el archivo aup. Si guarda y sale del programa más de una vez, se creará una copia de seguridad terminada en .aup.bak, pero siempre se debe utilizar el archivo .aup. Cuando el trabajo final exportado sea exactamente lo que quiere, puede borrar los archivos de proyecto y la carpeta _data para ahorrar espacio.</p><p><i>Archivo &gt; Guardar proyecto como...</i> se utiliza para guardar un proyecto nuevo. También permite guardar un proyecto existente con un <b>nuevo</b> nombre. Este es el único método efectivo para renombrar un proyecto. El archivo .aup y la carpeta _data no deben ser movidas o renombradas manualmente. </p><p>"
 
 #: HelpText.cpp:335
-msgid ""
-"To hear your work in other media programs, export it to an audio file such "
-"as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|"
-"Saving an Audacity project]] creates a project file (and linked _data "
-"folder) containing all your edited tracks, so you can return to your work "
-"later. However, other programs can't read Audacity projects. </p><p> To "
-"export, click <i>File &gt; Export</i> then choose the file format you want "
-"to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for "
-"standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:"
-"Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; "
-"Export Selection</i> exports only a selected area of audio. <i>Use File &gt; "
-"Export Multiple</i> to export multiple files at the same time, either one "
-"for each audio track, or one for each labeled area in a single track. "
-"<i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:"
-"Splitting_recordings_into_separate_tracks|split the tracks]] from an album "
-"for multiple export as separate files. </p><br><br>"
-msgstr ""
-"Para escuchar su trabajo en otros programas debe exportarlo a un archivo de "
-"audio como WAV o MP3 (algunos formatos [[wma-propietary|no están "
-"soportados]]). [[save|Guardar un proyecto de Audacity]] crea un archivo de "
-"proyecto (enlazado con una carpeta _data) que contiene todas las pistas "
-"editadas, así que en cualquier momento se puede recuperar el trabajo. No "
-"obstante, otros programas no pueden leer los archivos de proyecto creados "
-"con Audacity.<p><p>Para exportar, haga clic en <i>Archivo &gt; Exportar</i> "
-"y seleccione el formato de archivo al que desea exportar en el menú "
-"desplegable \"Guardar como tipo\". Si desea  [[burncd|grabar un CD]] para "
-"reproductores de CD, seleccione los formatos WAV o AIFF. Para exportar como "
-"MP3 debe tener instalado el [[Lame_Installation|codificador Lame]].</p><p> "
-"<i>Archivo &gt; Exportar Selección</i> exporta varios archivos al mismo "
-"tiempo, ya sea uno por posta o uno por cada zona etiquetada en una sola "
-"pista. <i>Pistas &gt; Insertar etiqueta en selección</i>le permite [[[[wiki:"
-"Splitting_recordings_into_separate_tracks|dividir las pistas]] de un álbum "
-"para realizar una exportación múltiple en archivos independientes. </"
-"p><br><br>"
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "Para escuchar su trabajo en otros programas debe exportarlo a un archivo de audio como WAV o MP3 (algunos formatos [[wma-propietary|no están soportados]]). [[save|Guardar un proyecto de Audacity]] crea un archivo de proyecto (enlazado con una carpeta _data) que contiene todas las pistas editadas, así que en cualquier momento se puede recuperar el trabajo. No obstante, otros programas no pueden leer los archivos de proyecto creados con Audacity.<p><p>Para exportar, haga clic en <i>Archivo &gt; Exportar</i> y seleccione el formato de archivo al que desea exportar en el menú desplegable \"Guardar como tipo\". Si desea  [[burncd|grabar un CD]] para reproductores de CD, seleccione los formatos WAV o AIFF. Para exportar como MP3 debe tener instalado el [[Lame_Installation|codificador Lame]].</p><p> <i>Archivo &gt; Exportar Selección</i> exporta varios archivos al mismo tiempo, ya sea uno por posta o uno por cada zona etiquetada en una sola pista. <i>Pistas &gt; Insertar etiqueta en selección</i>le permite [[[[wiki:Splitting_recordings_into_separate_tracks|dividir las pistas]] de un álbum para realizar una exportación múltiple en archivos independientes. </p><br><br>"
 
 #: HelpText.cpp:359
-msgid ""
-"<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in "
-"<b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due "
-"to licensing and patent restrictions.  On a Mac computer, unprotected "
-"<b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are "
-"not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files "
-"protected by any kind of Digital Rights Management (DRM), including most "
-"purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</"
-"p><p> If you can't import your file into Audacity, then if it is not DRM-"
-"protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, "
-"burn it to an audio CD in the program licensed to play it, then extract the "
-"CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos."
-"sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could "
-"also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-"i=streaming\">record</a> the CD to your computer. <i>To export to an "
-"unsupported format, export to WAV or AIFF and convert it to the desired "
-"format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">SUPER</a>. </i></p><p>"
-msgstr ""
-"<p>Audacity <b>no puede</b> [[play|reproducir]] o [[export|exportar]] "
-"archivos en la mayoría de formatos propietarios como <b>WMA, RealAudio, "
-"Shorten (SHN)</b> por problemas de licencia o restricciones de patente.  En "
-"ordenadores con Mac formatos <b>AAC</b> no protegidos como <b>M4A</b> pueden "
-"ser importados. Algunos formatos abiertos como <b>Ogg Speex</b> y "
-"<b>Musepack</b> aún no están soportados. Archivos protegidos por cualquier "
-"tipo de sistema de gestión de derechos digitales (DRM) incluídos la mayoría "
-"de los que se adquieren online en tiendas como iTunes o Napster, <b>no "
-"pueden</b> ser importados.</p><p> Si no puede importar un archivo en "
-"Audacity y está seguro de que no está protegido con DRM puede utilizar "
-"iTunes o <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> "
-"para convertirlo a WAV o AIFF. Si está protegido puede grabarlo en un CD de "
-"audio en un programa con licencia para reproducirlo y a continuación extraer "
-"la pista del CD a formato WAV o AIFF mediante iTunes o (en Windows) <a href="
-"\"http://cdexos.sourceforge.net/?q=download\">CDex</a> o Windows Media "
-"Player 11. También puede  <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&amp;i=streaming\">grabar</a> el CD en su ordenador. <i>Para "
-"exportar a un formato no soportado, exporte a WAV o AIFF y conviértalo al "
-"formato deseado con iTunes o <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a>. </i></p><p>"
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>Audacity <b>no puede</b> [[play|reproducir]] o [[export|exportar]] archivos en la mayoría de formatos propietarios como <b>WMA, RealAudio, Shorten (SHN)</b> por problemas de licencia o restricciones de patente.  En ordenadores con Mac formatos <b>AAC</b> no protegidos como <b>M4A</b> pueden ser importados. Algunos formatos abiertos como <b>Ogg Speex</b> y <b>Musepack</b> aún no están soportados. Archivos protegidos por cualquier tipo de sistema de gestión de derechos digitales (DRM) incluídos la mayoría de los que se adquieren online en tiendas como iTunes o Napster, <b>no pueden</b> ser importados.</p><p> Si no puede importar un archivo en Audacity y está seguro de que no está protegido con DRM puede utilizar iTunes o <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> para convertirlo a WAV o AIFF. Si está protegido puede grabarlo en un CD de audio en un programa con licencia para reproducirlo y a continuación extraer la pista del CD a formato WAV o AIFF mediante iTunes o (en Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> o Windows Media Player 11. También puede  <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">grabar</a> el CD en su ordenador. <i>Para exportar a un formato no soportado, exporte a WAV o AIFF y conviértalo al formato deseado con iTunes o <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 
 #: HelpText.cpp:383
-msgid ""
-"<p>To burn your work to an audio CD for standalone CD players, first "
-"[[export|export]] it as WAV or AIFF. The exported file should be stereo, "
-"44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in "
-"the \"Options\" button in the file export dialog). These are Audacity's "
-"default settings, so normally you will not need to change these before "
-"exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" "
-"or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media "
-"Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. "
-"</p><p>"
-msgstr ""
-"<p>Para grabar su trabajo en un CD de audio para escucharlo en "
-"reproductores  de CD, primero [[export|expórtelo]] como WAV o AIFF. El "
-"archivo exportado debería ser estéreo, 44100 Hz (se establece en el botón "
-"\"Frecuencia del proyecto\" en la parte inferior izquierda) y 16 bit (se "
-"establece en el botón \"Opciones\" del cuadro de diálogo de exportación de "
-"archivo). Estas son las opciones de configuración predeterminadas en "
-"Audacity, así que probablemente no necesitará cambiar nada antes de exportar."
-"<p>Almacene los archivos exportados en un \"CD de audio\", no en un \"CD de "
-"datos\" o un \"CD MP3\", con un programa de grabación de CD como iTunes o "
-"Windows Media Player. Para obtener más información consulte la ayuda online "
-"[[wiki:How_to_burn_CDs|Como grabar CD]]. </p><p>"
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "<p>Para grabar su trabajo en un CD de audio para escucharlo en reproductores  de CD, primero [[export|expórtelo]] como WAV o AIFF. El archivo exportado debería ser estéreo, 44100 Hz (se establece en el botón \"Frecuencia del proyecto\" en la parte inferior izquierda) y 16 bit (se establece en el botón \"Opciones\" del cuadro de diálogo de exportación de archivo). Estas son las opciones de configuración predeterminadas en Audacity, así que probablemente no necesitará cambiar nada antes de exportar.<p>Almacene los archivos exportados en un \"CD de audio\", no en un \"CD de datos\" o un \"CD MP3\", con un programa de grabación de CD como iTunes o Windows Media Player. Para obtener más información consulte la ayuda online [[wiki:How_to_burn_CDs|Como grabar CD]]. </p><p>"
 
 #: HelpText.cpp:403
-msgid ""
-"<p>You don't appear to have Audacity help files on your machine. Either <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the "
-"help files and then access them again from Audacity by clicking <i>Help</i> "
-"then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr ""
-"<p>Parece que no tiene instalados los archivos de ayuda Audacity en su "
-"ordenador. Puede <a href=\"http://audacity.sourceforge.net/help/documentation"
-"\">descargar</a> los archivos de ayuda y así acceder a ellos desde Audacity "
-"pulsando en <i>Ayuda</i> y <i>Índice</i> o haciendo clic <a href=\"http://"
-"www.audacityteam.org/manual/index.php?title=Main_Page\">aquí</a> para leer "
-"el manual completo online."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr "<p>La ayuda de la versión Beta de Audacity está incompleta. Se puedeconsultar un borrador <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a> del manual. También puede hacer clic <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">aquí</a> para descargar una versión del manual en una sola página que se mostrará en esta ventana."
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1596,13 +1324,13 @@ msgstr "&Niveles disponibles para deshacer"
 msgid "Levels To Discard"
 msgstr "Niveles a descartar"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "&Descartar"
 
-#: HistoryWindow.cpp:111 Tags.cpp:2072 Tags.cpp:2074 Tags.cpp:2376
-#: Tags.cpp:2378 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
-#: effects/vamp/VampEffect.cpp:414 export/ExportCL.cpp:398
+#: HistoryWindow.cpp:112 Tags.cpp:2081 Tags.cpp:2083 Tags.cpp:2385
+#: Tags.cpp:2387 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
+#: export/ExportCL.cpp:399
 msgid "&OK"
 msgstr "&Aceptar"
 
@@ -1610,7 +1338,7 @@ msgstr "&Aceptar"
 msgid "Unable to determine"
 msgstr "No se puede determinar"
 
-#: Internat.cpp:195 import/ImportRaw.cpp:392
+#: Internat.cpp:195 import/ImportRaw.cpp:385
 msgid "bytes"
 msgstr "bytes"
 
@@ -1626,47 +1354,47 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: LabelDialog.cpp:52
+#: LabelDialog.cpp:54
 msgid "Track"
 msgstr "Pista"
 
-#: LabelDialog.cpp:53 Menus.cpp:4057 Menus.cpp:4085
+#: LabelDialog.cpp:55 Menus.cpp:4669 Menus.cpp:4704
 msgid "Label"
 msgstr "Etiqueta"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56 TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr "Instante inicial"
 
-#: LabelDialog.cpp:55
+#: LabelDialog.cpp:57 TimerRecordDialog.cpp:298
 msgid "End Time"
 msgstr "Instante final"
 
-#: LabelDialog.cpp:98 Menus.cpp:627
+#: LabelDialog.cpp:100 Menus.cpp:711
 msgid "&Edit Labels"
 msgstr "&Editar etiquetas"
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
 msgstr "Pulse F2 o haga doble clic para editar los contenidos de la celda."
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr "Insert&ar después"
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr "Insertar a&ntes"
 
-#: LabelDialog.cpp:127 Menus.cpp:194
+#: LabelDialog.cpp:129
 msgid "&Import..."
 msgstr "&Importar..."
 
-#: LabelDialog.cpp:155
+#: LabelDialog.cpp:157
 msgid "New..."
 msgstr "Nuevo..."
 
-#: LabelDialog.cpp:352
+#: LabelDialog.cpp:354
 msgid ""
 "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
@@ -1678,44 +1406,43 @@ msgstr ""
 "\n"
 "¿Desea volver e indicar los nombres?"
 
-#: LabelDialog.cpp:353
+#: LabelDialog.cpp:355
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: LabelDialog.cpp:514 Menus.cpp:3555
+#: LabelDialog.cpp:516 Menus.cpp:4093
 msgid "Select a text file containing labels..."
 msgstr "Seleccione un archivo de texto que contenga etiquetas..."
 
-#: LabelDialog.cpp:518 Menus.cpp:3559
+#: LabelDialog.cpp:520 Menus.cpp:4097
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Archivos de texto (*.txt)|*.txt|Todos los archivos (*.*)|*.*"
 
-#: LabelDialog.cpp:532 Menus.cpp:3571 Project.cpp:1831 Project.cpp:1839
-#: import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534 Menus.cpp:4109 Project.cpp:1914 Project.cpp:1922
 msgid "Could not open file: "
 msgstr "No se ha podido abrir el archivo: "
 
-#: LabelDialog.cpp:558
+#: LabelDialog.cpp:560
 msgid "No labels to export."
 msgstr "No hay etiquetas que exportar."
 
-#: LabelDialog.cpp:564 Menus.cpp:2172
+#: LabelDialog.cpp:566 Menus.cpp:2510
 msgid "Export Labels As:"
 msgstr "Exportar etiquetas como:"
 
-#: LabelDialog.cpp:566 Menus.cpp:2170
+#: LabelDialog.cpp:568 Menus.cpp:2508
 msgid "labels.txt"
 msgstr "etiquetas.txt"
 
-#: LabelDialog.cpp:699
+#: LabelDialog.cpp:703
 msgid "New Label Track"
 msgstr "Nueva pista de etiqueta"
 
-#: LabelDialog.cpp:700
+#: LabelDialog.cpp:704
 msgid "Enter track name"
 msgstr "Introduzca el nombre de la pista"
 
-#: LabelDialog.cpp:701 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:555
+#: LabelDialog.cpp:705 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:630
 msgid "&Label Track"
 msgstr "&Pista de etiqueta"
 
@@ -1723,7 +1450,7 @@ msgstr "&Pista de etiqueta"
 msgid "Audacity First Run"
 msgstr "Primera ejecución de Audacity"
 
-#: LangChoice.cpp:84
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
 msgstr "Seleccione el idioma que desea utilizar:"
 
@@ -1740,1319 +1467,1410 @@ msgstr ""
 msgid "Opening Audacity Project"
 msgstr "Abriendo proyecto de Audacity"
 
-#: Menus.cpp:162
+#: Menus.cpp:192
 msgid "&File"
 msgstr "&Archivo"
 
-#: Menus.cpp:164
+#: Menus.cpp:194
 msgid "&New\tCtrl+N"
 msgstr "&Nuevo\tCtrl+N"
 
-#: Menus.cpp:166
+#: Menus.cpp:196
 msgid "&Open...\tCtrl+O"
 msgstr "&Abrir...\tCtrl+O"
 
-#: Menus.cpp:171
+#: Menus.cpp:201
 msgid "&Close\tCtrl+W"
 msgstr "&Cerrar\tCtrl+W"
 
-#: Menus.cpp:174
+#: Menus.cpp:204
 msgid "&Save Project\tCtrl+S"
 msgstr "&Guardar proyecto\tCtrl+S"
 
-#: Menus.cpp:178 Project.cpp:2690
+#: Menus.cpp:208 Project.cpp:2896
 msgid "Save Project &As..."
 msgstr "Guardar &proyecto como..."
 
-#: Menus.cpp:181
+#: Menus.cpp:210
+msgid "Save Compressed Copy of Project..."
+msgstr "Guardar una copia comprimida del proyecto..."
+
+#: Menus.cpp:214
 msgid "Chec&k Dependencies..."
 msgstr "Co&mprobar dependencias..."
 
-#: Menus.cpp:187
+#: Menus.cpp:220
 msgid "Open Me&tadata Editor..."
 msgstr "Abrir edi&tor de metadatos..."
 
-#: Menus.cpp:196
+#: Menus.cpp:227 import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Importar"
+
+#: Menus.cpp:229
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audio...\tCtrl+Mayús+I"
 
-#: Menus.cpp:197
+#: Menus.cpp:230
 msgid "&Labels..."
 msgstr "&Etiquetas..."
 
-#: Menus.cpp:198
+#: Menus.cpp:232
 msgid "&MIDI..."
 msgstr "&MIDI..."
 
-#: Menus.cpp:199
+#: Menus.cpp:234
 msgid "&Raw Data..."
 msgstr "Datos en b&ruto..."
 
-#: Menus.cpp:210 Menus.cpp:239
+#: Menus.cpp:245 Menus.cpp:280
 msgid "Expo&rt Selection..."
 msgstr "Expo&rtar selección..."
 
-#: Menus.cpp:217
+#: Menus.cpp:252
 msgid "Export &Labels..."
 msgstr "Exportar e&tiquetas..."
 
-#: Menus.cpp:218
+#: Menus.cpp:253
 msgid "Export &Multiple..."
 msgstr "Exportar &múltiple..."
 
-#: Menus.cpp:247
+#: Menus.cpp:255
+msgid "Export MIDI..."
+msgstr "Exportar MIDI..."
+
+#: Menus.cpp:288
 msgid "CleanSpeech C&hain..."
 msgstr "Limpieza de lo&cución..."
 
-#: Menus.cpp:248 Menus.cpp:262
+#: Menus.cpp:289 Menus.cpp:303
 msgid "Edit C&hains..."
 msgstr "Editar se&cuencias de comandos..."
 
-#: Menus.cpp:249
+#: Menus.cpp:290
 msgid "Export CleanSpeech &Presets..."
 msgstr "Ex&portar configuración de limpieza de locución..."
 
-#: Menus.cpp:250
+#: Menus.cpp:291
 msgid "I&mport CleanSpeech Presets..."
 msgstr "I&mportar configuración de limpieza de locución..."
 
-#: Menus.cpp:260
+#: Menus.cpp:301
 msgid "Appl&y Chain..."
 msgstr "Apl&icar secuencia de comandos..."
 
-#: Menus.cpp:267
+#: Menus.cpp:308
 msgid "&Upload File..."
 msgstr "P&ublicar archivo..."
 
-#: Menus.cpp:273
+#: Menus.cpp:314
 msgid "Pa&ge Setup..."
 msgstr "Confi&gurar página...."
 
-#: Menus.cpp:274
+#: Menus.cpp:315
 msgid "&Print..."
 msgstr "Im&primir...."
 
-#: Menus.cpp:287
+#: Menus.cpp:328
 msgid "E&xit\tCtrl+Q"
 msgstr "Sa&lir\tCtrl+Q"
 
-#: Menus.cpp:295 toolbars/EditToolBar.cpp:76
+#: Menus.cpp:336 toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "&Editar"
 
-#: Menus.cpp:299
+#: Menus.cpp:340
 msgid "&Undo\tCtrl+Z"
 msgstr "&Deshacer\tCtrl+Z"
 
-#: Menus.cpp:307 prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:146
+#: Menus.cpp:348 prefs/KeyConfigPrefs.cpp:371 toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "&Rehacer"
 
-#: Menus.cpp:320
+#: Menus.cpp:361
 msgid "Cu&t\tCtrl+X"
 msgstr "Cor&tar\tCtrl+X"
 
-#: Menus.cpp:324
+#: Menus.cpp:365
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr "D&ividir y cortar\tCtrl+Alt+X"
 
-#: Menus.cpp:325
+#: Menus.cpp:366
 msgid "&Copy\tCtrl+C"
 msgstr "&Copiar\tCtrl+C"
 
-#: Menus.cpp:329
+#: Menus.cpp:370
 msgid "&Paste\tCtrl+V"
 msgstr "&Pegar\tCtrl+V"
 
-#: Menus.cpp:333
+#: Menus.cpp:374
 msgid "Tri&m\tCtrl+T"
 msgstr "&R&ecortar\tCtrl+T"
 
-#: Menus.cpp:335
+#: Menus.cpp:376
 msgid "&Delete\tCtrl+K"
 msgstr "&Borrar\tCtrl+K"
 
-#: Menus.cpp:336
+#: Menus.cpp:377
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Dividir y &borrar\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "Si&lenciar\tCtrl+L"
+#: Menus.cpp:378
+msgid "Silence Audi&o\tCtrl+L"
+msgstr "Silenciar audi&o\tCtrl+L"
 
-#: Menus.cpp:339
+#: Menus.cpp:380
 msgid "Sp&lit\tCtrl+I"
 msgstr "D&ividir\tCtrl+I"
 
-#: Menus.cpp:344
+#: Menus.cpp:385
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "Di&vidir y nueva\tCtrl+Alt+I"
 
-#: Menus.cpp:349
+#: Menus.cpp:390
 msgid "&Join\tCtrl+J"
 msgstr "&Unir\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Desu&nir en silencios\tCtrl+Alt+J"
+#: Menus.cpp:391
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "Des&unir en los silencios\tCtrl+Alt+J"
 
-#: Menus.cpp:352
+#: Menus.cpp:392
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Duplic&ar\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "E&stéreo a Mono"
+#: Menus.cpp:398 Menus.cpp:637
+msgid "Stereo Trac&k to Mono"
+msgstr "Pista e&stéreo a mono"
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Z&onas etiquetadas..."
+#: Menus.cpp:405
+msgid "La&beled Regions"
+msgstr "Z&onas etiquetadas"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:367
+#: Menus.cpp:407
 msgid "&Cut\tAlt+X"
 msgstr "Cor&tar\tAlt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:372
+#: Menus.cpp:412
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "Dividir y cor&tar\tMayús+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:377
+#: Menus.cpp:417
 msgid "Co&py\tShift+Alt+C"
 msgstr "Co&piar\tMayús+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:383
+#: Menus.cpp:423
 msgid "&Delete\tAlt+K"
 msgstr "&Borrar\tAlt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:388
+#: Menus.cpp:428
 msgid "Sp&lit Delete\tShift+Alt+K"
 msgstr "Dividir y &borrar\tMayús+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:393
+#: Menus.cpp:433
 msgid "Sile&nce\tAlt+L"
 msgstr "Sile&nciar\tAlt+L"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:399
+#: Menus.cpp:439
 msgid "Spli&t\tAlt+I"
 msgstr "D&ividir\tAlt+I"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:404
+#: Menus.cpp:444
 msgid "&Join\tAlt+J"
 msgstr "&Unir\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:449
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr "Desu&nir en silencios\tMayús+Alt+J"
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Seleccionar..."
+#: Menus.cpp:454
+msgid "&Select"
+msgstr "&Seleccionar"
 
-#: Menus.cpp:416
+#: Menus.cpp:455
 msgid "&All\tCtrl+A"
 msgstr "&Todo\tCtrl+A"
 
-#: Menus.cpp:417
+#: Menus.cpp:456
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Nada\tCtrl+Mayús+A"
 
-#: Menus.cpp:421
+#: Menus.cpp:460
 msgid "&Left at Playback Position\t["
 msgstr "Desde la &izquierda hasta el cursor\t["
 
-#: Menus.cpp:422
+#: Menus.cpp:461
 msgid "&Right at Playback Position\t]"
 msgstr "Desde la &derecha hasta el cursor\t]"
 
-#: Menus.cpp:426
+#: Menus.cpp:465
 msgid "Track &Start to Cursor\tShift+J"
 msgstr "De&sde el principio hasta el cursor\tShift+J"
 
-#: Menus.cpp:427
+#: Menus.cpp:466
 msgid "Cursor to Track &End\tShift+K"
 msgstr "D&esde el cursor hasta el final\tShift+K"
 
-#: Menus.cpp:433
+#: Menus.cpp:472
 msgid "Find &Zero Crossings\tZ"
 msgstr "Encontrar &cruces en cero\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Mo&ver cursor..."
+#: Menus.cpp:474
+msgid "Mo&ve Cursor"
+msgstr "Mo&ver cursor"
 
-#: Menus.cpp:437
+#: Menus.cpp:476
 msgid "to Selection Star&t"
 msgstr "&Al comienzo de la selección"
 
-#: Menus.cpp:438
+#: Menus.cpp:477
 msgid "to Selection En&d"
 msgstr "Al &final de la selección"
 
-#: Menus.cpp:442
+#: Menus.cpp:481
 msgid "to Track &Start\tJ"
 msgstr "Al comienzo de la pi&sta\tJ"
 
-#: Menus.cpp:443
+#: Menus.cpp:482
 msgid "to Track &End\tK"
 msgstr "Al final d&e la pista\tK"
 
-#: Menus.cpp:450
+#: Menus.cpp:489
 msgid "Re&gion Save"
 msgstr "&Guardar selección"
 
-#: Menus.cpp:451
+#: Menus.cpp:490
 msgid "Regio&n Restore"
 msgstr "Restaurar selecció&n"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Á&rea de reproducción..."
+#: Menus.cpp:501
+msgid "Pla&y Region"
+msgstr "Á&rea de reproducción"
 
-#: Menus.cpp:463
+#: Menus.cpp:502
 msgid "&Lock"
 msgstr "B&loquear"
 
-#: Menus.cpp:464
+#: Menus.cpp:503
 msgid "&Unlock"
 msgstr "&Desbloquear"
 
-#: Menus.cpp:470
+#: Menus.cpp:509
 msgid "Turn Snap-To On"
 msgstr "Activar ajuste"
 
-#: Menus.cpp:471
+#: Menus.cpp:510
 msgid "Turn Snap-To Off"
 msgstr "Desactivar ajuste"
 
-#: Menus.cpp:472
+#: Menus.cpp:511
 msgid "Turn Grid Snap On"
 msgstr "Activar el ajuste a cuadrícula"
 
-#: Menus.cpp:473
+#: Menus.cpp:512
 msgid "Turn Grid Snap Off"
 msgstr "Desactivar el ajuste a cuadrícula"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Preferencias...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:517
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "Pre&ferencias...\tCtrl+,"
+
+#: Menus.cpp:521
+msgid "Pre&ferences...\tCtrl+P"
+msgstr "Pre&ferencias...\tCtrl+P"
 
-#: Menus.cpp:492
+#: Menus.cpp:531
 msgid "&View"
 msgstr "&Ver"
 
-#: Menus.cpp:494
+#: Menus.cpp:533
 msgid "Zoom &In\tCtrl+1"
 msgstr "&Ampliar\tCtrl+1"
 
-#: Menus.cpp:497
+#: Menus.cpp:536
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "&Normal\tCtrl+2"
 
-#: Menus.cpp:498
+#: Menus.cpp:537
 msgid "Zoom &Out\tCtrl+3"
 msgstr "R&educir\tCtrl+3"
 
-#: Menus.cpp:501
+#: Menus.cpp:540
 msgid "&Fit in Window\tCtrl+F"
 msgstr "A&justar a la ventana\tCtrl+F"
 
-#: Menus.cpp:502
+#: Menus.cpp:541
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "Ajustar &verticalmente\tCtrl+Mayús+F"
 
-#: Menus.cpp:503
+#: Menus.cpp:542
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "Ampliar la s&elección\tCtrl+E"
 
-#: Menus.cpp:506
+#: Menus.cpp:545
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr "&Contraer todas las pistas\tCtrl+Mayús+C"
 
-#: Menus.cpp:507
+#: Menus.cpp:546
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "E&xpandir todas las pistas\tCtrl+Mayús+X"
 
-#: Menus.cpp:510
+#: Menus.cpp:549
 msgid "&Show Clipping"
 msgstr "Mo&strar distorsión"
 
-#: Menus.cpp:519
+#: Menus.cpp:558
 msgid "&History..."
 msgstr "&Historial..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&Barras de herramientas..."
+#: Menus.cpp:564
+msgid "&Toolbars"
+msgstr "&Barras de herramientas"
 
-#: Menus.cpp:526
+#: Menus.cpp:565
 msgid "&Control Toolbar"
 msgstr "Barra de herramientas de &control"
 
-#: Menus.cpp:527
+#: Menus.cpp:566
 msgid "&Device Toolbar"
 msgstr "Barra de herramientas de &dispositivos"
 
-#: Menus.cpp:528
+#: Menus.cpp:567
 msgid "&Edit Toolbar"
 msgstr "Barra de herramientas de &edición"
 
-#: Menus.cpp:529
+#: Menus.cpp:568
 msgid "&Meter Toolbar"
 msgstr "Barra de herramientas de &medidores"
 
-#: Menus.cpp:530
+#: Menus.cpp:569
 msgid "Mi&xer Toolbar"
 msgstr "Barra de herramientas de me&zcla"
 
-#: Menus.cpp:531
+#: Menus.cpp:570
 msgid "&Selection Toolbar"
 msgstr "Barra de herramientas de &selección"
 
-#: Menus.cpp:532
+#: Menus.cpp:571
 msgid "T&ools Toolbar"
 msgstr "Barra de herramientas de &herramientas"
 
-#: Menus.cpp:533
+#: Menus.cpp:572
 msgid "Transcri&ption Toolbar"
 msgstr "Barra de herramientas de &transcripción"
 
-#: Menus.cpp:535
+#: Menus.cpp:574
 msgid "&Reset Toolbars"
 msgstr "&Restablecer barras de herramientas"
 
-#: Menus.cpp:537
+#: Menus.cpp:576
 msgid "!Simplified View"
 msgstr "!Vista simplificada"
 
-#: Menus.cpp:545
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:585
+msgid "T&ransport"
+msgstr "Cont&rol"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr "Reproducir\tEspacio"
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr "Reproducir cíc&licamente\tMayús+Espacio"
+
+#: Menus.cpp:591
+msgid "&Pause\tP"
+msgstr "&Pausa\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr "&Parar\tEspacio"
+
+#: Menus.cpp:593 Menus.cpp:1008
+msgid "Skip to Start\tHome"
+msgstr "Ir al comienzo\tInicio"
+
+#: Menus.cpp:595 Menus.cpp:1009
+msgid "Skip to End\tEnd"
+msgstr "Ir al final\tFin"
+
+#: Menus.cpp:598
+msgid "&Record\tR"
+msgstr "G&rabar\tR"
+
+#: Menus.cpp:600
+msgid "&Timer Record...\tShift+T"
+msgstr "Grabación &programada...\tMayús+T"
+
+#: Menus.cpp:602
+msgid "Append Record\tShift+R"
+msgstr "Anexar grabación\tMayús+R"
+
+#: Menus.cpp:605
+msgid "Overdub (on/off)"
+msgstr "Remezclar"
+
+#: Menus.cpp:607
+msgid "Software Playthrough (on/off)"
+msgstr "Reproducción a través del software"
+
+#: Menus.cpp:610
+msgid "Sound Activated Recording (on/off)"
+msgstr "Grabación por activación de sonido"
+
+#: Menus.cpp:612
+msgid "Sound Activation Level..."
+msgstr "Nivel de activación de sonido..."
+
+#: Menus.cpp:620
 msgid "&Tracks"
 msgstr "&Pistas"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Añadir &nueva..."
+#: Menus.cpp:627
+msgid "Add &New"
+msgstr "Añadir &nueva"
 
-#: Menus.cpp:553
+#: Menus.cpp:628
 msgid "&Audio Track\tCtrl+Shift+N"
 msgstr "Pista de &audio\tCtrl+Mayús+N"
 
-#: Menus.cpp:554
+#: Menus.cpp:629
 msgid "&Stereo Track"
-msgstr "Pista e&stéreo"
+msgstr "Pista de audio e&stéreo"
 
-#: Menus.cpp:556 TimeTrack.cpp:44
+#: Menus.cpp:631 TimeTrack.cpp:44
 msgid "&Time Track"
 msgstr "Pista de &tiempo"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "Grabación &programada..."
-
-#: Menus.cpp:568
+#: Menus.cpp:641
 msgid "Mi&x and Render"
 msgstr "&Mezclar y generar"
 
-#: Menus.cpp:572
+#: Menus.cpp:645
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr "Mezclar y generar en una nueva pista\tCtrl+Mayús+M"
 
-#: Menus.cpp:576
+#: Menus.cpp:649
 msgid "&Resample..."
 msgstr "&Remuestrear..."
 
-#: Menus.cpp:586
+#: Menus.cpp:659
 msgid "Remo&ve Tracks"
 msgstr "E&liminar pistas"
 
-#: Menus.cpp:592
+#: Menus.cpp:665
 msgid "&Mute All Tracks\tCtrl+U"
 msgstr "&Silenciar todas las pistas\tCtrl+U"
 
-#: Menus.cpp:593
+#: Menus.cpp:666
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
 msgstr "D&esactivar silencio en todas las pistas\tCtrl+Mayús+U"
 
-#: Menus.cpp:597
+#: Menus.cpp:670
 msgid "Align with &Zero"
 msgstr "Alinear en c&ero"
 
-#: Menus.cpp:598
+#: Menus.cpp:671
 msgid "Align with &Cursor"
 msgstr "Alinear en el &cursor"
 
-#: Menus.cpp:599
+#: Menus.cpp:672
 msgid "Align with Selection &Start"
 msgstr "Alinear en el comienzo de &selección"
 
-#: Menus.cpp:600
+#: Menus.cpp:673
 msgid "Align with Selection &End"
 msgstr "Alinear en el final de se&lección"
 
-#: Menus.cpp:601
+#: Menus.cpp:674
 msgid "Align End with Cu&rsor"
 msgstr "Alinear final en el cu&rsor"
 
-#: Menus.cpp:602
+#: Menus.cpp:675
 msgid "Align End with Selection Star&t"
 msgstr "Alinear final en el comienzo de la &selección"
 
-#: Menus.cpp:603
+#: Menus.cpp:676
 msgid "Align End with Selection En&d"
 msgstr "Alinear final en el &final de la selección"
 
-#: Menus.cpp:604
+#: Menus.cpp:677
 msgid "Align Tracks To&gether"
 msgstr "Alinear pistas con&juntamente"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Alinear pistas..."
+#: Menus.cpp:679
+msgid "&Align Tracks"
+msgstr "&Alinear pistas"
+
+#: Menus.cpp:688
+msgid "Ali&gn and Move Cursor"
+msgstr "Al&inear y desplazar cursor"
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Al&inear y desplazar cursor..."
+#: Menus.cpp:695
+msgid "Synchronize MIDI with Audio"
+msgstr "Sincronizar MIDI con audio"
 
-#: Menus.cpp:623
+#: Menus.cpp:704
+msgid "Link Audio and Label Tracks"
+msgstr "Enlazar audio y pistas de etiquetas"
+
+#: Menus.cpp:707
 msgid "Add &Label At Selection\tCtrl+B"
 msgstr "Añadir etiqueta en se&lección\tCtrl+B"
 
-#: Menus.cpp:624
+#: Menus.cpp:708
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Añadir etiqueta en el &punto de reproducción\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "&Ordenar pistas por..."
+#: Menus.cpp:714
+msgid "S&ort tracks"
+msgstr "&Ordenar pistas"
 
-#: Menus.cpp:631
-msgid "&Start time"
+#: Menus.cpp:715
+msgid "by &Start time"
 msgstr "In&stante inicial"
 
-#: Menus.cpp:633
-msgid "&Name"
+#: Menus.cpp:717
+msgid "by &Name"
 msgstr "&Nombre"
 
-#: Menus.cpp:643
+#: Menus.cpp:728
 msgid "&Generate"
 msgstr "&Generar"
 
-#: Menus.cpp:666
+#: Menus.cpp:774 Menus.cpp:858 Menus.cpp:920
+msgid "Unsorted"
+msgstr "Desordenado"
+
+#: Menus.cpp:793
 msgid "Effe&ct"
 msgstr "Efe&cto"
 
-#: Menus.cpp:670
+#: Menus.cpp:797
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "Repetir el último efecto\tCtrl+R"
 
-#: Menus.cpp:702
+#: Menus.cpp:875
 msgid "&Analyze"
 msgstr "&Analizar"
 
-#: Menus.cpp:704
+#: Menus.cpp:877
 msgid "Plot Spectrum..."
 msgstr "Análisis de espectro..."
 
-#: Menus.cpp:737 Menus.cpp:740
+#: Menus.cpp:945 Menus.cpp:948
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: Menus.cpp:743
+#: Menus.cpp:951
 msgid "&About Audacity CleanSpeech..."
 msgstr "&Acerca de limpieza de locución de Audacity..."
 
-#: Menus.cpp:747
+#: Menus.cpp:955
 msgid "&Show Welcome Message..."
 msgstr "Men&saje de bienvenida..."
 
-#: Menus.cpp:748
+#: Menus.cpp:956
 msgid "&Index..."
 msgstr "Índ&ice..."
 
-#: Menus.cpp:756
+#: Menus.cpp:957
+msgid "Show &Log..."
+msgstr "&Mostrar registro..."
+
+#: Menus.cpp:965
 msgid "&Screenshot Tools..."
 msgstr "Herramienta&s de captura de pantalla..."
 
-#: Menus.cpp:759
+#: Menus.cpp:968
 msgid "&Run Benchmark..."
 msgstr "Ejecutar test de &rendimiento..."
 
-#: Menus.cpp:761
+#: Menus.cpp:970
 msgid "&Audio Device Info..."
 msgstr "Información de dispositivo de &audio..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr ""
-"Saltar hacia atrás entre acoplamiento, vista de pista y barra de "
-"herramientas de selección\tCtrl+Mayús+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr "Saltar hacia atrás entre las barras de herramientas y la vista de pista\tCtrl+Mayús+F6"
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr ""
-"Saltar entre acoplamiento, vista de pista y barra de herramientas de "
-"selección\tCtrl+Mayús+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr "Saltar hacia adelante entre las barras de herramientas y la vista de pista\tCtrl+F6"
 
-#: Menus.cpp:774
+#: Menus.cpp:983
 msgid "Selection Tool\tF1"
 msgstr "Herramienta de selección\tF1"
 
-#: Menus.cpp:775
+#: Menus.cpp:984
 msgid "Envelope Tool\tF2"
 msgstr "Herramienta de envolvente\tF2"
 
-#: Menus.cpp:776
+#: Menus.cpp:985
 msgid "Draw Tool\tF3"
 msgstr "Herramienta de dibujo\tF3"
 
-#: Menus.cpp:777
+#: Menus.cpp:986
 msgid "Zoom Tool\tF4"
 msgstr "Herramienta de ampliación\tF4"
 
-#: Menus.cpp:778
+#: Menus.cpp:987
 msgid "Time Shift Tool\tF5"
 msgstr "Herramienta de desplazamiento en el tiempo\tF5"
 
-#: Menus.cpp:779
+#: Menus.cpp:988
 msgid "Multi Tool\tF6"
 msgstr "Multiherramienta\tF6"
 
-#: Menus.cpp:781
+#: Menus.cpp:990
 msgid "Next Tool\tD"
 msgstr "Herramienta siguiente\tD"
 
-#: Menus.cpp:782
+#: Menus.cpp:991
 msgid "Previous Tool\tA"
 msgstr "Herramienta anterior\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Reproducir/Detener\tEspacio"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr "Reproducir/Parar\tEspacio"
 
-#: Menus.cpp:785
+#: Menus.cpp:994
 msgid "Stop\tS"
 msgstr "Detener\tS"
 
-#: Menus.cpp:786
+#: Menus.cpp:995
 msgid "Pause\tP"
 msgstr "Pausa\tP"
 
-#: Menus.cpp:787
+#: Menus.cpp:996
 msgid "Record\tR"
 msgstr "Grabar\tR"
 
-#: Menus.cpp:788
+#: Menus.cpp:997
 msgid "Record Append\tShift+R"
 msgstr "Anexar grabación\tMayús+R"
 
-#: Menus.cpp:790
+#: Menus.cpp:999
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "Reproducir/Detener y establecer cursor\tMayús+A"
 
-#: Menus.cpp:793
+#: Menus.cpp:1002
 msgid "Play One Second\t1"
 msgstr "Reproducir un segundo\t1"
 
-#: Menus.cpp:794
+#: Menus.cpp:1003
 msgid "Play To Selection\tB"
 msgstr "Reproducir hasta la selección\tB"
 
-#: Menus.cpp:795
+#: Menus.cpp:1004
 msgid "Play Looped\tL"
 msgstr "Reproducir cíclicamente\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
 msgstr "Reproducir cíclicamente\tMayús+Espacio"
 
-#: Menus.cpp:797
+#: Menus.cpp:1006
 msgid "Play Cut Preview\tC"
 msgstr "Reproducir vista previa\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Ir al comienzo\tInicio"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Ir al final\tFin"
-
-#: Menus.cpp:802
+#: Menus.cpp:1011
 msgid "Selection to Start\tShift+Home"
 msgstr "Seleccionar hasta el comienzo\tMayús+Inicio"
 
-#: Menus.cpp:803
+#: Menus.cpp:1012
 msgid "Selection to End\tShift+End"
 msgstr "Seleccionar hasta el final\tMayús+Fin"
 
-#: Menus.cpp:805
+#: Menus.cpp:1014
 msgid "DeleteKey\tBackspace"
 msgstr "Tecla de borrado\tBorrar"
 
-#: Menus.cpp:810
+#: Menus.cpp:1019
 msgid "DeleteKey2\tDelete"
 msgstr "Tecla de borrado 2\tSupr"
 
-#: Menus.cpp:816
+#: Menus.cpp:1025
 msgid "Seek left short period during playback\tLeft"
-msgstr ""
-"Avanzar hacia la izquierda un periodo corto durante la reproducción"
-"\tIzquierda"
+msgstr "Avanzar hacia la izquierda un periodo corto durante la reproducción\tIzquierda"
 
-#: Menus.cpp:817
+#: Menus.cpp:1026
 msgid "Seek right short period during playback\tRight"
 msgstr "Avanzar hacia la derecha un periodo corto durante la reproducción\tDerecha"
 
-#: Menus.cpp:818
+#: Menus.cpp:1027
 msgid "Seek left long period during playback\tShift+Left"
-msgstr ""
-"Avanzar hacia la izquierda un periodo largo durante la reproducción\tMayús"
-"+Izquierda"
+msgstr "Avanzar hacia la izquierda un periodo largo durante la reproducción\tMayús+Izquierda"
 
-#: Menus.cpp:819
+#: Menus.cpp:1028
 msgid "Seek right long period during playback\tShift+Right"
-msgstr ""
-"Avanzar hacia la derecha un periodo largo durante la reproducción\tMayús"
-"+Derecha"
+msgstr "Avanzar hacia la derecha un periodo largo durante la reproducción\tMayús+Derecha"
 
-#: Menus.cpp:823
+#: Menus.cpp:1032
 msgid "Move Focus to Previous Track\tUp"
 msgstr "Ir a la pista anterior\tArriba"
 
-#: Menus.cpp:824
+#: Menus.cpp:1033
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
 msgstr "Ir a la pista anterior y cambiar selección\tMayús+Arriba"
 
-#: Menus.cpp:825
+#: Menus.cpp:1034
 msgid "Move Focus to Next Track\tDown"
 msgstr "Ir a la pista siguiente\tAbajo"
 
-#: Menus.cpp:826
+#: Menus.cpp:1035
 msgid "Move Focus to Next and Change Selection\tShift+Down"
 msgstr "Ir a la pista siguiente y cambiar la selección\tMayús+Abajo"
 
-#: Menus.cpp:827
+#: Menus.cpp:1036
 msgid "Toggle Focused Track\tReturn"
 msgstr "Cambiar pista activa\tIntro"
 
-#: Menus.cpp:828
+#: Menus.cpp:1037
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Cambiar pista activa\tTeclado numérico Intro"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr "Cambiar pista activa\tCtrl+Espacio"
 
-#: Menus.cpp:831
+#: Menus.cpp:1040
 msgid "Cursor Left\tLeft"
 msgstr "Cursor a la Izquierda\tIzquierda"
 
-#: Menus.cpp:832
+#: Menus.cpp:1041
 msgid "Cursor Right\tRight"
 msgstr "Cursor a la derecha\tDerecha"
 
-#: Menus.cpp:833
+#: Menus.cpp:1042
 msgid "Cursor Short Jump Left\t,"
 msgstr "Pequeño salto del cursor a la izquierda\t,"
 
-#: Menus.cpp:834
+#: Menus.cpp:1043
 msgid "Cursor Short Jump Right\t."
 msgstr "Pequeño salto del cursor a la derecha\t."
 
-#: Menus.cpp:835
+#: Menus.cpp:1044
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr "Salto largo del cursor a la izquierda\tMayús+,"
 
-#: Menus.cpp:836
+#: Menus.cpp:1045
 msgid "Cursor Long Jump Right\tShift+."
 msgstr "Salto largo del cursor a la derecha\tMayús+."
 
-#: Menus.cpp:838
+#: Menus.cpp:1047
 msgid "Selection Extend Left\tShift+Left"
 msgstr "Extender selección a la izquierda\tMayús+Izquierda"
 
-#: Menus.cpp:839
+#: Menus.cpp:1048
 msgid "Selection Extend Right\tShift+Right"
 msgstr "Extender selección a la derecha\tMayús+Derecha"
 
-#: Menus.cpp:841
+#: Menus.cpp:1050
 msgid "Set (or Extend) Left Selection"
 msgstr "Establecer (o extender) límite izquierdo de selección"
 
-#: Menus.cpp:842
+#: Menus.cpp:1051
 msgid "Set (or Extend) Right Selection"
 msgstr "Establecer (o extender) límite derecho de selección"
 
-#: Menus.cpp:844
+#: Menus.cpp:1053
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "Contraer selección a la izquierda\tCtrl+Mayús+Derecha"
 
-#: Menus.cpp:845
+#: Menus.cpp:1054
 msgid "Selection Contract Right\tCtrl+Shift+Left"
 msgstr "Contraer selección a la derecha\tCtrl+Mayús+Izquierda"
 
-#: Menus.cpp:847
+#: Menus.cpp:1056
 msgid "Change pan on focused track\tShift+P"
 msgstr "Cambiar panorama en la pista activa\tMayús+P"
 
-#: Menus.cpp:848
+#: Menus.cpp:1057
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr "Desplazar panorama a la izquierda en la pista activa.\tAlt+Mayús+Izquierda"
 
-#: Menus.cpp:849
+#: Menus.cpp:1058
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr "Desplazar panorama a la derecha en la pista activa.\tAlt+Mayús+Derecha"
 
-#: Menus.cpp:850
+#: Menus.cpp:1059
 msgid "Change gain on focused track\tShift+G"
 msgstr "Cambiar ganancia en la pista activa\tMayús+G"
 
-#: Menus.cpp:851
+#: Menus.cpp:1060
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr "Incrementar ganancia en la pista activa\tAlt+Mayús+Arriba"
 
-#: Menus.cpp:852
+#: Menus.cpp:1061
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr "Decrementa ganancia en la pista activa\tAlt+Mayús+Abajo"
 
-#: Menus.cpp:853
+#: Menus.cpp:1062
 msgid "Open menu on focused track\tShift+M"
 msgstr "Desplegar menú en la pista activa\tMayús+M"
 
-#: Menus.cpp:854
+#: Menus.cpp:1063
 msgid "Mute/Unmute focused track\tShift+U"
 msgstr "Activar o desactivar silencio en la pista activa\tMayús+U"
 
-#: Menus.cpp:855
+#: Menus.cpp:1064
 msgid "Solo/Unsolo focused track\tShift+S"
 msgstr "Activar o desactivar Solo en la pista activa\tMayús+S"
 
-#: Menus.cpp:856
+#: Menus.cpp:1065
 msgid "Close focused track\tShift+C"
 msgstr "Cerrar la pista activa\tMayús+C"
 
-#: Menus.cpp:858
+#: Menus.cpp:1067
 msgid "Snap To On"
 msgstr "Activar ajuste"
 
-#: Menus.cpp:859
+#: Menus.cpp:1068
 msgid "Snap To Off"
 msgstr "Desactivar ajuste"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr "Activar/Desactivar pantalla completa\tF11"
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:873
+#: Menus.cpp:1149
 msgid "Open Recent"
 msgstr "Abrir reciente"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Archivos &recientes..."
+#: Menus.cpp:1152
+msgid "Recent &Files"
+msgstr "Archivos &recientes"
 
-#: Menus.cpp:925
+#: Menus.cpp:1201
 #, c-format
 msgid "&Undo %s"
 msgstr "&Deshacer %s"
 
-#: Menus.cpp:951
+#: Menus.cpp:1227
 msgid "Can't Undo"
 msgstr "No se puede deshacer"
 
-#: Menus.cpp:960
+#: Menus.cpp:1236
 #, c-format
 msgid "&Redo %s"
 msgstr "&Rehacer %s"
 
-#: Menus.cpp:966
+#: Menus.cpp:1242
 msgid "Can't Redo"
 msgstr "No se puede rehacer"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1848
 msgid "Sort By Time"
 msgstr "Ordenar por fecha"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1848
 msgid "Tracks sorted by time"
 msgstr "Pistas ordenadas por fecha"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1874
 msgid "Sort By Name"
 msgstr "Ordenar por nombre"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1874
 msgid "Tracks sorted by name"
 msgstr "Pistas ordenadas por nombre"
 
-#: Menus.cpp:1705
+#: Menus.cpp:2025
 msgid "Set Left Selection Bound"
 msgstr "Establecer límite izquierdo de selección"
 
-#: Menus.cpp:1739
+#: Menus.cpp:2060
 msgid "Set Right Selection Bound"
 msgstr "Establecer límite derecho de selección"
 
-#: Menus.cpp:2006
+#: Menus.cpp:2329
 msgid "You must select a track first."
 msgstr "Primero debe seleccionar una pista."
 
-#: Menus.cpp:2035
+#: Menus.cpp:2361
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "Repetir %s\tCtrl+R"
 
-#: Menus.cpp:2166
+#: Menus.cpp:2504
 msgid "There are no label tracks to export."
 msgstr "No hay pistas de etiqueta que exportar."
 
-#: Menus.cpp:2271
+#: Menus.cpp:2599
+msgid "Export MIDI As:"
+msgstr "Exportar MIDI como:"
+
+#: Menus.cpp:2603
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "Archivos MIDI (*.mid)|*.mid|Archivos Allegro (*.gro)|*.gro"
+
+#: Menus.cpp:2635
+msgid ""
+"You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+"Ha seleccionado un nombre de archivo con una extensión no identificada.\n"
+"¿Está seguro de que quiere continuar?"
+
+#: Menus.cpp:2636
+msgid "Export MIDI"
+msgstr "Exportar MIDI"
+
+#: Menus.cpp:2694
 msgid "Nothing to undo"
 msgstr "No hay nada que deshacer"
 
-#: Menus.cpp:2291
+#: Menus.cpp:2714
 msgid "Nothing to redo"
 msgstr "No hay nada que rehacer"
 
-#: Menus.cpp:2366 TrackPanel.cpp:605 toolbars/EditToolBar.cpp:133
+#: Menus.cpp:2801 TrackPanel.cpp:596 toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Cortar"
 
-#: Menus.cpp:2366
+#: Menus.cpp:2801
 msgid "Cut to the clipboard"
 msgstr "Cortar y guardar en portapapeles"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2841
 msgid "Split Cut"
 msgstr "Dividir y cortar"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2841
 msgid "Split-cut to the clipboard"
 msgstr "Divide y corta en el portapapeles"
 
-#: Menus.cpp:2469 Menus.cpp:2540 Menus.cpp:2634 TrackPanel.cpp:607
+#: Menus.cpp:2906 Menus.cpp:2978 Menus.cpp:3170 TrackPanel.cpp:598
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Pegar"
 
-#: Menus.cpp:2469
+#: Menus.cpp:2906
 msgid "Pasted text from the clipboard"
 msgstr "Texto pegado desde el portapapeles"
 
-#: Menus.cpp:2540 Menus.cpp:2634
+#: Menus.cpp:2978 Menus.cpp:3170
 msgid "Pasted from the clipboard"
 msgstr "Pegado desde el portapapeles"
 
-#: Menus.cpp:2574
+#: Menus.cpp:3044
+msgid "Pasting one type of track into another is not allowed."
+msgstr "No se puede pegar un tipo de pista en otra."
+
+#: Menus.cpp:3056
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "No se puede copiar audio estéreo en una pista mono."
 
-#: Menus.cpp:2670 toolbars/EditToolBar.cpp:139
+#: Menus.cpp:3206 toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "Recortar"
 
-#: Menus.cpp:2670
+#: Menus.cpp:3206
 msgid "Trim file to selection"
 msgstr "Recortar archivo hasta la selección"
 
-#: Menus.cpp:2699
+#: Menus.cpp:3235
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
 msgstr "Dividir y borrar %.2f segundos en t=%.2f"
 
-#: Menus.cpp:2702
+#: Menus.cpp:3238
 msgid "Split Delete"
 msgstr "Dividir y borrar"
 
-#: Menus.cpp:2723
+#: Menus.cpp:3259
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr "Desunidos %.2f segundos en t=%.2f"
 
-#: Menus.cpp:2726
+#: Menus.cpp:3262
 msgid "Disjoin"
 msgstr "Desunir"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3283
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr "Unidos %.2f segundos en t=%.2f"
 
-#: Menus.cpp:2750
+#: Menus.cpp:3286
 msgid "Join"
 msgstr "Unir"
 
-#: Menus.cpp:2769
+#: Menus.cpp:3305
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "Pistas seleccionadas silenciadas durante %.2f segundos en %.2f"
 
-#: Menus.cpp:2771 toolbars/EditToolBar.cpp:141
+#: Menus.cpp:3307 toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Silenciar"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3341
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3341
 msgid "Duplicated"
 msgstr "Duplicado"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3360
 msgid "Cut Labels"
 msgstr "Cortar etiquetas"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3360
 msgid "Cut labeled regions to the clipboard"
 msgstr "Cortar zonas etiquetadas y guardar en portapapeles"
 
-#: Menus.cpp:2838
+#: Menus.cpp:3374
 msgid "SplitCut labeled regions to the clipboard"
 msgstr "Dividir y cortar zonas etiquetadas en el portapapeles"
 
-#: Menus.cpp:2839
+#: Menus.cpp:3375
 msgid "Split Cut Labels"
 msgstr "Dividir y cortar etiquetas"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3389
 msgid "Copied labeled regions to the clipboard"
 msgstr "Pegadas zonas etiquetadas desde el portapapeles"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3389
 msgid "Copy Labels"
 msgstr "Copiar etiquetas"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3401
 msgid "Delete Labels"
 msgstr "Borrar etiquetas"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3401
 msgid "Deleted labeled regions"
 msgstr "Zonas etiquetadas borradas"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3413
 msgid "Split Delete Labels"
 msgstr "Dividir y borrar etiquetas"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3413
 msgid "Split Deleted labeled regions"
 msgstr "Dividir y borrar zonas etiquetadas"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3425
 msgid "Silence Labels"
 msgstr "Silenciar en etiquetas"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3425
 msgid "Silenced labeled regions"
 msgstr "Silenciar zonas etiquetadas"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3437
 msgid "Split Labels"
 msgstr "Dividir en etiquetas"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3437
 msgid "Split labeled regions"
 msgstr "Dividir en las zonas etiquetadas"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3449
 msgid "Join Labels"
 msgstr "Unir etiquetas"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3449
 msgid "Joined labeled regions"
 msgstr "Unir zonas etiquetadas"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3461
 msgid "Disjoin Labels"
 msgstr "Desunir etiquetas"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3461
 msgid "Disjoined labeled regions"
 msgstr "Desunir zonas etiquetadas"
 
-#: Menus.cpp:2947 TrackPanel.cpp:6121
+#: Menus.cpp:3483 TrackPanel.cpp:6134
 msgid "Split"
 msgstr "Dividir"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3577
 msgid "Split New"
 msgstr "Dividir y nuevo"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3577
 msgid "Split to new track"
 msgstr "Dividir en una nueva pista"
 
-#: Menus.cpp:3124
+#: Menus.cpp:3660
 msgid "Split at labels"
 msgstr "Dividir en las etiquetas"
 
-#: Menus.cpp:3425
+#: Menus.cpp:3961
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
-msgstr ""
-"Para dibujar el espectro, todas las pistas seleccionadas deben tener la "
-"misma frecuencia de muestreo."
+msgstr "Para dibujar el espectro, todas las pistas seleccionadas deben tener la misma frecuencia de muestreo."
 
-#: Menus.cpp:3451
+#: Menus.cpp:3987
 #, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
-msgstr ""
-"Demasiado audio seleccionado.  Sólo los primeros %.1f segundos de audio "
-"serán analizados."
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "Demasiado audio seleccionado.  Sólo los primeros %.1f segundos de audio serán analizados."
 
-#: Menus.cpp:3584
+#: Menus.cpp:4122
 #, c-format
 msgid "Imported labels from '%s'"
 msgstr "Etiquetas Importadas de '%s'"
 
-#: Menus.cpp:3585
+#: Menus.cpp:4123
 msgid "Import Labels"
 msgstr "Importar etiquetas"
 
-#: Menus.cpp:3595
+#: Menus.cpp:4134
 msgid "Select a MIDI file..."
 msgstr "Seleccionar un archivo MIDI..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr ""
-"Todos los archivos (*.*)|*.*|Archivos MIDI (*.mid)|*.mid|Archivos Allegro (*."
-"gro)|*.gro"
+#: Menus.cpp:4138
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "Archivos MIDI y Allegro (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|Archivos MIDI (*.mid;*.midi)|*.mid;*.midi|Archivos Allegro (*.gro)|*.gro|Todos los archivos (*.*)|*.*"
 
-#: Menus.cpp:3615
+#: Menus.cpp:4154
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "MIDI importado de '%s'"
 
-#: Menus.cpp:3617
+#: Menus.cpp:4155
 msgid "Import MIDI"
 msgstr "Importar MIDI"
 
-#: Menus.cpp:3630
+#: Menus.cpp:4169
 msgid "Select any uncompressed audio file..."
 msgstr "Seleccione algún archivo de audio descomprimido..."
 
-#: Menus.cpp:3634
+#: Menus.cpp:4173
 msgid "All files (*)|*"
 msgstr "Todos los archivos (*)|*"
 
-#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importar"
-
-#: Menus.cpp:3668
+#: Menus.cpp:4197
 msgid "Edit the metadata tags"
 msgstr "Editar las etiquetas de metadatos"
 
-#: Menus.cpp:3669 export/Export.cpp:298
+#: Menus.cpp:4198 export/Export.cpp:353
 msgid "Edit Metadata"
 msgstr "Editar metadatos"
 
-#: Menus.cpp:3669
+#: Menus.cpp:4198
 msgid "Edit Metadata tags"
 msgstr "Editar etiquetas de metadatos"
 
-#: Menus.cpp:3725
+#: Menus.cpp:4254
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr "Generado todo el audio en la pista '%s'"
 
-#: Menus.cpp:3726
+#: Menus.cpp:4255
 msgid "Render"
 msgstr "Generar"
 
-#: Menus.cpp:3731
+#: Menus.cpp:4260
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
 msgstr "Mezclado y generado %d pistas en una nueva pista estéreo"
 
-#: Menus.cpp:3734
+#: Menus.cpp:4263
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "Mezcladas y generadas %d pistas en una nueva pista mono"
 
-#: Menus.cpp:3736 Mix.cpp:120
+#: Menus.cpp:4265 Mix.cpp:121
 msgid "&Mix and Render"
 msgstr "&Mezclar y generar"
 
-#: Menus.cpp:3866
+#: Menus.cpp:4395
 msgid "Aligned with zero"
 msgstr "Alineado en cero"
 
-#: Menus.cpp:3870
+#: Menus.cpp:4399
 msgid "Aligned cursor"
 msgstr "Cursor alineado"
 
-#: Menus.cpp:3874
+#: Menus.cpp:4403
 msgid "Aligned with selection start"
 msgstr "Alineado con comienzo de selección"
 
-#: Menus.cpp:3878
+#: Menus.cpp:4407
 msgid "Aligned with selection end"
 msgstr "Alineado con final de selección"
 
-#: Menus.cpp:3882
+#: Menus.cpp:4411
 msgid "Aligned end with cursor"
 msgstr "Alineado final con cursor"
 
-#: Menus.cpp:3886
+#: Menus.cpp:4415
 msgid "Aligned end with selection start"
 msgstr "Alineado final con comienzo de selección"
 
-#: Menus.cpp:3890
+#: Menus.cpp:4419
 msgid "Aligned end with selection end"
 msgstr "Alineado final con final de selección"
 
-#: Menus.cpp:3894
+#: Menus.cpp:4423
 msgid "Aligned"
 msgstr "Alineado"
 
-#: Menus.cpp:3927
+#: Menus.cpp:4456
 msgid "Align"
 msgstr "Alinear"
 
-#: Menus.cpp:3950
+#: Menus.cpp:4541
+msgid "Sync MIDI with Audio"
+msgstr "Sincronizar MIDI con audio"
+
+#: Menus.cpp:4545
+msgid "Alignment completed."
+msgstr "Alineamiento completado."
+
+#: Menus.cpp:4556
 msgid "Created new audio track"
 msgstr "Nueva pista de audio creada"
 
-#: Menus.cpp:3950 Menus.cpp:3973 Menus.cpp:3988 Menus.cpp:4008
+#: Menus.cpp:4556 Menus.cpp:4579 Menus.cpp:4594 Menus.cpp:4614
 msgid "New Track"
 msgstr "Nueva pista"
 
-#: Menus.cpp:3973
+#: Menus.cpp:4579
 msgid "Created new stereo audio track"
 msgstr "Nueva pista de audio estéreo creada"
 
-#: Menus.cpp:3988
+#: Menus.cpp:4594
 msgid "Created new label track"
 msgstr "Nueva pista de etiqueta creada"
 
-#: Menus.cpp:3997
+#: Menus.cpp:4603
 msgid "The version of Audacity you are using does not support multiple time tracks."
-msgstr ""
-"La versión de Audacity que está utilizando no soporta múltiples pistas de "
-"tiempo."
+msgstr "La versión de Audacity que está utilizando no soporta múltiples pistas de tiempo."
 
-#: Menus.cpp:4008
+#: Menus.cpp:4614
 msgid "Created new time track"
 msgstr "Nueva pista de tiempo creada"
 
-#: Menus.cpp:4057
+#: Menus.cpp:4669
 msgid "Added label"
 msgstr "Etiqueta añadida"
 
-#: Menus.cpp:4085
+#: Menus.cpp:4704
 msgid "Edited labels"
 msgstr "Etiquetas editadas"
 
-#: Menus.cpp:4112
+#: Menus.cpp:4731
 msgid "Save CleanSpeech Preset File As:"
 msgstr "Guardar archivo de configuración de limpieza de locución como:"
 
-#: Menus.cpp:4116
+#: Menus.cpp:4735
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr "Configuración de limpieza de locución (*.csp)|*.csp"
 
-#: Menus.cpp:4123 export/Export.cpp:515
+#: Menus.cpp:4742 export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "Las rutas de carpetas no pueden superar los 256 caracteres."
 
-#: Menus.cpp:4169
+#: Menus.cpp:4788
 msgid "Problem encountered exporting presets."
 msgstr "Se ha encontrado un problema al exportar la configuración."
 
-#: Menus.cpp:4170 export/Export.cpp:408
+#: Menus.cpp:4789 export/Export.cpp:468
 msgid "Unable to export"
 msgstr "No se puede exportar"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4973
 msgid "Remove Track"
 msgstr "Eliminar pista"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4973
 msgid "Removed audio track(s)"
 msgstr "Pista(s) de audio eliminadas"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nueva frecuencia de muestreo (Hz):"
-
-#: Menus.cpp:4508 Menus.cpp:4527 export/ExportMP3.cpp:1926
+#: Menus.cpp:5130 Menus.cpp:5185 export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr "Remuestrear"
 
-#: Menus.cpp:4514
+#: Menus.cpp:5150 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr "Nueva frecuencia de muestreo (Hz):"
+
+#: Menus.cpp:5174 TrackPanel.cpp:6385
 msgid "The entered value is invalid"
 msgstr "El valor introducido es inválido"
 
-#: Menus.cpp:4525
+#: Menus.cpp:5183
 #, c-format
 msgid "Resampling track %d"
 msgstr "Remuestreando pista %d"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5192
 msgid "Resample Track"
 msgstr "Remuestrear pista"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5192
 msgid "Resampled audio track(s)"
 msgstr "Pista(s) de audio remuestreadas"
 
-#: Mix.cpp:94 Mix.cpp:101
+#: Mix.cpp:95 Mix.cpp:102
 msgid "Mix"
 msgstr "Mezclar"
 
-#: Mix.cpp:121
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
 msgstr "Mezclando y generando pistas"
 
-#: NoteTrack.cpp:36
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "Pista de notas"
 
-#: Printing.cpp:198
+#: Printing.cpp:192
 msgid "There was a problem printing."
 msgstr "Se encontró un problema al imprimir."
 
-#: Printing.cpp:199
+#: Printing.cpp:193
 msgid "Print"
 msgstr "Imprimir"
 
-#: Project.cpp:636
+#: Project.cpp:673
 msgid "Main Mix"
 msgstr "Mezclador principal"
 
-#: Project.cpp:761
+#: Project.cpp:797
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Bienvenido a la versión %s de Audacity"
 
-#: Project.cpp:922
+#: Project.cpp:957
 msgid "(Recovered)"
 msgstr "(Recuperado)"
 
-#: Project.cpp:1482 TrackPanel.cpp:804 toolbars/ControlToolBar.cpp:191
+#: Project.cpp:1546 TrackPanel.cpp:796 toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Grabar"
 
-#: Project.cpp:1482 TrackPanel.cpp:804
+#: Project.cpp:1546 TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "Audio grabado"
 
-#: Project.cpp:1500
+#: Project.cpp:1564
 msgid "Save changes before closing?"
 msgstr "¿Desea guardar los cambios antes de cerrar?"
 
-#: Project.cpp:1503
+#: Project.cpp:1567
 msgid ""
 "\n"
 "If saved, the project will have no tracks.\n"
@@ -3070,23 +2888,23 @@ msgstr ""
 "hasta que todas las pistas estén abiertas. En ese momento \n"
 "seleccione Archivo > Guardar proyecto."
 
-#: Project.cpp:1506
+#: Project.cpp:1570
 msgid "Save changes?"
 msgstr "¿Guardar cambios?"
 
-#: Project.cpp:1694
+#: Project.cpp:1772
 msgid "All files|*.*|All supported files|"
 msgstr "Todos los archivos|*.*|Todos los archivos soportados|"
 
-#: Project.cpp:1719
+#: Project.cpp:1802
 msgid "Select one or more audio files..."
 msgstr "Seleccione uno o más archivos de audio..."
 
-#: Project.cpp:1746
+#: Project.cpp:1829
 msgid "Audacity projects|*.aup|"
 msgstr "Proyectos Audacity|*.aup|"
 
-#: Project.cpp:1799 Project.cpp:2186
+#: Project.cpp:1882 Project.cpp:2304
 #, c-format
 msgid ""
 "This file was saved by Audacity %s, a much\n"
@@ -3106,19 +2924,19 @@ msgstr ""
 "\n"
 "¿Le gustaría abrir el archivo ahora?"
 
-#: Project.cpp:1800
+#: Project.cpp:1883
 msgid "1.0 or earlier"
 msgstr "1.0 o anterior"
 
-#: Project.cpp:1806 Project.cpp:2198
+#: Project.cpp:1889 Project.cpp:2316
 msgid "Opening old project file"
 msgstr "Abriendo un archivo de proyecto antiguo"
 
-#: Project.cpp:1832 Project.cpp:1840
+#: Project.cpp:1915 Project.cpp:1923
 msgid "Error opening file"
 msgstr "Error al abrir archivo"
 
-#: Project.cpp:1846
+#: Project.cpp:1929
 #, c-format
 msgid ""
 "File may be invalid or corrupted: \n"
@@ -3127,44 +2945,40 @@ msgstr ""
 "El archivo podría ser inválido o estar dañado: \n"
 "%s"
 
-#: Project.cpp:1847
+#: Project.cpp:1930
 msgid "Error opening file or project"
 msgstr "Error al abrir el archivo o proyecto"
 
-#: Project.cpp:1867
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
-msgstr ""
-"Audacity no pudo convertir un proyecto de Audacity 1.0 al nuevo formato de "
-"proyecto."
+#: Project.cpp:1950
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity no pudo convertir un proyecto de Audacity 1.0 al nuevo formato de proyecto."
 
-#: Project.cpp:1970
+#: Project.cpp:2053
 msgid "Could not remove old auto save file"
 msgstr "No se ha podido eliminar el archivo de guardado automático"
 
-#: Project.cpp:1972
+#: Project.cpp:2055
 msgid "Project was recovered"
 msgstr "El proyecto fue recuperado"
 
-#: Project.cpp:1972
+#: Project.cpp:2055
 msgid "Recover"
 msgstr "Recuperar"
 
-#: Project.cpp:2001
+#: Project.cpp:2084
 msgid "Project checker repaired file"
 msgstr "La comprobación de proyectos recuperó el archivo"
 
-#: Project.cpp:2001 effects/Repair.h:29
+#: Project.cpp:2084 effects/Repair.h:29
 msgid "Repair"
-msgstr "Reparar"
+msgstr "Reparación"
 
-#: Project.cpp:2112
+#: Project.cpp:2230
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "No se ha podido encontrar la carpeta de datos de proyecto: \"%s\""
 
-#: Project.cpp:2155
+#: Project.cpp:2273
 #, c-format
 msgid ""
 "This file was saved using Audacity %s.\n"
@@ -3175,149 +2989,190 @@ msgstr ""
 "Está usando Audacity %s. Necesita actualizar a una\n"
 "versión más moderna para poder abrir este archivo."
 
-#: Project.cpp:2159
+#: Project.cpp:2277
 msgid "Can't open project file"
 msgstr "No se puede abrir el archivo de proyecto"
 
-#: Project.cpp:2193
+#: Project.cpp:2311
 #, c-format
 msgid ""
 "This file was saved by Audacity %s.\n"
-"You 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"
+"You 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"
 "\n"
 "Open this file now?"
 msgstr ""
 "Este archivo fue guardado por Audacity %s.\n"
-"La versión actual puede abrirlo, pero si lo guarda con  esta versión no "
-"podrá volverlo a abrir con versiones antiguas de Audacity.\n"
+"La versión actual puede abrirlo, pero si lo guarda con  esta versión no podrá volverlo a abrir con versiones antiguas de Audacity.\n"
 "una copia de seguridad previamente.\n"
 "\n"
 "¿Le gustaría abrir el archivo de todos modos?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid ""
+"Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+"El proyecto está vacío.\n"
+"Si se guarda ahora, no tendrá pistas.\n"
+"\n"
+"Para guardar cualquier pista abierta anteriormente:\n"
+"Haga clic sobre 'No', Editar > Deshacer \n"
+"hasta que todas las pistas estén abiertas y \n"
+"entonces haga clic en Archivo > Guardar proyecto.\n"
+"\n"
+"¿Guardar de todos modos?"
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr "Proyecto vacío"
+
+#: Project.cpp:2588
 #, c-format
 msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+"Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"No se ha podido guardar el proyecto. Tal vez %s no tenga\n"
-"permiso de escritura o el disco esté lleno."
+"No se ha podido guardar el proyecto. Tal vez %s \n"
+"no se pueda escribir o el disco esté lleno."
 
-#: Project.cpp:2428 Project.cpp:2442
+#: Project.cpp:2590 Project.cpp:2605
 msgid "Error saving project"
 msgstr "Error al guardar el proyecto"
 
-#: Project.cpp:2504
+#: Project.cpp:2680
 #, c-format
 msgid "Saved %s"
 msgstr "Se guardó %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "En bruto"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Importando %s..."
-
-#: Project.cpp:2586
+#: Project.cpp:2806
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' importado"
 
-#: Project.cpp:2639 Project.cpp:2647
+#: Project.cpp:2807 import/ImportPCM.cpp:483 import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "Importar"
+
+#: Project.cpp:2840 Project.cpp:2848
 msgid "Error importing"
 msgstr "Error al importar"
 
-#: Project.cpp:2681
+#: Project.cpp:2882
 msgid "Save Speech As:"
 msgstr "Guardar locución como:"
 
-#: Project.cpp:2683
+#: Project.cpp:2884
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Archivo de audio PCM de Windows (*.wav)|*.wav"
 
-#: Project.cpp:2689
+#: Project.cpp:2891
 msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+"Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Los archivos de proyecto de Audacity (.aup) le permiten guardar \n"
-"todo el trabajo tal y como aparece en pantalla, pero la mayoría \n"
-"de los programas no puede abrir archivos de proyecto de Audacity.\n"
+"Los archivo de proyecto comprimidos de Audacity (.aup) le permiten guardar \n"
+"su trabajo en un formato más pequeño y comprimido (.ogg).\n"
+"Los archivos de proyecto comprimidos suponen un buen métido para transmitir proyectos online, ya que son mucho más pequeños.\n"
+"Abrir un proyecto comprimido requiere más tiempo de lo habitual, ya que se tiene que importar cada pista comprimida.\n"
 "\n"
-"Cuando quiera guardar un archivo que pueda ser abierto por otros \n"
-"programas,seleccione uno de los comandos de Exportación."
+"La mayoría de los programas no pueden abrir archivos de proyecto de Audacity.\n"
+"Cuando quiera guardar un archivo que deba ser abierto con otros programas, seleccione \n"
+"una de las opciones de Exportar."
 
-#: Project.cpp:2692
+#: Project.cpp:2894
+msgid ""
+"You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+"Esta guardando un archivo como proyecto de Audacity (.aup).\n"
+"\n"
+"Guardar un proyecto crea un archivo que sólo puede ser abierto con Audacity.\n"
+"\n"
+"Para crear un archivo de audio que pueda ser utilizado en otros programas utilice una de las opciones de \"Archivo > Exportar\".\n"
+
+#: Project.cpp:2898
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Proyectos de Audacity (*.aup)|*.aup"
 
-#: Project.cpp:2736
+#: Project.cpp:2952
 msgid "Created new project"
 msgstr "Nuevo proyecto creado"
 
-#: Project.cpp:2856
+#: Project.cpp:3111
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Borrados %.2f segundos en t=%.2f"
 
-#: Project.cpp:2859 effects/Equalization.cpp:1262
-#: effects/Equalization.cpp:2593
+#: Project.cpp:3114 effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Borrar"
 
-#: Project.cpp:3052
+#: Project.cpp:3308
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr "Espacio de disco disponible para grabar %d horas y %d minutos."
 
-#: Project.cpp:3055
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr "Espacio de disco disponible para grabar 1 hora y %d minutos."
 
-#: Project.cpp:3058
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr "Espacio de disco disponible para grabar %d minutos."
 
-#: Project.cpp:3061
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr "Espacio de disco disponible para grabar %d segundos."
 
-#: Project.cpp:3064
+#: Project.cpp:3320
 msgid "Out of disk space"
 msgstr "Sin espacio en disco"
 
-#: Project.cpp:3342
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr "Importación completada.Ejecutando %d calculos de formas de onda bajo demanda. Total de %2.0f%% completadas."
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr "Importación completada. Ejecutando un cálculo de forma de onda bajo demanda.  %2.0f%% completados."
+
+#: Project.cpp:3614
 msgid "Could not remove old autosave file: "
 msgstr "No se ha podido eliminar el archivo de guardado automático anterior: "
 
-#: Project.cpp:3383
+#: Project.cpp:3655
 msgid "New Project"
 msgstr "Nuevo proyecto"
 
-#: Project.cpp:3396
+#: Project.cpp:3668
 msgid "Error writing autosave file"
 msgstr "Error al escribir el archivo de guardado automático"
 
-#: Project.cpp:3421
+#: Project.cpp:3693
 msgid "Could not create autosave file: "
 msgstr "No se ha podido crear el archivo de guardado automático: "
 
-#: Project.cpp:3447
+#: Project.cpp:3719
 #, c-format
 msgid "Actual Rate: %d"
 msgstr "Frecuencia real: %d"
@@ -3370,58 +3225,26 @@ msgstr "Guardado "
 msgid "Error trying to save file: "
 msgstr "Error al intentar guardar el archivo: "
 
-#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
+#: Sequence.cpp:745 Sequence.cpp:755 Sequence.cpp:762
 msgid "Gap detected in project file\n"
 msgstr "Se ha detectado un hueco en el archivo del proyecto\n"
 
-#: ShuttleGui.cpp:1852 effects/Effect.cpp:342
-#: effects/audiounits/AudioUnitEffect.cpp:872
+#: ShuttleGui.cpp:1972 effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
 msgstr "&Vista previa"
 
-#: ShuttleGui.cpp:1859
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "&Depurar"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Grabación programada de Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Comienzo de la grabación"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Fin de la grabación"
-
-#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
-#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Duración"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Progreso de grabación inteligente de Audacity"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Fecha y hora de comienzo"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "Grabación activada de sonido"
 
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Fecha y hora de final"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Esperando para comenzar la grabación en %s.\n"
-
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Grabación inteligente de Audacity. Esperando para comenzar"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "Nivel de activación (dB):"
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3431,198 +3254,113 @@ msgstr "&Bienvenido a Audacity"
 msgid "Don't show this again at start up"
 msgstr "No volver a mostrar esta ventana en el inicio del programa"
 
-#: Tags.cpp:629
+#: Tags.cpp:640
 msgid "Artist Name"
 msgstr "Artista"
 
-#: Tags.cpp:630
+#: Tags.cpp:641
 msgid "Track Title"
 msgstr "Nombre de pista"
 
-#: Tags.cpp:631
+#: Tags.cpp:642
 msgid "Album Title"
 msgstr "Título del álbum"
 
-#: Tags.cpp:632
+#: Tags.cpp:643
 msgid "Track Number"
 msgstr "Número de pista"
 
-#: Tags.cpp:633 Tags.cpp:2138
+#: Tags.cpp:644 Tags.cpp:2147
 msgid "Year"
 msgstr "Año"
 
-#: Tags.cpp:634
+#: Tags.cpp:645
 msgid "Genre"
 msgstr "Género"
 
-#: Tags.cpp:635 Tags.cpp:2148 prefs/MousePrefs.cpp:96
+#: Tags.cpp:646 Tags.cpp:2157 prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Comentarios"
 
-#: Tags.cpp:778 Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Pulse F2 o doble clic para editar."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr "Use las teclas de cursor (o Intro después de editar) para desplazarse por los campos."
 
-#: Tags.cpp:802
+#: Tags.cpp:813
 msgid "Tag Name"
 msgstr "Etiqueta"
 
-#: Tags.cpp:803
+#: Tags.cpp:814
 msgid "Tag Value"
 msgstr "Valor de la etiqueta"
 
-#: Tags.cpp:818 Tags.cpp:1476 prefs/KeyConfigPrefs.cpp:116
+#: Tags.cpp:829 Tags.cpp:1486 prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
 msgstr "&Limpiar"
 
-#: Tags.cpp:824
+#: Tags.cpp:835
 msgid "Genres"
 msgstr "Géneros"
 
-#: Tags.cpp:828 Tags.cpp:1439 Tags.cpp:1980
-msgid "Edit"
-msgstr "Editar"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr "E&ditar..."
 
-#: Tags.cpp:829 Tags.cpp:1981
-msgid "Reset"
-msgstr "Restablecer"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr "Res&tablecer..."
 
-#: Tags.cpp:834 Tags.cpp:1460 Tags.cpp:1988
+#: Tags.cpp:845 Tags.cpp:1470 Tags.cpp:1997
 msgid "Template"
 msgstr "Plantilla"
 
-#: Tags.cpp:838 Tags.cpp:1464 Tags.cpp:1992 prefs/KeyConfigPrefs.cpp:126
+#: Tags.cpp:849 Tags.cpp:1474 Tags.cpp:2001 prefs/KeyConfigPrefs.cpp:126
 msgid "&Load..."
 msgstr "&Cargar..."
 
-#: Tags.cpp:839 Tags.cpp:1465 Tags.cpp:1993 prefs/KeyConfigPrefs.cpp:125
+#: Tags.cpp:850 Tags.cpp:1475 Tags.cpp:2002 prefs/KeyConfigPrefs.cpp:125
 msgid "&Save..."
 msgstr "&Guardar..."
 
-#: Tags.cpp:841 Tags.cpp:1467 Tags.cpp:1995
+#: Tags.cpp:852 Tags.cpp:1477 Tags.cpp:2004
 msgid "S&et Default"
 msgstr "&Establecer valores predeterminados"
 
-#: Tags.cpp:991 Tags.cpp:1630 Tags.cpp:2359
+#: Tags.cpp:1002 Tags.cpp:1640 Tags.cpp:2368
 msgid "Edit Genres"
 msgstr "Editar géneros"
 
-#: Tags.cpp:1024 Tags.cpp:1036 Tags.cpp:1052 Tags.cpp:1065 Tags.cpp:1668
-#: Tags.cpp:1680 Tags.cpp:1696 Tags.cpp:1709 Tags.cpp:2402 Tags.cpp:2414
-#: Tags.cpp:2430 Tags.cpp:2443
+#: Tags.cpp:1035 Tags.cpp:1047 Tags.cpp:1062 Tags.cpp:1075 Tags.cpp:1678
+#: Tags.cpp:1690 Tags.cpp:1705 Tags.cpp:1718 Tags.cpp:2411 Tags.cpp:2423
+#: Tags.cpp:2438 Tags.cpp:2451
 msgid "Reset Genres"
 msgstr "Restablecer géneros"
 
-#: Tags.cpp:1024 Tags.cpp:1065 Tags.cpp:1668 Tags.cpp:1709 Tags.cpp:2402
-#: Tags.cpp:2443
+#: Tags.cpp:1035 Tags.cpp:1075 Tags.cpp:1678 Tags.cpp:1718 Tags.cpp:2411
+#: Tags.cpp:2451
 msgid "Unable to save genre file."
 msgstr "No se puede guardar archivo de género."
 
-#: Tags.cpp:1035 Tags.cpp:1679 Tags.cpp:2413
+#: Tags.cpp:1046 Tags.cpp:1689 Tags.cpp:2422
 msgid "Are you sure you want to reset the genre list to defaults?"
-msgstr ""
-"¿Está seguro de que desea restablecer la lista de géneros a los valores "
-"predeterminados?"
+msgstr "¿Está seguro de que desea restablecer la lista de géneros a los valores predeterminados?"
 
-#: Tags.cpp:1052 Tags.cpp:1696 Tags.cpp:2430
+#: Tags.cpp:1062 Tags.cpp:1705 Tags.cpp:2438
 msgid "Unable to open genre file."
 msgstr "No se puede abrir el archivo de género."
 
-#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "Guardar metadatos como:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr "Cargar metadato como:"
 
-#: Tags.cpp:1112 Tags.cpp:1763 Tags.cpp:2486
+#: Tags.cpp:1122 Tags.cpp:1772 Tags.cpp:2494
 msgid "Error loading metadata"
 msgstr "Error al cargar metadato"
 
-#: Tags.cpp:1409 Tags.cpp:1968
-msgid "Title:"
-msgstr "Título:"
-
-#: Tags.cpp:1410 Tags.cpp:1969
-msgid "Artist:"
-msgstr "Artista:"
-
-#: Tags.cpp:1411 Tags.cpp:1970
-msgid "Album:"
-msgstr "Álbum:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Compositor:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Letrista:"
-
-#: Tags.cpp:1414 Tags.cpp:1973
-msgid "Comments:"
-msgstr "Comentarios:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Codificación por:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: Tags.cpp:1424 Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Número de pista:"
-
-#: Tags.cpp:1428 Tags.cpp:1972
-msgid "Year:"
-msgstr "Año:"
-
-#: Tags.cpp:1432 Tags.cpp:1974
-msgid "Genre:"
-msgstr "Género:"
-
-#: Tags.cpp:1490 Tags.cpp:2089
-msgid "No Genres"
-msgstr "Sin género"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Restablecer a valores predeterminados"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Básico"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Valor"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "Limpia&r"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr ""
-"La longitud máxima del atributo '%s' es %d caracteres. Los datos fueron "
-"truncados."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Título"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Artista"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Álbum"
+#: Tags.cpp:1097 Tags.cpp:1151 Tags.cpp:1751 Tags.cpp:1787 Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "Guardar metadato como:"
 
 #: Theme.cpp:638
 #, c-format
@@ -3723,421 +3461,462 @@ msgstr ""
 "  %s\n"
 "ya están presentes."
 
-#: TrackPanel.cpp:464 TrackPanel.cpp:465
+#: TimeDialog.cpp:53 TimerRecordDialog.cpp:227 TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309 effects/Noise.cpp:243 effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "Duración"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Grabación programada de Audacity"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "Comienzo de la grabación"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "Fin de la grabación"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr "Progreso de grabación programada de Audacity"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "Fecha y hora de comienzo"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Fecha y hora de final"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr "Fecha final"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Esperando para comenzar la grabación en %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Grabación programada de Audacity. Esperando para comenzar"
+
+#: TrackPanel.cpp:457 TrackPanel.cpp:458
 msgid "Track Panel"
 msgstr "Panel de pista"
 
-#: TrackPanel.cpp:548 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
+#: TrackPanel.cpp:541 prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Otro..."
 
-#: TrackPanel.cpp:556 TrackPanel.cpp:580 TrackPanel.cpp:589 TrackPanel.cpp:597
+#: TrackPanel.cpp:549 TrackPanel.cpp:571 TrackPanel.cpp:580 TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "Nombre..."
 
-#: TrackPanel.cpp:558 TrackPanel.cpp:582 TrackPanel.cpp:593 TrackPanel.cpp:599
+#: TrackPanel.cpp:551 TrackPanel.cpp:573 TrackPanel.cpp:584 TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
 msgstr "Desplazar pista hacia arriba"
 
-#: TrackPanel.cpp:559 TrackPanel.cpp:583 TrackPanel.cpp:594 TrackPanel.cpp:600
+#: TrackPanel.cpp:552 TrackPanel.cpp:574 TrackPanel.cpp:585 TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
 msgstr "Desplazar pista hacia abajo"
 
-#: TrackPanel.cpp:561 effects/ToneGen.cpp:325
+#: TrackPanel.cpp:554 effects/ToneGen.cpp:319 prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Forma de onda"
 
-#: TrackPanel.cpp:562
+#: TrackPanel.cpp:555 prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "Forma de onda (dB)"
 
-#: TrackPanel.cpp:565
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
 msgid "Spectrum log(f)"
 msgstr "Espectro logarítmico (f)"
 
-#: TrackPanel.cpp:567
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558 prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
 msgstr "Tono (EAC)"
 
-#: TrackPanel.cpp:569 TrackPanel.cpp:6091
+#: TrackPanel.cpp:560 TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "Mono"
 
-#: TrackPanel.cpp:570 TrackPanel.cpp:6090
+#: TrackPanel.cpp:561 TrackPanel.cpp:6095
 msgid "Left Channel"
 msgstr "Canal izquierdo"
 
-#: TrackPanel.cpp:571 TrackPanel.cpp:6090
+#: TrackPanel.cpp:562 TrackPanel.cpp:6095
 msgid "Right Channel"
 msgstr "Canal derecho"
 
-#: TrackPanel.cpp:572
+#: TrackPanel.cpp:563
 msgid "Make Stereo Track"
 msgstr "Hacer pista estéreo"
 
-#: TrackPanel.cpp:573
+#: TrackPanel.cpp:564
 msgid "Split Stereo Track"
 msgstr "Dividir pista estéreo"
 
-#: TrackPanel.cpp:575
+#: TrackPanel.cpp:566
 msgid "Set Sample Format"
 msgstr "Establecer formato de muestra"
 
-#: TrackPanel.cpp:577 TrackPanel.cpp:6320
+#: TrackPanel.cpp:568 TrackPanel.cpp:6341
 msgid "Set Rate"
 msgstr "Establecer frecuencia"
 
-#: TrackPanel.cpp:585
+#: TrackPanel.cpp:576
 msgid "Up Octave"
 msgstr "Subir una octava"
 
-#: TrackPanel.cpp:586
+#: TrackPanel.cpp:577
 msgid "Down Octave"
 msgstr "Bajar una octava"
 
-#: TrackPanel.cpp:591
+#: TrackPanel.cpp:582 TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "Tipo de letra..."
 
-#: TrackPanel.cpp:602
+#: TrackPanel.cpp:593
 msgid "Set Range..."
 msgstr "Establecer rango..."
 
-#: TrackPanel.cpp:606 toolbars/EditToolBar.cpp:135
+#: TrackPanel.cpp:597 toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Copiar"
 
-#: TrackPanel.cpp:1272
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
-msgstr ""
-"Haga clic para acercar verticalmente, Mayús-Clic para alejar. Arrastre para "
-"acercar una zona en concreto."
+#: TrackPanel.cpp:1258
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "Haga clic para acercar verticalmente, Mayús-Clic para alejar. Arrastre para acercar una zona en concreto."
 
-#: TrackPanel.cpp:1277
+#: TrackPanel.cpp:1263
 msgid "Drag the label vertically to change the order of the tracks."
-msgstr ""
-"Arrastre la etiqueta hacia arriba o abajo para cambiar el orden de las "
-"pistas."
+msgstr "Arrastre la etiqueta hacia arriba o abajo para cambiar el orden de las pistas."
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1283
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr "Haga clic y arrastre para modificar el tamaño relativo de las pistas estéreo."
 
-#: TrackPanel.cpp:1300
+#: TrackPanel.cpp:1286
 msgid "Click and drag to resize the track."
 msgstr "Haga clic y arrastre para modificar el tamaño de la pista."
 
-#: TrackPanel.cpp:1331
+#: TrackPanel.cpp:1317
 msgid "Drag one or more label boundaries"
 msgstr "Arrastrar uno o más límites de etiqueta"
 
-#: TrackPanel.cpp:1332
+#: TrackPanel.cpp:1318
 msgid "Drag label boundary"
 msgstr "Arrastrar límite de etiqueta"
 
 #. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1348
+#: TrackPanel.cpp:1334
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr "Modo multiherramienta: Cmd- para preferencias de ratón y teclado"
 
 #. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1351
+#: TrackPanel.cpp:1337
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr "Modo multiherramienta: Ctrl+P para preferencias de ratón y teclado"
 
-#: TrackPanel.cpp:1371
+#: TrackPanel.cpp:1383
 msgid "Click and drag to move left selection boundary."
 msgstr "Haga clic y arrastre para mover el límite izquierdo de la selección."
 
-#: TrackPanel.cpp:1376
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move right selection boundary."
 msgstr "Haga clic y arrastre para mover el límite derecho de la selección."
 
-#: TrackPanel.cpp:1702 TrackPanel.cpp:3993 TrackPanel.cpp:4025
-#: TrackPanel.cpp:4280 TrackPanel.cpp:6432 TrackPanel.cpp:6452
+#: TrackPanel.cpp:1730 TrackPanel.cpp:3959 TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255 TrackPanel.cpp:6490 TrackPanel.cpp:6510
 msgid "Modified Label"
 msgstr "Etiqueta modificada"
 
-#: TrackPanel.cpp:1703 TrackPanel.cpp:3994 TrackPanel.cpp:4026
-#: TrackPanel.cpp:4281 TrackPanel.cpp:6433 TrackPanel.cpp:6453
+#: TrackPanel.cpp:1731 TrackPanel.cpp:3960 TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256 TrackPanel.cpp:6491 TrackPanel.cpp:6511
 msgid "Label Edit"
 msgstr "Edición de etiqueta"
 
-#: TrackPanel.cpp:1930
+#: TrackPanel.cpp:1971
 msgid "Adjusted envelope."
 msgstr "Envolvente ajustada."
 
-#: TrackPanel.cpp:1931 prefs/MousePrefs.cpp:115
+#: TrackPanel.cpp:1972 prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Envolvente"
 
-#: TrackPanel.cpp:2082
+#: TrackPanel.cpp:2123
 msgid "Moved clip to another track"
 msgstr "Bloque desplazado a otra pista"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "left"
 msgstr "izquierdo"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "right"
 msgstr "derecho"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2088
+#: TrackPanel.cpp:2129
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr "Pistas o bloques desplazados en el tiempo %s %.02f segundos"
 
-#: TrackPanel.cpp:2092 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
+#: TrackPanel.cpp:2133 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "Desplazamiento en el tiempo"
 
-#: TrackPanel.cpp:2953
+#: TrackPanel.cpp:2916
 msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
-msgstr ""
-"Para usar la herramienta de dibujo seleccione 'Forma de onda' en el menú "
-"desplegable de pista."
+msgstr "Para usar la herramienta de dibujo seleccione 'Forma de onda' en el menú desplegable de pista."
 
-#: TrackPanel.cpp:2970
+#: TrackPanel.cpp:2933
 msgid "To use Draw, zoom in further until you can see the individual samples."
-msgstr ""
-"Para utilizar la herramienta de dibujo debe acercar la pista hasta poder ver "
-"las muestras individuales."
+msgstr "Para utilizar la herramienta de dibujo debe acercar la pista hasta poder ver las muestras individuales."
 
-#: TrackPanel.cpp:3241
+#: TrackPanel.cpp:3205
 msgid "Moved Sample"
 msgstr "Muestra movida"
 
-#: TrackPanel.cpp:3242
+#: TrackPanel.cpp:3206
 msgid "Sample Edit"
 msgstr "Edición de muestra"
 
-#: TrackPanel.cpp:3341
+#: TrackPanel.cpp:3305
 #, c-format
 msgid "Removed track '%s.'"
 msgstr "Pista '%s' eliminada"
 
-#: TrackPanel.cpp:3343
+#: TrackPanel.cpp:3307
 msgid "Track Remove"
 msgstr "Eliminación de pista"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved gain slider"
 msgstr "Desplazado el control de ganancia"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved pan slider"
 msgstr "Desplazado el control de panorama"
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5726 TrackPanel.cpp:7149
+#: TrackPanel.cpp:3449 TrackPanel.cpp:5703 TrackPanel.cpp:7244
 msgid "Gain"
 msgstr "Ganancia"
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5664 TrackPanel.cpp:7156
+#: TrackPanel.cpp:3449 TrackPanel.cpp:5641 TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "Panorama"
 
-#: TrackPanel.cpp:3610 TrackPanel.cpp:6385 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3576 TrackPanel.cpp:6441
 msgid "up"
 msgstr "arriba"
 
-#: TrackPanel.cpp:3614 TrackPanel.cpp:6386 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3580 TrackPanel.cpp:6442
 msgid "down"
 msgstr "abajo"
 
-#: TrackPanel.cpp:3621 TrackPanel.cpp:6381
+#: TrackPanel.cpp:3587 TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "Movida '%s' %s"
 
-#: TrackPanel.cpp:3624 TrackPanel.cpp:6387
+#: TrackPanel.cpp:3590 TrackPanel.cpp:6443
 msgid "Move Track"
 msgstr "Desplazar pista"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expand"
 msgstr "Expandir"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expanded Cut Line"
 msgstr "Expandida la línea de corte"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merge"
 msgstr "Combinar"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merged Clips"
 msgstr "Bloques combinados"
 
-#: TrackPanel.cpp:4201
+#: TrackPanel.cpp:4176
 msgid "Removed Cut Line"
 msgstr "Eliminada la línea de corte"
 
-#: TrackPanel.cpp:5664
+#: TrackPanel.cpp:5641
 msgid "Adjusted Pan"
 msgstr "Panorama ajustado"
 
-#: TrackPanel.cpp:5726
+#: TrackPanel.cpp:5703
 msgid "Adjusted gain"
 msgstr "Ganancia ajustada"
 
-#: TrackPanel.cpp:5918
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr "Agrupar con la pista de onda"
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr "Limpiar cualquier agrupamiento"
+
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
 msgstr "No se puede borrar una pista con audio activo"
 
-#: TrackPanel.cpp:6071
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Estéreo, "
 
-#: TrackPanel.cpp:6074
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Mono, "
 
-#: TrackPanel.cpp:6076
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "Izquierdo, "
 
-#: TrackPanel.cpp:6078
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "Derecho, "
 
-#: TrackPanel.cpp:6100 TrackPanel.cpp:6225
+#: TrackPanel.cpp:6105 TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "Cambiado '%s' a %s"
 
-#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6110
 msgid "Channel"
 msgstr "Canal"
 
-#: TrackPanel.cpp:6118
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "Dividir pista estéreo '%s'"
 
-#: TrackPanel.cpp:6139
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "Se convirtió a estéreo la pista '%s'"
 
-#: TrackPanel.cpp:6142
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
 msgstr "Hacer estéreo"
 
-#: TrackPanel.cpp:6189
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "Cambiado '%s' a %d Hz"
 
-#: TrackPanel.cpp:6191
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "Cambio de frecuencia"
 
-#: TrackPanel.cpp:6229
+#: TrackPanel.cpp:6255
 msgid "Format Change"
 msgstr "Cambio de formato"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr ""
-"Introduzca una frecuencia de muestreo en Hz (muestras por segundo) entre 1 y "
-"1000000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Frecuencia de muestreo inválida."
-
-#: TrackPanel.cpp:6349
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
 msgstr "Cambiar el límite inferior de velocidad (%) a:"
 
-#: TrackPanel.cpp:6350 TrackPanel.cpp:6351
+#: TrackPanel.cpp:6406 TrackPanel.cpp:6407
 msgid "Lower speed limit"
 msgstr "Límite inferior de velocidad"
 
-#: TrackPanel.cpp:6356
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
 msgstr "Cambiar el límite superior de velocidad (%) a:"
 
-#: TrackPanel.cpp:6357 TrackPanel.cpp:6358
+#: TrackPanel.cpp:6413 TrackPanel.cpp:6414
 msgid "Upper speed limit"
 msgstr "Límite superior de velocidad"
 
-#: TrackPanel.cpp:6366
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Establecer rango en '%d' - '%d'"
 
-#: TrackPanel.cpp:6369
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "Establecer rango"
 
-#: TrackPanel.cpp:6414
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
 msgstr "Cambiar  nombre de pista a:"
 
-#: TrackPanel.cpp:6415
+#: TrackPanel.cpp:6473
 msgid "Track Name"
 msgstr "Nombre de pista"
 
-#: TrackPanel.cpp:6418
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "'%s' renombrado a '%s'"
 
-#: TrackPanel.cpp:6421
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "Cambio de nombre"
 
-#: TrackPanel.cpp:6487
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
 msgstr "Tipo de letra de la pista de etiqueta"
 
-#: TrackPanel.cpp:6499
+#: TrackPanel.cpp:6592 TrackPanel.cpp:6598
 msgid "Face name"
 msgstr "Nombre de tipografía"
 
-#: TrackPanel.cpp:6508
+#: TrackPanel.cpp:6602 TrackPanel.cpp:6609
 msgid "Face size"
 msgstr "Tamaño de tipografía"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Silencio"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Solo"
 
-#: TrackPanelAx.cpp:265
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
 msgstr "Vista de pista"
 
-#: TrackPanelAx.cpp:273
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
 msgstr "Pista accesible fuera de sincronía"
 
-#: TrackPanelAx.cpp:281
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
 msgstr "Pista %d"
 
-#: TrackPanelAx.cpp:287
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr " Silencio activado"
 
-#: TrackPanelAx.cpp:292
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
 msgstr " Solo activado"
 
-#: TrackPanelAx.cpp:296
+#: TrackPanelAx.cpp:304
 msgid " Select On"
 msgstr " Selección activada"
 
@@ -4164,35 +3943,33 @@ msgstr "Cambios de signo        -- significa: %1.4f  sd: (%1.4f)\n"
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr "Cambios de dirección  -- significa: %1.4f  sd: (%1.4f)\n"
 
-#: WaveTrack.cpp:85
+#: WaveTrack.cpp:88
 msgid "Audio Track"
 msgstr "Pista de audio"
 
-#: WaveTrack.cpp:555 WaveTrack.cpp:574
+#: WaveTrack.cpp:597 WaveTrack.cpp:616 WaveTrack.cpp:1057 WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
 msgstr "No hay espacio suficiente para pegar la selección"
 
-#: WaveTrack.cpp:1688
+#: WaveTrack.cpp:2052
 msgid "There is not enough room available to expand the cut line"
 msgstr "No hay espacio suficiente para expandir la línea de corte"
 
-#: commands/CommandManager.cpp:448
+#: commands/CommandManager.cpp:555
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "Complementos del 1 al %i"
 
-#: commands/CommandManager.cpp:462
+#: commands/CommandManager.cpp:569
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "Complementos del %i al %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
-msgstr ""
-"Deshabilitado por algún motivo. ¿Ha probado a seleccionar algo de audio "
-"antes?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "Deshabilitado por algún motivo. ¿Ha probado a seleccionar algo de audio previamente?"
 
-#: commands/CommandManager.cpp:781
+#: commands/CommandManager.cpp:892
 msgid ""
 "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
@@ -4200,7 +3977,7 @@ msgstr ""
 "Sólo puede hacer esto cuando la reproducción y la \n"
 "grabación están detenidas (no basta con la pausa)."
 
-#: commands/CommandManager.cpp:783
+#: commands/CommandManager.cpp:894
 msgid ""
 "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
@@ -4208,11 +3985,11 @@ msgstr ""
 "Primero debe seleccionar audio estéreo para\n"
 "utilizar esto (no se puede hacer con mono)."
 
-#: commands/CommandManager.cpp:785
+#: commands/CommandManager.cpp:896
 msgid "You must first select some audio for this to use."
 msgstr "Primero debe seleccionar audio para utilizar esto."
 
-#: commands/CommandManager.cpp:787
+#: commands/CommandManager.cpp:898
 msgid ""
 "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
@@ -4220,16 +3997,16 @@ msgstr ""
 "Primero debe seleccionar audio para utilizar\n"
 "esto (seleccionar otro tipo de pista no funcionará)"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Mensaje"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr "Desestimado"
 
-#: commands/CommandManager.cpp:972
+#: commands/CommandManager.cpp:1083
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
 msgstr "%d accesos directos cargados\n"
 
-#: commands/CommandManager.cpp:974
+#: commands/CommandManager.cpp:1085
 msgid "Loading keyboard shortcuts"
 msgstr "Cargando accesos directos"
 
@@ -4238,45 +4015,46 @@ msgstr "Cargando accesos directos"
 msgid "Applied effect: %s %.1f dB"
 msgstr "Efecto aplicado: %s %.1f dB"
 
-#: effects/Amplify.cpp:87
+#: effects/Amplify.cpp:139
 msgid "Amplify"
-msgstr "Amplificar"
+msgstr "Amplificado"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplificar de Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "de Dominic Mazzoni"
 
-#: effects/Amplify.cpp:159
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "Amplificación (dB):"
 
-#: effects/Amplify.cpp:179
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr "Amplificación dB"
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "Nuevo pico de amplitud (dB):"
 
-#: effects/Amplify.cpp:191
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
 msgstr "Permitir recorte"
 
-#: effects/Amplify.cpp:237 effects/Amplify.cpp:287 effects/Amplify.cpp:353
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
 msgid "-Infinity"
 msgstr "-Infinito"
 
-#: effects/Amplify.h:46
+#: effects/Amplify.h:37
 msgid "Amplify..."
-msgstr "Amplificar..."
+msgstr "Amplificado..."
 
-#: effects/Amplify.h:54
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "Amplificando"
 
 #: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
-msgstr ""
-"Se ha seleccionado una pista que no contiene audio.  Auto Duck solo puede "
-"procesar pistas de audio."
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "Se ha seleccionado una pista que no contiene audio.  Auto Duck solo puede procesar pistas de audio."
 
 #: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:453
 #: effects/AutoDuck.cpp:570
@@ -4284,12 +4062,8 @@ msgid "Auto Duck"
 msgstr "Auto Duck"
 
 #: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
-msgstr ""
-"Auto Duck necesita una pista de control que se debe situar debajo de la pista"
-"(s) seleccionada."
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Auto Duck necesita una pista de control que se debe situar debajo de la pista(s) seleccionada."
 
 #: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
@@ -4306,9 +4080,12 @@ msgstr "Pausa máxima:"
 #. i18n-hint: Name of time display format that shows time in seconds
 #: effects/AutoDuck.cpp:494 effects/AutoDuck.cpp:499 effects/AutoDuck.cpp:504
 #: effects/AutoDuck.cpp:509 effects/AutoDuck.cpp:514
-#: prefs/AudioIOPrefs.cpp:166 prefs/AudioIOPrefs.cpp:174
-#: prefs/AudioIOPrefs.cpp:176 prefs/AudioIOPrefs.cpp:201
-#: prefs/AudioIOPrefs.cpp:203 widgets/TimeTextCtrl.cpp:263
+#: prefs/AudioIOPrefs.cpp:172 prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182 prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209 prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163 prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189 prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
 msgstr "segundos"
 
@@ -4328,7 +4105,7 @@ msgstr "Longitud de caída interior:"
 msgid "Inner fade up length:"
 msgstr "Longitud de subida interior:"
 
-#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:484
+#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:494
 msgid "Threshold:"
 msgstr "Umbral:"
 
@@ -4336,22 +4113,21 @@ msgstr "Umbral:"
 msgid "Please enter valid values."
 msgstr "Introduzca valores válidos."
 
-#: effects/AutoDuck.cpp:704
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
 msgstr "Vista previa no disponible"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr "Auto Duck..."
 
-#: effects/AutoDuck.h:107
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr "Procesando Auto Duck..."
 
-#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:448
-#: effects/audiounits/AudioUnitEffect.cpp:877 effects/nyquist/Nyquist.cpp:1042
-#: widgets/ErrorDialog.cpp:79 widgets/ErrorDialog.cpp:105
-#: widgets/Warning.cpp:67
+#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882 effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "Aceptar"
 
@@ -4364,23 +4140,31 @@ msgstr "Efecto aplicado: frecuencia %s = %.0f Hz, realce = %.0f dB"
 msgid "Bass Boost"
 msgstr "Realce de graves"
 
-#: effects/BassBoost.cpp:182
+#: effects/BassBoost.cpp:182 effects/Phaser.cpp:219 effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr "de Nasca Octavian Paul"
 
-#: effects/BassBoost.cpp:196
+#: effects/BassBoost.cpp:196 effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
 msgstr "Frecuencia (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr "Frecuencia Herztios"
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Realce (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr "Realce dB"
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Realce de graves..."
 
-#: effects/BassBoost.h:43
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
 msgstr "Realzando frecuencias graves"
 
@@ -4397,250 +4181,602 @@ msgstr "Cambiando longitud..."
 msgid "Applied effect: %s %.2f semitones"
 msgstr "Efecto aplicado: %s %.2f semitonos"
 
-#: effects/ChangePitch.cpp:118
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
 msgstr "Cambiar tono"
 
-#: effects/ChangePitch.cpp:247
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
-msgstr "Cambiar tono sin cambiar tiempo"
+msgstr "Cambiar tono sin cambiar ritmo"
 
-#. i18n-hint: && in here is an escape character to get a single & on
-#. * screen, so keep it as is
-#: effects/ChangePitch.cpp:254 effects/ChangeSpeed.cpp:313
-#: effects/ChangeTempo.cpp:180
+#: effects/ChangePitch.cpp:258 effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "de Vaughan Johnson y Dominic Mazzoni"
 
-#: effects/ChangePitch.cpp:259 effects/ChangeTempo.cpp:185
+#: effects/ChangePitch.cpp:260 effects/ChangeTempo.cpp:175
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "uso de SoundTouch, de Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Tono:   desde"
+msgid "Pitch:"
+msgstr "Tono:"
 
-#: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
-#: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
-#: effects/ChangeTempo.cpp:270
-msgid "to"
-msgstr "a"
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr "Desde:"
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr "Desde tono"
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr "Arriba"
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr "Abajo"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr "A:"
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr "A tono"
 
-#: effects/ChangePitch.cpp:306
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
 msgstr "Semitonos (pasos intermedios):"
 
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frecuencia (Hz):   desde"
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr "Semitonos en pasos intermedios"
 
-#: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
-#: effects/ChangeTempo.cpp:198
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206 effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr "desde"
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr "Desde frencuencia en hertzios"
+
+#: effects/ChangePitch.cpp:331 effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211 effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "a"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr "A frecuencia en segundos"
+
+#: effects/ChangePitch.cpp:338 effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
 msgid "Percent Change:"
 msgstr "Porcentaje de cambio:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:195
+msgid "Percent Change"
+msgstr "Porcentaje de cambio"
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Cambiar tono..."
 
-#: effects/ChangePitch.h:39
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
 msgstr "Cambiando tono"
 
-#: effects/ChangeSpeed.cpp:53 effects/ChangeTempo.cpp:55
+#: effects/ChangeSpeed.cpp:54 effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "Efecto aplicado: %s %.1f%%"
 
-#: effects/ChangeSpeed.cpp:60
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
-msgstr "Cambiar velocidad"
+msgstr "Cambio de velocidad"
 
-#: effects/ChangeSpeed.cpp:308
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
+msgid "n/a"
+msgstr "no disponible"
+
+#: effects/ChangeSpeed.cpp:334
 msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Cambiar velocidad afectando a tiempo y a tono"
+msgstr "Cambio de velocidad afectando a tiempo y a ritmo"
 
-#: effects/ChangeSpeed.cpp:318
+#: effects/ChangeSpeed.cpp:338
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "uso de SampleRate, de Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "no disponible"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr "RPM de vinilo estándar:"
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Rpm de vinilo estándar:   desde"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr "Desde RPM"
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr "A RPM"
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
-msgstr "Cambiar velocidad..."
+msgstr "Cambio de velocidad..."
 
-#: effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
 msgstr "Cambiando velocidad"
 
-#: effects/ChangeTempo.cpp:74
+#: effects/ChangeTempo.cpp:138
 msgid "Change Tempo"
-msgstr "Cambiar tiempo"
+msgstr "Cambiar ritmo"
 
-#: effects/ChangeTempo.cpp:175
+#: effects/ChangeTempo.cpp:171
 msgid "Change Tempo without Changing Pitch"
-msgstr "Cambiar tiempo sin cambiar tono"
+msgstr "Cambiar ritmo sin cambiar tono"
+
+#: effects/ChangeTempo.cpp:203
+msgid "Beats per minute:"
+msgstr "Compases por minuto:"
+
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr "Desde compases por minuto"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Compases por minuto (Bpm):   desde"
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr "A compases por minuto"
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Longitud (segundos):   desde"
+#: effects/ChangeTempo.cpp:216
+msgid "Length (seconds):"
+msgstr "Duración (segundos):"
+
+#: effects/ChangeTempo.cpp:220
+msgid "From length in seconds"
+msgstr "Desde duración en segundos"
+
+#: effects/ChangeTempo.cpp:225
+msgid "To length in seconds"
+msgstr "A duración en segundos"
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
-msgstr "Cambiar tiempo..."
+msgstr "Cambiar ritmo..."
 
-#: effects/ChangeTempo.h:43
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
-msgstr "Cambiando tiempo"
+msgstr "Cambiando ritmo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr "Eliminación de click"
 
-#: effects/ClickRemoval.cpp:336
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Eliminación de click y pop de Craig DeForest"
 
-#: effects/ClickRemoval.cpp:350
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Seleccionar umbral (valores menores indican más sensibilidad):"
 
-#: effects/ClickRemoval.cpp:362
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr "Seleccionar umbral"
+
+#: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Ancho de pico máximo (valores mayores indican más sensibilidad):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr "Ancho de pico máximo"
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Eliminación de click...."
 
-#: effects/ClickRemoval.h:50
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
 msgstr "Eliminando click y pop..."
 
-#: effects/Compressor.cpp:74
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "Compresor de rango dinámico"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Compresor de rango dinámico de Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr "Umbral"
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Proporción: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr "Proporción:"
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
-msgstr "Periodo de ataque: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "Proporción"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
-msgstr "Periodo de decaimiento: "
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
+msgstr "Tiempo de ataque:"
 
-#: effects/Compressor.cpp:516
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr "Tiempo de ataque"
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr "Tiempo de decaimiento:"
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr "Tiempo de decaimiento"
+
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizar a 0 dB después de comprimir"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
-msgstr "Umbral: %d dB"
+msgid "Threshold %d dB"
+msgstr "Umbral %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Proporción: %.0f:1"
+msgid "%3d dB"
+msgstr "%3d dB"
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Proporción: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr "Proporción %.0f a 1"
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
-msgstr "Periodo de ataque: %.1f seg"
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr "Proporción %.1f a 1"
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr "%.1f:1"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Decay Time: %.1f secs"
-msgstr "Periodo de decaimiento: % 1f seg"
+msgid "Attack Time %.1f secs"
+msgstr "Timpo de ataque %.1f seg"
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr "%.1f seg"
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr "Tiempo de decaimiento % 1f seg"
 
 #: effects/Compressor.h:36
 msgid "Compressor..."
-msgstr "Compresor..."
+msgstr "Compresión..."
 
-#: effects/Compressor.h:44
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
 msgstr "Aplicando compresión de rango dinámico..."
 
-#: effects/DtmfGen.cpp:48
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr "Herramienta de contraste de sonido principal"
+
+#: effects/Contrast.cpp:79
+msgid ""
+"Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+"Tiempos de sonido principal seleccionados.\n"
+"Ahora seleccione el sonido de fondo y use Ctrl+Mayús+T o menú de nuevo."
+
+#: effects/Contrast.cpp:127
+msgid ""
+"Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+"El punto de inicio finaliza después del punto final!\n"
+"Introduzca unos valores razonables."
+
+#: effects/Contrast.cpp:137
+msgid ""
+"Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+"Los tiempos no son razonables\n"
+"Introduzca unos valores con sentido."
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr "Hola.\n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr "Analizador de contraste de audio WCAG2"
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr "Medido"
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr "Analizador de contraste"
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr "Parámetros"
+
+#: effects/ToneGen.cpp:355 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Comienzo"
+
+#: effects/ToneGen.cpp:356 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156 toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Fin"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr "Volumen     "
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr "Principal:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr "Punto de inicio de sonido principal"
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr "Punto de fin de sonido principal"
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr "Utilizar selección"
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr "Fondo:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr "Punto de inicio de sonido de fondo"
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr "Punto de fin de sonido de fondo"
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr "Resultado"
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr "Resultado de contraste:"
+
+#: Tags.cpp:840 Tags.cpp:1990
+msgid "Reset"
+msgstr "Restablecer"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr "Diferencia:"
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "Información"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr "Para medir diferencias de volumnen rms entre dos selecciones de audio"
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr "Ayuda del Analizador de contraste de audio WCAG2"
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "Control"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr "Nota: El botón 'Aceptar' restablece los valores de tiempo."
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr "Cerrar manteniendo los tiempos"
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr "Medición"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr "No hay principal que medir"
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr "Nivel de medición de principal"
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f dB"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr "No hay fondo que medir"
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr "Nivel de medición de fondo"
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr "WCAG2 superado"
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr "WCAG2 no superado"
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr "Diferencia actual"
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr "%.1f dB rms de media"
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr "Introduzca tiempos válidos"
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr "Exportar resultado de contraste como:"
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr "Resultados de contraste de WCAG 2.0 Success Criteria 1.4.7"
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr "Nombre de archivo = %s."
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr "Principal"
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr "Tiempo comenzado = %2d hora(s), %2d minuto(s), %.2f segundos."
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr "Tiempo finalizado = %2d hora(s), %2d minuto(s), %.2f segundos."
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr "Media de rms = %.1f dB."
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr "Media de rms =  dB."
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr "Fondo"
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr "Resultados"
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr "Diferencia = %.1f media de rms dB."
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr "Success Criteria 1.4.7 de WCAG 2.0: Superado"
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr "Success Criteria 1.4.7 de WCAG 2.0: No superado"
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr "Información recopilada"
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr "Contraste...\tCtrl+Mayús+T"
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr "Midiendo fondo"
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr "Midiendo principal"
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr "Generador de tonos DTMF"
 
-#: effects/DtmfGen.cpp:439
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "de Salvo Ventura (2006)"
 
-#: effects/DtmfGen.cpp:443
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "Secuencia DTMF:"
 
-#: effects/DtmfGen.cpp:446 effects/Noise.cpp:255 effects/ToneGen.cpp:328
-#: effects/ToneGen.cpp:365
+#: effects/DtmfGen.cpp:463 effects/Noise.cpp:242 effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "Amplitud (0-1)"
 
-#: effects/DtmfGen.cpp:448
+#: effects/DtmfGen.cpp:465
 msgid "Duration:"
 msgstr "Duración:"
 
-#: effects/DtmfGen.cpp:469
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
 msgstr "Proporción de tono a silencio:"
 
-#: effects/DtmfGen.cpp:479
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr "Ciclo de trabajo:"
 
-#: effects/DtmfGen.cpp:481
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
 msgstr "Duración de tono:"
 
-#: effects/DtmfGen.cpp:482 effects/DtmfGen.cpp:484 effects/DtmfGen.cpp:560
-#: effects/DtmfGen.cpp:561
+#: effects/DtmfGen.cpp:499 effects/DtmfGen.cpp:501 effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
 msgstr "ms"
 
-#: effects/DtmfGen.cpp:483
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr "Duración del silencio:"
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
 msgstr "Tonos DTMF..."
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
 msgstr "Efecto aplicado: Generar tonos DTMF, %.6lf segundos"
 
-#: effects/DtmfGen.h:53
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
 msgstr "Generando tonos DTMF"
 
@@ -4655,7 +4791,7 @@ msgstr "Eco"
 
 #. i18n-hint: && in here is an escape character to get a single & on
 #. * screen, so keep it as is
-#: effects/Echo.cpp:195
+#: effects/Echo.cpp:195 effects/Repeat.cpp:200
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "de Dominic Mazzoni y Vaughan Johnson"
 
@@ -4671,27 +4807,23 @@ msgstr "Factor de decaimiento:"
 msgid "Echo..."
 msgstr "Eco..."
 
-#: effects/Echo.h:42
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "Aplicando eco"
 
-#: effects/Effect.cpp:390
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
 msgstr "Preparando vista previa"
 
-#: effects/Effect.cpp:419
+#: effects/Effect.cpp:497
 msgid "Previewing"
 msgstr "Mostrando vista previa"
 
-#: effects/Effect.cpp:435
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"Error al abrir dispositivo de sonido. Por favor verifique la configuración "
-"del dispositivo de salida y la frecuencia de muestreo del proyecto."
+#: effects/Effect.cpp:512
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "Error al abrir dispositivo de sonido. Por favor verifique la configuración del dispositivo de salida y la frecuencia de muestreo del proyecto."
 
-#: effects/Effect.h:107
+#: effects/Effect.h:100
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Efecto aplicado: %s"
@@ -4708,78 +4840,78 @@ msgstr "Coseno"
 msgid "Cubic"
 msgstr "Cúbico"
 
-#: effects/Equalization.cpp:362 effects/Equalization.cpp:412
+#: effects/Equalization.cpp:367 effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "Ecualización"
 
-#: effects/Equalization.cpp:980
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
 msgstr "Error al cargar la curva de ecualización"
 
-#: effects/Equalization.cpp:1019
+#: effects/Equalization.cpp:1033
 msgid "custom"
 msgstr "personalizado"
 
 #. i18n-hint: && in here is an escape character to get a single &
 #. * on screen, so keep it as is
-#: effects/Equalization.cpp:1087
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr "Ecualización de Mitch Golden y Vaughan Johnson"
 
-#: effects/Equalization.cpp:1108
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr "Máximo de dB"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr "Mínimo de dB"
 
-#: effects/Equalization.cpp:1183
+#: effects/Equalization.cpp:1197
 msgid "kHz"
 msgstr "kHz"
 
-#: effects/Equalization.cpp:1200
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
 msgstr "Dibujar curvas"
 
-#: effects/Equalization.cpp:1205
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
 msgstr "Ecualizador gráfico"
 
-#: effects/Equalization.cpp:1219
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
 msgstr "Escala de frecuencia lineal"
 
-#: effects/Equalization.cpp:1228
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
 msgstr "Longitud del filtro:"
 
-#: effects/Equalization.cpp:1249
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
 msgstr "Seleccionar curva:"
 
-#: effects/Equalization.cpp:1259 effects/Equalization.cpp:2498
-#: export/ExportMultiple.cpp:826
+#: effects/Equalization.cpp:1273 effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: effects/Equalization.cpp:1265
+#: effects/Equalization.cpp:1279
 msgid "Flat"
 msgstr "Plano"
 
-#: effects/Equalization.cpp:2497
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
 msgstr "Introduzca el nombre de la curva"
 
-#: effects/Equalization.cpp:2597
+#: effects/Equalization.cpp:2611 export/ExportFFmpegDialogs.cpp:1202
 msgid "Confirm Deletion"
 msgstr "Confirmar borrado"
 
-#: effects/Equalization.h:87
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "Ecualización..."
 
-#: effects/Equalization.h:95
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "Aplicando ecualización"
 
@@ -4787,15 +4919,15 @@ msgstr "Aplicando ecualización"
 msgid "Fade In"
 msgstr "Aparecer progresivamente"
 
-#: effects/Fade.h:32
+#: effects/Fade.h:38
 msgid "Fading In"
 msgstr "Aplicando Aparecer progresivamente"
 
-#: effects/Fade.h:48
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "Desvanecer progresivamente"
 
-#: effects/Fade.h:56
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "Aplicando Desvanecer progresivamente"
 
@@ -4831,73 +4963,225 @@ msgstr "Comenzar y parar debe ser mayor que cero."
 msgid "Find Clipping..."
 msgstr "Buscar recorte..."
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr "Detectando recorte"
 
 #: effects/Invert.h:27
 msgid "Invert"
-msgstr "Invertir"
+msgstr "Inversión"
 
-#: effects/Invert.h:35
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "Invirtiendo"
 
-#: effects/Leveller.cpp:52
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "Nivelado"
+
+#: effects/Leveller.cpp:203
 msgid "None-Skip"
 msgstr "Sin saltar nada"
 
-#: effects/Leveller.cpp:53
+#: effects/Leveller.cpp:204
 msgid "Light"
 msgstr "Ligero"
 
-#: effects/Leveller.cpp:54
+#: effects/Leveller.cpp:205
 msgid "Moderate"
 msgstr "Moderado"
 
-#: effects/Leveller.cpp:55
+#: effects/Leveller.cpp:206
 msgid "Heavy"
 msgstr "Pesado"
 
-#: effects/Leveller.cpp:56
+#: effects/Leveller.cpp:207
 msgid "Heavier"
 msgstr "Más pesado"
 
-#: effects/Leveller.cpp:57
+#: effects/Leveller.cpp:208
 msgid "Heaviest"
 msgstr "El más pesado"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Nivelador"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Nivelador de Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Ecualizar secciones suaves y altas"
+#: effects/Leveller.cpp:212 effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "de Lynn Allan"
 
-#: effects/Leveller.cpp:226 effects/Leveller.cpp:231
+#: effects/Leveller.cpp:222
 msgid "Degree of Leveling"
 msgstr "Grado de nivelado"
 
-#: effects/Leveller.cpp:242
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr "Grado de nivelado:"
+
+#: effects/Leveller.cpp:234
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Umbral de ruido (Hiss/Hum/Ruido ambiental)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
-msgstr "Umbral de ruido: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
+msgstr "Umbral para ruido:"
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
-msgstr "Nivelador..."
+msgstr "Nivelado..."
 
-#: effects/Leveller.h:36
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
-msgstr "Aplicando nivelador..."
+msgstr "Aplicando nivelado..."
+
+#: effects/LoadEffects.cpp:99
+msgid "Generator"
+msgstr "Generador"
+
+#: effects/LoadEffects.cpp:101
+msgid "Instrument"
+msgstr "Instrumento"
+
+#: effects/LoadEffects.cpp:103
+msgid "Oscillator"
+msgstr "Oscilador"
+
+#: effects/LoadEffects.cpp:105
+msgid "Utility"
+msgstr "Utilidad"
+
+#: effects/LoadEffects.cpp:107
+msgid "Converter"
+msgstr "Conversor"
+
+#: effects/LoadEffects.cpp:109
+msgid "Analyser"
+msgstr "Analizador"
+
+#: effects/LoadEffects.cpp:111 toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mezclador"
+
+#: effects/LoadEffects.cpp:113
+msgid "Simulator"
+msgstr "Simulador"
+
+#: effects/LoadEffects.cpp:115
+msgid "Delay"
+msgstr "Retardo"
+
+#: effects/LoadEffects.cpp:117
+msgid "Modulator"
+msgstr "Modulador"
+
+#: effects/LoadEffects.cpp:119
+msgid "Reverb"
+msgstr "Reverberación"
+
+#: effects/LoadEffects.cpp:121 effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Cambio de fase"
+
+#: effects/LoadEffects.cpp:123
+msgid "Flanger"
+msgstr "Flanger"
+
+#: effects/LoadEffects.cpp:125
+msgid "Chorus"
+msgstr "Coro"
+
+#: effects/LoadEffects.cpp:127
+msgid "Filter"
+msgstr "Filtro"
+
+#: effects/LoadEffects.cpp:129
+msgid "Lowpass"
+msgstr "Paso bajo"
+
+#: effects/LoadEffects.cpp:131
+msgid "Bandpass"
+msgstr "Paso de banda"
+
+#: effects/LoadEffects.cpp:133
+msgid "Highpass"
+msgstr "Paso alto"
+
+#: effects/LoadEffects.cpp:135
+msgid "Comb"
+msgstr "Comb"
+
+#: effects/LoadEffects.cpp:137
+msgid "Allpass"
+msgstr "Paso de todos"
+
+#: effects/LoadEffects.cpp:139
+msgid "Equaliser"
+msgstr "Ecualizador"
+
+#: effects/LoadEffects.cpp:141
+msgid "Parametric"
+msgstr "Paramétrico"
+
+#: effects/LoadEffects.cpp:143
+msgid "Multiband"
+msgstr "Multibanda"
+
+#: effects/LoadEffects.cpp:145
+msgid "Spectral Processor"
+msgstr "Procesador de espectro"
+
+#: effects/LoadEffects.cpp:147
+msgid "Pitch Shifter"
+msgstr "Desplazamiento de tono"
+
+#: effects/LoadEffects.cpp:149
+msgid "Amplifier"
+msgstr "Amplicador"
+
+#: effects/LoadEffects.cpp:151
+msgid "Distortion"
+msgstr "Distorsión"
+
+#: effects/LoadEffects.cpp:153
+msgid "Waveshaper"
+msgstr "Perfilado de onda"
+
+#: effects/LoadEffects.cpp:155
+msgid "Dynamics Processor"
+msgstr "Procesador dinámico"
+
+#: effects/LoadEffects.cpp:157
+msgid "Compressor"
+msgstr "Compresor"
+
+#: effects/LoadEffects.cpp:159
+msgid "Expander"
+msgstr "Expandidor"
+
+#: effects/LoadEffects.cpp:161
+msgid "Limiter"
+msgstr "Limitador"
+
+#: effects/LoadEffects.cpp:163
+msgid "Gate"
+msgstr "Puerta"
+
+#: effects/LoadEffects.cpp:196 effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "Reducción de ruido"
+
+#: effects/LoadEffects.cpp:198
+msgid "Pitch and Tempo"
+msgstr "Tono y ritmo"
+
+#: effects/LoadEffects.cpp:200
+msgid "Timeline Changer"
+msgstr "Modicador de línea de tiempo"
+
+#: effects/LoadEffects.cpp:202
+msgid "Time"
+msgstr "Tiempo"
+
+#: effects/LoadEffects.cpp:204
+msgid "Onsets"
+msgstr "Comienzos"
 
 #: effects/Noise.cpp:37
 msgid "White"
@@ -4915,7 +5199,7 @@ msgstr "Marrón"
 msgid "Noise Generator"
 msgstr "Generador de ruido"
 
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr "Tipo de ruido:"
 
@@ -4923,12 +5207,12 @@ msgstr "Tipo de ruido:"
 msgid "Noise..."
 msgstr "Ruido..."
 
-#: effects/Noise.h:49
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
 msgstr "Efecto aplicado: Generar ruido, %.6lf segundos"
 
-#: effects/Noise.h:53
+#: effects/Noise.h:59
 msgid "Generating Noise"
 msgstr "Generando ruido"
 
@@ -4945,15 +5229,11 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Intentando aplicar reducción de ruido sin un perfil de ruido.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Reducción de ruido"
-
-#: effects/NoiseRemoval.cpp:813
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "Paso 1"
 
-#: effects/NoiseRemoval.cpp:814
+#: effects/NoiseRemoval.cpp:815
 msgid ""
 "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
@@ -4961,48 +5241,59 @@ msgstr ""
 "Seleccione unos segundos de ruido para que Audacity sepa qué filtrar, luego\n"
 "haga clic en Obtener perfil de ruido:"
 
-#: effects/NoiseRemoval.cpp:815
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "Paso 2"
 
-#: effects/NoiseRemoval.cpp:816
+#: effects/NoiseRemoval.cpp:817
 msgid ""
 "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
 msgstr ""
-"Seleccione todo el audio que desea filtrar, elija que porcentaje de ruido "
-"desea filtrar\n"
+"Seleccione todo el audio que desea filtrar, elija que porcentaje de ruido desea filtrar\n"
 "y luego haga clic en Aceptar para eliminar el ruido.\n"
 
-#: effects/NoiseRemoval.cpp:821
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Reducción de ruido de Dominic Mazzoni"
 
-#: effects/NoiseRemoval.cpp:829
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
 msgstr "Obtener perfil de ruido"
 
-#: effects/NoiseRemoval.cpp:840
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
 msgstr "Reducción de ruido (dB):"
 
-#: effects/NoiseRemoval.cpp:848
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr "Reducción de ruido"
+
+#: effects/NoiseRemoval.cpp:849
 msgid "Frequency smoothing (Hz):"
 msgstr "Suavizado de frecuencia (Hz):"
 
-#: effects/NoiseRemoval.cpp:856
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr "Suavizado de frecuencia"
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr "Tiempo de ataque o decaimiento (seg):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr "Tiempo de ataque o decaimiento"
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Reducción de ruido..."
 
-#: effects/NoiseRemoval.h:44
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "Creando perfil de ruido"
 
-#: effects/NoiseRemoval.h:46
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "Reduciendo ruido"
 
@@ -5028,146 +5319,159 @@ msgstr "verdadero"
 msgid ", maximum amplitude = %.1f dB"
 msgstr ", amplitud máxima = %1f dB"
 
-#: effects/Normalize.cpp:113
+#: effects/Normalize.cpp:327
 msgid "Normalize"
-msgstr "Normalizar"
-
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalizar de Dominic Mazzoni"
+msgstr "Normalizado"
 
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Eliminar cualquier desalineación vertical (centrar en cero verticalmente)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr "Eliminar cualquier desalineación DC (centrar en 0.0 verticalmente)"
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Normalizar amplitud máxima a"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr "Normalizar amplitud máxima a:"
 
-#: effects/Normalize.cpp:361
+#: effects/Normalize.cpp:362
 msgid "-"
 msgstr "-"
 
-#: effects/Normalize.h:32
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr "Amplitud máxima db"
+
+#: effects/Normalize.h:33
 msgid "Normalize..."
-msgstr "Normalizar..."
+msgstr "Normalizado..."
 
-#: effects/Normalize.h:41
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "Normalizando..."
 
 #: effects/Phaser.cpp:65
 #, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"Efecto aplicado: %s %d etapas, %.0f%% wet, frecuencia = %.1f Hz, fase "
-"inicial = %.0f grados, profundidad = %d, retroalimentación = %.0f%%"
-
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Cambio de fase"
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "Efecto aplicado: %s %d etapas, %.0f%% wet, frecuencia = %.1f Hz, fase inicial = %.0f grados, profundidad = %d, retroalimentación = %.0f%%"
 
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Cambio de fase de Nasca Octavian Paul"
-
-#: effects/Phaser.cpp:222
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "Etapas:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "Seco"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr "Etapas"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr "Seco/Húmedo:"
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "Húmedo"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr "Seco húmedo"
 
-#: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
+#: effects/Phaser.cpp:236 effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Frecuencia LFO (Hz):"
 
-#: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr "Frecuencia LFO en hertzios"
+
+#: effects/Phaser.cpp:241 effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
 msgstr "Fase de Inicio LFO (grados):"
 
-#: effects/Phaser.cpp:296
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr "Fase de Inicio LFO en grados"
+
+#: effects/Phaser.cpp:246
 msgid "Depth:"
 msgstr "Profundidad:"
 
-#: effects/Phaser.cpp:312
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr "Profundidad en porcentaje"
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
 msgstr "Retroalimentación (%):"
 
-#: effects/Phaser.h:38
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr "Retroalimentación en porcentaje"
+
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "Cambio de fase..."
 
-#: effects/Phaser.h:46
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "Aplicando cambio de fase"
 
 #: effects/Repair.cpp:99
 msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
+"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
-"El efecto de reparación está pensado para usarse en pequeñas secciones de "
-"audio dañado (hasta 128 muestras).\n"
+"El efecto de reparación está pensado para usarse en pequeñas secciones de audio dañado (hasta 128 muestras).\n"
 "\n"
-"Utilice la herramienta Acercar y seleccione una pequeña fracción de un "
-"segundo para realizar la reparación."
+"Utilice la herramienta Acercar y seleccione una pequeña fracción de un segundo para realizar la reparación."
 
-#: effects/Repair.h:37
+#: effects/Repair.cpp:105
+msgid ""
+"Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+"Repara utilizando el audio situado fuera de la zona seleccionada.\n"
+"\n"
+"Seleccione una región con audio situada junto a uno de los laterales.\n"
+"\n"
+"Cuando más audio haya alrededor, mejor será el resultado."
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
 msgstr "Reparando audio dañado"
 
-#: effects/Repeat.cpp:49
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
 msgstr "Repetido %d veces"
 
-#: effects/Repeat.cpp:75
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
 msgstr "Las pistas son muy largas para repetir la selección."
 
-#: effects/Repeat.cpp:76 effects/Repeat.cpp:80
+#: effects/Repeat.cpp:77 effects/Repeat.cpp:187
 msgid "Repeat"
 msgstr "Repetir"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repetir de Dominic Mazzoni y Vaughan Johnson"
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
+msgstr "Número de veces a repetir:"
 
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
-msgstr "Número de veces a repetir: "
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr "Nueva duración de selección: hh:mm:ss"
 
-#: effects/Repeat.cpp:207 effects/Repeat.cpp:237
+#: effects/Repeat.cpp:253
 msgid "New selection length: "
 msgstr "Nueva longitud de selección: "
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutos, %d segundos"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262 widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
-#: effects/Repeat.h:32
+#: effects/Repeat.h:33
 msgid "Repeat..."
 msgstr "Repetir..."
 
-#: effects/Repeat.h:40
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
 msgstr "Aplicando repetición"
 
@@ -5175,7 +5479,7 @@ msgstr "Aplicando repetición"
 msgid "Reverse"
 msgstr "Revertir"
 
-#: effects/Reverse.h:38
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "Revirtiendo"
 
@@ -5187,22 +5491,18 @@ msgstr "Generador de silencios"
 msgid "Silence..."
 msgstr "Silenciar..."
 
-#: effects/Silence.h:42
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "Generando silencio"
 
-#: effects/Silence.h:47
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Efecto aplicado: Generar silencio, %.6lf segundos"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Este efecto no puede ser aplicado en pistas estéreo donde los canales "
-"individuales de la pista no coinciden."
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Este efecto no puede ser aplicado en pistas estéreo donde los canales individuales de la pista no coinciden."
 
 #: effects/SpikeCleaner.cpp:69
 msgid "Spike Cleaner"
@@ -5232,69 +5532,120 @@ msgstr "Limpiador de picos..."
 msgid "Applying Spike Cleaner..."
 msgstr "Aplicando limpiador de picos..."
 
-#: effects/StereoToMono.h:32
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "E&stéreo a Mono"
+
+#: effects/StereoToMono.h:38
 msgid "Applying Stereo to Mono"
 msgstr "Aplicando Estéreo a Mono"
 
-#: effects/ToneGen.cpp:66
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr "Ritmo"
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr "Desplazamiento de ritmo/tono"
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr "usando SBSMS, de Clayton Otey"
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr "Cambio de ritmo inicial (%):"
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr "Cambio de ritmo final (%):"
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr "Cambio de ritmo inicial (%)"
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr "Cambio de ritmo final (%)"
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr "Desplazamiento de tono inicial (semitonos) [-12 a 12]:"
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr "Desplazamiento de tono final (semitonos) [-12 a 12]:"
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr "Desplazamiento de ritmo/tono..."
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr "Modificando ritmo/tono"
+
+#: effects/ToneGen.cpp:61
 #, c-format
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
-msgstr ""
-"Efecto aplicado: Generar %s onda %s, frecuencia = %.2f Hz, amplitud = %.2f, "
-"%.6lf segundos"
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "Efecto aplicado: Generar %s onda %s, frecuencia = %.2f Hz, amplitud = %.2f, %.6lf segundos"
 
-#: effects/ToneGen.cpp:75 widgets/Meter.cpp:379
+#: effects/ToneGen.cpp:69 widgets/Meter.cpp:415
 msgid "Linear"
 msgstr "Lineal"
 
-#: effects/ToneGen.cpp:76
+#: effects/ToneGen.cpp:70
 msgid "Logarithmic"
 msgstr "Logarítmico"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
 msgstr "Generador de chirp"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "Generador de tonos"
 
-#: effects/ToneGen.cpp:79
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "Sinusoide"
 
-#: effects/ToneGen.cpp:80
+#: effects/ToneGen.cpp:73
 msgid "Square"
 msgstr "Cuadrado"
 
-#: effects/ToneGen.cpp:81
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
 msgstr "Diente de sierra"
 
-#: effects/ToneGen.cpp:82
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
 msgstr "Cuadrado, sin alias"
 
-#: effects/ToneGen.cpp:327 effects/ToneGen.cpp:363
+#: effects/ToneGen.cpp:321 effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
 msgstr "Frecuencia (Hz)"
 
-#: effects/ToneGen.cpp:354
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "Forma de onda:"
 
-#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Comienzo"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr "Hertzio de comienzo de frecuencia"
 
-#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Fin"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr "Hertzio de fin de frecuencia"
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr "Comienzo de amplitud"
 
-#: effects/ToneGen.cpp:372
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr "Fin de amplitud"
+
+#: effects/ToneGen.cpp:365
 msgid "Interpolation:"
 msgstr "Interpolación:"
 
@@ -5306,11 +5657,11 @@ msgstr "Chirp..."
 msgid "Tone..."
 msgstr "Tono..."
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
 msgstr "Generando chirp"
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "Generando tono"
 
@@ -5318,183 +5669,180 @@ msgstr "Generando tono"
 msgid "All tracks must have the same sample rate"
 msgstr "Todas las pistas deben tener la misma frecuencia de muestreo"
 
-#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
-msgstr "Truncar silencio"
+msgstr "Truncado de silencio"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "de Lynn Allan"
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr "Duración máxima del silencio:"
 
-#: effects/TruncSilence.cpp:349 prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:193
+#: effects/TruncSilence.cpp:348 prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199 prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "milisegundos"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr "Umbral de silencio:"
 
-#: effects/TruncSilence.cpp:376
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr "   La duración debe ser de al menos 1 milisegundo"
 
 #: effects/TruncSilence.h:28
 msgid "Truncate Silence..."
-msgstr "Truncar silencio..."
+msgstr "Truncado de silencio..."
 
-#: effects/TruncSilence.h:36
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr "Truncando silencio..."
 
-#: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Los efectos VST no pueden ser aplicados en pistas estéreo donde los canales "
-"individuales de la pista no coinciden."
+#: effects/VST/VSTEffect.cpp:172
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Los efectos VST no pueden ser aplicados en pistas estéreo donde los canales individuales de la pista no coinciden."
 
-#: effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
 msgstr "No se puede realizar el reemplazo"
 
-#: effects/VST/VSTEffect.cpp:403
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "Parámetros de los complementos VST:"
 
 #: effects/Wahwah.cpp:61
 #, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"Efecto aplicado: frecuencia %s = %.1f Hz, fase inicial = %.0f grad, "
-"profundidad= %.0f% %, resonancia = %.1f, desplazamiento de frecuencia= %.0f%%"
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "Efecto aplicado: frecuencia %s = %.1f Hz, fase inicial = %.0f grad, profundidad= %.0f% %, resonancia = %.1f, desplazamiento de frecuencia= %.0f%%"
 
-#: effects/Wahwah.cpp:72
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah de Nasca Octavian Paul"
-
-#: effects/Wahwah.cpp:253
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
 msgstr "Profundidad (%):"
 
-#: effects/Wahwah.cpp:269
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "Resonancia:"
 
-#: effects/Wahwah.cpp:285
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr "Resonancia"
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
 msgstr "Desplazamiento de la frecuencia Wah (%):"
 
-#: effects/Wahwah.h:34
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr "Desplazamiento de la frecuencia Wah en porcentaje"
+
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "Wahwah..."
 
-#: effects/Wahwah.h:42
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "Aplicando Wahwah"
 
-#: effects/audiounits/AudioUnitEffect.cpp:133
-#: effects/ladspa/LadspaEffect.cpp:169
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176 effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "Aplicando efecto: %s"
 
-#: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
-msgstr ""
-"Los complementos de efectos no pueden ser aplicados en pistas estéreo donde "
-"los canales individuales de la pista no coinciden."
+#: effects/ladspa/LadspaEffect.cpp:196 effects/lv2/LV2Effect.cpp:211
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Los complementos de efectos no pueden ser aplicados en pistas estéreo donde los canales individuales de la pista no coinciden."
 
-#: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
+#: effects/ladspa/LadspaEffect.cpp:580 effects/ladspa/LadspaEffect.cpp:588
 #: prefs/GUIPrefs.cpp:51 prefs/QualityPrefs.cpp:72
 msgid "None"
 msgstr "Ninguno"
 
-#: effects/ladspa/LadspaEffect.cpp:575 effects/vamp/VampEffect.cpp:384
+#: effects/ladspa/LadspaEffect.cpp:582 effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "Autor: "
 
-#: effects/ladspa/LadspaEffect.cpp:608
+#: effects/ladspa/LadspaEffect.cpp:615 effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "Configuración del efecto"
 
-#: effects/ladspa/LadspaEffect.cpp:699
+#: effects/ladspa/LadspaEffect.cpp:710 effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834 effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
 msgstr "Longitud (segundos)"
 
-#: effects/nyquist/Nyquist.cpp:252
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr "Duración de nota (segundos)"
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr "Velocidad de nota"
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr "Clave de nota"
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "Aplicando efecto Nyquist..."
 
-#: effects/nyquist/Nyquist.cpp:259 effects/nyquist/Nyquist.cpp:321
+#: effects/nyquist/Nyquist.cpp:264 effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Comando Nyquist..."
 
-#: effects/nyquist/Nyquist.cpp:322
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
 msgstr "Introduzca comando Nyquist: "
 
-#: effects/nyquist/Nyquist.cpp:412
+#: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
-msgstr ""
-"No se puede aplicar el efecto en pistas estéreo donde las pistas no "
-"coinciden."
+msgstr "No se puede aplicar el efecto en pistas estéreo donde las pistas no coinciden."
 
-#: effects/nyquist/Nyquist.cpp:440
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Nyquist"
 
-#: effects/nyquist/Nyquist.cpp:441
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
 msgstr "Salida Nyquist: "
 
-#: effects/nyquist/Nyquist.cpp:598 effects/nyquist/Nyquist.cpp:609
+#: effects/nyquist/Nyquist.cpp:603 effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
 msgstr "Nyquist devolvió el valor:"
 
-#: effects/nyquist/Nyquist.cpp:651
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
 msgstr "Nyquist no devolvió audio.\n"
 
-#: effects/nyquist/Nyquist.cpp:662
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist devolvió demasiados canales de audio.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:86
 #, c-format
 msgid "Extracting features: %s"
 msgstr "Extrayendo características: %s"
 
-#: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Los complementos Vamp no pueden ser aplicados en pistas estéreo donde los "
-"canales individuales de la pista no coinciden."
+#: effects/vamp/VampEffect.cpp:117
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Los complementos Vamp no pueden ser aplicados en pistas estéreo donde los canales individuales de la pista no coinciden."
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:131
 msgid "Sorry, failed to load Vamp Plug-in."
 msgstr "Fallo al cargar el complemento Vamp."
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:239
 msgid "Sorry, Vamp Plug-in failed to initialize."
 msgstr "Fallo al inicializar el complemento Vamp."
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:387
 msgid " - Vamp audio analysis plugin"
 msgstr " - Complemento de análisis de audio Vamp"
 
@@ -5502,78 +5850,80 @@ msgstr " - Complemento de análisis de audio Vamp"
 msgid "Plugin Settings"
 msgstr "Configuración de complemento"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:442 effects/vamp/VampEffect.cpp:448
 msgid "Program"
 msgstr "Programa"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr ""
-"No se han seleccionado pistas Utilice Ctrl+A (Seleccionar todo)\n"
-"Seleccione Exportar... para exportar todas las pistas."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr "Todo el audio seleccionado está silenciado."
 
-#: export/Export.cpp:451
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr "Todo el audio está silenciado."
+
+#: export/Export.cpp:522
 msgid "Export File"
 msgstr "Exportar archivo"
 
-#: export/Export.cpp:459
+#: export/Export.cpp:530
 msgid "&Options..."
 msgstr "&Opciones..."
 
-#: export/Export.cpp:485
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
 msgstr "¿Está seguro de que desea guardar el archivo como \""
 
-#: export/Export.cpp:501
+#: export/Export.cpp:591
 #, c-format
 msgid ""
 "You are about to save a %s file with the name \"%s\".\n"
 "\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
 msgstr ""
 "Va a guardar un archivo %s con el nombre \"%s\".\n"
 "\n"
-"Estos archivos suelen acabar con \".%s\", y alguno programas no abrirán "
-"archivos con una extensión no estándar.\n"
+"Estos archivos suelen acabar con \".%s\", y alguno programas no abrirán archivos con una extensión no estándar.\n"
 "\n"
 "¿Está seguro de que desea guardar el archivo con ese nombre?"
 
-#: export/Export.cpp:522
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "Ya existe un archivo llamado \"%s\".  ¿Desea sobreescribirlo?"
 
-#: export/Export.cpp:604
+#: export/Export.cpp:710
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "Las pistas serán mezcladas en dos canales estéreo en el archivo exportado."
 
-#: export/Export.cpp:609
+#: export/Export.cpp:715
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
 msgstr "Las pistas serán mezcladas en un solo canal mono en el archivo exportado."
 
-#: export/Export.cpp:619
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr "Opciones avanzadas de mezclado"
 
-#: export/Export.cpp:821
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
 msgstr "Canal: %2d"
 
-#: export/Export.cpp:945
+#: export/Export.cpp:1046
 msgid " - Left"
 msgstr " - Izquierdo"
 
-#: export/Export.cpp:946
+#: export/Export.cpp:1047
 msgid " - Right"
 msgstr " - Derecho"
 
-#: export/Export.cpp:976 export/Export.cpp:1021
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr "Panel mezclador"
+
+#: export/Export.cpp:1078 export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "Canales de salida: %2d"
@@ -5596,42 +5946,598 @@ msgstr "Mostrar salida"
 
 #: export/ExportCL.cpp:87
 #, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
-msgstr ""
-"Los datos serán enviados a la entrada estándar. \"%f\" serán reemplazados "
-"con el nombre de archivo de salida seleccionado."
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "Los datos serán enviados a la entrada estándar. \"%f\" serán reemplazados con el nombre de archivo de salida seleccionado."
 
-#: export/ExportCL.cpp:220
+#: export/ExportCL.cpp:222
 msgid "(external program)"
 msgstr "Usar un programa externo"
 
-#: export/ExportCL.cpp:250 export/ExportPCM.cpp:367
+#: export/ExportCL.cpp:253 export/ExportPCM.cpp:454
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "No se puede exportar audio a %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Exportar"
-
-#: export/ExportCL.cpp:324
+#: export/ExportCL.cpp:327
 msgid "Exporting the selected audio using command-line encoder"
-msgstr ""
-"Exportando el audio seleccionado utilizando el codificador de línea de "
-"comandos"
+msgstr "Exportando el audio seleccionado utilizando el codificador de línea de comandos"
 
-#: export/ExportCL.cpp:325
+#: export/ExportCL.cpp:328
 msgid "Exporting the entire project using command-line encoder"
-msgstr ""
-"Exportando el proyecto completo utilizando el codificador de línea de "
-"comandos"
+msgstr "Exportando el proyecto completo utilizando el codificador de línea de comandos"
 
-#: export/ExportCL.cpp:389
+#: export/ExportCL.cpp:390
 msgid "Command Output"
 msgstr "Salida de comando"
 
+#: export/ExportFFmpeg.cpp:59
+msgid ""
+"Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+"Se necesita contar con FFmpeg correctamente configurado.\n"
+"Puede configurarlo en Preferencias->Importar/Exportar."
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid ""
+"FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+"FFmpeg no puede encontrar el codec de audio 0x%x.\n"
+"Probablemente se ha realizado la compilación sin soporte para el."
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr "Se intentó exportar %d canales, pero el número máximo de canales para el formato seleccionado es de %d"
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr "Exportando audio seleccionado como %s"
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr "Exportando el proyecto completo como %s"
+
+#: export/ExportFFmpeg.cpp:702 export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "Frecuencia de muestreo inválida"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid ""
+"The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+"La frecuencia de muestreo del proyecto (%d) no está soportada por el\n"
+"formato de archivo de salida actual."
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid ""
+"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+"La frecuencia de muestra del proyecto (%d) combinada con la velocidad\n"
+"de transferencia (%d kbps) no está soportada por el formato de archivo de salida actual."
+
+#: export/ExportFFmpeg.cpp:721 export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "Puede volver a muestrear a una de las frecuencias indicadas."
+
+#: export/ExportFFmpeg.cpp:749 export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "Frecuencias de muestreo"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "Especificar opciones AC3"
+
+#: export/ExportFFmpegDialogs.cpp:114
+msgid "AC3 Export Setup"
+msgstr "Opciones de exportación AC3"
+
+#: export/ExportFFmpegDialogs.cpp:118 export/ExportFFmpegDialogs.cpp:236
+#: export/ExportFFmpegDialogs.cpp:302 export/ExportFFmpegDialogs.cpp:370
+#: export/ExportFFmpegDialogs.cpp:919 export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Velocidad de transferencia:"
+
+#: export/ExportFFmpegDialogs.cpp:159
+msgid "Specify AAC Options"
+msgstr "Especificar opciones AAC"
+
+#: export/ExportFFmpegDialogs.cpp:172
+msgid "AAC Export Setup"
+msgstr "Opciones de exportación a AAC"
+
+#: export/ExportFFmpegDialogs.cpp:211
+msgid "Specify AMR-NB Options"
+msgstr "Especificar opciones AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:232
+msgid "AMR-NB Export Setup"
+msgstr "Opciones de exportación a AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:277
+msgid "Specify AMR-WB Options"
+msgstr "Especificar opciones AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:298
+msgid "AMR-WB Export Setup"
+msgstr "Opciones de exportación a AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:345
+msgid "Specify WMA Options"
+msgstr "Especificar opciones WMA"
+
+#: export/ExportFFmpegDialogs.cpp:366
+msgid "WMA Export Setup"
+msgstr "Opciones de exportación a WMA"
+
+#: export/ExportFFmpegDialogs.cpp:494
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "¿Sobreescribir valores predefinidos '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:495
+msgid "Confirm Overwrite"
+msgstr "Confirmar sobreescritura"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr "Seleccione el formato antes de guardar un perfil"
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr "Seleccione el codec antes de guardar un perfil"
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr "Los valores predefinidos '%s' no existen."
+
+#: export/ExportFFmpegDialogs.cpp:788
+msgid "Specify Other Options"
+msgstr "Especificar otras opciones"
+
+#: export/ExportFFmpegDialogs.cpp:879
+msgid "Preset:"
+msgstr "Predefinido:"
+
+#: export/ExportFFmpegDialogs.cpp:880
+msgid "Load Preset"
+msgstr "Cargar predefinidos"
+
+#: export/ExportFFmpegDialogs.cpp:881
+msgid "Save Preset"
+msgstr "Guardar predefinidos"
+
+#: export/ExportFFmpegDialogs.cpp:882
+msgid "Delete Preset"
+msgstr "Borrar predefinidos"
+
+#: export/ExportFFmpegDialogs.cpp:883
+msgid "Import Presets"
+msgstr "Importar predefinidos"
+
+#: export/ExportFFmpegDialogs.cpp:884
+msgid "Export Presets"
+msgstr "Exportar predefinidos"
+
+#: export/ExportFFmpegDialogs.cpp:889
+msgid "Format:"
+msgstr "Formato:"
+
+#: export/ExportFFmpegDialogs.cpp:891
+msgid "Codec:"
+msgstr "Codec:"
+
+#: export/ExportFFmpegDialogs.cpp:895
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr "No todos los formatos y codecs son compatibles. Algunas combinaciones de (como la velocidad de transferencia y la frecuencia de muestra) parámetros no son compatibles con algunos codecs."
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Format selector:"
+msgstr "Selector de formato:"
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Codec selector:"
+msgstr "Selector de codec:"
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Show All Formats"
+msgstr "Mostrar todos los formatos"
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Show All Codecs"
+msgstr "Mostrar todos los codecs"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr "Opciones"
+
+#: export/ExportFFmpegDialogs.cpp:913 prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Idioma:"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid ""
+"ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+"Código de lenguaje de tres letras ISO 639\n"
+"Opcional\n"
+"vacío - automático"
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Tag:"
+msgstr "Etiqueta:"
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid ""
+"Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+"Etiqueta de código (FOURCC)\n"
+"Opcional\n"
+"vacío - automático"
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid ""
+"Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+"Velocidad de transferencia (bits/segundo) - influye en el tamaño y calidad\n"
+"del archivo resultante. Algunos codec pueden aceptar sólo valores específicos \n"
+"(128k, 192k, 256k, etc.)\n"
+"0 - automático.\n"
+"Recomendado - 192000"
+
+#: export/ExportFFmpegDialogs.cpp:922 export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Calidad:"
+
+#: export/ExportFFmpegDialogs.cpp:923
+msgid ""
+"Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+"Cualidad general, empleada por diferentes codec\n"
+"Requerida para vorbis\n"
+"0 - automática -1 - desactivado (utilice en su lugar la velocidad de transferencia)"
+
+#: export/ExportFFmpegDialogs.cpp:925
+msgid "Sample Rate:"
+msgstr "Frecuencia de muestreo:"
+
+#: export/ExportFFmpegDialogs.cpp:926
+msgid ""
+"Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+"Frecuencia de muestreo (Hz)\n"
+"0 -No modificar la frecuencia de muestreo"
+
+#: export/ExportFFmpegDialogs.cpp:928
+msgid "Cutoff Bandwidth:"
+msgstr "Ancho de banda útil:"
+
+#: export/ExportFFmpegDialogs.cpp:929
+msgid ""
+"Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+"Ancho de banda útil de audio (Hz)\n"
+"Opcional\n"
+"0 - automático\n"
+
+#: export/ExportFFmpegDialogs.cpp:931
+msgid "Profile:"
+msgstr "Perfil:"
+
+#: export/ExportFFmpegDialogs.cpp:933
+msgid ""
+"AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+"Perfil AAC\n"
+"Baja complejidad -predeterminado\n"
+"La mayoría de los reproductores no reproducirán otro tipo de perfil"
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr "Usar Buffer de bit (Bit Reservoir)"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr "Usar longitud de bloque variable"
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr "Opciones FLAC"
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Compression Level:"
+msgstr "Nivel de compresión:"
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid ""
+"Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+"Nivel de compresión\n"
+"Requerido para FLAC\n"
+"-1 - automático\n"
+"min - 0 (codificación,  rápida, archivos resultantes grandes)\n"
+"max - 10 (codificación lenta, archivos resultantes pequeños)"
+
+#: export/ExportFFmpegDialogs.cpp:950
+msgid "Frame Size:"
+msgstr "Tamaño de fotograma:"
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid ""
+"Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+"Tamaño de fotograma\n"
+"Opcional\n"
+"0 - predeterminado\n"
+"min - 16\n"
+"max - 65535"
+
+#: export/ExportFFmpegDialogs.cpp:953
+msgid "LPC coefficients precision"
+msgstr "Precisión de coeficientes LPC"
+
+#: export/ExportFFmpegDialogs.cpp:954
+msgid ""
+"LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+"Precisión de coeficientes LPC Opcional\n"
+"0 - predeterminado\n"
+"min - 1\n"
+"max - 15"
+
+#: export/ExportFFmpegDialogs.cpp:956
+msgid "Minimal prediction order"
+msgstr "Orden mínimo de predicción"
+
+#: export/ExportFFmpegDialogs.cpp:957
+msgid ""
+"Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+"Orden mínimo de predicción\n"
+"Opcional\n"
+"-1 - predeterminado\n"
+"min - 0\n"
+"max - 32 (con LPC) o 4 (sin LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:959
+msgid "Maximal prediction order"
+msgstr "Orden máximo de predicción"
+
+#: export/ExportFFmpegDialogs.cpp:960
+msgid ""
+"Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+"Orden máximo de predicción\n"
+"Opcional\n"
+"-1 - predeterminado\n"
+"min - 0\n"
+"max - 32 (con LPC) o 4 (sin LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:962
+msgid "Prediction Order Method:"
+msgstr "Método de orden de predicción"
+
+#: export/ExportFFmpegDialogs.cpp:964
+msgid ""
+"Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+"Método de orden de predicción\n"
+"Estimativo - el más rápido, la menor compresión\n"
+"Búsqueda logarítmica - el más lento, la mejor compresión\n"
+"Búsqueda completa - predeterminado"
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Minimal partition order"
+msgstr "Orden mínimo de partición"
+
+#: export/ExportFFmpegDialogs.cpp:967
+msgid ""
+"Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+"Orden mínimo de partición\n"
+"Opcional\n"
+"-1 - predeterminado\n"
+"min - 0\n"
+"max - 8"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Maximal partition order"
+msgstr "Orden máximo de partición"
+
+#: export/ExportFFmpegDialogs.cpp:970
+msgid ""
+"Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+"Orden máximo de partición\n"
+"Opcional\n"
+"-1 - predeterminado\n"
+"min - 0\n"
+"max - 8"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr "Usar LPC"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr "Opciones de contendor MPEG"
+
+#: export/ExportFFmpegDialogs.cpp:983
+msgid "Mux Rate:"
+msgstr "Frecuencia de multiplexado:"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid ""
+"Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+"Máxima velocidad de transferencia del flujo multiplexado\n"
+"Opcional\n"
+"0 - predeterminado"
+
+#: export/ExportFFmpegDialogs.cpp:986
+msgid "Packet Size:"
+msgstr "Tamaño de paquete:"
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid ""
+"Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+"Tamaño de paquete:\n"
+"Opcional\n"
+"0 - predeterminado"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr "No puede borrar an valor predefinido sin nombre"
+
+#: export/ExportFFmpegDialogs.cpp:1201
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr "¿Eliminar valor predefinido '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:1220
+msgid "You can't save a preset without name"
+msgstr "No puede guardar un valor predefinido con ese nombre"
+
+#: export/ExportFFmpegDialogs.cpp:1259
+msgid "Select xml file with presets to import"
+msgstr "Seleccione un archivo xml con valores predefinidos a importar"
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Archivos Xml (*.xml)|*.xml|Todos los archivos (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1274
+msgid "Select xml file to export presets into"
+msgstr "Seleccione un archivo xml para exportar los valores predefinidos"
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr "Fallo al averiguar el formato"
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr "Fallo al buscar el codec"
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "Archivos M4A (AAC) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "Archivos AC3 (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr "Archivos AMR (banda estrecha) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr "Archivos AMR (banda ancha) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "Archivos WMA (version 2) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "Exportar FFmpeg personalizado"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr "Baja complejidad"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr "Perfil principal"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr "2 niveles"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr "4 niveles"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr "8 niveles"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr "Estimado"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr "Búsqueda completa"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr "Búsqueda logarítmica"
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Especificar opciones FLAC"
@@ -5692,15 +6598,15 @@ msgstr "Nivel:"
 msgid "Bit depth:"
 msgstr "Profundidad de bit:"
 
-#: export/ExportFLAC.cpp:208
+#: export/ExportFLAC.cpp:210
 msgid "FLAC Files"
 msgstr "Archivos FLAC"
 
-#: export/ExportFLAC.cpp:310
+#: export/ExportFLAC.cpp:313
 msgid "Exporting the selected audio as FLAC"
 msgstr "Exportando el audio seleccionado como un archivo FLAC"
 
-#: export/ExportFLAC.cpp:311
+#: export/ExportFLAC.cpp:314
 msgid "Exporting the entire project as FLAC"
 msgstr "Exportando el proyecto completo como un archivo FLAC"
 
@@ -5712,30 +6618,24 @@ msgstr "Especificar opciones MP2"
 msgid "MP2 Export Setup"
 msgstr "Opciones de exportación a MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Velocidad de transferencia:"
-
-#: export/ExportMP2.cpp:200
+#: export/ExportMP2.cpp:202
 msgid "MP2 Files"
 msgstr "Archivos MP2"
 
-#: export/ExportMP2.cpp:229
+#: export/ExportMP2.cpp:232
 msgid "Cannot export MP2 with this sample rate and bit rate"
-msgstr ""
-"No se puede exportar a MP2 con esta frecuencia de muestreo y velocidad de "
-"transferencia"
+msgstr "No se puede exportar a MP2 con esta frecuencia de muestreo y velocidad de transferencia"
 
-#: export/ExportMP2.cpp:240 export/ExportMP3.cpp:1768 export/ExportOGG.cpp:183
+#: export/ExportMP2.cpp:243 export/ExportMP3.cpp:1771 export/ExportOGG.cpp:186
 msgid "Unable to open target file for writing"
 msgstr "No se puede abrir el archivo de destino para escritura"
 
-#: export/ExportMP2.cpp:271
+#: export/ExportMP2.cpp:274
 #, c-format
 msgid "Exporting selected audio at %d kbps"
 msgstr "Exportando el audio seleccionado a %d kbps"
 
-#: export/ExportMP2.cpp:272
+#: export/ExportMP2.cpp:275
 #, c-format
 msgid "Exporting entire file at %d kbps"
 msgstr "Exportando el proyecto completo a %d kbps"
@@ -5831,116 +6731,83 @@ msgstr "Localizar Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity necesita el archivo %s para crear MP3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Ubicación de %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Para buscar %s, haga clic aquí -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Explorar..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Para obtener una copia gratuita de Lame, haga clic aquí -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Descargar..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "¿Dónde está %s?"
-
-#: export/ExportMP3.cpp:1094
 msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
+"You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
 msgstr ""
-"Sólo lame_enc.dll|lame_enc.dll|Bibliotecas enlazadas dinámicamente (*.dll)|*."
-"dll|Todos los archivos (*.*)|*"
+"Está enlazando con un lame_enc.dll v%d.%d. Esta versión no es compatible con Audacity %d.%d.%d.\n"
+"Descargue la última versión disponible de la biblioteca LAME MP3."
+
+#: export/ExportMP3.cpp:1094
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Sólo lame_enc.dll|lame_enc.dll|Bibliotecas enlazadas dinámicamente (*.dll)|*.dll|Todos los archivos (*.*)|*"
 
 #: export/ExportMP3.cpp:1550
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
-msgstr ""
-"Solo libmp3lame.dylib|libmp3lame.dylib|Bibliotecas dinámicas (*.dylib)|*."
-"dylib|Todos los archivos (*.*)|*"
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Solo libmp3lame.dylib|libmp3lame.dylib|Bibliotecas dinámicas (*.dylib)|*.dylib|Todos los archivos (*.*)|*"
 
 #: export/ExportMP3.cpp:1567
-msgid ""
-"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"Sólo libmp3lame.so|libmp3lame.so|Archivos de objeto compartido primario (*."
-"so)|*.so|Bibliotecas extendidas (*.so*)|*.so*|Todos los archivos (*)|*"
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Sólo libmp3lame.so|libmp3lame.so|Archivos de objeto compartido primario (*.so)|*.so|Bibliotecas extendidas (*.so*)|*.so*|Todos los archivos (*)|*"
 
-#: export/ExportMP3.cpp:1650
+#: export/ExportMP3.cpp:1652
 msgid "MP3 Files"
 msgstr "Archivos MP3"
 
-#: export/ExportMP3.cpp:1673
+#: export/ExportMP3.cpp:1676
 msgid "Could not open MP3 encoding library!"
 msgstr "No se ha podido abrir la biblioteca de codificación de MP3"
 
-#: export/ExportMP3.cpp:1680
+#: export/ExportMP3.cpp:1683
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "No es una biblioteca de codificación MP3 soportada"
 
-#: export/ExportMP3.cpp:1757
+#: export/ExportMP3.cpp:1760
 msgid "Unable to initialize MP3 stream"
 msgstr "No se puede inicializar el flujo MP3"
 
-#: export/ExportMP3.cpp:1799
+#: export/ExportMP3.cpp:1802
 #, c-format
 msgid "Exporting selected audio with %s preset"
 msgstr "Exportando audio seleccionado con preferencias %s"
 
-#: export/ExportMP3.cpp:1800
+#: export/ExportMP3.cpp:1803
 #, c-format
 msgid "Exporting entire file with %s preset"
 msgstr "Exportando archivo completo con preferencias %s"
 
-#: export/ExportMP3.cpp:1805
+#: export/ExportMP3.cpp:1808
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
 msgstr "Exportando audio seleccionado con calidad VBR %s"
 
-#: export/ExportMP3.cpp:1806
+#: export/ExportMP3.cpp:1809
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
 msgstr "Exportando archivo completo con calidad VBR %s"
 
-#: export/ExportMP3.cpp:1811
+#: export/ExportMP3.cpp:1814
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
 msgstr "Exportando audio seleccionado a %d kbps"
 
-#: export/ExportMP3.cpp:1812
+#: export/ExportMP3.cpp:1815
 #, c-format
 msgid "Exporting entire file at %d Kbps"
 msgstr "Exportando audio completo a %d kbps"
 
-#: export/ExportMP3.cpp:1845
+#: export/ExportMP3.cpp:1849
 #, c-format
 msgid "Error %d returned from MP3 encoder"
 msgstr "Error %d devuelto del codificador de MP3"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Frecuencia de muestreo inválida"
-
-#: export/ExportMP3.cpp:1931
+#: export/ExportMP3.cpp:1933
 #, c-format
 msgid ""
 "The project sample rate (%d) is not supported by the MP3\n"
@@ -5949,7 +6816,7 @@ msgstr ""
 "La frecuencia de muestreo del proyecto (%d) no está soportada por el\n"
 "formato de archivo MP3.  "
 
-#: export/ExportMP3.cpp:1934
+#: export/ExportMP3.cpp:1936
 #, c-format
 msgid ""
 "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
@@ -5958,118 +6825,109 @@ msgstr ""
 "La frecuencia de muestra del proyecto (%d) combinada con la velocidad\n"
 "de transferencia (%d kbps) no está soportada por el formato de archivo MP3.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Puede volver a muestrear a una de las frecuencias indicadas."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr "Biblioteca de exportación MP3 no encontrada"
 
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Frecuencias de muestreo"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "No se encontró un complemento para exportar a MP3"
-
-#: export/ExportMultiple.cpp:95 export/ExportMultiple.cpp:374
-#: export/ExportMultiple.cpp:598 export/ExportMultiple.cpp:765
+#: export/ExportMultiple.cpp:96 export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667 export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "Exportación múltiple"
 
-#: export/ExportMultiple.cpp:164
+#: export/ExportMultiple.cpp:166
 msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
+"If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
 msgstr ""
-"Si tiene más de una pista de audio puede exportar cada pista en un archivo "
-"independiente,\n"
-"o si tiene una pista de etiqueta puede exportar a un archivo independiente "
-"por cada etiqueta.\n"
+"Si tiene más de una pista de audio puede exportar cada pista en un archivo independiente,\n"
+"o si tiene una pista de etiqueta puede exportar a un archivo independiente por cada etiqueta.\n"
 "\n"
-"Este proyecto no tiene pistas múltiples ni pistas de etiqueta, así que no "
-"puede realizar una exportación múltiple."
+"Este proyecto no tiene pistas múltiples ni pistas de etiqueta, así que no puede realizar una exportación múltiple."
 
-#: export/ExportMultiple.cpp:165
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
 msgstr "No se puede realizar una exportación múltiple"
 
-#: export/ExportMultiple.cpp:200
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "Exportar formato:"
 
-#: export/ExportMultiple.cpp:207
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
 msgstr "Opciones..."
 
-#: export/ExportMultiple.cpp:210
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "Exportar ubicación:"
 
-#: export/ExportMultiple.cpp:216 prefs/DirectoriesPrefs.cpp:92
+#: export/ExportMultiple.cpp:245 prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: export/ExportMultiple.cpp:217
+#: export/ExportMultiple.cpp:246
 msgid "Create"
 msgstr "Crear"
 
-#: export/ExportMultiple.cpp:224
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "Dividir archivos basados en:"
 
-#: export/ExportMultiple.cpp:234
+#: export/ExportMultiple.cpp:262 export/ExportMultiple.cpp:264
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: export/ExportMultiple.cpp:239
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
 msgstr "Incluir audio antes de la primera etiqueta"
 
-#: export/ExportMultiple.cpp:245
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "Primer nombre del archivo:"
 
-#: export/ExportMultiple.cpp:258
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr "Primer nombre del archivo"
+
+#: export/ExportMultiple.cpp:288 export/ExportMultiple.cpp:290
 msgid "Tracks"
 msgstr "Pistas"
 
-#: export/ExportMultiple.cpp:265
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
 msgstr "Asignar nombre a archivos:"
 
-#: export/ExportMultiple.cpp:275
+#: export/ExportMultiple.cpp:306 export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
 msgstr "Uso de nombre de etiqueta  o pista"
 
-#: export/ExportMultiple.cpp:282
+#: export/ExportMultiple.cpp:314 export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
 msgstr "Numerando secuencialmente"
 
-#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "Prefijo del nombre de archivo:"
 
-#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr "Prefijo del nombre de archivo"
+
+#: export/ExportMultiple.cpp:341
 msgid "Overwrite existing files"
 msgstr "Sobreescribir archivos existentes"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&xportar"
-
-#: export/ExportMultiple.cpp:372
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr "\"%s\" creada con éxito."
 
-#: export/ExportMultiple.cpp:381
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
 msgstr "Seleccione una carpeta para guardar los archivos exportados"
 
-#: export/ExportMultiple.cpp:470
+#: export/ExportMultiple.cpp:539
 #, c-format
 msgid ""
 "\"%s\" doesn't exist.\n"
@@ -6080,28 +6938,27 @@ msgstr ""
 "\n"
 "¿Desea crearlo?"
 
-#: export/ExportMultiple.cpp:568 export/ExportMultiple.cpp:703
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
 msgid "Edit metadata"
 msgstr "Editar metadato"
 
-#: export/ExportMultiple.cpp:595 export/ExportMultiple.cpp:762
+#: export/ExportMultiple.cpp:664 export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
 msgstr "Se han exportado correctamente %d archivo(s)."
 
-#: export/ExportMultiple.cpp:596 export/ExportMultiple.cpp:763
+#: export/ExportMultiple.cpp:665 export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Se ha producido un error tras exportar %d archivos."
 
-#: export/ExportMultiple.cpp:825
+#: export/ExportMultiple.cpp:881
 #, c-format
 msgid ""
 "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
 msgstr ""
-"La etiqueta %s no es un nombre de archivo permitido. No puede utilizar:    %"
-"s\n"
+"La etiqueta %s no es un nombre de archivo permitido. No puede utilizar:    %s\n"
 "Utilice..."
 
 #: export/ExportOGG.cpp:64
@@ -6112,77 +6969,126 @@ msgstr "Especificar opciones Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Opciones de exportación Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Calidad:"
-
-#: export/ExportOGG.cpp:155
+#: export/ExportOGG.cpp:157
 msgid "Ogg Vorbis Files"
 msgstr "Archivos Ogg Vorbis"
 
-#: export/ExportOGG.cpp:254
+#: export/ExportOGG.cpp:257
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "Exportando el audio seleccionado como Ogg Vorbis"
 
-#: export/ExportOGG.cpp:255
+#: export/ExportOGG.cpp:258
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Exportando el proyecto completo como Ogg Vorbis"
 
-#: export/ExportPCM.cpp:115
+#: export/ExportPCM.cpp:113
 msgid "Specify Uncompressed Options"
 msgstr "Especificar opciones de datos sin comprimir"
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:182
 msgid "Uncompressed Export Setup"
 msgstr "Opciones de exportación de datos sin comprimir"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Formato:"
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:188
 msgid "Header:"
 msgstr "Tipo:"
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:192 import/ImportRaw.cpp:366
 msgid "Encoding:"
 msgstr "Codificación:"
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:197
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(No todas las combinaciones de tipo de cabecera y codificación son posibles)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF y otros tipos de datos sin comprimir"
+#: export/ExportPCM.cpp:366
+msgid "Other uncompressed files"
+msgstr "Otros archivos sin comprimir"
+
+#: export/ExportPCM.cpp:358
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr "AIFF (Apple) PCM de 16 bit con signo"
+
+#: export/ExportPCM.cpp:348
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr "WAV (Microsoft) PCM de 16 bit con signo"
 
-#: export/ExportPCM.cpp:361
+#: export/ExportPCM.cpp:384
+msgid "GSM 6.10 WAV (mobile)"
+msgstr "GSM 6.10 WAV (dispositivos móviles)"
+
+#: export/ExportPCM.cpp:446
 msgid "Cannot export audio in this format."
 msgstr "No se puede exportar audio en este formato."
 
-#: export/ExportPCM.cpp:401
+#: export/ExportPCM.cpp:488
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr "Exportando el audio seleccionado como %s"
 
-#: export/ExportPCM.cpp:403
+#: export/ExportPCM.cpp:490
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr "Exportando el proyecto completo como %s"
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:437
+#: export/ExportPCM.cpp:528
 #, c-format
 msgid "Error (file may not have been written): %s"
 msgstr "Error (el archivo puede no haber sido escrito): %s"
 
-#: import/Import.cpp:155
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr "No hay opciones para este formato.\n"
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr "Si necesita más control sobre el formato de exportación utilice el formato 'Otros archivos sin comprimir'."
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr "El archivo se exportará como un archivo AIFF de 16 bits (Apple/SGI).\n"
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr "El archivo se exportará como un archivo WAV de 16 bits (Microsoft).\n"
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr "El archivo se exportará como un archivo WAV GSM 6.10.\n"
+
+#: import/Import.cpp:156 import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "Archivos MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr "Seleccione flujo(s) a importar"
+
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Esta versión de Audacity no fue compilada con soporte para %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid ""
+"\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+"\"%s\" \n"
+"es un archivo MIDI, no un archivo de audio. \n"
+"Audacity no puede abrir este tipo de archivo para escucharlo, pero puede \n"
+"editarlo pulsando en Archivo > Importar > MIDI."
+
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:168
+#: import/Import.cpp:250
 #, c-format
 msgid ""
 "\"%s\" is an audio CD track. \n"
@@ -6195,21 +7101,18 @@ msgstr ""
 "Extraiga las pistas del CD a un formato de audio que \n"
 "pueda ser importado con Audacity, como WAV o AIFF."
 
-#: import/Import.cpp:174
+#: import/Import.cpp:256
 #, c-format
 msgid ""
 "\"%s\" is a playlist file. \n"
-"Audacity cannot open this file because it only contains links to other "
-"files. \n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
 "\"%s\" es una archivo de lista de reproducción. \n"
-"Audacity no puede abrir este archivo porque sólo contiene enlaces a otros "
-"archivos. \n"
+"Audacity no puede abrir este archivo porque sólo contiene enlaces a otros archivos. \n"
 "Podría abrirlo con un editor de texto y descargar el archivo de audio real."
 
-#: import/Import.cpp:179
+#: import/Import.cpp:261
 #, c-format
 msgid ""
 "\"%s\" is a Windows Media Audio file. \n"
@@ -6217,11 +7120,10 @@ msgid ""
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 "\"%s\" es un archivo de Windows Media Audio. \n"
-"Audacity no puede abrir este tipo de archivo por restricciones en su "
-"patente. \n"
+"Audacity no puede abrir este tipo de archivo por restricciones en su patente. \n"
 "Necesita convertirlo a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:184
+#: import/Import.cpp:266
 #, c-format
 msgid ""
 "\"%s\" is an Advanced Audio Coding file. \n"
@@ -6232,23 +7134,22 @@ msgstr ""
 "Audacity no puede abrir este tipo de archivo. \n"
 "Necesita convertirlo a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
 msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+"\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
-"\"%s\" es un archivo de audio encriptado. Estos suelen provenir de una "
-"tienda de música online. \n"
+"\"%s\" es un archivo de audio encriptado. \n"
+"Estos suelen provenir de una tienda de música online. \n"
 "Audacity no puede abrir este tipo de archivo porque están encriptados. \n"
 "Intente grabar el archivo en Audacity, o grabarlo en un CD de audio para\n"
-"posteriormente extraer la pista de CD a un formato de audio soportado como "
-"WAV o AIFF."
+"posteriormente extraer la pista de CD a un formato de audio soportado como WAV o AIFF."
 
-#: import/Import.cpp:194
+#: import/Import.cpp:276
 #, c-format
 msgid ""
 "\"%s\" is a RealPlayer media file. \n"
@@ -6259,19 +7160,7 @@ msgstr ""
 "Audacity no puede abrir este formato propietario. \n"
 "Necesita convertirlo a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" es un archivo MIDI, no un archivo de audio. \n"
-"Audacity no puede abrir este tipo de archivo para escucharlo o editarlo, "
-"pero puede \n"
-"mostrarlo pulsando en Archivo > Importar > MIDI."
-
-#: import/Import.cpp:206
+#: import/Import.cpp:282
 #, c-format
 msgid ""
 "\"%s\" is a notes-based file, not an audio file. \n"
@@ -6284,24 +7173,22 @@ msgstr ""
 "Internet convertirlo en un archivo de audio como WAV o AIFF y \n"
 "entonces impórtelo o grábelo en Audacity."
 
-#: import/Import.cpp:212
+#: import/Import.cpp:288
 #, c-format
 msgid ""
 "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
-"and try importing it again. Otherwise you need to convert it to a supported "
-"audio \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
 msgstr ""
 "\"%s\" es un archivo de audio Musepack. \n"
 "Audacity no puede abrir este tipo de archivo. \n"
-"Si piensa que podría ser un archivo MP3, renómbrelo para que finalice con \"."
-"mp3\" \n"
+"Si piensa que podría ser un archivo MP3, renómbrelo para que finalice con \".mp3\" \n"
 " e intente importarlo de nuevo. De otro modo necesitará convertirlo \n"
 "a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:218
+#: import/Import.cpp:294
 #, c-format
 msgid ""
 "\"%s\" is a Wavpack audio file. \n"
@@ -6312,7 +7199,7 @@ msgstr ""
 "Audacity no puede abrir este tipo de archivo. \n"
 "Necesita convertirlo a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:224
+#: import/Import.cpp:300
 #, c-format
 msgid ""
 "\"%s\" is a Dolby Digital audio file. \n"
@@ -6323,7 +7210,7 @@ msgstr ""
 "Audacity no puede abrir este tipo de archivo. \n"
 "Necesita convertirlo a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:230
+#: import/Import.cpp:306
 #, c-format
 msgid ""
 "\"%s\" is an Ogg Speex audio file. \n"
@@ -6334,256 +7221,293 @@ msgstr ""
 "Audacity no puede abrir este tipo de archivo. \n"
 "Necesita convertirlo a un formato de audio soportado, como WAV o AIFF."
 
-#: import/Import.cpp:253
+#: import/Import.cpp:312
+#, c-format
 msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+"\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity debe adivinar el tipo de archivo.\n"
-"Este paso puede producir un audio incorrecto.\n"
-"\n"
-"Si el audio no se escucha bien intente renombrar el archivo\n"
-"para que tenga la extensión correcta antes de abrirlo."
+"\"%s\" es un archivo de vídeo. \n"
+"Audacity no puede abrir este tipo de archivo. \n"
+"Necesita extraer su audio a un formato soportado, como WAV o AIFF."
 
-#: import/Import.cpp:269
+#: import/Import.cpp:317
+#, c-format
 msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+"Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
 msgstr ""
-"Audacity no reconoce este tipo de archivo.\n"
-"Si está descomprimido, intente importarlo usando \"Importar archivo en bruto"
-"\""
+"Audacity no reconoce este tipo de archivo '%s'.\n"
+"Si es audio sin compresión, intente importarlo usando \"Importar datos en bruto\"."
 
-#: import/ImportFLAC.cpp:35
+#: import/Import.cpp:322
+#, c-format
+msgid ""
+"Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+"Audacityreconoce el tipo de archivo '%s',\n"
+"pero no ha conseguido importarlo."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "Archivos compatibles con FFmpeg"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr "Índice[%02x] Codec[%S], Idioma[%S], Velocidad de transferencia[%S], Canales[%d], Duración[%d]"
+
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "Archivos FLAC"
 
-#: import/ImportLOF.cpp:92
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
 msgstr "Lista de archivos en formato de texto básico"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:318
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
 msgstr "Límite de ventana no válido en archivo LOF."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:320 import/ImportLOF.cpp:341 import/ImportLOF.cpp:415
-#: import/ImportLOF.cpp:435
+#: import/ImportLOF.cpp:316 import/ImportLOF.cpp:337 import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
 msgstr "Error de LOF"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:339
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
 msgstr "Duración no válida en archivo LOF."
 
-#: import/ImportLOF.cpp:414
+#: import/ImportLOF.cpp:417
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
-msgstr ""
-"Las pistas MIDI no pueden ser trasladadas individualmente, sólo se puede "
-"hacer con los archivos de audio."
+msgstr "Las pistas MIDI no pueden ser trasladadas individualmente, sólo se puede hacer con los archivos de audio."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:434
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
 msgstr "Desplazamiento de pista no válido en archivo LOF."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Error al analizar archivo Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": Nombre de archivo demasiado corto."
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Error al analizar archivo MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "No se ha podido abrir el archivo "
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "archivos MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": Tipo de archivo incorrecto."
 
-#: import/ImportOGG.cpp:36
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
-msgstr "archivos Ogg Vorbis"
+msgstr "Archivos Ogg Vorbis"
 
-#: import/ImportOGG.cpp:142
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
-msgstr "Error de lectura del medio"
+msgstr "Error de lectura"
 
-#: import/ImportOGG.cpp:145
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "No es un archivo Ogg Vorbis"
 
-#: import/ImportOGG.cpp:148
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
 msgstr "Diferencia de la versión de Vorbis"
 
-#: import/ImportOGG.cpp:151
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
 msgstr "Tipo inválido para un flujo de bits Vorbis"
 
-#: import/ImportOGG.cpp:154
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
 msgstr "Fallo de lógica interna"
 
-#: import/ImportPCM.cpp:396
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF y otros tipos de datos sin comprimir"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importando archivo %s..."
+msgid "Importing %s"
+msgstr "Importando %s"
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Archivos QuickTime"
 
-#: import/ImportRaw.cpp:278
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr "Importar datos en bruto"
+
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Importar archivo en bruto"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:337
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "Sin endianness"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:340
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "Little-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:343
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "Big-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:346
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "Endianness predeterminado"
 
-#: import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
 msgstr "1 Canal (Mono)"
 
-#: import/ImportRaw.cpp:371
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
 msgstr "2 Canales (estéreo)"
 
-#: import/ImportRaw.cpp:373
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
 msgstr "%d canales"
 
-#: import/ImportRaw.cpp:386
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr "Orden de byte:"
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "Canales:"
+
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
 msgstr "Desplazamiento inicial:"
 
-#: import/ImportRaw.cpp:397
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
 msgstr "Cantidad a importar:"
 
-#: import/ImportRaw.cpp:408
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
 msgstr "Frecuencia de muestreo:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importar"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr "Importación completa. Calculando la forma de onda"
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr "Decodificando la forma de onda"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr "%s %2.0f%% completado.  Haga clic para cambiar el foco de la tarea."
 
 #: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44 prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "Audio E/S"
 
-#: prefs/AudioIOPrefs.cpp:100
+#: prefs/AudioIOPrefs.cpp:102 prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (Mono)"
 
-#: prefs/AudioIOPrefs.cpp:101
+#: prefs/AudioIOPrefs.cpp:103 prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (Estéreo)"
 
-#: prefs/AudioIOPrefs.cpp:115
+#: prefs/AudioIOPrefs.cpp:117 prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "Reproducción"
 
-#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
+#: prefs/AudioIOPrefs.cpp:121 prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118 prefs/MidiIOPrefs.cpp:136
 #: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
 msgstr "Dispositivo"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:124 prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
 msgstr "Usando:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:125 prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
 msgstr "Portaudio v"
 
-#: prefs/AudioIOPrefs.cpp:133
+#: prefs/AudioIOPrefs.cpp:135 prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "Grabación"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:141 prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
 msgstr "Canales"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:147 prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr "Reproducir a través"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Reproducir otras pistas mientras se graba una nueva"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "Remezclar: &Reproducir otras pistas mientras se graba una nueva"
 
-#: prefs/AudioIOPrefs.cpp:150
+#: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
-msgstr ""
-"Reproducción a través del &hardware: Reproducir la pista mientras se está "
-"grabando"
+msgstr "Reproducción a través del &hardware: Reproducir la pista mientras se está grabando"
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
-msgstr ""
-"Reproducción a través del &software: Reproducir la pista mientras se está "
-"grabando"
+msgstr "Reproducción a través del &software: Reproducir la pista mientras se está grabando"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
-msgstr ""
-"Reproducción a través del &software: Reproducir la pista mientras se está "
-"grabando (desactivado cuando se está grabando \"mezcla estéreo\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "Reproducción a través del &software: Reproducir la pista mientras se está grabando o visualizando"
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr "(desactivar cuando se graba \"mezcla estéreo\")"
 
-#: prefs/AudioIOPrefs.cpp:162
+#: prefs/AudioIOPrefs.cpp:168 prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr "Vista previa de efectos"
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
 msgstr "Longitud de la vista previa:"
 
-#: prefs/AudioIOPrefs.cpp:170
+#: prefs/AudioIOPrefs.cpp:176 prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr "Vista previa del corte"
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
-msgstr "Vista previa antes de la zona de corte:"
+msgstr "Vista previa antes cortar zona:"
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
-msgstr "Vista previa después de la zona de corte:"
+msgstr "Vista previa después cortar zona:"
 
-#: prefs/AudioIOPrefs.cpp:183
+#: prefs/AudioIOPrefs.cpp:189 prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr "Latencia"
 
-#: prefs/AudioIOPrefs.cpp:189
+#: prefs/AudioIOPrefs.cpp:195
 msgid ""
 "Audio to buffer:\n"
 "(higher = more latency)"
@@ -6591,7 +7515,7 @@ msgstr ""
 "Audio a buffer:\n"
 "(mayores = más latencia)"
 
-#: prefs/AudioIOPrefs.cpp:192
+#: prefs/AudioIOPrefs.cpp:198
 msgid ""
 "Latency correction:\n"
 "(negative = backwards)"
@@ -6599,15 +7523,15 @@ msgstr ""
 "Corrección de latencia:\n"
 "(negativos=hacia atrás)"
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr "Buscar tiempo mientras se reproduce"
 
-#: prefs/AudioIOPrefs.cpp:200
+#: prefs/AudioIOPrefs.cpp:206 prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr "Periodo corto:"
 
-#: prefs/AudioIOPrefs.cpp:202
+#: prefs/AudioIOPrefs.cpp:208 prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr "Periodo largo:"
 
@@ -6619,7 +7543,7 @@ msgstr "Secuencia"
 msgid "Behaviors"
 msgstr "Comportamientos"
 
-#: prefs/BatchPrefs.cpp:80 prefs/GUIPrefs.cpp:129
+#: prefs/BatchPrefs.cpp:80
 msgid "&Don't apply effects in batch mode"
 msgstr "No ap&licar efectos en modo de secuencia"
 
@@ -6628,7 +7552,7 @@ msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "Modo de limpi&eza de locución (interfaz personalizado)"
 
 #: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:279
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Carpetas"
 
@@ -6665,8 +7589,8 @@ msgid "Audio cache"
 msgstr "Caché de audio"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Mantener los datos grabados en memoria hasta que la grabación finalice"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr "Reproducir y/o grabar utilizando la RAM (útil para discos lentos, pero puede no funcionar con archivos o grabaciones demasiado largas)"
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6687,96 +7611,98 @@ msgid "Directory %s is not writable"
 msgstr "La carpeta %s no tiene permiso de escritura"
 
 #: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
-msgstr ""
-"Los cambios de la carpeta temporal no tendrán efecto hasta que se reinicie "
-"Audacity"
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "Los cambios de la carpeta temporal no tendrán efecto hasta que se reinicie Audacity"
 
-#: prefs/FileFormatPrefs.cpp:48 prefs/FileFormatPrefs.cpp:49
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
 msgid "Import / Export"
 msgstr "Importar / Exportar"
 
-#: prefs/FileFormatPrefs.cpp:77
+#: prefs/FileFormatPrefs.cpp:84
 msgid "MP3 Export Library"
 msgstr "Biblioteca de exportación de MP3"
 
-#: prefs/FileFormatPrefs.cpp:80
+#: prefs/FileFormatPrefs.cpp:87
 msgid "MP3 Library Version:"
 msgstr "Versión de la biblioteca MP3:"
 
-#: prefs/FileFormatPrefs.cpp:86
+#: prefs/FileFormatPrefs.cpp:93
 msgid "MP3 Library:"
 msgstr "Biblioteca MP3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Buscar biblioteca"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr "&Ubicar..."
 
-#: prefs/FileFormatPrefs.cpp:91
+#: prefs/FileFormatPrefs.cpp:98
 msgid "LAME MP3 Library:"
 msgstr "Biblioteca LAME MP3:"
 
-#: prefs/FileFormatPrefs.cpp:94
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
 msgid "&Download"
 msgstr "&Descargar"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid ""
-"Note: Export quality options can be chosen by clicking the Options button in "
-"the Export dialog."
-msgstr ""
-"Nota: Las opciones de calidad de exportación pueden ser elegidas pulsando en "
-"el botón Opciones, en el cuadro de diálogo Exportar."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "Biblioteca de importación/exportación FFmpeg"
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "Versión de la biblioteca FFmpeg"
 
-#: prefs/FileFormatPrefs.cpp:100
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "Biblioteca FFmpeg:"
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Nota: Las opciones de calidad de exportación pueden ser elegidas pulsando en el botón Opciones, en el cuadro de diálogo Exportar.\n"
+
+#: prefs/FileFormatPrefs.cpp:137
 msgid "When importing audio files"
 msgstr "Cuando se importa archivos de audio"
 
-#: prefs/FileFormatPrefs.cpp:103
+#: prefs/FileFormatPrefs.cpp:140
 msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr "&Hacer una copia del archivo de audio descomprimido antes de editar (más seguro)"
 
-#: prefs/FileFormatPrefs.cpp:104
+#: prefs/FileFormatPrefs.cpp:141
 msgid "&Read uncompressed audio files directly from the original (faster)"
-msgstr ""
-"Lee&r directamente desde el archivo de audio descomprimido original (más "
-"rápido)"
+msgstr "Lee&r directamente desde el archivo de audio descomprimido original (más rápido)"
 
-#: prefs/FileFormatPrefs.cpp:106
+#: prefs/FileFormatPrefs.cpp:143
 msgid "&Normalize all tracks in project"
 msgstr "&Normalizar todas las pistas del proyecto"
 
-#: prefs/FileFormatPrefs.cpp:111
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
 msgstr "Cuando se guarda un proyecto que depende de otros archivos de audio"
 
-#: prefs/FileFormatPrefs.cpp:114
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
 msgstr "&Copiar siempre todo el audio dentro del proyecto (el más seguro)"
 
-#: prefs/FileFormatPrefs.cpp:115
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
 msgstr "&No copiar ninguna parte del audio"
 
-#: prefs/FileFormatPrefs.cpp:116
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
 msgstr "&Preguntar al usuario"
 
-#: prefs/FileFormatPrefs.cpp:120
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
 msgstr "Cuando se exportan pistas a un archivo de audio"
 
-#: prefs/FileFormatPrefs.cpp:123
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
 msgstr "Mezcl&ar siempre todas las pistas de canales estéreo o mono"
 
-#: prefs/FileFormatPrefs.cpp:124
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr "&Utilice mezcla personalizada (por ejemplo para exportar un archivo multicanal 5.1)"
 
-#: prefs/FileFormatPrefs.cpp:126
+#: prefs/FileFormatPrefs.cpp:163
 msgid "S&how Metadata Editor prior to export step"
 msgstr "&Mostrar el editor de metadatos antes de realizar la exportación"
 
@@ -6801,15 +7727,15 @@ msgid "&Update display while playing"
 msgstr "Act&ualizar pantalla mientras se reproduce"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
-msgstr "Cerrar la última ventana finaliza completamente Audacity"
+msgid "Cl&osing last window quits Audacity"
+msgstr "C&errar la última ventana finaliza completamente Audacity"
 
 #: prefs/GUIPrefs.cpp:98
 msgid "Enable &dragging of left and right selection edges"
 msgstr "Permitir arrastre de los bor&des izquierdo y derecho de la selección"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr "Orden &ergonómico de los botones de E/S de audio"
 
 #: prefs/GUIPrefs.cpp:102
@@ -6817,10 +7743,8 @@ msgid "Automatically &fit tracks vertically zoomed"
 msgstr "A&justar automáticamente las pistas acercadas verticalmente"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-"\"Mover la pista seleccionada\" se repite &cíclicamente a través de las "
-"pistas"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"Mover la pista seleccionada\" se repite &cíclicamente a través de las pistas"
 
 #: prefs/GUIPrefs.cpp:106
 msgid "Editing a &clip can move other clips"
@@ -6847,17 +7771,21 @@ msgid "Show warnings about &temp files"
 msgstr "Mostrar advertencias sobre archivos &temporales"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr "&Pedir confirmación al guardar, incluso si el proyecto está vacío"
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
-msgstr "Mostrar el mensaje de bienvenida al comenzar"
+msgid "Show &Welcome Message at program start up"
+msgstr "Mostrar el me&nsaje de bienvenida al comenzar"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Modos"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr "No a&plicar efectos en modo de secuencia"
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Mostrar  el rango mínimo: medidores y''Forma de onda (dB)'"
@@ -6890,39 +7818,15 @@ msgstr "-145 dB (rango PCM de muestras de 24 bit)"
 msgid "Default View Mode"
 msgstr "Modo de vista predeterminado"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "WaveformDisplay"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "WaveformDBDisplay"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "SpectrumDisplay"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "SpectrumLogDisplay"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "PitchDisplay"
-
-#: prefs/GUIPrefs.cpp:166
+#: prefs/GUIPrefs.cpp:164
 msgid "Other interface choices"
 msgstr "Otras opciones de espacio de trabajo"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Idioma:"
-
-#: prefs/GUIPrefs.cpp:169
+#: prefs/GUIPrefs.cpp:167
 msgid "Help:"
 msgstr "Ayuda:"
 
-#: prefs/GUIPrefs.cpp:170
+#: prefs/GUIPrefs.cpp:168
 msgid "Solo Button:"
 msgstr "Botón de sólo:"
 
@@ -6930,6 +7834,14 @@ msgstr "Botón de sólo:"
 msgid "Keyboard"
 msgstr "Teclado"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr "Las preferencias de teclado no están disponibles en este momento."
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr "Abra un nuevo proyecto para modificar los atajos de teclado."
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Atajos de teclado"
@@ -6940,9 +7852,7 @@ msgstr "&Establecer"
 
 #: prefs/KeyConfigPrefs.cpp:120
 msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
-msgstr ""
-"Nota: Pulsando Cmd+Q se cerrará el programa. El resto de las teclas son "
-"válidas."
+msgstr "Nota: Pulsando Cmd+Q se cerrará el programa. El resto de las teclas son válidas."
 
 #: prefs/KeyConfigPrefs.cpp:124 prefs/ThemePrefs.cpp:105
 msgid "&Defaults"
@@ -6956,25 +7866,19 @@ msgstr "Combinación de teclas"
 msgid "Export Keyboard Shortcuts As:"
 msgstr "Exportar accesos directos de teclado como:"
 
-#: prefs/KeyConfigPrefs.cpp:181
+#: prefs/KeyConfigPrefs.cpp:183
 msgid "Error saving keyboard shortcuts"
 msgstr "Error al guardar accesos directos de teclado"
 
-#: prefs/KeyConfigPrefs.cpp:196
+#: prefs/KeyConfigPrefs.cpp:198
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
-msgstr ""
-"Seleccione un archivo XML que contenga accesos directos de teclado de "
-"Audacity..."
-
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Archivos Xml (*.xml)|*.xml|Todos los archivos (*.*)|*.*"
+msgstr "Seleccione un archivo XML que contenga accesos directos de teclado de Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:213
+#: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
 msgstr "Error al cargar accesos directos de teclado"
 
-#: prefs/KeyConfigPrefs.cpp:241
+#: prefs/KeyConfigPrefs.cpp:243
 #, c-format
 msgid ""
 "The keyboard shortcut '%s' is already assigned to:\n"
@@ -6985,10 +7889,46 @@ msgstr ""
 "\n"
 "'%s'"
 
-#: prefs/KeyConfigPrefs.cpp:367 toolbars/EditToolBar.cpp:144
+#: prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "Deshacer"
 
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "&Reproducir otras pistas mientras se graba una nueva"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "Reproducción a través del &hardware (Reproducir la pista mientras se está grabando)"
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "Reproducción a través del &software (Reproducir la pista mientras se está grabando)"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr "Reproducir antes de cortar zona:"
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr "Reproducir después de cortar zona:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "Archivo a buffer:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "Corrección de latencia:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr "Buscar tiempo"
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr "Reproducir mientras se realiza la vista previa:"
+
 #: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Ratón"
@@ -7195,7 +8135,7 @@ msgstr "Ctrl-Rueda del ratón"
 msgid "Zoom in or out"
 msgstr "Ampliar o reducir"
 
-#: prefs/PrefsDialog.cpp:89
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
 msgstr "Preferencias de Audacity"
 
@@ -7259,17 +8199,17 @@ msgstr "Tiempo real:"
 msgid "High-quality:"
 msgstr "Alta calidad:"
 
-#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37 prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
 msgstr "Grabación inteligente"
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Pausar grabación en silencios"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr "Grabación de activación por sonido"
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Nivel de silencio (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr "Nivel de activación de sonido (dB):"
 
 #: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
@@ -7424,8 +8364,7 @@ msgstr ""
 "ImageCacheVxx.png usando un editor de imágenes como \n"
 "Gimp.\n"
 "\n"
-"Haga clic en  \"Cargar caché de tema\" para cargar las imágenes cambiada y "
-"colores en Audacity.\n"
+"Haga clic en  \"Cargar caché de tema\" para cargar las imágenes cambiada y colores en Audacity.\n"
 "\n"
 "[Sólo la barra de herramientas de control y los colores  \n"
 "de las pistas de onda se verán afectadas, incluso cuando\n"
@@ -7465,51 +8404,47 @@ msgstr ""
 "es el mismo concepto.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Control"
-
-#: toolbars/ControlToolBar.cpp:174
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Pausa"
 
-#: toolbars/ControlToolBar.cpp:177
+#: toolbars/ControlToolBar.cpp:178
 msgid "Play"
 msgstr "Reproducir"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
 msgstr "Reproducir (Mayús para reproducir cíclicamente)"
 
-#: toolbars/ControlToolBar.cpp:182
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "Detener"
 
-#: toolbars/ControlToolBar.cpp:185
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
 msgstr "Saltar al comienzo"
 
-#: toolbars/ControlToolBar.cpp:188
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
 msgstr "Saltar al final"
 
-#: toolbars/ControlToolBar.cpp:194
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "Grabar (Mayús para añadir grabación)"
+
+#: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Limpieza de locución"
 
-#: toolbars/ControlToolBar.cpp:530 toolbars/ControlToolBar.cpp:844
+#: toolbars/ControlToolBar.cpp:540 toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr "Error al abrir el dispositivo de audio. "
 
-#: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
-msgstr ""
-"La grabación en modo Limpieza de locución no es posible cuando hay abierta "
-"una pista o más de un proyecto."
+#: toolbars/ControlToolBar.cpp:706
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "La grabación en modo Limpieza de locución no es posible cuando hay abierta una pista o más de un proyecto."
 
-#: toolbars/ControlToolBar.cpp:697
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "Grabación no permitida"
 
@@ -7530,30 +8465,34 @@ msgid "Silence selection"
 msgstr "Silenciar selección"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr "Enlazar pistas"
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: toolbars/EditToolBar.cpp:152
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "Reducir"
 
-#: toolbars/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
 msgstr "Ampliación anterior"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr "Ajustar selección"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "Ajustar selección a la ventana"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr "Ajustar proyecto"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
 msgstr "Ajustar el proyecto en la ventana"
 
@@ -7585,71 +8524,68 @@ msgstr "Medidor de nivel de salida"
 msgid "Input level meter - click to monitor input"
 msgstr "Medidor de nivel de entrada- haga clic para visualizar la entrada"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mezclador"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Volumen de salida"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+msgid "Slider Output"
 msgstr "Control de salida"
 
-#: toolbars/MixerToolBar.cpp:101
+#: toolbars/MixerToolBar.cpp:101 widgets/Meter.cpp:873
 msgid "Input Volume"
 msgstr "Volumen de entrada"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+msgid "Slider Input"
 msgstr "Control de entrada"
 
 #: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
 msgstr "Fuente de entrada"
 
-#: toolbars/SelectionBar.cpp:80
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr "Selección"
 
-#: toolbars/SelectionBar.cpp:128 toolbars/SelectionBar.cpp:185
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
 msgstr "Frecuencia del proyecto (Hz):"
 
-#: toolbars/SelectionBar.cpp:142 toolbars/SelectionBar.cpp:247
+#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
 msgstr "Comienzo de la selección:"
 
-#: toolbars/SelectionBar.cpp:155 toolbars/SelectionBar.cpp:253
+#: toolbars/SelectionBar.cpp:163 toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
 msgid "Length"
 msgstr "Longitud"
 
-#: toolbars/SelectionBar.cpp:165
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
 msgstr "oculto"
 
-#: toolbars/SelectionBar.cpp:175 toolbars/SelectionBar.cpp:264
+#: toolbars/SelectionBar.cpp:184 toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
 msgstr "Posición de audio:"
 
-#: toolbars/SelectionBar.cpp:225 toolbars/SelectionBar.cpp:230
+#: toolbars/SelectionBar.cpp:236 toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr "Ajuste a"
 
-#: toolbars/SelectionBar.cpp:252
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
 msgstr "Selección "
 
-#: toolbars/SelectionBar.cpp:317
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
 msgstr "Longitud de la selección"
 
-#: toolbars/SelectionBar.cpp:325
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
 msgstr "Final de la selección"
 
-#: toolbars/ToolBar.cpp:97
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr "Barra de herramientas %s"
@@ -7842,43 +8778,43 @@ msgstr "Cambios de dirección (umbral alto)"
 msgid "Key type"
 msgstr "Tipo de clave"
 
-#: widgets/AButton.cpp:302
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr " (deshabilitado)"
 
-#: widgets/AButton.cpp:452
+#: widgets/AButton.cpp:461
 msgid "Press"
 msgstr "Pulsar"
 
-#: widgets/AButton.cpp:531
+#: widgets/AButton.cpp:540
 msgid "Button"
 msgstr "Botón"
 
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: widgets/ASlider.cpp:604 widgets/Meter.cpp:212
+#: widgets/ASlider.cpp:612 widgets/Meter.cpp:247
 msgid "L"
 msgstr "L"
 
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: widgets/ASlider.cpp:607 widgets/Meter.cpp:214
+#: widgets/ASlider.cpp:615 widgets/Meter.cpp:249
 msgid "R"
 msgstr "R"
 
-#: widgets/ASlider.cpp:670
+#: widgets/ASlider.cpp:678
 msgid "Center"
 msgstr "Centro"
 
-#: widgets/ASlider.cpp:674
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "Izquierda"
 
-#: widgets/ASlider.cpp:677
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "Derecha"
 
-#: widgets/ErrorDialog.cpp:78 widgets/ErrorDialog.cpp:102
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
 msgstr "Ayuda"
 
@@ -7898,7 +8834,7 @@ msgstr "Avances"
 msgid "Backwards"
 msgstr "Restrocesos"
 
-#: widgets/ErrorDialog.cpp:249
+#: widgets/ErrorDialog.cpp:255
 msgid "Help on the Internet"
 msgstr "Ayuda en Internet"
 
@@ -7920,35 +8856,39 @@ msgstr "Fila %d"
 msgid "Empty"
 msgstr "Vacío"
 
-#: widgets/Meter.cpp:359
+#: widgets/Meter.cpp:395
 msgid "Enable Meter"
 msgstr "Habilitar medidor"
 
-#: widgets/Meter.cpp:361
+#: widgets/Meter.cpp:397
 msgid "Disable Meter"
 msgstr "Desactivar medidor"
 
-#: widgets/Meter.cpp:364
+#: widgets/Meter.cpp:400
 msgid "Stop Monitoring"
 msgstr "Detener monitorización"
 
-#: widgets/Meter.cpp:366
+#: widgets/Meter.cpp:402
 msgid "Start Monitoring"
 msgstr "Comenzar monitorización"
 
-#: widgets/Meter.cpp:370
+#: widgets/Meter.cpp:406
 msgid "Horizontal Stereo"
 msgstr "Estéreo horizontal"
 
-#: widgets/Meter.cpp:371
+#: widgets/Meter.cpp:407
 msgid "Vertical Stereo"
 msgstr "Estéreo vertical"
 
-#: widgets/Meter.cpp:388
+#: widgets/Meter.cpp:424
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: widgets/Meter.cpp:1078
+#: widgets/Meter.cpp:875
+msgid "Mix Volume"
+msgstr "Mezcla de volumen"
+
+#: widgets/Meter.cpp:1144
 msgid ""
 "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7960,11 +8900,11 @@ msgstr ""
 "baja (30 por segundo o menos), para que la calidad de audio\n"
 "no se vea afectada por la presentación del medidor."
 
-#: widgets/Meter.cpp:1079
+#: widgets/Meter.cpp:1145
 msgid "Meter refresh rate per second [1-100]: "
 msgstr "Actualización por segundos del medidor [1-100]: "
 
-#: widgets/Meter.cpp:1080
+#: widgets/Meter.cpp:1146
 msgid "Meter Preferences"
 msgstr "Preferencias de medición"
 
@@ -7972,7 +8912,23 @@ msgstr "Preferencias de medición"
 msgid " Please select an action "
 msgstr "Seleccione una acción "
 
-#: widgets/Ruler.cpp:1478 widgets/Ruler.cpp:1479
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "Seleccione una acción"
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr "Tiempo transcurrido:"
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr "Tiempo restante:"
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: widgets/Ruler.cpp:1445 widgets/Ruler.cpp:1446
 msgid "Vertical Ruler"
 msgstr "Regla vertical"
 
@@ -7983,12 +8939,6 @@ msgstr "Regla vertical"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 segundos"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -8014,6 +8964,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 días 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr "hh:mm:ss + centésimas"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr "0100 h 060 m 060.0100 s"
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8182,9 +9147,7 @@ msgstr "01000,01000 fotogramas|75"
 
 #: widgets/TimeTextCtrl.cpp:451
 msgid "Use right mouse button or context key to change format"
-msgstr ""
-"Utilice el botón derecho del ratón o la tecla de contexto para cambiar el "
-"formato"
+msgstr "Utilice el botón derecho del ratón o la tecla de contexto para cambiar el formato"
 
 #: widgets/TimeTextCtrl.cpp:1485
 msgid "Time Control"
@@ -8201,8 +9164,8 @@ msgstr "No se ha podido abrir el archivo: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Error: %hs en la línea %d"
+msgid "Error: %hs at line %lu"
+msgstr "Error: %hs en la línea %lu"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/eu.po b/locale/eu.po
index 5041b2e..f3faa65 100644
--- a/locale/eu.po
+++ b/locale/eu.po
@@ -20,36 +20,24 @@ msgstr "Project-Id-Version: audacity.eu\n"
 msgid "&About Audacity..."
 msgstr "&Audacity-ri buruz..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Gaituta"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Programaren eraikitze-data:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity doako programa da eta mundu osoko garatzaile boluntarioen talde batek idatzi du. Koordinazioa posible da SourceForge.net-i esker; hori iturburu irekiko software-proiektuei tresnak doan hornitzen dizkien lineako zerbitzua da. Audacity Windows 98an eta berriagoan, Mac OS Xn, Linux-Len, eta inux-en antzeko beste sistema eragileetan erabil daiteke.  Audacity-ren bertsio zaharragoak Mac OS 9an erabil daitezke."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Hau programaren beta bertsioa da.  Hainbat errore eta amaitu gabeko eginbide izan ditzake. Zure oharren mende gaude; beraz, bisitatu gure web gunea eta eman erroreen eta eginbide-eskaeren berri."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Hau Audacity-ren banaketa egonkorra eta osatua da. Baina, errore bat aurkitzen baduzu edo iradokizun bat baduzu, jarri gurekin harremanetan. Erabiltzaileen iradokizunak beharrezkoak ditugu Audacity hobetzen jarraitzeko. Informazio gehiago nahi izanez gero, bisitatu gure web gunea."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: ../src/AboutDialog.cpp:127 ../src/AboutDialog.cpp:129
@@ -59,13 +47,9 @@ msgstr "Hizkuntza Politikarako Sailburuordetza\n"
 "Iñaki Larrañaga Murgoitio\n"
 "<dooteo at euskalgnu.org>"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Audio-editore digital librea"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Informazioa"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -101,26 +85,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Eskerrik asko hauei:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Gaituta"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Programaren eraikitze-data:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371 ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Itxi"
-
 #: ../src/AudacityApp.cpp:304 ../src/Project.cpp:1770
 #, c-format
 msgid "%s is already open in another window."
@@ -320,12 +396,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -359,8 +436,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -408,6 +485,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -456,10 +537,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -674,16 +763,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Fitxategiari izena aldatu zaio: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "%s blokea aldatzen\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -812,6 +901,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Laukizuzena"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Non dago %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Maiztasunaren analisia"
@@ -837,8 +1013,8 @@ msgstr "Hobetutako autokorrelazioa"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -850,8 +1026,8 @@ msgstr "Tamaina"
 msgid " window"
 msgstr " leihoa"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -862,14 +1038,23 @@ msgstr "Maiztasun lineala"
 msgid "Log frequency"
 msgstr "Maiztasunaren logaritmoa"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371 ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Itxi"
+
 #: ../src/effects/Compressor.cpp:385 ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
 msgid "dB"
@@ -920,7 +1105,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Atzerapena (segundo)\tMaiztasuna (Hz)\tMaila"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -936,15 +1121,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -955,40 +1156,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1182,6 +1407,10 @@ msgstr "&Gorde proiektua\tKtrl+S"
 msgid "Save Project &As..."
 msgstr "Gorde proiektua &honela..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1190,6 +1419,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1218,10 +1451,26 @@ msgstr "Esportatu &etiketak..."
 msgid "Export &Multiple..."
 msgstr "Esportatu &hainbat..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1283,9 +1532,9 @@ msgstr "&Ezabatu\tKtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Isildu\tKtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1299,22 +1548,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1358,12 +1605,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1374,66 +1621,67 @@ msgstr "&Dena\tKtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "Hasiera kurtsorean"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Kurtsorea amaieran"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Bilatu zeroak\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Lekuz aldatu kurtsorea..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "hautapenaren hasierara"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "hautapenaren amaierara"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "pistaren hasierara"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "pistaren amaierara"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Gorde hautapena"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Berrezarri hautapena"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1452,9 +1700,14 @@ msgstr "Aktibatu 'Atxiki saretari'"
 msgid "Turn Grid Snap Off"
 msgstr "Desaktibatu 'Atxiki saretari'"
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Hobespenak...\tKtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1492,60 +1745,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Historia..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:578
+msgid "!Simplified View"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Salto egin hasierara\tEtxea"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Salto egin amaierara\tAmaiera"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1561,12 +1876,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Denbora-pista"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1581,6 +1892,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Ke&ndu pistak"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Lerrokatu &zerorekin"
@@ -1597,29 +1916,40 @@ msgstr "Lerrokatu hautapen-&hasierarekin"
 msgid "Align with Selection &End"
 msgstr "Lerrokatu hautapen-&amaierarekin"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Lerrokatu amaiera kurtsorearekin"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Lerrokatu amaiera hautapen-hasierarekin"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Lerrokatu amaiera hautapen-amaierarekin"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Lerrokatu pistak elkarrekin"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Lerrokatu pistak..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1632,22 +1962,26 @@ msgstr "Gehitu etiketa hautapenari\tKtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Gehitu etiketa erreproduzio-posizioari\tKtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Sortu"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Efe&ktua"
@@ -1681,6 +2015,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1693,12 +2031,12 @@ msgstr "&Exekutatu Benchmark..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1733,9 +2071,9 @@ msgstr "Hurrengo tresna\tD"
 msgid "Previous Tool\tA"
 msgstr "Aurreko tresna\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Erreproduzitu/Gelditu\tZuriune-barra"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1749,12 +2087,12 @@ msgstr "Pausarazi\tP"
 msgid "Record\tR"
 msgstr "Grabatu\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1769,22 +2107,14 @@ msgstr "Erreproduzitu hautapenera arte\tB"
 msgid "Play Looped\tL"
 msgstr "Erreproduzitu begiztan\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Erreproduzitu begiztan\tMaius+Zuriune-barra"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Salto egin hasierara\tEtxea"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Salto egin amaierara\tAmaiera"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Hautatu hasieraraino\tMaius+Etxea"
@@ -1841,8 +2171,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1941,14 +2271,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "Azken &fitxategiak..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2005,6 +2340,23 @@ msgstr "Errepikatu %s\tKtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Ez dago etiketa-pistarik esportatzeko."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Ez dago zer desegin"
@@ -2041,6 +2393,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Arbeletik itsatsita"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2207,9 +2563,9 @@ msgstr "Inportatu etiketak"
 msgid "Select a MIDI file..."
 msgstr "Hautatu MIDI fitxategi bat..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Fitxategi guztiak (*.*)|*.*|MIDI fitxategiak (*.mid)|*.mid|Allegro fitxategiak (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2228,12 +2584,6 @@ msgstr "Hautatu konprimitu gabeko edozein audio-fitxategi..."
 msgid "All files (*)|*"
 msgstr "Fitxategi guztiak (*)|*"
 
-#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Inportatu"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2265,6 +2615,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Lerrokatu zerorekin"
@@ -2301,6 +2655,14 @@ msgstr "Lerrokatuta"
 msgid "Align"
 msgstr "Lerrokatu"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Audio-pista berria sortu da"
@@ -2362,14 +2724,14 @@ msgstr "Kendu pista"
 msgid "Removed audio track(s)"
 msgstr "Kendutako audio-pista(k)"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2433,14 +2795,13 @@ msgstr "Grabatutako audioa"
 msgid "Save changes before closing?"
 msgstr "Aldaketak gorde nahi dituzu itxi aurretik?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2459,6 +2820,25 @@ msgstr "Hautatu audio-fitxategi bat edo gehiago..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821 ../src/Project.cpp:1829
 msgid "Error opening file"
 msgstr "Errorea fitxategia irekitzean"
@@ -2515,42 +2895,34 @@ msgstr "Fitxategia Audacity %s erabiliz gorde zen.\n"
 msgid "Can't open project file"
 msgstr "Ezin da proiektuaren fitxategia ireki"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Ezin izan da proiektua gorde. Agian %s(e)n ezin da idatzi,\n"
-"edo diskoa beteta dago."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148 ../src/Project.cpp:2160
 msgid "Error saving project"
@@ -2561,21 +2933,17 @@ msgstr "Errorea proiektua gordetzean"
 msgid "Saved %s"
 msgstr "%s gorde da"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Formaturik gabe"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "`%s' inportatu da"
 
+#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Inportatu"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Errorea inportatzean"
@@ -2588,15 +2956,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity proiektuko fitxategiei (.aup) esker, lantzen ari zaren guztia gorde dezakezu pantailan ageri den bezala, baina beste programa gehienek ezin dituzte Audacity proiektuko fitxategiak ireki.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Beste programek ireki dezaketen fitxategi bat gorde nahi duzunean, hautatu esportatzeko komandoetako bat."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2639,6 +3015,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Diskoan ez dago lekurik libre"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2721,43 +3107,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2797,8 +3152,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Iruzkinak"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2817,12 +3172,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2864,100 +3219,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "'%s' atributuaren gehienezko luzera %d karakterekoa da. Datuak trunkatu egin dira."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Titulua"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artista"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Albuma"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3022,8 +3296,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3058,6 +3375,10 @@ msgstr "Uhin-forma"
 msgid "Waveform (dB)"
 msgstr "Uhin-forma (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Soinu-garaiera (EAC)"
@@ -3188,13 +3509,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Lerratu"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Ez zaude behar bezain gertu. Handiagotu lagin indibidualak ikusi arte."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3276,6 +3597,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3332,14 +3661,6 @@ msgstr "Abiadura-aldaketa"
 msgid "Format Change"
 msgstr "Formatu-aldaketa"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Sartu lagintze-maiztasuna Hz-etan (segundoko) 1 eta 100.000 artean:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Abiadura baliogabea."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Aldatu beheko abiadura-muga (%) hona:"
@@ -3472,8 +3793,8 @@ msgstr "Pluginak 1(e)tik %i(e)ra"
 msgid "Plugins %i to %i"
 msgstr "Pluginak %i(e)tik %i(e)ra"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3495,8 +3816,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3517,14 +3838,19 @@ msgstr "Aplikatutako efektua: %s %.1f dB"
 msgid "Amplify"
 msgstr "Anplifikatu"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Anplifikatu Dominic Mazzoni-ren eskutik"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Anplifikazioa (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Anplitude-erpin berria (dB):"
@@ -3533,6 +3859,10 @@ msgstr "Anplitude-erpin berria (dB):"
 msgid "Allow clipping"
 msgstr "Onartu moztea"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Anplifikatu..."
@@ -3644,10 +3974,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Maiztasuna (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Nabarmendu (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3687,9 +4025,50 @@ msgstr "Vaughan Johnson eta Dominic Mazzoni-ren eskutik"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "SoundTouch erabiliz (Olli Parviainen)"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Soinu-garaiera:   hemendik:"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Tonuerdiak (urrats erdiak):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
 #: ../src/effects/ChangeSpeed.cpp:351 ../src/effects/ChangeTempo.cpp:223
@@ -3697,19 +4076,20 @@ msgstr "Soinu-garaiera:   hemendik:"
 msgid "to"
 msgstr "hona"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Tonuerdiak (urrats erdiak):"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Maiztasuna (Hz):   hemendik:"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
 #: ../src/effects/ChangeTempo.cpp:182
 msgid "Percent Change:"
 msgstr "Ehuneko-aldaketa:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Aldatu soinu-garaiera..."
@@ -3727,6 +4107,11 @@ msgstr "Aplikatutako efektua: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Aldatu abiadura"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "e/e"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Aldatu abiadura, tempoari eta soinu-garaierari eraginez"
@@ -3735,14 +4120,17 @@ msgstr "Aldatu abiadura, tempoari eta soinu-garaierari eraginez"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "SampleRate erabiliz (Erik de Castro Lopo)"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "e/e"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Binilozko RPM estandarra:   hemendik:"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3760,13 +4148,29 @@ msgstr "Aldatu tempoa"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Aldatu tempoa soinu-garaiera aldatu gabe"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Golpeak minutuko (BPM):   hemendik:"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Luzera (segundo):   hemendik:"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3776,8 +4180,8 @@ msgstr "Aldatu tempoa..."
 msgid "Changing Tempo"
 msgstr "Tempoa aldatzen"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3788,10 +4192,18 @@ msgstr "Zarata eta txinpartak kentzea, egilea Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Kendu zarata..."
@@ -3804,49 +4216,84 @@ msgstr "Klaskak eta txinpartak kentzea..."
 msgid "Dynamic Range Compressor"
 msgstr "Tarte dinamikoaren konpresorea"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Tarte dinamikoaren konpresorea Dominic Mazzoni-ren eskutik"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Ratioa: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Eraso-denbora: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizatu 0dB-ra konprimitu ondoren"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Atalasea: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Ratioa: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Ratioa: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Eraso-denbora: %.1f s"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3857,6 +4304,247 @@ msgstr "Konpresorea..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Tarte dinamikoaren konpresioa aplikatzen..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Informazioa"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3873,8 +4561,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Anplitudea (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4101,16 +4789,12 @@ msgstr "Alderantzikatu"
 msgid "Inverting"
 msgstr "Alderantzikatzen"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4122,31 +4806,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4157,6 +4845,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Phaser-a"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Kendu zarata"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4173,10 +5013,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4204,10 +5040,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Kendu zarata"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "1. urratsa"
@@ -4238,14 +5070,26 @@ msgstr "Eskuratu zarataren profila"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Kendu zarata..."
@@ -4280,22 +5124,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalizatu"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Kendu DC desplazamenduak (zentratu zeron bertikalki)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normalizatu..."
@@ -4309,42 +5153,54 @@ msgstr "Normalizatzea..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Aplikatutako efektua: %s %d fase, %.0f%% hezea, maiztasuna = %.1f Hz, hasierako fasea  = %.0f gradu, sakonera = %d, berrelikadura= %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Phaser-a"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser-a Nasca Octavian Paul-en eskutik"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Faseak:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "LEHORRA"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "HEZEA"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO Maiztasuna (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO hasierako fasea (graduak):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Sakonera:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Berrelikadura (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Phaser-a..."
@@ -4359,6 +5215,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4376,27 +5240,22 @@ msgstr "Pistak luzeegiak dira hautapena errepikatzeko."
 msgid "Repeat"
 msgstr "Errepikatu"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Errepikatu Dominic Mazzoni eta Vaughan Johnson-en eskutik"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Errepikapen-kopurua: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Hautapen-luzera berria: "
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutu, %d segundo"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundo"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4460,8 +5319,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4469,6 +5376,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Lineala"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4497,22 +5412,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Uhin-forma:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4539,10 +5460,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4588,10 +5505,6 @@ msgstr "Aplikatutako efektua: %s maiztasuna = %.1f Hz, hasierako fasea = %.0f gr
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah, Nasca Octavian Paul-en eskutik"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Sakonera (%):"
@@ -4600,10 +5513,18 @@ msgstr "Sakonera (%):"
 msgid "Resonance:"
 msgstr "Erresonantzia:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah maiztasunaren desplazamendua (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4639,6 +5560,18 @@ msgstr "Efektuaren ezarpenak"
 msgid "Length (seconds)"
 msgstr "Luzera (segundo)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist-en efektua aplikatzen..."
@@ -4704,9 +5637,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4760,6 +5696,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4795,10 +5735,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Ezin da audioa %s(e)ra esportatu"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Hautatutako audioa komando-lerroaren kodetzailea erabiliz esportatzea"
@@ -4811,6 +5747,477 @@ msgstr "Proiektu osoa komando-lerroaren kodetzailea erabiliz esportatzea"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bit-abiadura:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Hizkuntza:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML fitxategiak (*.xml)|*.xml|Fitxategi guztiak(*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4883,10 +6290,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4895,10 +6298,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bit-abiadura:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4907,10 +6306,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345 ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
 msgstr "Ezin da helburuko fitxategia idazteko ireki"
@@ -4935,44 +6330,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -4983,20 +6346,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5027,6 +6386,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Kalitatea"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5052,33 +6415,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Non dago %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5088,8 +6433,9 @@ msgstr "Soilik lame_enc.dll|lame_enc.dll|Dinamikoki estekatutako liburutegiak (*
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Soilik libmp3lame.so|libmp3lame.so|Objektu partekatuen lehen mailako fitxategiak (*.so)|*.so|Fitxategi hedatuak (*.so*)|*.so*|Fitxategi guztiak (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5108,10 +6454,6 @@ msgstr "MP3 kodeketa-liburutegia ez da baliozkoa edo ez da onartzen!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Editatu ID3 etiketak MP3 fitxategirako"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5147,10 +6489,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5163,18 +6501,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "MP3ra esportatzeko plugin-a ez da aurkitu"
-
 #: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
 msgid "Export Multiple"
@@ -5230,6 +6560,10 @@ msgstr "Txertatu audioa lehen etiketaren aurretik"
 msgid "First file name:"
 msgstr "Artxiboaren lehen izena:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Pistak"
@@ -5250,15 +6584,14 @@ msgstr "Jarraian zenbatzea"
 msgid "File name prefix:"
 msgstr "Artxiboaren aurrizkia:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Gainidatzi lehendik dauden fitxategiak"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5268,10 +6601,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Aukeratu esportatutako fitxategiak gordetzeko  kokalekua"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5279,6 +6608,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5289,6 +6622,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5297,10 +6636,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5313,22 +6648,14 @@ msgstr "Hautatutako audioa Ogg Vorbis gisa esportatzea"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Proiektu osoa Ogg Vorbis gisa esportatzea"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5344,8 +6671,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Goiburu- eta kodeketa-konbinazio guztiak\n"
 " ez dira posible.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5369,8 +6708,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Errorea (agian fitxategia ez da idatzi): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5378,6 +6745,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Audacity-ren bertsio hau ez da %s euskarriarekin konpilatu."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5408,9 +6783,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5423,19 +6799,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity-k ez du fitxategi honen mota ezagutu.\n"
-"Deskonprimitu gabe badago, saiatu inportatzen \"Inportatu formaturik gabe\" erabiliz"
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5471,16 +6899,17 @@ msgstr "MIDI pistak ezin dira indibidualki desplazatu, audio-fitxategiak bakarri
 msgid "Invalid track offset in LOF file."
 msgstr "Pista-desplazamendu baliogabea LOF fitxategian."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Errorea Allegro fitxategia analizatzean."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Errorea MIDI fitxategia analizatzean."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5507,15 +6936,23 @@ msgstr "Vorbis bitstream-erako goiburu baliogabea"
 msgid "Internal logic fault"
 msgstr "Barne-logikak huts egin du"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "%s fitxategia inportatzen..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Inportatu formaturik gabeko datuak"
@@ -5553,6 +6990,14 @@ msgstr "2 kanal (Estereo)"
 msgid "%d Channels"
 msgstr "%d kanal"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Hasierako desplazamendua:"
@@ -5565,8 +7010,17 @@ msgstr "Esportatu beharreko kopurua:"
 msgid "Sample rate:"
 msgstr "Lagintze-maiztasuna:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5610,10 +7064,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Erreproduzitu beste pista berri bat grabatu bitartean"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5623,8 +7076,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5651,12 +7108,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5684,21 +7143,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88 ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
 msgstr "Direktorioak"
@@ -5736,7 +7183,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5761,23 +7208,65 @@ msgstr "%s direktorioan ezin da idatzi"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Aldi baterako direktorioan egindako aldaketek ez dute eraginik izango Audacity berrabiarazi arte"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Egin fitxategiaren kopia bat editatu baino lehen (seguruagoa)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "MP3 liburutegiaren bertsioa:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Irakurri zuzenean jatorriko fitxategitik (azkarragoa)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5807,53 +7296,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "MP3 liburutegiaren bertsioa:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Interfazea"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Bilatu liburutegia"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Interfazea"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5868,6 +7352,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5876,25 +7364,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Hizkuntza:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "db moduan bistaratzeko gutxieneko bitartea"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5904,6 +7392,10 @@ msgstr "-36 dB (anplitude handian editatzeko bitartea)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (8 biteko laginen PCM bitartea)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (16 biteko laginen PCM bitartea)"
@@ -5916,10 +7408,34 @@ msgstr "-120 dB (gizakion entzumenaren gutxi gorabeherako muga)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (24 biteko laginen PCM bitartea)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Teklatua"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -5952,10 +7468,6 @@ msgstr "Errorea laster-teklak gordetzean"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Hautatu Audacity-ren laster-teklak dituen XML fitxategia..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML fitxategiak (*.xml)|*.xml|Fitxategi guztiak(*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Errorea laster-teklak kargatzean"
@@ -5971,6 +7483,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Desegin"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Erreproduzitu beste pista berri bat grabatu bitartean"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Sagua"
@@ -6184,10 +7733,6 @@ msgstr "Handiagotu edo txikiagotu zooma"
 msgid "Audacity Preferences"
 msgstr "Audacity-ren hobespenak"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Kalitatea"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Laukizuzena"
@@ -6252,12 +7797,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6276,6 +7821,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - lehenetsia"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - bandarik estuena"
@@ -6284,6 +7833,10 @@ msgstr "4096 - bandarik estuena"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6300,6 +7853,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Gehienezko maiztasuna (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Gehienezko maiztasunak osoko zenbakia izan behar du"
@@ -6316,6 +7889,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6388,10 +7969,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pausarazi"
@@ -6400,9 +7977,9 @@ msgstr "Pausarazi"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Erreproduzitu (Maius begizta erreproduzitzeko)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6416,6 +7993,10 @@ msgstr "Salto egin hasierara"
 msgid "Skip to End"
 msgstr "Salto egin amaierara"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6448,6 +8029,10 @@ msgstr "Ezabatu hautapenetik kanpokoa"
 msgid "Silence selection"
 msgstr "Isildu hautapena"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Handiagotu zooma"
@@ -6504,24 +8089,20 @@ msgstr "Irteerako metro-maila"
 msgid "Input level meter - click to monitor input"
 msgstr "Sarrerako maila - egin klik sarrera monitorizatzeko"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Irteerako bolumena"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Sarrerako bolumena"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6540,6 +8121,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6795,6 +8381,22 @@ msgstr "Eskuina"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6841,14 +8443,14 @@ msgstr "stereo horizontal"
 msgid "Vertical Stereo"
 msgstr "Estereo bertikala"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Lineala"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6868,6 +8470,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6876,10 +8494,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6892,6 +8506,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7005,11 +8634,10 @@ msgstr "Ez erakutsi abisu hau berriro"
 msgid "Could not open file: \"%s\""
 msgstr "Ezin izan da fitxategia ireki: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Errorea: %s %d lerroan"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/fi.po b/locale/fi.po
index d092ef4..4e077dc 100644
--- a/locale/fi.po
+++ b/locale/fi.po
@@ -1,54 +1,45 @@
 # translation of audacity.po to Finnish
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Audacity package.
 # Petri Vuorio <petri dot vuorio at musita dot savonia-amk dot fi>, 2004, 2005.
 # Petri Vuorio <use the form of forename dot surname at pvjulkaisut dot fi>, 2005.
-#
+# Elias Julkunenm, 2008.
+# 
 msgid ""
-msgstr "Project-Id-Version: Audacity 1.2.4\n"
-"POT-Creation-Date: 2005-10-21 01:19-0700\n"
-"PO-Revision-Date: 2005-10-27 13:38+0300\n"
-"Last-Translator: Petri Vuorio <use the form of forename dot surname at pvjulkaisut dot fi>\n"
-"Language-Team: Finnish\n"
+msgstr "Project-Id-Version: Audacity 1.3\n"
+"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-11-09 20:10+0000\n"
+"PO-Revision-Date: 2008-11-15 19:39+0200\n"
+"Last-Translator: Elias Julkunen <elias.julkunen at gmail.com>\n"
+"Language-Team: Finnish <fi at li.org>\n"
+"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"MIME-Version: 1.0\n"
-"X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
 
-#: ../src/Menus.cpp:529
+#: AboutDialog.cpp:143
+#: AudacityApp.cpp:807
+#: Menus.cpp:955
 msgid "&About Audacity..."
 msgstr "&Tietoja Audacitystä..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Käytössä"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
-msgstr ""
-
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Ohjelman käännöspäivä:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
-msgstr ""
+#: AboutDialog.cpp:157
+msgid "OK... Audacious!"
+msgstr "OK... Audacious!"
 
-#: AboutDialog.cpp:214
+#: AboutDialog.cpp:175
 #, fuzzy
-msgid "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."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr "Audacity on vapaa ohjelma, jonka on kehittänyt eri puolilta maailmaa koostuva vapaaehtoisten kehittäjien tiimi. Koordinointi toimii SourceForge.net online-palvelun ansiosta, joka tarjoaa ilmaiset työkalut avoimen lähdekoodin ohjelmaprojekteille. Audacity on saatavana Windows 98:lle ja sitä uudemmille, Mac OS X:lle, Linuxille sekä muille Unix-tyyppisille käyttöjärjestelmille. Vanhemmat Audacityn versiot ovat saatavana Mac Os 9:lle."
 
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
+#: AboutDialog.cpp:179
+#, fuzzy
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr "Tämä on ohjelman beta-versio. Siinä saattaa olla virheitä ja keskeneräisiä toimintoja. Tarvitsemme palautettasi, joten toivomme sinun vierailevan kotisivuillamme ja antavan meille ilmoituksia virheistä ja ehdotuksia ominaisuuksista."
 
-#: AboutDialog.cpp:221
+#: AboutDialog.cpp:182
 #, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr "Tämä on vakaa, valmis Audacityn julkaisu. Jos kuitenkin löydät virheen tai sinulla on ehdotuksia, ota meihin yhteyttä. Tarvitsemme käyttäjien palauttetta voidaksemme kehittää Audacityä. Vieraile kotisivuillamme saadaksesi lisätietoa."
 
 #  i18n-hint: The translation of "translator_credits" will appear
@@ -56,83 +47,203 @@ msgstr "Tämä on vakaa, valmis Audacityn julkaisu. Jos kuitenkin löydät virhe
 #  your own name(s) to the credits.
 #  For example:  "English translation by Dominic Mazzoni."
 #. i18n-hint: The translation of "translator_credits" will appear
-#: ../src/AboutDialog.cpp:127 ../src/AboutDialog.cpp:129
+#. in the credits in the About Audacity window.  Use this to add
+#. your own name(s) to the credits.
+#.
+#. For example:  "English translation by Dominic Mazzoni."
+#.
+#: AboutDialog.cpp:192
+#: AboutDialog.cpp:194
 msgid "translator_credits"
-msgstr "Suomennos:   Petri Vuorio"
+msgstr "Suomennos:   Petri Vuorio, Elias Julkunen"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Vapaa digitaalinen audioeditori"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr "Vapaa digitaalinen äänieditori<br>"
 
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Tietoja"
-
-#: ../src/AboutDialog.cpp:154
+#: AboutDialog.cpp:211
 msgid "Credits"
 msgstr "Tekijät"
 
-#: AboutDialog.cpp:256
+#: AboutDialog.cpp:215
 #, c-format
 msgid "Audacity %s Development Team"
-msgstr ""
+msgstr "Audacity %s -kehitystiimi"
 
-#: AboutDialog.cpp:261
+#: AboutDialog.cpp:220
 #, c-format
 msgid "Audacity %s Support Team"
-msgstr ""
+msgstr "Audacity %s -tukitiimi"
 
-#: AboutDialog.cpp:266
+#: AboutDialog.cpp:225
 msgid "Emeritus Developers"
 msgstr ""
 
-#: AboutDialog.cpp:271
+#: AboutDialog.cpp:230
 msgid "Other Emeritus Team Members"
 msgstr ""
 
-#: AboutDialog.cpp:276
+#: AboutDialog.cpp:235
 msgid "Other Contributors"
-msgstr ""
+msgstr "Muut osallistujat"
 
-#: AboutDialog.cpp:281
+#: AboutDialog.cpp:240
 msgid "Audacity is based on code from the following projects:"
-msgstr ""
+msgstr "Audacty perustuu seuraavien projektien koodiin:"
 
-#: ../src/AboutDialog.cpp:237
+#: AboutDialog.cpp:245
 msgid "Special thanks:"
 msgstr "Erityiskiitokset:"
 
-#: AboutDialog.cpp:320
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
+msgstr "Audacity"
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
+#, fuzzy
+msgid "Build Information"
+msgstr "Tietoja"
+
+#: AboutDialog.cpp:310
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: AboutDialog.cpp:311
+msgid "Disabled"
+msgstr "Ei käytössä"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr "Tiedostomuototuki"
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr "MP3-tuonti"
+
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr "Ogg Vorbis -vienti ja -tuonti"
+
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr "ID3-tunnistetuki"
+
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr "FLAC-vienti ja -tuonti"
+
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr "MP2-vienti"
+
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr "Tuo QuickTimen avulla"
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389
+#: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+#, fuzzy
+msgid "Sample rate conversion"
+msgstr "Näytteenottotaajuus:"
+
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
+msgid "Audio playback and recording"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr "Ominaisuudet"
+
+#: AboutDialog.cpp:422
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:430
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:438
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr "Liitännäistuki"
+
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
+msgid "Sound card mixer support"
 msgstr ""
 
-#: AboutDialog.cpp:388
-msgid "GPL License"
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371 ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Sulje"
+#: AboutDialog.cpp:477
+#, fuzzy
+msgid "Program build date: "
+msgstr "Ohjelman käännöspäivä:"
+
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
+msgid "Build type:"
+msgstr "Version tyyppi:"
 
-#: ../src/AudacityApp.cpp:304 ../src/Project.cpp:1770
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr "Virheidenjäljitysversio"
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr "Julkaisuversio"
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:491
+msgid "Settings folder: "
+msgstr "Asetuskansio:"
+
+#: AboutDialog.cpp:506
+msgid "GPL License"
+msgstr "GPL-lisenssi"
+
+#: AudacityApp.cpp:507
+#: Project.cpp:1844
 #, c-format
 msgid "%s is already open in another window."
 msgstr "%s on jo avoinna toisessa ikkunassa."
 
-#: ../src/AudacityApp.cpp:306 ../src/Project.cpp:1772 ../src/Project.cpp:1843
-#: ../src/Project.cpp:1894 ../src/Project.cpp:1905 ../src/Project.cpp:1943
+#: AudacityApp.cpp:509
+#: Project.cpp:1846
+#: Project.cpp:1951
+#: Project.cpp:2095
+#: Project.cpp:2232
 msgid "Error opening project"
 msgstr "Virhe avattaessa projektia"
 
-#: ../src/AudacityApp.cpp:338
+#: AudacityApp.cpp:541
 #, c-format
 msgid "%s does not exist and could not be opened.\n"
 "\n"
@@ -141,96 +252,98 @@ msgstr "Kohdetta %s ei voitu avata koska sitä ei ole.\n"
 "\n"
 "Kohde on poistettu historialistasta."
 
-#: ../src/AudacityApp.cpp:367
+#: AudacityApp.cpp:643
 msgid "Master Gain Control"
 msgstr "Vahvistuksen pääsäädin"
 
-#: ../src/AudacityApp.cpp:368
+#: AudacityApp.cpp:644
 msgid "Input Meter"
 msgstr "Sisääntulomittari"
 
-#: ../src/AudacityApp.cpp:369
+#: AudacityApp.cpp:645
 msgid "Output Meter"
 msgstr "Ulostulomittari"
 
 #. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:534 Menus.cpp:575
+#: AudacityApp.cpp:809
 msgid "&Preferences...\tCtrl+,"
-msgstr ""
+msgstr "&Asetukset...\tCtrl+,"
 
-#: ../src/AudacityApp.cpp:626 ../src/AudacityApp.cpp:696
+#: AudacityApp.cpp:901
+#: AudacityApp.cpp:978
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "Käytetään jakson kokoa %ld\n"
 
-#: ../src/AudacityApp.cpp:641 ../src/AudacityApp.cpp:711
+#: AudacityApp.cpp:923
+#: AudacityApp.cpp:993
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Tuntematon komentoriviparametri: %s\n"
 
-#: ../src/AudacityApp.cpp:773
+#: AudacityApp.cpp:1127
 msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
 msgstr "Audacity ei löytänyt paikkaa väliaikaisille tiedostoille.\n"
 "Ole hyvä ja syötä kelvollinen hakemisto asetusikkunassa."
 
-#: AudacityApp.cpp:845
+#: AudacityApp.cpp:1133
 #, fuzzy
 msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
 msgstr "Audacity suljetaan. Ole hyvä ja käynnistä Audacity uudelleen käyttääksesi uutta väliaikaishakemistoa."
 
-#: AudacityApp.cpp:877
+#: AudacityApp.cpp:1165
 msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
 msgstr ""
 
-#: AudacityApp.cpp:884
+#: AudacityApp.cpp:1172
 msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
+msgstr "Audacity ei voinut lukita väliaikaistiedostojen hakemistoa.\n"
+"Audacityn toinen kopio saattaa käyttää sitä.\n"
 
-#: AudacityApp.cpp:886
+#: AudacityApp.cpp:1174
 msgid "Do you still want to start Audacity?"
-msgstr ""
+msgstr "Haluatko silti käynnistää Audacityn?"
 
-#: ../src/AudacityApp.cpp:829
+#: AudacityApp.cpp:1176
 msgid "Error locking temporary folder"
 msgstr "Virhe lukittaessa väliaikaista kansiota"
 
-#: AudacityApp.cpp:900
+#: AudacityApp.cpp:1214
 msgid "The system has detected that another copy of Audacity is running.\n"
-msgstr ""
+msgstr "Järjestelmä on havainnut toisen käynnissä olevan Audacityn.\n"
 
-#: AudacityApp.cpp:902
+#: AudacityApp.cpp:1216
 msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
 msgstr ""
 
-#: ../src/AudacityApp.cpp:846
+#: AudacityApp.cpp:1217
 msgid "Audacity is already running"
 msgstr "Audacity on jo käynnissä"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1234
 msgid "Command-line options supported:"
-msgstr ""
+msgstr "Tuetut komentorivivalinnat:"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1137
+#: AudacityApp.cpp:1237
 msgid "\t-help (this message)"
-msgstr ""
+msgstr "\t-help (tämä viesti)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1139
+#: AudacityApp.cpp:1239
 msgid "\t-version (display Audacity version)"
-msgstr ""
+msgstr "\t-version (näytä Audacityn versio)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1143
+#: AudacityApp.cpp:1243
 msgid "\t-test (run self diagnostics)"
 msgstr ""
 
@@ -238,15 +351,15 @@ msgstr ""
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1148
+#: AudacityApp.cpp:1248
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr ""
 
-#: AudacityApp.cpp:1149
+#: AudacityApp.cpp:1249
 msgid "In addition, specify the name of an audio file or Audacity project to open it."
 msgstr ""
 
-#: ../src/AudacityApp.cpp:1099
+#: AudacityApp.cpp:1529
 msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
@@ -257,400 +370,452 @@ msgstr "Audacityn projektitiedostoja (.AUP) ei ole\n"
 "Tehdäänkö asetus, jotta voit avata\n"
 "projektitiedostot kaksoisklikkaamalla?"
 
-#: ../src/AudacityApp.cpp:1100
+#: AudacityApp.cpp:1530
 msgid "Audacity Project Files"
 msgstr "Audacity projektitiedostot"
 
-#: AudioIO.cpp:214
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
-msgstr ""
+msgstr "Mitään äänilaitteita ei löydetty.\n"
 
-#: ../src/AudioIO.cpp:167
+#: AudioIO.cpp:255
 msgid "You will not be able to play or record audio.\n"
 "\n"
 msgstr "Et voi toistaa tai äänittää audiota.\n"
 "\n"
 
-#: ../src/AudioIO.cpp:170
+#: AudioIO.cpp:258
 msgid "Error: "
 msgstr "Virhe: "
 
-#: ../src/AudioIO.cpp:173
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
 msgstr "Virhe alustettaessa audiota"
 
-#: AudioIO.cpp:1236
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr ""
 
-#: AudioIO.cpp:1236
+#: AudioIO.cpp:1375
 msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
 msgstr ""
 
-#: AutoRecovery.cpp:40
+#: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
-msgstr ""
+msgstr "Automaattinen kaatumispalautus"
 
-#: AutoRecovery.cpp:59
+#: AutoRecovery.cpp:73
 msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
 msgstr ""
 
-#: AutoRecovery.cpp:61
+#: AutoRecovery.cpp:75
 msgid "Recoverable projects"
-msgstr ""
+msgstr "Palautettavissa olevat projektit"
 
-#: AutoRecovery.cpp:64
+#: AutoRecovery.cpp:78
+#: Tags.cpp:2041
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
-#: AutoRecovery.cpp:70
+#: AutoRecovery.cpp:84
 msgid "Recovering a project will not change any files on disk before you save it."
-msgstr ""
+msgstr "Projektin palautus ei muuta mitään tiedostoja levyllä ennen kuin tallennat projektin."
 
-#: AutoRecovery.cpp:74
+#: AutoRecovery.cpp:88
 msgid "Quit Audacity"
-msgstr ""
+msgstr "Lopeta Audacity"
 
 #: AutoRecovery.cpp:89
 msgid "Do Not Recover"
-msgstr ""
+msgstr "Älä palauta"
 
 #: AutoRecovery.cpp:90
 msgid "Recover Projects"
-msgstr ""
+msgstr "Palauta projekteja"
 
-#: AutoRecovery.cpp:113
-msgid "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?"
-msgstr ""
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr "Etkö halua palauttaa mitään projekteja?\n"
+"Niitä ei voi palauttaa myöhemmin."
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
-#: AutoRecovery.cpp:132 AutoRecovery.cpp:169
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
 msgid "Could not enumerate files in auto save directory"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:723 ../src/ControlToolBar.cpp:884
-#: ../src/effects/Effect.cpp:331 ../src/prefs/DirectoriesPrefs.cpp:204
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:3053
+#: Menus.cpp:3065
+#: Menus.cpp:5182
+#: Project.cpp:2054
+#: Project.cpp:3615
+#: Project.cpp:3694
+#: TrackPanel.cpp:6385
+#: WaveTrack.cpp:598
+#: WaveTrack.cpp:617
+#: WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077
+#: WaveTrack.cpp:2087
+#: effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "Virhe"
 
-#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
-msgstr ""
+msgstr "Valitse komento"
 
-#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:451
-#: prefs/KeyConfigPrefs.cpp:140
+#: BatchCommandDialog.cpp:82
+#: BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
-msgstr ""
+msgstr "&Komento"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
-msgstr ""
+msgstr "&Muokkaa parametreja"
 
-#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:452
+#: BatchCommandDialog.cpp:91
+#: BatchProcessDialog.cpp:455
 msgid "&Parameters"
-msgstr ""
+msgstr "&Parametrit"
 
-#: BatchCommandDialog.cpp:93
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
-msgstr ""
+msgstr "&Valitse komento"
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
-#: ../src/export/Export.cpp:366
+#: BatchCommands.cpp:476
 msgid "Ogg Vorbis support is not included in this build of Audacity"
 msgstr "Ogg Vorbis -tukea ei ole tässä Audacityn käännöksessä."
 
-#: BatchCommands.cpp:509
+#: BatchCommands.cpp:488
 msgid "FLAC support is not included in this build of Audacity"
-msgstr ""
+msgstr "FLAC-tukea ei ole sisällytetty tähän Audacityn versioon"
 
-#: BatchCommands.cpp:513
+#: BatchCommands.cpp:492
 #, c-format
 msgid "Command %s not implemented yet"
 msgstr ""
 
-#: BatchCommands.cpp:529
+#: BatchCommands.cpp:508
 #, c-format
 msgid "Could not set parameters of effect %s\n"
 " to %s."
 msgstr ""
 
-#: BatchCommands.cpp:583
+#: BatchCommands.cpp:561
 #, c-format
 msgid "Your batch command of %s was not recognised."
 msgstr ""
 
-#: BatchCommands.cpp:674
+#: BatchCommands.cpp:652
 #, c-format
 msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
+msgstr "Hyväksy %d parametr(e)illä\n"
+"\n"
+"%s"
 
-#: BatchCommands.cpp:675 BatchCommands.cpp:680
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
 msgid "Test Mode"
-msgstr ""
+msgstr "Kokeilutila"
 
-#: BatchCommands.cpp:679
+#: BatchCommands.cpp:657
 #, c-format
 msgid "Apply %s"
-msgstr ""
+msgstr "Hyväksy %s"
 
-#: BatchProcessDialog.cpp:58 BatchProcessDialog.cpp:68
-#: BatchProcessDialog.cpp:69
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
 msgid "Apply Chain"
 msgstr ""
 
-#: BatchProcessDialog.cpp:92
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
+#: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr ""
 
-#: BatchProcessDialog.cpp:97
+#: BatchProcessDialog.cpp:99
 msgid "Chain"
 msgstr ""
 
-#: BatchProcessDialog.cpp:104
+#: BatchProcessDialog.cpp:106
 msgid "Apply to Current &Project"
-msgstr ""
+msgstr "Hyväksy &nykyiseen projektiin"
 
-#: BatchProcessDialog.cpp:105
+#: BatchProcessDialog.cpp:107
 msgid "Apply to &Files..."
-msgstr ""
-
-#: BatchProcessDialog.cpp:106 BatchProcessDialog.cpp:245 LabelDialog.cpp:134
-#: LabelDialog.cpp:138 UploadDialog.cpp:178 effects/Amplify.cpp:209
-#: effects/AutoDuck.cpp:528 effects/AutoDuck.cpp:532
-#: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:184
-#: effects/ChangePitch.cpp:395 effects/ChangeSpeed.cpp:393
-#: effects/ChangeTempo.cpp:297 effects/ClickRemoval.cpp:429
-#: effects/Compressor.cpp:516 effects/Effect.cpp:387 effects/Effect.cpp:393
-#: effects/Equalization.cpp:1166 effects/Leveller.cpp:266
-#: effects/Normalize.cpp:353 effects/Phaser.cpp:600 effects/Repeat.cpp:271
-#: effects/SpikeCleaner.cpp:188 effects/TruncSilence.cpp:278
-#: effects/VST/VSTEffect.cpp:95 effects/VST/VSTEffect.cpp:452
-#: effects/Wahwah.cpp:587 effects/audiounits/AudioUnitEffect.cpp:862
-#: effects/ladspa/LadspaEffect.cpp:589 effects/nyquist/Nyquist.cpp:823
-#: effects/nyquist/Nyquist.cpp:987 export/Export.cpp:788
-#: export/ExportMultiple.cpp:844 import/ImportRaw.cpp:443
-#: prefs/FileFormatPrefs.cpp:407 prefs/PrefsDialog.cpp:169
+msgstr "Hyväksy &tiedostoihin"
+
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2080
+#: Tags.cpp:2084
+#: Tags.cpp:2384
+#: Tags.cpp:2388
+#: UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732
+#: effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
-msgstr ""
+msgstr "&Peruuta"
 
-#: BatchProcessDialog.cpp:144 BatchProcessDialog.cpp:189
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
 msgid "No chain selected"
 msgstr ""
 
-#: BatchProcessDialog.cpp:157
+#: BatchProcessDialog.cpp:159
 #, c-format
 msgid "Applying '%s' to current project"
 msgstr ""
 
-#: BatchProcessDialog.cpp:198
+#: BatchProcessDialog.cpp:200
 msgid "Please save and close the current project first."
 msgstr ""
 
-#: BatchProcessDialog.cpp:205
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
+#: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
-#: BatchProcessDialog.cpp:208
-msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
 msgstr ""
 
-#: BatchProcessDialog.cpp:229
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Kaikki tiedostot (*.*)|*.*|WAV-tiedostot (*.wav)|*.wav|AIFF-tiedostot (*.aif)|*.aif|AU-tiedostot (*.au)|*.au|MP3-tiedostot (*.mp3)|*.mp3|Ogg Vorbis -tiedostot (*.ogg)|*.ogg|FLAC-tiedostot (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:231
 msgid "Applying..."
 msgstr ""
 
-#: BatchProcessDialog.cpp:239
+#: BatchProcessDialog.cpp:241
 msgid "File"
-msgstr ""
+msgstr "Tiedosto"
 
-#: BatchProcessDialog.cpp:354 BatchProcessDialog.cpp:358
-#: BatchProcessDialog.cpp:359
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
 msgid "Edit Chains"
 msgstr ""
 
-#: BatchProcessDialog.cpp:414
+#: BatchProcessDialog.cpp:416
 msgid "&Chains"
 msgstr ""
 
-#: BatchProcessDialog.cpp:433
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:826
+#: Tags.cpp:1465
+#: Tags.cpp:2064
 msgid "&Add"
-msgstr ""
-
-#: BatchProcessDialog.cpp:434 LabelDialog.cpp:126 TrackPanel.cpp:3925
+msgstr "&Lisää"
+
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:128
+#: Tags.cpp:827
+#: Tags.cpp:1466
+#: Tags.cpp:2065
+#: TrackPanel.cpp:4176
 msgid "&Remove"
-msgstr ""
+msgstr "&Poista"
 
-#: BatchProcessDialog.cpp:435
+#: BatchProcessDialog.cpp:437
 msgid "Re&name"
-msgstr ""
+msgstr "&Nimeä uudelleen"
 
-#: BatchProcessDialog.cpp:441
+#: BatchProcessDialog.cpp:443
 msgid "C&hain (Double-Click or press SPACE to edit)"
 msgstr ""
 
-#: BatchProcessDialog.cpp:450
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
-#: BatchProcessDialog.cpp:456
+#: BatchProcessDialog.cpp:459
 msgid "&Insert"
-msgstr ""
+msgstr "&Lisää"
 
-#: BatchProcessDialog.cpp:457
+#: BatchProcessDialog.cpp:460
 msgid "De&lete"
-msgstr ""
+msgstr "&Poista"
 
-#: BatchProcessDialog.cpp:458
+#: BatchProcessDialog.cpp:461
 msgid "Move &Up"
-msgstr ""
+msgstr "Siirrä &ylöspäin"
 
-#: BatchProcessDialog.cpp:459
+#: BatchProcessDialog.cpp:462
 msgid "Move &Down"
-msgstr ""
+msgstr "Siirrä &alaspäin"
 
-#: BatchProcessDialog.cpp:460
+#: BatchProcessDialog.cpp:463
 msgid "De&faults"
-msgstr ""
+msgstr "&Oletukset"
 
-#: BatchProcessDialog.cpp:504
+#: BatchProcessDialog.cpp:507
 msgid "- END -"
-msgstr ""
+msgstr "- LOPPU -"
 
-#: BatchProcessDialog.cpp:531
+#: BatchProcessDialog.cpp:540
 #, c-format
 msgid "%s changed"
 msgstr ""
 
-#: BatchProcessDialog.cpp:532
+#: BatchProcessDialog.cpp:541
 msgid "Do you want to save the changes?"
-msgstr ""
+msgstr "Haluatko tallentaa muutokset?"
 
-#: BatchProcessDialog.cpp:614
+#: BatchProcessDialog.cpp:623
 msgid "Enter name of new chain"
 msgstr ""
 
-#: BatchProcessDialog.cpp:625
+#: BatchProcessDialog.cpp:634
 msgid "Name must not be blank"
 msgstr ""
 
-#: BatchProcessDialog.cpp:634
+#: BatchProcessDialog.cpp:643
 #, c-format
 msgid "Names may not contain '%c' and '%c'"
 msgstr ""
 
-#: BatchProcessDialog.cpp:664
+#: BatchProcessDialog.cpp:673
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
 #: Dependencies.cpp:139
 msgid "Removing Dependencies"
-msgstr ""
+msgstr "Poistetaan riippuvuuksia"
 
 #: Dependencies.cpp:140
 msgid "Copying audio data into project..."
-msgstr ""
+msgstr "Kopioidaan äänitietoja projektiin..."
 
-#: Dependencies.cpp:219
+#: Dependencies.cpp:223
 msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
 msgstr ""
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
-msgstr ""
+msgstr "Projekti riippuu muista äänitiedostoista"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
-msgstr ""
+msgstr "Projektin riippuvuudet"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
-msgstr ""
+msgstr "Äänitiedosto"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
-msgstr ""
+msgstr "Levytila"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
-msgstr ""
+msgstr "Kopioi valittu ääni projektiin"
 
-#: Dependencies.cpp:304 Dependencies.cpp:413
+#: Dependencies.cpp:308
+#: Dependencies.cpp:414
 msgid "Cancel Save"
-msgstr ""
+msgstr "Peruuta tallennus"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
-msgstr ""
+msgstr "Älä kopioi mitään ääntä"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
-msgstr ""
+msgstr "Kopioi kaikki ääni projektiin (turvallisempi)"
 
-#: Dependencies.cpp:320 Dependencies.cpp:325
+#: Dependencies.cpp:321
+#: Dependencies.cpp:326
 msgid "Ask me"
-msgstr ""
+msgstr "Kysy minulta"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
-msgstr ""
+msgstr "Kopioi aina kaikki ääni (turvallisin)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
-msgstr ""
+msgstr "Älä koskaan kopioi mitään ääntä"
 
-#: Dependencies.cpp:324
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
 msgstr ""
 
-#: Dependencies.cpp:412
+#: Dependencies.cpp:413
 msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
 msgstr ""
 
-#: Dependencies.cpp:452
+#: Dependencies.cpp:453
 msgid "Your project is self-contained; it does not depend on any external audio files."
 msgstr ""
 
-#: Dependencies.cpp:453
+#: Dependencies.cpp:454
 msgid "Dependency check"
-msgstr ""
+msgstr "Riippuvuustarkistus"
 
-#: DirManager.cpp:136
+#: DirManager.cpp:137
 #, fuzzy
 msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
 msgstr "Varoitus: tällä levyllä on vain vähän vapaata tilaa. Ole hyvä ja valitse asetuksista toinen väliaikaisten tiedostojen hakemisto."
 
-#: ../src/DirManager.cpp:157
+#: DirManager.cpp:223
+#: DirManager.cpp:254
+#: DirManager.cpp:337
 msgid "Progress"
 msgstr "Kehitys"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
 msgstr ""
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
-msgstr ""
+msgstr "Tallennetaan projektin datatiedostoja"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
 msgstr ""
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
 msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
@@ -660,88 +825,98 @@ msgstr ""
 #  when a file needs to be backed up to a different name.  For
 #  example, mysong would become mysong-old1, mysong-old2, etc.
 #. i18n-hint: This is the pattern for filenames that are created
-#: ../src/DirManager.cpp:627
+#. when a file needs to be backed up to a different name.  For
+#. example, mysong would become mysong-old1, mysong-old2, etc.
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-vanha%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr ""
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr ""
 
-#: ../src/DirManager.cpp:643
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "Tiedosto %s nimetty uudelleen\n"
 
-#: ../src/DirManager.cpp:660
+#: DirManager.cpp:1160
 #, c-format
-msgid "Changing block %s\n"
-msgstr "Muutetaan jaksoa %s\n"
+msgid "Unable to rename '%s' to '%s'"
+msgstr ""
 
-#: DirManager.cpp:1051
+#: DirManager.cpp:1183
 #, c-format
-msgid "Unable to rename '%s' to '%s'"
+msgid "Changed block %s to new alias name\n"
 msgstr ""
 
-#: DirManager.cpp:1115 DirManager.cpp:1403
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
 msgid "Inspecting project file data..."
 msgstr ""
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr ""
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr ""
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr ""
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
-msgstr ""
+msgstr "Puuttuva datatiedosto: (%s.au)"
 
-#: DirManager.cpp:1207
+#: DirManager.cpp:1319
 msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 msgstr ""
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1331
 #, c-format
 msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr ""
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
 msgstr ""
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr ""
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr ""
 
-#: ../src/widgets/Warning.cpp:45
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
+#: widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "Varoitus"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1366
 #, c-format
 msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
@@ -751,34 +926,37 @@ msgid "Project check detected %d input file[s] being used in place\n"
 "and try to restore the missing files by hand."
 msgstr ""
 
-#: DirManager.cpp:1259
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr ""
 
-#: DirManager.cpp:1260 DirManager.cpp:1348
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr ""
 
-#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr ""
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1412
 #, c-format
 msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
 msgstr ""
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr ""
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
 msgstr ""
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1454
 #, c-format
 msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
@@ -789,51 +967,149 @@ msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "missing data by hand."
 msgstr ""
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr ""
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
 msgstr ""
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1558
 msgid "Caching audio"
 msgstr ""
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
 msgstr ""
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
-msgstr ""
+msgstr "Tallennetaan nauhoitettua ääntä"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
-msgstr ""
+msgstr "Tallennetaan nauhoitettua ääntä levylle..."
 
-#: ../src/FFT.cpp:364
+#: FFT.cpp:389
 msgid "Rectangular"
 msgstr "Suorakulma"
 
-#: ../src/FreqWindow.cpp:68
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "FFmpeg-kirjastoa ei löytynyt"
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: FFmpeg.cpp:196
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: FFmpeg.cpp:205
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:211
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Selaa"
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Ladataksesi ilmainen kopion ohjelmasta FFmpeg, napsauta tästä -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#  i18n-hint: It's asking for the location of a file, for
+#  example, "Where is lame_enc.dll?" - you could translate
+#  "Where would I find the file %s" instead if you want.
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Missä on %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "Ohjelmaa FFmpeg ei löytynyt"
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Vain avformat.dll|*avformat*.dll|Dynaamisesti linkitetyt kirjastot (*.dll)|*.dll|Kaikki tiedostot (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "Taajuusanalyysi"
 
-#: ../src/FreqWindow.cpp:129 ../src/TrackPanel.cpp:837
+#: FreqWindow.cpp:139
+#: TrackPanel.cpp:556
+#: prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "Spektri"
 
-#: ../src/FreqWindow.cpp:130
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "Standardi autokorrelaatio"
 
-#: ../src/FreqWindow.cpp:131
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "Kuutiojuuriautokorrelaatio"
 
-#: ../src/FreqWindow.cpp:132
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "Parannettu autokorrelaatio"
 
@@ -841,177 +1117,264 @@ msgstr "Parannettu autokorrelaatio"
 #  "spectrum".  Do not translate it unless you are sure you
 #  know the correct technical word in your language.
 #. i18n-hint: This is a technical term, derived from the word
-#: ../src/FreqWindow.cpp:136
+#. "spectrum".  Do not translate it unless you are sure you
+#. know the correct technical word in your language.
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150
+#: FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
-#: ../src/HistoryWindow.cpp:58
+#: FreqWindow.cpp:169
+#: FreqWindow.cpp:173
+#: HistoryWindow.cpp:79
 msgid "Size"
 msgstr "Koko"
 
 #  i18n-hint: This refers to a "window function", used in the
 #  Frequency analyze dialog box.
 #. i18n-hint: This refers to a "window function", used in the
-#: ../src/FreqWindow.cpp:167
+#. Frequency analyze dialog box.
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr "-ikkunointi"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
-msgstr ""
+#: FreqWindow.cpp:187
+#: FreqWindow.cpp:191
+msgid "Function"
+msgstr "Toimenpide"
 
-#: ../src/FreqWindow.cpp:177
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "Lineaarinen taajuus"
 
-#: ../src/FreqWindow.cpp:178
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "Logaritminen taajuus"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
-msgstr ""
+#: FreqWindow.cpp:201
+#: FreqWindow.cpp:205
+#, fuzzy
+msgid "Axis"
+msgstr "Esittäjä"
 
-#: FreqWindow.cpp:204 LabelDialog.cpp:128
+#: FreqWindow.cpp:212
+#: LabelDialog.cpp:130
+#: Menus.cpp:241
+#: Menus.cpp:276
 msgid "&Export..."
-msgstr ""
+msgstr "&Vie..."
 
-#: ../src/effects/Compressor.cpp:385 ../src/effects/Compressor.cpp:393
-#: ../src/widgets/Meter.cpp:293
+#: FreqWindow.cpp:213
+#: export/ExportCL.cpp:325
+#: export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "Vie"
+
+#: FreqWindow.cpp:216
+#: FreqWindow.cpp:217
+#: widgets/ErrorDialog.cpp:161
+msgid "Close"
+msgstr "Sulje"
+
+#: FreqWindow.cpp:280
+#: FreqWindow.cpp:410
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:792
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1123
+#: effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133
+#: effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408
+#: effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367
+#: widgets/Meter.cpp:417
 msgid "dB"
 msgstr "dB"
 
 #  i18n-hint: This is the abbreviation for "Hertz", or
 #  cycles per second.
 #. i18n-hint: This is the abbreviation for "Hertz", or
-#: ../src/import/ImportRaw.cpp:378
+#. cycles per second.
+#: FreqWindow.cpp:295
+#: FreqWindow.cpp:450
+#: effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195
+#: import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/FreqWindow.cpp:463
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
 msgstr "Dataa ei ole valittu riittävästi."
 
-#: FreqWindow.cpp:441 effects/AutoDuck.cpp:801
+#: FreqWindow.cpp:458
+#: effects/AutoDuck.cpp:794
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: FreqWindow.cpp:769
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr ""
 
-#: FreqWindow.cpp:778
+#: FreqWindow.cpp:796
 #, c-format
 msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
 msgstr ""
 
-#: ../src/FreqWindow.cpp:996
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "spektri.txt"
 
-#: ../src/FreqWindow.cpp:998
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "Vie spektridata tiedostoon:"
 
-#: ../src/FreqWindow.cpp:1014 ../src/Menus.cpp:1393 ../src/Project.cpp:2159
-#: ../src/prefs/KeyConfigPrefs.cpp:173
+#: FreqWindow.cpp:1087
+#: LabelDialog.cpp:603
+#: Menus.cpp:2555
+#: Project.cpp:2604
+#: Project.cpp:3667
+#: prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
 msgstr "Ei voitu kirjoittaa tiedostoon:"
 
-#: ../src/FreqWindow.cpp:1019
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
 msgstr "Taajuus (Hz)\tTaso (dB)"
 
-#: ../src/FreqWindow.cpp:1025
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Viive (sekuntia)\tTaajuus (Hz)\tTaso"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
-#: HelpText.cpp:60
+#: HelpText.cpp:92
 msgid "Welcome!"
-msgstr ""
+msgstr "Tervetuloa!"
 
-#: HelpText.cpp:65
+#: HelpText.cpp:97
 msgid "Playing Audio"
-msgstr ""
+msgstr "Soitetaan ääntä"
 
-#: HelpText.cpp:69
+#: HelpText.cpp:101
 msgid "Recording Audio"
-msgstr ""
+msgstr "Nauhiotetaan ääntä"
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
 msgstr ""
 
-#: HelpText.cpp:85
-msgid "Burn to CD"
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
 msgstr ""
 
-#: HelpText.cpp:89
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr "Viedään äänitiedostoa"
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr "Tallennetaa Audacity-projektia"
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr "Tukemattomat muodot"
+
+#: HelpText.cpp:133
+msgid "Burn to CD"
+msgstr "Polta CD:lle"
+
+#: HelpText.cpp:137
 msgid "No Local Help"
+msgstr "Ei paikallista ohjetta"
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr "Tervetuloa käyttämää Audacityä"
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
-#: ../src/HistoryWindow.cpp:44
+#: HistoryWindow.cpp:53
 msgid "Undo History"
 msgstr "Kumoamishistoria"
 
 #: HistoryWindow.cpp:72
 msgid "Manage History"
-msgstr ""
+msgstr "Hallitse historiaa"
 
-#: ../src/HistoryWindow.cpp:57
+#: HistoryWindow.cpp:78
 msgid "Action"
 msgstr "Toimenpide"
 
@@ -1021,1500 +1384,1719 @@ msgstr ""
 
 #: HistoryWindow.cpp:92
 msgid "Levels To Discard"
-msgstr ""
+msgstr "Ohitettavat tasot"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
-msgstr ""
-
-#: HistoryWindow.cpp:111 LabelDialog.cpp:135 LabelDialog.cpp:137
-#: effects/Amplify.cpp:214 effects/AutoDuck.cpp:529 effects/AutoDuck.cpp:531
-#: effects/ChangeLength.cpp:187 effects/ChangePitch.cpp:399
-#: effects/ChangeSpeed.cpp:397 effects/ChangeTempo.cpp:301
-#: effects/Compressor.cpp:519 effects/Effect.cpp:389 effects/Effect.cpp:391
-#: effects/Equalization.cpp:1169 effects/Leveller.cpp:269
-#: effects/Normalize.cpp:356 effects/Phaser.cpp:605 effects/Repeat.cpp:274
-#: effects/SpikeCleaner.cpp:191 effects/VST/VSTEffect.cpp:98
-#: effects/Wahwah.cpp:592 effects/ladspa/LadspaEffect.cpp:592
-#: effects/nyquist/Nyquist.cpp:829 export/Export.cpp:791
-#: prefs/FileFormatPrefs.cpp:408 prefs/PrefsDialog.cpp:164
+msgstr "&Hylkää"
+
+#: HistoryWindow.cpp:112
+#: Tags.cpp:2081
+#: Tags.cpp:2083
+#: Tags.cpp:2385
+#: Tags.cpp:2387
+#: effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191
+#: export/ExportCL.cpp:399
 msgid "&OK"
-msgstr ""
+msgstr "&OK"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:114
+#: Internat.cpp:191
 msgid "Unable to determine"
 msgstr "Ei voitu päätellä"
 
-#: ../src/import/ImportRaw.cpp:354
+#: Internat.cpp:195
+#: import/ImportRaw.cpp:385
 msgid "bytes"
 msgstr "tavua"
 
-#: Internat.cpp:182
+#: Internat.cpp:197
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
-#: Internat.cpp:185
+#: Internat.cpp:200
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
-#: Internat.cpp:188
+#: Internat.cpp:203
 msgid "GB"
-msgstr ""
+msgstr "GB"
 
-#: LabelDialog.cpp:50
+#: LabelDialog.cpp:54
 msgid "Track"
-msgstr ""
+msgstr "Raita"
 
-#: ../src/Menus.cpp:3088
+#: LabelDialog.cpp:55
+#: Menus.cpp:4677
+#: Menus.cpp:4712
 msgid "Label"
 msgstr "Merkki"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56
+#: TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr ""
 
-#: LabelDialog.cpp:53
+#: LabelDialog.cpp:57
+#: TimerRecordDialog.cpp:298
 msgid "End Time"
 msgstr ""
 
-#: LabelDialog.cpp:98 Menus.cpp:709
+#: LabelDialog.cpp:100
+#: Menus.cpp:713
 msgid "&Edit Labels"
 msgstr ""
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
 msgstr ""
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr ""
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr ""
 
-#: LabelDialog.cpp:127 Menus.cpp:234
+#: LabelDialog.cpp:129
 msgid "&Import..."
-msgstr ""
+msgstr "&Tuo..."
 
-#: LabelDialog.cpp:163
+#: LabelDialog.cpp:157
 msgid "New..."
-msgstr ""
+msgstr "Uusi..."
 
-#: LabelDialog.cpp:352
+#: LabelDialog.cpp:354
 msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
 msgstr ""
 
-#: LabelDialog.cpp:350
+#: LabelDialog.cpp:355
 msgid "Confirm"
-msgstr ""
+msgstr "Varmista"
 
-#: ../src/Menus.cpp:2631
+#: LabelDialog.cpp:516
+#: Menus.cpp:4101
 msgid "Select a text file containing labels..."
 msgstr "Valitse merkit sisältävä tekstitiedosto..."
 
-#: ../src/Menus.cpp:2635
+#: LabelDialog.cpp:520
+#: Menus.cpp:4105
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Tekstitiedostot (*.txt)|*.txt|Kaikki tiedostot (*.*)|*.*"
 
-#: ../src/Menus.cpp:2647 ../src/Project.cpp:1820 ../src/Project.cpp:1828
-#: ../src/import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534
+#: Menus.cpp:4117
+#: Project.cpp:1914
+#: Project.cpp:1922
 msgid "Could not open file: "
 msgstr "Ei voitu avata tiedostoa:"
 
-#: LabelDialog.cpp:549
+#: LabelDialog.cpp:560
 msgid "No labels to export."
 msgstr ""
 
-#: ../src/Menus.cpp:1358
+#: LabelDialog.cpp:566
+#: Menus.cpp:2518
 msgid "Export Labels As:"
 msgstr "Vie merkit nimellä:"
 
-#: ../src/Menus.cpp:1356
+#: LabelDialog.cpp:568
+#: Menus.cpp:2516
 msgid "labels.txt"
 msgstr "merkit.txt"
 
-#: LabelDialog.cpp:690
+#: LabelDialog.cpp:703
 #, fuzzy
 msgid "New Label Track"
 msgstr "Uusi &merkkiraita"
 
-#: LabelDialog.cpp:691
+#: LabelDialog.cpp:704
 msgid "Enter track name"
-msgstr ""
+msgstr "Anna raidan nimi"
 
-#: LabelDialog.cpp:692 LabelDialog.h:50 LabelTrack.cpp:87 Menus.cpp:645
+#: LabelDialog.cpp:705
+#: LabelDialog.h:52
+#: LabelTrack.cpp:89
+#: Menus.cpp:632
 #, fuzzy
 msgid "&Label Track"
 msgstr "Merkkiraita"
 
-#: ../src/LangChoice.cpp:47
+#: LangChoice.cpp:57
 msgid "Audacity First Run"
 msgstr "Audacity ensimmäinen käynnistys"
 
-#: ../src/LangChoice.cpp:74
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
 msgstr "Valitse Audacityn kieli:"
 
-#: ../src/Legacy.cpp:337
+#: Legacy.cpp:356
 #, c-format
 msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
 msgstr "1.0-projekti muunnettiin uuteen tiedostomuotoon.\n"
-"Vanha tiedosto on tallennettu nimellä '%s'"
+"Vanha tiedosto on tallennettu nimellä \"%s\""
 
-#: ../src/Legacy.cpp:338
+#: Legacy.cpp:357
 msgid "Opening Audacity Project"
 msgstr "Avataan Audacity-projektia"
 
-#: ../src/Menus.cpp:139
+#: Menus.cpp:194
 msgid "&File"
 msgstr "&Tiedosto"
 
-#: ../src/Menus.cpp:141
+#: Menus.cpp:196
 msgid "&New\tCtrl+N"
 msgstr "&Uusi\tCtrl+N"
 
-#: ../src/Menus.cpp:143
+#: Menus.cpp:198
 msgid "&Open...\tCtrl+O"
 msgstr "&Avaa...\tCtrl+O"
 
-#: ../src/Menus.cpp:145
+#: Menus.cpp:203
 msgid "&Close\tCtrl+W"
 msgstr "&Sulje\tCtrl+W"
 
-#: ../src/Menus.cpp:146
+#: Menus.cpp:206
 msgid "&Save Project\tCtrl+S"
 msgstr "&Tallenna projekti\tCtrl+S"
 
-#: ../src/Menus.cpp:150
+#: Menus.cpp:210
+#: Project.cpp:2896
 msgid "Save Project &As..."
 msgstr "Tallenna projekti &nimellä..."
 
-#: Menus.cpp:223
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr "Tallenna pakattu kopio projektista..."
+
+#: Menus.cpp:216
 msgid "Chec&k Dependencies..."
-msgstr ""
+msgstr "&Tarkista riippuvuudet..."
 
-#: Menus.cpp:185
+#: Menus.cpp:222
 msgid "Open Me&tadata Editor..."
-msgstr ""
+msgstr "Avaa &metatietoeditori..."
 
-#: Menus.cpp:236
+#: Menus.cpp:229
+#: import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Tuo"
+
+#: Menus.cpp:231
 msgid "&Audio...\tCtrl+Shift+I"
-msgstr ""
+msgstr "&Ääni...\tCtrl+Shift+I"
 
-#: Menus.cpp:237
+#: Menus.cpp:232
 msgid "&Labels..."
 msgstr ""
 
-#: Menus.cpp:238
+#: Menus.cpp:234
 msgid "&MIDI..."
-msgstr ""
+msgstr "&MIDI..."
 
-#: Menus.cpp:239
+#: Menus.cpp:236
 msgid "&Raw Data..."
-msgstr ""
+msgstr "&Raakadata..."
 
-#: Menus.cpp:208 Menus.cpp:237
+#: Menus.cpp:247
+#: Menus.cpp:282
 msgid "Expo&rt Selection..."
-msgstr ""
+msgstr "&Vie valinta..."
 
-#: ../src/Menus.cpp:173
+#: Menus.cpp:254
 msgid "Export &Labels..."
 msgstr "Vie mer&kit..."
 
-#: ../src/Menus.cpp:174
+#: Menus.cpp:255
 msgid "Export &Multiple..."
 msgstr "Vie &moneen tiedostoon..."
 
-#: Menus.cpp:340 Menus.cpp:354
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr "MIDI-tiedosto"
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
+#: Menus.cpp:291
+#: Menus.cpp:305
 msgid "Edit C&hains..."
 msgstr ""
 
-#: Menus.cpp:352
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
+#: Menus.cpp:303
 msgid "Appl&y Chain..."
 msgstr ""
 
-#: Menus.cpp:358
+#: Menus.cpp:310
 msgid "&Upload File..."
 msgstr ""
 
-#: Menus.cpp:363
-#, fuzzy
+#: Menus.cpp:316
 msgid "Pa&ge Setup..."
-msgstr "Sivun asetukset..."
+msgstr "&Sivun asetukset..."
 
-#: Menus.cpp:364
+#: Menus.cpp:317
 msgid "&Print..."
-msgstr ""
+msgstr "&Tulosta..."
 
-#: Menus.cpp:382 Menus.cpp:385
+#: Menus.cpp:330
 msgid "E&xit\tCtrl+Q"
-msgstr ""
+msgstr "&Lopeta\tCtrl+Q"
 
-#: ../src/Menus.cpp:227
+#: Menus.cpp:338
+#: toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "&Muokkaa"
 
-#: ../src/Menus.cpp:231
+#: Menus.cpp:342
 msgid "&Undo\tCtrl+Z"
 msgstr "&Kumoa\tCtrl+Z"
 
-#: ../src/Menus.cpp:239
+#: Menus.cpp:350
+#: prefs/KeyConfigPrefs.cpp:371
+#: toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "Tee &uudelleen"
 
-#: ../src/Menus.cpp:252
+#: Menus.cpp:363
 msgid "Cu&t\tCtrl+X"
 msgstr "&Leikkaa\tCtrl+X"
 
-#: Menus.cpp:420
+#: Menus.cpp:367
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr ""
 
-#: ../src/Menus.cpp:253
+#: Menus.cpp:368
 msgid "&Copy\tCtrl+C"
 msgstr "K&opioi\tCtrl+C"
 
-#: ../src/Menus.cpp:254
+#: Menus.cpp:372
 msgid "&Paste\tCtrl+V"
 msgstr "L&iitä\tCtrl+V"
 
-#: Menus.cpp:426
+#: Menus.cpp:376
 msgid "Tri&m\tCtrl+T"
 msgstr ""
 
-#: ../src/Menus.cpp:260
+#: Menus.cpp:378
 msgid "&Delete\tCtrl+K"
 msgstr "&Poista\tCtrl+K"
 
-#: Menus.cpp:429
+#: Menus.cpp:379
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
+#: Menus.cpp:380
+#, fuzzy
+msgid "Silence Audi&o\tCtrl+L"
 msgstr "&Vaimenna\tCtrl+L"
 
-#: Menus.cpp:432
+#: Menus.cpp:382
 msgid "Sp&lit\tCtrl+I"
 msgstr ""
 
-#: Menus.cpp:342
+#: Menus.cpp:387
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr ""
 
-#: Menus.cpp:442
+#: Menus.cpp:392
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr ""
+#: Menus.cpp:393
+#, fuzzy
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "&Vaimenna\tCtrl+Alt+J"
 
-#: Menus.cpp:445
+#: Menus.cpp:394
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
-msgstr ""
+#: Menus.cpp:400
+#: Menus.cpp:639
+#, fuzzy
+msgid "Stereo Trac&k to Mono"
+msgstr "Yhdistä stereoraidaksi"
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:460
+#: Menus.cpp:409
 msgid "&Cut\tAlt+X"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:465
+#: Menus.cpp:414
 msgid "&Split Cut\tShift+Alt+X"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:470
+#: Menus.cpp:419
 msgid "Co&py\tShift+Alt+C"
-msgstr ""
+msgstr "&Kopioi\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:476
+#: Menus.cpp:425
 msgid "&Delete\tAlt+K"
-msgstr ""
+msgstr "&Poista\tAlt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:481
+#: Menus.cpp:430
 msgid "Sp&lit Delete\tShift+Alt+K"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:486
+#: Menus.cpp:435
 msgid "Sile&nce\tAlt+L"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:492
+#: Menus.cpp:441
 msgid "Spli&t\tAlt+I"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:497
+#: Menus.cpp:446
 msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
-msgstr ""
+#: Menus.cpp:456
+msgid "&Select"
+msgstr "&Valitse"
 
-#: ../src/Menus.cpp:269
+#: Menus.cpp:457
 msgid "&All\tCtrl+A"
 msgstr "&Kaikki\tCtrl+A"
 
-#: Menus.cpp:415
+#: Menus.cpp:458
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
-msgstr ""
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
+msgstr "Lisää merkki toistokohtaan\t["
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
-msgstr ""
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
+msgstr "Lisää merkki toistokohtaan\t]"
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
+#: Menus.cpp:467
+#, fuzzy
+msgid "Track &Start to Cursor\tShift+J"
 msgstr "Alusta kursoriin"
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
+#: Menus.cpp:468
+#, fuzzy
+msgid "Cursor to Track &End\tShift+K"
 msgstr "Kursorista loppuun"
 
-#: Menus.cpp:525
+#: Menus.cpp:474
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Etsi nollakohdat\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Siirrä kursori..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr "&Siirrä kohdistin..."
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
-msgstr "valinnan alkuun"
+#: Menus.cpp:478
+msgid "to Selection Star&t"
+msgstr "valinnan &alkuun"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
-msgstr "valinnan loppuun"
+#: Menus.cpp:479
+msgid "to Selection En&d"
+msgstr "valinnan &loppuun"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "raidan alkuun"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr "raidan al&kuun\tJ"
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "raidan loppuun"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr "raidan l&oppuun\tK"
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
+#: Menus.cpp:491
+#, fuzzy
+msgid "Re&gion Save"
 msgstr "Tallenna valinta"
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
+#: Menus.cpp:492
+#, fuzzy
+msgid "Regio&n Restore"
 msgstr "Palauta valinta"
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
-msgstr ""
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr "&Lukitse"
 
-#: Menus.cpp:561
-msgid "Unlock"
-msgstr ""
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr "&Avaa lukitus"
 
-#: ../src/Menus.cpp:311
+#: Menus.cpp:511
 msgid "Turn Snap-To On"
 msgstr "Ota kohdistus käyttöön"
 
-#: ../src/Menus.cpp:312
+#: Menus.cpp:512
 msgid "Turn Snap-To Off"
 msgstr "Poista kohdistus käytöstä"
 
-#: ../src/Menus.cpp:313
+#: Menus.cpp:513
 msgid "Turn Grid Snap On"
 msgstr "Ota ruudukkoon kohdistus käyttöön"
 
-#: ../src/Menus.cpp:314
+#: Menus.cpp:514
 msgid "Turn Grid Snap Off"
 msgstr "Poista ruudukkoon kohdistus käytöstä"
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "As&etukset...\tCtrl+,"
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
 msgstr "As&etukset...\tCtrl+P"
 
-#: ../src/Menus.cpp:345
+#: Menus.cpp:533
 msgid "&View"
 msgstr "&Näytä"
 
-#: ../src/Menus.cpp:347
+#: Menus.cpp:535
 msgid "Zoom &In\tCtrl+1"
 msgstr "&Lähennä näkymää\tCtrl+1"
 
-#: ../src/Menus.cpp:350
+#: Menus.cpp:538
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "&Normaali zoomaus\tCtrl+2"
 
-#: ../src/Menus.cpp:351
+#: Menus.cpp:539
 msgid "Zoom &Out\tCtrl+3"
 msgstr "L&oitonna näkymää\tCtrl+3"
 
-#: ../src/Menus.cpp:354
+#: Menus.cpp:542
 msgid "&Fit in Window\tCtrl+F"
 msgstr "&Sovita ikkunaan\tCtrl+F"
 
-#: ../src/Menus.cpp:355
+#: Menus.cpp:543
 msgid "Fit &Vertically\tCtrl+Shift+F"
-msgstr "Sovita &pystysuunnassa\tCtrl+Vaihto+F"
+msgstr "Sovita &pystysuunnassa\tCtrl+Shift+F"
 
-#: ../src/Menus.cpp:356
+#: Menus.cpp:544
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "&Zoomaa valintaan\tCtrl+E"
 
-#: Menus.cpp:603
+#: Menus.cpp:547
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr ""
 
-#: Menus.cpp:604
+#: Menus.cpp:548
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
-msgstr ""
+#: Menus.cpp:551
+#, fuzzy
+msgid "&Show Clipping"
+msgstr "Salli leikkautuminen"
 
-#: ../src/Menus.cpp:364
+#: Menus.cpp:560
 msgid "&History..."
 msgstr "&Historia..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr "&Työkalupalkit"
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr "&Hallintatyökalupalkki"
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr "&Laitetyökalupalkki"
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr "&Muokkaustyökalupalkki"
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr "&Valintatyökalupalkki"
+
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
+msgstr "Zoomaustyökalu"
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr "&Palauta työkalupalkit oletusarvoihin"
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr "!Yksinkertaistettu näkymä"
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr "&Pysäytä\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:595
+#: Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "Siirry alkuun\tHome"
+
+#: Menus.cpp:597
+#: Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "Siirry loppuun\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr "&Äänitä\tR"
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:635
-msgid "&Tracks"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:643
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
+#: Menus.cpp:622
+msgid "&Tracks"
+msgstr "&Raidat"
+
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr "Lisää &uusi"
+
+#: Menus.cpp:630
 msgid "&Audio Track\tCtrl+Shift+N"
 msgstr ""
 
-#: Menus.cpp:644
+#: Menus.cpp:631
 msgid "&Stereo Track"
 msgstr ""
 
-#: Menus.cpp:646 TimeTrack.cpp:44
+#: Menus.cpp:633
+#: TimeTrack.cpp:44
 #, fuzzy
 msgid "&Time Track"
 msgstr "Aikaraita"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
-#: Menus.cpp:564
+#: Menus.cpp:647
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr ""
 
-#: Menus.cpp:662
+#: Menus.cpp:651
 msgid "&Resample..."
 msgstr ""
 
-#: ../src/Menus.cpp:398
+#: Menus.cpp:661
 msgid "Remo&ve Tracks"
 msgstr "P&oista raitoja"
 
-#: ../src/Menus.cpp:405
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr "&Hiljennä kaikki raidat\tCtrl+U"
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr "&Poista hiljennys kaikilta raidoilta\tCtrl+Shift+U"
+
+#: Menus.cpp:672
 msgid "Align with &Zero"
 msgstr "Kohdista &nollakohtaan"
 
-#: ../src/Menus.cpp:406
+#: Menus.cpp:673
 msgid "Align with &Cursor"
 msgstr "Kohdista &kursoriin"
 
-#: ../src/Menus.cpp:407
+#: Menus.cpp:674
 msgid "Align with Selection &Start"
 msgstr "Kohdista valinnan &alkuun"
 
-#: ../src/Menus.cpp:408
+#: Menus.cpp:675
 msgid "Align with Selection &End"
 msgstr "Kohdista valinnan &loppuun"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Kohdista loppu kursoriin"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Kohdista loppu valinnan alkuun"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Kohdista loppu valinnan loppuun"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Kohdista raidat yhteen"
 
-#: Menus.cpp:688
+#: Menus.cpp:681
 #, fuzzy
-msgid "&Align Tracks..."
+msgid "&Align Tracks"
 msgstr "Kohdista raidat..."
 
+#: Menus.cpp:690
+#, fuzzy
+msgid "Ali&gn and Move Cursor"
+msgstr "Kohdista loppu kursoriin"
+
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr "Synkronoi MIDI äänen kanssa"
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
-#: Menus.cpp:705
+#: Menus.cpp:709
 #, fuzzy
 msgid "Add &Label At Selection\tCtrl+B"
 msgstr "Lisää valintaan merkki\tCtrl+B"
 
-#: Menus.cpp:706
+#: Menus.cpp:710
 #, fuzzy
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Lisää merkki toistokohtaan\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
-msgstr ""
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr "&Järjestä raidat"
 
-#: Menus.cpp:713
-msgid "&Start time"
-msgstr ""
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr "&Aloitusajan mukaan"
 
-#: Menus.cpp:715
-msgid "&Name"
-msgstr ""
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr "&Nimen mukaan"
 
-#: ../src/Menus.cpp:441
+#: Menus.cpp:730
 msgid "&Generate"
 msgstr "&Luo"
 
-#: ../src/Menus.cpp:464
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
+#: Menus.cpp:795
 msgid "Effe&ct"
 msgstr "&Efekti"
 
-#: ../src/Menus.cpp:468
+#: Menus.cpp:799
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "Toista viimeisin efekti\tCtrl+R"
 
-#: ../src/Menus.cpp:494
+#: Menus.cpp:877
 msgid "&Analyze"
 msgstr "&Analysoi"
 
-#: Menus.cpp:692
+#: Menus.cpp:879
 msgid "Plot Spectrum..."
 msgstr ""
 
-#. i18n-hint: The name of the Help menu
-#: ../src/Menus.cpp:524 ../src/Menus.cpp:540
+#: Menus.cpp:947
+#: Menus.cpp:950
 msgid "&Help"
 msgstr "&Ohje"
 
-#: Menus.cpp:829
+#: Menus.cpp:953
 msgid "&About Audacity CleanSpeech..."
 msgstr ""
 
-#: Menus.cpp:735
+#: Menus.cpp:957
 msgid "&Show Welcome Message..."
-msgstr ""
+msgstr "Näytä &Tervetuloa-viesti..."
 
-#: Menus.cpp:736
+#: Menus.cpp:958
 msgid "&Index..."
 msgstr ""
 
-#: Menus.cpp:744
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr "Näytä &loki..."
+
+#: Menus.cpp:967
 msgid "&Screenshot Tools..."
-msgstr ""
+msgstr "&Kuvakaappaustyökalut..."
 
-#: ../src/Menus.cpp:533
+#: Menus.cpp:970
 msgid "&Run Benchmark..."
 msgstr "&Suorita mittauskoe..."
 
-#: Menus.cpp:749
+#: Menus.cpp:972
 msgid "&Audio Device Info..."
-msgstr ""
+msgstr "&Äänilaitetiedot..."
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
-#: ../src/Menus.cpp:549
+#: Menus.cpp:985
 msgid "Selection Tool\tF1"
 msgstr "Valintatyökalu\tF1"
 
-#: ../src/Menus.cpp:550
+#: Menus.cpp:986
 msgid "Envelope Tool\tF2"
 msgstr "Verhotyökalu\tF2"
 
-#: ../src/Menus.cpp:551
+#: Menus.cpp:987
 msgid "Draw Tool\tF3"
 msgstr "Piirtotyökalu\tF3"
 
-#: ../src/Menus.cpp:552
+#: Menus.cpp:988
 msgid "Zoom Tool\tF4"
 msgstr "Zoomaustyökalu\tF4"
 
-#: ../src/Menus.cpp:553
+#: Menus.cpp:989
 msgid "Time Shift Tool\tF5"
 msgstr "Aikakorjaustyökalu\tF5"
 
-#: ../src/Menus.cpp:554
+#: Menus.cpp:990
 msgid "Multi Tool\tF6"
 msgstr "Monitoimityökalu\tF6"
 
-#: ../src/Menus.cpp:556
+#: Menus.cpp:992
 msgid "Next Tool\tD"
 msgstr "Seuraava työkalu\tD"
 
-#: ../src/Menus.cpp:557
+#: Menus.cpp:993
 msgid "Previous Tool\tA"
 msgstr "Edellinen työkalu\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Toista/Lopeta\tVälilyönti"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
-#: ../src/Menus.cpp:560
+#: Menus.cpp:996
 msgid "Stop\tS"
 msgstr "Pysäytä\tS"
 
-#: ../src/Menus.cpp:561
+#: Menus.cpp:997
 msgid "Pause\tP"
 msgstr "Keskeytä\tP"
 
-#: ../src/Menus.cpp:562
+#: Menus.cpp:998
 msgid "Record\tR"
 msgstr "Äänitä\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
-#: ../src/Menus.cpp:564
+#: Menus.cpp:1004
 msgid "Play One Second\t1"
 msgstr "Toista yksi sekunti\t1"
 
-#: ../src/Menus.cpp:565
+#: Menus.cpp:1005
 msgid "Play To Selection\tB"
 msgstr "Toista valintaan saakka\tB"
 
-#: ../src/Menus.cpp:566
+#: Menus.cpp:1006
 msgid "Play Looped\tL"
 msgstr "Toista silmukassa\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Toista silmukassa\tVaihto+välilyönti"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
-#: Menus.cpp:873
+#: Menus.cpp:1008
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Siirry alkuun\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Siirry loppuun\tEnd"
-
-#: ../src/Menus.cpp:572
+#: Menus.cpp:1013
 msgid "Selection to Start\tShift+Home"
-msgstr "Valitse alkuun\tVaihto+Home"
+msgstr "Valitse alkuun\tShift+Home"
 
-#: ../src/Menus.cpp:573
+#: Menus.cpp:1014
 msgid "Selection to End\tShift+End"
-msgstr "Valitse loppuun\tVaihto+End"
+msgstr "Valitse loppuun\tShift+End"
 
-#: ../src/Menus.cpp:575
+#: Menus.cpp:1016
 msgid "DeleteKey\tBackspace"
-msgstr "Poista-näppäin\tAskelpalautin"
+msgstr "Poista-näppäin\tBackspace"
 
-#: ../src/Menus.cpp:580
+#: Menus.cpp:1021
 msgid "DeleteKey2\tDelete"
 msgstr "Poista-näppäin2\tDelete"
 
-#: Menus.cpp:892
+#: Menus.cpp:1027
 msgid "Seek left short period during playback\tLeft"
 msgstr ""
 
-#: Menus.cpp:893
+#: Menus.cpp:1028
 msgid "Seek right short period during playback\tRight"
 msgstr ""
 
-#: Menus.cpp:894
+#: Menus.cpp:1029
 msgid "Seek left long period during playback\tShift+Left"
 msgstr ""
 
-#: Menus.cpp:895
+#: Menus.cpp:1030
 msgid "Seek right long period during playback\tShift+Right"
 msgstr ""
 
-#: Menus.cpp:899
+#: Menus.cpp:1034
 msgid "Move Focus to Previous Track\tUp"
 msgstr ""
 
-#: Menus.cpp:900
+#: Menus.cpp:1035
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
 msgstr ""
 
-#: Menus.cpp:901
+#: Menus.cpp:1036
 msgid "Move Focus to Next Track\tDown"
 msgstr ""
 
-#: Menus.cpp:902
+#: Menus.cpp:1037
 msgid "Move Focus to Next and Change Selection\tShift+Down"
 msgstr ""
 
-#: Menus.cpp:903
+#: Menus.cpp:1038
 msgid "Toggle Focused Track\tReturn"
 msgstr ""
 
-#: Menus.cpp:904
+#: Menus.cpp:1039
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
-#: ../src/Menus.cpp:585
+#: Menus.cpp:1042
 msgid "Cursor Left\tLeft"
-msgstr "Kursori vasemmalle\tVasen"
+msgstr "Kursori vasemmalle\tLeft"
 
-#: ../src/Menus.cpp:586
+#: Menus.cpp:1043
 msgid "Cursor Right\tRight"
-msgstr "Kursori oikealle\tOikea"
+msgstr "Kursori oikealle\tRight"
 
-#: Menus.cpp:820
+#: Menus.cpp:1044
 msgid "Cursor Short Jump Left\t,"
 msgstr ""
 
-#: Menus.cpp:821
+#: Menus.cpp:1045
 msgid "Cursor Short Jump Right\t."
 msgstr ""
 
-#: Menus.cpp:822
+#: Menus.cpp:1046
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr ""
 
-#: Menus.cpp:823
+#: Menus.cpp:1047
 msgid "Cursor Long Jump Right\tShift+."
 msgstr ""
 
-#: ../src/Menus.cpp:587
+#: Menus.cpp:1049
 msgid "Selection Extend Left\tShift+Left"
-msgstr "Laajenna valintaa vasemmalle\tVaihto+Vasen"
+msgstr "Laajenna valintaa vasemmalle\tShift+Left"
 
-#: ../src/Menus.cpp:588
+#: Menus.cpp:1050
 msgid "Selection Extend Right\tShift+Right"
-msgstr "Laajenna valintaa oikealle\tVaihto+Oikea"
+msgstr "Laajenna valintaa oikealle\tShift+Right"
 
-#: Menus.cpp:828
+#: Menus.cpp:1052
 msgid "Set (or Extend) Left Selection"
 msgstr ""
 
-#: Menus.cpp:829
+#: Menus.cpp:1053
 msgid "Set (or Extend) Right Selection"
 msgstr ""
 
-#: ../src/Menus.cpp:589
+#: Menus.cpp:1055
 msgid "Selection Contract Left\tCtrl+Shift+Right"
-msgstr "Supista valintaa vasemmalta\tCtrl+Vaihto+Oikea"
+msgstr "Supista valintaa vasemmalta\tCtrl+Shift+Right"
 
-#: ../src/Menus.cpp:590
+#: Menus.cpp:1056
 msgid "Selection Contract Right\tCtrl+Shift+Left"
-msgstr "Supista valintaa oikealta\tCtrl+Vaihto+Vasen"
+msgstr "Supista valintaa oikealta\tCtrl+Shift+Left"
 
-#: Menus.cpp:916
+#: Menus.cpp:1058
 msgid "Change pan on focused track\tShift+P"
 msgstr ""
 
-#: Menus.cpp:917
+#: Menus.cpp:1059
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr ""
 
-#: Menus.cpp:918
+#: Menus.cpp:1060
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr ""
 
-#: Menus.cpp:919
+#: Menus.cpp:1061
 msgid "Change gain on focused track\tShift+G"
 msgstr ""
 
-#: Menus.cpp:920
+#: Menus.cpp:1062
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr ""
 
-#: Menus.cpp:921
+#: Menus.cpp:1063
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr ""
 
-#: Menus.cpp:922
+#: Menus.cpp:1064
 msgid "Open menu on focused track\tShift+M"
 msgstr ""
 
-#: Menus.cpp:923
+#: Menus.cpp:1065
 msgid "Mute/Unmute focused track\tShift+U"
 msgstr ""
 
-#: Menus.cpp:924
+#: Menus.cpp:1066
 msgid "Solo/Unsolo focused track\tShift+S"
 msgstr ""
 
-#: Menus.cpp:925
+#: Menus.cpp:1067
 msgid "Close focused track\tShift+C"
 msgstr ""
 
-#: Menus.cpp:845
+#: Menus.cpp:1069
 msgid "Snap To On"
 msgstr ""
 
-#: Menus.cpp:846
+#: Menus.cpp:1070
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:939
+#: Menus.cpp:1157
 msgid "Open Recent"
-msgstr ""
+msgstr "Avaa viimeisin"
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "V&iimeaikaiset tiedostot..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1160
+msgid "Recent &Files"
+msgstr "V&iimeaikaiset tiedostot"
 
-#: ../src/Menus.cpp:620
+#: Menus.cpp:1209
 #, c-format
 msgid "&Undo %s"
 msgstr "&Kumoa %s"
 
-#: ../src/Menus.cpp:626
+#: Menus.cpp:1235
 msgid "Can't Undo"
 msgstr "Ei voi kumota"
 
-#: ../src/Menus.cpp:633
+#: Menus.cpp:1244
 #, c-format
 msgid "&Redo %s"
 msgstr "Tee &uudelleen %s"
 
-#: ../src/Menus.cpp:639
+#: Menus.cpp:1250
 msgid "Can't Redo"
 msgstr "Ei voi tehdä uudelleen"
 
-#: Menus.cpp:1557
+#: Menus.cpp:1856
 msgid "Sort By Time"
-msgstr ""
+msgstr "Järjestä ajan mukaan"
 
-#: Menus.cpp:1557
+#: Menus.cpp:1856
 msgid "Tracks sorted by time"
-msgstr ""
+msgstr "Raidat järjestetty ajan mukaan"
 
-#: Menus.cpp:1583
+#: Menus.cpp:1882
 msgid "Sort By Name"
-msgstr ""
+msgstr "Järjestä nimen mukaan"
 
-#: Menus.cpp:1583
+#: Menus.cpp:1882
 msgid "Tracks sorted by name"
-msgstr ""
+msgstr "Raidat järjrestetty nimen mukaan"
 
-#: Menus.cpp:1710
+#: Menus.cpp:2033
 msgid "Set Left Selection Bound"
 msgstr ""
 
-#: Menus.cpp:1744
+#: Menus.cpp:2068
 msgid "Set Right Selection Bound"
 msgstr ""
 
-#: ../src/Menus.cpp:1225
+#: Menus.cpp:2337
 msgid "You must select a track first."
 msgstr "Sinun on ensin valittava raita."
 
-#: ../src/Menus.cpp:1248
+#: Menus.cpp:2369
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "Toista %s\tCtrl+R"
 
-#: ../src/Menus.cpp:1352
+#: Menus.cpp:2512
 msgid "There are no label tracks to export."
 msgstr "Merkkiraitoja ei ole vietäväksi."
 
-#: ../src/Menus.cpp:1636
+#: Menus.cpp:2607
+msgid "Export MIDI As:"
+msgstr "Vie MIDI-tiedosto nimellä:"
+
+#: Menus.cpp:2611
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "MIDI-tiedostot (*.mid)|*.mid|Allegro-tiedostot (*.gro)|*.gro"
+
+#: Menus.cpp:2643
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "Export MIDI"
+msgstr "Vie MIDI-tiedosto"
+
+#: Menus.cpp:2702
 msgid "Nothing to undo"
 msgstr "Ei kumottavaa"
 
-#: ../src/Menus.cpp:1655
+#: Menus.cpp:2722
 msgid "Nothing to redo"
 msgstr "Ei uudelleen tehtävää"
 
-#: ../src/EditToolBar.cpp:148 ../src/Menus.cpp:1713
+#: Menus.cpp:2809
+#: TrackPanel.cpp:596
+#: toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: ../src/Menus.cpp:1713
+#: Menus.cpp:2809
 msgid "Cut to the clipboard"
 msgstr "Leikattu leikepöydälle"
 
-#: Menus.cpp:2468
+#: Menus.cpp:2849
 msgid "Split Cut"
 msgstr ""
 
-#: Menus.cpp:2468
+#: Menus.cpp:2849
 msgid "Split-cut to the clipboard"
 msgstr ""
 
-#: ../src/EditToolBar.cpp:152 ../src/Menus.cpp:1818 ../src/Menus.cpp:1862
+#: Menus.cpp:2914
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+#: TrackPanel.cpp:598
+#: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Liitä"
 
-#: Menus.cpp:2530
+#: Menus.cpp:2914
 msgid "Pasted text from the clipboard"
 msgstr ""
 
-#: ../src/Menus.cpp:1818 ../src/Menus.cpp:1862
+#: Menus.cpp:2986
+#: Menus.cpp:3178
 msgid "Pasted from the clipboard"
 msgstr "Liitetty leikepöydältä"
 
-#: Menus.cpp:2628
+#: Menus.cpp:3052
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
+#: Menus.cpp:3064
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
 
-#: ../src/Menus.cpp:1902
+#: Menus.cpp:3214
+#: toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "Rajaa"
 
-#: ../src/Menus.cpp:1902
+#: Menus.cpp:3214
 msgid "Trim file to selection"
 msgstr "Tiedosto rajattu valintaan"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3243
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
 msgstr ""
 
-#: Menus.cpp:2750
+#: Menus.cpp:3246
 msgid "Split Delete"
 msgstr ""
 
-#: Menus.cpp:2771
+#: Menus.cpp:3267
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr ""
 
-#: Menus.cpp:2774
+#: Menus.cpp:3270
 msgid "Disjoin"
 msgstr ""
 
-#: Menus.cpp:2795
+#: Menus.cpp:3291
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr ""
 
-#: Menus.cpp:2798
+#: Menus.cpp:3294
 msgid "Join"
 msgstr ""
 
-#: ../src/Menus.cpp:1926
+#: Menus.cpp:3313
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "Vaimennettu valitut raidat %.2f sekunniksi kohdassa %.2f"
 
-#: ../src/Menus.cpp:1928 ../src/effects/Silence.h:33
+#: Menus.cpp:3315
+#: toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Hiljaisuutta"
 
-#: ../src/Menus.cpp:1962
+#: Menus.cpp:3349
 msgid "Duplicate"
 msgstr "Kahdenna"
 
-#: ../src/Menus.cpp:1962
+#: Menus.cpp:3349
 msgid "Duplicated"
 msgstr "Kahdennettu"
 
-#: Menus.cpp:2872
+#: Menus.cpp:3368
 msgid "Cut Labels"
 msgstr ""
 
-#: Menus.cpp:2872
+#: Menus.cpp:3368
 msgid "Cut labeled regions to the clipboard"
 msgstr ""
 
-#: Menus.cpp:2886
+#: Menus.cpp:3382
 msgid "SplitCut labeled regions to the clipboard"
 msgstr ""
 
-#: Menus.cpp:2887
+#: Menus.cpp:3383
 msgid "Split Cut Labels"
 msgstr ""
 
-#: Menus.cpp:2901
+#: Menus.cpp:3397
 msgid "Copied labeled regions to the clipboard"
 msgstr ""
 
-#: Menus.cpp:2901
+#: Menus.cpp:3397
 msgid "Copy Labels"
 msgstr ""
 
-#: Menus.cpp:2913
+#: Menus.cpp:3409
 msgid "Delete Labels"
 msgstr ""
 
-#: Menus.cpp:2913
+#: Menus.cpp:3409
 msgid "Deleted labeled regions"
 msgstr ""
 
-#: Menus.cpp:2925
+#: Menus.cpp:3421
 msgid "Split Delete Labels"
 msgstr ""
 
-#: Menus.cpp:2925
+#: Menus.cpp:3421
 msgid "Split Deleted labeled regions"
 msgstr ""
 
-#: Menus.cpp:2937
+#: Menus.cpp:3433
 msgid "Silence Labels"
 msgstr ""
 
-#: Menus.cpp:2937
+#: Menus.cpp:3433
 msgid "Silenced labeled regions"
 msgstr ""
 
-#: Menus.cpp:2949
+#: Menus.cpp:3445
 msgid "Split Labels"
 msgstr ""
 
-#: Menus.cpp:2949
+#: Menus.cpp:3445
 msgid "Split labeled regions"
 msgstr ""
 
-#: Menus.cpp:2961
+#: Menus.cpp:3457
 msgid "Join Labels"
 msgstr ""
 
-#: Menus.cpp:2961
+#: Menus.cpp:3457
 msgid "Joined labeled regions"
 msgstr ""
 
-#: Menus.cpp:2973
+#: Menus.cpp:3469
 msgid "Disjoin Labels"
 msgstr ""
 
-#: Menus.cpp:2973
+#: Menus.cpp:3469
 msgid "Disjoined labeled regions"
 msgstr ""
 
-#: ../src/Menus.cpp:2009 ../src/TrackPanel.cpp:4134
+#: Menus.cpp:3491
+#: TrackPanel.cpp:6134
 msgid "Split"
 msgstr "Jaettu"
 
-#: Menus.cpp:3089
+#: Menus.cpp:3585
 msgid "Split New"
 msgstr ""
 
-#: Menus.cpp:3089
+#: Menus.cpp:3585
 msgid "Split to new track"
 msgstr ""
 
-#: ../src/Menus.cpp:2092
+#: Menus.cpp:3668
 msgid "Split at labels"
 msgstr "Jaa merkkien kohdalta"
 
-#: ../src/Menus.cpp:2369
+#: Menus.cpp:3969
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
 msgstr "Jotta spektri voidaan esittää, kaikkilla valituilla raidoilla täytyy olla sama näytteenottotaajuus."
 
-#: ../src/Menus.cpp:2395
+#: Menus.cpp:3995
 #, c-format
 msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
 msgstr "Audiota on valittu liian paljon. Vain ensimmäiset %.1f sekuntia audiosta analysoidaan."
 
-#: ../src/Menus.cpp:2660
+#: Menus.cpp:4130
 #, c-format
 msgid "Imported labels from '%s'"
-msgstr "Tuotu merkit lähteestä '%s'"
+msgstr "Tuotu merkit lähteestä \"%s\""
 
-#: ../src/Menus.cpp:2661
+#: Menus.cpp:4131
 msgid "Import Labels"
 msgstr "Tuo merkit"
 
-#: ../src/Menus.cpp:2672
+#: Menus.cpp:4142
 msgid "Select a MIDI file..."
 msgstr "Valitse MIDI-tiedosto..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Kaikki tiedostot (*.*)|*.*|MIDI-tiedostot (*.mid)|*.mid|Allegro-tiedostot (*.gro)|*.gro"
+#: Menus.cpp:4146
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "MIDI- ja  Allegro-tiedostot (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI-tiedostot (*.mid;*.midi)|*.mid;*.midi|Allegro-tiedostot (*.gro)|*.gro|Kaikki tiedostot (*.*)|*.*"
 
-#: ../src/Menus.cpp:2694
+#: Menus.cpp:4162
 #, c-format
 msgid "Imported MIDI from '%s'"
-msgstr "Tuotu MIDI-tiedosto lähteestä '%s'"
+msgstr "Tuotu MIDI-tiedosto lähteestä \"%s\""
 
-#: ../src/Menus.cpp:2696
+#: Menus.cpp:4163
 msgid "Import MIDI"
 msgstr "Tuo MIDI-tiedosto"
 
-#: ../src/Menus.cpp:2709
+#: Menus.cpp:4177
 msgid "Select any uncompressed audio file..."
 msgstr "Valitse mikä tahansa pakkaamaton audiotiedosto..."
 
-#: ../src/Menus.cpp:2713
+#: Menus.cpp:4181
 msgid "All files (*)|*"
 msgstr "Kaikki tiedostot (*)|*"
 
-#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Tuo"
-
-#: Menus.cpp:3630
+#: Menus.cpp:4205
 msgid "Edit the metadata tags"
-msgstr ""
+msgstr "Muokaa metatietotunnisteita"
 
-#: Menus.cpp:3631
+#: Menus.cpp:4206
+#: export/Export.cpp:353
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Muokkaa metatietoja"
 
-#: Menus.cpp:3631
+#: Menus.cpp:4206
 msgid "Edit Metadata tags"
-msgstr ""
+msgstr "Muokkaa metatietotunnisteita"
 
-#: Menus.cpp:3749
+#: Menus.cpp:4262
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr ""
 
-#: Menus.cpp:3750
+#: Menus.cpp:4263
 msgid "Render"
 msgstr ""
 
-#: Menus.cpp:3755
+#: Menus.cpp:4268
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
 msgstr ""
 
-#: Menus.cpp:3758
+#: Menus.cpp:4271
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
-#: ../src/Menus.cpp:2892
+#: Menus.cpp:4273
+#: Mix.cpp:121
+msgid "&Mix and Render"
+msgstr ""
+
+#: Menus.cpp:4403
 msgid "Aligned with zero"
 msgstr "Kohdistettu nollakohtaan"
 
-#: ../src/Menus.cpp:2896
+#: Menus.cpp:4407
 msgid "Aligned cursor"
 msgstr "Kohdistettu kursoriin"
 
-#: ../src/Menus.cpp:2900
+#: Menus.cpp:4411
 msgid "Aligned with selection start"
 msgstr "Kohdistettu valinnan alkuun"
 
-#: ../src/Menus.cpp:2904
+#: Menus.cpp:4415
 msgid "Aligned with selection end"
 msgstr "Kohdistettu valinnan loppuun"
 
-#: ../src/Menus.cpp:2908
+#: Menus.cpp:4419
 msgid "Aligned end with cursor"
 msgstr "Loppu kohdistettu kursoriin"
 
-#: ../src/Menus.cpp:2912
+#: Menus.cpp:4423
 msgid "Aligned end with selection start"
 msgstr "Loppu kohdistettu valinnan alkuun"
 
-#: ../src/Menus.cpp:2916
+#: Menus.cpp:4427
 msgid "Aligned end with selection end"
 msgstr "Loppu kohdistettu valinnan loppuun"
 
-#: ../src/Menus.cpp:2920
+#: Menus.cpp:4431
 msgid "Aligned"
 msgstr "Kohdistettu"
 
-#: ../src/Menus.cpp:2953
+#: Menus.cpp:4464
 msgid "Align"
 msgstr "Kohdista"
 
-#: ../src/Menus.cpp:2977
+#: Menus.cpp:4549
+msgid "Sync MIDI with Audio"
+msgstr "Synkronoi MIDI äänen kanssa"
+
+#: Menus.cpp:4553
+msgid "Alignment completed."
+msgstr ""
+
+#: Menus.cpp:4564
 msgid "Created new audio track"
 msgstr "Luotu uusi audioraita"
 
-#: ../src/Menus.cpp:2977 ../src/Menus.cpp:3001 ../src/Menus.cpp:3016
-#: ../src/Menus.cpp:3052
+#: Menus.cpp:4564
+#: Menus.cpp:4587
+#: Menus.cpp:4602
+#: Menus.cpp:4622
 msgid "New Track"
 msgstr "Uusi raita"
 
-#: ../src/Menus.cpp:3001
+#: Menus.cpp:4587
 msgid "Created new stereo audio track"
 msgstr "Luotu uusi stereoaudioraita"
 
-#: ../src/Menus.cpp:3016
+#: Menus.cpp:4602
 msgid "Created new label track"
 msgstr "Luotu uusi merkkiraita"
 
-#: ../src/Menus.cpp:3041
+#: Menus.cpp:4611
 msgid "The version of Audacity you are using does not support multiple time tracks."
 msgstr "Käyttämäsi Audacityn versio ei tue useita aikaraitoja."
 
-#: ../src/Menus.cpp:3052
+#: Menus.cpp:4622
 msgid "Created new time track"
 msgstr "Luotu uusi aikaraita"
 
-#: ../src/Menus.cpp:3088
+#: Menus.cpp:4677
 msgid "Added label"
 msgstr "Lisätty merkki"
 
-#: Menus.cpp:4119
+#: Menus.cpp:4712
 msgid "Edited labels"
 msgstr ""
 
-#: Menus.cpp:4146
+#: Menus.cpp:4739
 msgid "Save CleanSpeech Preset File As:"
 msgstr ""
 
-#: Menus.cpp:4150
+#: Menus.cpp:4743
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr ""
 
-#: ../src/export/Export.cpp:185
+#: Menus.cpp:4750
+#: export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "Valitan, yli 256 merkkiä pitkiä polkunimiä ei tueta."
 
-#: Menus.cpp:4203
+#: Menus.cpp:4796
 msgid "Problem encountered exporting presets."
 msgstr ""
 
-#: Menus.cpp:4204 export/Export.cpp:136
+#: Menus.cpp:4797
+#: export/Export.cpp:468
 msgid "Unable to export"
-msgstr ""
+msgstr "Ei voida viedä"
 
-#: ../src/Menus.cpp:3122
+#: Menus.cpp:4981
 msgid "Remove Track"
 msgstr "Poista raita"
 
-#: ../src/Menus.cpp:3122
+#: Menus.cpp:4981
 msgid "Removed audio track(s)"
 msgstr "Poistettu audioraitoja"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
-#: Menus.cpp:4480 Menus.cpp:4499
+#: Menus.cpp:5138
+#: Menus.cpp:5193
+#: export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr ""
 
-#: Menus.cpp:4486
+#: Menus.cpp:5158
+#: TrackPanel.cpp:6361
+#, fuzzy
+msgid "New sample rate (Hz):"
+msgstr "Näytteenottotaajuus:"
+
+#: Menus.cpp:5182
+#: TrackPanel.cpp:6385
 msgid "The entered value is invalid"
 msgstr ""
 
-#: Menus.cpp:4497
+#: Menus.cpp:5191
 #, c-format
 msgid "Resampling track %d"
 msgstr ""
 
-#: Menus.cpp:4508
+#: Menus.cpp:5200
 msgid "Resample Track"
 msgstr ""
 
-#: Menus.cpp:4508
+#: Menus.cpp:5200
 msgid "Resampled audio track(s)"
 msgstr ""
 
-#: ../src/Mix.cpp:74 ../src/Mix.cpp:82
+#: Mix.cpp:95
+#: Mix.cpp:102
 msgid "Mix"
 msgstr "Miksaus"
 
-#: Mix.cpp:120
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
 msgstr ""
 
-#: ../src/NoteTrack.cpp:30
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "Nuottiraita"
 
-#: ../src/Menus.cpp:1617
+#: Printing.cpp:192
 msgid "There was a problem printing."
 msgstr "Tulostamisessa oli ongelma."
 
-#: ../src/Menus.cpp:1618
+#: Printing.cpp:193
 msgid "Print"
 msgstr "Tulosta"
 
-#: Project.cpp:573
+#: Project.cpp:673
 msgid "Main Mix"
 msgstr ""
 
-#: Project.cpp:693
+#: Project.cpp:797
 #, c-format
 msgid "Welcome to Audacity version %s"
-msgstr ""
+msgstr "Tervetuloa käyttämään Audacityn versiota %d"
 
-#: Project.cpp:831
+#: Project.cpp:957
 msgid "(Recovered)"
-msgstr ""
+msgstr "(Palautettu)"
 
-#: ../src/ControlToolBar.cpp:469 ../src/Project.cpp:1707
-#: ../src/TrackPanel.cpp:1208
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+#: toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Äänitä"
 
-#: ../src/Project.cpp:1707 ../src/TrackPanel.cpp:1208
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "Äänitetty audiota"
 
-#: ../src/Project.cpp:1716
+#: Project.cpp:1564
 msgid "Save changes before closing?"
 msgstr "Tallennetaanko muutokset ennen sulkemista?"
 
-#: Project.cpp:1493
+#: Project.cpp:1567
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
-#: ../src/Project.cpp:1717
+#: Project.cpp:1570
 msgid "Save changes?"
 msgstr "Tallennetaanko muutokset?"
 
-#: Project.cpp:1684
+#: Project.cpp:1772
 msgid "All files|*.*|All supported files|"
-msgstr ""
+msgstr "Kaikki tiedostot|*.*|Kaikki tuetut tiedostot|"
 
-#: ../src/Menus.cpp:2595 ../src/Project.cpp:1738
+#: Project.cpp:1802
 msgid "Select one or more audio files..."
 msgstr "Valitse yksi tai useampia audiotiedostoja..."
 
-#: Project.cpp:1736
+#: Project.cpp:1829
 msgid "Audacity projects|*.aup|"
+msgstr "Audacity-projektit|*.aup|"
+
+#: Project.cpp:1882
+#: Project.cpp:2304
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1883
+msgid "1.0 or earlier"
+msgstr "1.0 tai aikaisempi"
+
+#: Project.cpp:1889
+#: Project.cpp:2316
+msgid "Opening old project file"
 msgstr ""
 
-#: ../src/Project.cpp:1821 ../src/Project.cpp:1829
+#: Project.cpp:1915
+#: Project.cpp:1923
 msgid "Error opening file"
 msgstr "Virhe avattaessa tiedostoa"
 
-#: Project.cpp:1585
+#: Project.cpp:1929
 #, c-format
 msgid "File may be invalid or corrupted: \n"
 "%s"
 msgstr ""
 
-#: Project.cpp:1586
+#: Project.cpp:1930
 msgid "Error opening file or project"
 msgstr ""
 
-#: ../src/Project.cpp:1842
+#: Project.cpp:1950
 msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
 msgstr "Audacity ei kyennyt muuntamaan Audacity 1.0:n projektia uuteen projektitiedostomuotoon."
 
-#: Project.cpp:1706
+#: Project.cpp:2053
 msgid "Could not remove old auto save file"
-msgstr ""
+msgstr "Vanhaa automaattitallennustiedostoa ei voitu poistaa"
 
-#: Project.cpp:1708
+#: Project.cpp:2055
 msgid "Project was recovered"
-msgstr ""
+msgstr "Projekti palautettiin"
 
-#: Project.cpp:1708
+#: Project.cpp:2055
 msgid "Recover"
-msgstr ""
+msgstr "Palauta"
 
-#: Project.cpp:1737
+#: Project.cpp:2084
 msgid "Project checker repaired file"
 msgstr ""
 
-#: Project.cpp:1737 effects/Repair.h:29
+#: Project.cpp:2084
+#: effects/Repair.h:29
 msgid "Repair"
 msgstr ""
 
-#: ../src/Project.cpp:1941
+#: Project.cpp:2230
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "Projektin data-kansiota \"%s\" ei löytynyt."
 
-#: ../src/Project.cpp:1985
+#: Project.cpp:2273
 #, c-format
 msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
@@ -2523,89 +3105,81 @@ msgstr "Tämä tiedosto on tallennettu Audacityn versiolla %s.\n"
 "Käytät Audacityn versiota %s - sinun on päivitettävä\n"
 "uudempaan versioon voidaksesi avata tämän tiedoston."
 
-#: ../src/Project.cpp:1991
+#: Project.cpp:2277
 msgid "Can't open project file"
 msgstr "Projektitiedoston avaaminen ei onnistu"
 
-#: Project.cpp:2131
+#: Project.cpp:2311
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
-#, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+#: Project.cpp:2588
+#, fuzzy, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr "Projektia ei voitu tallentaa. Ehkä %s ei ole kirjoitettavissa,\n"
 "tai levy on täynnä."
 
-#: ../src/Project.cpp:2148 ../src/Project.cpp:2160
+#: Project.cpp:2590
+#: Project.cpp:2605
 msgid "Error saving project"
 msgstr "Virhe tallennettaessa projektia"
 
-#: ../src/Project.cpp:2200
+#: Project.cpp:2680
 #, c-format
 msgid "Saved %s"
 msgstr "Tallennettu %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Raakadata"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
-#: ../src/Project.cpp:2282
+#: Project.cpp:2806
 #, c-format
 msgid "Imported '%s'"
-msgstr "Tuotu '%s'"
+msgstr "Tuotu \"%s\""
+
+#: Project.cpp:2807
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "Tuo"
 
-#: ../src/Project.cpp:2340
+#: Project.cpp:2840
+#: Project.cpp:2848
 msgid "Error importing"
 msgstr "Virhe tuotaessa"
 
-#: Project.cpp:2365
+#: Project.cpp:2882
 msgid "Save Speech As:"
 msgstr ""
 
-#: Project.cpp:2621
+#: Project.cpp:2884
 msgid "Windows PCM Audio file (*.wav)|*.wav"
-msgstr ""
+msgstr "Windows PCM -äänitiedosto (*.wav)|*.wav"
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2891
+#, fuzzy
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr "Työsi tallennetaan Audacityn projektitiedostoihin (.aup) samanlaisena, kuin\n"
@@ -2615,90 +3189,111 @@ msgstr "Työsi tallennetaan Audacityn projektitiedostoihin (.aup) samanlaisena,
 "Kun haluat tallentaa tiedoston käytettäväksi muilla ohjelmilla, valitse jokin\n"
 "Vie-toiminnoista."
 
-#: ../src/Project.cpp:2378
+#: Project.cpp:2894
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
+#: Project.cpp:2898
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Audacityn projektitiedostot (*.aup)|*.aup"
 
-#: ../src/Project.cpp:2414
+#: Project.cpp:2952
 msgid "Created new project"
 msgstr "Luotu uusi projekti"
 
-#: ../src/Project.cpp:2527
+#: Project.cpp:3111
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Poistettu %.2f sekuntia kohdasta t=%.2f"
 
-#: ../src/Project.cpp:2530
+#: Project.cpp:3114
+#: effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Poista"
 
-#: Project.cpp:2738
+#: Project.cpp:3308
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr ""
 
-#: Project.cpp:2741
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr ""
 
-#: Project.cpp:2744
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr ""
 
-#: Project.cpp:2747
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr ""
 
-#: ../src/Project.cpp:2706
+#: Project.cpp:3320
 msgid "Out of disk space"
 msgstr "Levytila loppu"
 
-#: Project.cpp:3027
-msgid "Could not remove old autosave file: "
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
 msgstr ""
 
-#: Project.cpp:3068
-msgid "New Project"
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
 msgstr ""
 
-#: Project.cpp:3081
+#: Project.cpp:3614
+msgid "Could not remove old autosave file: "
+msgstr "Vanhaa automaattitallennustiedostoa ei voitu poistaa:"
+
+#: Project.cpp:3655
+msgid "New Project"
+msgstr "Uusi projekti"
+
+#: Project.cpp:3668
 msgid "Error writing autosave file"
-msgstr ""
+msgstr "Virhe kirjoitettaessa automaattitallennustiedostoa"
 
-#: Project.cpp:3102
+#: Project.cpp:3693
 msgid "Could not create autosave file: "
-msgstr ""
+msgstr "Automaattitallennustiedostoa ei voitu luoda:"
 
-#: Project.cpp:3385
+#: Project.cpp:3719
 #, c-format
 msgid "Actual Rate: %d"
 msgstr ""
 
-#: ../src/Resample.cpp:35
+#: Resample.cpp:42
 msgid "Libresample by Dominic Mazzoni and Julius Smith"
 msgstr "Libresample, tehnyt Dominic Mazzoni and Julius Smith"
 
-#: ../src/Resample.cpp:46
+#: Resample.cpp:53
 msgid "High-quality Sinc Interpolation"
 msgstr "Korkealaatuinen Sinc-interpolointi"
 
-#: ../src/Resample.cpp:48
+#: Resample.cpp:55
 msgid "Fast Sinc Interpolation"
 msgstr "Nopea Sinc-interpolointi"
 
-#: ../src/Resample.cpp:118
+#: Resample.cpp:125
 msgid "Libsamplerate by Erik de Castro Lopo"
 msgstr "Libsamplerate, tehnyt Erik de Castro Lopo"
 
-#: ../src/Resample.cpp:211
+#: Resample.cpp:218
 #, c-format
 msgid "Libsamplerate error: %d\n"
 msgstr "Libsamplerate virhe: %d\n"
 
-#: ../src/Resample.cpp:233 ../src/Resample.cpp:243
+#: Resample.cpp:240
+#: Resample.cpp:250
 msgid "Resampling disabled."
 msgstr "Uudelleennäytteistys pois käytöstä"
 
@@ -2719,320 +3314,264 @@ msgstr ""
 
 #: Screenshot.cpp:384
 msgid "Saved "
-msgstr ""
+msgstr "Tallennettu"
 
 #: Screenshot.cpp:387
 msgid "Error trying to save file: "
-msgstr ""
+msgstr "Virhe yritettäessä tallentaa tiedostoa:"
 
-#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
 msgid "Gap detected in project file\n"
 msgstr ""
 
-#: effects/Effect.cpp:254 effects/Effect.cpp:370 effects/Phaser.cpp:595
-#: effects/Wahwah.cpp:582 effects/audiounits/AudioUnitEffect.cpp:852
+#: ShuttleGui.cpp:1972
+#: effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
-msgstr ""
+msgstr "&Esikatselu"
 
-#: effects/nyquist/Nyquist.cpp:826 effects/nyquist/Nyquist.cpp:990
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
-msgstr ""
-
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
+msgstr "&Virheidenjäljitys"
 
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr ""
+#: SoundActivatedRecord.cpp:58
+#, fuzzy
+msgid "Activation level (dB):"
+msgstr "Vahvistus (dB):"
 
-#: SplashDialog.cpp:58
+#: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
-msgstr ""
+msgstr "&Tervetuloa käyttämään Audacitya!"
 
-#: SplashDialog.cpp:110
+#: SplashDialog.cpp:112
 msgid "Don't show this again at start up"
-msgstr ""
+msgstr "Älä näytä tätä uudelleen käynnistyksessä"
 
-#: Tags.cpp:621
+#: Tags.cpp:640
 msgid "Artist Name"
-msgstr ""
+msgstr "Artistin nimi"
 
-#: Tags.cpp:622
+#: Tags.cpp:641
 msgid "Track Title"
-msgstr ""
+msgstr "Raidan nimi"
 
-#: Tags.cpp:623
+#: Tags.cpp:642
 msgid "Album Title"
-msgstr ""
+msgstr "Albumin nimi"
 
-#: Tags.cpp:953
-#, fuzzy
+#: Tags.cpp:643
 msgid "Track Number"
-msgstr "Raidan numero:"
+msgstr "Raidan numero"
 
-#: ../src/Tags.cpp:465
+#: Tags.cpp:644
+#: Tags.cpp:2147
 msgid "Year"
 msgstr "Vuosi"
 
-#: Tags.cpp:979
+#: Tags.cpp:645
 msgid "Genre"
-msgstr ""
+msgstr "Tyylilaji"
 
-#: ../src/Tags.cpp:475
+#: Tags.cpp:646
+#: Tags.cpp:2157
+#: prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Kommentit"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
-#: Tags.cpp:769
+#: Tags.cpp:813
 msgid "Tag Name"
-msgstr ""
+msgstr "Tunnisteen nimi"
 
-#: Tags.cpp:770
+#: Tags.cpp:814
 msgid "Tag Value"
-msgstr ""
+msgstr "Tunnisteen arvo"
 
-#: prefs/KeyConfigPrefs.cpp:114
+#: Tags.cpp:829
+#: Tags.cpp:1486
+#: prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
-msgstr ""
+msgstr "&Tyhjennä"
 
-#: Tags.cpp:791
+#: Tags.cpp:835
 msgid "Genres"
-msgstr ""
+msgstr "Tyylilajit"
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
-#: Tags.cpp:1070
+#: Tags.cpp:845
+#: Tags.cpp:1470
+#: Tags.cpp:1997
 msgid "Template"
-msgstr ""
+msgstr "Malli"
 
-#: Tags.cpp:1073 prefs/KeyConfigPrefs.cpp:124
+#: Tags.cpp:849
+#: Tags.cpp:1474
+#: Tags.cpp:2001
+#: prefs/KeyConfigPrefs.cpp:126
 msgid "&Load..."
-msgstr ""
+msgstr "&Lataa..."
 
-#: Tags.cpp:1078 prefs/KeyConfigPrefs.cpp:123
+#: Tags.cpp:850
+#: Tags.cpp:1475
+#: Tags.cpp:2002
+#: prefs/KeyConfigPrefs.cpp:125
 msgid "&Save..."
-msgstr ""
+msgstr "&Tallenna..."
 
-#: Tags.cpp:808 Tags.cpp:1434 Tags.cpp:1962
+#: Tags.cpp:852
+#: Tags.cpp:1477
+#: Tags.cpp:2004
 msgid "S&et Default"
-msgstr ""
+msgstr "&Aseta oletukseksi"
 
-#: Tags.cpp:958 Tags.cpp:1597 Tags.cpp:2326
+#: Tags.cpp:1002
+#: Tags.cpp:1640
+#: Tags.cpp:2368
 msgid "Edit Genres"
-msgstr ""
-
-#: Tags.cpp:991 Tags.cpp:1003 Tags.cpp:1019 Tags.cpp:1032 Tags.cpp:1635
-#: Tags.cpp:1647 Tags.cpp:1663 Tags.cpp:1676 Tags.cpp:2369 Tags.cpp:2381
-#: Tags.cpp:2397 Tags.cpp:2410
+msgstr "Muokkaa tyylilajeja"
+
+#: Tags.cpp:1035
+#: Tags.cpp:1047
+#: Tags.cpp:1062
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1690
+#: Tags.cpp:1705
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2423
+#: Tags.cpp:2438
+#: Tags.cpp:2451
 msgid "Reset Genres"
-msgstr ""
-
-#: Tags.cpp:991 Tags.cpp:1032 Tags.cpp:1635 Tags.cpp:1676 Tags.cpp:2369
-#: Tags.cpp:2410
+msgstr "Aseta tyylilajit oletusarvoihin"
+
+#: Tags.cpp:1035
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2451
 msgid "Unable to save genre file."
-msgstr ""
+msgstr "Tyylilajitiedostoa ei voida tallentaa."
 
-#: Tags.cpp:1002 Tags.cpp:1646 Tags.cpp:2380
+#: Tags.cpp:1046
+#: Tags.cpp:1689
+#: Tags.cpp:2422
 msgid "Are you sure you want to reset the genre list to defaults?"
-msgstr ""
+msgstr "Haluatko varmasti palauttaa tyylilajilistan oletusarvoihin?"
 
-#: Tags.cpp:1019 Tags.cpp:1663 Tags.cpp:2397
+#: Tags.cpp:1062
+#: Tags.cpp:1705
+#: Tags.cpp:2438
 msgid "Unable to open genre file."
-msgstr ""
+msgstr "Tyylilajitiedostoa ei voida avata."
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
-#: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
 msgid "Error loading metadata"
-msgstr ""
-
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr ""
-
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Suurin pituus atribuutille '%s' on %d merkkiä. Tieto katkaistiin."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Nimi"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Esittäjä"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Albumi"
+msgstr "Virhe ladattaessa metatietoja"
+
+#: Tags.cpp:1097
+#: Tags.cpp:1151
+#: Tags.cpp:1751
+#: Tags.cpp:1787
+#: Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "Tallenna metatiedot nimellä:"
 
-#: Theme.cpp:629
+#: Theme.cpp:638
 #, c-format
 msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
+msgstr "Audacity ei voinut kirjoittaa tiedostoa:\n"
+"  %s."
 
-#: Theme.cpp:647
+#: Theme.cpp:656
 #, c-format
 msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
+msgstr "Audacity ei voinut avata tiedostoa:\n"
+"  %s\n"
+"kirjoitusta varten."
 
-#: Theme.cpp:655
+#: Theme.cpp:664
 #, c-format
 msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
+msgstr "Audacity ei voinut kirjoittaa kuvia tiedostoon:\n"
+"  %s."
 
-#: Theme.cpp:790
+#: Theme.cpp:799
 #, c-format
 msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
+msgstr "Audacity ei voinut löytää tiedostoa:\n"
+"  %s.\n"
+"Teemaa ei ladattu."
 
-#: Theme.cpp:798 Theme.cpp:886
+#: Theme.cpp:807
+#: Theme.cpp:896
 #, c-format
 msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
+msgstr "Audacity ei voinut ladata tiedostoa:\n"
+"  %s.\n"
+"Ehkä virheellinen png-muoto?"
 
-#: Theme.cpp:814
+#: Theme.cpp:823
 msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
+msgstr "Audacity ei voinut lukea sen oletusteemaa.\n"
+"Ilmoita tästä virheestä."
 
-#: Theme.cpp:908
+#: Theme.cpp:918
 #, c-format
 msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
 msgstr ""
 
-#: Theme.cpp:932
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
 #, c-format
 msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
+msgstr "Ei voitu luoda hakemistoa:\n"
+"  %s"
 
-#: Theme.cpp:953
+#: Theme.cpp:963
 #, c-format
 msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
+msgstr "Audacity ei voinut tallentaa tiedostoa:\n"
+"  %s"
 
-#: Theme.cpp:965
+#: Theme.cpp:975
 #, c-format
 msgid "All required files in:\n"
 "  %s\n"
@@ -3040,413 +3579,524 @@ msgid "All required files in:\n"
 msgstr ""
 
 #: TimeDialog.cpp:53
-msgid "Specify Time"
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "Kesto"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
 msgstr ""
 
-#: TrackPanel.cpp:452 TrackPanel.cpp:453
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "Äänityksen alku"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "Äänityksen loppu"
+
+#: TimerRecordDialog.cpp:230
+#, fuzzy
+msgid "Audacity Timer Record Progress"
+msgstr "Audacity asetukset"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+#, fuzzy
+msgid "Start Date"
+msgstr "Aseta näytteenottotaajuus"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
+#: TrackPanel.cpp:457
+#: TrackPanel.cpp:458
 msgid "Track Panel"
 msgstr ""
 
-#: ../src/AStatus.cpp:81 ../src/TrackPanel.cpp:822
-#: ../src/prefs/FileFormatPrefs.cpp:105 ../src/prefs/QualityPrefs.cpp:91
+#: TrackPanel.cpp:541
+#: prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Muu..."
 
-#: ../src/TrackPanel.cpp:830 ../src/TrackPanel.cpp:851
-#: ../src/TrackPanel.cpp:860 ../src/TrackPanel.cpp:868
+#: TrackPanel.cpp:549
+#: TrackPanel.cpp:571
+#: TrackPanel.cpp:580
+#: TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "Nimi..."
 
-#: ../src/TrackPanel.cpp:832 ../src/TrackPanel.cpp:853
-#: ../src/TrackPanel.cpp:864 ../src/TrackPanel.cpp:870
+#: TrackPanel.cpp:551
+#: TrackPanel.cpp:573
+#: TrackPanel.cpp:584
+#: TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
 msgstr "Siirrä raita ylös"
 
-#: ../src/TrackPanel.cpp:833 ../src/TrackPanel.cpp:854
-#: ../src/TrackPanel.cpp:865 ../src/TrackPanel.cpp:871
+#: TrackPanel.cpp:552
+#: TrackPanel.cpp:574
+#: TrackPanel.cpp:585
+#: TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
 msgstr "Siirrä raita alas"
 
-#: ../src/TrackPanel.cpp:835
+#: TrackPanel.cpp:554
+#: effects/ToneGen.cpp:319
+#: prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Ääniaalto"
 
-#: ../src/TrackPanel.cpp:836
+#: TrackPanel.cpp:555
+#: prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "Ääniaalto (dB)"
 
-#: ../src/TrackPanel.cpp:838
+#: TrackPanel.cpp:557
+#: prefs/GUIPrefs.cpp:157
+#, fuzzy
+msgid "Spectrum log(f)"
+msgstr "Spektri"
+
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558
+#: prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
 msgstr "Sävelkorkeus (EAC)"
 
-#: ../src/TrackPanel.cpp:840
+#: TrackPanel.cpp:560
+#: TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "Mono"
 
-#: ../src/TrackPanel.cpp:841
+#: TrackPanel.cpp:561
+#: TrackPanel.cpp:6095
 msgid "Left Channel"
 msgstr "Vasen kanava"
 
-#: ../src/TrackPanel.cpp:842
+#: TrackPanel.cpp:562
+#: TrackPanel.cpp:6095
 msgid "Right Channel"
 msgstr "Oikea kanava"
 
-#: ../src/TrackPanel.cpp:843
+#: TrackPanel.cpp:563
 msgid "Make Stereo Track"
 msgstr "Yhdistä stereoraidaksi"
 
-#: ../src/TrackPanel.cpp:844
+#: TrackPanel.cpp:564
 msgid "Split Stereo Track"
 msgstr "Jaa stereoraita"
 
-#: ../src/TrackPanel.cpp:846
+#: TrackPanel.cpp:566
 msgid "Set Sample Format"
 msgstr "Aseta näytteen muoto"
 
-#: ../src/AStatus.cpp:352 ../src/TrackPanel.cpp:848 ../src/TrackPanel.cpp:4322
+#: TrackPanel.cpp:568
+#: TrackPanel.cpp:6341
 msgid "Set Rate"
 msgstr "Aseta näytteenottotaajuus"
 
-#: ../src/TrackPanel.cpp:856
+#: TrackPanel.cpp:576
 msgid "Up Octave"
 msgstr "Oktaavi ylös"
 
-#: ../src/TrackPanel.cpp:857
+#: TrackPanel.cpp:577
 msgid "Down Octave"
 msgstr "Oktaavi alas"
 
-#: ../src/TrackPanel.cpp:862
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "Fontti..."
 
-#: ../src/TrackPanel.cpp:873
+#: TrackPanel.cpp:593
 msgid "Set Range..."
 msgstr "Aseta alue..."
 
-#: ../src/EditToolBar.cpp:150
+#: TrackPanel.cpp:597
+#: toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../src/TrackPanel.cpp:1513
+#: TrackPanel.cpp:1258
 msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
 msgstr "Klikkaa lähentääksesi pystysuunnassa, Vaihto-klikkaus loitontaa, raahaa piirtääksesi alueen, johon lähennetään."
 
-#: ../src/TrackPanel.cpp:1519
+#: TrackPanel.cpp:1263
 msgid "Drag the label vertically to change the order of the tracks."
 msgstr "Raahaa nimiosaa pystysuunnassa muuttaaksesi raitojen järjestystä."
 
-#: ../src/TrackPanel.cpp:1616
+#: TrackPanel.cpp:1283
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr "Klikkaa ja raahaa muuttaaksesi stereoraitojen suhteellista kokoa."
 
-#: ../src/TrackPanel.cpp:1621
+#: TrackPanel.cpp:1286
 msgid "Click and drag to resize the track."
 msgstr "Klikkaa ja raahaa muuttaaksesi raidan kokoa."
 
-#: TrackPanel.cpp:1298
+#: TrackPanel.cpp:1317
 msgid "Drag one or more label boundaries"
 msgstr ""
 
-#: TrackPanel.cpp:1299
+#: TrackPanel.cpp:1318
 msgid "Drag label boundary"
 msgstr ""
 
-#: ../src/TrackPanel.cpp:1541
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1334
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr "Monitoimitila: Cmd-, hiiri- ja näppäimistöasetuksiin"
 
-#: ../src/TrackPanel.cpp:1543
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1337
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr "Monitoimitila: Ctrl-P: hiiri- ja näppäimistöasetuksiin"
 
-#: ../src/TrackPanel.cpp:1574
+#: TrackPanel.cpp:1383
 msgid "Click and drag to move left selection boundary."
 msgstr "Klikkaa ja raahaa siirtääksesi valinnan vasenta reunaa."
 
-#: ../src/TrackPanel.cpp:1579
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move right selection boundary."
 msgstr "Klikkaa ja raahaa siirtääksesi valinnan oikeaa reunaa."
 
-#: ../src/TrackPanel.cpp:3314
+#: TrackPanel.cpp:1730
+#: TrackPanel.cpp:3959
+#: TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
 msgid "Modified Label"
 msgstr "Muokattu merkkiä"
 
-#: ../src/TrackPanel.cpp:3315
+#: TrackPanel.cpp:1731
+#: TrackPanel.cpp:3960
+#: TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
 msgid "Label Edit"
 msgstr "Muokkaa merkkiä"
 
-#: ../src/TrackPanel.cpp:1904
+#: TrackPanel.cpp:1971
 msgid "Adjusted envelope."
 msgstr "Muokattu verhoa"
 
-#: ../src/TrackPanel.cpp:1905 ../src/prefs/MousePrefs.cpp:98
+#: TrackPanel.cpp:1972
+#: prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Verho"
 
-#: TrackPanel.cpp:2033
+#: TrackPanel.cpp:2123
 msgid "Moved clip to another track"
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2012
+#: TrackPanel.cpp:2127
 msgid "left"
 msgstr "vasemmalle"
 
-#: ../src/TrackPanel.cpp:2012
+#: TrackPanel.cpp:2127
 msgid "right"
 msgstr "oikealle"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2039
+#: TrackPanel.cpp:2129
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr ""
 
-#: ../src/prefs/MousePrefs.cpp:97
+#: TrackPanel.cpp:2133
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "Aikakorjaus"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
+#: TrackPanel.cpp:2933
+#, fuzzy
+msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr "Zoomaus ei ole tarpeeksi suuri. Lähennä näkymää kunnes näet yksittäiset näytteet."
 
-#: ../src/TrackPanel.cpp:2637
+#: TrackPanel.cpp:3205
 msgid "Moved Sample"
 msgstr "Siirretty näytettä"
 
-#: ../src/TrackPanel.cpp:2638
+#: TrackPanel.cpp:3206
 msgid "Sample Edit"
 msgstr "Näytteen muokkaus"
 
-#: ../src/TrackPanel.cpp:2703
+#: TrackPanel.cpp:3305
 #, c-format
 msgid "Removed track '%s.'"
-msgstr "Poistettu raita '%s'."
+msgstr "Poistettu raita \"%s\"."
 
-#: ../src/TrackPanel.cpp:2705
+#: TrackPanel.cpp:3307
 msgid "Track Remove"
 msgstr "Raidan poisto"
 
-#: ../src/TrackPanel.cpp:2806
+#: TrackPanel.cpp:3448
 msgid "Moved gain slider"
 msgstr "Siirretty vahvistussäädintä"
 
-#: ../src/TrackPanel.cpp:2806
+#: TrackPanel.cpp:3448
 msgid "Moved pan slider"
 msgstr "Muutettu panorointia"
 
 #  i18n-hint: Title of the Gain slider, used to adjust the volume
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: ../src/TrackPanel.cpp:2807 ../src/TrackPanel.cpp:4726
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5703
+#: TrackPanel.cpp:7244
 msgid "Gain"
 msgstr "Vahvistus"
 
 #  i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: ../src/TrackPanel.cpp:2807 ../src/TrackPanel.cpp:4733
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5641
+#: TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "Pan."
 
-#: ../src/TrackPanel.cpp:4387 ../src/effects/ChangePitch.cpp:277
+#: TrackPanel.cpp:3576
+#: TrackPanel.cpp:6441
 msgid "up"
 msgstr "ylös"
 
-#: ../src/TrackPanel.cpp:4388 ../src/effects/ChangePitch.cpp:277
+#: TrackPanel.cpp:3580
+#: TrackPanel.cpp:6442
 msgid "down"
 msgstr "alas"
 
-#: ../src/TrackPanel.cpp:4383
+#: TrackPanel.cpp:3587
+#: TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
-msgstr "Siirretty '%s' %s"
+msgstr "Siirretty \"%s\" %s"
 
-#: ../src/TrackPanel.cpp:4389
+#: TrackPanel.cpp:3590
+#: TrackPanel.cpp:6443
 msgid "Move Track"
 msgstr "Siirrä raita"
 
-#: TrackPanel.cpp:3905
+#: TrackPanel.cpp:4155
 msgid "Expand"
 msgstr ""
 
-#: TrackPanel.cpp:3905
+#: TrackPanel.cpp:4155
 msgid "Expanded Cut Line"
 msgstr ""
 
-#: TrackPanel.cpp:3973
+#: TrackPanel.cpp:4164
 msgid "Merge"
 msgstr ""
 
-#: TrackPanel.cpp:3973
+#: TrackPanel.cpp:4164
 msgid "Merged Clips"
 msgstr ""
 
-#: TrackPanel.cpp:3925
+#: TrackPanel.cpp:4176
 msgid "Removed Cut Line"
 msgstr ""
 
-#: TrackPanel.cpp:5210
+#: TrackPanel.cpp:5641
 msgid "Adjusted Pan"
 msgstr ""
 
-#: TrackPanel.cpp:5272
+#: TrackPanel.cpp:5703
 msgid "Adjusted gain"
 msgstr ""
 
-#: TrackPanel.cpp:5428
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
 msgstr ""
 
-#: ../src/TrackPanel.cpp:4087
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Stereo, "
 
-#: ../src/TrackPanel.cpp:4090
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Mono, "
 
-#: ../src/TrackPanel.cpp:4092
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "Vasen, "
 
-#: ../src/TrackPanel.cpp:4094
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "Oikea, "
 
-#: ../src/TrackPanel.cpp:4116 ../src/TrackPanel.cpp:4225
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
-msgstr "Muutettu '%s' -> %s"
+msgstr "Muutettu \"%s\" -> %s"
 
-#: ../src/TrackPanel.cpp:4121
+#: TrackPanel.cpp:6110
 msgid "Channel"
 msgstr "Kanava"
 
-#: ../src/TrackPanel.cpp:4131
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
-msgstr "Jaettu stereoraita '%s'"
+msgstr "Jaettu stereoraita \"%s\""
 
-#: ../src/TrackPanel.cpp:4153
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "%s:sta tehty stereoraita"
 
-#: ../src/TrackPanel.cpp:4156
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
 msgstr "Tee stereoksi"
 
-#: ../src/TrackPanel.cpp:4189
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
-msgstr "Muutettu '%s' %d Hz:iin"
+msgstr "Muutettu \"%s\" %d Hz:iin"
 
-#: ../src/TrackPanel.cpp:4191
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "Näytteenottotaajuuden vaihto"
 
-#: ../src/TrackPanel.cpp:4229
+#: TrackPanel.cpp:6255
 msgid "Format Change"
 msgstr "Vaihda muoto"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Syötä näytteenottotaajuus hertseinä (näytettä sekunnissa) välillä 1 ja 100000:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Kelpaamaton näytteenottotaajuus."
-
-#: ../src/TrackPanel.cpp:4351
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
 msgstr "Vaihda alemmaksi nopeusrajoitukseksi (%):"
 
-#: ../src/TrackPanel.cpp:4352 ../src/TrackPanel.cpp:4353
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
 msgid "Lower speed limit"
 msgstr "Alempi nopeusrajoitus"
 
-#: ../src/TrackPanel.cpp:4358
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
 msgstr "Vaihda ylemmäksi nopeusrajoitukseksi (%):"
 
-#: ../src/TrackPanel.cpp:4359 ../src/TrackPanel.cpp:4360
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
 msgid "Upper speed limit"
 msgstr "Ylempi nopeusrajoitus"
 
-#: ../src/TrackPanel.cpp:4368
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
-msgstr "Aseta alue välille '%d' - '%d'"
+msgstr "Aseta alue välille \"%d\" - \"%d\""
 
-#: ../src/TrackPanel.cpp:4371
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "Aseta alue"
 
-#: ../src/TrackPanel.cpp:4416
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
 msgstr "Vaihda raidan nimeksi:"
 
-#: ../src/TrackPanel.cpp:4417
+#: TrackPanel.cpp:6473
 msgid "Track Name"
 msgstr "Raidan nimi"
 
-#: ../src/TrackPanel.cpp:4420
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
-msgstr "'%s' vaihdettu nimelle '%s'"
+msgstr "\"%s\" vaihdettu nimelle \"%s\""
 
-#: ../src/TrackPanel.cpp:4423
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "Nimen muutos"
 
-#: ../src/TrackPanel.cpp:4454
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
 msgstr "Merkkiraidan fontti"
 
-#: TrackPanel.cpp:6227
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
 msgid "Face name"
 msgstr ""
 
-#: TrackPanel.cpp:6236
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
 msgid "Face size"
 msgstr ""
 
-#: ../src/TrackPanel.cpp:4701
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Mykkä"
 
-#: ../src/TrackPanel.cpp:4701
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Soolo"
 
-#: TrackPanelAx.cpp:266
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
 msgstr ""
 
-#: TrackPanelAx.cpp:274
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
 msgstr ""
 
-#: TrackPanelAx.cpp:282
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
-msgstr ""
+msgstr "Raita %d"
 
-#: TrackPanelAx.cpp:288
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr ""
 
-#: TrackPanelAx.cpp:293
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
 msgstr ""
 
-#: TrackPanelAx.cpp:297
+#: TrackPanelAx.cpp:304
 msgid " Select On"
 msgstr ""
 
-#: VoiceKey.cpp:88 VoiceKey.cpp:238 VoiceKey.cpp:376 VoiceKey.cpp:517
+#: VoiceKey.cpp:88
+#: VoiceKey.cpp:238
+#: VoiceKey.cpp:376
+#: VoiceKey.cpp:517
 msgid "Selection is too small to use voice key."
 msgstr ""
 
@@ -3469,94 +4119,110 @@ msgstr ""
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr ""
 
-#: ../src/WaveTrack.cpp:128
+#: WaveTrack.cpp:88
 msgid "Audio Track"
 msgstr "Audioraita"
 
-#: WaveTrack.cpp:515 WaveTrack.cpp:534
+#: WaveTrack.cpp:597
+#: WaveTrack.cpp:616
+#: WaveTrack.cpp:1057
+#: WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
 msgstr ""
 
-#: WaveTrack.cpp:1583
+#: WaveTrack.cpp:2086
 msgid "There is not enough room available to expand the cut line"
 msgstr ""
 
-#: ../src/commands/CommandManager.cpp:323
+#: commands/CommandManager.cpp:555
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "Laajennukset 1-%i"
 
-#: ../src/commands/CommandManager.cpp:337
+#: commands/CommandManager.cpp:569
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "Laajennukset %i-%i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
-#: commands/CommandManager.cpp:724
+#: commands/CommandManager.cpp:892
 msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:726
+#: commands/CommandManager.cpp:894
 msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:728
+#: commands/CommandManager.cpp:896
 msgid "You must first select some audio for this to use."
 msgstr ""
 
-#: commands/CommandManager.cpp:730
+#: commands/CommandManager.cpp:898
 msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
-#: ../src/commands/CommandManager.cpp:640
+#: commands/CommandManager.cpp:1083
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
 msgstr "Ladattu %d näppäinoikotietä\n"
 
-#: ../src/commands/CommandManager.cpp:643
+#: commands/CommandManager.cpp:1085
 msgid "Loading keyboard shortcuts"
 msgstr "Ladataan näppäinoikoteitä"
 
-#: ../src/effects/Amplify.cpp:34
+#: effects/Amplify.cpp:52
 #, c-format
 msgid "Applied effect: %s %.1f dB"
 msgstr "Käytetty efektiä: %s %.1f dB"
 
-#: ../src/effects/Amplify.cpp:63
+#: effects/Amplify.cpp:139
 msgid "Amplify"
 msgstr "Vahvista"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
+#: effects/Amplify.cpp:155
+#: effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+#, fuzzy
+msgid "by Dominic Mazzoni"
 msgstr "Vahvista, tehnyt Dominic Mazzoni"
 
-#: ../src/effects/Amplify.cpp:132
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "Vahvistus (dB):"
 
-#: ../src/effects/Amplify.cpp:152
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "Uusi huippukohdan voimakkuus (dB):"
 
-#: ../src/effects/Amplify.cpp:164
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
 msgstr "Salli leikkautuminen"
 
-#: ../src/effects/Amplify.h:47
+#: effects/Amplify.cpp:222
+#: effects/Amplify.cpp:279
+#: effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
+#: effects/Amplify.h:37
 msgid "Amplify..."
 msgstr "Vahvista..."
 
-#: ../src/effects/Amplify.h:51
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "Vahvistetaan"
 
@@ -3564,8 +4230,10 @@ msgstr "Vahvistetaan"
 msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
 msgstr ""
 
-#: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:451
-#: effects/AutoDuck.cpp:578
+#: effects/AutoDuck.cpp:126
+#: effects/AutoDuck.cpp:138
+#: effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:570
 msgid "Auto Duck"
 msgstr ""
 
@@ -3573,80 +4241,87 @@ msgstr ""
 msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
 msgstr ""
 
-#: effects/AutoDuck.cpp:463
+#: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
 msgstr ""
 
-#: effects/AutoDuck.cpp:485
+#: effects/AutoDuck.cpp:487
 msgid "Duck amount:"
 msgstr ""
 
-#: effects/AutoDuck.cpp:490
+#: effects/AutoDuck.cpp:492
 msgid "Maximum pause:"
-msgstr ""
-
-#: effects/AutoDuck.cpp:492 effects/AutoDuck.cpp:497 effects/AutoDuck.cpp:502
-#: effects/AutoDuck.cpp:507 effects/AutoDuck.cpp:512
-#: prefs/AudioIOPrefs.cpp:162 prefs/AudioIOPrefs.cpp:164
-#: prefs/AudioIOPrefs.cpp:188 prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:198 widgets/TimeTextCtrl.cpp:197
+msgstr "Enimmäispysäytys:"
+
+#. i18n-hint: Name of time display format that shows time in seconds
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: effects/Contrast.cpp:263
+#: effects/Contrast.cpp:286
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
+#: prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163
+#: prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
-msgstr ""
+msgstr "sekuntia"
 
-#: effects/AutoDuck.cpp:495
+#: effects/AutoDuck.cpp:497
 msgid "Outer fade down length:"
 msgstr ""
 
-#: effects/AutoDuck.cpp:500
+#: effects/AutoDuck.cpp:502
 msgid "Outer fade up length:"
 msgstr ""
 
-#: effects/AutoDuck.cpp:505
+#: effects/AutoDuck.cpp:507
 msgid "Inner fade down length:"
 msgstr ""
 
-#: effects/AutoDuck.cpp:510
+#: effects/AutoDuck.cpp:512
 msgid "Inner fade up length:"
 msgstr ""
 
-#: effects/AutoDuck.cpp:519 effects/Compressor.cpp:479
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:494
 #, fuzzy
 msgid "Threshold:"
 msgstr "Kynnys: "
 
-#: effects/AutoDuck.cpp:578
+#: effects/AutoDuck.cpp:570
 msgid "Please enter valid values."
-msgstr ""
+msgstr "Anna kelvollisia arvoja."
 
-#: effects/AutoDuck.cpp:712
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
-msgstr ""
+msgstr "Esikatselu ei ole käytössä"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr ""
 
-#: effects/AutoDuck.h:102
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr ""
 
-#: ../src/LangChoice.cpp:94 ../src/Tags.cpp:721 ../src/effects/Amplify.cpp:187
-#: ../src/effects/AvcCompressor.cpp:716 ../src/effects/BassBoost.cpp:332
-#: ../src/effects/ChangePitch.cpp:393 ../src/effects/ChangeSpeed.cpp:379
-#: ../src/effects/ChangeTempo.cpp:284 ../src/effects/Compressor.cpp:484
-#: ../src/effects/Echo.cpp:242 ../src/effects/Equalization.cpp:731
-#: ../src/effects/Filter.cpp:482 ../src/effects/Normalize.cpp:258
-#: ../src/effects/Phaser.cpp:576 ../src/effects/Repeat.cpp:251
-#: ../src/effects/VST/VSTEffect.cpp:98 ../src/effects/VST/VSTEffect.cpp:455
-#: ../src/effects/Wahwah.cpp:563 ../src/effects/ladspa/LadspaEffect.cpp:498
-#: ../src/effects/nyquist/Nyquist.cpp:736
-#: ../src/effects/nyquist/Nyquist.cpp:883
-#: ../src/effects/nyquist/Nyquist.cpp:949 ../src/prefs/FileFormatPrefs.cpp:471
-#: ../src/prefs/PrefsDialog.cpp:100 ../src/widgets/Warning.cpp:56
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "OK"
 
-#: ../src/effects/BassBoost.cpp:36
+#: effects/BassBoost.cpp:52
 #, c-format
 msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
 msgstr "Käytetty efektiä: %s taajuus = %.0f Hz, vahvistus = %.0f dB"
@@ -3656,427 +4331,838 @@ msgid "Bass Boost"
 msgstr ""
 
 #: effects/BassBoost.cpp:182
+#: effects/Phaser.cpp:219
+#: effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr ""
 
-#: ../src/effects/BassBoost.cpp:286
+#: effects/BassBoost.cpp:196
+#: effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
 msgstr "Taajuus (Hz):"
 
-#: ../src/effects/BassBoost.cpp:302
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Vahvistus (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
-#, fuzzy
 msgid "BassBoost..."
 msgstr "Bassokorostus..."
 
-#: ../src/effects/BassBoost.h:48
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
 msgstr "Bassotaajuuksia vahvistetaan"
 
 #: effects/ChangeLength.h:26
 msgid "Change Length..."
-msgstr ""
+msgstr "Muuta pituutta..."
 
-#: effects/ChangeLength.h:30
+#: effects/ChangeLength.h:34
 msgid "Changing Length..."
-msgstr ""
+msgstr "Muutetaan pituutta..."
 
-#: ../src/effects/ChangePitch.cpp:56
+#: effects/ChangePitch.cpp:55
 #, c-format
 msgid "Applied effect: %s %.2f semitones"
 msgstr "Käytetty efektiä: %s %.2f puolisävelaskelta"
 
-#: ../src/effects/ChangePitch.cpp:119
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
 msgstr "Muuta sävelkorkeutta"
 
-#: ../src/effects/ChangePitch.cpp:242
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
 msgstr "Muuta sävelkorkeutta muuttamatta tempoa"
 
-#: ../src/effects/ChangePitch.cpp:247 ../src/effects/ChangeSpeed.cpp:287
-#: ../src/effects/ChangeTempo.cpp:164
+#: effects/ChangePitch.cpp:258
+#: effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "tehnyt Vaughan Johnson && Dominic Mazzoni"
 
-#: ../src/effects/ChangePitch.cpp:252 ../src/effects/ChangeTempo.cpp:169
+#: effects/ChangePitch.cpp:260
+#: effects/ChangeTempo.cpp:175
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "käyttäen SoundTouch:a, jonka tehnyt Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
+#: effects/ChangePitch.cpp:269
+#, fuzzy
+msgid "Pitch:"
 msgstr "Sävelkorkeus:"
 
-#: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
-#: ../src/effects/ChangeSpeed.cpp:351 ../src/effects/ChangeTempo.cpp:223
-#: ../src/effects/ChangeTempo.cpp:254
-msgid "to"
-msgstr "->"
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+#, fuzzy
+msgid "Down"
+msgstr "alas"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+#, fuzzy
+msgid "To Pitch"
+msgstr "Muuta sävelkorkeutta"
 
-#: ../src/effects/ChangePitch.cpp:299
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
 msgstr "Puolisävelaskelia:"
 
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Taajuuden muutos (Hz):"
+#: effects/ChangePitch.cpp:316
+#, fuzzy
+msgid "Semitones in half-steps"
+msgstr "Puolisävelaskelia:"
 
-#: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
-#: ../src/effects/ChangeTempo.cpp:182
+#: effects/ChangePitch.cpp:326
+#: effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206
+#: effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+#, fuzzy
+msgid "From frequency in hertz"
+msgstr "Logaritminen taajuus"
+
+#: effects/ChangePitch.cpp:331
+#: effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211
+#: effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "->"
+
+#: effects/ChangePitch.cpp:332
+#, fuzzy
+msgid "To frequency in seconds"
+msgstr "Logaritminen taajuus"
+
+#: effects/ChangePitch.cpp:338
+#: effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
 msgid "Percent Change:"
 msgstr "Muutosprosentti:"
 
-#: ../src/effects/ChangePitch.h:31
+#: effects/ChangePitch.cpp:343
+#: effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358
+#: effects/ChangeTempo.cpp:195
+#, fuzzy
+msgid "Percent Change"
+msgstr "Muutosprosentti:"
+
+#: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Muuta sävelkorkeutta..."
 
-#: ../src/effects/ChangePitch.h:35
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
 msgstr "Muutetaan sävelkorkeutta"
 
-#: ../src/effects/ChangeSpeed.cpp:40 ../src/effects/ChangeTempo.cpp:43
+#: effects/ChangeSpeed.cpp:54
+#: effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "Käytetty efektiä: %s %.1f%%"
 
-#: ../src/effects/ChangeSpeed.cpp:47
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
 msgstr "Muuta nopeutta"
 
-#: ../src/effects/ChangeSpeed.cpp:282
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Muuta nopeutta, vaikuttaen tempoon ja sävelkorkeuteen"
-
-#: ../src/effects/ChangeSpeed.cpp:292
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "käyttäen SampleRate:a, jonka tehnyt Erik de Castro Lopo"
-
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
 #  unimportant, not relevant).
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
 msgid "n/a"
 msgstr "ei arvoa"
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
+#: effects/ChangeSpeed.cpp:334
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Muuta nopeutta, vaikuttaen tempoon ja sävelkorkeuteen"
+
+#: effects/ChangeSpeed.cpp:338
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "käyttäen SampleRate:a, jonka tehnyt Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+#, fuzzy
+msgid "Standard Vinyl RPM:"
 msgstr "Vinyylilevyn kierrosluku:"
 
-#: ../src/effects/ChangeSpeed.h:37
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
 msgstr "Muuta nopeutta..."
 
-#: ../src/effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
 msgstr "Muutetaan nopeutta"
 
-#: ../src/effects/ChangeTempo.cpp:62
+#: effects/ChangeTempo.cpp:138
 msgid "Change Tempo"
 msgstr "Muuta tempoa"
 
-#: ../src/effects/ChangeTempo.cpp:159
+#: effects/ChangeTempo.cpp:171
 msgid "Change Tempo without Changing Pitch"
 msgstr "Muuta tempoa muuttamatta sävelkorkeutta"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
+#: effects/ChangeTempo.cpp:203
+#, fuzzy
+msgid "Beats per minute:"
 msgstr "Iskua minuutissa (BPM) muutos:"
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Pituuden muutos (sekunteina):"
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:216
+#, fuzzy
+msgid "Length (seconds):"
+msgstr "Pituus (sekunteina)"
 
-#: ../src/effects/ChangeTempo.h:40
+#: effects/ChangeTempo.cpp:220
+#, fuzzy
+msgid "From length in seconds"
+msgstr "Pituus (sekunteina)"
+
+#: effects/ChangeTempo.cpp:225
+#, fuzzy
+msgid "To length in seconds"
+msgstr "Pituus (sekunteina)"
+
+#: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
 msgstr "Muuta tempoa..."
 
-#: ../src/effects/ChangeTempo.h:44
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
 msgstr "Muutetaan tempoa"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
-msgstr ""
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
+msgstr "Naksahdusten poisto..."
 
-#: ../src/effects/ClickRemoval.cpp:317
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Naksahdusten ja poksahdusten poisto, tehnyt Craig DeForest"
 
-#: effects/ClickRemoval.cpp:350
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
-#: effects/ClickRemoval.cpp:362
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
-#: ../src/effects/ClickRemoval.h:42
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
+#: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Naksahdusten poisto..."
 
-#: ../src/effects/ClickRemoval.h:46
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
 msgstr "Poistetaan naksahduksia ja poksahduksia..."
 
-#: ../src/effects/Compressor.cpp:43
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "Dynamiikka-alueen kompressori"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dynamiikka-alueen kompressori, tehnyt by Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+#, fuzzy
+msgid "Threshold"
+msgstr "Kynnys: "
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr "Suhde:"
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Suhde: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "Suhde"
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
+msgstr "Nousuaika: "
+
+#: effects/Compressor.cpp:514
+#, fuzzy
+msgid "Attack Time"
 msgstr "Nousuaika: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:469
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalisoi 0dB:iin kompression jälkeen"
 
-#: ../src/effects/Compressor.cpp:525
-#, c-format
-msgid "Threshold: %d dB"
+#: effects/Compressor.cpp:563
+#, fuzzy, c-format
+msgid "Threshold %d dB"
 msgstr "Kynnys: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
+msgid "%3d dB"
+msgstr "%3d dB"
+
+#: effects/Compressor.cpp:567
+#, fuzzy, c-format
+msgid "Ratio %.0f to 1"
 msgstr "Suhde: %.0f:1"
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:568
 #, c-format
-msgid "Ratio: %.1f:1"
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
+#, fuzzy, c-format
+msgid "Ratio %.1f to 1"
 msgstr "Suhde: %.1f:1"
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.1f:1"
+msgstr "%.1f:1"
+
+#: effects/Compressor.cpp:575
+#, fuzzy, c-format
+msgid "Attack Time %.1f secs"
 msgstr "Nousuaika: %.1f s."
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576
+#: effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
-msgstr ""
+msgid "%.1f secs"
+msgstr "%.1f secs"
+
+#: effects/Compressor.cpp:578
+#, fuzzy, c-format
+msgid "Decay Time %.1f secs"
+msgstr "Nousuaika: %.1f s."
 
-#: ../src/effects/Compressor.h:36
+#: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "Kompressori..."
 
-#: ../src/effects/Compressor.h:40
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
 msgstr "Kompressoidaan..."
 
-#: effects/DtmfGen.cpp:47
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr "Terve.\n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193
+#: effects/Contrast.cpp:204
+#: effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr "Parametrit"
+
+#: effects/Contrast.cpp:242
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Alku"
+
+#: effects/Contrast.cpp:243
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Loppu"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr "Edusta:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr "Tausta:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr "Tlos"
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+msgid "Reset"
+msgstr "Palauta"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "Tietoja"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328
+#: effects/Contrast.cpp:336
+#: effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191
+#: effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f dB"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr ""
 
-#: effects/DtmfGen.cpp:382
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr ""
 
-#: effects/DtmfGen.cpp:386
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr ""
 
-#: ../src/effects/ToneGen.cpp:293
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "Amplitudi (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
-msgstr ""
+#: effects/DtmfGen.cpp:465
+#, fuzzy
+msgid "Duration:"
+msgstr "Sijainti:"
 
-#: effects/DtmfGen.cpp:407
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:418
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:420
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:421 effects/DtmfGen.cpp:423 effects/DtmfGen.cpp:494
-#: effects/DtmfGen.cpp:495
+#: effects/DtmfGen.cpp:499
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: effects/DtmfGen.cpp:422
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr ""
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
 msgstr ""
 
-#: effects/DtmfGen.h:45
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
 msgstr ""
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
 msgstr ""
 
-#: ../src/effects/Echo.cpp:33
+#: effects/Echo.cpp:48
 #, c-format
 msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
 msgstr "Käytetty efektiä: %s viive = %f sekuntia, vaimenemiskerroin = %f"
 
-#: ../src/effects/Echo.cpp:39 ../src/effects/Echo.cpp:177
+#: effects/Echo.cpp:170
 msgid "Echo"
 msgstr "Kaiku"
 
-#: ../src/effects/Echo.cpp:182
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/Echo.cpp:195
+#: effects/Repeat.cpp:200
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "tehnyt Dominic Mazzoni && Vaughan Johnson"
 
-#: ../src/effects/Echo.cpp:192
+#: effects/Echo.cpp:207
 msgid "Delay time (seconds):"
 msgstr "Viiveen kesto (sekunteina):"
 
-#: ../src/effects/Echo.cpp:211
+#: effects/Echo.cpp:212
 msgid "Decay factor:"
 msgstr "Vaimenemiskerroin:"
 
-#: ../src/effects/Echo.h:36
+#: effects/Echo.h:34
 msgid "Echo..."
 msgstr "Kaiku..."
 
-#: ../src/effects/Echo.h:40
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "Kaiutetaan"
 
-#: effects/Effect.cpp:378
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
-msgstr ""
+msgstr "Valmistellaan esikatselua"
 
-#: effects/Effect.cpp:404
+#: effects/Effect.cpp:497
 msgid "Previewing"
-msgstr ""
+msgstr "Esikatsellaan"
 
-#: ../src/ControlToolBar.cpp:721 ../src/effects/Effect.cpp:329
+#: effects/Effect.cpp:512
 msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
 msgstr "Virhe äänilaitetta avattaessa. Ole hyvä ja tarkista toistolaitteen asetukset ja projektin näytteenottotaajuus."
 
-#: ../src/effects/Effect.h:84
+#: effects/Effect.h:100
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Käytetty efektiä: %s"
 
-#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:329
 msgid "B-spline"
 msgstr ""
 
-#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:330
 msgid "Cosine"
 msgstr ""
 
-#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:331
 msgid "Cubic"
 msgstr ""
 
-#: ../src/effects/Equalization.cpp:156
+#: effects/Equalization.cpp:367
+#: effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "Taajuuskorjaus"
 
-#: effects/Equalization.cpp:865
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
 msgstr ""
 
-#: effects/Equalization.cpp:1013
+#: effects/Equalization.cpp:1033
 msgid "custom"
 msgstr ""
 
-#: effects/Equalization.cpp:971
+#. i18n-hint: && in here is an escape character to get a single &
+#. * on screen, so keep it as is
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr ""
 
-#: effects/Equalization.cpp:992
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr ""
 
-#: effects/Equalization.cpp:994
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr ""
 
-#: effects/Equalization.cpp:1093
+#: effects/Equalization.cpp:1197
 msgid "kHz"
-msgstr ""
+msgstr "kHz"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
 msgstr ""
 
-#: effects/Equalization.cpp:1115
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
-msgstr ""
+msgstr "Graafinen EQ"
 
-#: effects/Equalization.cpp:1131
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
 msgstr ""
 
-#: effects/Equalization.cpp:1140
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
 msgstr ""
 
-#: effects/Equalization.cpp:1048
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
 msgstr ""
 
-#: effects/Equalization.cpp:1058 effects/Equalization.cpp:2244
+#: effects/Equalization.cpp:1273
+#: effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
-msgstr ""
+msgstr "Tallenna nimellä..."
 
-#: effects/Equalization.cpp:1064
+#: effects/Equalization.cpp:1279
 msgid "Flat"
 msgstr ""
 
-#: effects/Equalization.cpp:2243
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
 msgstr ""
 
-#: effects/Equalization.cpp:2343
+#: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
 msgid "Confirm Deletion"
 msgstr ""
 
-#: ../src/effects/Equalization.h:38
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "Taajuuskorjaus..."
 
-#: ../src/effects/Equalization.h:42
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "Ekvalisoidaan"
 
-#: ../src/effects/Fade.h:23
+#: effects/Fade.h:24
 msgid "Fade In"
 msgstr "Häivytys sisään"
 
-#: ../src/effects/Fade.h:27
+#: effects/Fade.h:38
 msgid "Fading In"
 msgstr "Tehdään sisäänhäivytystä"
 
-#: ../src/effects/Fade.h:43
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "Häivytys ulos"
 
-#: ../src/effects/Fade.h:47
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "Tehdään uloshäivytystä"
 
@@ -4094,7 +5180,7 @@ msgstr ""
 
 #: effects/FindClipping.cpp:222
 msgid "by Leland Lucius"
-msgstr ""
+msgstr "Tekijä: Leland Lucius"
 
 #: effects/FindClipping.cpp:234
 msgid "Start threshold (samples):"
@@ -4112,95 +5198,263 @@ msgstr ""
 msgid "Find Clipping..."
 msgstr ""
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr ""
 
-#: ../src/effects/Invert.h:27
+#: effects/Invert.h:27
 msgid "Invert"
 msgstr "Vastaääni"
 
-#: ../src/effects/Invert.h:31
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "Muunnetaan vastaääneksi"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: effects/Leveller.cpp:192
+msgid "Leveller"
 msgstr ""
 
-#: effects/Leveller.cpp:47
-msgid "Heavy"
+#: effects/Leveller.cpp:203
+msgid "None-Skip"
 msgstr ""
 
-#: effects/Leveller.cpp:47
+#: effects/Leveller.cpp:204
 msgid "Light"
 msgstr ""
 
-#: effects/Leveller.cpp:47
+#: effects/Leveller.cpp:205
 msgid "Moderate"
 msgstr ""
 
-#: effects/Leveller.cpp:47
-msgid "None-Skip"
+#: effects/Leveller.cpp:206
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:207
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:208
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
-msgstr ""
+#: effects/Leveller.cpp:212
+#: effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "Tekijä: Lynn Allan"
 
-#: effects/Leveller.cpp:220 effects/Leveller.cpp:233
+#: effects/Leveller.cpp:222
 msgid "Degree of Leveling"
 msgstr ""
 
-#: effects/Leveller.cpp:244
-msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:234
+msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
+msgstr "Kynnys: "
+
 #: effects/Leveller.h:28
 msgid "Leveller..."
 msgstr ""
 
-#: effects/Leveller.h:32
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+#, fuzzy
+msgid "Generator"
+msgstr "Äänigeneraattori"
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+#, fuzzy
+msgid "Converter"
+msgstr "Vastaääni"
+
+#: effects/LoadEffects.cpp:112
+#, fuzzy
+msgid "Analyser"
+msgstr "&Analysoi"
+
+#: effects/LoadEffects.cpp:114
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+#, fuzzy
+msgid "Reverb"
+msgstr "Takaperin"
+
+#: effects/LoadEffects.cpp:124
+#: effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+#, fuzzy
+msgid "Filter"
+msgstr "&Tiedosto"
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+#, fuzzy
+msgid "Multiband"
+msgstr "Monitoimi"
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+#, fuzzy
+msgid "Pitch Shifter"
+msgstr "Sävelkorkeus:"
+
+#: effects/LoadEffects.cpp:152
+#, fuzzy
+msgid "Amplifier"
+msgstr "Vahvista"
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+#, fuzzy
+msgid "Dynamics Processor"
+msgstr "Dynamiikka-alueen kompressori"
+
+#: effects/LoadEffects.cpp:160
+#, fuzzy
+msgid "Compressor"
+msgstr "Kompressori..."
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+#, fuzzy
+msgid "Limiter"
+msgstr "Lineaarinen"
+
+#: effects/LoadEffects.cpp:166
+#, fuzzy
+msgid "Gate"
+msgstr "Liitä"
+
+#: effects/LoadEffects.cpp:199
+#: effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "Kohinan poisto"
+
+#: effects/LoadEffects.cpp:201
+#, fuzzy
+msgid "Pitch and Tempo"
+msgstr "Muuta tempoa"
+
+#: effects/LoadEffects.cpp:203
+#, fuzzy
+msgid "Timeline Changer"
+msgstr "Nimen muutos"
+
+#: effects/LoadEffects.cpp:205
+#, fuzzy
+msgid "Time"
+msgstr "Rajaa"
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
-msgstr ""
+msgstr "Valkoinen"
 
 #: effects/Noise.cpp:38
 msgid "Pink"
-msgstr ""
+msgstr "Vaaleanpunainen"
 
 #: effects/Noise.cpp:39
 msgid "Brown"
-msgstr ""
+msgstr "Ruskea"
 
 #: effects/Noise.cpp:41
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr ""
 
@@ -4208,12 +5462,12 @@ msgstr ""
 msgid "Noise..."
 msgstr ""
 
-#: effects/Noise.h:45
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
 msgstr ""
 
-#: effects/Noise.h:49
+#: effects/Noise.h:59
 msgid "Generating Noise"
 msgstr ""
 
@@ -4227,213 +5481,257 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Kohinan poisto"
-
-#: ../src/effects/NoiseRemoval.cpp:410
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "Vaihe 1"
 
-#: effects/NoiseRemoval.cpp:765
+#: effects/NoiseRemoval.cpp:815
 msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:427
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "Vaihe 2"
 
-#: effects/NoiseRemoval.cpp:767
+#: effects/NoiseRemoval.cpp:817
 msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:403
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Kohinan poisto, tehnyt Dominic Mazzoni"
 
-#: ../src/effects/NoiseRemoval.cpp:419
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
 msgstr "Hae kohinaprofiili"
 
-#: effects/NoiseRemoval.cpp:791
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
 msgstr ""
 
-#: effects/NoiseRemoval.cpp:799
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:849
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
-#: effects/NoiseRemoval.cpp:807
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.h:38
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Kohinan poisto..."
 
-#: ../src/effects/NoiseRemoval.h:43
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "Luodaan kohinaprofiilia"
 
-#: ../src/effects/NoiseRemoval.h:45
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "Poistetaan kohinaa"
 
-#: effects/Normalize.cpp:68
+#. i18n-hint: First %s is the effect name, 2nd and 3rd are either true or
+#. * false (translated below) if those options were selected
+#: effects/Normalize.cpp:70
 #, c-format
 msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
 msgstr ""
 
-#: effects/Normalize.cpp:70 effects/Normalize.cpp:71
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
 msgid "false"
 msgstr ""
 
-#: effects/Normalize.cpp:70 effects/Normalize.cpp:71
+#. i18n-hint: true here means that the option was
+#. * selected. Opposite false if not selected
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
 msgid "true"
 msgstr ""
 
-#: effects/Normalize.cpp:73
+#: effects/Normalize.cpp:77
 #, c-format
 msgid ", maximum amplitude = %.1f dB"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:29
+#: effects/Normalize.cpp:327
 msgid "Normalize"
 msgstr "Normalisoi"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr ""
-
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
+#: effects/Normalize.cpp:351
+#: effects/Normalize.cpp:352
+#, fuzzy
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr "Poista DC-vaihe-erot (keskitä pystysuunnassa 0:aan)"
 
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
-#: effects/Normalize.cpp:336
+#: effects/Normalize.cpp:362
 msgid "-"
+msgstr "-"
+
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
 msgstr ""
 
-#: ../src/effects/Normalize.h:34
+#: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "Normalisoi..."
 
-#: ../src/effects/Normalize.h:38
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "Normalisoidaan..."
 
-#: ../src/effects/Phaser.cpp:47
+#: effects/Phaser.cpp:65
 #, c-format
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Käytetty efektiä: %s %d vaihetta, %.0f%% efektiä, taajuus = %.1f Hz, aloitusvaihe = %.0f°, syvyys = %d, takaisinsyöttö = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Phaser"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser, tehnyt Nasca Octavian Paul"
-
-#: ../src/effects/Phaser.cpp:455
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "Vaiheita:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "PUHDAS"
+#: effects/Phaser.cpp:229
+#, fuzzy
+msgid "Stages"
+msgstr "Vaiheita:"
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "EFEKTI"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
+#: effects/Phaser.cpp:236
+#: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO-taajuus (Hz):"
 
-#: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
+#: effects/Phaser.cpp:239
+#: effects/Wahwah.cpp:224
+#, fuzzy
+msgid "LFO frequency in hertz"
+msgstr "LFO-taajuus (Hz):"
+
+#: effects/Phaser.cpp:241
+#: effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO-aloitusvaihe (°):"
 
-#: ../src/effects/Phaser.cpp:529
+#: effects/Phaser.cpp:244
+#: effects/Wahwah.cpp:229
+#, fuzzy
+msgid "LFO start phase in degrees"
+msgstr "LFO-aloitusvaihe (°):"
+
+#: effects/Phaser.cpp:246
 msgid "Depth:"
 msgstr "Syvyys:"
 
-#: ../src/effects/Phaser.cpp:545
+#: effects/Phaser.cpp:249
+#: effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
 msgstr "Takaisinsyöttö (%):"
 
-#: ../src/effects/Phaser.h:41
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "Phaser..."
 
-#: ../src/effects/Phaser.h:45
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "Suoritetaan Phaser-efektiä"
 
-#: effects/Repair.cpp:94
+#: effects/Repair.cpp:99
 msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
-#: effects/Repair.h:33
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
 msgstr ""
 
-#: ../src/effects/Repeat.cpp:31
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
 msgstr "Monistettu %d kertaa"
 
-#: ../src/effects/Repeat.cpp:57
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
 msgstr "Raidat ovat liian pitkiä, jotta valinta voitaisiin monistaa."
 
-#: ../src/effects/Repeat.cpp:58 ../src/effects/Repeat.cpp:62
+#: effects/Repeat.cpp:77
+#: effects/Repeat.cpp:187
 msgid "Repeat"
 msgstr "Monista"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Monista, tehnyt Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Monistuskertojen määrä:"
 
-#: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
-msgid "New selection length: "
+#: effects/Repeat.cpp:221
+#, fuzzy
+msgid "New selection length: hh:mm:ss"
 msgstr "Uusi valinnan pituus: "
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minuuttia, %d sekuntia"
+#: effects/Repeat.cpp:253
+msgid "New selection length: "
+msgstr "Uusi valinnan pituus: "
 
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekuntia"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr ""
 
-#: ../src/effects/Repeat.h:34
+#: effects/Repeat.h:33
 msgid "Repeat..."
 msgstr "Monista..."
 
-#: ../src/effects/Repeat.h:38
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
 msgstr "Monistetaan"
 
-#: ../src/effects/Reverse.h:30
+#: effects/Reverse.h:30
 msgid "Reverse"
 msgstr "Takaperin"
 
-#: ../src/effects/Reverse.h:34
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "Käännetään takaperin"
 
@@ -4445,11 +5743,11 @@ msgstr ""
 msgid "Silence..."
 msgstr ""
 
-#: ../src/effects/Silence.h:37
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "Luodaan hiljaisuutta"
 
-#: ../src/effects/Silence.h:42
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Käytetty efektiä: Luo hiljaisuutta, %.6lf sekuntia"
@@ -4471,7 +5769,7 @@ msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
 msgstr ""
 
-#: effects/SpikeCleaner.cpp:178 effects/TruncSilence.cpp:269
+#: effects/SpikeCleaner.cpp:178
 msgid "Theshold for silence: "
 msgstr ""
 
@@ -4479,78 +5777,144 @@ msgstr ""
 msgid "Spike Cleaner..."
 msgstr ""
 
-#: effects/SpikeCleaner.h:31
+#: effects/SpikeCleaner.h:35
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "Stereo, "
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
 msgstr ""
 
-#: effects/ToneGen.cpp:59
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:61
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
-#: effects/ToneGen.cpp:66
+#: effects/ToneGen.cpp:69
+#: widgets/Meter.cpp:416
+msgid "Linear"
+msgstr "Lineaarinen"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
 msgstr ""
 
-#: ../src/effects/ToneGen.cpp:43
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "Äänigeneraattori"
 
-#: ../src/effects/ToneGen.cpp:48
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "Sini"
 
-#: ../src/effects/ToneGen.cpp:49
+#: effects/ToneGen.cpp:73
 msgid "Square"
 msgstr "Kantti"
 
-#: ../src/effects/ToneGen.cpp:50
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
 msgstr "Saha"
 
-#: effects/ToneGen.cpp:70
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
 msgstr ""
 
-#: effects/ToneGen.cpp:298
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
-#: ../src/effects/ToneGen.cpp:263
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "Ääniaalto:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
 msgstr ""
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.cpp:365
+#, fuzzy
+msgid "Interpolation:"
+msgstr "Nopea Sinc-interpolointi"
+
+#: effects/ToneGen.h:40
 msgid "Chirp..."
 msgstr ""
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.h:40
 msgid "Tone..."
 msgstr ""
 
-#: effects/ToneGen.h:43
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
 msgstr ""
 
-#: ../src/effects/ToneGen.h:44
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "Luodaan ääntä"
 
@@ -4558,193 +5922,233 @@ msgstr "Luodaan ääntä"
 msgid "All tracks must have the same sample rate"
 msgstr ""
 
-#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:113
+#: effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:175 prefs/AudioIOPrefs.cpp:178
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
+#: prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
-msgstr ""
+msgstr "millisekuntia"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr ""
 
-#: effects/TruncSilence.cpp:375
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr ""
 
-#: BatchCommands.cpp:236 effects/TruncSilence.cpp:84 effects/TruncSilence.h:29
+#: effects/TruncSilence.h:28
 msgid "Truncate Silence..."
 msgstr ""
 
-#: effects/TruncSilence.h:33
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr ""
 
-#: ../src/effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:172
 msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr "Valitan, VST-efektejä ei voi käyttää stereoraidoille, joissa raitojen yksittäiset kanavat eivät täsmää."
 
-#: ../src/effects/VST/VSTEffect.cpp:196
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
 msgstr "Korvausta ei voitu suorittaa"
 
-#: ../src/effects/VST/VSTEffect.cpp:410
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "VST-laajennuksen parametrit:"
 
-#: ../src/effects/Wahwah.cpp:41
+#: effects/Wahwah.cpp:61
 #, c-format
 msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
 msgstr "Käytetty efektiä: %s taajuus = %.1f Hz, aloitusvaihe = %.0f°, syvyys = %.0f%%, resonanssi = %.1f, taajuussiirtymä = %.0f%%"
 
-#: ../src/effects/Wahwah.cpp:52
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah, tehnyt Nasca Octavian Paul"
-
-#: ../src/effects/Wahwah.cpp:500
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
 msgstr "Syvyys (%):"
 
-#: ../src/effects/Wahwah.cpp:516
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "Resonanssi:"
 
-#: ../src/effects/Wahwah.cpp:532
+#: effects/Wahwah.cpp:239
+#, fuzzy
+msgid "Resonance"
+msgstr "Resonanssi:"
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah-taajuussiirtymä (%):"
 
-#: ../src/effects/Wahwah.h:39
+#: effects/Wahwah.cpp:244
+#, fuzzy
+msgid "Wah frequency offset in percent"
+msgstr "Wah-taajuussiirtymä (%):"
+
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "Wahwah..."
 
-#: ../src/effects/Wahwah.h:43
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "Suoritetaan wahwah-efektiä"
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:137
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176
+#: effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "Suoritetaan efektiä: %s"
 
-#: effects/ladspa/LadspaEffect.cpp:189
+#: effects/ladspa/LadspaEffect.cpp:196
+#: effects/lv2/LV2Effect.cpp:211
 msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr ""
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:435
-#: ../src/effects/ladspa/LadspaEffect.cpp:443
-#: ../src/prefs/QualityPrefs.cpp:160
+#: effects/ladspa/LadspaEffect.cpp:580
+#: effects/ladspa/LadspaEffect.cpp:588
+#: prefs/GUIPrefs.cpp:51
+#: prefs/QualityPrefs.cpp:72
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:437
+#: effects/ladspa/LadspaEffect.cpp:582
+#: effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "Tekijä: "
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:452
+#: effects/ladspa/LadspaEffect.cpp:615
+#: effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "Efektiasetukset"
 
-#: ../src/effects/Silence.cpp:127 ../src/effects/ToneGen.cpp:306
+#: effects/ladspa/LadspaEffect.cpp:710
+#: effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
 msgstr "Pituus (sekunteina)"
 
-#: ../src/effects/nyquist/Nyquist.cpp:217
+#: effects/lv2/LV2Effect.cpp:849
+#: effects/lv2/LV2Effect.cpp:852
+#, fuzzy
+msgid "Note length (seconds)"
+msgstr "Pituus (sekunteina)"
+
+#: effects/lv2/LV2Effect.cpp:860
+#: effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871
+#: effects/lv2/LV2Effect.cpp:874
+#, fuzzy
+msgid "Note key"
+msgstr "Nuottiraita"
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "Suoritetaan Nyquist-efektiä..."
 
-#: ../src/effects/nyquist/Nyquist.cpp:224
+#: effects/nyquist/Nyquist.cpp:264
+#: effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Nyquist-kehote..."
 
-#: ../src/effects/nyquist/Nyquist.cpp:282
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
 msgstr "Syötä Nyquist-komento:"
 
-#: ../src/effects/nyquist/Nyquist.cpp:370
+#: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
 msgstr "Valitan, efektiä ei voi käyttää stereoraidoille, joilla raidat eivät täsmää."
 
-#: ../src/effects/nyquist/Nyquist.cpp:397
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Nyquist"
 
-#: ../src/effects/nyquist/Nyquist.cpp:398
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
 msgstr "Nyquist tuloste: "
 
-#: effects/nyquist/Nyquist.cpp:594 effects/nyquist/Nyquist.cpp:605
+#: effects/nyquist/Nyquist.cpp:603
+#: effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
 msgstr ""
 
-#: ../src/effects/nyquist/Nyquist.cpp:594
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
 msgstr "Nyquist ei palauttanut audiota.\n"
 
-#: ../src/effects/nyquist/Nyquist.cpp:604
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist palautti liian monta audiokanavaa.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:86
 #, c-format
 msgid "Extracting features: %s"
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:106
+#: effects/vamp/VampEffect.cpp:117
 msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:131
 msgid "Sorry, failed to load Vamp Plug-in."
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:239
 msgid "Sorry, Vamp Plug-in failed to initialize."
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:387
 msgid " - Vamp audio analysis plugin"
 msgstr ""
 
 #: effects/vamp/VampEffect.cpp:423
 msgid "Plugin Settings"
-msgstr ""
+msgstr "Liitännäisten asetukset"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:442
+#: effects/vamp/VampEffect.cpp:448
 msgid "Program"
+msgstr "Sovellus"
+
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
-#: export/Export.cpp:445
+#: export/Export.cpp:522
 msgid "Export File"
-msgstr ""
+msgstr "Vie tiedosto"
 
-#: export/Export.cpp:453
+#: export/Export.cpp:530
 msgid "&Options..."
-msgstr ""
+msgstr "&Asetukset..."
 
-#: ../src/export/Export.cpp:202
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
 msgstr "Haluatko varmasti tallentaa tiedoston nimellä \""
 
-#: export/Export.cpp:495
+#: export/Export.cpp:591
 #, c-format
 msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
@@ -4753,37 +6157,42 @@ msgid "You are about to save a %s file with the name \"%s\".\n"
 "Are you sure you want to save the file under this name?"
 msgstr ""
 
-#: export/Export.cpp:516
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr ""
 
-#: ../src/export/Export.cpp:142
+#: export/Export.cpp:710
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "Viedyssä tiedostossa raitasi miksataan kahdeksi stereokanavaksi."
 
-#: ../src/export/Export.cpp:147
+#: export/Export.cpp:715
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
 msgstr "Viedyssä tiedostossa raitasi miksataan yhdeksi monokanavaksi."
 
-#: export/Export.cpp:171
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr ""
 
-#: export/Export.cpp:632
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
-msgstr ""
+msgstr "Kanava: %2d"
 
-#: export/Export.cpp:755
+#: export/Export.cpp:1046
 msgid " - Left"
-msgstr ""
+msgstr " - Vasen"
 
-#: export/Export.cpp:756
+#: export/Export.cpp:1047
 msgid " - Right"
+msgstr " - Oikea"
+
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
 msgstr ""
 
-#: export/Export.cpp:775 export/Export.cpp:829
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
 msgstr ""
@@ -4798,415 +6207,822 @@ msgstr ""
 
 #: export/ExportCL.cpp:75
 msgid "Command:"
-msgstr ""
+msgstr "Komento:"
 
 #: export/ExportCL.cpp:80
 msgid "Show output"
-msgstr ""
+msgstr "Näytä tuloste"
 
 #: export/ExportCL.cpp:87
 #, c-format
 msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
 msgstr ""
 
-#: export/ExportCL.cpp:219
+#: export/ExportCL.cpp:222
 msgid "(external program)"
-msgstr ""
+msgstr "(ulkoinen ohjelma)"
 
-#: ../src/export/ExportPCM.cpp:79
+#: export/ExportCL.cpp:253
+#: export/ExportPCM.cpp:457
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "Audiota ei voi viedä %s-muotoon."
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
-#: ../src/export/ExportCL.cpp:144
+#: export/ExportCL.cpp:327
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Valittua audiota viedään komentorivienkooderia käyttäen"
 
-#: ../src/export/ExportCL.cpp:146
+#: export/ExportCL.cpp:328
 msgid "Exporting the entire project using command-line encoder"
 msgstr "Koko projektia viedään komentorivienkooderia käyttäen"
 
-#: export/ExportCL.cpp:387
+#: export/ExportCL.cpp:390
 msgid "Command Output"
+msgstr "Komennon tuloste"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
 msgstr ""
 
-#: export/ExportFLAC.cpp:68
-msgid "Specify FLAC Options"
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
 msgstr ""
 
-#: export/ExportFLAC.cpp:82
-msgid "0 (fastest)"
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
 msgstr ""
 
-#: export/ExportFLAC.cpp:83
-msgid "1"
+#: export/ExportFFmpeg.cpp:638
+#, fuzzy, c-format
+msgid "Exporting selected audio as %s"
+msgstr "Valittua audiota viedään Ogg Vorbis -tiedostoon"
+
+#: export/ExportFFmpeg.cpp:639
+#, fuzzy, c-format
+msgid "Exporting entire file as %s"
+msgstr "Koko projektia viedään Ogg Vorbis -tiedostoon"
+
+#: export/ExportFFmpeg.cpp:702
+#: export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
 msgstr ""
 
-#: export/ExportFLAC.cpp:84
-msgid "2"
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
 msgstr ""
 
-#: export/ExportFLAC.cpp:85
-msgid "3"
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
 msgstr ""
 
-#: export/ExportFLAC.cpp:86
-msgid "4"
+#: export/ExportFFmpeg.cpp:721
+#: export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
 msgstr ""
 
-#: export/ExportFLAC.cpp:87
-msgid "5"
+#: export/ExportFFmpeg.cpp:749
+#: export/ExportMP3.cpp:1962
+msgid "Sample Rates"
 msgstr ""
 
-#: export/ExportFLAC.cpp:88
-msgid "6"
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "Tee AC3-asetukset"
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr "AC3-vientiasetukset"
+
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bittinopeus:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr "Tee AAC-asetukset"
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr "AAC-vientiasetukset"
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr "Tee AMR-NB-asetukset"
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr "AMR-NB-vientiasetukset"
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr "Tee AMR-WB-asetukset"
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr "AMR-WB-vientiasetukset"
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr "Tee WMA-asetukset"
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr "WMA-vientiasetukset"
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "Korvataanko esiasetus \"%s\"?"
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr "Varmista korvaus"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
 msgstr ""
 
-#: export/ExportFLAC.cpp:89
-msgid "7"
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
 msgstr ""
 
-#: export/ExportFLAC.cpp:90
-msgid "8 (best)"
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:193
-msgid "16 bit"
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr "Määrittele muut asetukset"
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr "Esiasetus:"
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr "Lataa esiasetus"
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr "Tallenna esiasetus"
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr "Poista esiasetus"
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr "Tuo esiasetuksia"
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr "Vie esiasetukset"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "Muoto:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr "Koodekki:"
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:194
-msgid "24 bit"
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:190
-msgid "FLAC Export Setup"
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr "Koodekin valinta:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr "Näytä kaikki muodot"
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr "Näytä kaikki koodekit"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
 msgstr ""
 
-#: export/ExportFLAC.cpp:102
-msgid "Level:"
+#: export/ExportFFmpegDialogs.cpp:931
+#: prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Kieli:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:197
-msgid "Bit depth:"
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr "Tunniste:"
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
 msgstr ""
 
-#: export/ExportFLAC.cpp:208
-msgid "FLAC Files"
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
 msgstr ""
 
-#: export/ExportFLAC.cpp:93
-msgid "Exporting the selected audio as FLAC"
+#: export/ExportFFmpegDialogs.cpp:940
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Laatu:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
 msgstr ""
 
-#: export/ExportFLAC.cpp:94
-msgid "Exporting the entire project as FLAC"
+#: export/ExportFFmpegDialogs.cpp:943
+#, fuzzy
+msgid "Sample Rate:"
+msgstr "Näytteenottotaajuus:"
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
 msgstr ""
 
-#: export/ExportMP2.cpp:108
-msgid "Specify MP2 Options"
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:204
-msgid "MP2 Export Setup"
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr "Profiili:"
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bittinopeus:"
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
 
-#: export/ExportMP2.cpp:200
-msgid "MP2 Files"
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
 msgstr ""
 
-#: export/ExportMP2.cpp:94
-msgid "Cannot export MP2 with this sample rate and bit rate"
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr "Pakkaustaso:"
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1345 ../src/export/ExportOGG.cpp:53
-msgid "Unable to open target file for writing"
-msgstr "Kohdetiedostoa ei kyetty avaamaan kirjoitusta varten"
+#: export/ExportFFmpegDialogs.cpp:968
+#, fuzzy
+msgid "Frame Size:"
+msgstr "Nimeä tiedostot:"
 
-#: export/ExportMP2.cpp:144 export/ExportMP3.cpp:1680
-#, c-format
-msgid "Exporting selected audio at %d kbps"
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
 msgstr ""
 
-#: export/ExportMP2.cpp:145 export/ExportMP3.cpp:1681
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+#, fuzzy
+msgid "Mux Rate:"
+msgstr "Bittinopeus:"
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr "Pakettikoko:"
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr "Pakettikoko\n"
+"Valinnainen\n"
+"0 - oletus"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
 #, c-format
-msgid "Exporting entire file at %d kbps"
+msgid "Delete preset '%s'?"
 msgstr ""
 
-#. i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second
-#: export/ExportMP3.cpp:142 export/ExportMP3.cpp:143 export/ExportMP3.cpp:144
-#: export/ExportMP3.cpp:145 export/ExportMP3.cpp:146 export/ExportMP3.cpp:147
-#: export/ExportMP3.cpp:148 export/ExportMP3.cpp:149 export/ExportMP3.cpp:150
-#: export/ExportMP3.cpp:151 export/ExportMP3.cpp:152 export/ExportMP3.cpp:153
-#: export/ExportMP3.cpp:154 export/ExportMP3.cpp:155 export/ExportMP3.cpp:156
-#: export/ExportMP3.cpp:157 export/ExportMP3.cpp:158 export/ExportMP3.cpp:159
-msgid "kbps"
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
 msgstr ""
 
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML-tiedostot (*.xml)|*.xml|Kaikki tiedostot (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
 msgstr ""
 
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
 msgstr ""
 
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
 msgstr ""
 
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "M4A (AAC) -tiedostot (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "AC3-tiedostot (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "WMA (versio 2) -tiedostot (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "Muokattu FFmpeg-vienti"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
 msgstr ""
 
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
 msgstr ""
 
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
 msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
 msgstr ""
 
-#: export/ExportMP3.cpp:178
-msgid "Fast"
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
 msgstr ""
 
-#: export/ExportMP3.cpp:179
-msgid "Standard"
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
+#: export/ExportFLAC.cpp:67
+msgid "Specify FLAC Options"
+msgstr "Tee FLAC-asetukset"
+
+#: export/ExportFLAC.cpp:81
+msgid "0 (fastest)"
+msgstr "0 (nopein)"
+
+#: export/ExportFLAC.cpp:82
+msgid "1"
+msgstr "1"
+
+#: export/ExportFLAC.cpp:83
+msgid "2"
+msgstr "2"
+
+#: export/ExportFLAC.cpp:84
+msgid "3"
+msgstr "3"
+
+#: export/ExportFLAC.cpp:85
+msgid "4"
+msgstr "4"
+
+#: export/ExportFLAC.cpp:86
+msgid "5"
+msgstr "5"
+
+#: export/ExportFLAC.cpp:87
+msgid "6"
+msgstr "6"
+
+#: export/ExportFLAC.cpp:88
+msgid "7"
+msgstr "7"
+
+#: export/ExportFLAC.cpp:89
+msgid "8 (best)"
+msgstr "8 (paras)"
+
+#: export/ExportFLAC.cpp:92
+msgid "16 bit"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportFLAC.cpp:93
+msgid "24 bit"
+msgstr ""
+
+#: export/ExportFLAC.cpp:97
+msgid "FLAC Export Setup"
+msgstr "FLAC-vientiasetukset"
+
+#: export/ExportFLAC.cpp:101
+msgid "Level:"
+msgstr "Taso:"
+
+#: export/ExportFLAC.cpp:103
+msgid "Bit depth:"
+msgstr "Bittisyvyys:"
+
+#: export/ExportFLAC.cpp:209
+msgid "FLAC Files"
+msgstr "FLAC-tiedostot"
+
+#: export/ExportFLAC.cpp:312
+msgid "Exporting the selected audio as FLAC"
+msgstr "Viedään valittua äänt FLAC-muodossa"
+
+#: export/ExportFLAC.cpp:313
+msgid "Exporting the entire project as FLAC"
+msgstr "Viedään koko projektia FLAC-muodossa"
+
+#: export/ExportMP2.cpp:108
+msgid "Specify MP2 Options"
+msgstr "Tee MP2-asetukset"
+
+#: export/ExportMP2.cpp:129
+msgid "MP2 Export Setup"
+msgstr "MP2-vientiasetukset"
+
+#: export/ExportMP2.cpp:202
+msgid "MP2 Files"
+msgstr "MP2-tiedostot"
+
+#: export/ExportMP2.cpp:232
+msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1771
+#: export/ExportOGG.cpp:186
+msgid "Unable to open target file for writing"
+msgstr "Kohdetiedostoa ei kyetty avaamaan kirjoitusta varten"
+
+#: export/ExportMP2.cpp:274
+#, c-format
+msgid "Exporting selected audio at %d kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP2.cpp:275
+#, c-format
+msgid "Exporting entire file at %d kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:221
+#: export/ExportMP3.cpp:239
+#: export/ExportMP3.cpp:253
+msgid "kbps"
+msgstr "kbps"
+
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr "(Paeas laatu)"
+
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr "(Pienemmät tiedostot)"
+
+#: export/ExportMP3.cpp:243
+msgid "Fast"
+msgstr "Nopea"
+
+#: export/ExportMP3.cpp:244
+#: export/ExportMP3.cpp:250
+#: prefs/GUIPrefs.cpp:41
+#: prefs/GUIPrefs.cpp:49
+msgid "Standard"
+msgstr "Oletus"
+
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
-msgid "Specify MP3 Options"
+msgid "Extreme"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:172
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr ""
+
+#: export/ExportMP3.cpp:303
+msgid "Specify MP3 Options"
+msgstr "Tee MP3-asetukset"
+
+#: export/ExportMP3.cpp:319
 msgid "MP3 Export Setup"
 msgstr "MP3-vientiasetukset"
 
-#: export/ExportMP3.cpp:271
+#: export/ExportMP3.cpp:326
 msgid "Bit Rate Mode:"
 msgstr ""
 
-#: export/ExportMP3.cpp:276
+#: export/ExportMP3.cpp:331
 msgid "Preset"
 msgstr ""
 
-#: export/ExportMP3.cpp:277
+#: export/ExportMP3.cpp:332
 msgid "Variable"
 msgstr ""
 
-#: export/ExportMP3.cpp:278
+#: export/ExportMP3.cpp:333
 msgid "Average"
 msgstr ""
 
-#: export/ExportMP3.cpp:279
+#: export/ExportMP3.cpp:334
 msgid "Constant"
 msgstr ""
 
-#: export/ExportMP3.cpp:324
+#: export/ExportMP3.cpp:373
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Laatu"
+
+#: export/ExportMP3.cpp:379
 msgid "Variable Speed:"
 msgstr ""
 
-#: export/ExportMP3.cpp:331
+#: export/ExportMP3.cpp:386
 msgid "Channel Mode:"
-msgstr ""
+msgstr "Kanavatila:"
 
-#: export/ExportMP3.cpp:336
+#: export/ExportMP3.cpp:391
 msgid "Joint Stereo"
 msgstr ""
 
-#: export/ExportMP3.cpp:337
+#: export/ExportMP3.cpp:392
 msgid "Stereo"
 msgstr ""
 
-#: export/ExportMP3.cpp:481
+#: export/ExportMP3.cpp:536
 msgid "Locate Lame"
 msgstr ""
 
-#: export/ExportMP3.cpp:501
+#: export/ExportMP3.cpp:556
 #, c-format
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
-#: export/ExportMP3.cpp:523
+#: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#  i18n-hint: It's asking for the location of a file, for
-#  example, "Where is lame_enc.dll?" - you could translate
-#  "Where would I find the file %s" instead if you want.
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Missä on %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1116
+#: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
 msgstr "Vain lame_enc.dll|lame_enc.dll|Dynaamisesti linkitetyt kirjastot (*.dll)|*.dll|Kaikki tiedostot (*.*)|*"
 
-#: export/ExportMP3.cpp:536
+#: export/ExportMP3.cpp:1550
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
-msgstr ""
+msgstr "Vain libmp3lame.dylib|libmp3lame.dylib|Dynaamiset kirjastot (*.dylib)|*.dylib|Kaikki tiedostot (*)|*"
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr "Vain libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|Kaikki tiedostot (*)|*"
+#: export/ExportMP3.cpp:1567
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Vain libmp3lame.so.0|libmp3lame.so.0|Ensisijaisesti jaetut objektitiedostot (*.so)|*.so|Laajennetut kirjastot (*.so*)|*.so*|Kaikki tiedostot (*)|*"
 
-#: export/ExportMP3.cpp:1592
+#: export/ExportMP3.cpp:1652
 msgid "MP3 Files"
-msgstr ""
+msgstr "MP3-tiedostot"
 
-#: ../src/export/ExportMP3.cpp:1328
+#: export/ExportMP3.cpp:1676
 msgid "Could not open MP3 encoding library!"
 msgstr "MP3-koodauskirjastoa ei voitu avata!"
 
-#: ../src/export/ExportMP3.cpp:1335
+#: export/ExportMP3.cpp:1683
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "MP3-enkoodauskirjasto ei ole kelvollinen tai tuettu!"
 
-#: export/ExportMP3.cpp:1699
+#: export/ExportMP3.cpp:1760
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Muokkaa MP3-tiedoston ID3-tageja"
-
-#: export/ExportMP3.cpp:1744
+#: export/ExportMP3.cpp:1802
 #, c-format
 msgid "Exporting selected audio with %s preset"
-msgstr ""
+msgstr "Viedään valittu ääni %s-esiasetuksella"
 
-#: export/ExportMP3.cpp:1745
+#: export/ExportMP3.cpp:1803
 #, c-format
 msgid "Exporting entire file with %s preset"
-msgstr ""
+msgstr "Viedään koko tiedosto %s-esiasetuksella"
 
-#: export/ExportMP3.cpp:1750
+#: export/ExportMP3.cpp:1808
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
-msgstr ""
+msgstr "Viedään valittu ääni VBR-laadulla %s"
 
-#: export/ExportMP3.cpp:1751
+#: export/ExportMP3.cpp:1809
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
-msgstr ""
+msgstr "Viedään koko tiedosto VBR-laadulla %s"
 
-#: export/ExportMP3.cpp:1756
+#: export/ExportMP3.cpp:1814
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:1757
+#: export/ExportMP3.cpp:1815
 #, c-format
 msgid "Exporting entire file at %d Kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:1790
+#: export/ExportMP3.cpp:1849
 #, c-format
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
-#: export/ExportMP3.cpp:1876
+#: export/ExportMP3.cpp:1933
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1879
+#: export/ExportMP3.cpp:1936
 #, c-format
 msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "MP3-vientilaajennusta ei löytynyt"
-
-#: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
-#: ../src/export/ExportMultiple.cpp:562
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "Vie moneen tiedostoon"
 
-#: ../src/export/ExportMultiple.cpp:487
+#: export/ExportMultiple.cpp:166
 msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
@@ -5216,196 +7032,255 @@ msgstr "Jos projektissa on useampi kuin yksi audioraita, voit viedä jokaisen ra
 "\n"
 "Tässä projektissa ei ole useaa raitaa eikä merkkiraitaa, joten vienti moneen tiedostoon ei ole mahdollista."
 
-#: ../src/export/ExportMultiple.cpp:493
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
 msgstr "Vienti moneen tiedostoon ei onnistu"
 
-#: ../src/export/ExportMultiple.cpp:576
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "Viennin muoto:"
 
-#: export/ExportMultiple.cpp:195
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
-msgstr ""
+msgstr "Asetukset..."
 
-#: ../src/export/ExportMultiple.cpp:594
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "Viennin kohde:"
 
-#: ../src/export/ExportMultiple.cpp:600 ../src/prefs/DirectoriesPrefs.cpp:82
+#: export/ExportMultiple.cpp:245
+#: prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: export/ExportMultiple.cpp:205
+#: export/ExportMultiple.cpp:246
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
-#: ../src/export/ExportMultiple.cpp:612
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "Tiedostojen jakamisperuste:"
 
-#: ../src/export/ExportMultiple.cpp:615
+#: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
 msgid "Labels"
 msgstr "Merkit"
 
-#: ../src/export/ExportMultiple.cpp:623
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
 msgstr "Myös audio ennen ensimmäistä merkkiä"
 
-#: ../src/export/ExportMultiple.cpp:629
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "Ensimmäisen tiedoston nimi:"
 
-#: ../src/export/ExportMultiple.cpp:636
+#: export/ExportMultiple.cpp:280
+#, fuzzy
+msgid "First file name"
+msgstr "Ensimmäisen tiedoston nimi:"
+
+#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
 msgid "Tracks"
 msgstr "Raidat"
 
-#: ../src/export/ExportMultiple.cpp:646
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
 msgstr "Nimeä tiedostot:"
 
-#: ../src/export/ExportMultiple.cpp:649
+#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
 msgstr "Käyttäen merkin/raidan nimeä"
 
-#: ../src/export/ExportMultiple.cpp:655
+#: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
 msgstr "Juoksevasti numeroiden"
 
-#: ../src/export/ExportMultiple.cpp:660
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "Tiedostonimen alkuosa:"
 
-#: ../src/export/ExportMultiple.cpp:677
+#: export/ExportMultiple.cpp:327
+#, fuzzy
+msgid "File name prefix"
+msgstr "Tiedostonimen alkuosa:"
+
+#: export/ExportMultiple.cpp:341
 msgid "Overwrite existing files"
 msgstr "Ylikirjoita olemassaolevat tiedostot"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
-#: export/ExportMultiple.cpp:360
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
-msgstr ""
+msgstr "\"%s\" luotiin onnistuneesti."
 
-#: ../src/export/ExportMultiple.cpp:766
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
 msgstr "Valitse hakemisto vietäville tiedostoille"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
-#: export/ExportMultiple.cpp:480
+#: export/ExportMultiple.cpp:539
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
+msgstr "Tiedostoa \"%s\" ei ole.\n"
+"\n"
+"Luodaanko se?"
 
-#: export/ExportMultiple.cpp:590
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr "Muokkaa metatietoja"
+
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
-msgstr ""
+msgstr "%d tiedosto(a) vietiinonnistuneesti."
 
-#: export/ExportMultiple.cpp:597
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
-msgstr ""
+msgstr "Tee Ogg Vorbis -asetukset"
 
 #: export/ExportOGG.cpp:81
 msgid "Ogg Vorbis Export Setup"
-msgstr ""
+msgstr "Ogg Vorbis -vientiasetukset"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
-#: export/ExportOGG.cpp:155
+#: export/ExportOGG.cpp:157
 msgid "Ogg Vorbis Files"
-msgstr ""
+msgstr "Ogg Vorbis -tiedostot"
 
-#: ../src/export/ExportOGG.cpp:191
+#: export/ExportOGG.cpp:257
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "Valittua audiota viedään Ogg Vorbis -tiedostoon"
 
-#: ../src/export/ExportOGG.cpp:192
+#: export/ExportOGG.cpp:258
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Koko projektia viedään Ogg Vorbis -tiedostoon"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:185
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:191
 msgid "Header:"
 msgstr ""
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:195
+#: import/ImportRaw.cpp:366
 #, fuzzy
 msgid "Encoding:"
 msgstr "Enkoodaus:"
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:200
 #, fuzzy
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Kaikki tunnisteiden ja enkoodausten\n"
 "yhdistelmät eivät ole mahdollisia.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+#, fuzzy
+msgid "Other uncompressed files"
+msgstr "Valitse mikä tahansa pakkaamaton audiotiedosto..."
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
-#: ../src/export/ExportPCM.cpp:73
+#: export/ExportPCM.cpp:449
 msgid "Cannot export audio in this format."
 msgstr "Audion vienti tässä muodossa ei onnistu."
 
-#: export/ExportPCM.cpp:400
+#: export/ExportPCM.cpp:491
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr ""
 
-#: export/ExportPCM.cpp:402
+#: export/ExportPCM.cpp:493
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr ""
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:436
+#: export/ExportPCM.cpp:531
 #, c-format
-#, fuzzy
 msgid "Error (file may not have been written): %s"
 msgstr "Virhe (tiedostoa ei ehkä ole tallennettu): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
 msgstr ""
 
-#: ../src/import/Import.cpp:159
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156
+#: import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "MP3-tiedostot"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Tähän Audacityn versioon ei ole käännetty %s -tukea."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:167
+#: import/Import.cpp:250
 #, c-format
 msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
@@ -5413,307 +7288,427 @@ msgid "\"%s\" is an audio CD track. \n"
 "Audacity can import, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:173
+#: import/Import.cpp:256
 #, c-format
 msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
 
-#: import/Import.cpp:178
+#: import/Import.cpp:261
 #, c-format
 msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:183
+#: import/Import.cpp:266
 #, c-format
 msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:193
+#: import/Import.cpp:276
 #, c-format
 msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, fuzzy, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
 msgstr "Audacity ei tunnistanut tiedoston tyyppiä.\n"
 "Jos tiedosto on pakkaamaton, kokeile tuoda se \"Tuo raakadataa\" -toiminnolla."
 
-#: import/ImportFLAC.cpp:35
-msgid "FLAC files"
+#: import/Import.cpp:322
+#, fuzzy, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr "Audacity ei tunnistanut tiedoston tyyppiä.\n"
+"Jos tiedosto on pakkaamaton, kokeile tuoda se \"Tuo raakadataa\" -toiminnolla."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "FFmpeg-yhteensopivat tiedostot"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
 
-#: ../src/import/ImportLOF.cpp:151 ../src/import/ImportLOF.cpp:177
+#: import/ImportFLAC.cpp:43
+msgid "FLAC files"
+msgstr "FLAC-tiedostot"
+
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
 msgstr "Lista tiedostoista tekstitiedostomuodossa"
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:268
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
 msgstr "Kelpaamaton ikkunan siirtymä LOF-tiedostossa."
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:270 ../src/import/ImportLOF.cpp:291
-#: ../src/import/ImportLOF.cpp:364 ../src/import/ImportLOF.cpp:384
+#: import/ImportLOF.cpp:316
+#: import/ImportLOF.cpp:337
+#: import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
 msgstr "LOF virhe"
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:289
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
 msgstr "Kelpaamaton kesto LOF-tiedostossa."
 
-#: import/ImportLOF.cpp:407
+#: import/ImportLOF.cpp:417
 #, fuzzy
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
 msgstr "MIDI-raitoja ei voi siirtää yksitellen, vain audioraitoja voi."
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:383
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
 msgstr "Kelpaamaton raidan siirtymä LOF-tiedostossa."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Virhe luettaessa Allegro-tiedostoa."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": Tiedoston nimi on liian lyhyt."
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Virhe luettaessa MIDI-tiedostoa"
+#: import/ImportMIDI.cpp:31
+#: import/ImportMIDI.cpp:39
+#: import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "Ei voitu avata tiedostoa"
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr ""
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": Virheellinen tiedostotyyppi."
 
-#: import/ImportOGG.cpp:35
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
-msgstr ""
+msgstr "Ogg Vorbis -tiedostot"
 
-#: ../src/import/ImportOGG.cpp:124
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
 msgstr "Median lukuvirhe"
 
-#: ../src/import/ImportOGG.cpp:127
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "Ei ole Ogg Vorbis -tiedosto"
 
-#: ../src/import/ImportOGG.cpp:130
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
 msgstr "Vorbis versio ei käy"
 
-#: ../src/import/ImportOGG.cpp:133
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
 msgstr "Kelvoton Vorbis-bittivirran otsikko"
 
-#: ../src/import/ImportOGG.cpp:136
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
 msgstr "Sisäinen logiikkavirhe"
 
-#: ../src/Project.cpp:2233
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, ja muut pakkaamattomat tyypit"
+
+#: import/ImportPlugin.h:142
+#: import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Tuodaan %s -tiedostoa..."
+msgid "Importing %s"
+msgstr "Tuodaan %s"
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
-msgstr ""
+msgstr "QuickTime-tiedostot"
+
+#: import/ImportRaw.cpp:205
+#, fuzzy
+msgid "Import Raw"
+msgstr "Tuo raakadataa"
 
-#: ../src/import/ImportRaw.cpp:256
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Tuo raakadataa"
 
 #  i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
-#: ../src/import/ImportRaw.cpp:299
+#. know the correct technical word.
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "Ei endianness:a"
 
 #  i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
-#: ../src/import/ImportRaw.cpp:302
+#. know the correct technical word.
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "Little-endian"
 
 #  i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
-#: ../src/import/ImportRaw.cpp:305
+#. know the correct technical word.
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "Big-endian"
 
 #  i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
-#: ../src/import/ImportRaw.cpp:308
+#. know the correct technical word.
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "Oletus-endianness"
 
-#: ../src/import/ImportRaw.cpp:332
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
 msgstr "1 kanava (mono)"
 
-#: ../src/import/ImportRaw.cpp:333
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
 msgstr "2 kanavaa (stereo)"
 
-#: ../src/import/ImportRaw.cpp:335
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
 msgstr "%d Kanavaa"
 
-#: ../src/import/ImportRaw.cpp:348
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "Kanavat:"
+
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
 msgstr "Aloitussiirtymä:"
 
-#: ../src/import/ImportRaw.cpp:359
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
 msgstr "Kuinka paljon tuodaan:"
 
-#: ../src/import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
 msgstr "Näytteenottotaajuus:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+#, fuzzy
+msgid "Decoding Waveform"
+msgstr "Ääniaalto"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:84
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44
+#: prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "Audio I/O"
 
-#: ../src/prefs/AudioIOPrefs.cpp:212
+#: prefs/AudioIOPrefs.cpp:102
+#: prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (mono)"
 
-#: ../src/prefs/AudioIOPrefs.cpp:213
+#: prefs/AudioIOPrefs.cpp:103
+#: prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (stereo)"
 
-#: ../src/prefs/AudioIOPrefs.cpp:80
+#: prefs/AudioIOPrefs.cpp:117
+#: prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "Toisto"
 
-#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
-#: toolbars/DeviceToolBar.cpp:54
+#: prefs/AudioIOPrefs.cpp:121
+#: prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118
+#: prefs/MidiIOPrefs.cpp:136
+#: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
-msgstr ""
+msgstr "Laite"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:124
+#: prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
-msgstr ""
+msgstr "Käytetään:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:125
+#: prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
 msgstr ""
 
-#: ../src/prefs/AudioIOPrefs.cpp:148
+#: prefs/AudioIOPrefs.cpp:135
+#: prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "Äänitys"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:141
+#: prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
-msgstr ""
+msgstr "Kanavat"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:147
+#: prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
+#: prefs/AudioIOPrefs.cpp:149
 #, fuzzy
-msgid "&Play other tracks while recording new one"
+msgid "Overdub: &Play other tracks while recording new one"
 msgstr "Toista muut raidat uutta raitaa äänitettäessä"
 
-#: prefs/AudioIOPrefs.cpp:150
+#: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+#, fuzzy
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "Toista muut raidat uutta raitaa äänitettäessä"
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:194
+#: prefs/AudioIOPrefs.cpp:168
+#: prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:158
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:168
+#: prefs/AudioIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:187
+#: prefs/AudioIOPrefs.cpp:206
+#: prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:189
+#: prefs/AudioIOPrefs.cpp:208
+#: prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:53 prefs/BatchPrefs.cpp:54
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
 msgid "Batch"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:75 prefs/GUIPrefs.cpp:70
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:92
 msgid "Behaviors"
 msgstr ""
 
@@ -5722,342 +7717,464 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
+#: prefs/GUIPrefs.cpp:132
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
-#: ../src/prefs/PrefsDialog.cpp:88 ../src/prefs/PrefsDialog.cpp:216
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Hakemistot"
 
 #: prefs/DirectoriesPrefs.cpp:87
 msgid "Temporary files directory"
-msgstr ""
+msgstr "Väliaikaistiedostojen hakemisto"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:57
+#: prefs/DirectoriesPrefs.cpp:91
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:78
+#: prefs/DirectoriesPrefs.cpp:93
 msgid "Free Space:"
 msgstr "Vapaata tilaa:"
 
 #: prefs/DirectoriesPrefs.cpp:99
 msgid "Auto save"
-msgstr ""
+msgstr "Automaattitallennus"
 
 #: prefs/DirectoriesPrefs.cpp:101
 msgid "Auto save a copy of the project in a separate folder"
-msgstr ""
+msgstr "Tallenna automaattisesti kopio projektista erilliseen kansioon"
 
 #: prefs/DirectoriesPrefs.cpp:104
 msgid "Auto save interval:"
-msgstr ""
+msgstr "Automaattitallennuksen väli:"
 
 #: prefs/DirectoriesPrefs.cpp:105
 msgid "minutes"
-msgstr ""
+msgstr "minuuttia"
 
 #: prefs/DirectoriesPrefs.cpp:110
 msgid "Audio cache"
-msgstr ""
+msgstr "Äänivälimuisti"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
-#: ../src/prefs/DirectoriesPrefs.cpp:135
+#: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
 msgstr "Valitse hakemisto väliaikaisille tiedostoille"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:181
+#: prefs/DirectoriesPrefs.cpp:166
 #, c-format
 msgid "Directory %s does not exist. Create it?"
 msgstr "Hakemistoa %s ei ole olemassa. Luodaanko se?"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:183
+#: prefs/DirectoriesPrefs.cpp:168
 msgid "New Temporary Directory"
 msgstr "Uusi väliaikaishakemisto"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:202
+#: prefs/DirectoriesPrefs.cpp:187
 #, c-format
 msgid "Directory %s is not writable"
 msgstr "Hakemisto %s ei ole kirjoitettava"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:214
+#: prefs/DirectoriesPrefs.cpp:199
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Väliaikaishakemiston muutos tulee voimaan vasta, kun Audacity käynnistetään uudelleen"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53
+#: prefs/FileFormatPrefs.cpp:54
+#, fuzzy
+msgid "Import / Export"
+msgstr "Tuo raakadataa"
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr "MP3-vientikirjasto"
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "MP3 Library Version:"
+msgstr "MP3-kirjaston versio:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr "MP3-kirjasto:"
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr "LAME MP3 -kirjasto:"
+
+#: prefs/FileFormatPrefs.cpp:101
+#: prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr "&Lataa"
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "FFmpeg tuonti- ja vientikirjasto"
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "FFmpeg-kirjaston versio:"
+
+#: prefs/FileFormatPrefs.cpp:118
+#: prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "FFmpeg-kirjasto:"
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr "Tuoatessa äänitiedostoja"
+
+#: prefs/FileFormatPrefs.cpp:140
 #, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr "Tee tiedostosta kopio ennen muokkausta (turvallisempi)"
 
-#: prefs/FileFormatPrefs.cpp:128
+#: prefs/FileFormatPrefs.cpp:141
 #, fuzzy
-msgid "&Read directly from the original file (faster)"
+msgid "&Read uncompressed audio files directly from the original (faster)"
 msgstr "Lue suoraan alkuperäistä tiedostoa (nopeampi)"
 
-#: prefs/FileFormatPrefs.cpp:132
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:87
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:88
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
-msgstr ""
+msgstr "&Älä kopioi mitään ääntä"
 
-#: prefs/FileFormatPrefs.cpp:135
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
-msgstr ""
+msgstr "&Kysy"
 
-#: prefs/FileFormatPrefs.cpp:93
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:144
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:97
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "MP3-kirjaston versio:"
+#: prefs/GUIPrefs.cpp:34
+#: prefs/GUIPrefs.cpp:35
+msgid "Interface"
+msgstr "Käyttöliittymä"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Etsi kirjasto"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr "Selaimessa"
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
-msgstr ""
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr "Internetistä"
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Käyttöliittymä"
+#: prefs/GUIPrefs.cpp:50
+#, fuzzy
+msgid "Simple"
+msgstr "Hiljaisuutta"
 
-#: prefs/GUIPrefs.cpp:72
+#: prefs/GUIPrefs.cpp:94
 msgid "&Update display while playing"
-msgstr ""
+msgstr "&Päivitä näyttö soitettaessa"
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
-msgstr ""
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr "Viimeisimmän ikkunan &sulkeminen lopettaa Audacityn"
 
-#: prefs/GUIPrefs.cpp:76
+#: prefs/GUIPrefs.cpp:98
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:80
+#: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:90
+#: prefs/GUIPrefs.cpp:106
 msgid "Editing a &clip can move other clips"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:88
+#: prefs/GUIPrefs.cpp:108
 msgid "&Select all audio in project, if none selected"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:90
+#: prefs/GUIPrefs.cpp:110
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:96
+#: prefs/GUIPrefs.cpp:114
+msgid "Show / Hide"
+msgstr "Näytä/piilota"
+
+#: prefs/GUIPrefs.cpp:116
 msgid "Enable cut &lines"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:98
+#: prefs/GUIPrefs.cpp:118
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
-msgstr ""
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr "Näytä &tallennusvalintaikkunan, vaikka projekti olisi tyhjä"
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
-msgstr ""
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
+msgstr "Näytä &Tervetuloa-viesti sovelluksen käynnistyksessä"
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
-msgstr ""
+#: prefs/GUIPrefs.cpp:126
+#, fuzzy
+msgid "Modes"
+msgstr "Hiiri"
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Kieli:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "dB-tilan näyttöalueen minimi"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:150
+#: prefs/GUIPrefs.cpp:141
 msgid "-36 dB (shallow range for high-amplitude editing)"
 msgstr "-36 dB (ylimalkainen alue korkea-amplitudiselle muokkaukselle)"
 
-#: ../src/prefs/GUIPrefs.cpp:157
+#: prefs/GUIPrefs.cpp:142
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (8-bittisen PCM:n näytealue)"
 
-#: ../src/prefs/GUIPrefs.cpp:164
+#: prefs/GUIPrefs.cpp:143
+#, fuzzy
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr "-96 dB (16-bittisen PCM:n näytealue)"
+
+#: prefs/GUIPrefs.cpp:144
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (16-bittisen PCM:n näytealue)"
 
-#: ../src/prefs/GUIPrefs.cpp:171
+#: prefs/GUIPrefs.cpp:145
 msgid "-120 dB (approximate limit of human hearing)"
 msgstr "-120 dB (suunnilleen ihmiskuulon raja)"
 
-#: ../src/prefs/GUIPrefs.cpp:178
+#: prefs/GUIPrefs.cpp:146
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (24-bittisen PCM:n näytealue)"
 
-#: ../src/prefs/PrefsDialog.cpp:90
+#  i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#  know the correct technical word.
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr "Oletusnäkymä"
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr "Ohje:"
+
+#: prefs/GUIPrefs.cpp:168
+#, fuzzy
+msgid "Solo Button:"
+msgstr "Painikkeet"
+
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: prefs/KeyConfigPrefs.cpp:93
-msgid "Key Bindings"
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
 msgstr ""
 
-#: prefs/KeyConfigPrefs.cpp:113
-msgid "S&et"
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
 msgstr ""
 
-#: ../src/prefs/KeyConfigPrefs.cpp:115
+#: prefs/KeyConfigPrefs.cpp:95
+msgid "Key Bindings"
+msgstr "Näppäinoikotiet"
+
+#: prefs/KeyConfigPrefs.cpp:115
+msgid "S&et"
+msgstr "&Aseta"
+
+#: prefs/KeyConfigPrefs.cpp:120
 msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
 msgstr "Huom: Cmd+Q lopettaa. Muut näppäimet ovat kelvollisia."
 
-#: prefs/KeyConfigPrefs.cpp:122 prefs/ThemePrefs.cpp:102
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
 msgid "&Defaults"
-msgstr ""
+msgstr "&Oletukset"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:79
+#: prefs/KeyConfigPrefs.cpp:143
 msgid "Key Combination"
 msgstr "Näppäinyhdistelmä"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:159
+#: prefs/KeyConfigPrefs.cpp:163
 msgid "Export Keyboard Shortcuts As:"
 msgstr "Vie näppäinoikotiet tiedostoon:"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:174
+#: prefs/KeyConfigPrefs.cpp:183
 msgid "Error saving keyboard shortcuts"
 msgstr "Virhe tallennettaessa näppäinoikoteitä"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:188
+#: prefs/KeyConfigPrefs.cpp:198
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Valitse Audacityn näppäinoikotiet sisältävä XML-tiedosto..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML-tiedostot (*.xml)|*.xml|Kaikki tiedostot (*.*)|*.*"
-
-#: ../src/prefs/KeyConfigPrefs.cpp:206
+#: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
 msgstr "Virhe ladattaessa näppäinoikoteitä"
 
-#: prefs/KeyConfigPrefs.cpp:239
+#: prefs/KeyConfigPrefs.cpp:243
 #, c-format
 msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
 msgstr ""
 
-#: ../src/EditToolBar.cpp:159
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../src/prefs/PrefsDialog.cpp:91
+#: prefs/MidiIOPrefs.cpp:146
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Toista muut raidat uutta raitaa äänitettäessä"
+
+#: prefs/MidiIOPrefs.cpp:149
+#, fuzzy
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "Toista muut raidat uutta raitaa äänitettäessä"
+
+#: prefs/MidiIOPrefs.cpp:152
+#, fuzzy
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "Toista muut raidat uutta raitaa äänitettäessä"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Hiiri"
 
-#: ../src/prefs/MousePrefs.cpp:71
+#: prefs/MousePrefs.cpp:78
 msgid "Mouse Bindings (default values, not configurable)"
 msgstr "Hiiriyhdistelmät (oletusasetukset, ei muutettavissa)"
 
-#: ../src/prefs/MousePrefs.cpp:84
+#: prefs/MousePrefs.cpp:93
 msgid "Tool"
 msgstr "Työkalu"
 
-#: ../src/prefs/MousePrefs.cpp:85
+#: prefs/MousePrefs.cpp:94
 msgid "Command Action"
 msgstr "Toiminto"
 
-#: ../src/prefs/MousePrefs.cpp:86
+#: prefs/MousePrefs.cpp:95
 msgid "Buttons"
 msgstr "Painikkeet"
 
-#: ../src/prefs/MousePrefs.cpp:88 ../src/prefs/MousePrefs.cpp:92
-#: ../src/prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
 msgid "Left-Click"
 msgstr "Vasen-klikkaus"
 
-#: ../src/prefs/MousePrefs.cpp:88 ../src/prefs/MousePrefs.cpp:89
-#: ../src/prefs/MousePrefs.cpp:90
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
 msgid "Select"
 msgstr "Valitse"
 
-#: ../src/prefs/MousePrefs.cpp:88
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
 msgid "Set Selection Point"
 msgstr "Aseta valintapiste"
 
-#: ../src/prefs/MousePrefs.cpp:89 ../src/prefs/MousePrefs.cpp:93
-#: ../src/prefs/MousePrefs.cpp:97 ../src/prefs/MousePrefs.cpp:98
-#: ../src/prefs/MousePrefs.cpp:102
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
 msgid "Left-Drag"
 msgstr "Vasen-raahaus"
 
-#: ../src/prefs/MousePrefs.cpp:89
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
 msgid "Set Selection Range"
 msgstr "Aseta valinta-alue"
 
-#: ../src/prefs/MousePrefs.cpp:90
+#: prefs/MousePrefs.cpp:100
 msgid "Extend Selection Range"
 msgstr "Laajenna valittua aluetta"
 
-#: ../src/prefs/MousePrefs.cpp:90
+#: prefs/MousePrefs.cpp:100
 msgid "Shift-Left-Click"
 msgstr "Vaihto-vasen-klikkaus"
 
@@ -6077,36 +8194,45 @@ msgstr ""
 msgid "Set Selection Point and Play"
 msgstr ""
 
-#: ../src/prefs/MousePrefs.cpp:92 ../src/prefs/MousePrefs.cpp:93
-#: ../src/prefs/MousePrefs.cpp:94 ../src/prefs/MousePrefs.cpp:95
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
 msgid "Zoom"
 msgstr "Zoomaa"
 
-#: ../src/prefs/MousePrefs.cpp:92
+#: prefs/MousePrefs.cpp:104
 msgid "Zoom in on Point"
 msgstr "Lähennä pisteeseen"
 
-#: ../src/prefs/MousePrefs.cpp:93
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
 msgid "Zoom in on a Range"
 msgstr "Lähennä alueeseen"
 
-#: prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:105
 msgid "same as right-drag"
 msgstr ""
 
-#: ../src/prefs/MousePrefs.cpp:94
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
 msgid "Right-Click"
 msgstr "Oikea-klikkaus"
 
-#: ../src/prefs/MousePrefs.cpp:94
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
 msgid "Zoom out one step"
 msgstr "Loitonna yksi askel"
 
-#: ../src/prefs/MousePrefs.cpp:95
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
 msgid "Right-Drag"
 msgstr "Oikea-raahaus"
 
-#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
 msgid "same as left-drag"
 msgstr ""
 
@@ -6126,79 +8252,86 @@ msgstr ""
 msgid "Zoom default"
 msgstr ""
 
-#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:111
 msgid "Time shift clip or move up/down between tracks"
 msgstr ""
 
-#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:112
 msgid "Shift-Left-Drag"
 msgstr ""
 
-#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:112
 msgid "Time shift all clips in track"
 msgstr ""
 
-#: ../src/prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
 msgid "Ctrl-Left-Drag"
 msgstr "Ctrl-vasen-raahaus"
 
-#: prefs/MousePrefs.cpp:109
+#: prefs/MousePrefs.cpp:113
 msgid "Move clip up/down between tracks"
 msgstr ""
 
-#: ../src/prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:115
 msgid "Change Amplification Envelope"
 msgstr "Muuta voimakkuusverhoa"
 
-#: ../src/prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:117
 msgid "Change Sample"
 msgstr "Muuta näytettä"
 
-#: ../src/prefs/MousePrefs.cpp:100 ../src/prefs/MousePrefs.cpp:101
-#: ../src/prefs/MousePrefs.cpp:102 ../src/prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
 msgid "Pencil"
 msgstr "Kynä"
 
-#: ../src/prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:118
 msgid "Alt-Left-Click"
 msgstr "Alt-vasen-klikkaus"
 
-#: ../src/prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:118
 msgid "Smooth at Sample"
 msgstr "Tasoita näytteitä"
 
-#: ../src/prefs/MousePrefs.cpp:102
+#: prefs/MousePrefs.cpp:119
 msgid "Change Several Samples"
 msgstr "Muuta useita näytteitä"
 
-#: ../src/prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:120
 msgid "Change ONE Sample only"
 msgstr "Muuta vain YKSI näyte"
 
-#: ../src/prefs/MousePrefs.cpp:105 ../src/prefs/MousePrefs.cpp:106
-#: ../src/prefs/MousePrefs.cpp:107 ../src/prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
 msgid "Multi"
 msgstr "Monitoimi"
 
-#: prefs/MousePrefs.cpp:118 prefs/MousePrefs.cpp:119
-#, fuzzy
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
 msgid "same as select tool"
-msgstr "Sama kuin valintatyökalu"
+msgstr "sama kuin valintatyökalu"
 
-#: prefs/MousePrefs.cpp:120 prefs/MousePrefs.cpp:121
-#, fuzzy
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
 msgid "same as zoom tool"
-msgstr "Sama kuin zoomaustyökalu"
+msgstr "sama kuin zoomaustyökalu"
 
-#: ../src/prefs/MousePrefs.cpp:110 ../src/prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#: ../src/prefs/MousePrefs.cpp:110
+#: prefs/MousePrefs.cpp:127
 msgid "Scroll up or down"
 msgstr "Vieritä ylös tai alas"
 
-#: ../src/prefs/MousePrefs.cpp:110
+#: prefs/MousePrefs.cpp:127
 msgid "Wheel-Rotate"
 msgstr "Rulla-vieritä"
 
@@ -6210,31 +8343,27 @@ msgstr ""
 msgid "Shift-Wheel-Rotate"
 msgstr ""
 
-#: ../src/prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:129
 msgid "Ctrl-Wheel-Rotate"
 msgstr "Ctrl-rulla-vieritys"
 
-#: ../src/prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:129
 msgid "Zoom in or out"
 msgstr "Lähennä tai loitonna"
 
-#: ../src/prefs/PrefsDialog.cpp:52
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
 msgstr "Audacity asetukset"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Laatu"
-
-#: ../src/prefs/QualityPrefs.cpp:161
+#: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "Neliö"
 
-#: ../src/prefs/QualityPrefs.cpp:162
+#: prefs/QualityPrefs.cpp:74
 msgid "Triangle"
 msgstr "Kolmio"
 
-#: ../src/prefs/QualityPrefs.cpp:163
+#: prefs/QualityPrefs.cpp:75
 msgid "Shaped"
 msgstr "Kuvioitu"
 
@@ -6242,27 +8371,27 @@ msgstr "Kuvioitu"
 msgid "Sampling"
 msgstr ""
 
-#: ../src/prefs/QualityPrefs.cpp:80
+#: prefs/QualityPrefs.cpp:125
 msgid "Default Sample Rate:"
 msgstr "Oletusnäytteenottotaajuus:"
 
-#: ../src/prefs/QualityPrefs.cpp:114
+#: prefs/QualityPrefs.cpp:127
 msgid "Default Sample Format:"
 msgstr "Näytteen oletusmuoto:"
 
-#: ../src/prefs/QualityPrefs.cpp:136
+#: prefs/QualityPrefs.cpp:136
 msgid "Real-time sample rate converter:"
 msgstr "Reaaliaikainen näytteenottotaajuuden muunnos:"
 
-#: ../src/prefs/QualityPrefs.cpp:147
+#: prefs/QualityPrefs.cpp:139
 msgid "High-quality sample rate converter:"
 msgstr "Korkealaatuinen näytteenottotaajuuden muunnos:"
 
-#: ../src/prefs/QualityPrefs.cpp:171
+#: prefs/QualityPrefs.cpp:142
 msgid "Real-time dither:"
 msgstr "Reaaliaikainen tasoitus:"
 
-#: ../src/prefs/QualityPrefs.cpp:186
+#: prefs/QualityPrefs.cpp:145
 msgid "High-quality dither:"
 msgstr "Korkealaatuinen tasoitus:"
 
@@ -6286,109 +8415,156 @@ msgstr ""
 msgid "High-quality:"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37
+#: prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64
+#: prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:87
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
 msgstr "Spektrogrammit"
 
-#: ../src/prefs/SpectrumPrefs.cpp:70
+#: prefs/SpectrumPrefs.cpp:91
 msgid "FFT Size"
 msgstr "FFT:n koko"
 
-#: prefs/SpectrumPrefs.cpp:75
+#: prefs/SpectrumPrefs.cpp:94
 msgid "8 - most wideband"
 msgstr ""
 
-#: ../src/prefs/SpectrumPrefs.cpp:40
+#: prefs/SpectrumPrefs.cpp:99
 msgid "256 - default"
 msgstr "256 - oletus"
 
-#: ../src/prefs/SpectrumPrefs.cpp:44
+#: prefs/SpectrumPrefs.cpp:107
+#, fuzzy
+msgid "32768 - most narrowband"
+msgstr "4096 - kapea-alaisin"
+
+#: prefs/SpectrumPrefs.cpp:109
 msgid "4096 - most narrowband"
 msgstr "4096 - kapea-alaisin"
 
-#: prefs/SpectrumPrefs.cpp:90
+#: prefs/SpectrumPrefs.cpp:116
 msgid "Window type:"
+msgstr "Ikkunatyyppi:"
+
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:96
+#: prefs/SpectrumPrefs.cpp:140
 msgid "Display"
-msgstr ""
+msgstr "Näyttö"
 
-#: prefs/SpectrumPrefs.cpp:100
+#: prefs/SpectrumPrefs.cpp:144
 msgid "&Grayscale"
-msgstr ""
+msgstr "&Harmaasävyt"
 
-#: prefs/SpectrumPrefs.cpp:103
+#: prefs/SpectrumPrefs.cpp:147
 msgid "Minimum Frequency (Hz):"
 msgstr ""
 
-#: ../src/prefs/SpectrumPrefs.cpp:104
+#: prefs/SpectrumPrefs.cpp:152
 msgid "Maximum Frequency (Hz):"
 msgstr "Suurin taajuus (Hz):"
 
-#: ../src/prefs/SpectrumPrefs.cpp:148
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+#, fuzzy
+msgid "Minimum Amplitude (dB):"
+msgstr "Uusi huippukohdan voimakkuus (dB):"
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:197
 msgid "The maximum frequency must be an integer"
 msgstr "Maksimitaajuuden täytyy olla kokonaisluku"
 
-#: ../src/prefs/SpectrumPrefs.cpp:152
+#: prefs/SpectrumPrefs.cpp:201
 msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
 msgstr "Maksimitaajuuden on oltava välillä 100 Hz - 100.000 Hz"
 
-#: prefs/SpectrumPrefs.cpp:146
+#: prefs/SpectrumPrefs.cpp:209
 msgid "The minimum frequency must be an integer"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:150
+#: prefs/SpectrumPrefs.cpp:213
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
-#: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
+#: prefs/SpectrumPrefs.cpp:220
+#, fuzzy
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr "Maksimitaajuuden täytyy olla kokonaisluku"
+
+#: prefs/SpectrumPrefs.cpp:226
+#: prefs/SpectrumPrefs.cpp:230
+#, fuzzy
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr "Maksimitaajuuden täytyy olla kokonaisluku"
+
+#: prefs/ThemePrefs.cpp:62
+#: prefs/ThemePrefs.cpp:63
 msgid "Theme"
-msgstr ""
+msgstr "Teema"
 
-#: prefs/ThemePrefs.cpp:90
+#. i18n-hint: && in here is an escape character to get a single & on screen,
+#. * so keep it as is
+#: prefs/ThemePrefs.cpp:93
 msgid "Theme Cache - Images && Color"
 msgstr ""
 
-#: prefs/ThemePrefs.cpp:92
+#: prefs/ThemePrefs.cpp:95
 msgid "Save Theme Cache"
-msgstr ""
+msgstr "Tallenna teemavälimuisti"
 
-#: prefs/ThemePrefs.cpp:93
+#: prefs/ThemePrefs.cpp:96
 msgid "Load Theme Cache"
-msgstr ""
+msgstr "Lataa teemavälimuisti"
 
-#: prefs/ThemePrefs.cpp:103
+#: prefs/ThemePrefs.cpp:106
 msgid "Load Theme Cache At Startup"
-msgstr ""
+msgstr "Lataa teemavälimuisti käynnistyksessä"
 
-#: prefs/ThemePrefs.cpp:115
+#: prefs/ThemePrefs.cpp:118
 msgid "Individual Theme Files"
-msgstr ""
+msgstr "Virheelliset teematiedostot"
 
-#: prefs/ThemePrefs.cpp:117
+#: prefs/ThemePrefs.cpp:120
 msgid "Save Files"
-msgstr ""
+msgstr "Tallenna tiedostot"
 
-#: prefs/ThemePrefs.cpp:118
+#: prefs/ThemePrefs.cpp:121
 msgid "Load Files"
-msgstr ""
+msgstr "Lataa tiedostot"
 
-#: prefs/ThemePrefs.cpp:123
+#: prefs/ThemePrefs.cpp:126
 msgid "Info"
-msgstr ""
+msgstr "Tietoja"
 
 #: prefs/ThemePrefs.cpp:129
 msgid "Themability is an experimental feature.\n"
@@ -6426,244 +8602,265 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
-#: ../src/ControlToolBar.cpp:470
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Keskeytä"
 
 #: toolbars/ControlToolBar.cpp:178
 msgid "Play"
-msgstr ""
+msgstr "Soita"
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+#, fuzzy
+msgid "Play (Shift for Loop Play)"
 msgstr "Toista (Vaihto+klikkaus: soittosilmukka)"
 
-#: ../src/ControlToolBar.cpp:471
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../src/ControlToolBar.cpp:467
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
 msgstr "Siirry alkuun"
 
-#: ../src/ControlToolBar.cpp:472
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
 msgstr "Siirry loppuun"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:524 toolbars/ControlToolBar.cpp:776
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:696
+#: toolbars/ControlToolBar.cpp:706
 msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:685
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr ""
 
-#: toolbars/DeviceToolBar.cpp:113 toolbars/DeviceToolBar.cpp:115
+#: toolbars/DeviceToolBar.cpp:113
+#: toolbars/DeviceToolBar.cpp:115
 msgid "Output Device"
 msgstr ""
 
-#: toolbars/DeviceToolBar.cpp:134 toolbars/DeviceToolBar.cpp:136
+#: toolbars/DeviceToolBar.cpp:134
+#: toolbars/DeviceToolBar.cpp:136
 msgid "Input Device"
 msgstr ""
 
-#: ../src/EditToolBar.cpp:154
+#: toolbars/EditToolBar.cpp:139
 msgid "Trim outside selection"
 msgstr "Rajaa valinnan ulkopuolelta"
 
-#: ../src/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:141
 msgid "Silence selection"
 msgstr "Vaimenna valinta"
 
-#: ../src/EditToolBar.cpp:164
+#: toolbars/EditToolBar.cpp:150
+#, fuzzy
+msgid "Link Tracks"
+msgstr "Raidat"
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
 msgstr "Lähennä näkymää"
 
-#: ../src/EditToolBar.cpp:166
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "Loitonna näkymää"
 
-#: ../src/EditToolBar.cpp:170
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
 msgstr "Vaihda zoomausta"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr ""
 
-#: ../src/EditToolBar.cpp:174
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "Sovita valinta ikkunaan"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr ""
 
-#: ../src/EditToolBar.cpp:176
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
 msgstr "Sovita projekti ikkunaan"
 
-#: toolbars/MeterToolBar.cpp:49
+#: toolbars/MeterToolBar.cpp:50
 msgid "Meter"
 msgstr ""
 
-#: toolbars/MeterToolBar.cpp:79
+#: toolbars/MeterToolBar.cpp:80
 msgid "Play Meter"
 msgstr ""
 
-#: toolbars/MeterToolBar.cpp:80
+#: toolbars/MeterToolBar.cpp:81
 msgid "Meter-Play"
 msgstr ""
 
-#: toolbars/MeterToolBar.cpp:88
+#: toolbars/MeterToolBar.cpp:89
 msgid "Record Meter"
 msgstr ""
 
-#: toolbars/MeterToolBar.cpp:89
+#: toolbars/MeterToolBar.cpp:90
 msgid "Meter-Record"
 msgstr ""
 
-#: ../src/MeterToolBar.cpp:66
+#: toolbars/MeterToolBar.cpp:94
 msgid "Output level meter"
 msgstr "Ulostulotason mittari"
 
-#: ../src/MeterToolBar.cpp:67
+#: toolbars/MeterToolBar.cpp:95
 msgid "Input level meter - click to monitor input"
 msgstr "Sisääntulotason mittari - klikkaa tarkkaillaksesi sisääntuloa"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
-#: ../src/MixerToolBar.cpp:135
+#: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Toistovoimakkuus"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
-#: ../src/MixerToolBar.cpp:138
+#: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
 msgid "Input Volume"
 msgstr "Äänitysvoimakkuus"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:119
+#: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
 msgstr ""
 
-#: toolbars/SelectionBar.cpp:75
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr ""
 
-#: toolbars/SelectionBar.cpp:115 toolbars/SelectionBar.cpp:168
+#: toolbars/SelectionBar.cpp:135
+#: toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
 msgstr ""
 
-#: toolbars/SelectionBar.cpp:120 toolbars/SelectionBar.cpp:211
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
+msgstr "Valinnan alku:"
+
+#: toolbars/SelectionBar.cpp:163
+#: toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
+msgid "Length"
 msgstr ""
 
-#: toolbars/SelectionBar.cpp:145
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
-msgstr ""
+msgstr "piilotettu"
 
-#: toolbars/SelectionBar.cpp:155 toolbars/SelectionBar.cpp:239
+#: toolbars/SelectionBar.cpp:184
+#: toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
 msgstr ""
 
-#: toolbars/SelectionBar.cpp:217 toolbars/SelectionBar.cpp:222
+#: toolbars/SelectionBar.cpp:236
+#: toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr ""
 
-#: toolbars/SelectionBar.cpp:224
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
-msgstr ""
+msgstr "Valinta"
 
-#: toolbars/SelectionBar.cpp:289
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
-msgstr ""
+msgstr "Valinnan pituus"
 
-#: toolbars/SelectionBar.cpp:297
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
-msgstr ""
+msgstr "Valinnan loppu"
 
-#: toolbars/ToolBar.cpp:96
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr ""
 
-#: toolbars/ToolDock.cpp:74 toolbars/ToolDock.cpp:75
+#: toolbars/ToolDock.cpp:74
+#: toolbars/ToolDock.cpp:75
 msgid "ToolDock"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:76
+#: toolbars/ToolsToolBar.cpp:63
 msgid "Click and drag to select audio"
 msgstr "Klikkaa ja raahaa valitaksesi audiota"
 
-#: ../src/ControlToolBar.cpp:77
+#: toolbars/ToolsToolBar.cpp:64
 msgid "Click and drag to edit the amplitude envelope"
 msgstr "Klikkaa ja raahaa muokataksesi amplitudiverhoa"
 
-#: ../src/ControlToolBar.cpp:78
+#: toolbars/ToolsToolBar.cpp:65
 msgid "Click and drag to edit the samples"
 msgstr "Klikkaa ja raahaa muokataksesi näytteitä"
 
-#: ../src/ControlToolBar.cpp:80
+#: toolbars/ToolsToolBar.cpp:67
 msgid "Click to Zoom In, Shift-Click to Zoom Out"
 msgstr "Klikkaa lähentääksesi, Vaihto-klikkaa loitontaaksesi"
 
-#: ../src/ControlToolBar.cpp:82
+#: toolbars/ToolsToolBar.cpp:69
 msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
 msgstr "Raahaa lähentääksesi alueeseen, oikea-klikkaus loitontaaksesi"
 
-#: ../src/ControlToolBar.cpp:84
+#: toolbars/ToolsToolBar.cpp:71
 msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
 msgstr "Vasen=lähennä, oikea=loitonna, keskipainike=normaali"
 
-#: ../src/ControlToolBar.cpp:86
+#: toolbars/ToolsToolBar.cpp:73
 msgid "Click and drag to move a track in time"
 msgstr "Klikkaa ja raahaa siirtääksesi raitaa aikajanalla"
 
 #: toolbars/ToolsToolBar.cpp:90
 msgid "Tools"
-msgstr ""
+msgstr "Työkalut"
 
-#: ../src/ControlToolBar.cpp:355
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
 msgid "Selection Tool"
 msgstr "Valintatyökalu"
 
-#: ../src/ControlToolBar.cpp:356
+#: toolbars/ToolsToolBar.cpp:148
 msgid "Envelope Tool"
 msgstr "Verhotyökalu"
 
-#: ../src/ControlToolBar.cpp:357
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
 msgid "Time Shift Tool"
 msgstr "Aikakorjaustyökalu"
 
-#: ../src/ControlToolBar.cpp:358
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
 msgid "Zoom Tool"
 msgstr "Zoomaustyökalu"
 
-#: ../src/ControlToolBar.cpp:359
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
 msgid "Draw Tool"
 msgstr "Piirtotyökalu"
 
-#: ../src/ControlToolBar.cpp:360
+#: toolbars/ToolsToolBar.cpp:152
 msgid "Multi-Tool Mode"
 msgstr "Monitoimitila"
 
@@ -6675,384 +8872,520 @@ msgstr ""
 msgid "Multi Tool"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:81
+#: toolbars/TranscriptionToolBar.cpp:84
 msgid "Transcription"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:183
+#: toolbars/TranscriptionToolBar.cpp:171
 msgid "Play at selected speed"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:184
+#: toolbars/TranscriptionToolBar.cpp:172
 msgid "Play-at-speed"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:190 toolbars/TranscriptionToolBar.cpp:195
+#: toolbars/TranscriptionToolBar.cpp:178
+#: toolbars/TranscriptionToolBar.cpp:183
 msgid "Playback Speed"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:200
+#: toolbars/TranscriptionToolBar.cpp:196
 msgid "Adjust left selection to next onset"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:201
+#: toolbars/TranscriptionToolBar.cpp:197
 msgid "Left-to-On"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:203
+#: toolbars/TranscriptionToolBar.cpp:199
 msgid "Adjust right selection to previous offset"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:204
+#: toolbars/TranscriptionToolBar.cpp:200
 msgid "Right-to-Off"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:206
+#: toolbars/TranscriptionToolBar.cpp:202
 msgid "Adjust left selection to next offset"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:207
+#: toolbars/TranscriptionToolBar.cpp:203
 msgid "Left-to-Off"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:209
+#: toolbars/TranscriptionToolBar.cpp:205
 msgid "Adjust right selection to previous onset"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:210
+#: toolbars/TranscriptionToolBar.cpp:206
 msgid "Right-to-On"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:212
+#: toolbars/TranscriptionToolBar.cpp:208
 msgid "Select region of sound around cursor"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:213
+#: toolbars/TranscriptionToolBar.cpp:209
 msgid "Select-Sound"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:215
+#: toolbars/TranscriptionToolBar.cpp:211
 msgid "Select region of silence around cursor"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:216
+#: toolbars/TranscriptionToolBar.cpp:212
 msgid "Select-Silence"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:218
+#: toolbars/TranscriptionToolBar.cpp:214
 msgid "Automatically make labels from words"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:219
+#: toolbars/TranscriptionToolBar.cpp:215
 msgid "Make Labels"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:221
+#: toolbars/TranscriptionToolBar.cpp:217
 msgid "Add label at selection"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:222
+#: toolbars/TranscriptionToolBar.cpp:218
 msgid "Add Label"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:224
+#: toolbars/TranscriptionToolBar.cpp:220
 msgid "Calibrate voicekey"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:225
+#: toolbars/TranscriptionToolBar.cpp:221
 msgid "Calibrate"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:229
+#: toolbars/TranscriptionToolBar.cpp:225
 msgid "Adjust Sensitivity"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:234
+#: toolbars/TranscriptionToolBar.cpp:230
 msgid "Sensitivity"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:239
+#: toolbars/TranscriptionToolBar.cpp:235
 msgid "Energy"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:240
+#: toolbars/TranscriptionToolBar.cpp:236
 msgid "Sign Changes (Low Threshold)"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:241
+#: toolbars/TranscriptionToolBar.cpp:237
 msgid "Sign Changes (High Threshold)"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:242
+#: toolbars/TranscriptionToolBar.cpp:238
 msgid "Direction Changes (Low Threshold)"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:243
+#: toolbars/TranscriptionToolBar.cpp:239
 msgid "Direction Changes (High Threshold)"
 msgstr ""
 
-#: toolbars/TranscriptionToolBar.cpp:251
+#: toolbars/TranscriptionToolBar.cpp:247
 msgid "Key type"
-msgstr ""
+msgstr "Näppäintyyppi"
 
-#: ../src/widgets/AButton.cpp:181
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr " (ei käytössä)"
 
-#: widgets/AButton.cpp:443
+#: widgets/AButton.cpp:461
 msgid "Press"
-msgstr ""
+msgstr "Paina"
 
-#: widgets/AButton.cpp:522
+#: widgets/AButton.cpp:540
 msgid "Button"
-msgstr ""
+msgstr "Painike"
 
 #  i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: ../src/widgets/ASlider.cpp:329 ../src/widgets/Meter.cpp:165
+#: widgets/ASlider.cpp:612
+#: widgets/Meter.cpp:248
 msgid "L"
 msgstr "V"
 
 #  i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: ../src/widgets/ASlider.cpp:332 ../src/widgets/Meter.cpp:167
+#: widgets/ASlider.cpp:615
+#: widgets/Meter.cpp:250
 msgid "R"
 msgstr "O"
 
-#: ../src/widgets/ASlider.cpp:484
+#: widgets/ASlider.cpp:678
 msgid "Center"
 msgstr "Keskellä"
 
-#: ../src/widgets/ASlider.cpp:488
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "Vasen"
 
-#: ../src/widgets/ASlider.cpp:491
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "Oikea"
 
-#: widgets/ErrorDialog.cpp:73 widgets/ErrorDialog.cpp:97
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
+msgstr "Ohje"
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr "<"
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ">"
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
 msgstr ""
 
-#: widgets/ErrorDialog.cpp:190
-msgid "Help on the Internet"
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
 msgstr ""
 
-#: widgets/Grabber.cpp:61
+#: widgets/ErrorDialog.cpp:255
+msgid "Help on the Internet"
+msgstr "Ohjeet Internetissä"
+
+#: widgets/Grabber.cpp:62
 msgid "Grabber"
 msgstr ""
 
-#: widgets/Grid.cpp:616
+#: widgets/Grid.cpp:643
 #, c-format
 msgid "%d rows, %d columns"
-msgstr ""
+msgstr "%d riviä, %d saraketta"
 
-#: widgets/Grid.cpp:622 widgets/Grid.cpp:749
+#: widgets/Grid.cpp:649
+#: widgets/Grid.cpp:776
 #, c-format
 msgid "Row %d"
-msgstr ""
+msgstr "Rivi %d"
 
-#: widgets/Grid.cpp:764
+#: widgets/Grid.cpp:791
 msgid "Empty"
-msgstr ""
+msgstr "Tyhjä"
 
-#: widgets/Meter.cpp:336
+#: widgets/Meter.cpp:396
 msgid "Enable Meter"
 msgstr ""
 
-#: widgets/Meter.cpp:338
+#: widgets/Meter.cpp:398
 msgid "Disable Meter"
 msgstr ""
 
-#: widgets/Meter.cpp:341
+#: widgets/Meter.cpp:401
 msgid "Stop Monitoring"
-msgstr ""
+msgstr "Lopeta seuraus"
 
-#: widgets/Meter.cpp:343
+#: widgets/Meter.cpp:403
 msgid "Start Monitoring"
-msgstr ""
+msgstr "Aloita seuraus"
 
-#: ../src/widgets/Meter.cpp:285
+#: widgets/Meter.cpp:407
 msgid "Horizontal Stereo"
 msgstr "Vaakasuuntainen stereo"
 
-#: ../src/widgets/Meter.cpp:286
+#: widgets/Meter.cpp:408
 msgid "Vertical Stereo"
 msgstr "Pystysuuntainen stereo"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Lineaarinen"
-
-#: widgets/Meter.cpp:365
+#: widgets/Meter.cpp:425
 msgid "Preferences..."
-msgstr ""
+msgstr "Asetukset..."
 
-#: widgets/Meter.cpp:1037
+#: widgets/Meter.cpp:876
+#, fuzzy
+msgid "Mix Volume"
+msgstr "Äänitysvoimakkuus"
+
+#: widgets/Meter.cpp:1145
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
 msgstr ""
 
-#: widgets/Meter.cpp:1038
+#: widgets/Meter.cpp:1146
 msgid "Meter refresh rate per second [1-100]: "
 msgstr ""
 
-#: widgets/Meter.cpp:1063
+#: widgets/Meter.cpp:1147
 msgid "Meter Preferences"
 msgstr ""
 
 #: widgets/MultiDialog.cpp:82
 msgid " Please select an action "
-msgstr ""
+msgstr " Valitse toimenpide"
 
-#: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
-msgid "Vertical Ruler"
-msgstr ""
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "Valitse toimenpide"
 
-#: widgets/TimeTextCtrl.cpp:198
-msgid "01000,01000 seconds"
-msgstr ""
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr "Kulunut aika:"
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr "Jäljellä oleva aika:"
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: widgets/Ruler.cpp:1445
+#: widgets/Ruler.cpp:1446
+msgid "Vertical Ruler"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:200
+#. i18n-hint: Format string for displaying time in seconds. Change the comma
+#. * in the middle to the 1000s separator for your locale, and the 'seconds'
+#. * on the end to the word for seconds. Don't change the numbers.
+#: widgets/TimeTextCtrl.cpp:267
+msgid "01000,01000 seconds"
+msgstr "01000,01000 sekuntia"
+
+#. i18n-hint: Format string for displaying time in hours, minutes and
+#. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
+#. * change the numbers unless there aren't 60 seconds in a minute in your
+#. * locale
+#: widgets/TimeTextCtrl.cpp:276
 msgid "0100 h 060 m 060 s"
-msgstr ""
+msgstr "0100 h 060 m 060 s"
 
-#: widgets/TimeTextCtrl.cpp:201
+#. i18n-hint: Name of time display format that shows time in days, hours,
+#. * minutes and seconds
+#: widgets/TimeTextCtrl.cpp:279
 msgid "dd:hh:mm:ss"
-msgstr ""
-
-#: widgets/TimeTextCtrl.cpp:202
+msgstr "dd:hh:mm:ss"
+
+#. i18n-hint: Format string for displaying time in days, hours, minutes and
+#. * seconds. Change the 'days' to the word for days, 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes and 's' to the
+#. * abbreviation for seconds. Don't change the numbers unless there aren't
+#. * 24 hours in a day in your locale
+#: widgets/TimeTextCtrl.cpp:285
 msgid "0100 days 024 h 060 m 060 s"
+msgstr "0100 päivöö 024 h 060 m 060 s"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:203
-msgid "hh:mm:ss + milliseconds"
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:204
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and milliseconds (1/1000 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + milliseconds"
+msgstr "hh:mm:ss + millisekuntit"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * milliseconds are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
 msgid "0100 h 060 m 060.01000 s"
-msgstr ""
+msgstr "0100 h 060 m 060.01000 s"
 
-#: widgets/TimeTextCtrl.cpp:205
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and samples (at the current project sample rate)
+#: widgets/TimeTextCtrl.cpp:297
 msgid "hh:mm:ss + samples"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:206
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and samples. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes, 's' to the abbreviation for seconds and
+#. * translate samples . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:303
 msgid "0100 h 060 m 060 s+.# samples"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:207
+#. i18n-hint: Name of time display format that shows time in samples (at the
+#. * current project sample rate)
+#: widgets/TimeTextCtrl.cpp:306
 msgid "samples"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:208
+#. i18n-hint: Format string for displaying time in samples (lots of samples).
+#. * Change the ',' to the 1000s separator for your locale, and translate
+#. * samples. If 1000s aren't a base multiple for your number system, then you
+#. * can change the numbers to an appropriate one, and put a 0 on the front
+#: widgets/TimeTextCtrl.cpp:311
 msgid "01000,01000,01000 samples|#"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:209
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:314
 msgid "hh:mm:ss + film frames (24 fps)"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:210
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames at 24 frames per second. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames' . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:320
 msgid "0100 h 060 m 060 s+.24 frames"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:211
+#. i18n-hint: Name of time display format that shows time in frames (lots of
+#. * frames) at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:323
 msgid "film frames (24 fps)"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:212
+#. i18n-hint: Format string for displaying time in frames at 24 frames per
+#. * second. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:326
 msgid "01000,01000 frames|24"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:213
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV drop-frame rate (used for American /
+#. * Japananese TV, and very odd)
+#: widgets/TimeTextCtrl.cpp:330
 msgid "hh:mm:ss + NTSC drop frames"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:214
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the |N alone, it's important!
+#: widgets/TimeTextCtrl.cpp:335
 msgid "0100 h 060 m 060 s+.30 frames|N"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:215
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV non-drop-frame rate (used for American /
+#. * Japananese TV, and doesn't quite match wall time
+#: widgets/TimeTextCtrl.cpp:339
 msgid "hh:mm:ss + NTSC non-drop frames"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:216
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the | .999000999 alone,
+#. * the whole things really is slightly off-speed!
+#: widgets/TimeTextCtrl.cpp:345
 msgid "0100 h 060 m 060 s+.030 frames| .999000999"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:217
+#. i18n-hint: Name of time display format that shows time in frames at NTSC
+#. * TV frame rate (used for American / Japananese TV
+#: widgets/TimeTextCtrl.cpp:348
 msgid "NTSC frames"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:218
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone. That really is the frame
+#. * rate!
+#: widgets/TimeTextCtrl.cpp:352
 msgid "01000,01000 frames|29.97002997"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:219
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at PAL TV frame rate (used for European TV)
+#: widgets/TimeTextCtrl.cpp:355
 msgid "hh:mm:ss + PAL frames (25 fps)"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:220
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with PAL TV frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Nice simple time code!
+#: widgets/TimeTextCtrl.cpp:360
 msgid "0100 h 060 m 060 s+.25 frames"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:221
+#. i18n-hint: Name of time display format that shows time in frames at PAL
+#. * TV frame rate (used for European TV
+#: widgets/TimeTextCtrl.cpp:363
 msgid "PAL frames (25 fps)"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:222
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone.
+#: widgets/TimeTextCtrl.cpp:366
 msgid "01000,01000 frames|25"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:223
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at CD Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:369
 msgid "hh:mm:ss + CDDA frames (75 fps)"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:224
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with CD Audio frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'.
+#: widgets/TimeTextCtrl.cpp:374
 msgid "0100 h 060 m 060 s+.75 frames"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:225
+#. i18n-hint: Name of time display format that shows time in frames at CD
+#. * Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:377
 msgid "CDDA frames (75 fps)"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:226
+#. i18n-hint: Format string for displaying time in frames with CD Audio
+#. * frames. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:380
 msgid "01000,01000 frames|75"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:363
+#: widgets/TimeTextCtrl.cpp:451
 msgid "Use right mouse button or context key to change format"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:1376
+#: widgets/TimeTextCtrl.cpp:1485
 msgid "Time Control"
 msgstr ""
 
-#: ../src/widgets/Warning.cpp:53
+#: widgets/Warning.cpp:64
 msgid "Don't show this warning again"
 msgstr "Älä näytä tätä varoitusta uudelleen"
 
-#: ../src/xml/XMLFileReader.cpp:45
+#: xml/XMLFileReader.cpp:49
 #, c-format
 msgid "Could not open file: \"%s\""
 msgstr "Tiedostoa \"%s\" ei voitu avata."
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Virhe: %s rivillä %d"
+msgid "Error: %hs at line %lu"
+msgstr "Virhe: %hs rivillä %lu"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
-msgstr ""
+msgstr "Ei voitu ladata tiedostoa: \"%s\""
 
diff --git a/locale/fr.po b/locale/fr.po
index 96ac36f..9e29903 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,16 +1,16 @@
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity 1.4.x\n"
+msgstr "Project-Id-Version: Audacity 1.4.x\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
-"PO-Revision-Date: 2008-05-25 11:41+0100\n"
-"Last-Translator: Christian Brochec <christian at audacityteam.org>\n"
+"PO-Revision-Date: 2008-12-22 17:28-0000\n"
+"Last-Translator: g <g at g>\n"
 "Language-Team: Christian Brochec <christian at audacityteam.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
+"X-Poedit-Bookmarks: 394,948,-1,-1,-1,-1,-1,1523,-1,-1\n"
 
 #: AboutDialog.cpp:142
 #: AudacityApp.cpp:749
@@ -23,28 +23,27 @@ msgid "OK... Audacious!"
 msgstr "OK... Audacieux !"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "Audacity est un programme gratuit écrit par une équipe internationale de développeurs bénévoles. La coordination remercie SourceForge.net, un service en ligne qui fournit des outils aux projets de programmes en source libre. Audacity est disponible pour Windows 98 et plus, MacOS9 et X, Linux, et d'autres systèmes basés sur Unix. Des versions plus anciennes d'Audacity  sont disponibles pour Mac OS 9. "
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Ce programme est encore en bêta test ! Il est suffisamment stable pour une utilisation quotidienne, mais il peut contenir des bogues et des fonctions non achevées. Nous avons besoin de vos remarques, SVP visitez notre site web et donnez-nous vos relevés de bogues et vos demandes d'améliorations."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Ceci est une version stable et complête d'Audacity. Si toutefois vous décelez un bogue ou avez une suggestion, merci de nous contacter. Nous dépendons des retours des utilisateurs pour l'amélioration d'Audacity. Pour plus d'information, veuillez vous connecter à notre site Internet."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: AboutDialog.cpp:192
 #: AboutDialog.cpp:194
 msgid "translator_credits"
-msgstr ""
-"Traduction française de Christian Brochec.\n"
+msgstr "Traduction française de Christian Brochec.\n"
 "Pour toute remarque ou suggestion  :  christian at audacityteam.org"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Un éditeur audio numérique libre"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -62,7 +61,7 @@ msgstr "%s équipe de support d'Audacity"
 
 #: AboutDialog.cpp:225
 msgid "Emeritus Developers"
-msgstr "Développeurs émérites :"
+msgstr "Développeurs émérites"
 
 #: AboutDialog.cpp:230
 msgid "Other Emeritus Team Members"
@@ -70,7 +69,7 @@ msgstr "Autres membres émérites de l'équipe"
 
 #: AboutDialog.cpp:235
 msgid "Other Contributors"
-msgstr "Autres contributeurs :"
+msgstr "Autres contributeurs"
 
 #: AboutDialog.cpp:240
 msgid "Audacity is based on code from the following projects:"
@@ -80,6 +79,10 @@ msgstr "Audacity est basé sur le code des projets suivants :"
 msgid "Special thanks:"
 msgstr "Remerciements particuliers :"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -113,12 +116,12 @@ msgstr "Importation de MP3"
 #: AboutDialog.cpp:335
 #: AboutDialog.cpp:338
 msgid "Ogg Vorbis Import and Export"
-msgstr "Import et Export Ogg Vorbis "
+msgstr "Importation et Exportation d'Ogg Vorbis "
 
 #: AboutDialog.cpp:342
 #: AboutDialog.cpp:345
 msgid "ID3 tag support"
-msgstr "support des tag ID3"
+msgstr "Support des tag ID3"
 
 #: AboutDialog.cpp:352
 #: AboutDialog.cpp:355
@@ -128,7 +131,7 @@ msgstr "Import et Export FLAC"
 #: AboutDialog.cpp:360
 #: AboutDialog.cpp:363
 msgid "MP2 export"
-msgstr "export MP2"
+msgstr "Export MP2"
 
 #: AboutDialog.cpp:368
 #: AboutDialog.cpp:371
@@ -197,7 +200,7 @@ msgstr ""
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
 #: AboutDialog.cpp:482
 msgid "Installation Prefix: "
-msgstr ""
+msgstr "Préfixe d'installation :"
 
 #: AboutDialog.cpp:486
 msgid "Settings folder: "
@@ -223,12 +226,10 @@ msgstr "Erreur d'ouverture de projet"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s n'existe pas et ne peut être ouvert.\n"
+msgstr "%s n'existe pas et ne peut être ouvert.\n"
 "\n"
 "Il a été retiré de l'historique."
 
@@ -263,38 +264,32 @@ msgid "Unknown command line option: %s\n"
 msgstr "Option de ligne de commande inconnue : %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity ne peut pas trouver de place pour stocker les fichiers temporaires.\n"
+msgstr "Audacity n'a pas pu trouver un emplacement pour stocker les fichiers temporaires.\n"
 "Veuillez entrer un répertoire approprié dans la boîte de dialogue des préférences."
 
 #: AudacityApp.cpp:1050
 msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
-msgstr "Audacity va maintenant se fermer.  Veuillez relancer Audacity pour utiliser le nouveau répertoire temporaire."
+msgstr "Audacity va maintenant se fermer. Veuillez relancer Audacity pour utiliser le nouveau répertoire temporaire."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"L'ouverture simultanné de deux sessions d'Audacity\n"
-"peut causer des perrtes de données ou le crash du système.\n"
+msgstr "L'ouverture simultanée de deux sessions d'Audacity\n"
+"peut causer des pertes de données ou le crash du système.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity ne peut pas verrouiller le répertoire temporaire.\n"
+msgstr "Audacity n'a pas pu verrouiller le répertoire temporaire.\n"
 "Ce répertoire est peut être déjà utilisé par une autre session d'Audacity.\n"
 
 #: AudacityApp.cpp:1091
 msgid "Do you still want to start Audacity?"
-msgstr "Voulez-vous toujours démarrer Audacity"
+msgstr "Voulez-vous toujours démarrer Audacity ?"
 
 #: AudacityApp.cpp:1093
 msgid "Error locking temporary folder"
@@ -302,15 +297,13 @@ msgstr "Erreur de verrouillage du répertoire temporaire"
 
 #: AudacityApp.cpp:1131
 msgid "The system has detected that another copy of Audacity is running.\n"
-msgstr "Le système a détecté qu'une autre session d'Audacity était ouverte.\n"
+msgstr "Le système a détecté qu'une autre session d'Audacity est ouverte.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"A partir de la session courante d'Audacity, utilisez Nouveau ou Ouvrir\n"
-"pour démarrer plusieurs projets simultannément.\n"
+msgstr "Sélectionnez Nouveau ou Ouvrir dans la session courante d'Audacity \n"
+"pour démarrer plusieurs projets simultanément.\n"
 
 #: AudacityApp.cpp:1134
 msgid "Audacity is already running"
@@ -318,7 +311,7 @@ msgstr "Audacity est déjà ouvert"
 
 #: AudacityApp.cpp:1151
 msgid "Command-line options supported:"
-msgstr "Options de lignes de commandes supportées :"
+msgstr "Options de ligne de commande supportées :"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #: AudacityApp.cpp:1154
@@ -328,31 +321,29 @@ msgstr "\t-help (ce message)"
 #. i18n-hint '-version' needs to stay in English.
 #: AudacityApp.cpp:1156
 msgid "\t-version (display Audacity version)"
-msgstr "\t-version (affiche la version d'Audacity)"
+msgstr "\t-version (afficher la version d'Audacity)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #: AudacityApp.cpp:1160
 msgid "\t-test (run self diagnostics)"
-msgstr "\t-test (lance l'auto diagnostic)"
+msgstr "\t-test (lancer l'auto diagnostic)"
 
 #. i18n-hint '-blocksize' is the option and needs to stay in
 #: AudacityApp.cpp:1165
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
-msgstr "\t-blocksize nnn (règle en bytes la taille maximale des blocs)"
+msgstr "\t-blocksize nnn (fixer la taille maximale des blocs en octets)"
 
 #: AudacityApp.cpp:1166
 msgid "In addition, specify the name of an audio file or Audacity project to open it."
-msgstr "De plus, spécifier le nom du fichier audio ou du projet Audacity pour l'ouvrir"
+msgstr "De plus, spécifier le nom d'un fichier audio ou projet Audacity pour l'ouvrir"
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Les projets Audacity(.AUP) ne sont actuellement pas\n"
-"associés à  Audacity. \n"
+msgstr "Les projets Audacity (.AUP) ne sont actuellement pas\n"
+"associés à Audacity. \n"
 "\n"
 "Voulez-vous les associer afin de pouvoir les ouvrir d'un double clic ?"
 
@@ -365,11 +356,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Impossible de trouver un périphérique audio.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Vous ne pourrez pas lire ou enregistrer d'audio.\n"
+msgstr "Vous ne pourrez pas lire ou enregistrer d'audio.\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -385,13 +374,11 @@ msgid "Latency problem"
 msgstr "Problème de latence"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"La latence a caché l'audio enregistré avant le zéro.\n"
-"Audacity l'a ramené au zéro.\n"
+msgstr "La latence a caché l'audio enregistré avant le zéro.\n"
+"Audacity l'a rétabli à zéro.\n"
 "Vous pourrez utiliser l'outil de glissement temporel (<---> ou F5) pour glisser la piste à sa place."
 
 #: AutoRecovery.cpp:54
@@ -399,11 +386,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Récupération automatique de crash"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Des projets n'ont pas été correctement sauvegardés lors de la dernière session Audacity.\n"
+msgstr "Des projets n'ont pas été correctement sauvegardés lors de la dernière session Audacity.\n"
 "Heureusement, les projets suivants peuvent être automatiquement récupérés :"
 
 #: AutoRecovery.cpp:75
@@ -413,7 +398,7 @@ msgstr "Projets récupérables"
 #: AutoRecovery.cpp:78
 #: Tags.cpp:2032
 msgid "Name"
-msgstr "Nom..."
+msgstr "Nom"
 
 #: AutoRecovery.cpp:84
 msgid "Recovering a project will not change any files on disk before you save it."
@@ -421,7 +406,7 @@ msgstr "La récupération du projet ne modifiera aucun des fichiers du disque av
 
 #: AutoRecovery.cpp:88
 msgid "Quit Audacity"
-msgstr "Quitter Audacity..."
+msgstr "Quitter Audacity"
 
 #: AutoRecovery.cpp:89
 msgid "Do Not Recover"
@@ -432,11 +417,9 @@ msgid "Recover Projects"
 msgstr "Récupérer les projets"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Etes-vous sûr(e) de ne pas vouloir récupérer de projets ?\n"
+msgstr "Etes-vous sûr(e) de ne pas vouloir récupérer de projets ?\n"
 "Ils ne pourront pas être récupérés plus tard."
 
 #: AutoRecovery.cpp:128
@@ -446,7 +429,7 @@ msgstr "Confirmer ?"
 #: AutoRecovery.cpp:146
 #: AutoRecovery.cpp:183
 msgid "Could not enumerate files in auto save directory"
-msgstr "Impossible d'énumérer les fichiers du répertoire de sauvegarde auto"
+msgstr "Impossible d'énumérer les fichiers du répertoire de sauvegarde automatique"
 
 #: AutoRecovery.cpp:147
 #: AutoRecovery.cpp:184
@@ -494,7 +477,7 @@ msgstr "C&hoisir une commande"
 
 #: BatchCommands.cpp:477
 msgid "Stereo to Mono Effect not found"
-msgstr "L'effet Stéréo vers mono n'a pas été trouvé"
+msgstr "L'effet Stéréo vers Mono n'a pas été trouvé"
 
 #: BatchCommands.cpp:497
 msgid "Ogg Vorbis support is not included in this build of Audacity"
@@ -502,7 +485,7 @@ msgstr "Le support d'Ogg Vorbis n'est pas inclus dans cette version d'Audacity"
 
 #: BatchCommands.cpp:509
 msgid "FLAC support is not included in this build of Audacity"
-msgstr "Le support de  FLAC n'est pas inclus dans cette version d'Audacity"
+msgstr "Le support de FLAC n'est pas inclus dans cette version d'Audacity"
 
 #: BatchCommands.cpp:513
 #, c-format
@@ -511,11 +494,9 @@ msgstr "La commande %s n'est pas encore implémentée"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Impossible de modifier les paramêtres de l'effet %s\n"
+msgstr "Impossible de modifier les paramêtres de l'effet %s\n"
 "à %s."
 
 #: BatchCommands.cpp:583
@@ -525,12 +506,10 @@ msgstr "Votre commande de traitement en lot de %s n'a pas été reconnu."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Appliquer %s avec le(s) paramêtre(s)\n"
+msgstr "Appliquer %s avec le(s) paramètre(s)\n"
 "\n"
 "%s"
 
@@ -550,6 +529,10 @@ msgstr "Appliquer %s"
 msgid "Apply Chain"
 msgstr "Appliquer le script"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Sélectionner le script"
@@ -564,7 +547,7 @@ msgstr "Appliquer au &Projet courant"
 
 #: BatchProcessDialog.cpp:107
 msgid "Apply to &Files..."
-msgstr "Appliquer aux &fichiers"
+msgstr "Appliquer aux &fichiers..."
 
 #: BatchProcessDialog.cpp:108
 #: BatchProcessDialog.cpp:247
@@ -580,7 +563,7 @@ msgstr "Appliquer aux &fichiers"
 #: effects/audiounits/AudioUnitEffect.cpp:882
 #: effects/vamp/VampEffect.cpp:411
 msgid "&Cancel"
-msgstr "Annuler"
+msgstr "&Annuler"
 
 #: BatchProcessDialog.cpp:146
 #: BatchProcessDialog.cpp:191
@@ -596,9 +579,17 @@ msgstr "Application de '%s' au projet courant"
 msgid "Please save and close the current project first."
 msgstr "Veuillez d'abord enregistrer et fermer le projet courant."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
-msgstr "Sélectionner le(s) fichier(s) pour le traitement en lot.."
+msgstr "Sélectionner le(s) fichier(s) pour le traitement en lot..."
+
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
 
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
@@ -620,7 +611,7 @@ msgstr "Editer les scripts"
 
 #: BatchProcessDialog.cpp:416
 msgid "&Chains"
-msgstr "S&cripts"
+msgstr "&Scripts"
 
 #: BatchProcessDialog.cpp:435
 #: Tags.cpp:815
@@ -644,7 +635,7 @@ msgstr "Re&nommer"
 
 #: BatchProcessDialog.cpp:443
 msgid "C&hain (Double-Click or press SPACE to edit)"
-msgstr "S&cript (double-cliquer ou taper ESPACE pour éditer)"
+msgstr "&Script (double-cliquer ou taper ESPACE pour éditer)"
 
 #. i18n-hint: This is the number of the command in the list
 #: BatchProcessDialog.cpp:453
@@ -657,11 +648,11 @@ msgstr "&Insérer"
 
 #: BatchProcessDialog.cpp:460
 msgid "De&lete"
-msgstr "Effacer"
+msgstr "&Effacer"
 
 #: BatchProcessDialog.cpp:461
 msgid "Move &Up"
-msgstr "Déplacer la piste vers le ha&ut"
+msgstr "&Déplacer la piste vers le haut"
 
 #: BatchProcessDialog.cpp:462
 msgid "Move &Down"
@@ -669,7 +660,7 @@ msgstr "&Déplacer la piste vers le bas"
 
 #: BatchProcessDialog.cpp:463
 msgid "De&faults"
-msgstr "Réglages par défaut"
+msgstr "Réglages par dé&faut"
 
 #: BatchProcessDialog.cpp:507
 msgid "- END -"
@@ -711,12 +702,10 @@ msgid "Copying audio data into project..."
 msgstr "Copie de données audio dans le projet..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Votre projet dépend de la présence d'autres fichiers.\n"
+msgstr "Votre projet dépend de la présence d'autres fichiers.\n"
 "Copiez l'audio des fichiers suivants vers votre projet afin qu'il le contienne.\n"
 "Ceci nécessite davantage d'espace disque, mais est plus sûr."
 
@@ -747,7 +736,7 @@ msgstr "Annuler l'enregistrement"
 
 #: Dependencies.cpp:306
 msgid "Do Not Copy Any Audio"
-msgstr "Ne pas cop"
+msgstr "Ne pas copier d'Audio"
 
 #: Dependencies.cpp:308
 msgid "Copy All Audio into Project (Safer)"
@@ -760,7 +749,7 @@ msgstr "Me demander"
 
 #: Dependencies.cpp:318
 msgid "Always copy all audio (safest)"
-msgstr "Toujours &copier tout l'audio (plus sûr)"
+msgstr "Toujours copier tout l'audio (le plus sûr)"
 
 #: Dependencies.cpp:319
 msgid "Never copy any audio"
@@ -772,7 +761,7 @@ msgstr "A chaque fois qu'un projet dépend d'autres fichiers :"
 
 #: Dependencies.cpp:409
 msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
-msgstr "Si vous le faites, votre projet ne sera pas enregistré. Le souhaitez-vous ?"
+msgstr "Si vous continuez, votre projet ne sera pas enregistré. Le souhaitez-vous ?"
 
 #: Dependencies.cpp:449
 msgid "Your project is self-contained; it does not depend on any external audio files."
@@ -783,11 +772,9 @@ msgid "Dependency check"
 msgstr "Vérification des fichiers associés."
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Attention : il reste très peu d'espace libre sur ce volume. Veuillez\n"
+msgstr "Attention : il reste très peu d'espace libre sur ce volume. Veuillez\n"
 " sélectionner un autre répertoire temporaire dans vos préférences."
 
 #: DirManager.cpp:221
@@ -810,12 +797,10 @@ msgstr "Nettoyage des répertoires cache..."
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity a trouvé des blocs de fichiers orphelins %s! \n"
-"Il est souhaitable d'enregsitrer et de recharger le projet pour effectuer une vérification du projet.\n"
+msgstr "Audacity a trouvé un bloc de fichiers orphelins %s! \n"
+"Il est souhaitable d'enregistrer et de recharger le projet pour effectuer une vérification complète du projet.\n"
 
 #  i18n-hint: This is the pattern for filenames that are created
 #  when a file needs to be backed up to a different name.  For
@@ -828,7 +813,7 @@ msgstr "%s-old%d"
 
 #: DirManager.cpp:993
 msgid "Unable to open/create test file"
-msgstr "Impossible d'ouvrir/créer le ficher test"
+msgstr "Impossible d'ouvrir/créer un fichier test"
 
 #: DirManager.cpp:1002
 #, c-format
@@ -838,17 +823,17 @@ msgstr "Impossible de retirer '%s'"
 #: DirManager.cpp:1007
 #, c-format
 msgid "Renamed file: %s\n"
-msgstr "Renommer le fichier : %s\n"
-
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Changement de bloc %s\n"
+msgstr "Fichier renommé : %s\n"
 
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
-msgstr "Imposible de renommer '%s' en '%s'"
+msgstr "Impossible de renommer '%s' en '%s'"
+
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
 
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
@@ -858,7 +843,7 @@ msgstr "Vérification des données du projet..."
 #: DirManager.cpp:1128
 #, c-format
 msgid "Orphaned blockfile: (%s)"
-msgstr "Bloc de fichier orphelin : (%s)"
+msgstr "Bloc de fichiers orphelins : (%s)"
 
 #: DirManager.cpp:1153
 #, c-format
@@ -876,21 +861,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "Fichier de données manquant : (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"Le vérificateur de projet a trouvé des erreurs lors de l'inspection des données du projet chargé;\n"
-"cliquer sur 'Détails' pour une liste complète des erreurs ou sur \"OK\" pour accéder à davantage d'options."
+msgstr "Le vérificateur de projet a trouvé des erreurs lors de l'inspection des données du projet chargé;\n"
+"cliquer sur \"Détails\" pour une liste complète des erreurs ou sur \"OK\" pour accéder à davantage d'options."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Le vérificateur de projet a trouvé %d blocs de fichiers orphelins. Ces fichiers\n"
+msgstr "Le vérificateur de projet a trouvé %d blocs de fichiers orphelins. Ces fichiers\n"
 "sont inutilisés et sont probablement le résultat d'un crash ou d'un bogue.\n"
 "Il doivent être effacés pour éviter de saturer le disque."
 
@@ -899,7 +880,6 @@ msgid "Delete orphaned files [safe and recommended]"
 msgstr "Effacer les fichiers orphelins [recommandé et sans risque]"
 
 #: DirManager.cpp:1225
-#, fuzzy
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "Continuer sans effacer ; silently work around the extra files"
 
@@ -920,16 +900,14 @@ msgstr "Attention"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Le vérificateur de projet a détecté %d fichier(s) source utilisé(s) à la place\n"
-"(\"liens\"') sont désormais manquant. Audacity n'a aucun moyen\n"
+msgstr "Le vérificateur de projet a détecté %d fichier(s) source utilisé(s) à la place\n"
+"(\"liens\"') sont désormais manquants. Audacity n'a aucun moyen\n"
 "de récupérer ces fichiers automatiquement ; vous pouvez choisir\n"
 "de remplir définitivement de silence ces fichiers manquants, de les remplir\n"
 "de silence pour cette session seulement, ou de fermer le projet maintenant\n"
@@ -937,12 +915,12 @@ msgstr ""
 
 #: DirManager.cpp:1259
 msgid "Replace missing data with silence [permanent upon save]"
-msgstr "Remplacer les données manquante par du silence [permanent jusqu'à la sauvegarde]"
+msgstr "Remplacer les données manquantes de silence [permanent jusqu'à la sauvegarde]"
 
 #: DirManager.cpp:1260
 #: DirManager.cpp:1348
 msgid "Temporarily replace missing data with silence [this session only]"
-msgstr "Remplacer temporairement les données manquantes par du silence [cette session seulement]"
+msgstr "Remplacer temporairement les données manquantes de silence [cette session seulement]"
 
 #: DirManager.cpp:1261
 #: DirManager.cpp:1307
@@ -952,12 +930,10 @@ msgstr "Fermer immédiatement le projet sans modifications supplémentaires"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Le vérificateur de projet a détecté %d sommaire manquant (.auf).\n"
+msgstr "Le vérificateur de projet a détecté %d sommaire manquant (.auf).\n"
 "Audacity peut totalement recréer ce sommaire à partir des données\n"
 "audio originales du projet."
 
@@ -967,20 +943,18 @@ msgstr "Recréer le sommaire [sans risque et recommandé]"
 
 #: DirManager.cpp:1306
 msgid "Fill in silence for missing display data [this session only]"
-msgstr "Rempli de silence les données manquantes [pour cette session]"
+msgstr "Remplir de silence les données manquantes [pour cette session]"
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Le vérificateur de projet a détecté %d bloc(s) de données audio manquants (.au) \n"
+msgstr "Le vérificateur de projet a détecté %d bloc(s) de données audio manquants (.au) \n"
 "probablement à cause d'un bogue, d'un crash système ou d'un effacement accidentel\n"
 "Il est impossible à Audacity de récupérer ces fichiers manquants automatiquement.\n"
 "Vous pouvez choisir de les remplir définitivement de silence, de les remplir\n"
@@ -989,11 +963,11 @@ msgstr ""
 
 #: DirManager.cpp:1347
 msgid "Replace missing data with silence [permanent immediately]"
-msgstr "Remplacer les données manquantes par du  silence [permanent immédiatement]"
+msgstr "Remplacer les données manquantes de silence [permanent immédiatement]"
 
 #: DirManager.cpp:1375
 msgid "Cleaning up unused directories in project data..."
-msgstr "Nettoyer les répertoires inutilisés des données du projet..."
+msgstr "Nettoyer les répertoires inutilisés dans les données du projet..."
 
 #: DirManager.cpp:1448
 msgid "Caching audio"
@@ -1009,12 +983,99 @@ msgstr "Sauvegarde de l'audio enregistré"
 
 #: DirManager.cpp:1487
 msgid "Saving recorded audio to disk..."
-msgstr "Enregistrement de l'audio sur le disque..."
+msgstr "Sauvegarde sur le disque de l'audio enregistré ..."
 
 #: FFT.cpp:389
 msgid "Rectangular"
 msgstr "Rectangulaire"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:112
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:172
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:192
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Localisation de %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Pour trouver %s, cliquer ici -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Parcourir..."
+
+#: FFmpeg.cpp:214
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Où se trouve  %s ?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:87
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:242
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Analyse de fréquence"
@@ -1044,9 +1105,10 @@ msgstr "Autocorrélation avancée"
 msgid "Cepstrum"
 msgstr "Cepstre"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "Algorythme :"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
+msgstr "Algorithme :"
 
 #: FreqWindow.cpp:168
 #: HistoryWindow.cpp:79
@@ -1056,11 +1118,11 @@ msgstr "Taille"
 #. i18n-hint: This refers to a "window function", used in the
 #: FreqWindow.cpp:181
 msgid " window"
-msgstr " window"
+msgstr " fenêtre"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Fonction :"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1068,11 +1130,11 @@ msgstr "Fréquence linéaire"
 
 #: FreqWindow.cpp:193
 msgid "Log frequency"
-msgstr "Fréquence logarythmique"
+msgstr "Fréquence logarithmique"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Axe :"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1081,6 +1143,10 @@ msgstr "Axe :"
 msgid "&Export..."
 msgstr "&Exporter..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Exporter"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1179,11 +1245,11 @@ msgstr "Enregistrement -choisir le périphérique d'entrée"
 
 #: HelpText.cpp:109
 msgid "Recording - Choosing the Input Source"
-msgstr "Enregistrement -choisir la source audio"
+msgstr "Enregistrement - Choisir la source audio"
 
 #: HelpText.cpp:113
 msgid "Recording - Setting the Input Level"
-msgstr "Enregistrement - régler le niveau d'enregistrement"
+msgstr "Enregistrement - Régler le niveau d'enregistrement"
 
 #: HelpText.cpp:117
 msgid "Editing and greyed out Menus"
@@ -1203,7 +1269,7 @@ msgstr "Formats non supportés"
 
 #: HelpText.cpp:133
 msgid "Burn to CD"
-msgstr "Graver sur un CD"
+msgstr "Graver sur CD"
 
 #: HelpText.cpp:137
 msgid "No Local Help"
@@ -1215,7 +1281,7 @@ msgstr "</p><center><h3>Pour bien démarrer</h3></center><br>"
 
 #: HelpText.cpp:150
 msgid "Welcome to Audacity "
-msgstr "Bienvenue dans Audacity"
+msgstr "Bienvenue à Audacity"
 
 #: HelpText.cpp:151
 msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
@@ -1223,7 +1289,7 @@ msgstr "Découvrez comment : <ul><li>[[play|lire]] un fichier audio existant <li
 
 #: HelpText.cpp:159
 msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
-msgstr "Cet écran peut être affiché à tout moment en cliquant sur le menu <i>Aide</i>,puis <i>afficher le message d'accueil</i>. Pour une découverte des menus et contrôles d'Audacity en détail, cliquer sur le menu <i>Aide</i> puis <i>Index</i>, ou télécharger notre <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">Manuel</a> en format PDF (en anglais).</p>"
+msgstr "Cet écran peut être affiché à tout moment en cliquant sur le menu <i>Aide</i>,puis <i>afficher le message d'accueil</i>. Pour une découverte des menus et contrôles d'Audacity en détail, cliquer sur le menu <i>Aide</i> puis <i>Index</i>, ou télécharger notre <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">Manuel complet</a> en format PDF (en anglais).</p>"
 
 #: HelpText.cpp:172
 msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
@@ -1266,8 +1332,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr "<p>Pour graver votre oeuvre sur un CD audio lisible sur tout lecteur de CD, l'[[export|exporter]] dans un premier temps en WAV ou AIFF. Le fichier doit être stéréo, 44100 Hz (à régler grâce au sélecteur \"Projet à\" en bas à gauche) et en 16 bits (à régler depuis le bouton \"Options\" de la boîte de dialogue d'exportation). Ce sont les réglages par défaut d'Audacity, si bien que -normalement- vous n'avez rien à changer pour l'exportation. <p>Gravez le fichier exporté sur un  \"CD audio\" - et pas un \"CD de données\" ou un  \"CD MP3\" - avec un logiciel de gravure de CD comme iTunes ou Windows Media Player. Pour davantage d'aide, voir en ligne [[wiki:How_to_burn_CDs|How to burn CDs]] (en anglais). </p><p>"
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Vous ne semblez pas avoir le fichier d'aide Audacity sur votre machine. Vous pouvez soit <a href=\"http://audacity.sourceforge.net/help/documentation\">télécharger</a> le fichier d'aide puis y accéder depuis Audacity en cliquant <i>Aide</i> puis <i>Index</i>, soit cliquer <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">ici</a> pour lire le manuel complet en ligne."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1364,20 +1430,18 @@ msgstr "Insérer avant"
 #: LabelDialog.cpp:127
 #: Menus.cpp:194
 msgid "&Import..."
-msgstr "&Importer"
+msgstr "&Importer..."
 
 #: LabelDialog.cpp:155
 msgid "New..."
 msgstr "Nouveau..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Vous avez laissé des noms de marqueurs en blanc.  Ils seront\n"
+msgstr "Vous avez laissé des noms de marqueurs en blanc.  Ils seront\n"
 "omis lors du remplissage de la piste de marqueurs.\n"
 "\n"
 "Voulez-vous revenir en arrière et fournir des noms ?"
@@ -1389,7 +1453,7 @@ msgstr "Confirmer"
 #: LabelDialog.cpp:514
 #: Menus.cpp:3555
 msgid "Select a text file containing labels..."
-msgstr "Choisir un fichier texte contenantdles marqueurs..."
+msgstr "Choisir un fichier texte contenant des marqueurs..."
 
 #: LabelDialog.cpp:518
 #: Menus.cpp:3559
@@ -1406,7 +1470,7 @@ msgstr "Impossible d'ouvrir le fichier : "
 
 #: LabelDialog.cpp:558
 msgid "No labels to export."
-msgstr "Aucun marqueur à exporter"
+msgstr "Aucun marqueur à exporter."
 
 #: LabelDialog.cpp:564
 #: Menus.cpp:2172
@@ -1443,11 +1507,9 @@ msgstr "Choisir la langue qu'Audacity utilisera :"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Conversion d'un projet version 1.0 au nouveau format.\n"
+msgstr "Conversion d'un projet version 1.0 au nouveau format.\n"
 "L'ancien fichier a été sauvegardé sous '%s'"
 
 #: Legacy.cpp:357
@@ -1479,6 +1541,10 @@ msgstr "&Enregistrer le projet\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Enregistrer le projet &sous..."
 
+#: Menus.cpp:213
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Vérifier les fichiers associés..."
@@ -1487,6 +1553,10 @@ msgstr "Vérifier les fichiers associés..."
 msgid "Open Me&tadata Editor..."
 msgstr "Ouvrir l'éditeur de mé&tadonnées..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Importer"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audio...\tCtrl+Shift+I"
@@ -1516,9 +1586,13 @@ msgstr "Exporter les marqueurs..."
 msgid "Export &Multiple..."
 msgstr "Export &Multiple..."
 
+#: Menus.cpp:258
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
-msgstr "Script CleanSpeech..."
+msgstr "Script CleanSpeec&h..."
 
 #: Menus.cpp:248
 #: Menus.cpp:262
@@ -1527,7 +1601,7 @@ msgstr "Editer les scripts"
 
 #: Menus.cpp:249
 msgid "Export CleanSpeech &Presets..."
-msgstr "Exporter les Préselections CleanSpeech..."
+msgstr "Exporter les &Préselections CleanSpeech..."
 
 #: Menus.cpp:250
 msgid "I&mport CleanSpeech Presets..."
@@ -1539,7 +1613,7 @@ msgstr "Appliquer le script..."
 
 #: Menus.cpp:267
 msgid "&Upload File..."
-msgstr "Envoyer le fichier.."
+msgstr "Envoyer le fichier..."
 
 #: Menus.cpp:273
 msgid "Pa&ge Setup..."
@@ -1586,7 +1660,7 @@ msgstr "C&oller\tCtrl+V"
 
 #: Menus.cpp:333
 msgid "Tri&m\tCtrl+T"
-msgstr "Rognage (supprimer en dehors de la sélection)\tCtrl+T"
+msgstr "Rogner (supprimer en dehors de la sélection)\tCtrl+T"
 
 #: Menus.cpp:335
 msgid "&Delete\tCtrl+K"
@@ -1596,9 +1670,9 @@ msgstr "&Effacer\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Supprimer la sélection\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&Silence\tCtrl+L"
+#: Menus.cpp:381
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1612,23 +1686,21 @@ msgstr "Scinder Nouveau\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "Grouper\tCtrl+C"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Dégrouper\tCtrl+Alt+J"
+#: Menus.cpp:394
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Dupliquer\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&Stéréo vers mono"
+#: Menus.cpp:401 Menus.cpp:641
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Régions marquées..."
+#: Menus.cpp:408
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1671,13 +1743,13 @@ msgid "&Join\tAlt+J"
 msgstr "Grouper\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Dégrouper\tShift+Alt+J"
+#: Menus.cpp:452
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "Sélectionner&..."
+#: Menus.cpp:457
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1707,9 +1779,9 @@ msgstr ""
 msgid "Find &Zero Crossings\tZ"
 msgstr "Rechercher les croisements avec le &zéro\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Déplacer le curseur..."
+#: Menus.cpp:478
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1717,15 +1789,15 @@ msgstr "au début de la sélec&tion"
 
 #: Menus.cpp:438
 msgid "to Selection En&d"
-msgstr "à la f&in de la sélection"
+msgstr "à la fin &de la sélection"
 
 #: Menus.cpp:442
 msgid "to Track &Start\tJ"
-msgstr "au début de la piste\tJ"
+msgstr "au début de la pi&ste\tJ"
 
 #: Menus.cpp:443
 msgid "to Track &End\tK"
-msgstr "à la fin de la piste\tK"
+msgstr "à la fin de la pist&e\tK"
 
 #: Menus.cpp:450
 msgid "Re&gion Save"
@@ -1733,19 +1805,19 @@ msgstr "Enregistrer la Ré&gion"
 
 #: Menus.cpp:451
 msgid "Regio&n Restore"
-msgstr "Restaurer la Ré&gion"
+msgstr "Restaurer la Régio&n"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Lire la région..."
+#: Menus.cpp:505
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
-msgstr "Verrouiller"
+msgstr "Verroui&ller"
 
 #: Menus.cpp:464
 msgid "&Unlock"
-msgstr "Déverrouiller"
+msgstr "Déverro&uiller"
 
 #: Menus.cpp:470
 msgid "Turn Snap-To On"
@@ -1763,9 +1835,14 @@ msgstr ""
 msgid "Turn Grid Snap Off"
 msgstr ""
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Préférences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:521
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:525
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1811,25 +1888,25 @@ msgstr "Montrer la &saturation"
 msgid "&History..."
 msgstr "&Historique..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "Barres d'ou&tils..."
+#: Menus.cpp:568
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
-msgstr "Barre de contrôle"
+msgstr "Barre de &contrôle"
 
 #: Menus.cpp:527
 msgid "&Device Toolbar"
-msgstr "Barre de périphérique"
+msgstr "Barre &de périphérique"
 
 #: Menus.cpp:528
 msgid "&Edit Toolbar"
-msgstr "Barre d'édition"
+msgstr "Barre d'&édition"
 
 #: Menus.cpp:529
 msgid "&Meter Toolbar"
-msgstr "VU-mètre"
+msgstr "Barre de VU-&mètre"
 
 #: Menus.cpp:530
 msgid "Mi&xer Toolbar"
@@ -1853,15 +1930,73 @@ msgstr "&Réinitialiser les barres d'outils"
 
 #: Menus.cpp:537
 msgid "!Simplified View"
-msgstr "! Affichage simplifié"
+msgstr "!Affichage simplifié"
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:589
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:595
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Retour au début\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Aller à la fin\tEnd"
+
+#: Menus.cpp:602
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:606
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:611
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:616
+msgid "Sound Activation Level..."
+msgstr ""
 
 #: Menus.cpp:545
 msgid "&Tracks"
-msgstr "Pistes"
+msgstr "Pis&tes"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "&Nouveau..."
+#: Menus.cpp:631
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1876,10 +2011,6 @@ msgstr "Piste &stéréo"
 msgid "&Time Track"
 msgstr "Piste de &temps"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "Enregistrement programmé..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "Mi&xage et Rendu"
@@ -1902,7 +2033,7 @@ msgstr "Rendre toutes les pistes &muettes\tCtrl+U"
 
 #: Menus.cpp:593
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
-msgstr "aucune piste muette\tCtrl+Shift+U"
+msgstr "Aucune piste muette\tCtrl+Shift+U"
 
 #: Menus.cpp:597
 msgid "Align with &Zero"
@@ -1936,38 +2067,50 @@ msgstr "Aligner la fin avec la fi&n de la sélection"
 msgid "Align Tracks To&gether"
 msgstr "Aligner les pistes entre elles"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Aligner les pistes...."
+#: Menus.cpp:683
+msgid "&Align Tracks"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Ali&gner et déplacer le curseur..."
+#: Menus.cpp:692
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:699
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:708
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
-msgstr "Ajouter un marqueur à  la sélection\tCtrl+B"
+msgstr "Ajouter un marqueur à  la sé&lection\tCtrl+B"
 
 #: Menus.cpp:624
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Ajouter un marqueur au point de lecture\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "Trier les pistes par ..."
+#: Menus.cpp:718
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Compteur de début"
+#: Menus.cpp:719
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Nom."
+#: Menus.cpp:721
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "&Générer"
 
+#: Menus.cpp:778 Menus.cpp:862 Menus.cpp:924
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "Effet"
@@ -1995,30 +2138,34 @@ msgstr "&A propos d'Audacity CleanSpeech..."
 
 #: Menus.cpp:747
 msgid "&Show Welcome Message..."
-msgstr "&Message d'accueil..."
+msgstr "Me&ssage d'accueil..."
 
 #: Menus.cpp:748
 msgid "&Index..."
 msgstr "&Index..."
 
+#: Menus.cpp:961
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Outils de capture d'écran..."
 
 #: Menus.cpp:759
 msgid "&Run Benchmark..."
-msgstr "&Lancer Test de performance..."
+msgstr "Lance&r Test de performance..."
 
 #: Menus.cpp:761
 msgid "&Audio Device Info..."
 msgstr "&Périphérique audio..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: Menus.cpp:774
@@ -2051,11 +2198,11 @@ msgstr "Outil suivant\tD"
 
 #: Menus.cpp:782
 msgid "Previous Tool\tA"
-msgstr "Outi précédent\tA"
+msgstr "Outil précédent\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Lecture/Stop\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2089,22 +2236,14 @@ msgstr "Lire jusqu'à la sélection\tB"
 msgid "Play Looped\tL"
 msgstr "Lecture en boucle\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Lecture en boucle\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "Prévisualisation de la coupe\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Retour au début\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Aller à la fin\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "Sélectionner depuis le début\tShift+Home"
@@ -2161,9 +2300,9 @@ msgstr "Bascule de visée de piste\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Bascule de visée de piste\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Bascule de visée de piste\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2261,15 +2400,19 @@ msgstr "Passer en sélection par bloc"
 msgid "Snap To Off"
 msgstr "Passer en sélection libre"
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Ouvrir les fichiers récents"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Projets récents..."
+#: Menus.cpp:1158
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2315,7 +2458,7 @@ msgstr "Définir la limite droite de sélection"
 
 #: Menus.cpp:2006
 msgid "You must select a track first."
-msgstr "Sélectionner d'abord une piste"
+msgstr "Sélectionner d'abord une piste."
 
 #: Menus.cpp:2035
 #, c-format
@@ -2324,7 +2467,24 @@ msgstr "Répéter %s\tCtrl+R"
 
 #: Menus.cpp:2166
 msgid "There are no label tracks to export."
-msgstr "Il n'y a pas de piste de marqueurs à exporter"
+msgstr "Il n'y a pas de piste de marqueurs à exporter."
+
+#: Menus.cpp:2619
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2623
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2655
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2656
+msgid "Export MIDI"
+msgstr ""
 
 #: Menus.cpp:2271
 msgid "Nothing to undo"
@@ -2369,6 +2529,10 @@ msgstr "Texte collé depuis le presse-papier"
 msgid "Pasted from the clipboard"
 msgstr "Collé depuis le presse-papier"
 
+#: Menus.cpp:3094
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "La copie d'audio stéréo dans une piste mono n'est pas permise."
@@ -2376,11 +2540,11 @@ msgstr "La copie d'audio stéréo dans une piste mono n'est pas permise."
 #: Menus.cpp:2670
 #: toolbars/EditToolBar.cpp:139
 msgid "Trim"
-msgstr "Ne garder que la sélection"
+msgstr "Rogner"
 
 #: Menus.cpp:2670
 msgid "Trim file to selection"
-msgstr "Couper le fichier vers la sélection"
+msgstr "Rogner le fichier vers la sélection"
 
 #: Menus.cpp:2699
 #, c-format
@@ -2431,7 +2595,6 @@ msgstr "Dupliqué"
 msgid "Cut Labels"
 msgstr "Copier les marqueurs"
 
-#
 #: Menus.cpp:2824
 msgid "Cut labeled regions to the clipboard"
 msgstr "Couper la région marquée vers le presse-papier"
@@ -2540,9 +2703,9 @@ msgstr "Importer les marqueurs"
 msgid "Select a MIDI file..."
 msgstr "Choisir un fichier MIDI..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Tous les fichiers (*.*)|*.*|Fichiers MIDI (*.mid)|*.mid|Fichiers Allegro (*.gro)|*.gro"
+#: Menus.cpp:4196
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2561,14 +2724,6 @@ msgstr "Choisir un fichier audio non compressé..."
 msgid "All files (*)|*"
 msgstr "Tous les fichiers (*.*)|*.*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importer"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Editer les tags de métadonnées"
@@ -2642,6 +2797,14 @@ msgstr "Aligné"
 msgid "Align"
 msgstr "Aligner"
 
+#: Menus.cpp:4599
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4603
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "Nouvelle piste audio créée"
@@ -2708,15 +2871,15 @@ msgid "Removed audio track(s)"
 msgstr "Piste(s) audio supprimée(s)"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nouvelle fréquence d'échantillonnage (Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Rééchantillonner"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Nouvelle fréquence d'échantillonnage (Hz) :"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "La valeur entrée est invalide"
@@ -2784,15 +2947,13 @@ msgid "Save changes before closing?"
 msgstr "Enregistrer les modifications avant de quitter ?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "En cas d'enregistrement, le projet n'aura pas de piste.\n"
 "\n"
 "Pour enregistrer toute piste précédemment ouverte :\n"
@@ -2818,16 +2979,14 @@ msgstr "Projets Audacity (*.aup)|*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Ce fichier a été enregistré par Audacity %s,\n"
+msgstr "Ce fichier a été enregistré par Audacity %s,\n"
 "une très vieille version.  Le format a changé.\n"
 "\n"
 "Audacity peut corrompre le fichier en l'ouvrant,\n"
@@ -2851,11 +3010,9 @@ msgstr "Erreur d'ouverture de fichier"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Le fichier est peut-être invalide ou corrompu: \n"
+msgstr "Le fichier est peut-être invalide ou corrompu: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -2894,12 +3051,10 @@ msgstr "Impossible de trouver le répertoire de données du projet : \"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Ce fichier a été enregistré avec  Audacity %s.\n"
+msgstr "Ce fichier a été enregistré avec  Audacity %s.\n"
 "Vous utilisez Audacity %s - vous devez mettre votre version\n"
 "à jour pour ouvrir ce fichier."
 
@@ -2910,25 +3065,35 @@ msgstr "Impossible d'ouvrir le fichier projet"
 # n
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Ce fichier a été enregistré par Audacity %s,\n"
+msgstr "Ce fichier a été enregistré par Audacity %s.\n"
 "Vous pouvez l'ouvrir avec cette version d'Audacity, mais si vous l'enregistrez avec, vous ne pourrez plus l'ouvrir dans l'ancienne version.\n"
 "\n"
 "Ouvrir le fichier immédiatement ?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2647
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Impossible de sauver le projet. %s est peut-être protégé en écriture, \n"
-"ou le disque est plein."
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2940,21 +3105,19 @@ msgstr "Erreur d'enregistrement du projet"
 msgid "Saved %s"
 msgstr " %s enregistré"
 
-#. i18n-hint: This refers to files that are opened directly
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "données brutes (Raw)"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Importation du fichier %s ..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr " '%s' importé"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Importer"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -2968,19 +3131,23 @@ msgstr "Enregistrer Speech sous :"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Fichier audio Windows PCM  *.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2938
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Les projets Audacity (.aup) vous permettent d'enregister votre travail exactement tel t\n"
-"qu'il apparaît à l'écran, mais la plupart des autres programmes ne peuvent les ouvrir.\n"
+
+#: Project.cpp:2941
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Si vous voulez enregister un fichier pouvant être ouvert par d'autres programmes, sélectionnez\n"
-"une des commandes d'exportation."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3004,12 +3171,12 @@ msgstr "Effacer"
 #: Project.cpp:3052
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
-msgstr "Espace disque restant pour l'enregistrement : %d heures et %d minutes"
+msgstr "Espace disque restant pour l'enregistrement de %d heures et %d minutes."
 
 #: Project.cpp:3055
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
-msgstr "Espace disque restant pour l'enregistrement : 1 heure et %d minutes"
+msgstr "Espace disque restant pour l'enregistrement d'une 1 heure et %d minutes."
 
 #: Project.cpp:3058
 #, c-format
@@ -3025,9 +3192,19 @@ msgstr "L'espace disque restant permet l'enregistrement de  %d seconds."
 msgid "Out of disk space"
 msgstr "Disque plein"
 
+#: Project.cpp:3380
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3383
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
-msgstr "Impossible de retirer l'ancien fichier de sauvegarde automatique :"
+msgstr "Impossible de supprimer l'ancien fichier de sauvegarde automatique :"
 
 #: Project.cpp:3383
 msgid "New Project"
@@ -3111,48 +3288,13 @@ msgstr "Pré&visualisation"
 msgid "&Debug"
 msgstr "&Débogage"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Enregistrement programmé d'Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Début de l'enregistrement"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Fin de l'enregistrement"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Durée"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity Smart Record en progression"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Date et heure de début"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Date et heure de fin"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "En attente de démarrage d'enregistrement à %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity Smart Record - en attente de démarrage"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3181,7 +3323,7 @@ msgstr "Numéro de piste"
 #: Tags.cpp:633
 #: Tags.cpp:2138
 msgid "Year"
-msgstr "Année :"
+msgstr "Année"
 
 #: Tags.cpp:634
 msgid "Genre"
@@ -3193,14 +3335,13 @@ msgstr "Genre "
 msgid "Comments"
 msgstr "Commentaires "
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Appuyer sur F2 ou double-cliquer pour éditer."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
-msgstr "Nom du  Tag"
+msgstr "Nom du Tag"
 
 #: Tags.cpp:803
 msgid "Tag Value"
@@ -3210,22 +3351,19 @@ msgstr "Valeur de tag"
 #: Tags.cpp:1476
 #: prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
-msgstr "Effacer"
+msgstr "Effa&cer"
 
 #: Tags.cpp:824
 msgid "Genres"
 msgstr "Genres"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Edition"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "Remise à zéro"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3281,7 +3419,7 @@ msgstr "Rétablir les genres"
 #: Tags.cpp:2402
 #: Tags.cpp:2443
 msgid "Unable to save genre file."
-msgstr "Impossible d'enregistrer le fichier de genre"
+msgstr "Impossible d'enregistrer le fichier de genre."
 
 #: Tags.cpp:1035
 #: Tags.cpp:1679
@@ -3295,6 +3433,16 @@ msgstr "Etes-vous sûr(e) de remettre à zéro la liste de genre ? "
 msgid "Unable to open genre file."
 msgstr "Impossible d'ouvrir le fichier de genre."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "Erreur de chargement des métadonnées"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3304,205 +3452,137 @@ msgstr "Impossible d'ouvrir le fichier de genre."
 msgid "Save Metadata As:"
 msgstr "Enregistrer les métadonnées sous :"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "Erreur de chargement des métadonnées"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Titre :"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Artiste :"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Album :"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Compositeur :"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Chanteur :"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Commentaires :"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Encodé par :"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Copyright :"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Numéro de piste :"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Année :"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Genre :"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Pas de genres"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Réglages par défaut"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Basic"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Avancé"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Valeur"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "Effacer"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "La longueur maximale des attributs de  '%s' est de %d caractères. Les données seront tronquées."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Titre"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Artiste"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity n'arrive pas à écrire le fichier :\n"
+msgstr "Audacity n'arrive pas à écrire le fichier :\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity ne peut ouvrir le fichier :\n"
+msgstr "Audacity ne peut ouvrir le fichier :\n"
 "  %s\n"
 "en écriture."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity n'arrive pas à enregistrer les images dans le fichier :\n"
+msgstr "Audacity n'arrive pas à enregistrer les images dans le fichier :\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity ne peut trouver le fichier :\n"
+msgstr "Audacity ne peut trouver le fichier :\n"
 "  %s.\n"
 "Le thème n'est pas chargé."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity ne peut charger le fichier :\n"
+msgstr "Audacity ne peut charger le fichier :\n"
 "  %s.\n"
 "Peut-être un mauvais format png ?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity ne peut lire son thème par défaut.\n"
+msgstr "Audacity ne peut lire son thème par défaut.\n"
 "Merci de rapporter le problème."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Aucun des fichiers composant le thème attendu\n"
+msgstr "Aucun des fichiers composant le thème attendu\n"
 "n'a été trouvé dans :\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Impossible de créer le répertoire :\n"
+msgstr "Impossible de créer le répertoire :\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity n'arrive pas à enregistrer le fichier :\n"
+msgstr "Audacity n'arrive pas à enregistrer le fichier :\n"
 "  %s."
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Tous les fichiers requis dans :\n"
+msgstr "Tous les fichiers requis dans :\n"
 "  %s\n"
-"sont désormais présents."
+"sont déjà présents."
+
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Durée"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Enregistrement programmé d'Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Début de l'enregistrement"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Fin de l'enregistrement"
+
+#: TimerRecordDialog.cpp:231
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Date et heure de début"
+
+#: TimerRecordDialog.cpp:324
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Date et heure de fin"
+
+#: TimerRecordDialog.cpp:344
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "En attente de démarrage d'enregistrement à %s.\n"
+
+#: TimerRecordDialog.cpp:432
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
@@ -3599,7 +3679,7 @@ msgstr "Police..."
 
 #: TrackPanel.cpp:602
 msgid "Set Range..."
-msgstr "Régler l'amplitude..."
+msgstr "Régler l'étendue..."
 
 #: TrackPanel.cpp:606
 #: toolbars/EditToolBar.cpp:135
@@ -3642,11 +3722,11 @@ msgstr "Mode multi-outils : Ctrl+P pour Préférences souris et clavier"
 
 #: TrackPanel.cpp:1371
 msgid "Click and drag to move left selection boundary."
-msgstr "Cliquer-glisser pour déplacer à gauche les limites de la sélection."
+msgstr "Cliquer-glisser pour déplacer la limite gauche de la sélection."
 
 #: TrackPanel.cpp:1376
 msgid "Click and drag to move right selection boundary."
-msgstr "Cliquer-glisser pour déplacer à droite les limites de la sélection."
+msgstr "Cliquer-glisser pour déplacer la limite droite de la sélection."
 
 #: TrackPanel.cpp:1702
 #: TrackPanel.cpp:3993
@@ -3793,12 +3873,20 @@ msgstr "Supprimer le bruit"
 
 #: TrackPanel.cpp:5664
 msgid "Adjusted Pan"
-msgstr "Panoramique ajusté."
+msgstr "Panoramique ajusté"
 
 #: TrackPanel.cpp:5726
 msgid "Adjusted gain"
 msgstr "Gain ajusté"
 
+#: TrackPanel.cpp:5796
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5797
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "Impossible d'effacer les pistes avec l'audio actif"
@@ -3854,15 +3942,7 @@ msgstr "Changement de taux"
 
 #: TrackPanel.cpp:6229
 msgid "Format Change"
-msgstr "Format :"
-
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Entrer un taux d'échantillonnage en Hz (par seconde) entre 1 et 100 000 :"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Taux invalide."
+msgstr "Changement de format"
 
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
@@ -3871,7 +3951,7 @@ msgstr "Passer la vitesse minimale de (%) à :"
 #: TrackPanel.cpp:6350
 #: TrackPanel.cpp:6351
 msgid "Lower speed limit"
-msgstr "Vitesse limite basse"
+msgstr "Limite inférieure de vitesse"
 
 #: TrackPanel.cpp:6356
 msgid "Change upper speed limit (%) to:"
@@ -3880,12 +3960,12 @@ msgstr "Passer la vitesse maximale de (%) à :"
 #: TrackPanel.cpp:6357
 #: TrackPanel.cpp:6358
 msgid "Upper speed limit"
-msgstr "Vitesse maximale"
+msgstr "Limite supérieure de vitesse"
 
 #: TrackPanel.cpp:6366
 #, c-format
 msgid "Set range to '%d' - '%d'"
-msgstr "Passer la sélection de  '%d' à '%d'"
+msgstr "Passer la sélection de '%d' à '%d'"
 
 #: TrackPanel.cpp:6369
 msgid "Set Range"
@@ -3906,7 +3986,7 @@ msgstr " '%s' renommé en '%s'"
 
 #: TrackPanel.cpp:6421
 msgid "Name Change"
-msgstr "changement de nom"
+msgstr "Changement de nom"
 
 #: TrackPanel.cpp:6487
 msgid "Label Track Font"
@@ -3968,17 +4048,17 @@ msgstr "Résultats de la calibration\n"
 #: VoiceKey.cpp:844
 #, c-format
 msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
-msgstr "Energie                  -- soit: %1.4f  sd: (%1.4f)\n"
+msgstr "Energie                  -- moyenne : %1.4f  ds : (%1.4f)\n"
 
 #: VoiceKey.cpp:845
 #, c-format
 msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
-msgstr ""
+msgstr "Changements de signe        -- moyenne : %1.4f  ds : (%1.4f)\n"
 
 #: VoiceKey.cpp:846
 #, c-format
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
-msgstr ""
+msgstr "Changements de direction        -- moyenne : %1.4f  ds: (%1.4f)\n"
 
 #: WaveTrack.cpp:85
 msgid "Audio Track"
@@ -4003,24 +4083,21 @@ msgstr "Modules de 1 à %i"
 msgid "Plugins %i to %i"
 msgstr "Modules de %i à %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Non autorisé pour quelque raison. Essayer de sélectionner de l'audio auparavant ?"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Vous ne pouvez faire ceci que si la lecture et l'enregistrement\n"
+msgstr "Vous ne pouvez faire ceci que si la lecture et l'enregistrement\n"
 "sont arrêtés. [Il ne suffit pas de mettre en pause.]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Vous devez auparavant sélectionner de l'audio stéréo.\n"
+msgstr "Vous devez auparavant sélectionner de l'audio stéréo.\n"
 "[Vous ne pouvez pas utiliser ceci avec du mono.]"
 
 #: commands/CommandManager.cpp:785
@@ -4028,16 +4105,14 @@ msgid "You must first select some audio for this to use."
 msgstr "Pour ceci, sélectionner d'abord de l'audio."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Vous devez auparavant sélectionner de l'audio\n"
-" [Selectionner un autre type de piste ne marche pas.]"
+msgstr "Vous devez auparavant sélectionner de l'audio.\n"
+" [Selectionner un autre type de piste ne marchera pas.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Message"
+#: commands/CommandManager.cpp:872
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4057,17 +4132,22 @@ msgstr "Effet appliqué : %s %.1f dB"
 msgid "Amplify"
 msgstr "Amplification"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplification par Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Amplification (dB) :"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
-msgstr "Nouvelle crête (dB ):"
+msgstr "Nouvelle crête (dB) :"
 
 #: effects/Amplify.cpp:191
 msgid "Allow clipping"
@@ -4193,10 +4273,18 @@ msgstr "par Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Fréquence (Hz) :"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Amplification (dB) :"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Amplification des basses..."
@@ -4239,8 +4327,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "utilise SoundTouch, d'Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Hauteur : depuis"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Demi tons :"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4250,13 +4379,9 @@ msgstr "Hauteur : depuis"
 msgid "to"
 msgstr "vers"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Demi tons :"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frequence (Hz) : depuis"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4264,6 +4389,11 @@ msgstr "Frequence (Hz) : depuis"
 msgid "Percent Change:"
 msgstr "Pourcentage de modification :"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Changer la hauteur..."
@@ -4282,6 +4412,11 @@ msgstr "Effet Appliqué : %s %.1f%%"
 msgid "Change Speed"
 msgstr "Changer la vitesse"
 
+#. i18n-hint: n/a is an English
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "n/a"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Changer la vitesse en modifiant tempo et hauteur"
@@ -4290,14 +4425,17 @@ msgstr "Changer la vitesse en modifiant tempo et hauteur"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "utilise SampleRate, d'Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Type de vinyl t/m : de"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4315,13 +4453,29 @@ msgstr "Changer le tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Changer le tempo sans modifier la hauteur"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Battements Par Minute (BPM ) :   par"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Durée (secondes): depuis"
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4331,8 +4485,9 @@ msgstr "Changer le tempo..."
 msgid "Changing Tempo"
 msgstr "Changement de tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Suppression des clics..."
 
 #: effects/ClickRemoval.cpp:336
@@ -4343,10 +4498,18 @@ msgstr "Suppression des clics et pops par Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Sélectionnez le seuil (la sensibilité diminue avec le seuil)"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Largeur maximum du pic (la sensibilité augmente avec la largeur) :"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Suppression des clics..."
@@ -4359,49 +4522,86 @@ msgstr "Suppression des clics et pops "
 msgid "Dynamic Range Compressor"
 msgstr "Compresseur dynamique"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Compresseur dynamique par Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Ratio : "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Attaque :"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Durée de décroissance :"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
-msgstr "Normaliser à 0dB après la compression."
+msgstr "Normaliser à 0dB après la compression"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Seuil : %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Ratio : %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Ratio : %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Attaque: %.1f secs"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Délai : %.1f secs"
 
 #: effects/Compressor.h:36
@@ -4412,6 +4612,251 @@ msgstr "Compresseur..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Application de compression dynamique..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:190
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:277 effects/Contrast.cpp:288 effects/Contrast.cpp:371
+#: effects/Contrast.cpp:415
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:318
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:321
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Début"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Fin"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:335
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:378
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:426
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:430
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "Remise à zéro"
+
+#: effects/Contrast.cpp:434
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:445
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Contrôle"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:466 effects/Contrast.cpp:472 effects/Contrast.cpp:478
+#: effects/Contrast.cpp:484
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:517 effects/Contrast.cpp:527
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:532
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:534
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "Générateur de son DTMF"
@@ -4666,6 +5111,10 @@ msgstr "Inverser"
 msgid "Inverting"
 msgstr "Inversion"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Niveleur"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Aucun saut"
@@ -4690,30 +5139,27 @@ msgstr "Plus fort"
 msgid "Heaviest"
 msgstr "Très fort"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Niveleur"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Niveleur par  Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Egaliser les sections faibles et fortes"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "par Lynn Allan"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Dégré de nivellement"
 
+#: effects/Leveller.cpp:228
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Seuil de bruit (Bruit de bande, hum, son ambient)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
-msgstr "Seuil de bruit:"
+#: effects/Leveller.cpp:240
+#, fuzzy
+msgid "Threshold for Noise:"
+msgstr "Seuil de bruit :"
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
@@ -4723,6 +5169,158 @@ msgstr "Nivelleur..."
 msgid "Applying Leveller..."
 msgstr "Application du nivelleur..."
 
+#: effects/LoadEffects.cpp:103
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:105
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:107
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:109
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:111
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:113
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mixage"
+
+#: effects/LoadEffects.cpp:117
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:119
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:121
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:123
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:127
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:129
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:131
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:133
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:135
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:137
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:139
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:141
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:143
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:145
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:147
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:149
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:151
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:153
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:155
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:157
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:159
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:161
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:163
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:165
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:167
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Elimination du bruit"
+
+#: effects/LoadEffects.cpp:202
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:204
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:206
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:208
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Blanc"
@@ -4758,31 +5356,23 @@ msgstr "Génération du bruit"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Impossible d'ouvrir le fichier : \n"
+msgstr "Impossible d'ouvrir le fichier : \n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Tentative d'application de la suppression de bruit sans profil de bruit. \n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Elimination du bruit"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "Etape 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Choisir quelques secondes de bruit seul\n"
+msgstr "Choisir quelques secondes de bruit seul\n"
 "afin que Audacity sache ce qu'il doit filtrer.\n"
 "Cliquer ensuite sur Prendre le profil du bruit :"
 
@@ -4791,12 +5381,10 @@ msgid "Step 2"
 msgstr "Etape 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Sélectionner tout l'audio que vous voulez filtrer,\n"
-"choisir la quantité de bruit vous voulez filtrer,\n"
+msgstr "Sélectionner tout l'audio à filtrer,\n"
+"choisir la quantité de bruit à filtrer,\n"
 "cliquer alors sur \"OK\" pour supprimer le bruit.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4809,16 +5397,28 @@ msgstr "Prendre le profil du bruit"
 
 #: effects/NoiseRemoval.cpp:840
 msgid "Noise reduction (dB):"
-msgstr "Réduction de bruit (dB):"
+msgstr "Réduction de bruit (dB) :"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
 
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Lissage de fréquence (Hz) :"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Durée de l'attaque et du délai (secondes) :"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Elimination du bruit..."
@@ -4857,73 +5457,86 @@ msgstr ", amplitude maximum = %.1f dB"
 msgid "Normalize"
 msgstr "Normaliser"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalisation par Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Supprimer tout décalage DC (centrer verticalement à 0)"
+#: effects/Normalize.cpp:351
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:354
+#, fuzzy
+msgid "Normalize maximum amplitude to:"
 msgstr "Normaliser l'amplitude maximum à "
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
-msgstr "Normaliser......"
+msgstr "Normaliser..."
 
 #: effects/Normalize.h:41
 msgid "Normalizing..."
-msgstr "Normalisation"
+msgstr "Normalisation..."
 
 #: effects/Phaser.cpp:65
 #, c-format
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Effet appliqué: %s %d phases, %.0f%% maxi, fréquence = %.1f Hz, phase de départ = %.0f deg, amplitude = %d, retour = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser par Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Phases :"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "Mini"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "Maxi"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Fréquence LFO (Hz) :"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "Phase de départ LFO (deg.) :"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Profondeur :"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Retour (%) :"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4933,14 +5546,20 @@ msgid "Applying Phaser"
 msgstr "Application de Phaser"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"L'effet réparation est destiné à être utilisé avec de très courtes sections d'audio endommagé (jusqu'à 128 échantillons).\n"
+msgstr "L'effet Réparation est destiné à être utilisé avec de très courtes sections d'audio endommagé (jusqu'à 128 échantillons).\n"
 "\n"
-"Zoommer et selectionner une courte fraction de seconde à réparer."
+"Zoomer et sélectionner une courte fraction de seconde à réparer."
+
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
 
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
@@ -4960,29 +5579,24 @@ msgstr "Les pistes sont trop longues pour pouvoir répéter la sélection."
 msgid "Repeat"
 msgstr "Répéter"
 
-#. i18n-hint: && in here is an escape character to get
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Répétition par Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:211
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Nombre de répétitions :"
 
+#: effects/Repeat.cpp:220
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Longueur de la nouvelle sélection :"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutes, %d secondes"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondes"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5030,11 +5644,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Nettoyeur de pic par Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Durée maximale de pic (millisecondes): \n"
+msgstr "Durée maximale de pic (millisecondes): \n"
 "(inférieure à 99999)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5049,10 +5661,60 @@ msgstr "Nettoyeur de pic..."
 msgid "Applying Spike Cleaner..."
 msgstr "Application de Nettoyeur de pic..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Stéréo vers mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Appliquer stéréo vers mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5100,17 +5762,21 @@ msgstr "Fréquence (Hz) :"
 msgid "Waveform:"
 msgstr "Forme d'onde :"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Début"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Fin"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5126,11 +5792,11 @@ msgstr "Son..."
 
 #: effects/ToneGen.h:48
 msgid "Generating Chirp"
-msgstr "Géneration d'un sifflet"
+msgstr "Génération d'un sifflet"
 
 #: effects/ToneGen.h:48
 msgid "Generating Tone"
-msgstr "Géneration d'un son"
+msgstr "Génération d'un son"
 
 #: effects/TruncSilence.cpp:113
 msgid "All tracks must have the same sample rate"
@@ -5141,10 +5807,6 @@ msgstr "Toutes les pistes doivent avoir le même taux d'échantillonnage."
 msgid "Truncate Silence"
 msgstr "Tronquer le silence"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "par Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Durée maxi du silence :"
@@ -5192,10 +5854,6 @@ msgstr "Effet appliqué : %s fréquence = %.1f Hz, phase de départ = %.0f deg,
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah par Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Profondeur (%) :"
@@ -5204,9 +5862,17 @@ msgstr "Profondeur (%) :"
 msgid "Resonance:"
 msgstr "Résonnance:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
-msgstr "Fréquence Wah (%):"
+msgstr "Fréquence Wah (%) :"
+
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
 
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
@@ -5246,6 +5912,18 @@ msgstr "Réglages de l'effet"
 msgid "Length (seconds)"
 msgstr "Durée (secondes)"
 
+#: effects/lv2/LV2Effect.cpp:850 effects/lv2/LV2Effect.cpp:853
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:861 effects/lv2/LV2Effect.cpp:864
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:872 effects/lv2/LV2Effect.cpp:875
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Application d'effet Nyquist..."
@@ -5313,13 +5991,13 @@ msgstr "Réglage du module"
 msgid "Program"
 msgstr "Programme"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Aucune piste n'est sélectionnée ! Taper Ctrl-A (Tout sélectionner)\n"
-"Choisissez Exporter... pour exporter toutes les pistes"
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5335,14 +6013,12 @@ msgstr "Etes-vous sûr(e) d'enregistrer le fichier sous \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Vous allez enregistrer le fichier %s sous le nom \"%s\".\n"
+msgstr "Vous allez enregistrer le fichier %s sous le nom \"%s\".\n"
 "\n"
 "Normalement, ces fichiers se terminent par \"%s\", et plusieurs programmes ne peuvent ouvrir de fichiers \n"
 "ayant des extensions non standard.\n"
@@ -5356,11 +6032,11 @@ msgstr "Un fichier nommé \"%s\" existe déjà. Le remplacer ?"
 
 #: export/Export.cpp:604
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
-msgstr "Dans le fichier exporté, vos pistes seront mélangées en deux canaux stéréo"
+msgstr "Dans le fichier exporté, vos pistes seront mélangées en deux canaux stéréo."
 
 #: export/Export.cpp:609
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
-msgstr "Dans le fichier exporté, vos pistes seront mélangées en un canal mono "
+msgstr "Dans le fichier exporté, vos pistes seront mélangées en un canal mono."
 
 #: export/Export.cpp:619
 msgid "Advanced Mixing Options"
@@ -5379,6 +6055,10 @@ msgstr " - Gauche"
 msgid " - Right"
 msgstr " - Droit"
 
+#: export/Export.cpp:1082
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5416,10 +6096,6 @@ msgstr "(programme externe)"
 msgid "Cannot export audio to %s"
 msgstr "Impossible d'exporter l'audio vers %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Exporter"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Exportation de la sélection audio en utilisant un encodeur à ligne de commande"
@@ -5429,9 +6105,479 @@ msgid "Exporting the entire project using command-line encoder"
 msgstr "Exportation du projet entier en utilisant un encodeur à ligne de commande"
 
 #: export/ExportCL.cpp:389
-#, fuzzy
 msgid "Command Output"
-msgstr "Commande"
+msgstr "Sortie de commande"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:643
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:644
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Taux d'échantillonnage invalide"
+
+#: export/ExportFFmpeg.cpp:720
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:723
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Vous devez rééchantillonner à un des taux ci-dessous."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Taux d'échantillonnage"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:112
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Débit :"
+
+#: export/ExportFFmpegDialogs.cpp:157
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:168
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:211
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:230
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:275
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:294
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:341
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:360
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:488
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:489
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:795
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:884
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:885
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:886
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:887
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:888
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:889
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Format :"
+
+#: export/ExportFFmpegDialogs.cpp:896
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:903
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:904
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:906
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Langue :"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:921
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:922
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:925
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Qualité :"
+
+#: export/ExportFFmpegDialogs.cpp:928
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:930
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:933
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:936
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:952
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:953
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:955
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:956
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:958
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:959
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:961
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:962
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:964
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:967
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:989
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:991
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:992
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1211
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1230
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1270
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Fichiers XML (*.xml)|*.xlml|Tous fichiers (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1290
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
 
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
@@ -5513,10 +6659,6 @@ msgstr "Spécifier les options MP2"
 msgid "MP2 Export Setup"
 msgstr "Réglage de l'exportation MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Débit :"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Fichiers MP2"
@@ -5614,7 +6756,7 @@ msgstr "Qualité"
 
 #: export/ExportMP3.cpp:379
 msgid "Variable Speed:"
-msgstr "Vistesse variable"
+msgstr "Vitesse variable"
 
 #: export/ExportMP3.cpp:386
 msgid "Channel Mode:"
@@ -5626,7 +6768,7 @@ msgstr "Joindre stéréo"
 
 #: export/ExportMP3.cpp:392
 msgid "Stereo"
-msgstr "Stéréo,"
+msgstr "Stéréo"
 
 #: export/ExportMP3.cpp:536
 msgid "Locate Lame"
@@ -5637,33 +6779,15 @@ msgstr "Localiser l'encodeur Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity requiert le fichier %s pour pouvoir créer des MP3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Localisation de %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Pour trouver %s, cliquer ici -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Parcourir..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Pour obtenir une copie de Lame gratuite, cliquer ici -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Télécharger..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Où se trouve  %s ?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5729,39 +6853,23 @@ msgstr "Exportation du fichier entier à %d kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "Erreur %d retournée par l'encodeur MP3"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Taux d'échantillonnage invalide."
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"Le taux d'échantillonnage du projet (%d) n'est pas supporté\n"
+msgstr "Le taux d'échantillonnage du projet (%d) n'est pas supporté\n"
 "par le format MP3."
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"La combinaison de taux d'échantillonnage du projet (%d) et de définition  (%d kbps)\n"
+msgstr "La combinaison de taux d'échantillonnage du projet (%d) et de définition  (%d kbps)\n"
 "n'est pas supporté par le format MP3."
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Vous devez rééchantillonner à un des taux ci-dessous."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Taux d'échantillonnage :"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Module d'exportation (plugin) MP3 non trouvé"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
@@ -5771,13 +6879,11 @@ msgid "Export Multiple"
 msgstr "Export Multiple"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Si vous avez plus d'une piste audio, il est possible d'exporter chacune dans un fichier indépendant,\n"
+msgstr "Si vous avez plus d'une piste audio, il est possible d'exporter chacune dans un fichier indépendant,\n"
 "ou si vous avez une piste de marqueurs, vous pouvez créer un nouveau fichier pour chaque marqueur.\n"
 "\n"
 "Ce projet n'ayant pas de pistes multiples, ni de piste de marqueurs, vous ne pouvez pas exporter de fichiers multiples."
@@ -5809,7 +6915,7 @@ msgstr "Créer"
 
 #: export/ExportMultiple.cpp:224
 msgid "Split files based on:"
-msgstr "Séparer en fichier selon :"
+msgstr "Séparer en fichiers selon :"
 
 #: export/ExportMultiple.cpp:234
 msgid "Labels"
@@ -5823,6 +6929,10 @@ msgstr "Inclure l'audio avant le premier marqueur"
 msgid "First file name:"
 msgstr "Premier nom de fichier :"
 
+#: export/ExportMultiple.cpp:277
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Pistes"
@@ -5843,14 +6953,14 @@ msgstr "Numérotation continue"
 msgid "File name prefix:"
 msgstr "Préfixe de nom de fichier :"
 
+#: export/ExportMultiple.cpp:324
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Ecraser les fichiers existants"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&xporter"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5862,12 +6972,10 @@ msgstr "Choisir un emplacement pour placer les fichiers temporaires"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" n'existe pas.\n"
+msgstr "\"%s\" n'existe pas.\n"
 "\n"
 "Voulez-vous le créer ?"
 
@@ -5890,11 +6998,9 @@ msgstr "Quelque chose a mal tourné après l'export du (des) fichier(s) %d."
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"Le marqueur %s n'est pas un nom valise. Ne pas utiliser les caractères suivants :   %s\n"
+msgstr "Le marqueur %s n'est pas un nom valise. Ne pas utiliser les caractères suivants :   %s\n"
 "Utiliser..."
 
 #: export/ExportOGG.cpp:64
@@ -5905,10 +7011,6 @@ msgstr "Spécifier les options Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Réglage de l'exportation Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Qualité :"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Fichier Ogg Vorbis"
@@ -5929,13 +7031,9 @@ msgstr "Spécifier les options de compression"
 msgid "Uncompressed Export Setup"
 msgstr "Réglage d'exportation non compressé"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Format :"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
-msgstr "Entête :"
+msgstr "En-tête :"
 
 #: export/ExportPCM.cpp:185
 msgid "Encoding:"
@@ -5945,10 +7043,21 @@ msgstr "Encodage :"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Les combinaison d'entête et d'encodage ne sont pas toutes possibles.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, et autres formats non compressés"
+#: export/ExportPCM.cpp:359
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:377
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:388
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:399
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -5970,175 +7079,190 @@ msgstr "Exportation du projet entier en %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Erreur (le fichier peut ne pas avoir été écrit) : %hs"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "Fichiers MP3"
+
+#: import/Import.cpp:176
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Cette version d'Audacity n'a pas été compilée avec le support %s."
 
+#: import/Import.cpp:242
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est une piste de CD audio. \n"
+msgstr "\"%s\" est une piste de CD audio. \n"
 "Audacity ne peut pas ouvrir de CD audio directement. \n"
 "Extraire (ripper) les pistes de CD dans un format audio\n"
 "qu'Audacity peut importer, comme le WAV ou l'AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\" est une liste de lecture. \n"
+msgstr "\"%s\" est une liste de lecture. \n"
 "Audacity ne peut pas ouvrir ce fichier car il contient seulement des liens vers d'autres fichiers. \n"
-"Vous pouvez l'ouvrir avec un traitement de texte et télécharger les fichiers audio correspondants."
+"Vous pouvez l'ouvrir avec un éditeur de texte et télécharger les fichiers audio correspondants."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier Windows Media Audio. \n"
+msgstr "\"%s\" est un fichier Windows Media Audio. \n"
 "Audacity ne peut pas ouvrir ce type de fichier pour des raisons de droits. \n"
-"Vous devez le convertir dans un format audio compatible, tel le WAV ou l'AIFF."
+"Vous devez le convertir dans un format audio compatible, tel que le WAV ou l'AIFF."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier Advanced Audio Coding. \n"
+msgstr "\"%s\" est un fichier Advanced Audio Coding. \n"
 "Audacity ne peut pas ouvrir ce type de fichier. \n"
-"Vous devez le convertir dans un format audio compatible, tel le WAV ou l'AIFF."
+"Vous devez le convertir dans un format audio compatible, tel que le WAV ou l'AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:273
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier audio crypté, de ceux distribués par les boutiques de musique en ligne. \n"
+msgstr "\"%s\" est un fichier audio crypté, de ceux distribués par les boutiques de musique en ligne. \n"
 "Audacity ne peut pas ouvrir ce type de fichier à cause de son cryptage. \n"
 "Essayez d'enregistrer ce fichier avec Audacity, ou de le graver sur un CD audio, puis d'extraire \n"
 "les pistes de CD dans un format audio qu'Audacity peut importer, comme le WAV ou l'AIFF."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier média RealPlayer. \n"
+msgstr "\"%s\" est un fichier média RealPlayer. \n"
 "Audacity ne peut pas ouvrir ce format propriétaire. \n"
-"Vous devez le convertir dans un format audio compatible, tel le WAV ou l'AIFF."
-
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" est un fichier MIDI, et non audio. \n"
-"Audacity ne peut pas ouvrir ce type de fichier pour le lire ou l'éditer, mais vous pouvez \n"
-"l'afficher en cliquant sur Fichier > Importer > MIDI."
+"Vous devez le convertir dans un format audio compatible, tel que le WAV ou l'AIFF."
 
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" est un fichier de notes, pas un fichier audio. \n"
+msgstr "\"%s\" est un fichier de notes, pas un fichier audio. \n"
 "Audacity ne peut pas ouvrir ce type de fichier. \n"
-"Essayez de le convertir dans un format audio, tel le WAV ou l'AIFF.\n"
+"Essayez de le convertir dans un format audio, tel que le WAV ou l'AIFF.\n"
 "puis de l'importer, ou de l'enregistrer avec Audacity."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier audio Musepack. \n"
+msgstr "\"%s\" est un fichier audio Musepack. \n"
 "Audacity ne peut pas ouvrir ce type de fichier. \n"
 "Si vous pensez qu'il peut s'agir d'un fichier MP3, renommez-le avec l'extension \".mp3\" \n"
 "et essayez de l'importer à nouveau. Sinon, vous devez le convertir dans un format audio  \n"
-"compatible, tel le WAV ou l'AIFF."
+"compatible, tel que le WAV ou l'AIFF."
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier audio Wavpack. \n"
+msgstr "\"%s\" est un fichier audio Wavpack. \n"
 "Audacity ne peut pas ouvrir ce type de fichier. \n"
-"Vous devez le convertir dans un format audio compatible, tel le WAV ou l'AIFF."
+"Vous devez le convertir dans un format audio compatible, tel que le WAV ou l'AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier audio Dolby Digital. \n"
+msgstr "\"%s\" est un fichier audio Dolby Digital. \n"
 "Pour le moment, Audacity ne peut pas ouvrir ce type de fichier. \n"
-"Vous devez le convertir dans un format audio compatible, tel le WAV ou l'AIFF."
+"Vous devez le convertir dans un format audio compatible, tel que le WAV ou l'AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" est un fichier audio Ogg Speex. \n"
+msgstr "\"%s\" est un fichier audio Ogg Speex. \n"
 "Pour le moment, Audacity ne peut pas ouvrir ce type de fichier. \n"
-"Vous devez le convertir dans un format audio compatible, tel le WAV ou l'AIFF."
+"Vous devez le convertir dans un format audio compatible, tel que le WAV ou l'AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:314
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity a dû établir au jugé le format du fichier.\n"
-"L'audio peut être défectueux.\n"
-"\n"
-"Si c'est le cas, essayez de renommer le fichier\n"
-"avec son extension correcte avant de l'ouvrir."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:319
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:324
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity n'a pas reconnu ce type de fichier.\n"
-"S'il est non compressé, essayez de l'importer en utilisant \"Importer Raw\""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6177,17 +7301,18 @@ msgstr "Les pistes MIDI ne peuvent être compensées individuellement, seules le
 msgid "Invalid track offset in LOF file."
 msgstr ""
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Erreur de traitement de fichier Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Erreur de traitement de fichier Midi."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Fichiers MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6213,15 +7338,24 @@ msgstr "Entête Vorbis bitstream invalide"
 msgid "Internal logic fault"
 msgstr "Erreur de logique interne"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, et autres formats non compressés"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importation du fichier %s ..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Fichiers QuickTime"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Importer des données brutes (Raw)"
@@ -6261,6 +7395,14 @@ msgstr "2 Canaux (Stéréo)"
 msgid "%d Channels"
 msgstr "%d Canaux"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Décalage de début :"
@@ -6273,9 +7415,18 @@ msgstr "Portion à importer :"
 msgid "Sample rate:"
 msgstr "Fréquence d'échantillonnage :"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importer"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6314,15 +7465,15 @@ msgstr "Enregistrement"
 
 #: prefs/AudioIOPrefs.cpp:139
 msgid "Channels"
-msgstr "Canaux :"
+msgstr "Canaux"
 
 #: prefs/AudioIOPrefs.cpp:145
 msgid "Playthrough"
 msgstr "Passage audio"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Lire les autres pistes pendant l'enregistrement d'une nouvelle"
+#: prefs/AudioIOPrefs.cpp:150
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6332,9 +7483,13 @@ msgstr "Passage audio matériel : Lire la nouvelle piste pendant son enregistrem
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Passage audio logiciel : Lire la nouvelle piste pendant son enregistrement"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "Passage audio logiciel : Lire la nouvelle piste pendant son enregistrement (décocher en cas d'enregistrement de \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:158
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:161
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6361,19 +7516,15 @@ msgid "Latency"
 msgstr "Latence"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Buffer audio :\n"
+msgstr "Buffer audio :\n"
 "(plus haut = plus de latence)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Correction de latence :\n"
+msgstr "Correction de latence :\n"
 "(négative = arrière)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6447,8 +7598,8 @@ msgid "Audio cache"
 msgstr "Cache audio"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Conserver les données enregistrées en mémoire jusqu'à la fin de l'enregistrement"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6489,9 +7640,9 @@ msgstr "Version de la librairie MP3 :"
 msgid "MP3 Library:"
 msgstr "Librairie MP3 :"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "Chercher la librairie"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6501,9 +7652,22 @@ msgstr "Librairie MP3 LAME :"
 msgid "&Download"
 msgstr "Téléchargement"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "Note : Pour choisir les options de qualité d'exportation, cliquer sur le bouton Options de la boîte de dialogue d'exportation."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Note : Pour choisir les options de qualité d'exportation, cliquer sur le bouton Options de la boîte de dialogue d'exportation.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6523,11 +7687,11 @@ msgstr "&Normaliser toutes les pistes du projet"
 
 #: prefs/FileFormatPrefs.cpp:111
 msgid "When saving a project that depends on other audio files"
-msgstr "Lors de l'enregistrement d'un  projet dépendant d'autres fichiers audio"
+msgstr "Lors de l'enregistrement d'un projet dépendant d'autres fichiers audio"
 
 #: prefs/FileFormatPrefs.cpp:114
 msgid "Always &copy all audio into project (safest)"
-msgstr "Toujours copier tout l'audio dans le projet ( plus sûr)"
+msgstr "Toujours copier tout l'audio dans le projet (plus sûr)"
 
 #: prefs/FileFormatPrefs.cpp:115
 msgid "&Do not copy any audio"
@@ -6535,7 +7699,7 @@ msgstr "Ne pas copier d'au&dio"
 
 #: prefs/FileFormatPrefs.cpp:116
 msgid "&Ask user"
-msgstr "Demander à l'utilisateur"
+msgstr "Dem&ander à l'utilisateur"
 
 #: prefs/FileFormatPrefs.cpp:120
 msgid "When exporting tracks to an audio file"
@@ -6575,7 +7739,8 @@ msgid "&Update display while playing"
 msgstr "Act&ualiser l'affichage pendant la lecture"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "La fermeture de la dernière fenêtre referme Audacity"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6583,15 +7748,15 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "Permettre le glissement des bordures de sélection gauche et droite"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Activer l'&ergonomie des boutons d'E/S audio"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Ajuster automatiquement les pistes à la hauteur de la fenêtre"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:106
@@ -6619,17 +7784,22 @@ msgid "Show warnings about &temp files"
 msgstr "Afficher les avertissements concernant les fichiers &temporaires"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "Afficher la boîte de dialogue d'enregistrement, même si le projet est vide"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Afficher le message de bienvenue au lancement du programme"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Modes"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
@@ -6662,34 +7832,10 @@ msgstr "-145 dB (amplitude PCM en échantillonnage 24 bits)"
 msgid "Default View Mode"
 msgstr "Mode dd'affichage par défaut"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "Affichage de la forme d'onde"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "Affichage du spectre"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "Affichage de la hauteur"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Autres choix d'interface"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Langue :"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Aide :"
@@ -6703,6 +7849,14 @@ msgstr "Bouton solo :"
 msgid "Keyboard"
 msgstr "Clavier"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Définition des raccourcis clavier"
@@ -6736,22 +7890,16 @@ msgstr "Erreur d'enregistrement des raccourcis clavier"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Choisir un fichier XML contenant les raccourcis clavier..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Fichiers XML (*.xml)|*.xlml|Tous fichiers (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Erreur de chargement des raccourcis clavier"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Le raccourcis clavier '%s' est déjà assigné à :\n"
+msgstr "Le raccourcis clavier '%s' est déjà assigné à :\n"
 "\n"
 "'%s'"
 
@@ -6760,6 +7908,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Annuler"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "Lire les autres pistes pendant l'enregistrement d'une nouvelle"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7038,7 +8222,7 @@ msgstr "Lissage en temps réel :"
 
 #: prefs/QualityPrefs.cpp:145
 msgid "High-quality dither:"
-msgstr "Lissage de haute qualité."
+msgstr "Lissage de haute qualité :"
 
 #: prefs/QualityPrefs.cpp:157
 msgid "Conversion"
@@ -7058,21 +8242,20 @@ msgstr "Temps réel :"
 
 #: prefs/QualityPrefs.cpp:171
 msgid "High-quality:"
-msgstr "Haute qualité."
+msgstr "Haute qualité :"
 
 #: prefs/SmartRecordPrefs.cpp:54
 #: prefs/SmartRecordPrefs.cpp:55
 msgid "Smart Recording"
 msgstr "Enregistrement simplifié"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Pause d'enregistrement au silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Niveau du silence (dB) :"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7093,7 +8276,7 @@ msgstr "256 - par défaut"
 
 #: prefs/SpectrumPrefs.cpp:107
 msgid "32768 - most narrowband"
-msgstr ""
+msgstr "32768 - bande la plus étroite"
 
 #: prefs/SpectrumPrefs.cpp:109
 msgid "4096 - most narrowband"
@@ -7133,11 +8316,11 @@ msgstr "Touver les notes"
 
 #: prefs/SpectrumPrefs.cpp:162
 msgid "&Quantize Notes"
-msgstr ""
+msgstr "&Quantifier les notes"
 
 #: prefs/SpectrumPrefs.cpp:165
 msgid "Minimum Amplitude (dB):"
-msgstr "Amplitude Minimale (dB):"
+msgstr "Amplitude Minimale (dB) :"
 
 #: prefs/SpectrumPrefs.cpp:170
 msgid "Max. Number of Notes (1..128):"
@@ -7149,7 +8332,7 @@ msgstr "La fréquence maximale doit être un nombre entier"
 
 #: prefs/SpectrumPrefs.cpp:201
 msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
-msgstr "La fréquence maximum doit se situer entre 100 Hz et 100 000 Hz"
+msgstr "La fréquence maximale doit se situer entre 100 Hz et 100 000 Hz"
 
 #: prefs/SpectrumPrefs.cpp:209
 msgid "The minimum frequency must be an integer"
@@ -7157,7 +8340,7 @@ msgstr "La fréquence minimale doit être un nombre entier"
 
 #: prefs/SpectrumPrefs.cpp:213
 msgid "Minimum frequency must be at least 0 Hz"
-msgstr "La fréquence minimum doit être supérieure à 0 Hz"
+msgstr "La fréquence minimale doit être supérieure à 0 Hz"
 
 #: prefs/SpectrumPrefs.cpp:220
 msgid "The minimum amplitude (dB) must be an integer"
@@ -7207,8 +8390,7 @@ msgid "Info"
 msgstr "Info"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7224,31 +8406,30 @@ msgid ""
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
+msgstr "Vous avez compilé Audacity avec un bouton \n"
+"supplémentaire, \"Output Sourcery\". Ceci va sauvegarder \n"
+"une version C de l'image cachée qui peut être compilée \n"
+"dedans comme défaut.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Contrôle"
+msgstr "L'enregistrement et chargement de fichiers de thèmes \n"
+"séparés utilise un fichier séparé pour chaue image, mais est\n"
+"d'ailleurs la même idée.\n"
+"\n"
 
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
@@ -7258,9 +8439,9 @@ msgstr "Pause"
 msgid "Play"
 msgstr "Lecture"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Lecture (+Maj pour lecture en boucle)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7274,6 +8455,10 @@ msgstr "Retour au début"
 msgid "Skip to End"
 msgstr "Aller à la fin"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "Clean Speech"
@@ -7310,6 +8495,10 @@ msgid "Silence selection"
 msgstr "Rendre la sélection muette"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Zoom avant"
 
@@ -7366,16 +8555,13 @@ msgstr "VU mètre de sortie"
 msgid "Input level meter - click to monitor input"
 msgstr "VU mètre d'entrée - cliquer pour visualiser"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mixage"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Volume de sortie"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "Curseur de sortie"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7383,7 +8569,8 @@ msgid "Input Volume"
 msgstr "Volume d'entrée"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "Curseur d'entrée"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7619,19 +8806,19 @@ msgstr "Energie"
 
 #: toolbars/TranscriptionToolBar.cpp:236
 msgid "Sign Changes (Low Threshold)"
-msgstr ""
+msgstr "Changements de signe (seuil inférieur)"
 
 #: toolbars/TranscriptionToolBar.cpp:237
 msgid "Sign Changes (High Threshold)"
-msgstr ""
+msgstr "Changements de direction (Seuil supérieur)"
 
 #: toolbars/TranscriptionToolBar.cpp:238
 msgid "Direction Changes (Low Threshold)"
-msgstr ""
+msgstr "Changements de direction (Seuil inférieur)"
 
 #: toolbars/TranscriptionToolBar.cpp:239
 msgid "Direction Changes (High Threshold)"
-msgstr ""
+msgstr "Changements de direction (Seuil supérieur)"
 
 #: toolbars/TranscriptionToolBar.cpp:247
 msgid "Key type"
@@ -7745,14 +8932,16 @@ msgstr "Affichage vertical"
 msgid "Preferences..."
 msgstr "Préférences..."
 
+#: widgets/Meter.cpp:872
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Détermine la fréquence de rafraîchissement du VU mètre.\n"
+msgstr "Détermine la fréquence de rafraîchissement du VU mètre.\n"
 "Si votre ordinateur est ancien, vous devriez sélectionner\n"
 "une fréquence basse (30 par seconde ou moins), afin\n"
 "de ne pas affecter la qualité audio."
@@ -7769,6 +8958,22 @@ msgstr "Préférences de mesure"
 msgid " Please select an action "
 msgstr "Veuillez sélectionner une action"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1058
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1078
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1095
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7779,11 +8984,6 @@ msgstr "Règle verticale"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 secondes"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #: widgets/TimeTextCtrl.cpp:276
 msgid "0100 h 060 m 060 s"
@@ -7800,6 +9000,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 jours 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
 msgstr "hh:mm:ss + millisecondes"
@@ -7812,7 +9027,7 @@ msgstr "0100 h 060 m 060.01000 s"
 #. i18n-hint: Name of time display format that shows time in hours,
 #: widgets/TimeTextCtrl.cpp:297
 msgid "hh:mm:ss + samples"
-msgstr "hh:mm:ss + échantillon"
+msgstr "hh:mm:ss + échantillons"
 
 #. i18n-hint: Format string for displaying time in hours, minutes, seconds
 #: widgets/TimeTextCtrl.cpp:303
@@ -7929,7 +9144,7 @@ msgstr "Contrôle du temps"
 
 #: widgets/Warning.cpp:64
 msgid "Don't show this warning again"
-msgstr "Ne plus montrer cet avertissement."
+msgstr "Ne plus montrer cet avertissement"
 
 #: xml/XMLFileReader.cpp:49
 #, c-format
@@ -7938,8 +9153,8 @@ msgstr "Impossible d'ouvrir le fichier : \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Erreur : %hs à la ligne %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/ga.po b/locale/ga.po
index ac35e91..fc4a3e4 100644
--- a/locale/ga.po
+++ b/locale/ga.po
@@ -20,36 +20,24 @@ msgstr "Project-Id-Version: Gaelainn 2.0\n"
 msgid "&About Audacity..."
 msgstr "&Mar Gheall ar Audacity"
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Ceadaithe"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Dáta shraith an ríomhchláir:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Is ríomhchlár é Audacity athá ar fáil saor in aisce. Foireann dheonach fhorbróirí a cheap é, is iad ag saothrú leo timpeall na cruinne.  Is de bharr acmhainn SourceForge.net gur féidir leo saotharú mar fhoireann. Seirbhís ar-líne í seo, a sholáthraíonn uirlisí saor in aisce i gcomhair thionscadail bhogearraí fhoinse-oscailte. Tá Audacity ar fáil i gcomhair Windows 98 i leith, Mac OS X, Linux is córais oibriúcháin eile den aicme XIX.  Tá leaganacha níos sine d'Audacity ar fáil i gcomhair Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Is leagan beta den chlár é seo. Seans go bhfuil lochtanna air, is go bhfuil gnéithe de fós le cur i gcrích.  Bímíd ag brath ar bhur gcuid aiseolais. Tabhair cuairt ar ár láithreán, agus fáilte, is seol chughainn tuarascáil ar lochtanna is iarratais i gcomhair córacha."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Is eisiúint daingean, críochnaithe d'Audacity í seo.  Má thagann tú ar locht, áfaigh, nó má tá moladh agat, dein teangabháil linn.  Bímíd ag brath ar aiseolas d'fhonn Audacity a chur i bhfeabhas.  Gheobhair eolas breise ar ár láithreán."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: ../src/AboutDialog.cpp:127
@@ -57,13 +45,9 @@ msgstr "Is eisi
 msgid "translator_credits"
 msgstr "creidiúintí_aistritheora"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Eagarthóir Digiteach Fuaime Saor in Aisce"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Faisnéis"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -99,28 +83,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Baochas fé leith:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Ceadaithe"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Dáta shraith an ríomhchláir:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Dún"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -329,12 +403,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -370,8 +445,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -419,6 +494,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -467,10 +546,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -685,16 +772,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Comhad arna athainmniú: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Bloc á athrú %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -823,6 +910,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Dronnuilleogach"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Cá bhfuil %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Anailís ar Mhinicíocht"
@@ -849,8 +1023,8 @@ msgstr "Uath-chomhghaol
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -862,8 +1036,8 @@ msgstr "M
 msgid " window"
 msgstr " - fuinneog"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -874,14 +1048,25 @@ msgstr "Minic
 msgid "Log frequency"
 msgstr "Minicíocht log"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Dún"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
@@ -935,7 +1120,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Moill (soicindí)\tMinicíocht (Hz)\tLeibhéal"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -951,15 +1136,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -970,40 +1171,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1199,6 +1424,10 @@ msgstr "&S
 msgid "Save Project &As..."
 msgstr "Sábháil Tionscadal M&ar..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1207,6 +1436,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1235,10 +1468,26 @@ msgstr "Easp
 msgid "Export &Multiple..."
 msgstr "Easpórtáil &Iomadúil..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1300,9 +1549,9 @@ msgstr "Scri&os\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "To&st\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1316,22 +1565,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1375,12 +1622,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1391,66 +1638,67 @@ msgstr "G&ach 
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "Tosach go dtí an Reathaí"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Reathaí go dtí an Deireadh"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Aimsigh Trasnuithe Náide\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Bog an Reathaí..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "go Tosach an Rogha"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "go Deireadh an Rogha"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "go Tosach an Riain"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "go Deireadh an Riain"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Sábháil an Rogha"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Athlonnú Rogha"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1469,10 +1717,14 @@ msgstr "Cas ar L
 msgid "Turn Grid Snap Off"
 msgstr "Cas as Léim go Greille"
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Roghanna...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1510,60 +1762,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Stair..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:578
+msgid "!Simplified View"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Léim go dtí an Tosach\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Léim go dtí an Deireadh\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1579,12 +1893,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Rian Ama"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1599,6 +1909,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "&Bain Amach Rianta"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Ailínigh le &Náid"
@@ -1615,29 +1933,40 @@ msgstr "Ail
 msgid "Align with Selection &End"
 msgstr "Ailínigh le D&eireadh an Rogha"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Ailínigh an Deireadh le Reathaí"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Ailínigh an Deireadh le Tosach an Rogha"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Ailínigh an Deireadh le Deireadh an Rogha"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Ailínigh na Rianta le Chéile"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Ailínigh na Rianta..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1650,22 +1979,26 @@ msgstr "Cuir Lip
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Cuir Lipéad ag an Ionad Seinnte\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "Cea&p"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "&Maisiúchán"
@@ -1700,6 +2033,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1712,12 +2049,12 @@ msgstr "&Rith Tagarmharc..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1752,9 +2089,9 @@ msgstr "An Ch
 msgid "Previous Tool\tA"
 msgstr "Uirlis Dheireanach\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Seinn/Stad\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1768,12 +2105,12 @@ msgstr "Sos\tP"
 msgid "Record\tR"
 msgstr "Déan Taifeadadh\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1788,22 +2125,14 @@ msgstr "Seinn go dt
 msgid "Play Looped\tL"
 msgstr "Seinnt i Lúb\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Seinnt i Lúb\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Léim go dtí an Tosach\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Léim go dtí an Deireadh\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Rogha go dtí an Tosach\tShift+Home"
@@ -1860,8 +2189,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1960,14 +2289,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "&F Comhaid a sriseadh le déanaí..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2024,6 +2358,23 @@ msgstr "Athdh
 msgid "There are no label tracks to export."
 msgstr "Níl aon rianta lipéid le n-easpórtáil."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Níl pioc le cealú"
@@ -2064,6 +2415,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Arna ghreamú ón ghearrathaisce"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2232,9 +2587,9 @@ msgstr "Iomp
 msgid "Select a MIDI file..."
 msgstr "Roghnaigh comhad MIDI..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Gach comhad (*.*)|*.*|Comhaid MIDI (*.mid)|*.mid|Comhaid Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2253,14 +2608,6 @@ msgstr "Roghnaigh aon chomhad neamh-chomhbhr
 msgid "All files (*)|*"
 msgstr "Gach Comhad (*)|*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Iompórtáil"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2292,6 +2639,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Ailínithe le náid"
@@ -2328,6 +2679,14 @@ msgstr "Ail
 msgid "Align"
 msgstr "Ailínigh"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Rian nua fuaime arna cheapadh"
@@ -2391,14 +2750,14 @@ msgstr "Bain Amach Rian"
 msgid "Removed audio track(s)"
 msgstr "Rian(ta) arna (n-)asbhaint"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2465,14 +2824,13 @@ msgstr "Fuaim Thaifeadta"
 msgid "Save changes before closing?"
 msgstr "Sábháil athruithe sara ndúntar Audacity?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2492,6 +2850,25 @@ msgstr "Roghnaigh comha(i)d f(h)uaime..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2549,42 +2926,34 @@ msgstr "S
 msgid "Can't open project file"
 msgstr "Theip ar oscailt chomhad an tionscadail"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Theip ar shábháilt an tionscadail.  Seans nach bhfuil %s inlscríofa,\n"
-"nó go bhfuil an diosca lán."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2596,21 +2965,19 @@ msgstr "Earr
 msgid "Saved %s"
 msgstr "%s sábháilte"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Amh"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' arna (h)iompórtáil"
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Iompórtáil"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Earráid le linn iomportála"
@@ -2623,19 +2990,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Le comhaid tionscadal Audacity (.aup) is féidir gach a bhfuil tú ag obair air a shábháil\n"
-"díreach mar athá sé ar an scáileán ach ní féidir le formhór ríomhchlár eile comhaid\n"
-"tionscadal Audacity a oscailt.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Nuair is mian leat comhad a shábháil gur féidir le ríomhchláir eile é a oscailt,\n"
-"roghnaigh ceann de na\n"
-"horduithe Easportála."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2678,6 +3049,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Slí ídithe ar an diosca"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2761,43 +3142,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2837,8 +3187,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Nótaí"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2857,12 +3207,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2904,100 +3254,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Is é %2$d carachtar an fad is sia a ceadaítear don tréith '%1$s'. Smutadh na sonraí."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Teideal"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Ealaíontóir"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Albam"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3062,8 +3331,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3106,6 +3418,10 @@ msgstr "Tonnchrot"
 msgid "Waveform (dB)"
 msgstr "Tonnchrot (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Airde (EAC)"
@@ -3239,13 +3555,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Bogadh-in-Am"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Níl tú zúmáilte isteach do dhóthain. Zúmáil isteach go bhfeiceann tú samplaí fé leith."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3331,6 +3647,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3388,15 +3712,6 @@ msgstr "Athr
 msgid "Format Change"
 msgstr "Athrú Formáide"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Cuir isteach ráta i Hz (in aghaidh an tsoicind) idir 1 is 100000:"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Ráta neamhdhlistineach."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Athraigh íosteorainn an luasa (%) go:"
@@ -3531,8 +3846,8 @@ msgstr "Breise
 msgid "Plugins %i to %i"
 msgstr "Breiseáin %i go %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3554,8 +3869,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3576,14 +3891,19 @@ msgstr "Maisi
 msgid "Amplify"
 msgstr "Aimpligh"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Aimpliú le Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Aimpliú (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Buaicaimplitiúid Nua (dB):"
@@ -3592,6 +3912,10 @@ msgstr "Buaicaimpliti
 msgid "Allow clipping"
 msgstr "Ceadaigh bearradh"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Aimpligh..."
@@ -3715,10 +4039,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Minicíocht (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Treisiú (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3760,9 +4092,50 @@ msgstr "le Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "TadhallFuaime, le hOlli Parviainen, á úsáid"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Airde:   ó"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Leath-thoin (leath-chéimeanna):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284
 #: ../src/effects/ChangePitch.cpp:330
@@ -3772,13 +4145,9 @@ msgstr "Airde:   
 msgid "to"
 msgstr "go (dtí)"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Leath-thoin (leath-chéimeanna):"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Minicíocht (Hz):  ó"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
@@ -3786,6 +4155,11 @@ msgstr "Minic
 msgid "Percent Change:"
 msgstr "Céatadán an Athraithe:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Athraigh Airde..."
@@ -3804,6 +4178,11 @@ msgstr "Maisi
 msgid "Change Speed"
 msgstr "Athraigh idir Luas is Airde"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "n/bh"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Athraigh idir Luas is Airde"
@@ -3812,14 +4191,17 @@ msgstr "Athraigh idir Luas is Airde"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "RátaSamplaithe, le hErik de Castro Lopo, á úsáid"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "n/bh"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "C/N Caighdeánach Vinile:   ó"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3837,13 +4219,29 @@ msgstr "Athraigh Luas; Airde gan Athr
 msgid "Change Tempo without Changing Pitch"
 msgstr "Athraigh Luas; Airde gan Athrú"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Béimeanna in Aghaidh an Neomait (B/N):   ó"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Fad (soicindí):   ó"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3853,8 +4251,8 @@ msgstr "Athraigh Luas; Airde gan Athr
 msgid "Changing Tempo"
 msgstr "Luas á Athrú; Airde gan Athrú"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3865,10 +4263,18 @@ msgstr "Asbhaint Cnagadh is Plab le Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Asbhaint Cnag..."
@@ -3881,49 +4287,84 @@ msgstr "Cnaga is plaib 
 msgid "Dynamic Range Compressor"
 msgstr "Comhbhrúiteoir Réimse Dhinimiciúil"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Comhbhrúiteoir Réimse Dhinimiciúil le Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Cóimheas:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Aga Ionsaithe:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalaigh go 0dB tar éis comhbhrúite"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Tairseach: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Cóimheas: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Cóimheas: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Aga Ionsaithe: %.1f soic"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3934,6 +4375,247 @@ msgstr "Comhbhr
 msgid "Applying Dynamic Range Compression..."
 msgstr "Comhbhrú Réimse Dhinimiciúil á Fhorchur..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Faisnéis"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3950,8 +4632,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Aimplitiúid (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4180,16 +4862,12 @@ msgstr "Inbheartaigh"
 msgid "Inverting"
 msgstr "Á inbheartú"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4201,31 +4879,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4236,6 +4918,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Asbhaint Fhothraim"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4252,10 +5086,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4283,10 +5113,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Asbhaint Fhothraim"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Céim 1"
@@ -4317,14 +5143,26 @@ msgstr "Faigh an tIml
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Asbhaint Fothraim..."
@@ -4359,22 +5197,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalú"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Bain amach taobhrianadh SD ar bith (lárnaigh ar 0 go hingearach)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normalú..."
@@ -4388,44 +5226,56 @@ msgstr "
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Maisiúchán forchurtha: %s %d céimeanna, %.0f%% fliuch, minicíocht = %.1f Hz, pas tosaigh = %.0f céim, doimhneacht = %d, aisfhotha = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Phaser"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser le Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Céimeanna:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "TIRIM"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "FLIUCH"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
 #: ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "Minicíocht LFO (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "Pas Tosaigh LFO (céim.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Doimhneacht:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Aisfhotha (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4440,6 +5290,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4458,28 +5316,23 @@ msgstr "T
 msgid "Repeat"
 msgstr "Athdhéan"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Athdhéan le Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Líon uaireanta le hathdhéanamh:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Fad roghnaithe nua:"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d neomat, %d s(h)oicind"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d s(h)oicind"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4543,8 +5396,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4552,6 +5453,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Líneach"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4580,22 +5489,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Tonnchrot:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4622,10 +5537,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4671,10 +5582,6 @@ msgstr "Maisi
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah le Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Doimhneacht (%):"
@@ -4683,10 +5590,18 @@ msgstr "Doimhneacht (%):"
 msgid "Resonance:"
 msgstr "Athshondas:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Taobhrian Mhinicíocht Wah (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4723,6 +5638,18 @@ msgstr "Socruithe Maisi
 msgid "Length (seconds)"
 msgstr "Fad (soicindí)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Maisiúchán Nyquist á Fhorchur..."
@@ -4788,9 +5715,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4844,6 +5774,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4879,10 +5813,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Ní féidir fuaim a easpórtáil go %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Fuaim roghnaithe á heaspórtáil le hionchódaitheoir an líne-orduithe"
@@ -4895,6 +5825,477 @@ msgstr "Tionscadal ar fad 
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Ráta Giotán:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Teanga:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Comhaid XML (*.xml)|*.xml|Gach Comhad (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4967,10 +6368,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4979,10 +6376,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Ráta Giotán:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4991,10 +6384,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -5020,44 +6409,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5068,20 +6425,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5112,6 +6465,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Caighdeán"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5137,33 +6494,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Cá bhfuil %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5173,8 +6512,9 @@ msgstr "lame_enc.dll|lame_enc.dll|Dynamically Leabharlanna Naisceacha Dinimici
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "libmp3lame.so|libmp3lame.so|Comhaid Oibiacht Phríomhúil Chomhroinnte amháin (*.so)|*.so|Leabharlanna Breisithe (*.so*)|*.so*|Gach Comhad (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5193,10 +6533,6 @@ msgstr "T
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Déan Eagarthóireacht ar Lipéid ID3 i gcomhair an chomhad MP3"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5232,10 +6568,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5248,18 +6580,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Ní bhfuarthas breiseán easportála MP3"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5318,6 +6642,10 @@ msgstr "Cuir fuaim san 
 msgid "First file name:"
 msgstr "Ainm an chéad chomhaid:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Rianta"
@@ -5338,15 +6666,14 @@ msgstr "Uimhri
 msgid "File name prefix:"
 msgstr "Réamh-mhír ainm an chomhaid:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Scríobh thar chomhaid reatha"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5356,10 +6683,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Roghnaigh ionad ina sábháilfear na comhaid easphortáilte"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5367,6 +6690,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5377,6 +6704,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5385,10 +6718,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5401,22 +6730,14 @@ msgstr "Fuaim roghnaithe 
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Tionscadal ar fad á easpórtáil mar Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5432,8 +6753,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Ní féidir gach teaglaim ceanntásc\n"
 "is inchóduithe a úsáid.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5457,8 +6790,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Earráid (seans nár scríobhadh an comhad): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5466,6 +6827,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Tiomsaíodh an leagan seo d'Audacity gan cumas láimhseála %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5496,9 +6865,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5511,19 +6881,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Níor aithin Audacity an saghas seo comhaid.\n"
-"Murar comhad comhbhrúite é triail é a iompórtáil le \"Impórtáil Sonraí Amha\""
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5562,16 +6984,17 @@ msgstr "N
 msgid "Invalid track offset in LOF file."
 msgstr "Taobhrianadh neamhdhlistineach riain sa chomhad LOF."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Earráid le linn pharsáil chomhad Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Earráid le linn pharsáil chomhad MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5598,15 +7021,23 @@ msgstr "Ceannt
 msgid "Internal logic fault"
 msgstr "Locht inmheánach loighce"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Comhad %s á Iompórtáil..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Iompórtáil Sonraí Loma"
@@ -5644,6 +7075,14 @@ msgstr "2 Cain
 msgid "%d Channels"
 msgstr "%d (g)C(h)ainéal"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Taobhrian tosaigh:"
@@ -5656,8 +7095,17 @@ msgstr "M
 msgid "Sample rate:"
 msgstr "Ráta samplaithe:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5701,10 +7149,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Seinn rianta eile le linn taifeadadh ar cheann nua"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5714,8 +7161,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5742,12 +7193,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5775,21 +7228,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5828,7 +7269,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5853,23 +7294,65 @@ msgstr "N
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Ní chuirfear athruithe ar an gcomhadlann shealadach i gcrích go dtí go n-athmhúsclófar Audacity"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Déan cóip den chomhad roimh eagarthóireacht (níos sábháilte)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Leagan Leabharlainne MP3:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Léigh díreach ón mbunchomhad (níos tapúla)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5899,53 +7382,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Leagan Leabharlainne MP3:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Comhéadan"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Aimsigh Leabharlann"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Comhéadan"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5960,6 +7438,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5968,25 +7450,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Teanga:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Íosluach an réimse léirithe dB"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5996,6 +7478,10 @@ msgstr "-36 dB (r
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (réimse PCM de shamplaí 8 giotán)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (réimse PCM de shamplaí 16 giotán)"
@@ -6008,10 +7494,34 @@ msgstr "-120 dB (teorainn gharbh 
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (réimse PCM de shamplaí 24 giotán)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Méarchlár"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6044,10 +7554,6 @@ msgstr "Earr
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Roghnaigh comhad XML ina bhfuil congair mhéarchláir Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Comhaid XML (*.xml)|*.xml|Gach Comhad (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Earráid le linn lódáil chongair mhéarchláir"
@@ -6063,6 +7569,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Cealaigh"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Seinn rianta eile le linn taifeadadh ar cheann nua"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Luch"
@@ -6287,10 +7830,6 @@ msgstr "Z
 msgid "Audacity Preferences"
 msgstr "Roghanna Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Caighdeán"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Dronnuilleog"
@@ -6355,12 +7894,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6379,6 +7918,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - réamhshocrú"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - cúngbhanda is cúinge"
@@ -6387,6 +7930,10 @@ msgstr "4096 - c
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6403,6 +7950,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Uasmhinicíocht (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Ní foláir ach gur slánuimhir í an uasmhinicíocht"
@@ -6419,6 +7986,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6491,10 +8066,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Sos"
@@ -6503,9 +8074,9 @@ msgstr "Sos"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Seinn (Iomlaoid le seinnt i lúib)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6519,6 +8090,10 @@ msgstr "L
 msgid "Skip to End"
 msgstr "Léim go dtí an Deireadh"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6551,6 +8126,10 @@ msgstr "Bearr a bhfuil lasmuigh den rogha"
 msgid "Silence selection"
 msgstr "Cuir an Rogha ina thost"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Zúmáil Isteach"
@@ -6607,24 +8186,20 @@ msgstr "M
 msgid "Input level meter - click to monitor input"
 msgstr "Méadar leibhéal an ionchuir - cnag le hionchur a iniúchadh"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Glór Aschuir"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Glór Ionchuir"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6643,6 +8218,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6900,6 +8480,22 @@ msgstr "Deas"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6946,14 +8542,14 @@ msgstr "D
 msgid "Vertical Stereo"
 msgstr "Défhónach Ingearach"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Líneach"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6973,6 +8569,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6981,10 +8593,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6997,6 +8605,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7110,11 +8733,10 @@ msgstr "N
 msgid "Could not open file: \"%s\""
 msgstr "Theip ar oscailt an chomhaid: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Earráid, %s ag líne %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/he.po b/locale/he.po
index bad408f..7709cd3 100644
--- a/locale/he.po
+++ b/locale/he.po
@@ -3,8 +3,7 @@
 # Rani.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: audacity 1.3.4\n"
+msgstr "Project-Id-Version: audacity 1.3.4\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2007-12-16 16:54+0000\n"
 "PO-Revision-Date: 2008-03-01 01:50+0200\n"
@@ -29,18 +28,15 @@ msgid "OK... Audacious!"
 msgstr "קדימה נועזי המוזיקה ...OK"
 
 #: AboutDialog.cpp:175
-msgid "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."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
-" הינה תוכנה חופשית שנכתבה ע\"י צוות מפתחים מתנדבים מסביב לעולם. התאום מתבצע בזכות .SourceForge.net שהוא שירות מקוון המספק כלים חינמיים לפרויקטי קוד פתוח. \n"
-".לינוקס ומערכות הפעלה דומויות לינוקס ,Mac OS X ,ומעלה  Win98 התוכנה זמינה למערכות הפעלה .\n"
-"Mac OS 9  גרסאות ישנות יותר קיימות למקינטוש "
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
@@ -52,13 +48,12 @@ msgstr ""
 #: AboutDialog.cpp:192
 #: AboutDialog.cpp:194
 msgid "translator_credits"
-msgstr ""
-" רני :למתרגם קרדיט \n"
+msgstr " רני :למתרגם קרדיט \n"
 "  "
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "החופשי השמע עורך"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -95,6 +90,10 @@ msgstr ""
 msgid "Special thanks:"
 msgstr ":מיוחדות תודות"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -197,6 +196,18 @@ msgstr ""
 msgid "Program build date: "
 msgstr "התוכנה בניית תאריך:"
 
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
 #: AboutDialog.cpp:465
 msgid "Installation Prefix: "
@@ -227,12 +238,10 @@ msgstr "שגיאה בפתיחת פרויקט"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-".לא קיים ולא יכול להיפתח %s\n"
+msgstr ".לא קיים ולא יכול להיפתח %s\n"
 "\n"
 ".הוא הוסר מרשימת ההיסטוריה."
 
@@ -269,11 +278,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "%s :אופצית הפקודה לא מוכרת\n"
 
 #: AudacityApp.cpp:1035
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-".התוכנה לא מצאה מקום לקבצים זמניים\n"
+msgstr ".התוכנה לא מצאה מקום לקבצים זמניים\n"
 "\"אנא בחר מקום מתאים בתיבת \"העדפות"
 
 #: AudacityApp.cpp:1041
@@ -282,15 +289,13 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr ".התוכנה עומדת להיסגר. אנא פתח אותה שוב בכדי להשתמש בספריה הזמנית החדשה"
 
 #: AudacityApp.cpp:1073
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
 msgstr ""
 
 #: AudacityApp.cpp:1080
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
 msgstr ""
 
@@ -307,8 +312,7 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr ""
 
 #: AudacityApp.cpp:1124
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
 msgstr ""
 
@@ -351,13 +355,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr ".בנוסף, ציין את שם קובץ השמע או הפרויקט שאותו יש לפתוח"
 
 #: AudacityApp.cpp:1434
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"אינם (.AUP) הקבצים שך תוכנה זו בסיומת \n"
+msgstr "אינם (.AUP) הקבצים שך תוכנה זו בסיומת \n"
 ".Audacity- משוייכים ל \n"
 "\n"
 "?האם לשייך אותם בכדי שיפתחו בלחיצה כפולה?"
@@ -371,11 +373,9 @@ msgid "Could not find any audio devices.\n"
 msgstr ""
 
 #: AudioIO.cpp:220
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-".לא תוכל ונגן או להקליט שמע\n"
+msgstr ".לא תוכל ונגן או להקליט שמע\n"
 "\n"
 
 #: AudioIO.cpp:223
@@ -391,12 +391,10 @@ msgid "Latency problem"
 msgstr "בעיית הסתרה"
 
 #: AudioIO.cpp:1236
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"ערכי הסתרה גרמו לשמע המוקלט להיות נסתר לפני האפס.\n"
+msgstr "ערכי הסתרה גרמו לשמע המוקלט להיות נסתר לפני האפס.\n"
 " ...×”"
 
 #: AutoRecovery.cpp:54
@@ -404,8 +402,7 @@ msgid "Automatic Crash Recovery"
 msgstr "התאוששות אוטומטית משגיאה"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
 msgstr ""
 
@@ -438,8 +435,7 @@ msgid "Recover Projects"
 msgstr "Recover projects"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
 msgstr ""
 
@@ -515,11 +511,9 @@ msgstr "לא ממומשת עדיין %s פקודת "
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"%s לא יכול לקבוע פרמטר של אפקט \n"
+msgstr "%s לא יכול לקבוע פרמטר של אפקט \n"
 "%s לערך."
 
 #: BatchCommands.cpp:583
@@ -529,8 +523,7 @@ msgstr "לא זוהתה %s  פקודת אצווה שלך"
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
 msgstr ""
@@ -551,6 +544,10 @@ msgstr "%s מיישם את "
 msgid "Apply Chain"
 msgstr "מיישם שרשרת"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&בחר שרשרת"
@@ -597,10 +594,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "...בחר קובץ (קבצים) לעיבוד אצווה "
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -713,8 +718,7 @@ msgid "Copying audio data into project..."
 msgstr ""
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
 msgstr ""
@@ -782,8 +786,7 @@ msgid "Dependency check"
 msgstr "בדיקת תלויות"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
 msgstr ""
 
@@ -807,8 +810,7 @@ msgstr "מנקה ספריות זמניות"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
 msgstr ""
 
@@ -834,16 +836,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "%s :שם קובץ שונה\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "%s משנה בלוק\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -870,15 +872,13 @@ msgid "Missing data file: (%s.au)"
 msgstr ""
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 msgstr ""
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr ""
@@ -908,8 +908,7 @@ msgstr "התראה"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
@@ -934,8 +933,7 @@ msgstr "סגור את הפרויקט מיידית ללא שינויים נוספ
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
 msgstr ""
@@ -950,8 +948,7 @@ msgstr "[מלא בשקט מקומות בהן חסר מידע להצגה [בפע
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
@@ -988,6 +985,95 @@ msgstr "...שומר שמע מוקלע לדיסק"
 msgid "Rectangular"
 msgstr "Rectangular"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "...עיין"
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "?%s היכן "
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "ניתוח תדר"
@@ -1016,8 +1102,9 @@ msgstr "תיקון עצמי מוגדש"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "אלגוריתם:"
 
 #: FreqWindow.cpp:168
@@ -1031,9 +1118,9 @@ msgstr "גודל"
 msgid " window"
 msgstr " חלון "
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "פונקציה:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1043,9 +1130,9 @@ msgstr "תדירות לינארית"
 msgid "Log frequency"
 msgstr "תדירות לוגריתמית"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "ציר:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1054,6 +1141,10 @@ msgstr "ציר:"
 msgid "&Export..."
 msgstr "...ייצוא&"
 
+#: export/ExportCL.cpp:320
+msgid "Export"
+msgstr "ייצא"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:135
 msgid "Close"
@@ -1132,7 +1223,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "(Hz)השהייה (שניות) / תדר\tעוצמה(השהייה (שניות/t(Hz) תדר\tעוצמה "
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:92
@@ -1148,16 +1239,33 @@ msgid "Recording Audio"
 msgstr "מקליט שמע"
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
-msgstr "עריכה והצללה של תפריטים"
+msgid "Recording - Choosing the Input Device"
+msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
-msgstr "ייצו ושמירה"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
 
 #: HelpText.cpp:113
-msgid "Supported Formats"
-msgstr " פורמטים נתמכים "
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+#, fuzzy
+msgid "Editing and greyed out Menus"
+msgstr "עריכה והצללה של תפריטים"
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr ""
 
 #: HelpText.cpp:117
 msgid "Burn to CD"
@@ -1167,45 +1275,64 @@ msgstr "CD-צרוב ל"
 msgid "No Local Help"
 msgstr "אין עזרה למקום זה"
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
-msgstr "<p>Audacity אל הבאים ברוכים,"
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
 
-#: 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 "!בואו נתחיל</p><p>ניתן להקיש על הקישורים הבאים בכדי ללמוד כיצד ניתן:<ul><li> <p>להשמיע קובץ שמע קיים.<li> להקליט קובץ שמע חדש.<li> MPלערוך שמע ולייצא לקבצי שמע כמו 3.<li> CD לצרוב.</ul> <br><br>"
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
 
-# ניתן תמיד לחזור אל הוראות אלה ע\"י הקשה על תפריט 'עזרה', ואחר כך על 'הצג הודעת פתיחה'. לקריאה מעמיקה יותר, אנא קיראו את העזרה המלאה ע\"י הקשה על 'תוכן העניינים' בתפריט 'עזרה' או <a href=\"http://audacity.sourceforge.net/help/documentation\">הורדה של המדריך המלא</a> בפורמט .ברוכים הבאים בשנית.
-#: 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."
-msgstr "ניתן תמיד לחזור אל הוראות אלה ע\"י הקשה על תפריט 'עזרה', ואחר כך על 'הצג הודעת פתיחה'. לקריאה מעמיקה יותר, אנא קיראו את העזרה המלאה ע\"י הקשה על 'תוכן העניינים' בתפריט 'עזרה' או <a href=\"http://audacity.sourceforge.net/help/documentation\">הורדה של המדריך המלא</a> בפורמט .ברוכים הבאים בשנית."
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
 
-#: 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>"
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: 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>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
 #: HelpText.cpp:221
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:252
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. If burning to an audio CD for standalone CD players, you must export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:287
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, or most other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:314
-msgid "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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:329
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: HistoryWindow.cpp:53
@@ -1312,8 +1439,7 @@ msgid "New..."
 msgstr "...חדש"
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
@@ -1380,11 +1506,9 @@ msgstr "Audacity בחר שפה לשימוש :"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-".ממיר פרויקט מגרסב 1.0 לפורמט החדש\n"
+msgstr ".ממיר פרויקט מגרסב 1.0 לפורמט החדש\n"
 "'%s' הקובץ הישן נשמר בתור"
 
 #: Legacy.cpp:357
@@ -1416,6 +1540,10 @@ msgstr "&שמור פרויקט\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "...שמור פרויקט &בתור"
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "...בדו&ק קישוריות"
@@ -1424,6 +1552,10 @@ msgstr "...בדו&ק קישוריות"
 msgid "Open Me&tadata Editor..."
 msgstr "...פתח עו&רך מטא-מידע"
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&ייבוא"
+
 #: Menus.cpp:194
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&...שמע\tCtrl+Shift+I"
@@ -1453,6 +1585,10 @@ msgstr "...ייצא &תוויות"
 msgid "Export &Multiple..."
 msgstr "...יצא &בריבוי"
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:245
 msgid "CleanSpeech C&hain..."
 msgstr ""
@@ -1534,9 +1670,9 @@ msgstr "&מחק\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "&פיצול מחיקה\tCtrl+Alt+K"
 
-#: Menus.cpp:335
-msgid "&Silence\tCtrl+L"
-msgstr "&שקט\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:337
 msgid "Sp&lit\tCtrl+I"
@@ -1550,24 +1686,21 @@ msgstr "&פצל חדש\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&צרף\tCtrl+J"
 
-#: Menus.cpp:348
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "בטל איחוד\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:350
 msgid "Duplic&ate\tCtrl+D"
 msgstr "&שכפל\tCtrl+D"
 
-#: Menus.cpp:356
-#: Menus.cpp:556
-#: effects/StereoToMono.h:23
-#, fuzzy
-msgid "&Stereo to Mono"
-msgstr "&סטריאו למונו"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:363
-msgid "Labeled Re&gions..."
-msgstr "&...תחומים בעלי תויות"
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:365
@@ -1612,13 +1745,13 @@ msgid "&Join\tAlt+J"
 msgstr "&אחד\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:407
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "בטל איחוד\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
-msgstr "&...בחר"
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:414
 msgid "&All\tCtrl+A"
@@ -1628,65 +1761,67 @@ msgstr "&הכל\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr "&כלום\tCtrl+Shift+A"
 
-#: Menus.cpp:419
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:420
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: Menus.cpp:424
-msgid "Start to Cursor"
-msgstr "מהתחלה עד לסמן"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: Menus.cpp:425
-msgid "Cursor to End"
-msgstr "סמן עד לסוף"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:431
 msgid "Find &Zero Crossings\tZ"
 msgstr "&מצא את חציית האפס\tZ"
 
-#: Menus.cpp:433
-msgid "Mo&ve Cursor..."
-msgstr "&...הזז סמן"
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: Menus.cpp:435
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "לתחילת הקטע הנבחר"
 
-#: Menus.cpp:436
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "לסוף הקטע הנבחר"
 
-#: Menus.cpp:440
-msgid "to Track Start"
-msgstr "לתחילת הרצועה"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: Menus.cpp:441
-msgid "to Track End"
-msgstr "לסוף הרצועה"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: Menus.cpp:448
-msgid "Selection Save"
-msgstr "שמור בחירה"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: Menus.cpp:449
-msgid "Selection Restore"
-msgstr "שחזר בחירה"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:454
-msgid "Play &Region..."
-msgstr "&...נגן מקטע"
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
-#: Menus.cpp:455
-msgid "Lock"
-msgstr "נעל"
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr ""
 
-#: Menus.cpp:456
-msgid "Unlock"
-msgstr "בטל נעילה"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr ""
 
 #: Menus.cpp:462
 msgid "Turn Snap-To On"
@@ -1704,9 +1839,14 @@ msgstr "(grid snap) הפעל הצמדה לרישות"
 msgid "Turn Grid Snap Off"
 msgstr "(grid snap) בטל הצמדה לרישות"
 
-#: Menus.cpp:474
-msgid "&Preferences...\tCtrl+P"
-msgstr "&...העדפות\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:484
 msgid "&View"
@@ -1744,61 +1884,133 @@ msgstr "&צמצם כל הרצועות\tCtrl+Shift+C"
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "&רווח כל הרצועות\tCtrl+Shift+X"
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+#, fuzzy
+msgid "&Show Clipping"
 msgstr "הצג חיתוך"
 
 #: Menus.cpp:511
 msgid "&History..."
 msgstr "&...הסטוריה"
 
-#: Menus.cpp:517
-msgid "&Toolbars..."
-msgstr "&...סרגלי כלים"
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
-#: Menus.cpp:518
-msgid "Control Toolbar"
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
 msgstr "סרגל כלי הבקרה"
 
-#: Menus.cpp:519
-msgid "Device Toolbar"
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
 msgstr "סרגל כלי ההתקן"
 
-#: Menus.cpp:520
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
 msgstr "סרגל כלי העריכה"
 
-#: Menus.cpp:521
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
 msgstr "סרגל כלי המדידה"
 
-#: Menus.cpp:522
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
 msgstr "סרגל כלי הערבוב"
 
-#: Menus.cpp:523
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
 msgstr "סרגל כלי הבחירה"
 
-#: Menus.cpp:524
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
 msgstr "סרגל כלים"
 
-#: Menus.cpp:525
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
 msgstr "סרגל כלי תעתיק"
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:576
+#, fuzzy
+msgid "&Reset Toolbars"
 msgstr "סרגל כלי איפוס"
 
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:786
+msgid "Skip to Start\tHome"
+msgstr "דלג להתחלהt\tHome"
+
+#: Menus.cpp:787
+msgid "Skip to End\tEnd"
+msgstr "דלג לסוף\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:537
 msgid "&Tracks"
 msgstr "&רצועות"
 
-#: Menus.cpp:544
-msgid "Add &New..."
-msgstr "&...הוסף חדש"
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:545
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1813,15 +2025,9 @@ msgstr "&ערוץ סטריאו"
 msgid "&Time Track"
 msgstr "&רצועת זמן"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr "&...הקלטה מתוזמנת"
-
-#: Menus.cpp:560
-#: Menus.cpp:3698
-#: Mix.cpp:120
-msgid "&Mix and Render"
-msgstr "&ערבל והפוך"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
+msgstr ""
 
 #: Menus.cpp:564
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
@@ -1835,6 +2041,14 @@ msgstr "&...דגימה מחדש"
 msgid "Remo&ve Tracks"
 msgstr "הס&ר רצועה"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: Menus.cpp:585
 msgid "Align with &Zero"
 msgstr "יישר עם &האפס"
@@ -1851,29 +2065,41 @@ msgstr "יישר עם &תחילת מקטע נבחר"
 msgid "Align with Selection &End"
 msgstr "יישר עם &סוף מקטע נבחר"
 
-#: Menus.cpp:589
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "יישר סיום עם הסמן"
 
-#: Menus.cpp:590
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "יישר סיום עם תחילת מקטע נבחר"
 
-#: Menus.cpp:591
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "יישר סיום עם סוף מקטע נבחר"
 
-#: Menus.cpp:592
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "יישר רצועות יחדיו"
 
-#: Menus.cpp:594
-msgid "&Align Tracks..."
-msgstr "&...יישר רצועות"
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
 
-#: Menus.cpp:603
-msgid "Ali&gn And Move Cursor..."
-msgstr "&...יישר והזז סמן"
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:611
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1883,22 +2109,26 @@ msgstr "&הוספת תווית בנקודת הבחירה\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "&הוסף תוית בנקודת ההשמעה\tCtrl+M"
 
-#: Menus.cpp:618
-msgid "S&ort tracks by..."
-msgstr "&...מיין רצועות לפי"
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:619
-msgid "&Start time"
-msgstr "&זמן התחלה"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:621
-msgid "&Name"
-msgstr "&שם"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:631
 msgid "&Generate"
 msgstr "&צור"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:654
 msgid "Effe&ct"
 msgstr "&אפקטים"
@@ -1932,6 +2162,10 @@ msgstr "&...הצג הודעת פתיחה"
 msgid "&Index..."
 msgstr "...א&ינדקס"
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr "&...כלי לכידת תמונת מסך"
@@ -1944,12 +2178,12 @@ msgstr "&...הרץ מבחן השוואה"
 msgid "&Audio Device Info..."
 msgstr "&...אינפורמציית התקן שמע"
 
-#: Menus.cpp:758
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:759
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: Menus.cpp:762
@@ -1984,9 +2218,9 @@ msgstr "הכלי הבא\tD"
 msgid "Previous Tool\tA"
 msgstr "כלי קודם\tA"
 
-#: Menus.cpp:772
-msgid "Play/Stop\tSpacebar"
-msgstr "נגן עצור\tמקש רווח"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:773
 msgid "Stop\tS"
@@ -2000,6 +2234,10 @@ msgstr "הפסקה\tP"
 msgid "Record\tR"
 msgstr "הקלטה\tR"
 
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
+msgstr ""
+
 #: Menus.cpp:777
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "נגן/עצור וקבע סמן\tShift+A"
@@ -2016,22 +2254,14 @@ msgstr "נגן עד לבחירה\tB"
 msgid "Play Looped\tL"
 msgstr "נגן בלולאה\tL"
 
-#: Menus.cpp:783
-msgid "Play Looped\tShift+Spacebar"
-msgstr "נגן בלולאה\tShift+מקש רווח"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:784
 msgid "Play Cut Preview\tC"
 msgstr "ניגון מקדים של גזירה "
 
-#: Menus.cpp:786
-msgid "Skip to Start\tHome"
-msgstr "דלג להתחלהt\tHome"
-
-#: Menus.cpp:787
-msgid "Skip to End\tEnd"
-msgstr "דלג לסוף\tEnd"
-
 #: Menus.cpp:789
 msgid "Selection to Start\tShift+Home"
 msgstr "בחירה מההתחלה\tShift+Home"
@@ -2088,9 +2318,9 @@ msgstr "שנה רצועה ממוקדת\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "שנה רצועה ממוקדת\tNUMPAD_ENTER"
 
-#: Menus.cpp:816
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "שנה רצועה ממוקדת\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:818
 msgid "Cursor Left\tLeft"
@@ -2188,15 +2418,19 @@ msgstr "Snap-To On"
 msgid "Snap To Off"
 msgstr "Snap-To Off"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:860
 msgid "Open Recent"
 msgstr "פתח אחרונים"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:863
-msgid "Recent &Files..."
-msgstr "...קבצים & אחרונים"
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:910
 #, c-format
@@ -2253,6 +2487,23 @@ msgstr "%s חזור שוב\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr ".אין תוויות לרצועות לייצא"
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2241
 msgid "Nothing to undo"
 msgstr "שום דבר לביטול ביצוע"
@@ -2296,6 +2547,10 @@ msgstr "הדבק טקסט מלוח ההעתקה"
 msgid "Pasted from the clipboard"
 msgstr "הדבק מלוח ההעתקה"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2544
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ".העתקת שמע סטריאופוני לרצועת מונו אסורה"
@@ -2312,8 +2567,7 @@ msgstr "קצוץ קובץ עד לבחירה"
 #: Menus.cpp:2669
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
-msgstr ""
-"%.2f פיצול מחק\n"
+msgstr "%.2f פיצול מחק\n"
 "%.2f שניות בנקודה "
 
 #: Menus.cpp:2672
@@ -2323,8 +2577,7 @@ msgstr "פצל ומחק"
 #: Menus.cpp:2693
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
-msgstr ""
-"%.2f פורקו\n"
+msgstr "%.2f פורקו\n"
 "%.2f שניות בנקודה "
 
 #: Menus.cpp:2696
@@ -2334,8 +2587,7 @@ msgstr "פירוק"
 #: Menus.cpp:2717
 #, fuzzy, c-format
 msgid "Joined %.2f seconds at t=%.2f"
-msgstr ""
-"%.2f נמחקו\n"
+msgstr "%.2f נמחקו\n"
 "%.2f שניות בנקודה "
 
 #: Menus.cpp:2720
@@ -2345,8 +2597,7 @@ msgstr "צרף"
 #: Menus.cpp:2739
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
-msgstr ""
-"%.2f נבחרו רצועות שקטות למשך\n"
+msgstr "%.2f נבחרו רצועות שקטות למשך\n"
 "%.2f בנקודה "
 
 #: Menus.cpp:2741
@@ -2459,8 +2710,7 @@ msgstr ".בכדי לצייר את הספקטרום, כלל הרצועות הנב
 #: Menus.cpp:3420
 #, c-format
 msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
-msgstr ""
-"%.1f -יותר מדי שמע נבחר. רק ה\n"
+msgstr "%.1f -יותר מדי שמע נבחר. רק ה\n"
 ".השניות הראשונות של השמע ינותחו"
 
 #: Menus.cpp:3546
@@ -2476,9 +2726,9 @@ msgstr "ייבא תויות"
 msgid "Select a MIDI file..."
 msgstr "...MIDI בחר קובץ"
 
-#: Menus.cpp:3561
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "כל הקבצים (*.*)|*.*|MIDI קבצי (*.mid)|*.mid|Allegro קבצי (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3577
 #, c-format
@@ -2497,14 +2747,6 @@ msgstr "...בחר קובץ לא דחוס כלשהו"
 msgid "All files (*)|*"
 msgstr "כל הקבצים (*)|*"
 
-#: Menus.cpp:3611
-#: Project.cpp:2540
-#: Project.cpp:2565
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "ייבא"
-
 #: Menus.cpp:3630
 #, fuzzy
 msgid "Edit the metadata tags"
@@ -2537,6 +2779,12 @@ msgstr "רצועות לערוץ סטריאו יחיד %d ערבב והפוך"
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "רצועות לערוץ מונו יחיד %d ערבב והפוך"
 
+#: Menus.cpp:560
+#: Menus.cpp:3698
+#: Mix.cpp:120
+msgid "&Mix and Render"
+msgstr "&ערבל והפוך"
+
 #: Menus.cpp:3828
 msgid "Aligned with zero"
 msgstr "יושר עם האפס"
@@ -2573,6 +2821,14 @@ msgstr "מייושר"
 msgid "Align"
 msgstr "יישר"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3912
 msgid "Created new audio track"
 msgstr "רצועת שמע חדשה נוצרה"
@@ -2639,15 +2895,15 @@ msgid "Removed audio track(s)"
 msgstr "הסר רצועות שמע "
 
 #: Menus.cpp:4439
-msgid "New sample rate (Hz):"
-msgstr "(Hz) קצב דגימה חדש:"
-
-#: Menus.cpp:4439
 #: Menus.cpp:4458
 #: export/ExportMP3.cpp:1927
 msgid "Resample"
 msgstr "דגימה מחדש"
 
+#: Menus.cpp:4439
+msgid "New sample rate (Hz):"
+msgstr "(Hz) קצב דגימה חדש:"
+
 #: Menus.cpp:4445
 msgid "The entered value is invalid"
 msgstr "הערך המוכנס אינו חוקי"
@@ -2714,15 +2970,13 @@ msgstr "שמע מוקלט"
 msgid "Save changes before closing?"
 msgstr "לשמור שינויים לפני סגירה?"
 
-#: Project.cpp:1493
-msgid ""
+#: Project.cpp:1570
+msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: Project.cpp:1496
@@ -2741,6 +2995,25 @@ msgstr "...בחר קובץ שמע אחד או יותר"
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:2146
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2158
+msgid "Opening old project file"
+msgstr "פותח קובץ פרויקט ישן"
+
 #: Project.cpp:1801
 #: Project.cpp:1809
 msgid "Error opening file"
@@ -2748,11 +3021,9 @@ msgstr "שגיאה בפתיחת קובץ"
 
 #: Project.cpp:1815
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-":הקובץ אינו מתאים או אינו תקין\n"
+msgstr ":הקובץ אינו מתאים או אינו תקין\n"
 "%s"
 
 #: Project.cpp:1816
@@ -2791,8 +3062,7 @@ msgstr "\"%s\" :לא יכול למצוא את ספריית הפרויקט"
 
 #: Project.cpp:2121
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
 msgstr ""
@@ -2801,39 +3071,34 @@ msgstr ""
 msgid "Can't open project file"
 msgstr "לא יכול לפתוח קובץ פרויקט"
 
-#: Project.cpp:2146
+#: Project.cpp:2153
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
-"older version.  The format has changed.\n"
-"\n"
-"Audacity could corrupt the file in opening\n"
-"it, so you must back it up first.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
 "Open this file now?"
 msgstr ""
 
-#: Project.cpp:2153
-#, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
-"You 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"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Open this file now?"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:2158
-msgid "Opening old project file"
-msgstr "פותח קובץ פרויקט ישן"
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
 
-#: Project.cpp:2379
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"אינו בר כתיבה %s לא יכול לשמור את הפרויקט. יתכן ש \n"
-"או שהדיסק מלא."
 
 #: Project.cpp:2381
 #: Project.cpp:2395
@@ -2845,22 +3110,19 @@ msgstr "שגיאה בשמירת הפרויקט"
 msgid "Saved %s"
 msgstr "%s נשמר"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2473
-msgid "Raw"
-msgstr "גולמי"
-
-#: Project.cpp:2478
-#, c-format
-msgid "Importing %s..."
-msgstr "...%s מייבא"
-
 #: Project.cpp:2539
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' ייובאו"
 
+#: Menus.cpp:3611
+#: Project.cpp:2540
+#: Project.cpp:2565
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "ייבא"
+
 #: Project.cpp:2592
 #: Project.cpp:2600
 msgid "Error importing"
@@ -2874,15 +3136,24 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM קובץ שמע מסוג (*.wav)|*.wav"
 
-#: Project.cpp:2642
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
 
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
 #: Project.cpp:2645
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Audacity פרויקט (*.aup)|*.aup"
@@ -2894,8 +3165,7 @@ msgstr "פרויקט חדש נוצר"
 #: Project.cpp:2809
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
-msgstr ""
-"%.2f נמחקו\n"
+msgstr "%.2f נמחקו\n"
 "%.2f שניות בנקודה "
 
 #: Project.cpp:2812
@@ -2928,6 +3198,16 @@ msgstr "שניות %d נפח דיסק נותר מספיק להקלטה של  "
 msgid "Out of disk space"
 msgstr "נגמר שטח הדיסק"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3295
 msgid "Could not remove old autosave file: "
 msgstr ":לא יכול למחוק קובץ שמירה אוטומטית"
@@ -3014,45 +3294,13 @@ msgstr "&הצג קודם"
 msgid "&Debug"
 msgstr "&Debug - בחן"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity הקלטה מתוזמנת ע\"י"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "תחילת ההקלטה"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "סוף ההקלטה"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:304
-msgid "Duration"
-msgstr "משך זמן"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity התקדמות הקלטה חכמה של "
-
-#: SmartRecordDialog.cpp:270
-msgid "Start Date and Time"
-msgstr "תאריך וזמן התחלה"
-
-#: SmartRecordDialog.cpp:287
-msgid "End Date and Time"
-msgstr "תאריך וזמן סיום"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "%s מחכה להתחיל הקלטה ב .\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:381
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "מחכה להתחיל- Audacity הקלטה חכמה של "
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3093,10 +3341,9 @@ msgstr "סגנון"
 msgid "Comments"
 msgstr "הערות"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr ".או הקשה כפולה בכדי לערוך  F2 הקש"
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3116,16 +3363,13 @@ msgstr "&נקה"
 msgid "Genres"
 msgstr "סגנונות"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "ערוך"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "איתחול"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3195,6 +3439,16 @@ msgstr "?האם אתה בטוח שאתה רוצה לאפס את קובץ רשי
 msgid "Unable to open genre file."
 msgstr ".לא יכול לפתןח קובץ סגנון"
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "שגיאה בטעינת מטא-מידע"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3204,138 +3458,32 @@ msgstr ".לא יכול לפתןח קובץ סגנון"
 msgid "Save Metadata As:"
 msgstr "שמור מטא-מידע בתור:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "שגיאה בטעינת מטא-מידע"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "כותר:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "אומן:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "אלבום:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "דוחס:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "פזמון:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "הערות:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr ":קידוד ע\"י"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "זכויות יוצרים"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "רצועה מספר:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr ":שנה"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "סגנון:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "אין סגנון"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "אפס לברירת מחדל"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "בסיסי"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "מתקדם"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "ערך"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "&נקה"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr ".המידע נחתך .'%s' עבור הסימון %d האורך המירבי הוא "
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "כותר"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "אומן"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "אלבום"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"לא יכול לכתוב קובץ:\n"
+msgstr "לא יכול לכתוב קובץ:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"לא יכול לפתוח קובץ:\n"
+msgstr "לא יכול לפתוח קובץ:\n"
 "  %s\n"
 ".לכתיבה"
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-" לא יכול לכתוב קובץ בבואה:\n"
+msgstr " לא יכול לכתוב קובץ בבואה:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
 msgstr ""
@@ -3343,22 +3491,19 @@ msgstr ""
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
 msgstr ""
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
 msgstr ""
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
 msgstr ""
@@ -3366,33 +3511,72 @@ msgstr ""
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"לא יכול לייצר ספריה:\n"
+msgstr "לא יכול לייצר ספריה:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"לא יכול לשמור קובץ:\n"
+msgstr "לא יכול לשמור קובץ:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "ציין זמן"
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:304
+msgid "Duration"
+msgstr "משך זמן"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity הקלטה מתוזמנת ע\"י"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "תחילת ההקלטה"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "סוף ההקלטה"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:270
+msgid "Start Date and Time"
+msgstr "תאריך וזמן התחלה"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:287
+msgid "End Date and Time"
+msgstr "תאריך וזמן סיום"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "%s מחכה להתחיל הקלטה ב .\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: TrackPanel.cpp:463
 #: TrackPanel.cpp:464
@@ -3590,13 +3774,13 @@ msgstr "Time shifted tracks/clips %s %.02f seconds"
 msgid "Time-Shift"
 msgstr "הזזה-בזמן"
 
-#: TrackPanel.cpp:2928
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "ציור עובד כרגע רק עם צורת גל לינארית"
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: TrackPanel.cpp:2945
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "You are not zoomed in enough. Zoom in until you can see the individual samples."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: TrackPanel.cpp:3216
 msgid "Moved Sample"
@@ -3688,6 +3872,14 @@ msgstr "Adjusted Pan"
 msgid "Adjusted gain"
 msgstr "Adjusted gain"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5884
 msgid "Can't delete track with active audio"
 msgstr "לא יכול למחוק רצועה עם שמע אקטיבי"
@@ -3745,14 +3937,6 @@ msgstr "שינוי קצב"
 msgid "Format Change"
 msgstr "שנה פורמט"
 
-#: TrackPanel.cpp:6285
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr ":הכנס קצב דגימה בהרץ (לשניה) בין 1 ל 100000"
-
-#: TrackPanel.cpp:6295
-msgid "Invalid rate."
-msgstr ".קצב לא חוקי"
-
 #: TrackPanel.cpp:6315
 msgid "Change lower speed limit (%) to:"
 msgstr ":שנה גבול מהירות תחתון (%) ל"
@@ -3891,19 +4075,18 @@ msgstr "1 עד %i תוספים"
 msgid "Plugins %i to %i"
 msgstr "%i עד %i תוספים"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "?אינו מותר מסיבה כל שהיא. נסה ראשית לבחור שמע כלשהו "
 
 #: commands/CommandManager.cpp:724
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
 msgstr ""
 
 #: commands/CommandManager.cpp:726
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
 msgstr ""
 
@@ -3912,14 +4095,13 @@ msgid "You must first select some audio for this to use."
 msgstr ".ראשית צריך לבחור רצועת שמע לשימוש "
 
 #: commands/CommandManager.cpp:730
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
-msgstr "הודעה"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:915
 #, c-format
@@ -3939,14 +4121,19 @@ msgstr "%s %.1f dB :יושם אפקט"
 msgid "Amplify"
 msgstr "הגבר"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Dominic Mazzoni הגברה ע\"י"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "הגברה (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "שיא עוצמה חדש (dB):"
@@ -3955,6 +4142,10 @@ msgstr "שיא עוצמה חדש (dB):"
 msgid "Allow clipping"
 msgstr "אפשר חיתוך"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "...הגבר"
@@ -4055,8 +4246,7 @@ msgstr "אישור"
 #: effects/BassBoost.cpp:52
 #, c-format
 msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
-msgstr ""
-"%s : יושם אפקט\n"
+msgstr "%s : יושם אפקט\n"
 "%.0f Hz -תדר\n"
 "%.0f db - הגברה ב"
 
@@ -4072,10 +4262,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "(Hz) תדר:"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "(db) הגבר:"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "הגברת הבס..."
@@ -4119,8 +4317,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "Olli Parviainen ע\"י SoundTouch-משתמש ב"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "מ :גובה צליל ->"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "(חצאי טונים (חצאי צעד:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4130,13 +4369,9 @@ msgstr "מ :גובה צליל ->"
 msgid "to"
 msgstr "ל ->"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "(חצאי טונים (חצאי צעד:"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "(Hz) מ  :תדר ->"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4144,6 +4379,11 @@ msgstr "(Hz) מ  :תדר ->"
 msgid "Percent Change:"
 msgstr "אחוז שינוי:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "...שנה גובה צליל"
@@ -4162,6 +4402,14 @@ msgstr "%s %.1f%% :יושם אפקט"
 msgid "Change Speed"
 msgstr "שנה מהירות"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "לא זמין"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "שנה מהירות, משפיע על הקצב וגם על גובה הצליל"
@@ -4170,17 +4418,17 @@ msgstr "שנה מהירות, משפיע על הקצב וגם על גובה הצ
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "Erik de Castro Lopo ע\"י SampleRate-משתמש ב"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "לא זמין"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "ממהירות סיבוב סטנדרטית של תקליט:"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4198,13 +4446,29 @@ msgstr "שנה קצב"
 msgid "Change Tempo without Changing Pitch"
 msgstr "שנה קצב מבלי להשפיע על גובה הצליל"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "מתוך   :(BPM) נקישות לדקה "
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "(מ :אורך (שניות ->"
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4214,8 +4478,9 @@ msgstr "...שנה קצב"
 msgid "Changing Tempo"
 msgstr "משנה קצב"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "הסרת קליקים"
 
 #: effects/ClickRemoval.cpp:336
@@ -4226,10 +4491,18 @@ msgstr "Craig DeForest מסיר קליקים ופופים ע\"י"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "(בחר ברמת סף (נמוך יותר הינו רגיש יותר"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "(רוחב קפיצה מירבי (גבוה הינו רגיש יותר"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "...\"הסרת \"קליקים"
@@ -4242,50 +4515,87 @@ msgstr "...מסיר קליקים ופופים"
 msgid "Dynamic Range Compressor"
 msgstr "דוחס תחום דינמי"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dominic Mazzoni דוחס תחום דינמי ע\"י "
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "שיעור:"
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "זמן מתקף:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "זמן ניוון:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 #, fuzzy
 msgid "Normalize to 0dB after compressing"
 msgstr "(0dbיישם נירמול אחרי הדחיסה (ל "
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "רמת סף: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "%.0f:1 :שיעור"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "%.1f:1 :שיעור"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "%.1f :זמן מתקף בשניות"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "%.1f :זמן דעיכה בשניות"
 
 #: effects/Compressor.h:36
@@ -4296,6 +4606,251 @@ msgstr "...דוחס"
 msgid "Applying Dynamic Range Compression..."
 msgstr "...מיישם דחיסת תחום דינמי"
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "התחלה"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "סוף"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "איתחול"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "cerv"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "DTMF מייצר צלילי"
@@ -4315,9 +4870,9 @@ msgstr "DTMF סדר:"
 msgid "Amplitude (0-1)"
 msgstr "(עוצמה (0-1"
 
-#: effects/DtmfGen.cpp:446
-msgid "DTMF duration:"
-msgstr "משך DTMF:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
 
 #: effects/DtmfGen.cpp:464
 msgid "Tone/silence ratio:"
@@ -4551,6 +5106,10 @@ msgstr "היפוך"
 msgid "Inverting"
 msgstr "הופך"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "מתאם עוצמות"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr ""
@@ -4575,29 +5134,26 @@ msgstr ""
 msgid "Heaviest"
 msgstr "כבד ביותר"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "מתאם עוצמות"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Lynn Allan מתאם עוצמות ע\"י"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "יישר מקטעים רכים ורועשים"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "Lynn Allan ×¢\"×™"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "רמת ההחלקה"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "רמת הסף לרעש:"
 
 #: effects/Leveller.h:28
@@ -4608,6 +5164,158 @@ msgstr "מתאם עוצמות..."
 msgid "Applying Leveller..."
 msgstr "מיישם התאמת עוצמות"
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "מערבב"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "הסרת רעש"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "לבן"
@@ -4624,10 +5332,6 @@ msgstr "חום"
 msgid "Noise Generator"
 msgstr "מייצר רעשים"
 
-#: effects/Noise.cpp:235
-msgid "Noise duration"
-msgstr "משך הרעש"
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr "סוג רעש"
@@ -4647,31 +5351,23 @@ msgstr "מייצר רעש"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-":לא יכול לפתוח קובץ\n"
+msgstr ":לא יכול לפתוח קובץ\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "נסה להריץ את מסיר הרעש ללו פרופיל רעש.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "הסרת רעש"
-
 #: effects/NoiseRemoval.cpp:812
 msgid "Step 1"
 msgstr "צעד 1"
 
 #: effects/NoiseRemoval.cpp:813
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"בחר מספר שניות שבהן רעש בלבד ,בכדי שהתוכנה תדע מה לסנן החוצה\n"
+msgstr "בחר מספר שניות שבהן רעש בלבד ,בכדי שהתוכנה תדע מה לסנן החוצה\n"
 ":\"ואז הקש \"מצא פרופיל רעש"
 
 #: effects/NoiseRemoval.cpp:814
@@ -4679,11 +5375,9 @@ msgid "Step 2"
 msgstr "צעד 2"
 
 #: effects/NoiseRemoval.cpp:815
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-",בחר את כל השמע שברצונך לסנן\n"
+msgstr ",בחר את כל השמע שברצונך לסנן\n"
 ",בחר כמה רעש ברצונך לסנן החוצה\n"
 ".ואז הקש 'אישור' להסרת הרעש\n"
 
@@ -4699,14 +5393,26 @@ msgstr "מצא את פרופיל הרעש"
 msgid "Noise reduction (dB):"
 msgstr "הנמכת רעש (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:847
 msgid "Frequency smoothing (Hz):"
 msgstr "(Hz) החלקת תדר: "
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:855
 msgid "Attack/decay time (secs):"
 msgstr "(זמן מתקף/דעיכה (בשניות:"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "....הסרת רעשים"
@@ -4747,22 +5453,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "נרמל"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Dominic Mazzoni נירמול ע\"י"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "(מרכז ל-0 אנכית)  DC הסר כל הזזת"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr " נירמול עוצמה מירבית ל"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "...נירמול"
@@ -4774,8 +5480,7 @@ msgstr "...מנרמל"
 #: effects/Phaser.cpp:65
 #, c-format
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"%s : יושם אפקט\n"
+msgstr "%s : יושם אפקט\n"
 "%d -שלבים\n"
 "%.0f%%  - הרטבה\n"
 "%.1f Hz - תדר\n"
@@ -4783,44 +5488,56 @@ msgstr ""
 "%d -עומק\n"
 "%.0f%% - משוב "
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser by Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "שלבים:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "יבש"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO תדירות (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO פאזת התחלה של (deg.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "עומק:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "משוב (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4830,12 +5547,19 @@ msgid "Applying Phaser"
 msgstr "מיישם שינוי פאזה"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "מתקן שמע פגום"
@@ -4854,30 +5578,25 @@ msgstr ".הרצועות ארוכות מדי בכדי לחזור על המקטע
 msgid "Repeat"
 msgstr "חזור שוב"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Dominic Mazzoni && Vaughan Johnson חזרה על ע\"י "
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "מספר פעמים לחזרה:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "אורך מקטע חדש: "
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "דקות %d ,שניות %d"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "שניות %d"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr ""
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -4925,8 +5644,7 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Lynn Allan מנקה 'חודים' ע\"י"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
 msgstr ""
 
@@ -4942,15 +5660,65 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
+#: Menus.cpp:356
+#: Menus.cpp:556
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "&סטריאו למונו"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr " מיישם &סטריאו למונו"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:65
 #, fuzzy, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
-msgstr ""
-"%s %s יושם אפקט: ייצור גל\n"
+msgstr "%s %s יושם אפקט: ייצור גל\n"
 "%.2f Hz -תדר\n"
 "%.2f -עוצמה\n"
 "%.6lf  -משך בשניות"
@@ -4993,28 +5761,25 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr "(Hz) תדר"
 
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-#: toolbars/SelectionBar.cpp:155
-#: toolbars/SelectionBar.cpp:253
-msgid "Length"
-msgstr "אורך "
-
 #: effects/ToneGen.cpp:354
 msgid "Waveform:"
 msgstr "צורת הגל:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "התחלה"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "סוף"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5045,10 +5810,6 @@ msgstr ".כל הרצועות חייבות להיות בעלות אותו קצב
 msgid "Truncate Silence"
 msgstr "חתוך שקט"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "Lynn Allan ×¢\"×™"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "אורך השקט המירבי:"
@@ -5090,8 +5851,7 @@ msgstr ":VST פרמטר לתוסף"
 #: effects/Wahwah.cpp:61
 #, c-format
 msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"%s : יושם אפקט\n"
+msgstr "%s : יושם אפקט\n"
 "%.1f Hz -תדר\n"
 "%.0f - פאזת התחלה במעלות\n"
 "%.0f%% -עומק\n"
@@ -5102,10 +5862,6 @@ msgstr ""
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Nasca Octavian Paul ×¢\"×™ Wahwah"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "(%) עומק:"
@@ -5114,10 +5870,18 @@ msgstr "(%) עומק:"
 msgid "Resonance:"
 msgstr "תהודה:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah הזזת תדר (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5155,6 +5919,18 @@ msgstr "ערכי האפקטים"
 msgid "Length (seconds)"
 msgstr "(אורך (שניות"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "...מיישם אפקט נייקוויסט"
@@ -5222,10 +5998,12 @@ msgstr "הגדרות התוספים"
 msgid "Program"
 msgstr "תוכנית"
 
-#: export/Export.cpp:401
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -5242,14 +6020,12 @@ msgstr "האם אתה בטוח שאתה רוצה לשמור את הקובץ בת
 
 #: export/Export.cpp:495
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-".%s את הקובץ %s הינך מתעתד לשמור תחת השם.\n"
+msgstr ".%s את הקובץ %s הינך מתעתד לשמור תחת השם.\n"
 "\n"
 ".ומספר תוכנות לא יוכלו לפתוח קבצים בעלי סיומת לא סטנדרטית ,%s-בדרך כלל קבצים אלו מסתימים ב\n"
 "\n"
@@ -5285,6 +6061,10 @@ msgstr "- שמאל"
 msgid " - Right"
 msgstr "- ימין"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:961
 #: export/Export.cpp:1006
 #, c-format
@@ -5322,10 +6102,6 @@ msgstr "(תוכנה חיצונית)"
 msgid "Cannot export audio to %s"
 msgstr "%s לא יכול ליצא שמע אל"
 
-#: export/ExportCL.cpp:320
-msgid "Export"
-msgstr "ייצא"
-
 #: export/ExportCL.cpp:322
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "מייצא את כל השמע הנבחר תוך שימוש במקודד פקודת השורה"
@@ -5338,6 +6114,477 @@ msgstr "מייצא את כל הפרויקט תוך שימוש במקודד פק
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1919
+msgid "Invalid sample rate"
+msgstr "קצב לא חוקי"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1938
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1961
+msgid "Sample Rates"
+msgstr "קצבי דגימה"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "קצב הביטים:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "פורמט:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:110
+msgid "Language:"
+msgstr "שפת ממשק:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "איכות:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML קבצי (*.xml)|*.xml|כל הקבצים (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -5410,10 +6657,6 @@ msgstr "FLAC מייצא את חלק השמע הנבחר בתור"
 msgid "Exporting the entire project as FLAC"
 msgstr "FLAC מייצא את כל הפרויקט בתור"
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -5422,10 +6665,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr "MP2 הגדרות ייצוא"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "קצב הביטים:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "MP2 קובץ "
@@ -5434,10 +6673,6 @@ msgstr "MP2 קובץ "
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "בקצב דגימה זה ובקצב ביטים זה MP2 לא יכול לייצא ל"
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr "MP2 לקובץ ID3 ערוךאת תגי"
-
 #: export/ExportMP2.cpp:243
 #: export/ExportMP3.cpp:1769
 #: export/ExportOGG.cpp:183
@@ -5517,6 +6752,11 @@ msgstr "מיצוע"
 msgid "Constant"
 msgstr "קבוע"
 
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "איכות"
+
 #: export/ExportMP3.cpp:379
 msgid "Variable Speed:"
 msgstr "קצב משתנה:"
@@ -5542,35 +6782,15 @@ msgstr "Lame אתר את "
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "MP3 ליצירת %s זקוק לקובץ  Audacity"
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "...עיין"
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "...הורד"
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "?%s היכן "
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1093
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5580,8 +6800,9 @@ msgstr "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dl
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: export/ExportMP3.cpp:1565
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 
 #: export/ExportMP3.cpp:1648
@@ -5600,10 +6821,6 @@ msgstr "!ללא חוקית או לא נתמכתMP3 ספריית קידוד "
 msgid "Unable to initialize MP3 stream"
 msgstr "MP3 לא יכול לאתחל זרם "
 
-#: export/ExportMP3.cpp:1762
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "MP3 לקובץ ID3 ערוךאת תגי"
-
 #: export/ExportMP3.cpp:1800
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5639,36 +6856,22 @@ msgstr "מייצא את כל הפרויקט בתור MP3"
 msgid "Error %d returned from MP3 encoder"
 msgstr "MP3 חזרה ממקודד  %d שגיאת "
 
-#: export/ExportMP3.cpp:1919
-msgid "Invalid sample rate"
-msgstr "קצב לא חוקי"
-
 #: export/ExportMP3.cpp:1932
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr ""
 
 #: export/ExportMP3.cpp:1935
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1938
-msgid "You may resample to one of the rates below."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: export/ExportMP3.cpp:1961
-msgid "Sample Rates"
-msgstr "קצבי דגימה"
-
-#: export/ExportMP3.cpp:2109
-msgid "MP3 exporting plugin not found"
-msgstr "לא נמצא MPתוסף ייצוא ל3"
-
 #: export/ExportMultiple.cpp:88
 #: export/ExportMultiple.cpp:362
 #: export/ExportMultiple.cpp:609
@@ -5677,13 +6880,11 @@ msgid "Export Multiple"
 msgstr "יצא לכמה פורמטים"
 
 #: export/ExportMultiple.cpp:152
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"אם יש לך יותר מרצועת שמע אחת, יש באפשרותך לייצא כל רצועה לקובץ נפרד\n"
+msgstr "אם יש לך יותר מרצועת שמע אחת, יש באפשרותך לייצא כל רצועה לקובץ נפרד\n"
 ".ליצא לקובץ נפרד כל תוית (Label Track) או במידה ויש לך תויות לרצועות\n"
 "\n"
 ".פרויקט זה אינו מכיל מספר רצועות או תוויות לרצועות ולכן אינך יכול לייצא לקבצים מרובים"
@@ -5729,6 +6930,10 @@ msgstr "שים שמע לפני תוית ראשונה"
 msgid "First file name:"
 msgstr "שם קובץ ראשון:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:246
 msgid "Tracks"
 msgstr "רצועות"
@@ -5749,14 +6954,14 @@ msgstr "מיספור עוקב"
 msgid "File name prefix:"
 msgstr ":סיומת שם הקובץ"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:294
 msgid "Overwrite existing files"
 msgstr ".דרוך על קבצים קיימים"
 
-#: export/ExportMultiple.cpp:300
-msgid "E&xport"
-msgstr "י&צא"
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5766,18 +6971,17 @@ msgstr "נוצר בהצלחה \"%s\""
 msgid "Choose a location to save the exported files"
 msgstr "בחר מיקום עבור קבצים מיוצאים"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr "ערוך תגי מטא-מידע"
-
 #: export/ExportMultiple.cpp:480
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:606
 #: export/ExportMultiple.cpp:714
 #, fuzzy, c-format
@@ -5790,6 +6994,12 @@ msgstr ".קבצים %d יוצאו בהצלחה "
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5798,10 +7008,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg Vorbis הגדרות ייצוא"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "איכות:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis קבצי "
@@ -5814,22 +7020,14 @@ msgstr "מייצא את חלק השמע הנבחר בתור Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "מייצא את כל הפרויקט בתור Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr "הגדרת ייצוא לא דחוס"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "פורמט:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "כותרת:"
@@ -5842,13 +7040,23 @@ msgstr ":קידוד"
 #: export/ExportPCM.cpp:190
 #, fuzzy
 msgid "(Not all combinations of headers and encodings are possible.)"
-msgstr ""
-"לא כל הקומבינציות של כותרות )\n"
+msgstr "לא כל הקומבינציות של כותרות )\n"
 ".(וקידודים אפשריים"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: export/ExportPCM.cpp:361
@@ -5871,8 +7079,36 @@ msgstr "מייצא את כל הפרויקט בתור קובץ %s"
 msgid "Error (file may not have been written): %s"
 msgstr "%s :(שגיאה (ייתכן והקובץ לא נשמר"
 
-#: export/ExportPCM.cpp:463
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "MP3 קבצי"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: import/Import.cpp:154
@@ -5880,54 +7116,55 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "This version of Audacity was not compiled with %s support."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-".CD הינה רצועת שמע מ \"%s\" \n"
+msgstr ".CD הינה רצועת שמע מ \"%s\" \n"
 ".CD אינה יכולה לפתוח ספריית Audacity \n"
 "לפורמט שמע CD את רצועות ה (RIP) הפשט \n"
 ".WAV או AIFF שהתוכנה יכולה לייבא, כמו "
 
 #: import/Import.cpp:173
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
 
 #: import/Import.cpp:178
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-".הינו קובץ שמע של חלונות \"%s\" \n"
+msgstr ".הינו קובץ שמע של חלונות \"%s\" \n"
 ". אינה יכולה לפתוח קובץ זה כתוצאה ממגבלות פטנטים Audacity\n"
 ".WAV או AIFF יש להמירו לפורמט שמע שנתמך ע\"י התוכנה , כמו "
 
 #: import/Import.cpp:183
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-".הינו קובץ שמע בקידוד מתקדם \"%s\" \n"
+msgstr ".הינו קובץ שמע בקידוד מתקדם \"%s\" \n"
 ". אינה יכולה לפתוח קובץ זה Audacity\n"
 ".WAV או AIFF יש להמירו לפורמט שמע שנתמך ע\"י התוכנה , כמו "
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5935,31 +7172,78 @@ msgstr ""
 
 #: import/Import.cpp:193
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-".RealPlayer הינו קובץ שמע של \"%s\" \n"
+msgstr ".RealPlayer הינו קובץ שמע של \"%s\" \n"
 ".אינה יכולה לפתוח קובץ זה Audacity\n"
 ".WAV או AIFF יש להמירו לפורמט שמע שנתמך ע\"י התוכנה , כמו "
 
-#: import/Import.cpp:216
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
 msgstr ""
 
-#: import/Import.cpp:232
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-".התוכנה לא זיהתה את סוג הקובץ הזה\n"
-"\"אם הוא לא דחוס, נסה לייבא אותו ע\"י \"ייבוא גולמי"
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5997,17 +7281,18 @@ msgstr ".באופן עצמאי, אלא רק קבצי שמע MIDI לא ניתן 
 msgid "Invalid track offset in LOF file."
 msgstr ".LOF הזז רצועה לא חוקית בקובץ"
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr ".שגיאה בניתוח קובץ אלגרו"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr ".MIDI שגיאה בניתוח קובץ"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "MP3 קבצי"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6033,15 +7318,24 @@ msgstr "לא חוקית Vorbis bitstream כותרת"
 msgid "Internal logic fault"
 msgstr "שגיאה לוגית פנימית"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "...%s מייבא קובץ"
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime קבצי "
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "ייבא נתונים גולמיים"
@@ -6083,6 +7377,14 @@ msgstr "2 ערוצים (סטריאו)"
 msgid "%d Channels"
 msgstr "%d ערוצים"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "היסט התחלתי:"
@@ -6095,9 +7397,18 @@ msgstr "כמות לייבא:"
 msgid "Sample rate:"
 msgstr ":קצב דגימה"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&ייבוא"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6142,9 +7453,9 @@ msgstr "ערוצים"
 msgid "Playthrough"
 msgstr "נגן דרך"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&נגן רצועה אחרת בזמן הקלטת רצועה חדשה"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6155,9 +7466,13 @@ msgstr "(נגינה תוך-כדי ע\"י חומרה (השמע רצועה חדש
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "(ניגון עצמי בתוכנה (נגן רצועה חדשה בזמן ההקלטה שלה"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "(\"stereo mix\" ניגון עצמי בתוכנה: נגן רצועה חדשה בזמן ההקלטה שלה. (לא זמין כאשר מקליטים "
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6184,14 +7499,12 @@ msgid "Latency"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
 msgstr ""
 
@@ -6221,23 +7534,10 @@ msgstr "התנהגויות"
 msgid "&Don't apply effects in batch mode"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
 #: prefs/BatchPrefs.cpp:85
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:89
-#: prefs/GUIPrefs.cpp:95
-msgid "Show / Hide"
-msgstr "הצג / הסתר"
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr "ה&צג עורך מטא-מידע לפני פעולת ייצוא"
-
 #: prefs/DirectoriesPrefs.cpp:55
 #: prefs/DirectoriesPrefs.cpp:56
 #: prefs/PrefsDialog.cpp:279
@@ -6277,7 +7577,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
@@ -6302,22 +7602,65 @@ msgstr " אינה ברת כתיבה %s ספריה"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "שינויים לספרייה הזמנית לא יכנסו לתוקף עד שהתוכנה תאותחל"
 
-#: prefs/FileFormatPrefs.cpp:47
-#: prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
-msgstr "קבצי שמע"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:105
+msgid "MP3 Library Version:"
+msgstr "MP3 גרסת ספריית:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
-msgstr "כאשר מייבאים קבצי שמע לא דחוס לתוכנה"
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:79
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "&(שמור עותק של הקובץ לפני העריכה (בטוח יותר"
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:80
-msgid "&Read directly from the original file (faster)"
-msgstr "&(קרא ישירות מהקובץ המקורי (מהיר יותר"
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:84
 msgid "When saving a project that depends on other audio files"
@@ -6347,53 +7690,49 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:102
-msgid "MP3 Export Library Location"
-msgstr ""
-
-#: prefs/FileFormatPrefs.cpp:105
-msgid "MP3 Library Version:"
-msgstr "MP3 גרסת ספריית:"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
+msgstr "ה&צג עורך מטא-מידע לפני פעולת ייצוא"
 
-#: prefs/FileFormatPrefs.cpp:111
-msgid "&Find Library"
-msgstr "&מצא ספריה"
+#: prefs/GUIPrefs.cpp:33
+#: prefs/GUIPrefs.cpp:34
+msgid "Interface"
+msgstr "ממשק"
 
-#: prefs/FileFormatPrefs.cpp:113
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:118
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialogue."
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:33
-#: prefs/GUIPrefs.cpp:34
-msgid "Interface"
-msgstr "ממשק"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:75
 msgid "&Update display while playing"
 msgstr "&עדכן תצוגה בזמן השמעה"
 
-#: prefs/GUIPrefs.cpp:77
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:79
 msgid "Enable &dragging of left and right selection edges"
 msgstr "אפשר ג&רירה של השוליים הימני והשמאלי של הקטע הנבחר"
 
-#: prefs/GUIPrefs.cpp:81
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&I/O -אפשר סדר ארגונומי של כפתורי ה "
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:83
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:85
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:87
@@ -6408,6 +7747,11 @@ msgstr "ב&חר כל השמע בפרויקט, אם אינו בחור"
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:89
+#: prefs/GUIPrefs.cpp:95
+msgid "Show / Hide"
+msgstr "הצג / הסתר"
+
 #: prefs/GUIPrefs.cpp:97
 msgid "Enable cut &lines"
 msgstr "&אפשר חיתוך וקווים"
@@ -6416,25 +7760,25 @@ msgstr "&אפשר חיתוך וקווים"
 msgid "Show warnings about &temp files"
 msgstr "הצג הזהרות בנוגע ל&קבצים זמניים"
 
-#: prefs/GUIPrefs.cpp:101
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "הצג הודעת פתיחה בהתחלת התוכנית"
 
-#: prefs/GUIPrefs.cpp:108
-#, fuzzy
-msgid "Language"
-msgstr "שפה"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:110
-msgid "Language:"
-msgstr "שפת ממשק:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:113
-msgid "Display range minimum for 'Waveform (dB)' view"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:116
@@ -6445,6 +7789,10 @@ msgstr "-36 dB (תחום רדוד עבור עריכת עוצמות גבוהות)
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM תחום דגימה של 8 סיביות)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:118
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM תחום דגימה של 16 סיביות)"
@@ -6461,24 +7809,16 @@ msgstr "-145 dB (PCM תחום דגימה של 24 סיביות)"
 msgid "Default View Mode"
 msgstr "ברירת המחדל של צורת התצוגה"
 
-#: prefs/GUIPrefs.cpp:129
-msgid "WaveformDisplay"
-msgstr "הצגת צורת הגל"
-
-#: prefs/GUIPrefs.cpp:130
-msgid "WaveformDBDisplay"
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:131
-msgid "SpectrumDisplay"
-msgstr "תצוגת ספקטרום"
-
-#: prefs/GUIPrefs.cpp:133
-msgid "SpectrumLogDisplay"
-msgstr "תצוגת ספקטרום לוגריתמית"
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:135
-msgid "PitchDisplay"
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
 msgstr ""
 
 #: prefs/KeyConfigPrefs.cpp:64
@@ -6486,6 +7826,14 @@ msgstr ""
 msgid "Keyboard"
 msgstr "לוח מקשים"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "קישור מקשים"
@@ -6519,18 +7867,13 @@ msgstr "שגיאה בשמירת קיצורי המקשים"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "...שמכיל את קיצורי המקשים עבור התוכנה XML בחר קובץ"
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML קבצי (*.xml)|*.xml|כל הקבצים (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "שגיאה בטעינת קיצורי המקשים"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
 msgstr ""
@@ -6540,6 +7883,42 @@ msgstr ""
 msgid "Undo"
 msgstr "ביטול-ביצוע"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&נגן רצועה אחרת בזמן הקלטת רצועה חדשה"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -6783,11 +8162,6 @@ msgstr "זום פנימה או החוצה"
 msgid "Audacity Preferences"
 msgstr "Audacity העדפות של"
 
-#: prefs/QualityPrefs.cpp:42
-#: prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "איכות"
-
 #: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "מרובע"
@@ -6853,14 +8227,13 @@ msgstr "איכות גבוהה:"
 msgid "Smart Recording"
 msgstr "מקליט חכם"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "עצור הקלטה בזמן שקט"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "(dB) רמת שקט:"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -6998,8 +8371,7 @@ msgid "Info"
 msgstr "אינפורמציה"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7015,32 +8387,25 @@ msgid ""
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "cerv"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "הפסק"
@@ -7049,9 +8414,9 @@ msgstr "הפסק"
 msgid "Play"
 msgstr "נגן "
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "(לניגון בלולאה shift) נגן  "
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7065,6 +8430,10 @@ msgstr "דלג להתחלה"
 msgid "Skip to End"
 msgstr "דלג לסוף"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr ""
@@ -7101,6 +8470,10 @@ msgid "Silence selection"
 msgstr "מקטע שקט"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "זום פנימה"
 
@@ -7156,16 +8529,13 @@ msgstr "מד עוצמת היציאה"
 msgid "Input level meter - click to monitor input"
 msgstr "מד עוצמת כניסה - הקש לניטור הכניסה"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "מערבב"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "עוצמת היציאה"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "מוצא-גלילה"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7173,7 +8543,8 @@ msgid "Input Volume"
 msgstr "עוצמת כניסה"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "מבוא-גלילה"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7194,6 +8565,13 @@ msgstr "קצב הפרויקט (Hz):"
 msgid "Selection Start:"
 msgstr "תחילת הקטע הנבחר:"
 
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+#: toolbars/SelectionBar.cpp:155
+#: toolbars/SelectionBar.cpp:253
+msgid "Length"
+msgstr "אורך "
+
 #: toolbars/SelectionBar.cpp:165
 msgid "hidden"
 msgstr "ניסתר"
@@ -7464,6 +8842,22 @@ msgstr "ימינה"
 msgid "Help"
 msgstr "עזרה"
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr "gzrv cthbyrby"
@@ -7515,9 +8909,12 @@ msgstr "סטריאו אנכי"
 msgid "Preferences..."
 msgstr "העדפות..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1065
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
@@ -7535,6 +8932,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr "אנא  בחר מקטע"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1462
 #: widgets/Ruler.cpp:1463
 msgid "Vertical Ruler"
@@ -7547,12 +8960,6 @@ msgstr "סרגל אנכי"
 msgid "01000,01000 seconds"
 msgstr ""
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr ""
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7578,6 +8985,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -7763,7 +9185,7 @@ msgstr "\"%s\" :לא יכול לפתוח קובץ"
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
+msgid "Error: %hs at line %lu"
 msgstr ""
 
 #: xml/XMLFileReader.cpp:79
@@ -7771,154 +9193,3 @@ msgstr ""
 msgid "Could not load file: \"%s\""
 msgstr "\"%s\" :לא יכול לפתוח קובץ"
 
-#~ msgid ""
-#~ "Command-line options supported:\n"
-#~ "  -help (this message)\n"
-#~ "  -test (run self diagnostics)\n"
-#~ "  -blocksize ### (set max disk block size in bytes)\n"
-#~ "\n"
-#~ "In addition, specify the name of an audio file or Audacity project\n"
-#~ "to open it.\n"
-#~ "\n"
-#~ msgstr ""
-#~ ":פקודות שורה נתמכות\n"
-#~ "  -help (הודעה זו)\n"
-#~ "  -test (להרצת בדיקה עצמית)\n"
-#~ "  -blocksize ### (קביעת גודל בלוק מכסימלי בדיסק בבתים)\n"
-#~ "\n"
-#~ "בנוסף, ציין את שם קובץ השמע או הפרוייקט\n"
-#~ ".בכדי לפתוח אותו\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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?"
-#~ msgstr ""
-#~ "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?"
-#~ msgid "Question"
-#~ msgstr "שאלה"
-#~ msgid "Skip"
-#~ msgstr "דלג"
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Recording end:   "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "סיום הקלטה:"
-#~ msgid "          Duration: "
-#~ msgstr "          משך זמן: "
-#~ msgid "ID3v1 (more compatible)"
-#~ msgstr "ID3v1 (תואם יותר)"
-#~ msgid "ID3v2 (more flexible)"
-#~ msgstr "ID3v2 (גמיש יותר)"
-#~ msgid "Format"
-#~ msgstr "פורמט"
-#~ msgid "&Fewer"
-#~ msgstr "&פחות"
-#~ msgid "&More"
-#~ msgstr "&עוד"
-#~ msgid "&Done"
-#~ msgstr "&בוצע"
-#~ msgid "Choose a font for Label Tracks"
-#~ msgstr "(Label Tracks) בחר גופן לתוויות הרצועות "
-
-#, fuzzy
-#~ msgid "Amplitude"
-#~ msgstr "(עוצמה (0-1"
-#~ msgid "Frequency / Hz"
-#~ msgstr "תדר / Hz"
-#~ msgid "16 kbps"
-#~ msgstr "16 kbps"
-#~ msgid "24 kbps"
-#~ msgstr "24 kbps"
-#~ msgid "32 kbps"
-#~ msgstr "32 kbps"
-#~ msgid "40 kbps"
-#~ msgstr "40 kbps"
-#~ msgid "48 kbps"
-#~ msgstr "48 kbps"
-#~ msgid "56 kbps"
-#~ msgstr "56 kbps"
-#~ msgid "64 kbps"
-#~ msgstr "64 kbps"
-#~ msgid "80 kbps"
-#~ msgstr "80 kbps"
-#~ msgid "96 kbps"
-#~ msgstr "96 kbps"
-#~ msgid "112 kbps"
-#~ msgstr "112 kbps"
-#~ msgid "128 kbps"
-#~ msgstr "128 kbps"
-#~ msgid "144 kbps"
-#~ msgstr "144 kbps"
-#~ msgid "160 kbps"
-#~ msgstr "160 kbps"
-#~ msgid "192 kbps"
-#~ msgstr "192 kbps"
-#~ msgid "224 kbps"
-#~ msgstr "224 kbps"
-#~ msgid "256 kbps"
-#~ msgstr "256 kbps"
-#~ msgid "320 kbps"
-#~ msgstr "320 kbps"
-#~ msgid "0, 220-260 kbps (Best Quality)"
-#~ msgstr "0, 220-260 kbps (איכות טובה ביותר)"
-#~ msgid "1, 200-250 kbps"
-#~ msgstr "1, 200-250 kbps"
-#~ msgid "2, 170-210 kbps"
-#~ msgstr "2, 170-210 kbps"
-#~ msgid "3, 155-195 kbps"
-#~ msgstr "3, 155-195 kbps"
-#~ msgid "4, 145-185 kbps"
-#~ msgstr "4, 145-185 kbps"
-#~ msgid "5, 110-150 kbps"
-#~ msgstr "5, 110-150 kbps"
-#~ msgid "6, 95-135 kbps"
-#~ msgstr "6, 95-135 kbps"
-#~ msgid "7, 80-120 kbps"
-#~ msgstr "7, 80-120 kbps"
-#~ msgid "8, 65-105 kbps"
-#~ msgstr "8, 65-105 kbps"
-#~ msgid "8000"
-#~ msgstr "8000"
-#~ msgid "11025"
-#~ msgstr "11025"
-#~ msgid "12000"
-#~ msgstr "12000"
-#~ msgid "16000"
-#~ msgstr "16000"
-#~ msgid "22050"
-#~ msgstr "22050"
-#~ msgid "24000"
-#~ msgstr "24000"
-#~ msgid "32000"
-#~ msgstr "32000"
-#~ msgid "44100"
-#~ msgstr "44100"
-#~ msgid "48000"
-#~ msgstr "48000"
-#~ msgid "Exporting the selected audio as a %s file"
-#~ msgstr "מייצא את חלק השמע הנבחר בתור קובץ %s"
-#~ msgid "Exporting the entire project as a %s file"
-#~ msgstr "מייצא את כל הפרויקט בתור קובץ %s"
-#~ msgid "&Normalize on load"
-#~ msgstr "&נרמל בזמן טעינה"
-#~ msgid "S&how MP3-ID3 Dialog"
-#~ msgstr "MP3-ID3 הצג דיאלוג "
-#~ msgid "&Autoscroll while playing"
-#~ msgstr "&גלילה אוטומטית בזמן השמעה"
-#~ msgid "Al&ways allow pausing"
-#~ msgstr "&תמיד אפשר הפסקה"
-#~ msgid "Alwa&ys allow playing"
-#~ msgstr "&תמיד אפשר השמעה"
-#~ msgid "&Quit Audacity upon closing last window"
-#~ msgstr "&צא המתוכנה עם סגירת החלון האחרון"
-#~ msgid "Minimum of dB mode display range"
-#~ msgstr " DB תחום תצוגה של מינימום"
-
diff --git a/locale/hu.po b/locale/hu.po
index b96db36..687458b 100644
--- a/locale/hu.po
+++ b/locale/hu.po
@@ -4,49 +4,37 @@
 # Audacity Team <audacity-translation at lists.sourceforge.net>, 2008.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity 1.3.5\n"
+msgstr "Project-Id-Version: Audacity 1.3.6\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-04-28 22:24+0100\n"
-"PO-Revision-Date: 2008-09-11 13:28+0200\n"
+"POT-Creation-Date: 2008-11-03 21:55+0000\n"
+"PO-Revision-Date: 2008-12-02 20:30+0100\n"
 "Last-Translator: Pelladi Gabor <audacity-translation at lists.sourceforge.net>\n"
 "Language-Team: HU <hu at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: AboutDialog.cpp:142 AudacityApp.cpp:749 Menus.cpp:745
+#: AboutDialog.cpp:143 AudacityApp.cpp:807 Menus.cpp:955
 msgid "&About Audacity..."
 msgstr "Az &Audacityről bővebben..."
 
-#: AboutDialog.cpp:156
+#: AboutDialog.cpp:157
 msgid "OK... Audacious!"
 msgstr "OK... Audasztikus!"
 
 #: AboutDialog.cpp:175
-msgid ""
-"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."
-msgstr "Az Audacity egy ingyenes program, képzett fejlesztők munkája, akik szerte a világon dolgoznak a fejlesztésén. Eredményes együttműködésük a SourceForge.net-nek, egy ingyenes és nyilt forráskódú programok készítését támogató online-szolgáltatásnak köszönhető. Az Audacity futtatható Windows 98-on és az újabb változatokon, Mac OS X-en, Linuxon, és más, Unix-on alapuló operációs rendszereken. Az Audacity régebbi verziói Mac OS 9-en is futtathatóak."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Az Audacity egy ingyenes program, képzett <a href=\"http://audacity.sourceforge.net/community/developers\">fejlesztők</a> munkája, akik szerte a világon dolgoznak a fejlesztésén. Eredményes együttműködésük a <a href=\"http://sourceforge.net\">SourceForge.net</a>-nek, egy ingyenes és nyilt forráskódú programok készítését támogató online-szolgáltatásnak köszönhető. Az Audacity futtatható Windows 98-on és az újabb változatokon, Mac OS X-en, Linuxon, és más, Unix-on alapuló operációs rendszereken. Az Audacity régebbi verziói Mac OS 9-en is futtathatóak."
 
 #: AboutDialog.cpp:179
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
-msgstr "Ez a programnak egy béta verziója. Tartalmazhat hibákat és elkészületlenfunkciókat. Számítunk a visszajelzésedre, ezért kérünk, látogass el honlapunkra, aholjelentheted az észlelt hibákat és a kívánt változtatásokat."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Ez a programnak egy béta verziója. Tartalmazhat hibákat és elkészületlen funkciókat. Számítunk a visszajelzésére, ezért kérjük, jelezze az észlelt hibákat és a kívánt változtatásokat a <b>feedback at audacityteam.org</b> címen. Az Audacity használstához a <a href=\"http://audacityteam.org/forum/\">Fórumban</a> találhat segítséget."
 
 #: AboutDialog.cpp:182
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
-msgstr "Ez egy stabil, befejezett verziója az Audacity-nek. Amennyiben mégis találnál egy hibát vagy javaslatod van, kérünk lépj kapcsolatba velünk. Számítunk a felhasználók visszajelzéseire ahhoz, hogy az Audacity egyre jobb lehessen. Bővebb információért kérünk, látogass el honlapunkra."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Ez egy stabil, befejezett verziója az Audacity-nek. Amennyiben mégis hibát találna vagy javaslata van, kérünk írjon a <b>feedback at audacityteam.org</b> címre. Az Audacity használstához a <a href=\"http://audacityteam.org/forum/\">Fórumban</a> találhat segítséget."
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -59,8 +47,8 @@ msgid "translator_credits"
 msgstr "A magyar fordítást Márton Balázs (documan at mailbox.hu) és Pelládi Gábor (pelladigabor at gmail.com) készítették."
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Egy ingyenes digitális audió-szerkesztő"
+msgid "A Free Digital Audio Editor<br>"
+msgstr "Egy ingyenes digitális audió-szerkesztő<br>"
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -96,236 +84,227 @@ msgstr "Az Audacity a következő projektek kódján alapszik:"
 msgid "Special thanks:"
 msgstr "Külön köszönet:"
 
-#: AboutDialog.cpp:254
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
 msgstr "Audacity"
 
 #. i18n-hint: Information about when audacity was compiled
-#: AboutDialog.cpp:299 AboutDialog.cpp:312 AboutDialog.cpp:468
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
 msgid "Build Information"
 msgstr "Fordítási információ"
 
-#: AboutDialog.cpp:305 effects/AvcCompressor.cpp:674
+#: AboutDialog.cpp:310 effects/AvcCompressor.cpp:674
 msgid "Enabled"
 msgstr "Engedélyezett"
 
-#: AboutDialog.cpp:306
+#: AboutDialog.cpp:311
 msgid "Disabled"
 msgstr "Letiltott"
 
-#: AboutDialog.cpp:316
+#: AboutDialog.cpp:321
 msgid "File Format Support"
 msgstr "Fájl formátum támogatás"
 
 #. i18n-hint: This is what the library (libmad) does - imports MP3 files
-#: AboutDialog.cpp:326 AboutDialog.cpp:328
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
 msgid "MP3 Importing"
 msgstr "MP3 importálás"
 
-#: AboutDialog.cpp:335 AboutDialog.cpp:338
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
 msgid "Ogg Vorbis Import and Export"
 msgstr "Ogg Vorbis importálás és exportálás"
 
-#: AboutDialog.cpp:342 AboutDialog.cpp:345
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
 msgid "ID3 tag support"
 msgstr "ID3 tag támogatás"
 
-#: AboutDialog.cpp:352 AboutDialog.cpp:355
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
 msgid "FLAC import and export"
 msgstr "FLAC importálás és exportálás"
 
-#: AboutDialog.cpp:360 AboutDialog.cpp:363
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
 msgid "MP2 export"
 msgstr "MP2 exportálás"
 
-#: AboutDialog.cpp:368 AboutDialog.cpp:371
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
 msgid "Import via QuickTime"
 msgstr "Importálás QuickTime által"
 
 #. i18n-hint: Libraries that are essential to audacity
-#: AboutDialog.cpp:378
+#: AboutDialog.cpp:383
 msgid "Core Libraries"
 msgstr "Alapvető könyvtárak"
 
-#: AboutDialog.cpp:384 AboutDialog.cpp:387 AboutDialog.cpp:390
-#: AboutDialog.cpp:392
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
 msgid "Sample rate conversion"
 msgstr "Mintavételi ráta konverzió"
 
-#: AboutDialog.cpp:397 AboutDialog.cpp:400
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
 msgid "Audio playback and recording"
 msgstr "Hang lejátszás és felvétel"
 
-#: AboutDialog.cpp:413
+#: AboutDialog.cpp:418
 msgid "Features"
 msgstr "Képességek"
 
-#: AboutDialog.cpp:417 AboutDialog.cpp:420 AboutDialog.cpp:425
-#: AboutDialog.cpp:428 AboutDialog.cpp:433 AboutDialog.cpp:436
-#: AboutDialog.cpp:441 AboutDialog.cpp:444
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
 msgid "Plug-in support"
 msgstr "Támogatás bővítményekhez"
 
-#: AboutDialog.cpp:449 AboutDialog.cpp:452
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
 msgid "Sound card mixer support"
 msgstr "Hangkártya keverés támogatás"
 
-#: AboutDialog.cpp:457 AboutDialog.cpp:460
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
 msgid "Pitch and Tempo Change support"
 msgstr "Hangmagasság és tempó változtatási támogatás"
 
-#: AboutDialog.cpp:472
+#: AboutDialog.cpp:477
 msgid "Program build date: "
 msgstr "Program készítésének dátuma: "
 
-#: AboutDialog.cpp:475 AboutDialog.cpp:477
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
 msgid "Build type:"
-msgstr ""
+msgstr "Fordítás típusa:"
 
-#: AboutDialog.cpp:475
+#: AboutDialog.cpp:480
 msgid "Debug build"
-msgstr ""
+msgstr "Hibakeresési változat"
 
-#: AboutDialog.cpp:477
+#: AboutDialog.cpp:482
 msgid "Release build"
-msgstr ""
+msgstr "Kiadási változat"
 
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
-#: AboutDialog.cpp:482
+#: AboutDialog.cpp:487
 msgid "Installation Prefix: "
-msgstr ""
+msgstr "Telepítési előtag: "
 
-#: AboutDialog.cpp:486
+#: AboutDialog.cpp:491
 msgid "Settings folder: "
 msgstr "Beállítások könyvtára: "
 
-#: AboutDialog.cpp:501
+#: AboutDialog.cpp:506
 msgid "GPL License"
 msgstr "GPL licensz"
 
-#: AudacityApp.cpp:468 Project.cpp:1761
+#: AudacityApp.cpp:507 Project.cpp:1844
 #, c-format
 msgid "%s is already open in another window."
 msgstr "Ez a fájl ('%s') már meg van nyitva egy másik ablakban."
 
-#: AudacityApp.cpp:470 Project.cpp:1763 Project.cpp:1868 Project.cpp:2012
-#: Project.cpp:2114
+#: AudacityApp.cpp:509 Project.cpp:1846 Project.cpp:1951 Project.cpp:2095
+#: Project.cpp:2232
 msgid "Error opening project"
 msgstr "Hiba a projekt megnyitásakor"
 
-#: AudacityApp.cpp:502
+#: AudacityApp.cpp:541
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s már nem létezik és nem lehet megnyitni.\n"
+msgstr "%s már nem létezik és nem lehet megnyitni.\n"
 "\n"
 "Mostantól el lett távolítva az előzmények listájáról."
 
-#: AudacityApp.cpp:581
+#: AudacityApp.cpp:643
 msgid "Master Gain Control"
 msgstr "Master Gain szabályzó"
 
-#: AudacityApp.cpp:582
+#: AudacityApp.cpp:644
 msgid "Input Meter"
 msgstr "Bemeneti szint"
 
-#: AudacityApp.cpp:583
+#: AudacityApp.cpp:645
 msgid "Output Meter"
 msgstr "Kimeneti szint"
 
 #. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:751 Menus.cpp:478
+#: AudacityApp.cpp:809
 msgid "&Preferences...\tCtrl+,"
 msgstr "&Beállítások...\tCtrl+,"
 
-#: AudacityApp.cpp:833 AudacityApp.cpp:910
+#: AudacityApp.cpp:901 AudacityApp.cpp:978
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "%ld méretű blokkok használata\n"
 
-#: AudacityApp.cpp:855 AudacityApp.cpp:925
+#: AudacityApp.cpp:923 AudacityApp.cpp:993
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Ismeretlen parancssori opció: %s\n"
 
-#: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+#: AudacityApp.cpp:1127
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Az Audacity nem talált megfelelő helyet, ahol az ideiglenes fájlokat tárolni lehetne.\n"
+msgstr "Az Audacity nem talált megfelelő helyet, ahol az ideiglenes fájlokat tárolni lehetne.\n"
 "Kérlek, hogy határozz meg egy erre szolgáló könyvtárat a Beállítások menüpontban."
 
-#: AudacityApp.cpp:1050
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
+#: AudacityApp.cpp:1133
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
 msgstr "Az Audacity most ki fog lépni. Kérlek, hogy indítsd el újra a programot, hogy az új ideiglenes könyvtárat használhasd."
 
-#: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+#: AudacityApp.cpp:1165
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Az Audacity két példányának egyidejű futtatása adatvesztést, vagy rendszerösszeomlást okozhat.\n"
+msgstr "Az Audacity két példányának egyidejű futtatása adatvesztést, vagy rendszerösszeomlást okozhat.\n"
 "\n"
 
-#: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+#: AudacityApp.cpp:1172
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Az Audacity nem tudta zárolni az ideiglenes fájlok könyvtárát.\n"
+msgstr "Az Audacity nem tudta zárolni az ideiglenes fájlok könyvtárát.\n"
 "Lehet, hogy ezt a könyvtárat az Audacity egy másik példánya használja.\n"
 
-#: AudacityApp.cpp:1091
+#: AudacityApp.cpp:1174
 msgid "Do you still want to start Audacity?"
 msgstr "Mégis el kívánja indítani az Audacity-t?"
 
-#: AudacityApp.cpp:1093
+#: AudacityApp.cpp:1176
 msgid "Error locking temporary folder"
 msgstr "Hiba a az ideiglenes könyvtárban"
 
-#: AudacityApp.cpp:1131
+#: AudacityApp.cpp:1214
 msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "A rendszer azt észlelte, hogy az Audacity egy példánya már fut.\n"
 
-#: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+#: AudacityApp.cpp:1216
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Használja az Új vagy a Megnyitás parancsot a már futó Audacity\n"
+msgstr "Használja az Új vagy a Megnyitás parancsot a már futó Audacity\n"
 "folyamatban, hogy egyszerre több projektet nyisson meg.\n"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1217
 msgid "Audacity is already running"
 msgstr "Az Audacity már fut"
 
-#: AudacityApp.cpp:1151
+#: AudacityApp.cpp:1234
 msgid "Command-line options supported:"
 msgstr "Támogatott parancssori opciók:"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1154
+#: AudacityApp.cpp:1237
 msgid "\t-help (this message)"
 msgstr "\t-help (ez a szöveg)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1156
+#: AudacityApp.cpp:1239
 msgid "\t-version (display Audacity version)"
 msgstr "\t-version (az Audacity verziója)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1160
+#: AudacityApp.cpp:1243
 msgid "\t-test (run self diagnostics)"
 msgstr "\t-test (öndiagnosztika futtatása)"
 
@@ -333,80 +312,72 @@ msgstr "\t-test (öndiagnosztika futtatása)"
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1165
+#: AudacityApp.cpp:1248
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (a maximális blokkméret bájtokban)"
 
-#: AudacityApp.cpp:1166
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
-msgstr ""
+#: AudacityApp.cpp:1249
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "Továbbá adja meg a hangfájl vagy Audacity projekt nevét, melyet meg szeretne nyitni."
 
-#: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+#: AudacityApp.cpp:1529
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Az Audacity Projekt (.AUP) fájlok jelenleg nincsenek társítva az Audacity-vel. \n"
+msgstr "Az Audacity Projekt (.AUP) fájlok jelenleg nincsenek társítva az Audacity-vel. \n"
 "\n"
 "Szeretnéd társítani ezeket, hogy bárhonnan megnyithatóak legyenek dupla-kattintással?"
 
-#: AudacityApp.cpp:1444
+#: AudacityApp.cpp:1530
 msgid "Audacity Project Files"
 msgstr "Audacity Projekt fájlok"
 
-#: AudioIO.cpp:241
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
 msgstr "Nem található hangeszköz.\n"
 
-#: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+#: AudioIO.cpp:255
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Nem fogsz tudni audiót felvenni és lejátszani.\n"
+msgstr "Nem fogsz tudni audiót felvenni és lejátszani.\n"
 "\n"
 
-#: AudioIO.cpp:245
+#: AudioIO.cpp:258
 msgid "Error: "
 msgstr "Hiba: "
 
-#: AudioIO.cpp:248
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
 msgstr "Hiba az Audió inicializásakor"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr "Késleltetési probléma"
 
-#: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+#: AudioIO.cpp:1375
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
-msgstr ""
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "A késleltetési beállítás miatt a rögzített hang eleje a nulla pont elé került.\n"
+"Az Audacity eltolta, hogy nullánál kezdődjön.\n"
+"Szüksége lehet az Időbeni eltolás eszközre (<---> vagy F5), hogy a sávot a megfelelő helyre igazítsa."
 
 #: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
 msgstr "Automatikus helyreállítás"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Néhány projekt nem lett megfelelően mentve az Audacity legutóbbi futásakor.\n"
+msgstr "Néhány projekt nem lett megfelelően mentve az Audacity legutóbbi futásakor.\n"
 "Szerencsére az alábbi projekteket automatikusan helyre lehet állítani:"
 
 #: AutoRecovery.cpp:75
 msgid "Recoverable projects"
 msgstr "Helyreállítható projektek"
 
-#: AutoRecovery.cpp:78 Tags.cpp:2032
+#: AutoRecovery.cpp:78 Tags.cpp:2041
 msgid "Name"
 msgstr "Név"
 
@@ -427,11 +398,9 @@ msgid "Recover Projects"
 msgstr "Projektek helyreállítása"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Biztosan nem szeretné helyreállítani a projekteket?\n"
+msgstr "Biztosan nem szeretné helyreállítani a projekteket?\n"
 "A helyreállításra később nem lesz lehetőség."
 
 #: AutoRecovery.cpp:128
@@ -440,36 +409,37 @@ msgstr "Megerősíti?"
 
 #: AutoRecovery.cpp:146 AutoRecovery.cpp:183
 msgid "Could not enumerate files in auto save directory"
-msgstr ""
-
-#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2575 Menus.cpp:4514
-#: Project.cpp:1971 Project.cpp:3343 Project.cpp:3422 WaveTrack.cpp:556
-#: WaveTrack.cpp:575 WaveTrack.cpp:1689 effects/Effect.cpp:436
-#: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
-#: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
-#: toolbars/ControlToolBar.cpp:846
+msgstr "Nem sikerült listázni a fájlokat az automatikus mentés könyvtárában"
+
+#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:3047 Menus.cpp:3059
+#: Menus.cpp:5176 Project.cpp:2054 Project.cpp:3615 Project.cpp:3694
+#: TrackPanel.cpp:6385 WaveTrack.cpp:598 WaveTrack.cpp:617 WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077 WaveTrack.cpp:2053 effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233 prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247 toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "Hiba"
 
-#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57 BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr ""
 
-#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:454
+#: BatchCommandDialog.cpp:82 BatchProcessDialog.cpp:454
 #: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
 msgstr ""
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr ""
 
-#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:455
+#: BatchCommandDialog.cpp:91 BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr ""
 
-#: BatchCommandDialog.cpp:94
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr ""
 
@@ -488,12 +458,11 @@ msgstr "A FLAC támogatást az Audacity ezen példánya nem tartalmazza."
 #: BatchCommands.cpp:513
 #, c-format
 msgid "Command %s not implemented yet"
-msgstr ""
+msgstr "A %s parancs még nincs implementálva"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
 msgstr ""
 
@@ -504,8 +473,7 @@ msgstr ""
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
 msgstr ""
@@ -524,9 +492,13 @@ msgstr "%s alkalmazása"
 msgid "Apply Chain"
 msgstr "Lánc alkalmazása"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "CleanSpeech kötegelt feldolgozás"
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
-msgstr ""
+msgstr "&Lánc kiválasztása"
 
 #: BatchProcessDialog.cpp:99
 msgid "Chain"
@@ -534,17 +506,17 @@ msgstr "Lánc"
 
 #: BatchProcessDialog.cpp:106
 msgid "Apply to Current &Project"
-msgstr ""
+msgstr "Alkalmazás az aktuális &projektre"
 
 #: BatchProcessDialog.cpp:107
 msgid "Apply to &Files..."
-msgstr ""
+msgstr "&Alkalmazás fájlokra"
 
-#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2071
-#: Tags.cpp:2075 Tags.cpp:2375 Tags.cpp:2379 UploadDialog.cpp:180
+#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2080
+#: Tags.cpp:2084 Tags.cpp:2384 Tags.cpp:2388 UploadDialog.cpp:180
 #: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:183
-#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:446
-#: effects/audiounits/AudioUnitEffect.cpp:882 effects/vamp/VampEffect.cpp:411
+#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
 msgstr "&Mégse"
 
@@ -561,19 +533,21 @@ msgstr "'%s' alkalmazása az aktuális projekten"
 msgid "Please save and close the current project first."
 msgstr "Kérem, először mentse és zárja be az aktuális projektet."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Fájlok kiválasztása a kötegelt feldolgazáshoz..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr "Hangfájlok (*.wav;*.mp3)|*.wav;*.mp3|WAV fájlok (*.wav)|*.wav|MP3 fájlok (*.mp3)|*.mp3"
+
 #: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
-msgstr ""
-"Minden fájl (*.*)|*.*|WAV fájlok (*.wav)|*.wav|AIFF fájlok (*.aif)|*.aif|AU "
-"fájlok (*.au)|*.au|MP3 fájlok (*.mp3)|*.mp3|Ogg Vorbis fájlok (*.ogg)|*.ogg|"
-"FLAC fájlok (*.flac)|*.flac"
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Minden fájl (*.*)|*.*|WAV fájlok (*.wav)|*.wav|AIFF fájlok (*.aif)|*.aif|AU fájlok (*.au)|*.au|MP3 fájlok (*.mp3)|*.mp3|Ogg Vorbis fájlok (*.ogg)|*.ogg|FLAC fájlok (*.flac)|*.flac"
 
 #: BatchProcessDialog.cpp:231
 msgid "Applying..."
@@ -592,12 +566,12 @@ msgstr "Láncok szerkesztése"
 msgid "&Chains"
 msgstr "&Láncok"
 
-#: BatchProcessDialog.cpp:435 Tags.cpp:815 Tags.cpp:1455 Tags.cpp:2055
+#: BatchProcessDialog.cpp:435 Tags.cpp:826 Tags.cpp:1465 Tags.cpp:2064
 msgid "&Add"
 msgstr "&Hozzáadás"
 
-#: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:816 Tags.cpp:1456
-#: Tags.cpp:2056 TrackPanel.cpp:4201
+#: BatchProcessDialog.cpp:436 LabelDialog.cpp:128 Tags.cpp:827 Tags.cpp:1466
+#: Tags.cpp:2065 TrackPanel.cpp:4176
 msgid "&Remove"
 msgstr "&Eltávolítás"
 
@@ -673,207 +647,190 @@ msgstr "Függőségek törlése"
 msgid "Copying audio data into project..."
 msgstr "Hangadatok másolása a projektbe..."
 
-#: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
+#: Dependencies.cpp:223
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"A projekt jelenleg külső fájlok meglététől függ.\n"
-"Bemásolja az alábbi fájlokban található hanganyagot a projektbe, hogy "
-"az önálló legyen?\n"
+msgstr "A projekt jelenleg külső fájlok meglététől függ.\n"
+"Bemásolja az alábbi fájlokban található hanganyagot a projektbe, hogy az önálló legyen?\n"
 "Ehhez több lemezterületre van szükség, de biztonságosabb."
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
 msgstr "A projekt külső hangfájloktól függ"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
 msgstr "Projekt függőségei"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
 msgstr "Audió fájl"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
 msgstr "Lemezterület"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
 msgstr "A kiválasztott hang projektbe másolása"
 
-#: Dependencies.cpp:304 Dependencies.cpp:410
+#: Dependencies.cpp:308 Dependencies.cpp:414
 msgid "Cancel Save"
 msgstr "Mégse ment"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
 msgstr "Ne másoljon be hangot"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
 msgstr "Minden hang bemásolása a projektbe (biztonságosabb)"
 
-#: Dependencies.cpp:317 Dependencies.cpp:322
+#: Dependencies.cpp:321 Dependencies.cpp:326
 msgid "Ask me"
 msgstr "Kérdezzen rá"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
 msgstr "Mindig minden hang másolása (legbiztonságosabb)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
 msgstr "Sose másoljon semmilyen hangot"
 
-#: Dependencies.cpp:321
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
 msgstr "Ha a projekt külső hangfájloktól függ:"
 
-#: Dependencies.cpp:409
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
-msgstr ""
-"Ha folytatja, a projekt nem lesz lemezre mentve. Ezt szeretné?"
+#: Dependencies.cpp:413
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "Ha folytatja, a projekt nem lesz lemezre mentve. Ezt szeretné?"
 
-#: Dependencies.cpp:449
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
-msgstr ""
-"A projekt önálló, nem függ egyetlen külső hangfájltól sem."
+#: Dependencies.cpp:453
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "A projekt önálló, nem függ egyetlen külső hangfájltól sem."
 
-#: Dependencies.cpp:450
+#: Dependencies.cpp:454
 msgid "Dependency check"
 msgstr "Függőség ellenőrzése"
 
-#: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+#: DirManager.cpp:137
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
 msgstr "FIGYELEM: Ezen a meghajtón nagyon kevés a szabad hely. Kérlek, válassz ki egy másik ideiglenes könyvtárat a Beállítások pont alatt."
 
-#: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
+#: DirManager.cpp:223 DirManager.cpp:254 DirManager.cpp:337
 msgid "Progress"
 msgstr "Folyamat"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
 msgstr "Ideiglenes fájlok törlése"
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "Projekt adatfájlok mentése"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
 msgstr "Gyorsítótár ürítése"
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
 msgstr ""
 
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:985
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-régi%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr "Teszt fájl létrehozása/megnyitása sikertelen"
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr "'%s' törlése sikertelen"
 
-#: DirManager.cpp:1007
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "Átnevezett fájl: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "%s blokk változtatása\n"
-
-#: DirManager.cpp:1051
+#: DirManager.cpp:1160
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "'%s' átnevezése '%s'-re sikertelen"
 
-#: DirManager.cpp:1115 DirManager.cpp:1403
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1224 DirManager.cpp:1515
 msgid "Inspecting project file data..."
 msgstr ""
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr ""
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr ""
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr ""
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
 msgstr ""
 
-#: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
+#: DirManager.cpp:1319
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 msgstr ""
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1331
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr ""
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
 msgstr ""
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr ""
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr ""
 
-#: DirManager.cpp:1228 DirManager.cpp:1263 DirManager.cpp:1309
-#: DirManager.cpp:1351 export/Export.cpp:490 export/Export.cpp:507
-#: export/Export.cpp:526 widgets/Warning.cpp:55
+#: DirManager.cpp:1340 DirManager.cpp:1375 DirManager.cpp:1421
+#: DirManager.cpp:1463 export/Export.cpp:576 export/Export.cpp:597
+#: export/Export.cpp:616 widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "FIGYELEM"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1366
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
@@ -881,38 +838,36 @@ msgid ""
 "and try to restore the missing files by hand."
 msgstr ""
 
-#: DirManager.cpp:1259
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr ""
 
-#: DirManager.cpp:1260 DirManager.cpp:1348
+#: DirManager.cpp:1372 DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr ""
 
-#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
+#: DirManager.cpp:1373 DirManager.cpp:1419 DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr ""
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1412
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
 msgstr ""
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr ""
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
 msgstr ""
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1454
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
@@ -921,27 +876,27 @@ msgid ""
 "missing data by hand."
 msgstr ""
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr ""
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
 msgstr ""
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1558
 msgid "Caching audio"
 msgstr "Hang pufferelése"
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
 msgstr "Hang pufferelése a memóriába..."
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
 msgstr "Rögzített hang mentése"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
 msgstr "Rögzített hang mentése lemezre..."
 
@@ -949,124 +904,217 @@ msgstr "Rögzített hang mentése lemezre..."
 msgid "Rectangular"
 msgstr "Négyszögletű"
 
-#: FreqWindow.cpp:104
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "FFmpeg könyvtár nem található"
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr "FFmpeg megkeresése"
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Az Audacitynek szüksge van a %s fájlra, hogy importálni és exportálni tudjon az FFmpeg segítégével."
+
+#: FFmpeg.cpp:196 export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "%s helye:"
+
+#: FFmpeg.cpp:205 export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "%s megkereséséhez kattintson ide -->"
+
+#: FFmpeg.cpp:211 export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Böngészés..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Az FFmpeg ingyenes letöltéséhez kattintson ide -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235 export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Hol található meg ez: %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "FFmpeg nem található"
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Csak avformat.dll|*avformat*.dll|Dinamikusan linkelt könyvtárak (*.dll)|*.dll|Minden fájl (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "Frekvencia analízis"
 
-#: FreqWindow.cpp:140 TrackPanel.cpp:563
+#: FreqWindow.cpp:139 TrackPanel.cpp:556 prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: FreqWindow.cpp:141
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "Sztenderd autókorreláció"
 
-#: FreqWindow.cpp:142
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "Köbgyök autókorreláció"
 
-#: FreqWindow.cpp:143
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "Fokozott autókorreláció"
 
 #. i18n-hint: This is a technical term, derived from the word
 #. "spectrum".  Do not translate it unless you are sure you
 #. know the correct technical word in your language.
-#: FreqWindow.cpp:147
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "Algoritmus:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "Algoritmus"
 
-#: FreqWindow.cpp:168 HistoryWindow.cpp:79
+#: FreqWindow.cpp:169 FreqWindow.cpp:173 HistoryWindow.cpp:79
 msgid "Size"
 msgstr "Méret"
 
 #. i18n-hint: This refers to a "window function", used in the
 #. Frequency analyze dialog box.
-#: FreqWindow.cpp:181
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr " módszer"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Függvény:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr "Függvény"
 
-#: FreqWindow.cpp:192
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "Lineáris frekvencia"
 
-#: FreqWindow.cpp:193
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "Log. frekvencia"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Tengely:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr "Tengely"
 
-#: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:204 Menus.cpp:233
+#: FreqWindow.cpp:212 LabelDialog.cpp:130 Menus.cpp:241 Menus.cpp:276
 msgid "&Export..."
 msgstr "&Exportálás..."
 
-#: FreqWindow.cpp:209 widgets/ErrorDialog.cpp:159
+#: FreqWindow.cpp:213 export/ExportCL.cpp:325 export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "Exportálás"
+
+#: FreqWindow.cpp:216 FreqWindow.cpp:217 widgets/ErrorDialog.cpp:161
 msgid "Close"
 msgstr "Bezárás"
 
-#: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:489
-#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:791
+#: FreqWindow.cpp:280 FreqWindow.cpp:410 effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:792
 #: effects/Compressor.cpp:352 effects/Compressor.cpp:360
-#: effects/Equalization.cpp:1109 effects/Equalization.cpp:1111
-#: effects/Equalization.cpp:1119 effects/Equalization.cpp:1185
-#: effects/Equalization.cpp:1394 effects/Equalization.cpp:1405
-#: effects/Normalize.cpp:365 widgets/Meter.cpp:380
+#: effects/Equalization.cpp:1123 effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133 effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408 effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367 widgets/Meter.cpp:417
 msgid "dB"
 msgstr "dB"
 
 #. i18n-hint: This is the abbreviation for "Hertz", or
 #. cycles per second.
-#: FreqWindow.cpp:287 FreqWindow.cpp:442 effects/Equalization.cpp:1150
-#: effects/Equalization.cpp:1181 import/ImportRaw.cpp:416
+#: FreqWindow.cpp:295 FreqWindow.cpp:450 effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195 import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Hz"
 
-#: FreqWindow.cpp:386
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
 msgstr "Nincsen elég adat kijelölve."
 
-#: FreqWindow.cpp:450 effects/AutoDuck.cpp:793
+#: FreqWindow.cpp:458 effects/AutoDuck.cpp:794
 msgid "s"
 msgstr "s"
 
-#: FreqWindow.cpp:779
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr "Kurzor: %d Hz (%s) = %d dB    Csúcs: %d Hz (%s) = %.1f dB"
 
-#: FreqWindow.cpp:788
+#: FreqWindow.cpp:796
 #, c-format
 msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
 msgstr "Kurzor: %.4f sec (%d Hz) (%s) = %f,    Csúcs: %.4f sec (%d Hz) (%s) = %.3f"
 
-#: FreqWindow.cpp:1061
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "spektrum.txt"
 
-#: FreqWindow.cpp:1063
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "Spektrális adat exportálása, mint:"
 
-#: FreqWindow.cpp:1079 LabelDialog.cpp:599 Menus.cpp:2207 Project.cpp:2441
-#: Project.cpp:3395 prefs/KeyConfigPrefs.cpp:180
+#: FreqWindow.cpp:1087 LabelDialog.cpp:603 Menus.cpp:2549 Project.cpp:2604
+#: Project.cpp:3667 prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
 msgstr "Nem lehet írni a fájlt: "
 
-#: FreqWindow.cpp:1084
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
 msgstr "Frekvencia (Hz)\tSzint (dB)"
 
-#: FreqWindow.cpp:1090
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Lag (másodperc)\tFrekvencia (Hz)\tSzint"
 
@@ -1131,212 +1179,56 @@ msgid "Welcome to Audacity "
 msgstr "Üdvözli az Audacity "
 
 #: HelpText.cpp:151
-msgid ""
-"Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|"
-"record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or "
-"open an Audacity project]] <li>[[export|export]] to an MP3 or other audio "
-"file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
 #: HelpText.cpp:159
-msgid ""
-"This screen can be viewed at any time by clicking the <i>Help</i> menu, then "
-"<i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus "
-"and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a "
-"href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf"
-"\">full Manual</a> in PDF format.</p>"
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
 #: HelpText.cpp:172
-msgid ""
-"<p><b>Opening audio files:</b> Either drag the files into the current "
-"project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be "
-"opened into a new project window with <i>File &gt; Open</i>. The main "
-"formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), "
-"<b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if "
-"your file is in some other format. <b>To import a CD:</b> extract it to WAV "
-"or AIFF using iTunes, Windows Media Player 11 or similar. See our online "
-"guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:"
-"</b> Press the green Play button to start playback. Press the blue Pause "
-"button once to pause playback, and again to resume. To stop, press the "
-"yellow Stop button. Spacebar can be used to either play or stop. After "
-"stopping, playback resumes from its last starting point. To change the "
-"starting point, click in the track at your desired starting point. The <b>|"
-"&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start "
-"or end of the track respectively. </p><br><br>"
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
 #: HelpText.cpp:194
-msgid ""
-"<p><b>To record:</b> Set the recording device and input source, adjust the "
-"input level, then press the red Record button.</b></p><p> 1) [[inputdevice|"
-"Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or "
-"in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo "
-"recording if required.<br> 2) [[inputsource|Set input source]] for that "
-"device (for example, microphone or line-in) in the dropdown selector of the "
-"<i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the "
-"<i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) "
-"[[inputlevel|Adjust input level]] using the right-hand slider on the "
-"<i>Mixer Toolbar</i>. Correct adjustment of level before recording is "
-"essential to avoid noise or distortion. </p><p> More help at: \"Recording\" "
-"<a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial "
-"<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-"
-"_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://"
-"www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our "
-"Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:"
-"Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
 #: HelpText.cpp:221
-msgid ""
-"<p>The input device is the actual physical sound device you are recording "
-"from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of "
-"Preferences</i>, On Windows and Linux, Preferences are at the bottom of the "
-"<i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also "
-"conveniently select Recording Device in the <i>Device Toolbar</i>, which can "
-"be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity "
-"uses the device currently being used by the system, (usually your inbuilt "
-"sound device), so it is often not necessary to change the input device. On "
-"Windows, this current system device can be selected as \"Microsoft Sound "
-"Mapper\". If you are recording from an external USB or Firewire device such "
-"as a USB turntable, select it explicitly by name as recording device after "
-"conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
 #: HelpText.cpp:244
-msgid ""
-"<p>Select the input source (such as microphone or line-in) for your "
-"[[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and "
-"<b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</"
-"i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the "
-"<i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source "
-"will be shown as part of the parent device (for example, <i>High Def Audio "
-"Card: Microphone</i>). If necessary, Mac users can choose the input source "
-"at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire "
-"recording devices don't have a choice of inputs, so this step is not "
-"necessary. If in doubt, see the documentation for your device. </i></p><p> "
-"<b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&i=streaming\">record audio playing on the computer</a>, Windows "
-"and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or "
-"comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
 #: HelpText.cpp:267
-msgid ""
-"<p>The input level must be set correctly. If the level is too low, there "
-"will be background noise. If the level is too high, there will be distortion "
-"in the loud parts. </p><p>To set the level, either see this [[wiki:"
-"Recording_levels|illustrated online guide]] or follow these steps: "
-"<ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two "
-"<i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If "
-"the meters are not visible, click <i>View &gt; Toolbars</i> and check "
-"\"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</"
-"i> (by the microphone symbol), so that the red bars in the meter come close "
-"to <b>but do not touch</b> the right edge of the scale. If you can't hear "
-"the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check "
-"\"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording "
-"Audio]] <br></p>"
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
 #: HelpText.cpp:292
-msgid ""
-"<p>The main commands for editing audio are under the <i>Edit</i> menu (such "
-"as cut, copy and paste) and the <i>Effect</i> menu (you can do things like "
-"boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity "
-"applies edits to selected areas of the audio track. To select a particular "
-"area, click in the track and drag the shaded area with the mouse. If no "
-"audio is selected, Audacity selects all the audio in the project window.</"
-"p><p> When playing or recording, the Edit and Effect menus will appear "
-"greyed out, because a moving track can't be edited. Commands can sometimes "
-"be unavailable for other reasons too. For example, you can't run effects "
-"until you have audio on the screen, and you can't paste audio until you've "
-"cut or copied it to Audacity's clipboard. </p><br><br>"
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
 #: HelpText.cpp:311
-msgid ""
-"<p>To return later to your unfinished work in Audacity with all tracks and "
-"edits as you left them, save an Audacity project. To play your current work "
-"in other media programs or send it to others, [[export|export]] an audio "
-"file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>."
-"aup</b> project file and  a <b>_data</b> folder containing the actual audio. "
-"To re-open a saved project, click <i>File &gt; Open</i> and open the .aup "
-"file. If you save and exit more than once, an .aup.bak backup file is "
-"created, but the .aup file should always be opened if present. When your "
-"final exported file is exactly as you want, delete the project files and "
-"_data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> "
-"is for saving an empty project. It also lets you save an existing Project to "
-"a <b> new</b> name. This is the only safe way to rename a project. The .aup "
-"file and _data folder should not be moved or renamed manually. </p><p>"
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
 #: HelpText.cpp:335
-msgid ""
-"To hear your work in other media programs, export it to an audio file such "
-"as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|"
-"Saving an Audacity project]] creates a project file (and linked _data "
-"folder) containing all your edited tracks, so you can return to your work "
-"later. However, other programs can't read Audacity projects. </p><p> To "
-"export, click <i>File &gt; Export</i> then choose the file format you want "
-"to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for "
-"standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:"
-"Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; "
-"Export Selection</i> exports only a selected area of audio. <i>Use File &gt; "
-"Export Multiple</i> to export multiple files at the same time, either one "
-"for each audio track, or one for each labeled area in a single track. "
-"<i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:"
-"Splitting_recordings_into_separate_tracks|split the tracks]] from an album "
-"for multiple export as separate files. </p><br><br>"
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
 #: HelpText.cpp:359
-msgid ""
-"<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in "
-"<b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due "
-"to licensing and patent restrictions.  On a Mac computer, unprotected "
-"<b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are "
-"not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files "
-"protected by any kind of Digital Rights Management (DRM), including most "
-"purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</"
-"p><p> If you can't import your file into Audacity, then if it is not DRM-"
-"protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, "
-"burn it to an audio CD in the program licensed to play it, then extract the "
-"CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos."
-"sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could "
-"also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-"i=streaming\">record</a> the CD to your computer. <i>To export to an "
-"unsupported format, export to WAV or AIFF and convert it to the desired "
-"format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">SUPER</a>. </i></p><p>"
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
 #: HelpText.cpp:383
-msgid ""
-"<p>To burn your work to an audio CD for standalone CD players, first "
-"[[export|export]] it as WAV or AIFF. The exported file should be stereo, "
-"44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in "
-"the \"Options\" button in the file export dialog). These are Audacity's "
-"default settings, so normally you will not need to change these before "
-"exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" "
-"or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media "
-"Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. "
-"</p><p>"
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
 #: HelpText.cpp:403
-msgid ""
-"<p>You don't appear to have Audacity help files on your machine. Either <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the "
-"help files and then access them again from Audacity by clicking <i>Help</i> "
-"then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr ""
-"<p>A számítógépen nem találhatók meg az Audacity súgóállományai. Vagy <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">töltse le</a> a "
-"súgófájlokat és a <i>Súgó</i> "
-"menü <i>Tartalomjegyzék</i> menüpontjának segítségével elérhezi azokat, vagy kattintson <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">ide</a> a teljes Kézikönyv internetes böngészéséhez."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1352,19 +1244,19 @@ msgstr "Akció"
 
 #: HistoryWindow.cpp:86
 msgid "&Undo Levels Available"
-msgstr ""
+msgstr "Elérhető visszavonási szintek"
 
 #: HistoryWindow.cpp:92
 msgid "Levels To Discard"
-msgstr ""
+msgstr "Elvetendő szintek"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "&Elvetés"
 
-#: HistoryWindow.cpp:111 Tags.cpp:2072 Tags.cpp:2074 Tags.cpp:2376
-#: Tags.cpp:2378 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
-#: effects/vamp/VampEffect.cpp:414 export/ExportCL.cpp:398
+#: HistoryWindow.cpp:112 Tags.cpp:2081 Tags.cpp:2083 Tags.cpp:2385
+#: Tags.cpp:2387 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
+#: export/ExportCL.cpp:399
 msgid "&OK"
 msgstr "&OK"
 
@@ -1372,7 +1264,7 @@ msgstr "&OK"
 msgid "Unable to determine"
 msgstr "Nem lehet meghatározni"
 
-#: Internat.cpp:195 import/ImportRaw.cpp:392
+#: Internat.cpp:195 import/ImportRaw.cpp:385
 msgid "bytes"
 msgstr "bájt"
 
@@ -1388,92 +1280,90 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: LabelDialog.cpp:52
+#: LabelDialog.cpp:54
 msgid "Track"
 msgstr "Sáv"
 
-#: LabelDialog.cpp:53 Menus.cpp:4057 Menus.cpp:4085
+#: LabelDialog.cpp:55 Menus.cpp:4671 Menus.cpp:4706
 msgid "Label"
 msgstr "Címke"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56 TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr "Kezdési idő"
 
-#: LabelDialog.cpp:55
+#: LabelDialog.cpp:57 TimerRecordDialog.cpp:298
 msgid "End Time"
 msgstr "Befejezési idő"
 
-#: LabelDialog.cpp:98 Menus.cpp:627
+#: LabelDialog.cpp:100 Menus.cpp:713
 msgid "&Edit Labels"
 msgstr "Címkék s&zerkesztése"
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
 msgstr "Nyomjon F2-t vagy kattintson duplán a cella tartalmányak szerkesztéséhez."
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr "Beszúrás &mögé"
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr "Beszúrás &elé"
 
-#: LabelDialog.cpp:127 Menus.cpp:194
+#: LabelDialog.cpp:129
 msgid "&Import..."
 msgstr "&Importálás..."
 
-#: LabelDialog.cpp:155
+#: LabelDialog.cpp:157
 msgid "New..."
 msgstr "Új..."
 
-#: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+#: LabelDialog.cpp:354
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
 msgstr ""
 
-#: LabelDialog.cpp:353
+#: LabelDialog.cpp:355
 msgid "Confirm"
 msgstr "Megerősítés"
 
-#: LabelDialog.cpp:514 Menus.cpp:3555
+#: LabelDialog.cpp:516 Menus.cpp:4095
 msgid "Select a text file containing labels..."
 msgstr "Válassz ki egy címkéket tartalmazó szöveges fájlt..."
 
-#: LabelDialog.cpp:518 Menus.cpp:3559
+#: LabelDialog.cpp:520 Menus.cpp:4099
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Szöveges fájlok (*.txt)|*.txt|Minden fájl (*.*)|*.*"
 
-#: LabelDialog.cpp:532 Menus.cpp:3571 Project.cpp:1831 Project.cpp:1839
-#: import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534 Menus.cpp:4111 Project.cpp:1914 Project.cpp:1922
 msgid "Could not open file: "
 msgstr "Nem lehet megnyitni ezt a fájlt: "
 
-#: LabelDialog.cpp:558
+#: LabelDialog.cpp:560
 msgid "No labels to export."
 msgstr "Nincs exportálandó címke."
 
-#: LabelDialog.cpp:564 Menus.cpp:2172
+#: LabelDialog.cpp:566 Menus.cpp:2512
 msgid "Export Labels As:"
 msgstr "Címkék exportálása, mint: "
 
-#: LabelDialog.cpp:566 Menus.cpp:2170
+#: LabelDialog.cpp:568 Menus.cpp:2510
 msgid "labels.txt"
 msgstr "cimkék.txt"
 
-#: LabelDialog.cpp:699
+#: LabelDialog.cpp:703
 msgid "New Label Track"
 msgstr "Új &Címkesáv"
 
-#: LabelDialog.cpp:700
+#: LabelDialog.cpp:704
 msgid "Enter track name"
 msgstr "Adja meg a sáv nevét"
 
-#: LabelDialog.cpp:701 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:555
+#: LabelDialog.cpp:705 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:632
 msgid "&Label Track"
 msgstr "Címkesáv"
 
@@ -1481,1353 +1371,1455 @@ msgstr "Címkesáv"
 msgid "Audacity First Run"
 msgstr "Audacity első indításakor"
 
-#: LangChoice.cpp:84
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
 msgstr "Válassz egy nyelvet, amit az Audacity használjon:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Az 1.0-ás projekt fájl új formátumba lett konvertálva.\n"
+msgstr "Az 1.0-ás projekt fájl új formátumba lett konvertálva.\n"
 "A régi fájl ezen a néven lett elmentve: '%s'"
 
 #: Legacy.cpp:357
 msgid "Opening Audacity Project"
 msgstr "Audacity Projekt megnyitása"
 
-#: Menus.cpp:162
+#: Menus.cpp:194
 msgid "&File"
 msgstr "&Fájl"
 
-#: Menus.cpp:164
+#: Menus.cpp:196
 msgid "&New\tCtrl+N"
 msgstr "&Új\tCtrl+N"
 
-#: Menus.cpp:166
+#: Menus.cpp:198
 msgid "&Open...\tCtrl+O"
 msgstr "&Megnyitás...\tCtrl+O"
 
-#: Menus.cpp:171
+#: Menus.cpp:203
 msgid "&Close\tCtrl+W"
 msgstr "&Bezárás\tCtrl+W"
 
-#: Menus.cpp:174
+#: Menus.cpp:206
 msgid "&Save Project\tCtrl+S"
 msgstr "&Projekt mentése\tCtrl+S"
 
-#: Menus.cpp:178 Project.cpp:2690
+#: Menus.cpp:210 Project.cpp:2896
 msgid "Save Project &As..."
 msgstr "Projekt mentése &másként..."
 
-#: Menus.cpp:181
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr "&Tömörített másolat mentése a projektből..."
+
+#: Menus.cpp:216
 msgid "Chec&k Dependencies..."
 msgstr "&Függőségek ellenőrzése..."
 
-#: Menus.cpp:187
+#: Menus.cpp:222
 msgid "Open Me&tadata Editor..."
 msgstr "Me&taadat szerkesztő megnyitása..."
 
-#: Menus.cpp:196
+#: Menus.cpp:229 import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Importálás"
+
+#: Menus.cpp:231
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audió...\tCtrl+Shift+I"
 
-#: Menus.cpp:197
+#: Menus.cpp:232
 msgid "&Labels..."
 msgstr "&Címkék..."
 
-#: Menus.cpp:198
+#: Menus.cpp:234
 msgid "&MIDI..."
 msgstr "&MIDI..."
 
-#: Menus.cpp:199
+#: Menus.cpp:236
 msgid "&Raw Data..."
 msgstr "N&yers adat..."
 
-#: Menus.cpp:210 Menus.cpp:239
+#: Menus.cpp:247 Menus.cpp:282
 msgid "Expo&rt Selection..."
 msgstr "Kijelölés expo&rtálása..."
 
-#: Menus.cpp:217
+#: Menus.cpp:254
 msgid "Export &Labels..."
 msgstr "Címkék e&xportálása..."
 
-#: Menus.cpp:218
+#: Menus.cpp:255
 msgid "Export &Multiple..."
 msgstr "&Köteg-Exportálás..."
 
-#: Menus.cpp:247
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr "MIDI exportálása..."
+
+#: Menus.cpp:290
 msgid "CleanSpeech C&hain..."
 msgstr "&CleanSpeech lánc..."
 
-#: Menus.cpp:248 Menus.cpp:262
+#: Menus.cpp:291 Menus.cpp:305
 msgid "Edit C&hains..."
 msgstr "&Láncok szerkesztése..."
 
-#: Menus.cpp:249
+#: Menus.cpp:292
 msgid "Export CleanSpeech &Presets..."
 msgstr "CleanSpeech beállítások e&xportálása..."
 
-#: Menus.cpp:250
+#: Menus.cpp:293
 msgid "I&mport CleanSpeech Presets..."
 msgstr "CleanSpeech beállítások i&mportálása..."
 
-#: Menus.cpp:260
+#: Menus.cpp:303
 msgid "Appl&y Chain..."
 msgstr "Lánc &alkalmazása..."
 
-#: Menus.cpp:267
+#: Menus.cpp:310
 msgid "&Upload File..."
 msgstr "Fájl f&eltöltése..."
 
-#: Menus.cpp:273
+#: Menus.cpp:316
 msgid "Pa&ge Setup..."
 msgstr "&Oldalbeállítás..."
 
-#: Menus.cpp:274
+#: Menus.cpp:317
 msgid "&Print..."
 msgstr "&Nyomtatás..."
 
-#: Menus.cpp:287
+#: Menus.cpp:330
 msgid "E&xit\tCtrl+Q"
 msgstr "Kilé&pés\tCtrl+Q"
 
-#: Menus.cpp:295 toolbars/EditToolBar.cpp:76
+#: Menus.cpp:338 toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "S&zerkesztés"
 
-#: Menus.cpp:299
+#: Menus.cpp:342
 msgid "&Undo\tCtrl+Z"
 msgstr "&Visszavonás"
 
-#: Menus.cpp:307 prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:146
+#: Menus.cpp:350 prefs/KeyConfigPrefs.cpp:371 toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "&Újra"
 
-#: Menus.cpp:320
+#: Menus.cpp:363
 msgid "Cu&t\tCtrl+X"
 msgstr "&Kivágás\tCtrl+X"
 
-#: Menus.cpp:324
+#: Menus.cpp:367
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr "&Szétvágó kivágás\tCtrl+Alt+X"
 
-#: Menus.cpp:325
+#: Menus.cpp:368
 msgid "&Copy\tCtrl+C"
 msgstr "&Másolás\tCtrl+C"
 
-#: Menus.cpp:329
+#: Menus.cpp:372
 msgid "&Paste\tCtrl+V"
 msgstr "&Beillesztés\tCtrl+V"
 
-#: Menus.cpp:333
+#: Menus.cpp:376
 msgid "Tri&m\tCtrl+T"
 msgstr "&Nyírás\tCtrl+T"
 
-#: Menus.cpp:335
+#: Menus.cpp:378
 msgid "&Delete\tCtrl+K"
 msgstr "&Törlés\tCtrl+K"
 
-#: Menus.cpp:336
+#: Menus.cpp:379
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Sz&étvágó törlés\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&Csend\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr "Hang elném&ítása\tCtrl+L"
 
-#: Menus.cpp:339
+#: Menus.cpp:382
 msgid "Sp&lit\tCtrl+I"
 msgstr "Szétv&ágás\tCtrl+I"
 
-#: Menus.cpp:344
+#: Menus.cpp:387
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "Szétvágva ú&j\tCtrl+Alt+I"
 
-#: Menus.cpp:349
+#: Menus.cpp:392
 msgid "&Join\tCtrl+J"
 msgstr "&Összevonás\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Szét&bontás\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "Elválasztás a &csendeknél\tCtrl+Alt+J"
 
-#: Menus.cpp:352
+#: Menus.cpp:394
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Kett&őzés\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "S&ztereóból monó"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr "Sztereo sávból m&ono"
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "&Címkézett régiók..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr "Címkézett &régiók"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:367
+#: Menus.cpp:409
 msgid "&Cut\tAlt+X"
 msgstr "&Kivágás\tAlt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:372
+#: Menus.cpp:414
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "&Szétvágó kivágás\tShift+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:377
+#: Menus.cpp:419
 msgid "Co&py\tShift+Alt+C"
 msgstr "&Másolás\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:383
+#: Menus.cpp:425
 msgid "&Delete\tAlt+K"
 msgstr "&Törlés\tAlt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:388
+#: Menus.cpp:430
 msgid "Sp&lit Delete\tShift+Alt+K"
 msgstr "Sz&étvágó törlés\tShift+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:393
+#: Menus.cpp:435
 msgid "Sile&nce\tAlt+L"
 msgstr "&Csend\tAlt+L"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:399
+#: Menus.cpp:441
 msgid "Spli&t\tAlt+I"
 msgstr "Szétv&ágás\tAlt+I"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:404
+#: Menus.cpp:446
 msgid "&Join\tAlt+J"
 msgstr "&Összevonás\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Szét&bontás\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr "Elválasztás a &csendeknél\tShift+Alt+J"
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Kijelölés..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr "&Kijelölés"
 
-#: Menus.cpp:416
+#: Menus.cpp:457
 msgid "&All\tCtrl+A"
 msgstr "&Összes\tCtrl+A"
 
-#: Menus.cpp:417
+#: Menus.cpp:458
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Semmi\tCtrl+Shift+A"
 
-#: Menus.cpp:421
+#: Menus.cpp:462
 msgid "&Left at Playback Position\t["
 msgstr "K&ezdet a lejátszás pozíciójában"
 
-#: Menus.cpp:422
+#: Menus.cpp:463
 msgid "&Right at Playback Position\t]"
 msgstr "&Vég a lejátszás pozíciójában"
 
-#: Menus.cpp:426
+#: Menus.cpp:467
 msgid "Track &Start to Cursor\tShift+J"
 msgstr "A sáv &kezdetétől a kurzorig\tShift+J"
 
-#: Menus.cpp:427
+#: Menus.cpp:468
 msgid "Cursor to Track &End\tShift+K"
 msgstr "A kurzortól a sáv végéi&g\tShift+K"
 
-#: Menus.cpp:433
+#: Menus.cpp:474
 msgid "Find &Zero Crossings\tZ"
 msgstr "Nullpontok ke&resése\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "K&urzor mozgatása..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr "Kurzor &mozgatása"
 
-#: Menus.cpp:437
+#: Menus.cpp:478
 msgid "to Selection Star&t"
 msgstr "a kijelölés kezde&téhez"
 
-#: Menus.cpp:438
+#: Menus.cpp:479
 msgid "to Selection En&d"
 msgstr "a kijelölés vé&géhez"
 
-#: Menus.cpp:442
+#: Menus.cpp:483
 msgid "to Track &Start\tJ"
 msgstr "a sáv &kezdetéhez\tJ"
 
-#: Menus.cpp:443
+#: Menus.cpp:484
 msgid "to Track &End\tK"
 msgstr "a sáv &végéhez\tK"
 
-#: Menus.cpp:450
+#: Menus.cpp:491
 msgid "Re&gion Save"
 msgstr "Régió &mentése"
 
-#: Menus.cpp:451
+#: Menus.cpp:492
 msgid "Regio&n Restore"
 msgstr "Régió &visszaállítása"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Régió &lejátszása..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr "Régió &lejátszása"
 
-#: Menus.cpp:463
+#: Menus.cpp:504
 msgid "&Lock"
 msgstr "&Zárolás"
 
-#: Menus.cpp:464
+#: Menus.cpp:505
 msgid "&Unlock"
 msgstr "Zárolás &feloldása"
 
-#: Menus.cpp:470
+#: Menus.cpp:511
 msgid "Turn Snap-To On"
 msgstr "Hozzáillesztés be"
 
-#: Menus.cpp:471
+#: Menus.cpp:512
 msgid "Turn Snap-To Off"
 msgstr "Hozzáillesztés ki"
 
-#: Menus.cpp:472
+#: Menus.cpp:513
 msgid "Turn Grid Snap On"
 msgstr "Rácshoz illesztés be"
 
-#: Menus.cpp:473
+#: Menus.cpp:514
 msgid "Turn Grid Snap Off"
 msgstr "Rácshoz illesztés ki"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "&Beállítások...\tCtrl+,"
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
 msgstr "&Beállítások...\tCtrl+P"
 
-#: Menus.cpp:492
+#: Menus.cpp:533
 msgid "&View"
 msgstr "&Nézet"
 
-#: Menus.cpp:494
+#: Menus.cpp:535
 msgid "Zoom &In\tCtrl+1"
 msgstr "&Nagyítás\tCtrl+1"
 
-#: Menus.cpp:497
+#: Menus.cpp:538
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "&Eredeti érték\tCtrl+2"
 
-#: Menus.cpp:498
+#: Menus.cpp:539
 msgid "Zoom &Out\tCtrl+3"
 msgstr "&Kicsinyítés\tCtrl+3"
 
-#: Menus.cpp:501
+#: Menus.cpp:542
 msgid "&Fit in Window\tCtrl+F"
 msgstr "&Méretezés az ablakhoz igazítva"
 
-#: Menus.cpp:502
+#: Menus.cpp:543
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "&Magassághoz igazítás\tCtrl+Shift+F"
 
-#: Menus.cpp:503
+#: Menus.cpp:544
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "&Kijelölés nagyítása\tCtrl+E"
 
-#: Menus.cpp:506
+#: Menus.cpp:547
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr "Minden sáv &összecsukása\tCtrl+Shift+C"
 
-#: Menus.cpp:507
+#: Menus.cpp:548
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "Minden sáv ki&bontása\tCtrl+Shift+X"
 
-#: Menus.cpp:510
+#: Menus.cpp:551
 msgid "&Show Clipping"
 msgstr "N&yírás mutatása"
 
-#: Menus.cpp:519
+#: Menus.cpp:560
 msgid "&History..."
 msgstr "&Előzmények..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "Eszköz&tárak..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr "E&szköztárak"
 
-#: Menus.cpp:526
+#: Menus.cpp:567
 msgid "&Control Toolbar"
 msgstr "&Vezérlő eszköztár"
 
-#: Menus.cpp:527
+#: Menus.cpp:568
 msgid "&Device Toolbar"
 msgstr "&Hangeszköz eszköztár"
 
-#: Menus.cpp:528
+#: Menus.cpp:569
 msgid "&Edit Toolbar"
 msgstr "&Szerkesztés eszköztár"
 
-#: Menus.cpp:529
+#: Menus.cpp:570
 msgid "&Meter Toolbar"
 msgstr "&Mérő eszköztár"
 
-#: Menus.cpp:530
+#: Menus.cpp:571
 msgid "Mi&xer Toolbar"
 msgstr "&Keverés eszköztár"
 
-#: Menus.cpp:531
+#: Menus.cpp:572
 msgid "&Selection Toolbar"
 msgstr "Ki&jelölés eszköztár"
 
-#: Menus.cpp:532
+#: Menus.cpp:573
 msgid "T&ools Toolbar"
 msgstr "Se&gédeszközök eszköztár"
 
-#: Menus.cpp:533
+#: Menus.cpp:574
 msgid "Transcri&ption Toolbar"
 msgstr "Á&ttétel eszköztár"
 
-#: Menus.cpp:535
+#: Menus.cpp:576
 msgid "&Reset Toolbars"
 msgstr "Eszköztárak &alaphelyzetbe állítása"
 
-#: Menus.cpp:537
+#: Menus.cpp:578
 msgid "!Simplified View"
 msgstr "!Egyszerűsített nézet"
 
-#: Menus.cpp:545
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr "&Vezérlők"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr "Szü&net\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:595 Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "Ugrás a kezdetére\tHome"
+
+#: Menus.cpp:597 Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "Ugrás a végére\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr "&Felvétel\tR"
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr "I&dőzített felvétel...\tShift+T"
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr "Hozáfűzött felvétel\tShift+R"
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr "Rákeverés (be/ki)"
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr "Szoftveres átjátszás (be/ki)"
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr "Hang által aktivált felvétel (be/ki)"
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr "Hang aktiválási szintje..."
+
+#: Menus.cpp:622
 msgid "&Tracks"
 msgstr "&Sávok"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "&Új hozzáadása..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr "&Új hozzáadása"
 
-#: Menus.cpp:553
+#: Menus.cpp:630
 msgid "&Audio Track\tCtrl+Shift+N"
 msgstr "&Audió sáv\tCtrl+Shift+N"
 
-#: Menus.cpp:554
+#: Menus.cpp:631
 msgid "&Stereo Track"
 msgstr "S&ztereo sáv"
 
-#: Menus.cpp:556 TimeTrack.cpp:44
+#: Menus.cpp:633 TimeTrack.cpp:44
 msgid "&Time Track"
 msgstr "&Idősáv"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&Időzített felvétel..."
-
-#: Menus.cpp:568
+#: Menus.cpp:643
 msgid "Mi&x and Render"
 msgstr "Keverés és renderelés"
 
-#: Menus.cpp:572
+#: Menus.cpp:647
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr "Keverés és renderelés új sávba\tCtrl+Shift+M"
 
-#: Menus.cpp:576
+#: Menus.cpp:651
 msgid "&Resample..."
-msgstr "Újraminta&vételezés"
+msgstr "Újraminta&vételezés..."
 
-#: Menus.cpp:586
+#: Menus.cpp:661
 msgid "Remo&ve Tracks"
 msgstr "Sávok &eltávolítása"
 
-#: Menus.cpp:592
+#: Menus.cpp:667
 msgid "&Mute All Tracks\tCtrl+U"
 msgstr "Minden sáv el&némítása\tCtrl+U"
 
-#: Menus.cpp:593
+#: Menus.cpp:668
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
 msgstr "Minden sáv &hallhatóvá tétele\tCtrl+Shift+U"
 
-#: Menus.cpp:597
+#: Menus.cpp:672
 msgid "Align with &Zero"
 msgstr "Igazítás &nullához"
 
-#: Menus.cpp:598
+#: Menus.cpp:673
 msgid "Align with &Cursor"
 msgstr "Igazítás a &kurzorhoz"
 
-#: Menus.cpp:599
+#: Menus.cpp:674
 msgid "Align with Selection &Start"
 msgstr "Igazítás a kijelölés ke&zdetéhez"
 
-#: Menus.cpp:600
+#: Menus.cpp:675
 msgid "Align with Selection &End"
 msgstr "Igazítás a kijelölés &végéhez"
 
-#: Menus.cpp:601
+#: Menus.cpp:676
 msgid "Align End with Cu&rsor"
 msgstr "A sáv végének igazítása a ku&rzorhoz"
 
-#: Menus.cpp:602
+#: Menus.cpp:677
 msgid "Align End with Selection Star&t"
 msgstr "A sáv végének igazítása a kijelölés kezdeté&hez"
 
-#: Menus.cpp:603
+#: Menus.cpp:678
 msgid "Align End with Selection En&d"
 msgstr "A sáv végének igazítása a kijelölés v&égéhez"
 
-#: Menus.cpp:604
+#: Menus.cpp:679
 msgid "Align Tracks To&gether"
 msgstr "Sávok egymáshoz &igazítása"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "Sávok &igazítása..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr "&Sávok igazítása"
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr "&Kurzor igazítása és mozgatása"
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Kurzor i&gazítása és mozgatása..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr "A MIDI szinkronizálása a hanghoz"
 
-#: Menus.cpp:623
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr "Hang- és címkesávok összekapcsolása"
+
+#: Menus.cpp:709
 msgid "Add &Label At Selection\tCtrl+B"
 msgstr "Címke hozzárendelése a kijelölésnél\tCtrl+B"
 
-#: Menus.cpp:624
+#: Menus.cpp:710
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Címke hozzáadása az aktuális pozícónál\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "Sávok &rendezése..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr "Sávok &rendezése"
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Kezdeti idő"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr "&Kezdés ideje szerint"
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Név"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr "&Név szerint"
 
-#: Menus.cpp:643
+#: Menus.cpp:730
 msgid "&Generate"
 msgstr "&Generálás"
 
-#: Menus.cpp:666
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr "Rendezetlen"
+
+#: Menus.cpp:795
 msgid "Effe&ct"
 msgstr "&Effekt"
 
-#: Menus.cpp:670
+#: Menus.cpp:799
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "Utolsó effekt megismétlése\tCtrl+R"
 
-#: Menus.cpp:702
+#: Menus.cpp:877
 msgid "&Analyze"
 msgstr "&Analizálás"
 
-#: Menus.cpp:704
+#: Menus.cpp:879
 msgid "Plot Spectrum..."
 msgstr "S&pektrum ábrázolása"
 
-#: Menus.cpp:737 Menus.cpp:740
+#: Menus.cpp:947 Menus.cpp:950
 msgid "&Help"
 msgstr "&Súgó"
 
-#: Menus.cpp:743
+#: Menus.cpp:953
 msgid "&About Audacity CleanSpeech..."
 msgstr "&Az Audacity CleanSpeech-ről..."
 
-#: Menus.cpp:747
+#: Menus.cpp:957
 msgid "&Show Welcome Message..."
 msgstr "&Üdvözlő üzenet mutatása..."
 
-#: Menus.cpp:748
+#: Menus.cpp:958
 msgid "&Index..."
 msgstr "&Tartalomjegyzék..."
 
-#: Menus.cpp:756
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr "&Napló mutatása..."
+
+#: Menus.cpp:967
 msgid "&Screenshot Tools..."
 msgstr "&Képlopó eszközök..."
 
-#: Menus.cpp:759
+#: Menus.cpp:970
 msgid "&Run Benchmark..."
 msgstr "&Szintjel Futtatása..."
 
-#: Menus.cpp:761
+#: Menus.cpp:972
 msgid "&Audio Device Info..."
 msgstr "&Hangeszköz információ..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
-#: Menus.cpp:774
+#: Menus.cpp:985
 msgid "Selection Tool\tF1"
 msgstr "Kijelölő eszköz\tF1"
 
-#: Menus.cpp:775
+#: Menus.cpp:986
 msgid "Envelope Tool\tF2"
 msgstr "Burkológörbe eszköz\tF2"
 
-#: Menus.cpp:776
+#: Menus.cpp:987
 msgid "Draw Tool\tF3"
 msgstr "Rajzoló eszköz\tF3"
 
-#: Menus.cpp:777
+#: Menus.cpp:988
 msgid "Zoom Tool\tF4"
 msgstr "Nagyító eszköz\tF4"
 
-#: Menus.cpp:778
+#: Menus.cpp:989
 msgid "Time Shift Tool\tF5"
 msgstr "Időbeni Eltolás eszköz\tF5"
 
-#: Menus.cpp:779
+#: Menus.cpp:990
 msgid "Multi Tool\tF6"
 msgstr "Multi Eszköz\tF6"
 
-#: Menus.cpp:781
+#: Menus.cpp:992
 msgid "Next Tool\tD"
 msgstr "Következő eszköz\tD"
 
-#: Menus.cpp:782
+#: Menus.cpp:993
 msgid "Previous Tool\tA"
 msgstr "Előző eszköz\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Lejátszás/Állj\tSpace"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
-#: Menus.cpp:785
+#: Menus.cpp:996
 msgid "Stop\tS"
 msgstr "Állj\tS"
 
-#: Menus.cpp:786
+#: Menus.cpp:997
 msgid "Pause\tP"
 msgstr "Szünet\tP"
 
-#: Menus.cpp:787
+#: Menus.cpp:998
 msgid "Record\tR"
 msgstr "Felvétel\tR"
 
-#: Menus.cpp:788
+#: Menus.cpp:999
 msgid "Record Append\tShift+R"
 msgstr "Felvétel hozzáfűzve\tShift+R"
 
-#: Menus.cpp:790
+#: Menus.cpp:1001
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "Lejátszás/Stop és kurzor beállítása\tShift+A"
 
-#: Menus.cpp:793
+#: Menus.cpp:1004
 msgid "Play One Second\t1"
 msgstr "Egymásodperces lejátszás\t1"
 
-#: Menus.cpp:794
+#: Menus.cpp:1005
 msgid "Play To Selection\tB"
 msgstr "Lejátszás a kijelölésig\tB"
 
-#: Menus.cpp:795
+#: Menus.cpp:1006
 msgid "Play Looped\tL"
 msgstr "Ismételt Lejátszás\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Ismételt Lejátszás\tShift+Space"
-
-#: Menus.cpp:797
-msgid "Play Cut Preview\tC"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Ugrás a kezdetére\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Ugrás a végére\tEnd"
+#: Menus.cpp:1008
+msgid "Play Cut Preview\tC"
+msgstr "A kivágott rész lejátszása\tC"
 
-#: Menus.cpp:802
+#: Menus.cpp:1013
 msgid "Selection to Start\tShift+Home"
 msgstr "Kijelölés a kezdetéig\tShift+Home"
 
-#: Menus.cpp:803
+#: Menus.cpp:1014
 msgid "Selection to End\tShift+End"
 msgstr "Kijelölés a végéig\tShift+End"
 
-#: Menus.cpp:805
+#: Menus.cpp:1016
 msgid "DeleteKey\tBackspace"
 msgstr "TörlésGomb\tBackspace"
 
-#: Menus.cpp:810
+#: Menus.cpp:1021
 msgid "DeleteKey2\tDelete"
 msgstr "TörlésGomb2\tDelete"
 
-#: Menus.cpp:816
+#: Menus.cpp:1027
 msgid "Seek left short period during playback\tLeft"
-msgstr ""
+msgstr "Ugrás balra keveset lejátszás közben\tLeft"
 
-#: Menus.cpp:817
+#: Menus.cpp:1028
 msgid "Seek right short period during playback\tRight"
-msgstr ""
+msgstr "Ugrás jobbra keveset lejátszás közben\tRight"
 
-#: Menus.cpp:818
+#: Menus.cpp:1029
 msgid "Seek left long period during playback\tShift+Left"
-msgstr ""
+msgstr "Ugrás balra nagyot lejátszás közben\tShift+Left"
 
-#: Menus.cpp:819
+#: Menus.cpp:1030
 msgid "Seek right long period during playback\tShift+Right"
-msgstr ""
+msgstr "Ugrás jobbra nagyot lejátszás közben\tShift+Right"
 
-#: Menus.cpp:823
+#: Menus.cpp:1034
 msgid "Move Focus to Previous Track\tUp"
-msgstr ""
+msgstr "Fókusz mozgatása az előző sávra\tUp"
 
-#: Menus.cpp:824
+#: Menus.cpp:1035
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
-msgstr ""
+msgstr "Fókusz mozgatása az előzőre és kijelölés módosítása\tShift+Up"
 
-#: Menus.cpp:825
+#: Menus.cpp:1036
 msgid "Move Focus to Next Track\tDown"
-msgstr ""
+msgstr "Fókusz mozgatása a következő sávra\tDown"
 
-#: Menus.cpp:826
+#: Menus.cpp:1037
 msgid "Move Focus to Next and Change Selection\tShift+Down"
-msgstr ""
+msgstr "Fókusz mozgatása a következőre és kijelölés módosítása\tShift+Down"
 
-#: Menus.cpp:827
+#: Menus.cpp:1038
 msgid "Toggle Focused Track\tReturn"
-msgstr ""
+msgstr "Fókuszált sáv be- és kikapcsolása\tReturn"
 
-#: Menus.cpp:828
+#: Menus.cpp:1039
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
-msgstr ""
+msgstr "Fókuszált sáv be- és kikapcsolása\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
-#: Menus.cpp:831
+#: Menus.cpp:1042
 msgid "Cursor Left\tLeft"
 msgstr "Kurzor balra\tLeft"
 
-#: Menus.cpp:832
+#: Menus.cpp:1043
 msgid "Cursor Right\tRight"
 msgstr "Kurzor jobbra\tRight"
 
-#: Menus.cpp:833
+#: Menus.cpp:1044
 msgid "Cursor Short Jump Left\t,"
 msgstr "Kurzor kis ugrás balra\t,"
 
-#: Menus.cpp:834
+#: Menus.cpp:1045
 msgid "Cursor Short Jump Right\t."
 msgstr "Kurzor kis ugrás jobbra\t."
 
-#: Menus.cpp:835
+#: Menus.cpp:1046
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr "Kurzor nagy ugrás balra\tShift+,"
 
-#: Menus.cpp:836
+#: Menus.cpp:1047
 msgid "Cursor Long Jump Right\tShift+."
 msgstr "Kurzor nagy ugrás jobbra\tShift+."
 
-#: Menus.cpp:838
+#: Menus.cpp:1049
 msgid "Selection Extend Left\tShift+Left"
 msgstr "Kijelölés megnövelése balra\tShift+Left"
 
-#: Menus.cpp:839
+#: Menus.cpp:1050
 msgid "Selection Extend Right\tShift+Right"
 msgstr "Kijelölés megnövelése jobbra\tShift+Right"
 
-#: Menus.cpp:841
+#: Menus.cpp:1052
 msgid "Set (or Extend) Left Selection"
-msgstr ""
+msgstr "Kijelölés kezdetének beállítása (vagy kiterjesztése)"
 
-#: Menus.cpp:842
+#: Menus.cpp:1053
 msgid "Set (or Extend) Right Selection"
-msgstr ""
+msgstr "Kijelölés vvégének beállítása (vagy kiterjesztése)"
 
-#: Menus.cpp:844
+#: Menus.cpp:1055
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "Kijelölés kurtítása balról\tCtrl+Shift+Right"
 
-#: Menus.cpp:845
+#: Menus.cpp:1056
 msgid "Selection Contract Right\tCtrl+Shift+Left"
 msgstr "Kijelölés kurtítása jobbról\tCtrl+Shift+Left"
 
-#: Menus.cpp:847
+#: Menus.cpp:1058
 msgid "Change pan on focused track\tShift+P"
 msgstr ""
 
-#: Menus.cpp:848
+#: Menus.cpp:1059
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr ""
 
-#: Menus.cpp:849
+#: Menus.cpp:1060
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr ""
 
-#: Menus.cpp:850
+#: Menus.cpp:1061
 msgid "Change gain on focused track\tShift+G"
 msgstr ""
 
-#: Menus.cpp:851
+#: Menus.cpp:1062
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr ""
 
-#: Menus.cpp:852
+#: Menus.cpp:1063
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr ""
 
-#: Menus.cpp:853
+#: Menus.cpp:1064
 msgid "Open menu on focused track\tShift+M"
-msgstr ""
+msgstr "Menu megnyitása a fókuszált sávon\tShift+M"
 
-#: Menus.cpp:854
+#: Menus.cpp:1065
 msgid "Mute/Unmute focused track\tShift+U"
-msgstr ""
+msgstr "Fókuszált sáv némítása/hangosítása\tShift+M"
 
-#: Menus.cpp:855
+#: Menus.cpp:1066
 msgid "Solo/Unsolo focused track\tShift+S"
 msgstr ""
 
-#: Menus.cpp:856
+#: Menus.cpp:1067
 msgid "Close focused track\tShift+C"
-msgstr ""
+msgstr "Fókuszált sáv bezásása\tShift+C"
 
-#: Menus.cpp:858
+#: Menus.cpp:1069
 msgid "Snap To On"
 msgstr "Hozzáillesztés be"
 
-#: Menus.cpp:859
+#: Menus.cpp:1070
 msgid "Snap To Off"
 msgstr "Hozzáillesztés ki"
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:873
+#: Menus.cpp:1151
 msgid "Open Recent"
 msgstr "Legutóbbi megynyitása"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Legutóbbi &fájlok..."
+#: Menus.cpp:1154
+msgid "Recent &Files"
+msgstr "Legutóbbi &fájlok"
 
-#: Menus.cpp:925
+#: Menus.cpp:1203
 #, c-format
 msgid "&Undo %s"
 msgstr "&Visszavonás: %s"
 
-#: Menus.cpp:951
+#: Menus.cpp:1229
 msgid "Can't Undo"
-msgstr "Nincs Visszavonás"
+msgstr "Nincs visszavonás"
 
-#: Menus.cpp:960
+#: Menus.cpp:1238
 #, c-format
 msgid "&Redo %s"
 msgstr "&Újra: %s"
 
-#: Menus.cpp:966
+#: Menus.cpp:1244
 msgid "Can't Redo"
-msgstr "Nincs Újra"
+msgstr "Nincs újra"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1850
 msgid "Sort By Time"
 msgstr "Rendezés idő szerint"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1850
 msgid "Tracks sorted by time"
 msgstr "Sávok idő szerint rendezve"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1876
 msgid "Sort By Name"
 msgstr "Rendezés név szerint"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1876
 msgid "Tracks sorted by name"
 msgstr "Sávok név szerint rendezve"
 
-#: Menus.cpp:1705
+#: Menus.cpp:2027
 msgid "Set Left Selection Bound"
-msgstr ""
+msgstr "Kijelölés bal határának beállítása"
 
-#: Menus.cpp:1739
+#: Menus.cpp:2062
 msgid "Set Right Selection Bound"
-msgstr ""
+msgstr "Kijelölés jobb határának beállítása"
 
-#: Menus.cpp:2006
+#: Menus.cpp:2331
 msgid "You must select a track first."
 msgstr "Először jelöljön ki egy sávot."
 
-#: Menus.cpp:2035
+#: Menus.cpp:2363
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "Ismétlés %s\tCtrl+R"
 
-#: Menus.cpp:2166
+#: Menus.cpp:2506
 msgid "There are no label tracks to export."
 msgstr "Nincsenek címkesávok, amit exportálni lehetne."
 
-#: Menus.cpp:2271
+#: Menus.cpp:2601
+msgid "Export MIDI As:"
+msgstr "MIDI exportálása mint:"
+
+#: Menus.cpp:2605
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "MIDI fájl (*.mid)|*.mid|Allegro fájl (*.gro)|*.gro"
+
+#: Menus.cpp:2637
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr "A kiválasztott fájlnév kiterjesztése nem egy felismert kiterjesztés.\n"
+"Folytatja?"
+
+#: Menus.cpp:2638
+msgid "Export MIDI"
+msgstr "MIDI exportálása"
+
+#: Menus.cpp:2696
 msgid "Nothing to undo"
-msgstr "Nincs mit Visszavonni"
+msgstr "Nincs mit visszavonni"
 
-#: Menus.cpp:2291
+#: Menus.cpp:2716
 msgid "Nothing to redo"
-msgstr "Nincs mit Újra végrehajtani"
+msgstr "Nincs mit újra végrehajtani"
 
-#: Menus.cpp:2366 TrackPanel.cpp:605 toolbars/EditToolBar.cpp:133
+#: Menus.cpp:2803 TrackPanel.cpp:596 toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Kivágás"
 
-#: Menus.cpp:2366
+#: Menus.cpp:2803
 msgid "Cut to the clipboard"
 msgstr "Kivágás a vágólapra"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2843
 msgid "Split Cut"
-msgstr ""
+msgstr "Szétvágó kivágás"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2843
 msgid "Split-cut to the clipboard"
-msgstr ""
+msgstr "Szétvágó kivágás a vágólapra"
 
-#: Menus.cpp:2469 Menus.cpp:2540 Menus.cpp:2634 TrackPanel.cpp:607
+#: Menus.cpp:2908 Menus.cpp:2980 Menus.cpp:3172 TrackPanel.cpp:598
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: Menus.cpp:2469
+#: Menus.cpp:2908
 msgid "Pasted text from the clipboard"
 msgstr "Szöveg beillesztve a vágólapról"
 
-#: Menus.cpp:2540 Menus.cpp:2634
+#: Menus.cpp:2980 Menus.cpp:3172
 msgid "Pasted from the clipboard"
 msgstr "Beillesztve a vágólapról"
 
-#: Menus.cpp:2574
+#: Menus.cpp:3046
+msgid "Pasting one type of track into another is not allowed."
+msgstr "Az egyik típusú sáv másolása másikba nem megengedett."
+
+#: Menus.cpp:3058
 msgid "Copying stereo audio into a mono track is not allowed."
-msgstr ""
+msgstr "Sztereo hang másolása mono sávba nem megengedett."
 
-#: Menus.cpp:2670 toolbars/EditToolBar.cpp:139
+#: Menus.cpp:3208 toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "Nyírás"
 
-#: Menus.cpp:2670
+#: Menus.cpp:3208
 msgid "Trim file to selection"
 msgstr "Fájl nyírása a kijelölés kivételével"
 
-#: Menus.cpp:2699
+#: Menus.cpp:3237
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
 msgstr ""
 
-#: Menus.cpp:2702
+#: Menus.cpp:3240
 msgid "Split Delete"
-msgstr ""
+msgstr "Szétvágó törlés"
 
-#: Menus.cpp:2723
+#: Menus.cpp:3261
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr ""
 
-#: Menus.cpp:2726
+#: Menus.cpp:3264
 msgid "Disjoin"
-msgstr ""
+msgstr "Szétválasztás"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3285
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr ""
 
-#: Menus.cpp:2750
+#: Menus.cpp:3288
 msgid "Join"
-msgstr ""
+msgstr "Összevonás"
 
-#: Menus.cpp:2769
+#: Menus.cpp:3307
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "Kijelölt sávok %.2f mp-es csenddé alakítása. Átalakítás kezdőpontja (mp): %.2f"
 
-#: Menus.cpp:2771 toolbars/EditToolBar.cpp:141
+#: Menus.cpp:3309 toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Csend"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3343
 msgid "Duplicate"
 msgstr "Duplikálás"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3343
 msgid "Duplicated"
 msgstr "Duplikált"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3362
 msgid "Cut Labels"
-msgstr ""
+msgstr "Címkék kivágása"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3362
 msgid "Cut labeled regions to the clipboard"
-msgstr ""
+msgstr "Címkézett régiók kivágása a vágólapra"
 
-#: Menus.cpp:2838
+#: Menus.cpp:3376
 msgid "SplitCut labeled regions to the clipboard"
-msgstr ""
+msgstr "Címkézett régiók szétvágó kivágása a vágólapra"
 
-#: Menus.cpp:2839
+#: Menus.cpp:3377
 msgid "Split Cut Labels"
-msgstr ""
+msgstr "Címkék szétvágó kivágása"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3391
 msgid "Copied labeled regions to the clipboard"
-msgstr ""
+msgstr "Címkézett régiók másolva a vágólapra"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3391
 msgid "Copy Labels"
-msgstr ""
+msgstr "Címkék másolása"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3403
 msgid "Delete Labels"
-msgstr ""
+msgstr "Címkék törlése"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3403
 msgid "Deleted labeled regions"
-msgstr ""
+msgstr "Címkézett régiók törölve"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3415
 msgid "Split Delete Labels"
 msgstr ""
 
-#: Menus.cpp:2877
+#: Menus.cpp:3415
 msgid "Split Deleted labeled regions"
 msgstr ""
 
-#: Menus.cpp:2889
+#: Menus.cpp:3427
 msgid "Silence Labels"
-msgstr ""
+msgstr "Címkék elnémítása"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3427
 msgid "Silenced labeled regions"
 msgstr ""
 
-#: Menus.cpp:2901
+#: Menus.cpp:3439
 msgid "Split Labels"
 msgstr ""
 
-#: Menus.cpp:2901
+#: Menus.cpp:3439
 msgid "Split labeled regions"
 msgstr ""
 
-#: Menus.cpp:2913
+#: Menus.cpp:3451
 msgid "Join Labels"
 msgstr ""
 
-#: Menus.cpp:2913
+#: Menus.cpp:3451
 msgid "Joined labeled regions"
 msgstr ""
 
-#: Menus.cpp:2925
+#: Menus.cpp:3463
 msgid "Disjoin Labels"
 msgstr ""
 
-#: Menus.cpp:2925
+#: Menus.cpp:3463
 msgid "Disjoined labeled regions"
 msgstr ""
 
-#: Menus.cpp:2947 TrackPanel.cpp:6121
+#: Menus.cpp:3485 TrackPanel.cpp:6134
 msgid "Split"
 msgstr "Szétvágás"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3579
 msgid "Split New"
 msgstr ""
 
-#: Menus.cpp:3041
+#: Menus.cpp:3579
 msgid "Split to new track"
 msgstr ""
 
-#: Menus.cpp:3124
+#: Menus.cpp:3662
 msgid "Split at labels"
 msgstr "Szétvágás a címkénél"
 
-#: Menus.cpp:3425
+#: Menus.cpp:3963
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
 msgstr "A spektrumtérkép készítéséhez minden sávnak azonos mintavételezési frekvenciával kell rendelkeznie."
 
-#: Menus.cpp:3451
+#: Menus.cpp:3989
 #, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
 msgstr "Túl sok audió adat lett kijelölve. Csak az első %.1f másodperc lett analizálva."
 
-#: Menus.cpp:3584
+#: Menus.cpp:4124
 #, c-format
 msgid "Imported labels from '%s'"
 msgstr "'%s' fájlból címkék importálása"
 
-#: Menus.cpp:3585
+#: Menus.cpp:4125
 msgid "Import Labels"
 msgstr "Címkék importálása"
 
-#: Menus.cpp:3595
+#: Menus.cpp:4136
 msgid "Select a MIDI file..."
 msgstr "Válassz ki egy MIDI fájlt..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Minden fájl (*.*)|*.*|MIDI fájlok (*.mid)|*.mid|Allegro fájlok (*.gro)|*.gro|"
+#: Menus.cpp:4140
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "MIDI és Allegro fájlok (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI fájlok (*.mid;*.midi)|*.mid;*.midi|Allegro fájlok (*.gro)|*.gro|Minden fájl (*.*)|*.*"
 
-#: Menus.cpp:3615
+#: Menus.cpp:4156
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "'%s' fájlból MIDI importálása"
 
-#: Menus.cpp:3617
+#: Menus.cpp:4157
 msgid "Import MIDI"
 msgstr "MIDI importálása"
 
-#: Menus.cpp:3630
+#: Menus.cpp:4171
 msgid "Select any uncompressed audio file..."
 msgstr "Válassz ki egy tömörítetlen audió fájlt..."
 
-#: Menus.cpp:3634
+#: Menus.cpp:4175
 msgid "All files (*)|*"
 msgstr "Minden fájl (*)|*"
 
-#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importálás"
-
-#: Menus.cpp:3668
+#: Menus.cpp:4199
 msgid "Edit the metadata tags"
-msgstr ""
+msgstr "Metaadat címkék szerkesztése"
 
-#: Menus.cpp:3669 export/Export.cpp:298
+#: Menus.cpp:4200 export/Export.cpp:353
 msgid "Edit Metadata"
 msgstr "Metaadat szerkesztése"
 
-#: Menus.cpp:3669
+#: Menus.cpp:4200
 msgid "Edit Metadata tags"
-msgstr ""
+msgstr "Metaadat címkék szerkesztése"
 
-#: Menus.cpp:3725
+#: Menus.cpp:4256
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr ""
 
-#: Menus.cpp:3726
+#: Menus.cpp:4257
 msgid "Render"
-msgstr ""
+msgstr "Renderelés"
 
-#: Menus.cpp:3731
+#: Menus.cpp:4262
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
-msgstr ""
+msgstr "%d sáv keverve és renderelve egy új sztereo sávba"
 
-#: Menus.cpp:3734
+#: Menus.cpp:4265
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
-msgstr ""
+msgstr "%d sáv keverve és renderelve egy új mono sávba"
 
-#: Menus.cpp:3736 Mix.cpp:120
+#: Menus.cpp:4267 Mix.cpp:121
 msgid "&Mix and Render"
 msgstr "&Keverés és renderelés"
 
-#: Menus.cpp:3866
+#: Menus.cpp:4397
 msgid "Aligned with zero"
 msgstr "Igazítás Nullához"
 
-#: Menus.cpp:3870
+#: Menus.cpp:4401
 msgid "Aligned cursor"
 msgstr "Kurzor igazítása"
 
-#: Menus.cpp:3874
+#: Menus.cpp:4405
 msgid "Aligned with selection start"
 msgstr "Igazítás a Kijelölés kezdetéhez"
 
-#: Menus.cpp:3878
+#: Menus.cpp:4409
 msgid "Aligned with selection end"
 msgstr "Igazítás a Kijelölés végéhez"
 
-#: Menus.cpp:3882
+#: Menus.cpp:4413
 msgid "Aligned end with cursor"
 msgstr "Végpont igazítása a Kurzorhoz"
 
-#: Menus.cpp:3886
+#: Menus.cpp:4417
 msgid "Aligned end with selection start"
 msgstr "Végpont igazítása a Kijelölés kezdetéhez"
 
-#: Menus.cpp:3890
+#: Menus.cpp:4421
 msgid "Aligned end with selection end"
 msgstr "Végpont igazítása a Kijelölés végéhez"
 
-#: Menus.cpp:3894
+#: Menus.cpp:4425
 msgid "Aligned"
 msgstr "Igazítás"
 
-#: Menus.cpp:3927
+#: Menus.cpp:4458
 msgid "Align"
 msgstr "Igazítás"
 
-#: Menus.cpp:3950
+#: Menus.cpp:4543
+msgid "Sync MIDI with Audio"
+msgstr "MIDI és hang szinkronizálása"
+
+#: Menus.cpp:4547
+msgid "Alignment completed."
+msgstr "Igazítás kész."
+
+#: Menus.cpp:4558
 msgid "Created new audio track"
 msgstr "Létrehozott új audió sáv"
 
-#: Menus.cpp:3950 Menus.cpp:3973 Menus.cpp:3988 Menus.cpp:4008
+#: Menus.cpp:4558 Menus.cpp:4581 Menus.cpp:4596 Menus.cpp:4616
 msgid "New Track"
 msgstr "Új sáv"
 
-#: Menus.cpp:3973
+#: Menus.cpp:4581
 msgid "Created new stereo audio track"
 msgstr "Létrehozott új sztereó sáv"
 
-#: Menus.cpp:3988
+#: Menus.cpp:4596
 msgid "Created new label track"
 msgstr "Létrehozott új címke sáv"
 
-#: Menus.cpp:3997
+#: Menus.cpp:4605
 msgid "The version of Audacity you are using does not support multiple time tracks."
 msgstr "Az Audacity-nek ez a verziója nem támogatja több idősáv létrehozását."
 
-#: Menus.cpp:4008
+#: Menus.cpp:4616
 msgid "Created new time track"
 msgstr "Létrehozott új idősáv"
 
-#: Menus.cpp:4057
+#: Menus.cpp:4671
 msgid "Added label"
 msgstr "Hozzárendelt címke"
 
-#: Menus.cpp:4085
+#: Menus.cpp:4706
 msgid "Edited labels"
 msgstr "Szerkesztett címkék"
 
-#: Menus.cpp:4112
+#: Menus.cpp:4733
 msgid "Save CleanSpeech Preset File As:"
-msgstr ""
+msgstr "CleanSpeech beállítás mentése mint:"
 
-#: Menus.cpp:4116
+#: Menus.cpp:4737
 msgid "CleanSpeech Presets (*.csp)|*.csp"
-msgstr ""
+msgstr "CleanSpeech beállítás (*.csp)|*.csp"
 
-#: Menus.cpp:4123 export/Export.cpp:515
+#: Menus.cpp:4744 export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "Sajnálom, de a 256 karakternél hosszabb útvonalnevek nincsenek támogatva."
 
-#: Menus.cpp:4169
+#: Menus.cpp:4790
 msgid "Problem encountered exporting presets."
 msgstr "Probléma merült fel a beállítások exportálásakor."
 
-#: Menus.cpp:4170 export/Export.cpp:408
+#: Menus.cpp:4791 export/Export.cpp:468
 msgid "Unable to export"
 msgstr "Exportálás sikertelen"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4975
 msgid "Remove Track"
 msgstr "Sáv törlése"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4975
 msgid "Removed audio track(s)"
 msgstr "Törölt audió sáv(ok)"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Új mintavételi ráta (Hz):"
-
-#: Menus.cpp:4508 Menus.cpp:4527 export/ExportMP3.cpp:1926
+#: Menus.cpp:5132 Menus.cpp:5187 export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr "Újramintavételezés"
 
-#: Menus.cpp:4514
+#: Menus.cpp:5152 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr "Új mintavételi ráta (Hz):"
+
+#: Menus.cpp:5176 TrackPanel.cpp:6385
 msgid "The entered value is invalid"
 msgstr "A beírt érték érvénytelen"
 
-#: Menus.cpp:4525
+#: Menus.cpp:5185
 #, c-format
 msgid "Resampling track %d"
 msgstr "%d. sáv újramintavételezése"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5194
 msgid "Resample Track"
 msgstr "Sáv újramintavételezése"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5194
 msgid "Resampled audio track(s)"
 msgstr "Hangsávok újramintavételezve"
 
-#: Mix.cpp:94 Mix.cpp:101
+#: Mix.cpp:95 Mix.cpp:102
 msgid "Mix"
 msgstr "Keverés"
 
-#: Mix.cpp:121
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
 msgstr "Sávok keverése és renderelése"
 
-#: NoteTrack.cpp:36
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "Jegyzetsáv"
 
-#: Printing.cpp:198
+#: Printing.cpp:192
 msgid "There was a problem printing."
 msgstr "Probléma adódott nyomtatás közben."
 
-#: Printing.cpp:199
+#: Printing.cpp:193
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: Project.cpp:636
+#: Project.cpp:673
 msgid "Main Mix"
 msgstr "Fő keverés"
 
-#: Project.cpp:761
+#: Project.cpp:797
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Üdvözli az Audacity %s verziója"
 
-#: Project.cpp:922
+#: Project.cpp:957
 msgid "(Recovered)"
 msgstr "(Helyreállított)"
 
-#: Project.cpp:1482 TrackPanel.cpp:804 toolbars/ControlToolBar.cpp:191
+#: Project.cpp:1546 TrackPanel.cpp:796 toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Felvétel"
 
-#: Project.cpp:1482 TrackPanel.cpp:804
+#: Project.cpp:1546 TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "Felvett Audió"
 
-#: Project.cpp:1500
+#: Project.cpp:1564
 msgid "Save changes before closing?"
 msgstr "Mentsük a változtatásokat kilépés előtt?"
 
-#: Project.cpp:1503
-msgid ""
-"\n"
+#: Project.cpp:1567
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "Ha menti, a projekt nem fog sávokat tartalmazni.\n"
 "\n"
 "A következőképp mentheti a korábban megnyitott sávokat:\n"
 "Mégsem, Szerkesztés > Visszavonás amíg minden\n"
 "sáv visszanyílik, majd Fájl > Projekt mentése."
 
-#: Project.cpp:1506
+#: Project.cpp:1570
 msgid "Save changes?"
 msgstr "Mentsük a változtatásokat?"
 
-#: Project.cpp:1694
+#: Project.cpp:1772
 msgid "All files|*.*|All supported files|"
 msgstr "Minden fájl|*.*|Minden támogatott fájl|"
 
-#: Project.cpp:1719
+#: Project.cpp:1802
 msgid "Select one or more audio files..."
 msgstr "Válassz ki egy vagy több audió fájt..."
 
-#: Project.cpp:1746
+#: Project.cpp:1829
 msgid "Audacity projects|*.aup|"
 msgstr "Audacity projektek|*.aup|"
 
-#: Project.cpp:1799 Project.cpp:2186
+#: Project.cpp:1882 Project.cpp:2304
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
@@ -2836,212 +2828,220 @@ msgid ""
 "Open this file now?"
 msgstr ""
 
-#: Project.cpp:1800
+#: Project.cpp:1883
 msgid "1.0 or earlier"
 msgstr "1.0 vagy korábbi"
 
-#: Project.cpp:1806 Project.cpp:2198
+#: Project.cpp:1889 Project.cpp:2316
 msgid "Opening old project file"
 msgstr "Régi projekt fájl megnyitása"
 
-#: Project.cpp:1832 Project.cpp:1840
+#: Project.cpp:1915 Project.cpp:1923
 msgid "Error opening file"
 msgstr "Hiba a fájl megnyitásakor"
 
-#: Project.cpp:1846
+#: Project.cpp:1929
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"A fájl érvénytelen vagy sérült: \n"
+msgstr "A fájl érvénytelen vagy sérült: \n"
 "%s"
 
-#: Project.cpp:1847
+#: Project.cpp:1930
 msgid "Error opening file or project"
 msgstr "Fájl vagy projekt megnyitása sikertelen"
 
-#: Project.cpp:1867
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
+#: Project.cpp:1950
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
 msgstr "Az Audacity nem tudja a korábbi verziójának projektfájljait átkonvertálni az új projektformátumba."
 
-#: Project.cpp:1970
+#: Project.cpp:2053
 msgid "Could not remove old auto save file"
-msgstr ""
+msgstr "Nem sikerült eltávolítani a régi automatikus mentést"
 
-#: Project.cpp:1972
+#: Project.cpp:2055
 msgid "Project was recovered"
 msgstr "A project helyreállítva"
 
-#: Project.cpp:1972
+#: Project.cpp:2055
 msgid "Recover"
 msgstr "Helyreállítás"
 
-#: Project.cpp:2001
+#: Project.cpp:2084
 msgid "Project checker repaired file"
 msgstr "A projekt ellenőrző megjavította a fájlt"
 
-#: Project.cpp:2001 effects/Repair.h:29
+#: Project.cpp:2084 effects/Repair.h:29
 msgid "Repair"
 msgstr "Javítás"
 
-#: Project.cpp:2112
+#: Project.cpp:2230
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "Nem található meg a projekt adat-könyvtára: \"%s\""
 
-#: Project.cpp:2155
+#: Project.cpp:2273
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Ezt a fájlt az Audacity %s. verziója mentette.\n"
+msgstr "Ezt a fájlt az Audacity %s. verziója mentette.\n"
 "Te az Audacity %s. verzióját használod - a fájl megnyitásához\n"
 "frissítened kell a programot."
 
-#: Project.cpp:2159
+#: Project.cpp:2277
 msgid "Can't open project file"
 msgstr "Nem lehet megnyitni a projekt fájlt"
 
-#: Project.cpp:2193
+#: Project.cpp:2311
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
-"You 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"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Ez a fájl az Audacity %s által lett mentve.\n"
-"Megnyithatja a fájlt az Audacity ezen verziójával, de ha ezzel a verzióval "
-"elmenti, a későbbiekben nem fogja tudni megnyitni a régebbi verziókkal.\n"
+msgstr "Ez a fájl az Audacity %s által lett mentve.\n"
+"Megnyithatja a fájlt az Audacity ezen verziójával, de ha ezzel a verzióval elmenti, a későbbiekben nem fogja tudni megnyitni a régebbi verziókkal.\n"
 "\n"
 "Megnyitja most a fájlt?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2588
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Nem lehet menteni a projektet. %s valószínűleg nem írható,\n"
-"vagy a lemez megtelt."
 
-#: Project.cpp:2428 Project.cpp:2442
+#: Project.cpp:2590 Project.cpp:2605
 msgid "Error saving project"
 msgstr "Hiba a projekt mentésekor"
 
-#: Project.cpp:2504
+#: Project.cpp:2680
 #, c-format
 msgid "Saved %s"
 msgstr "%s mentve"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Nyersadat"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "%s importálása..."
-
-#: Project.cpp:2586
+#: Project.cpp:2806
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' importálva"
 
-#: Project.cpp:2639 Project.cpp:2647
+#: Project.cpp:2807 import/ImportPCM.cpp:483 import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "Importálás"
+
+#: Project.cpp:2840 Project.cpp:2848
 msgid "Error importing"
 msgstr "Hiba az importálásnál"
 
-#: Project.cpp:2681
+#: Project.cpp:2882
 msgid "Save Speech As:"
 msgstr "Beszéd mentése mint:"
 
-#: Project.cpp:2683
+#: Project.cpp:2884
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM hangfájl (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+#: Project.cpp:2891
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Az Audacity projekt (.aup) fájlok segítségével mindegyik, munkához szükséges fájlt el tudsz menteni pontosan úgy, ahogyan a programban használva vannak. Viszont más programok nem ismerik fel ezt a fájlformátumot.\n"
+
+#: Project.cpp:2894
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Ha olyan fájlformátumban szeretnéd menteni a munkádat, amit más programok is támogatnak, akkor használd az Exportálás parancsot."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
-#: Project.cpp:2692
+#: Project.cpp:2898
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Audacity projektek (*.aup)|*.aup"
 
-#: Project.cpp:2736
+#: Project.cpp:2952
 msgid "Created new project"
 msgstr "Létrehozott új projekt"
 
-#: Project.cpp:2856
+#: Project.cpp:3111
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Törölve lett: %.2f másodperc. Törlés kezdőpontja (mp): %.2f"
 
-#: Project.cpp:2859 effects/Equalization.cpp:1262
-#: effects/Equalization.cpp:2593
+#: Project.cpp:3114 effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Törlés"
 
-#: Project.cpp:3052
+#: Project.cpp:3308
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr "A szabad lemezterület még %d óra és %d perc felvételéhez elegendő."
 
-#: Project.cpp:3055
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr "A szabad lemezterület még 1 óra és %d perc felvételéhez elegendő."
 
-#: Project.cpp:3058
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr "A szabad lemezterület még %d perc felvételéhez elegendő."
 
-#: Project.cpp:3061
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr "A szabad lemezterület még %d másodperc felvételéhez elegendő."
 
-#: Project.cpp:3064
+#: Project.cpp:3320
 msgid "Out of disk space"
 msgstr "Nincs elég szabad hely"
 
-#: Project.cpp:3342
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3614
 msgid "Could not remove old autosave file: "
 msgstr "Nem sikerült a régi automatikus mentést eltávolítani:"
 
-#: Project.cpp:3383
+#: Project.cpp:3655
 msgid "New Project"
 msgstr "Új projekt"
 
-#: Project.cpp:3396
+#: Project.cpp:3668
 msgid "Error writing autosave file"
 msgstr "Hiba az automatikus mentés írásakor"
 
-#: Project.cpp:3421
+#: Project.cpp:3693
 msgid "Could not create autosave file: "
 msgstr "Nem sikerült az automatikus mentést létrehozni:"
 
-#: Project.cpp:3447
+#: Project.cpp:3719
 #, c-format
 msgid "Actual Rate: %d"
 msgstr "Aktuális ráta: %d"
@@ -3094,58 +3094,26 @@ msgstr "Mentve "
 msgid "Error trying to save file: "
 msgstr "Hiba a fájl mentése közben: "
 
-#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
+#: Sequence.cpp:745 Sequence.cpp:755 Sequence.cpp:762
 msgid "Gap detected in project file\n"
 msgstr "Hézag került detektálásra a projekt fájlban\n"
 
-#: ShuttleGui.cpp:1852 effects/Effect.cpp:342
-#: effects/audiounits/AudioUnitEffect.cpp:872
+#: ShuttleGui.cpp:1972 effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
 msgstr "&Előnézet"
 
-#: ShuttleGui.cpp:1859
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "&Hibakeresés"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity időzített felvétel"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Felvétel kezdete"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Felvétel vége"
-
-#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
-#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Időtartam"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity okos felvétel állapot"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Kezdési dátum és idő"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Befejezési dátum és idő"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "Hang által aktivált felvétel"
 
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Várakozás a felvétel megkezdésére eddig: %s.\n"
-
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity okos felvétel - Várakozás a kezdésre"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "Aktiválás szintje (dB):"
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3155,693 +3123,645 @@ msgstr "Ü&dvözli az Audacity!"
 msgid "Don't show this again at start up"
 msgstr "Ne jelenjen meg ismét indításkor"
 
-#: Tags.cpp:629
+#: Tags.cpp:640
 msgid "Artist Name"
 msgstr "Előadó neve"
 
-#: Tags.cpp:630
+#: Tags.cpp:641
 msgid "Track Title"
 msgstr "Szám címe"
 
-#: Tags.cpp:631
+#: Tags.cpp:642
 msgid "Album Title"
 msgstr "Album címe"
 
-#: Tags.cpp:632
+#: Tags.cpp:643
 msgid "Track Number"
 msgstr "Zeneszám sorszáma"
 
-#: Tags.cpp:633 Tags.cpp:2138
+#: Tags.cpp:644 Tags.cpp:2147
 msgid "Year"
 msgstr "Év"
 
-#: Tags.cpp:634
+#: Tags.cpp:645
 msgid "Genre"
 msgstr "Műfaj"
 
-#: Tags.cpp:635 Tags.cpp:2148 prefs/MousePrefs.cpp:96
+#: Tags.cpp:646 Tags.cpp:2157 prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Megjegyzések"
 
-#: Tags.cpp:778 Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Nyomjon F2-t vagy kattintson duplán a szerkesztéshez."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
-#: Tags.cpp:802
+#: Tags.cpp:813
 msgid "Tag Name"
 msgstr "Tag neve"
 
-#: Tags.cpp:803
+#: Tags.cpp:814
 msgid "Tag Value"
 msgstr "Tag értéke"
 
-#: Tags.cpp:818 Tags.cpp:1476 prefs/KeyConfigPrefs.cpp:116
+#: Tags.cpp:829 Tags.cpp:1486 prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
 msgstr "&Törlés:"
 
-#: Tags.cpp:824
+#: Tags.cpp:835
 msgid "Genres"
 msgstr "Műfajok"
 
-#: Tags.cpp:828 Tags.cpp:1439 Tags.cpp:1980
-msgid "Edit"
-msgstr "Szerkeszt"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829 Tags.cpp:1981
-msgid "Reset"
-msgstr "Alaphelyzet"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
-#: Tags.cpp:834 Tags.cpp:1460 Tags.cpp:1988
+#: Tags.cpp:845 Tags.cpp:1470 Tags.cpp:1997
 msgid "Template"
 msgstr "Sablon"
 
-#: Tags.cpp:838 Tags.cpp:1464 Tags.cpp:1992 prefs/KeyConfigPrefs.cpp:126
+#: Tags.cpp:849 Tags.cpp:1474 Tags.cpp:2001 prefs/KeyConfigPrefs.cpp:126
 msgid "&Load..."
 msgstr "Tö&lt..."
 
-#: Tags.cpp:839 Tags.cpp:1465 Tags.cpp:1993 prefs/KeyConfigPrefs.cpp:125
+#: Tags.cpp:850 Tags.cpp:1475 Tags.cpp:2002 prefs/KeyConfigPrefs.cpp:125
 msgid "&Save..."
 msgstr "&Ment..."
 
-#: Tags.cpp:841 Tags.cpp:1467 Tags.cpp:1995
+#: Tags.cpp:852 Tags.cpp:1477 Tags.cpp:2004
 msgid "S&et Default"
 msgstr "Alapértelmezett beállítása"
 
-#: Tags.cpp:991 Tags.cpp:1630 Tags.cpp:2359
+#: Tags.cpp:1002 Tags.cpp:1640 Tags.cpp:2368
 msgid "Edit Genres"
 msgstr "Műfajok szerkesztése"
 
-#: Tags.cpp:1024 Tags.cpp:1036 Tags.cpp:1052 Tags.cpp:1065 Tags.cpp:1668
-#: Tags.cpp:1680 Tags.cpp:1696 Tags.cpp:1709 Tags.cpp:2402 Tags.cpp:2414
-#: Tags.cpp:2430 Tags.cpp:2443
+#: Tags.cpp:1035 Tags.cpp:1047 Tags.cpp:1062 Tags.cpp:1075 Tags.cpp:1678
+#: Tags.cpp:1690 Tags.cpp:1705 Tags.cpp:1718 Tags.cpp:2411 Tags.cpp:2423
+#: Tags.cpp:2438 Tags.cpp:2451
 msgid "Reset Genres"
 msgstr "Műfajok visszaállítása"
 
-#: Tags.cpp:1024 Tags.cpp:1065 Tags.cpp:1668 Tags.cpp:1709 Tags.cpp:2402
-#: Tags.cpp:2443
+#: Tags.cpp:1035 Tags.cpp:1075 Tags.cpp:1678 Tags.cpp:1718 Tags.cpp:2411
+#: Tags.cpp:2451
 msgid "Unable to save genre file."
 msgstr "Műfaj fájl mentése sikertelen."
 
-#: Tags.cpp:1035 Tags.cpp:1679 Tags.cpp:2413
+#: Tags.cpp:1046 Tags.cpp:1689 Tags.cpp:2422
 msgid "Are you sure you want to reset the genre list to defaults?"
 msgstr "Biztosan vissza kívánja állítani a műfajok listáját az alapértékekre?"
 
-#: Tags.cpp:1052 Tags.cpp:1696 Tags.cpp:2430
+#: Tags.cpp:1062 Tags.cpp:1705 Tags.cpp:2438
 msgid "Unable to open genre file."
 msgstr "Műfaj fájl megnyitása sikertelen."
 
-#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "Metaadat mentése mint:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
-#: Tags.cpp:1112 Tags.cpp:1763 Tags.cpp:2486
+#: Tags.cpp:1122 Tags.cpp:1772 Tags.cpp:2494
 msgid "Error loading metadata"
 msgstr "Hiba a metaadat betöltésekor"
 
-#: Tags.cpp:1409 Tags.cpp:1968
-msgid "Title:"
-msgstr "Cím:"
-
-#: Tags.cpp:1410 Tags.cpp:1969
-msgid "Artist:"
-msgstr "Előadó:"
-
-#: Tags.cpp:1411 Tags.cpp:1970
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Zeneszerző:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Dalszövegíró:"
-
-#: Tags.cpp:1414 Tags.cpp:1973
-msgid "Comments:"
-msgstr "Megjegyzés:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Tömörítő:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Jogtulajdonos:"
-
-#: Tags.cpp:1424 Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Sorszám:"
-
-#: Tags.cpp:1428 Tags.cpp:1972
-msgid "Year:"
-msgstr "Év:"
-
-#: Tags.cpp:1432 Tags.cpp:1974
-msgid "Genre:"
-msgstr "Műfaj"
-
-#: Tags.cpp:1490 Tags.cpp:2089
-msgid "No Genres"
-msgstr "Nincs műfaj"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Alapértékek visszaállítása"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Egyszerű"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Haladó"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Érték"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "&Töröl"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "A '%s' attribútum maximális hossza %d karakter. A többi adat levégásra kerül."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Cím"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Előadó"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album"
+#: Tags.cpp:1097 Tags.cpp:1151 Tags.cpp:1751 Tags.cpp:1787 Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "Metaadat mentése mint:"
 
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Az Audacity nem tudta írni a fájlt:\n"
+msgstr "Az Audacity nem tudta írni a fájlt:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Az Audacity nem tudta megnyitni a fájlt:\n"
+msgstr "Az Audacity nem tudta megnyitni a fájlt:\n"
 "  %s\n"
 "írásra."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Az Audacity nem tudott képeket írni a fájlba:\n"
+msgstr "Az Audacity nem tudott képeket írni a fájlba:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Az Audacity nem találta a fáljt:\n"
+msgstr "Az Audacity nem találta a fáljt:\n"
 "  %s.\n"
 "Téma nem lett betöltve."
 
 #: Theme.cpp:807 Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Az Audacity nem tudta betölteni a fájlt:\n"
+msgstr "Az Audacity nem tudta betölteni a fájlt:\n"
 "  %s.\n"
 "Talán hibás formátumú a png?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Az Audacity nem tudta beolvasni az alapértelmezet témáját.\n"
+msgstr "Az Audacity nem tudta beolvasni az alapértelmezet témáját.\n"
 "Kérem, jelentse a problémát."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
 msgstr ""
 
 #: Theme.cpp:942 effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Nem sikerült a könyvtárat létrehozni:\n"
+msgstr "Nem sikerült a könyvtárat létrehozni:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Az Audacity nem tudta menteni a fájlt:\n"
+msgstr "Az Audacity nem tudta menteni a fájlt:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
 msgstr ""
 
-#: TrackPanel.cpp:464 TrackPanel.cpp:465
+#: TimeDialog.cpp:53 TimerRecordDialog.cpp:227 TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309 effects/Noise.cpp:243 effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "Időtartam"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity időzített felvétel"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "Felvétel kezdete"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "Felvétel vége"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr "Audacity időzített felvétel állapota"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "Kezdési dátum és idő"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr "Kezdési dátum"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Befejezési dátum és idő"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr "Befejezési dátum"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Várakozás a felvétel megkezdésére eddig: %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Audacity időzített felvétel - Várakozás a kezdésre"
+
+#: TrackPanel.cpp:457 TrackPanel.cpp:458
 msgid "Track Panel"
 msgstr "Sáv panel"
 
-#: TrackPanel.cpp:548 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
+#: TrackPanel.cpp:541 prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Egyéb..."
 
-#: TrackPanel.cpp:556 TrackPanel.cpp:580 TrackPanel.cpp:589 TrackPanel.cpp:597
+#: TrackPanel.cpp:549 TrackPanel.cpp:571 TrackPanel.cpp:580 TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "Név..."
 
-#: TrackPanel.cpp:558 TrackPanel.cpp:582 TrackPanel.cpp:593 TrackPanel.cpp:599
+#: TrackPanel.cpp:551 TrackPanel.cpp:573 TrackPanel.cpp:584 TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
 msgstr "Sáv mozgatása felfelé"
 
-#: TrackPanel.cpp:559 TrackPanel.cpp:583 TrackPanel.cpp:594 TrackPanel.cpp:600
+#: TrackPanel.cpp:552 TrackPanel.cpp:574 TrackPanel.cpp:585 TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
 msgstr "Sáv mozgatása lefelé"
 
-#: TrackPanel.cpp:561 effects/ToneGen.cpp:325
+#: TrackPanel.cpp:554 effects/ToneGen.cpp:319 prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Hullámforma"
 
-#: TrackPanel.cpp:562
+#: TrackPanel.cpp:555 prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "Hullámforma (dB)"
 
-#: TrackPanel.cpp:565
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
 msgid "Spectrum log(f)"
 msgstr "Spektrum log(f)"
 
-#: TrackPanel.cpp:567
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558 prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
 msgstr "Hangmagasság (FAK)"
 
-#: TrackPanel.cpp:569 TrackPanel.cpp:6091
+#: TrackPanel.cpp:560 TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "Monó"
 
-#: TrackPanel.cpp:570 TrackPanel.cpp:6090
+#: TrackPanel.cpp:561 TrackPanel.cpp:6095
 msgid "Left Channel"
 msgstr "Bal csatorna"
 
-#: TrackPanel.cpp:571 TrackPanel.cpp:6090
+#: TrackPanel.cpp:562 TrackPanel.cpp:6095
 msgid "Right Channel"
 msgstr "Jobb csatorna"
 
-#: TrackPanel.cpp:572
+#: TrackPanel.cpp:563
 msgid "Make Stereo Track"
 msgstr "Sztereó sáv készítése"
 
-#: TrackPanel.cpp:573
+#: TrackPanel.cpp:564
 msgid "Split Stereo Track"
 msgstr "Sztereó sáv szétvágása"
 
-#: TrackPanel.cpp:575
+#: TrackPanel.cpp:566
 msgid "Set Sample Format"
 msgstr "Hangminta formátum beállítása"
 
-#: TrackPanel.cpp:577 TrackPanel.cpp:6320
+#: TrackPanel.cpp:568 TrackPanel.cpp:6341
 msgid "Set Rate"
 msgstr "M. frekv. beállítása"
 
-#: TrackPanel.cpp:585
+#: TrackPanel.cpp:576
 msgid "Up Octave"
 msgstr "Egy oktávval feljebb"
 
-#: TrackPanel.cpp:586
+#: TrackPanel.cpp:577
 msgid "Down Octave"
 msgstr "Egy oktávval lejjebb"
 
-#: TrackPanel.cpp:591
+#: TrackPanel.cpp:582 TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "Betűtípus"
 
-#: TrackPanel.cpp:602
+#: TrackPanel.cpp:593
 msgid "Set Range..."
 msgstr "Tartomány beállítása..."
 
-#: TrackPanel.cpp:606 toolbars/EditToolBar.cpp:135
+#: TrackPanel.cpp:597 toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Másolás"
 
-#: TrackPanel.cpp:1272
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
+#: TrackPanel.cpp:1258
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
 msgstr "Kattints a vízszintes irányú nagyításhoz, SHIFT-kattintás a kicsinyítéshez, Vonszolás a részleges nagyítási terület meghatározásához."
 
-#: TrackPanel.cpp:1277
+#: TrackPanel.cpp:1263
 msgid "Drag the label vertically to change the order of the tracks."
 msgstr "Vonszold a címkéket függőleges irányban a sávok átrendezéséhez."
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1283
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr "Kattints és mozgasd a kurzort a sztereó sávok relatív méretének beállításához."
 
-#: TrackPanel.cpp:1300
+#: TrackPanel.cpp:1286
 msgid "Click and drag to resize the track."
 msgstr "Kattints és mozgasd a kurzort a sáv átméretezéséhez"
 
-#: TrackPanel.cpp:1331
+#: TrackPanel.cpp:1317
 msgid "Drag one or more label boundaries"
-msgstr ""
+msgstr "Egy vagy több címke határának vonszolása"
 
-#: TrackPanel.cpp:1332
+#: TrackPanel.cpp:1318
 msgid "Drag label boundary"
-msgstr ""
+msgstr "Címke határának vonszolása"
 
 #. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1348
+#: TrackPanel.cpp:1334
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr "Multi-Eszköz mód. Cmd-, az Egér és Billentyűparancsok beállításaihoz"
 
 #. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1351
+#: TrackPanel.cpp:1337
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr "Multi-Eszköz mód: Ctrl-P az Egér és a Billentyűzet Beállításához"
 
-#: TrackPanel.cpp:1371
+#: TrackPanel.cpp:1383
 msgid "Click and drag to move left selection boundary."
 msgstr "Kattints és mozgasd a kurzort a kijelölés bal szélének mdosításához"
 
-#: TrackPanel.cpp:1376
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move right selection boundary."
 msgstr "Kattints és mozgasd a kurzort a kijelölés jobb szélének mdosításához"
 
-#: TrackPanel.cpp:1702 TrackPanel.cpp:3993 TrackPanel.cpp:4025
-#: TrackPanel.cpp:4280 TrackPanel.cpp:6432 TrackPanel.cpp:6452
+#: TrackPanel.cpp:1730 TrackPanel.cpp:3959 TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255 TrackPanel.cpp:6490 TrackPanel.cpp:6510
 msgid "Modified Label"
 msgstr "Módosított címke"
 
-#: TrackPanel.cpp:1703 TrackPanel.cpp:3994 TrackPanel.cpp:4026
-#: TrackPanel.cpp:4281 TrackPanel.cpp:6433 TrackPanel.cpp:6453
+#: TrackPanel.cpp:1731 TrackPanel.cpp:3960 TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256 TrackPanel.cpp:6491 TrackPanel.cpp:6511
 msgid "Label Edit"
 msgstr "Címke szerkesztése"
 
-#: TrackPanel.cpp:1930
+#: TrackPanel.cpp:1971
 msgid "Adjusted envelope."
 msgstr "Módosított burkológörbe."
 
-#: TrackPanel.cpp:1931 prefs/MousePrefs.cpp:115
+#: TrackPanel.cpp:1972 prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Burkológörbe"
 
-#: TrackPanel.cpp:2082
+#: TrackPanel.cpp:2123
 msgid "Moved clip to another track"
 msgstr ""
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "left"
 msgstr "balra"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "right"
 msgstr "jobbra"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2088
+#: TrackPanel.cpp:2129
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr ""
 
-#: TrackPanel.cpp:2092 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
+#: TrackPanel.cpp:2133 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "Idő-eltolás"
 
-#: TrackPanel.cpp:2953
+#: TrackPanel.cpp:2916
 msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: TrackPanel.cpp:2970
+#: TrackPanel.cpp:2933
 msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr ""
 
-#: TrackPanel.cpp:3241
+#: TrackPanel.cpp:3205
 msgid "Moved Sample"
 msgstr "Mozgatott hangminta"
 
-#: TrackPanel.cpp:3242
+#: TrackPanel.cpp:3206
 msgid "Sample Edit"
 msgstr "Hangminta szerkesztés"
 
-#: TrackPanel.cpp:3341
+#: TrackPanel.cpp:3305
 #, c-format
 msgid "Removed track '%s.'"
 msgstr "Törölt sáv '%s.'"
 
-#: TrackPanel.cpp:3343
+#: TrackPanel.cpp:3307
 msgid "Track Remove"
 msgstr "Sáv törlése"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved gain slider"
 msgstr "Mozgatott gain csúszka"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved pan slider"
 msgstr "Mozgatott pan csúszka"
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5726 TrackPanel.cpp:7149
+#: TrackPanel.cpp:3449 TrackPanel.cpp:5703 TrackPanel.cpp:7244
 msgid "Gain"
 msgstr "Hangerő"
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5664 TrackPanel.cpp:7156
+#: TrackPanel.cpp:3449 TrackPanel.cpp:5641 TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "Pan"
 
-#: TrackPanel.cpp:3610 TrackPanel.cpp:6385 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3576 TrackPanel.cpp:6441
 msgid "up"
 msgstr "fel"
 
-#: TrackPanel.cpp:3614 TrackPanel.cpp:6386 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3580 TrackPanel.cpp:6442
 msgid "down"
 msgstr "le"
 
-#: TrackPanel.cpp:3621 TrackPanel.cpp:6381
+#: TrackPanel.cpp:3587 TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "'%s' %sfelé mozgatva"
 
-#: TrackPanel.cpp:3624 TrackPanel.cpp:6387
+#: TrackPanel.cpp:3590 TrackPanel.cpp:6443
 msgid "Move Track"
 msgstr "Sáv mozgatása"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expand"
-msgstr ""
+msgstr "Kiterjesztés"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expanded Cut Line"
 msgstr ""
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merge"
 msgstr ""
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merged Clips"
 msgstr ""
 
-#: TrackPanel.cpp:4201
+#: TrackPanel.cpp:4176
 msgid "Removed Cut Line"
 msgstr ""
 
-#: TrackPanel.cpp:5664
+#: TrackPanel.cpp:5641
 msgid "Adjusted Pan"
 msgstr ""
 
-#: TrackPanel.cpp:5726
+#: TrackPanel.cpp:5703
 msgid "Adjusted gain"
 msgstr ""
 
-#: TrackPanel.cpp:5918
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
 msgstr "Nem törölhető sáv aktív hanggal"
 
-#: TrackPanel.cpp:6071
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Sztereó, "
 
-#: TrackPanel.cpp:6074
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Monó, "
 
-#: TrackPanel.cpp:6076
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "Bal, "
 
-#: TrackPanel.cpp:6078
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "Jobb, "
 
-#: TrackPanel.cpp:6100 TrackPanel.cpp:6225
+#: TrackPanel.cpp:6105 TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "'%s' sáv %s-vá változtatása"
 
-#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6110
 msgid "Channel"
 msgstr "Csatorna"
 
-#: TrackPanel.cpp:6118
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "'%s' sztereó sáv szétvágása"
 
-#: TrackPanel.cpp:6139
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "'%s' sztereó sávvá alakítása"
 
-#: TrackPanel.cpp:6142
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
 msgstr "Sztereó készítése"
 
-#: TrackPanel.cpp:6189
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "'%s' sáv megváltoztatva %d Hz-esre"
 
-#: TrackPanel.cpp:6191
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "Frekv. változtatása"
 
-#: TrackPanel.cpp:6229
+#: TrackPanel.cpp:6255
 msgid "Format Change"
 msgstr "Formátum változtatás"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Írj be egy mintasűrűséget Hz( per másodperc)-ben, 1 és 100000 között:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Érvénytelen érték."
-
-#: TrackPanel.cpp:6349
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
 msgstr "Alsó sebességhatár változtatása (%):"
 
-#: TrackPanel.cpp:6350 TrackPanel.cpp:6351
+#: TrackPanel.cpp:6406 TrackPanel.cpp:6407
 msgid "Lower speed limit"
 msgstr "Alsó sebesség határa"
 
-#: TrackPanel.cpp:6356
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
 msgstr "Felső sebességhatár változtatása (%):"
 
-#: TrackPanel.cpp:6357 TrackPanel.cpp:6358
+#: TrackPanel.cpp:6413 TrackPanel.cpp:6414
 msgid "Upper speed limit"
 msgstr "Felső sebesség határa"
 
-#: TrackPanel.cpp:6366
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Tartomány beállítása '%d' - '%d' között"
 
-#: TrackPanel.cpp:6369
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "Tartomány beállítása"
 
-#: TrackPanel.cpp:6414
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
 msgstr "Sáv átnevezése erre:"
 
-#: TrackPanel.cpp:6415
+#: TrackPanel.cpp:6473
 msgid "Track Name"
 msgstr "Sáv neve"
 
-#: TrackPanel.cpp:6418
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "'%s' átnevezve erre: '%s'"
 
-#: TrackPanel.cpp:6421
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "Név változtatása"
 
-#: TrackPanel.cpp:6487
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
 msgstr "Címkesáv Betűtípus"
 
-#: TrackPanel.cpp:6499
+#: TrackPanel.cpp:6592 TrackPanel.cpp:6598
 msgid "Face name"
 msgstr ""
 
-#: TrackPanel.cpp:6508
+#: TrackPanel.cpp:6602 TrackPanel.cpp:6609
 msgid "Face size"
 msgstr ""
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Néma"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Szóló"
 
-#: TrackPanelAx.cpp:265
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
 msgstr ""
 
-#: TrackPanelAx.cpp:273
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
 msgstr ""
 
-#: TrackPanelAx.cpp:281
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
 msgstr "%d. sáv"
 
-#: TrackPanelAx.cpp:287
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr " Némítás be"
 
-#: TrackPanelAx.cpp:292
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
 msgstr " Szóló be"
 
-#: TrackPanelAx.cpp:296
+#: TrackPanelAx.cpp:304
 msgid " Select On"
 msgstr " Kijelölés be"
 
@@ -3868,64 +3788,65 @@ msgstr ""
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr ""
 
-#: WaveTrack.cpp:85
+#: WaveTrack.cpp:88
 msgid "Audio Track"
 msgstr "Audio Sáv"
 
-#: WaveTrack.cpp:555 WaveTrack.cpp:574
+#: WaveTrack.cpp:597 WaveTrack.cpp:616 WaveTrack.cpp:1057 WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
 msgstr "Nincs elegendő hely a kijelölés beillesztéséhez"
 
-#: WaveTrack.cpp:1688
+#: WaveTrack.cpp:2052
 msgid "There is not enough room available to expand the cut line"
 msgstr "Nincs elegendő hely a kivágás vonalának kiterjesztéséhez"
 
-#: commands/CommandManager.cpp:448
+#: commands/CommandManager.cpp:555
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "Plugin-ek 1-től %i-ig"
 
-#: commands/CommandManager.cpp:462
+#: commands/CommandManager.cpp:569
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "Plugin-ek %i-től %i-ig"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
-msgstr ""
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "Letiltott valamilyen okból.  Próbált kijelölni némi hangot?"
 
-#: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+#: commands/CommandManager.cpp:892
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
+msgstr "Ezt csak olyankor teheti meg, mikor a lejátszás és\n"
+" a felvétel áll.  [A szünet nem elég.]"
 
-#: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+#: commands/CommandManager.cpp:894
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
+msgstr "Először ki kell jelölnie némi sztereó hangot, hogy\n"
+" ezt használja.  [Nem használhatja mono-val.]"
 
-#: commands/CommandManager.cpp:785
+#: commands/CommandManager.cpp:896
 msgid "You must first select some audio for this to use."
-msgstr ""
+msgstr "Először ki kell jelölnie némi hangot, hogy ezt használja."
 
-#: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+#: commands/CommandManager.cpp:898
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
+msgstr "Először ki kell jelölnie némi hangot, hogy\n"
+" ezt használja. [Másfajta sávval nem működik.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Ãœzenet"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr "Letiltott"
 
-#: commands/CommandManager.cpp:972
+#: commands/CommandManager.cpp:1083
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
 msgstr "Betöltve %d Billentyűparancs\n"
 
-#: commands/CommandManager.cpp:974
+#: commands/CommandManager.cpp:1085
 msgid "Loading keyboard shortcuts"
 msgstr "Billentyűparancsok betöltése"
 
@@ -3934,42 +3855,45 @@ msgstr "Billentyűparancsok betöltése"
 msgid "Applied effect: %s %.1f dB"
 msgstr "Végrehajtott effekt: %s %.1f dB-el"
 
-#: effects/Amplify.cpp:87
+#: effects/Amplify.cpp:139
 msgid "Amplify"
 msgstr "Erősítés"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Erősítő. Készítette: Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "(Dominic Mazzoni)"
 
-#: effects/Amplify.cpp:159
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "Erősítés (dB):"
 
-#: effects/Amplify.cpp:179
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "Új amplitúdó csúcsérték (dB):"
 
-#: effects/Amplify.cpp:191
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
 msgstr "Torzítás engedélyezése"
 
-#: effects/Amplify.cpp:237 effects/Amplify.cpp:287 effects/Amplify.cpp:353
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
 msgid "-Infinity"
 msgstr "-Végtelen"
 
-#: effects/Amplify.h:46
+#: effects/Amplify.h:37
 msgid "Amplify..."
 msgstr "Erősítés"
 
-#: effects/Amplify.h:54
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "Erősítés végrehajtása"
 
 #: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
 msgstr ""
 
 #: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:453
@@ -3978,12 +3902,8 @@ msgid "Auto Duck"
 msgstr "Auto alámerülés"
 
 #: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
-msgstr ""
-"Az Auto alámerülésnek egy vezérlő sávra van szüksége, melyet a kiválasztott"
-"sáv(ok) alá kell helyezni."
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Az Auto alámerülésnek egy vezérlő sávra van szüksége, melyet a kiválasztottsáv(ok) alá kell helyezni."
 
 #: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
@@ -4000,9 +3920,12 @@ msgstr "Maximum szünet:"
 #. i18n-hint: Name of time display format that shows time in seconds
 #: effects/AutoDuck.cpp:494 effects/AutoDuck.cpp:499 effects/AutoDuck.cpp:504
 #: effects/AutoDuck.cpp:509 effects/AutoDuck.cpp:514
-#: prefs/AudioIOPrefs.cpp:166 prefs/AudioIOPrefs.cpp:174
-#: prefs/AudioIOPrefs.cpp:176 prefs/AudioIOPrefs.cpp:201
-#: prefs/AudioIOPrefs.cpp:203 widgets/TimeTextCtrl.cpp:263
+#: prefs/AudioIOPrefs.cpp:172 prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182 prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209 prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163 prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189 prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
 msgstr "másodperc"
 
@@ -4022,7 +3945,7 @@ msgstr ""
 msgid "Inner fade up length:"
 msgstr ""
 
-#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:484
+#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:494
 msgid "Threshold:"
 msgstr "Küszöbszint:"
 
@@ -4030,22 +3953,21 @@ msgstr "Küszöbszint:"
 msgid "Please enter valid values."
 msgstr "Kérem adjon meg érvényes értékeket."
 
-#: effects/AutoDuck.cpp:704
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
 msgstr "Előnézet nem elérhető"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr "Auto alámerülés..."
 
-#: effects/AutoDuck.h:107
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr "Auto alámerülés feldolgozása..."
 
-#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:448
-#: effects/audiounits/AudioUnitEffect.cpp:877 effects/nyquist/Nyquist.cpp:1042
-#: widgets/ErrorDialog.cpp:79 widgets/ErrorDialog.cpp:105
-#: widgets/Warning.cpp:67
+#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882 effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "Rendben"
 
@@ -4058,23 +3980,31 @@ msgstr "Végrehajtott effekt: %s %.0f Hz-en, %.0f dB-es kiemeléssel"
 msgid "Bass Boost"
 msgstr "Basszus kiemelés"
 
-#: effects/BassBoost.cpp:182
+#: effects/BassBoost.cpp:182 effects/Phaser.cpp:219 effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr "(Nasca Octavian Paul)"
 
-#: effects/BassBoost.cpp:196
+#: effects/BassBoost.cpp:196 effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
 msgstr "Frekvencia (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Kiemelés (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Basszus kiemelés..."
 
-#: effects/BassBoost.h:43
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
 msgstr "Basszusfrekvenciák kiemelése"
 
@@ -4091,250 +4021,593 @@ msgstr "Hossz változtatása..."
 msgid "Applied effect: %s %.2f semitones"
 msgstr "Végrehajtott effekt: %s %.2f félhanggal"
 
-#: effects/ChangePitch.cpp:118
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
 msgstr "Hangmagasság változtatása"
 
-#: effects/ChangePitch.cpp:247
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
 msgstr "Hangmagasság változtatása a Tempó megtartásával"
 
-#. i18n-hint: && in here is an escape character to get a single & on
-#. * screen, so keep it as is
-#: effects/ChangePitch.cpp:254 effects/ChangeSpeed.cpp:313
-#: effects/ChangeTempo.cpp:180
+#: effects/ChangePitch.cpp:258 effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "Készítette: Vaughan Johnson && Dominic Mazzoni"
 
-#: effects/ChangePitch.cpp:259 effects/ChangeTempo.cpp:185
+#: effects/ChangePitch.cpp:260 effects/ChangeTempo.cpp:175
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "Soundtouch. Készítette: Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Hangmagasság:   erről:"
+msgid "Pitch:"
+msgstr ""
 
-#: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
-#: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
-#: effects/ChangeTempo.cpp:270
-msgid "to"
-msgstr "erre:"
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
 
-#: effects/ChangePitch.cpp:306
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
 msgstr "Módosítandó hangok száma (fél lépésekben):"
 
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frekvencia (Hz):   erről:"
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
 
-#: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
-#: effects/ChangeTempo.cpp:198
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206 effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
+
+#: effects/ChangePitch.cpp:331 effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211 effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "erre:"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
+
+#: effects/ChangePitch.cpp:338 effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
 msgid "Percent Change:"
 msgstr "Változtatás százalékban:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:195
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Hangmagasság változtatása"
 
-#: effects/ChangePitch.h:39
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
 msgstr "Hangmagasság változtatása"
 
-#: effects/ChangeSpeed.cpp:53 effects/ChangeTempo.cpp:55
+#: effects/ChangeSpeed.cpp:54 effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "Végrehajtott effekt: %s %.1f%%-re"
 
-#: effects/ChangeSpeed.cpp:60
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
 msgstr "Sebesség változtatása"
 
-#: effects/ChangeSpeed.cpp:308
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
+msgid "n/a"
+msgstr "n/a"
+
+#: effects/ChangeSpeed.cpp:334
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Sebesség változtatása, kihatással a Tempóra és Hangmagasságra"
 
-#: effects/ChangeSpeed.cpp:318
+#: effects/ChangeSpeed.cpp:338
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "SampleRate. Készítette: Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Sztenderd Lemezjátszó RPM:   erről:"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
 msgstr "Sebesség változtatása"
 
-#: effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
 msgstr "Sebesség változtatása"
 
-#: effects/ChangeTempo.cpp:74
+#: effects/ChangeTempo.cpp:138
 msgid "Change Tempo"
 msgstr "Tempo változtatása"
 
-#: effects/ChangeTempo.cpp:175
+#: effects/ChangeTempo.cpp:171
 msgid "Change Tempo without Changing Pitch"
 msgstr "Tempó változtatása a Hangmagasság megtartásával"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Beats per Minute (BPM):   erről:"
+#: effects/ChangeTempo.cpp:203
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:216
+msgid "Length (seconds):"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Hossz (másodperc):   erről:"
+#: effects/ChangeTempo.cpp:220
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:225
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
 msgstr "Tempó megváltoztatása"
 
-#: effects/ChangeTempo.h:43
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
 msgstr "Tempó változtatása"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
-msgstr "Sercegés eltávolítás"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
+msgstr ""
 
-#: effects/ClickRemoval.cpp:336
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Sercegés és Pattogás eltávolítás. Készítette: Craig DeForest"
 
-#: effects/ClickRemoval.cpp:350
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
-#: effects/ClickRemoval.cpp:362
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Sercegés eltávolítás..."
 
-#: effects/ClickRemoval.h:50
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
 msgstr "Sercegés és pattogás eltávolítása..."
 
-#: effects/Compressor.cpp:74
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "Dinamika tartomány Kompresszor"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dinamika tartomány Kompresszor. Készítette: Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Arány: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
-msgstr "Felfutási idő:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
-msgstr "Lecsengési idő:"
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
 
-#: effects/Compressor.cpp:516
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizálás 0dB-re kompresszálás után"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
-msgstr "Küszöbszint: %d dB"
+msgid "Threshold %d dB"
+msgstr ""
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Arány: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Arány: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
-msgstr "Felfutási idő: %.1f mp"
+msgid "%.0f:1"
+msgstr ""
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Decay Time: %.1f secs"
-msgstr "Lecsengési idő: %.1f mp"
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr ""
 
 #: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "Kompresszor"
 
-#: effects/Compressor.h:44
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
 msgstr "Dinamika tartomány kompressziójának végrehajtása..."
 
-#: effects/DtmfGen.cpp:48
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:190
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:277 effects/Contrast.cpp:288 effects/Contrast.cpp:371
+#: effects/Contrast.cpp:415
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:318
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:321
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:355 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Kezdet"
+
+#: effects/ToneGen.cpp:356 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156 toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Vég"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:335
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:378
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:426
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:430
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:840 Tags.cpp:1990
+msgid "Reset"
+msgstr "Alaphelyzet"
+
+#: effects/Contrast.cpp:434
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:445
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:466 effects/Contrast.cpp:472 effects/Contrast.cpp:478
+#: effects/Contrast.cpp:484
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:517 effects/Contrast.cpp:527
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:532
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:534
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr ""
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr "DTMF hang generátor"
 
-#: effects/DtmfGen.cpp:439
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "(Salvo Ventura, 2006)"
 
-#: effects/DtmfGen.cpp:443
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "DTMF szekvencia:"
 
-#: effects/DtmfGen.cpp:446 effects/Noise.cpp:255 effects/ToneGen.cpp:328
-#: effects/ToneGen.cpp:365
+#: effects/DtmfGen.cpp:463 effects/Noise.cpp:242 effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "Amplitúdó (0-1)"
 
-#: effects/DtmfGen.cpp:448
+#: effects/DtmfGen.cpp:465
 msgid "Duration:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:469
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:479
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:481
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:482 effects/DtmfGen.cpp:484 effects/DtmfGen.cpp:560
-#: effects/DtmfGen.cpp:561
+#: effects/DtmfGen.cpp:499 effects/DtmfGen.cpp:501 effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
 msgstr "ms"
 
-#: effects/DtmfGen.cpp:483
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr "Csend időtartama:"
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
 msgstr "DTMF hangok..."
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
 msgstr ""
 
-#: effects/DtmfGen.h:53
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
 msgstr "DTMF hangok generálása"
 
@@ -4349,7 +4622,7 @@ msgstr "Visszhang"
 
 #. i18n-hint: && in here is an escape character to get a single & on
 #. * screen, so keep it as is
-#: effects/Echo.cpp:195
+#: effects/Echo.cpp:195 effects/Repeat.cpp:200
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "Készítette: Dominic Mazzoni && Vaughan Johnson"
 
@@ -4365,27 +4638,23 @@ msgstr "Elhalási érték:"
 msgid "Echo..."
 msgstr "Visszhang..."
 
-#: effects/Echo.h:42
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "Visszhang végrehajtása"
 
-#: effects/Effect.cpp:390
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
 msgstr "Előnézet létrehozása"
 
-#: effects/Effect.cpp:419
+#: effects/Effect.cpp:497
 msgid "Previewing"
 msgstr "Előnézet"
 
-#: effects/Effect.cpp:435
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"Hiba a hangeszköz megnyitása közben. Kérem, ellenőrizze a bemeneti eszköz "
-"beállításait és a projekt mintavételezési frekvenciáját."
+#: effects/Effect.cpp:512
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "Hiba a hangeszköz megnyitása közben. Kérem, ellenőrizze a bemeneti eszköz beállításait és a projekt mintavételezési frekvenciáját."
 
-#: effects/Effect.h:107
+#: effects/Effect.h:100
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Végrehajtott effekt: %s"
@@ -4402,78 +4671,78 @@ msgstr "Koszinusz"
 msgid "Cubic"
 msgstr "Köbös"
 
-#: effects/Equalization.cpp:362 effects/Equalization.cpp:412
+#: effects/Equalization.cpp:367 effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "Hangszínszabályzó"
 
-#: effects/Equalization.cpp:980
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
 msgstr "EQ görbe betöltése sikertelen"
 
-#: effects/Equalization.cpp:1019
+#: effects/Equalization.cpp:1033
 msgid "custom"
 msgstr "egyéni"
 
 #. i18n-hint: && in here is an escape character to get a single &
 #. * on screen, so keep it as is
-#: effects/Equalization.cpp:1087
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr "Hangszínszabályzó (Martyn Shaw && Mitch Golden)"
 
-#: effects/Equalization.cpp:1108
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr "Max dB"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr "Min dB"
 
-#: effects/Equalization.cpp:1183
+#: effects/Equalization.cpp:1197
 msgid "kHz"
 msgstr "kHz"
 
-#: effects/Equalization.cpp:1200
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
 msgstr "Görbék rajzolása"
 
-#: effects/Equalization.cpp:1205
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
 msgstr "Grafikus EQ"
 
-#: effects/Equalization.cpp:1219
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
 msgstr "Lineáris frekvencia skála"
 
-#: effects/Equalization.cpp:1228
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
 msgstr "Szűrő hossza:"
 
-#: effects/Equalization.cpp:1249
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
 msgstr "Görbe kiválasztása:"
 
-#: effects/Equalization.cpp:1259 effects/Equalization.cpp:2498
-#: export/ExportMultiple.cpp:826
+#: effects/Equalization.cpp:1273 effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
 msgstr "Mentés mint..."
 
-#: effects/Equalization.cpp:1265
+#: effects/Equalization.cpp:1279
 msgid "Flat"
 msgstr "Sík"
 
-#: effects/Equalization.cpp:2497
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
 msgstr "Adja meg a görbe nevét"
 
-#: effects/Equalization.cpp:2597
+#: effects/Equalization.cpp:2611 export/ExportFFmpegDialogs.cpp:1220
 msgid "Confirm Deletion"
 msgstr "Törlés megerősítése"
 
-#: effects/Equalization.h:87
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "Hangszínszabályzó..."
 
-#: effects/Equalization.h:95
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "Hangszínszabályzás végrehajtása"
 
@@ -4481,15 +4750,15 @@ msgstr "Hangszínszabályzás végrehajtása"
 msgid "Fade In"
 msgstr "Felkeverés"
 
-#: effects/Fade.h:32
+#: effects/Fade.h:38
 msgid "Fading In"
 msgstr "Felkeverés"
 
-#: effects/Fade.h:48
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "Lekeverés"
 
-#: effects/Fade.h:56
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "Lekeverés"
 
@@ -4525,7 +4794,7 @@ msgstr ""
 msgid "Find Clipping..."
 msgstr "Vágás keresése..."
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr "Vágás detektálása..."
 
@@ -4533,66 +4802,218 @@ msgstr "Vágás detektálása..."
 msgid "Invert"
 msgstr "Invertálás"
 
-#: effects/Invert.h:35
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "Invertálás"
 
-#: effects/Leveller.cpp:52
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "Kiegyenlítő"
+
+#: effects/Leveller.cpp:203
 msgid "None-Skip"
 msgstr "Nincs-Kihagy"
 
-#: effects/Leveller.cpp:53
+#: effects/Leveller.cpp:204
 msgid "Light"
 msgstr "Enyhe"
 
-#: effects/Leveller.cpp:54
+#: effects/Leveller.cpp:205
 msgid "Moderate"
 msgstr "Közepes"
 
-#: effects/Leveller.cpp:55
+#: effects/Leveller.cpp:206
 msgid "Heavy"
 msgstr "Erős"
 
-#: effects/Leveller.cpp:56
+#: effects/Leveller.cpp:207
 msgid "Heavier"
 msgstr "Erősebb"
 
-#: effects/Leveller.cpp:57
+#: effects/Leveller.cpp:208
 msgid "Heaviest"
 msgstr "Legerősebb"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Kiegyenlítő"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Kiegyenlítő. Készítette: Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Halk és hangos részek kiegyelítése"
+#: effects/Leveller.cpp:212 effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "Készítette: Lynn Allan"
 
-#: effects/Leveller.cpp:226 effects/Leveller.cpp:231
+#: effects/Leveller.cpp:222
 msgid "Degree of Leveling"
 msgstr "Kiegyenlítés mértéke"
 
-#: effects/Leveller.cpp:242
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr "Kiegyenlítés mértéke:"
+
+#: effects/Leveller.cpp:234
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
-msgstr ""
+msgstr "Zaj küszöbszintje (Hiss/Hum/Ambiens zaj)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
-msgstr "A zaj küszöbértéke"
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
+msgstr "Zaj küszöbszintje:"
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
 msgstr "Kiegyenlítő..."
 
-#: effects/Leveller.h:36
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
 msgstr "Kiegyenlítő alkalmazása..."
 
+#: effects/LoadEffects.cpp:99
+msgid "Generator"
+msgstr "Generátor"
+
+#: effects/LoadEffects.cpp:101
+msgid "Instrument"
+msgstr "Hangszer"
+
+#: effects/LoadEffects.cpp:103
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:105
+msgid "Utility"
+msgstr "Segédeszközök"
+
+#: effects/LoadEffects.cpp:107
+msgid "Converter"
+msgstr "Konvertáló"
+
+#: effects/LoadEffects.cpp:109
+msgid "Analyser"
+msgstr "Analizáló"
+
+#: effects/LoadEffects.cpp:111 toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Keverő"
+
+#: effects/LoadEffects.cpp:113
+msgid "Simulator"
+msgstr "Szimulátor"
+
+#: effects/LoadEffects.cpp:115
+msgid "Delay"
+msgstr "Késleltetés"
+
+#: effects/LoadEffects.cpp:117
+msgid "Modulator"
+msgstr "Moduláló"
+
+#: effects/LoadEffects.cpp:119
+msgid "Reverb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:121 effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:123
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:125
+msgid "Chorus"
+msgstr "Kórus"
+
+#: effects/LoadEffects.cpp:127
+msgid "Filter"
+msgstr "Szűrő"
+
+#: effects/LoadEffects.cpp:129
+msgid "Lowpass"
+msgstr "Aluláteresztő"
+
+#: effects/LoadEffects.cpp:131
+msgid "Bandpass"
+msgstr "Sáváteresztő"
+
+#: effects/LoadEffects.cpp:133
+msgid "Highpass"
+msgstr "Felüláteresztő"
+
+#: effects/LoadEffects.cpp:135
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:137
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:139
+msgid "Equaliser"
+msgstr "Hangszínszabályzó"
+
+#: effects/LoadEffects.cpp:141
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:143
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:145
+msgid "Spectral Processor"
+msgstr "Spektrum feldolgozó"
+
+#: effects/LoadEffects.cpp:147
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:149
+msgid "Amplifier"
+msgstr "Hangerő"
+
+#: effects/LoadEffects.cpp:151
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:153
+msgid "Waveshaper"
+msgstr "Hullámformáló"
+
+#: effects/LoadEffects.cpp:155
+msgid "Dynamics Processor"
+msgstr "Dinamikus feldolgozó"
+
+#: effects/LoadEffects.cpp:157
+msgid "Compressor"
+msgstr "Kompresszor"
+
+#: effects/LoadEffects.cpp:159
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:161
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:163
+msgid "Gate"
+msgstr ""
+
+#: effects/LoadEffects.cpp:196 effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "Zajszűrő"
+
+#: effects/LoadEffects.cpp:198
+msgid "Pitch and Tempo"
+msgstr "Hangmagasság és tempó"
+
+#: effects/LoadEffects.cpp:200
+msgid "Timeline Changer"
+msgstr "Idővonal változtató"
+
+#: effects/LoadEffects.cpp:202
+msgid "Time"
+msgstr "Idő"
+
+#: effects/LoadEffects.cpp:204
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Fehér"
@@ -4609,7 +5030,7 @@ msgstr "Barna"
 msgid "Noise Generator"
 msgstr "Zaj generálása"
 
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr "Zaj típusa"
 
@@ -4617,81 +5038,85 @@ msgstr "Zaj típusa"
 msgid "Noise..."
 msgstr "Zaj..."
 
-#: effects/Noise.h:49
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
 msgstr ""
 
-#: effects/Noise.h:53
+#: effects/Noise.h:59
 msgid "Generating Noise"
 msgstr "Zaj generálása"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Fájl megnyitása sikertelen:\n"
+msgstr "Fájl megnyitása sikertelen:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Zajszűrő"
-
-#: effects/NoiseRemoval.cpp:813
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "1. lépés"
 
-#: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+#: effects/NoiseRemoval.cpp:815
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
 msgstr ""
 
-#: effects/NoiseRemoval.cpp:815
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "2. lépés"
 
-#: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+#: effects/NoiseRemoval.cpp:817
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
 msgstr ""
 
-#: effects/NoiseRemoval.cpp:821
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Zajszűrő. Készítette: Dominic Mazzoni"
 
-#: effects/NoiseRemoval.cpp:829
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
 msgstr "Zajprofil készítése"
 
-#: effects/NoiseRemoval.cpp:840
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
 msgstr "Zaj csökkentése (dB):"
 
-#: effects/NoiseRemoval.cpp:848
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:849
 msgid "Frequency smoothing (Hz):"
 msgstr "Frekvencia simítás (Hz):"
 
-#: effects/NoiseRemoval.cpp:856
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr "Felfutás/lecsengés ideje (másodperc):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Zajszűrő"
 
-#: effects/NoiseRemoval.h:44
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "Zajprofil készítése"
 
-#: effects/NoiseRemoval.h:46
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "Zajszűrés"
 
@@ -4717,139 +5142,149 @@ msgstr "igaz"
 msgid ", maximum amplitude = %.1f dB"
 msgstr ", maximum amplitudó = %.1f dB"
 
-#: effects/Normalize.cpp:113
+#: effects/Normalize.cpp:327
 msgid "Normalize"
 msgstr "Normalizálás"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalizálás. Készítette: Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "DC eltolódás helyreállítása"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
-#: effects/Normalize.cpp:361
+#: effects/Normalize.cpp:362
 msgid "-"
 msgstr "-"
 
-#: effects/Normalize.h:32
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "Normalizálás"
 
-#: effects/Normalize.h:41
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "Normalizálás..."
 
 #: effects/Phaser.cpp:65
 #, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Végrehajtott effekt: %s %d szinttel, %.0f%%-os módosított jelaránnyal, %.1f Hz-es frekvenciával, %.0f fokos kezdési fáziseltolással, %d mélységgel, %.0f%%-os visszacsatolással"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser. Készítette: Nasca Octavian Paul"
-
-#: effects/Phaser.cpp:222
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "Szakaszok:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "Eredeti"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "Kevert"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
-#: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
+#: effects/Phaser.cpp:236 effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO frekvenciája (Hz):"
 
-#: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
+#: effects/Phaser.cpp:241 effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO kezdeti fázisa (fok):"
 
-#: effects/Phaser.cpp:296
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
+#: effects/Phaser.cpp:246
 msgid "Depth:"
 msgstr "Mélység:"
 
-#: effects/Phaser.cpp:312
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
 msgstr "Visszacsatolás (%):"
 
-#: effects/Phaser.h:38
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "Phaser..."
 
-#: effects/Phaser.h:46
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "Phaser alkalmazása"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
-#: effects/Repair.h:37
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
 msgstr "Sérült hang javítása"
 
-#: effects/Repeat.cpp:49
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
 msgstr "Ismétlések száma: %d"
 
-#: effects/Repeat.cpp:75
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
 msgstr "A sáv túl hosszú ahhoz, hogy a kijelölést megismételhessem."
 
-#: effects/Repeat.cpp:76 effects/Repeat.cpp:80
+#: effects/Repeat.cpp:77 effects/Repeat.cpp:187
 msgid "Repeat"
 msgstr "Ismétlés"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Ismétlés. Készítette: Dominic Mazzoni && Vaughan Johnson"
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
+msgstr ""
 
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
-msgstr "Ismétlések száma: "
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
 
-#: effects/Repeat.cpp:207 effects/Repeat.cpp:237
+#: effects/Repeat.cpp:253
 msgid "New selection length: "
 msgstr "Új kijelölés hossz:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d perc, %d másodperc"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d másodperc"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262 widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "óó:pp:mm"
 
-#: effects/Repeat.h:32
+#: effects/Repeat.h:33
 msgid "Repeat..."
 msgstr "Ismétlés"
 
-#: effects/Repeat.h:40
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
 msgstr "Ismétlés végrehajtása"
 
@@ -4857,7 +5292,7 @@ msgstr "Ismétlés végrehajtása"
 msgid "Reverse"
 msgstr "Megfordítás"
 
-#: effects/Reverse.h:38
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "Megfordítás"
 
@@ -4869,19 +5304,17 @@ msgstr "Csend generálása"
 msgid "Silence..."
 msgstr "Csend..."
 
-#: effects/Silence.h:42
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "Csend generálása"
 
-#: effects/Silence.h:47
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Végrehajtott effekt: %.6lf másodpercnyi csend generálása"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr ""
 
 #: effects/SpikeCleaner.cpp:69
@@ -4893,8 +5326,7 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Tüskék eltávolítása (Lynn Allan)"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
 msgstr ""
 
@@ -4910,67 +5342,120 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "S&ztereóból monó"
+
+#: effects/StereoToMono.h:38
 msgid "Applying Stereo to Mono"
 msgstr ""
 
-#: effects/ToneGen.cpp:66
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:61
 #, c-format
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
-#: effects/ToneGen.cpp:75 widgets/Meter.cpp:379
+#: effects/ToneGen.cpp:69 widgets/Meter.cpp:416
 msgid "Linear"
 msgstr "Lineáris"
 
-#: effects/ToneGen.cpp:76
+#: effects/ToneGen.cpp:70
 msgid "Logarithmic"
 msgstr "Logaritmikus"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
 msgstr "Csiripelés generátor "
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "Hang generátor"
 
-#: effects/ToneGen.cpp:79
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "Szinusz"
 
-#: effects/ToneGen.cpp:80
+#: effects/ToneGen.cpp:73
 msgid "Square"
 msgstr "Négyszög"
 
-#: effects/ToneGen.cpp:81
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
 msgstr "Fűrészfog"
 
-#: effects/ToneGen.cpp:82
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
 msgstr ""
 
-#: effects/ToneGen.cpp:327 effects/ToneGen.cpp:363
+#: effects/ToneGen.cpp:321 effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
 msgstr "Frekvencia"
 
-#: effects/ToneGen.cpp:354
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "Hullámforma:"
 
-#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Kezdet"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Vég"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:372
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
 msgid "Interpolation:"
 msgstr "Interpoláció:"
 
@@ -4982,11 +5467,11 @@ msgstr "Csiripelés..."
 msgid "Tone..."
 msgstr "Hang..."
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
 msgstr "Csiripelés generálása"
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "Hang generálása"
 
@@ -4994,28 +5479,25 @@ msgstr "Hang generálása"
 msgid "All tracks must have the same sample rate"
 msgstr "Minden sávnak egyforma mintavételi rátával kell rendelkeznie"
 
-#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr "Csend eltávolítása"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "Készítette: Lynn Allan"
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr "A csend max hossza:"
 
-#: effects/TruncSilence.cpp:349 prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:193
+#: effects/TruncSilence.cpp:348 prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199 prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "ezredmásodperc"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr "Csend küszöbértéke:"
 
-#: effects/TruncSilence.cpp:376
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr "   Az időtartamnak legalább egy ezredmásodpercnek kell lennie"
 
@@ -5023,144 +5505,154 @@ msgstr "   Az időtartamnak legalább egy ezredmásodpercnek kell lennie"
 msgid "Truncate Silence..."
 msgstr "Csend eltávolítása..."
 
-#: effects/TruncSilence.h:36
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr "Csend eltávolítása..."
 
-#: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
+#: effects/VST/VSTEffect.cpp:172
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr "Sajnálom, de a VST Effekt nem működik az olyan sztereó sávokon, ahol a két csatorna tartalma nem egyezik."
 
-#: effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
 msgstr "Nem lehet végrehajtani a cserét"
 
-#: effects/VST/VSTEffect.cpp:403
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "VST plugin parméterek:"
 
 #: effects/Wahwah.cpp:61
 #, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
 msgstr "Végrehajtott effekt: %s %.1f Hz-es frekvenciával, %.0f fokos kezdeti fáziseltolással, %.0f%%-os mélységgel, %.1f rezonanciával, %.0f%%-os frekvencia eltolással"
 
-#: effects/Wahwah.cpp:72
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "WahWah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "WahWah. Készítette: Nasca Octavian Paul"
-
-#: effects/Wahwah.cpp:253
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
 msgstr "Mélység (%):"
 
-#: effects/Wahwah.cpp:269
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "Rezonancia:"
 
-#: effects/Wahwah.cpp:285
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah frekvencia eltolás (%):"
 
-#: effects/Wahwah.h:34
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "WahWah"
 
-#: effects/Wahwah.h:42
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "WahWah alkalmazása"
 
-#: effects/audiounits/AudioUnitEffect.cpp:133
-#: effects/ladspa/LadspaEffect.cpp:169
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176 effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "%s effekt végrehajtása"
 
-#: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
+#: effects/ladspa/LadspaEffect.cpp:196 effects/lv2/LV2Effect.cpp:211
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr ""
 
-#: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
+#: effects/ladspa/LadspaEffect.cpp:580 effects/ladspa/LadspaEffect.cpp:588
 #: prefs/GUIPrefs.cpp:51 prefs/QualityPrefs.cpp:72
 msgid "None"
 msgstr "Nincs"
 
-#: effects/ladspa/LadspaEffect.cpp:575 effects/vamp/VampEffect.cpp:384
+#: effects/ladspa/LadspaEffect.cpp:582 effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "Szerző: "
 
-#: effects/ladspa/LadspaEffect.cpp:608
+#: effects/ladspa/LadspaEffect.cpp:615 effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "Effekt beállítások"
 
-#: effects/ladspa/LadspaEffect.cpp:699
+#: effects/ladspa/LadspaEffect.cpp:710 effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834 effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
 msgstr "Hossz (másodperc)"
 
-#: effects/nyquist/Nyquist.cpp:252
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist effekt végrehajtása..."
 
-#: effects/nyquist/Nyquist.cpp:259 effects/nyquist/Nyquist.cpp:321
+#: effects/nyquist/Nyquist.cpp:264 effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Nyquist prompt"
 
-#: effects/nyquist/Nyquist.cpp:322
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
 msgstr "Írd be a Nyquist parancsot:"
 
-#: effects/nyquist/Nyquist.cpp:412
+#: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
 msgstr "Sajnálom, de az effekt nem alkalmazható olyan sztereó sávokon, ahol a két csatorna tartalma nem egyezik."
 
-#: effects/nyquist/Nyquist.cpp:440
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Nyquist"
 
-#: effects/nyquist/Nyquist.cpp:441
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
 msgstr "Nyquist kimenet: "
 
-#: effects/nyquist/Nyquist.cpp:598 effects/nyquist/Nyquist.cpp:609
+#: effects/nyquist/Nyquist.cpp:603 effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
 msgstr "Nyquist ezt az értéket adta vissza:"
 
-#: effects/nyquist/Nyquist.cpp:651
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
 msgstr "A Nyquist nem ad vissza audió jelet.\n"
 
-#: effects/nyquist/Nyquist.cpp:662
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "A Nyquist túl sok audió csatornát küldött vissza.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:86
 #, c-format
 msgid "Extracting features: %s"
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
+#: effects/vamp/VampEffect.cpp:117
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:131
 msgid "Sorry, failed to load Vamp Plug-in."
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:239
 msgid "Sorry, Vamp Plug-in failed to initialize."
 msgstr ""
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:387
 msgid " - Vamp audio analysis plugin"
 msgstr ""
 
@@ -5168,70 +5660,74 @@ msgstr ""
 msgid "Plugin Settings"
 msgstr "Bővítmény beállításai"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:442 effects/vamp/VampEffect.cpp:448
 msgid "Program"
 msgstr "Program"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
 msgstr ""
 
-#: export/Export.cpp:451
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:522
 msgid "Export File"
 msgstr "Fájl exportálása"
 
-#: export/Export.cpp:459
+#: export/Export.cpp:530
 msgid "&Options..."
 msgstr "&Beállítások..."
 
-#: export/Export.cpp:485
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
 msgstr "Biztos vagy benne, hogy mentsük a fájlt, mint: \""
 
-#: export/Export.cpp:501
+#: export/Export.cpp:591
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
 msgstr ""
 
-#: export/Export.cpp:522
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "Egy fájl \"%s\" névvel már létezik.  Felülírja?"
 
-#: export/Export.cpp:604
+#: export/Export.cpp:710
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "Az általad használt sávok két darab sztereó csatornára lesznek keverve az exporált fájlban."
 
-#: export/Export.cpp:609
+#: export/Export.cpp:715
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
 msgstr "Az általad használt sávok egy darab monó csatornára lesznek keverve az exporált fájlban."
 
-#: export/Export.cpp:619
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr "Haladó keverési opciók"
 
-#: export/Export.cpp:821
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
 msgstr "Csatorna: %2d"
 
-#: export/Export.cpp:945
+#: export/Export.cpp:1046
 msgid " - Left"
 msgstr " - Bal"
 
-#: export/Export.cpp:946
+#: export/Export.cpp:1047
 msgid " - Right"
 msgstr " - Jobb"
 
-#: export/Export.cpp:976 export/Export.cpp:1021
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
+#: export/Export.cpp:1078 export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "Kimeneti csatornák: %2d"
@@ -5254,105 +5750,572 @@ msgstr "Kimenet mutatása"
 
 #: export/ExportCL.cpp:87
 #, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
 msgstr ""
 
-#: export/ExportCL.cpp:220
+#: export/ExportCL.cpp:222
 msgid "(external program)"
 msgstr "(külső program)"
 
-#: export/ExportCL.cpp:250 export/ExportPCM.cpp:367
+#: export/ExportCL.cpp:253 export/ExportPCM.cpp:454
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "Nem lehet az audiót %s-ként exportálni"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Exportálás"
-
-#: export/ExportCL.cpp:324
+#: export/ExportCL.cpp:327
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "A kijelölt audió exportálása parancssori enkóder segítségével"
 
-#: export/ExportCL.cpp:325
+#: export/ExportCL.cpp:328
 msgid "Exporting the entire project using command-line encoder"
 msgstr "A teljes projekt exportálása parancssori enkóder segítségével"
 
-#: export/ExportCL.cpp:389
+#: export/ExportCL.cpp:390
 msgid "Command Output"
 msgstr "A parancs kimenete"
 
-#: export/ExportFLAC.cpp:68
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:702 export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "Érvénytelen mintavételi ráta"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:721 export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "Az alábbi ráták egyikére mintavételezhet újra."
+
+#: export/ExportFFmpeg.cpp:749 export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "Mintavételi ráták"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:121 export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314 export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937 export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bitsűrűség:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "Formátum:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931 prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Nyelv:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940 export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Minőség:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML fájlok (*.xml)|*.xml|Minden fájl (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
+#: export/ExportFLAC.cpp:67
 msgid "Specify FLAC Options"
 msgstr "FLAC beállítások megadása"
 
-#: export/ExportFLAC.cpp:82
+#: export/ExportFLAC.cpp:81
 msgid "0 (fastest)"
 msgstr "0 (leggyorsabb)"
 
-#: export/ExportFLAC.cpp:83
+#: export/ExportFLAC.cpp:82
 msgid "1"
 msgstr "1"
 
-#: export/ExportFLAC.cpp:84
+#: export/ExportFLAC.cpp:83
 msgid "2"
 msgstr "2"
 
-#: export/ExportFLAC.cpp:85
+#: export/ExportFLAC.cpp:84
 msgid "3"
 msgstr "3"
 
-#: export/ExportFLAC.cpp:86
+#: export/ExportFLAC.cpp:85
 msgid "4"
 msgstr "4"
 
-#: export/ExportFLAC.cpp:87
+#: export/ExportFLAC.cpp:86
 msgid "5"
 msgstr "5"
 
-#: export/ExportFLAC.cpp:88
+#: export/ExportFLAC.cpp:87
 msgid "6"
 msgstr "6"
 
-#: export/ExportFLAC.cpp:89
+#: export/ExportFLAC.cpp:88
 msgid "7"
 msgstr "7"
 
-#: export/ExportFLAC.cpp:90
+#: export/ExportFLAC.cpp:89
 msgid "8 (best)"
 msgstr "8 (legjobb)"
 
-#: export/ExportFLAC.cpp:93
+#: export/ExportFLAC.cpp:92
 msgid "16 bit"
 msgstr "16 bit"
 
-#: export/ExportFLAC.cpp:94
+#: export/ExportFLAC.cpp:93
 msgid "24 bit"
 msgstr "24 bit"
 
-#: export/ExportFLAC.cpp:98
+#: export/ExportFLAC.cpp:97
 msgid "FLAC Export Setup"
 msgstr "FLAC exportálás beállításai"
 
-#: export/ExportFLAC.cpp:102
+#: export/ExportFLAC.cpp:101
 msgid "Level:"
 msgstr "Szint:"
 
-#: export/ExportFLAC.cpp:104
+#: export/ExportFLAC.cpp:103
 msgid "Bit depth:"
 msgstr "Bitmélység:"
 
-#: export/ExportFLAC.cpp:208
+#: export/ExportFLAC.cpp:209
 msgid "FLAC Files"
 msgstr "FLAC fájlok"
 
-#: export/ExportFLAC.cpp:310
+#: export/ExportFLAC.cpp:312
 msgid "Exporting the selected audio as FLAC"
 msgstr "A kiválasztott hang exportálása FLAC-ként"
 
-#: export/ExportFLAC.cpp:311
+#: export/ExportFLAC.cpp:313
 msgid "Exporting the entire project as FLAC"
 msgstr "A teljes projekt exportálása FLAC-ként"
 
@@ -5364,28 +6327,24 @@ msgstr "Adja meg az MP2 opciókat"
 msgid "MP2 Export Setup"
 msgstr "MP2 export beállítása"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Bitsűrűség:"
-
-#: export/ExportMP2.cpp:200
+#: export/ExportMP2.cpp:202
 msgid "MP2 Files"
 msgstr "MP2 fájlok"
 
-#: export/ExportMP2.cpp:229
+#: export/ExportMP2.cpp:232
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "Nem lehet MP2-be exportálni ezzel a mintavételi- és bitrátával"
 
-#: export/ExportMP2.cpp:240 export/ExportMP3.cpp:1768 export/ExportOGG.cpp:183
+#: export/ExportMP2.cpp:243 export/ExportMP3.cpp:1771 export/ExportOGG.cpp:186
 msgid "Unable to open target file for writing"
 msgstr "Nem lehetett megnyítni a kijelölt fájlt az íráshoz"
 
-#: export/ExportMP2.cpp:271
+#: export/ExportMP2.cpp:274
 #, c-format
 msgid "Exporting selected audio at %d kbps"
 msgstr "A kijelölt hang exportálása %d kbps-al"
 
-#: export/ExportMP2.cpp:272
+#: export/ExportMP2.cpp:275
 #, c-format
 msgid "Exporting entire file at %d kbps"
 msgstr "A teljes fájl exportálása %d kbps-al"
@@ -5481,268 +6440,219 @@ msgstr "Lame keresése"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Az Audacitynek a következő fájlra van szüksége MP3 létrehozásához: %s"
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "%s helye:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "%s megkereséséhez kattintson ide -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Böngészés..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "A Lame egy ingyenes másolatáért kattintson ide -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Letöltés..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Hol található meg ez: %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
-msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
 msgstr "Csak lame_enc.dll|lame_enc.dll|Dinamikusan linkelt könyvtárak (*.dll)|*.dll|Minden fájl (*.*)|*"
 
 #: export/ExportMP3.cpp:1550
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
-msgstr ""
-"Csak libmp3lame.dylib|libmp3lame.dylib|Dinamikus könyvtárak (*.dylib)|*.dylib|"
-"Minden fájl (*)|*"
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Csak libmp3lame.dylib|libmp3lame.dylib|Dinamikus könyvtárak (*.dylib)|*.dylib|Minden fájl (*)|*"
 
 #: export/ExportMP3.cpp:1567
-msgid ""
-"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"Csak libmp3lame.so.0|libmp3lame.so.0|Elsődleges megosztott objektum fájlok (*.so)|*.so|"
-"Kiterjesztett könyvtárak (*.so*)|*.so*|Minden fájl (*)|*"
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Csak libmp3lame.so.0|libmp3lame.so.0|Elsődleges megosztott objektum fájlok (*.so)|*.so|Kiterjesztett könyvtárak (*.so*)|*.so*|Minden fájl (*)|*"
 
-#: export/ExportMP3.cpp:1650
+#: export/ExportMP3.cpp:1652
 msgid "MP3 Files"
 msgstr "MP3 fájlok"
 
-#: export/ExportMP3.cpp:1673
+#: export/ExportMP3.cpp:1676
 msgid "Could not open MP3 encoding library!"
 msgstr "Nem lehet megnyitni az MP3-enkóder könyvtárat"
 
-#: export/ExportMP3.cpp:1680
+#: export/ExportMP3.cpp:1683
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "Ez egy érvénytelen vagy nem támogatott MP3 enkóder könyvtár!"
 
-#: export/ExportMP3.cpp:1757
+#: export/ExportMP3.cpp:1760
 msgid "Unable to initialize MP3 stream"
 msgstr "Az MP3 folyam inicializálása sikertelen"
 
-#: export/ExportMP3.cpp:1799
+#: export/ExportMP3.cpp:1802
 #, c-format
 msgid "Exporting selected audio with %s preset"
 msgstr "A kijelölt hang exportálása %s beállítással"
 
-#: export/ExportMP3.cpp:1800
+#: export/ExportMP3.cpp:1803
 #, c-format
 msgid "Exporting entire file with %s preset"
 msgstr "A teljes fájl exportálása %s beállítással"
 
-#: export/ExportMP3.cpp:1805
+#: export/ExportMP3.cpp:1808
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
 msgstr "A kijelölt hang exportálása %s VBR minőséggel"
 
-#: export/ExportMP3.cpp:1806
+#: export/ExportMP3.cpp:1809
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
 msgstr "A teljes fájl exportálása %s VBR minőséggel"
 
-#: export/ExportMP3.cpp:1811
+#: export/ExportMP3.cpp:1814
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
 msgstr "A kijelölt hang exportálása %d kpbs-al"
 
-#: export/ExportMP3.cpp:1812
+#: export/ExportMP3.cpp:1815
 #, c-format
 msgid "Exporting entire file at %d Kbps"
 msgstr "A teljes fájl exportálása %d kpbs-al"
 
-#: export/ExportMP3.cpp:1845
+#: export/ExportMP3.cpp:1849
 #, c-format
 msgid "Error %d returned from MP3 encoder"
 msgstr "Az MP3 kódoló az alábbi hibával tért vissza: %d"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Érvénytelen mintavételi ráta"
-
-#: export/ExportMP3.cpp:1931
+#: export/ExportMP3.cpp:1933
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"A projekt mintavételi rátája (%d) nem támogatott az MP3\n"
+msgstr "A projekt mintavételi rátája (%d) nem támogatott az MP3\n"
 "fájlformátum által.  "
 
-#: export/ExportMP3.cpp:1934
+#: export/ExportMP3.cpp:1936
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"A projekt mintavételi rátájának (%d) és bitrátájának (%d kbps) kombinációja\n"
+msgstr "A projekt mintavételi rátájának (%d) és bitrátájának (%d kbps) kombinációja\n"
 "nem támogatott az MP3 fájlformátum által.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Az alábbi ráták egyikére mintavételezhet újra."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Mintavételi ráták"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Nem található az MP3 exportáló alkamazás."
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
-#: export/ExportMultiple.cpp:95 export/ExportMultiple.cpp:374
-#: export/ExportMultiple.cpp:598 export/ExportMultiple.cpp:765
+#: export/ExportMultiple.cpp:96 export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667 export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "Köteg-Exportálás"
 
-#: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
+#: export/ExportMultiple.cpp:166
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
-msgstr ""
-"Amennyiben egynél több Audió Sávot használsz, lehetőséged van minden egyes sávot külön fájlba exportálni,\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "Amennyiben egynél több Audió Sávot használsz, lehetőséged van minden egyes sávot külön fájlba exportálni,\n"
 "vagy amennyiben rendelkezel egy Címke Sávval, új fájlt exportálhatsz minden egyes címkéhez.\n"
 "\n"
 "Ez a projekt nem használ több sávot vagy címkét, így nem tudsz több fájlt exportálni."
 
-#: export/ExportMultiple.cpp:165
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
 msgstr "Nem lehet több fájlt exportálni"
 
-#: export/ExportMultiple.cpp:200
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "Exportálási formátum:"
 
-#: export/ExportMultiple.cpp:207
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
 msgstr "Beállítások..."
 
-#: export/ExportMultiple.cpp:210
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "Exportálási hely:"
 
-#: export/ExportMultiple.cpp:216 prefs/DirectoriesPrefs.cpp:92
+#: export/ExportMultiple.cpp:245 prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Tallózás..."
 
-#: export/ExportMultiple.cpp:217
+#: export/ExportMultiple.cpp:246
 msgid "Create"
 msgstr "Létrehozás"
 
-#: export/ExportMultiple.cpp:224
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "Fájlok darabolása. Sorrend:"
 
-#: export/ExportMultiple.cpp:234
+#: export/ExportMultiple.cpp:262 export/ExportMultiple.cpp:264
 msgid "Labels"
 msgstr "Címkék"
 
-#: export/ExportMultiple.cpp:239
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
 msgstr "Audió beillesztése az első címke elé"
 
-#: export/ExportMultiple.cpp:245
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "Első fájl neve:"
 
-#: export/ExportMultiple.cpp:258
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
+#: export/ExportMultiple.cpp:288 export/ExportMultiple.cpp:290
 msgid "Tracks"
 msgstr "Sávok"
 
-#: export/ExportMultiple.cpp:265
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
 msgstr "Fájlok elnevezése:"
 
-#: export/ExportMultiple.cpp:275
+#: export/ExportMultiple.cpp:306 export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
 msgstr "Sáv neve alapján"
 
-#: export/ExportMultiple.cpp:282
+#: export/ExportMultiple.cpp:314 export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
 msgstr "számozás alapján"
 
-#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "Fájlnév prefix:"
 
-#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
+#: export/ExportMultiple.cpp:341
 msgid "Overwrite existing files"
 msgstr "Létező fájlok felülírása"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&xportálás"
-
-#: export/ExportMultiple.cpp:372
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr "\"%s\" sikeresen létrehozva."
 
-#: export/ExportMultiple.cpp:381
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
 msgstr "Válassz egy útvonalat az exportálandó fájlok számára"
 
-#: export/ExportMultiple.cpp:470
+#: export/ExportMultiple.cpp:539
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" nem létezik.\n"
+msgstr "\"%s\" nem létezik.\n"
 "\n"
 "Szeretné létrehozni?"
 
-#: export/ExportMultiple.cpp:568 export/ExportMultiple.cpp:703
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
 msgid "Edit metadata"
 msgstr "Metaadat szerkesztése"
 
-#: export/ExportMultiple.cpp:595 export/ExportMultiple.cpp:762
+#: export/ExportMultiple.cpp:664 export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
 msgstr "%d fájl sikeresen exportálva."
 
-#: export/ExportMultiple.cpp:596 export/ExportMultiple.cpp:763
+#: export/ExportMultiple.cpp:665 export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Valami elromlott %d fájl exportálása után."
 
-#: export/ExportMultiple.cpp:825
+#: export/ExportMultiple.cpp:881
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
 msgstr ""
 
@@ -5754,437 +6664,498 @@ msgstr "Ogg Vorbis opciók megadása"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg Vorbis exportálás beállítások"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Minőség:"
-
-#: export/ExportOGG.cpp:155
+#: export/ExportOGG.cpp:157
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis fájlok"
 
-#: export/ExportOGG.cpp:254
+#: export/ExportOGG.cpp:257
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "A kijelölt audió exportálása Ogg Vorbis-ként"
 
-#: export/ExportOGG.cpp:255
+#: export/ExportOGG.cpp:258
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "A teljes projekt exportálása Ogg Vorbis-ként"
 
-#: export/ExportPCM.cpp:115
+#: export/ExportPCM.cpp:113
 msgid "Specify Uncompressed Options"
 msgstr "Tömörítetlen opciók meadása"
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:182
 msgid "Uncompressed Export Setup"
 msgstr "Tömörítetlen exportálás beállítása"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Formátum:"
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:188
 msgid "Header:"
 msgstr "Fejléc:"
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:192 import/ImportRaw.cpp:366
 msgid "Encoding:"
 msgstr "Kódolás:"
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:197
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(A fejléceknek és kódolásoknak nem minden kombinációja lehetséges.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, és más tömörítetlen típusok"
+#: export/ExportPCM.cpp:366
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:358
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
 
-#: export/ExportPCM.cpp:361
+#: export/ExportPCM.cpp:348
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:384
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
+
+#: export/ExportPCM.cpp:446
 msgid "Cannot export audio in this format."
 msgstr "Nem lehet az audiót ebben a formátumban exportálni."
 
-#: export/ExportPCM.cpp:401
+#: export/ExportPCM.cpp:488
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr "A kijelölt hang exportálása mint %s"
 
-#: export/ExportPCM.cpp:403
+#: export/ExportPCM.cpp:490
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr "A teljes projekt exportálása mint %s"
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:437
+#: export/ExportPCM.cpp:528
 #, c-format
 msgid "Error (file may not have been written): %s"
 msgstr "Hiba (lehet hogy a fájl sem lett írva): %s"
 
-#: import/Import.cpp:155
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156 import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "MP3 fájlok"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Az Audacity-nek ez a verziója nem támogatja a(z) %s formátumot."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:168
+#: import/Import.cpp:250
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:174
+#: import/Import.cpp:256
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
-"Audacity cannot open this file because it only contains links to other "
-"files. \n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
 
-#: import/Import.cpp:179
+#: import/Import.cpp:261
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:184
+#: import/Import.cpp:266
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:194
+#: import/Import.cpp:276
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-
-#: import/Import.cpp:206
+#: import/Import.cpp:282
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
 msgstr ""
 
-#: import/Import.cpp:212
+#: import/Import.cpp:288
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
-"and try importing it again. Otherwise you need to convert it to a supported "
-"audio \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:218
+#: import/Import.cpp:294
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:224
+#: import/Import.cpp:300
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:230
+#: import/Import.cpp:306
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
 msgstr ""
-"Az Audacity nem tudta azonosítani ennek a fájlnak a formátumát.\n"
-"Amennyiben ez egy tömörítetlen állomány, próbáld meg importálni a \"Nyersadat importálása\" paranccsal."
 
-#: import/ImportFLAC.cpp:35
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "FLAC fájlok"
 
-#: import/ImportLOF.cpp:92
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
 msgstr "Lista a Fájlokról sima szövegformátumban"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:318
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
 msgstr "Érvénytelen az LOF fájlban lévő ablak pozíció."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:320 import/ImportLOF.cpp:341 import/ImportLOF.cpp:415
-#: import/ImportLOF.cpp:435
+#: import/ImportLOF.cpp:316 import/ImportLOF.cpp:337 import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
 msgstr "LOF hiba"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:339
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
 msgstr "Érvénytelen az LOF fájl hossza."
 
-#: import/ImportLOF.cpp:414
+#: import/ImportLOF.cpp:417
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
 msgstr "A MIDI sávokat nem lehet elmozgatni, csak az audió fájlokat."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:434
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
 msgstr "Érvénytelen az LOF fájlban lévő sáv eltolás."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Hiba az Allegro fájl feldolgozása közben."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Hiba a MIDI fájl feldolgozása közben."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "MP3 fájlok"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
-#: import/ImportOGG.cpp:36
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
 msgstr "Ogg Vorbis fájlok"
 
-#: import/ImportOGG.cpp:142
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
 msgstr "Média olvasási hiba"
 
-#: import/ImportOGG.cpp:145
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "Ez nem egy Ogg Vorbis fájl"
 
-#: import/ImportOGG.cpp:148
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
 msgstr "Vorbis verzió eltérési hiba"
 
-#: import/ImportOGG.cpp:151
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
 msgstr "Érvénytelen Vorbis fejléc-típus"
 
-#: import/ImportOGG.cpp:154
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
 msgstr "Belső logikai hiba"
 
-#: import/ImportPCM.cpp:396
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, és más tömörítetlen típusok"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "%s fájl importálása..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime fájlok"
 
-#: import/ImportRaw.cpp:278
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Nyersadat importálása"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:337
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "Nincs endianness"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:340
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "Little-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:343
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "Big-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:346
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "Alapértelmezett endianness"
 
-#: import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
 msgstr "1 Csatorna (Monó)"
 
-#: import/ImportRaw.cpp:371
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
 msgstr "2 Csatorna (Sztereó)"
 
-#: import/ImportRaw.cpp:373
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
 msgstr "%d Csatorna"
 
-#: import/ImportRaw.cpp:386
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
 msgstr "Kezdeti eltolás:"
 
-#: import/ImportRaw.cpp:397
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
 msgstr "Importálandó anyagmennyiség:"
 
-#: import/ImportRaw.cpp:408
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
 msgstr "Mintavételezési frekvencia"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importálás"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44 prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "Audió I/O"
 
-#: prefs/AudioIOPrefs.cpp:100
+#: prefs/AudioIOPrefs.cpp:102 prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (Monó)"
 
-#: prefs/AudioIOPrefs.cpp:101
+#: prefs/AudioIOPrefs.cpp:103 prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (Sztereó)"
 
-#: prefs/AudioIOPrefs.cpp:115
+#: prefs/AudioIOPrefs.cpp:117 prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "Visszajátszás"
 
-#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
+#: prefs/AudioIOPrefs.cpp:121 prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118 prefs/MidiIOPrefs.cpp:136
 #: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
 msgstr "Eszköz"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:124 prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
 msgstr "Használva:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:125 prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
 msgstr "Portaudio v"
 
-#: prefs/AudioIOPrefs.cpp:133
+#: prefs/AudioIOPrefs.cpp:135 prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "Felvétel"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:141 prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
 msgstr "Csatornák"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:147 prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "A többi sáv lejátszása az új sáv felvétele közben"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:150
+#: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:162
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:168 prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
 msgstr "Előnézet hossza:"
 
-#: prefs/AudioIOPrefs.cpp:170
+#: prefs/AudioIOPrefs.cpp:176 prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:183
+#: prefs/AudioIOPrefs.cpp:189 prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr "Késleltetés"
 
-#: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
 "(negative = backwards)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:200
+#: prefs/AudioIOPrefs.cpp:206 prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr "Rövid periódus:"
 
-#: prefs/AudioIOPrefs.cpp:202
+#: prefs/AudioIOPrefs.cpp:208 prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr "Hosszú periódus:"
 
@@ -6196,7 +7167,7 @@ msgstr "Köteg"
 msgid "Behaviors"
 msgstr "Viselkedések"
 
-#: prefs/BatchPrefs.cpp:80 prefs/GUIPrefs.cpp:129
+#: prefs/BatchPrefs.cpp:80
 msgid "&Don't apply effects in batch mode"
 msgstr ""
 
@@ -6205,7 +7176,7 @@ msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:279
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Könyvtárak"
 
@@ -6242,7 +7213,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
@@ -6264,90 +7235,98 @@ msgid "Directory %s is not writable"
 msgstr "A(z) %s nevű könyvtár nem írható"
 
 #: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Az ideiglenes könyvtár új beállításai az Audacity újraindításakor lépnek érvénybe."
 
-#: prefs/FileFormatPrefs.cpp:48 prefs/FileFormatPrefs.cpp:49
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
 msgid "Import / Export"
 msgstr "Importálás / Exportálás"
 
-#: prefs/FileFormatPrefs.cpp:77
+#: prefs/FileFormatPrefs.cpp:84
 msgid "MP3 Export Library"
 msgstr "MP3 exportálás könyvtár"
 
-#: prefs/FileFormatPrefs.cpp:80
+#: prefs/FileFormatPrefs.cpp:87
 msgid "MP3 Library Version:"
 msgstr "MP3 könyvtár verziója:"
 
-#: prefs/FileFormatPrefs.cpp:86
+#: prefs/FileFormatPrefs.cpp:93
 msgid "MP3 Library:"
 msgstr "MP3 könyvtár:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "Könyvtár keresése"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:91
+#: prefs/FileFormatPrefs.cpp:98
 msgid "LAME MP3 Library:"
 msgstr "LAME MP3 könyvtár:"
 
-#: prefs/FileFormatPrefs.cpp:94
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
 msgid "&Download"
 msgstr "&Letöltés"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid ""
-"Note: Export quality options can be chosen by clicking the Options button in "
-"the Export dialog."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:100
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
 msgid "When importing audio files"
 msgstr "Hangfájlok importálásakor"
 
-#: prefs/FileFormatPrefs.cpp:103
+#: prefs/FileFormatPrefs.cpp:140
 msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:104
+#: prefs/FileFormatPrefs.cpp:141
 msgid "&Read uncompressed audio files directly from the original (faster)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:106
+#: prefs/FileFormatPrefs.cpp:143
 msgid "&Normalize all tracks in project"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:111
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:114
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:115
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:116
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:120
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:123
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:124
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:126
+#: prefs/FileFormatPrefs.cpp:163
 msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
@@ -6372,7 +7351,7 @@ msgid "&Update display while playing"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:98
@@ -6380,7 +7359,7 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
@@ -6388,7 +7367,7 @@ msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:106
@@ -6416,17 +7395,21 @@ msgid "Show warnings about &temp files"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
@@ -6459,39 +7442,15 @@ msgstr "-145 dB (a 24 bites PCM-kódolású hangminták dinamika-tartománya)"
 msgid "Default View Mode"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:166
+#: prefs/GUIPrefs.cpp:164
 msgid "Other interface choices"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Nyelv:"
-
-#: prefs/GUIPrefs.cpp:169
+#: prefs/GUIPrefs.cpp:167
 msgid "Help:"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:170
+#: prefs/GUIPrefs.cpp:168
 msgid "Solo Button:"
 msgstr ""
 
@@ -6499,6 +7458,14 @@ msgstr ""
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr ""
@@ -6523,34 +7490,65 @@ msgstr "Billentyűkombináció"
 msgid "Export Keyboard Shortcuts As:"
 msgstr "Billentyűparancsok exportálása, mint: "
 
-#: prefs/KeyConfigPrefs.cpp:181
+#: prefs/KeyConfigPrefs.cpp:183
 msgid "Error saving keyboard shortcuts"
 msgstr "Hiba a billentyűparancsok mentésekor"
 
-#: prefs/KeyConfigPrefs.cpp:196
+#: prefs/KeyConfigPrefs.cpp:198
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Válassz ki egy XML fájlt, amelyik az Audacity billentyűparancsait tartalmazza..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML fájlok (*.xml)|*.xml|Minden fájl (*.*)|*.*"
-
-#: prefs/KeyConfigPrefs.cpp:213
+#: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
 msgstr "Hiba a billentyűparancsok betöltésekor"
 
-#: prefs/KeyConfigPrefs.cpp:241
+#: prefs/KeyConfigPrefs.cpp:243
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
 msgstr ""
 
-#: prefs/KeyConfigPrefs.cpp:367 toolbars/EditToolBar.cpp:144
+#: prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "Visszavonás"
 
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "A többi sáv lejátszása az új sáv felvétele közben"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Egér"
@@ -6757,7 +7755,7 @@ msgstr "Ctrl-Görgőkerék-Forgatás"
 msgid "Zoom in or out"
 msgstr "Nagyítás vagy kicsinyítés"
 
-#: prefs/PrefsDialog.cpp:89
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
 msgstr "Audacity Beállítások"
 
@@ -6821,17 +7819,17 @@ msgstr "Valós idejű:"
 msgid "High-quality:"
 msgstr "Csúcsminőség:"
 
-#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37 prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Csend szintje (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
@@ -6964,8 +7962,7 @@ msgid "Info"
 msgstr "Információ"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -6981,71 +7978,66 @@ msgid ""
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
-#: toolbars/ControlToolBar.cpp:174
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Szünet"
 
-#: toolbars/ControlToolBar.cpp:177
+#: toolbars/ControlToolBar.cpp:178
 msgid "Play"
 msgstr "Lejátszás"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Lejátszás (Shift az ismételt lejátszáshoz)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr "Lejátszás (Shift-tel ismételt lejátszás)"
 
-#: toolbars/ControlToolBar.cpp:182
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "Állj"
 
-#: toolbars/ControlToolBar.cpp:185
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
 msgstr "Ugrás a kezdetére"
 
-#: toolbars/ControlToolBar.cpp:188
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
 msgstr "Ugrás a végére"
 
-#: toolbars/ControlToolBar.cpp:194
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "Felvétel (Shift-tel hozzáfűzve felvétel)"
+
+#: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:530 toolbars/ControlToolBar.cpp:844
+#: toolbars/ControlToolBar.cpp:540 toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr "Hiba a hangeszköz megnyitása közben. "
 
-#: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
+#: toolbars/ControlToolBar.cpp:706
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:697
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "Felvétel nem engedélyezett"
 
@@ -7066,30 +8058,34 @@ msgid "Silence selection"
 msgstr "Kijelölés átalakítása csenddé"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
 msgstr "Nagyítás"
 
-#: toolbars/EditToolBar.cpp:152
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "Kicsinyítés"
 
-#: toolbars/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
 msgstr "Nagyítás/kicsinyítés kapcsoló"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr "Méretezés a kijelöléshez"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "Kijelölés méretezése az ablakhoz igazítva"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr "Méretezés a projekthez"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
 msgstr "Projekt méretezése az ablakhoz igazítva"
 
@@ -7121,71 +8117,68 @@ msgstr "Kimeneti jelszint"
 msgid "Input level meter - click to monitor input"
 msgstr "Bemeneti jelszint - Kattints rá a bemenet monitorozásához"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr ""
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Kimeneti jelszint"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+msgid "Slider Output"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:101
+#: toolbars/MixerToolBar.cpp:101 widgets/Meter.cpp:874
 msgid "Input Volume"
 msgstr "Bemeneti jelszint"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
 msgstr "Bemenet forrása"
 
-#: toolbars/SelectionBar.cpp:80
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr "Kijelölés"
 
-#: toolbars/SelectionBar.cpp:128 toolbars/SelectionBar.cpp:185
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
 msgstr "Projekt ráta (Hz):"
 
-#: toolbars/SelectionBar.cpp:142 toolbars/SelectionBar.cpp:247
+#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
 msgstr "Kijelölés kezdete:"
 
-#: toolbars/SelectionBar.cpp:155 toolbars/SelectionBar.cpp:253
+#: toolbars/SelectionBar.cpp:163 toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
 msgid "Length"
 msgstr "Hossz"
 
-#: toolbars/SelectionBar.cpp:165
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
 msgstr "rejtett"
 
-#: toolbars/SelectionBar.cpp:175 toolbars/SelectionBar.cpp:264
+#: toolbars/SelectionBar.cpp:184 toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
 msgstr "Audió pozíció:"
 
-#: toolbars/SelectionBar.cpp:225 toolbars/SelectionBar.cpp:230
+#: toolbars/SelectionBar.cpp:236 toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr "Hozzáillesztés"
 
-#: toolbars/SelectionBar.cpp:252
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
 msgstr "Kijelölés"
 
-#: toolbars/SelectionBar.cpp:317
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
 msgstr "Kijelölés hossza"
 
-#: toolbars/SelectionBar.cpp:325
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
 msgstr "Kijelölés vége"
 
-#: toolbars/ToolBar.cpp:97
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr "Audacity %s eszköztár"
@@ -7378,43 +8371,43 @@ msgstr ""
 msgid "Key type"
 msgstr ""
 
-#: widgets/AButton.cpp:302
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr " (tiltva)"
 
-#: widgets/AButton.cpp:452
+#: widgets/AButton.cpp:461
 msgid "Press"
 msgstr ""
 
-#: widgets/AButton.cpp:531
+#: widgets/AButton.cpp:540
 msgid "Button"
 msgstr "Gomb"
 
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: widgets/ASlider.cpp:604 widgets/Meter.cpp:212
+#: widgets/ASlider.cpp:612 widgets/Meter.cpp:248
 msgid "L"
 msgstr "B"
 
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: widgets/ASlider.cpp:607 widgets/Meter.cpp:214
+#: widgets/ASlider.cpp:615 widgets/Meter.cpp:250
 msgid "R"
 msgstr "J"
 
-#: widgets/ASlider.cpp:670
+#: widgets/ASlider.cpp:678
 msgid "Center"
 msgstr "Közép"
 
-#: widgets/ASlider.cpp:674
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "Bal"
 
-#: widgets/ASlider.cpp:677
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "Jobb"
 
-#: widgets/ErrorDialog.cpp:78 widgets/ErrorDialog.cpp:102
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
 msgstr "Segítség"
 
@@ -7434,7 +8427,7 @@ msgstr "Előre"
 msgid "Backwards"
 msgstr "Hátra"
 
-#: widgets/ErrorDialog.cpp:249
+#: widgets/ErrorDialog.cpp:255
 msgid "Help on the Internet"
 msgstr "Segítség az interneten"
 
@@ -7456,47 +8449,50 @@ msgstr "%d. sor"
 msgid "Empty"
 msgstr "Ãœres"
 
-#: widgets/Meter.cpp:359
+#: widgets/Meter.cpp:396
 msgid "Enable Meter"
 msgstr "Mérő engedélyezése"
 
-#: widgets/Meter.cpp:361
+#: widgets/Meter.cpp:398
 msgid "Disable Meter"
 msgstr "Mérő letiltása"
 
-#: widgets/Meter.cpp:364
+#: widgets/Meter.cpp:401
 msgid "Stop Monitoring"
 msgstr "Megfigyelés leállítása"
 
-#: widgets/Meter.cpp:366
+#: widgets/Meter.cpp:403
 msgid "Start Monitoring"
 msgstr "Megfigyelés elindítása"
 
-#: widgets/Meter.cpp:370
+#: widgets/Meter.cpp:407
 msgid "Horizontal Stereo"
 msgstr "Vízszintes Sztereó"
 
-#: widgets/Meter.cpp:371
+#: widgets/Meter.cpp:408
 msgid "Vertical Stereo"
 msgstr "Függőleges sztereó"
 
-#: widgets/Meter.cpp:388
+#: widgets/Meter.cpp:425
 msgid "Preferences..."
 msgstr "Beállítások..."
 
-#: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
+#: widgets/Meter.cpp:1145
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
 msgstr ""
 
-#: widgets/Meter.cpp:1079
+#: widgets/Meter.cpp:1146
 msgid "Meter refresh rate per second [1-100]: "
 msgstr ""
 
-#: widgets/Meter.cpp:1080
+#: widgets/Meter.cpp:1147
 msgid "Meter Preferences"
 msgstr "Mérő beállításai"
 
@@ -7504,7 +8500,23 @@ msgstr "Mérő beállításai"
 msgid " Please select an action "
 msgstr " Kérem válasszon egy akciót "
 
-#: widgets/Ruler.cpp:1478 widgets/Ruler.cpp:1479
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
+#: widgets/Ruler.cpp:1445 widgets/Ruler.cpp:1446
 msgid "Vertical Ruler"
 msgstr "Függőleges vonalzó"
 
@@ -7515,12 +8527,6 @@ msgstr "Függőleges vonalzó"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 másodperc"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "óó:pp:mm"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7546,6 +8552,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 nap 024 ó 060 p 060 mp"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -7731,8 +8752,8 @@ msgstr "Nem lehet megnyitni ezt a fájlt: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Hiba %hs a %d. sorban"
+msgid "Error: %hs at line %lu"
+msgstr "Hiba: %hs a %lu. sorban"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/id.po b/locale/id.po
new file mode 100644
index 0000000..2b3ae7c
--- /dev/null
+++ b/locale/id.po
@@ -0,0 +1,9407 @@
+msgid ""
+msgstr "Project-Id-Version: Indo 1.0\n"
+"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-11-09 20:10+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Lukmanul Hakim <lukmanulhakim14 at gmail.com>\n"
+"Language-Team: Audacityn' Indonesia <lukmanulhakim14 at gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+
+#: AboutDialog.cpp:143
+#: AudacityApp.cpp:807
+#: Menus.cpp:955
+msgid "&About Audacity..."
+msgstr "&Tentang Audacity"
+
+#: AboutDialog.cpp:157
+msgid "OK... Audacious!"
+msgstr "OK... Bersenanglah dengan Audacity!"
+
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Audacity adalah program bebas dan gratis yang dicanangkan oleh <a href=\"http://audacity.sourceforge.net/community/developers\">tim pengembang</a> di seluruh dunia. Kami berterima kasih kepada <a href=\"http://sourceforge.net\">Sourceforge.net</a>, untuk penempatan proyek kami. Audacity tersedia untuk Windows 98 atau yang lebih baru, Mac OS X, Linux, atau sistem operasi lainnya yang mirip dengan sistem operasi Unix. Audacity versi lebih lama tersedia untuk Mac OS 9."
+
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Ini adalah program versi beta. Program ini mungkin mengandung beberapa bug dan fitur yang belum sempurna. Kami mengharapkan pendapat Anda. Mohon kirimkan laporan bug dan permintaan fitur ke <b>feedback at audacityteam.org</b>. Untuk bantuan menggunakan Audacity, silahkan kunjungi <a href=\"http://audacityteam.org/forum/\">Forum</a> kami."
+
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Ini adalah versi yang sudah stabil. Tetapi, jika Anda menemukan bug atau mempunyai saran, silahkan hubungi ke <b>feedback at audacityteam.org</b>. Untuk bantuan menggunakan Audacity, silahkan kunjungi <a href=\"http://audacityteam.org/forum/\">Forum</a> kami."
+
+#. i18n-hint: The translation of "translator_credits" will appear
+#. in the credits in the About Audacity window.  Use this to add
+#. your own name(s) to the credits.
+#.
+#. For example:  "English translation by Dominic Mazzoni."
+#.
+#: AboutDialog.cpp:192
+#: AboutDialog.cpp:194
+msgid "translator_credits"
+msgstr "Bahasa Indonesia: Lukmanul Hakim (kim-kim at kaskus.us)"
+
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr "Editor Audio Digital Bebas dan Gratis <br>"
+
+#: AboutDialog.cpp:211
+msgid "Credits"
+msgstr "Orang-Orang yang Berjasa"
+
+#: AboutDialog.cpp:215
+#, c-format
+msgid "Audacity %s Development Team"
+msgstr "Tim Pengembang Audacity %s"
+
+#: AboutDialog.cpp:220
+#, c-format
+msgid "Audacity %s Support Team"
+msgstr "Tim Pendukung Audacity %s"
+
+#: AboutDialog.cpp:225
+msgid "Emeritus Developers"
+msgstr "Pengembang Emeritus"
+
+#: AboutDialog.cpp:230
+msgid "Other Emeritus Team Members"
+msgstr "Anggota Tim Emeritus Lainnya"
+
+#: AboutDialog.cpp:235
+msgid "Other Contributors"
+msgstr "Kontributor Lainnya"
+
+#: AboutDialog.cpp:240
+msgid "Audacity is based on code from the following projects:"
+msgstr "Audacity didasarkan sumber dari proyek berikut ini:"
+
+#: AboutDialog.cpp:245
+msgid "Special thanks:"
+msgstr "Terima kasih untuk:"
+
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr "Perangkat lunak <b>Audacity&reg;</b> adalah hak cipta &copy; 1999-2008 Audacity Team. <br>Nama <b>Audacity&reg;</b> adalah merk terdaftar oleh Dominic Mazzoni."
+
+#: AboutDialog.cpp:258
+msgid "Audacity"
+msgstr "Audacity"
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
+msgid "Build Information"
+msgstr "Informasi Perubahan"
+
+#: AboutDialog.cpp:310
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Dibolehkan"
+
+#: AboutDialog.cpp:311
+msgid "Disabled"
+msgstr "Dilarang"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr "Dukungan Format File"
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr "Mengimpor MP3"
+
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr "Impor dan Ekspor Ogg Vorbis"
+
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr "Dukungan Tag ID3"
+
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr "Impor dan Ekspor FLAC"
+
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr "Ekspor MP2"
+
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr "Impor melalui QuickTime"
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr "Referensi Penting"
+
+#: AboutDialog.cpp:389
+#: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr "Konversi Sample Rate"
+
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr "Pemproduksian Audio dan Perekaman"
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr "Fitur"
+
+#: AboutDialog.cpp:422
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:430
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:438
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr "Dukungan Plug-in"
+
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr "Dukungan Sound card mixer"
+
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr "Dukungan Perubahan Pitch dan Tempo"
+
+#: AboutDialog.cpp:477
+msgid "Program build date: "
+msgstr "Tangga perubahan program:"
+
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
+msgid "Build type:"
+msgstr "Tipe perubahan:"
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr "Pembuangan bug"
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr "Rilis"
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr "Awalan Instalasi:"
+
+#: AboutDialog.cpp:491
+msgid "Settings folder: "
+msgstr "Folder pengaturan:"
+
+#: AboutDialog.cpp:506
+msgid "GPL License"
+msgstr "Lisensi GPL"
+
+#: AudacityApp.cpp:507
+#: Project.cpp:1844
+#, c-format
+msgid "%s is already open in another window."
+msgstr "%s sudah dibuka di window yang lain."
+
+#: AudacityApp.cpp:509
+#: Project.cpp:1846
+#: Project.cpp:1951
+#: Project.cpp:2095
+#: Project.cpp:2232
+msgid "Error opening project"
+msgstr "Error dalam membuka proyek"
+
+#: AudacityApp.cpp:541
+#, c-format
+msgid "%s does not exist and could not be opened.\n"
+"\n"
+"It has been removed from the history list."
+msgstr "%s tidak ada dan tidak bisa dibuka.\n"
+"\n"
+"Ini sudah dibuang dari daftar history."
+
+#: AudacityApp.cpp:643
+msgid "Master Gain Control"
+msgstr "Pengendali Master"
+
+#: AudacityApp.cpp:644
+msgid "Input Meter"
+msgstr "Meter Input"
+
+#: AudacityApp.cpp:645
+msgid "Output Meter"
+msgstr "Meter Output"
+
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
+#: AudacityApp.cpp:809
+msgid "&Preferences...\tCtrl+,"
+msgstr "&Preferensi...\tCtrl+,"
+
+#: AudacityApp.cpp:901
+#: AudacityApp.cpp:978
+#, c-format
+msgid "Using block size of %ld\n"
+msgstr "Menggunakan ukuran blok %ld\n"
+
+#: AudacityApp.cpp:923
+#: AudacityApp.cpp:993
+#, c-format
+msgid "Unknown command line option: %s\n"
+msgstr "Opsi baris komando tidak diketahui: %s\n"
+
+#: AudacityApp.cpp:1127
+msgid "Audacity could not find a place to store temporary files.\n"
+"Please enter an appropriate directory in the preferences dialog."
+msgstr "Audacity tidak bisa mencari tempat untuk meletakkan file temporary.\n"
+"Tolong masukkan direktori yang benar ke dalam dialog preferensi."
+
+#: AudacityApp.cpp:1133
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity sekarang ingin keluar. Tolong aktifkan Audacity kembali untuk menggunakan direktori file temporary yang baru."
+
+#: AudacityApp.cpp:1165
+msgid "Running two copies of Audacity simultaneously may cause\n"
+"data loss or cause your system to crash.\n"
+"\n"
+msgstr "Menjalankan dua Audacity yang sama sekaligus dapat menyebabkan\n"
+"hilangnya data atau dapat merusak sistem Anda.\n"
+"\n"
+
+#: AudacityApp.cpp:1172
+msgid "Audacity was not able to lock the temporary files directory.\n"
+"This folder may be in use by another copy of Audacity.\n"
+msgstr "Audacity tidak bisa mengunci direktori file temporary.\n"
+"Folder ini mungkin digunakan oleh program Audacity yang Lain.\n"
+
+#: AudacityApp.cpp:1174
+msgid "Do you still want to start Audacity?"
+msgstr "Anda ingin tetap menjalankan Audacity?"
+
+#: AudacityApp.cpp:1176
+msgid "Error locking temporary folder"
+msgstr "Error dalam mengunci folder temporary"
+
+#: AudacityApp.cpp:1214
+msgid "The system has detected that another copy of Audacity is running.\n"
+msgstr "Sistem telah mendeteksi bahwa Audacity yang lainnya sedang berjalan.\n"
+
+#: AudacityApp.cpp:1216
+msgid "Use the New or Open commands in the currently running Audacity\n"
+"process to open multiple projects simultaneously.\n"
+msgstr "Gunakan komando Baru atau Buka waktu menjalankan\n"
+"Audacity untuk membuka beberapa proyek sekaligus.\n"
+
+#: AudacityApp.cpp:1217
+msgid "Audacity is already running"
+msgstr "Audacity sudah berjalan"
+
+#: AudacityApp.cpp:1234
+msgid "Command-line options supported:"
+msgstr "Dukungan opsi baris komando"
+
+#. i18n-hint: '-help' is the option and needs to stay in
+#. * English. This displays a list of available options
+#: AudacityApp.cpp:1237
+msgid "\t-help (this message)"
+msgstr "\t-bantuan (pesan ini)"
+
+#. i18n-hint '-version' needs to stay in English.
+#: AudacityApp.cpp:1239
+msgid "\t-version (display Audacity version)"
+msgstr "\t-versi (tampilan versi Audacity)"
+
+#. i18n-hint '-test' is the option and needs to stay in
+#. * English. This runs a set of automatic tests on audacity
+#. * itself
+#: AudacityApp.cpp:1243
+msgid "\t-test (run self diagnostics)"
+msgstr "\t-test (jalankan diagnosa otomatis)"
+
+#. i18n-hint '-blocksize' is the option and needs to stay in
+#. * English. 'nnn' is any integer number. This controls the
+#. * size pieces that audacity uses when writing files to the
+#. * disk
+#: AudacityApp.cpp:1248
+msgid "\t-blocksize nnn (set max disk block size in bytes)"
+msgstr "\t-blocksize nnn (ukuran blok pada disk maksimum dalam byte)"
+
+#: AudacityApp.cpp:1249
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "Tambahan, spesifikasikan nama file audio atau proyek audacity terlebih dahul untuk membukanya."
+
+#: AudacityApp.cpp:1529
+msgid "Audacity project (.AUP) files are not currently \n"
+"associated with Audacity. \n"
+"\n"
+"Associate them, so they open on double-click?"
+msgstr "File Proyek Audacity (.AUP) tidak\n"
+"berasosiasi dengan Audacity.\n"
+"\n"
+"Hubungkan terlebih dahulu baru file tersebut bisa dibuka dengan klik ganda?"
+
+#: AudacityApp.cpp:1530
+msgid "Audacity Project Files"
+msgstr "File Proyek Audacity"
+
+#: AudioIO.cpp:254
+msgid "Could not find any audio devices.\n"
+msgstr "Tidak dapat mencari perangkat audio.\n"
+
+#: AudioIO.cpp:255
+msgid "You will not be able to play or record audio.\n"
+"\n"
+msgstr "Anda tidak akan bisa memainkan ataupun merekam audio.\n"
+"\n"
+
+#: AudioIO.cpp:258
+msgid "Error: "
+msgstr "Error:"
+
+#: AudioIO.cpp:261
+msgid "Error Initializing Audio"
+msgstr "Error Menginisialisasi audio"
+
+#: AudioIO.cpp:1375
+msgid "Latency problem"
+msgstr "Masalah Laten"
+
+#: AudioIO.cpp:1375
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "Aturan yang laten telah menyebabkan audio yang direkam menghilang.\n"
+"Audacity telah mengembalikan mulai dari nol.\n"
+"Anda bisa menggunakan Alat Time Shift (<--> atau F5) untuk memindahkan trak ke tempat yang tepat."
+
+#: AutoRecovery.cpp:54
+msgid "Automatic Crash Recovery"
+msgstr "Pengembalian Otomatis Akibat Crash"
+
+#: AutoRecovery.cpp:73
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
+"Fortunately, the following projects can automatically be recovered:"
+msgstr "Beberapa proyek tidak disimpan sebelumnya waktu Audacity terakhir dijalankan.\n"
+"Pada yang akan datang, proyek-proyek ini bisa dikembalikan secara otomatis:"
+
+#: AutoRecovery.cpp:75
+msgid "Recoverable projects"
+msgstr "Proyek yang dipindahkan"
+
+#: AutoRecovery.cpp:78
+#: Tags.cpp:2041
+msgid "Name"
+msgstr "Nama"
+
+#: AutoRecovery.cpp:84
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "Mengembalikan proyek tidak akan mengubah file apapun pada disk sebelum anda menyimpan ini."
+
+#: AutoRecovery.cpp:88
+msgid "Quit Audacity"
+msgstr "Keluar dari Audacity"
+
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr "Jangan dikembalikan"
+
+#: AutoRecovery.cpp:90
+msgid "Recover Projects"
+msgstr "Kembalikan proyek-proyek"
+
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr "Apakah Anda yakin tidak mau mengembalikan proyek apapun?\n"
+"Proyek tersebut tidak akan bisa dikembalikan lagi."
+
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr "Yakin?"
+
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
+msgid "Could not enumerate files in auto save directory"
+msgstr "Tidak bisa enumerasi file dalam direkroti simpan otomatis"
+
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:3053
+#: Menus.cpp:3065
+#: Menus.cpp:5182
+#: Project.cpp:2054
+#: Project.cpp:3615
+#: Project.cpp:3694
+#: TrackPanel.cpp:6385
+#: WaveTrack.cpp:598
+#: WaveTrack.cpp:617
+#: WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077
+#: WaveTrack.cpp:2087
+#: effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
+msgid "Error"
+msgstr "Error"
+
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
+msgid "Select Command"
+msgstr "Pilih Komando"
+
+#: BatchCommandDialog.cpp:82
+#: BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
+msgid "&Command"
+msgstr "&Komando"
+
+#: BatchCommandDialog.cpp:84
+msgid "&Edit Parameters"
+msgstr "&Edit Parameter"
+
+#: BatchCommandDialog.cpp:91
+#: BatchProcessDialog.cpp:455
+msgid "&Parameters"
+msgstr "&Parameter"
+
+#: BatchCommandDialog.cpp:96
+msgid "C&hoose command"
+msgstr "P&ilih Komando"
+
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
+msgstr "Efek Stereo ke Mono tidak ditemukan"
+
+#: BatchCommands.cpp:476
+msgid "Ogg Vorbis support is not included in this build of Audacity"
+msgstr "Dukungan Ogg Vorbis tidak dimasukkan di dalam Audacity"
+
+#: BatchCommands.cpp:488
+msgid "FLAC support is not included in this build of Audacity"
+msgstr "Dukungan FLAC tidak dimasukkan di dalam Audacity"
+
+#: BatchCommands.cpp:492
+#, c-format
+msgid "Command %s not implemented yet"
+msgstr "Komando %s belum bisa diimplementasikan"
+
+#: BatchCommands.cpp:508
+#, c-format
+msgid "Could not set parameters of effect %s\n"
+" to %s."
+msgstr "Tidak dapat mengatur parameters efek %s\n"
+"ke %s."
+
+#: BatchCommands.cpp:561
+#, c-format
+msgid "Your batch command of %s was not recognised."
+msgstr "%s Komando Anda tidak bisa dijalankan."
+
+#: BatchCommands.cpp:652
+#, c-format
+msgid "Apply %s with parameter(s)\n"
+"\n"
+"%s"
+msgstr "Mengaplikasikan %s dengan (beberapa) parameter\n"
+"\n"
+"%s"
+
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
+msgid "Test Mode"
+msgstr "Mode Percobaan"
+
+#: BatchCommands.cpp:657
+#, c-format
+msgid "Apply %s"
+msgstr "Mengaplikasikan %s"
+
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
+msgid "Apply Chain"
+msgstr "Mengaplikasikan Untaian"
+
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "Proses Batch CleanSpeech"
+
+#: BatchProcessDialog.cpp:94
+msgid "&Select chain"
+msgstr "&Pilih untaian"
+
+#: BatchProcessDialog.cpp:99
+msgid "Chain"
+msgstr "Untaian"
+
+#: BatchProcessDialog.cpp:106
+msgid "Apply to Current &Project"
+msgstr "Aplikasikan ke proyek yang tersedia"
+
+#: BatchProcessDialog.cpp:107
+msgid "Apply to &Files..."
+msgstr "Aplikasikan ke &File"
+
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2080
+#: Tags.cpp:2084
+#: Tags.cpp:2384
+#: Tags.cpp:2388
+#: UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732
+#: effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
+msgid "&Cancel"
+msgstr "&Batal"
+
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
+msgid "No chain selected"
+msgstr "Tidak ada untaian yang dipilih"
+
+#: BatchProcessDialog.cpp:159
+#, c-format
+msgid "Applying '%s' to current project"
+msgstr "Mengaplikasikan '%s' ke proyek yang tersedia"
+
+#: BatchProcessDialog.cpp:200
+msgid "Please save and close the current project first."
+msgstr "Mohon simpan dan tutup proyek yang ada dahulu."
+
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "Pilih (beberapa) file vokal untuk Sambungan batch CleanSpeech..."
+
+#: BatchProcessDialog.cpp:207
+msgid "Select file(s) for batch processing..."
+msgstr "Pilih (beberapa) file untuk memproses..."
+
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr "File vokal (*.wav;*.mp3)|*.wav;*.mp3|file WAV (*.wav)|*.wav|file MP3 (*.mp3)|*.mp3"
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Semua file (*.*)|*.*|File WAV(*.wav)|*.wav|File AIFF (*.aif)|*.aif|File AU (*.au)|*.au|File MP3 (*.mp3)|*.mp3|File Ogg Vorbis (*.ogg)|*.ogg|File FLAC (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:231
+msgid "Applying..."
+msgstr "Mengaplikasikan..."
+
+#: BatchProcessDialog.cpp:241
+msgid "File"
+msgstr "Berkas"
+
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
+msgid "Edit Chains"
+msgstr "Edit Untaian"
+
+#: BatchProcessDialog.cpp:416
+msgid "&Chains"
+msgstr "&Untaian"
+
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:826
+#: Tags.cpp:1465
+#: Tags.cpp:2064
+msgid "&Add"
+msgstr "&Tambah"
+
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:128
+#: Tags.cpp:827
+#: Tags.cpp:1466
+#: Tags.cpp:2065
+#: TrackPanel.cpp:4176
+msgid "&Remove"
+msgstr "&Buang"
+
+#: BatchProcessDialog.cpp:437
+msgid "Re&name"
+msgstr "&Ganti Nama"
+
+#: BatchProcessDialog.cpp:443
+msgid "C&hain (Double-Click or press SPACE to edit)"
+msgstr "Un&taiann (Klik ganda atau tekan SPASI untuk edit)"
+
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
+msgid "No"
+msgstr "Tidak"
+
+#: BatchProcessDialog.cpp:459
+msgid "&Insert"
+msgstr "&Masukkan"
+
+#: BatchProcessDialog.cpp:460
+msgid "De&lete"
+msgstr "&Hapus"
+
+#: BatchProcessDialog.cpp:461
+msgid "Move &Up"
+msgstr "Pindah ke &Atas"
+
+#: BatchProcessDialog.cpp:462
+msgid "Move &Down"
+msgstr "Pindak ke &Bawah"
+
+#: BatchProcessDialog.cpp:463
+msgid "De&faults"
+msgstr "Se&mula"
+
+#: BatchProcessDialog.cpp:507
+msgid "- END -"
+msgstr "- SELESAI -"
+
+#: BatchProcessDialog.cpp:540
+#, c-format
+msgid "%s changed"
+msgstr "%s telah diubah"
+
+#: BatchProcessDialog.cpp:541
+msgid "Do you want to save the changes?"
+msgstr "Anda mau menyimpan perubahan?"
+
+#: BatchProcessDialog.cpp:623
+msgid "Enter name of new chain"
+msgstr "Masukkan nama untaian baru"
+
+#: BatchProcessDialog.cpp:634
+msgid "Name must not be blank"
+msgstr "Nama seharusnya tidak kosong"
+
+#: BatchProcessDialog.cpp:643
+#, c-format
+msgid "Names may not contain '%c' and '%c'"
+msgstr "Nama tidak mungkin mengandung '%c' and '%c'"
+
+#: BatchProcessDialog.cpp:673
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "anda yakin mau menghapus %s?"
+
+#: Dependencies.cpp:139
+msgid "Removing Dependencies"
+msgstr "Menghapus Ketergantungan"
+
+#: Dependencies.cpp:140
+msgid "Copying audio data into project..."
+msgstr "Menyalin data audio ke proyek..."
+
+#: Dependencies.cpp:223
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
+"This will need more disc space but is safer."
+msgstr "Proyek Anda membutuhkan file lainnya.\n"
+"Salin audio dari file tersebut ke dalam proyek Anda supaya proyek anda terisi sendiri?\n"
+"Ini akan membutuhkan ruang lebig besar, tetapi lebih aman."
+
+#: Dependencies.cpp:270
+msgid "Project depends on other audio files"
+msgstr "Proyek membutuhkan file audio lainnya"
+
+#: Dependencies.cpp:291
+msgid "Project Dependencies"
+msgstr "Ketergantungan Proyek"
+
+#: Dependencies.cpp:294
+msgid "Audio file"
+msgstr "File audio"
+
+#: Dependencies.cpp:296
+msgid "Disk space"
+msgstr "Ruang disk"
+
+#: Dependencies.cpp:301
+msgid "Copy Selected Audio Into Project"
+msgstr "Menyalin Audio yang Dipilih ke dalam Proyek"
+
+#: Dependencies.cpp:308
+#: Dependencies.cpp:414
+msgid "Cancel Save"
+msgstr "Batalkan Penyimpanan"
+
+#: Dependencies.cpp:310
+msgid "Do Not Copy Any Audio"
+msgstr "Jangan Salin Audio Apapun"
+
+#: Dependencies.cpp:312
+msgid "Copy All Audio into Project (Safer)"
+msgstr "Salin Semua Audio ke dalam Proyek (Lebih Aman)"
+
+#: Dependencies.cpp:321
+#: Dependencies.cpp:326
+msgid "Ask me"
+msgstr "Tanya saya"
+
+#: Dependencies.cpp:322
+msgid "Always copy all audio (safest)"
+msgstr "Selalu salin semua audio (paling aman)"
+
+#: Dependencies.cpp:323
+msgid "Never copy any audio"
+msgstr "Tidak pernah menyalin audio apapun"
+
+#: Dependencies.cpp:325
+msgid "Whenever a project depends on other files:"
+msgstr "Ketika proyek membutuhkan file lainnya:"
+
+#: Dependencies.cpp:413
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "Proyek Anda tidak akan disimpad di disk. Itukan yang Anda mau?"
+
+#: Dependencies.cpp:453
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "Proyek Anda terisi sendiri; proyek ini tidak membutuhkan file audio eksternal apapun."
+
+#: Dependencies.cpp:454
+msgid "Dependency check"
+msgstr "Cek ketergantungan"
+
+#: DirManager.cpp:137
+msgid "Warning: there is very little free disk space left on this volume.\n"
+"Please select another temporary directory in your preferences."
+msgstr "Perhatian: ruang disk yang tersisa tinggal sedikit.\n"
+"Mohon pilih direktori temporer lainnya dalam preferensi Anda."
+
+#: DirManager.cpp:223
+#: DirManager.cpp:254
+#: DirManager.cpp:337
+msgid "Progress"
+msgstr "Kemajuan"
+
+#: DirManager.cpp:288
+msgid "Cleaning up temporary files"
+msgstr "Membersihkan file temporer"
+
+#: DirManager.cpp:338
+msgid "Saving project data files"
+msgstr "Menyimpan file data proyek"
+
+#: DirManager.cpp:410
+msgid "Cleaning up cache directories"
+msgstr "Membersihkan direktori cache"
+
+#: DirManager.cpp:505
+#, c-format
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "Audacity menemukan anak file blok %s! \n"
+"Silahkan Anda simpan dan buka kembali proyek Anda untuk melakukan pengecekan penuh.\n"
+
+#. i18n-hint: This is the pattern for filenames that are created
+#. when a file needs to be backed up to a different name.  For
+#. example, mysong would become mysong-old1, mysong-old2, etc.
+#: DirManager.cpp:1094
+#, c-format
+msgid "%s-old%d"
+msgstr "%s-%dlama"
+
+#: DirManager.cpp:1102
+msgid "Unable to open/create test file"
+msgstr "Tidak bisa membuka atau membuat file tes"
+
+#: DirManager.cpp:1111
+#, c-format
+msgid "Unable to remove '%s'"
+msgstr "Tidak bisa membuang '%s'"
+
+#: DirManager.cpp:1116
+#, c-format
+msgid "Renamed file: %s\n"
+msgstr "File yang telah diganti nama: %s\n"
+
+#: DirManager.cpp:1160
+#, c-format
+msgid "Unable to rename '%s' to '%s'"
+msgstr "Tidak bisa meganti nama '%s' ke '%s'"
+
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
+msgid "Inspecting project file data..."
+msgstr "Memeriksa data file proyek..."
+
+#: DirManager.cpp:1240
+#, c-format
+msgid "Orphaned blockfile: (%s)"
+msgstr "Anak file blok: (%s)"
+
+#: DirManager.cpp:1265
+#, c-format
+msgid "Missing alias file: (%s)"
+msgstr "File alias menghilang: (%s)"
+
+#: DirManager.cpp:1285
+#, c-format
+msgid "Missing summary file: (%s.auf)"
+msgstr "File rangkuman menghilang: (%s)"
+
+#: DirManager.cpp:1305
+#, c-format
+msgid "Missing data file: (%s.au)"
+msgstr "File data menghilang: (%s.au)"
+
+#: DirManager.cpp:1319
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "Pengecekan menemukan ketidakkonsistenan keteka memeriksa data yang diambil;\n"
+"Tekan 'Detail' untuk daftar error, atau 'OK' untuk meneruskan ke opsi lainnya."
+
+#: DirManager.cpp:1331
+#, c-format
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
+"unused and probably left over from a crash or some other bug.\n"
+"They should be deleted to avoid disk contention."
+msgstr "Pengecekan menemukan %d anak file blok. File ini tidak berguna\n"
+"dan mungkin tertinggal waktu crash atau bug lainya.\n"
+"Ini harus dihapus untuk menghemat ruang disk."
+
+#: DirManager.cpp:1336
+msgid "Delete orphaned files [safe and recommended]"
+msgstr "Hapus anak file [Aman dan direkomendasikan]"
+
+#: DirManager.cpp:1337
+msgid "Continue without deleting; silently work around the extra files"
+msgstr "Terus tanpa penghapusan; bekerja di sekitar file tambahan secara diam-diam"
+
+#: DirManager.cpp:1338
+msgid "Close project immediately with no changes"
+msgstr "Tutup proyek secepatnya tanpa perubahan"
+
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
+#: widgets/Warning.cpp:55
+msgid "Warning"
+msgstr "Perhatian"
+
+#: DirManager.cpp:1366
+#, c-format
+msgid "Project check detected %d input file[s] being used in place\n"
+"('alias files') are now missing.  There is no way for Audacity\n"
+"to recover these files automatically; you may choose to\n"
+"permanently fill in silence for the missing files, temporarily\n"
+"fill in silence for this session only, or close the project now\n"
+"and try to restore the missing files by hand."
+msgstr "Pengecekan menemukan file input %d yang telah digunakan\n"
+"('alias file') sekarang telah menghilang. Tidak ada cara lain\n"
+"selain mengembalikan file tersebut secara otomatis; Anda bisa memilih\n"
+"mengosongkan file yang hilang secara permanen pada sesi ini, atau\n"
+"tutup proyek ini dan coba mencari file itu sendiri."
+
+#: DirManager.cpp:1371
+msgid "Replace missing data with silence [permanent upon save]"
+msgstr "Mengembalikan data yang hilang diam-diam [permanen pada penyimpanan]"
+
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
+msgid "Temporarily replace missing data with silence [this session only]"
+msgstr "Mengembalikan data yang hilang diam-diam secara sementara [hanya sesi ini saja]"
+
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
+msgid "Close project immediately with no further changes"
+msgstr "Tutup proyek secepatnya tanpa perubahan"
+
+#: DirManager.cpp:1412
+#, c-format
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
+"Audacity can fully regenerate these summary files from the\n"
+"original audio data in the project."
+msgstr "Pengecekan menemukan file rangkuman %d yang hilang (.auf).\n"
+"Audacity bisa membuat ulang file tersebut dari data aslinya pada proyek."
+
+#: DirManager.cpp:1417
+msgid "Regenerate summary files [safe and recommended]"
+msgstr "Membuat ulang file rangkuman [lebih aman dan direkomendasikan]"
+
+#: DirManager.cpp:1418
+msgid "Fill in silence for missing display data [this session only]"
+msgstr "Kosongkan tampilan data yang hilang [sesi ini saja]"
+
+#: DirManager.cpp:1454
+#, c-format
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
+"probably due to a bug, system crash or accidental deletion.\n"
+"There is no way for Audacity to recover this lost data\n"
+"automatically; you may choose to permanently fill in silence\n"
+"for the missing data, temporarily fill in silence for this\n"
+"session only, or close the project now and try to restore the\n"
+"missing data by hand."
+msgstr "Pengecekan menemukan file data blok audio %d yang menghilang (.au), \n"
+"mungkin karena bug, crash, atau ketidaksengajaan. \n"
+"Tidak ada jalan lain selain mengembalikan data yang hilang\n"
+"secara otomatis; Anda bisa memilih untuk tetap mengosongkan data tadi\n"
+"atau secara sementara atau tutup proyek dan mencoba mengembalikannya sendiri."
+
+#: DirManager.cpp:1459
+msgid "Replace missing data with silence [permanent immediately]"
+msgstr "Kosongkan data yang hilang [permanen]"
+
+#: DirManager.cpp:1487
+msgid "Cleaning up unused directories in project data..."
+msgstr "Membersihkan direktori yang tak berguna apda data proyek..."
+
+#: DirManager.cpp:1558
+msgid "Caching audio"
+msgstr "Membuat cache audio"
+
+#: DirManager.cpp:1559
+msgid "Caching audio into memory..."
+msgstr "Membuat cache audio di memeoi..."
+
+#: DirManager.cpp:1592
+msgid "Saving recorded audio"
+msgstr "Meinyimpan audio yang direkam"
+
+#: DirManager.cpp:1593
+msgid "Saving recorded audio to disk..."
+msgstr "Meinyimpan audio yang direkam pada disk..."
+
+#: FFT.cpp:389
+msgid "Rectangular"
+msgstr "Bersiku"
+
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "FFmpeg library not found"
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr "Tempatkan FFmpeg"
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Audacity memerlukan file %s untuk menegkspor dan mengimpor dengan FFmpeg.."
+
+#: FFmpeg.cpp:196
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Lokasi %s:"
+
+#: FFmpeg.cpp:205
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Untuk mencari %s, click here -->"
+
+#: FFmpeg.cpp:211
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Jelajah..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Untuk mendapatkan salinan FFmpeg gratis, klik di sini ==>"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Dimana %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "FFmpeg tidak ada"
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Hanya avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:103
+msgid "Frequency Analysis"
+msgstr "Analisis Frekuensi"
+
+#: FreqWindow.cpp:139
+#: TrackPanel.cpp:556
+#: prefs/GUIPrefs.cpp:156
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: FreqWindow.cpp:140
+msgid "Standard Autocorrelation"
+msgstr "Autokoreksi Standar"
+
+#: FreqWindow.cpp:141
+msgid "Cuberoot Autocorrelation"
+msgstr "Autokoreksi Cuberoot"
+
+#: FreqWindow.cpp:142
+msgid "Enhanced Autocorrelation"
+msgstr "Autokoreksi Tingkat Tinggi"
+
+#. i18n-hint: This is a technical term, derived from the word
+#. "spectrum".  Do not translate it unless you are sure you
+#. know the correct technical word in your language.
+#: FreqWindow.cpp:146
+msgid "Cepstrum"
+msgstr "Kepstrum"
+
+#: FreqWindow.cpp:150
+#: FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "Algoritma"
+
+#: FreqWindow.cpp:169
+#: FreqWindow.cpp:173
+#: HistoryWindow.cpp:79
+msgid "Size"
+msgstr "Ukuran"
+
+#. i18n-hint: This refers to a "window function", used in the
+#. Frequency analyze dialog box.
+#: FreqWindow.cpp:183
+msgid " window"
+msgstr " jendela"
+
+#: FreqWindow.cpp:187
+#: FreqWindow.cpp:191
+msgid "Function"
+msgstr "Fungsi"
+
+#: FreqWindow.cpp:196
+msgid "Linear frequency"
+msgstr "Frekuensi linier"
+
+#: FreqWindow.cpp:197
+msgid "Log frequency"
+msgstr "Frekuensi logaritma"
+
+#: FreqWindow.cpp:201
+#: FreqWindow.cpp:205
+msgid "Axis"
+msgstr "Aksis"
+
+#: FreqWindow.cpp:212
+#: LabelDialog.cpp:130
+#: Menus.cpp:241
+#: Menus.cpp:276
+msgid "&Export..."
+msgstr "&Ekspor"
+
+#: FreqWindow.cpp:213
+#: export/ExportCL.cpp:325
+#: export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "Ekspor"
+
+#: FreqWindow.cpp:216
+#: FreqWindow.cpp:217
+#: widgets/ErrorDialog.cpp:161
+msgid "Close"
+msgstr "Tutup"
+
+#: FreqWindow.cpp:280
+#: FreqWindow.cpp:410
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:792
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1123
+#: effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133
+#: effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408
+#: effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367
+#: widgets/Meter.cpp:417
+msgid "dB"
+msgstr "dB"
+
+#. i18n-hint: This is the abbreviation for "Hertz", or
+#. cycles per second.
+#: FreqWindow.cpp:295
+#: FreqWindow.cpp:450
+#: effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195
+#: import/ImportRaw.cpp:399
+msgid "Hz"
+msgstr "Hz"
+
+#: FreqWindow.cpp:394
+msgid "Not enough data selected."
+msgstr "Data yang dipilih tidak cukup"
+
+#: FreqWindow.cpp:458
+#: effects/AutoDuck.cpp:794
+msgid "s"
+msgstr "d"
+
+#: FreqWindow.cpp:787
+#, c-format
+msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
+msgstr "Kursor: %d Hz (%s) = %d dB    Pik: %d Hz (%s) = %.1f dB"
+
+#: FreqWindow.cpp:796
+#, c-format
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "Kursor: %.4f det (%d Hz) (%s) = %f,    Pik: %.4f det (%d Hz) (%s) = %.3f"
+
+#: FreqWindow.cpp:1069
+msgid "spectrum.txt"
+msgstr "spektrum.txt"
+
+#: FreqWindow.cpp:1071
+msgid "Export Spectral Data As:"
+msgstr "Ekspor data spektral sebagai:"
+
+#: FreqWindow.cpp:1087
+#: LabelDialog.cpp:603
+#: Menus.cpp:2555
+#: Project.cpp:2604
+#: Project.cpp:3667
+#: prefs/KeyConfigPrefs.cpp:182
+msgid "Couldn't write to file: "
+msgstr "Tidak bisa menulis file:"
+
+#: FreqWindow.cpp:1092
+msgid "Frequency (Hz)\tLevel (dB)"
+msgstr "Frekuensi (Hz)\tTingkatan (dB)"
+
+#: FreqWindow.cpp:1098
+msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
+msgstr "Waktu (detik)\tFrekuensi (Hz)\tTingkat"
+
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
+msgstr "Ke [[welcome|Awal]]"
+
+#: HelpText.cpp:92
+msgid "Welcome!"
+msgstr "Selamat Datang!"
+
+#: HelpText.cpp:97
+msgid "Playing Audio"
+msgstr "Memeainkan Audio"
+
+#: HelpText.cpp:101
+msgid "Recording Audio"
+msgstr "Merekam Audio"
+
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
+msgstr "Merekam - Memilih Perangkat Input"
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr "Merekam - Memilih Sumber Input"
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr "Merekam - Mengatur Tingkatan Input"
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr "Mengedit dan mengabu-abukan Menu"
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr "Mengekspor File Audio"
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr "Menyimpan Proyek Audacity"
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr "Format yang tidak mendukung"
+
+#: HelpText.cpp:133
+msgid "Burn to CD"
+msgstr "Bakar ke CD"
+
+#: HelpText.cpp:137
+msgid "No Local Help"
+msgstr "Tidak Ada Bantuan lokal"
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr "</p><center><h3>Memulai</h3></center><br>"
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr "Selamat Datang di Audacity "
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "Belajar mengenai: <ul><li>[[play|memainkan]] file audio yang ada <li>[[record|merekam]] suara Anda, LP atau tape <li>[[edit|mengedit]] suara <li>[[save|simpan atau buka proyek Audacity]] <li>[[export|mengekspor]] ke file MP3 atau format lainnya, or [[burncd|bakar ke CD]]  </ul></p><p>"
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "Tampilan ini bisa dilihat kapan saja dengan mengklik menu <i>Bantuan</i>, kemudian <i>Tampilkan Pesan Awal</i>. Untuk pentunjuk yang lebih detil, klik menu <i>Bantuan</i> kemudian <i>Indeks</i>, atau download <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">Manual lengkap</a> kami dalam format PDF.</p>"
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>Membuka file audio:</b> masukkan (drag) file ke jendela proyek yang ada, atau klik <i>Berkas &gt; Impor &gt; Audio</i>. File juga bisa dibuka ke dalam proyek dengan <i>Berkas &gt; Buka</i>. Format-format yang bisa dimainkan adalah <b>AIFF, AU, FLAC, M4A</b> (hanya pada Mac), <b>MP2/MP3, OGG Vorbis</b> dan <b>WAV</b>. Click [[wma-proprietary|di sini]] jika file Anda berformat selain yang disebutkan tadi. <b>Untuk mengimpor CD:</b> ekstrak ke format WAV atau AIFF dengan iTunes, Windows Media Player 11 atau yang lainnya. Lihat petunjuk online kami: [[wiki:How_to_import_CDs|mengimpor CD]].</p><p> <p><b>Memainkan audio:</b> Tekan tombol hijau untuk memainkan. Tekan tombol biru untuk menghentikan sementara, dan tekan lagi untuk melanjutkan. Untuk berhenti, tekan tombol kuning. Spasi bisa digunakan untuk memainkan atau berhenti. Setelah berhenti, akan dilanjutkan pada titik awal yang terakhir ditentukan. Untuk mengubah titik awal, klik pada tempat yang anda ingin tentukan. Tombol <b>|&lt;&lt;</b> dan <b>&gt;&gt;|</b> bisa digunakan pindah ke awal atau akhir trek. </p><br><br>"
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>Untuk merekam:</b> Atur perekam dan inputnya, atur volume input, kemudian tekan tombol merah.</b></p><p> 1) [[inputdevice|Atur perekam]] bisa di <i>Tab Audio I/O pada Preferensi</i> atau pada <i>Toolbar Perangkat</i>. Preferences Audio I/O memungkinkan anda memilih rekaman stereo jika mau.<br> 2) [[inputsource|Atur sumber input]] untuk perangkate (contoh: mikropon atau line-in) pada pilihan di bawah <i>Toolbar Mixer</i>, atau (pada beberapa sistem) di Perangkat Rekaman dalam <i>Tab Audio I/O pada Preferensi</i> atau pada <i>Toolbar Perangkat</i>.<br> 3) [[inputlevel|Atur tingkatan input]] menggunakan slider kanan pada <i>Toolbar Mixer</i>. Memeriksa tingkatan sebelum merekam sangat penting untuk mencegah bising. </p><p> Bantuan lainnya ada di: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, Tutorial kami <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> \"Your First Recording\"</a> di <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual kami</a>, dan halaman Wiki kami [[wiki:Recording_Tips|Tips Merekam]] dan [[wiki:Troubleshooting_Recordings|Memecahkan masalah pada rekaman]]. </p><br><br>"
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Perangkat input adalah perangkat suara fisik yang digunakan untuk merekam. Bisa dipilih di \"Perangkat Rekaman\" pada <i>tab Audio I/O pada Preferensi</i>, Pada windows dan Linux, Preferensi ada di bawah Menu <i>Edit</i>. Pada Macintosh, ada di menu <i>Audacity</i>. Anda bisa juga memilih perangkat rekaman di <i>Toolbar Perangkat</i>, yang bisa ditampilkan pada <i>View &gt; Toolbar...</i>. </p><p> Biasanya, Audacity memakai perangkat yang digunakan oleh sistem, (biasanya perangkat suara yang bulit-in), karenanya jarang sekali pada pengguna mengubah setting-an ini. Pada Windows, perangkat untuk sistem bisa dipilih di \"Microsoft Sound Mapper\". Jika Anda merekam dari USb eksternal atau perngkat Firewire seperti USB turntable, pilih secara terpisah dengan nama perangkat rekaman setelah dihubungkan. </p><p> Kembali ke [[record|Merekam Audio]] <br></p>"
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Memilih sumber input (seperti mikropon atau line-in) untuk [[inputdevice|perangkat rekaman]] Anda:<br> - <b>Pada windows (kecuali Vista)</b> dan <b>Linux</b>, pada pilihan kebawah di kanan <i>Toolbar Mixer</i>.<br> - <b>Pada Windows Vista</b> dan <b>Mac</b>, pada Perangkat Rekaman di <i>tab Audio I/O dari Preferensi</i>, atau di <i>Toolbar Perangkat</i>. Sumber akan terlihat sebagai bagian dari perangkat (contoh: <i>High Def Audio Card: Mikropon</i>). Jika memungkinkan, Pengguna Mac bisa memilih sumber input di Apple Audio MIDI Setup. <br><i><b>Catatan:</b> beberapa perangkat rekaman USB atau Firewire tidak mempunyai pilihan input, jadi langkah ini bisa diabaikan. Jika ragu, silahkan lihat dokumen untuk perangkat Anda. </i></p><p> <b>Tips:</b> Untuk <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">merekam audio yang dimainkan di komputer</a>, pengguna Windows dan Linux bisa memilih \"Stereo Mix\", \"Wave Out\", \"Sum\" atau sumber input yang cocok lainnya. </p><p> Kembali ke [[record|Merekam Audio]] <br></p>"
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>tingkatan input harus diatur dengan benar. Jika terlalu rendah, akan menjadi suara latar belakang. Jika terlalu tinggi, suara akan pecah. </p><p>untuk mengatur level, bisa lihat ini [[wiki:Recording_levels|pentunjuk online yang diilustrasikan]] atau ikuti langkah ini: <ol><li>Hidupkan <b>pemantauan</b>. Klik-ganda the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>Perintah utama untuk mengedit audio ada di menu <i>Edit</i> (seperti potong, salin dan tempel) dan menu <i>Efek</i> (Anda bisa mengecangkan bass, mengubah pitch atau tempo, atau membuang bising). </p><p> Audacity mengaplikasikan efek hanya pada daerah terpilih. Untuk memilih area, klik pada trek dan arahkan dengan mouse. Jika tidak ada yang dipilih, Audacity akan memilih semua yang ada di jendela proyek.</p><p> Ketika memainkan atau merekam, menu Edit dan Efek tidak akan aktif, karena trek yang bergerak tidak bisa diedit. Perintah bisa sewaktu-waktu tidak bisa karena alasan lain. Contohnya, Anda  tidak bisa menjalankan efek sampai Anda mempunyai audio pada jendela, dan Anda tidak bisa menempel audio sampai Anda memotong atau menyalin dahulu. </p><br><br>"
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>Untuk melanjutkan kembali proyek pada Audacity, simpan proyek Audacity terlebih dahulu. Untuk memainkan pekerjaan Anda di program media atau mengirimkannya kepada orang lain, [[export|ekspor]] file audio ke format WAV atau MP3. </p><p> <i>Berkas &gt; Simpan Proyek</i> menyimpan file proyek <b>.aup</b> dan folder <b>_data</b> berisi audio yang diperlukan. Untuk membuka kembali proyek yang telah disimpan, klik <i>Berkas &gt; Buka</i> dan pilih file .aup. Jika anda menyimpan dan keluar lebih dari sekali, file backup .aup.bak akan dibuat, tapi file .aup seharusnya salalu dibuka jika terjadi. Ketika file ekspor akhir Anda sesuai dengan yang anda minta, hapus file proyek dan folder _data untuk menghemat ruang disk. </p><p><i>Berkas &gt; Simpan Proyek Sebagai...</i> digunakan untuk menyimpan proyek kosong. Ini juga digunakan untuk menyimpan Proyek yang sudah ada dengan nama<b> baru</b>. Inilah langkah teraman untuk menamai ulang proyek. File .aup dan folder _data tidak seharusnya dipindahkan atau diganti namanya secara manual. </p><p>"
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "Untuk mendengarkan pekerjaan Anda di program media, eksporkan ke file audio seperti WAV atau MP3 (beberapa format [[wma-proprietary|tidak mendukung]]). [[save|Menyimpan proyek Audacity]] akan membuat file proyek (dan berhubungan dengan folder _data) yang mengandung semua trek yang telah diedit, jadi anda bisa melanjutkannya kembali. Tetapi, program lainnya tidak bisa membaca proyek Audacity. </p><p> Untuk mengekspor, klik <i>Berkas &gt; Ekspor</i> kemudian pilih format file yang anda inginkan pada \"Save as type\". Untuk [[burncd|membakar ke CD]] untuk CD player yang tunggal, pilih WAV atau AIFF. Untuk mengekspor sebagai MP3, [[wiki:Lame_Installation|Encoder Lame]] harus sudah terinstal. </p><p> <i>Berkas &gt; Ekspor Terpilih</i> mengekspor area audio yang dipilih saja. <i>Gunakan Berkas &gt; Ekspor Multipel</i> untuk mengekspor banyak file sekaligus, baik pada setiap trek, maupun pada area-area yang ditandai pada satu trek. <i>Trek &gt; Tambahkan Label pada yang Dipilih</i> memungkinkan Anda [[wiki:Splitting_recordings_into_separate_tracks|menyederhanakan trek]] dari satu album ke beberapa file. </p><br><br>"
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>Audacity <b>tidak bisa</b> [[play|memainkan]] atau [[export|mengekspor]] file ke <b>WMA, RealAudio, Shorten (SHN)</b> atau format-format berbayar lainnya, karena larangan lisensi dan paten.  Pada komputer Mac, format <b>AAC</b> yang tidak terproteksi seperti <b>M4A</b> bisa diimpor. Beberapa format open-source belum didukung, termasuk <b>Ogg Speex</b> dan <b>Musepack</b>. File yang diproteksi oleh Digital Rights Management (DRM), termasuk yang berbayar seperti dari iTunes atau Napster, <b>tidak bisa</b> diimpor.</p><p> Jika Anda tidak bisa mengimpor file Anda ke Audacity, kemudian jika itu tidak terlindungi oleh DRM, gunakan iTunes atau <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> untuk mengubahnya ke WAV atau AIFF. jika dilindungi, bakar ke CD audio pada program berlisensi untuk memainkannya, kemudian ekstrak CD ke WAV atau AIFF dengan ITunes atau (pada Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> atau Windows Media Player 11. Anda bisa juga <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">merekam</a> CD ke komputer Anda. <i>Untuk mengekspor ke format yang tidak terdukung, ekspor ke WAV atau AIFF dan ubah ke formatnya dengan iTunes atau <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "<p>UNtuk membakar pekerjaan Anda ke CD audio untuk CD player, pertama [[export|ekspor]] sebagai WAV atau AIFF. File yang diekspor haruslah stereo, 44100 Hz (atur pada tombol \"Project Rate\" di kiri bawah) dan 16 bit (atur pada tombol \"Options\" dialog ekspor file). Inilah aturan dasar Audacity, Jadi Anda tidak perlu mengubah aturannya sebelum diekspor. <p>Bakar file tersebut ke \"audio CD\" - bukan \"data CD\" atau \"MP3 CD\" - dengan program pembakar CD seperti iTunes atau Windows Media Player. Untuk bantuan lainnya, silahkan lihat [[wiki:How_to_burn_CDs|Bagaimana membakar CD]] secara online. </p><p>"
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr "<p>Bantuan untuk Audacity Beta belum selesai. Untuk saat ini, manual draft telah ada <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">pada online</a>. Atau dengan cara lain, klik <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">di sini</a> untuk mendownload manual berhalaman tunggal yang bisa dilihat di jendela ini."
+
+#: HistoryWindow.cpp:53
+msgid "Undo History"
+msgstr "Batalkan History"
+
+#: HistoryWindow.cpp:72
+msgid "Manage History"
+msgstr "Atur History"
+
+#: HistoryWindow.cpp:78
+msgid "Action"
+msgstr "Aksi"
+
+#: HistoryWindow.cpp:86
+msgid "&Undo Levels Available"
+msgstr "&Dibolehkan Pembatalan Level"
+
+#: HistoryWindow.cpp:92
+msgid "Levels To Discard"
+msgstr "Level menuju pelarangan"
+
+#: HistoryWindow.cpp:103
+msgid "&Discard"
+msgstr "&Larang"
+
+#: HistoryWindow.cpp:112
+#: Tags.cpp:2081
+#: Tags.cpp:2083
+#: Tags.cpp:2385
+#: Tags.cpp:2387
+#: effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191
+#: export/ExportCL.cpp:399
+msgid "&OK"
+msgstr "&OK"
+
+#: Internat.cpp:191
+msgid "Unable to determine"
+msgstr "Tidak bisa medeterminasi"
+
+#: Internat.cpp:195
+#: import/ImportRaw.cpp:385
+msgid "bytes"
+msgstr "byte"
+
+#: Internat.cpp:197
+msgid "KB"
+msgstr "KB"
+
+#: Internat.cpp:200
+msgid "MB"
+msgstr "MB"
+
+#: Internat.cpp:203
+msgid "GB"
+msgstr "GB"
+
+#: LabelDialog.cpp:54
+msgid "Track"
+msgstr "Trek"
+
+#: LabelDialog.cpp:55
+#: Menus.cpp:4677
+#: Menus.cpp:4712
+msgid "Label"
+msgstr "Label"
+
+#: LabelDialog.cpp:56
+#: TimerRecordDialog.cpp:279
+msgid "Start Time"
+msgstr "Waktu Mulai"
+
+#: LabelDialog.cpp:57
+#: TimerRecordDialog.cpp:298
+msgid "End Time"
+msgstr "Waktu Selesai"
+
+#: LabelDialog.cpp:100
+#: Menus.cpp:713
+msgid "&Edit Labels"
+msgstr "&Edit Label"
+
+#: LabelDialog.cpp:115
+msgid "Press F2 or double click to edit cell contents."
+msgstr "Tekan F2 atau klik ganda untuk mengedit konten sel."
+
+#: LabelDialog.cpp:126
+msgid "Insert &After"
+msgstr "Masukkan Se&telah"
+
+#: LabelDialog.cpp:127
+msgid "Insert &Before"
+msgstr "Masukkan Se&belum"
+
+#: LabelDialog.cpp:129
+msgid "&Import..."
+msgstr "&Impor..."
+
+#: LabelDialog.cpp:157
+msgid "New..."
+msgstr "Baru..."
+
+#: LabelDialog.cpp:354
+msgid "You have left blank label names.  These will be\n"
+"skipped when repopulating the Label Tracks.\n"
+"\n"
+"Would you like to go back and provide names?"
+msgstr "Anda telah mengosongkan nama label. Ini akan\n"
+"dilewatkan ketika memasukkan Trek Label.\n"
+"\n"
+"Apakah Anda ingin untuk kembali dan memasukkan namanya kembali?"
+
+#: LabelDialog.cpp:355
+msgid "Confirm"
+msgstr "Konfirmasi"
+
+#: LabelDialog.cpp:516
+#: Menus.cpp:4101
+msgid "Select a text file containing labels..."
+msgstr "Pilih file teks yang berisi label..."
+
+#: LabelDialog.cpp:520
+#: Menus.cpp:4105
+msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
+msgstr "File teks (*.txt)|*.txt|Semua file (*.*)|*.* "
+
+#: LabelDialog.cpp:534
+#: Menus.cpp:4117
+#: Project.cpp:1914
+#: Project.cpp:1922
+msgid "Could not open file: "
+msgstr "Tidak bisa membuka file:"
+
+#: LabelDialog.cpp:560
+msgid "No labels to export."
+msgstr "Tidak ada label untuk diekspor."
+
+#: LabelDialog.cpp:566
+#: Menus.cpp:2518
+msgid "Export Labels As:"
+msgstr "Ekspor label sebagai:"
+
+#: LabelDialog.cpp:568
+#: Menus.cpp:2516
+msgid "labels.txt"
+msgstr "label.txt"
+
+#: LabelDialog.cpp:703
+msgid "New Label Track"
+msgstr "Buat Trek Label"
+
+#: LabelDialog.cpp:704
+msgid "Enter track name"
+msgstr "Masukkan nama trek"
+
+#: LabelDialog.cpp:705
+#: LabelDialog.h:52
+#: LabelTrack.cpp:89
+#: Menus.cpp:632
+msgid "&Label Track"
+msgstr "&Trek Label"
+
+#: LangChoice.cpp:57
+msgid "Audacity First Run"
+msgstr "Pengoperasian Pertama Audacity"
+
+#: LangChoice.cpp:89
+msgid "Choose Language for Audacity to use:"
+msgstr "Pilih Bahasa untuk digunakan pada Audacity:"
+
+#: Legacy.cpp:356
+#, c-format
+msgid "Converted a 1.0 project file to the new format.\n"
+"The old file has been saved as '%s'"
+msgstr "Mengubah file proyek 1.0 ke format baru.\n"
+"File lama telah disimpan sebagai '%s'"
+
+#: Legacy.cpp:357
+msgid "Opening Audacity Project"
+msgstr "Membuka Proyek Audacity"
+
+#: Menus.cpp:194
+msgid "&File"
+msgstr "&Berkas"
+
+#: Menus.cpp:196
+msgid "&New\tCtrl+N"
+msgstr "&Baru\tCtrl+N"
+
+#: Menus.cpp:198
+msgid "&Open...\tCtrl+O"
+msgstr "B&uka...\tCtrl+O"
+
+#: Menus.cpp:203
+msgid "&Close\tCtrl+W"
+msgstr "&Tutup\tCtrl+W"
+
+#: Menus.cpp:206
+msgid "&Save Project\tCtrl+S"
+msgstr "&Simpan Proyek\tCtrl+S"
+
+#: Menus.cpp:210
+#: Project.cpp:2896
+msgid "Save Project &As..."
+msgstr "Simpan &Proyek Sebagai..."
+
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr "Simpan Salinan Proyek Terkompres..."
+
+#: Menus.cpp:216
+msgid "Chec&k Dependencies..."
+msgstr "Ce&k Ketergantungan..."
+
+#: Menus.cpp:222
+msgid "Open Me&tadata Editor..."
+msgstr "Buka Editor M&etadata..."
+
+#: Menus.cpp:229
+#: import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Impor"
+
+#: Menus.cpp:231
+msgid "&Audio...\tCtrl+Shift+I"
+msgstr "&Audio...\tCtrl+Shift+I"
+
+#: Menus.cpp:232
+msgid "&Labels..."
+msgstr "&Label..."
+
+#: Menus.cpp:234
+msgid "&MIDI..."
+msgstr "&MIDI..."
+
+#: Menus.cpp:236
+msgid "&Raw Data..."
+msgstr "&Data Raw..."
+
+#: Menus.cpp:247
+#: Menus.cpp:282
+msgid "Expo&rt Selection..."
+msgstr "Eksp&or Terpilih..."
+
+#: Menus.cpp:254
+msgid "Export &Labels..."
+msgstr "Ekspor &Label..."
+
+#: Menus.cpp:255
+msgid "Export &Multiple..."
+msgstr "Ekspor &Multipel..."
+
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr "Ekspor MIDI..."
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr "Sa&mbungan CleanSpeech..."
+
+#: Menus.cpp:291
+#: Menus.cpp:305
+msgid "Edit C&hains..."
+msgstr "Edit Sam&bungan..."
+
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr "Ekspor CleanSpee&ch..."
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr "I&mpor CleamSpeech..."
+
+#: Menus.cpp:303
+msgid "Appl&y Chain..."
+msgstr "Aplikasi&kan Sambungan..."
+
+#: Menus.cpp:310
+msgid "&Upload File..."
+msgstr "&Upload File..."
+
+#: Menus.cpp:316
+msgid "Pa&ge Setup..."
+msgstr "Setup &Halaman..."
+
+#: Menus.cpp:317
+msgid "&Print..."
+msgstr "P&rint..."
+
+#: Menus.cpp:330
+msgid "E&xit\tCtrl+Q"
+msgstr "Ke&luar\tCtrl+Q"
+
+#: Menus.cpp:338
+#: toolbars/EditToolBar.cpp:76
+msgid "&Edit"
+msgstr "&Edit"
+
+#: Menus.cpp:342
+msgid "&Undo\tCtrl+Z"
+msgstr "&Batalkan\tCtrl+Z"
+
+#: Menus.cpp:350
+#: prefs/KeyConfigPrefs.cpp:371
+#: toolbars/EditToolBar.cpp:146
+msgid "&Redo"
+msgstr "&Lakukan Kembali"
+
+#: Menus.cpp:363
+msgid "Cu&t\tCtrl+X"
+msgstr "&Potong\tCtrl+X"
+
+#: Menus.cpp:367
+msgid "Spl&it Cut\tCtrl+Alt+X"
+msgstr "Potong Se&kaligus\tCtrl+Alt+X"
+
+#: Menus.cpp:368
+msgid "&Copy\tCtrl+C"
+msgstr "&Salin\tCtrl+C"
+
+#: Menus.cpp:372
+msgid "&Paste\tCtrl+V"
+msgstr "&Tempel\tCtrl+V"
+
+#: Menus.cpp:376
+msgid "Tri&m\tCtrl+T"
+msgstr "Tri&m\tCtrl+T"
+
+#: Menus.cpp:378
+msgid "&Delete\tCtrl+K"
+msgstr "&Hapus\tCtrl+K"
+
+#: Menus.cpp:379
+msgid "Split D&elete\tCtrl+Alt+K"
+msgstr "H&apus Sekaligus\tCtrl+Alt+K"
+
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr "&Diamkan Audio\tCtrl+L"
+
+#: Menus.cpp:382
+msgid "Sp&lit\tCtrl+I"
+msgstr "&Gabung\tCtrl+I"
+
+#: Menus.cpp:387
+msgid "Split Ne&w\tCtrl+Alt+I"
+msgstr "Gabung yang &Baru\tCtrl+Alt+I"
+
+#: Menus.cpp:392
+msgid "&Join\tCtrl+J"
+msgstr "&Berteman\tCtrl+J"
+
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "Membuat tugas di Diam\tCtrl+Alt+J"
+
+#: Menus.cpp:394
+msgid "Duplic&ate\tCtrl+D"
+msgstr "&Gandakan\tCtrl+D"
+
+#: Menus.cpp:400
+#: Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr "Tre&k Stereo ke Mono"
+
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr "&Wilayah Terlabel"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:409
+msgid "&Cut\tAlt+X"
+msgstr "&Potong\tAlt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:414
+msgid "&Split Cut\tShift+Alt+X"
+msgstr "Potong Se&kaligus\tShift+Alt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:419
+msgid "Co&py\tShift+Alt+C"
+msgstr "&Salin\tShift+Alt+C"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:425
+msgid "&Delete\tAlt+K"
+msgstr "&Hapus\tAlt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:430
+msgid "Sp&lit Delete\tShift+Alt+K"
+msgstr "Hapus Seka&ligus\tShift+Alt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:435
+msgid "Sile&nce\tAlt+L"
+msgstr "Dia&m\tAlt+L"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:441
+msgid "Spli&t\tAlt+I"
+msgstr "Ga&bung\tAlt+I"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:446
+msgid "&Join\tAlt+J"
+msgstr "Ber&teman\talt+J"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr "Membuat tugas di Diam\tShift+Alt+J"
+
+#: Menus.cpp:456
+msgid "&Select"
+msgstr "&Pilih"
+
+#: Menus.cpp:457
+msgid "&All\tCtrl+A"
+msgstr "Se&mua\tCtrl+A"
+
+#: Menus.cpp:458
+msgid "&None\tCtrl+Shift+A"
+msgstr "&Tidak Sama Sekali\tCtrl+Shift+A"
+
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
+msgstr "Di &Kiri Posisi Kursor Trek\t["
+
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
+msgstr "Di K&anan Posisi Kursor Trek\t]"
+
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr "&Awal Trek ke Kursor\tShift+J"
+
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr "&Kursor ke akhir trek\tShift+K"
+
+#: Menus.cpp:474
+msgid "Find &Zero Crossings\tZ"
+msgstr "Cari Crossing Kosong\tZ"
+
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr "Pin&dahkan Kursor"
+
+#: Menus.cpp:478
+msgid "to Selection Star&t"
+msgstr "ke A&walan yang dipilih"
+
+#: Menus.cpp:479
+msgid "to Selection En&d"
+msgstr "ke A&khiran yang Dipilih"
+
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr "ke &Awal Trek\tJ"
+
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr "ke Ak&hir Trek\tK"
+
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr "&Wilayah Penyimpanan"
+
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr "Wila&yah Pengembalian"
+
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr "Mai&nkan Wilayah"
+
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr "&Kunci"
+
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr "&Buka Kunci"
+
+#: Menus.cpp:511
+msgid "Turn Snap-To On"
+msgstr "&Hidupkan Snap-To"
+
+#: Menus.cpp:512
+msgid "Turn Snap-To Off"
+msgstr "&Matikan Snap-To"
+
+#: Menus.cpp:513
+msgid "Turn Grid Snap On"
+msgstr "H&idupkan Grid Snap"
+
+#: Menus.cpp:514
+msgid "Turn Grid Snap Off"
+msgstr "M&atikan Grid Snap"
+
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "Pre&ferensi...\tCtrl+,"
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr "Pre&ferensi...\tCtrl+P"
+
+#: Menus.cpp:533
+msgid "&View"
+msgstr "&Lihat"
+
+#: Menus.cpp:535
+msgid "Zoom &In\tCtrl+1"
+msgstr "Per&besar\tCtrl+1"
+
+#: Menus.cpp:538
+msgid "Zoom &Normal\tCtrl+2"
+msgstr "&Normal\tCtrl+2"
+
+#: Menus.cpp:539
+msgid "Zoom &Out\tCtrl+3"
+msgstr "Per&kecil\tCtrl+3"
+
+#: Menus.cpp:542
+msgid "&Fit in Window\tCtrl+F"
+msgstr "&Samakan Dengan Jendela\tCtrl+F"
+
+#: Menus.cpp:543
+msgid "Fit &Vertically\tCtrl+Shift+F"
+msgstr "Samakan Secara &Vertikal\tCtrl+Shift+F"
+
+#: Menus.cpp:544
+msgid "&Zoom to Selection\tCtrl+E"
+msgstr "Perbesar Ter&pilih\tCtrl+E"
+
+#: Menus.cpp:547
+msgid "&Collapse All Tracks\tCtrl+Shift+C"
+msgstr "&Sederhanakan Semua Trek\tCtrl+Shift+C"
+
+#: Menus.cpp:548
+msgid "E&xpand All Tracks\tCtrl+Shift+X"
+msgstr "Seba&rkan Semua Trek\tCtrl+Shift+X"
+
+#: Menus.cpp:551
+msgid "&Show Clipping"
+msgstr "&Lihat Clipping"
+
+#: Menus.cpp:560
+msgid "&History..."
+msgstr "&History..."
+
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr "&Toolbar"
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr "Toolbar &Kontrol"
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr "Toolbar &Perangkat"
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr "Toolbar &Edit"
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr "Toolbar &Meter"
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr "Toolbar Mi&xer"
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr "Toolbar &Terpilih"
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr "Toolbar Per&alatan"
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr "Toolbar Transkri&psi"
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr "&Kembalikan Toolbar"
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr "!Lihat Sederhana"
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr "T&ransportasi"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr "&Pause\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:595
+#: Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "Langsung ke Awal\tHome"
+
+#: Menus.cpp:597
+#: Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "Langsung ke akhir\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr "&Rekam\tR"
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr "Pen&catat waktu rekaman...\tShift+T"
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr "Tambah Rekaman\tShift+R"
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr "Overdub (nyala/mati)"
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr "Selama bermainpada software (nyala/mati)"
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr "Merekam dengan Suara Diaktifkan (nyala/mati)"
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr "Level Pengaktifan Suara..."
+
+#: Menus.cpp:622
+msgid "&Tracks"
+msgstr "&Trek"
+
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr "Add &New"
+
+#: Menus.cpp:630
+msgid "&Audio Track\tCtrl+Shift+N"
+msgstr "Trek &Audio\tCtrl+Shift+N"
+
+#: Menus.cpp:631
+msgid "&Stereo Track"
+msgstr "Trek &Stereo"
+
+#: Menus.cpp:633
+#: TimeTrack.cpp:44
+msgid "&Time Track"
+msgstr "Trek &Waktu"
+
+#: Menus.cpp:643
+msgid "Mi&x and Render"
+msgstr "Mi&x dan Render"
+
+#: Menus.cpp:647
+msgid "Mix and Render to New Track\tCtrl+Shift+M"
+msgstr "Mix dan Render ke Trek Baru\tCtrl+Shift+M"
+
+#: Menus.cpp:651
+msgid "&Resample..."
+msgstr "&Sampel Ulang..."
+
+#: Menus.cpp:661
+msgid "Remo&ve Tracks"
+msgstr "&Buang Trek"
+
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr "&Diamkan Semua Trek\tCtrl+U"
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr "&Matikan Diam ke Semua Trek\tCtrl+Shift+U"
+
+#: Menus.cpp:672
+msgid "Align with &Zero"
+msgstr "Ratakan dengan &Nol"
+
+#: Menus.cpp:673
+msgid "Align with &Cursor"
+msgstr "Ratakan dengan &Kursor"
+
+#: Menus.cpp:674
+msgid "Align with Selection &Start"
+msgstr "Ratakan dengan &Awalan yang Terpilih"
+
+#: Menus.cpp:675
+msgid "Align with Selection &End"
+msgstr "Ratakan dengan A&khiran yang Terpilih"
+
+#: Menus.cpp:676
+msgid "Align End with Cu&rsor"
+msgstr "Ratakan Akhir dengan Ku&rsor"
+
+#: Menus.cpp:677
+msgid "Align End with Selection Star&t"
+msgstr "Ra&takan Akhir dengan Awal di Pilihan"
+
+#: Menus.cpp:678
+msgid "Align End with Selection En&d"
+msgstr "Ratakan Akhir &dengan Akhir di Pilihan"
+
+#: Menus.cpp:679
+msgid "Align Tracks To&gether"
+msgstr "Ratakan Trek Bersa&ma-sama"
+
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr "&Ratakan Trek"
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr "Ratakan dan P&indahan Kursor"
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr "Sinkronkan MIDI dengan Audio"
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr "Link Audio dan Label"
+
+#: Menus.cpp:709
+msgid "Add &Label At Selection\tCtrl+B"
+msgstr "Tambahkan &Label Pada Pilihan\tCtrl+B"
+
+#: Menus.cpp:710
+msgid "Add Label At &Playback Position\tCtrl+M"
+msgstr "Tambahkan Label Pada &Posisi Kursor\tCtrl+M"
+
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr "U&rutkan trek"
+
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr "dari &Waktu awal"
+
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr "dari &Nama"
+
+#: Menus.cpp:730
+msgid "&Generate"
+msgstr "&Buat"
+
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
+msgid "Unsorted"
+msgstr "Tidak berurut"
+
+#: Menus.cpp:795
+msgid "Effe&ct"
+msgstr "E&fek"
+
+#: Menus.cpp:799
+msgid "Repeat Last Effect\tCtrl+R"
+msgstr "Ulangi Efek Terakhir\tCtrl+R"
+
+#: Menus.cpp:877
+msgid "&Analyze"
+msgstr "&Analisa"
+
+#: Menus.cpp:879
+msgid "Plot Spectrum..."
+msgstr "Spektrum Plot..."
+
+#: Menus.cpp:947
+#: Menus.cpp:950
+msgid "&Help"
+msgstr "&Bantuan"
+
+#: Menus.cpp:953
+msgid "&About Audacity CleanSpeech..."
+msgstr "&Tentang Audacity CleamSpeech..."
+
+#: Menus.cpp:957
+msgid "&Show Welcome Message..."
+msgstr "&Tampilkan Pesan Awal..."
+
+#: Menus.cpp:958
+msgid "&Index..."
+msgstr "&Indeks..."
+
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr "Tunjukkan &Log..."
+
+#: Menus.cpp:967
+msgid "&Screenshot Tools..."
+msgstr "&Alat Screenshot..."
+
+#: Menus.cpp:970
+msgid "&Run Benchmark..."
+msgstr "&Jalankan Benchmark..."
+
+#: Menus.cpp:972
+msgid "&Audio Device Info..."
+msgstr "&Info Perangkat Audio..."
+
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
+
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
+
+#: Menus.cpp:985
+msgid "Selection Tool\tF1"
+msgstr "Alat Pemilihan\tF1"
+
+#: Menus.cpp:986
+msgid "Envelope Tool\tF2"
+msgstr "Alat Envelop\tF2"
+
+#: Menus.cpp:987
+msgid "Draw Tool\tF3"
+msgstr "Alat Menggambar\tF3"
+
+#: Menus.cpp:988
+msgid "Zoom Tool\tF4"
+msgstr "Alat Memperbesar\tF4"
+
+#: Menus.cpp:989
+msgid "Time Shift Tool\tF5"
+msgstr "Alat Menyingkat Waktu\tF5"
+
+#: Menus.cpp:990
+msgid "Multi Tool\tF6"
+msgstr "Alat Multifungsi\tF6"
+
+#: Menus.cpp:992
+msgid "Next Tool\tD"
+msgstr "Alat Selanjutnya\tD"
+
+#: Menus.cpp:993
+msgid "Previous Tool\tA"
+msgstr "Alat Sebelumnya\tA"
+
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:996
+msgid "Stop\tS"
+msgstr "Berhenti\tS"
+
+#: Menus.cpp:997
+msgid "Pause\tP"
+msgstr "Pause\tP"
+
+#: Menus.cpp:998
+msgid "Record\tR"
+msgstr "Rekam\tR"
+
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
+msgstr "Penambahan Rekaman\tShift+R"
+
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr "Main/Berhenti dan Atur Kursor\tShift+A"
+
+#: Menus.cpp:1004
+msgid "Play One Second\t1"
+msgstr "Mainkan Satu Detik\t1"
+
+#: Menus.cpp:1005
+msgid "Play To Selection\tB"
+msgstr "Mainkan ke yang dipilih\tB"
+
+#: Menus.cpp:1006
+msgid "Play Looped\tL"
+msgstr "Maikan berulang\tL"
+
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:1008
+msgid "Play Cut Preview\tC"
+msgstr "Mainkan Preview POtongan\tC"
+
+#: Menus.cpp:1013
+msgid "Selection to Start\tShift+Home"
+msgstr "Pilih ke Awal\tShift+Home"
+
+#: Menus.cpp:1014
+msgid "Selection to End\tShift+End"
+msgstr "Pilih ke Akhir\tShift+End"
+
+#: Menus.cpp:1016
+msgid "DeleteKey\tBackspace"
+msgstr "KunciHapus\tBackspace"
+
+#: Menus.cpp:1021
+msgid "DeleteKey2\tDelete"
+msgstr "KunciHapus2\tDelete"
+
+#: Menus.cpp:1027
+msgid "Seek left short period during playback\tLeft"
+msgstr "Coba periode pendek di kiri selama bermain\tLeft"
+
+#: Menus.cpp:1028
+msgid "Seek right short period during playback\tRight"
+msgstr "Coba periode pendek di kanan selama bermain\tRight"
+
+#: Menus.cpp:1029
+msgid "Seek left long period during playback\tShift+Left"
+msgstr "Coba periode panjang di kiri selama bermain\tShift+Left"
+
+#: Menus.cpp:1030
+msgid "Seek right long period during playback\tShift+Right"
+msgstr "Coba periode panjang di kanan selama bermain\tShift+Right"
+
+#: Menus.cpp:1034
+msgid "Move Focus to Previous Track\tUp"
+msgstr "Pindahkan Fokus ke Trek Sebelumnya\tUp"
+
+#: Menus.cpp:1035
+msgid "Move Focus to Previous and Change Selection\tShift+Up"
+msgstr "Pindahkan Fokus ke Trek Sebelumnya dan ubah pilihannya\tShift+Up"
+
+#: Menus.cpp:1036
+msgid "Move Focus to Next Track\tDown"
+msgstr "Pindahkan Fokus ke Trek Selanjutnya\tDown"
+
+#: Menus.cpp:1037
+msgid "Move Focus to Next and Change Selection\tShift+Down"
+msgstr "Pindahkan Fokus ke Trek Selanjutnya dan ubah pilihannya\tShift+Down"
+
+#: Menus.cpp:1038
+msgid "Toggle Focused Track\tReturn"
+msgstr "Fokuskan ke Trek Terpilih\tReturn"
+
+#: Menus.cpp:1039
+msgid "Toggle Focused Track\tNUMPAD_ENTER"
+msgstr "Fokuskan ke Trek Terpilih\tNUMPAD_ENTER"
+
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
+
+#: Menus.cpp:1042
+msgid "Cursor Left\tLeft"
+msgstr "Kursor Kiri\tLeft"
+
+#: Menus.cpp:1043
+msgid "Cursor Right\tRight"
+msgstr "Kursor Kanan\tRight"
+
+#: Menus.cpp:1044
+msgid "Cursor Short Jump Left\t,"
+msgstr "Kursor Kiri Lompatan Rendah\t,"
+
+#: Menus.cpp:1045
+msgid "Cursor Short Jump Right\t."
+msgstr "Kursor Kiri Lompatan Rendah\t."
+
+#: Menus.cpp:1046
+msgid "Cursor Long Jump Left\tShift+,"
+msgstr "Kursor Kiri Lompatan Tinggi\tShift+,"
+
+#: Menus.cpp:1047
+msgid "Cursor Long Jump Right\tShift+."
+msgstr "Kursor Kanan Lompatan Tinggi\tShift+."
+
+#: Menus.cpp:1049
+msgid "Selection Extend Left\tShift+Left"
+msgstr "Pilih yang tidak dipilih di Kiri\tShift+Left"
+
+#: Menus.cpp:1050
+msgid "Selection Extend Right\tShift+Right"
+msgstr "Pilih yang tidak dipilih di Kanan\tShift+Right"
+
+#: Menus.cpp:1052
+msgid "Set (or Extend) Left Selection"
+msgstr "Atur (atau Mengecualikan) Yang Terpilih di Kiri"
+
+#: Menus.cpp:1053
+msgid "Set (or Extend) Right Selection"
+msgstr "Atur (atau Mengecualikan) Yang Terpilih di Kanan"
+
+#: Menus.cpp:1055
+msgid "Selection Contract Left\tCtrl+Shift+Right"
+msgstr "Pilih yang di Kiri\tCtrl+Shift+Right"
+
+#: Menus.cpp:1056
+msgid "Selection Contract Right\tCtrl+Shift+Left"
+msgstr "Pilih yang di Kanan\tCtrl+Shift+Left"
+
+#: Menus.cpp:1058
+msgid "Change pan on focused track\tShift+P"
+msgstr "Ubah pan pada trek terfokus\tShift+P"
+
+#: Menus.cpp:1059
+msgid "Pan left on focused track\tAlt+Shift+Left"
+msgstr "Pan-kan di kiri trek terfokus\tAlt+Shift+Left"
+
+#: Menus.cpp:1060
+msgid "Pan right on focused track\tAlt+Shift+Right"
+msgstr "Pan-kan di kanan trek terfokus\tAlt+Shift+Left"
+
+#: Menus.cpp:1061
+msgid "Change gain on focused track\tShift+G"
+msgstr "Ubah kekuatan pada trek yang terfokus\tShift+G"
+
+#: Menus.cpp:1062
+msgid "Increase gain on focused track\tAlt+Shift+Up"
+msgstr "Tingkatkan kekuatan pada trek yang difokuskan\tAlt+Shift+Up"
+
+#: Menus.cpp:1063
+msgid "Decrease gain on focused track\tAlt+Shift+Down"
+msgstr "Turunkan kekuatan pada trek yang difokuskan\tAlt+Shift+Down"
+
+#: Menus.cpp:1064
+msgid "Open menu on focused track\tShift+M"
+msgstr "Buka menu pada trek yang terfokus\tShift+M"
+
+#: Menus.cpp:1065
+msgid "Mute/Unmute focused track\tShift+U"
+msgstr "Diam/Hidupkan suara trek yang terfokus\tShift+U"
+
+#: Menus.cpp:1066
+msgid "Solo/Unsolo focused track\tShift+S"
+msgstr "Solo/Jangan solo trek yang terfokus\tShift+5"
+
+#: Menus.cpp:1067
+msgid "Close focused track\tShift+C"
+msgstr "Tutup trek yang terfokus\tShift+C"
+
+#: Menus.cpp:1069
+msgid "Snap To On"
+msgstr "Hidupkan Patokan"
+
+#: Menus.cpp:1070
+msgid "Snap To Off"
+msgstr "Matikankan Patokan"
+
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
+#. i18n-hint: This is the name of the menu item on Mac OS X only
+#: Menus.cpp:1157
+msgid "Open Recent"
+msgstr "Buka yang Sebelumnya"
+
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1160
+msgid "Recent &Files"
+msgstr "&File Sebelumnya"
+
+#: Menus.cpp:1209
+#, c-format
+msgid "&Undo %s"
+msgstr "&Batalkan %s"
+
+#: Menus.cpp:1235
+msgid "Can't Undo"
+msgstr "Tidak Dapat Membatalkan"
+
+#: Menus.cpp:1244
+#, c-format
+msgid "&Redo %s"
+msgstr "&Ulang %s"
+
+#: Menus.cpp:1250
+msgid "Can't Redo"
+msgstr "Tidak Dapat Mengulang"
+
+#: Menus.cpp:1856
+msgid "Sort By Time"
+msgstr "Urutkan dari waktu"
+
+#: Menus.cpp:1856
+msgid "Tracks sorted by time"
+msgstr "Trek diurut bedasarkan waktu"
+
+#: Menus.cpp:1882
+msgid "Sort By Name"
+msgstr "Urutkan dari Nama"
+
+#: Menus.cpp:1882
+msgid "Tracks sorted by name"
+msgstr "Trek diurut bedasarkan nama"
+
+#: Menus.cpp:2033
+msgid "Set Left Selection Bound"
+msgstr "Atur Batas Terpilih Kiri"
+
+#: Menus.cpp:2068
+msgid "Set Right Selection Bound"
+msgstr "Atur Batas Terpilih Kanan"
+
+#: Menus.cpp:2337
+msgid "You must select a track first."
+msgstr "Anda harus pilih trek terlebih dahulu"
+
+#: Menus.cpp:2369
+#, c-format
+msgid "Repeat %s\tCtrl+R"
+msgstr "Ulangi %s\tCtrl+R"
+
+#: Menus.cpp:2512
+msgid "There are no label tracks to export."
+msgstr "Tidak ada label yang diekspor"
+
+#: Menus.cpp:2607
+msgid "Export MIDI As:"
+msgstr "Ekspor MIDI Sebagai:"
+
+#: Menus.cpp:2611
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "File MIDI (*.mid)|*.mid|File Allegro (*.gro)|*.gro"
+
+#: Menus.cpp:2643
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr "Anda memilih nama file yang ekstensinya tidak bisa dibaca.\n"
+" Anda ingin meneruskan?"
+
+#: Menus.cpp:2644
+msgid "Export MIDI"
+msgstr "Ekspor MIDI"
+
+#: Menus.cpp:2702
+msgid "Nothing to undo"
+msgstr "Tidak mungkin membatalkan"
+
+#: Menus.cpp:2722
+msgid "Nothing to redo"
+msgstr "Tidak mungkin melakukan kembali"
+
+#: Menus.cpp:2809
+#: TrackPanel.cpp:596
+#: toolbars/EditToolBar.cpp:133
+msgid "Cut"
+msgstr "Potong"
+
+#: Menus.cpp:2809
+msgid "Cut to the clipboard"
+msgstr "Potong ke Clipboard"
+
+#: Menus.cpp:2849
+msgid "Split Cut"
+msgstr "Potong Sekaligus"
+
+#: Menus.cpp:2849
+msgid "Split-cut to the clipboard"
+msgstr "Potong sekaligus ke clipboard"
+
+#: Menus.cpp:2914
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+#: TrackPanel.cpp:598
+#: toolbars/EditToolBar.cpp:137
+msgid "Paste"
+msgstr "Tempel"
+
+#: Menus.cpp:2914
+msgid "Pasted text from the clipboard"
+msgstr "Teks ditempel dari clipboard"
+
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+msgid "Pasted from the clipboard"
+msgstr "Ditempel dari clipboard"
+
+#: Menus.cpp:3052
+msgid "Pasting one type of track into another is not allowed."
+msgstr "Menempelkan satu tipe audio ke tipe lainnya tidak diperbolehkan."
+
+#: Menus.cpp:3064
+msgid "Copying stereo audio into a mono track is not allowed."
+msgstr "Menyalin auido stereo ke trek mono tidak diperbolehkan."
+
+#: Menus.cpp:3214
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim"
+msgstr "Gabung"
+
+#: Menus.cpp:3214
+msgid "Trim file to selection"
+msgstr "Trim file ke bagian terpilih"
+
+#: Menus.cpp:3243
+#, c-format
+msgid "Split-deleted %.2f seconds at t=%.2f"
+msgstr "Dihapus sekaligus %.2f detik pada t=%.2f"
+
+#: Menus.cpp:3246
+msgid "Split Delete"
+msgstr "Hapus Sekaligus"
+
+#: Menus.cpp:3267
+#, c-format
+msgid "Disjoined %.2f seconds at t=%.2f"
+msgstr "Berpisah %.2f detik pada t=%.2f"
+
+#: Menus.cpp:3270
+msgid "Disjoin"
+msgstr "Pisah"
+
+#: Menus.cpp:3291
+#, c-format
+msgid "Joined %.2f seconds at t=%.2f"
+msgstr "Bergabung %.2f detik pada t=%.2f"
+
+#: Menus.cpp:3294
+msgid "Join"
+msgstr "Pasangkan"
+
+#: Menus.cpp:3313
+#, c-format
+msgid "Silenced selected tracks for %.2f seconds at %.2f"
+msgstr "Telah didiamkan trek terpilih pada %.2f seconds at %.2f"
+
+#: Menus.cpp:3315
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence"
+msgstr "Diam"
+
+#: Menus.cpp:3349
+msgid "Duplicate"
+msgstr "Duplikatkan"
+
+#: Menus.cpp:3349
+msgid "Duplicated"
+msgstr "Terduplikat"
+
+#: Menus.cpp:3368
+msgid "Cut Labels"
+msgstr "Potong Label"
+
+#: Menus.cpp:3368
+msgid "Cut labeled regions to the clipboard"
+msgstr "Potong wilayah berlabel ke clipboard"
+
+#: Menus.cpp:3382
+msgid "SplitCut labeled regions to the clipboard"
+msgstr "Potong Sekaligus wilayah berlabel ke clipboard"
+
+#: Menus.cpp:3383
+msgid "Split Cut Labels"
+msgstr "Potong Sekaligus Label"
+
+#: Menus.cpp:3397
+msgid "Copied labeled regions to the clipboard"
+msgstr "Salin wilayah berlabel ke clipboard"
+
+#: Menus.cpp:3397
+msgid "Copy Labels"
+msgstr "Salin Label"
+
+#: Menus.cpp:3409
+msgid "Delete Labels"
+msgstr "Hapus Label"
+
+#: Menus.cpp:3409
+msgid "Deleted labeled regions"
+msgstr "Wilayah berlabel dihapus"
+
+#: Menus.cpp:3421
+msgid "Split Delete Labels"
+msgstr "Hapus Sekaligus Label"
+
+#: Menus.cpp:3421
+msgid "Split Deleted labeled regions"
+msgstr "Hapus Sekaligus wilayah berlabel"
+
+#: Menus.cpp:3433
+msgid "Silence Labels"
+msgstr "Label Diam"
+
+#: Menus.cpp:3433
+msgid "Silenced labeled regions"
+msgstr "Wilayah berlabel didiamkan"
+
+#: Menus.cpp:3445
+msgid "Split Labels"
+msgstr "Labelkan Sekaligus"
+
+#: Menus.cpp:3445
+msgid "Split labeled regions"
+msgstr "Sekaliguskan wilayah berlabel"
+
+#: Menus.cpp:3457
+msgid "Join Labels"
+msgstr "Gabungkan Label"
+
+#: Menus.cpp:3457
+msgid "Joined labeled regions"
+msgstr "Wilayah berlabel digabung"
+
+#: Menus.cpp:3469
+msgid "Disjoin Labels"
+msgstr "Pisahkan Label"
+
+#: Menus.cpp:3469
+msgid "Disjoined labeled regions"
+msgstr "Wilayah berlabel dipisahkan"
+
+#: Menus.cpp:3491
+#: TrackPanel.cpp:6134
+msgid "Split"
+msgstr "Sekaligus"
+
+#: Menus.cpp:3585
+msgid "Split New"
+msgstr "Perbaharui sekaligus"
+
+#: Menus.cpp:3585
+msgid "Split to new track"
+msgstr "Sekaliguskan ke trek baru"
+
+#: Menus.cpp:3668
+msgid "Split at labels"
+msgstr "Sekaliguskan pada label"
+
+#: Menus.cpp:3969
+msgid "To plot the spectrum, all selected tracks must be the same sample rate."
+msgstr "Untuk memplot spektrum, semua trek yang dipilih harus mempunyai rate sampel yang sama."
+
+#: Menus.cpp:3995
+#, c-format
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "Terlalu banyak yang dipilih. Hanya awal %.1f detik audio yang akan dianalisis."
+
+#: Menus.cpp:4130
+#, c-format
+msgid "Imported labels from '%s'"
+msgstr "Diimpor label dari '%s'"
+
+#: Menus.cpp:4131
+msgid "Import Labels"
+msgstr "Impor label"
+
+#: Menus.cpp:4142
+msgid "Select a MIDI file..."
+msgstr "Pilih file MIDI..."
+
+#: Menus.cpp:4146
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "File MIDI dan Allegro (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|File MIDI (*.mid;*.midi)|*.mid;*.midi|File Allegro (*.gro)|*.gro|Semua file (*.*)|*.*"
+
+#: Menus.cpp:4162
+#, c-format
+msgid "Imported MIDI from '%s'"
+msgstr "MIDI diimpor dari '%s'"
+
+#: Menus.cpp:4163
+msgid "Import MIDI"
+msgstr "Impor MIDI"
+
+#: Menus.cpp:4177
+msgid "Select any uncompressed audio file..."
+msgstr "Pilih file audio tanpa kompresi apa saja..."
+
+#: Menus.cpp:4181
+msgid "All files (*)|*"
+msgstr "Semua File (*)|*"
+
+#: Menus.cpp:4205
+msgid "Edit the metadata tags"
+msgstr "Edit tag metadata"
+
+#: Menus.cpp:4206
+#: export/Export.cpp:353
+msgid "Edit Metadata"
+msgstr "Edit Metadata"
+
+#: Menus.cpp:4206
+msgid "Edit Metadata tags"
+msgstr "Edit Tag Metadata"
+
+#: Menus.cpp:4262
+#, c-format
+msgid "Rendered all audio in track '%s'"
+msgstr "Semua audio di trek '%s' telah di-render"
+
+#: Menus.cpp:4263
+msgid "Render"
+msgstr "Render"
+
+#: Menus.cpp:4268
+#, c-format
+msgid "Mixed and rendered %d tracks into one new stereo track"
+msgstr "Di-mix dan di-render %d trek ke dalam satu trek stereo"
+
+#: Menus.cpp:4271
+#, c-format
+msgid "Mixed and rendered %d tracks into one new mono track"
+msgstr "Di-mix dan di-render %d trek ke dalam satu trek mono"
+
+#: Menus.cpp:4273
+#: Mix.cpp:121
+msgid "&Mix and Render"
+msgstr "&Mix dan Render"
+
+#: Menus.cpp:4403
+msgid "Aligned with zero"
+msgstr "Sejajarkan dengan nol"
+
+#: Menus.cpp:4407
+msgid "Aligned cursor"
+msgstr "Kursor yang diratakan"
+
+#: Menus.cpp:4411
+msgid "Aligned with selection start"
+msgstr "Diratakan dengan awal pilihan"
+
+#: Menus.cpp:4415
+msgid "Aligned with selection end"
+msgstr "Diratakan dengan akhir pilihan"
+
+#: Menus.cpp:4419
+msgid "Aligned end with cursor"
+msgstr "Diratakan akhir dengan kursor"
+
+#: Menus.cpp:4423
+msgid "Aligned end with selection start"
+msgstr "Diratakan akhir dengan awal pilihan"
+
+#: Menus.cpp:4427
+msgid "Aligned end with selection end"
+msgstr "Diratakan akhir dengan akhir pilihan"
+
+#: Menus.cpp:4431
+msgid "Aligned"
+msgstr "Diratakan"
+
+#: Menus.cpp:4464
+msgid "Align"
+msgstr "Perataan"
+
+#: Menus.cpp:4549
+msgid "Sync MIDI with Audio"
+msgstr "Sinkronisasi MIDI dengan Audio"
+
+#: Menus.cpp:4553
+msgid "Alignment completed."
+msgstr "Perataan selesai."
+
+#: Menus.cpp:4564
+msgid "Created new audio track"
+msgstr "Trek audio baru telah dibuat"
+
+#: Menus.cpp:4564
+#: Menus.cpp:4587
+#: Menus.cpp:4602
+#: Menus.cpp:4622
+msgid "New Track"
+msgstr "Trek Baru"
+
+#: Menus.cpp:4587
+msgid "Created new stereo audio track"
+msgstr "Trek stereo baru telah dibuat"
+
+#: Menus.cpp:4602
+msgid "Created new label track"
+msgstr "Trek label baru telah dibuat"
+
+#: Menus.cpp:4611
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "Varsi Audacity anda tidak mendukung multi-trek "
+
+#: Menus.cpp:4622
+msgid "Created new time track"
+msgstr "Dibuat trek waktu yang baru"
+
+#: Menus.cpp:4677
+msgid "Added label"
+msgstr "Label telah dibuat"
+
+#: Menus.cpp:4712
+msgid "Edited labels"
+msgstr "Label yang diedit"
+
+#: Menus.cpp:4739
+msgid "Save CleanSpeech Preset File As:"
+msgstr "Simpan File Aturan Lanjut CleanSpeech Sebagai:"
+
+#: Menus.cpp:4743
+msgid "CleanSpeech Presets (*.csp)|*.csp"
+msgstr "CleanSpeech Presets (*.csp)|*.csp"
+
+#: Menus.cpp:4750
+#: export/Export.cpp:605
+msgid "Sorry, pathnames longer than 256 characters not supported."
+msgstr "Maaf, nama path yang lebih dari 256 karakter tidak mendukung."
+
+#: Menus.cpp:4796
+msgid "Problem encountered exporting presets."
+msgstr "Problem encountered exporting presets."
+
+#: Menus.cpp:4797
+#: export/Export.cpp:468
+msgid "Unable to export"
+msgstr "Tidak bisa mengekspor"
+
+#: Menus.cpp:4981
+msgid "Remove Track"
+msgstr "Buang Trek"
+
+#: Menus.cpp:4981
+msgid "Removed audio track(s)"
+msgstr "Trek audio dibuang"
+
+#: Menus.cpp:5138
+#: Menus.cpp:5193
+#: export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
+msgid "Resample"
+msgstr "Sampel Ulang"
+
+#: Menus.cpp:5158
+#: TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr "New sample rate (Hz):"
+
+#: Menus.cpp:5182
+#: TrackPanel.cpp:6385
+msgid "The entered value is invalid"
+msgstr "Nilai yang Anda masukkan tidak valid"
+
+#: Menus.cpp:5191
+#, c-format
+msgid "Resampling track %d"
+msgstr "Menyampel ulang trek %d"
+
+#: Menus.cpp:5200
+msgid "Resample Track"
+msgstr "Menyempel Ulang Trek"
+
+#: Menus.cpp:5200
+msgid "Resampled audio track(s)"
+msgstr "Trek audio telah disampel ulang"
+
+#: Mix.cpp:95
+#: Mix.cpp:102
+msgid "Mix"
+msgstr "Mix"
+
+#: Mix.cpp:122
+msgid "Mixing and rendering tracks"
+msgstr "Trek Mix dan Render"
+
+#: NoteTrack.cpp:43
+msgid "Note Track"
+msgstr "Trek Catatan"
+
+#: Printing.cpp:192
+msgid "There was a problem printing."
+msgstr "Ada masalah dalam mencetak"
+
+#: Printing.cpp:193
+msgid "Print"
+msgstr "Cetak"
+
+#: Project.cpp:673
+msgid "Main Mix"
+msgstr "Mix Utama"
+
+#: Project.cpp:797
+#, c-format
+msgid "Welcome to Audacity version %s"
+msgstr "Selamat datang di Audacity versi %s"
+
+#: Project.cpp:957
+msgid "(Recovered)"
+msgstr "(Terkembalikan)"
+
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record"
+msgstr "Rekam"
+
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+msgid "Recorded Audio"
+msgstr "Rekaman Audio"
+
+#: Project.cpp:1564
+msgid "Save changes before closing?"
+msgstr "Simpan perubahan sebelum ditutup?"
+
+#: Project.cpp:1567
+msgid "\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr "\n"
+"Jika disimpan, proyek tidak akan punya trek.\n"
+"\n"
+"Untuk menyimpan trek yang dibuka sebelumnya:\n"
+"Batal, Edit > Batalkan sampai semua trek\n"
+"terbuka, kemudian Berkas > Simpan Proyek."
+
+#: Project.cpp:1570
+msgid "Save changes?"
+msgstr "Simpan perubahan?"
+
+#: Project.cpp:1772
+msgid "All files|*.*|All supported files|"
+msgstr "Semua file|*.*|Semua file yang terdukung|"
+
+#: Project.cpp:1802
+msgid "Select one or more audio files..."
+msgstr "Pilih satu atau lebih file audio..."
+
+#: Project.cpp:1829
+msgid "Audacity projects|*.aup|"
+msgstr "Proyek Audacity|*.aup|"
+
+#: Project.cpp:1882
+#: Project.cpp:2304
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr "File ini disimpan dengan Audacity %s, versi\n"
+"yang sudah lama.  Formatnya telah berbeda.\n"
+"\n"
+"Audacity bisa menghancurkan file dalam membukanya,\n"
+"jadi Anda harus membuat back-upnya dahulu.\n"
+"\n"
+"Buka filenya sekarang?"
+
+#: Project.cpp:1883
+msgid "1.0 or earlier"
+msgstr "1.0 atau lebih lama"
+
+#: Project.cpp:1889
+#: Project.cpp:2316
+msgid "Opening old project file"
+msgstr "Membuka file proyek yang lama"
+
+#: Project.cpp:1915
+#: Project.cpp:1923
+msgid "Error opening file"
+msgstr "Error dalam mebuka file"
+
+#: Project.cpp:1929
+#, c-format
+msgid "File may be invalid or corrupted: \n"
+"%s"
+msgstr "File mungkin tidak ada atau terhapus: \n"
+"%s"
+
+#: Project.cpp:1930
+msgid "Error opening file or project"
+msgstr "Error dalam membuka file atau proyek"
+
+#: Project.cpp:1950
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+
+#: Project.cpp:2053
+msgid "Could not remove old auto save file"
+msgstr "Tidak bisa membuang file simpan otomatis yang lama"
+
+#: Project.cpp:2055
+msgid "Project was recovered"
+msgstr "Proyek telah dikembalikan"
+
+#: Project.cpp:2055
+msgid "Recover"
+msgstr "Kembalikan"
+
+#: Project.cpp:2084
+msgid "Project checker repaired file"
+msgstr "Pengecekan telah memperbaiki file"
+
+#: Project.cpp:2084
+#: effects/Repair.h:29
+msgid "Repair"
+msgstr "Perbaiki"
+
+#: Project.cpp:2230
+#, c-format
+msgid "Couldn't find the project data folder: \"%s\""
+msgstr "Tidak bisa menemukan folder data proyek: \"%s\""
+
+#: Project.cpp:2273
+#, c-format
+msgid "This file was saved using Audacity %s.\n"
+"You are using Audacity %s - you need to upgrade to\n"
+"a newer version to open this file."
+msgstr "File ini disimpan dengan Audacity %s.\n"
+"Anda menggunakan Audacity %s - anda diharuskan untuk\n"
+"meng-upgrade versi terbaru untuk membuka file ini."
+
+#: Project.cpp:2277
+msgid "Can't open project file"
+msgstr "Tidak bisa membuka file proyek"
+
+#: Project.cpp:2311
+#, c-format
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
+"\n"
+"Open this file now?"
+msgstr "File ini disimpan dengan Audacity %s.\n"
+"Anda bisa membuka file ini dengan Audacity Anda ini, tapi jika anda menyimpannya, Anda tidak akan bisa untuk membukanya pada versi yang lama.\n"
+"\n"
+"Buka filenya sekarang?"
+
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2588
+#, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+
+#: Project.cpp:2590
+#: Project.cpp:2605
+msgid "Error saving project"
+msgstr "Error dalam meyimpan proyek"
+
+#: Project.cpp:2680
+#, c-format
+msgid "Saved %s"
+msgstr "Tersimpan %s"
+
+#: Project.cpp:2806
+#, c-format
+msgid "Imported '%s'"
+msgstr "Terimpor '%s'"
+
+#: Project.cpp:2807
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "Impor"
+
+#: Project.cpp:2840
+#: Project.cpp:2848
+msgid "Error importing"
+msgstr "Error menginpor"
+
+#: Project.cpp:2882
+msgid "Save Speech As:"
+msgstr "Simpan Speech Sebagai:"
+
+#: Project.cpp:2884
+msgid "Windows PCM Audio file (*.wav)|*.wav"
+msgstr "File Windows PCM Audio(*.wav)|*.wav"
+
+#: Project.cpp:2891
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
+"\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
+"Export commands."
+msgstr "File proyek Audacity (.aup) menyimpan pekerjaan Anda lebih kecil, karena format terkompres (.ogg) \n"
+"Proyek yang terkompres baik untuk menyebarkan proyek Anda secara online karena saking kecilnya.\n"
+"Untuk membuka proyek terkompres butuh waktu lebih lama, karena harus mengimpor setiap trek yang terkompres.\n"
+"\n"
+"Kebanyakan program tidak bisa membuka file proyek Audacity.\n"
+"Ketika anda ingin menyimpan file yang bisa dibuka oleh program lain, Pilih salah satu\n"
+"perintah Ekspor."
+
+#: Project.cpp:2894
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr "Anda sedang menyimpan file proyek Audacity (.aup).\n"
+"\n"
+"emnyimpan proyek akan membuat file dimana hanya Audacity yang bisa membukanya.\n"
+"\n"
+"Untuk emnyimpan file untuk program lainnya, gunakan salah satu perintah \"Berkas > Ekspor\".\n"
+
+#: Project.cpp:2898
+msgid "Audacity projects (*.aup)|*.aup"
+msgstr "Proyek Audacity (*.aup)|*.aup"
+
+#: Project.cpp:2952
+msgid "Created new project"
+msgstr "Membuat proyek baru"
+
+#: Project.cpp:3111
+#, c-format
+msgid "Deleted %.2f seconds at t=%.2f"
+msgstr "Terhapus %.2f detik pada t=%.2f"
+
+#: Project.cpp:3114
+#: effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
+msgid "Delete"
+msgstr "Hapus"
+
+#: Project.cpp:3308
+#, c-format
+msgid "Disk space remains for recording %d hours and %d minutes."
+msgstr "Ruang disk tinggal %d jam dan %d menit waktu rekaman."
+
+#: Project.cpp:3311
+#, c-format
+msgid "Disk space remains for recording 1 hour and %d minutes."
+msgstr "Ruang disk tinggal 1 jam dan %d menit waktu rekaman."
+
+#: Project.cpp:3314
+#, c-format
+msgid "Disk space remains for recording %d minutes."
+msgstr "Ruang disk tinggal %d menit waktu rekaman."
+
+#: Project.cpp:3317
+#, c-format
+msgid "Disk space remains for recording %d seconds."
+msgstr "Ruang disk tinggal %d detik waktu rekaman."
+
+#: Project.cpp:3320
+msgid "Out of disk space"
+msgstr "Ruang disk tidak cukup"
+
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr "Mengimpor selesai. Menjalankan %d perhitungan waveform di tempat. %2.0f%% selesai dari semuanya."
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr "Mengimpor selesai. Menjalankan perhitungan waveform di tempat. %2.0f%% selesai."
+
+#: Project.cpp:3614
+msgid "Could not remove old autosave file: "
+msgstr "Tidak bisa membuang file autosimpan yang lama:"
+
+#: Project.cpp:3655
+msgid "New Project"
+msgstr "Proyek Baru"
+
+#: Project.cpp:3668
+msgid "Error writing autosave file"
+msgstr "Error menulis file simpan otomatis"
+
+#: Project.cpp:3693
+msgid "Could not create autosave file: "
+msgstr "Tidak bisa membuat file autosimpan:"
+
+#: Project.cpp:3719
+#, c-format
+msgid "Actual Rate: %d"
+msgstr "Rate Asli: %d"
+
+#: Resample.cpp:42
+msgid "Libresample by Dominic Mazzoni and Julius Smith"
+msgstr "Libresample dari Dominic Mazzoni and Julius Smith"
+
+#: Resample.cpp:53
+msgid "High-quality Sinc Interpolation"
+msgstr "Interpolasi Sinc Berkualitas Tinggi"
+
+#: Resample.cpp:55
+msgid "Fast Sinc Interpolation"
+msgstr "Interpolasi Sinc yang Cepat"
+
+#: Resample.cpp:125
+msgid "Libsamplerate by Erik de Castro Lopo"
+msgstr "Libsamplerate dari Erik de Castro Lopo"
+
+#: Resample.cpp:218
+#, c-format
+msgid "Libsamplerate error: %d\n"
+msgstr "Libsamplerate error: %d\n"
+
+#: Resample.cpp:240
+#: Resample.cpp:250
+msgid "Resampling disabled."
+msgstr "Sampel ulang dimatikan."
+
+#. i18n-hint: Audio data bit depth (precison): 16-bit integers
+#: SampleFormat.cpp:66
+msgid "16-bit PCM"
+msgstr "16-bit PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 24-bit integers
+#: SampleFormat.cpp:69
+msgid "24-bit PCM"
+msgstr "24-bit PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 32-bit floating point
+#: SampleFormat.cpp:72
+msgid "32-bit float"
+msgstr "32-bit float"
+
+#: Screenshot.cpp:384
+msgid "Saved "
+msgstr "Tersimpan"
+
+#: Screenshot.cpp:387
+msgid "Error trying to save file: "
+msgstr "error dalam menyimpan file:"
+
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
+msgid "Gap detected in project file\n"
+msgstr "Pemisah terdeteksi pada file proyek\n"
+
+#: ShuttleGui.cpp:1972
+#: effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
+msgid "Pre&view"
+msgstr "Pre&view"
+
+#: ShuttleGui.cpp:1979
+msgid "&Debug"
+msgstr "&Benah"
+
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "Rekam dengan Suara Diaktifkan"
+
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "Level Aktivasi (dB):"
+
+#: SplashDialog.cpp:60
+msgid "&Welcome to Audacity!"
+msgstr "&selamat datang di Audacity!"
+
+#: SplashDialog.cpp:112
+msgid "Don't show this again at start up"
+msgstr "Jangan tampilkan lagi waktu start up"
+
+#: Tags.cpp:640
+msgid "Artist Name"
+msgstr "Nama Artis"
+
+#: Tags.cpp:641
+msgid "Track Title"
+msgstr "Judul Trek"
+
+#: Tags.cpp:642
+msgid "Album Title"
+msgstr "Judul album"
+
+#: Tags.cpp:643
+msgid "Track Number"
+msgstr "Nomor Trek"
+
+#: Tags.cpp:644
+#: Tags.cpp:2147
+msgid "Year"
+msgstr "Tahun"
+
+#: Tags.cpp:645
+msgid "Genre"
+msgstr "Genre"
+
+#: Tags.cpp:646
+#: Tags.cpp:2157
+#: prefs/MousePrefs.cpp:96
+msgid "Comments"
+msgstr "Kommentar"
+
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
+
+#: Tags.cpp:813
+msgid "Tag Name"
+msgstr "Nama Tag"
+
+#: Tags.cpp:814
+msgid "Tag Value"
+msgstr "Nilai Tag"
+
+#: Tags.cpp:829
+#: Tags.cpp:1486
+#: prefs/KeyConfigPrefs.cpp:116
+msgid "&Clear"
+msgstr "&Hapus"
+
+#: Tags.cpp:835
+msgid "Genres"
+msgstr "Genre"
+
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
+
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
+
+#: Tags.cpp:845
+#: Tags.cpp:1470
+#: Tags.cpp:1997
+msgid "Template"
+msgstr "Sketsa"
+
+#: Tags.cpp:849
+#: Tags.cpp:1474
+#: Tags.cpp:2001
+#: prefs/KeyConfigPrefs.cpp:126
+msgid "&Load..."
+msgstr "&Ambil..."
+
+#: Tags.cpp:850
+#: Tags.cpp:1475
+#: Tags.cpp:2002
+#: prefs/KeyConfigPrefs.cpp:125
+msgid "&Save..."
+msgstr "Sim&pan..."
+
+#: Tags.cpp:852
+#: Tags.cpp:1477
+#: Tags.cpp:2004
+msgid "S&et Default"
+msgstr "A&tur Normal"
+
+#: Tags.cpp:1002
+#: Tags.cpp:1640
+#: Tags.cpp:2368
+msgid "Edit Genres"
+msgstr "Edit Genre"
+
+#: Tags.cpp:1035
+#: Tags.cpp:1047
+#: Tags.cpp:1062
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1690
+#: Tags.cpp:1705
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2423
+#: Tags.cpp:2438
+#: Tags.cpp:2451
+msgid "Reset Genres"
+msgstr "Atur Ulang Genre"
+
+#: Tags.cpp:1035
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2451
+msgid "Unable to save genre file."
+msgstr "Tidak bisa menyimpan file genre."
+
+#: Tags.cpp:1046
+#: Tags.cpp:1689
+#: Tags.cpp:2422
+msgid "Are you sure you want to reset the genre list to defaults?"
+msgstr "Anda yakin ingin mengatur ulang daftar genre Anda?"
+
+#: Tags.cpp:1062
+#: Tags.cpp:1705
+#: Tags.cpp:2438
+msgid "Unable to open genre file."
+msgstr "Tidak bisa membuka file genre."
+
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
+msgid "Error loading metadata"
+msgstr "Error mengambil metadata"
+
+#: Tags.cpp:1097
+#: Tags.cpp:1151
+#: Tags.cpp:1751
+#: Tags.cpp:1787
+#: Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "Simpan Metadata Sebagai:"
+
+#: Theme.cpp:638
+#, c-format
+msgid "Audacity could not write file:\n"
+"  %s."
+msgstr "Audacity tidak bisa menulis file:\n"
+"  %s."
+
+#: Theme.cpp:656
+#, c-format
+msgid "Audacity could not open file:\n"
+"  %s\n"
+"for writing."
+msgstr "Audacity tidak bisa membuka file:\n"
+"  %s\n"
+"untuk ditulis."
+
+#: Theme.cpp:664
+#, c-format
+msgid "Audacity could not write images to file:\n"
+"  %s."
+msgstr "Audacity tidak bisa menulis gambar ke file:\n"
+"  %s."
+
+#: Theme.cpp:799
+#, c-format
+msgid "Audacity could not find file:\n"
+"  %s.\n"
+"Theme not loaded."
+msgstr "Audacity tidak bisa menemukan file:\n"
+"  %s.\n"
+"Tema tidak diambil."
+
+#: Theme.cpp:807
+#: Theme.cpp:896
+#, c-format
+msgid "Audacity could not load file:\n"
+"  %s.\n"
+"Bad png format perhaps?"
+msgstr "Audacity tidak bisa mengambil file:\n"
+"  %s.\n"
+"Format png yang buruk mungkin?"
+
+#: Theme.cpp:823
+msgid "Audacity could not read its default theme.\n"
+"Please report the problem."
+msgstr "Audacity tidak bisa membaca tema normalnya.\n"
+"Tolong segera laporkan masalah ini."
+
+#: Theme.cpp:918
+#, c-format
+msgid "None of the expected theme component files\n"
+" were found in:\n"
+"  %s."
+msgstr "Tidak ditemukan file komponen\n"
+" tema di:\n"
+"  %s."
+
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
+#, c-format
+msgid "Could not create directory:\n"
+"  %s"
+msgstr "Tidak bisa membuat direktori:\n"
+"  %s"
+
+#: Theme.cpp:963
+#, c-format
+msgid "Audacity could not save file:\n"
+"  %s"
+msgstr "Audacity tidak bisa menyimpan file:\n"
+"  %s"
+
+#: Theme.cpp:975
+#, c-format
+msgid "All required files in:\n"
+"  %s\n"
+"were already present."
+msgstr "Semua file yang dibutuhjkan di:\n"
+"  %s\n"
+"sudah ada."
+
+#: TimeDialog.cpp:53
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "Durasi"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Pencatat Waktu Rekaman Audacity"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "Mulai merekam"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "Selesai merekam"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr "Peningkatan Pencatat Waktu Rekaman Audacity"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "Tanggal dan Waktu mulai"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr "Tanggal Mulai"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Tanggal dan Waktu selesai"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr "Tanggal Selesai"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Menunggu untuk memulai rekaman pada %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Pencatat Waktu Rekaman Audacity - Menunggu untuk mulai"
+
+#: TrackPanel.cpp:457
+#: TrackPanel.cpp:458
+msgid "Track Panel"
+msgstr "Panel Trek"
+
+#: TrackPanel.cpp:541
+#: prefs/QualityPrefs.cpp:97
+msgid "Other..."
+msgstr "Lainnya..."
+
+#: TrackPanel.cpp:549
+#: TrackPanel.cpp:571
+#: TrackPanel.cpp:580
+#: TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
+msgid "Name..."
+msgstr "Nama..."
+
+#: TrackPanel.cpp:551
+#: TrackPanel.cpp:573
+#: TrackPanel.cpp:584
+#: TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
+msgid "Move Track Up"
+msgstr "Pindahkan Trek ke Atas"
+
+#: TrackPanel.cpp:552
+#: TrackPanel.cpp:574
+#: TrackPanel.cpp:585
+#: TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
+msgid "Move Track Down"
+msgstr "Pindahkan Trek ke Bawah"
+
+#: TrackPanel.cpp:554
+#: effects/ToneGen.cpp:319
+#: prefs/GUIPrefs.cpp:154
+msgid "Waveform"
+msgstr "Waveform"
+
+#: TrackPanel.cpp:555
+#: prefs/GUIPrefs.cpp:155
+msgid "Waveform (dB)"
+msgstr "Waveform (db)"
+
+#: TrackPanel.cpp:557
+#: prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr "Spektrum log(f)"
+
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558
+#: prefs/GUIPrefs.cpp:158
+msgid "Pitch (EAC)"
+msgstr "Pitch (EAC)"
+
+#: TrackPanel.cpp:560
+#: TrackPanel.cpp:6096
+msgid "Mono"
+msgstr "Mono"
+
+#: TrackPanel.cpp:561
+#: TrackPanel.cpp:6095
+msgid "Left Channel"
+msgstr "Bagian Kiri"
+
+#: TrackPanel.cpp:562
+#: TrackPanel.cpp:6095
+msgid "Right Channel"
+msgstr "Bagian Kanan"
+
+#: TrackPanel.cpp:563
+msgid "Make Stereo Track"
+msgstr "Buat Trek Stero"
+
+#: TrackPanel.cpp:564
+msgid "Split Stereo Track"
+msgstr "Gabung Trek Stereo"
+
+#: TrackPanel.cpp:566
+msgid "Set Sample Format"
+msgstr "Atur Format Sampel"
+
+#: TrackPanel.cpp:568
+#: TrackPanel.cpp:6341
+msgid "Set Rate"
+msgstr "Atur Rate"
+
+#: TrackPanel.cpp:576
+msgid "Up Octave"
+msgstr "Oktaf Atas"
+
+#: TrackPanel.cpp:577
+msgid "Down Octave"
+msgstr "Oktaf Bawah"
+
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:5795
+msgid "Font..."
+msgstr "Huruf..."
+
+#: TrackPanel.cpp:593
+msgid "Set Range..."
+msgstr "Atur Jarak..."
+
+#: TrackPanel.cpp:597
+#: toolbars/EditToolBar.cpp:135
+msgid "Copy"
+msgstr "Salin"
+
+#: TrackPanel.cpp:1258
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "Klik untuk perbesar secara vertikal, klik dengan Shift untuk perkecil, Dorong untuk membuat wilayah zoom kecil."
+
+#: TrackPanel.cpp:1263
+msgid "Drag the label vertically to change the order of the tracks."
+msgstr "Dorong label secara vertikal untuk mengubah urutan trek."
+
+#: TrackPanel.cpp:1283
+msgid "Click and drag to adjust relative size of stereo tracks."
+msgstr "Klik dan dorong untuk mengubah ukuran relatif trek stereo."
+
+#: TrackPanel.cpp:1286
+msgid "Click and drag to resize the track."
+msgstr "Klik dan dorong untuk mengubah ukuran trek"
+
+#: TrackPanel.cpp:1317
+msgid "Drag one or more label boundaries"
+msgstr "Dorong satu atau lebih batasan label"
+
+#: TrackPanel.cpp:1318
+msgid "Drag label boundary"
+msgstr "Borong batasan label"
+
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1334
+msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
+msgstr "Mode Tool Serbaguna: Cmd-. untuk Preferensi Mouse dan Keyboard"
+
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1337
+msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
+msgstr "Mode Tool Serbaguna: Ctrl-P untuk Preferensi Mouse dan Keyboard"
+
+#: TrackPanel.cpp:1383
+msgid "Click and drag to move left selection boundary."
+msgstr "Klik dan dorong untuk memindahkan batasan kiri."
+
+#: TrackPanel.cpp:1388
+msgid "Click and drag to move right selection boundary."
+msgstr "Klik dan dorong untuk memindahkan batasan kanan."
+
+#: TrackPanel.cpp:1730
+#: TrackPanel.cpp:3959
+#: TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
+msgid "Modified Label"
+msgstr "Label yang Telah Diubah"
+
+#: TrackPanel.cpp:1731
+#: TrackPanel.cpp:3960
+#: TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
+msgid "Label Edit"
+msgstr "Label Edit"
+
+#: TrackPanel.cpp:1971
+msgid "Adjusted envelope."
+msgstr "Amplop diubah."
+
+#: TrackPanel.cpp:1972
+#: prefs/MousePrefs.cpp:115
+msgid "Envelope"
+msgstr "Amplop"
+
+#: TrackPanel.cpp:2123
+msgid "Moved clip to another track"
+msgstr "Telah dipindah ke trek yang lain"
+
+#: TrackPanel.cpp:2127
+msgid "left"
+msgstr "kiri"
+
+#: TrackPanel.cpp:2127
+msgid "right"
+msgstr "kanan"
+
+#. i18n-hint: %s is a direction like left or right
+#: TrackPanel.cpp:2129
+#, c-format
+msgid "Time shifted tracks/clips %s %.02f seconds"
+msgstr "Waktu trek/klip %s dipersingkat %.02f seconds"
+
+#: TrackPanel.cpp:2133
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
+msgid "Time-Shift"
+msgstr "Time-Shift"
+
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr "Untuk menggunakan Gambar, pilih 'Waveform' pada Menu Trek."
+
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr "Untuk emnggunakan Gambar, perbesar sampai Anda melihat sampel berdiri sendiri."
+
+#: TrackPanel.cpp:3205
+msgid "Moved Sample"
+msgstr "Dipindahkan Sampel"
+
+#: TrackPanel.cpp:3206
+msgid "Sample Edit"
+msgstr "Sampel Edit"
+
+#: TrackPanel.cpp:3305
+#, c-format
+msgid "Removed track '%s.'"
+msgstr "Dibuang trek '%s.'"
+
+#: TrackPanel.cpp:3307
+msgid "Track Remove"
+msgstr "Pembuangan Trek"
+
+#: TrackPanel.cpp:3448
+msgid "Moved gain slider"
+msgstr "Pindahkan slider kekuatan"
+
+#: TrackPanel.cpp:3448
+msgid "Moved pan slider"
+msgstr "Pindahkan slider pan"
+
+#. i18n-hint: Title of the Gain slider, used to adjust the volume
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5703
+#: TrackPanel.cpp:7244
+msgid "Gain"
+msgstr "Kekuatan"
+
+#. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5641
+#: TrackPanel.cpp:7251
+msgid "Pan"
+msgstr "Pan"
+
+#: TrackPanel.cpp:3576
+#: TrackPanel.cpp:6441
+msgid "up"
+msgstr "atas"
+
+#: TrackPanel.cpp:3580
+#: TrackPanel.cpp:6442
+msgid "down"
+msgstr "bawah"
+
+#: TrackPanel.cpp:3587
+#: TrackPanel.cpp:6437
+#, c-format
+msgid "Moved '%s' %s"
+msgstr "Dipindahkan '%s' %s"
+
+#: TrackPanel.cpp:3590
+#: TrackPanel.cpp:6443
+msgid "Move Track"
+msgstr "Pindahkan Trek"
+
+#: TrackPanel.cpp:4155
+msgid "Expand"
+msgstr "Sebar"
+
+#: TrackPanel.cpp:4155
+msgid "Expanded Cut Line"
+msgstr "Garis Potong yng Tersebar"
+
+#: TrackPanel.cpp:4164
+msgid "Merge"
+msgstr "Gabung"
+
+#: TrackPanel.cpp:4164
+msgid "Merged Clips"
+msgstr "Klip Tergabung"
+
+#: TrackPanel.cpp:4176
+msgid "Removed Cut Line"
+msgstr "Garis Pemisah yang Dibuang"
+
+#: TrackPanel.cpp:5641
+msgid "Adjusted Pan"
+msgstr "Pengubahan Pan"
+
+#: TrackPanel.cpp:5703
+msgid "Adjusted gain"
+msgstr "Kekuatan yang Diubah"
+
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr "Grupkan dengan Trek Wave"
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr "Hapus grup apapun"
+
+#: TrackPanel.cpp:5923
+msgid "Can't delete track with active audio"
+msgstr "Tidak bisa menghapus trek yang sedang aktif"
+
+#: TrackPanel.cpp:6076
+msgid "Stereo, "
+msgstr "Stereo,"
+
+#: TrackPanel.cpp:6079
+msgid "Mono, "
+msgstr "Mono,"
+
+#: TrackPanel.cpp:6081
+msgid "Left, "
+msgstr "Kiri,"
+
+#: TrackPanel.cpp:6083
+msgid "Right, "
+msgstr "Kanan,"
+
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
+#, c-format
+msgid "Changed '%s' to %s"
+msgstr "Diubah '%s' ke %s"
+
+#: TrackPanel.cpp:6110
+msgid "Channel"
+msgstr "Saluran"
+
+#: TrackPanel.cpp:6131
+#, c-format
+msgid "Split stereo track '%s'"
+msgstr "Menggabung Trek Stereo '%s'"
+
+#: TrackPanel.cpp:6169
+#, c-format
+msgid "Made '%s' a stereo track"
+msgstr "Dibuat '%s' trek stereo"
+
+#: TrackPanel.cpp:6172
+msgid "Make Stereo"
+msgstr "Buat Stereo"
+
+#: TrackPanel.cpp:6215
+#, c-format
+msgid "Changed '%s' to %d Hz"
+msgstr "Diubah '%s' ke %d Hz"
+
+#: TrackPanel.cpp:6217
+msgid "Rate Change"
+msgstr "Perubahan Rate"
+
+#: TrackPanel.cpp:6255
+msgid "Format Change"
+msgstr "Perubahan Format"
+
+#: TrackPanel.cpp:6405
+msgid "Change lower speed limit (%) to:"
+msgstr "Ubah batas kecepatan rendah (%) ke:"
+
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
+msgid "Lower speed limit"
+msgstr "Batas kecepatan rendah"
+
+#: TrackPanel.cpp:6412
+msgid "Change upper speed limit (%) to:"
+msgstr "Ubah batas kecepatan tinggi (%) ke:"
+
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
+msgid "Upper speed limit"
+msgstr "Batas kecepatan tinggi"
+
+#: TrackPanel.cpp:6422
+#, c-format
+msgid "Set range to '%d' - '%d'"
+msgstr "Atur jarak ke '%d' - '%d'"
+
+#: TrackPanel.cpp:6425
+msgid "Set Range"
+msgstr "Atur Jarak"
+
+#: TrackPanel.cpp:6472
+msgid "Change track name to:"
+msgstr "Ubah nama trek ke:"
+
+#: TrackPanel.cpp:6473
+msgid "Track Name"
+msgstr "Nama Trek"
+
+#: TrackPanel.cpp:6476
+#, c-format
+msgid "Renamed '%s' to '%s'"
+msgstr "Diubah nama '%s' ke '%s'"
+
+#: TrackPanel.cpp:6479
+msgid "Name Change"
+msgstr "Pengubahan Nama"
+
+#: TrackPanel.cpp:6580
+msgid "Label Track Font"
+msgstr "Font Label Trek"
+
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
+msgid "Face name"
+msgstr "Nama depan"
+
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
+msgid "Face size"
+msgstr "Ukuran depan"
+
+#: TrackPanel.cpp:7171
+msgid "Mute"
+msgstr "Diam"
+
+#: TrackPanel.cpp:7171
+msgid "Solo"
+msgstr "Solo"
+
+#: TrackPanelAx.cpp:273
+msgid "TrackView"
+msgstr "LihatTrek"
+
+#: TrackPanelAx.cpp:281
+msgid "Track Accessible out of sync"
+msgstr "Trek tidak bisa disinkronkan"
+
+#: TrackPanelAx.cpp:289
+#, c-format
+msgid "Track %d"
+msgstr "Trek %d"
+
+#: TrackPanelAx.cpp:295
+msgid " Mute On"
+msgstr " Sunyi Hidup"
+
+#: TrackPanelAx.cpp:300
+msgid " Solo On"
+msgstr " Solo Hidup"
+
+#: TrackPanelAx.cpp:304
+msgid " Select On"
+msgstr " Pilihan Hidup"
+
+#: VoiceKey.cpp:88
+#: VoiceKey.cpp:238
+#: VoiceKey.cpp:376
+#: VoiceKey.cpp:517
+msgid "Selection is too small to use voice key."
+msgstr "Pilhan terlalu kecil untuk menggunakan kunci suara."
+
+#: VoiceKey.cpp:843
+msgid "Calibration Results\n"
+msgstr "Hasil Kalibrasi\n"
+
+#: VoiceKey.cpp:844
+#, c-format
+msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Energi                  -- arti: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:845
+#, c-format
+msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Pengubahan Tanda        -- mean: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:846
+#, c-format
+msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "Pengubahan Arah        -- mean: %1.4f  sd: (%1.4f)\n"
+
+#: WaveTrack.cpp:88
+msgid "Audio Track"
+msgstr "Trek Audio"
+
+#: WaveTrack.cpp:597
+#: WaveTrack.cpp:616
+#: WaveTrack.cpp:1057
+#: WaveTrack.cpp:1076
+msgid "There is not enough room available to paste the selection"
+msgstr "Tidak ada ruang cukup untuk menempel itu"
+
+#: WaveTrack.cpp:2086
+msgid "There is not enough room available to expand the cut line"
+msgstr "Tidak ada ruang yang tersedia untuk menyebarkan garis potong"
+
+#: commands/CommandManager.cpp:555
+#, c-format
+msgid "Plugins 1 to %i"
+msgstr "Plugin 1 ke %i"
+
+#: commands/CommandManager.cpp:569
+#, c-format
+msgid "Plugins %i to %i"
+msgstr "Plugin %i ke %i"
+
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "Tidak diperbolehkan karena beberapa alasan.  Coba memilih audio dahulu?"
+
+#: commands/CommandManager.cpp:892
+msgid "You can only do this when playing and recording are\n"
+" stopped.  [Pausing is not sufficient.]"
+msgstr "Anda hanya bisa melakukannya ketika berhenti memainkan atau\n"
+" merekam.  [Pause juga tidak berpengaruh.]"
+
+#: commands/CommandManager.cpp:894
+msgid "You must first select some stereo audio for this\n"
+" to use.  [You can't use this with mono.]"
+msgstr "Anda harus pilih beberapa trek stereo dahulu\n"
+" untuk menggunakannya. [Anda tidak bisa menggunakannya pada Mono.]"
+
+#: commands/CommandManager.cpp:896
+msgid "You must first select some audio for this to use."
+msgstr "Anda harus pilih beberapa audio terlebih dahulu."
+
+#: commands/CommandManager.cpp:898
+msgid "You must first select some audio for this\n"
+" to use. [Selecting other kinds of track won't work.]"
+msgstr "Anda harus pilih beberapa audio dahulu\n"
+" untuk menggunakannya. [Memilih jenis trek yang lain tidak akan bekerja.]"
+
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr "Tidak Diperbolehkan"
+
+#: commands/CommandManager.cpp:1083
+#, c-format
+msgid "Loaded %d keyboard shortcuts\n"
+msgstr "Diambil %d jalan pintas keyboard\n"
+
+#: commands/CommandManager.cpp:1085
+msgid "Loading keyboard shortcuts"
+msgstr "Mengambil jalan pintas keyboard"
+
+#: effects/Amplify.cpp:52
+#, c-format
+msgid "Applied effect: %s %.1f dB"
+msgstr "Efek traplikasi: %s %.1f dB"
+
+#: effects/Amplify.cpp:139
+msgid "Amplify"
+msgstr "Amplify"
+
+#: effects/Amplify.cpp:155
+#: effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "dari Dominic Mazzoni"
+
+#: effects/Amplify.cpp:168
+msgid "Amplification (dB):"
+msgstr "Amplifikasi (dB):"
+
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:190
+msgid "New Peak Amplitude (dB):"
+msgstr "Amplitudo yang baru (dB):"
+
+#: effects/Amplify.cpp:200
+msgid "Allow clipping"
+msgstr "Dibolehkan clipping"
+
+#: effects/Amplify.cpp:222
+#: effects/Amplify.cpp:279
+#: effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr "-tak terhingga"
+
+#: effects/Amplify.h:37
+msgid "Amplify..."
+msgstr "Amplify..."
+
+#: effects/Amplify.h:51
+msgid "Amplifying"
+msgstr "Mengamplifikasikan"
+
+#: effects/AutoDuck.cpp:125
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "Anda memilih trek yang tidak ada suaranya. AutoDuck hanya bisa memproses trek beraudio."
+
+#: effects/AutoDuck.cpp:126
+#: effects/AutoDuck.cpp:138
+#: effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:570
+msgid "Auto Duck"
+msgstr "Auto Duck"
+
+#: effects/AutoDuck.cpp:137
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Auto Duck membutuhkan trek pengendali yang harus ditempatkan dibawah trek yang dipilih."
+
+#: effects/AutoDuck.cpp:465
+msgid "Auto Duck by Markus Meyer"
+msgstr "Auto Duck dari Markus Meyer"
+
+#: effects/AutoDuck.cpp:487
+msgid "Duck amount:"
+msgstr "Banyak Duck:"
+
+#: effects/AutoDuck.cpp:492
+msgid "Maximum pause:"
+msgstr "Tunda maksimum:"
+
+#. i18n-hint: Name of time display format that shows time in seconds
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: effects/Contrast.cpp:263
+#: effects/Contrast.cpp:286
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
+#: prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163
+#: prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
+msgid "seconds"
+msgstr "detik"
+
+#: effects/AutoDuck.cpp:497
+msgid "Outer fade down length:"
+msgstr "Panjang fade down luar: "
+
+#: effects/AutoDuck.cpp:502
+msgid "Outer fade up length:"
+msgstr "Panjang fade up luar: "
+
+#: effects/AutoDuck.cpp:507
+msgid "Inner fade down length:"
+msgstr "Panjang fade down dalam: "
+
+#: effects/AutoDuck.cpp:512
+msgid "Inner fade up length:"
+msgstr "Panjang fade up dalam: "
+
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:494
+msgid "Threshold:"
+msgstr "Ambang Batas:"
+
+#: effects/AutoDuck.cpp:570
+msgid "Please enter valid values."
+msgstr "Tolong masukkan nilai yang valid."
+
+#: effects/AutoDuck.cpp:705
+msgid "Preview not available"
+msgstr "Preview tidak tersedia"
+
+#: effects/AutoDuck.h:98
+msgid "Auto Duck..."
+msgstr "Auto Duck..."
+
+#: effects/AutoDuck.h:115
+msgid "Processing Auto Duck..."
+msgstr "Memproses Auto Duck..."
+
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
+msgid "OK"
+msgstr "OK"
+
+#: effects/BassBoost.cpp:52
+#, c-format
+msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
+msgstr "Efek teraplikasi: %s frekuensi = %.0f Hz, boost = %.0f dB"
+
+#: effects/BassBoost.cpp:169
+msgid "Bass Boost"
+msgstr "Bass Boost"
+
+#: effects/BassBoost.cpp:182
+#: effects/Phaser.cpp:219
+#: effects/Wahwah.cpp:214
+msgid "by Nasca Octavian Paul"
+msgstr "dari Nasca Octavian Paul"
+
+#: effects/BassBoost.cpp:196
+#: effects/ChangePitch.cpp:322
+msgid "Frequency (Hz):"
+msgstr "Frekuensi (Hz):"
+
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
+msgid "Boost (dB):"
+msgstr "Boost (dB):"
+
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
+#: effects/BassBoost.h:35
+msgid "BassBoost..."
+msgstr "BassBoost..."
+
+#: effects/BassBoost.h:49
+msgid "Boosting Bass Frequencies"
+msgstr "Memboosting Frekuensi Bass"
+
+#: effects/ChangeLength.h:26
+msgid "Change Length..."
+msgstr "Ubah Panjang..."
+
+#: effects/ChangeLength.h:34
+msgid "Changing Length..."
+msgstr "Mengubah Panjang..."
+
+#: effects/ChangePitch.cpp:55
+#, c-format
+msgid "Applied effect: %s %.2f semitones"
+msgstr "Efek teraplikasi: %s %.2f seminada"
+
+#: effects/ChangePitch.cpp:198
+msgid "Change Pitch"
+msgstr "Mengubah Pitch"
+
+#: effects/ChangePitch.cpp:256
+msgid "Change Pitch without Changing Tempo"
+msgstr "Mengubah Pitch Tanpa Mengubah Tempo"
+
+#: effects/ChangePitch.cpp:258
+#: effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
+msgid "by Vaughan Johnson && Dominic Mazzoni"
+msgstr "dari Vaughan Johnson && Dominic Mazzoni"
+
+#: effects/ChangePitch.cpp:260
+#: effects/ChangeTempo.cpp:175
+msgid "using SoundTouch, by Olli Parviainen"
+msgstr "menggunakan SoundTouch, dari Olli Parviainen"
+
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr "Pitch:"
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr "Dari:"
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr "Dari Pitch"
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr "Atas"
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr "Bawah"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr "Ke:"
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr "Ke Pitch"
+
+#: effects/ChangePitch.cpp:311
+msgid "Semitones (half-steps):"
+msgstr "Seminada (separuh langkah):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr "Seminada dalam separuh langkah"
+
+#: effects/ChangePitch.cpp:326
+#: effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206
+#: effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr "dari"
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr "Dari Frekuensi dalam Hertz"
+
+#: effects/ChangePitch.cpp:331
+#: effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211
+#: effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "ke"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr "Ke Frekuensi dalam Detik"
+
+#: effects/ChangePitch.cpp:338
+#: effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
+msgid "Percent Change:"
+msgstr "Presentase Perubahan:"
+
+#: effects/ChangePitch.cpp:343
+#: effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358
+#: effects/ChangeTempo.cpp:195
+msgid "Percent Change"
+msgstr "Presentase Perubahan"
+
+#: effects/ChangePitch.h:31
+msgid "Change Pitch..."
+msgstr "Ubah Pitch..."
+
+#: effects/ChangePitch.h:46
+msgid "Changing Pitch"
+msgstr "Mengubah Pitch"
+
+#: effects/ChangeSpeed.cpp:54
+#: effects/ChangeTempo.cpp:55
+#, c-format
+msgid "Applied effect: %s %.1f%%"
+msgstr "Efek teraplikasi: %s %.1f%%"
+
+#: effects/ChangeSpeed.cpp:298
+msgid "Change Speed"
+msgstr "Mengubah Kecepatan"
+
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
+msgid "n/a"
+msgstr "tidak ada"
+
+#: effects/ChangeSpeed.cpp:334
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Mengubah Kecepatan, mengubah Tempo dan juga Pitch"
+
+#: effects/ChangeSpeed.cpp:338
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "menggunakan SampleRate, dari Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr "Vinyl RPM Standar:"
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr "Dari RPM"
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr "Ke RPM"
+
+#: effects/ChangeSpeed.h:32
+msgid "Change Speed..."
+msgstr "Udah Kecepatan..."
+
+#: effects/ChangeSpeed.h:46
+msgid "Changing Speed"
+msgstr "Mengubah Kecepatan"
+
+#: effects/ChangeTempo.cpp:138
+msgid "Change Tempo"
+msgstr "Mengubah Tempo"
+
+#: effects/ChangeTempo.cpp:171
+msgid "Change Tempo without Changing Pitch"
+msgstr "Mengubah Tempo Tanpa Mengubah Pitch"
+
+#: effects/ChangeTempo.cpp:203
+msgid "Beats per minute:"
+msgstr "Bit per Menit:"
+
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr "Dari bit per menit"
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr "Kei bit per menit"
+
+#: effects/ChangeTempo.cpp:216
+msgid "Length (seconds):"
+msgstr "Panjang (detik):"
+
+#: effects/ChangeTempo.cpp:220
+msgid "From length in seconds"
+msgstr "Dari panjang dalam detik"
+
+#: effects/ChangeTempo.cpp:225
+msgid "To length in seconds"
+msgstr "Ke panjang dalam detik"
+
+#: effects/ChangeTempo.h:35
+msgid "Change Tempo..."
+msgstr "Ubah Tempo..."
+
+#: effects/ChangeTempo.h:49
+msgid "Changing Tempo"
+msgstr "Mengubah Tempo"
+
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
+msgstr "Click Removal"
+
+#: effects/ClickRemoval.cpp:327
+msgid "Click and Pop Removal by Craig DeForest"
+msgstr "Pembuang Klik dan Pop dari Craig DeForest"
+
+#: effects/ClickRemoval.cpp:341
+msgid "Select threshold (lower is more sensitive):"
+msgstr "Pilih ambang batas (lebih rendah, lebih sensitif):"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:353
+msgid "Max spike width (higher is more sensitive):"
+msgstr "Besar Spike maksimal (lebih tinggi, lebih sensitif):"
+
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
+#: effects/ClickRemoval.h:42
+msgid "Click Removal..."
+msgstr "Pembuang Klik..."
+
+#: effects/ClickRemoval.h:56
+msgid "Removing clicks and pops..."
+msgstr "Membuang klik dan pop..."
+
+#: effects/Compressor.cpp:461
+msgid "Dynamic Range Compressor"
+msgstr "Pengompresan Dinamis"
+
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr "Ambang Batas"
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr "Ratio:"
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "Rasio"
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
+msgstr "Attack Time:"
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr "Waktu Serang"
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr "Decay Time:"
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr "Waktu Kekurangan"
+
+#: effects/Compressor.cpp:530
+msgid "Normalize to 0dB after compressing"
+msgstr "Normalkan ke 0dB setelah mengompres"
+
+#: effects/Compressor.cpp:563
+#, c-format
+msgid "Threshold %d dB"
+msgstr "Ambang Batas %d dB"
+
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr "%3d dB"
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr "Rasio: %.0f banding 1"
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr "Rasio %.1f banding 1"
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr "%.1f:1"
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr "Waktu Serang %.1f dtk"
+
+#: effects/Compressor.cpp:576
+#: effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr "%.1f detik"
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr "Waktu Kekurangan %.1f dtk"
+
+#: effects/Compressor.h:36
+msgid "Compressor..."
+msgstr "Kompresor..."
+
+#: effects/Compressor.h:50
+msgid "Applying Dynamic Range Compression..."
+msgstr "Mengaplikasikan Pengompresan Dinamis"
+
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr "Halo. \n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193
+#: effects/Contrast.cpp:204
+#: effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr "Terukur"
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr "Penganalisa Kontras"
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr "Parameter"
+
+#: effects/Contrast.cpp:242
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Awal"
+
+#: effects/Contrast.cpp:243
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Akhir"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr "Latar Depan:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr "Latar Belakang:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr "Hasil"
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr "Hasil Kontras:"
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+msgid "Reset"
+msgstr "Ulang"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr "Perbedaan:"
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "Informasi"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "Kontrol"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328
+#: effects/Contrast.cpp:336
+#: effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr "Ukuran"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191
+#: effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f dB"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr "WCAG2 Lolos"
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr "WCAG2 Gagal"
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr "Mengukur latar belakang"
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr "Mengukur latar depan"
+
+#: effects/DtmfGen.cpp:56
+msgid "DTMF Tone Generator"
+msgstr "Pembuat Nada DTMF "
+
+#: effects/DtmfGen.cpp:456
+msgid "by Salvo Ventura (2006)"
+msgstr "dari Salvo Ventura (2006)"
+
+#: effects/DtmfGen.cpp:460
+msgid "DTMF sequence:"
+msgstr "Urutan DTMF:"
+
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
+msgid "Amplitude (0-1)"
+msgstr "Amplitudo (0-1)"
+
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr "Durasi"
+
+#: effects/DtmfGen.cpp:486
+msgid "Tone/silence ratio:"
+msgstr "Rasio nada dengan diam:"
+
+#: effects/DtmfGen.cpp:496
+msgid "Duty cycle:"
+msgstr "Pengulangan:"
+
+#: effects/DtmfGen.cpp:498
+msgid "Tone duration:"
+msgstr "Durasi nada:"
+
+#: effects/DtmfGen.cpp:499
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
+msgid "ms"
+msgstr "ms"
+
+#: effects/DtmfGen.cpp:500
+msgid "Silence duration:"
+msgstr "Durasi diam:"
+
+#: effects/DtmfGen.h:39
+msgid "DTMF Tones..."
+msgstr "Nada DTMF..."
+
+#: effects/DtmfGen.h:53
+#, c-format
+msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
+msgstr "Efek teraplikasi: Membuat nada DTMF, %.6lf detik"
+
+#: effects/DtmfGen.h:57
+msgid "Generating DTMF tones"
+msgstr "Membuat nada DTMF"
+
+#: effects/Echo.cpp:48
+#, c-format
+msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
+msgstr "Efek teraplikasi: jarak %s = %f detik, faktor kekurangan = %f"
+
+#: effects/Echo.cpp:170
+msgid "Echo"
+msgstr "Echo"
+
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/Echo.cpp:195
+#: effects/Repeat.cpp:200
+msgid "by Dominic Mazzoni && Vaughan Johnson"
+msgstr "dari Dominic Mazzoni && Vaughan Johnson"
+
+#: effects/Echo.cpp:207
+msgid "Delay time (seconds):"
+msgstr "Waktu tenggang (detk):"
+
+#: effects/Echo.cpp:212
+msgid "Decay factor:"
+msgstr "Faktor kekurangan:"
+
+#: effects/Echo.h:34
+msgid "Echo..."
+msgstr "Echo..."
+
+#: effects/Echo.h:48
+msgid "Performing Echo"
+msgstr "Menjalankan Echo..."
+
+#: effects/Effect.cpp:467
+msgid "Preparing preview"
+msgstr "Meyiapkan preview"
+
+#: effects/Effect.cpp:497
+msgid "Previewing"
+msgstr "Melihat preview"
+
+#: effects/Effect.cpp:512
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "Error ketika membuka perangkat suara. Tolong cek pengaturan perangkat output dan rate sampel proyek."
+
+#: effects/Effect.h:100
+#, c-format
+msgid "Applied effect: %s"
+msgstr "Efek teraplikasi: %s"
+
+#: effects/Equalization.cpp:329
+msgid "B-spline"
+msgstr "Papan Bergelombang"
+
+#: effects/Equalization.cpp:330
+msgid "Cosine"
+msgstr "Kosinus"
+
+#: effects/Equalization.cpp:331
+msgid "Cubic"
+msgstr "Kubik"
+
+#: effects/Equalization.cpp:367
+#: effects/Equalization.cpp:416
+msgid "Equalization"
+msgstr "Ekualisasi"
+
+#: effects/Equalization.cpp:994
+msgid "Error loading EQ curve"
+msgstr "Error mengambil kurva EQ"
+
+#: effects/Equalization.cpp:1033
+msgid "custom"
+msgstr "pilihan sendiri"
+
+#. i18n-hint: && in here is an escape character to get a single &
+#. * on screen, so keep it as is
+#: effects/Equalization.cpp:1101
+msgid "Equalization, by Martyn Shaw && Mitch Golden"
+msgstr "Ekualisasi, dari Martyn Shaw && Mitch Golden"
+
+#: effects/Equalization.cpp:1122
+msgid "Max dB"
+msgstr "dB Maks"
+
+#: effects/Equalization.cpp:1124
+msgid "Min dB"
+msgstr "dB Min"
+
+#: effects/Equalization.cpp:1197
+msgid "kHz"
+msgstr "kHz"
+
+#: effects/Equalization.cpp:1214
+msgid "Draw curves"
+msgstr "Gambar kurva"
+
+#: effects/Equalization.cpp:1219
+msgid "Graphic EQ"
+msgstr "Grafik EQ"
+
+#: effects/Equalization.cpp:1233
+msgid "Linear frequency scale"
+msgstr "Skala frekuensi linier"
+
+#: effects/Equalization.cpp:1242
+msgid "Length of filter:"
+msgstr "Panjang filter:"
+
+#: effects/Equalization.cpp:1263
+msgid "Select curve:"
+msgstr "Pilih kurva:"
+
+#: effects/Equalization.cpp:1273
+#: effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
+msgid "Save As..."
+msgstr "Simpan Sebagai..."
+
+#: effects/Equalization.cpp:1279
+msgid "Flat"
+msgstr "Datar"
+
+#: effects/Equalization.cpp:2511
+msgid "Enter the desired name of the curve"
+msgstr "Masukkan nama untuk kurva"
+
+#: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
+msgid "Confirm Deletion"
+msgstr "Konfirmasi Penghapusan"
+
+#: effects/Equalization.h:84
+msgid "Equalization..."
+msgstr "Ekualisasi..."
+
+#: effects/Equalization.h:98
+msgid "Performing Equalization"
+msgstr "Mengekualisasi"
+
+#: effects/Fade.h:24
+msgid "Fade In"
+msgstr "Fade Masuk"
+
+#: effects/Fade.h:38
+msgid "Fading In"
+msgstr "Membuat Fade Masuk"
+
+#: effects/Fade.h:54
+msgid "Fade Out"
+msgstr "Fade Keluar"
+
+#: effects/Fade.h:68
+msgid "Fading Out"
+msgstr "Membuat Fade Keluar"
+
+#: effects/FindClipping.cpp:49
+msgid "Detect clipping"
+msgstr "Deteksi clipping"
+
+#: effects/FindClipping.cpp:91
+msgid "Clipping"
+msgstr "Clipping"
+
+#: effects/FindClipping.cpp:211
+msgid "Find Clipping"
+msgstr "Mencari Clipping"
+
+#: effects/FindClipping.cpp:222
+msgid "by Leland Lucius"
+msgstr "dari Leland Lucius"
+
+#: effects/FindClipping.cpp:234
+msgid "Start threshold (samples):"
+msgstr "Ambang batas awal (sampel):"
+
+#: effects/FindClipping.cpp:238
+msgid "Stop threshold (samples):"
+msgstr "Ambang batas akhir (sampel):"
+
+#: effects/FindClipping.cpp:250
+msgid "Start and stop must be greater than 0."
+msgstr "Awal dan akhir harus lebih dari 0."
+
+#: effects/FindClipping.h:37
+msgid "Find Clipping..."
+msgstr "Mencari Clipping..."
+
+#: effects/FindClipping.h:54
+msgid "Detecting clipping"
+msgstr "Memdeteksi Clipping"
+
+#: effects/Invert.h:27
+msgid "Invert"
+msgstr "Tukar"
+
+#: effects/Invert.h:41
+msgid "Inverting"
+msgstr "Menukar"
+
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "Leveller"
+
+#: effects/Leveller.cpp:203
+msgid "None-Skip"
+msgstr "Tidak Ada yang Dilewatkan"
+
+#: effects/Leveller.cpp:204
+msgid "Light"
+msgstr "Cahaya"
+
+#: effects/Leveller.cpp:205
+msgid "Moderate"
+msgstr "Moderat"
+
+#: effects/Leveller.cpp:206
+msgid "Heavy"
+msgstr "Berat"
+
+#: effects/Leveller.cpp:207
+msgid "Heavier"
+msgstr "Lebig Berat"
+
+#: effects/Leveller.cpp:208
+msgid "Heaviest"
+msgstr "Paling Berat"
+
+#: effects/Leveller.cpp:212
+#: effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "dari Lynn Allan"
+
+#: effects/Leveller.cpp:222
+msgid "Degree of Leveling"
+msgstr "Derajat Leveller"
+
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr "Derajat Pelevelan:"
+
+#: effects/Leveller.cpp:234
+msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
+msgstr "Ambang batas bising (Hiss/Hum/Ambang Bising):"
+
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
+msgstr "Ambang Batas untuk Bising:"
+
+#: effects/Leveller.h:28
+msgid "Leveller..."
+msgstr "Leveller..."
+
+#: effects/Leveller.h:42
+msgid "Applying Leveller..."
+msgstr "Mengaplikasikan Leveller..."
+
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr "Generator"
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr "Instrumen"
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr "Osilator1"
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr "Alat"
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr "Pengubah"
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr "Penganalisa"
+
+#: effects/LoadEffects.cpp:114
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mixer"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr "Simulator"
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr "Pembeda"
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr "Modulator"
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr "Reverb"
+
+#: effects/LoadEffects.cpp:124
+#: effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr "Flanger"
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr "Chorus"
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr "Penyaring"
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr "Batas Bawah"
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr "Batas Band"
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr "Batas Atas"
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr "Sisir"
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr "Semua Batas"
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr "Ekualiser"
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr "Parametrik"
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr "Banyak band"
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr "Pemroses Spektral"
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr "Penyingkat Pitch"
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr "Amplifier"
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr "Distorsi"
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr "Pembentuk Wave"
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr "Pengompres Dinamis"
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr "Kompresor"
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr "Penyebar"
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr "Pembatas"
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr "Jembatan"
+
+#: effects/LoadEffects.cpp:199
+#: effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "Pembuang Bising"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr "Pitch dan Tempo"
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr "Pengubah Nama"
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr "Waktu"
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr "Penyerangan"
+
+#: effects/Noise.cpp:37
+msgid "White"
+msgstr "Putih"
+
+#: effects/Noise.cpp:38
+msgid "Pink"
+msgstr "Merah Jambu"
+
+#: effects/Noise.cpp:39
+msgid "Brown"
+msgstr "Coklat"
+
+#: effects/Noise.cpp:41
+msgid "Noise Generator"
+msgstr "Pembuat Bising"
+
+#: effects/Noise.cpp:241
+msgid "Noise type"
+msgstr "Tpie Bising"
+
+#: effects/Noise.h:41
+msgid "Noise..."
+msgstr "Bising..."
+
+#: effects/Noise.h:55
+#, c-format
+msgid "Applied effect: Generate Noise, %.6lf seconds"
+msgstr "Efek Teraplikasi: Masukkan Bising, %.6lf detik"
+
+#: effects/Noise.h:59
+msgid "Generating Noise"
+msgstr "Membuat Bising"
+
+#: effects/NoiseRemoval.cpp:192
+#, c-format
+msgid "Could not open file:\n"
+"  %s"
+msgstr "Tidak bisa membuka file:\n"
+"  %s"
+
+#: effects/NoiseRemoval.cpp:277
+msgid "Attempt to run Noise Removal without a noise profile.\n"
+msgstr "Tetap menjalankan Pembuang Bising tanpa profil bising.\n"
+
+#: effects/NoiseRemoval.cpp:814
+msgid "Step 1"
+msgstr "Tahap 1"
+
+#: effects/NoiseRemoval.cpp:815
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
+"then click Get Noise Profile:"
+msgstr "Pilih beberapa detik bising agar Audacity tahu apa yang harus dibuang,\n"
+"kemudian klik Ambil Profil Bising:"
+
+#: effects/NoiseRemoval.cpp:816
+msgid "Step 2"
+msgstr "Tahap 2"
+
+#: effects/NoiseRemoval.cpp:817
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
+"filtered out, and then click 'OK' to remove noise.\n"
+msgstr "Pilih seluruh audio yang anda mau disaring, pilih seberapa banyak bising\n"
+"yang Anda ingin buang, dan klik 'OK' untuk membuangnya.\n"
+
+#: effects/NoiseRemoval.cpp:822
+msgid "Noise Removal by Dominic Mazzoni"
+msgstr "Pembuang Bising dari Dominic Mazzoni"
+
+#: effects/NoiseRemoval.cpp:830
+msgid "Get Noise Profile"
+msgstr "Ambil Profil Bising"
+
+#: effects/NoiseRemoval.cpp:841
+msgid "Noise reduction (dB):"
+msgstr "Reduksi bising (dB):"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:849
+msgid "Frequency smoothing (Hz):"
+msgstr "Frekuensi pelembut (Hz):"
+
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
+msgid "Attack/decay time (secs):"
+msgstr "Waktu serang/kurang (dtk):"
+
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
+msgid "Noise Removal..."
+msgstr "Pembuang Bising..."
+
+#: effects/NoiseRemoval.h:50
+msgid "Creating Noise Profile"
+msgstr "Membuat Profil Bising"
+
+#: effects/NoiseRemoval.h:52
+msgid "Removing Noise"
+msgstr "Membuang Bising"
+
+#. i18n-hint: First %s is the effect name, 2nd and 3rd are either true or
+#. * false (translated below) if those options were selected
+#: effects/Normalize.cpp:70
+#, c-format
+msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
+msgstr "Efek teraplikasi: %s membuang dc offset = %s, amplitudo penormalan = %s"
+
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
+msgid "false"
+msgstr "salah"
+
+#. i18n-hint: true here means that the option was
+#. * selected. Opposite false if not selected
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
+msgid "true"
+msgstr "benar"
+
+#: effects/Normalize.cpp:77
+#, c-format
+msgid ", maximum amplitude = %.1f dB"
+msgstr ", amplitudo maksimum = %.1f dB"
+
+#: effects/Normalize.cpp:327
+msgid "Normalize"
+msgstr "Normalize"
+
+#: effects/Normalize.cpp:351
+#: effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr "Buang semua DC offset (tengah pada 0.0 secara vertikal)"
+
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr "Menormalkan amplitudo maksimum ke:"
+
+#: effects/Normalize.cpp:362
+msgid "-"
+msgstr "-"
+
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:33
+msgid "Normalize..."
+msgstr "Normalize..."
+
+#: effects/Normalize.h:49
+msgid "Normalizing..."
+msgstr "Menormalkan..."
+
+#: effects/Phaser.cpp:65
+#, c-format
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "Efek teraplikasi: %s %d tingkatan, %.0f%% basah, frekuensi = %.1f Hz, fase awal = %.0f derajat, dalam = %d, umpan balik = %.0f%%"
+
+#: effects/Phaser.cpp:226
+msgid "Stages:"
+msgstr "Tingkat:"
+
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr "Tingkat"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr "Kering/Baah:"
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr "Kering Basah"
+
+#: effects/Phaser.cpp:236
+#: effects/Wahwah.cpp:221
+msgid "LFO Frequency (Hz):"
+msgstr "Frekuensi LFO (Hz):"
+
+#: effects/Phaser.cpp:239
+#: effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr "Frekuensi LFO dalam Hertz"
+
+#: effects/Phaser.cpp:241
+#: effects/Wahwah.cpp:226
+msgid "LFO Start Phase (deg.):"
+msgstr "Fase Awal LFO (derajat):"
+
+#: effects/Phaser.cpp:244
+#: effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr "Fase Awal LFO dalam derajat"
+
+#: effects/Phaser.cpp:246
+msgid "Depth:"
+msgstr "Kedalaman:"
+
+#: effects/Phaser.cpp:249
+#: effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr "Kedalaman dalam persen"
+
+#: effects/Phaser.cpp:251
+msgid "Feedback (%):"
+msgstr "Tanggapan (%):"
+
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr "Timbal Balik dalam persen"
+
+#: effects/Phaser.h:45
+msgid "Phaser..."
+msgstr "Phaser..."
+
+#: effects/Phaser.h:59
+msgid "Applying Phaser"
+msgstr "Membuat Fase"
+
+#: effects/Repair.cpp:99
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+"\n"
+"Zoom in and select a tiny fraction of a second to repair."
+msgstr "Efek perbaikan hanya digunakan pada sesi sangat pendek pada audio yang hancur (lebih dari 128 sampel).\n"
+"\n"
+"Perbesar dan pilih fraksi kecil untuk memperbaikinya."
+
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr "Perbaikan bekerja dengan menggunakan data audio di luar wilayah yang dipilih.\n"
+"\n"
+"Silahkan pilih wilayah yang mempinyai sentuhan audio sedikitnya satu sisi ini.\n"
+"\n"
+"Audio lebih mengelegar, lebih baik performanya."
+
+#: effects/Repair.h:43
+msgid "Repairing damaged audio"
+msgstr "Memperbaiki audio yang rusak"
+
+#: effects/Repeat.cpp:50
+#, c-format
+msgid "Repeated %d times"
+msgstr "Diulang %d kali"
+
+#: effects/Repeat.cpp:76
+msgid "Tracks are too long to repeat the selection."
+msgstr "Trek yang dipilih terlalu panjang untuk diulang."
+
+#: effects/Repeat.cpp:77
+#: effects/Repeat.cpp:187
+msgid "Repeat"
+msgstr "Ulang"
+
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
+msgstr "Number of times to repeat:"
+
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr "Panjang yang baru: jj:mm:dd"
+
+#: effects/Repeat.cpp:253
+msgid "New selection length: "
+msgstr "Panjang yang baru:"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "jj:mm:dd"
+
+#: effects/Repeat.h:33
+msgid "Repeat..."
+msgstr "Repeat...."
+
+#: effects/Repeat.h:47
+msgid "Performing Repeat"
+msgstr "Mengulang"
+
+#: effects/Reverse.h:30
+msgid "Reverse"
+msgstr "Tukar Balik"
+
+#: effects/Reverse.h:44
+msgid "Reversing"
+msgstr "Menukar Balik"
+
+#: effects/Silence.cpp:32
+msgid "Silence Generator"
+msgstr "Pembuat Diam"
+
+#: effects/Silence.h:34
+msgid "Silence..."
+msgstr "Diam..."
+
+#: effects/Silence.h:48
+msgid "Generating Silence"
+msgstr "Membuat Diam"
+
+#: effects/Silence.h:53
+#, c-format
+msgid "Applied effect: Generate Silence, %.6lf seconds"
+msgstr "Efek teraplikasi: Membuat Diam, %.6lf detik"
+
+#: effects/SimplePairedTwoTrack.h:120
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Maaf, efek ini tidak bisa dipakai pada trek stereo yang masing-masing salurannya tidak cocok."
+
+#: effects/SpikeCleaner.cpp:69
+msgid "Spike Cleaner"
+msgstr "Pembersih Spike"
+
+#: effects/SpikeCleaner.cpp:160
+msgid "SpikeCleaner by Lynn Allan"
+msgstr "Pembersih Spike dari Lynn Allan"
+
+#: effects/SpikeCleaner.cpp:165
+msgid "Max Spike Duration (milliseconds): \n"
+"(99999 or greater is off)"
+msgstr "Durasi Spike Maksimum (millidetik): \n"
+"(99999 atau lebih berarti dimatikan)"
+
+#: effects/SpikeCleaner.cpp:178
+msgid "Theshold for silence: "
+msgstr "Ambang Batas untuk Diam:"
+
+#: effects/SpikeCleaner.h:27
+msgid "Spike Cleaner..."
+msgstr "Pembersih Spike..."
+
+#: effects/SpikeCleaner.h:35
+msgid "Applying Spike Cleaner..."
+msgstr "Membersihkan Spike..."
+
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Stereo ke Mono"
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr "Membuat Stereo ke Mono"
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:61
+#, c-format
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "Efek teraplikasi: Membuat %s gelombang %s, frekuensi = %.2f Hz, amplitudo = %.2f, %.6lf detik"
+
+#: effects/ToneGen.cpp:69
+#: widgets/Meter.cpp:416
+msgid "Linear"
+msgstr "Linier"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr "Logaritmik"
+
+#: effects/ToneGen.cpp:71
+msgid "Chirp Generator"
+msgstr "Pembuat Chirp"
+
+#: effects/ToneGen.cpp:71
+msgid "Tone Generator"
+msgstr "Pembuat Nada"
+
+#: effects/ToneGen.cpp:72
+msgid "Sine"
+msgstr "Silau"
+
+#: effects/ToneGen.cpp:73
+msgid "Square"
+msgstr "Kotak"
+
+#: effects/ToneGen.cpp:74
+msgid "Sawtooth"
+msgstr "Gerigi"
+
+#: effects/ToneGen.cpp:75
+msgid "Square, no alias"
+msgstr "Persegi, tanpa samaran"
+
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
+msgid "Frequency (Hz)"
+msgstr "Frekuensi (Hz)"
+
+#: effects/ToneGen.cpp:348
+msgid "Waveform:"
+msgstr "Waveform:"
+
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr "Interpolasi:"
+
+#: effects/ToneGen.h:40
+msgid "Chirp..."
+msgstr "Chirp..."
+
+#: effects/ToneGen.h:40
+msgid "Tone..."
+msgstr "Nada..."
+
+#: effects/ToneGen.h:54
+msgid "Generating Chirp"
+msgstr "Membuat Chirp"
+
+#: effects/ToneGen.h:54
+msgid "Generating Tone"
+msgstr "Membuat Nada"
+
+#: effects/TruncSilence.cpp:113
+msgid "All tracks must have the same sample rate"
+msgstr "Semua trek harus mempunyai rate sampel yang sama"
+
+#: effects/TruncSilence.cpp:113
+#: effects/TruncSilence.cpp:321
+msgid "Truncate Silence"
+msgstr "Pangkas Diam"
+
+#: effects/TruncSilence.cpp:345
+msgid "Max silence duration:"
+msgstr "Durasi diam maksimum:"
+
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
+#: prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
+msgid "milliseconds"
+msgstr "milidetik"
+
+#: effects/TruncSilence.cpp:350
+msgid "Threshold for silence:"
+msgstr "Ambang Batas untuk Diam:"
+
+#: effects/TruncSilence.cpp:374
+msgid "   Duration must be at least 1 millisecond"
+msgstr "   Durasi harus minimal 1 milidetik"
+
+#: effects/TruncSilence.h:28
+msgid "Truncate Silence..."
+msgstr "Pangkas Diam..."
+
+#: effects/TruncSilence.h:42
+msgid "Truncating Silence..."
+msgstr "Memangkas Diam.."
+
+#: effects/VST/VSTEffect.cpp:172
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Maaf, Efek VST tidak bisa dipakai pada trek stereo yang masing-masing salurannya tidak cocok."
+
+#: effects/VST/VSTEffect.cpp:187
+msgid "Can't process replacing"
+msgstr "Tidak bisa memindahkan"
+
+#: effects/VST/VSTEffect.cpp:410
+msgid "VST Plug-in parameters:"
+msgstr "Parameter Plug-in VST:"
+
+#: effects/Wahwah.cpp:61
+#, c-format
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "Efek teraplikasi: %s frekuensi = %.1f Hz, fase mulai = %.0f deerjat, kedalaman = %.0f%%, resonansi = %.1f, frekuensi offset = %.0f%%"
+
+#: effects/Wahwah.cpp:203
+msgid "Wahwah"
+msgstr "Wahwah"
+
+#: effects/Wahwah.cpp:231
+msgid "Depth (%):"
+msgstr "Kedalaman (%):"
+
+#: effects/Wahwah.cpp:236
+msgid "Resonance:"
+msgstr "Resonansi:"
+
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr "Resonansi"
+
+#: effects/Wahwah.cpp:241
+msgid "Wah Frequency Offset (%):"
+msgstr "Frekuensi Offset Wah (%):"
+
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr "Frekuensi Offset Wah dalam persen"
+
+#: effects/Wahwah.h:41
+msgid "Wahwah..."
+msgstr "Wahwah..."
+
+#: effects/Wahwah.h:55
+msgid "Applying Wahwah"
+msgstr "Mengaplikasikan Wahwah"
+
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176
+#: effects/lv2/LV2Effect.cpp:191
+#, c-format
+msgid "Performing Effect: %s"
+msgstr "Menjalankan Efek: %s"
+
+#: effects/ladspa/LadspaEffect.cpp:196
+#: effects/lv2/LV2Effect.cpp:211
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Maaf, Efek Pulg-in tidak bisa dipakai pada trek stereo yang masing-masing salurannya tidak cocok."
+
+#: effects/ladspa/LadspaEffect.cpp:580
+#: effects/ladspa/LadspaEffect.cpp:588
+#: prefs/GUIPrefs.cpp:51
+#: prefs/QualityPrefs.cpp:72
+msgid "None"
+msgstr "Tidak Ada"
+
+#: effects/ladspa/LadspaEffect.cpp:582
+#: effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
+msgid "Author: "
+msgstr "Pengarang:"
+
+#: effects/ladspa/LadspaEffect.cpp:615
+#: effects/lv2/LV2Effect.cpp:823
+msgid "Effect Settings"
+msgstr "Aturan Efek"
+
+#: effects/ladspa/LadspaEffect.cpp:710
+#: effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
+msgid "Length (seconds)"
+msgstr "Panjang (detik)"
+
+#: effects/lv2/LV2Effect.cpp:849
+#: effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr "Panjang catatan(detik)"
+
+#: effects/lv2/LV2Effect.cpp:860
+#: effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr "Kecepatan pencatatan"
+
+#: effects/lv2/LV2Effect.cpp:871
+#: effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr "Kunci Catatan"
+
+#: effects/nyquist/Nyquist.cpp:257
+msgid "Applying Nyquist Effect..."
+msgstr "Mengaplikasikan Efek Nyquist..."
+
+#: effects/nyquist/Nyquist.cpp:264
+#: effects/nyquist/Nyquist.cpp:326
+msgid "Nyquist Prompt..."
+msgstr "Prompt Nyquist..."
+
+#: effects/nyquist/Nyquist.cpp:327
+msgid "Enter Nyquist Command: "
+msgstr "Masukkan Perintah Nyquist:"
+
+#: effects/nyquist/Nyquist.cpp:417
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "Maaf, efek tidak bisa dipakai padatrek stereo yang trek-terknya tidak cocok."
+
+#: effects/nyquist/Nyquist.cpp:445
+msgid "Nyquist"
+msgstr "Nyquist"
+
+#: effects/nyquist/Nyquist.cpp:446
+msgid "Nyquist Output: "
+msgstr "Output Nyquist:"
+
+#: effects/nyquist/Nyquist.cpp:603
+#: effects/nyquist/Nyquist.cpp:614
+msgid "Nyquist returned the value:"
+msgstr "Nyquist menghasilkan nilai:"
+
+#: effects/nyquist/Nyquist.cpp:656
+msgid "Nyquist did not return audio.\n"
+msgstr "Nyquist tidak menghasilkan audio.\n"
+
+#: effects/nyquist/Nyquist.cpp:667
+msgid "Nyquist returned too many audio channels.\n"
+msgstr "Nyquist terlalu banyak membuat audio.\n"
+
+#: effects/vamp/VampEffect.cpp:86
+#, c-format
+msgid "Extracting features: %s"
+msgstr "Mengekstrak fitur: %s"
+
+#: effects/vamp/VampEffect.cpp:117
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Maaf, Plug-in Vamp tidak bisa dipakai pada trek stereo yang masing-masing salurannya tidak cocok."
+
+#: effects/vamp/VampEffect.cpp:131
+msgid "Sorry, failed to load Vamp Plug-in."
+msgstr "Maaf, gagal mengambil Plug-in Vamp."
+
+#: effects/vamp/VampEffect.cpp:239
+msgid "Sorry, Vamp Plug-in failed to initialize."
+msgstr "Maaf, Plug-in Vamp gagal diinstall."
+
+#: effects/vamp/VampEffect.cpp:387
+msgid " - Vamp audio analysis plugin"
+msgstr " - Plugin analisis Vamp auido"
+
+#: effects/vamp/VampEffect.cpp:423
+msgid "Plugin Settings"
+msgstr "Aturan Plugin"
+
+#: effects/vamp/VampEffect.cpp:442
+#: effects/vamp/VampEffect.cpp:448
+msgid "Program"
+msgstr "Program"
+
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:522
+msgid "Export File"
+msgstr "Mengekpor File"
+
+#: export/Export.cpp:530
+msgid "&Options..."
+msgstr "&Opsi..."
+
+#: export/Export.cpp:571
+msgid "Are you sure you want to save the file as \""
+msgstr "Anda yakin ingin menyimpan file sebagai \""
+
+#: export/Export.cpp:591
+#, c-format
+msgid "You are about to save a %s file with the name \"%s\".\n"
+"\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
+"\n"
+"Are you sure you want to save the file under this name?"
+msgstr "Anda ingin menyimpan file %s dengan nama \"%s\".\n"
+"\n"
+"Biasanya file berakhiran dengan \".%s\", dan beberapa program tidak dapat membuka file dengan ekstensi nonstandar.\n"
+"\n"
+"Anda yakin ingin menyimpan file dangan nama ini?"
+
+#: export/Export.cpp:612
+#, c-format
+msgid "A file named \"%s\" already exists.  Replace?"
+msgstr "File bernama \"%s\" telah ada. Ganti?"
+
+#: export/Export.cpp:710
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "Trek Anda akan di-mix ke stereo pada pengeksporan file."
+
+#: export/Export.cpp:715
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "Trek Anda akan di-mix ke mono pada pengeksporan file."
+
+#: export/Export.cpp:726
+msgid "Advanced Mixing Options"
+msgstr "Opsi Mixing Lanjut"
+
+#: export/Export.cpp:930
+#, c-format
+msgid "Channel: %2d"
+msgstr "Channel: %2d"
+
+#: export/Export.cpp:1046
+msgid " - Left"
+msgstr " - Kiri"
+
+#: export/Export.cpp:1047
+msgid " - Right"
+msgstr " - Kanan"
+
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr "Panel Mixer"
+
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
+#, c-format
+msgid "Output Channels: %2d"
+msgstr "Channel Output: %2d"
+
+#: export/ExportCL.cpp:55
+msgid "Specify Command Line Encoder"
+msgstr "Spesifikasi Encoder Baris Perintah"
+
+#: export/ExportCL.cpp:70
+msgid "Command Line Export Setup"
+msgstr "Pengaturan Ekspor Baris Perintah"
+
+#: export/ExportCL.cpp:75
+msgid "Command:"
+msgstr "Perintah:"
+
+#: export/ExportCL.cpp:80
+msgid "Show output"
+msgstr "Tunjukkan output"
+
+#: export/ExportCL.cpp:87
+#, c-format
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "Data akan distandarkan. \"%f\" akan diganti dengan nama file yang dipilih tadi."
+
+#: export/ExportCL.cpp:222
+msgid "(external program)"
+msgstr "(program eksternal)"
+
+#: export/ExportCL.cpp:253
+#: export/ExportPCM.cpp:457
+#, c-format
+msgid "Cannot export audio to %s"
+msgstr "Tidak dapat mengekspor audio ke %s"
+
+#: export/ExportCL.cpp:327
+msgid "Exporting the selected audio using command-line encoder"
+msgstr "Mengekspor audio terpilih dengan encoder baris perintah"
+
+#: export/ExportCL.cpp:328
+msgid "Exporting the entire project using command-line encoder"
+msgstr "Mengekspor proyek tersebut dengan encoder baris perintah"
+
+#: export/ExportCL.cpp:390
+msgid "Command Output"
+msgstr "Output Perintah"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr "Exporting selected audio as %s"
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr "Mengekspor file sebagai %s"
+
+#: export/ExportFFmpeg.cpp:702
+#: export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "Rate sampel tidak valid"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr "Rate Sampel proyek (%d) tidak mendukung \n"
+"file format output yang ada.  "
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr "Kombinasi rate Sampel proyek (%d) dan bit ratenya (%d kbps) tidak\n"
+"mendukung format file output yang ada."
+
+#: export/ExportFFmpeg.cpp:721
+#: export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "Anda harus menyampel ulang ke salah satu rate di bawah ini."
+
+#: export/ExportFFmpeg.cpp:749
+#: export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "Rate Sampel"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "Opsi Spesifikasi AC3"
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr "Aturan Ekspor AC3"
+
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bit Rate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr "Opsi Spesifikasi AAC"
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr "Aturan Ekspor AAC"
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr "Opsi Spesifikasi AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr "Pengaturan Ekspor AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr "Opsi Spesifikasi AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr "Pengaturan Ekspor AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr "Opsi Spesifikasi WMA"
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr "Pengaturan Ekspor WMA"
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "Tiban aturan lanjut '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr "Konfirmasi Penibanan"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr "Opsi Spesifikasi yang Lainnya"
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr "Aturan Lanjut:"
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr "Ambil Aturan Lanjut"
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr "Simpan Aturan Lanjut"
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr "Hapus Aturan Lanjut"
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr "Impor Aturan Lajut"
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr "Ekspor Aturan Lanjut"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr "Codec:"
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr "Tidak semua format dan codec kompetibel. Beberapa kombinasi parameter (seperti bitrate dan sampelrate) tidak kompetibel juga dengan beberapa codec"
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr "Pemilih format:"
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr "Pemilih codec:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr "Tunjukkan Semua Format"
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr "Tunjukkan Semua Codec"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+#: prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Bahasa:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr "Tiga karakter kode bahasa berdasarkan ISO 639\n"
+"Opsi\n"
+"kosong - otomatis"
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr "Tag:"
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr "Tag codec (FOURCC)\n"
+"Opsi\n"
+"kosong - otomatis"
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr "Bit Rate (bit/detik) - menunjukkan hasil pada ukuran file dan kualitas\n"
+"Beberapa codec mungkin hanya menunjukkan nilai spesifik (128k, 192k, 256k, dll)\n"
+"0 - otomatis\n"
+"Direkomendasikan - 192000"
+
+#: export/ExportFFmpegDialogs.cpp:940
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kualitas:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr "Kualitas keseluruhan, digunakan berbeda oleh codec yang berbeda pula\n"
+"Diperlukan untuk Vorbis\n"
+"0 - otomatis\n"
+"-1 - mati (jadi, gunakan bitrate)"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr "Rate Sampel:"
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr "Rate sampel (Hz)\n"
+"0 - jangan ubah rate sampel"
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr "Bandwidth yang Dipotong:"
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr "Bandwidth audio yang dipotong (Hz)\n"
+"Opsi\n"
+"0 - otomatis\n"
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr "Profil:"
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr "Profil AAC\n"
+"Kompleksitas Rendah (LC) -biasa\n"
+"Kebannyakan player tidak mau mainkan apapun selain LC"
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr "Level pengompres:"
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr "Level pengompresan\n"
+"Diperlukan untuk FLAC\n"
+"-1 - otomatis\n"
+"min - 0 (encoding cepat, file output besar)\n"
+"maks - 10 (encoding lambat, file output kecil)"
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr "Ukuran Bingkai:"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr "Ukuran bingkai\n"
+"Opsi\n"
+"0 - biasa\n"
+"min - 16\n"
+"maks - 65535"
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr "Presisi Koefisien LPC"
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr "Presisi koefisien LPC\n"
+"Opsi\n"
+"0 - biasa\n"
+"min - 1\n"
+"maks - 15"
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr "Prediksi persebaran minimal"
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr "Prediksi persebaran minimal\n"
+"Opsi\n"
+"-1 - biasa\n"
+"min - 0\n"
+"maks - 32 (dengan LPC) atau 4 (tanpa LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr "Prediksi persebaran maksimal"
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr "Prediksi persebaran maksimal\n"
+"Opsi\n"
+"-1 - biasa\n"
+"min - 0\n"
+"maks - 32 (dengan LPC) atau 4 (tanpa LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr "Metode prediksi persebaran:"
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr "Metode Prediksi Persebaran\n"
+"Mapan - tercepat, kompresi lebih rendah\n"
+"Pencarian Log - terlambat, kompresi lebih tinggi\n"
+"Pencarian Penuh - biasa"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr "Pembagian persebaran minimal"
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr "Pembagian persebaran minimal\n"
+"Opsi\n"
+"-1 - biasa\n"
+"min - 0\n"
+"maks - 8"
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr "Pembagian persebaran maksimal"
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr "Pembagian persebaran maksimall\n"
+"Opsi\n"
+"-1 - biasa\n"
+"min - 0\n"
+"maks - 8"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr "Mux Rate:"
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr "Bit rate maksimum stream rumit\n"
+"Opsi\n"
+"0 - biasa"
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr "Ukuran paket:"
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr "Ukuran paket\n"
+"Opsi\n"
+"0 - biasa"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr "Hapus aturan lanjut '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr "And tidak bisa menyimpan aturan lanjut tanpa nama"
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr "Pilih file xml dengan aturan lanjut untuk diimpor"
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "File XML (*.xml)|*.xml|All files (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr "Pilih file xml untuk mengekspor aturan lanjut ke dalam"
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "File M4A (AAC) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "File AC3 (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr "File AMR-NB (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr "File AMR-WB (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "File WMA (v2) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "Pengeksporan FFmpeg Pilihan Sendiri"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr "Kompleksitas Rendah"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr "Profil utama"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr "2 level"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr "4 level"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr "8 level"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr "Mapan"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr "Pencarian Penuh"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr "Pencarian Log"
+
+#: export/ExportFLAC.cpp:67
+msgid "Specify FLAC Options"
+msgstr "Opsi Spesifikasi FLAC"
+
+#: export/ExportFLAC.cpp:81
+msgid "0 (fastest)"
+msgstr "0 (tercepat)"
+
+#: export/ExportFLAC.cpp:82
+msgid "1"
+msgstr "1"
+
+#: export/ExportFLAC.cpp:83
+msgid "2"
+msgstr "2"
+
+#: export/ExportFLAC.cpp:84
+msgid "3"
+msgstr "3"
+
+#: export/ExportFLAC.cpp:85
+msgid "4"
+msgstr "4"
+
+#: export/ExportFLAC.cpp:86
+msgid "5"
+msgstr "5"
+
+#: export/ExportFLAC.cpp:87
+msgid "6"
+msgstr "6"
+
+#: export/ExportFLAC.cpp:88
+msgid "7"
+msgstr "7"
+
+#: export/ExportFLAC.cpp:89
+msgid "8 (best)"
+msgstr "8 (terbaik)"
+
+#: export/ExportFLAC.cpp:92
+msgid "16 bit"
+msgstr "16 bit"
+
+#: export/ExportFLAC.cpp:93
+msgid "24 bit"
+msgstr "24 bit"
+
+#: export/ExportFLAC.cpp:97
+msgid "FLAC Export Setup"
+msgstr "Aturan Ekspor FLAC"
+
+#: export/ExportFLAC.cpp:101
+msgid "Level:"
+msgstr "Tingkat:"
+
+#: export/ExportFLAC.cpp:103
+msgid "Bit depth:"
+msgstr "Kedalaman bit:"
+
+#: export/ExportFLAC.cpp:209
+msgid "FLAC Files"
+msgstr "File FLAC"
+
+#: export/ExportFLAC.cpp:312
+msgid "Exporting the selected audio as FLAC"
+msgstr "Mengekspor audio yang dipilih ke FLAC"
+
+#: export/ExportFLAC.cpp:313
+msgid "Exporting the entire project as FLAC"
+msgstr "Mengekspor proyek yang ditentukan sebagai FLAC"
+
+#: export/ExportMP2.cpp:108
+msgid "Specify MP2 Options"
+msgstr "Opsi Spesifikasi MP2"
+
+#: export/ExportMP2.cpp:129
+msgid "MP2 Export Setup"
+msgstr "Pengaturan Ekspor MP2"
+
+#: export/ExportMP2.cpp:202
+msgid "MP2 Files"
+msgstr "File MP2"
+
+#: export/ExportMP2.cpp:232
+msgid "Cannot export MP2 with this sample rate and bit rate"
+msgstr "Tidak bisa mengekspor MP2 dengan rate sampel dan bit rate ini"
+
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1771
+#: export/ExportOGG.cpp:186
+msgid "Unable to open target file for writing"
+msgstr "Tidak dapat membuka file target untuk ditulis"
+
+#: export/ExportMP2.cpp:274
+#, c-format
+msgid "Exporting selected audio at %d kbps"
+msgstr "Mengekspor audio terpilih pada %d kbps"
+
+#: export/ExportMP2.cpp:275
+#, c-format
+msgid "Exporting entire file at %d kbps"
+msgstr "Mengekspor file pada %d kbps"
+
+#: export/ExportMP3.cpp:221
+#: export/ExportMP3.cpp:239
+#: export/ExportMP3.cpp:253
+msgid "kbps"
+msgstr "kbps"
+
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr "(Kualitas Terbaik)"
+
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr "(File yang lebih kecil)"
+
+#: export/ExportMP3.cpp:243
+msgid "Fast"
+msgstr "Cepat"
+
+#: export/ExportMP3.cpp:244
+#: export/ExportMP3.cpp:250
+#: prefs/GUIPrefs.cpp:41
+#: prefs/GUIPrefs.cpp:49
+msgid "Standard"
+msgstr "Standar"
+
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr "Parah"
+
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr "Ekstrim"
+
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr "Sedang"
+
+#: export/ExportMP3.cpp:303
+msgid "Specify MP3 Options"
+msgstr "Opsi Spesifikasi MP3"
+
+#: export/ExportMP3.cpp:319
+msgid "MP3 Export Setup"
+msgstr "Aturan Ekspor MP3"
+
+#: export/ExportMP3.cpp:326
+msgid "Bit Rate Mode:"
+msgstr "Mode Bit Rate:"
+
+#: export/ExportMP3.cpp:331
+msgid "Preset"
+msgstr "Aturan Lanjut"
+
+#: export/ExportMP3.cpp:332
+msgid "Variable"
+msgstr "Variabel"
+
+#: export/ExportMP3.cpp:333
+msgid "Average"
+msgstr "Rata-rata"
+
+#: export/ExportMP3.cpp:334
+msgid "Constant"
+msgstr "Konstan"
+
+#: export/ExportMP3.cpp:373
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Kualitas"
+
+#: export/ExportMP3.cpp:379
+msgid "Variable Speed:"
+msgstr "Kecepatan Variabel:"
+
+#: export/ExportMP3.cpp:386
+msgid "Channel Mode:"
+msgstr "Mode Channel:"
+
+#: export/ExportMP3.cpp:391
+msgid "Joint Stereo"
+msgstr "Stereo yang Telah Digabung"
+
+#: export/ExportMP3.cpp:392
+msgid "Stereo"
+msgstr "Stereo"
+
+#: export/ExportMP3.cpp:536
+msgid "Locate Lame"
+msgstr "Tempatkan Lame"
+
+#: export/ExportMP3.cpp:556
+#, c-format
+msgid "Audacity needs the file %s to create MP3s."
+msgstr "Audacity memerlukan file %s untuk membuat MP3."
+
+#: export/ExportMP3.cpp:578
+msgid "To get a free copy of Lame, click here -->"
+msgstr "Untuk mendapatkan salinan Lame gratis, klik di sini ==>"
+
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
+#: export/ExportMP3.cpp:1094
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Hanya lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+
+#: export/ExportMP3.cpp:1550
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Hanya libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|Semua File (*)|*"
+
+#: export/ExportMP3.cpp:1567
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Hanya libmp3lame.so.0|libmp3lame.so.0|File Primary Shared Object (*.so)|*.so|Extended Libraries (*.so*)|*.so*|Semua File (*)|*"
+
+#: export/ExportMP3.cpp:1652
+msgid "MP3 Files"
+msgstr "File MP3"
+
+#: export/ExportMP3.cpp:1676
+msgid "Could not open MP3 encoding library!"
+msgstr "Tidak bisa membuka referensi encoding MP3!"
+
+#: export/ExportMP3.cpp:1683
+msgid "Not a valid or supported MP3 encoding library!"
+msgstr "Referensi encoding MP3 tidak valid atau terdukung"
+
+#: export/ExportMP3.cpp:1760
+msgid "Unable to initialize MP3 stream"
+msgstr "Tidak bisa menginisialisasi strim MP3"
+
+#: export/ExportMP3.cpp:1802
+#, c-format
+msgid "Exporting selected audio with %s preset"
+msgstr "Mengekspor audio terpilih dengan %s aturan lanjut"
+
+#: export/ExportMP3.cpp:1803
+#, c-format
+msgid "Exporting entire file with %s preset"
+msgstr "Mengekspor file terpilih dengan %s aturan lanjut"
+
+#: export/ExportMP3.cpp:1808
+#, c-format
+msgid "Exporting selected audio with VBR quality %s"
+msgstr "Mengekspor audio terpilih dengan kualitas VBR %s"
+
+#: export/ExportMP3.cpp:1809
+#, c-format
+msgid "Exporting entire file with VBR quality %s"
+msgstr "Mengekspor file tersebut dengan kualitas VBR %s"
+
+#: export/ExportMP3.cpp:1814
+#, c-format
+msgid "Exporting selected audio at %d Kbps"
+msgstr "Mengekspor audio terpilih pada %d Kbps"
+
+#: export/ExportMP3.cpp:1815
+#, c-format
+msgid "Exporting entire file at %d Kbps"
+msgstr "Mengekspor file tersebut pada %d Kbps"
+
+#: export/ExportMP3.cpp:1849
+#, c-format
+msgid "Error %d returned from MP3 encoder"
+msgstr "Error %d ditolak dari encoder MP3"
+
+#: export/ExportMP3.cpp:1933
+#, c-format
+msgid "The project sample rate (%d) is not supported by the MP3\n"
+"file format.  "
+msgstr "Rate Sampel proyek (%d) tidak mendukung \n"
+"file format MP3.  "
+
+#: export/ExportMP3.cpp:1936
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the MP3 file format.  "
+msgstr "Kombinasi rate Sampel proyek (%d) dan bit ratenya (%d kbps) tidak\n"
+"mendukung format file MP3."
+
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
+
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
+msgid "Export Multiple"
+msgstr "Ekspor Banyak"
+
+#: export/ExportMultiple.cpp:166
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
+"or if you have a Label Track, you can export a new file for each label.\n"
+"\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "Jika Anda mempunyai lebih dari satu Trek Audio, Anda bisa mengekspor setiap trek dalam file-file terpisah,\n"
+"atau jika Anda mempunyai label pada trek, Anda bisa mengekspornya berdasarkan labelnya.\n"
+"\n"
+"Proyek ini tidak mempunyai trek atau label yang banyak, jadi Anda tidak bisa mengekspor file seperti yang Anda perintahkan."
+
+#: export/ExportMultiple.cpp:167
+msgid "Can't export multiple files"
+msgstr "Tidak bisa mengekspor file-file"
+
+#: export/ExportMultiple.cpp:232
+msgid "Export format:"
+msgstr "Format Ekspor:"
+
+#: export/ExportMultiple.cpp:237
+msgid "Options..."
+msgstr "Opsi..."
+
+#: export/ExportMultiple.cpp:241
+msgid "Export location:"
+msgstr "Lokasi ekspor:"
+
+#: export/ExportMultiple.cpp:245
+#: prefs/DirectoriesPrefs.cpp:92
+msgid "Choose..."
+msgstr "Pilih..."
+
+#: export/ExportMultiple.cpp:246
+msgid "Create"
+msgstr "Buat"
+
+#: export/ExportMultiple.cpp:253
+msgid "Split files based on:"
+msgstr "Penggabungan file berdasarkan:"
+
+#: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
+msgid "Labels"
+msgstr "Label"
+
+#: export/ExportMultiple.cpp:269
+msgid "Include audio before first label"
+msgstr "Termasuk audio sebelum label pertama"
+
+#: export/ExportMultiple.cpp:275
+msgid "First file name:"
+msgstr "Nama file pertama:"
+
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr "Nama file pertama"
+
+#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
+msgid "Tracks"
+msgstr "Trek"
+
+#: export/ExportMultiple.cpp:297
+msgid "Name files:"
+msgstr "Nama file:"
+
+#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
+msgid "Using Label/Track Name"
+msgstr "Menggunakan Nama Label/Trek"
+
+#: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
+msgid "Numbering consecutively"
+msgstr "Penomoran secara otomatis"
+
+#: export/ExportMultiple.cpp:322
+msgid "File name prefix:"
+msgstr "Awalan naman file:"
+
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr "Awalan naman file"
+
+#: export/ExportMultiple.cpp:341
+msgid "Overwrite existing files"
+msgstr "Meniban file yang sudah ada"
+
+#: export/ExportMultiple.cpp:424
+#, c-format
+msgid "\"%s\" successfully created."
+msgstr "\"%s\" telah dibuat."
+
+#: export/ExportMultiple.cpp:433
+msgid "Choose a location to save the exported files"
+msgstr "Pilih lokasi untuk menyimpan hasil ekspor"
+
+#: export/ExportMultiple.cpp:539
+#, c-format
+msgid "\"%s\" doesn't exist.\n"
+"\n"
+"Would you like to create it?"
+msgstr "\"%s\" tidak ada.\n"
+"\n"
+"Apakah Anda mingin membuatnya?"
+
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr "Edit Metadata"
+
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
+#, c-format
+msgid "Successfully exported %d file(s)."
+msgstr "Telah terekspor %d file."
+
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
+#, c-format
+msgid "Something went wrong after exporting %d file(s)."
+msgstr "Sesuatu gagal setelah mengekspor %d file."
+
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr "Label %s bukan nama file yang legal. Anda tidak bisa menggunakan:   %s\n"
+"Gunakan..."
+
+#: export/ExportOGG.cpp:64
+msgid "Specify Ogg Vorbis Options"
+msgstr "Opsi Spesifikasi Ogg Vorbis"
+
+#: export/ExportOGG.cpp:81
+msgid "Ogg Vorbis Export Setup"
+msgstr "Pengaturan Ekspor Ogg Vorbis"
+
+#: export/ExportOGG.cpp:157
+msgid "Ogg Vorbis Files"
+msgstr "File Ogg Vorbis"
+
+#: export/ExportOGG.cpp:257
+msgid "Exporting the selected audio as Ogg Vorbis"
+msgstr "Mengekspor audio terpilih sebagai Ogg Vorbis"
+
+#: export/ExportOGG.cpp:258
+msgid "Exporting the entire project as Ogg Vorbis"
+msgstr "Mengekspor proyek sebagai Ogg Vorbis"
+
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
+msgstr "Opsi Spesifikasi Tak Terkompres"
+
+#: export/ExportPCM.cpp:185
+msgid "Uncompressed Export Setup"
+msgstr "Pengaturan Ekspor Tanpa Pengompresan"
+
+#: export/ExportPCM.cpp:191
+msgid "Header:"
+msgstr "Catatan Kepala:"
+
+#: export/ExportPCM.cpp:195
+#: import/ImportRaw.cpp:366
+msgid "Encoding:"
+msgstr "Encoding:"
+
+#: export/ExportPCM.cpp:200
+msgid "(Not all combinations of headers and encodings are possible.)"
+msgstr "(Tidak semua kombinasi catatan kepala dan encoding bisa dipakai.)"
+
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr "File tanpa terkompres lainnya"
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr "AIFF (Apple) tertanda 16 bit PCM"
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr "WAV (Microsoft) tertanda 16 bit PCM"
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr "GSM 6.10 WAV (telepon genggam)"
+
+#: export/ExportPCM.cpp:449
+msgid "Cannot export audio in this format."
+msgstr "Tidak bisa mengekspor audio pada format ini."
+
+#: export/ExportPCM.cpp:491
+#, c-format
+msgid "Exporting the selected audio as %s"
+msgstr "Mengekspor audio terpilih sebagai %s"
+
+#: export/ExportPCM.cpp:493
+#, c-format
+msgid "Exporting the entire project as %s"
+msgstr "Mengekspor proyek yang tersedia sebagai %s"
+
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:531
+#, c-format
+msgid "Error (file may not have been written): %s"
+msgstr "Error (file tidak mungkin ditulis): %s"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156
+#: import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "File MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr "Pilih stream untuk diimpor"
+
+#: import/Import.cpp:227
+#, c-format
+msgid "This version of Audacity was not compiled with %s support."
+msgstr "Versi Audacity ini tidak di-compile dengan dukungan %s."
+
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr "\"%s\" \n"
+"adalah file MIDI, buka file audio. \n"
+"Audacity tidak bisa membuka tipe file ini untuk dimainkan, tapi Anda bisa \n"
+"mengeditnya dengan mengklik Berkas > Impor > MIDI."
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:250
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
+"Audacity cannot open audio CDs directly. \n"
+"Extract (rip) the CD tracks to an audio format that \n"
+"Audacity can import, such as WAV or AIFF."
+msgstr "\"%s\" adalah trek CD audio. \n"
+"Audacity tidak bisa membuka CD audio secara langsung. \n"
+"Ekstrak (rip) trek CD ke format Audio itu \n"
+"Audacity bisa mengimpor salah satunya WAV atau AIFF."
+
+#: import/Import.cpp:256
+#, c-format
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr "\"%s\" adalah file playlist. \n"
+"Audacity tidak bisa membuka file karena ini hanya mempunyai link ke file lain. \n"
+"Anda bisa membuka file ini pada editor teks dan download file audio yang asli."
+
+#: import/Import.cpp:261
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
+"Audacity cannot open this type of file due to patent restrictions. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file Windows Media Audio. \n"
+"Audacity tidak bisa membuka tipe file ini karena pelarangan paten. \n"
+"Anda perlu mengubahnya ke format audio yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:266
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file Advanced Audio Coding. \n"
+"Audacity tidak bisa membuka file ini. \n"
+"Anda perlu mengubahnya ke format audio yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:271
+#, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
+"Audacity cannot open this type of file due to the encryption. \n"
+"Try recording the file into Audacity, or burn it to audio CD then \n"
+"extract the CD track to a supported audio format such as WAV or AIFF."
+msgstr "\"%s\" adalah file audio terenkripsi. \n"
+"Ini biasanya didapat dari toko musik online. \n"
+"Audacity tidak bisa membuka tipe file ini karena enkripsi. \n"
+"Coba rekam file ke dalam Audacity, atau bakar ke CD audio kemudian \n"
+"ekstrak trek CD ke format audio yang mendukung seperti WAV atau AIFF."
+
+#: import/Import.cpp:276
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
+"Audacity cannot open this proprietary format. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" is a file media RealPlayer. \n"
+"Audacity tidak bisa membuka format berbayar ini. \n"
+"Anda perlu mengubah ke format audio yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr "\"%s\" adalah file berbasis teks, bukan file audio. \n"
+"Audacity tidak bisa membuka tipe file ini. \n"
+"Coba ubah ke format audio seperti WAV atau AIFF dan \n"
+"kemudian imporkan, atau rekam ke dalam Audacity."
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file audio Musepack. \n"
+"Audacity tidak bisa membuka tipe file ini. \n"
+"Jika anda berpikir ini adalah file mp3, ganti nama ekstensi file Anda ke \".mp3\" \n"
+"dan coba mengimpor lagi. Atau anda perlu mengubah ke format audio yang mendukung, \n"
+"seperti WAV atau AIFF."
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file audio Wavpack. \n"
+"Audacity tidak bisa membuka tipe file ini. \n"
+"Anda perlu mengubah ke format audio yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file audio Dolby Digital. \n"
+"Audacity tidak bisa membuka tipe file ini. \n"
+"Anda perlu mengubah ke format audio yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file audio Ogg Speex. \n"
+"Audacity tidak bisa membuka tipe file ini. \n"
+"Anda perlu mengubah ke format audio yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr "\"%s\" adalah file video. \n"
+"Audacity belum bisa membuka tipe file ini. \n"
+"Anda perlu mengekstrak audio ke format yang mendukung, seperti WAV atau AIFF."
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr "Audacity tidak dapat membaca tipe file '%s'.\n"
+"Jika ini tidak dikompres, coba mengimpornya dengan menggunakan \"Import Raw\""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr "Audacity dapat membaca tipe file '%s'.\n"
+"Tapi tidak bisa diimpor."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "File yang berkompetibel dengan FFmpeg"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:43
+msgid "FLAC files"
+msgstr "File FLAC"
+
+#: import/ImportLOF.cpp:95
+msgid "List of Files in basic text format"
+msgstr "Daftar file dalam format teks dasar"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:314
+msgid "Invalid window offset in LOF file."
+msgstr "Penyeimbang jendela tidak valid pada file LOF"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:316
+#: import/ImportLOF.cpp:337
+#: import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
+msgid "LOF Error"
+msgstr "Error LOF"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:335
+msgid "Invalid duration in LOF file."
+msgstr "Durasi file LOF tidak valid"
+
+#: import/ImportLOF.cpp:417
+msgid "MIDI tracks cannot be offset individually, only audio files can be."
+msgstr "Trek MIDI tidak bisa diseimbangkan dengan sendirinya, hanya file audio yang bisa."
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:438
+msgid "Invalid track offset in LOF file."
+msgstr "trek offset pada file LOF tidak valid."
+
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": Nama file terlalu pendek."
+
+#: import/ImportMIDI.cpp:31
+#: import/ImportMIDI.cpp:39
+#: import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "Tidak bisa membuka file"
+
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": Tipe file tidak benar."
+
+#: import/ImportOGG.cpp:44
+msgid "Ogg Vorbis files"
+msgstr "File Ogg Vorbis"
+
+#: import/ImportOGG.cpp:184
+msgid "Media read error"
+msgstr "Pembaca media error"
+
+#: import/ImportOGG.cpp:187
+msgid "Not an Ogg Vorbis file"
+msgstr "Bukan file Ogg Vorbis"
+
+#: import/ImportOGG.cpp:190
+msgid "Vorbis version mismatch"
+msgstr "Versi Vorbis tidak cocok"
+
+#: import/ImportOGG.cpp:193
+msgid "Invalid Vorbis bitstream header"
+msgstr "Vorbis bitstream header tidak valid"
+
+#: import/ImportOGG.cpp:196
+msgid "Internal logic fault"
+msgstr "Kesalahan logika internal"
+
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, dan tipe tanpa terkompres lainnya"
+
+#: import/ImportPlugin.h:142
+#: import/ImportRaw.cpp:203
+#, c-format
+msgid "Importing %s"
+msgstr "Mengimpor %s"
+
+#: import/ImportQT.cpp:21
+msgid "QuickTime files"
+msgstr "File QuickTime"
+
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr "Impor Raw"
+
+#: import/ImportRaw.cpp:282
+msgid "Import Raw Data"
+msgstr "Impor Data Raw"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:327
+msgid "No endianness"
+msgstr "Tidak ada pengakhiran"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:330
+msgid "Little-endian"
+msgstr "Pengakhiran Kecil"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:333
+msgid "Big-endian"
+msgstr "PEngakhiran Besar"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:336
+msgid "Default endianness"
+msgstr "Pengakhiran Biasa"
+
+#: import/ImportRaw.cpp:355
+msgid "1 Channel (Mono)"
+msgstr "1 Saluran (Mono)"
+
+#: import/ImportRaw.cpp:356
+msgid "2 Channels (Stereo)"
+msgstr "2 Saluran (Stereo)"
+
+#: import/ImportRaw.cpp:358
+#, c-format
+msgid "%d Channels"
+msgstr "%d Saluran"
+
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr "Persebaran byte:"
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "Saluran:"
+
+#: import/ImportRaw.cpp:382
+msgid "Start offset:"
+msgstr "Awal penyeimbangan:"
+
+#: import/ImportRaw.cpp:388
+msgid "Amount to import:"
+msgstr "Besar yang diimpor:"
+
+#: import/ImportRaw.cpp:394
+msgid "Sample rate:"
+msgstr "Rate sampel:"
+
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr "Impor selesai. Mnghitung Waveform"
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr "Men-decode Waveform"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr "%s %2.0f%% selesai.  Klik untuk mengubah titik tugas."
+
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44
+#: prefs/MidiIOPrefs.cpp:45
+msgid "Audio I/O"
+msgstr "Audio I/O"
+
+#: prefs/AudioIOPrefs.cpp:102
+#: prefs/MidiIOPrefs.cpp:99
+msgid "1 (Mono)"
+msgstr "1 (Mono)"
+
+#: prefs/AudioIOPrefs.cpp:103
+#: prefs/MidiIOPrefs.cpp:100
+msgid "2 (Stereo)"
+msgstr "2 (Stereo)"
+
+#: prefs/AudioIOPrefs.cpp:117
+#: prefs/MidiIOPrefs.cpp:114
+msgid "Playback"
+msgstr "Memainkan"
+
+#: prefs/AudioIOPrefs.cpp:121
+#: prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118
+#: prefs/MidiIOPrefs.cpp:136
+#: toolbars/DeviceToolBar.cpp:57
+msgid "Device"
+msgstr "Perangkat"
+
+#: prefs/AudioIOPrefs.cpp:124
+#: prefs/MidiIOPrefs.cpp:121
+msgid "Using:"
+msgstr "Menggunakan:"
+
+#: prefs/AudioIOPrefs.cpp:125
+#: prefs/MidiIOPrefs.cpp:122
+msgid "Portaudio v"
+msgstr "Portaudio v"
+
+#: prefs/AudioIOPrefs.cpp:135
+#: prefs/MidiIOPrefs.cpp:132
+msgid "Recording"
+msgstr "Merekam"
+
+#: prefs/AudioIOPrefs.cpp:141
+#: prefs/MidiIOPrefs.cpp:138
+msgid "Channels"
+msgstr "Saluran"
+
+#: prefs/AudioIOPrefs.cpp:147
+#: prefs/MidiIOPrefs.cpp:144
+msgid "Playthrough"
+msgstr "Selama Bermain"
+
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "OverDub: &Mainkan trek lain ketika merekam"
+
+#: prefs/AudioIOPrefs.cpp:152
+msgid "&Hardware Playthrough: Play new track while recording it"
+msgstr "Selama Bermain pada &Hardware: Mainkan trek baru ketika merekamnya"
+
+#: prefs/AudioIOPrefs.cpp:154
+msgid "&Software Playthrough: Play new track while recording it"
+msgstr "Selama Bermain pada &Software: Mainkan trek baru ketika merekamnya"
+
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "Selama Bermain pada &Software: Mainkan trek baru ketika merekam atau memantau"
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr "(hilangkan cek ketika merekam \"stereo mix\")"
+
+#: prefs/AudioIOPrefs.cpp:168
+#: prefs/MidiIOPrefs.cpp:193
+msgid "Effects Preview"
+msgstr "Efek preview"
+
+#: prefs/AudioIOPrefs.cpp:171
+msgid "Length of preview:"
+msgstr "Panjang preview:"
+
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/MidiIOPrefs.cpp:157
+msgid "Cut Preview"
+msgstr "Preview Potongan"
+
+#: prefs/AudioIOPrefs.cpp:179
+msgid "Preview before cut region:"
+msgstr "Preview sebelum wilayah dipotong:"
+
+#: prefs/AudioIOPrefs.cpp:181
+msgid "Preview after cut region:"
+msgstr "Preview sesudah wilayah dipotong:"
+
+#: prefs/AudioIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:167
+msgid "Latency"
+msgstr "Laten"
+
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr "Audio yang akan di-buffer:\n"
+"(lebih tinggi = lebih laten)"
+
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr "Koreksi laten:\n"
+"(negatif=percepat ke awal)"
+
+#: prefs/AudioIOPrefs.cpp:203
+msgid "Seek Time when playing"
+msgstr "Coba waktu ketika bermain"
+
+#: prefs/AudioIOPrefs.cpp:206
+#: prefs/MidiIOPrefs.cpp:186
+msgid "Short period:"
+msgstr "Periode pendek:"
+
+#: prefs/AudioIOPrefs.cpp:208
+#: prefs/MidiIOPrefs.cpp:188
+msgid "Long period:"
+msgstr "Periode panjang:"
+
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
+msgid "Batch"
+msgstr "Batch"
+
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:92
+msgid "Behaviors"
+msgstr "Kelakuan"
+
+#: prefs/BatchPrefs.cpp:80
+msgid "&Don't apply effects in batch mode"
+msgstr "&Jangan aplikasikan efek pada mode batch"
+
+#: prefs/BatchPrefs.cpp:83
+#: prefs/GUIPrefs.cpp:132
+msgid "Cl&eanSpeech Mode (Customized GUI)"
+msgstr "Mode Cl&eanSpeech (Dengan model GUI)"
+
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:267
+msgid "Directories"
+msgstr "Direktori"
+
+#: prefs/DirectoriesPrefs.cpp:87
+msgid "Temporary files directory"
+msgstr "Direktori file sementara"
+
+#: prefs/DirectoriesPrefs.cpp:91
+msgid "Location:"
+msgstr "Lokasi:"
+
+#: prefs/DirectoriesPrefs.cpp:93
+msgid "Free Space:"
+msgstr "Ruang Disk yang Bebas:"
+
+#: prefs/DirectoriesPrefs.cpp:99
+msgid "Auto save"
+msgstr "Simpan otomatis"
+
+#: prefs/DirectoriesPrefs.cpp:101
+msgid "Auto save a copy of the project in a separate folder"
+msgstr "Simpan otomatis salinan proyek pada folder terpisah"
+
+#: prefs/DirectoriesPrefs.cpp:104
+msgid "Auto save interval:"
+msgstr "Jarak waktu penyimpanan otomatis:"
+
+#: prefs/DirectoriesPrefs.cpp:105
+msgid "minutes"
+msgstr "menit"
+
+#: prefs/DirectoriesPrefs.cpp:110
+msgid "Audio cache"
+msgstr "Cache Audio"
+
+#: prefs/DirectoriesPrefs.cpp:112
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr "Mainkan dan/atau rekam menggunakan RAM (berguna untuk performa driver rendah, tapi bisa menyebabkan crash akibat panjang file atau panjang merekam)"
+
+#: prefs/DirectoriesPrefs.cpp:121
+msgid "Choose a location to place the temporary directory"
+msgstr "Pilih lokasi untuk meletakkan direktori temporer"
+
+#: prefs/DirectoriesPrefs.cpp:166
+#, c-format
+msgid "Directory %s does not exist. Create it?"
+msgstr "Direktori %s belum ada. Buat dulu?"
+
+#: prefs/DirectoriesPrefs.cpp:168
+msgid "New Temporary Directory"
+msgstr "Direktori Temporer Baru"
+
+#: prefs/DirectoriesPrefs.cpp:187
+#, c-format
+msgid "Directory %s is not writable"
+msgstr "Direktori %s tidak bisa ditulis"
+
+#: prefs/DirectoriesPrefs.cpp:199
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "Pengubahan direktori temporer tidak berefek sampai Audacity dihidupkan ulang"
+
+#: prefs/FileFormatPrefs.cpp:53
+#: prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr "Impor / Ekspor"
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr "Referensi Pengeksporan  MP3"
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "MP3 Library Version:"
+msgstr "Versi Referensi MP3:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr "Referensi MP3:"
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr "Referensi LAME MP3"
+
+#: prefs/FileFormatPrefs.cpp:101
+#: prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr "&Download"
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "Referensi Impor/Ekspor FFmpeg"
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "Versi Referensi FFmpeg:"
+
+#: prefs/FileFormatPrefs.cpp:118
+#: prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "Referensi FFmpeg:"
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Catatan: Opsi kualitas ekspor bisa dipilih dengan mengklik tombol Opsi pada dialog Ekspor.\n"
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr "Ketika mengimpor file audio"
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr "&Buat salinan file audio tak terkompres sebelum diedit (lebih aman)"
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr "&Langsung baca file audo tak terkompres dari aslinya (lebih cepat)"
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr "&Normalkan semua trek pada proyek"
+
+#: prefs/FileFormatPrefs.cpp:148
+msgid "When saving a project that depends on other audio files"
+msgstr "Ketika menyimpan proyek yang bergantung pada file audio yang lain"
+
+#: prefs/FileFormatPrefs.cpp:151
+msgid "Always &copy all audio into project (safest)"
+msgstr "Salalu &salin semua audio pada proyek (teraman)"
+
+#: prefs/FileFormatPrefs.cpp:152
+msgid "&Do not copy any audio"
+msgstr "&Jangan salin audio apapiun"
+
+#: prefs/FileFormatPrefs.cpp:153
+msgid "&Ask user"
+msgstr "&Tanya pengguna"
+
+#: prefs/FileFormatPrefs.cpp:157
+msgid "When exporting tracks to an audio file"
+msgstr "Ketike mengekspor ke file audio"
+
+#: prefs/FileFormatPrefs.cpp:160
+msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
+msgstr "Se&lalu mix semua trek ke Stereo atau Mono."
+
+#: prefs/FileFormatPrefs.cpp:161
+msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
+msgstr "&Gunakan mix pilihan sendiri (contohnya untuk emngekspor file saluran 5.1)"
+
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
+msgstr "&Tunjukkan Editor Metadata dahulu dalam langkah mengekspor"
+
+#: prefs/GUIPrefs.cpp:34
+#: prefs/GUIPrefs.cpp:35
+msgid "Interface"
+msgstr "Tampilan"
+
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr "Pada Browser"
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr "Dari Internet"
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr "Sederhana"
+
+#: prefs/GUIPrefs.cpp:94
+msgid "&Update display while playing"
+msgstr "&Perbaharui tampilan ketika memainkan"
+
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr "Menutup jendela terak&hir akan mematikan Audacity"
+
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr "Perbolehkan &menahan batas kiri dan kanan yang dipilih"
+
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr "Peletakan tombol I/O auido yang er&gonomis"
+
+#: prefs/GUIPrefs.cpp:102
+msgid "Automatically &fit tracks vertically zoomed"
+msgstr "&Fit-kan trek secera vertikal dengan otomatis"
+
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"Move track focus\" memutar terus-menerus pada trek"
+
+#: prefs/GUIPrefs.cpp:106
+msgid "Editing a &clip can move other clips"
+msgstr "Mengedit &klik bisa membuang klip lainnya"
+
+#: prefs/GUIPrefs.cpp:108
+msgid "&Select all audio in project, if none selected"
+msgstr "&Pilih semua audio pada proyek, jika tidak ada yang dipilih"
+
+#: prefs/GUIPrefs.cpp:110
+msgid "&Beep on completion of longer activities"
+msgstr "&Beep pada penyelesaian aktivitas lama"
+
+#: prefs/GUIPrefs.cpp:114
+msgid "Show / Hide"
+msgstr "Lihat / Sembunyi"
+
+#: prefs/GUIPrefs.cpp:116
+msgid "Enable cut &lines"
+msgstr "Bo&lehkan memotong batas"
+
+#: prefs/GUIPrefs.cpp:118
+msgid "Show warnings about &temp files"
+msgstr "Tunjukkan peringatan mengenai file &temporer"
+
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr "Tunjukkan prompt untuk menyimpan, bahkan jika proyek masih kosong"
+
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
+msgstr "Tunjukkan Pesan A&wal pada permulaan program"
+
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr "Mode"
+
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr "Don't a&pply effects in batch mode"
+
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr "Tampilkan range minimum: meter dan 'waveform (dB)'"
+
+#: prefs/GUIPrefs.cpp:141
+msgid "-36 dB (shallow range for high-amplitude editing)"
+msgstr "-36 dB (range yang dangkal untuk mengedit amplitudo tinggi)"
+
+#: prefs/GUIPrefs.cpp:142
+msgid "-48 dB (PCM range of 8 bit samples)"
+msgstr "-48 dB (range PCM dari sampel 8 bit)"
+
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr "-60 dB (range PCM dari sampel 10 bit)"
+
+#: prefs/GUIPrefs.cpp:144
+msgid "-96 dB (PCM range of 16 bit samples)"
+msgstr "-96 dB (range PCM dari sampel 16 bit)"
+
+#: prefs/GUIPrefs.cpp:145
+msgid "-120 dB (approximate limit of human hearing)"
+msgstr "-120 dB (batas terbaik untuk pendengaran manusia)"
+
+#: prefs/GUIPrefs.cpp:146
+msgid "-145 dB (PCM range of 24 bit samples)"
+msgstr "-145 dB (range PCM dari sampel 24 bit)"
+
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr "Mode View Normal"
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr "Pilihan interface lainnya"
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr "Bantuan:"
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr "Tombol Solo:"
+
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
+msgid "Keyboard"
+msgstr "Keyboard"
+
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:95
+msgid "Key Bindings"
+msgstr "Kunci-kunci Keyboard"
+
+#: prefs/KeyConfigPrefs.cpp:115
+msgid "S&et"
+msgstr "&Atur"
+
+#: prefs/KeyConfigPrefs.cpp:120
+msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
+msgstr "Catatan: Menekan Cmd+Q akan keluar. Kunci lainnya valid."
+
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
+msgid "&Defaults"
+msgstr "&Normal"
+
+#: prefs/KeyConfigPrefs.cpp:143
+msgid "Key Combination"
+msgstr "Kombinasi Tombol Keyboard"
+
+#: prefs/KeyConfigPrefs.cpp:163
+msgid "Export Keyboard Shortcuts As:"
+msgstr "Ekspor Jalan Pintas Keyboard Sebagai:"
+
+#: prefs/KeyConfigPrefs.cpp:183
+msgid "Error saving keyboard shortcuts"
+msgstr "Error dalam menyimpan jalan pintas keyboard"
+
+#: prefs/KeyConfigPrefs.cpp:198
+msgid "Select an XML file containing Audacity keyboard shortcuts..."
+msgstr "Pilih file XML yang mengandung jalan pintas keyboard Audacity..."
+
+#: prefs/KeyConfigPrefs.cpp:215
+msgid "Error loading keyboard shortcuts"
+msgstr "Error mengambil jalan pintas keyboard"
+
+#: prefs/KeyConfigPrefs.cpp:243
+#, c-format
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
+"\n"
+"'%s'"
+msgstr "Jalan pintas keyboard '%s' telah ditandai untuk:\n"
+"\n"
+"'%s'"
+
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:144
+msgid "Undo"
+msgstr "Batalkan"
+
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "&Mainkan trek lain ketika merekam"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "Selama Bermain pada &Hardware (Mainkan trek baru ketika merekamnya)"
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "Selama Bermain pada &Software (Mainkan trek baru ketika merekamnya)"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr "Mainkan sebelum wilayah dipotong:"
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr "Mainkan sesudah wilayah dipotong:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "Audio yang dibuffer:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "Koreksi laten:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr "Waktu Percobaan"
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr "Meinkan ketika melakukan preview:"
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
+msgid "Mouse"
+msgstr "Mouse"
+
+#: prefs/MousePrefs.cpp:78
+msgid "Mouse Bindings (default values, not configurable)"
+msgstr "Kunci-kunci Mouse (tidak bisa diubah)"
+
+#: prefs/MousePrefs.cpp:93
+msgid "Tool"
+msgstr "Alat"
+
+#: prefs/MousePrefs.cpp:94
+msgid "Command Action"
+msgstr "Aksi perintah"
+
+#: prefs/MousePrefs.cpp:95
+msgid "Buttons"
+msgstr "Tombol"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
+msgid "Left-Click"
+msgstr "Klik-Kiri"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
+msgid "Select"
+msgstr "Pilih"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
+msgid "Set Selection Point"
+msgstr "Pilih Titik Pilihan"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
+msgid "Left-Drag"
+msgstr "Klik Kiri dan Dorong"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
+msgid "Set Selection Range"
+msgstr "Atur Range yang Dipilih"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Extend Selection Range"
+msgstr "Pilih Range yang Tidak Dipilih"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Shift-Left-Click"
+msgstr "Klik Kiri dengan Shift"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Left-Double-Click"
+msgstr "Klik Ganda Kiri"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Select Clip or Entire Track"
+msgstr "Pilih Klip atau Trek"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Ctrl-Left-Click"
+msgstr "Klik Kiri dengan Ctrl"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Set Selection Point and Play"
+msgstr "Pilih Titik Terpilih dan Mainkan"
+
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom"
+msgstr "Zoom"
+
+#: prefs/MousePrefs.cpp:104
+msgid "Zoom in on Point"
+msgstr "Perbesar pada Titik"
+
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Zoom in on a Range"
+msgstr "Perbesar pada Wilayah"
+
+#: prefs/MousePrefs.cpp:105
+msgid "same as right-drag"
+msgstr "seperti klik kanan dan dorong"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Right-Click"
+msgstr "Klik Kanan"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Zoom out one step"
+msgstr "Perkecil satu kali"
+
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Right-Drag"
+msgstr "Klik Kanan dan Dorong"
+
+#: prefs/MousePrefs.cpp:107
+msgid "same as left-drag"
+msgstr "seperti klik kiri dan dorong"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Shift-Drag"
+msgstr "Dorong dengan Shift"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Zoom out on a Range"
+msgstr "Perkecil dengan jarak yang pas"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Middle-Click"
+msgstr "Klik Tengah"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom default"
+msgstr "Normalkan"
+
+#: prefs/MousePrefs.cpp:111
+msgid "Time shift clip or move up/down between tracks"
+msgstr "Ubah waktu klip atau pindahkan ke atas/bawah diantara trek"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Shift-Left-Drag"
+msgstr "Klik Kiri Dorong dengan Shift"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Time shift all clips in track"
+msgstr "Ubah waktu semua klip pada trek"
+
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
+msgid "Ctrl-Left-Drag"
+msgstr "Klik kiri dorong dengan Ctrl"
+
+#: prefs/MousePrefs.cpp:113
+msgid "Move clip up/down between tracks"
+msgstr "Pindahkan klik ke atas/bawah diantara trek"
+
+#: prefs/MousePrefs.cpp:115
+msgid "Change Amplification Envelope"
+msgstr "Ubah Amplifikasi dengan Amplop"
+
+#: prefs/MousePrefs.cpp:117
+msgid "Change Sample"
+msgstr "Ubah Sample"
+
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
+msgid "Pencil"
+msgstr "Pensil"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Alt-Left-Click"
+msgstr "Klik Kiri dengan Alt"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Smooth at Sample"
+msgstr "Pelembutan pada Sampel"
+
+#: prefs/MousePrefs.cpp:119
+msgid "Change Several Samples"
+msgstr "Ubah Beberapa Sampel"
+
+#: prefs/MousePrefs.cpp:120
+msgid "Change ONE Sample only"
+msgstr "Ubah SATU Sampel saja"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "Multi"
+msgstr "Banyak"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+msgid "same as select tool"
+msgstr "seperti alat memilih"
+
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "same as zoom tool"
+msgstr "seperti alat zoom"
+
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
+msgid "Any"
+msgstr "Apapun"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Scroll up or down"
+msgstr "Ke atas atau bawah"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Wheel-Rotate"
+msgstr "Rotasi Roda Mouse"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Scroll left or right"
+msgstr "Ke kiri atau kanan"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Shift-Wheel-Rotate"
+msgstr "Putar Roda Mouse dengan Shift"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Ctrl-Wheel-Rotate"
+msgstr "Putar Roda Mouse dengan Ctrl"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Zoom in or out"
+msgstr "Perbesar atau Perkecil"
+
+#: prefs/PrefsDialog.cpp:94
+msgid "Audacity Preferences"
+msgstr "Preferensi Audacity"
+
+#: prefs/QualityPrefs.cpp:73
+msgid "Rectangle"
+msgstr "Persegi"
+
+#: prefs/QualityPrefs.cpp:74
+msgid "Triangle"
+msgstr "Segitiga"
+
+#: prefs/QualityPrefs.cpp:75
+msgid "Shaped"
+msgstr "Terbentuk"
+
+#: prefs/QualityPrefs.cpp:122
+msgid "Sampling"
+msgstr "Menyampel"
+
+#: prefs/QualityPrefs.cpp:125
+msgid "Default Sample Rate:"
+msgstr "Rate Sampel Normal:"
+
+#: prefs/QualityPrefs.cpp:127
+msgid "Default Sample Format:"
+msgstr "Format Sampel Normal:"
+
+#: prefs/QualityPrefs.cpp:136
+msgid "Real-time sample rate converter:"
+msgstr "Pengkonversi rate sampel yang cepat:"
+
+#: prefs/QualityPrefs.cpp:139
+msgid "High-quality sample rate converter:"
+msgstr "Pengkonversi rate sampel berkualitas tinggi:"
+
+#: prefs/QualityPrefs.cpp:142
+msgid "Real-time dither:"
+msgstr "Dither tepat waktu:"
+
+#: prefs/QualityPrefs.cpp:145
+msgid "High-quality dither:"
+msgstr "Dither berkualitas tinggi:"
+
+#: prefs/QualityPrefs.cpp:157
+msgid "Conversion"
+msgstr "Konversi"
+
+#: prefs/QualityPrefs.cpp:163
+msgid "Sample Rate Converter"
+msgstr "Pengkonversi Rate Sampel"
+
+#: prefs/QualityPrefs.cpp:164
+msgid "Dither"
+msgstr "Dither"
+
+#: prefs/QualityPrefs.cpp:165
+msgid "Real-time:"
+msgstr "Tepat Waktu:"
+
+#: prefs/QualityPrefs.cpp:171
+msgid "High-quality:"
+msgstr "Kualitas Tinggi:"
+
+#: prefs/SmartRecordPrefs.cpp:37
+#: prefs/SmartRecordPrefs.cpp:38
+msgid "Smart Recording"
+msgstr "Rekaman Pintar"
+
+#: prefs/SmartRecordPrefs.cpp:64
+#: prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr "Meream dengan Suara Diaktifkan"
+
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr "Level Pengaktifan Suara (dB):"
+
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
+msgid "Spectrograms"
+msgstr "Spektrogram"
+
+#: prefs/SpectrumPrefs.cpp:91
+msgid "FFT Size"
+msgstr "Ukuran FFT"
+
+#: prefs/SpectrumPrefs.cpp:94
+msgid "8 - most wideband"
+msgstr "8 - jangkauan terbesar"
+
+#: prefs/SpectrumPrefs.cpp:99
+msgid "256 - default"
+msgstr "256 - normal"
+
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr "32768 - jangkauan terkecil"
+
+#: prefs/SpectrumPrefs.cpp:109
+msgid "4096 - most narrowband"
+msgstr "4096 - jangkauan terkecil"
+
+#: prefs/SpectrumPrefs.cpp:116
+msgid "Window type:"
+msgstr "Tipe jendela:"
+
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr "Titik Pelompatan FFT"
+
+#: prefs/SpectrumPrefs.cpp:140
+msgid "Display"
+msgstr "Tampilan"
+
+#: prefs/SpectrumPrefs.cpp:144
+msgid "&Grayscale"
+msgstr "&Hitam Putih"
+
+#: prefs/SpectrumPrefs.cpp:147
+msgid "Minimum Frequency (Hz):"
+msgstr "Frekuensi Minimum (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:152
+msgid "Maximum Frequency (Hz):"
+msgstr "Frekuensi Maksimum (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr "&Ordinat"
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr "&Cari Catatan"
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr "Catatan &Kuantisasi"
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr "Amplitudo Minimum (dB):"
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr "Jumlah Catatan Maksimum (1..128):"
+
+#: prefs/SpectrumPrefs.cpp:197
+msgid "The maximum frequency must be an integer"
+msgstr "Frekuensi maksimum harus berupa angka"
+
+#: prefs/SpectrumPrefs.cpp:201
+msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
+msgstr "Frekuensi maksimum harus diantara 100 Hz - 100.000 Hz"
+
+#: prefs/SpectrumPrefs.cpp:209
+msgid "The minimum frequency must be an integer"
+msgstr "Frekuensi minmum harus berupa angka"
+
+#: prefs/SpectrumPrefs.cpp:213
+msgid "Minimum frequency must be at least 0 Hz"
+msgstr "Frekuensi minimum harus lebih atau sama dengan 0 Hz"
+
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr "Amplitudo minimal (dB) harus berupa integer"
+
+#: prefs/SpectrumPrefs.cpp:226
+#: prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr "Jumlah Catatan Maksimum harus berupa angka dan diantara 1 - 128"
+
+#: prefs/ThemePrefs.cpp:62
+#: prefs/ThemePrefs.cpp:63
+msgid "Theme"
+msgstr "Tema"
+
+#. i18n-hint: && in here is an escape character to get a single & on screen,
+#. * so keep it as is
+#: prefs/ThemePrefs.cpp:93
+msgid "Theme Cache - Images && Color"
+msgstr "Cache Tema - Gambar && Warna"
+
+#: prefs/ThemePrefs.cpp:95
+msgid "Save Theme Cache"
+msgstr "Simpan Cache Tema"
+
+#: prefs/ThemePrefs.cpp:96
+msgid "Load Theme Cache"
+msgstr "Ambil Cache Tema"
+
+#: prefs/ThemePrefs.cpp:106
+msgid "Load Theme Cache At Startup"
+msgstr "Ambil Cache Tema Pada Permulaan"
+
+#: prefs/ThemePrefs.cpp:118
+msgid "Individual Theme Files"
+msgstr "File Tema Individual"
+
+#: prefs/ThemePrefs.cpp:120
+msgid "Save Files"
+msgstr "Simpan File"
+
+#: prefs/ThemePrefs.cpp:121
+msgid "Load Files"
+msgstr "Ambil File"
+
+#: prefs/ThemePrefs.cpp:126
+msgid "Info"
+msgstr "Info"
+
+#: prefs/ThemePrefs.cpp:129
+msgid "Themability is an experimental feature.\n"
+"\n"
+"To try it out, click \"Save Theme Cache\" then\n"
+"find and modify the images and colors in \n"
+"ImageCacheVxx.png using an image editor such \n"
+"as the Gimp.\n"
+"\n"
+"Click \"Load Theme Cache\" to load the changed images\n"
+"and colors back into Audacity.\n"
+"\n"
+"[Only the control toolbar and the colors on the \n"
+"wavetrack are currently affected, even though the\n"
+"image file shows other icons too.]\n"
+msgstr "Tema adalah fitur percobaan.\n"
+"\n"
+"Untuk mencobanya, klik \"Simpan Cache Tema\" kemudian\n"
+"cari dan ubah gambar dan warna pada \n"
+"ImageCacheVxx.png dengan editor gambar seperti Gimp.\n"
+"\n"
+"Klik \"Ambil Cache Tema\" Untuk mengambil gambar dan warna\n"
+"yang telah diubah ke Audacity.\n"
+"\n"
+"[Hanya toolbar kontrol dan warna wavetrack \n"
+"yang berubah, walaupun file gambar mempunyai icon lainnya juga.]\n"
+
+#: prefs/ThemePrefs.cpp:134
+msgid "You have compiled Audacity with an extra button, \n"
+"'Output Sourcery'.  This will save a C version of \n"
+"the image cache that can be compiled in as a default.\n"
+msgstr "Anda telah mengkompilasikan Audacity dengan tombol tambahan, \n"
+"'Sumber Output'.  Ini akan mengimpan gambar dengan \n"
+"versi C yang bisa dikompilasi sebagaimana mestinya.\n"
+
+#: prefs/ThemePrefs.cpp:139
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
+"the Theme Cache will be loaded when the program \n"
+"starts up.\n"
+"\n"
+msgstr "Jika 'Ambil Cache Tema Pada Permulaan' ditandai, \n"
+"Cache Tema akan diambil ketika program \n"
+"dimulai.\n"
+"\n"
+
+#: prefs/ThemePrefs.cpp:142
+msgid "Saving and loading individual theme files uses a \n"
+"separate file for each image, but is otherwise the \n"
+"same idea.\n"
+"\n"
+msgstr "Menyimpan atau mengambil file tema sendiri menggunakan \n"
+"file terpisah untuk setiap gambar, tapi tetap berhubungan \n"
+"\n"
+
+#: toolbars/ControlToolBar.cpp:175
+msgid "Pause"
+msgstr "Pause"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play"
+msgstr "Play"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr "Play (Shift for Loop Play)"
+
+#: toolbars/ControlToolBar.cpp:183
+msgid "Stop"
+msgstr "Berhenti"
+
+#: toolbars/ControlToolBar.cpp:186
+msgid "Skip to Start"
+msgstr "Langsung ke awal"
+
+#: toolbars/ControlToolBar.cpp:189
+msgid "Skip to End"
+msgstr "Langsung ke Akhir"
+
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "Rekam (Shift untuk Tambahan Rekam)"
+
+#: toolbars/ControlToolBar.cpp:195
+msgid "Clean Speech"
+msgstr "Clean Speech"
+
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
+msgid "Error while opening sound device. "
+msgstr "Error ketika membuka perangkat suara."
+
+#: toolbars/ControlToolBar.cpp:706
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "Merekam pada Mode CleanSpeech tidak mungkin ketika trek, atau lebih dari satu proyek telah dibuka."
+
+#: toolbars/ControlToolBar.cpp:707
+msgid "Recording not permitted"
+msgstr "Rekaman tidak diizinkan"
+
+#: toolbars/DeviceToolBar.cpp:113
+#: toolbars/DeviceToolBar.cpp:115
+msgid "Output Device"
+msgstr "PErangkat Output"
+
+#: toolbars/DeviceToolBar.cpp:134
+#: toolbars/DeviceToolBar.cpp:136
+msgid "Input Device"
+msgstr "Perangkat Input"
+
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim outside selection"
+msgstr "Trim-kan diluar pilihan"
+
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence selection"
+msgstr "Pilihan diam"
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr "Link Trek"
+
+#: toolbars/EditToolBar.cpp:155
+msgid "Zoom In"
+msgstr "Perbesar"
+
+#: toolbars/EditToolBar.cpp:157
+msgid "Zoom Out"
+msgstr "Perkecil"
+
+#: toolbars/EditToolBar.cpp:161
+msgid "Zoom Toggle"
+msgstr "Fokuskan"
+
+#: toolbars/EditToolBar.cpp:165
+msgid "Fit Selection"
+msgstr "Fit-kan ke Pilihan"
+
+#: toolbars/EditToolBar.cpp:165
+msgid "Fit selection in window"
+msgstr "Fit-kan pilihan dengan jendela"
+
+#: toolbars/EditToolBar.cpp:167
+msgid "Fit Project"
+msgstr "Fit-kan Proyek"
+
+#: toolbars/EditToolBar.cpp:167
+msgid "Fit project in window"
+msgstr "Fit-kan proyek dengan jendela"
+
+#: toolbars/MeterToolBar.cpp:50
+msgid "Meter"
+msgstr "Meter"
+
+#: toolbars/MeterToolBar.cpp:80
+msgid "Play Meter"
+msgstr "Pengukur Permainan"
+
+#: toolbars/MeterToolBar.cpp:81
+msgid "Meter-Play"
+msgstr "Meter Memainkan"
+
+#: toolbars/MeterToolBar.cpp:89
+msgid "Record Meter"
+msgstr "Pengukur Rekaman"
+
+#: toolbars/MeterToolBar.cpp:90
+msgid "Meter-Record"
+msgstr "Meter Rekaman"
+
+#: toolbars/MeterToolBar.cpp:94
+msgid "Output level meter"
+msgstr "Pengukur level output"
+
+#: toolbars/MeterToolBar.cpp:95
+msgid "Input level meter - click to monitor input"
+msgstr "Pengukur level input - klik untuk memantau input"
+
+#: toolbars/MixerToolBar.cpp:90
+msgid "Output Volume"
+msgstr "Volume Output"
+
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
+msgstr "Slider pada Output"
+
+#: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
+msgid "Input Volume"
+msgstr "Volume Input"
+
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
+msgstr "Slider pada Input"
+
+#: toolbars/MixerToolBar.cpp:134
+msgid "Input Source"
+msgstr "Sumber Input"
+
+#: toolbars/SelectionBar.cpp:86
+msgid "Selection"
+msgstr "Pilihan"
+
+#: toolbars/SelectionBar.cpp:135
+#: toolbars/SelectionBar.cpp:194
+msgid "Project Rate (Hz):"
+msgstr "Rate Proyek (Hz):"
+
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:255
+msgid "Selection Start:"
+msgstr "Awal Pilihan:"
+
+#: toolbars/SelectionBar.cpp:163
+#: toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
+msgid "Length"
+msgstr "Panjang"
+
+#: toolbars/SelectionBar.cpp:174
+msgid "hidden"
+msgstr "tersembunyi"
+
+#: toolbars/SelectionBar.cpp:184
+#: toolbars/SelectionBar.cpp:272
+msgid "Audio Position:"
+msgstr "Posisi Audio:"
+
+#: toolbars/SelectionBar.cpp:236
+#: toolbars/SelectionBar.cpp:241
+msgid "Snap To"
+msgstr "Patokan"
+
+#: toolbars/SelectionBar.cpp:260
+msgid "Selection "
+msgstr "Pilihan"
+
+#: toolbars/SelectionBar.cpp:325
+msgid "Selection Length"
+msgstr "Panjang Pilihan"
+
+#: toolbars/SelectionBar.cpp:333
+msgid "Selection End"
+msgstr "Akhir Pilihan"
+
+#: toolbars/ToolBar.cpp:98
+#, c-format
+msgid "Audacity %s ToolBar"
+msgstr "Toolbar Audacity %s"
+
+#: toolbars/ToolDock.cpp:74
+#: toolbars/ToolDock.cpp:75
+msgid "ToolDock"
+msgstr "Alat Dock"
+
+#: toolbars/ToolsToolBar.cpp:63
+msgid "Click and drag to select audio"
+msgstr "Klik dan dorong untuk memilih audio"
+
+#: toolbars/ToolsToolBar.cpp:64
+msgid "Click and drag to edit the amplitude envelope"
+msgstr "Klik dan dorong untuk mengedit pengamplopan amplitudo"
+
+#: toolbars/ToolsToolBar.cpp:65
+msgid "Click and drag to edit the samples"
+msgstr "Kik dan dorong untuk mengedit sampel"
+
+#: toolbars/ToolsToolBar.cpp:67
+msgid "Click to Zoom In, Shift-Click to Zoom Out"
+msgstr "Klik untuk memperbesar, Shift+ Klik untuk memperkecil"
+
+#: toolbars/ToolsToolBar.cpp:69
+msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
+msgstr "Dorong untuk Zoom pada wilayah, Klik kanan untuk perkecil"
+
+#: toolbars/ToolsToolBar.cpp:71
+msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
+msgstr "Kiri=Perbesar, Kanan=Perkecil, Tengah=Normal"
+
+#: toolbars/ToolsToolBar.cpp:73
+msgid "Click and drag to move a track in time"
+msgstr "Klik dan dorong ubtuk memindahkan trek ke waktu tertentu"
+
+#: toolbars/ToolsToolBar.cpp:90
+msgid "Tools"
+msgstr "Alat"
+
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
+msgid "Selection Tool"
+msgstr "Tool Pemilihan"
+
+#: toolbars/ToolsToolBar.cpp:148
+msgid "Envelope Tool"
+msgstr "Tool Amplop"
+
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
+msgid "Time Shift Tool"
+msgstr "Tool Time-Shift"
+
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
+msgid "Zoom Tool"
+msgstr "Tool Zoom"
+
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
+msgid "Draw Tool"
+msgstr "Tool Gambar"
+
+#: toolbars/ToolsToolBar.cpp:152
+msgid "Multi-Tool Mode"
+msgstr "Mode Tool Serbaguna"
+
+#: toolbars/ToolsToolBar.cpp:186
+msgid "Slide Tool"
+msgstr "Tool Slide"
+
+#: toolbars/ToolsToolBar.cpp:187
+msgid "Multi Tool"
+msgstr "Tool Serbaguna"
+
+#: toolbars/TranscriptionToolBar.cpp:84
+msgid "Transcription"
+msgstr "Transkrispi"
+
+#: toolbars/TranscriptionToolBar.cpp:171
+msgid "Play at selected speed"
+msgstr "Mainkan padakecepatan terpilih"
+
+#: toolbars/TranscriptionToolBar.cpp:172
+msgid "Play-at-speed"
+msgstr "Memainkan berkecepatan"
+
+#: toolbars/TranscriptionToolBar.cpp:178
+#: toolbars/TranscriptionToolBar.cpp:183
+msgid "Playback Speed"
+msgstr "Memainkan Berdasarkan Kecepatan"
+
+#: toolbars/TranscriptionToolBar.cpp:196
+msgid "Adjust left selection to next onset"
+msgstr "Ubah pemilihan sebelah kiri ke perintah selanjutnya"
+
+#: toolbars/TranscriptionToolBar.cpp:197
+msgid "Left-to-On"
+msgstr "Hidupkan Fitur Kiri"
+
+#: toolbars/TranscriptionToolBar.cpp:199
+msgid "Adjust right selection to previous offset"
+msgstr "Ubah pemilihan sebelah kanan ke pertahanan sebelumnya"
+
+#: toolbars/TranscriptionToolBar.cpp:200
+msgid "Right-to-Off"
+msgstr "Matikan Fitur Kanan"
+
+#: toolbars/TranscriptionToolBar.cpp:202
+msgid "Adjust left selection to next offset"
+msgstr "Ubah pemilihan sebelah kiri ke perintah selanjutnya"
+
+#: toolbars/TranscriptionToolBar.cpp:203
+msgid "Left-to-Off"
+msgstr "Matikankan Fitur Kiri"
+
+#: toolbars/TranscriptionToolBar.cpp:205
+msgid "Adjust right selection to previous onset"
+msgstr "Ubah pemilihan sebelah kanan ke perintah sebelumnya"
+
+#: toolbars/TranscriptionToolBar.cpp:206
+msgid "Right-to-On"
+msgstr "Hidupkan Fitur Kanan"
+
+#: toolbars/TranscriptionToolBar.cpp:208
+msgid "Select region of sound around cursor"
+msgstr "Pilih area suara di sekitar kursor"
+
+#: toolbars/TranscriptionToolBar.cpp:209
+msgid "Select-Sound"
+msgstr "Pilih Suara"
+
+#: toolbars/TranscriptionToolBar.cpp:211
+msgid "Select region of silence around cursor"
+msgstr "Pilih area diam di sekitar kursor"
+
+#: toolbars/TranscriptionToolBar.cpp:212
+msgid "Select-Silence"
+msgstr "Pilih Diam"
+
+#: toolbars/TranscriptionToolBar.cpp:214
+msgid "Automatically make labels from words"
+msgstr "Membuat label dari kata-kata secara otomatis"
+
+#: toolbars/TranscriptionToolBar.cpp:215
+msgid "Make Labels"
+msgstr "Buat Label"
+
+#: toolbars/TranscriptionToolBar.cpp:217
+msgid "Add label at selection"
+msgstr "Tambahkan label pada yang dipilih"
+
+#: toolbars/TranscriptionToolBar.cpp:218
+msgid "Add Label"
+msgstr "Tambahkan Label"
+
+#: toolbars/TranscriptionToolBar.cpp:220
+msgid "Calibrate voicekey"
+msgstr "Kalibrasi kunci suara"
+
+#: toolbars/TranscriptionToolBar.cpp:221
+msgid "Calibrate"
+msgstr "Kalibrasi"
+
+#: toolbars/TranscriptionToolBar.cpp:225
+msgid "Adjust Sensitivity"
+msgstr "Ubah Sensitivitas"
+
+#: toolbars/TranscriptionToolBar.cpp:230
+msgid "Sensitivity"
+msgstr "Senstivitas"
+
+#: toolbars/TranscriptionToolBar.cpp:235
+msgid "Energy"
+msgstr "Energi"
+
+#: toolbars/TranscriptionToolBar.cpp:236
+msgid "Sign Changes (Low Threshold)"
+msgstr "Pengubahan Tanda (Ambang Batas Rendah)"
+
+#: toolbars/TranscriptionToolBar.cpp:237
+msgid "Sign Changes (High Threshold)"
+msgstr "Pengubahan Tanda (Ambang Batas Tinggi)"
+
+#: toolbars/TranscriptionToolBar.cpp:238
+msgid "Direction Changes (Low Threshold)"
+msgstr "Pengubahan Arah (Ambang Batas Rendah)"
+
+#: toolbars/TranscriptionToolBar.cpp:239
+msgid "Direction Changes (High Threshold)"
+msgstr "Pengubahan Arah (Ambang Batas Tinggi)"
+
+#: toolbars/TranscriptionToolBar.cpp:247
+msgid "Key type"
+msgstr "Kunci Ketikan"
+
+#: widgets/AButton.cpp:303
+msgid " (disabled)"
+msgstr " (dilarang)"
+
+#: widgets/AButton.cpp:461
+msgid "Press"
+msgstr "Tekan"
+
+#: widgets/AButton.cpp:540
+msgid "Button"
+msgstr "Tombol"
+
+#. i18n-hint: One-letter abbreviation for Left, in VU Meter
+#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#: widgets/ASlider.cpp:612
+#: widgets/Meter.cpp:248
+msgid "L"
+msgstr "L"
+
+#. i18n-hint: One-letter abbreviation for Right, in VU Meter
+#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#: widgets/ASlider.cpp:615
+#: widgets/Meter.cpp:250
+msgid "R"
+msgstr "R"
+
+#: widgets/ASlider.cpp:678
+msgid "Center"
+msgstr "Tengah"
+
+#: widgets/ASlider.cpp:682
+msgid "Left"
+msgstr "Kiri"
+
+#: widgets/ASlider.cpp:685
+msgid "Right"
+msgstr "Kanan"
+
+#: widgets/ErrorDialog.cpp:98
+msgid "Help"
+msgstr "Bantuan"
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr "<"
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ">"
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr "Percepat ke Akhir"
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr "Percepat ke Awal"
+
+#: widgets/ErrorDialog.cpp:255
+msgid "Help on the Internet"
+msgstr "Bantuan di Internet"
+
+#: widgets/Grabber.cpp:62
+msgid "Grabber"
+msgstr "Pendorong"
+
+#: widgets/Grid.cpp:643
+#, c-format
+msgid "%d rows, %d columns"
+msgstr "%d baris, %d kolom"
+
+#: widgets/Grid.cpp:649
+#: widgets/Grid.cpp:776
+#, c-format
+msgid "Row %d"
+msgstr "Baris %d"
+
+#: widgets/Grid.cpp:791
+msgid "Empty"
+msgstr "Kosong"
+
+#: widgets/Meter.cpp:396
+msgid "Enable Meter"
+msgstr "Bolehkan Meter"
+
+#: widgets/Meter.cpp:398
+msgid "Disable Meter"
+msgstr "Larangkan Meter"
+
+#: widgets/Meter.cpp:401
+msgid "Stop Monitoring"
+msgstr "Hentikan Pemantauan"
+
+#: widgets/Meter.cpp:403
+msgid "Start Monitoring"
+msgstr "Mulai Pemantauan"
+
+#: widgets/Meter.cpp:407
+msgid "Horizontal Stereo"
+msgstr "Stereo Horizontal"
+
+#: widgets/Meter.cpp:408
+msgid "Vertical Stereo"
+msgstr "Stereo Vertikal"
+
+#: widgets/Meter.cpp:425
+msgid "Preferences..."
+msgstr "Preferensi..."
+
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr "Volume Mix"
+
+#: widgets/Meter.cpp:1145
+msgid "This determines how often the meter is refreshed.\n"
+"If you have a slower PC you may want to select a\n"
+"lower refresh rate (30 per second or lower), so that\n"
+"audio qualtiy is not affected by the meter display."
+msgstr "Ini menunjukkan sesering apa meteran disegarkan.\n"
+"Jika performa PC Anda tidak tinggi, Anda pilih rate\n"
+"penyegaran lebih rendah (30 per detik atau lebih rendah), supaya\n"
+"kualitas audio tidak berdampak kepada penunjuk ini."
+
+#: widgets/Meter.cpp:1146
+msgid "Meter refresh rate per second [1-100]: "
+msgstr "Rate penyegaran meter per detik [1-100]:"
+
+#: widgets/Meter.cpp:1147
+msgid "Meter Preferences"
+msgstr "Preferensi Meter"
+
+#: widgets/MultiDialog.cpp:82
+msgid " Please select an action "
+msgstr " Mohon pilih aksinya"
+
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "Silahkan pilih aksinya"
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr "Waktu Berjalan:"
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr "Waktu Tersisa:"
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr "Batal"
+
+#: widgets/Ruler.cpp:1445
+#: widgets/Ruler.cpp:1446
+msgid "Vertical Ruler"
+msgstr "Penunjuk Vertikal"
+
+#. i18n-hint: Format string for displaying time in seconds. Change the comma
+#. * in the middle to the 1000s separator for your locale, and the 'seconds'
+#. * on the end to the word for seconds. Don't change the numbers.
+#: widgets/TimeTextCtrl.cpp:267
+msgid "01000,01000 seconds"
+msgstr "01000,01000 detik"
+
+#. i18n-hint: Format string for displaying time in hours, minutes and
+#. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
+#. * change the numbers unless there aren't 60 seconds in a minute in your
+#. * locale
+#: widgets/TimeTextCtrl.cpp:276
+msgid "0100 h 060 m 060 s"
+msgstr "0100 jam 060 mnt 060 dtk"
+
+#. i18n-hint: Name of time display format that shows time in days, hours,
+#. * minutes and seconds
+#: widgets/TimeTextCtrl.cpp:279
+msgid "dd:hh:mm:ss"
+msgstr "hh:jj:mm:dd"
+
+#. i18n-hint: Format string for displaying time in days, hours, minutes and
+#. * seconds. Change the 'days' to the word for days, 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes and 's' to the
+#. * abbreviation for seconds. Don't change the numbers unless there aren't
+#. * 24 hours in a day in your locale
+#: widgets/TimeTextCtrl.cpp:285
+msgid "0100 days 024 h 060 m 060 s"
+msgstr "0100 hari 024 jam 060 mnt 060 dtk"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and milliseconds (1/1000 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + milliseconds"
+msgstr "jj:mm:dd: + milidetik"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * milliseconds are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.01000 s"
+msgstr "0100 jam 060 mnt 060.01000 dtk"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and samples (at the current project sample rate)
+#: widgets/TimeTextCtrl.cpp:297
+msgid "hh:mm:ss + samples"
+msgstr "jj:mm:dd: + sampel"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and samples. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes, 's' to the abbreviation for seconds and
+#. * translate samples . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:303
+msgid "0100 h 060 m 060 s+.# samples"
+msgstr "0100 jam 060 mnt 060 dtk+.# sampel"
+
+#. i18n-hint: Name of time display format that shows time in samples (at the
+#. * current project sample rate)
+#: widgets/TimeTextCtrl.cpp:306
+msgid "samples"
+msgstr "sampel"
+
+#. i18n-hint: Format string for displaying time in samples (lots of samples).
+#. * Change the ',' to the 1000s separator for your locale, and translate
+#. * samples. If 1000s aren't a base multiple for your number system, then you
+#. * can change the numbers to an appropriate one, and put a 0 on the front
+#: widgets/TimeTextCtrl.cpp:311
+msgid "01000,01000,01000 samples|#"
+msgstr "01000,01000,01000 sampel|#"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:314
+msgid "hh:mm:ss + film frames (24 fps)"
+msgstr "jj:mm:dd: + Bingkai film (24 bpd)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames at 24 frames per second. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames' . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:320
+msgid "0100 h 060 m 060 s+.24 frames"
+msgstr "0100 jam 060 mnt 060 dtk+.24 bingkai"
+
+#. i18n-hint: Name of time display format that shows time in frames (lots of
+#. * frames) at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:323
+msgid "film frames (24 fps)"
+msgstr "Bingkai PAL (25 bpd)"
+
+#. i18n-hint: Format string for displaying time in frames at 24 frames per
+#. * second. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:326
+msgid "01000,01000 frames|24"
+msgstr "01000,01000 bingkai|24"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV drop-frame rate (used for American /
+#. * Japananese TV, and very odd)
+#: widgets/TimeTextCtrl.cpp:330
+msgid "hh:mm:ss + NTSC drop frames"
+msgstr "jj:mm:dd: + Bingkai NTSC dengan drop"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the |N alone, it's important!
+#: widgets/TimeTextCtrl.cpp:335
+msgid "0100 h 060 m 060 s+.30 frames|N"
+msgstr "0100 jam 060 mnt 060 dtk+.30 bingkai|N"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV non-drop-frame rate (used for American /
+#. * Japananese TV, and doesn't quite match wall time
+#: widgets/TimeTextCtrl.cpp:339
+msgid "hh:mm:ss + NTSC non-drop frames"
+msgstr "jj:mm:dd: + Bingkai NTSC non-drop"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the | .999000999 alone,
+#. * the whole things really is slightly off-speed!
+#: widgets/TimeTextCtrl.cpp:345
+msgid "0100 h 060 m 060 s+.030 frames| .999000999"
+msgstr "0100 jam 060 mnt 060 dtk+.030 bingkai| .999000999"
+
+#. i18n-hint: Name of time display format that shows time in frames at NTSC
+#. * TV frame rate (used for American / Japananese TV
+#: widgets/TimeTextCtrl.cpp:348
+msgid "NTSC frames"
+msgstr "Bingkai NTSC"
+
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone. That really is the frame
+#. * rate!
+#: widgets/TimeTextCtrl.cpp:352
+msgid "01000,01000 frames|29.97002997"
+msgstr "01000,01000 bingkai|29.97002997"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at PAL TV frame rate (used for European TV)
+#: widgets/TimeTextCtrl.cpp:355
+msgid "hh:mm:ss + PAL frames (25 fps)"
+msgstr "jj:mm:dd: + Bingkai PAL (25 bpd)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with PAL TV frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Nice simple time code!
+#: widgets/TimeTextCtrl.cpp:360
+msgid "0100 h 060 m 060 s+.25 frames"
+msgstr "0100 jam 060 mnt 060 dtk+.25 bingkai"
+
+#. i18n-hint: Name of time display format that shows time in frames at PAL
+#. * TV frame rate (used for European TV
+#: widgets/TimeTextCtrl.cpp:363
+msgid "PAL frames (25 fps)"
+msgstr "Bingkai PAL (25 bpd)"
+
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone.
+#: widgets/TimeTextCtrl.cpp:366
+msgid "01000,01000 frames|25"
+msgstr "01000,01000 bingkai|25"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at CD Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:369
+msgid "hh:mm:ss + CDDA frames (75 fps)"
+msgstr "jj:mm:dd: + Bingkai CDDA (75 bpd)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with CD Audio frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'.
+#: widgets/TimeTextCtrl.cpp:374
+msgid "0100 h 060 m 060 s+.75 frames"
+msgstr "0100 jam 060 mnt 060 dtk+.75 bingkai"
+
+#. i18n-hint: Name of time display format that shows time in frames at CD
+#. * Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:377
+msgid "CDDA frames (75 fps)"
+msgstr "Bingkai CCDA (75 bpd)"
+
+#. i18n-hint: Format string for displaying time in frames with CD Audio
+#. * frames. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:380
+msgid "01000,01000 frames|75"
+msgstr "01000,01000 bingkai|75"
+
+#: widgets/TimeTextCtrl.cpp:451
+msgid "Use right mouse button or context key to change format"
+msgstr "Gunakan tombol kanan mouse atau kunci konteks untuk mengubah format"
+
+#: widgets/TimeTextCtrl.cpp:1485
+msgid "Time Control"
+msgstr "Kontrol Waktu"
+
+#: widgets/Warning.cpp:64
+msgid "Don't show this warning again"
+msgstr "Jangan perlihatkan peringatan lagi"
+
+#: xml/XMLFileReader.cpp:49
+#, c-format
+msgid "Could not open file: \"%s\""
+msgstr "Tidak bisa membuka file:\"%s\""
+
+#: xml/XMLFileReader.cpp:63
+#, c-format
+msgid "Error: %hs at line %lu"
+msgstr "Error: %hs pada garis %lu"
+
+#: xml/XMLFileReader.cpp:79
+#, c-format
+msgid "Could not load file: \"%s\""
+msgstr "Tidak bisa mengambil file: \"%s\""
+
diff --git a/locale/it.po b/locale/it.po
index 6ece8a2..f182c08 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -19,36 +19,24 @@ msgstr "Project-Id-Version: it\n"
 msgid "&About Audacity..."
 msgstr "Informazioni su &Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Abilitato"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Data di rilascio del programma:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity è un programma libero, sviluppato da un team di volontari provenienti da tutto il mondo. La coordinazione é possibile grazie a Sourceforge.net, un servizio on-line che rende disponibili degli strumenti liberi ai progetti di sviluppo software open-source. Audacity é disponibile per Windows 98 e superiori, Mac OS X, Linux, e altri sistemi operativi Unix like.  Vecchie versioni di Audacity sono disponibili per Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Questo programma è ancora in beta!  Può contenere bug e funzionalità incomplete. Noi dipendiamo dalle vostre segnalazioni, quindi visitate il nostro sito web e informateci dei bug che avete trovato e delle funzionalità che vi interessano."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Questa è una versione stabile e completa di Audacity.  Comunque, se trovate un bug o avete dei suggerimenti, per piacere contattateci.  Noi dipendiamo dal supporto degli utenti per poter continuare a migliorare Audacity.  Per maggiori informazioni, visitate il nostro sito web."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -60,13 +48,9 @@ msgstr "Questa 
 msgid "translator_credits"
 msgstr "Traduzione italiana di Aldo Boccacci"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Un Editor libero per l'audio digitale"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Informazioni"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -102,26 +86,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Ringraziamenti particolari:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Abilitato"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Data di rilascio del programma:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
-#: ../src/effects/NoiseRemoval.cpp:463 ../src/effects/ClickRemoval.cpp:371
-msgid "Close"
-msgstr "Chiudi"
-
 #: ../src/AudacityApp.cpp:304 ../src/Project.cpp:1770
 #, c-format
 msgid "%s is already open in another window."
@@ -321,12 +397,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -360,8 +437,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -409,6 +486,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -457,10 +538,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -677,16 +766,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "File rinominato: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Sto cambiando il blocco %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -815,6 +904,95 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Rettangolare"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Dove si trova %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Analisi di frequenza"
@@ -842,8 +1020,8 @@ msgstr "Autocorrelazione avanzata"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -856,8 +1034,8 @@ msgstr "Dimensione"
 msgid " window"
 msgstr " finestra"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -868,14 +1046,23 @@ msgstr "Frequenza lineare"
 msgid "Log frequency"
 msgstr "Frequenza di log"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
+#: ../src/effects/NoiseRemoval.cpp:463 ../src/effects/ClickRemoval.cpp:371
+msgid "Close"
+msgstr "Chiudi"
+
 #: ../src/widgets/Meter.cpp:293
 msgid "dB"
 msgstr "dB"
@@ -926,7 +1113,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Lag (secondi)\tfrequenza (Hz)\t livello"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -942,15 +1129,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -961,40 +1164,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1188,6 +1415,10 @@ msgstr "&Salva il Progetto\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "S&alva il Progetto con Nome..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1196,6 +1427,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1224,10 +1459,26 @@ msgstr "Esporta &Etichette..."
 msgid "Export &Multiple..."
 msgstr "Esportazione &Multipla..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1289,9 +1540,9 @@ msgstr "Elimina\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Silenzio\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1305,22 +1556,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1364,12 +1613,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1380,66 +1629,67 @@ msgstr "Tutto\tCtrl+&A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "Dall'Inizio al Cursore"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Dal Cursore alla Fine"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Trova Incroci con Zero\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Muovi il cursore..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "all'inizio della selezione"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "alla fine della selezione"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "all'inizio della traccia"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "alla fine della traccia"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Salva la selezione"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Ripristina la selezione"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1458,9 +1708,14 @@ msgstr "Attiva l'Allineamento alla Griglia"
 msgid "Turn Grid Snap Off"
 msgstr "Disattiva l'Allineamento alla Griglia"
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Preferenze...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1498,60 +1753,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "Cronologia..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Vai all'Inizio\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Vai alla Fine\tFine"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1567,12 +1884,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Traccia Tempo"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1587,6 +1900,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Rimuo&vi Tracce"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Allinea con &Zero"
@@ -1603,29 +1924,40 @@ msgstr "Allinea con l'Inizio della &Selezione"
 msgid "Align with Selection &End"
 msgstr "Allinea con la Fin&e della Selezione"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Allinea la Fine col Cursore"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Allinea la Fine con l'Inizio della Selezione"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Allinea la Fine con la Fine della Selezione"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Allinea Tutte le Tracce"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Allinea Tracce..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1638,22 +1970,26 @@ msgstr "Aggiungi un'Etichetta alla Selezione\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Aggiungi un'Etichetta al punto di riproduzione\tCtrl+B"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Genera"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Effetti"
@@ -1687,6 +2023,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1699,12 +2039,12 @@ msgstr "Avvia P&rove di Sistema..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1739,9 +2079,9 @@ msgstr "Strumento successivo\tD"
 msgid "Previous Tool\tA"
 msgstr "Strumento Precedente\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Play/Stop\tBarra spaziatrice"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1755,12 +2095,12 @@ msgstr "Pausa\tP"
 msgid "Record\tR"
 msgstr "Registra\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1775,22 +2115,14 @@ msgstr "Play To Selection\tB"
 msgid "Play Looped\tL"
 msgstr "Esegui in loop\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Esegui in loop\tShift+Barra Spaziatrice"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Vai all'Inizio\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Vai alla Fine\tFine"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Seleziona dall'Inizio\tShift+Home"
@@ -1847,8 +2179,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1947,14 +2279,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "&File Recenti..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2011,6 +2348,23 @@ msgstr "Ripeti %s\t Ctrl+R"
 msgid "There are no label tracks to export."
 msgstr "Non ci sono tracce etichetta da esportare."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Nulla da annullare"
@@ -2047,6 +2401,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Incollato dagli appunti"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2213,9 +2571,9 @@ msgstr "Importa Etichette"
 msgid "Select a MIDI file..."
 msgstr "Seleziona un file MIDI..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Tutti i file (*.*)|*.*|File MIDI (*.mid)|*.mid|File Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2234,12 +2592,6 @@ msgstr "Seleziona un qualsiasi file audio non compresso..."
 msgid "All files (*)|*"
 msgstr "Tutti i file (*)|*"
 
-#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Importa"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2271,6 +2623,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Allinea con zero"
@@ -2307,6 +2663,14 @@ msgstr "Allineato"
 msgid "Align"
 msgstr "Allinea"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Nuova traccia audio creata"
@@ -2368,14 +2732,14 @@ msgstr "Rimuovi Traccia"
 msgid "Removed audio track(s)"
 msgstr "Traccia/e audio rimossa/e"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2439,14 +2803,13 @@ msgstr "Audio registrato"
 msgid "Save changes before closing?"
 msgstr "Salvare i cambiamenti prima di chiudere?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2465,6 +2828,25 @@ msgstr "Seleziona uno o pi
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821 ../src/Project.cpp:1829
 msgid "Error opening file"
 msgstr "Errore aprendo il file"
@@ -2521,42 +2903,34 @@ msgstr "Questo file 
 msgid "Can't open project file"
 msgstr "Impossibile aprire il file del progetto"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Impossibile salvare il progetto.   Forse non è possibile scrivere su %s,\n"
-"oppure il disco è pieno."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148 ../src/Project.cpp:2160
 msgid "Error saving project"
@@ -2567,22 +2941,17 @@ msgstr "Errore salvando il progetto"
 msgid "Saved %s"
 msgstr "Salvato %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' importato"
 
+#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Importa"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Errore durante l'importazione"
@@ -2595,17 +2964,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "I file di progetto di Audacity (.aup) vi consentono di salvare tutto quello su cui state lavorando esattamente come\n"
-"appare sullo schermo, ma gli altri programmi non possono aprirli.\n"
-" \n"
-"Quando vuoi salvare un file che possa essere aperto da altri programmi, seleziona un'opzione nel \n"
-"comando Esporta."
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2648,6 +3023,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Spazio su disco finito"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2730,43 +3115,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2806,8 +3160,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Commenti"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2826,12 +3180,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2873,100 +3227,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "La massima lunghezza dell'attributo '%s' é di %d caratteri. I dati sono stati troncati."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Titolo"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artista"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3031,8 +3304,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3067,6 +3383,10 @@ msgstr "Forma d'onda"
 msgid "Waveform (dB)"
 msgstr "Forma d'onda (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Intonazione (EAC)"
@@ -3197,13 +3517,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Spostamento Temporale"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Zoom insufficiente. Aumenta lo zoom fino a vedere i singoli campioni."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3285,6 +3605,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3341,14 +3669,6 @@ msgstr "Cambia Frequenza"
 msgid "Format Change"
 msgstr "Cambio formato"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Immetti una frequenza in Hz (per secondo) tra 1 e 100000:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Frequenza non valida."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Cambia il limite inferiore di velocità (%) a:"
@@ -3481,8 +3801,8 @@ msgstr "Plugins da 1 a %i"
 msgid "Plugins %i to %i"
 msgstr "Plugins da %i a %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3504,8 +3824,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3526,14 +3846,19 @@ msgstr "Effetto applicato: %s %.1f dB"
 msgid "Amplify"
 msgstr "Amplifica"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplifica di Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Amplificazione (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Nuovo picco ampiezza (dB):"
@@ -3542,6 +3867,10 @@ msgstr "Nuovo picco ampiezza (dB):"
 msgid "Allow clipping"
 msgstr "Consenti il clipping"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Amplifica..."
@@ -3654,10 +3983,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Frequenza (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Incremento (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3697,9 +4034,50 @@ msgstr "di Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "Sto usando SoundTouch, di Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Intonazione:   da"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Semitoni:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
 #: ../src/effects/ChangeSpeed.cpp:351 ../src/effects/ChangeTempo.cpp:223
@@ -3707,19 +4085,20 @@ msgstr "Intonazione:   da"
 msgid "to"
 msgstr "a"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Semitoni:"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frequenza (Hz):   da"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
 #: ../src/effects/ChangeTempo.cpp:182
 msgid "Percent Change:"
 msgstr "Percentuale di cambiamento:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Cambia intonazione..."
@@ -3737,6 +4116,14 @@ msgstr "Effetto applicato: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Cambia velocità"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "n/a"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Modificare la velocità, influisce sia sul Tempo che sull'Intonazione"
@@ -3745,17 +4132,17 @@ msgstr "Modificare la velocit
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "Sto usando SampleRate, di Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standard Vinyl RPM:   da"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3773,13 +4160,29 @@ msgstr "Cambia Tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Cambia Tempo senza cambiare l'intonazione"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Battiti al Minuto (BPM): ... da"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Durata (secondi):   da"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3789,8 +4192,8 @@ msgstr "Cambia tempo..."
 msgid "Changing Tempo"
 msgstr "Sto cambiando il tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3801,10 +4204,18 @@ msgstr "Rimozione di Click e Pop a cura di Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Rimozione dei click..."
@@ -3817,49 +4228,84 @@ msgstr "Sto rimuovendo i click e i pop..."
 msgid "Dynamic Range Compressor"
 msgstr "Compressore della Gamma Dinamica"
 
-#: ../src/effects/Compressor.cpp:428
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Compressore della Gamma Dinamica a cura di Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:446
-msgid "Ratio: "
-msgstr "Rapporto: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:453
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Tempo d'attacco: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:520
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Soglia: %d dB"
 
-#: ../src/effects/Compressor.cpp:523
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Rapporto: %.0f:1"
+msgid "%.0f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Rapporto: %.1f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:527
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Tempo d'attacco: %.1f secondi"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3870,6 +4316,247 @@ msgstr "Compressore..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Sto applicando il Compressore della Gamma Dinamica..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Informazioni"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3886,8 +4573,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Ampiezza (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4114,16 +4801,12 @@ msgstr "Inverti"
 msgid "Inverting"
 msgstr "Sto invertendo"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4135,31 +4818,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4170,6 +4857,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Rimozione rumore"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4186,10 +5025,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4217,10 +5052,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Rimozione rumore"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Passo 1"
@@ -4251,14 +5082,26 @@ msgstr "Dai Profilo Rumore"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Rimozione rumore..."
@@ -4293,22 +5136,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalizza"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Rimuovi ogni spostamento DC (centra verticalmente sullo 0)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normalizza..."
@@ -4322,42 +5165,54 @@ msgstr "Sto Normalizzando..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Effetto applicato: %s %d, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Phaser"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser di Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Fasi:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "Frequenza LFO (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "Inizio fase LFO (deg):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Profondità:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Feedback (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4372,6 +5227,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4389,27 +5252,22 @@ msgstr "Le tracce sono troppo lunghe per ripetere la selezione."
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Ripeti di Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Numero di ripetizioni: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Nuova lunghezza della selezione: "
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minuti, %d secondi"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondi"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4473,8 +5331,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4482,6 +5388,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Lineare"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4510,22 +5424,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Forma d'onda:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4552,10 +5472,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4601,10 +5517,6 @@ msgstr "Effetto applicato: %s frequenza = %.1f, start phase = %.0f deg, depth =
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah by Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Profondità (%):"
@@ -4613,10 +5525,18 @@ msgstr "Profondit
 msgid "Resonance:"
 msgstr "Risonanza:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah: bilanciamento frequenza (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4652,6 +5572,18 @@ msgstr "Impostazioni Effetti"
 msgid "Length (seconds)"
 msgstr "Durata (secondi)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Sto applicando l'effetto Nyquist..."
@@ -4717,9 +5649,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4773,6 +5708,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4808,10 +5747,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Impossibile esportare in %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Esporta l'audio selezionato usando un encoder da linea di comando"
@@ -4824,6 +5759,477 @@ msgstr "Esporta l'intero progetto usando un encoder da linea di comando"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bit Rate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Lingua:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4896,10 +6302,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4908,10 +6310,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bit Rate:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4920,10 +6318,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345 ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
 msgstr "Impossibile scrivere sul file di destinazione"
@@ -4948,44 +6342,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -4996,20 +6358,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5040,6 +6398,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Qualità"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5065,35 +6427,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Dove si trova %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5103,8 +6445,9 @@ msgstr "Solo lame_enc.dll|lame_enc.dll|Librerie a collegamento dinamico (*.dll)|
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Solo libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Librerie estese (*.so*)|*.so*|All Files (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5123,10 +6466,6 @@ msgstr "Libreria per la codifica MP3 non valida o supportata!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Modifica i tag ID3 per il file MP3"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5162,10 +6501,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5178,18 +6513,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Il plugin per l'esportazione MP3 non è stato trovato"
-
 #: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
 msgid "Export Multiple"
@@ -5245,6 +6572,10 @@ msgstr "Includi audio precedente alla prima etichetta"
 msgid "First file name:"
 msgstr "Nome del primo file:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Tracce"
@@ -5265,15 +6596,14 @@ msgstr "Numerazione progressiva"
 msgid "File name prefix:"
 msgstr "Prefisso dei nomi dei file:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Sovrascrivi i file esistenti"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5283,10 +6613,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Scegli dove salvare i file esportati"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5294,6 +6620,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5304,6 +6634,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5312,10 +6648,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5328,22 +6660,14 @@ msgstr "Esporta l'audio selezionato come Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Esportazione dell'intero progetto in formato Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5359,8 +6683,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Non sono possibili tutte le combinazioni di intestazione\n"
 "e codifica.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5384,8 +6720,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Errore (il file potrebbe non essere stato salvato): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5393,6 +6757,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Questa versione di Audacity non è stata compilata con il supporto per il formato. %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5423,9 +6795,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5438,19 +6811,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity non ha riconosciuto questo tipo di file.\n"
-"Se è in formato non compresso, prova a importarlo usando \"Importa Dati Grezzi (raw)\""
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5486,16 +6911,17 @@ msgstr "Le tracce MIDI non possono essere spostate individualmente, solo i file
 msgid "Invalid track offset in LOF file."
 msgstr "Parametro temporale non valido di una traccia in un file LOF."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Errore importando Allegro file."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Errore importando MIDI file."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5522,15 +6948,23 @@ msgstr "Intestazione bitstream Vorbis non valida"
 msgid "Internal logic fault"
 msgstr "Errore logico interno"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Sto importando il file %s..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Importa Dati Grezzi (raw)"
@@ -5572,6 +7006,14 @@ msgstr "2 Canali (stereo)"
 msgid "%d Channels"
 msgstr "%d canali"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Start offset:"
@@ -5584,8 +7026,17 @@ msgstr "Da importare:"
 msgid "Sample rate:"
 msgstr "Frequenza di campionamento:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5629,10 +7080,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Riproduci le altre tracce mentre ne registro una nuova"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5642,8 +7092,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5670,12 +7124,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5703,21 +7159,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88 ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
 msgstr "Cartelle"
@@ -5755,7 +7199,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5780,23 +7224,65 @@ msgstr "Impossibile scrivere nella cartella %s"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "I cambiamenti alla cartella temporanea non saranno effettuati fino a che Audacity non sarà riavviato"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Crea una copia del file prima di modificarlo (più sicuro)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Versione libreria MP3:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Leggi direttamente dal file originale (più veloce)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5826,53 +7312,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Versione libreria MP3:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Interfaccia"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Cerca libreria"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Interfaccia"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5887,6 +7368,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5895,25 +7380,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Lingua:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Livello minimo di dB visualizzato"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5923,6 +7408,10 @@ msgstr "-36 dB (profondit
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM range of 8 bit samples)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM range of 16 bit samples)"
@@ -5935,10 +7424,34 @@ msgstr "-120 dB (approssimativamente il limite dell'udito umano)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM range of 24 bit samples)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Tastiera"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -5971,10 +7484,6 @@ msgstr "Errore salvando le scorciatoie da tastiera"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Seleziona un file XML contenente le scorciatoie da tastiera di Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Errore caricando le scorciatoie da tastiera"
@@ -5990,6 +7499,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Annulla"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Riproduci le altre tracce mentre ne registro una nuova"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Mouse"
@@ -6203,10 +7749,6 @@ msgstr "Zoom avanti o indietro"
 msgid "Audacity Preferences"
 msgstr "Preferenze Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Qualità"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Rectangle"
@@ -6271,12 +7813,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6295,6 +7837,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - default"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - most narrowband"
@@ -6303,6 +7849,10 @@ msgstr "4096 - most narrowband"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6319,6 +7869,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Frequenza massima (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "La frequenza massima deve essere un numero intero"
@@ -6335,6 +7905,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6407,10 +7985,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pausa"
@@ -6419,9 +7993,9 @@ msgstr "Pausa"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Riproduci (Shift per eseguire in loop)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6435,6 +8009,10 @@ msgstr "Vai all'Inizio"
 msgid "Skip to End"
 msgstr "Vai alla Fine"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6467,6 +8045,10 @@ msgstr "Elimina fuori dalla selezione"
 msgid "Silence selection"
 msgstr "Azzera la selezione"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Zoom Avanti"
@@ -6523,24 +8105,20 @@ msgstr "Livello di output"
 msgid "Input level meter - click to monitor input"
 msgstr "Livello di input - clicca per monitorare l'input"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Output Volume"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Input Volume"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6559,6 +8137,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6816,6 +8399,22 @@ msgstr "Destra"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6862,14 +8461,14 @@ msgstr "Orizzontale - Stereo"
 msgid "Vertical Stereo"
 msgstr "Verticale - Stereo"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Lineare"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6889,6 +8488,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6897,10 +8512,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6913,6 +8524,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7026,11 +8652,10 @@ msgstr "Non mostrare pi
 msgid "Could not open file: \"%s\""
 msgstr "Impossibile aprire il file: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Errore: %s alla linea %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/ja.po b/locale/ja.po
index 847d715..f81ae51 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -7,62 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-04-28 22:24+0100\n"
-"PO-Revision-Date: 2007-12-19 19:42+0900\n"
-"Last-Translator: Akira Nishimura <akira at rsch.tuis.ac.jp>\n"
-"Language-Team:  <akira at rsch.tuis.ac.jp>\n"
+"POT-Creation-Date: 2008-11-09 20:10+0000\n"
+"PO-Revision-Date: 2009-01-25 17:00+0900\n"
+"Last-Translator: Pepper Tree <at_chan at yahoo.co.jp>\n"
+"Language-Team: Pepper Tree <at_chan at yahoo.co.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Japanese\n"
+"X-Poedit-Country: JAPAN\n"
 
-#: AboutDialog.cpp:142 AudacityApp.cpp:749 Menus.cpp:745
+#: AboutDialog.cpp:143
+#: AudacityApp.cpp:807
+#: Menus.cpp:955
 msgid "&About Audacity..."
 msgstr "Audacity について (&A)"
 
 #  i18n-hint: Rather than a literal translation, consider adding the
 #  appropriate suffix or prefix to create a word meaning 'something which
 #  has Audacity'
-#: AboutDialog.cpp:156
+#: AboutDialog.cpp:157
 msgid "OK... Audacious!"
 msgstr "OK... Audacious!"
 
 #: AboutDialog.cpp:175
-msgid ""
-"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."
-msgstr ""
-"Audacity は世界中のボランティアの開発者のチームによって製作されたフリーなプロ"
-"グラムです. 開発は SourceForge.net (オープンソースソフトウェアプロジェクトに"
-"無料の様々なツールを提供してくれているオンラインサービス) 上で行われていま"
-"す. Audacity はWindows98 以降, Mac OS X, Linux および他の Unix ライクなオペ"
-"レーティングシステム上で動作します. Audacity のより古いバージョンはマック "
-"OS9 上での利用が可能です."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Audacity は世界中のボランティアの<a href=\"http://audacity.sourceforge.net/community/developers\">開発者</a>のチームによって製作されたフリーなプログラムです. 我々はプロジェクトのホスティングを行ってくれる <a href=\"http://sourceforge.net\">ourceForge.net</a>に感謝しています.Audacity はWindows98 以降, Mac OS X, Linux および他の Unix ライクなオペレーティングシステム上で動作します. Audacity のより古いバージョンはマック OS9 上での利用が可能です."
 
 #: AboutDialog.cpp:179
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
-msgstr ""
-"このプログラムはベータバージョンで, バグや未完成の機能などがあるでしょう. も"
-"し何かお気付きの点などがありましたら, ぜひ私達の WebSite を訪れてください. バ"
-"グの報告や欲しい機能のリクエストなど. みなさんからのフィードバックをお待ちし"
-"ております."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "このプログラムはベータバージョンで, バグや未完成の機能などがあるでしょう. もし何かお気付きの点などがありましたら, ぜひ私達の WebSite を訪れてください. バグの報告や欲しい機能のリクエストなど. みなさんからのフィードバックを<b>feedback at audacityteam.org</b>にお待ちしております. Audacity を使用するうえでの助けが必要なら、<a href=\"http://audacityteam.org/forum/\">フォーラム</a>にアクセスしてみてください."
 
 #: AboutDialog.cpp:182
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
-msgstr ""
-"これは Audacity の安定したリリースバージョンです. ですが, もしバグを見付けた"
-"り欲しい機能などがありましたら, ぜひ私達お知らせください. Audacity を改良し, "
-"より使いやすくしていくために, みなさんからのフィードバックをお待ちしておりま"
-"す. より詳しい情報は, 私達の WebSite をご覧ください."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "これは Audacity の安定したリリースバージョンです. ですが, もしバグを見付けたり欲しい機能などがありましたら, ぜひ私達<b>feedback at audacityteam.org</b>宛にお知らせください. Audacity を使用するうえでの助けが必要なら、<a href=\"http://audacityteam.org/forum/\">フォーラム</a>にアクセスしてみてください."
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -82,13 +60,14 @@ msgstr ""
 #.
 #. For example:  "English translation by Dominic Mazzoni."
 #.
-#: AboutDialog.cpp:192 AboutDialog.cpp:194
+#: AboutDialog.cpp:192
+#: AboutDialog.cpp:194
 msgid "translator_credits"
 msgstr "Japanese translation by Akira Nishimura (akira at rsch.tuis.ac.jp)"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "フリーのディジタルオーディオエディタ"
+msgid "A Free Digital Audio Editor<br>"
+msgstr "フリーのディジタルオーディオエディタ<br>"
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -114,134 +93,162 @@ msgstr "その他の名誉チームメンバー"
 
 #: AboutDialog.cpp:235
 msgid "Other Contributors"
-msgstr "その他の支援者:"
+msgstr "その他の支援者たち"
 
 #: AboutDialog.cpp:240
 msgid "Audacity is based on code from the following projects:"
-msgstr "Audacity は以下のプロジェクトのコードに基づいています。"
+msgstr "Audacity は以下のプロジェクトのコードに基づいています:"
 
 #: AboutDialog.cpp:245
 msgid "Special thanks:"
 msgstr "スペシャルサンクス:"
 
-#: AboutDialog.cpp:254
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr "<b>Audacity&reg;</b>ソフトウェアの著作権は Audacity Team にあります.&copy; 1999-2008.<br><b>Audacity&reg;</b>の名称は Dominic Mazzoni の登録商標です."
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
 msgstr "Audacity"
 
 #. i18n-hint: Information about when audacity was compiled
-#: AboutDialog.cpp:299 AboutDialog.cpp:312 AboutDialog.cpp:468
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
 msgid "Build Information"
 msgstr "コンパイル情報"
 
-#: AboutDialog.cpp:305 effects/AvcCompressor.cpp:674
+#: AboutDialog.cpp:310
+#: effects/AvcCompressor.cpp:674
 msgid "Enabled"
 msgstr "有効になっています"
 
-#: AboutDialog.cpp:306
+#: AboutDialog.cpp:311
 msgid "Disabled"
 msgstr "無効"
 
-#: AboutDialog.cpp:316
+#: AboutDialog.cpp:321
 msgid "File Format Support"
 msgstr "サポートするファイル形式"
 
 #. i18n-hint: This is what the library (libmad) does - imports MP3 files
-#: AboutDialog.cpp:326 AboutDialog.cpp:328
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
 msgid "MP3 Importing"
 msgstr "MP3ファイルを読み込む"
 
-#: AboutDialog.cpp:335 AboutDialog.cpp:338
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:343
 msgid "Ogg Vorbis Import and Export"
 msgstr "Ogg Vorbis 読み込みと書き出し"
 
-#: AboutDialog.cpp:342 AboutDialog.cpp:345
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
 msgid "ID3 tag support"
 msgstr "ID3タグのサポート"
 
-#: AboutDialog.cpp:352 AboutDialog.cpp:355
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
 msgid "FLAC import and export"
 msgstr "FLAC 読み込みと書き出し"
 
-#: AboutDialog.cpp:360 AboutDialog.cpp:363
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
 msgid "MP2 export"
 msgstr "MP2 書き出し"
 
-#: AboutDialog.cpp:368 AboutDialog.cpp:371
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
 msgid "Import via QuickTime"
 msgstr "QuickTime を通じて読み込み"
 
 #. i18n-hint: Libraries that are essential to audacity
-#: AboutDialog.cpp:378
+#: AboutDialog.cpp:383
 msgid "Core Libraries"
 msgstr "コアライブラリ"
 
-#: AboutDialog.cpp:384 AboutDialog.cpp:387 AboutDialog.cpp:390
+#: AboutDialog.cpp:389
 #: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
 msgid "Sample rate conversion"
 msgstr "サンプルレートコンバーター"
 
-#: AboutDialog.cpp:397 AboutDialog.cpp:400
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
 msgid "Audio playback and recording"
 msgstr "オーディオ再生と録音"
 
-#: AboutDialog.cpp:413
+#: AboutDialog.cpp:418
 msgid "Features"
 msgstr "特徴"
 
-#: AboutDialog.cpp:417 AboutDialog.cpp:420 AboutDialog.cpp:425
-#: AboutDialog.cpp:428 AboutDialog.cpp:433 AboutDialog.cpp:436
-#: AboutDialog.cpp:441 AboutDialog.cpp:444
+#: AboutDialog.cpp:422
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:430
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:438
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
 msgid "Plug-in support"
 msgstr "プラグインのサポート"
 
-#: AboutDialog.cpp:449 AboutDialog.cpp:452
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
 msgid "Sound card mixer support"
 msgstr "サウンドカードミキサーのサポート"
 
-#: AboutDialog.cpp:457 AboutDialog.cpp:460
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
 msgid "Pitch and Tempo Change support"
 msgstr "ピッチとテンポの変化のサポート"
 
-#: AboutDialog.cpp:472
+#: AboutDialog.cpp:477
 msgid "Program build date: "
 msgstr "プログラムビルドの日付:"
 
-#: AboutDialog.cpp:475 AboutDialog.cpp:477
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
 msgid "Build type:"
 msgstr "ビルドの種類:"
 
-#: AboutDialog.cpp:475
+#: AboutDialog.cpp:480
 msgid "Debug build"
 msgstr "デバッグビルド"
 
-#: AboutDialog.cpp:477
+#: AboutDialog.cpp:482
 msgid "Release build"
 msgstr "公開ビルド"
 
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
-#: AboutDialog.cpp:482
+#: AboutDialog.cpp:487
 msgid "Installation Prefix: "
 msgstr "インストールのフォルダ: "
 
-#: AboutDialog.cpp:486
+#: AboutDialog.cpp:491
 msgid "Settings folder: "
 msgstr "設定フォルダ: "
 
-#: AboutDialog.cpp:501
+#: AboutDialog.cpp:506
 msgid "GPL License"
 msgstr "GPLライセンス"
 
-#: AudacityApp.cpp:468 Project.cpp:1761
+#: AudacityApp.cpp:507
+#: Project.cpp:1844
 #, c-format
 msgid "%s is already open in another window."
 msgstr "%s は他のウィンドウで既に開かれています."
 
-#: AudacityApp.cpp:470 Project.cpp:1763 Project.cpp:1868 Project.cpp:2012
-#: Project.cpp:2114
+#: AudacityApp.cpp:509
+#: Project.cpp:1846
+#: Project.cpp:1951
+#: Project.cpp:2095
+#: Project.cpp:2232
 msgid "Error opening project"
 msgstr "Audacity プロジェクトファイルの読み込み時にエラーが発生しました"
 
-#: AudacityApp.cpp:502
+#: AudacityApp.cpp:541
 #, c-format
 msgid ""
 "%s does not exist and could not be opened.\n"
@@ -252,37 +259,38 @@ msgstr ""
 "\n"
 "履歴より削除されています。"
 
-#: AudacityApp.cpp:581
+#: AudacityApp.cpp:643
 msgid "Master Gain Control"
 msgstr "マスターゲインコントロール"
 
-#: AudacityApp.cpp:582
+#: AudacityApp.cpp:644
 msgid "Input Meter"
 msgstr "インプットメーター"
 
-#: AudacityApp.cpp:583
+#: AudacityApp.cpp:645
 msgid "Output Meter"
 msgstr "出力メーター"
 
 #  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+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:751 Menus.cpp:478
+#: AudacityApp.cpp:809
 msgid "&Preferences...\tCtrl+,"
-msgstr "設定... (&P)\tCtrl+."
+msgstr "設定... (&P)\tCtrl+,"
 
-#: AudacityApp.cpp:833 AudacityApp.cpp:910
+#: AudacityApp.cpp:901
+#: AudacityApp.cpp:978
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "ブロックサイズを %ld にします\n"
 
-#: AudacityApp.cpp:855 AudacityApp.cpp:925
+#: AudacityApp.cpp:923
+#: AudacityApp.cpp:993
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "不明なコマンドラインオプションです: %s\n"
 
-#: AudacityApp.cpp:1044
+#: AudacityApp.cpp:1127
 msgid ""
 "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
@@ -290,15 +298,11 @@ msgstr ""
 "Audacity はテンポラリファイルを製作する場所を見つけられませんでした.\n"
 "設定メニューでテンポラリファイルを製作するディレクトリー名を入力してください."
 
-#: AudacityApp.cpp:1050
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
-msgstr ""
-"Audacity を終了させます. 新しいテンポラリディレクトリを使うために, Audacity "
-"を再起動して下さい."
+#: AudacityApp.cpp:1133
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity を終了させます. 新しいテンポラリディレクトリを使うために, Audacity を再起動して下さい."
 
-#: AudacityApp.cpp:1082
+#: AudacityApp.cpp:1165
 msgid ""
 "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
@@ -308,7 +312,7 @@ msgstr ""
 "システムを停止させたりすることがあります。\n"
 "\n"
 
-#: AudacityApp.cpp:1089
+#: AudacityApp.cpp:1172
 msgid ""
 "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
@@ -316,32 +320,31 @@ msgstr ""
 "Audacity はテンポラリファイルのあるフォルダをロックできません.\n"
 "このフォルダは別に起動されたAudacityが使用しているようです.\n"
 
-#: AudacityApp.cpp:1091
+#: AudacityApp.cpp:1174
 msgid "Do you still want to start Audacity?"
 msgstr "それでも Audacity を開始しますか?"
 
-#: AudacityApp.cpp:1093
+#: AudacityApp.cpp:1176
 msgid "Error locking temporary folder"
 msgstr "テンポラリフォルダのロックに失敗"
 
-#: AudacityApp.cpp:1131
+#: AudacityApp.cpp:1214
 msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "システムは別の Audacity が動作していることを検知しました。\n"
 
-#: AudacityApp.cpp:1133
+#: AudacityApp.cpp:1216
 msgid ""
 "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
 msgstr ""
-"複数のプロジェクトを同時に開いて作業するためには、新規 あるいは開くコマンド"
-"を、\n"
+"複数のプロジェクトを同時に開いて作業するためには、新規 あるいは開くコマンドを、\n"
 "今動作している Audacity において使ってください。\n"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1217
 msgid "Audacity is already running"
 msgstr "Audacity は既に起動されています"
 
-#: AudacityApp.cpp:1151
+#: AudacityApp.cpp:1234
 msgid "Command-line options supported:"
 msgstr "コマンドラインを使っての書き出しのサポート:"
 
@@ -349,20 +352,20 @@ msgstr "コマンドラインを使っての書き出しのサポート:"
 #  * English. This displays a list of available options
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1154
+#: AudacityApp.cpp:1237
 msgid "\t-help (this message)"
 msgstr "\t-help (this message)"
 
 #  i18n-hint '-version' needs to stay in English.
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1156
+#: AudacityApp.cpp:1239
 msgid "\t-version (display Audacity version)"
 msgstr "\t-version (display Audacity version)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1160
+#: AudacityApp.cpp:1243
 msgid "\t-test (run self diagnostics)"
 msgstr "\t-test (run self diagnostics)"
 
@@ -370,19 +373,15 @@ msgstr "\t-test (run self diagnostics)"
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1165
+#: AudacityApp.cpp:1248
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (set max disk block size in bytes)"
 
-#: AudacityApp.cpp:1166
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
-msgstr ""
-"加えて、オーディオファイルの名前あるいは Audacity プロジェクトが開く名前を指"
-"定してください。"
+#: AudacityApp.cpp:1249
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "加えて、オーディオファイルの名前あるいは Audacity プロジェクトが開く名前を指定してください。"
 
-#: AudacityApp.cpp:1443
+#: AudacityApp.cpp:1529
 msgid ""
 "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
@@ -394,15 +393,15 @@ msgstr ""
 "\n"
 "ダブルクリックで開くために関連付けを行いますか?"
 
-#: AudacityApp.cpp:1444
+#: AudacityApp.cpp:1530
 msgid "Audacity Project Files"
 msgstr "Audacity プロジェクトファイル"
 
-#: AudioIO.cpp:241
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
 msgstr "オーディオデバイスが見つかりません。\n"
 
-#: AudioIO.cpp:242
+#: AudioIO.cpp:255
 msgid ""
 "You will not be able to play or record audio.\n"
 "\n"
@@ -410,30 +409,27 @@ msgstr ""
 "再生もしくは録音することができないでしょう.\n"
 "\n"
 
-#: AudioIO.cpp:245
+#: AudioIO.cpp:258
 msgid "Error: "
 msgstr "エラー: "
 
-#: AudioIO.cpp:248
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
 msgstr "オーディオの初期化時にエラーが発生しました"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr "レイテンシー(潜時)の問題"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid ""
 "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
 msgstr ""
-"レイテンシーの設定は、録音された音をゼロ時刻より前に隠れている状態にしま"
-"す。\n"
+"レイテンシーの設定は、録音された音をゼロ時刻より前に隠れている状態にします。\n"
 "Audacity はそれをゼロ時刻から開始するように巻き戻します。\n"
-"トラックを正しい時刻にドラッグするために、タイムシフトツール(<---> あるいは "
-"F5)を使うべきでしょう"
+"トラックを正しい時刻にドラッグするために、タイムシフトツール(<---> あるいは F5)を使うべきでしょう"
 
 #: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
@@ -444,24 +440,21 @@ msgid ""
 "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
 msgstr ""
-"いくつかのプロジェクトは Audacity が最後に動作状態にあったときに正常に保存さ"
-"れていません。\n"
+"いくつかのプロジェクトは Audacity が最後に動作状態にあったときに正常に保存されていません。\n"
 "うまくいけば、以下のプロジェクトは自動的に回復することができるでしょう。"
 
 #: AutoRecovery.cpp:75
 msgid "Recoverable projects"
 msgstr "回復可能なプロジェクト"
 
-#: AutoRecovery.cpp:78 Tags.cpp:2032
+#: AutoRecovery.cpp:78
+#: Tags.cpp:2041
 msgid "Name"
 msgstr "名前"
 
 #: AutoRecovery.cpp:84
-msgid ""
-"Recovering a project will not change any files on disk before you save it."
-msgstr ""
-"プロジェクトを回復することは、そのプロジェクトを保存するまではディスク上のい"
-"かなるファイルも修正することはありません。"
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "プロジェクトを回復することは、そのプロジェクトを保存するまではディスク上のいかなるファイルも修正することはありません。"
 
 #: AutoRecovery.cpp:88
 msgid "Quit Audacity"
@@ -487,59 +480,77 @@ msgstr ""
 msgid "Confirm?"
 msgstr "確認?"
 
-#: AutoRecovery.cpp:146 AutoRecovery.cpp:183
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
 msgid "Could not enumerate files in auto save directory"
 msgstr "自動保存ディレクトリにファイル番号を振ることができません。"
 
-#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2575 Menus.cpp:4514
-#: Project.cpp:1971 Project.cpp:3343 Project.cpp:3422 WaveTrack.cpp:556
-#: WaveTrack.cpp:575 WaveTrack.cpp:1689 effects/Effect.cpp:436
-#: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
-#: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
-#: toolbars/ControlToolBar.cpp:846
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:3053
+#: Menus.cpp:3065
+#: Menus.cpp:5182
+#: Project.cpp:2054
+#: Project.cpp:3615
+#: Project.cpp:3694
+#: TrackPanel.cpp:6385
+#: WaveTrack.cpp:598
+#: WaveTrack.cpp:617
+#: WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077
+#: WaveTrack.cpp:2087
+#: effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "エラー"
 
-#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr "コマンドを選択"
 
-#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:454
+#: BatchCommandDialog.cpp:82
+#: BatchProcessDialog.cpp:454
 #: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
 msgstr "コマンド (&C)"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr "編集パラメータ (&E)"
 
-#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:455
+#: BatchCommandDialog.cpp:91
+#: BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr "パラメータ (&P)"
 
-#: BatchCommandDialog.cpp:94
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr "コマンドを選択 (&h)"
 
-#: BatchCommands.cpp:477
+#: BatchCommands.cpp:456
 msgid "Stereo to Mono Effect not found"
 msgstr "ステレオからモノラルへの効果が見つかりません"
 
-#: BatchCommands.cpp:497
+#: BatchCommands.cpp:476
 msgid "Ogg Vorbis support is not included in this build of Audacity"
 msgstr "この Audacity のビルドには Ogg Vorbis のサポートは含まれていません"
 
-#: BatchCommands.cpp:509
+#: BatchCommands.cpp:488
 msgid "FLAC support is not included in this build of Audacity"
 msgstr "この Audacity のビルドには FLACのサポートは含まれていません"
 
-#: BatchCommands.cpp:513
+#: BatchCommands.cpp:492
 #, c-format
 msgid "Command %s not implemented yet"
 msgstr "コマンド %s はまだ実装されていません"
 
-#: BatchCommands.cpp:529
+#: BatchCommands.cpp:508
 #, c-format
 msgid ""
 "Could not set parameters of effect %s\n"
@@ -548,12 +559,12 @@ msgstr ""
 "エフェクト %s のパラメータが \n"
 "%s に設定できません"
 
-#: BatchCommands.cpp:583
+#: BatchCommands.cpp:561
 #, c-format
 msgid "Your batch command of %s was not recognised."
 msgstr "自動実行コマンド %s は認識されません。"
 
-#: BatchCommands.cpp:674
+#: BatchCommands.cpp:652
 #, c-format
 msgid ""
 "Apply %s with parameter(s)\n"
@@ -564,20 +575,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: BatchCommands.cpp:675 BatchCommands.cpp:680
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
 msgid "Test Mode"
 msgstr "テストモード"
 
-#: BatchCommands.cpp:679
+#: BatchCommands.cpp:657
 #, c-format
 msgid "Apply %s"
 msgstr "%s を適用"
 
-#: BatchProcessDialog.cpp:60 BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
 #: BatchProcessDialog.cpp:71
 msgid "Apply Chain"
 msgstr "チェインを適用..."
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "クリーンスピーチ バッチ処理"
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "チェインを選択 (&S)"
@@ -596,15 +613,23 @@ msgstr "現在のプロジェクトに適用 (&P)"
 msgid "Apply to &Files..."
 msgstr "ファイルへ適用... (&F)"
 
-#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2071
-#: Tags.cpp:2075 Tags.cpp:2375 Tags.cpp:2379 UploadDialog.cpp:180
-#: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:183
-#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:446
-#: effects/audiounits/AudioUnitEffect.cpp:882 effects/vamp/VampEffect.cpp:411
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2080
+#: Tags.cpp:2084
+#: Tags.cpp:2384
+#: Tags.cpp:2388
+#: UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732
+#: effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
 msgstr "キャンセル (&C)"
 
-#: BatchProcessDialog.cpp:146 BatchProcessDialog.cpp:191
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
 msgid "No chain selected"
 msgstr "チェインが選択されていません."
 
@@ -617,19 +642,21 @@ msgstr "`%s' を現在のプロジェクトに適用中"
 msgid "Please save and close the current project first."
 msgstr "現在のプロジェクトを先に保存して閉じてください。"
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "自動実行処理のために音声ファイルを選択してください..."
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "自動実行処理のためにファイルを選択してください..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr "Vocal ファイル (*.wav;*.mp3)|*.wav;*.mp3|WAV ファイル (*.wav)|*.wav|MP3 ファイル (*.mp3)|*.mp3"
+
 #: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
-msgstr ""
-"全てのファイル  (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|"
-"AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "全てのファイル  (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 
 #: BatchProcessDialog.cpp:231
 msgid "Applying..."
@@ -639,7 +666,8 @@ msgstr "適用中..."
 msgid "File"
 msgstr "ファイル"
 
-#: BatchProcessDialog.cpp:356 BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
 #: BatchProcessDialog.cpp:361
 msgid "Edit Chains"
 msgstr "チェインを編集"
@@ -648,12 +676,19 @@ msgstr "チェインを編集"
 msgid "&Chains"
 msgstr "チェイン (&C)"
 
-#: BatchProcessDialog.cpp:435 Tags.cpp:815 Tags.cpp:1455 Tags.cpp:2055
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:826
+#: Tags.cpp:1465
+#: Tags.cpp:2064
 msgid "&Add"
 msgstr "加算 (&A)"
 
-#: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:816 Tags.cpp:1456
-#: Tags.cpp:2056 TrackPanel.cpp:4201
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:128
+#: Tags.cpp:827
+#: Tags.cpp:1466
+#: Tags.cpp:2065
+#: TrackPanel.cpp:4176
 msgid "&Remove"
 msgstr "削除(&R)"
 
@@ -730,85 +765,79 @@ msgstr "依存関係を削除中"
 msgid "Copying audio data into project..."
 msgstr "オーディオデータをプロジェクトにコピーしています..."
 
-#: Dependencies.cpp:219
+#: Dependencies.cpp:223
 msgid ""
 "Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
 msgstr ""
 "プロジェクトは現在、別のファイルに依存しています。\n"
-"自分自身でファイルを保持するために、以下のファイルからプロジェクトにオーディ"
-"オをコピーしませんか?\n"
+"自分自身でファイルを保持するために、以下のファイルからプロジェクトにオーディオをコピーしませんか?\n"
 "この作業はより多くのディスク領域を必要としますが、より安全であるといえます。"
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
 msgstr "プロジェクトは別のオーディオファイルに依存しています"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
 msgstr "プロジェクトの依存性"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
 msgstr "オーディオファイル"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
 msgstr "ディスクスペース"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
 msgstr "選択されたオーディオをプロジェクトへコピー"
 
-#: Dependencies.cpp:304 Dependencies.cpp:410
+#: Dependencies.cpp:308
+#: Dependencies.cpp:414
 msgid "Cancel Save"
 msgstr "保存をキャンセル"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
 msgstr "いかなるオーディオもコピーしません"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
 msgstr "全てのオーディオをプロジェクトにコピーします(より安全)"
 
-#: Dependencies.cpp:317 Dependencies.cpp:322
+#: Dependencies.cpp:321
+#: Dependencies.cpp:326
 msgid "Ask me"
 msgstr "質問してください"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
 msgstr "常に全てのオーディオをコピーする(最も安全)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
 msgstr "絶対にオーディオをコピーしない"
 
-#: Dependencies.cpp:321
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
 msgstr "プロジェクトが別のファイルに依存するときはいつも:"
 
-#: Dependencies.cpp:409
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
+#: Dependencies.cpp:413
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
 msgstr "もし続行すると、プロジェクトはディスクに保存されません。続行しますか?"
 
-#: Dependencies.cpp:449
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
-msgstr ""
-"プロジェクトは自分自身でオーディオを含んでいます; 別の外部のオーディオファ"
-"イルに依存していません。"
+#: Dependencies.cpp:453
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "プロジェクトは自分自身でオーディオを含んでいます; 別の外部のオーディオファイルに依存していません。"
 
-#: Dependencies.cpp:450
+#: Dependencies.cpp:454
 msgid "Dependency check"
 msgstr "依存性のチェック"
 
-#: DirManager.cpp:136
+#: DirManager.cpp:137
 msgid ""
 "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
@@ -816,32 +845,32 @@ msgstr ""
 "警告: ディスクの空き容量がわずかしか残っていません. \n"
 "他のテンポラリディレクトリを設定で選択してください."
 
-#: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
+#: DirManager.cpp:223
+#: DirManager.cpp:254
+#: DirManager.cpp:337
 msgid "Progress"
 msgstr "進行"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
 msgstr "テンポラリファイルのクリア..."
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "プロジェクトファイルを保存中"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
 msgstr "キャッシュディレクトリをクリア中"
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
 msgid ""
 "Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
 msgstr ""
 "Audacity は管理されていないブロックファイル %s を見つけました! \n"
-"完全なプロジェクトのチェックを実行するために、プロジェクトを保存して再読み込"
-"みすることを検討してください。\n"
+"完全なプロジェクトのチェックを実行するために、プロジェクトを保存して再読み込みすることを検討してください。\n"
 
 #  i18n-hint: This is the pattern for filenames that are created
 #  when a file needs to be backed up to a different name.  For
@@ -852,102 +881,103 @@ msgstr ""
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:985
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-old%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr "テストファイルを作成あるいは開けません"
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr "%s を削除できません。"
 
-#: DirManager.cpp:1007
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "リネームされたファイル: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "ブロック %s の変更\n"
-
-#: DirManager.cpp:1051
+#: DirManager.cpp:1160
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "%s' から '%s' へリネームできません"
 
-#: DirManager.cpp:1115 DirManager.cpp:1403
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr "ブロック %s は新しいエリアス名に変更されました\n"
+
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
 msgid "Inspecting project file data..."
 msgstr "プロジェクトファイルを精査しています..."
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr "管理されていないブロックファイル: (%s)"
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr "欠損したエリアスファイル: (%s)"
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr "欠損した要約ファイル: (%s.auf)"
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
 msgstr "欠損したデータファイル: (%s.au)"
 
-#: DirManager.cpp:1207
+#: DirManager.cpp:1319
 msgid ""
 "Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 msgstr ""
-"プロジェクトチェックは読み込まれたプロジェクトデータを精査して不整合性を見つ"
-"けました。\n"
-"完全なエラーのリストを得るために、`詳細'をクリックするか、より多くのオプショ"
-"ンに進むため`OK'をクリックしてください。"
+"プロジェクトチェックは読み込まれたプロジェクトデータを精査して不整合性を見つけました。\n"
+"完全なエラーのリストを得るために、`詳細'をクリックするか、より多くのオプションに進むため`OK'をクリックしてください。"
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1331
 #, c-format
 msgid ""
 "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr ""
-"プロジェクトチェックは %d 個の管理されていないブロックファイルを見つけまし"
-"た。これらのファイルは\n"
-"使われておらず、多分なんらかのバグかプログラムの停止によって残されたもので"
-"しょう。\n"
+"プロジェクトチェックは %d 個の管理されていないブロックファイルを見つけました。これらのファイルは\n"
+"使われておらず、多分なんらかのバグかプログラムの停止によって残されたものでしょう。\n"
 "それらは、ディスク競合を防ぐために消すべきでしょう。"
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
 msgstr "管理されていないファイルの削除 [安全かつ推奨]"
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "削除せずに続行; こっそり余分なファイルに向きをかえる"
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr "何も変更せずにすぐにプロジェクトを閉じる"
 
-#: DirManager.cpp:1228 DirManager.cpp:1263 DirManager.cpp:1309
-#: DirManager.cpp:1351 export/Export.cpp:490 export/Export.cpp:507
-#: export/Export.cpp:526 widgets/Warning.cpp:55
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
+#: widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "警告"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1366
 #, c-format
 msgid ""
 "Project check detected %d input file[s] being used in place\n"
@@ -957,28 +987,27 @@ msgid ""
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
 msgstr ""
-"プロジェクトチェックは (`エリアスファイル')が今は存在しない場所で使われてい"
-"ã‚‹ \n"
-"%d 個の入力ファイルを見つけました。Audacity はそれらのファイルを自動的に回復"
-"する\n"
-"すべをもちません; 恒久的に欠損ファイルを無音で満たすか、一時的にこのセッショ"
-"ンのみ無音で\n"
-"満たすか、プロジェクトをすぐに閉じて欠損したファイルを手動で回復するかを選ぶ"
-"とよいでしょう。"
-
-#: DirManager.cpp:1259
+"プロジェクトチェックは (`エリアスファイル')が今は存在しない場所で使われている \n"
+"%d 個の入力ファイルを見つけました。Audacity はそれらのファイルを自動的に回復する\n"
+"すべをもちません; 恒久的に欠損ファイルを無音で満たすか、一時的にこのセッションのみ無音で\n"
+"満たすか、プロジェクトをすぐに閉じて欠損したファイルを手動で回復するかを選ぶとよいでしょう。"
+
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr "欠損したデータファイルを無音で置換する [保存するにあたって恒久的に]"
 
-#: DirManager.cpp:1260 DirManager.cpp:1348
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr "一時的に欠損したデータを無音で置換する [このセッションのみ]"
 
-#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr "これ以上の変更をしないでプロジェクトをすぐに閉じる"
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1412
 #, c-format
 msgid ""
 "Project check detected %d missing summary file[s] (.auf).\n"
@@ -986,19 +1015,18 @@ msgid ""
 "original audio data in the project."
 msgstr ""
 "プロジェクトチェックは %d 個の欠損した要約ファイル(.auf)を見つけました。\n"
-"Audacity は、それらの要約ファイルをプロジェクトにある元のオーディオデータか"
-"ら\n"
+"Audacity は、それらの要約ファイルをプロジェクトにある元のオーディオデータから\n"
 "完全に再生成することができます。"
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr "要約ファイルを再生成する [安全かつ推奨]"
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
 msgstr "表示データの欠損を無音で埋める [このセッションのみ]"
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1454
 #, c-format
 msgid ""
 "Project check detected %d missing audio data blockfile[s] (.au), \n"
@@ -1012,33 +1040,30 @@ msgstr ""
 "プロジェクトチェックは 多分バグかシステム停止あるいは偶発的な削除によって\n"
 "%d 個の欠損したオーディオデータのブロックファイル(.au)を見つけました。\n"
 "Audacity はそれらの失われたデータを自動的に回復することはできません; \n"
-"欠損データを恒久的に無音で埋めるか、一時的にこのセッションのみ無音で埋める"
-"か、\n"
-"あるいはプロジェクトをすぐ閉じて欠損したデータを手動で回復するかをえらんでく"
-"ださい。"
+"欠損データを恒久的に無音で埋めるか、一時的にこのセッションのみ無音で埋めるか、\n"
+"あるいはプロジェクトをすぐ閉じて欠損したデータを手動で回復するかをえらんでください。"
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr "欠損したデータを無音で置換する [恒久的にいますぐ]"
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
-msgstr ""
-"プロジェクトデータの中で使われていないディレクトリをきれいにしています..."
+msgstr "プロジェクトデータの中で使われていないディレクトリをきれいにしています..."
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1558
 msgid "Caching audio"
 msgstr "オーディオをキャッシュしています"
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
 msgstr "オーディオをメモリにキャッシュしています..."
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
 msgstr "録音されたオーディオを保存中"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
 msgstr "録音されたオーディオをディスクに保存しています..."
 
@@ -1046,23 +1071,132 @@ msgstr "録音されたオーディオをディスクに保存しています...
 msgid "Rectangular"
 msgstr "矩形"
 
-#: FreqWindow.cpp:104
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr "FFmpeg 対応はコンパイルされていません"
+
+#: FFmpeg.cpp:101
+msgid ""
+"FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+"FFmpegは設定されており以前は正常に読み込まれていましたが                       \n"
+"今回Audacity起動時に読み込み失敗しました。                       \n"
+"\n"
+"設定 > 読み込み/書き出しで再設定してください。"
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr "FFmpegの起動に失敗しました。"
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "FFmpeg ライブラリが見付かりません."
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr "FFmpegを位置づける"
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "ファイル %s が FFmpeg を通じて入出力を行うために必要です。"
+
+#: FFmpeg.cpp:196
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "位置 %s :"
+
+#: FFmpeg.cpp:205
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "%s を見つけるには、ここをクリック -->"
+
+#: FFmpeg.cpp:211
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "ブラウズ..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "FFmpeg の無料コピーを入手するには、ここをクリック -->"
+
+#: FFmpeg.cpp:215
+#: export/ExportMP3.cpp:579
+msgid "Download"
+msgstr "ダウンロード"
+
+#  i18n-hint: It's asking for the location of a file, for
+#  example, "Where is lame_enc.dll?" - you could translate
+#  "Where would I find the file %s" instead if you want.
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "%s はどこにありますか?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr "コンパチブルなFFmpegライブラリが存在しません。"
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "FFmpeg が見つかりません"
+
+#: FFmpeg.h:101
+msgid ""
+"Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+"Audacityはオーディオファイルを読み込むためにFFmpegライブラリを使おうとしましたが、\n"
+"ライヴラリが存在しませんでした。\n"
+"FFmpeg読み込み機能を使う場合は、設定 > 読み込み/書き出しで\n"
+"ライブラリの場所を指定してください。"
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr "この警告を再表示しないでください。"
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "avformat.dll のみ|*avformat*.dll|動的リンクライブラリ (*.dll)|*.dll|すべてのファイル (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "ダイナミックライブラリ (*.dylib)|*.dylib|全ファイル (*)|*"
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "libavformat.so|libavformat.so*|ダイナミックリンクライブラリ (*.so*)|*.so*|全ファイル (*)|* のみ"
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "周波数解析"
 
-#: FreqWindow.cpp:140 TrackPanel.cpp:563
+#: FreqWindow.cpp:139
+#: TrackPanel.cpp:556
+#: prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "スペクトログラム表示"
 
-#: FreqWindow.cpp:141
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "標準自己相関"
 
-#: FreqWindow.cpp:142
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "立方根自己相関"
 
-#: FreqWindow.cpp:143
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "強調された自己相関 (Enhanced Autocorrelation)"
 
@@ -1075,15 +1209,18 @@ msgstr "強調された自己相関 (Enhanced Autocorrelation)"
 #. i18n-hint: This is a technical term, derived from the word
 #. "spectrum".  Do not translate it unless you are sure you
 #. know the correct technical word in your language.
-#: FreqWindow.cpp:147
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "ケプストラム"
 
 #: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "アルゴリズム:"
+#: FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "アルゴリズム"
 
-#: FreqWindow.cpp:168 HistoryWindow.cpp:79
+#: FreqWindow.cpp:169
+#: FreqWindow.cpp:173
+#: HistoryWindow.cpp:79
 msgid "Size"
 msgstr "サイズ"
 
@@ -1093,41 +1230,62 @@ msgstr "サイズ"
 #  Frequency analyze dialog box.
 #. i18n-hint: This refers to a "window function", used in the
 #. Frequency analyze dialog box.
-#: FreqWindow.cpp:181
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr "ウィンドウ"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "窓関数:"
+#: FreqWindow.cpp:187
+#: FreqWindow.cpp:191
+msgid "Function"
+msgstr "窓関数"
 
-#: FreqWindow.cpp:192
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "リニア周波数軸"
 
-#: FreqWindow.cpp:193
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "対数周波数軸"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "軸:"
+#: FreqWindow.cpp:201
+#: FreqWindow.cpp:205
+msgid "Axis"
+msgstr "軸"
 
-#: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:204 Menus.cpp:233
+#: FreqWindow.cpp:212
+#: LabelDialog.cpp:130
+#: Menus.cpp:241
+#: Menus.cpp:276
 msgid "&Export..."
 msgstr "書き出し...(&E)"
 
-#: FreqWindow.cpp:209 widgets/ErrorDialog.cpp:159
+#: FreqWindow.cpp:213
+#: export/ExportCL.cpp:325
+#: export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "書き出し"
+
+#: FreqWindow.cpp:216
+#: FreqWindow.cpp:217
+#: widgets/ErrorDialog.cpp:161
 msgid "Close"
 msgstr "閉じる"
 
-#: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:489
-#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:791
-#: effects/Compressor.cpp:352 effects/Compressor.cpp:360
-#: effects/Equalization.cpp:1109 effects/Equalization.cpp:1111
-#: effects/Equalization.cpp:1119 effects/Equalization.cpp:1185
-#: effects/Equalization.cpp:1394 effects/Equalization.cpp:1405
-#: effects/Normalize.cpp:365 widgets/Meter.cpp:380
+#: FreqWindow.cpp:280
+#: FreqWindow.cpp:410
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:792
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1123
+#: effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133
+#: effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408
+#: effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367
+#: widgets/Meter.cpp:417
 msgid "dB"
 msgstr "dB"
 
@@ -1137,49 +1295,55 @@ msgstr "dB"
 #  cycles per second.
 #. i18n-hint: This is the abbreviation for "Hertz", or
 #. cycles per second.
-#: FreqWindow.cpp:287 FreqWindow.cpp:442 effects/Equalization.cpp:1150
-#: effects/Equalization.cpp:1181 import/ImportRaw.cpp:416
+#: FreqWindow.cpp:295
+#: FreqWindow.cpp:450
+#: effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195
+#: import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Hz"
 
-#: FreqWindow.cpp:386
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
 msgstr "必要なデータが選択されていません."
 
-#: FreqWindow.cpp:450 effects/AutoDuck.cpp:793
+#: FreqWindow.cpp:458
+#: effects/AutoDuck.cpp:794
 msgid "s"
 msgstr "s"
 
-#: FreqWindow.cpp:779
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr "カーソル: %d Hz (%s) = %d dB    ピーク: %d Hz (%s) = %.1f dB"
 
-#: FreqWindow.cpp:788
+#: FreqWindow.cpp:796
 #, c-format
-msgid ""
-"Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
-msgstr ""
-"カーソル: %.4f sec (%d Hz) (%s) = %f,    ピーク: %.4f sec (%d Hz) (%s) = %.3f"
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "カーソル: %.4f sec (%d Hz) (%s) = %f,    ピーク: %.4f sec (%d Hz) (%s) = %.3f"
 
-#: FreqWindow.cpp:1061
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "spectrum.txt"
 
-#: FreqWindow.cpp:1063
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "スペクトルデータの書き出し:"
 
-#: FreqWindow.cpp:1079 LabelDialog.cpp:599 Menus.cpp:2207 Project.cpp:2441
-#: Project.cpp:3395 prefs/KeyConfigPrefs.cpp:180
+#: FreqWindow.cpp:1087
+#: LabelDialog.cpp:603
+#: Menus.cpp:2555
+#: Project.cpp:2604
+#: Project.cpp:3667
+#: prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
 msgstr "ファイルが書き込めません:"
 
-#: FreqWindow.cpp:1084
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
 msgstr "周波数 (Hz)\tレベル (dB)"
 
-#: FreqWindow.cpp:1090
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "遅延 (秒)\t周波数 (Hz)\tレベル"
 
@@ -1244,253 +1408,56 @@ msgid "Welcome to Audacity "
 msgstr "Audacity へようこそ"
 
 #: HelpText.cpp:151
-msgid ""
-"Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|"
-"record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or "
-"open an Audacity project]] <li>[[export|export]] to an MP3 or other audio "
-"file, or [[burncd|burn to a CD]]  </ul></p><p>"
-msgstr ""
-"以下のリンクをクリックすると、操作方法を学べます:<ul><li>既存サウンドファイル"
-"の[[play|再生]]方法<li>新しいサウンドファイルの[[record|録音]]方法<li>[[edit|"
-"編集]]方法と MP3のようなサウンドファイルを[[export|書き出す]]方法<li>"
-"[[burncd|CDを作成]]</ul></p><p>"
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "以下のリンクをクリックすると、操作方法を学べます:<ul><li>既存サウンドファイルの[[play|再生]]方法<li>新しいサウンドファイルの[[record|録音]]方法<li>[[edit|編集]]方法と MP3のようなサウンドファイルを[[export|書き出す]]方法<li>[[burncd|CDを作成]]</ul></p><p>"
 
 #: HelpText.cpp:159
-msgid ""
-"This screen can be viewed at any time by clicking the <i>Help</i> menu, then "
-"<i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus "
-"and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a "
-"href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf"
-"\">full Manual</a> in PDF format.</p>"
-msgstr ""
-"<i>ヘルプ</i>メニューをクリックして、<i>ウェルカムメッセージを表示</i>を選べ"
-"ばこの画面にいつでも戻ることができます。より詳しい全てのメニューやコントロー"
-"ルのガイドには、<i>ヘルプ</i>メニューをクリックして<i>目次</i>を見るか、<a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">マニュアルのダウ"
-"ンロード</a>を行なってPDFファイルを入手するかして、完全なヘルプを読んでくださ"
-"い。</p>"
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "<i>ヘルプ</i>メニューをクリックして、<i>ウェルカムメッセージを表示</i>を選べばこの画面にいつでも戻ることができます。より詳しい全てのメニューやコントロールのガイドには、<i>ヘルプ</i>メニューをクリックして<i>目次</i>を見るか、<a href=\"http://audacity.sourceforge.net/help/documentation\">マニュアルのダウンロード</a>を行なってPDFファイルを入手するかして、完全なヘルプを読んでください。</p>"
 
 #: HelpText.cpp:172
-msgid ""
-"<p><b>Opening audio files:</b> Either drag the files into the current "
-"project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be "
-"opened into a new project window with <i>File &gt; Open</i>. The main "
-"formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), "
-"<b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if "
-"your file is in some other format. <b>To import a CD:</b> extract it to WAV "
-"or AIFF using iTunes, Windows Media Player 11 or similar. See our online "
-"guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:"
-"</b> Press the green Play button to start playback. Press the blue Pause "
-"button once to pause playback, and again to resume. To stop, press the "
-"yellow Stop button. Spacebar can be used to either play or stop. After "
-"stopping, playback resumes from its last starting point. To change the "
-"starting point, click in the track at your desired starting point. The <b>|"
-"&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start "
-"or end of the track respectively. </p><br><br>"
-msgstr ""
-"<p><b>オーディオファイルを開くには:</b> ファイルファイルを現在のプロジェクトウィンドウへドラッグして、あるいは <i>ファイル &gt; 読み込み "
-"&gt; オーディオ </i>のコマンドのいずれでも読み込むことができます。<i>ファイル &gt; "
-"開く </i>によっても、新しいプロジェクトウィンドウに開くことができます。"
-"Audacity が再生する主なファイル形式は<b>AIFF, AU, FLAC, M4A</b> (Mac のみ) <b>MP2/MP3, OGG "
-"Vorbis</b> それと <b>WAV</b>です。もし、何か別の形式のファイルである場合は、"
-"[[wma-proprietary|ここ]]をクリックしてください。<b>オーディオCDから読み込む場合: </b>"
-"iTunes、Windows Media Player 11 や同様なソフトを使って AIFF か WAV "
-"ファイルにしてください。オンラインガイド"
-"[[wiki:How to import CDs|CDの取り込み方]]を見てください。</p><p><p><b>オーディオの"
-"再生: </b> 緑色の再生ボタンを押してください。青い一時停止ボタンを押すと"
-"一時停止、もう一度押すと再生の再開ができます。再生を停止するには黄色"
-"のボタンです。スペースキーも再生と停止いずれにも使えます。停止"
-"した後に再度再生したい場合は、直前に開始した位置より再生が再開されます。再生"
-"開始時刻を変更したい場合は、<b>|&lt;&lt;</b> と <b>&gt;&gt;|</b> ボタンを使っ"
-"て、あるいはトラック上の好きな点をクリックして選んで、開始点あるいは終了点を"
-"それぞれ選んでください。</p><br><br>"
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>オーディオファイルを開くには:</b> ファイルファイルを現在のプロジェクトウィンドウへドラッグして、あるいは <i>ファイル &gt; 読み込み &gt; オーディオ </i>のコマンドのいずれでも読み込むことができます。<i>ファイル &gt; 開く </i>によっても、新しいプロジェクトウィンドウに開くことができます。Audacity が再生する主なファイル形式は<b>AIFF, AU, FLAC, M4A</b> (Mac のみ) <b>MP2/MP3, OGG Vorbis</b> それと <b>WAV</b>です。もし、何か別の形式のファイルである場合は、[[wma-proprietary|ここ]]をクリックしてください。<b>オーディオCDから読み込む場合: </b>iTunes、Windows Media Player 11 や同様なソフトを使って AIFF か WAV ファイルにしてください。オンラインガイド[[wiki:How to import CDs|CDの取り込み方]]を見てください。</p><p><p><b>オーディオの再生: </b> 緑色の再生ボタンを押してください。青い一時停止ボタンを押すと一時停止、もう一度押すと再生の再開ができます。再生を停止するには黄色のボタンです。スペースキーも再生と停止いずれにも使えます。停止した後に再度再生したい場合は、直前に開始した位置より再生が再開されます。再生開始時刻を変更したい場合は、<b>|&lt;&lt;</b> と <b>&gt;&gt;|</b> ボタンを使って、あるいはトラック上の好きな点をクリックして選んで、開始点あるいは終了点をそれぞれ選んでください。</p><br><br>"
 
 #: HelpText.cpp:194
-msgid ""
-"<p><b>To record:</b> Set the recording device and input source, adjust the "
-"input level, then press the red Record button.</b></p><p> 1) [[inputdevice|"
-"Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or "
-"in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo "
-"recording if required.<br> 2) [[inputsource|Set input source]] for that "
-"device (for example, microphone or line-in) in the dropdown selector of the "
-"<i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the "
-"<i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) "
-"[[inputlevel|Adjust input level]] using the right-hand slider on the "
-"<i>Mixer Toolbar</i>. Correct adjustment of level before recording is "
-"essential to avoid noise or distortion. </p><p> More help at: \"Recording\" "
-"<a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial "
-"<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-"
-"_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://"
-"www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our "
-"Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:"
-"Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
-msgstr ""
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>録音するには: </b>録音デバイスと入力ソースをセットして、入力レベルを合わせ、赤い録音ボタンを押してください。</b></p><p>1)<i>設定のオーディオI/Oタブ</i>あるいは<i>デバイスツールバー</i>のなかにある[[inputdevice|録音デバイスの設定]]。オーディオI/O設定では、ステレオ録音が必要ならばそれを選んでもらいます。2)[[inputsorce|入力ソースの設定]] を、<i>ミキサーツールバー</i>あるいは (いくつかのシステムでは) <i>設定のオーディオIOタブ</i>あるいは<i>デバイスツールバー</i>の中に録音デバイスのドロップダウンリストの中にあるそのデバイスに対して行います(例えばマイクロホンやライン入力など).<br>3) [[inputlevel|入力レベルの調整]]] を<i>ミキサーツルーバー</i>の左側にあるスライダーを使って行います. ノイズや歪を抑えるには、録音の前に録音レベルの調整を行うことは基本です.</p><p>さらなるヘルプは、<a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">マニュアルの中にある、\"録音\"の<a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>と、我々のチュートリアル<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\">初めての録音</a>と、Wiki [[wiki:Recording_Tips|録音のコツ]] と [[wiki:Troubleshooting_Recordings|録音のトラブルシューティング]]ページを御覧ください.</p><br><br>"
 
 #: HelpText.cpp:221
-msgid ""
-"<p>The input device is the actual physical sound device you are recording "
-"from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of "
-"Preferences</i>, On Windows and Linux, Preferences are at the bottom of the "
-"<i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also "
-"conveniently select Recording Device in the <i>Device Toolbar</i>, which can "
-"be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity "
-"uses the device currently being used by the system, (usually your inbuilt "
-"sound device), so it is often not necessary to change the input device. On "
-"Windows, this current system device can be selected as \"Microsoft Sound "
-"Mapper\". If you are recording from an external USB or Firewire device such "
-"as a USB turntable, select it explicitly by name as recording device after "
-"conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>入力デバイスとは、あなたが実際録音しようとしている物理的なサウンドデバイスのことです。これは<i>設定のなかのオーディオ I/O タブ</i>\"にある、\"録音デバイス\"にて選びます。Windows と Linux では、<i>編集</i>メニューの中程に設定があります。Mac の場合、<i>Audacity</i>メニューのなかにあります。<i>ビュー &gt; ツールバー...</i>にて有効にできる <i>デバイスツールバー</i>の中から録音デバイスを便利に選ぶこともできます。</p><p>そのままでは、Audacity はシステムによって現在使用されているデバイス(一般に内蔵のサウンドデバイス)を使用しますので、入力デバイスを変更する必要は頻繁にはないでしょう。Windowsでは、この現在システムが使用中のデバイスは、\"Microsoft サウンドマッパー\"にて選ぶことができます。もし、USBレコードプレーヤなどの外部のUSBや Firewire デバイスから録音する場合は、それを接続後に録音のデバイスで名前を指定して選んでください。</p><p> [[record|音の録音]] へ戻る<br></p>"
 
 #: HelpText.cpp:244
-msgid ""
-"<p>Select the input source (such as microphone or line-in) for your "
-"[[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and "
-"<b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</"
-"i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the "
-"<i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source "
-"will be shown as part of the parent device (for example, <i>High Def Audio "
-"Card: Microphone</i>). If necessary, Mac users can choose the input source "
-"at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire "
-"recording devices don't have a choice of inputs, so this step is not "
-"necessary. If in doubt, see the documentation for your device. </i></p><p> "
-"<b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&i=streaming\">record audio playing on the computer</a>, Windows "
-"and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or "
-"comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>お使いの[[inputdevice|録音デバイス]]の入力ソース(マイクやライン入力など)を選んでください。<br> - <b>Windows(Vistaを除く)</b>および<b>Linux</b>では<i>ミキサーツールバー</i>の右のドロップダウンリスト - Windows VistaおよびMacでは<i>設定の中のオーディオI/Oタブ</i>または<i>デバイスツールバー</i>の中の録音デバイス。入力ソースは親デバイス(たとえば<i>高品質オーディオカード:マイクロフォン</i>)の一部として表示されます。Macユーザの場合はアップルオーディオMIDIセットアップを選ぶこともできます。<br><i><b>注:</b>USBやFirewire録音デバイスでは入力選択できないものも多くあります。その場合はこのステップは不要です。もし不明な場合は、お使いのデバイスの説明書をご覧ください。</i></p><p> <b>Tip:</b><a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">コンピュータで再生中のオーディオを録音する</a>ためにはWindowsとLinuxのユーザーはステレオミックス、 Wave出力、Sumまたは同等の入力ソースを選択することができます。</p><p> [[record|オーディオを録音]] に戻る<br></p>"
 
 #: HelpText.cpp:267
-msgid ""
-"<p>The input level must be set correctly. If the level is too low, there "
-"will be background noise. If the level is too high, there will be distortion "
-"in the loud parts. </p><p>To set the level, either see this [[wiki:"
-"Recording_levels|illustrated online guide]] or follow these steps: "
-"<ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two "
-"<i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If "
-"the meters are not visible, click <i>View &gt; Toolbars</i> and check "
-"\"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</"
-"i> (by the microphone symbol), so that the red bars in the meter come close "
-"to <b>but do not touch</b> the right edge of the scale. If you can't hear "
-"the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check "
-"\"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording "
-"Audio]] <br></p>"
-msgstr ""
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>入力レベルは正しく設定される必要があります。 レベルが低すぎる場合は雑音が目立ち、高すぎる場合は音のピークで歪むことがあります。</p><p>入力レベルを設定するには[[wiki:Recording_levels|オンラインガイド]]を参照するか、次の手順で行ってください。<ol><li><b>モニター機能</b>の有効化。両方の<i>VUメータ</i> の右側をダブルクリック(または右クリック)し\"モニター開始\"をクリックしてください。 もしVUメータが表示されていない場合は<i>ビュー&gt; ツールバー</i> をクリックし、さらに\"メータツールバー\"をクリックしてください。</li><li><i>ミキサーツールバー</i>のインプットボリューム(マイクロフォンのマークの横)をメータの赤い部分が右端に<b>決して到達しない</b>程度にできるだけ近づくように調整してください。もしモニター音が聞こえない場合は、<i>設定のオーディオI/Oタブ</i>を開き、\"ソフトウェアによるスルー再生\"をチェックしてください。</li></ol></p><p>[[record|オーディオの録音]]に戻る <br></p>"
 
 #: HelpText.cpp:292
-msgid ""
-"<p>The main commands for editing audio are under the <i>Edit</i> menu (such "
-"as cut, copy and paste) and the <i>Effect</i> menu (you can do things like "
-"boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity "
-"applies edits to selected areas of the audio track. To select a particular "
-"area, click in the track and drag the shaded area with the mouse. If no "
-"audio is selected, Audacity selects all the audio in the project window.</"
-"p><p> When playing or recording, the Edit and Effect menus will appear "
-"greyed out, because a moving track can't be edited. Commands can sometimes "
-"be unavailable for other reasons too. For example, you can't run effects "
-"until you have audio on the screen, and you can't paste audio until you've "
-"cut or copied it to Audacity's clipboard. </p><br><br>"
-msgstr ""
-"<p>オーディオ編集に主に使われるであろうコマンドは、<i>編集</i>メニューの中(例えば、カット、コピー&ペー"
-"スト)と、<i>エフェクト</i>メニューの中(低域の強調や、ピッチやテンポの変更、そしてノ"
-"イズ除去など)にあります。</p></p>Audacity は、オーディオトラックの選択されたある領域に"
-"対して編集を適用します。特定のオーディオの領域を選ぶには、トラック中を"
-"クリックして影になった部分をマウスでドラッグします。オーディオトラックを選択して"
-"いない場合は、プロジェクトウィンドウ内の全てのオーディオが選ばれた状"
-"態になります。</p><p>再生中や録音中には、編集やエッフェクトメニューは"
-"灰色の状態で見えるでしょう。なぜなら、動いているトラックは編集できな"
-"いからです。コマンドは、別の理由でもしばしば使用不可能になります。"
-"例えば、画面上にオーディオデータが無いときにはエフェクトは動かせませ"
-"んし、Audacity のクリップボードにカットあるいはコピーを行なわないかぎ"
-"り、オーディオデータをペーストすることはできません。</p><br><br>"
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>オーディオ編集に主に使われるであろうコマンドは、<i>編集</i>メニューの中(例えば、カット、コピー&ペースト)と、<i>エフェクト</i>メニューの中(低域の強調や、ピッチやテンポの変更、そしてノイズ除去など)にあります。</p></p>Audacity は、オーディオトラックの選択されたある領域に対して編集を適用します。特定のオーディオの領域を選ぶには、トラック中をクリックして影になった部分をマウスでドラッグします。オーディオトラックを選択していない場合は、プロジェクトウィンドウ内の全てのオーディオが選ばれた状態になります。</p><p>再生中や録音中には、編集やエフェクトメニューは灰色の状態で見えるでしょう。なぜなら、動いているトラックは編集できないからです。コマンドは、別の理由でもしばしば使用不可能になります。例えば、画面上にオーディオデータが無いときにはエフェクトは動かせませんし、Audacity のクリップボードにカットあるいはコピーを行なわないかぎり、オーディオデータをペーストすることはできません。</p><br><br>"
 
 #: HelpText.cpp:311
-msgid ""
-"<p>To return later to your unfinished work in Audacity with all tracks and "
-"edits as you left them, save an Audacity project. To play your current work "
-"in other media programs or send it to others, [[export|export]] an audio "
-"file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>."
-"aup</b> project file and  a <b>_data</b> folder containing the actual audio. "
-"To re-open a saved project, click <i>File &gt; Open</i> and open the .aup "
-"file. If you save and exit more than once, an .aup.bak backup file is "
-"created, but the .aup file should always be opened if present. When your "
-"final exported file is exactly as you want, delete the project files and "
-"_data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> "
-"is for saving an empty project. It also lets you save an existing Project to "
-"a <b> new</b> name. This is the only safe way to rename a project. The .aup "
-"file and _data folder should not be moved or renamed manually. </p><p>"
-msgstr ""
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>Audacityプロジェクトの保存により、作成途中のAudacity作品のすべてのトラックや編集途中の状態を再現することができます。作品を他のメディアプログラムに送ったり再生するには、オーディオファイルをWAV形式やMP3形式にて[[export|書き出し]]します。</p><p> <i>ファイル &gt; プロジェクトファイルを保存</i>は<b>.aup</b>形式のプロジェクトファイルを保存し、<b>_data</b>フォルダ に実際のオーディオが保存されます。保存されたプロジェクトを開くには<i>ファイル &gt; 開く</i>をクリックし、.aupファイルを開いてください。複数回にわたって保存した場合は、.aup.bak形式のバックアップが作成されていますが、.aupファイルが優先的に開かれます。最後に書き出したファイルが希望通りのものであった場合、プロジェクトファイルと_dataフォルダを消去することでディスク領域を節約することができます。</p><p><i>ファイル&gt; プロジェクトファイルを別名で保存</i>は空のプロジェクトファイルを保存できます。また既存のプロジェクトを<b>新しい</b>名前で保存できます。これはプロジェクトの名前を変更する唯一の方法です。.aupファイルと_dataフォルダは手動で移動したり名前変更はできません。</p><p>"
 
 #: HelpText.cpp:335
-msgid ""
-"To hear your work in other media programs, export it to an audio file such "
-"as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|"
-"Saving an Audacity project]] creates a project file (and linked _data "
-"folder) containing all your edited tracks, so you can return to your work "
-"later. However, other programs can't read Audacity projects. </p><p> To "
-"export, click <i>File &gt; Export</i> then choose the file format you want "
-"to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for "
-"standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:"
-"Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; "
-"Export Selection</i> exports only a selected area of audio. <i>Use File &gt; "
-"Export Multiple</i> to export multiple files at the same time, either one "
-"for each audio track, or one for each labeled area in a single track. "
-"<i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:"
-"Splitting_recordings_into_separate_tracks|split the tracks]] from an album "
-"for multiple export as separate files. </p><br><br>"
-msgstr ""
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "完成した作品を他のメディアプログラムで再生するには、オーディオファイルをWAVやMP3形式に書き出してください。(いくつかの形式 [[wma-proprietary|は未サポートです]]). [[save|プロジェクトファイルの保存]] はプロジェクトファイル(および _data フォルダ)が生成しすべての編集されたトラックが保存されます。したがって後で編集作業に戻ることができます。しかしながら他のプログラムはAudacityプロジェクトファイルを読み込むことができません。</p><p> ファイルを書き出すには、<i>File &gt; 書き出し</i> をクリックし、\"ファイルの種類\" にてファイル形式を選択してください。 普通のCDプレーヤーで聴くために [[burncd|CDに書き込む]]にはWAVまたはAIFF形式を選択してください。 MP3形式に書き出すには[[wiki:Lameのインストール|Lameエンコーダー]]をインストールすることが必要です。 </p><p> <i>File &gt; 選択範囲を書き出し</i> はオーディオファイルの中の一部分だけを書き出すことができます。 <i>Use File &gt; 複数ファイルの書き出し</i> は個別のトラックごとあるいは1つのトラックの中の複数部分を複数のファイルに書き出すことができます。<i>Tracks &gt; ラベルの書き出し</i> は1つのアルバムから [[wiki:録音ファイルを複数トラックに分割するには|トラックを分割]]し複数のファイルに分割して書き出すために使います。</p><br><br>"
 
 #: HelpText.cpp:359
-msgid ""
-"<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in "
-"<b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due "
-"to licensing and patent restrictions.  On a Mac computer, unprotected "
-"<b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are "
-"not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files "
-"protected by any kind of Digital Rights Management (DRM), including most "
-"purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</"
-"p><p> If you can't import your file into Audacity, then if it is not DRM-"
-"protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, "
-"burn it to an audio CD in the program licensed to play it, then extract the "
-"CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos."
-"sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could "
-"also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-"i=streaming\">record</a> the CD to your computer. <i>To export to an "
-"unsupported format, export to WAV or AIFF and convert it to the desired "
-"format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">SUPER</a>. </i></p><p>"
-msgstr ""
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>Audacity ではライセンスや特許の制限により <b>WMA, RealAudio, Shorten (SHN)</b> や他の独自形式のファイルの[[play|再生]] or [[export|書き出し]]<b>はできません</b> Mac版では非保護の<b>AAC</b> 形式たとえば <b>M4A</b>を読み込むことができます。 <b>Ogg Speex</b> や<b>Musepack</b>などの他の形式は未対応です。ディジタル著作権管理(DRM)により保護されたファイル、たとえばもっとも一般的なiTunesやNapsterからオンライン購入されたファイルは読み込むことは<b>できません。</b>  </p><p> もしDRMで保護されていないファイルなのにAudacityで読み込めない場合、iTunes または<a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> を使ってWAVあるいはAIFF形式に変換してから読み込んでください。 もしDRM保護されたファイルである場合は、正しいライセンスに対応したプログラムにて音楽CDを作成し、その後、ITunes、(Windowsの場合) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> またはWindows Media Player 11を使って、作成した音楽CDからWAVまたはAIFFファイルとして読み出してください。またCDよりコンピュータに <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">録音</a>することもできます。<i>未対応の形式に書き出すには、まずWAVあるいはAIFF形式に書き出し、その後iTunesまたは<a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>にて希望の形式に変換してください。 </i></p><p>"
 
 #: HelpText.cpp:383
-msgid ""
-"<p>To burn your work to an audio CD for standalone CD players, first "
-"[[export|export]] it as WAV or AIFF. The exported file should be stereo, "
-"44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in "
-"the \"Options\" button in the file export dialog). These are Audacity's "
-"default settings, so normally you will not need to change these before "
-"exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" "
-"or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media "
-"Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. "
-"</p><p>"
-msgstr ""
-"<p>作品を単体のCDプレーヤで再生できるオーディオCDに焼く場合には、最初にそれ"
-"を WAVあるいはAIFFにて[[export|書き出し]]します。"
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "<p>作品を単体のCDプレーヤで再生できるオーディオCDに焼く場合には、最初にそれを WAVあるいはAIFFにて[[export|書き出し]]します。"
 
 #: HelpText.cpp:403
-msgid ""
-"<p>You don't appear to have Audacity help files on your machine. Either <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the "
-"help files and then access them again from Audacity by clicking <i>Help</i> "
-"then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr ""
-"<p>Audacity のヘルプファイルがコンピュータ内に見付からない時には、ヘルプファ"
-"イルを<a href=\"http://audacity.sourceforge.net/help/documentation\">ダウン"
-"ロード</a> して Audacity から <i>ヘルプ</li>の後に<i>もくじ</i>をクリックする"
-"か、あるいは<a href=\"http://www.audacityteam.org/manual/index.php?"
-"title=Main_Page\">ここ</a> をクリックしてオンラインヘルプを読むこともできま"
-"す。"
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr "<p>Audacity ベータバージョンのヘルプは現在完了していません。現時点では、マニュアルの草稿が <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">オンライン</a>にて得られます。あるいは、<a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">ここ</a>をクリックして、このウィンドウで見ることのできる1枚もののバージョンのマニュアルをダウンロードしてください。"
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1512,13 +1479,18 @@ msgstr "アンドゥ可能なレベル (&U)"
 msgid "Levels To Discard"
 msgstr "破棄するラベル"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "破棄 (&D)"
 
-#: HistoryWindow.cpp:111 Tags.cpp:2072 Tags.cpp:2074 Tags.cpp:2376
-#: Tags.cpp:2378 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
-#: effects/vamp/VampEffect.cpp:414 export/ExportCL.cpp:398
+#: HistoryWindow.cpp:112
+#: Tags.cpp:2081
+#: Tags.cpp:2083
+#: Tags.cpp:2385
+#: Tags.cpp:2387
+#: effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191
+#: export/ExportCL.cpp:399
 msgid "&OK"
 msgstr "OK (&O)"
 
@@ -1526,7 +1498,8 @@ msgstr "OK (&O)"
 msgid "Unable to determine"
 msgstr "測定できません"
 
-#: Internat.cpp:195 import/ImportRaw.cpp:392
+#: Internat.cpp:195
+#: import/ImportRaw.cpp:385
 msgid "bytes"
 msgstr "バイト"
 
@@ -1542,47 +1515,52 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: LabelDialog.cpp:52
+#: LabelDialog.cpp:54
 msgid "Track"
 msgstr "トラック"
 
-#: LabelDialog.cpp:53 Menus.cpp:4057 Menus.cpp:4085
+#: LabelDialog.cpp:55
+#: Menus.cpp:4677
+#: Menus.cpp:4712
 msgid "Label"
 msgstr "ラベル"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56
+#: TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr "開始時刻"
 
-#: LabelDialog.cpp:55
+#: LabelDialog.cpp:57
+#: TimerRecordDialog.cpp:298
 msgid "End Time"
 msgstr "終了時刻"
 
-#: LabelDialog.cpp:98 Menus.cpp:627
+#: LabelDialog.cpp:100
+#: Menus.cpp:713
 msgid "&Edit Labels"
 msgstr "ラベルの編集 (&E)"
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
 msgstr "F2を押すか、ダブルクリックしてセルコメントを編集"
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr "後に挿入 (&A)"
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr "前に挿入 (&B)"
 
-#: LabelDialog.cpp:127 Menus.cpp:194
+#: LabelDialog.cpp:129
 msgid "&Import..."
 msgstr "取り込み... (&I)"
 
-#: LabelDialog.cpp:155
+#: LabelDialog.cpp:157
 msgid "New..."
 msgstr "新規..."
 
-#: LabelDialog.cpp:352
+#: LabelDialog.cpp:354
 msgid ""
 "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
@@ -1593,44 +1571,53 @@ msgstr ""
 "集合させるときにスキップさせることになります。\n"
 "戻って名前を付けてやりますか?"
 
-#: LabelDialog.cpp:353
+#: LabelDialog.cpp:355
 msgid "Confirm"
 msgstr "確認"
 
-#: LabelDialog.cpp:514 Menus.cpp:3555
+#: LabelDialog.cpp:516
+#: Menus.cpp:4101
 msgid "Select a text file containing labels..."
 msgstr "ラベルを含むテキストファイルを選択して下さい..."
 
-#: LabelDialog.cpp:518 Menus.cpp:3559
+#: LabelDialog.cpp:520
+#: Menus.cpp:4105
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "テキスト files (*.txt)|*.txt|All files (*.*)|*.*"
 
-#: LabelDialog.cpp:532 Menus.cpp:3571 Project.cpp:1831 Project.cpp:1839
-#: import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534
+#: Menus.cpp:4117
+#: Project.cpp:1914
+#: Project.cpp:1922
 msgid "Could not open file: "
 msgstr "ファイルが開けません:"
 
-#: LabelDialog.cpp:558
+#: LabelDialog.cpp:560
 msgid "No labels to export."
 msgstr "書き出すトラックラベルはありません."
 
-#: LabelDialog.cpp:564 Menus.cpp:2172
+#: LabelDialog.cpp:566
+#: Menus.cpp:2518
 msgid "Export Labels As:"
 msgstr "ラベルの書き出し:"
 
-#: LabelDialog.cpp:566 Menus.cpp:2170
+#: LabelDialog.cpp:568
+#: Menus.cpp:2516
 msgid "labels.txt"
 msgstr "labels.txt"
 
-#: LabelDialog.cpp:699
+#: LabelDialog.cpp:703
 msgid "New Label Track"
 msgstr "新規ラベルトラック "
 
-#: LabelDialog.cpp:700
+#: LabelDialog.cpp:704
 msgid "Enter track name"
 msgstr "トラック名の入力:"
 
-#: LabelDialog.cpp:701 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:555
+#: LabelDialog.cpp:705
+#: LabelDialog.h:52
+#: LabelTrack.cpp:89
+#: Menus.cpp:632
 msgid "&Label Track"
 msgstr "ラベルトラック (&L)"
 
@@ -1638,7 +1625,7 @@ msgstr "ラベルトラック (&L)"
 msgid "Audacity First Run"
 msgstr "Audacity の初めての起動"
 
-#: LangChoice.cpp:84
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
 msgstr "Audacity で使用する言語の選択:"
 
@@ -1655,1326 +1642,1464 @@ msgstr ""
 msgid "Opening Audacity Project"
 msgstr "Audacity プロジェクトファイルを開く"
 
-#: Menus.cpp:162
+#: Menus.cpp:194
 msgid "&File"
 msgstr "ファイル (&F)"
 
-#: Menus.cpp:164
+#: Menus.cpp:196
 msgid "&New\tCtrl+N"
 msgstr "新規(&N)\tCtrl+N"
 
-#: Menus.cpp:166
+#: Menus.cpp:198
 msgid "&Open...\tCtrl+O"
 msgstr "開く...(&O)\tCtrl+O"
 
-#: Menus.cpp:171
+#: Menus.cpp:203
 msgid "&Close\tCtrl+W"
 msgstr "閉じる (&C)\tCtrl+W"
 
-#: Menus.cpp:174
+#: Menus.cpp:206
 msgid "&Save Project\tCtrl+S"
 msgstr "プロジェクトファイルを保存 (&S)\tCtrl+S"
 
-#: Menus.cpp:178 Project.cpp:2690
+#: Menus.cpp:210
+#: Project.cpp:2896
 msgid "Save Project &As..."
 msgstr "プロジェクトファイルを別名で保存... (&A)"
 
-#: Menus.cpp:181
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr "圧縮されたプロジェクトのコピーを保存..."
+
+#: Menus.cpp:216
 msgid "Chec&k Dependencies..."
 msgstr "依存性のチェック (&k)"
 
-#: Menus.cpp:187
+#: Menus.cpp:222
 msgid "Open Me&tadata Editor..."
 msgstr "メタデータエディタを開く (&t)"
 
-#: Menus.cpp:196
+#: Menus.cpp:229
+#: import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "取り込み (&I)"
+
+#: Menus.cpp:231
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "オーディオの取り込み... (&A)\tCtrl+Shift+I"
 
-#: Menus.cpp:197
+#: Menus.cpp:232
 msgid "&Labels..."
 msgstr "ラベル (&L)"
 
-#: Menus.cpp:198
+#: Menus.cpp:234
 msgid "&MIDI..."
-msgstr "MIDI の取り込み..."
+msgstr "MIDI の取り込み... (&M)"
 
-#: Menus.cpp:199
+#: Menus.cpp:236
 msgid "&Raw Data..."
 msgstr "ロー (Raw) データの取り込み... (&R)"
 
-#: Menus.cpp:210 Menus.cpp:239
+#: Menus.cpp:247
+#: Menus.cpp:282
 msgid "Expo&rt Selection..."
 msgstr "選択範囲を書き出し... (&r)"
 
-#: Menus.cpp:217
+#: Menus.cpp:254
 msgid "Export &Labels..."
 msgstr "ラベルの書き出し... (&L)"
 
-#: Menus.cpp:218
+#: Menus.cpp:255
 msgid "Export &Multiple..."
 msgstr "複数ファイルの書き出し... (&M)"
 
-#: Menus.cpp:247
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr "MIDIを書き出し..."
+
+#: Menus.cpp:290
 msgid "CleanSpeech C&hain..."
 msgstr "クリーンスピーチ チェイン (&h)"
 
-#: Menus.cpp:248 Menus.cpp:262
+#: Menus.cpp:291
+#: Menus.cpp:305
 msgid "Edit C&hains..."
 msgstr "チェインを編集 (&h)"
 
-#: Menus.cpp:249
+#: Menus.cpp:292
 msgid "Export CleanSpeech &Presets..."
 msgstr "クリーンスピーチ設定の書き出し (&P)"
 
-#: Menus.cpp:250
+#: Menus.cpp:293
 msgid "I&mport CleanSpeech Presets..."
 msgstr "クリーンスピーチ設定の読み込み (&m)"
 
-#: Menus.cpp:260
+#: Menus.cpp:303
 msgid "Appl&y Chain..."
 msgstr "チェインを適用 (&y)"
 
-#: Menus.cpp:267
+#: Menus.cpp:310
 msgid "&Upload File..."
 msgstr "ファイルのアップロード (&U)"
 
-#: Menus.cpp:273
+#: Menus.cpp:316
 msgid "Pa&ge Setup..."
 msgstr "ページ設定 (&g)"
 
-#: Menus.cpp:274
+#: Menus.cpp:317
 msgid "&Print..."
 msgstr "印刷... (&P)"
 
-#: Menus.cpp:287
+#: Menus.cpp:330
 msgid "E&xit\tCtrl+Q"
-msgstr "終了(&E)\tCtrl+Q"
+msgstr "終了(&x)\tCtrl+Q"
 
-#: Menus.cpp:295 toolbars/EditToolBar.cpp:76
+#: Menus.cpp:338
+#: toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "編集 (&E)"
 
-#: Menus.cpp:299
+#: Menus.cpp:342
 msgid "&Undo\tCtrl+Z"
 msgstr "アンドゥ (&U)\tCtrl+Z"
 
-#: Menus.cpp:307 prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:146
+#: Menus.cpp:350
+#: prefs/KeyConfigPrefs.cpp:371
+#: toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "リドゥ (&R)"
 
-#: Menus.cpp:320
+#: Menus.cpp:363
 msgid "Cu&t\tCtrl+X"
 msgstr "カット (&t)\tCtrl+X"
 
-#: Menus.cpp:324
+#: Menus.cpp:367
 msgid "Spl&it Cut\tCtrl+Alt+X"
-msgstr "分割 (&l)\tCtrl+Alt+X"
+msgstr "分割 (&i)\tCtrl+Alt+X"
 
-#: Menus.cpp:325
+#: Menus.cpp:368
 msgid "&Copy\tCtrl+C"
 msgstr "コピー (&C)\tCtrl+C"
 
-#: Menus.cpp:329
+#: Menus.cpp:372
 msgid "&Paste\tCtrl+V"
 msgstr "ペースト (&P)\tCtrl+V"
 
-#: Menus.cpp:333
+#: Menus.cpp:376
 msgid "Tri&m\tCtrl+T"
 msgstr "トリム (&m)\tCtrl+T"
 
-#: Menus.cpp:335
+#: Menus.cpp:378
 msgid "&Delete\tCtrl+K"
 msgstr "削除 (&D)\tCtrl+K"
 
-#: Menus.cpp:336
+#: Menus.cpp:379
 msgid "Split D&elete\tCtrl+Alt+K"
-msgstr "分割と削除 (&D)\tCtrl+Alt+K"
+msgstr "分割と削除 (&e)\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "無音 (&S)\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr "無音 (&o)\tCtrl+L"
 
-#: Menus.cpp:339
+#: Menus.cpp:382
 msgid "Sp&lit\tCtrl+I"
 msgstr "分割(&l)\tCtrl+I"
 
-#: Menus.cpp:344
+#: Menus.cpp:387
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "新規分離 (&w) \tCtrl+Alt+I"
 
-#: Menus.cpp:349
+#: Menus.cpp:392
 msgid "&Join\tCtrl+J"
 msgstr "連結(&J)\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "分離 (&o) \tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "無音の切り離し (&h)\tCtrl+Alt+J"
 
-#: Menus.cpp:352
+#: Menus.cpp:394
 msgid "Duplic&ate\tCtrl+D"
 msgstr "複製 (&a)\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "ステレオからモノラルへ (&S)"
+#: Menus.cpp:400
+#: Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr "ステレオからモノラルへ (&k)"
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr "ラベルづけされた領域... (&b)"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:367
+#: Menus.cpp:409
 msgid "&Cut\tAlt+X"
 msgstr "カット (&C)\tAlt+X"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:372
+#: Menus.cpp:414
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "分割と切り取り (&S)\tShift+Alt+X"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:377
+#: Menus.cpp:419
 msgid "Co&py\tShift+Alt+C"
-msgstr "コピー (&o)\tShift+Altl+C"
+msgstr "コピー (&p)\tShift+Altl+C"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:383
+#: Menus.cpp:425
 msgid "&Delete\tAlt+K"
 msgstr "削除 (&D)\tAlt+K"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:388
+#: Menus.cpp:430
 msgid "Sp&lit Delete\tShift+Alt+K"
-msgstr "分割と削除 (&D)\tCtrl+Alt+K"
+msgstr "分割と削除 (&l)\tCtrl+Alt+K"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:393
+#: Menus.cpp:435
 msgid "Sile&nce\tAlt+L"
-msgstr "無音 (&S)\tAlt+L"
+msgstr "無音 (&n)\tAlt+L"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:399
+#: Menus.cpp:441
 msgid "Spli&t\tAlt+I"
-msgstr "分割(&t)\tAlt+I"
+msgstr "分割 (&t)\tAlt+I"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:404
+#: Menus.cpp:446
 msgid "&Join\tAlt+J"
-msgstr "結合 (&j) \tAlt+J"
+msgstr "結合 (&J) \tAlt+J"
 
 #  i18n-hint: Labeled Regions submenu
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "分離 (&j)\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr "無音で分離 (&h)\tShift+Alt+J"
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "選択...(&S)"
+#: Menus.cpp:456
+msgid "&Select"
+msgstr "選択 (&S)"
 
-#: Menus.cpp:416
+#: Menus.cpp:457
 msgid "&All\tCtrl+A"
 msgstr "全て (&A)\tCtrl+A"
 
-#: Menus.cpp:417
+#: Menus.cpp:458
 msgid "&None\tCtrl+Shift+A"
-msgstr "無し(&N)\tCtrl+Shift+N"
+msgstr "無し(&N)\tCtrl+Shift+A"
 
-#: Menus.cpp:421
+#: Menus.cpp:462
 msgid "&Left at Playback Position\t["
-msgstr "再生開始位置を左に\t[ (&L)"
+msgstr "再生開始位置を左に (&L) \t["
 
-#: Menus.cpp:422
+#: Menus.cpp:463
 msgid "&Right at Playback Position\t]"
-msgstr "再生開始位置を右に\t] (&R)"
+msgstr "再生開始位置を右に (&R) \t]"
 
-#: Menus.cpp:426
+#: Menus.cpp:467
 msgid "Track &Start to Cursor\tShift+J"
-msgstr "先頭からカーソルまで (&S)"
+msgstr "先頭からカーソルまで (&S) \tShift+J"
 
-#: Menus.cpp:427
+#: Menus.cpp:468
 msgid "Cursor to Track &End\tShift+K"
-msgstr "カーソルから最後まで (&E)"
+msgstr "カーソルから最後まで (&E) \tShift+K"
 
-#: Menus.cpp:433
+#: Menus.cpp:474
 msgid "Find &Zero Crossings\tZ"
 msgstr "ゼロとの交差部分を見つける (&Z) \tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "カーソルの移動... (&v)"
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr "カーソルの移動 (&v)"
 
-#: Menus.cpp:437
+#: Menus.cpp:478
 msgid "to Selection Star&t"
 msgstr "選択の最初 (&t)"
 
-#: Menus.cpp:438
+#: Menus.cpp:479
 msgid "to Selection En&d"
 msgstr "選択の最後 (&d)"
 
-#: Menus.cpp:442
+#: Menus.cpp:483
 msgid "to Track &Start\tJ"
-msgstr "トラックの最初 (&S)"
+msgstr "トラックの最初 (&S)\tJ"
 
-#: Menus.cpp:443
+#: Menus.cpp:484
 msgid "to Track &End\tK"
-msgstr "トラックの最後 (&E)"
+msgstr "トラックの最後 (&E)\tK"
 
-#: Menus.cpp:450
+#: Menus.cpp:491
 msgid "Re&gion Save"
 msgstr "選択範囲を保存 (&g)"
 
-#: Menus.cpp:451
+#: Menus.cpp:492
 msgid "Regio&n Restore"
 msgstr "選択範囲を復帰 (&n)"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr "領域を再生 (&y)"
 
-#: Menus.cpp:463
+#: Menus.cpp:504
 msgid "&Lock"
 msgstr "ロック (&L)"
 
-#: Menus.cpp:464
+#: Menus.cpp:505
 msgid "&Unlock"
 msgstr "アンロック (&U)"
 
-#: Menus.cpp:470
+#: Menus.cpp:511
 msgid "Turn Snap-To On"
 msgstr "スナップをオン"
 
-#: Menus.cpp:471
+#: Menus.cpp:512
 msgid "Turn Snap-To Off"
 msgstr "スナップをオフ"
 
-#: Menus.cpp:472
+#: Menus.cpp:513
 msgid "Turn Grid Snap On"
 msgstr "グリッドスナップをオン"
 
-#: Menus.cpp:473
+#: Menus.cpp:514
 msgid "Turn Grid Snap Off"
 msgstr "グリッドスナップをオフ"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "設定... (&P)\tCtrl+P"
+#  i18n-hint: Mac OS X shortcut should be Ctrl+,
+#  i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "設定... (&f)\tCtrl+,"
 
-#: Menus.cpp:492
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr "設定... (&f)\tCtrl+P"
+
+#: Menus.cpp:533
 msgid "&View"
 msgstr "ビュー (&V)"
 
-#: Menus.cpp:494
+#: Menus.cpp:535
 msgid "Zoom &In\tCtrl+1"
 msgstr "拡大 (&I)\tCtrl+1"
 
-#: Menus.cpp:497
+#: Menus.cpp:538
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "元の縮尺に戻す (&N)\tCtrl+2"
 
-#: Menus.cpp:498
+#: Menus.cpp:539
 msgid "Zoom &Out\tCtrl+3"
 msgstr "縮小 (&O)\tCtrl+3"
 
-#: Menus.cpp:501
+#: Menus.cpp:542
 msgid "&Fit in Window\tCtrl+F"
 msgstr "ウィンドウに合わせる (&F)\tCtrl+F"
 
-#: Menus.cpp:502
+#: Menus.cpp:543
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "垂直方向に合わせる (&V)\tCtrl+Shift+F"
 
-#: Menus.cpp:503
+#: Menus.cpp:544
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "選択範囲を拡大 (&Z)\tCtrl+E"
 
-#: Menus.cpp:506
+#: Menus.cpp:547
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr "全てのトラックの縮小 (&C) \tCtrl+Shift+C"
 
-#: Menus.cpp:507
+#: Menus.cpp:548
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
-msgstr "全てのトラックの拡張 (&E)\tCtrl+Shift+X"
+msgstr "全てのトラックの拡張 (&x)\tCtrl+Shift+X"
 
-#: Menus.cpp:510
+#: Menus.cpp:551
 msgid "&Show Clipping"
 msgstr "クリッピングを表示 (&S)"
 
-#: Menus.cpp:519
+#: Menus.cpp:560
 msgid "&History..."
 msgstr "履歴 (&H)..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
 msgstr "ツールバー (&T)"
 
-#: Menus.cpp:526
+#: Menus.cpp:567
 msgid "&Control Toolbar"
 msgstr "コントロールツールバー (&C)"
 
-#: Menus.cpp:527
+#: Menus.cpp:568
 msgid "&Device Toolbar"
 msgstr "デバイスツールバー (&D)"
 
-#: Menus.cpp:528
+#: Menus.cpp:569
 msgid "&Edit Toolbar"
 msgstr "編集ツールバー (&E)"
 
-#: Menus.cpp:529
+#: Menus.cpp:570
 msgid "&Meter Toolbar"
 msgstr "メータツールバー (&M)"
 
-#: Menus.cpp:530
+#: Menus.cpp:571
 msgid "Mi&xer Toolbar"
 msgstr "ミキサーツールバー (&x)"
 
-#: Menus.cpp:531
+#: Menus.cpp:572
 msgid "&Selection Toolbar"
 msgstr "選択ツールバー (&S)"
 
-#: Menus.cpp:532
+#: Menus.cpp:573
 msgid "T&ools Toolbar"
 msgstr "ツールバー (&o)"
 
-#: Menus.cpp:533
+#: Menus.cpp:574
 msgid "Transcri&ption Toolbar"
 msgstr "書き換えツールバー (&p)"
 
-#: Menus.cpp:535
+#: Menus.cpp:576
 msgid "&Reset Toolbars"
 msgstr "ツールバーをリセット (&R)"
 
-#: Menus.cpp:537
+#: Menus.cpp:578
 msgid "!Simplified View"
-msgstr ""
+msgstr "!単純化した見えかた"
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr "録音と再生 (&r)"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr "再生\tSpace"
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr "ループ再生(&L)\tShift+Space"
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr "一時停止 (&P) \tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr "停止(&S)\tSpace"
+
+#: Menus.cpp:595
+#: Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "初めまで進める\tHome"
+
+#: Menus.cpp:597
+#: Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "終わりまで進める\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr "録音 (&R) \tR"
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr "タイマーを使った録音...(&T) \tShift+T"
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr "追加して録音\tShift+R"
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr "オーバーダブ (オン/オフ)"
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr "ソフトウェアによる再生 (オン/オフ)"
 
-#: Menus.cpp:545
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr "音のレベルに応じた録音 (オン/オフ)"
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr "録音開始レベル..."
+
+#: Menus.cpp:622
 msgid "&Tracks"
 msgstr "トラック (&T)"
 
-#: Menus.cpp:552
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr "新しく追加 (&N)"
 
-#: Menus.cpp:553
+#: Menus.cpp:630
 msgid "&Audio Track\tCtrl+Shift+N"
 msgstr "オーディオトラック (&A) \tCtrl+Shift+N"
 
-#: Menus.cpp:554
+#: Menus.cpp:631
 msgid "&Stereo Track"
 msgstr "ステレオトラック (&S)"
 
-#: Menus.cpp:556 TimeTrack.cpp:44
+#: Menus.cpp:633
+#: TimeTrack.cpp:44
 msgid "&Time Track"
 msgstr "タイムトラック (&T)"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "タイマーを使った録音 (&T)"
-
-#: Menus.cpp:568
+#: Menus.cpp:643
 msgid "Mi&x and Render"
-msgstr "ミックスして作成 (&M)"
+msgstr "ミックスして作成 (&x)"
 
-#: Menus.cpp:572
+#: Menus.cpp:647
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr "新しいトラックにミックスして作成\tCtrl+Shift+M"
 
-#: Menus.cpp:576
+#: Menus.cpp:651
 msgid "&Resample..."
 msgstr "リサンプル.. (&R)."
 
-#: Menus.cpp:586
+#: Menus.cpp:661
 msgid "Remo&ve Tracks"
 msgstr "トラック削除 (&v)"
 
-#: Menus.cpp:592
+#: Menus.cpp:667
 msgid "&Mute All Tracks\tCtrl+U"
 msgstr "全てのトラックのミュート (&M) \tCtrl+U"
 
-#: Menus.cpp:593
+#: Menus.cpp:668
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
 msgstr "全てのトラックのミュート解除 (&U)\tCtrl+Shift+U"
 
-#: Menus.cpp:597
+#: Menus.cpp:672
 msgid "Align with &Zero"
 msgstr "ゼロに揃える (&Z)"
 
-#: Menus.cpp:598
+#: Menus.cpp:673
 msgid "Align with &Cursor"
 msgstr "カーソルに揃える (&C)"
 
-#: Menus.cpp:599
+#: Menus.cpp:674
 msgid "Align with Selection &Start"
 msgstr "選択範囲の最初に揃える (&S)"
 
-#: Menus.cpp:600
+#: Menus.cpp:675
 msgid "Align with Selection &End"
 msgstr "選択範囲の最後に揃える (&E)"
 
-#: Menus.cpp:601
+#: Menus.cpp:676
 msgid "Align End with Cu&rsor"
 msgstr "カーソル位置を終端にする (&r)"
 
-#: Menus.cpp:602
+#: Menus.cpp:677
 msgid "Align End with Selection Star&t"
 msgstr "選択範囲の最初を起点にする (&t)"
 
-#: Menus.cpp:603
+#: Menus.cpp:678
 msgid "Align End with Selection En&d"
 msgstr "選択範囲の最後を終端にする (&d)"
 
-#: Menus.cpp:604
+#: Menus.cpp:679
 msgid "Align Tracks To&gether"
 msgstr "全てのトラックを揃える (&g)"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "トラックを揃える... (&A)"
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr "トラックを揃える(&A)"
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
 msgstr "カーソルを移動して揃える (&g)"
 
-#: Menus.cpp:623
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr "MIDIをオーディオと同期"
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr "オーディオとラベルトラックをリンク"
+
+#: Menus.cpp:709
 msgid "Add &Label At Selection\tCtrl+B"
 msgstr "選択範囲にラベルを付ける (&L) \tCtrl+B"
 
-#: Menus.cpp:624
+#: Menus.cpp:710
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "再生開始位置にラベルを付ける (&P) \tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "トラックの整列 (&o) ..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr "トラックの整列 (&o)"
 
-#: Menus.cpp:631
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr "開始時刻 (&S)"
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "名前...(&N)"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr "名前 (&N)"
 
-#: Menus.cpp:643
+#: Menus.cpp:730
 msgid "&Generate"
 msgstr "製作 (&G)"
 
-#: Menus.cpp:666
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
+msgid "Unsorted"
+msgstr "未分類"
+
+#: Menus.cpp:795
 msgid "Effe&ct"
 msgstr "効果 (&c)"
 
-#: Menus.cpp:670
+#: Menus.cpp:799
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "前回の効果を適用\tCtrl+R"
 
-#: Menus.cpp:702
+#: Menus.cpp:877
 msgid "&Analyze"
 msgstr "解析 (&A)"
 
-#: Menus.cpp:704
+#: Menus.cpp:879
 msgid "Plot Spectrum..."
 msgstr "スペクトル表示..."
 
 #  i18n-hint: The name of the Help menu
-#: Menus.cpp:737 Menus.cpp:740
+#: Menus.cpp:947
+#: Menus.cpp:950
 msgid "&Help"
 msgstr "ヘルプ (&H)"
 
-#: Menus.cpp:743
+#: Menus.cpp:953
 msgid "&About Audacity CleanSpeech..."
 msgstr "Audacity クリーンスピーチについて... (&A)"
 
-#: Menus.cpp:747
+#: Menus.cpp:957
 msgid "&Show Welcome Message..."
 msgstr "ようこそを表示 (&S)"
 
-#: Menus.cpp:748
+#: Menus.cpp:958
 msgid "&Index..."
 msgstr "インデックス... (&I)"
 
-#: Menus.cpp:756
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr "ログの表示...(&L)"
+
+#: Menus.cpp:967
 msgid "&Screenshot Tools..."
 msgstr "スクリーンショットツール (&S)"
 
-#: Menus.cpp:759
+#: Menus.cpp:970
 msgid "&Run Benchmark..."
 msgstr "ベンチマーク... (&R)"
 
-#: Menus.cpp:761
+#: Menus.cpp:972
 msgid "&Audio Device Info..."
 msgstr "オーディオデイバイス情報 (&A)"
 
-#: Menus.cpp:770
-msgid ""
-"Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "ドック、トラックビュー、バー選択を逆向きに回ります \tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr "ツールバーとトラックビューを逆向きに回ります。\tCtrl+Shift+F6"
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "ドック、トラックビュー、バー選択をを順向きに回ります \tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr "ツールバーとトラックビューを順向きに回ります。\tCtrl+F6"
 
-#: Menus.cpp:774
+#: Menus.cpp:985
 msgid "Selection Tool\tF1"
 msgstr "選択ツール\tF1"
 
-#: Menus.cpp:775
+#: Menus.cpp:986
 msgid "Envelope Tool\tF2"
 msgstr "エンベロープツール\tF2"
 
-#: Menus.cpp:776
+#: Menus.cpp:987
 msgid "Draw Tool\tF3"
 msgstr "描画ツール\tF3"
 
-#: Menus.cpp:777
+#: Menus.cpp:988
 msgid "Zoom Tool\tF4"
 msgstr "拡大ツール \tF4"
 
-#: Menus.cpp:778
+#: Menus.cpp:989
 msgid "Time Shift Tool\tF5"
 msgstr "タイムシフトツール\tF5"
 
-#: Menus.cpp:779
+#: Menus.cpp:990
 msgid "Multi Tool\tF6"
 msgstr "マルチツール\tF6"
 
-#: Menus.cpp:781
+#: Menus.cpp:992
 msgid "Next Tool\tD"
 msgstr "次のツール\tD"
 
-#: Menus.cpp:782
+#: Menus.cpp:993
 msgid "Previous Tool\tA"
 msgstr "前回のツール\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "再生 / 停止\tスペース"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr " 再生/停止\tSpace"
 
-#: Menus.cpp:785
+#: Menus.cpp:996
 msgid "Stop\tS"
 msgstr "停止\tS"
 
-#: Menus.cpp:786
+#: Menus.cpp:997
 msgid "Pause\tP"
 msgstr "停止\tP"
 
-#: Menus.cpp:787
+#: Menus.cpp:998
 msgid "Record\tR"
 msgstr "録音\tR"
 
-#: Menus.cpp:788
+#: Menus.cpp:999
 msgid "Record Append\tShift+R"
-msgstr ""
+msgstr "追加して録音\tShift+R"
 
-#: Menus.cpp:790
+#: Menus.cpp:1001
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "再生/停止 と選択\tShift+A"
 
-#: Menus.cpp:793
+#: Menus.cpp:1004
 msgid "Play One Second\t1"
 msgstr "1秒間再生\t1"
 
-#: Menus.cpp:794
+#: Menus.cpp:1005
 msgid "Play To Selection\tB"
 msgstr "選択範囲を再生\tB"
 
-#: Menus.cpp:795
+#: Menus.cpp:1006
 msgid "Play Looped\tL"
 msgstr "ループ再生\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "ループ再生\tシフト+スペース"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr "ループ再生\tShift+Space"
 
-#: Menus.cpp:797
+#: Menus.cpp:1008
 msgid "Play Cut Preview\tC"
-msgstr "カットプリビューを再生\tC"
-
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "初めまで進める\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "終わりまで進める\tEnd"
+msgstr "カットプレビューを再生\tC"
 
-#: Menus.cpp:802
+#: Menus.cpp:1013
 msgid "Selection to Start\tShift+Home"
 msgstr "最初まで選択\tShift+Home"
 
-#: Menus.cpp:803
+#: Menus.cpp:1014
 msgid "Selection to End\tShift+End"
 msgstr "最後まで選択\tShift+End"
 
-#: Menus.cpp:805
+#: Menus.cpp:1016
 msgid "DeleteKey\tBackspace"
 msgstr "デリートキー\tBackspace"
 
-#: Menus.cpp:810
+#: Menus.cpp:1021
 msgid "DeleteKey2\tDelete"
 msgstr "デリートキー2\tDelete"
 
-#: Menus.cpp:816
+#: Menus.cpp:1027
 msgid "Seek left short period during playback\tLeft"
 msgstr "再生中に左側の短い区間を探す \tLeft"
 
-#: Menus.cpp:817
+#: Menus.cpp:1028
 msgid "Seek right short period during playback\tRight"
 msgstr "再生中に右側の短い区間を探す \tRight"
 
-#: Menus.cpp:818
+#: Menus.cpp:1029
 msgid "Seek left long period during playback\tShift+Left"
 msgstr "再生中に左側の長い区間を探す \tShift+Left"
 
-#: Menus.cpp:819
+#: Menus.cpp:1030
 msgid "Seek right long period during playback\tShift+Right"
 msgstr "再生中に右側の長い区間を探す \tShift+Right"
 
-#: Menus.cpp:823
+#: Menus.cpp:1034
 msgid "Move Focus to Previous Track\tUp"
 msgstr "フォーカスを前のトラックに移動 \tUp"
 
-#: Menus.cpp:824
+#: Menus.cpp:1035
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
 msgstr "フォーカスを前のトラックに移動して選択を変更 \tShift+tUp"
 
-#: Menus.cpp:825
+#: Menus.cpp:1036
 msgid "Move Focus to Next Track\tDown"
 msgstr "フォーカスを次のトラックへ移動 \tDown"
 
-#: Menus.cpp:826
+#: Menus.cpp:1037
 msgid "Move Focus to Next and Change Selection\tShift+Down"
 msgstr "フォーカスを次のトラックに移動して選択を変更 \tShift+Down"
 
-#: Menus.cpp:827
+#: Menus.cpp:1038
 msgid "Toggle Focused Track\tReturn"
 msgstr "フォーカスするトラックを切り替え \tReturn"
 
-#: Menus.cpp:828
+#: Menus.cpp:1039
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "フォーカスするトラックを切り替え\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "フォーカスするトラックを切り替え\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr "トラックの切り替え\tShift+Space"
 
-#: Menus.cpp:831
+#: Menus.cpp:1042
 msgid "Cursor Left\tLeft"
 msgstr "カーソルを左へ\tLeft"
 
-#: Menus.cpp:832
+#: Menus.cpp:1043
 msgid "Cursor Right\tRight"
 msgstr "カーソルを右へ\tRight"
 
-#: Menus.cpp:833
+#: Menus.cpp:1044
 msgid "Cursor Short Jump Left\t,"
 msgstr "カーソルを少しだけ左へ\t,"
 
-#: Menus.cpp:834
+#: Menus.cpp:1045
 msgid "Cursor Short Jump Right\t."
 msgstr "カーソルを少しだけ右へ\t."
 
-#: Menus.cpp:835
+#: Menus.cpp:1046
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr "カーソルを大きく左へ\tShift+,"
 
-#: Menus.cpp:836
+#: Menus.cpp:1047
 msgid "Cursor Long Jump Right\tShift+."
 msgstr "カーソルを大きく右へ\tShift+."
 
-#: Menus.cpp:838
+#: Menus.cpp:1049
 msgid "Selection Extend Left\tShift+Left"
 msgstr "選択範囲の左端を拡げる\tShift+Left"
 
-#: Menus.cpp:839
+#: Menus.cpp:1050
 msgid "Selection Extend Right\tShift+Right"
 msgstr "選択範囲の右端を拡げる\tShift+Right"
 
-#: Menus.cpp:841
+#: Menus.cpp:1052
 msgid "Set (or Extend) Left Selection"
 msgstr "選択範囲の左端を設定(あるいは延長)"
 
-#: Menus.cpp:842
+#: Menus.cpp:1053
 msgid "Set (or Extend) Right Selection"
 msgstr "選択範囲の右端を設定(あるいは延長)"
 
-#: Menus.cpp:844
+#: Menus.cpp:1055
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "選択範囲の左端を縮める\tCtrl+Shift+Right"
 
-#: Menus.cpp:845
+#: Menus.cpp:1056
 msgid "Selection Contract Right\tCtrl+Shift+Left"
 msgstr "選択範囲の右端を縮める\tCtrl+Shift+Left"
 
-#: Menus.cpp:847
+#: Menus.cpp:1058
 msgid "Change pan on focused track\tShift+P"
-msgstr "フォーカスするトラックを切り替え"
+msgstr "フォーカスするトラックを切り替え\tShift+P"
 
-#: Menus.cpp:848
+#: Menus.cpp:1059
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr "フォーカスしたトラックを左へパン\tAlt+Shift+Left"
 
-#: Menus.cpp:849
+#: Menus.cpp:1060
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr "フォーカスしたトラックを右へパン\tAlt+Shift+Right"
 
-#: Menus.cpp:850
+#: Menus.cpp:1061
 msgid "Change gain on focused track\tShift+G"
 msgstr "フォーカスしたトラックのゲインを変更\tShift+G"
 
-#: Menus.cpp:851
+#: Menus.cpp:1062
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr "フォーカスしたトラックのゲインを上げる \tAlt+Shift+Up"
 
-#: Menus.cpp:852
+#: Menus.cpp:1063
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr "フォーカスしたトラックのゲインをさげる \tAlt+Shift+Down"
 
-#: Menus.cpp:853
+#: Menus.cpp:1064
 msgid "Open menu on focused track\tShift+M"
 msgstr "フォーカスしたトラックでメニューを開く \tShift+M"
 
-#: Menus.cpp:854
+#: Menus.cpp:1065
 msgid "Mute/Unmute focused track\tShift+U"
 msgstr "フォーカスしたトラックをミュート入り/切りする \tShift+U"
 
-#: Menus.cpp:855
+#: Menus.cpp:1066
 msgid "Solo/Unsolo focused track\tShift+S"
-msgstr "フォーカスしたトラックをソロ入り/切りする \tShift+U"
+msgstr "フォーカスしたトラックをソロ入り/切りする \tShift+S"
 
-#: Menus.cpp:856
+#: Menus.cpp:1067
 msgid "Close focused track\tShift+C"
 msgstr "フォーカスされたトラックを閉じる \tShift+C"
 
 #  i18n-hint: Set snap-to mode on or off
 #  i18n-hint: Set snap-to mode on or off
-#: Menus.cpp:858
+#: Menus.cpp:1069
 msgid "Snap To On"
 msgstr "スナップモードを有効"
 
 #  i18n-hint: Set snap-to mode on or off
 #  i18n-hint: Set snap-to mode on or off
-#: Menus.cpp:859
+#: Menus.cpp:1070
 msgid "Snap To Off"
 msgstr "スナップモードを無効"
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr "フルスクリーン表示on/off\tF11"
+
 #  i18n-hint: This is the name of the menu item on Mac OS X only
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:873
+#: Menus.cpp:1157
 msgid "Open Recent"
 msgstr "最近開いた"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "最近のファイル..."
+#: Menus.cpp:1160
+msgid "Recent &Files"
+msgstr "最近のファイル (&F)"
 
-#: Menus.cpp:925
+#: Menus.cpp:1209
 #, c-format
 msgid "&Undo %s"
 msgstr "%s をアンドゥ (&U)"
 
-#: Menus.cpp:951
+#: Menus.cpp:1235
 msgid "Can't Undo"
 msgstr "アンドゥできません"
 
-#: Menus.cpp:960
+#: Menus.cpp:1244
 #, c-format
 msgid "&Redo %s"
 msgstr "%s をリドゥ (&R)"
 
-#: Menus.cpp:966
+#: Menus.cpp:1250
 msgid "Can't Redo"
 msgstr "リドゥできません"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1856
 msgid "Sort By Time"
 msgstr "時間で整列"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1856
 msgid "Tracks sorted by time"
 msgstr "トラックが時間で整列されました"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1882
 msgid "Sort By Name"
 msgstr "名前で整列"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1882
 msgid "Tracks sorted by name"
 msgstr "トラックが名前で整列されました"
 
-#: Menus.cpp:1705
+#: Menus.cpp:2033
 msgid "Set Left Selection Bound"
 msgstr "左側の選択境界を設定"
 
-#: Menus.cpp:1739
+#: Menus.cpp:2068
 msgid "Set Right Selection Bound"
 msgstr "右側の選択境界を設定"
 
-#: Menus.cpp:2006
+#: Menus.cpp:2337
 msgid "You must select a track first."
 msgstr "トラックを最初に選択してください."
 
-#: Menus.cpp:2035
+#: Menus.cpp:2369
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "繰り返す %s\tCtrl+R"
 
-#: Menus.cpp:2166
+#: Menus.cpp:2512
 msgid "There are no label tracks to export."
 msgstr "書き出すトラックラベルはありません."
 
-#: Menus.cpp:2271
+#: Menus.cpp:2607
+msgid "Export MIDI As:"
+msgstr "MIDI の出力:"
+
+#: Menus.cpp:2611
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "MIDI ファイル (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+
+#: Menus.cpp:2643
+msgid ""
+"You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr "識別できない拡張子のファイル名を選びました.つづけますか?"
+
+#: Menus.cpp:2644
+msgid "Export MIDI"
+msgstr "MIDI の出力"
+
+#: Menus.cpp:2702
 msgid "Nothing to undo"
 msgstr "アンドゥはありません"
 
-#: Menus.cpp:2291
+#: Menus.cpp:2722
 msgid "Nothing to redo"
 msgstr "リドゥはありません"
 
-#: Menus.cpp:2366 TrackPanel.cpp:605 toolbars/EditToolBar.cpp:133
+#: Menus.cpp:2809
+#: TrackPanel.cpp:596
+#: toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "カット"
 
-#: Menus.cpp:2366
+#: Menus.cpp:2809
 msgid "Cut to the clipboard"
 msgstr "カットした内容をクリップボードに退避"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2849
 msgid "Split Cut"
 msgstr "分離カット"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2849
 msgid "Split-cut to the clipboard"
 msgstr "カットした内容をクリップボードに退避"
 
-#: Menus.cpp:2469 Menus.cpp:2540 Menus.cpp:2634 TrackPanel.cpp:607
+#: Menus.cpp:2914
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+#: TrackPanel.cpp:598
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "ペースト"
 
-#: Menus.cpp:2469
+#: Menus.cpp:2914
 msgid "Pasted text from the clipboard"
 msgstr "クリップボードからペーストされたテキスト"
 
-#: Menus.cpp:2540 Menus.cpp:2634
+#: Menus.cpp:2986
+#: Menus.cpp:3178
 msgid "Pasted from the clipboard"
 msgstr "クリップボードからペーストする"
 
-#: Menus.cpp:2574
+#: Menus.cpp:3052
+msgid "Pasting one type of track into another is not allowed."
+msgstr "あの種類のオーディオデータを別の種類のトラックにコピーすることは許可されていません。"
+
+#: Menus.cpp:3064
 msgid "Copying stereo audio into a mono track is not allowed."
-msgstr ""
-"ステレオのオーディオデータをモノラルトラックにコピーすることは許可されていま"
-"せん。"
+msgstr "ステレオのオーディオデータをモノラルトラックにコピーすることは許可されていません。"
 
-#: Menus.cpp:2670 toolbars/EditToolBar.cpp:139
+#: Menus.cpp:3214
+#: toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "トリム"
 
-#: Menus.cpp:2670
+#: Menus.cpp:3214
 msgid "Trim file to selection"
 msgstr "トリムファイルの選択"
 
-#: Menus.cpp:2699
+#: Menus.cpp:3243
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
 msgstr "%.2f 秒分離削除しました (位置 %.2f)"
 
-#: Menus.cpp:2702
+#: Menus.cpp:3246
 msgid "Split Delete"
 msgstr "分離削除"
 
-#: Menus.cpp:2723
+#: Menus.cpp:3267
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr "%.2f 秒分離しました (位置 %.2f)"
 
-#: Menus.cpp:2726
+#: Menus.cpp:3270
 msgid "Disjoin"
 msgstr "分離"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3291
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr "%.2f 秒連結しました (位置 %.2f)"
 
-#: Menus.cpp:2750
+#: Menus.cpp:3294
 msgid "Join"
 msgstr "結合"
 
-#: Menus.cpp:2769
+#: Menus.cpp:3313
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "%.2f 秒から %.2f 秒までの無音トラックを選択"
 
-#: Menus.cpp:2771 toolbars/EditToolBar.cpp:141
+#: Menus.cpp:3315
+#: toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "無音"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3349
 msgid "Duplicate"
 msgstr "複製"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3349
 msgid "Duplicated"
 msgstr "複製済み"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3368
 msgid "Cut Labels"
 msgstr "カットラベル"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3368
 msgid "Cut labeled regions to the clipboard"
 msgstr "ラベルづけされた領域をカットしてクリップボードへ"
 
-#: Menus.cpp:2838
+#: Menus.cpp:3382
 msgid "SplitCut labeled regions to the clipboard"
 msgstr "分離カットのラベルづけされた領域をクリップボードへ"
 
-#: Menus.cpp:2839
+#: Menus.cpp:3383
 msgid "Split Cut Labels"
 msgstr "分離カットラベル"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3397
 msgid "Copied labeled regions to the clipboard"
 msgstr "ラベルづけされた領域をクリップボードへコピーしました"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3397
 msgid "Copy Labels"
 msgstr "コピーラベル"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3409
 msgid "Delete Labels"
 msgstr "消去ラベル"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3409
 msgid "Deleted labeled regions"
 msgstr "削除したラベル付けされた領域"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3421
 msgid "Split Delete Labels"
 msgstr "消去ラベルを分離"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3421
 msgid "Split Deleted labeled regions"
 msgstr "消去ラベル領域を分離"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3433
 msgid "Silence Labels"
 msgstr "無音のラベル"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3433
 msgid "Silenced labeled regions"
 msgstr "無音のラベル付けされた領域"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3445
 msgid "Split Labels"
 msgstr "分離ラベル"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3445
 msgid "Split labeled regions"
 msgstr "分離ラベルのついた領域"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3457
 msgid "Join Labels"
 msgstr "ラベルを連結"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3457
 msgid "Joined labeled regions"
 msgstr "結合したラベル付けされた領域"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3469
 msgid "Disjoin Labels"
 msgstr "ラベルを分割"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3469
 msgid "Disjoined labeled regions"
 msgstr "分離したラベル付けされた領域"
 
-#: Menus.cpp:2947 TrackPanel.cpp:6121
+#: Menus.cpp:3491
+#: TrackPanel.cpp:6134
 msgid "Split"
 msgstr "分離"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3585
 msgid "Split New"
 msgstr "新しく分離"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3585
 msgid "Split to new track"
 msgstr "新しいトラックに分離"
 
-#: Menus.cpp:3124
+#: Menus.cpp:3668
 msgid "Split at labels"
 msgstr "ラベルを分離"
 
-#: Menus.cpp:3425
+#: Menus.cpp:3969
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
-msgstr ""
-"スペクトルをプロットするためには, 選択されたトラックはすべてが同一のサンプリ"
-"レートでなければなりません."
+msgstr "スペクトルをプロットするためには, 選択されたトラックはすべてが同一のサンプリレートでなければなりません."
 
-#: Menus.cpp:3451
+#: Menus.cpp:3995
 #, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
-msgstr ""
-"大量のオーディオが選択されました. 最初の %.1f 秒だけが分析されるでしょう."
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "大量のオーディオが選択されました. 最初の %.1f 秒だけが分析されるでしょう."
 
-#: Menus.cpp:3584
+#: Menus.cpp:4130
 #, c-format
 msgid "Imported labels from '%s'"
 msgstr "'%s' からラベルを取り込む"
 
-#: Menus.cpp:3585
+#: Menus.cpp:4131
 msgid "Import Labels"
 msgstr "ラベルの取り込み"
 
-#: Menus.cpp:3595
+#: Menus.cpp:4142
 msgid "Select a MIDI file..."
 msgstr "MIDI ファイルを選択..."
 
-#: Menus.cpp:3599
-msgid ""
-"All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr ""
-"全てのファイル (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
+#: Menus.cpp:4196
+#, fuzzy
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "MIDI と Allegro ファイル (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDIファイル (*.MIDI mid;*.midi)|*.mid;*.midi|Allegroファイル(*.gro)|*.gro|全てのファイル (*.*)|*.*"
 
-#: Menus.cpp:3615
+#: Menus.cpp:4162
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "'%s' から MIDI を取り込む"
 
-#: Menus.cpp:3617
+#: Menus.cpp:4163
 msgid "Import MIDI"
 msgstr "MIDI の取り込み"
 
-#: Menus.cpp:3630
+#: Menus.cpp:4177
 msgid "Select any uncompressed audio file..."
 msgstr "非圧縮オーディオファイルを選択して下さい..."
 
-#: Menus.cpp:3634
+#: Menus.cpp:4181
 msgid "All files (*)|*"
 msgstr "全てのファイル (*)|*"
 
-#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "取り込み"
-
-#: Menus.cpp:3668
+#: Menus.cpp:4205
 msgid "Edit the metadata tags"
 msgstr "メタデータタグを編集"
 
-#: Menus.cpp:3669 export/Export.cpp:298
+#: Menus.cpp:4206
+#: export/Export.cpp:353
 msgid "Edit Metadata"
 msgstr "メタデータを編集"
 
-#: Menus.cpp:3669
+#: Menus.cpp:4206
 msgid "Edit Metadata tags"
 msgstr "メタデータタグを編集"
 
-#: Menus.cpp:3725
+#: Menus.cpp:4262
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr "トラック `%s' にある全てのオーディオの再描画"
 
-#: Menus.cpp:3726
+#: Menus.cpp:4263
 msgid "Render"
 msgstr "描画"
 
-#: Menus.cpp:3731
+#: Menus.cpp:4268
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
 msgstr "%d 個のトラックを一つの新しいステレオトラックにミックスして作成"
 
-#: Menus.cpp:3734
+#: Menus.cpp:4271
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "%d 個のトラックを一つの新しいモノラルトラックにミックスして作成"
 
-#: Menus.cpp:3736 Mix.cpp:120
+#: Menus.cpp:4273
+#: Mix.cpp:121
 msgid "&Mix and Render"
 msgstr "ミックスして置き換え (&M)"
 
-#: Menus.cpp:3866
+#: Menus.cpp:4403
 msgid "Aligned with zero"
 msgstr "セロで揃えました"
 
-#: Menus.cpp:3870
+#: Menus.cpp:4407
 msgid "Aligned cursor"
 msgstr "カーソルを揃えました"
 
-#: Menus.cpp:3874
+#: Menus.cpp:4411
 msgid "Aligned with selection start"
 msgstr "選択範囲の最初を揃えました"
 
-#: Menus.cpp:3878
+#: Menus.cpp:4415
 msgid "Aligned with selection end"
 msgstr "選択範囲の最後を揃えました"
 
-#: Menus.cpp:3882
+#: Menus.cpp:4419
 msgid "Aligned end with cursor"
 msgstr "カーソル位置を終端にしました"
 
-#: Menus.cpp:3886
+#: Menus.cpp:4423
 msgid "Aligned end with selection start"
 msgstr "選択範囲の最初を起点にしました"
 
-#: Menus.cpp:3890
+#: Menus.cpp:4427
 msgid "Aligned end with selection end"
 msgstr "選択範囲の最後を終端にしました"
 
-#: Menus.cpp:3894
+#: Menus.cpp:4431
 msgid "Aligned"
 msgstr "揃えました"
 
-#: Menus.cpp:3927
+#: Menus.cpp:4464
 msgid "Align"
 msgstr "揃える"
 
-#: Menus.cpp:3950
+#: Menus.cpp:4549
+msgid "Sync MIDI with Audio"
+msgstr "MIDIをオーディオに同期"
+
+#: Menus.cpp:4553
+msgid "Alignment completed."
+msgstr "整列が完了しました."
+
+#: Menus.cpp:4564
 msgid "Created new audio track"
 msgstr "新しいオーディオトラックが製作されました"
 
-#: Menus.cpp:3950 Menus.cpp:3973 Menus.cpp:3988 Menus.cpp:4008
+#: Menus.cpp:4564
+#: Menus.cpp:4587
+#: Menus.cpp:4602
+#: Menus.cpp:4622
 msgid "New Track"
 msgstr "新しいトラック"
 
-#: Menus.cpp:3973
+#: Menus.cpp:4587
 msgid "Created new stereo audio track"
 msgstr "新しいステレオオーディオトラックが製作されました"
 
-#: Menus.cpp:3988
+#: Menus.cpp:4602
 msgid "Created new label track"
 msgstr "新しいラベルトラックが製作されました"
 
-#: Menus.cpp:3997
-msgid ""
-"The version of Audacity you are using does not support multiple time tracks."
-msgstr ""
-"この Audacity のバージョンではマルチプルタイムトラックをサポートしていません."
+#: Menus.cpp:4611
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "この Audacity のバージョンではマルチプルタイムトラックをサポートしていません."
 
-#: Menus.cpp:4008
+#: Menus.cpp:4622
 msgid "Created new time track"
 msgstr "新しいタイムトラックが製作されました"
 
-#: Menus.cpp:4057
+#: Menus.cpp:4677
 msgid "Added label"
 msgstr "ラベルを付ける"
 
-#: Menus.cpp:4085
+#: Menus.cpp:4712
 msgid "Edited labels"
 msgstr "編集されたラベル"
 
-#: Menus.cpp:4112
+#: Menus.cpp:4739
 msgid "Save CleanSpeech Preset File As:"
 msgstr "クリーンな音声プリセットファイルを保存:"
 
-#: Menus.cpp:4116
+#: Menus.cpp:4743
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr "きれいな音声信号のプリセット (*.csp) |*.csp"
 
-#: Menus.cpp:4123 export/Export.cpp:515
+#: Menus.cpp:4750
+#: export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "256 文字以上のパス名はサポートしていません."
 
-#: Menus.cpp:4169
+#: Menus.cpp:4796
 msgid "Problem encountered exporting presets."
 msgstr "プリセットを導入する際に問題が生じました。"
 
-#: Menus.cpp:4170 export/Export.cpp:408
+#: Menus.cpp:4797
+#: export/Export.cpp:468
 msgid "Unable to export"
 msgstr "書き出しできません"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4981
 msgid "Remove Track"
 msgstr "トラックの削除"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4981
 msgid "Removed audio track(s)"
 msgstr "削除されたオーディオトラック"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "新しいサンプルレート(Hz):"
-
-#: Menus.cpp:4508 Menus.cpp:4527 export/ExportMP3.cpp:1926
+#: Menus.cpp:5138
+#: Menus.cpp:5193
+#: export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr "リサンプル"
 
-#: Menus.cpp:4514
+#: Menus.cpp:5158
+#: TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr "新しいサンプルレート(Hz):"
+
+#: Menus.cpp:5182
+#: TrackPanel.cpp:6385
 msgid "The entered value is invalid"
 msgstr "入力された値は不適切です。"
 
-#: Menus.cpp:4525
+#: Menus.cpp:5191
 #, c-format
 msgid "Resampling track %d"
 msgstr "%d トラックを再サンプリング中"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5200
 msgid "Resample Track"
 msgstr "トラックのリサンプル"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5200
 msgid "Resampled audio track(s)"
 msgstr "リサンプルされたオーディオトラック"
 
-#: Mix.cpp:94 Mix.cpp:101
+#: Mix.cpp:95
+#: Mix.cpp:102
 msgid "Mix"
 msgstr "Mix"
 
-#: Mix.cpp:121
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
 msgstr "トラックの合成と表示"
 
-#: NoteTrack.cpp:36
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "ノートトラック"
 
-#: Printing.cpp:198
+#: Printing.cpp:192
 msgid "There was a problem printing."
 msgstr "印刷に問題があります."
 
-#: Printing.cpp:199
+#: Printing.cpp:193
 msgid "Print"
 msgstr "印刷"
 
-#: Project.cpp:636
+#: Project.cpp:673
 msgid "Main Mix"
 msgstr "主ミックス"
 
-#: Project.cpp:761
+#: Project.cpp:797
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Audacity version %s へようこそ"
 
-#: Project.cpp:922
+#: Project.cpp:957
 msgid "(Recovered)"
 msgstr "回復済み"
 
-#: Project.cpp:1482 TrackPanel.cpp:804 toolbars/ControlToolBar.cpp:191
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+#: toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "録音"
 
-#: Project.cpp:1482 TrackPanel.cpp:804
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "録音されたオーディオ"
 
-#: Project.cpp:1500
+#: Project.cpp:1564
 msgid "Save changes before closing?"
 msgstr "閉じる前に変更を保存しますか?"
 
-#: Project.cpp:1503
+#: Project.cpp:1567
 msgid ""
 "\n"
 "If saved, the project will have no tracks.\n"
@@ -2991,23 +3116,24 @@ msgstr ""
 "キャンセルをクリックして、編集 > アンドゥ で全ての\n"
 "トラックを開いてから、ファイル > プロジェクトを保存 を実行してください。"
 
-#: Project.cpp:1506
+#: Project.cpp:1570
 msgid "Save changes?"
 msgstr "変更を保存しますか?"
 
-#: Project.cpp:1694
+#: Project.cpp:1772
 msgid "All files|*.*|All supported files|"
 msgstr "すべてのファイル|*.*|全てのサポートされるファイル|"
 
-#: Project.cpp:1719
+#: Project.cpp:1802
 msgid "Select one or more audio files..."
 msgstr "1つもしくは複数のオーディオファイルを選択して下さい..."
 
-#: Project.cpp:1746
+#: Project.cpp:1829
 msgid "Audacity projects|*.aup|"
 msgstr "Audacity プロジェクト|*.aup|"
 
-#: Project.cpp:1799 Project.cpp:2186
+#: Project.cpp:1882
+#: Project.cpp:2304
 #, c-format
 msgid ""
 "This file was saved by Audacity %s, a much\n"
@@ -3026,19 +3152,21 @@ msgstr ""
 "\n"
 "それでも今このファイルを開きたいですか? "
 
-#: Project.cpp:1800
+#: Project.cpp:1883
 msgid "1.0 or earlier"
-msgstr ""
+msgstr "1.0 より以前"
 
-#: Project.cpp:1806 Project.cpp:2198
+#: Project.cpp:1889
+#: Project.cpp:2316
 msgid "Opening old project file"
 msgstr "古いプロジェクトファイルを開いています"
 
-#: Project.cpp:1832 Project.cpp:1840
+#: Project.cpp:1915
+#: Project.cpp:1923
 msgid "Error opening file"
 msgstr "ファイルの読み込み時にエラーが発生しました"
 
-#: Project.cpp:1846
+#: Project.cpp:1929
 #, c-format
 msgid ""
 "File may be invalid or corrupted: \n"
@@ -3047,44 +3175,41 @@ msgstr ""
 "ファイルは不正か壊れているでしょう。\n"
 "%s"
 
-#: Project.cpp:1847
+#: Project.cpp:1930
 msgid "Error opening file or project"
 msgstr "プロジェクトあるいはファイルの読み込み時にエラーが発生しました"
 
-#: Project.cpp:1867
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
-msgstr ""
-"Audacity 1.0 形式のプロジェクトファイルを新しいフォーマットに変換することがで"
-"きませんでした."
+#: Project.cpp:1950
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity 1.0 形式のプロジェクトファイルを新しいフォーマットに変換することができませんでした."
 
-#: Project.cpp:1970
+#: Project.cpp:2053
 msgid "Could not remove old auto save file"
 msgstr "古い自動保存ファイルを削除できませんでした"
 
-#: Project.cpp:1972
+#: Project.cpp:2055
 msgid "Project was recovered"
 msgstr "プロジェクトは回復されました。"
 
-#: Project.cpp:1972
+#: Project.cpp:2055
 msgid "Recover"
 msgstr "回復"
 
-#: Project.cpp:2001
+#: Project.cpp:2084
 msgid "Project checker repaired file"
 msgstr "プロジェクトチェッカーがファイルを修復しました。"
 
-#: Project.cpp:2001 effects/Repair.h:29
+#: Project.cpp:2084
+#: effects/Repair.h:29
 msgid "Repair"
 msgstr "修復"
 
-#: Project.cpp:2112
+#: Project.cpp:2230
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "プロジェクトデータフォルダーが見つかりません: \"%s\""
 
-#: Project.cpp:2155
+#: Project.cpp:2273
 #, c-format
 msgid ""
 "This file was saved using Audacity %s.\n"
@@ -3095,16 +3220,15 @@ msgstr ""
 "あなたは Audacity %s を使用しています - このファイルを\n"
 "開くには、新しいバージョンにアップグレードする必要があります。"
 
-#: Project.cpp:2159
+#: Project.cpp:2277
 msgid "Can't open project file"
 msgstr "プロジェクトファイルを開けません"
 
-#: Project.cpp:2193
+#: Project.cpp:2311
 #, c-format
 msgid ""
 "This file was saved by Audacity %s.\n"
-"You 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"
+"You 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"
 "\n"
 "Open this file now?"
 msgstr ""
@@ -3114,133 +3238,173 @@ msgstr ""
 "\n"
 "このファイルを今開きますか?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid ""
+"Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+"プロジェクトは空です。\n"
+"もし保存済みであれば、そのプロジェクトにはトラックがありません。\n"
+"\n"
+"以前開いていたトラックを保存するには:\n"
+"'No'をクリックし、編集>やり直しで全トラックが\n"
+"開かれるまで繰り返し、ファイル>プロジェクトの保存を実行する。\n"
+"\n"
+"保存しますか?"
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr "警告:プロジェクトは空です。"
+
+#: Project.cpp:2588
 #, c-format
 msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+"Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
 "プロジェクトファイルが保存できません. %s は書き込みできないか,\n"
 "ディスクが一杯です."
 
-#: Project.cpp:2428 Project.cpp:2442
+#: Project.cpp:2590
+#: Project.cpp:2605
 msgid "Error saving project"
 msgstr "Audacity プロジェクトファイルの保存時にエラーが発生しました"
 
-#: Project.cpp:2504
+#: Project.cpp:2680
 #, c-format
 msgid "Saved %s"
 msgstr "%s を保存しました"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "ヘッダなし(Raw)"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "'%s' ファイルを取り込む..."
-
-#: Project.cpp:2586
+#: Project.cpp:2806
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' を取り込む"
 
-#: Project.cpp:2639 Project.cpp:2647
+#: Project.cpp:2807
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "取り込み"
+
+#: Project.cpp:2840
+#: Project.cpp:2848
 msgid "Error importing"
 msgstr "ファイルの取り込み時にエラーが発生しました"
 
-#: Project.cpp:2681
+#: Project.cpp:2882
 msgid "Save Speech As:"
 msgstr "スピーチを保存:"
 
-#: Project.cpp:2683
+#: Project.cpp:2884
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM オーディオファイル (*.wav)|*.wav"
 
-#: Project.cpp:2689
+#: Project.cpp:2891
 msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+"Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Audacity プロジェクトファイル (.AUP) は作業結果を正確に保存します\n"
-"しかし他のほとんどのプログラムは Audacity プロジェクトファイルを開くことがで"
-"きません\n"
+"Audacity の圧縮されたプロジェクトファイル (.aup) は作業結果をよりサイズの小さな圧縮された (.ogg)フォーマットで保存します.\n"
+"圧縮されたプロジェクトファイルは、オンラインでプロジェクトをやりとりするにはよい方法です. なぜならサイズが小さくなるからです.圧縮されたプロジェクトファイルを拓くには、それぞれの圧縮されたトラックを読み込むため、通常よりより時間がかかります.\n"
 "\n"
-"他のプログラムからファイルを開きたい場合にはエクスポートコマンドのうちの\n"
-"どれかを使って下さい."
+"他のほとんどのプログラムは Audacity プロジェクトファイルを開くことができません\n"
+"他のプログラムから開くことのできるファイルを保存したいならば、書き出しコマンドのうちのどれかを使って下さい."
 
-#: Project.cpp:2692
+#: Project.cpp:2894
+msgid ""
+"You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+"Audacity のプロジェクトファイル (.aup)を保存しようとしています.\n"
+"\n"
+"プロジェクトを保存することは、Audacity のみが開くことのできるファイルを作成します.\n"
+"\n"
+"他のプログラムで利用するオーディオファイルを保存するには、\"ファイル > 書き出し\" コマンドを選んでください.\n"
+
+#: Project.cpp:2898
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Audacity プロジェクト (*.aup)|*.aup"
 
-#: Project.cpp:2736
+#: Project.cpp:2952
 msgid "Created new project"
 msgstr "新しいプロジェクトが製作されました"
 
-#: Project.cpp:2856
+#: Project.cpp:3111
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "%.2f 秒削除しました (位置 %.2f)"
 
-#: Project.cpp:2859 effects/Equalization.cpp:1262
-#: effects/Equalization.cpp:2593
+#: Project.cpp:3114
+#: effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "削除"
 
-#: Project.cpp:3052
+#: Project.cpp:3308
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr "録音可能時間: %d 時間 %d 分"
 
-#: Project.cpp:3055
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr "録音可能時間: 1 時間 %d 分"
 
-#: Project.cpp:3058
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr "録音可能時間: %d 分"
 
-#: Project.cpp:3061
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr "録音可能時間: %d 秒"
 
-#: Project.cpp:3064
+#: Project.cpp:3320
 msgid "Out of disk space"
 msgstr "ディスクスペースが一杯です"
 
-#: Project.cpp:3342
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr "複数読み込み完了. オンデマンドによる %d この波形計算が実行中. 全体の %2.0f%% 完了."
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr "読み込み完了. オンデマンドの波形計算が実行中. %2.0f%% 完了."
+
+#: Project.cpp:3614
 msgid "Could not remove old autosave file: "
 msgstr "古い自動保存ファイルを削除できません:"
 
-#: Project.cpp:3383
+#: Project.cpp:3655
 msgid "New Project"
 msgstr "新しいプロジェクト"
 
-#: Project.cpp:3396
+#: Project.cpp:3668
 msgid "Error writing autosave file"
 msgstr "自動保存ファイルの書き込みにエラーが発生しました"
 
-#: Project.cpp:3421
+#: Project.cpp:3693
 msgid "Could not create autosave file: "
 msgstr "自動保存ファイルが書き込めません:"
 
-#: Project.cpp:3447
+#: Project.cpp:3719
 #, c-format
 msgid "Actual Rate: %d"
 msgstr "本来のレート: %d"
@@ -3266,7 +3430,8 @@ msgstr "Erik de Castro Lopo による Libresample"
 msgid "Libsamplerate error: %d\n"
 msgstr "Libsamplerate エラー: %d\n"
 
-#: Resample.cpp:240 Resample.cpp:250
+#: Resample.cpp:240
+#: Resample.cpp:250
 msgid "Resampling disabled."
 msgstr "再サンプリングは無効になっています."
 
@@ -3296,58 +3461,29 @@ msgstr "保存しました"
 msgid "Error trying to save file: "
 msgstr "ファイル保存時のエラー: "
 
-#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
 msgid "Gap detected in project file\n"
 msgstr "プロジェクトファイルに空白が検知されました。\n"
 
-#: ShuttleGui.cpp:1852 effects/Effect.cpp:342
-#: effects/audiounits/AudioUnitEffect.cpp:872
+#: ShuttleGui.cpp:1972
+#: effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
 msgstr "プレビュー (&v)"
 
-#: ShuttleGui.cpp:1859
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "デバッグ (&D)"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity タイマー録音"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "音のレベルに応じた録音"
 
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "録音の開始"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "録音の終了"
-
-#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
-#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "持続時間"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity の賢い録音機能が動作中です"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "開始日時"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "終了日時"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "録音開始を待っています %s \n"
-
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity 録音機 - 開始待機中"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "録音開始レベル (dB):"
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3357,194 +3493,153 @@ msgstr "Audacity へようこそ! (&W)"
 msgid "Don't show this again at start up"
 msgstr "このメッセージを次回からは開始時に表示しない"
 
-#: Tags.cpp:629
+#: Tags.cpp:640
 msgid "Artist Name"
 msgstr "アーティスト名"
 
-#: Tags.cpp:630
+#: Tags.cpp:641
 msgid "Track Title"
 msgstr "トラック名"
 
-#: Tags.cpp:631
+#: Tags.cpp:642
 msgid "Album Title"
 msgstr "アルバム名"
 
-#: Tags.cpp:632
+#: Tags.cpp:643
 msgid "Track Number"
 msgstr "トラックナンバー:"
 
-#: Tags.cpp:633 Tags.cpp:2138
+#: Tags.cpp:644
+#: Tags.cpp:2147
 msgid "Year"
 msgstr "å¹´"
 
-#: Tags.cpp:634
+#: Tags.cpp:645
 msgid "Genre"
 msgstr "ジャンル:"
 
-#: Tags.cpp:635 Tags.cpp:2148 prefs/MousePrefs.cpp:96
+#: Tags.cpp:646
+#: Tags.cpp:2157
+#: prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "コメント"
 
-#: Tags.cpp:778 Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "F2 を押すかダブルクリックして編集"
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr "矢印キー(または編集後であればReturnキー)を使ってフィールド内を移動してください。"
 
-#: Tags.cpp:802
+#: Tags.cpp:813
 msgid "Tag Name"
 msgstr "タグ名"
 
-#: Tags.cpp:803
+#: Tags.cpp:814
 msgid "Tag Value"
 msgstr "タグ値"
 
-#: Tags.cpp:818 Tags.cpp:1476 prefs/KeyConfigPrefs.cpp:116
+#: Tags.cpp:829
+#: Tags.cpp:1486
+#: prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
 msgstr "クリア (&C)"
 
-#: Tags.cpp:824
+#: Tags.cpp:835
 msgid "Genres"
 msgstr "ジャンル:"
 
-#: Tags.cpp:828 Tags.cpp:1439 Tags.cpp:1980
-msgid "Edit"
-msgstr "編集"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr " 編集(&d)"
 
-#: Tags.cpp:829 Tags.cpp:1981
-msgid "Reset"
-msgstr "リセット"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr "リセット(&t)"
 
-#: Tags.cpp:834 Tags.cpp:1460 Tags.cpp:1988
+#: Tags.cpp:845
+#: Tags.cpp:1470
+#: Tags.cpp:1997
 msgid "Template"
 msgstr "雛形"
 
-#: Tags.cpp:838 Tags.cpp:1464 Tags.cpp:1992 prefs/KeyConfigPrefs.cpp:126
+#: Tags.cpp:849
+#: Tags.cpp:1474
+#: Tags.cpp:2001
+#: prefs/KeyConfigPrefs.cpp:126
 msgid "&Load..."
 msgstr "読み込み...(&L)"
 
-#: Tags.cpp:839 Tags.cpp:1465 Tags.cpp:1993 prefs/KeyConfigPrefs.cpp:125
+#: Tags.cpp:850
+#: Tags.cpp:1475
+#: Tags.cpp:2002
+#: prefs/KeyConfigPrefs.cpp:125
 msgid "&Save..."
 msgstr "保存...(&S)"
 
-#: Tags.cpp:841 Tags.cpp:1467 Tags.cpp:1995
+#: Tags.cpp:852
+#: Tags.cpp:1477
+#: Tags.cpp:2004
 msgid "S&et Default"
 msgstr "デフォルトに戻す (&e)"
 
-#: Tags.cpp:991 Tags.cpp:1630 Tags.cpp:2359
+#: Tags.cpp:1002
+#: Tags.cpp:1640
+#: Tags.cpp:2368
 msgid "Edit Genres"
 msgstr "ジャンルを編集"
 
-#: Tags.cpp:1024 Tags.cpp:1036 Tags.cpp:1052 Tags.cpp:1065 Tags.cpp:1668
-#: Tags.cpp:1680 Tags.cpp:1696 Tags.cpp:1709 Tags.cpp:2402 Tags.cpp:2414
-#: Tags.cpp:2430 Tags.cpp:2443
+#: Tags.cpp:1035
+#: Tags.cpp:1047
+#: Tags.cpp:1062
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1690
+#: Tags.cpp:1705
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2423
+#: Tags.cpp:2438
+#: Tags.cpp:2451
 msgid "Reset Genres"
 msgstr "ジャンルをリセット"
 
-#: Tags.cpp:1024 Tags.cpp:1065 Tags.cpp:1668 Tags.cpp:1709 Tags.cpp:2402
-#: Tags.cpp:2443
+#: Tags.cpp:1035
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2451
 msgid "Unable to save genre file."
 msgstr "ジャンルファイルに保存できません。"
 
-#: Tags.cpp:1035 Tags.cpp:1679 Tags.cpp:2413
+#: Tags.cpp:1046
+#: Tags.cpp:1689
+#: Tags.cpp:2422
 msgid "Are you sure you want to reset the genre list to defaults?"
 msgstr "ジャンルリストを既定値にリセットしてよろしいですか?"
 
-#: Tags.cpp:1052 Tags.cpp:1696 Tags.cpp:2430
+#: Tags.cpp:1062
+#: Tags.cpp:1705
+#: Tags.cpp:2438
 msgid "Unable to open genre file."
 msgstr "ジャンルファイルを開けません"
 
-#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "メタデータを保存:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr "メタデータをロード:"
 
-#: Tags.cpp:1112 Tags.cpp:1763 Tags.cpp:2486
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
 msgid "Error loading metadata"
 msgstr "メタデータの読み込みエラー"
 
-#: Tags.cpp:1409 Tags.cpp:1968
-msgid "Title:"
-msgstr "タイトル:"
-
-#: Tags.cpp:1410 Tags.cpp:1969
-msgid "Artist:"
-msgstr "アーティスト:"
-
-#: Tags.cpp:1411 Tags.cpp:1970
-msgid "Album:"
-msgstr "アルバム:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "作曲家:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "作詞家:"
-
-#: Tags.cpp:1414 Tags.cpp:1973
-msgid "Comments:"
-msgstr "コメント:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "エンコード:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "著作権:"
-
-#: Tags.cpp:1424 Tags.cpp:1971
-msgid "Track Number:"
-msgstr "トラックナンバー:"
-
-#: Tags.cpp:1428 Tags.cpp:1972
-msgid "Year:"
-msgstr "å¹´:"
-
-#: Tags.cpp:1432 Tags.cpp:1974
-msgid "Genre:"
-msgstr "ジャンル:"
-
-#: Tags.cpp:1490 Tags.cpp:2089
-msgid "No Genres"
-msgstr "ジャンルなし"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "デフォルトに戻す"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "基本"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "上級"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "ボリューム"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "クリア (&r)"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "属性 \"%s\" の最大長は %d 文字です. データが切り詰められました."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "タイトル"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "アーティスト"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "アルバム"
+#: Tags.cpp:1097
+#: Tags.cpp:1151
+#: Tags.cpp:1751
+#: Tags.cpp:1787
+#: Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "メタデータを保存:"
 
 #: Theme.cpp:638
 #, c-format
@@ -3579,7 +3674,8 @@ msgstr ""
 "が見つかりません。\n"
 "テーマはロードされません。"
 
-#: Theme.cpp:807 Theme.cpp:896
+#: Theme.cpp:807
+#: Theme.cpp:896
 #, c-format
 msgid ""
 "Audacity could not load file:\n"
@@ -3594,7 +3690,9 @@ msgstr ""
 msgid ""
 "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr "規定のテーマを読み取ることができません。¥n"
+msgstr ""
+"規定のテーマを読み取ることができません。\n"
+"問題を報告してください。"
 
 #: Theme.cpp:918
 #, c-format
@@ -3604,7 +3702,8 @@ msgid ""
 "  %s."
 msgstr "テーマを構成するであろうファイルが %s で見つかりません。"
 
-#: Theme.cpp:942 effects/NoiseRemoval.cpp:173
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
 #, c-format
 msgid ""
 "Could not create directory:\n"
@@ -3633,425 +3732,524 @@ msgstr ""
 "にある全ての要求されたファイルは\n"
 "既に存在しています。"
 
-#: TrackPanel.cpp:464 TrackPanel.cpp:465
+#: TimeDialog.cpp:53
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "持続時間"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity タイマー録音"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "録音の開始"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "録音の終了"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr "Audacity のタイマー録音が動作中です"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "開始日時"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr "開始日時"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "終了日時"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr "終了日時"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "録音開始を待っています %s \n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Audacity タイマー録音 - 開始待機中"
+
+#: TrackPanel.cpp:457
+#: TrackPanel.cpp:458
 msgid "Track Panel"
 msgstr "トラックパネル"
 
-#: TrackPanel.cpp:548 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
+#: TrackPanel.cpp:541
+#: prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "その他..."
 
-#: TrackPanel.cpp:556 TrackPanel.cpp:580 TrackPanel.cpp:589 TrackPanel.cpp:597
+#: TrackPanel.cpp:549
+#: TrackPanel.cpp:571
+#: TrackPanel.cpp:580
+#: TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "名前..."
 
-#: TrackPanel.cpp:558 TrackPanel.cpp:582 TrackPanel.cpp:593 TrackPanel.cpp:599
+#: TrackPanel.cpp:551
+#: TrackPanel.cpp:573
+#: TrackPanel.cpp:584
+#: TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
 msgstr "トラックを上へ移動"
 
-#: TrackPanel.cpp:559 TrackPanel.cpp:583 TrackPanel.cpp:594 TrackPanel.cpp:600
+#: TrackPanel.cpp:552
+#: TrackPanel.cpp:574
+#: TrackPanel.cpp:585
+#: TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
 msgstr "トラックを下へ移動"
 
-#: TrackPanel.cpp:561 effects/ToneGen.cpp:325
+#: TrackPanel.cpp:554
+#: effects/ToneGen.cpp:319
+#: prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "波形"
 
-#: TrackPanel.cpp:562
+#: TrackPanel.cpp:555
+#: prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "波形 (dB)"
 
-#: TrackPanel.cpp:565
+#: TrackPanel.cpp:557
+#: prefs/GUIPrefs.cpp:157
 msgid "Spectrum log(f)"
 msgstr "対数周波数でのスペクトログラム表示 "
 
-#: TrackPanel.cpp:567
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558
+#: prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
 msgstr "ピッチ (EAC)"
 
-#: TrackPanel.cpp:569 TrackPanel.cpp:6091
+#: TrackPanel.cpp:560
+#: TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "モノラル"
 
-#: TrackPanel.cpp:570 TrackPanel.cpp:6090
+#: TrackPanel.cpp:561
+#: TrackPanel.cpp:6095
 msgid "Left Channel"
 msgstr "左チャンネル"
 
-#: TrackPanel.cpp:571 TrackPanel.cpp:6090
+#: TrackPanel.cpp:562
+#: TrackPanel.cpp:6095
 msgid "Right Channel"
 msgstr "右チャンネル"
 
-#: TrackPanel.cpp:572
+#: TrackPanel.cpp:563
 msgid "Make Stereo Track"
 msgstr "ステレオトラックの作製"
 
-#: TrackPanel.cpp:573
+#: TrackPanel.cpp:564
 msgid "Split Stereo Track"
 msgstr "ステレオトラックを分離"
 
-#: TrackPanel.cpp:575
+#: TrackPanel.cpp:566
 msgid "Set Sample Format"
 msgstr "サンプルフォーマットを設定"
 
-#: TrackPanel.cpp:577 TrackPanel.cpp:6320
+#: TrackPanel.cpp:568
+#: TrackPanel.cpp:6341
 msgid "Set Rate"
 msgstr "レートをセット"
 
-#: TrackPanel.cpp:585
+#: TrackPanel.cpp:576
 msgid "Up Octave"
 msgstr "オクターブを上げる"
 
-#: TrackPanel.cpp:586
+#: TrackPanel.cpp:577
 msgid "Down Octave"
 msgstr "オクターブを下げる"
 
-#: TrackPanel.cpp:591
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "フォント..."
 
-#: TrackPanel.cpp:602
+#: TrackPanel.cpp:593
 msgid "Set Range..."
 msgstr "範囲をセット..."
 
-#: TrackPanel.cpp:606 toolbars/EditToolBar.cpp:135
+#: TrackPanel.cpp:597
+#: toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "コピー"
 
-#: TrackPanel.cpp:1272
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
-msgstr ""
-"クリックで垂直方向に拡大, シフトキーを押しながらクリックで縮小, 拡大縮小範囲"
-"を選択するためにはドラッグして下さい."
+#: TrackPanel.cpp:1258
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "クリックで垂直方向に拡大, シフトキーを押しながらクリックで縮小, 拡大縮小範囲を選択するためにはドラッグして下さい."
 
-#: TrackPanel.cpp:1277
+#: TrackPanel.cpp:1263
 msgid "Drag the label vertically to change the order of the tracks."
 msgstr "ラベルをドラッグしてトラックの順番を変更します."
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1283
 msgid "Click and drag to adjust relative size of stereo tracks."
-msgstr ""
-"ステレオトラックの相対サイズを変更するためにはクリックした後にドラッグして下"
-"さい"
+msgstr "ステレオトラックの相対サイズを変更するためにはクリックした後にドラッグして下さい"
 
-#: TrackPanel.cpp:1300
+#: TrackPanel.cpp:1286
 msgid "Click and drag to resize the track."
 msgstr "トラックをリサイズするためにはクリック後にドラックして下さい."
 
-#: TrackPanel.cpp:1331
+#: TrackPanel.cpp:1317
 msgid "Drag one or more label boundaries"
 msgstr "ひとつあるいはそれ以上のラベル境界をドラッグ"
 
-#: TrackPanel.cpp:1332
+#: TrackPanel.cpp:1318
 msgid "Drag label boundary"
 msgstr "ラベル境界をドラッグ"
 
 #. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1348
+#: TrackPanel.cpp:1334
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr "マルチツールモード: Cmd-, マウスとキーボードの設定"
 
 #. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1351
+#: TrackPanel.cpp:1337
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr "マルチツールモード: Ctrl-P, マウスとキーボードの設定"
 
-#: TrackPanel.cpp:1371
+#: TrackPanel.cpp:1383
 msgid "Click and drag to move left selection boundary."
 msgstr "左の選択範囲を移動させるためにはクリックした後にドラッグして下さい."
 
-#: TrackPanel.cpp:1376
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move right selection boundary."
 msgstr "右の選択範囲を移動させるためにはクリックした後にドラッグして下さい."
 
-#: TrackPanel.cpp:1702 TrackPanel.cpp:3993 TrackPanel.cpp:4025
-#: TrackPanel.cpp:4280 TrackPanel.cpp:6432 TrackPanel.cpp:6452
+#: TrackPanel.cpp:1730
+#: TrackPanel.cpp:3959
+#: TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
 msgid "Modified Label"
 msgstr "変更されたラベル"
 
-#: TrackPanel.cpp:1703 TrackPanel.cpp:3994 TrackPanel.cpp:4026
-#: TrackPanel.cpp:4281 TrackPanel.cpp:6433 TrackPanel.cpp:6453
+#: TrackPanel.cpp:1731
+#: TrackPanel.cpp:3960
+#: TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
 msgid "Label Edit"
 msgstr "ラベルの編集"
 
-#: TrackPanel.cpp:1930
+#: TrackPanel.cpp:1971
 msgid "Adjusted envelope."
 msgstr "エンベロープの調整."
 
-#: TrackPanel.cpp:1931 prefs/MousePrefs.cpp:115
+#: TrackPanel.cpp:1972
+#: prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "エンベロープ"
 
-#: TrackPanel.cpp:2082
+#: TrackPanel.cpp:2123
 msgid "Moved clip to another track"
 msgstr "別のトラックを移動されたクリップ"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "left"
 msgstr "å·¦"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "right"
 msgstr "右"
 
 #  i18n-hint: %s is a direction like left or right
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2088
+#: TrackPanel.cpp:2129
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr "タイムシフトされたトラック/クリップ %s %.02f 秒"
 
-#: TrackPanel.cpp:2092 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
+#: TrackPanel.cpp:2133
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "タイムシフト"
 
-#: TrackPanel.cpp:2953
+#: TrackPanel.cpp:2916
 msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
-msgstr ""
-"描画を行うなら、'波形'をトラックのドロップダウンメニューで選んでください。"
+msgstr "描画を行うなら、'波形'をトラックのドロップダウンメニューで選んでください。"
 
-#: TrackPanel.cpp:2970
+#: TrackPanel.cpp:2933
 msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr "描画を行うなら、個々のサンプルが見えるまで拡大をしてください."
 
-#: TrackPanel.cpp:3241
+#: TrackPanel.cpp:3205
 msgid "Moved Sample"
 msgstr "移動されたサンプル"
 
-#: TrackPanel.cpp:3242
+#: TrackPanel.cpp:3206
 msgid "Sample Edit"
 msgstr "サンプルの編集"
 
-#: TrackPanel.cpp:3341
+#: TrackPanel.cpp:3305
 #, c-format
 msgid "Removed track '%s.'"
 msgstr "削除されたトラック '%s'"
 
-#: TrackPanel.cpp:3343
+#: TrackPanel.cpp:3307
 msgid "Track Remove"
 msgstr "トラックの削除"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved gain slider"
 msgstr "移動されたゲインススライダー"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved pan slider"
 msgstr "移動されたパンスライダー"
 
 #  i18n-hint: Title of the Gain slider, used to adjust the volume
 #  i18n-hint: Title of the Gain slider, used to adjust the volume
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5726 TrackPanel.cpp:7149
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5703
+#: TrackPanel.cpp:7244
 msgid "Gain"
 msgstr "ゲイン調整"
 
 #  i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
 #  i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5664 TrackPanel.cpp:7156
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5641
+#: TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "パンスライダー"
 
-#: TrackPanel.cpp:3610 TrackPanel.cpp:6385 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3576
+#: TrackPanel.cpp:6441
 msgid "up"
 msgstr "アップ"
 
-#: TrackPanel.cpp:3614 TrackPanel.cpp:6386 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3580
+#: TrackPanel.cpp:6442
 msgid "down"
 msgstr "ダウン"
 
-#: TrackPanel.cpp:3621 TrackPanel.cpp:6381
+#: TrackPanel.cpp:3587
+#: TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "移動 '%s' %s"
 
-#: TrackPanel.cpp:3624 TrackPanel.cpp:6387
+#: TrackPanel.cpp:3590
+#: TrackPanel.cpp:6443
 msgid "Move Track"
 msgstr "トラックの移動"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expand"
 msgstr "æ‹¡å¼µ"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expanded Cut Line"
 msgstr "切り取り線を拡張"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merge"
 msgstr "連結"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merged Clips"
 msgstr "クリップを連結"
 
-#: TrackPanel.cpp:4201
+#: TrackPanel.cpp:4176
 msgid "Removed Cut Line"
 msgstr "カットラインの除去"
 
-#: TrackPanel.cpp:5664
+#: TrackPanel.cpp:5641
 msgid "Adjusted Pan"
 msgstr "パンの調整."
 
-#: TrackPanel.cpp:5726
+#: TrackPanel.cpp:5703
 msgid "Adjusted gain"
 msgstr "ゲインの調整:"
 
-#: TrackPanel.cpp:5918
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr "波形トラックをグループ化"
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr "全てのグルーピングを解除"
+
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
 msgstr "アクティブなオーディオと一緒にトラックの削除はできません。"
 
-#: TrackPanel.cpp:6071
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Stereo, "
 
-#: TrackPanel.cpp:6074
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Mono, "
 
-#: TrackPanel.cpp:6076
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "å·¦,"
 
-#: TrackPanel.cpp:6078
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "右,"
 
-#: TrackPanel.cpp:6100 TrackPanel.cpp:6225
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "'%s' から %s に変更されました"
 
-#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6110
 msgid "Channel"
 msgstr "チャンネル"
 
-#: TrackPanel.cpp:6118
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "ステレオトラック '%s' を分離"
 
-#: TrackPanel.cpp:6139
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "ステレオトラック '%s' が製作されました"
 
-#: TrackPanel.cpp:6142
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
 msgstr "ステレオの作製"
 
-#: TrackPanel.cpp:6189
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "'%s' から %d Hz に変更されました"
 
-#: TrackPanel.cpp:6191
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "レートの変更"
 
-#: TrackPanel.cpp:6229
+#: TrackPanel.cpp:6255
 msgid "Format Change"
 msgstr "フォーマットの変更"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "1秒あたりの周波数 (Hz) を 1 から 100000 の範囲で入力:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "無効なレートです"
-
-#: TrackPanel.cpp:6349
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
 msgstr "最低速度制限を変更 (%):"
 
-#: TrackPanel.cpp:6350 TrackPanel.cpp:6351
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
 msgid "Lower speed limit"
 msgstr "最低スピードの制限"
 
-#: TrackPanel.cpp:6356
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
 msgstr "最高速度制限を変更 (%):"
 
-#: TrackPanel.cpp:6357 TrackPanel.cpp:6358
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
 msgid "Upper speed limit"
 msgstr "上位速度の制限"
 
-#: TrackPanel.cpp:6366
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "範囲を '%d' から '%d' に設定"
 
-#: TrackPanel.cpp:6369
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "範囲をセット"
 
-#: TrackPanel.cpp:6414
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
 msgstr "トラック名の変更:"
 
-#: TrackPanel.cpp:6415
+#: TrackPanel.cpp:6473
 msgid "Track Name"
 msgstr "トラック名"
 
-#: TrackPanel.cpp:6418
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "%s' から '%s' へリネーム"
 
-#: TrackPanel.cpp:6421
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "名前の変更"
 
-#: TrackPanel.cpp:6487
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
 msgstr "トラックラベルのフォント"
 
-#: TrackPanel.cpp:6499
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
 msgid "Face name"
 msgstr "フォント名"
 
-#: TrackPanel.cpp:6508
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
 msgid "Face size"
 msgstr "フォントサイズ"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Mute"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Solo"
 
-#: TrackPanelAx.cpp:265
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
 msgstr "トラックビュー"
 
-#: TrackPanelAx.cpp:273
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
 msgstr "トラックアクセスは非同期"
 
-#: TrackPanelAx.cpp:281
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
 msgstr "トラック %d "
 
-#: TrackPanelAx.cpp:287
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr "ミュート入"
 
-#: TrackPanelAx.cpp:292
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
 msgstr "ソロ入り"
 
-#: TrackPanelAx.cpp:296
+#: TrackPanelAx.cpp:304
 msgid " Select On"
 msgstr "選択"
 
-#: VoiceKey.cpp:88 VoiceKey.cpp:238 VoiceKey.cpp:376 VoiceKey.cpp:517
+#: VoiceKey.cpp:88
+#: VoiceKey.cpp:238
+#: VoiceKey.cpp:376
+#: VoiceKey.cpp:517
 msgid "Selection is too small to use voice key."
 msgstr "ボイスキーを使うには選択範囲は小さすぎです。"
 
@@ -4074,34 +4272,37 @@ msgstr "符号の変化       -- 平均: %1.4f  標準偏差: (%1.4f)\n"
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr "方向の変化  -- 平均: %1.4f  標準偏差: (%1.4f)\n"
 
-#: WaveTrack.cpp:85
+#: WaveTrack.cpp:88
 msgid "Audio Track"
 msgstr "Audio Track"
 
-#: WaveTrack.cpp:555 WaveTrack.cpp:574
+#: WaveTrack.cpp:597
+#: WaveTrack.cpp:616
+#: WaveTrack.cpp:1057
+#: WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
 msgstr "選択範囲をペーストするには余裕がありません。"
 
-#: WaveTrack.cpp:1688
+#: WaveTrack.cpp:2086
 msgid "There is not enough room available to expand the cut line"
 msgstr "カットラインを延長するのに十分な余裕がありません。"
 
-#: commands/CommandManager.cpp:448
+#: commands/CommandManager.cpp:555
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "プラグイン 1 から %i"
 
-#: commands/CommandManager.cpp:462
+#: commands/CommandManager.cpp:569
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "プラグイン %i から %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
-msgstr ""
-"何らかの理由で許可されません。どれかのオーディオを先に選んでみてください。"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "何らかの理由で許可されません。どれかのオーディオを先に選んでみてください。"
 
-#: commands/CommandManager.cpp:781
+#: commands/CommandManager.cpp:892
 msgid ""
 "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
@@ -4109,7 +4310,7 @@ msgstr ""
 "録音と再生が停止しているときのみ、この作業は可能です。\n"
 "[一時停止状態でもだめです。]"
 
-#: commands/CommandManager.cpp:783
+#: commands/CommandManager.cpp:894
 msgid ""
 "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
@@ -4117,11 +4318,11 @@ msgstr ""
 "この利用のためには、ステレオのオーディオを何か最初に選ぶべきです。\n"
 "[モノラルのオーディオには利用できません。]"
 
-#: commands/CommandManager.cpp:785
+#: commands/CommandManager.cpp:896
 msgid "You must first select some audio for this to use."
 msgstr "トラックを最初に選択してください."
 
-#: commands/CommandManager.cpp:787
+#: commands/CommandManager.cpp:898
 msgid ""
 "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
@@ -4129,16 +4330,16 @@ msgstr ""
 "この利用のためには、オーディオを何か最初に選ぶべきです。\n"
 "[オーディオ以外のトラックには利用できません。]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "メッセージ"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr "許可なし"
 
-#: commands/CommandManager.cpp:972
+#: commands/CommandManager.cpp:1083
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
 msgstr "%d キーボードショートカットは読み込まれました\n"
 
-#: commands/CommandManager.cpp:974
+#: commands/CommandManager.cpp:1085
 msgid "Loading keyboard shortcuts"
 msgstr "キーボードショートカットの読み込み"
 
@@ -4147,57 +4348,60 @@ msgstr "キーボードショートカットの読み込み"
 msgid "Applied effect: %s %.1f dB"
 msgstr "エフェクトの適用: %s %.1f dB"
 
-#: effects/Amplify.cpp:87
+#: effects/Amplify.cpp:139
 msgid "Amplify"
 msgstr "増幅"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Dominic Mazzoni による増幅"
+#: effects/Amplify.cpp:155
+#: effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "Dominic Mazzoni による"
 
-#: effects/Amplify.cpp:159
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "増幅 (dB):"
 
-#: effects/Amplify.cpp:179
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr "増幅 dB"
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "新しい最大振幅"
 
-#: effects/Amplify.cpp:191
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
 msgstr "クリッピングを許可"
 
-#: effects/Amplify.cpp:237 effects/Amplify.cpp:287 effects/Amplify.cpp:353
+#: effects/Amplify.cpp:222
+#: effects/Amplify.cpp:279
+#: effects/Amplify.cpp:323
 msgid "-Infinity"
-msgstr ""
+msgstr "-無限"
 
-#: effects/Amplify.h:46
+#: effects/Amplify.h:37
 msgid "Amplify..."
 msgstr "増幅..."
 
-#: effects/Amplify.h:54
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "増幅"
 
 #: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
-msgstr ""
-"オーディオを含まないトラックが選ばれました。オートドックはオーディオトラック"
-"のみを処理できます。"
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "オーディオを含まないトラックが選ばれました。オートドックはオーディオトラックのみを処理できます。"
 
-#: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:126
+#: effects/AutoDuck.cpp:138
+#: effects/AutoDuck.cpp:453
 #: effects/AutoDuck.cpp:570
 msgid "Auto Duck"
 msgstr "オートドック"
 
 #: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
-msgstr ""
-"オートドックは、選択したトラックの下にコントロールトラックを必要とします。"
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "オートドックは、選択したトラックの下にコントロールトラックを必要とします。"
 
 #: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
@@ -4212,11 +4416,24 @@ msgid "Maximum pause:"
 msgstr "最大休止:"
 
 #. i18n-hint: Name of time display format that shows time in seconds
-#: effects/AutoDuck.cpp:494 effects/AutoDuck.cpp:499 effects/AutoDuck.cpp:504
-#: effects/AutoDuck.cpp:509 effects/AutoDuck.cpp:514
-#: prefs/AudioIOPrefs.cpp:166 prefs/AudioIOPrefs.cpp:174
-#: prefs/AudioIOPrefs.cpp:176 prefs/AudioIOPrefs.cpp:201
-#: prefs/AudioIOPrefs.cpp:203 widgets/TimeTextCtrl.cpp:263
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: effects/Contrast.cpp:263
+#: effects/Contrast.cpp:286
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
+#: prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163
+#: prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
 msgstr "秒"
 
@@ -4236,7 +4453,8 @@ msgstr "内側のフェードダウンする長さ:"
 msgid "Inner fade up length:"
 msgstr "内側のフェードアップする長さ:"
 
-#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:484
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:494
 msgid "Threshold:"
 msgstr "閾値:"
 
@@ -4244,22 +4462,23 @@ msgstr "閾値:"
 msgid "Please enter valid values."
 msgstr "有効な数値を入力してください。"
 
-#: effects/AutoDuck.cpp:704
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
-msgstr "プリビューは使用できません"
+msgstr "プレビューは使用できません"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr "オートドック..."
 
-#: effects/AutoDuck.h:107
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr "オーディオドックでの処理..."
 
-#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:448
-#: effects/audiounits/AudioUnitEffect.cpp:877 effects/nyquist/Nyquist.cpp:1042
-#: widgets/ErrorDialog.cpp:79 widgets/ErrorDialog.cpp:105
-#: widgets/Warning.cpp:67
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "OK"
 
@@ -4273,22 +4492,33 @@ msgid "Bass Boost"
 msgstr "低域の強調"
 
 #: effects/BassBoost.cpp:182
+#: effects/Phaser.cpp:219
+#: effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr "Nasca Octavian Paul による"
 
 #: effects/BassBoost.cpp:196
+#: effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
 msgstr "周波数 (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr "周波数 ヘルツ"
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "増幅 (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr "ブースト dB"
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "低域の強調..."
 
-#: effects/BassBoost.h:43
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
 msgstr "低周波数域の増幅"
 
@@ -4305,73 +4535,114 @@ msgstr "長さの変更"
 msgid "Applied effect: %s %.2f semitones"
 msgstr "エフェクトの適用: %s %.2f (半音)"
 
-#: effects/ChangePitch.cpp:118
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
 msgstr "ピッチの変更"
 
-#: effects/ChangePitch.cpp:247
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
 msgstr "テンポを変えずにピッチの変更"
 
-#. i18n-hint: && in here is an escape character to get a single & on
-#. * screen, so keep it as is
-#: effects/ChangePitch.cpp:254 effects/ChangeSpeed.cpp:313
-#: effects/ChangeTempo.cpp:180
+#: effects/ChangePitch.cpp:258
+#: effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "Vaughan Johnson と Dominic Mazzoni による"
 
-#: effects/ChangePitch.cpp:259 effects/ChangeTempo.cpp:185
+#: effects/ChangePitch.cpp:260
+#: effects/ChangeTempo.cpp:175
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "Olli Parviainen による SoundTouch の使用"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "ピッチ: from"
+msgid "Pitch:"
+msgstr "ピッチ:"
 
-#: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
-#: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
-#: effects/ChangeTempo.cpp:270
-msgid "to"
-msgstr "to"
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr "から:"
 
-#: effects/ChangePitch.cpp:306
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr "ピッチから"
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr "アップ"
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr "ダウン"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr "へ:"
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr "ピッチへ"
+
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
 msgstr "半音 (半階):"
 
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "周波数 (Hz): from"
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr "半音 (半階):"
 
-#: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
-#: effects/ChangeTempo.cpp:198
+#: effects/ChangePitch.cpp:326
+#: effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206
+#: effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr "から"
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr "周波数 Hz から"
+
+#: effects/ChangePitch.cpp:331
+#: effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211
+#: effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "to"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr "秒であらわされる周波数へ"
+
+#: effects/ChangePitch.cpp:338
+#: effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
 msgid "Percent Change:"
 msgstr "テンポ変更率(%):"
 
+#: effects/ChangePitch.cpp:343
+#: effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358
+#: effects/ChangeTempo.cpp:195
+msgid "Percent Change"
+msgstr "変更率(%)"
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "ピッチの変更..."
 
-#: effects/ChangePitch.h:39
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
 msgstr "ピッチの変更"
 
-#: effects/ChangeSpeed.cpp:53 effects/ChangeTempo.cpp:55
+#: effects/ChangeSpeed.cpp:54
+#: effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "エフェクトの適用: %s %.1f%%"
 
-#: effects/ChangeSpeed.cpp:60
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
 msgstr "スピードの変更"
 
-#: effects/ChangeSpeed.cpp:308
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "スピードの変更 (テンポとピッチの双方に影響します)"
-
-#: effects/ChangeSpeed.cpp:318
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "Erik de Castro Lopo によるサンプルレートの使用"
-
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
@@ -4380,183 +4651,525 @@ msgstr "Erik de Castro Lopo によるサンプルレートの使用"
 #  abbreviation meaning "not
 #  applicable" (in other words,
 #  unimportant, not relevant).
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
 msgid "n/a"
 msgstr "適用不可"
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "標準のLPレコード回転数:   from"
+#: effects/ChangeSpeed.cpp:334
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "スピードの変更 (テンポとピッチの双方に影響します)"
+
+#: effects/ChangeSpeed.cpp:338
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "Erik de Castro Lopo によるサンプルレートの使用"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr "標準のLPレコード回転数:"
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr "RPMから"
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr "RPMへ"
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
-msgstr "スピードの変更"
+msgstr "スピードの変更..."
 
-#: effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
 msgstr "スピードの変更"
 
-#: effects/ChangeTempo.cpp:74
+#: effects/ChangeTempo.cpp:138
 msgid "Change Tempo"
 msgstr "テンポの変更"
 
-#: effects/ChangeTempo.cpp:175
+#: effects/ChangeTempo.cpp:171
 msgid "Change Tempo without Changing Pitch"
 msgstr "ピッチを変えずにテンポの変更"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "1分あたりの拍数 (BPM):   from"
+#: effects/ChangeTempo.cpp:203
+msgid "Beats per minute:"
+msgstr "1分あたりの拍数 (BPM):"
+
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr "1分あたりの拍数から"
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr "1分あたりの拍数へ"
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "長さ (秒):   from"
+#: effects/ChangeTempo.cpp:216
+msgid "Length (seconds):"
+msgstr "長さ (秒):"
+
+#: effects/ChangeTempo.cpp:220
+msgid "From length in seconds"
+msgstr "長さ (秒)から"
+
+#: effects/ChangeTempo.cpp:225
+msgid "To length in seconds"
+msgstr "長さ (秒)へ"
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
-msgstr "テンポの変更"
+msgstr "テンポの変更..."
 
-#: effects/ChangeTempo.h:43
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
 msgstr "テンポの変更"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
-msgstr "クリックノイズの除去..."
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
+msgstr "クリックノイズの除去"
 
-#: effects/ClickRemoval.cpp:336
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Griag DeForestによるクリックおよびポップ音除去"
 
-#: effects/ClickRemoval.cpp:350
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
 msgstr "閾値の選択(低くすると感度が高くなります):"
 
-#: effects/ClickRemoval.cpp:362
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr "スレッショルドの選択"
+
+#: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
 msgstr "最大のパルス幅(大きくすると、より感度が高くなります)"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr "最大スパイク幅"
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "クリックノイズの除去..."
 
-#: effects/ClickRemoval.h:50
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
 msgstr "クリック音やポップ音の除去..."
 
-#: effects/Compressor.cpp:74
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "ダイナミックレンジの圧縮"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dominic Mazzoni によるダイナミックレンジの圧縮"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr "閾値"
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
 msgstr "比率:"
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "比率"
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
 msgstr "アタックタイム:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr "アタックタイム"
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
 msgstr "減衰時間: "
 
-#: effects/Compressor.cpp:516
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr "減衰時間"
+
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "圧縮後に音量を0dBに基準化"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
-msgstr "閾値: %d dB"
+msgid "Threshold %d dB"
+msgstr "閾値 %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "比率: %.0f:1"
+msgid "%3d dB"
+msgstr "%3d dB"
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "比率: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr "比率 %.0f から 1"
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
-msgstr "アタックタイム: %.1f 秒"
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr "比率 %.1f から 1"
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr "%.1f:1"
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr "アタックタイム %.1f 秒"
+
+#: effects/Compressor.cpp:576
+#: effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr "%.1f 秒"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr "減衰時間: %.1f 秒"
 
 #: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "圧縮..."
 
-#: effects/Compressor.h:44
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
 msgstr "ダイナミックレンジを圧縮..."
 
-#: effects/DtmfGen.cpp:48
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr "コントラストツール 前景"
+
+#: effects/Contrast.cpp:79
+msgid ""
+"Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+"前景時間が選択されました。\n"
+"次に背景を選択し Ctrl+Shift+Tまたはメニューに戻ってください。"
+
+#: effects/Contrast.cpp:127
+msgid ""
+"Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+"開始時間が終了時間より後になっています!\n"
+"正しい時間を入力してください。"
+
+#: effects/Contrast.cpp:137
+msgid ""
+"Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+"時間が正しくありません!\n"
+"正しい時間を入力してください。"
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr "Hello.\n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr "WCAG2オーディオコントラストアナライザ"
+
+#: effects/Contrast.cpp:193
+#: effects/Contrast.cpp:204
+#: effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr "拍子づけされた"
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr "コントラスト分析器"
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr "パラメータ"
+
+#: effects/Contrast.cpp:242
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "開始"
+
+#: effects/Contrast.cpp:243
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "終了"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr "ボリューム"
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr "前面:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr "前景開始時間"
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr "前景終了時間"
+
+#: effects/Contrast.cpp:373
+#: effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr "選択してください"
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr "背面:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr "背景開始時間"
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr "背景終了時間"
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr "結果"
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr "対比結果:"
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+msgid "Reset"
+msgstr "リセット"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr "差異:"
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "情報"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr "2つのオーディオ区間同士のrmsボリュームの差を計測するには"
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr "WCAG2 オーディオコントラストアナライザのヘルプ"
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "コントロール"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr "注: 'OK'ボタンにより時間はリセットされます。"
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr "時間を維持したまま閉じる"
+
+#: effects/Contrast.cpp:328
+#: effects/Contrast.cpp:336
+#: effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr "小節"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr "計測すべき前景がありません。"
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr "計測された前景レベル"
+
+#: effects/Contrast.cpp:191
+#: effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f dB"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr "計測すべき背景がありません。"
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr "計測された背景レベル"
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr "WCAG2 経路"
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr "WCAG2 失敗"
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr "現在の差異"
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr "%.1f dB 平均 rms"
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr "有効な時間を入力してください。"
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr "コントラスト結果を書き出す:"
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr "WCAG 2.0 Success Criteria 1.4.7 コントラスト結果"
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr "ファイル名 = %s."
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr "前景"
+
+#: effects/Contrast.cpp:581
+#: effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr "開始時間 = %2d 時間, %2d 分, %.2f 秒"
+
+#: effects/Contrast.cpp:586
+#: effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr "終了時間 = %2d 時間, %2d 分, %.2f 秒"
+
+#: effects/Contrast.cpp:588
+#: effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr "平均 rms = %.1f dB."
+
+#: effects/Contrast.cpp:590
+#: effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr "平均 rms =  dB."
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr "背景"
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr "結果"
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr "差分 = %.1f 平均 rms dB."
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr "WCAG2.0のSuccess Criteria 1.4.7: 合格"
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr "WCAG2.0のSuccess Criteria 1.4.7: 不合格"
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr "データ収集済み"
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr "コントラスト...\tCtrl+Shift+T"
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr "背面で測定"
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr "前面で測定"
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr "DTMF トーンジェネレータ"
 
-#: effects/DtmfGen.cpp:439
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "Salvo Ventura (2006) による"
 
-#: effects/DtmfGen.cpp:443
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "DTMFシーケンス:"
 
-#: effects/DtmfGen.cpp:446 effects/Noise.cpp:255 effects/ToneGen.cpp:328
-#: effects/ToneGen.cpp:365
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "振幅 (0-1)"
 
-#: effects/DtmfGen.cpp:448
+#: effects/DtmfGen.cpp:465
 msgid "Duration:"
 msgstr "持続時間:"
 
-#: effects/DtmfGen.cpp:469
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
 msgstr "トーンと無音の比:"
 
-#: effects/DtmfGen.cpp:479
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr "デューティー比:"
 
-#: effects/DtmfGen.cpp:481
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
 msgstr "トーン持続時間:"
 
-#: effects/DtmfGen.cpp:482 effects/DtmfGen.cpp:484 effects/DtmfGen.cpp:560
-#: effects/DtmfGen.cpp:561
+#: effects/DtmfGen.cpp:499
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
 msgstr "ミリ秒"
 
-#: effects/DtmfGen.cpp:483
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr "無音持続時間:"
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
 msgstr "DTMFトーン"
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
 msgstr "エフェクトの適用: DTMFトーンの生成 %6lf 秒"
 
-#: effects/DtmfGen.h:53
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
 msgstr "DTMFトーンの作成"
 
@@ -4572,6 +5185,7 @@ msgstr "エコー"
 #. i18n-hint: && in here is an escape character to get a single & on
 #. * screen, so keep it as is
 #: effects/Echo.cpp:195
+#: effects/Repeat.cpp:200
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "Dominic Mazzoni と Vaughan Johnson による"
 
@@ -4587,27 +5201,23 @@ msgstr "減衰ファクター"
 msgid "Echo..."
 msgstr "エコー:"
 
-#: effects/Echo.h:42
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "エコーの適用"
 
-#: effects/Effect.cpp:390
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
-msgstr "プリビューの準備中..."
+msgstr "プレビューの準備中..."
 
-#: effects/Effect.cpp:419
+#: effects/Effect.cpp:497
 msgid "Previewing"
 msgstr "プレビュー"
 
-#: effects/Effect.cpp:435
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"サウンドデバイスの取得時に時にエラーが発生しました. 出力デバイス設定と, プロ"
-"ジェクトのサンプルレートのチェックをして下さい."
+#: effects/Effect.cpp:512
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "サウンドデバイスの取得時に時にエラーが発生しました. 出力デバイス設定と, プロジェクトのサンプルレートのチェックをして下さい."
 
-#: effects/Effect.h:107
+#: effects/Effect.h:100
 #, c-format
 msgid "Applied effect: %s"
 msgstr "エフェクトの適用: %s"
@@ -4624,29 +5234,30 @@ msgstr "コサイン"
 msgid "Cubic"
 msgstr "キュービック"
 
-#: effects/Equalization.cpp:362 effects/Equalization.cpp:412
+#: effects/Equalization.cpp:367
+#: effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "イコライゼーション"
 
-#: effects/Equalization.cpp:980
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
 msgstr "イコライザ曲線の読み込みエラー"
 
-#: effects/Equalization.cpp:1019
+#: effects/Equalization.cpp:1033
 msgid "custom"
 msgstr "カスタム"
 
 #. i18n-hint: && in here is an escape character to get a single &
 #. * on screen, so keep it as is
-#: effects/Equalization.cpp:1087
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr "Mitch Golden と Vaughan Johnson によるイコライゼーション"
 
-#: effects/Equalization.cpp:1108
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr "最大 dB"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr "最小 dB"
 
@@ -4654,52 +5265,54 @@ msgstr "最小 dB"
 #  cycles per second.
 #  i18n-hint: This is the abbreviation for "Hertz", or
 #  cycles per second.
-#: effects/Equalization.cpp:1183
+#: effects/Equalization.cpp:1197
 msgid "kHz"
 msgstr "kHz"
 
-#: effects/Equalization.cpp:1200
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
 msgstr "カーブの描画"
 
-#: effects/Equalization.cpp:1205
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
 msgstr "グラフィックイコライザ"
 
-#: effects/Equalization.cpp:1219
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
 msgstr "リニア周波数軸"
 
-#: effects/Equalization.cpp:1228
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
 msgstr "フィルタ長"
 
-#: effects/Equalization.cpp:1249
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
 msgstr "曲線を選択"
 
-#: effects/Equalization.cpp:1259 effects/Equalization.cpp:2498
-#: export/ExportMultiple.cpp:826
+#: effects/Equalization.cpp:1273
+#: effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
 msgstr "保存"
 
-#: effects/Equalization.cpp:1265
+#: effects/Equalization.cpp:1279
 msgid "Flat"
 msgstr "平坦"
 
-#: effects/Equalization.cpp:2497
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
 msgstr "カーブに付ける名前を入力"
 
-#: effects/Equalization.cpp:2597
+#: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
 msgid "Confirm Deletion"
 msgstr "削除の確認"
 
-#: effects/Equalization.h:87
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "イコライゼーション..."
 
-#: effects/Equalization.h:95
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "イコライゼーションの適用"
 
@@ -4707,15 +5320,15 @@ msgstr "イコライゼーションの適用"
 msgid "Fade In"
 msgstr "フェードイン"
 
-#: effects/Fade.h:32
+#: effects/Fade.h:38
 msgid "Fading In"
 msgstr "フェーディングイン"
 
-#: effects/Fade.h:48
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "フェードアウト"
 
-#: effects/Fade.h:56
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "フェーディングアウト"
 
@@ -4751,7 +5364,7 @@ msgstr "開始と停止は正でかつ0より大きい必要があります。"
 msgid "Find Clipping..."
 msgstr "クリッピングの検出..."
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr "クリッピングの検出中"
 
@@ -4759,66 +5372,222 @@ msgstr "クリッピングの検出中"
 msgid "Invert"
 msgstr "上下を反転"
 
-#: effects/Invert.h:35
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "上下を反転"
 
-#: effects/Leveller.cpp:52
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "レベラー"
+
+#: effects/Leveller.cpp:203
 msgid "None-Skip"
 msgstr "無し"
 
-#: effects/Leveller.cpp:53
+#: effects/Leveller.cpp:204
 msgid "Light"
 msgstr "右"
 
-#: effects/Leveller.cpp:54
+#: effects/Leveller.cpp:205
 msgid "Moderate"
 msgstr "そこそこ"
 
-#: effects/Leveller.cpp:55
+#: effects/Leveller.cpp:206
 msgid "Heavy"
 msgstr "強く"
 
-#: effects/Leveller.cpp:56
+#: effects/Leveller.cpp:207
 msgid "Heavier"
 msgstr "より強く"
 
-#: effects/Leveller.cpp:57
+#: effects/Leveller.cpp:208
 msgid "Heaviest"
 msgstr "最も強く"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "レベラー"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Lynn Allan によるレベラー"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "静かな部分とうるさい部分の調整"
+#: effects/Leveller.cpp:212
+#: effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "Lynn Allan による"
 
-#: effects/Leveller.cpp:226 effects/Leveller.cpp:231
+#: effects/Leveller.cpp:222
 msgid "Degree of Leveling"
 msgstr "レベル調整の度合"
 
-#: effects/Leveller.cpp:242
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr "レベル調整の度合:"
+
+#: effects/Leveller.cpp:234
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "ノイズの閾値(ヒス/ハム/環境雑音)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr "ノイズの閾値:"
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
 msgstr "レベラー..."
 
-#: effects/Leveller.h:36
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
 msgstr "レベラーを適用..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr "生成器"
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr "楽器"
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr "発振器"
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr "便利なツール"
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr "変換器"
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr "解析器"
+
+#: effects/LoadEffects.cpp:114
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "ミキサー"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr "シミュレータ"
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr "遅延"
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr "変調器"
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr "残響"
+
+#: effects/LoadEffects.cpp:124
+#: effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "フェーザー"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr "フランジャー"
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr "コーラス"
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr "フィルタ"
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr "低域通過"
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr "帯域通過"
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr "高域通過"
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr "くし型"
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr "全帯域通過"
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr "イコライザ"
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr "パラメトリック"
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr "マルチバンド"
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr "スペクトル上の処理"
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr "ピッチシフタ"
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr "増幅器"
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr "ディストーション"
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr "波形変形"
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr "ダイナミックレンジの圧縮"
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr "圧縮"
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr "æ‹¡å¼µ"
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr "リミッタ"
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr "ゲート"
+
+#: effects/LoadEffects.cpp:199
+#: effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "ノイズの除去"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr "ピッチとテンポの変更"
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr "タイムライン変更"
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr "時間"
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr "立上り"
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "ホワイト"
@@ -4835,7 +5604,7 @@ msgstr "ブラウン"
 msgid "Noise Generator"
 msgstr "ノイズジェネレータ"
 
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr "ノイズの種類"
 
@@ -4843,12 +5612,12 @@ msgstr "ノイズの種類"
 msgid "Noise..."
 msgstr "ノイズ..."
 
-#: effects/Noise.h:49
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
 msgstr "エフェクトの適用: ノイズの生成 %6lf 秒"
 
-#: effects/Noise.h:53
+#: effects/Noise.h:59
 msgid "Generating Noise"
 msgstr "ノイズの作成"
 
@@ -4865,65 +5634,71 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "ノイズプロファイル無しでのノイズ除去を意図\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "ノイズの除去"
-
-#: effects/NoiseRemoval.cpp:813
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "ステップ 1"
 
-#: effects/NoiseRemoval.cpp:814
+#: effects/NoiseRemoval.cpp:815
 msgid ""
 "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
 msgstr ""
-"Audacity が何をフィルタで除去するべきかを判断するために, まずノイズを何秒か選"
-"択します\n"
+"Audacity が何をフィルタで除去するべきかを判断するために, まずノイズを何秒か選択します\n"
 "次にクリックすることでノイズのプロファイルを得ます:"
 
-#: effects/NoiseRemoval.cpp:815
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "ステップ 2"
 
-#: effects/NoiseRemoval.cpp:816
+#: effects/NoiseRemoval.cpp:817
 msgid ""
 "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
 msgstr ""
-"フィルタリングしたいオーディオを全て選択し,どの程度フィルタで除去をしたいかを"
-"選択,\n"
+"フィルタリングしたいオーディオを全て選択し,どの程度フィルタで除去をしたいかを選択,\n"
 "次に`OK'クリックすることでノイズを除去します.\n"
 
-#: effects/NoiseRemoval.cpp:821
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Dominic Mazzoni によるノイズの除去"
 
-#: effects/NoiseRemoval.cpp:829
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
 msgstr "ノイズプロファイルの取得"
 
-#: effects/NoiseRemoval.cpp:840
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
 msgstr "ノイズ除去 (dB):"
 
-#: effects/NoiseRemoval.cpp:848
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr "ノイズの除去"
+
+#: effects/NoiseRemoval.cpp:849
 msgid "Frequency smoothing (Hz):"
 msgstr "スムージング周波数 (Hz):"
 
-#: effects/NoiseRemoval.cpp:856
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr "周波数平滑化"
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr "アタック/ディケイ時間 (秒):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr "アタック/デケイ時間"
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "ノイズの除去..."
 
-#: effects/NoiseRemoval.h:44
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "ノイズプロファイルの製作"
 
-#: effects/NoiseRemoval.h:46
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "ノイズの除去"
 
@@ -4934,13 +5709,15 @@ msgstr "ノイズの除去"
 msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
 msgstr "与えた効果: %s DCオフセットの除去 = %s, 基準化された振幅 = %s"
 
-#: effects/Normalize.cpp:74 effects/Normalize.cpp:75
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
 msgid "false"
 msgstr "偽"
 
 #. i18n-hint: true here means that the option was
 #. * selected. Opposite false if not selected
-#: effects/Normalize.cpp:74 effects/Normalize.cpp:75
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
 msgid "true"
 msgstr "真"
 
@@ -4949,91 +5726,104 @@ msgstr "真"
 msgid ", maximum amplitude = %.1f dB"
 msgstr ", 最大振幅 = %.1f dB"
 
-#: effects/Normalize.cpp:113
+#: effects/Normalize.cpp:327
 msgid "Normalize"
 msgstr "正規化"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Dominic Mazzoni による正規化"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
+#: effects/Normalize.cpp:351
+#: effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr "どんな DC オフセットも削除します (センターを 0 にします)"
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "最大振幅を正規化します."
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr "最大振幅を正規化します:"
 
-#: effects/Normalize.cpp:361
+#: effects/Normalize.cpp:362
 msgid "-"
 msgstr "-"
 
-#: effects/Normalize.h:32
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr "最大振幅 dB"
+
+#: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "正規化..."
 
-#: effects/Normalize.h:41
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "正規化..."
 
 #: effects/Phaser.cpp:65
 #, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"エフェクトの適用: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase "
-"= %.0f deg, depth = %d, feedback = %.0f%%"
-
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "フェーザー"
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "エフェクトの適用: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Nasca Octavian Paul によるフェーザー"
-
-#: effects/Phaser.cpp:222
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "ステージ:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "ドライ"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr "ステージ"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr "ドライ/ウェット"
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "ウェット"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr "ドライ ウェット"
 
-#: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
+#: effects/Phaser.cpp:236
+#: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO 周波数 (Hz):"
 
-#: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
+#: effects/Phaser.cpp:239
+#: effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr "LFO 周波数 (Hz)"
+
+#: effects/Phaser.cpp:241
+#: effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO 初期位相 (角度):"
 
-#: effects/Phaser.cpp:296
+#: effects/Phaser.cpp:244
+#: effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr "LFO 初期位相 (角度):"
+
+#: effects/Phaser.cpp:246
 msgid "Depth:"
 msgstr "深度:"
 
-#: effects/Phaser.cpp:312
+#: effects/Phaser.cpp:249
+#: effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr "パーセント表記による深さ"
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
 msgstr "フィードバック (%):"
 
-#: effects/Phaser.h:38
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr "パーセント表記によるフィードバック"
+
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "フェーザー..."
 
-#: effects/Phaser.h:46
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "フェーザーエフェクトを適用..."
 
 #: effects/Repair.cpp:99
 msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
+"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
@@ -5042,52 +5832,62 @@ msgstr ""
 "\n"
 "ズームして、1秒よりずっと短い修復したい部分を選んでください。"
 
-#: effects/Repair.h:37
+#: effects/Repair.cpp:105
+msgid ""
+"Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+"選択範囲外のオーディオデータを使って修復します.\n"
+"\n"
+"オーディオデータが接続する最低片方側のデータ領域を選択してください\n"
+"\n"
+"より多くのオーディオデータを選ぶと、より良く修復できます."
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
 msgstr "損傷したオーディオデータの修復中"
 
-#: effects/Repeat.cpp:49
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
 msgstr "%d 回リピートされました"
 
-#: effects/Repeat.cpp:75
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
 msgstr "トラックが長すぎるため選択範囲をリピートすることができません."
 
-#: effects/Repeat.cpp:76 effects/Repeat.cpp:80
+#: effects/Repeat.cpp:77
+#: effects/Repeat.cpp:187
 msgid "Repeat"
 msgstr "リピート"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Dominic Mazzoni と Vaughan Johnson によるリピート"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
 msgstr "繰り返し回数:"
 
-#: effects/Repeat.cpp:207 effects/Repeat.cpp:237
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr "新しい選択範囲: hh:mm:ss"
+
+#: effects/Repeat.cpp:253
 msgid "New selection length: "
 msgstr "新しい選択範囲:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d 分, %d 秒"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "時:分:秒"
 
-#: effects/Repeat.h:32
+#: effects/Repeat.h:33
 msgid "Repeat..."
 msgstr "リピート..."
 
-#: effects/Repeat.h:40
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
 msgstr "リピートの適用"
 
@@ -5095,7 +5895,7 @@ msgstr "リピートの適用"
 msgid "Reverse"
 msgstr "前後を反転"
 
-#: effects/Reverse.h:38
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "前後を反転"
 
@@ -5107,22 +5907,18 @@ msgstr "無音ジェネレータ"
 msgid "Silence..."
 msgstr "無音"
 
-#: effects/Silence.h:42
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "無音の作成"
 
-#: effects/Silence.h:47
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "エフェクトの適用: 無音の生成 %6lf 秒"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"このエフェクトは個別のチャンネルが一致しないステレオトラック上では実行できま"
-"せん."
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "このエフェクトは個別のチャンネルが一致しないステレオトラック上では実行できません."
 
 #: effects/SpikeCleaner.cpp:69
 msgid "Spike Cleaner"
@@ -5152,68 +5948,122 @@ msgstr "突発音除去..."
 msgid "Applying Spike Cleaner..."
 msgstr "突発音除去を適用中..."
 
-#: effects/StereoToMono.h:32
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "ステレオからモノラルへ (&S)"
+
+#: effects/StereoToMono.h:38
 msgid "Applying Stereo to Mono"
 msgstr "ステレオからモノラルへの変換を適用中"
 
-#: effects/ToneGen.cpp:66
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr "時間軸"
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr "時間軸のスライド/ピッチの変更"
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr "SBSMSを使う, by Clayton Otey"
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr "テンポ変更の初期値 (%):"
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr "テンポ変更の最終値 (%):"
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr "テンポ変更の初期値 (%)"
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr "テンポ変更の最終値 (%)"
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr "ピッチ変更の初期値(半音) [-12 to 12]:"
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr "ピッチ変更の最終値(半音) [-12 to 12]:"
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr "時間軸のスライド/ピッチの変更..."
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr "テンポ/ピッチの変更"
+
+#: effects/ToneGen.cpp:61
 #, c-format
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
-msgstr ""
-"エフェクトの適用:  %s %s wave,生成  周波数 = %.2f Hz, 振幅 = %.2f, %6lf 秒"
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "エフェクトの適用:  %s %s wave,生成  周波数 = %.2f Hz, 振幅 = %.2f, %6lf 秒"
 
-#: effects/ToneGen.cpp:75 widgets/Meter.cpp:379
+#: effects/ToneGen.cpp:69
+#: widgets/Meter.cpp:416
 msgid "Linear"
 msgstr "リニア"
 
-#: effects/ToneGen.cpp:76
+#: effects/ToneGen.cpp:70
 msgid "Logarithmic"
-msgstr ""
+msgstr "対数"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
 msgstr "チャープジェネレータ"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "トーンジェネレータ"
 
-#: effects/ToneGen.cpp:79
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "サイン"
 
-#: effects/ToneGen.cpp:80
+#: effects/ToneGen.cpp:73
 msgid "Square"
 msgstr "ï¼’ä¹—"
 
-#: effects/ToneGen.cpp:81
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
 msgstr "のこぎり波"
 
-#: effects/ToneGen.cpp:82
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
 msgstr "矩形波、エリアス成分なし"
 
-#: effects/ToneGen.cpp:327 effects/ToneGen.cpp:363
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
 msgstr "周波数 (Hz):"
 
-#: effects/ToneGen.cpp:354
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "波形:"
 
-#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "開始"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr "周波数 初期値"
 
-#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "終了"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr "周波数 最終値"
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr "振幅 初期値"
 
-#: effects/ToneGen.cpp:372
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr "振幅 最終値"
+
+#: effects/ToneGen.cpp:365
 msgid "Interpolation:"
 msgstr "補完:"
 
@@ -5225,11 +6075,11 @@ msgstr "チャープ..."
 msgid "Tone..."
 msgstr "トーン"
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
 msgstr "チャープ音の作成"
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "トーンの作成"
 
@@ -5237,28 +6087,28 @@ msgstr "トーンの作成"
 msgid "All tracks must have the same sample rate"
 msgstr "選択されたトラックはすべてが同一のサンプルレートでなければなりません."
 
-#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:113
+#: effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr "無音の短縮"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "Lynn Allan による"
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr "最大の無音持続時間:"
 
-#: effects/TruncSilence.cpp:349 prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:193
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
+#: prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "ミリ秒"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr "無音のための閾値:"
 
-#: effects/TruncSilence.cpp:376
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr "持続時間は最低でも1ミリ秒は必要です。"
 
@@ -5266,152 +6116,167 @@ msgstr "持続時間は最低でも1ミリ秒は必要です。"
 msgid "Truncate Silence..."
 msgstr "無音を短縮"
 
-#: effects/TruncSilence.h:36
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr "無音の短縮"
 
-#: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"VST の効果は個々のチャンネルが一致しないステレオトラック上では実行できません."
+#: effects/VST/VSTEffect.cpp:172
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "VST の効果は個々のチャンネルが一致しないステレオトラック上では実行できません."
 
-#: effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
 msgstr "リプレースできません"
 
-#: effects/VST/VSTEffect.cpp:403
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "VST プラグインのパラメータ:"
 
 #: effects/Wahwah.cpp:61
 #, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"エフェクトの適用: %s frequency = %.1f Hz, start phase = %.0f deg, depth = "
-"%.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "エフェクトの適用: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
 
-#: effects/Wahwah.cpp:72
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "ワウワウ (Wahwah)"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Nasca Octavian Paul によるワウワウ (Wahwah)"
-
-#: effects/Wahwah.cpp:253
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
 msgstr "深度 (%):"
 
-#: effects/Wahwah.cpp:269
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "応答:"
 
-#: effects/Wahwah.cpp:285
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr "共振"
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
 msgstr "ワウ (Wah) 周波数オフセット (%):"
 
-#: effects/Wahwah.h:34
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr "ワウ (Wah) 周波数オフセット (%):"
+
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "ワウワウ (Wahwah)..."
 
-#: effects/Wahwah.h:42
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "ワウワウ を適用"
 
-#: effects/audiounits/AudioUnitEffect.cpp:133
-#: effects/ladspa/LadspaEffect.cpp:169
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176
+#: effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "効果の適用: %s"
 
-#: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
-msgstr ""
-"プラグインの効果は個々のチャンネルが一致しないステレオトラック上では実行でき"
-"ません."
+#: effects/ladspa/LadspaEffect.cpp:196
+#: effects/lv2/LV2Effect.cpp:211
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "プラグインの効果は個々のチャンネルが一致しないステレオトラック上では実行できません."
 
-#: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
-#: prefs/GUIPrefs.cpp:51 prefs/QualityPrefs.cpp:72
+#: effects/ladspa/LadspaEffect.cpp:580
+#: effects/ladspa/LadspaEffect.cpp:588
+#: prefs/GUIPrefs.cpp:51
+#: prefs/QualityPrefs.cpp:72
 msgid "None"
 msgstr "無し"
 
-#: effects/ladspa/LadspaEffect.cpp:575 effects/vamp/VampEffect.cpp:384
+#: effects/ladspa/LadspaEffect.cpp:582
+#: effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "製作者:"
 
-#: effects/ladspa/LadspaEffect.cpp:608
+#: effects/ladspa/LadspaEffect.cpp:615
+#: effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "エフェクトセッティング"
 
-#: effects/ladspa/LadspaEffect.cpp:699
+#: effects/ladspa/LadspaEffect.cpp:710
+#: effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
 msgstr "長さ (秒)"
 
-#: effects/nyquist/Nyquist.cpp:252
+#: effects/lv2/LV2Effect.cpp:849
+#: effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr "音の長さ (秒)"
+
+#: effects/lv2/LV2Effect.cpp:860
+#: effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr "音の強さ"
+
+#: effects/lv2/LV2Effect.cpp:871
+#: effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr "音の調性"
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "ナイキストエフェクトを適用..."
 
-#: effects/nyquist/Nyquist.cpp:259 effects/nyquist/Nyquist.cpp:321
+#: effects/nyquist/Nyquist.cpp:264
+#: effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Nyquist プロンプト..."
 
-#: effects/nyquist/Nyquist.cpp:322
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
 msgstr "Nyquist コマンドを入力:"
 
-#: effects/nyquist/Nyquist.cpp:412
-msgid ""
-"Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+#: effects/nyquist/Nyquist.cpp:417
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
 msgstr "個々のチャンネルが一致しないステレオトラック上では適用できません."
 
-#: effects/nyquist/Nyquist.cpp:440
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Nyquist"
 
-#: effects/nyquist/Nyquist.cpp:441
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
 msgstr "Nyquist 出力"
 
-#: effects/nyquist/Nyquist.cpp:598 effects/nyquist/Nyquist.cpp:609
+#: effects/nyquist/Nyquist.cpp:603
+#: effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
 msgstr "Nyquist が返した値: "
 
-#: effects/nyquist/Nyquist.cpp:651
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
 msgstr "Nyquist はオーディオを返しませんでした.\n"
 
-#: effects/nyquist/Nyquist.cpp:662
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist は複数のオーディオチャンネルを返しました.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:86
 #, c-format
 msgid "Extracting features: %s"
 msgstr "特徴を抽出中: %s"
 
-#: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Vampプラグインは個々のチャンネルが一致しないステレオトラック上では実行できま"
-"せん."
+#: effects/vamp/VampEffect.cpp:117
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Vampプラグインは個々のチャンネルが一致しないステレオトラック上では実行できません."
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:131
 msgid "Sorry, failed to load Vamp Plug-in."
 msgstr "Vamp プラグインを読み込むことに失敗しました。"
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:239
 msgid "Sorry, Vamp Plug-in failed to initialize."
 msgstr "Vamp プラグインを初期化することに失敗しました。"
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:387
 msgid " - Vamp audio analysis plugin"
 msgstr "- Vamp オーディオ分析プラグイン"
 
@@ -5419,79 +6284,80 @@ msgstr "- Vamp オーディオ分析プラグイン"
 msgid "Plugin Settings"
 msgstr "プラグインの設定"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:442
+#: effects/vamp/VampEffect.cpp:448
 msgid "Program"
 msgstr "プログラム"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr ""
-"トラックが選択されていません!Ctrl-A (Select All) を使ってください\n"
-"全てのトラックを書き出すためには \"書き出し\" を選択してください."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr "選択されたオーディオはミュートされています。"
 
-#: export/Export.cpp:451
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr "すべてのオーディオはミュートされています。"
+
+#: export/Export.cpp:522
 msgid "Export File"
 msgstr "ファイルの書き出し"
 
-#: export/Export.cpp:459
+#: export/Export.cpp:530
 msgid "&Options..."
 msgstr "オプション... (&O)"
 
-#: export/Export.cpp:485
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
 msgstr "本当に保存しますか \""
 
-#: export/Export.cpp:501
+#: export/Export.cpp:591
 #, c-format
 msgid ""
 "You are about to save a %s file with the name \"%s\".\n"
 "\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
 msgstr ""
 "%s ファイルを拡張子 %s で保存しようとしています.\n"
-"この拡張子 %s は標準的な拡張子ではないため, 他のプログラムでは開けないでしょ"
-"う.\n"
+"この拡張子 %s は標準的な拡張子ではないため, 他のプログラムでは開けないでしょう.\n"
 "本当にこの拡張子でファイルを保存しますか?"
 
-#: export/Export.cpp:522
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "ファイル名 \"%s\" は既に存在しています。置き換えますか?"
 
-#: export/Export.cpp:604
-msgid ""
-"Your tracks will be mixed down to two stereo channels in the exported file."
+#: export/Export.cpp:710
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "トラックは合成されてステレオチャンネルとして書き出しされるでしょう."
 
-#: export/Export.cpp:609
-msgid ""
-"Your tracks will be mixed down to a single mono channel in the exported file."
-msgstr ""
-"トラックは合成されて1つのモノラルチャンネルとして書き出しされるでしょう."
+#: export/Export.cpp:715
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "トラックは合成されて1つのモノラルチャンネルとして書き出しされるでしょう."
 
-#: export/Export.cpp:619
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr "高度なミキシングオプション"
 
-#: export/Export.cpp:821
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
 msgstr "チャンネル: %2d"
 
-#: export/Export.cpp:945
+#: export/Export.cpp:1046
 msgid " - Left"
 msgstr "å·¦"
 
-#: export/Export.cpp:946
+#: export/Export.cpp:1047
 msgid " - Right"
 msgstr "右"
 
-#: export/Export.cpp:976 export/Export.cpp:1021
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr "ミキサパネル"
+
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "出力チャンネル: %2d"
@@ -5514,107 +6380,676 @@ msgstr "出力を表示"
 
 #: export/ExportCL.cpp:87
 #, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
-msgstr ""
-"データは標準入力にパイプされるでしょう。\"%f\" は選ばれた出力ファイルと置き換"
-"わるでしょう。"
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "データは標準入力にパイプされるでしょう。\"%f\" は選ばれた出力ファイルと置き換わるでしょう。"
 
-#: export/ExportCL.cpp:220
+#: export/ExportCL.cpp:222
 msgid "(external program)"
 msgstr "(外部プログラム)"
 
-#: export/ExportCL.cpp:250 export/ExportPCM.cpp:367
+#: export/ExportCL.cpp:253
+#: export/ExportPCM.cpp:457
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "%s というファイル名でオーディオを書き出すことができません"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "書き出し"
-
-#: export/ExportCL.cpp:324
+#: export/ExportCL.cpp:327
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "選択したオーディオをコマンドラインエンコーダを使って書き出し"
 
-#: export/ExportCL.cpp:325
+#: export/ExportCL.cpp:328
 msgid "Exporting the entire project using command-line encoder"
 msgstr "プロジェクト全体をコマンドラインエンコーダを使って書き出し"
 
-#: export/ExportCL.cpp:389
+#: export/ExportCL.cpp:390
 msgid "Command Output"
 msgstr "コマンド出力"
 
-#: export/ExportFLAC.cpp:68
+#: export/ExportFFmpeg.cpp:59
+msgid ""
+"Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+"続けるには正しく設定されたFFmpegが必要です。\n"
+"設定->読み込み/書き出しにて設定できます。"
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid ""
+"FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+"FFmpegはオーディオコーデック 0x%x を発見できませんでした。\n"
+"このコーデックの対応はおそらくコンパイルされていません。"
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr "%d 個のチャンネルを書き出そうとしましたが、選択された出力形式では最大チャンネル数は%dです。"
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr "選択したオーディオを %s というファイル名で書き出し"
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr "ファイル全体を %s で書き出し"
+
+#: export/ExportFFmpeg.cpp:702
+#: export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "無効なレートです"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid ""
+"The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+"プロジェクトのサンプリング周波数 (%d) は現在の出力ファイル形式では\n"
+"サポートされていません."
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid ""
+"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+"プロジェクトのサンプリング周波数 (%d) とビットレート (%d kbps) の組み合わせは\n"
+"現在のファイル形式ではサポートされていません。"
+
+#: export/ExportFFmpeg.cpp:721
+#: export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "以下のサンプリング周波数のうちの一つへリサンプルしましょう。"
+
+#: export/ExportFFmpeg.cpp:749
+#: export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "サンプルレート"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "AC3オプションの特定"
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr "AC3書き出し設定"
+
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "ビットレート:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr "AACオプションの特定"
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr "AAC書き出し設定"
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr "AMR-NB オプションを指定"
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr "AMR-NB 書き出しセットアップ"
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr "AMR-WB オプションを指定"
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr "AMR-WB 書き出しセットアップ"
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr "WMAオプションの特定"
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr "WMA 書き出しセットアップ"
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "既存のファイル '%s' を上書きしますか?"
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr "削除の確認"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr "設定を保存する前に形式を選んでください。"
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr "設定を保存する前にコーデックを選んでください。"
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr "プリセット '%s' は存在しません。"
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr "その他のオプションの特定"
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr "プリセット:"
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr "プリセットの読み込み"
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr "プリセットの保存"
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr "プリセットの消去"
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr "プリセットの取り込み"
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr "規定値の書き出し"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "フォーマット:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr "コーデック:"
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr "全てのフォーマットとコーデックは互換性がありません. いくつかのパラメータ値(例えばビットレートやサンプルレート)の組合せもいくつかのコーデックにおいて互換性がありません."
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr "形式の選択:"
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr "コーデックの選択:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr "すべてのフォーマットを呈示"
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr "すべてのコーデックを表示"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr "オプション"
+
+#: export/ExportFFmpegDialogs.cpp:931
+#: prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "言語:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid ""
+"ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+"ISO 639 3文字言語コード\n"
+"オプション\n"
+"空 - 自動"
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr "ã‚¿ã‚°:"
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid ""
+"Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+"コーデックタグ (FOURCC)\n"
+"オプション\n"
+"空 - 自動"
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid ""
+"Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+"ビットレート (bits/秒) - 生成されるファイルのファイルサイズと品質に影響\n"
+"いくつかのコーデックは特定の値(128k, 192k, 256k など)のみ可能\n"
+"0 - 自動\n"
+"推奨 - 192000"
+
+#: export/ExportFFmpegDialogs.cpp:940
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "品質:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid ""
+"Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+"全体の品質、異なるコーデックによって異なる\n"
+"vorbis に要求される\n"
+"0 - 自動\n"
+"-1 - オフ (ビットレートが代わりに使用される)"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr "サンプルレート:"
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid ""
+"Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+"サンプルレート (Hz)\n"
+"0 - サンプルレートを変更しないでください."
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr "カットオフ帯域幅:"
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid ""
+"Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+"カットオフ帯域幅 (Hz)\n"
+"オプション\n"
+"0 - 自動\n"
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr "プロファイル:"
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid ""
+"AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+"AAC プロファイル\n"
+"Low Complexity (LC)低複雑度 既定値\n"
+"ほとんどのプレーヤは、LC以外のものを再生できません"
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr "Bit Reservoirを使ってください。"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr "可変ブロック長を使ってください。"
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr "FLACオプション"
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr "圧縮レベル:"
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid ""
+"Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+"圧縮レベル\n"
+"FLACを必要とします\n"
+"-1 -自動\n"
+"最小 - 0 (高速なエンコード、大きい出力ファイル)\n"
+"最大 - 10 (低速なエンコード、小さい出力ファイル)"
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr "フレームサイズ:"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid ""
+"Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+"フレームサイズ\n"
+"オプション\n"
+"0 - 既定値\n"
+"最小 - 16\n"
+"最大 - 65535"
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr "LPC係数の精度"
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid ""
+"LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+"LPC係数の精度\n"
+"オプション\n"
+"0 - 既定値\n"
+"最小 - 1\n"
+"最大 - 15"
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr "最大予測次数"
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid ""
+"Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+"最小予測次数\n"
+"オプション\n"
+"-1 - 既定値\n"
+"最小 - 0\n"
+"最大 - 32 (LPCあり) あるいは 4 (LPCなし)"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr "最大予測次数"
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid ""
+"Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+"最大予測次数オプション\n"
+"1 - 既定値\n"
+"最小 - 0\n"
+"最大 - 32 (LPCあり) あるいは 4 (LPCなし)"
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr "予測次数の方法:"
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid ""
+"Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+"予測次数の方法\n"
+"評価 - 高速で低い圧縮\n"
+"長い探索 - 低速で高度な圧縮\n"
+"全探索 - 既定値"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr "最小予測次数"
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid ""
+"Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+"最小分割次数\n"
+"オプション\n"
+"-1 - 既定値\n"
+"最小 - 0\n"
+"最大 - 8"
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr "最大分割次数"
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid ""
+"Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+"最大分割次数\n"
+"オプション\n"
+"-1 - 既定値\n"
+"最小 - 0\n"
+"最大 - 8"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr "LPCを使ってください。"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr "MPEGコンテナのオプション"
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr "最大レート:"
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid ""
+"Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+"複数ストリームの最大ビットレート\n"
+"オプション\n"
+"0 - 既定値"
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr "パケットサイズ:"
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid ""
+"Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+"パケット サイズ\n"
+"オプション\n"
+"0 - 既定値"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr "無名のプリセットを削除することはできません。"
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr "プリセット %s を削除しますか?"
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr "名前なしではプリセット値を保存できません."
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr "読み込みのためのプリセットを記録した xmlファイルの選択"
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML ファイル (*.xml)|*.xml|All files (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr "プリセット書き出しのための xml ファイルを選択してください..."
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr "形式を検出できませんでした。"
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr "コーデックが見つかりませんでした。"
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "M4A (AAC) ファイル (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "AC3 ファイル (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr "AMR (狭帯域) ファイル (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr "AMR (広帯域) ファイル (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "WMA (バージョン 2) ファイル (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "FFmpeg 書き出しをカスタマイズ"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr "Low Complexity (低複雑度)"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr "主プロファイル"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr "2-レベル"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr "4-レベル"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr "8-レベル"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr "評価"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr "全探索"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr "対数探索"
+
+#: export/ExportFLAC.cpp:67
 msgid "Specify FLAC Options"
 msgstr "FLACオプションの特定"
 
-#: export/ExportFLAC.cpp:82
+#: export/ExportFLAC.cpp:81
 msgid "0 (fastest)"
 msgstr "0 (最も高速)"
 
-#: export/ExportFLAC.cpp:83
+#: export/ExportFLAC.cpp:82
 msgid "1"
 msgstr "1"
 
-#: export/ExportFLAC.cpp:84
+#: export/ExportFLAC.cpp:83
 msgid "2"
 msgstr "2"
 
-#: export/ExportFLAC.cpp:85
+#: export/ExportFLAC.cpp:84
 msgid "3"
 msgstr "3"
 
-#: export/ExportFLAC.cpp:86
+#: export/ExportFLAC.cpp:85
 msgid "4"
 msgstr "4"
 
-#: export/ExportFLAC.cpp:87
+#: export/ExportFLAC.cpp:86
 msgid "5"
 msgstr "5"
 
-#: export/ExportFLAC.cpp:88
+#: export/ExportFLAC.cpp:87
 msgid "6"
 msgstr "6"
 
-#: export/ExportFLAC.cpp:89
+#: export/ExportFLAC.cpp:88
 msgid "7"
 msgstr "7"
 
-#: export/ExportFLAC.cpp:90
+#: export/ExportFLAC.cpp:89
 msgid "8 (best)"
 msgstr "8 (最良)"
 
-#: export/ExportFLAC.cpp:93
+#: export/ExportFLAC.cpp:92
 msgid "16 bit"
 msgstr "16 bit"
 
-#: export/ExportFLAC.cpp:94
+#: export/ExportFLAC.cpp:93
 msgid "24 bit"
 msgstr "24 bit"
 
-#: export/ExportFLAC.cpp:98
+#: export/ExportFLAC.cpp:97
 msgid "FLAC Export Setup"
 msgstr "FLAC書き出し設定"
 
-#: export/ExportFLAC.cpp:102
+#: export/ExportFLAC.cpp:101
 msgid "Level:"
 msgstr "レベル:"
 
-#: export/ExportFLAC.cpp:104
+#: export/ExportFLAC.cpp:103
 msgid "Bit depth:"
 msgstr "量子化ビット数:"
 
-#: export/ExportFLAC.cpp:208
+#: export/ExportFLAC.cpp:209
 msgid "FLAC Files"
 msgstr "FLACファイル"
 
-#: export/ExportFLAC.cpp:310
+#: export/ExportFLAC.cpp:312
 msgid "Exporting the selected audio as FLAC"
 msgstr "選択したオーディオを FLACファイルに書き出し"
 
-#: export/ExportFLAC.cpp:311
+#: export/ExportFLAC.cpp:313
 msgid "Exporting the entire project as FLAC"
 msgstr "プロジェクト全体を FLACファイルに書き出し"
 
@@ -5626,35 +7061,34 @@ msgstr "MP2オプションの特定"
 msgid "MP2 Export Setup"
 msgstr "MP2 書き出しセットアップ"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "ビットレート:"
-
-#: export/ExportMP2.cpp:200
+#: export/ExportMP2.cpp:202
 msgid "MP2 Files"
 msgstr "MP2ファイル"
 
-#: export/ExportMP2.cpp:229
+#: export/ExportMP2.cpp:232
 msgid "Cannot export MP2 with this sample rate and bit rate"
-msgstr ""
-"このサンプリング周波数とビットレートではMP2ファイルは書き出しできません。"
+msgstr "このサンプリング周波数とビットレートではMP2ファイルは書き出しできません。"
 
-#: export/ExportMP2.cpp:240 export/ExportMP3.cpp:1768 export/ExportOGG.cpp:183
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1771
+#: export/ExportOGG.cpp:186
 msgid "Unable to open target file for writing"
 msgstr "書き込むためのファイルを開けません"
 
-#: export/ExportMP2.cpp:271
+#: export/ExportMP2.cpp:274
 #, c-format
 msgid "Exporting selected audio at %d kbps"
 msgstr "選択したオーディオを %d kbps で書き出し"
 
-#: export/ExportMP2.cpp:272
+#: export/ExportMP2.cpp:275
 #, c-format
 msgid "Exporting entire file at %d kbps"
 msgstr "ファイル全体を %d kbps で書き出し"
 
 #  i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second
-#: export/ExportMP3.cpp:221 export/ExportMP3.cpp:239 export/ExportMP3.cpp:253
+#: export/ExportMP3.cpp:221
+#: export/ExportMP3.cpp:239
+#: export/ExportMP3.cpp:253
 msgid "kbps"
 msgstr "kbps"
 
@@ -5670,7 +7104,9 @@ msgstr "(最小のファイルサイズ)"
 msgid "Fast"
 msgstr "高速"
 
-#: export/ExportMP3.cpp:244 export/ExportMP3.cpp:250 prefs/GUIPrefs.cpp:41
+#: export/ExportMP3.cpp:244
+#: export/ExportMP3.cpp:250
+#: prefs/GUIPrefs.cpp:41
 #: prefs/GUIPrefs.cpp:49
 msgid "Standard"
 msgstr "標準"
@@ -5715,7 +7151,8 @@ msgstr "平均"
 msgid "Constant"
 msgstr "一定"
 
-#: export/ExportMP3.cpp:373 prefs/QualityPrefs.cpp:42
+#: export/ExportMP3.cpp:373
+#: prefs/QualityPrefs.cpp:42
 #: prefs/QualityPrefs.cpp:43
 msgid "Quality"
 msgstr "品質"
@@ -5745,248 +7182,208 @@ msgstr "Lameを位置づける"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "ファイル %s が MP3 を作成するために必要です。"
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "位置 %s :"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "%s を見つけるには、ここをクリック -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "ブラウズ..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Lame の無料コピーを入手するには、ここをクリック -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "ダウンロード..."
-
-#  i18n-hint: It's asking for the location of a file, for
-#  example, "Where is lame_enc.dll?" - you could translate
-#  "Where would I find the file %s" instead if you want.
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "%s はどこにありますか?"
-
-#: export/ExportMP3.cpp:1094
 msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
+"You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
 msgstr ""
-"lame_enc.dll のみ|lame_enc.dll|動的リンクライブラリ (*.dll)|*.dll|すべての"
-"ファイル (*.*)|*"
+"lame_enc.dll v%d.%d とリンクしようとしています。 このバージョンはAudacity %d.%d.%dとはコンパチブルではありません。\n"
+"LAME MP3ライブラリの最新版をダウンロードしてください。"
+
+#: export/ExportMP3.cpp:1094
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "lame_enc.dll のみ|lame_enc.dll|動的リンクライブラリ (*.dll)|*.dll|すべてのファイル (*.*)|*"
 
 #: export/ExportMP3.cpp:1550
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
-msgstr ""
-"libmp3lame.dylib のみ|libmp3lame.dylib|動的リンクライブラリ (*.dylib)|*."
-"dylib|すべてのファイル (*)|*"
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "libmp3lame.dylib のみ|libmp3lame.dylib|動的リンクライブラリ (*.dylib)|*.dylib|すべてのファイル (*)|*"
 
 #: export/ExportMP3.cpp:1567
-msgid ""
-"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"libmp3lame.so のみ|libmp3lame.so.0|基本共有オブジェクトファイル (*.so)|*.so|"
-"拡張ライブラリ (*.so*)|*.so*|すべてのファイル (*)|*"
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "libmp3lame.so のみ|libmp3lame.so.0|基本共有オブジェクトファイル (*.so)|*.so|拡張ライブラリ (*.so*)|*.so*|すべてのファイル (*)|*"
 
-#: export/ExportMP3.cpp:1650
+#: export/ExportMP3.cpp:1652
 msgid "MP3 Files"
 msgstr "MP3 ファイル"
 
-#: export/ExportMP3.cpp:1673
+#: export/ExportMP3.cpp:1676
 msgid "Could not open MP3 encoding library!"
 msgstr "MP3 エンコーディングライブラリが開けません"
 
-#: export/ExportMP3.cpp:1680
+#: export/ExportMP3.cpp:1683
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "サポートされている MP3 エンコーディングライブラリではありません!"
 
-#: export/ExportMP3.cpp:1757
+#: export/ExportMP3.cpp:1760
 msgid "Unable to initialize MP3 stream"
 msgstr "MP3ストリームを初期化できません"
 
-#: export/ExportMP3.cpp:1799
+#: export/ExportMP3.cpp:1802
 #, c-format
 msgid "Exporting selected audio with %s preset"
 msgstr "選択したオーディオを %s というファイル名で書き出し"
 
-#: export/ExportMP3.cpp:1800
+#: export/ExportMP3.cpp:1803
 #, c-format
 msgid "Exporting entire file with %s preset"
 msgstr "プロジェクト全体を %s というファイル名で書き出し"
 
-#: export/ExportMP3.cpp:1805
+#: export/ExportMP3.cpp:1808
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
 msgstr "選択したオーディオを VBR 品質 %s で書き出し"
 
-#: export/ExportMP3.cpp:1806
+#: export/ExportMP3.cpp:1809
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
 msgstr "プロジェクト全体を VBR 品質 %s で書き出し"
 
-#: export/ExportMP3.cpp:1811
+#: export/ExportMP3.cpp:1814
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
 msgstr "選択したオーディオを %d Kbps で書き出し"
 
-#: export/ExportMP3.cpp:1812
+#: export/ExportMP3.cpp:1815
 #, c-format
 msgid "Exporting entire file at %d Kbps"
 msgstr "ファイル全体を %d Kbps で書き出し"
 
-#: export/ExportMP3.cpp:1845
+#: export/ExportMP3.cpp:1849
 #, c-format
 msgid "Error %d returned from MP3 encoder"
 msgstr "MP3エンコーダにおいて、エラー %d が返されました。"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "無効なレートです"
-
-#: export/ExportMP3.cpp:1931
+#: export/ExportMP3.cpp:1933
 #, c-format
 msgid ""
 "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"プロジェクトのサンプリング周波数 (%d) はMP3ではサポートされていません。"
+msgstr "プロジェクトのサンプリング周波数 (%d) はMP3ではサポートされていません。"
 
-#: export/ExportMP3.cpp:1934
+#: export/ExportMP3.cpp:1936
 #, c-format
 msgid ""
 "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
-"プロジェクトのサンプリング周波数 (%d) とビットレート (%d kbps) の組み合わせ"
-"は\n"
+"プロジェクトのサンプリング周波数 (%d) とビットレート (%d kbps) の組み合わせは\n"
 "MP3ファイル形式ではサポートされていません。"
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "以下のサンプリング周波数のうちの一つへリサンプルしましょう。"
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "サンプルレート:"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr "MP3書き出しライブラリが見つかりませんでした。"
 
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "MP3 書き出しプラグインが見つかりません"
-
-#: export/ExportMultiple.cpp:95 export/ExportMultiple.cpp:374
-#: export/ExportMultiple.cpp:598 export/ExportMultiple.cpp:765
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "複数ファイルの書き出し"
 
-#: export/ExportMultiple.cpp:164
+#: export/ExportMultiple.cpp:166
 msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
+"If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
 msgstr ""
-"もし複数のオーディオトラックがある場合、それぞれのトラックを別々のファイルに"
-"書き出し可能です.\n"
-"あるいは、もしラベルつきトラックがある場合、それぞれのラベルを新しいファイル"
-"として書き出し可能です.\n"
+"もし複数のオーディオトラックがある場合、それぞれのトラックを別々のファイルに書き出し可能です.\n"
+"あるいは、もしラベルつきトラックがある場合、それぞれのラベルを新しいファイルとして書き出し可能です.\n"
 "\n"
-"このプロジェクトには複数のトラックやラベルつきトラックが無いので、複数のファ"
-"イルに書き出しはできません."
+"このプロジェクトには複数のトラックやラベルつきトラックが無いので、複数のファイルに書き出しはできません."
 
-#: export/ExportMultiple.cpp:165
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
 msgstr "複数のファイルを書き出しできません"
 
-#: export/ExportMultiple.cpp:200
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "書き出し形式"
 
-#: export/ExportMultiple.cpp:207
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
 msgstr "オプション..."
 
-#: export/ExportMultiple.cpp:210
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "書き出し場所"
 
-#: export/ExportMultiple.cpp:216 prefs/DirectoriesPrefs.cpp:92
+#: export/ExportMultiple.cpp:245
+#: prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "選択..."
 
-#: export/ExportMultiple.cpp:217
+#: export/ExportMultiple.cpp:246
 msgid "Create"
 msgstr "作成"
 
-#: export/ExportMultiple.cpp:224
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "ファイル分離基準: "
 
-#: export/ExportMultiple.cpp:234
+#: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
 msgid "Labels"
 msgstr "ラベル"
 
-#: export/ExportMultiple.cpp:239
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
 msgstr "最初のラベル以前のオーディオデータを含む"
 
-#: export/ExportMultiple.cpp:245
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "最初のファイル名"
 
-#: export/ExportMultiple.cpp:258
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr "最初のファイル名"
+
+#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
 msgid "Tracks"
 msgstr "トラック"
 
-#: export/ExportMultiple.cpp:265
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
 msgstr "ファイルの命名"
 
-#: export/ExportMultiple.cpp:275
+#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
 msgstr "ラベル/トラック名の使用"
 
-#: export/ExportMultiple.cpp:282
+#: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
 msgstr "連続した番号づけ"
 
-#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "ファイル名の前部"
 
-#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr "ファイル名の前部"
+
+#: export/ExportMultiple.cpp:341
 msgid "Overwrite existing files"
 msgstr "既存のファイルを上書き"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "書き出し (&x)"
-
-#: export/ExportMultiple.cpp:372
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr "\"%s\" は正常に生成されました。"
 
-#: export/ExportMultiple.cpp:381
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
 msgstr "書き出して保存するファイルの場所を選んでください"
 
-#: export/ExportMultiple.cpp:470
+#: export/ExportMultiple.cpp:539
 #, c-format
 msgid ""
 "\"%s\" doesn't exist.\n"
@@ -5997,26 +7394,31 @@ msgstr ""
 "\n"
 "作成しますか?"
 
-#: export/ExportMultiple.cpp:568 export/ExportMultiple.cpp:703
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
 msgid "Edit metadata"
 msgstr "メタデータを編集"
 
-#: export/ExportMultiple.cpp:595 export/ExportMultiple.cpp:762
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
-msgstr "%d 個のファイルのエクスポートに成功"
+msgstr "%d 個のファイルの書き出しに成功"
 
-#: export/ExportMultiple.cpp:596 export/ExportMultiple.cpp:763
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "%d 個のファイルを出力した後に、何かがうまくいかなくなりました。"
 
-#: export/ExportMultiple.cpp:825
+#: export/ExportMultiple.cpp:881
 #, c-format
 msgid ""
 "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
 msgstr ""
+"ラベル %s は正当なファイル名ではありません. %s のいずれも使えません.\n"
+"以下を使うように..."
 
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
@@ -6026,79 +7428,127 @@ msgstr "Ogg Vorbis のオプションを設定してください。"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg Vorbis 書き出し設定"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "品質:"
-
-#: export/ExportOGG.cpp:155
+#: export/ExportOGG.cpp:157
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis ファイル"
 
-#: export/ExportOGG.cpp:254
+#: export/ExportOGG.cpp:257
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "選択したオーディオを Ogg Vorbis ファイルに書き出し"
 
-#: export/ExportOGG.cpp:255
+#: export/ExportOGG.cpp:258
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "プロジェクト全体を Ogg Vorbis ファイルに書き出し"
 
-#: export/ExportPCM.cpp:115
+#: export/ExportPCM.cpp:116
 msgid "Specify Uncompressed Options"
 msgstr "非圧縮のオプションを設定してください。"
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:185
 msgid "Uncompressed Export Setup"
 msgstr "非圧縮書き出し設定"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "フォーマット:"
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:191
 msgid "Header:"
 msgstr "ヘッダ:"
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:195
+#: import/ImportRaw.cpp:366
 msgid "Encoding:"
 msgstr "エンコーディング:"
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:200
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(ヘッダーとエンコーディングの全ての組み合わせが可能だとは限りません.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF と他の非圧縮形式"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr "その他の非圧縮ファイル"
 
 #: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr "AIFF (Apple) 16 bit PCM 符号あり"
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr "WAV (Microsoft) 16 bit PCM 符号あり"
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr "GSM 6.10 WAV (移動体用)"
+
+#: export/ExportPCM.cpp:449
 msgid "Cannot export audio in this format."
 msgstr "このフォーマットでオーディオを書き出すことができません."
 
-#: export/ExportPCM.cpp:401
+#: export/ExportPCM.cpp:491
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr "選択したオーディオを %s というファイル名で書き出し"
 
-#: export/ExportPCM.cpp:403
+#: export/ExportPCM.cpp:493
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr "プロジェクト全体を %s というファイル名で書き出し"
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:437
+#: export/ExportPCM.cpp:531
 #, c-format
 msgid "Error (file may not have been written): %s"
-msgstr ""
-"エラー (ファイルへの書き込みが正常に行われなかった可能性があります): %s"
+msgstr "エラー (ファイルへの書き込みが正常に行われなかった可能性があります): %s"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr "この形式にはオプションはありません。\n"
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr "書き出し形式に対してより多くの変更を行いたい場合は'他の非圧縮ファイル' 形式を使ってください。"
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr "ファイルは16-bit AIFF (Apple/SGI)形式で書き出されます。\n"
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr "ファイルは16-bit WAV (Microsoft) 形式で書き出されます。\n"
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr "ファイルは GSM 6.10 WAV 形式で書き出されます。\n"
+
+#: import/Import.cpp:156
+#: import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "MP3 ファイル"
 
-#: import/Import.cpp:155
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr "読み込むためのストリームを選択"
+
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
+msgstr "この Audacity のバージョンは %s サポート機能と一緒にコンパイルされていません."
+
+#: import/Import.cpp:240
+#, c-format
+msgid ""
+"\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
 msgstr ""
-"この Audacity のバージョンは %s サポート機能と一緒にコンパイルされていません."
+"\"%s\" は MIDI ファイルであり、オーディオファイルではありません。\n"
+"Audacity はこの種のファイルを、再生のため開くことはできませんが、\n"
+"ファイル > 読み込み > MIDI をクリックすることにより、編集はできます。"
 
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:168
+#: import/Import.cpp:250
 #, c-format
 msgid ""
 "\"%s\" is an audio CD track. \n"
@@ -6111,22 +7561,18 @@ msgstr ""
 "CDトラックをリップ(抽出)して、Audacity での読み込みが可能な形式\n"
 "WAV や AIFF にしてみてください."
 
-#: import/Import.cpp:174
+#: import/Import.cpp:256
 #, c-format
 msgid ""
 "\"%s\" is a playlist file. \n"
-"Audacity cannot open this file because it only contains links to other "
-"files. \n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
 "\"%s\" はプレイリストファイルです。\n"
-"他のファイルへのリンクを含んでいるため、Audacity はこのファイルを開くことがで"
-"きません。\n"
-"テキストエディタで開くか、本来のオーディオファイルをダウンロードして開くこと"
-"は可能でしょう。"
+"他のファイルへのリンクを含んでいるため、Audacity はこのファイルを開くことができません。\n"
+"テキストエディタで開くか、本来のオーディオファイルをダウンロードして開くことは可能でしょう。"
 
-#: import/Import.cpp:179
+#: import/Import.cpp:261
 #, c-format
 msgid ""
 "\"%s\" is a Windows Media Audio file. \n"
@@ -6135,10 +7581,9 @@ msgid ""
 msgstr ""
 "\"%s\" は Windows Media オーディオファイルです。\n"
 "特許上の制限により、Audacity はこの種のファイルを開くことはできません。\n"
-"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があり"
-"ます。"
+"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:184
+#: import/Import.cpp:266
 #, c-format
 msgid ""
 "\"%s\" is an Advanced Audio Coding file. \n"
@@ -6147,26 +7592,24 @@ msgid ""
 msgstr ""
 "\"%s\"  は先進的なオーディオコーデックのファイルです.\n"
 "Audacity はこの形式のファイルをオープンできません.\n"
-"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があり"
-"ます。"
+"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
 msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+"\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
-"\"%s\" は、暗号化された典型的なオンラインストアからのオーディオファイルで"
-"す。\n"
-"暗号化のため Audacity はこの種のファイルを開くことができません。\n"
+"\"%s\" は、暗号化されたオーディオファイルです.\n"
+"これらは典型的にはオンライン音楽ショップからのものです.\n"
+"暗号化のため Audacity はこの種のファイルを開くことができません.\n"
 "Audacity で録音を試みるか、オーディオCDとして作成した後、\n"
-"CDトラックをサポートされている WAV や AIFF などのオーディオファイル形式に変換"
-"すべきです。"
+"CDトラックをサポートされている WAV や AIFF などのオーディオファイル形式に変換すべきです."
 
-#: import/Import.cpp:194
+#: import/Import.cpp:276
 #, c-format
 msgid ""
 "\"%s\" is a RealPlayer media file. \n"
@@ -6175,21 +7618,9 @@ msgid ""
 msgstr ""
 "\"%s\" は RealPlayer 用のメディアファイルです。\n"
 "この商業フォーマットを Audacity は開くことができません。\n"
-"サポートされている WAV や AIFF などのオーディオファイル形式に変換する必要があ"
-"ります。"
-
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" は MIDI ファイルであり、オーディオファイルではありません。\n"
-"Audacity はこの種のファイルを、再生や編集のため開くことはできませんが、\n"
-"ファイル > 読み込み > MIDI をクリックすることにより、表示はできます。"
+"サポートされている WAV や AIFF などのオーディオファイル形式に変換する必要があります。"
 
-#: import/Import.cpp:206
+#: import/Import.cpp:282
 #, c-format
 msgid ""
 "\"%s\" is a notes-based file, not an audio file. \n"
@@ -6199,27 +7630,24 @@ msgid ""
 msgstr ""
 "\"%s\"  は音符に基づくファイルであり、オーディオファイルでありません.\n"
 "Audacity はこの形式のファイルをオープンできません.\n"
-"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があり"
-"ます。"
+"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:212
+#: import/Import.cpp:288
 #, c-format
 msgid ""
 "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
-"and try importing it again. Otherwise you need to convert it to a supported "
-"audio \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
 msgstr ""
 "\"%s\" は Musepack オーディオファイルです。\n"
 "Audacity はこの種のファイルを開くことはできません。\n"
 "もし、これが mp3 かもしれないと思うなら,最後が\".mp3\" で終わるよう\n"
 "ファイル名を書き換えてから再度読み込みを試してください。\n"
-"うまくいかなければ、サポートしているオーディオファイル形式、WAV や AIFF など"
-"に変換する必要があります。"
+"うまくいかなければ、サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:218
+#: import/Import.cpp:294
 #, c-format
 msgid ""
 "\"%s\" is a Wavpack audio file. \n"
@@ -6228,10 +7656,9 @@ msgid ""
 msgstr ""
 "\"%s\"  は Wavpackオーディオファイルです.\n"
 "Audacity はこの形式のファイルをオープンできません.\n"
-"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があり"
-"ます。"
+"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:224
+#: import/Import.cpp:300
 #, c-format
 msgid ""
 "\"%s\" is a Dolby Digital audio file. \n"
@@ -6240,10 +7667,9 @@ msgid ""
 msgstr ""
 "\"%s\"  は Dolby Digital オーディオファイルです.\n"
 "Audacity はこの形式のファイルをオープンできません.\n"
-"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があり"
-"ます。"
+"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:230
+#: import/Import.cpp:306
 #, c-format
 msgid ""
 "\"%s\" is an Ogg Speex audio file. \n"
@@ -6252,122 +7678,147 @@ msgid ""
 msgstr ""
 "\"%s\"  は Ogg Speex オーディオファイルです.\n"
 "Audacity はこの形式のファイルをオープンできません.\n"
-"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があり"
-"ます。"
+"サポートしているオーディオファイル形式、WAV や AIFF などに変換する必要があります。"
 
-#: import/Import.cpp:253
+#: import/Import.cpp:312
+#, c-format
 msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+"\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity はこのファイル形式を推測しました。\n"
-"オーディオデータはデタラメかもしれません。\n"
-"\n"
-"もしオーディオデータがデタラメであれば、ファイルを開く前に正しい拡張子となる"
-"よう、\n"
-"ファイル名を付け直してください。"
+"\"%s\"  は映像ファイルです.\n"
+"Audacity はこの形式のファイルをオープンできません.\n"
+"サポートしているオーディオファイル形式、たとえば WAV や AIFF などを抽出する必要があります."
+
+#: import/Import.cpp:317
+#, c-format
+msgid ""
+"Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+"Audacity はこのファイル'%s'の種類を認識できませんでした.\n"
+"このファイルが非圧縮ファイルの場合、\"Raw ファイルの読み込み\" を試してみて下さい."
 
-#: import/Import.cpp:269
+#: import/Import.cpp:322
+#, c-format
 msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+"Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
 msgstr ""
-"Audacity はこのファイルの種類を認識できませんでした.\n"
-"このファイルが非圧縮ファイルの場合、\"Raw ファイルのインポート\" を試してみて"
-"下さい."
+"Audacity はこのファイル'%s'の種類を認識しましたが\n"
+"読み込むことができませんでした."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "FFmpeg 互換ファイル"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr "インデックス[%02x] コーデック[%S], 言語[%S], ビットレート[%S], チャンネル[%d], 継続時間[%d]"
 
-#: import/ImportFLAC.cpp:35
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "FLACファイル"
 
-#: import/ImportLOF.cpp:92
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
 msgstr "基本的なテキストフォーマットによるファイルリスト"
 
 #  i18n-hint: You do not need to translate "LOF"
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:318
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
 msgstr "LOF ファイル中のウィンドウオフセットは無効です."
 
 #  i18n-hint: You do not need to translate "LOF"
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:320 import/ImportLOF.cpp:341 import/ImportLOF.cpp:415
-#: import/ImportLOF.cpp:435
+#: import/ImportLOF.cpp:316
+#: import/ImportLOF.cpp:337
+#: import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
 msgstr "LOF エラー"
 
 #  i18n-hint: You do not need to translate "LOF"
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:339
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
 msgstr "LOF ファイル中の持続時間は無効です."
 
-#: import/ImportLOF.cpp:414
+#: import/ImportLOF.cpp:417
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
-msgstr ""
-"MIDI トラックは単体ではオフセットできません, オーディオファイルのみが可能で"
-"しょう."
+msgstr "MIDI トラックは単体ではオフセットできません, オーディオファイルのみが可能でしょう."
 
 #  i18n-hint: You do not need to translate "LOF"
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:434
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
 msgstr "LOF ファイル中のトラックオフセットは無効です."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Allegro ファイルの読み込み時にエラーが発生しました"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": ファイル名が短すぎます."
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "MIDI ファイルの読み込み時にエラーが発生しました"
+#: import/ImportMIDI.cpp:31
+#: import/ImportMIDI.cpp:39
+#: import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "ファイルが開けません"
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "MP3 ファイル"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": 不正なファイルの種類."
 
-#: import/ImportOGG.cpp:36
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
 msgstr "Ogg Vorbis ファイル"
 
-#: import/ImportOGG.cpp:142
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
 msgstr "メディアの読み込みエラー"
 
-#: import/ImportOGG.cpp:145
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "Ogg Vorbis ファイルではありません"
 
-#: import/ImportOGG.cpp:148
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
 msgstr "Vorbis バージョンが合いません"
 
-#: import/ImportOGG.cpp:151
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
 msgstr "無効な Vorbis ビットストリームヘッダーです"
 
-#: import/ImportOGG.cpp:154
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
 msgstr "内部処理エラー"
 
-#: import/ImportPCM.cpp:396
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF と他の非圧縮形式"
+
+#: import/ImportPlugin.h:142
+#: import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
+msgid "Importing %s"
 msgstr "'%s' ファイルを取り込む"
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Quick Time ファイル"
 
-#: import/ImportRaw.cpp:278
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr "Raw データの取り込み"
+
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Raw データの取り込み"
 
@@ -6377,7 +7828,7 @@ msgstr "Raw データの取り込み"
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:337
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "エンディアン無し"
 
@@ -6385,7 +7836,7 @@ msgstr "エンディアン無し"
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:340
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "リトルエンディアン"
 
@@ -6393,7 +7844,7 @@ msgstr "リトルエンディアン"
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:343
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "ビックエンディアン (バイトオーダ)"
 
@@ -6403,123 +7854,159 @@ msgstr "ビックエンディアン (バイトオーダ)"
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:346
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "既定エンディアン (バイトオーダ)"
 
-#: import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
 msgstr "1 チャンネル (モノラル)"
 
-#: import/ImportRaw.cpp:371
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
 msgstr "2 チャンネル (ステレオ)"
 
-#: import/ImportRaw.cpp:373
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
 msgstr "%d チャンネル"
 
-#: import/ImportRaw.cpp:386
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr "バイト順序:"
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "チャンネル:"
+
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
 msgstr "オフセットの開始:"
 
-#: import/ImportRaw.cpp:397
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
 msgstr "インポートするために:"
 
-#: import/ImportRaw.cpp:408
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
 msgstr "サンプルレート:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "取り込み (&I)"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr "完全に読み込み. 波形の計算."
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr "波形を復号化"
 
-#: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr "%s %2.0f%% 完了. 処理ポイントを変更するにはクリック."
+
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44
+#: prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "オーディオ I/O"
 
-#: prefs/AudioIOPrefs.cpp:100
+#: prefs/AudioIOPrefs.cpp:102
+#: prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (モノラル)"
 
-#: prefs/AudioIOPrefs.cpp:101
+#: prefs/AudioIOPrefs.cpp:103
+#: prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (ステレオ)"
 
-#: prefs/AudioIOPrefs.cpp:115
+#: prefs/AudioIOPrefs.cpp:117
+#: prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "プレイバック"
 
-#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
+#: prefs/AudioIOPrefs.cpp:121
+#: prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118
+#: prefs/MidiIOPrefs.cpp:136
 #: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
 msgstr "デバイス:"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:124
+#: prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
 msgstr "利用中:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:125
+#: prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
 msgstr "ポートオーディオ v"
 
-#: prefs/AudioIOPrefs.cpp:133
+#: prefs/AudioIOPrefs.cpp:135
+#: prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "レコーディング"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:141
+#: prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
 msgstr "チャンネル:"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:147
+#: prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr "スルー再生"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "レコーディングしながら他のトラックを再生 (&P)"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "オーバーダブ: 新しいレコーディングしながら他のトラックを再生 (&P)"
 
-#: prefs/AudioIOPrefs.cpp:150
+#: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
 msgstr "ハードウェアによるスルー再生 (録音中にその新しいトラックを再生) (&H)"
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "ソフトウェアによるスルー再生 (録音中にその新しいトラックを再生) (&S)"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
 msgstr "ソフトウェアによるスルー再生 (録音中にその新しいトラックを再生) (&S)"
 
-#: prefs/AudioIOPrefs.cpp:162
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr "(\"stereo mix\"を録音する場合はチェックをはずしてください。)"
+
+#: prefs/AudioIOPrefs.cpp:168
+#: prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr "エフェクトプレビュー"
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
-msgstr "プリビューの長さ:"
+msgstr "プレビューの長さ:"
 
-#: prefs/AudioIOPrefs.cpp:170
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr "カットプレビュー"
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
-msgstr "カット領域の前にプリビュー"
+msgstr "カット領域の前にプレビュー"
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
-msgstr "カット領域の後にプリビュー:"
+msgstr "カット領域の後にプレビュー:"
 
-#: prefs/AudioIOPrefs.cpp:183
+#: prefs/AudioIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr "レイテンシー"
 
-#: prefs/AudioIOPrefs.cpp:189
+#: prefs/AudioIOPrefs.cpp:195
 msgid ""
 "Audio to buffer:\n"
 "(higher = more latency)"
@@ -6527,7 +8014,7 @@ msgstr ""
 "オーディオをバッファへ送る時間: \n"
 "(大きいとより遅れます)"
 
-#: prefs/AudioIOPrefs.cpp:192
+#: prefs/AudioIOPrefs.cpp:198
 msgid ""
 "Latency correction:\n"
 "(negative = backwards)"
@@ -6535,36 +8022,42 @@ msgstr ""
 "レイテンシー補正:\n"
 "(負の値は過去を意味する)"
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr "再生時に時間を見る:"
 
-#: prefs/AudioIOPrefs.cpp:200
+#: prefs/AudioIOPrefs.cpp:206
+#: prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr "短い期間:"
 
-#: prefs/AudioIOPrefs.cpp:202
+#: prefs/AudioIOPrefs.cpp:208
+#: prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr "長い期間:"
 
-#: prefs/BatchPrefs.cpp:55 prefs/BatchPrefs.cpp:56
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
 msgid "Batch"
 msgstr "自動実行"
 
-#: prefs/BatchPrefs.cpp:77 prefs/GUIPrefs.cpp:92
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:92
 msgid "Behaviors"
 msgstr "ふるまい"
 
-#: prefs/BatchPrefs.cpp:80 prefs/GUIPrefs.cpp:129
+#: prefs/BatchPrefs.cpp:80
 msgid "&Don't apply effects in batch mode"
 msgstr "自動実行モードでは、エフェクトを適用しない (&D)"
 
-#: prefs/BatchPrefs.cpp:83 prefs/GUIPrefs.cpp:132
+#: prefs/BatchPrefs.cpp:83
+#: prefs/GUIPrefs.cpp:132
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "クリーンスピーチモード (カスタマイズされたGUI) (&e)"
 
-#: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:279
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "ディレクトリ"
 
@@ -6601,8 +8094,8 @@ msgid "Audio cache"
 msgstr "オーディオキャッシュ"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "録音が停止するまで、録音されたデータをメモリに保持"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr "RAM (通常は遅いデバイス、しかし長いファイルや録音で破滅することがある)を用いた再生あるいは録音"
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6623,100 +8116,107 @@ msgid "Directory %s is not writable"
 msgstr "ディレクトリ %s は書き込みできません"
 
 #: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
-msgstr ""
-"変更されたテンポラリディレクトリは Audacity を再起動するまで有効になりません"
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "変更されたテンポラリディレクトリは Audacity を再起動するまで有効になりません"
 
-#: prefs/FileFormatPrefs.cpp:48 prefs/FileFormatPrefs.cpp:49
+#: prefs/FileFormatPrefs.cpp:53
+#: prefs/FileFormatPrefs.cpp:54
 msgid "Import / Export"
 msgstr "読み込みと書き出し"
 
-#: prefs/FileFormatPrefs.cpp:77
+#: prefs/FileFormatPrefs.cpp:84
 msgid "MP3 Export Library"
 msgstr "MP3 書き出しライブラリ"
 
-#: prefs/FileFormatPrefs.cpp:80
+#: prefs/FileFormatPrefs.cpp:87
 msgid "MP3 Library Version:"
 msgstr "MP3 ライブラリバージョン:"
 
-#: prefs/FileFormatPrefs.cpp:86
+#: prefs/FileFormatPrefs.cpp:93
 msgid "MP3 Library:"
 msgstr "MP3 ライブラリ:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "ライブラリ検索 (&F)"
+#: prefs/FileFormatPrefs.cpp:96
+#: prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr "位置づける(&L)"
 
-#: prefs/FileFormatPrefs.cpp:91
+#: prefs/FileFormatPrefs.cpp:98
 msgid "LAME MP3 Library:"
 msgstr "LAME MP3 ライブラリ:"
 
-#: prefs/FileFormatPrefs.cpp:94
+#: prefs/FileFormatPrefs.cpp:101
+#: prefs/FileFormatPrefs.cpp:125
 msgid "&Download"
 msgstr "ダウンロード (&D)"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid ""
-"Note: Export quality options can be chosen by clicking the Options button in "
-"the Export dialog."
-msgstr ""
-"注意: 書き出し品質オプションは書き出し画面でオプションボタンをクリックして選"
-"ぶことができます。"
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "FFmpeg 読み込み/書き出しライブラリ"
 
-#: prefs/FileFormatPrefs.cpp:100
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "FFmpeg ライブラリバージョン:"
+
+#: prefs/FileFormatPrefs.cpp:118
+#: prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "FFmpeg ライブラリ:"
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "注意: 書き出し品質オプションは書き出し画面でオプションボタンをクリックして選ぶことができます。\n"
+
+#: prefs/FileFormatPrefs.cpp:137
 msgid "When importing audio files"
 msgstr "非圧縮オーディオファイルを取り込む場合"
 
-#: prefs/FileFormatPrefs.cpp:103
+#: prefs/FileFormatPrefs.cpp:140
 msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr "編集の前に非圧縮のオーディオファイルをコピーする (より安全です) (&M)"
 
-#: prefs/FileFormatPrefs.cpp:104
+#: prefs/FileFormatPrefs.cpp:141
 msgid "&Read uncompressed audio files directly from the original (faster)"
 msgstr "非圧縮のオーディオファイルから直接読み込みます (高速) (&R)"
 
-#: prefs/FileFormatPrefs.cpp:106
+#: prefs/FileFormatPrefs.cpp:143
 msgid "&Normalize all tracks in project"
 msgstr "全てのトラックを基準化する (&N)"
 
-#: prefs/FileFormatPrefs.cpp:111
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
 msgstr "他のオーディオファイルに依存するプロジェクトを保存するとき"
 
-#: prefs/FileFormatPrefs.cpp:114
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
 msgstr "常に全てのオーディオをプロジェクトにコピーする(最も安全) (&c)"
 
-#: prefs/FileFormatPrefs.cpp:115
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
 msgstr "いかなるオーディオもコピーしません (&D)"
 
-#: prefs/FileFormatPrefs.cpp:116
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
 msgstr "ユーザに確認する (&A)"
 
-#: prefs/FileFormatPrefs.cpp:120
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
 msgstr "トラックの書き出し時"
 
-#: prefs/FileFormatPrefs.cpp:123
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
-msgstr ""
-"常に全てのトラックをステレオあるいはモノラルチャンネルにミックスダウンする "
-"(&l)"
+msgstr "常に全てのトラックをステレオあるいはモノラルチャンネルにミックスダウンする (&l)"
 
-#: prefs/FileFormatPrefs.cpp:124
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
-msgstr ""
-"カスタムミックスを使用 (例えば5.1マルチチャンネルファイルへの出力) (&U)"
+msgstr "カスタムミックスを使用 (例えば5.1マルチチャンネルファイルへの出力) (&U)"
 
-#: prefs/FileFormatPrefs.cpp:126
+#: prefs/FileFormatPrefs.cpp:163
 msgid "S&how Metadata Editor prior to export step"
 msgstr "メタデータエディタを書き出しの前に表示 (&h)"
 
-#: prefs/GUIPrefs.cpp:34 prefs/GUIPrefs.cpp:35
+#: prefs/GUIPrefs.cpp:34
+#: prefs/GUIPrefs.cpp:35
 msgid "Interface"
 msgstr "インタフェイス"
 
@@ -6737,24 +8237,24 @@ msgid "&Update display while playing"
 msgstr "再生しながら表示を更新 (&U)"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
-msgstr "最後のウィンドウを閉じると Audacity を完全に終了します"
+msgid "Cl&osing last window quits Audacity"
+msgstr "最後のウィンドウを閉じると Audacity を完全に終了します (&o)"
 
 #: prefs/GUIPrefs.cpp:98
 msgid "Enable &dragging of left and right selection edges"
-msgstr "選択領域の左右両端のドラッグを可能 (&D)"
+msgstr "選択領域の左右両端のドラッグを可能 (&d)"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "オーディオ I/O ボタンを人間工学的順序とする (&E)"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr "オーディオ I/O ボタンを人間工学的順序とする (&g)"
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "トラックを縦にズームして自動的に合わせる (&f)"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr "\"トラックのフォーカスを移動\" トラックを環状に繰り返して移動"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"トラックのフォーカスを移動\" トラックを環状に繰り返して移動 (&y)"
 
 #: prefs/GUIPrefs.cpp:106
 msgid "Editing a &clip can move other clips"
@@ -6781,17 +8281,21 @@ msgid "Show warnings about &temp files"
 msgstr "テンポラリファイルに関する警告を表示 (&t)"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "もしプロジェクトが空であっても、保存の際にプロンプトを表示 (&S)"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr "もしプロジェクトが空であっても、保存の際にプロンプトを表示 (&v)"
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
-msgstr "プログラム開始時にようこそ画面を表示"
+msgid "Show &Welcome Message at program start up"
+msgstr "プログラム開始時にようこそ画面を表示 (&W)"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "モード"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr "自動実行モードでは、エフェクトを適用しない (&p)"
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "波形(dB)表示における表示範囲の最小"
@@ -6828,60 +8332,46 @@ msgstr "-145 dB (PCM 24bit サンプリングの範囲)"
 msgid "Default View Mode"
 msgstr "既定の表示モード"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "波形表示"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "波形表示"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "スペクトログラム表示"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "対数周波数スペクトログラム表示"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "ピッチ表示"
-
-#: prefs/GUIPrefs.cpp:166
+#: prefs/GUIPrefs.cpp:164
 msgid "Other interface choices"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "言語:"
+msgstr "その他のインタフェースの選択"
 
 #  i18n-hint: The name of the Help menu
-#: prefs/GUIPrefs.cpp:169
+#: prefs/GUIPrefs.cpp:167
 msgid "Help:"
 msgstr "ヘルプ:"
 
-#: prefs/GUIPrefs.cpp:170
+#: prefs/GUIPrefs.cpp:168
 msgid "Solo Button:"
 msgstr "ソロボタン:"
 
-#: prefs/KeyConfigPrefs.cpp:64 prefs/KeyConfigPrefs.cpp:65
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "キーボード"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr "キーボードの設定は現在できません。"
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr "キーボードショートカットを変更するには新規プロジェクトを開いてください。"
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "キー割り当て"
 
 #: prefs/KeyConfigPrefs.cpp:115
 msgid "S&et"
-msgstr "セット (&S)"
+msgstr "セット (&e)"
 
 #: prefs/KeyConfigPrefs.cpp:120
 msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
 msgstr "メモ: Cmd+Q で終了. 他のキー全ては有効です."
 
-#: prefs/KeyConfigPrefs.cpp:124 prefs/ThemePrefs.cpp:105
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
 msgid "&Defaults"
 msgstr "既定値 (&D)"
 
@@ -6893,25 +8383,19 @@ msgstr "キーの組み合わせ"
 msgid "Export Keyboard Shortcuts As:"
 msgstr "キーボードショートカットの書き出し:"
 
-#: prefs/KeyConfigPrefs.cpp:181
+#: prefs/KeyConfigPrefs.cpp:183
 msgid "Error saving keyboard shortcuts"
 msgstr "キーボードショートカットの保存時にエラーが発生しました"
 
-#: prefs/KeyConfigPrefs.cpp:196
+#: prefs/KeyConfigPrefs.cpp:198
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
-msgstr ""
-"Audacty のキーボードショートカットが定義されている XML ファイルを選択して下さ"
-"い..."
-
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML ファイル (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Audacty のキーボードショートカットが定義されている XML ファイルを選択して下さい..."
 
-#: prefs/KeyConfigPrefs.cpp:213
+#: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
 msgstr "キーボードショートカットの読み込み時にエラーが発生しました"
 
-#: prefs/KeyConfigPrefs.cpp:241
+#: prefs/KeyConfigPrefs.cpp:243
 #, c-format
 msgid ""
 "The keyboard shortcut '%s' is already assigned to:\n"
@@ -6922,11 +8406,49 @@ msgstr ""
 "\n"
 "`%s' に割り当てられています。"
 
-#: prefs/KeyConfigPrefs.cpp:367 toolbars/EditToolBar.cpp:144
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "アンドゥ"
 
-#: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "レコーディングしながら他のトラックを再生 (&P)"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "ハードウェアによるスルー再生 (録音中にその新しいトラックを再生) (&H)"
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "ソフトウェアによるスルー再生 (録音中にその新しいトラックを再生) (&S)"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr "カット領域の前にプリビュー:"
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr "カット領域の後にプリビュー:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "オーディオからバッファへ:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "レイテンシー補正:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr "時刻の探索"
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr "プレビュー時に再生:"
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "マウス"
 
@@ -6946,26 +8468,37 @@ msgstr "コマンドアクション"
 msgid "Buttons"
 msgstr "ボタン"
 
-#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:104 prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
 #: prefs/MousePrefs.cpp:122
 msgid "Left-Click"
 msgstr "左-クリック"
 
-#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:100
-#: prefs/MousePrefs.cpp:101 prefs/MousePrefs.cpp:102
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
 msgid "Select"
 msgstr "選択"
 
-#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
 msgid "Set Selection Point"
 msgstr "選択位置を設定"
 
-#: prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:111
-#: prefs/MousePrefs.cpp:115 prefs/MousePrefs.cpp:119 prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
 msgid "Left-Drag"
 msgstr "左-ドラッグ"
 
-#: prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
 msgid "Set Selection Range"
 msgstr "選択範囲を設定"
 
@@ -6993,8 +8526,12 @@ msgstr "Ctrl-Left-Click"
 msgid "Set Selection Point and Play"
 msgstr "選択位置を設定して再生"
 
-#: prefs/MousePrefs.cpp:104 prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:106
-#: prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:108 prefs/MousePrefs.cpp:109
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
 msgid "Zoom"
 msgstr "拡大"
 
@@ -7002,7 +8539,9 @@ msgstr "拡大"
 msgid "Zoom in on Point"
 msgstr "このポイントを拡大"
 
-#: prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:125
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
 msgid "Zoom in on a Range"
 msgstr "この範囲を拡大"
 
@@ -7010,15 +8549,18 @@ msgstr "この範囲を拡大"
 msgid "same as right-drag"
 msgstr "左ドラッグと同じです"
 
-#: prefs/MousePrefs.cpp:106 prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
 msgid "Right-Click"
 msgstr "右クリック"
 
-#: prefs/MousePrefs.cpp:106 prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
 msgid "Zoom out one step"
 msgstr "1段階縮小"
 
-#: prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:125
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
 msgid "Right-Drag"
 msgstr "右ドラッグ"
 
@@ -7054,7 +8596,8 @@ msgstr "シフト-左ボタン-ドラッグ"
 msgid "Time shift all clips in track"
 msgstr "トラック内での全てのクリップの時間をシフト"
 
-#: prefs/MousePrefs.cpp:113 prefs/MousePrefs.cpp:120
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
 msgid "Ctrl-Left-Drag"
 msgstr "コントロール-左ボタン-ドラッグ"
 
@@ -7070,7 +8613,9 @@ msgstr "増幅域を変更"
 msgid "Change Sample"
 msgstr "サンプルの変更"
 
-#: prefs/MousePrefs.cpp:117 prefs/MousePrefs.cpp:118 prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
 #: prefs/MousePrefs.cpp:120
 msgid "Pencil"
 msgstr "ペンシル"
@@ -7091,20 +8636,26 @@ msgstr "いくつかのサンプルを変更"
 msgid "Change ONE Sample only"
 msgstr "単一サンプルのみ変更"
 
-#: prefs/MousePrefs.cpp:122 prefs/MousePrefs.cpp:123 prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
 #: prefs/MousePrefs.cpp:125
 msgid "Multi"
 msgstr "マルチ"
 
-#: prefs/MousePrefs.cpp:122 prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
 msgid "same as select tool"
 msgstr "セレクトツールと同じです"
 
-#: prefs/MousePrefs.cpp:124 prefs/MousePrefs.cpp:125
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
 msgid "same as zoom tool"
 msgstr "拡大ツールと同じです"
 
-#: prefs/MousePrefs.cpp:127 prefs/MousePrefs.cpp:128 prefs/MousePrefs.cpp:129
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
 msgid "Any"
 msgstr "いずれでも"
 
@@ -7132,7 +8683,7 @@ msgstr "コントロール-ホイール-回転"
 msgid "Zoom in or out"
 msgstr "拡大もしくは縮小"
 
-#: prefs/PrefsDialog.cpp:89
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
 msgstr "Audacity の設定"
 
@@ -7196,19 +8747,22 @@ msgstr "リアルタイム:"
 msgid "High-quality:"
 msgstr "高性能:"
 
-#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37
+#: prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
 msgstr "賢い録音"
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "無音で録音を休止"
+#: prefs/SmartRecordPrefs.cpp:64
+#: prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr "音があるときに録音"
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "無音レベル (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr "音があるときのレベル (dB):"
 
-#: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
 msgstr "スペクトログラム"
 
@@ -7266,7 +8820,7 @@ msgstr "音符を見付ける (&F)"
 
 #: prefs/SpectrumPrefs.cpp:162
 msgid "&Quantize Notes"
-msgstr "音符の長さを"
+msgstr "音符を量子化(クオンタイズ) (&Q)"
 
 #: prefs/SpectrumPrefs.cpp:165
 msgid "Minimum Amplitude (dB):"
@@ -7296,11 +8850,13 @@ msgstr "最低周波数少なくとも 0Hzでなければなりません。"
 msgid "The minimum amplitude (dB) must be an integer"
 msgstr "最低振幅(dB)は整数でなければなりません"
 
-#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+#: prefs/SpectrumPrefs.cpp:226
+#: prefs/SpectrumPrefs.cpp:230
 msgid "The Maximum Number of Notes must be an integer in the range 1..128"
 msgstr "最大ノート番号は 1から 128までの整数でなければなりません"
 
-#: prefs/ThemePrefs.cpp:62 prefs/ThemePrefs.cpp:63
+#: prefs/ThemePrefs.cpp:62
+#: prefs/ThemePrefs.cpp:63
 msgid "Theme"
 msgstr "テーマ"
 
@@ -7398,59 +8954,58 @@ msgstr ""
 "しかし、それ以外では同じ考え方です。\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "コントロール"
-
-#: toolbars/ControlToolBar.cpp:174
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "ポーズ"
 
-#: toolbars/ControlToolBar.cpp:177
+#: toolbars/ControlToolBar.cpp:178
 msgid "Play"
 msgstr "再生"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
 msgstr "再生 (シフトを押すとループ再生)"
 
-#: toolbars/ControlToolBar.cpp:182
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "停止"
 
-#: toolbars/ControlToolBar.cpp:185
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
 msgstr "初めまで進める"
 
-#: toolbars/ControlToolBar.cpp:188
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
 msgstr "終わりまで進める"
 
-#: toolbars/ControlToolBar.cpp:194
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "録音 (追加録音のためにシフト)"
+
+#: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "クリーンスピーチ"
 
-#: toolbars/ControlToolBar.cpp:530 toolbars/ControlToolBar.cpp:844
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr "音ファイルの読み込み時にエラーが発生しました"
 
-#: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
-msgstr ""
-"既にひとつのトラック、あるいはひとつ以上のプロジェクトが開かれているときに"
-"は、クリーンスピーチモードで録音することはできません。"
+#: toolbars/ControlToolBar.cpp:706
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "既にひとつのトラック、あるいはひとつ以上のプロジェクトが開かれているときには、クリーンスピーチモードで録音することはできません。"
 
-#: toolbars/ControlToolBar.cpp:697
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "録音は許可されていません"
 
-#: toolbars/DeviceToolBar.cpp:113 toolbars/DeviceToolBar.cpp:115
+#: toolbars/DeviceToolBar.cpp:113
+#: toolbars/DeviceToolBar.cpp:115
 msgid "Output Device"
 msgstr "再生デバイス"
 
-#: toolbars/DeviceToolBar.cpp:134 toolbars/DeviceToolBar.cpp:136
+#: toolbars/DeviceToolBar.cpp:134
+#: toolbars/DeviceToolBar.cpp:136
 msgid "Input Device"
 msgstr "入力デバイス"
 
@@ -7463,30 +9018,34 @@ msgid "Silence selection"
 msgstr "無音を選択"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr "トラックをリンク"
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
 msgstr "拡大"
 
-#: toolbars/EditToolBar.cpp:152
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: toolbars/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
 msgstr "拡大切り替え"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr "選択部分を合わせる"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "選択範囲をウィンドウに合わせる"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr "プロジェクトを合わせる"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
 msgstr "プロジェクトをウィンドに合わせる"
 
@@ -7518,78 +9077,82 @@ msgstr "出力レベルモニター"
 msgid "Input level meter - click to monitor input"
 msgstr "入力レベルメータ - クリックすると入力を監視します"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "ミキサー"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "出力ボリューム"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+msgid "Slider Output"
 msgstr "出力スライダー"
 
 #: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
 msgid "Input Volume"
 msgstr "インプットボリューム"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+msgid "Slider Input"
 msgstr "入力スライダー"
 
 #: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
 msgstr "入力ソース"
 
-#: toolbars/SelectionBar.cpp:80
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr "選択"
 
-#: toolbars/SelectionBar.cpp:128 toolbars/SelectionBar.cpp:185
+#: toolbars/SelectionBar.cpp:135
+#: toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
 msgstr "プロジェクトのサンプリング周波数 (Hz):"
 
-#: toolbars/SelectionBar.cpp:142 toolbars/SelectionBar.cpp:247
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
 msgstr "選択開始:"
 
-#: toolbars/SelectionBar.cpp:155 toolbars/SelectionBar.cpp:253
+#: toolbars/SelectionBar.cpp:163
+#: toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
 msgid "Length"
 msgstr "長さ"
 
-#: toolbars/SelectionBar.cpp:165
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
 msgstr "隠された"
 
-#: toolbars/SelectionBar.cpp:175 toolbars/SelectionBar.cpp:264
+#: toolbars/SelectionBar.cpp:184
+#: toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
 msgstr "再生位置"
 
 #  i18n-hint: Set snap-to mode on or off
 #  i18n-hint: Set snap-to mode on or off
-#: toolbars/SelectionBar.cpp:225 toolbars/SelectionBar.cpp:230
+#: toolbars/SelectionBar.cpp:236
+#: toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr "スナップモードを有効"
 
-#: toolbars/SelectionBar.cpp:252
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
 msgstr "選択 "
 
-#: toolbars/SelectionBar.cpp:317
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
 msgstr "選択する長さ"
 
-#: toolbars/SelectionBar.cpp:325
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
 msgstr "選択の最後"
 
-#: toolbars/ToolBar.cpp:97
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr "Audacity %s ツールバー"
 
-#: toolbars/ToolDock.cpp:74 toolbars/ToolDock.cpp:75
+#: toolbars/ToolDock.cpp:74
+#: toolbars/ToolDock.cpp:75
 msgid "ToolDock"
 msgstr "ツールドック"
 
@@ -7625,7 +9188,8 @@ msgstr "トラックの時間を移動するためにはクリックした後に
 msgid "Tools"
 msgstr "ツール"
 
-#: toolbars/ToolsToolBar.cpp:147 toolbars/ToolsToolBar.cpp:182
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
 msgid "Selection Tool"
 msgstr "選択ツール"
 
@@ -7633,15 +9197,18 @@ msgstr "選択ツール"
 msgid "Envelope Tool"
 msgstr "エンベロープツール"
 
-#: toolbars/ToolsToolBar.cpp:149 toolbars/ToolsToolBar.cpp:183
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
 msgid "Time Shift Tool"
 msgstr "タイムシフトツール"
 
-#: toolbars/ToolsToolBar.cpp:150 toolbars/ToolsToolBar.cpp:185
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
 msgid "Zoom Tool"
 msgstr "拡大ツール"
 
-#: toolbars/ToolsToolBar.cpp:151 toolbars/ToolsToolBar.cpp:184
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
 msgid "Draw Tool"
 msgstr "ドローツール"
 
@@ -7669,7 +9236,8 @@ msgstr "選択したスピードで再生"
 msgid "Play-at-speed"
 msgstr "スピードを変えて再生"
 
-#: toolbars/TranscriptionToolBar.cpp:178 toolbars/TranscriptionToolBar.cpp:183
+#: toolbars/TranscriptionToolBar.cpp:178
+#: toolbars/TranscriptionToolBar.cpp:183
 msgid "Playback Speed"
 msgstr "再生速度"
 
@@ -7777,15 +9345,15 @@ msgstr "方向の変化(高い閾値)"
 msgid "Key type"
 msgstr "キータイプ"
 
-#: widgets/AButton.cpp:302
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr "(無効)"
 
-#: widgets/AButton.cpp:452
+#: widgets/AButton.cpp:461
 msgid "Press"
 msgstr "押す"
 
-#: widgets/AButton.cpp:531
+#: widgets/AButton.cpp:540
 msgid "Button"
 msgstr "ボタン"
 
@@ -7794,7 +9362,8 @@ msgstr "ボタン"
 #  i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: widgets/ASlider.cpp:604 widgets/Meter.cpp:212
+#: widgets/ASlider.cpp:612
+#: widgets/Meter.cpp:248
 msgid "L"
 msgstr "L"
 
@@ -7803,44 +9372,45 @@ msgstr "L"
 #  i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: widgets/ASlider.cpp:607 widgets/Meter.cpp:214
+#: widgets/ASlider.cpp:615
+#: widgets/Meter.cpp:250
 msgid "R"
 msgstr "R"
 
-#: widgets/ASlider.cpp:670
+#: widgets/ASlider.cpp:678
 msgid "Center"
 msgstr "中央"
 
-#: widgets/ASlider.cpp:674
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "å·¦"
 
-#: widgets/ASlider.cpp:677
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "右"
 
 #  i18n-hint: The name of the Help menu
-#: widgets/ErrorDialog.cpp:78 widgets/ErrorDialog.cpp:102
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
 msgstr "ヘルプ"
 
 #: widgets/ErrorDialog.cpp:137
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #: widgets/ErrorDialog.cpp:138
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: widgets/ErrorDialog.cpp:142
 msgid "Forwards"
-msgstr ""
+msgstr "前方へ"
 
 #: widgets/ErrorDialog.cpp:143
 msgid "Backwards"
-msgstr ""
+msgstr "後方へ"
 
-#: widgets/ErrorDialog.cpp:249
+#: widgets/ErrorDialog.cpp:255
 msgid "Help on the Internet"
 msgstr "インターネット上のヘルプ"
 
@@ -7853,7 +9423,8 @@ msgstr "グラバー"
 msgid "%d rows, %d columns"
 msgstr "%d 行, %d 列"
 
-#: widgets/Grid.cpp:649 widgets/Grid.cpp:776
+#: widgets/Grid.cpp:649
+#: widgets/Grid.cpp:776
 #, c-format
 msgid "Row %d"
 msgstr "%d 行"
@@ -7862,35 +9433,39 @@ msgstr "%d 行"
 msgid "Empty"
 msgstr "空"
 
-#: widgets/Meter.cpp:359
+#: widgets/Meter.cpp:396
 msgid "Enable Meter"
 msgstr "メータツールバーを有効"
 
-#: widgets/Meter.cpp:361
+#: widgets/Meter.cpp:398
 msgid "Disable Meter"
 msgstr "メータを無効"
 
-#: widgets/Meter.cpp:364
+#: widgets/Meter.cpp:401
 msgid "Stop Monitoring"
 msgstr "入力モニターを停止"
 
-#: widgets/Meter.cpp:366
+#: widgets/Meter.cpp:403
 msgid "Start Monitoring"
 msgstr "モニターを開始"
 
-#: widgets/Meter.cpp:370
+#: widgets/Meter.cpp:407
 msgid "Horizontal Stereo"
 msgstr "水平方向ステレオ"
 
-#: widgets/Meter.cpp:371
+#: widgets/Meter.cpp:408
 msgid "Vertical Stereo"
 msgstr "垂直方向ステレオ"
 
-#: widgets/Meter.cpp:388
+#: widgets/Meter.cpp:425
 msgid "Preferences..."
 msgstr "設定... "
 
-#: widgets/Meter.cpp:1078
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr "ミキシングボリューム"
+
+#: widgets/Meter.cpp:1145
 msgid ""
 "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7902,11 +9477,11 @@ msgstr ""
 "30回かそれ以下)を使って、オーディオの品質にメータ表示が影響を\n"
 "与えないようにするとよいでしょう。"
 
-#: widgets/Meter.cpp:1079
+#: widgets/Meter.cpp:1146
 msgid "Meter refresh rate per second [1-100]: "
 msgstr "メータの1秒あたりのリフレッシュレート [1-100]:"
 
-#: widgets/Meter.cpp:1080
+#: widgets/Meter.cpp:1147
 msgid "Meter Preferences"
 msgstr "メーターの設定"
 
@@ -7914,7 +9489,24 @@ msgstr "メーターの設定"
 msgid " Please select an action "
 msgstr "操作を選んでください"
 
-#: widgets/Ruler.cpp:1478 widgets/Ruler.cpp:1479
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "操作を選んでください"
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr "処理時間:"
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr "残り時間:"
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: widgets/Ruler.cpp:1445
+#: widgets/Ruler.cpp:1446
 msgid "Vertical Ruler"
 msgstr "垂直方向"
 
@@ -7928,12 +9520,6 @@ msgstr "垂直方向"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 秒"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "時:分:秒"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7959,6 +9545,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 days 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr "時:分:秒 + 百分の1秒"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr "0100 時間 060 分 060.0100 秒"
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8139,9 +9740,7 @@ msgstr "01000,01000 フレーム|75"
 
 #: widgets/TimeTextCtrl.cpp:451
 msgid "Use right mouse button or context key to change format"
-msgstr ""
-"フォーマットを変更するには、右マウスボタンあるいはコンテクストキーを使ってく"
-"ださい"
+msgstr "フォーマットを変更するには、右マウスボタンあるいはコンテクストキーを使ってください"
 
 #: widgets/TimeTextCtrl.cpp:1485
 msgid "Time Control"
@@ -8158,705 +9757,11 @@ msgstr "ファイルが開けません: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "エラー: %hs (%d 行目)"
+msgid "Error: %hs at line %lu"
+msgstr "エラー: %hs (%lu 行目)"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
 msgstr "ファイルが開けません: \"%s\""
 
-#~ msgid "Export and Saving"
-#~ msgstr "書き出しと保存"
-
-#~ msgid "<p>Welcome to Audacity "
-#~ msgstr "<p>ようこそ Audacity へ"
-
-#~ 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>"
-#~ msgstr ""
-#~ "<b>録音を開始するには、赤い録音ボタンを押してください。</b>そうするまえ"
-#~ "に、チェックせねばならない大事な点が3つあります。<br><br>(1)<b>録音デバイ"
-#~ "ス</b>を、設定におけるオーディオI/Oタブで設定してください。規定値として、"
-#~ "Audacity は現在のシステムが選んだデバイス、通常は組込み済みのサウンドデバ"
-#~ "イスを使います。だから設定する必要がなかったりします。しかし、USBターン"
-#~ "テーブルのような、外部の USB やFirewire のサウンドデバイスを使っている場合"
-#~ "は、録音デバイスとしてそれが選ばれているか確かめてください。<br><br>(2) デ"
-#~ "バイスの<b>入力ソース</b> は、マイクやラインインなどです。<ul><li><b>ウィ"
-#~ "ンドウズ</b>では、通常は<b>ミキサーツールバー</b> の右にあるプルダウン選択"
-#~ "の中から選んでください。<i>注意: ビスタでは、オーディオI/O設定タブにおけ"
-#~ "る、録音デバイスにおいて選ばねばなりません。</i></li><li><b>Mac</b>では、"
-#~ "通常はAudacity 以外の、Apple オーディオ-MIDI設定において、録音ソースを選ぶ"
-#~ "必要があります。</li></ul><i>注意: USB やFirewire のデバイスは、入力の選択"
-#~ "ができないものが多いので、この設定は無視することもできます - 使っているデ"
-#~ "バイスの説明書を見てください。</i><br><br>(3)<b> 入力ボリューム</b> 実際に"
-#~ "録音する前に、大き過ぎるあるいは小さ過ぎないように入力レベルのテストをすべ"
-#~ "きです。このためには、この[[wiki:Recording_levels|イラストガイド]]をみる"
-#~ "か、次の2つのステップ従ってください: <ol><li>2つのVUメーターの右横をダブル"
-#~ "クリックして、あるいはそこを右クリックして、<b>\"入力をモニター\"</b>を選"
-#~ "んで<b>レベルメーター</b>をオンにすることです。もし、メーターが見付からな"
-#~ "い場合は、ビュー > ツールバー > \"メーターツールバー\" をチェックしてくだ"
-#~ "さい。<li>録音を押して、ミキサーツールバー(マイクの絵がついている)で入力ボ"
-#~ "リュームのスライダーを合わせると、メーターの赤いバーがスケールの右端に近付"
-#~ "きます(ただし、くっつかないように)。もし、音が憩えなければ、設定のオーディ"
-#~ "オI/Oのタブに行き、\"ソフトウェアによるスルー再生\"をチェックしてくださ"
-#~ "い。</ol><br><br>もし、行き詰まってしまった場合は、録音のFAQ(よく尋ねられ"
-#~ "る質問)、チュートリアル、<b>初めての録音</b>がマニュアルにはあります。ま"
-#~ "た、Wiki[[wiki:Recording_Tips|録音の秘訣]]には、特に、[[wiki:"
-#~ "Troubleshooting_Recordings|録音のトラブル解決法]]があります。<br><br>"
-
-#~ msgid ""
-#~ "Exporting and Saving have different purposes.You \"save\" an Audacity "
-#~ "project file when you want to return to your work in Audacity later.This "
-#~ "means you don't then have to re-import or re-record audio, or redo "
-#~ "editing you have done so far.When you want to listen to your work in "
-#~ "other computer programs you \"export\" it as an audio file such as a WAV, "
-#~ "AIFF or MP3. If burning to an audio CD for standalone CD players, you "
-#~ "must export as WAV or AIFF.<br><br>To save an Audacity project, use "
-#~ "<b>File > Save Project</b>. This will save an <b>.aup</b> Project file, "
-#~ "plus a <b>_data</b> folder containing the actual audio. Make sure you "
-#~ "don't rename or move either of these, because Audacity needs to refer to "
-#~ "both.Only use File > Save Project As... when you either need to save an "
-#~ "empty Project, or if you want to save an existing Project to a <i> new</"
-#~ "i> name. When you want to re-open a saved Project, simply click File > "
-#~ "Open and open the .aup file. <br><br>When you want to export your work to "
-#~ "an audio file, use <b>File > Export</b> and choose your desired format in "
-#~ "the \"Save as type\" dropdown.Click the Options button for advanced "
-#~ "choices, such as the bit rate to use for MP3 export.There are two other "
-#~ "Export commands under the File menu.\"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]]. <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]]. There is "
-#~ "also some help on how to [[burncd|burn to a CD]].<br><br>"
-#~ msgstr ""
-#~ "書き出しと保存には異なる目的があります。後で作業を再開したいときには、"
-#~ "Audacity のプロジェクトファイルを\"保存\"します。これは再度読み込みや録"
-#~ "音、既に行なった編集を再実行する必要のないことを意味します。別のソフトで作"
-#~ "品を聞いたり、CDに焼くときには、\"書き出し\"を行なって、WAV, AIFF あるい"
-#~ "は MP3 といったオーディオファイルにします。もし、CDプレーヤで再生するオー"
-#~ "ディオCDを作成したいときは、WAVあるいはAIFFで書き出す必要があります。"
-#~ "<br><br>Audacity のプロジェクトを保存するには、<b>ファイル > プロジェクト"
-#~ "を保存</b>を使ってください。この操作は、<b>.aup</b>という拡張子のプロジェ"
-#~ "クトファイルを保存して、かつ本来のオーディオデータを含んだ<b>_data</b>フォ"
-#~ "ルダを保存します。いずれのファイルおよびフォルダの名前も変更しないようにし"
-#~ "てください、なぜなら Audacity は両方を参照する必要があるからです。もし空の"
-#~ "プロジェクトを保存したいときや既存のプロジェクトを<li>新しい</li>名前で保"
-#~ "存したいときには、ファイル> プロジェクトを保存... を使ってください。再度プ"
-#~ "ロジェクトを開くときには、ファイル > 開く を使って、.aup ファイルを開いて"
-#~ "ください。<br><br>オーディオファイルとして作品を書き出したいときには、<b>"
-#~ "ファイル > 書き出し</b>を選んで、\"保存する種類\" のドロップダウンメニュー"
-#~ "から保存したい形式を選んでください。オプションボタンを押すと、MP3 書き出し"
-#~ "でのビットレートのような、高度な設定をすることができます。ファイルメニュー"
-#~ "には、ふたつの書き出しコマンドがあります。\"選択範囲を書き出し\" はオー"
-#~ "ディオの選択された領域のみを書き出します。\"複数ファイルの書き出し\"は、例"
-#~ "えば画面上に複数トラックがあって、それらを別々のファイルに保存したい時など"
-#~ "に、複数ファイルを書き出します。もし、LPレコードやテープのトラックから複数"
-#~ "のファイルの書き出しをする場合には、[[wiki:"
-#~ "Splitting_recordings_into_separate_tracks|ラベルと一緒に複数ファイルへの書"
-#~ "き出し]]を使ってください。<br><br> <b>MP3</b>を書き出す前には、LAME MP3 エ"
-#~ "ンコーダをコンピュータに入れておく必要があります。LAMEについてのヘルプは、"
-#~ "[[wiki:Lame_Installation|Lameのインストール]] を見てください。CDを製作する"
-#~ "ためにも[[burncd|CD に焼く]] というヘルプがあります。<br><br>"
-
-#~ msgid ""
-#~ "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> "
-#~ "<p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten "
-#~ "(SHN)</b>, or most other proprietary formats, because of licensing and "
-#~ "patent restrictions. Audacity also cannot import any kind of Digital "
-#~ "Rights Management (DRM) protected file, including most purchased online "
-#~ "such as from iTunes or Napster.If you are on a Mac, you can import "
-#~ "<b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not "
-#~ "DRM protected, but you cannot export to these formats.</p> <p>Some open "
-#~ "formats are not yet supported by Audacity, including <b>Ogg Speex</b> and "
-#~ "<b>Musepack</b>.We hope to support these formats in future versions of "
-#~ "Audacity.</p> <p>If you cannot import your file into Audacity, you can as "
-#~ "a workround convert it to WAV or AIFF.As long as it's not a DRM-protected "
-#~ "file, you could do this with iTunes or with <a href=\"http://www."
-#~ "erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-"
-#~ "protected file, you can burn it to an audio CD in the application that is "
-#~ "licensed to play it, then extract (rip) the CD track to WAV or AIFF.You "
-#~ "can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or "
-#~ "<a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows."
-#~ "Or you can play the file on your computer and record it - see <a href="
-#~ "\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
-#~ msgstr ""
-#~ "<h2>Audcity は WMA, AAC, RealAudio といった形式のファイルを読み込むことが"
-#~ "できるのでしょうか?</h2> <p><b>WMA, RealAudio, Shorten (SHN)</b>や、他の多"
-#~ "くのプロプラエタリ(独占的)な形式を、読み込むことはできません。なぜなら、許"
-#~ "諾や特許による制限があるためです。Audacity はディジタル著作権管理(DRM)に"
-#~ "よって保護されたどんなファイルも、例えば iTunes や Napster からオンライン"
-#~ "購入したものも含みますが、それらを読み込むことができません。もし Mac を"
-#~ "使っている場合は、<b>AAC</b>でエンコードされたファイル(<b>M4A</a>といった"
-#~ "もの)は、DRM で保護されていない限りは読み込むことができますが、それらの"
-#~ "フォーマットへ書き出すことはできません。</p></p><p><b>Ogg Speex</b>や "
-#~ "<b>Musepack</b>を含む、いくつかの公開されているフォーマットは、まだ "
-#~ "Audacity がサポートしていません。それらのフォーマットはこの先の Audacity "
-#~ "のバージョンで、サポートしたいと考えています。</p><p>もし、Audacity に読み"
-#~ "込むことができなければ、WAV か AIFFに変換してからやれば、うまくいきます。"
-#~ "DRMで保護されたファイルでない限りは、iTunes あるいは <a href=\"http://www."
-#~ "erightsoft.com/SUPER.html#Dnload\">SUPER</a>プレーヤが変換できます。もし "
-#~ "DRM で保護されたファイルであれば、そのファイルを再生することを許可されてい"
-#~ "るアプリケーションソフトでオーディオCDに焼いて、そのCDトラックをWAVあるい"
-#~ "は AIFF として読み込み(リップ)してください。Windows上では、iTunes を使っ"
-#~ "て、Windows Media Player 11 あるいは<a href=\"http://cdexos.sourceforge."
-#~ "net/?q=download\">CDex</a> も加えて WAV あるいは AIFF を取り出すことができ"
-#~ "ます。あるいは、そのファイルをコンピュータ上で再生して録音することもでいま"
-#~ "す。<a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-#~ "i=streaming\">を見てください。"
-
-#~ msgid ""
-#~ "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]].<br><br>"
-#~ msgstr ""
-#~ "もし、作品をオーディオCDとして製作したい場合は、最初に[[export|WAVあるいは"
-#~ "AIFFとして書き出し]]を行ない、iTunes のような CD 製作ソフトを使って、CDに"
-#~ "記録してください。より詳しいヘルプは、[[wiki:How_to_burn_CDs|CDの作り方]]"
-#~ "を見てください。<br><br>"
-
-#~ msgid "Specify Time"
-#~ msgstr "時刻の特定"
-
-#~ msgid "Draw currently only works with linear-view waveforms."
-#~ msgstr "線形表示の波形としてのみ描画されます."
-
-#~ msgid "DTMF duration:"
-#~ msgstr "DTMF 生成"
-
-#~ msgid "Noise duration"
-#~ msgstr "ノイズ持続時間"
-
-#~ msgid "Edit the metadata for the FLAC file"
-#~ msgstr "FLACファイルのメタデータをエディット"
-
-#~ msgid "Edit the ID3 tags for the MP2 file"
-#~ msgstr "MP2 ファイルの ID3 タグをエディット"
-
-#~ msgid "Edit the ID3 tags for the MP3 file"
-#~ msgstr "MP3 ファイルの ID3 タグをエディット"
-
-#~ msgid "Edit the metadata"
-#~ msgstr "メタデータの編集"
-
-#~ msgid "Edit the metadata for the OGG file"
-#~ msgstr "Ogg ファイルのメタデータタグをエディット"
-
-#~ msgid "Specify PCM Options"
-#~ msgstr "PCMオプションを指定"
-
-#~ msgid "Edit the metadata for the uncompressed file"
-#~ msgstr "非圧縮ファイルのメタデータを編集"
-
-#~ msgid "Audio Files"
-#~ msgstr "オーディオファイル"
-
-#~ msgid "&Download Free Copy of LAME"
-#~ msgstr "LAMEの無料コピーをダウンロードする (&D)"
-
-#~ msgid "Language"
-#~ msgstr "言語:"
-
-#~ msgid ""
-#~ "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?"
-#~ msgstr ""
-#~ "プロジェクトを回復しないことを選んでいます。もし後で気が変わったとしても、"
-#~ "これらのプロジェクトを回復できないでしょう。本当に回復せずに続行しますか?"
-
-#~ msgid "Really not recover projects?"
-#~ msgstr "本当にプロジェクトを回復しませんか?"
-
-#~ msgid "Enter new samplerate:"
-#~ msgstr "新しいサンプルレートを入力:"
-
-#~ msgid "0, 220-260 kbps (Best Quality)"
-#~ msgstr "0, 220-260 kbps (最良の品質)"
-
-#~ msgid "1, 200-250 kbps"
-#~ msgstr "1, 200-250 kbps"
-
-#~ msgid "2, 170-210 kbps"
-#~ msgstr "2, 170-210 kbps"
-
-#~ msgid "3, 155-195 kbps"
-#~ msgstr "3, 155-195 kbps"
-
-#~ msgid "4, 145-185 kbps"
-#~ msgstr "4, 145-185 kbps"
-
-#~ msgid "5, 110-150 kbps"
-#~ msgstr "5, 110-150 kbps"
-
-#~ msgid "6, 95-135 kbps"
-#~ msgstr "6, 95-135 kbps"
-
-#~ msgid "7, 80-120 kbps"
-#~ msgstr "7, 80-120 kbps"
-
-#~ msgid "8, 65-105 kbps"
-#~ msgstr "8, 65-105 kbps"
-
-#~ msgid "Insane, 320 kbps"
-#~ msgstr "過剰, 320 kbps"
-
-#~ msgid "Extreme, 220-260 kbps"
-#~ msgstr "極上, 220-260 kbps"
-
-#~ msgid "Standard, 170-210 kbps"
-#~ msgstr "標準, 170-210 kbps"
-
-#~ msgid "Medium, 145-185 kbps"
-#~ msgstr "中程度, 145-185 kbps"
-
-#~ msgid "Minimum of dB mode display range"
-#~ msgstr "最小 dB モード表示範囲"
-
-#~ msgid "Stop and Select\tShift+A"
-#~ msgstr "停止と選択\tShift+A"
-
-#~ msgid "Audio to buffer:"
-#~ msgstr "オーディオからバッファへ:"
-
-#~ msgid "&Present track number to accessibility aid"
-#~ msgstr "アクセス補助のために、トラック番号を与える (&P)"
-
-#~ msgid ""
-#~ "Editing: Audacity is a powerful editor, so you'll want to see what it can "
-#~ "do with your imported file or recording.  "
-#~ msgstr ""
-#~ "編集: Audacity は多機能な編集ソフトですから、ファイルを取り込んだり、録音"
-#~ "したりについて何ができるか知りたいでしょう。"
-
-#~ msgid "<p>You don't appear to have Audacity help files on your machine. "
-#~ msgstr "<p>Audacity ヘルプファイルがコンピュータに見当たりません。"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Recording end:   "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "録音の終了"
-
-#~ msgid "          Duration: "
-#~ msgstr "持続時間:"
-
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
-
-#~ msgid "S&how MP3-ID3 Dialog"
-#~ msgstr "MP3のID3表示 (&h)"
-
-#~ msgid "&Never copy any audio"
-#~ msgstr "オーディオを絶対コピーしない (&N)"
-
-#~ msgid "Question"
-#~ msgstr "質問"
-
-#~ msgid " page."
-#~ msgstr " page."
-
-#~ msgid "Back to "
-#~ msgstr "Back to"
-
-#~ msgid "Greyed Out Items"
-#~ msgstr "グレイアウトされたアイテム"
-
-#~ msgid "Welcome to Audacity 1.4.0! Let's get started!"
-#~ msgstr "Audacity 1.4.0 へようこそ! さあ始めましょう!"
-
-#~ msgid "You may want to click on the hyperlinks below to read:"
-#~ msgstr "以下のハイパーリンクをクリックして読んでみたいでしょう:"
-
-#~ msgid " an existing sound file."
-#~ msgstr "存在する音ファイル"
-
-#~ msgid "How to "
-#~ msgstr "ハウツー"
-
-#~ msgid "play back"
-#~ msgstr "プレイバック"
-
-#~ msgid " a new sound file."
-#~ msgstr "新しい音ファイル"
-
-#~ msgid "record"
-#~ msgstr "録音"
-
-#~ msgid " sound and "
-#~ msgstr "音と"
-
-#~ msgid " for an mp3 player."
-#~ msgstr "mp3プレーヤのために"
-
-#~ msgid "This could save you from puzzling over why some functions in the "
-#~ msgstr "This could save you from puzzling over why some functions in the "
-
-#~ msgid " or why Audacity "
-#~ msgstr " or why Audacity "
-
-#~ msgid "menus are greyed out"
-#~ msgstr "menus are greyed out"
-
-#~ msgid " when "
-#~ msgstr " when "
-
-#~ msgid "isn't recording anything"
-#~ msgstr "isn't recording anything"
-
-#~ msgid ""
-#~ "you expect it to.  Or you may prefer to just try using Audacity and see "
-#~ msgstr ""
-#~ "you expect it to.  Or you may prefer to just try using Audacity and see "
-
-#~ msgid ""
-#~ "what you can do.  You can always get back to these instructions by using "
-#~ msgstr ""
-#~ "what you can do.  You can always get back to these instructions by using "
-
-#~ msgid "the 'Help' option in the menus, and then 'Show Welcome Message...' "
-#~ msgstr "the 'Help' option in the menus, and then 'Show Welcome Message...' "
-
-#~ msgid ""
-#~ "You can import files into Audacity by dragging them in, or use the File > "
-#~ msgstr ""
-#~ "Audacity にファイルをドラッグしてインポートすることもできるし、File > を使"
-#~ "用することもできます"
-
-#~ msgid ""
-#~ "Import > Audio command.<br><br>File > Open does the same, but opens a new "
-#~ msgstr ""
-#~ "Import > Audio command.<br><br>File > Open does the same, but opens a new "
-
-#~ msgid ""
-#~ "Audacity window.<br><br>These are the main formats Audacity will import "
-#~ "for "
-#~ msgstr ""
-#~ "Audacity window.<br><br>These are the main formats Audacity will import "
-#~ "for "
-
-#~ msgid ""
-#~ "you: AIFF, AU, FLAC, [M4A (only on a Mac)], MP2/MP3, OGG Vorbis, WAV. "
-#~ msgstr ""
-#~ "you: AIFF, AU, FLAC, [M4A (only on a Mac)], MP2/MP3, OGG Vorbis, WAV. "
-
-#~ msgid ""
-#~ "If your file is in some other format see (format help).<br><br>If you "
-#~ "want to import an "
-#~ msgstr ""
-#~ "If your file is in some other format see (format help).<br><br>If you "
-#~ "want to import an "
-
-#~ msgid ". To start playing your imported audio, "
-#~ msgstr ". To start playing your imported audio, "
-
-#~ msgid "audio CD, see "
-#~ msgstr "audio CD, see "
-
-#~ msgid "press the green Play button. "
-#~ msgstr "press the green Play button. "
-
-#~ msgid ""
-#~ "To start recording, press the red Record button. Of course it's not quite "
-#~ msgstr ""
-#~ "To start recording, press the red Record button. Of course it's not quite "
-
-#~ msgid "that easy. There are three crucial settings you need to make:"
-#~ msgstr "that easy. There are three crucial settings you need to make:"
-
-#~ msgid ""
-#~ "(1) The \"Recording Device\", set in the Audio I/O tab of Preferences. "
-#~ msgstr ""
-#~ "(1) The \"Recording Device\", set in the Audio I/O tab of Preferences. "
-
-#~ msgid ""
-#~ "By default Audacity will choose the current system device, usually your "
-#~ msgstr ""
-#~ "By default Audacity will choose the current system device, usually your "
-
-#~ msgid ""
-#~ "inbuilt sound device, so you may not need to set this. But if you're "
-#~ "using an "
-#~ msgstr ""
-#~ "inbuilt sound device, so you may not need to set this. But if you're "
-#~ "using an "
-
-#~ msgid ""
-#~ "external USB or Firewire device such as a USB turntable, please check "
-#~ "this "
-#~ msgstr ""
-#~ "external USB or Firewire device such as a USB turntable, please check "
-#~ "this "
-
-#~ msgid "device is selected as your recording device. "
-#~ msgstr "device is selected as your recording device. "
-
-#~ msgid ""
-#~ "(2) The input source for your device, such as microphone, line-in [or "
-#~ msgstr ""
-#~ "(2) The input source for your device, such as microphone, line-in [or "
-
-#~ msgid ""
-#~ "stereo mix]. [If you're on Vista, choose your source in the \"Recording "
-#~ msgstr ""
-#~ "stereo mix]. [If you're on Vista, choose your source in the \"Recording "
-
-#~ msgid ""
-#~ "Device\" on the Audio I/O tab as above.] [Mac info]. Otherwise, choose "
-#~ msgstr ""
-#~ "Device\" on the Audio I/O tab as above.] [Mac info]. Otherwise, choose "
-
-#~ msgid ""
-#~ "your input in the dropdown selector on the right of the Mixer Toolbar. "
-#~ msgstr ""
-#~ "your input in the dropdown selector on the right of the Mixer Toolbar. "
-
-#~ msgid ""
-#~ "Note: many USB or Firewire devices won't have a choice of inputs, so "
-#~ msgstr ""
-#~ "Note: many USB or Firewire devices won't have a choice of inputs, so "
-
-#~ msgid "you can ignore this step - see the documentation for your device. "
-#~ msgstr "you can ignore this step - see the documentation for your device. "
-
-#~ msgid ""
-#~ "(3) Input Volume: Before recording for real, make a test recording to set "
-#~ msgstr ""
-#~ "(3) Input Volume: Before recording for real, make a test recording to set "
-
-#~ msgid ""
-#~ "the input level of your recording so that it's neither too soft or too "
-#~ "loud. "
-#~ msgstr ""
-#~ "the input level of your recording so that it's neither too soft or too "
-#~ "loud. "
-
-#~ msgid ""
-#~ "To do this, adjust the input volume slider on the Mixer Toolbar (by the "
-#~ msgstr ""
-#~ "To do this, adjust the input volume slider on the Mixer Toolbar (by the "
-
-#~ msgid ""
-#~ "microphone symbol) so that when you record, the levels on the red VU "
-#~ msgstr ""
-#~ "microphone symbol) so that when you record, the levels on the red VU "
-
-#~ msgid ""
-#~ "recording meter in the Meter Toolbar are close to (but not touching) "
-#~ msgstr ""
-#~ "recording meter in the Meter Toolbar are close to (but not touching) "
-
-#~ msgid "the right edge of the scale. "
-#~ msgstr "the right edge of the scale. "
-
-#~ msgid ""
-#~ "There is more help if you're stuck: our Recording FAQs, our Tutorial  "
-#~ "\"Your "
-#~ msgstr ""
-#~ "There is more help if you're stuck: our Recording FAQs, our Tutorial  "
-#~ "\"Your "
-
-#~ msgid " especially "
-#~ msgstr " especially "
-
-#~ msgid "First Recording\" in the Manual, and our Wiki "
-#~ msgstr "First Recording\" in the Manual, and our Wiki "
-
-#~ msgid " section. "
-#~ msgstr "セクション"
-
-#~ msgid "the "
-#~ msgstr "the "
-
-#~ msgid ""
-#~ "your imported file or recording.  The main commands you will use are "
-#~ "under "
-#~ msgstr ""
-#~ "your imported file or recording.  The main commands you will use are "
-#~ "under "
-
-#~ msgid ""
-#~ "the Edit menu (such as cut, copy and paste) and under the Effect menu "
-#~ "(you "
-#~ msgstr ""
-#~ "the Edit menu (such as cut, copy and paste) and under the Effect menu "
-#~ "(you "
-
-#~ msgid ""
-#~ "can do things like boost the bass, change pitch or tempo, or remove "
-#~ "noise). "
-#~ msgstr ""
-#~ "can do things like boost the bass, change pitch or tempo, or remove "
-#~ "noise). "
-
-#~ msgid "There are two rules when editing:"
-#~ msgstr "There are two rules when editing:"
-
-#~ msgid "(1) if you're still playing or recording, use "
-#~ msgstr "(1) if you're still playing or recording, use "
-
-#~ msgid "the yellow Stop button, because you can't edit a moving track! "
-#~ msgstr "the yellow Stop button, because you can't edit a moving track! "
-
-#~ msgid ""
-#~ "(2) You'll see that on occasion some of the menus or buttons are greyed "
-#~ "out or say "
-#~ msgstr ""
-#~ "(2) You'll see that on occasion some of the menus or buttons are greyed "
-#~ "out or say "
-
-#~ msgid ""
-#~ "\"Disabled\", according to what you are trying to do. This is normal. For "
-#~ "example "
-#~ msgstr ""
-#~ "\"Disabled\", according to what you are trying to do. This is normal. For "
-#~ "example "
-
-#~ msgid ""
-#~ "because you can't edit the audio while playing or recording, we grey out "
-#~ "or "
-#~ msgstr ""
-#~ "because you can't edit the audio while playing or recording, we grey out "
-#~ "or "
-
-#~ msgid ""
-#~ "disable commands until you press Stop.  Commands can sometimes be greyed "
-#~ msgstr ""
-#~ "disable commands until you press Stop.  Commands can sometimes be greyed "
-
-#~ msgid ""
-#~ "out or disabled for other reasons - for example you can't run effects "
-#~ "until "
-#~ msgstr ""
-#~ "out or disabled for other reasons - for example you can't run effects "
-#~ "until "
-
-#~ msgid ""
-#~ "you have audio on the screen, and you obviously cannot paste audio until "
-#~ "you've "
-#~ msgstr ""
-#~ "you have audio on the screen, and you obviously cannot paste audio until "
-#~ "you've "
-
-#~ msgid "cut or copied it to Audacity's clipboard. "
-#~ msgstr "cut or copied it to Audacity's clipboard. "
-
-#~ msgid "Text about exporting still to be written..."
-#~ msgstr "Text about exporting still to be written..."
-
-#~ msgid ""
-#~ "<p>Audacity can currently import WAV, AIFF, AU, MP2/MP3 and OGG Vorbis "
-#~ msgstr ""
-#~ "<p>Audacity can currently import WAV, AIFF, AU, MP2/MP3 and OGG Vorbis "
-
-#~ msgid "files."
-#~ msgstr "files."
-
-#~ msgid "<p>Audacity <b>cannot</b> import or export files in "
-#~ msgstr "<p>Audacity <b>cannot</b> import or export files in "
-
-#~ msgid "<b>WMA, AAC, RealAudio, Shorten (SHN)</b>, "
-#~ msgstr "<b>WMA, AAC, RealAudio, Shorten (SHN)</b>, "
-
-#~ msgid "or most other proprietary formats, or any kind of Digital Rights "
-#~ msgstr "or most other proprietary formats, or any kind of Digital Rights "
-
-#~ msgid ""
-#~ "Management (DRM) protected file, including many purchased online such "
-#~ msgstr ""
-#~ "Management (DRM) protected file, including many purchased online such "
-
-#~ msgid ""
-#~ "as on iTunes or Napster. Because of licensing and patent restrictions, "
-#~ msgstr ""
-#~ "as on iTunes or Napster. Because of licensing and patent restrictions, "
-
-#~ msgid ""
-#~ "we are not allowed to add these formats to Audacity. Future versions of "
-#~ msgstr ""
-#~ "we are not allowed to add these formats to Audacity. Future versions of "
-
-#~ msgid ""
-#~ "Audacity might be able to support these formats using codecs installed "
-#~ msgstr ""
-#~ "Audacity might be able to support these formats using codecs installed "
-
-#~ msgid "in your operating system.</p> "
-#~ msgstr "in your operating system.</p> "
-
-#~ msgid ""
-#~ "<p>Some open formats are not yet supported by Audacity, including <b>Ogg "
-#~ "Speex</b> "
-#~ msgstr ""
-#~ "<p>Some open formats are not yet supported by Audacity, including <b>Ogg "
-#~ "Speex</b> "
-
-#~ msgid "and <b>FLAC</b>."
-#~ msgstr "and <b>FLAC</b>."
-
-#~ msgid "<p>More information is available on line "
-#~ msgstr "<p>More information is available on line "
-
-#~ msgid ""
-#~ "<a href=\"http://audacity.sourceforge.net/help/faq?s=files&i=wma-"
-#~ "proprietary\">here</a> "
-#~ msgstr ""
-#~ "<a href=\"http://audacity.sourceforge.net/help/faq?s=files&i=wma-"
-#~ "proprietary\">here</a> "
-
-#~ msgid "You can download the help files and then access them from "
-#~ msgstr "You can download the help files and then access them from "
-
-#~ msgid "the help online."
-#~ msgstr "the help online."
-
-#~ msgid "Amplitude"
-#~ msgstr "振幅"
-
-#~ msgid "Frequency / Hz"
-#~ msgstr "周波数 / Hz"
-
-#~ msgid "&Normalize on load"
-#~ msgstr "読み込む時に正規化 (&N)"
-
-#~ msgid "&Quit Audacity upon closing last window"
-#~ msgstr "最後のウィンドを閉じると Audacity を終了します (&Q)"
-
-#~ msgid "&Circular track keyboard navigation"
-#~ msgstr "キーボードによる循環的なトラックのナビゲーション (&C)"
diff --git a/locale/ka.po b/locale/ka.po
new file mode 100644
index 0000000..5522e9f
--- /dev/null
+++ b/locale/ka.po
@@ -0,0 +1,9417 @@
+# translation of AUDACITY.PO.po to
+# Audacity Strings for Translation.
+# Copyright (C) YEAR Audacity Development Team
+# This file is distributed under the same license as Audacity.
+# Audacity Team <audacity-translation at lists.sourceforge.net>, YEAR.
+#
+msgid ""
+msgstr "Project-Id-Version: AUDACITY.PO\n"
+"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-11-09 20:10+0000\n"
+"PO-Revision-Date: 2009-01-16 03:10-0000\n"
+"Last-Translator: g <g at g>\n"
+"Language-Team:  <en at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Bookmarks: -1,1872,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: AboutDialog.cpp:143
+#: AudacityApp.cpp:807
+#: Menus.cpp:955
+msgid "&About Audacity..."
+msgstr "Audacity-ის &შესახებ..."
+
+#: AboutDialog.cpp:157
+msgid "OK... Audacious!"
+msgstr "OK... Audacious!"
+
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Audacity მოხალისეთა ჯგუფის მიერ დაწერილი უფასო პროგრამაა <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a>, რომელიც მსოფლიოს მასშტაბითაა გავრცელებული <a href=\"http://sourceforge.net\">SourceForge.net</a>. Audacity მუშაობს 98 და მომდევნოზე, Mac OS X, Linux და სხვა Unix ოპერაციულ სისტემებზე. უფრო ძველი  Audacity ხელმისაწვდომია Mac OS 9."
+
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "ეს Beta პროგრამის ბეტა ვერსიაა. შეიძლება შეიცავდეს ხარვეზებსა და დაუმთავრებელ ფუნქციებს. ჩვენ თქვენს გამოხმაურებას ველით ხარვეზებისა და ფუნქციონალობის მოთხოვნით: <b>feedback at audacityteam.org</b>. დახმარებისათვის  მოინახულეთ <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "ეს პროგრამის სტაბილური, დასრულებული ვერსიაა, თუმცა, თუ რაიმე ხარვეზს იპოვით, გთხოვთ მოგვწეროთ:<b>feedback at audacityteam.org</b>. Audacity-ის გამოყენების ინსტრუქციისთვის,მოინახულეთ   <a href=\"http://audacityteam.org/forum/\">ფორუმი</a>."
+
+#. i18n-hint: The translation of "translator_credits" will appear
+#. in the credits in the About Audacity window.  Use this to add
+#. your own name(s) to the credits.
+#.
+#. For example:  "English translation by Dominic Mazzoni."
+#.
+#: AboutDialog.cpp:192
+#: AboutDialog.cpp:194
+msgid "translator_credits"
+msgstr "მთარგმნელის_შესახებ"
+
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr "უფასო აუდიო რედაქტორი<br>"
+
+#: AboutDialog.cpp:211
+msgid "Credits"
+msgstr "კრედიტები"
+
+#: AboutDialog.cpp:215
+#, c-format
+msgid "Audacity %s Development Team"
+msgstr "Audacity %s დეველოპერთა ჯგუფი"
+
+#: AboutDialog.cpp:220
+#, c-format
+msgid "Audacity %s Support Team"
+msgstr "Audacity %s მხარდაჭერის გუნდი"
+
+#: AboutDialog.cpp:225
+msgid "Emeritus Developers"
+msgstr "გამორჩეული დეველოპერები"
+
+#: AboutDialog.cpp:230
+msgid "Other Emeritus Team Members"
+msgstr "ჯგუფის სხვა გამორჩეული წევრები"
+
+#: AboutDialog.cpp:235
+msgid "Other Contributors"
+msgstr "სხვა კონტრიბუტორები"
+
+#: AboutDialog.cpp:240
+msgid "Audacity is based on code from the following projects:"
+msgstr "Audacity დაფუძნებულია კოდზე შემდეგი პროექტებიდან:"
+
+#: AboutDialog.cpp:245
+msgid "Special thanks:"
+msgstr "განსაკუთრებული მადლობა:"
+
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr "<b>Audacity&reg;</b> პროგრამა copyright &copy; 1999-2008 Audacity ჯგუფი. <br>The name <b>Audacity&reg;</b>  Dominic Mazzoni-ის რეგისტრირებული სავაჭრო ნიშანი."
+
+#: AboutDialog.cpp:258
+msgid "Audacity"
+msgstr "Audacity"
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
+msgid "Build Information"
+msgstr "აგების ინფორმაცია"
+
+#: AboutDialog.cpp:310
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "გააქტიურებულია"
+
+#: AboutDialog.cpp:311
+msgid "Disabled"
+msgstr "გამორთულია"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr "ფაილსი ფორმატის მხარდაჭერა"
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr "MP3 იმპორტირება"
+
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr "Ogg Vorbis იმპორტი და ექსპორტი"
+
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr "ID3 ჭდეების მხარდაჭერა"
+
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr "FLAC  იმპორტი და ექსპორტი"
+
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr "MP2  ექსპორტი"
+
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr "იმპორტი QuickTime-ით"
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr "ძირითადი ბიბლიოთეკები"
+
+#: AboutDialog.cpp:389
+#: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr "სანიმუშე კოეფიციენტის კონვერსია"
+
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr "აუდიოს დაკვრა და ჩაწერა"
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr "ფუნქციები"
+
+#: AboutDialog.cpp:422
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:430
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:438
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr "მოდულის მხარდაჭერა"
+
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr "ხმის ბარათის მიქსერის მხარდაჭერა"
+
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr "Pitch და Tempo შეცვლის მხარდაჭერა"
+
+#: AboutDialog.cpp:477
+msgid "Program build date: "
+msgstr "პროგრამის აგების თარიღი:"
+
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
+msgid "Build type:"
+msgstr "აგების ტიპი:"
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr "ხარვეზების მოცილების აგება"
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr "გამოცემის აგება"
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr "ინსტალაციის პრეფიქსი:"
+
+#: AboutDialog.cpp:491
+msgid "Settings folder: "
+msgstr "პარამეტრების საქაღალდე:"
+
+#: AboutDialog.cpp:506
+msgid "GPL License"
+msgstr "GPL ლიცენზია:"
+
+#: AudacityApp.cpp:507
+#: Project.cpp:1844
+#, c-format
+msgid "%s is already open in another window."
+msgstr "%s უკვე გახსნილია სხვა ფანჯარაში."
+
+#: AudacityApp.cpp:509
+#: Project.cpp:1846
+#: Project.cpp:1951
+#: Project.cpp:2095
+#: Project.cpp:2232
+msgid "Error opening project"
+msgstr "პროექტის გახსნის შეცდომა"
+
+#: AudacityApp.cpp:541
+#, c-format
+msgid "%s does not exist and could not be opened.\n"
+"\n"
+"It has been removed from the history list."
+msgstr "%s არ არსებობს და მისი გახსნა შეუძლებელია.\n"
+"\n"
+"წაშლილია ისტორიის ნუსხიდან."
+
+#: AudacityApp.cpp:643
+msgid "Master Gain Control"
+msgstr "Master Gain კონტროლი"
+
+#: AudacityApp.cpp:644
+msgid "Input Meter"
+msgstr "შენატანის მთვლელი"
+
+#: AudacityApp.cpp:645
+msgid "Output Meter"
+msgstr "გამონატანის მთვლელი"
+
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
+#: AudacityApp.cpp:809
+msgid "&Preferences...\tCtrl+,"
+msgstr "&პარამეტრები...\tCtrl+,"
+
+#: AudacityApp.cpp:901
+#: AudacityApp.cpp:978
+#, c-format
+msgid "Using block size of %ld\n"
+msgstr "%ld-ის ბლოკის ზომის გამოყენება\n"
+
+#: AudacityApp.cpp:923
+#: AudacityApp.cpp:993
+#, c-format
+msgid "Unknown command line option: %s\n"
+msgstr "ბრძანების სტრიქონის უცნობი პარამეტრი: %s\n"
+
+#: AudacityApp.cpp:1127
+msgid "Audacity could not find a place to store temporary files.\n"
+"Please enter an appropriate directory in the preferences dialog."
+msgstr "Audacity ვერ პოულობს დროებითი ფაილების შესანახ ადგილს.\n"
+"გთხოვთ, შეიყვანოთ შესაბამისი დირექტორია პარამეტრების დიალოგურ სარკმელში."
+
+#: AudacityApp.cpp:1133
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity  ახლა დაიხურება. გთხოვთ, გაუშვათ თავიდან ახალი დროებითი დირექტორიის გამოსაყენებლად."
+
+#: AudacityApp.cpp:1165
+msgid "Running two copies of Audacity simultaneously may cause\n"
+"data loss or cause your system to crash.\n"
+"\n"
+msgstr "Audacity-ის ერთდროულად ორი ასლის გაშვებამ შეიძლება გამოიწვიოს\n"
+"მონაცემების დაკარგვა ან სისტემური მარცხი.\n"
+"\n"
+
+#: AudacityApp.cpp:1172
+msgid "Audacity was not able to lock the temporary files directory.\n"
+"This folder may be in use by another copy of Audacity.\n"
+msgstr "Audacity-მა ვერ შეძლო დროებითი ფაილების დირექტორიის ჩაკეტვა.\n"
+"ეს საქაღალდე შეიძლება Audacity-ის სხვა ასლის მიერ გამოიყენება.\n"
+
+#: AudacityApp.cpp:1174
+msgid "Do you still want to start Audacity?"
+msgstr "კვლავ გსურთ  Audacity-ის დაწყება?"
+
+#: AudacityApp.cpp:1176
+msgid "Error locking temporary folder"
+msgstr "დროებითი საქაღალდის ჩაკეტვის შეცდომა"
+
+#: AudacityApp.cpp:1214
+msgid "The system has detected that another copy of Audacity is running.\n"
+msgstr "სისტემამ დაადგინა, რომ გაშვებულია Audacity -ის ასლი.\n"
+
+#: AudacityApp.cpp:1216
+msgid "Use the New or Open commands in the currently running Audacity\n"
+"process to open multiple projects simultaneously.\n"
+msgstr "გამოიყენეთ ახალი ან გახსნა ბრძანებები მიმდინარე Audacity-ში\n"
+"პროცესში მრავალჯერადი პროექტების თანადროული გახსნისთვის.\n"
+
+#: AudacityApp.cpp:1217
+msgid "Audacity is already running"
+msgstr "Audacity კვლავ გაშვებულია"
+
+#: AudacityApp.cpp:1234
+msgid "Command-line options supported:"
+msgstr "ბრძანების სტრიქონის მხარდაჭერილი პარამეტრები:"
+
+#. i18n-hint: '-help' is the option and needs to stay in
+#. * English. This displays a list of available options
+#: AudacityApp.cpp:1237
+msgid "\t-help (this message)"
+msgstr "\t-დახმარება (ეს შეტყობინება)"
+
+#. i18n-hint '-version' needs to stay in English.
+#: AudacityApp.cpp:1239
+msgid "\t-version (display Audacity version)"
+msgstr "\t-ვერსია (Audacity ვერსიის ჩვენება)"
+
+#. i18n-hint '-test' is the option and needs to stay in
+#. * English. This runs a set of automatic tests on audacity
+#. * itself
+#: AudacityApp.cpp:1243
+msgid "\t-test (run self diagnostics)"
+msgstr "\t-ტესტი (დიაგნოსტიკის გაშვება)"
+
+#. i18n-hint '-blocksize' is the option and needs to stay in
+#. * English. 'nnn' is any integer number. This controls the
+#. * size pieces that audacity uses when writing files to the
+#. * disk
+#: AudacityApp.cpp:1248
+msgid "\t-blocksize nnn (set max disk block size in bytes)"
+msgstr "\t-ბლოკის ზომა nnn (დისკის ბლოკის მაქსიმალური ზომის მომართვა ბაიტებში)"
+
+#: AudacityApp.cpp:1249
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "ასევე, გთხოვთ, გახსნისთვის მიუთითოთ აუდიო ფაილის ან Audacity პროექტის სახელი."
+
+#: AudacityApp.cpp:1529
+msgid "Audacity project (.AUP) files are not currently \n"
+"associated with Audacity. \n"
+"\n"
+"Associate them, so they open on double-click?"
+msgstr "Audacity პროექტის (.AUP) ამჟამად არაა დაკავშირებული \n"
+"Audacity-ისთან. \n"
+"\n"
+"დავაკავშირო ფაილები, რომ ორმაგი წკაპით გაიხსნას?"
+
+#: AudacityApp.cpp:1530
+msgid "Audacity Project Files"
+msgstr "Audacity პროექტის ფაილები"
+
+#: AudioIO.cpp:254
+msgid "Could not find any audio devices.\n"
+msgstr "აუდიო-მოწყობილობა ვერ მოიძებნა.\n"
+
+#: AudioIO.cpp:255
+msgid "You will not be able to play or record audio.\n"
+"\n"
+msgstr "ვერ შეძლებთ აუდიოს დაკვრას ან ჩაწერას.\n"
+"\n"
+
+#: AudioIO.cpp:258
+msgid "Error: "
+msgstr "შეცდომა: "
+
+#: AudioIO.cpp:261
+msgid "Error Initializing Audio"
+msgstr "აუდიოს დაწყების შეცდომა"
+
+#: AudioIO.cpp:1375
+msgid "Latency problem"
+msgstr "ლატენტურობის პრობლემა"
+
+#: AudioIO.cpp:1375
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+
+#: AutoRecovery.cpp:54
+msgid "Automatic Crash Recovery"
+msgstr "ავტომატური აღდგენა მარცხის მერე"
+
+#: AutoRecovery.cpp:73
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
+"Fortunately, the following projects can automatically be recovered:"
+msgstr "ზოგიერთი პროექტი არ შეინახა სწორად, როდესაც Audacity იყო გაშვებული ბოლოს.\n"
+"საბედნიეროდ, შემდეგი პროექტების ავტომატური აღდგენა შესაძლებელია:"
+
+#: AutoRecovery.cpp:75
+msgid "Recoverable projects"
+msgstr "აღდგენადი პროექტები"
+
+#: AutoRecovery.cpp:78
+#: Tags.cpp:2041
+msgid "Name"
+msgstr "სახელი"
+
+#: AutoRecovery.cpp:84
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "პროექტის აღდენა არ შეცვლის ფაილებს დისკებს სანამ შეინახავთ."
+
+#: AutoRecovery.cpp:88
+msgid "Quit Audacity"
+msgstr "Audacity-ის დახურვა"
+
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr "არა აღადგინო"
+
+#: AutoRecovery.cpp:90
+msgid "Recover Projects"
+msgstr "პროექტების აღდგენა"
+
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr "დარწმუნებული ხართ, რომ არ გსურთ პროექტების აღდგენა?\n"
+"მათი მოგვიანებით აღდგენა შეუძლებელია"
+
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr "დავადასტურო?"
+
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
+msgid "Could not enumerate files in auto save directory"
+msgstr "შეუძლებელია ფაილების დათვლა ავტო შენახვის დირექტორიაში"
+
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:3053
+#: Menus.cpp:3065
+#: Menus.cpp:5182
+#: Project.cpp:2054
+#: Project.cpp:3615
+#: Project.cpp:3694
+#: TrackPanel.cpp:6385
+#: WaveTrack.cpp:598
+#: WaveTrack.cpp:617
+#: WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077
+#: WaveTrack.cpp:2087
+#: effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
+msgid "Error"
+msgstr "შეცდომა"
+
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
+msgid "Select Command"
+msgstr "ბრძანების არჩევა"
+
+#: BatchCommandDialog.cpp:82
+#: BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
+msgid "&Command"
+msgstr "&ბრძანება"
+
+#: BatchCommandDialog.cpp:84
+msgid "&Edit Parameters"
+msgstr "&პარამეტრების რედაქტირება"
+
+#: BatchCommandDialog.cpp:91
+#: BatchProcessDialog.cpp:455
+msgid "&Parameters"
+msgstr "&პარამეტრები"
+
+#: BatchCommandDialog.cpp:96
+msgid "C&hoose command"
+msgstr "ბრძანების ა&მორჩევა"
+
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
+msgstr "Stereo-დან  Mono-ზე ეფექტი ვერ მოიძებნა"
+
+#: BatchCommands.cpp:476
+msgid "Ogg Vorbis support is not included in this build of Audacity"
+msgstr "Ogg Vorbis  მხარდაჭერა არ დაერთვის თან Audacity-ის ამ ვერსიას"
+
+#: BatchCommands.cpp:488
+msgid "FLAC support is not included in this build of Audacity"
+msgstr "FLAC მხარდაჭერა არ დაერთვის თან Audacity-ის ამ ვერსიას"
+
+#: BatchCommands.cpp:492
+#, c-format
+msgid "Command %s not implemented yet"
+msgstr "ბრძანება %s ჯერ არ შესრულებულა"
+
+#: BatchCommands.cpp:508
+#, c-format
+msgid "Could not set parameters of effect %s\n"
+" to %s."
+msgstr "შეუძლებელია პარამეტრების მომართვა %s ეფექტიდან\n"
+" %s-ზე."
+
+#: BatchCommands.cpp:561
+#, c-format
+msgid "Your batch command of %s was not recognised."
+msgstr "ჯგუფური დამუშავების თქვენი %s ბრძანება ვერ ამოიცნო."
+
+#: BatchCommands.cpp:652
+#, c-format
+msgid "Apply %s with parameter(s)\n"
+"\n"
+"%s"
+msgstr "%s-ის გააქტიურება შემდეგი პარამეტრ(ებ)ით\n"
+"\n"
+"%s"
+
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
+msgid "Test Mode"
+msgstr "ტესტირების რეჟიმი"
+
+#: BatchCommands.cpp:657
+#, c-format
+msgid "Apply %s"
+msgstr "%s-ის გააქტიურება"
+
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
+msgid "Apply Chain"
+msgstr "ჯაჭვის გააქტიურება"
+
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "CleanSpeech ჯგუფური დამუშავება"
+
+#: BatchProcessDialog.cpp:94
+msgid "&Select chain"
+msgstr "ჯაჭვის &ამორჩევა"
+
+#: BatchProcessDialog.cpp:99
+msgid "Chain"
+msgstr "ჯაჭვი"
+
+#: BatchProcessDialog.cpp:106
+msgid "Apply to Current &Project"
+msgstr "მიმდინარე &პროექტის გააქტიურება"
+
+#: BatchProcessDialog.cpp:107
+msgid "Apply to &Files..."
+msgstr "&ფაილებზე გააქტიურება"
+
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2080
+#: Tags.cpp:2084
+#: Tags.cpp:2384
+#: Tags.cpp:2388
+#: UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732
+#: effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
+msgid "&Cancel"
+msgstr "&გაუქმება"
+
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
+msgid "No chain selected"
+msgstr "ჯაჭვი არაა მონიშნული"
+
+#: BatchProcessDialog.cpp:159
+#, c-format
+msgid "Applying '%s' to current project"
+msgstr "'%s'-ის მიმდინარე პროექტზე გააქტიურება"
+
+#: BatchProcessDialog.cpp:200
+msgid "Please save and close the current project first."
+msgstr "გთხოვთ, ჯერ  შეინახოთ და დახუროთ მიმდინარე პროექტი"
+
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "მონიშნეთ ხმოვანი ფაილ(ებ) ჯგუფური CleanSpeech ჯაჭვისთვის..."
+
+#: BatchProcessDialog.cpp:207
+msgid "Select file(s) for batch processing..."
+msgstr "ფაილ(ებ)ის მონიშვნა დასამუშავებლად..."
+
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr "ხმის ფაილები  (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "ყველა ფაილი  (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:231
+msgid "Applying..."
+msgstr "გააქტიურება..."
+
+#: BatchProcessDialog.cpp:241
+msgid "File"
+msgstr "ფაილი"
+
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
+msgid "Edit Chains"
+msgstr "ჯაჭვების რედაქტირება"
+
+#: BatchProcessDialog.cpp:416
+msgid "&Chains"
+msgstr "&ჯაჭვები"
+
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:826
+#: Tags.cpp:1465
+#: Tags.cpp:2064
+msgid "&Add"
+msgstr "&დამატება"
+
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:128
+#: Tags.cpp:827
+#: Tags.cpp:1466
+#: Tags.cpp:2065
+#: TrackPanel.cpp:4176
+msgid "&Remove"
+msgstr "&წაშლა"
+
+#: BatchProcessDialog.cpp:437
+msgid "Re&name"
+msgstr "სახელის &შეცვლა"
+
+#: BatchProcessDialog.cpp:443
+msgid "C&hain (Double-Click or press SPACE to edit)"
+msgstr "ჯაჭვი (ორჯერ დაუწკაპუნეთ ან დააჭირეთ შორისს რედაქტირებისთის)"
+
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
+msgid "No"
+msgstr "არა"
+
+#: BatchProcessDialog.cpp:459
+msgid "&Insert"
+msgstr "&ჩასმა"
+
+#: BatchProcessDialog.cpp:460
+msgid "De&lete"
+msgstr "წა&შლა"
+
+#: BatchProcessDialog.cpp:461
+msgid "Move &Up"
+msgstr "აწევა"
+
+#: BatchProcessDialog.cpp:462
+msgid "Move &Down"
+msgstr "ჩამოწევა"
+
+#: BatchProcessDialog.cpp:463
+msgid "De&faults"
+msgstr "ნაგულისხმევი"
+
+#: BatchProcessDialog.cpp:507
+msgid "- END -"
+msgstr "- END -"
+
+#: BatchProcessDialog.cpp:540
+#, c-format
+msgid "%s changed"
+msgstr "%s შეცვლილია"
+
+#: BatchProcessDialog.cpp:541
+msgid "Do you want to save the changes?"
+msgstr "გსურთ ცვლილებების შენახვა?"
+
+#: BatchProcessDialog.cpp:623
+msgid "Enter name of new chain"
+msgstr "ახალი ჯაჭვის სახელის შეტანა"
+
+#: BatchProcessDialog.cpp:634
+msgid "Name must not be blank"
+msgstr "სახელი არ უნდა იყოს ცარიელი"
+
+#: BatchProcessDialog.cpp:643
+#, c-format
+msgid "Names may not contain '%c' and '%c'"
+msgstr "სახელები უნდა შეიცავდეს '%c' და %c'"
+
+#: BatchProcessDialog.cpp:673
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "დარწმუნებული ხართ, რომ გსურთ %s-ის წაშლა?"
+
+#: Dependencies.cpp:139
+msgid "Removing Dependencies"
+msgstr "დამოკიდებულთა წაშლა"
+
+#: Dependencies.cpp:140
+msgid "Copying audio data into project..."
+msgstr "აუდიო მონაცემების პროექტის კოპირება..."
+
+#: Dependencies.cpp:223
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
+"This will need more disc space but is safer."
+msgstr "თქვენი პროექტი ამჟამად დამოკიდებულია სხვა ფაილებზე.\n"
+"გადმოვაკოპიროთ პროექტში აუდიო შემდეგ ფაილებიდან რათა თვითკმარი გახდეს?\n"
+"ეს მეტ სივრცეს მოითხოვს, მაგრამ უფრო უსაფრთხოა."
+
+#: Dependencies.cpp:270
+msgid "Project depends on other audio files"
+msgstr "პროექტი სხვა აუდიო ფაილებზეა დამოკიდებული"
+
+#: Dependencies.cpp:291
+msgid "Project Dependencies"
+msgstr "პროექტის დამოკიდებულებანი"
+
+#: Dependencies.cpp:294
+msgid "Audio file"
+msgstr "აუდიო ფაილი"
+
+#: Dependencies.cpp:296
+msgid "Disk space"
+msgstr "დისკის ზომა"
+
+#: Dependencies.cpp:301
+msgid "Copy Selected Audio Into Project"
+msgstr "მონიშნული აუდიოდან  კოპირება პროექტში"
+
+#: Dependencies.cpp:308
+#: Dependencies.cpp:414
+msgid "Cancel Save"
+msgstr "შენახვის გაუქმება"
+
+#: Dependencies.cpp:310
+msgid "Do Not Copy Any Audio"
+msgstr "არ დააკოპიროთ არცერთი აუდიო"
+
+#: Dependencies.cpp:312
+msgid "Copy All Audio into Project (Safer)"
+msgstr "ყველა აუდიო ფაილის პროექტში კოპირება (Safer)"
+
+#: Dependencies.cpp:321
+#: Dependencies.cpp:326
+msgid "Ask me"
+msgstr "მკითხე"
+
+#: Dependencies.cpp:322
+msgid "Always copy all audio (safest)"
+msgstr "ყოველთვის დააკოპირე ყველა აუდიო (ყველაზე უსაფრთხო)"
+
+#: Dependencies.cpp:323
+msgid "Never copy any audio"
+msgstr "არასდროს დააკოპირო აუდიო"
+
+#: Dependencies.cpp:325
+msgid "Whenever a project depends on other files:"
+msgstr "როდესაც პროექტი დამოკიდებულია სხვა ფაილებზე:"
+
+#: Dependencies.cpp:413
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "თუ გააგრძელებთ, თქვენი პროექტი არ შეინახება დისკზე. ასე გსურთ?"
+
+#: Dependencies.cpp:453
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "თქვენი პროექტი თვითტევადია; ეს არაა დამოკიდებული არცერთ გარე აუდიო ფაილზე."
+
+#: Dependencies.cpp:454
+msgid "Dependency check"
+msgstr "დამოკიდებულების შემოწმება"
+
+#: DirManager.cpp:137
+msgid "Warning: there is very little free disk space left on this volume.\n"
+"Please select another temporary directory in your preferences."
+msgstr "გაფრთხილება: ძალიან მცირე სივრცეა დარჩენილი ამ ნაწილზე.\n"
+"გთხოვთ მონიშნოთ სხვა დროებითი დირექტორია თქვენს პარამეტრებში."
+
+#: DirManager.cpp:223
+#: DirManager.cpp:254
+#: DirManager.cpp:337
+msgid "Progress"
+msgstr "მიმდინარეობა"
+
+#: DirManager.cpp:288
+msgid "Cleaning up temporary files"
+msgstr "დროებითი ფაილების გაწმენდა"
+
+#: DirManager.cpp:338
+msgid "Saving project data files"
+msgstr "პროექტის მონაცემთა ფაილების შენახვა "
+
+#: DirManager.cpp:410
+msgid "Cleaning up cache directories"
+msgstr "ქეშის დირექტორიების გაწმენდა"
+
+#: DirManager.cpp:505
+#, c-format
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+
+#. i18n-hint: This is the pattern for filenames that are created
+#. when a file needs to be backed up to a different name.  For
+#. example, mysong would become mysong-old1, mysong-old2, etc.
+#: DirManager.cpp:1094
+#, c-format
+msgid "%s-old%d"
+msgstr "%s-old%d"
+
+#: DirManager.cpp:1102
+msgid "Unable to open/create test file"
+msgstr "შეუძლებელია ტესტის ფაილის გახსნა/შექმნა"
+
+#: DirManager.cpp:1111
+#, c-format
+msgid "Unable to remove '%s'"
+msgstr "შეუძლებელია '%s'-ის წაშლა"
+
+#: DirManager.cpp:1116
+#, c-format
+msgid "Renamed file: %s\n"
+msgstr "სახელშეცვლილი ფაილი: %s\n"
+
+#: DirManager.cpp:1160
+#, c-format
+msgid "Unable to rename '%s' to '%s'"
+msgstr "შეუძლებელია '%s'-ის სახელის გადარქმევა  '%s'-ად"
+
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
+msgid "Inspecting project file data..."
+msgstr "ფაილების მონაცემების გამოკვლევა.."
+
+#: DirManager.cpp:1240
+#, c-format
+msgid "Orphaned blockfile: (%s)"
+msgstr "დაცალკევებული ბლოკის ფაილი: (%s)"
+
+#: DirManager.cpp:1265
+#, c-format
+msgid "Missing alias file: (%s)"
+msgstr "მეტსახელის ფაილი აკლია: (%s)"
+
+#: DirManager.cpp:1285
+#, c-format
+msgid "Missing summary file: (%s.auf)"
+msgstr "რეზიუმეს ფაილი აკლია: (%s.auf)"
+
+#: DirManager.cpp:1305
+#, c-format
+msgid "Missing data file: (%s.au)"
+msgstr "მონაცემების ფაილი აკლია: (%s.au)"
+
+#: DirManager.cpp:1319
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "პროექტის შემოწმებისას აღმოჩენილია არამდგრადობანი ჩატვირთული პროექტის მონაცემებში;\n"
+"დაუწკაპუნეთ 'დეტალებს' შეცდომათა სრული სიისთვის ან   'დიახ' -ს დამატებითი პარამეტრებზე გადასვლისთვის."
+
+#: DirManager.cpp:1331
+#, c-format
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
+"unused and probably left over from a crash or some other bug.\n"
+"They should be deleted to avoid disk contention."
+msgstr "Project check found %d orphaned blockfile[s]. These files are\n"
+"unused and probably left over from a crash or some other bug.\n"
+"They should be deleted to avoid disk contention."
+
+#: DirManager.cpp:1336
+msgid "Delete orphaned files [safe and recommended]"
+msgstr "Delete orphaned files [safe and recommended]"
+
+#: DirManager.cpp:1337
+msgid "Continue without deleting; silently work around the extra files"
+msgstr "წაშლის გარეშე გაგრძელება; დამატებით ფაილებთან ჩუმად მუშაობა"
+
+#: DirManager.cpp:1338
+msgid "Close project immediately with no changes"
+msgstr "პროექტის მყისიერი დახურვა ცვლილებების გარეშე"
+
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
+#: widgets/Warning.cpp:55
+msgid "Warning"
+msgstr "გაფრთხილება"
+
+#: DirManager.cpp:1366
+#, c-format
+msgid "Project check detected %d input file[s] being used in place\n"
+"('alias files') are now missing.  There is no way for Audacity\n"
+"to recover these files automatically; you may choose to\n"
+"permanently fill in silence for the missing files, temporarily\n"
+"fill in silence for this session only, or close the project now\n"
+"and try to restore the missing files by hand."
+msgstr "პროექტის შემოწმებისას აღმოჩენილია, რომ %d შენატანი ფაილ[ებ]ი, რომელიც გამოიყენება ადგილზე\n"
+"('მეტსახელის ფაილები') ახლა აკლია. Audacity-ის არ შეუძლია დაკარგული მონაცემების\n"
+"ავტომატური აღდგენა, შეიძლება ნაკლული მონაცემების სიჩუმის მუდმივი შევსება,\n"
+"მხოლოდ ამ სესიისთვის დროებითი შევსება\n"
+"ან პროექტის დახურვა ახლა და შემდეგ აღდგენის მცდელობა\n"
+"ხელით."
+
+#: DirManager.cpp:1371
+msgid "Replace missing data with silence [permanent upon save]"
+msgstr "ნაკლული მონაცემების სიჩუმით ჩანაცვლება [შენახვისას მუდმივია]"
+
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
+msgid "Temporarily replace missing data with silence [this session only]"
+msgstr "ნაკლული მონაცემების სიჩუმით დროებითი ჩანაცვლება [მხოლოდ ეს სესია]"
+
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
+msgid "Close project immediately with no further changes"
+msgstr "პროექტის მყისიერი დახურვა შემდგომი ცვლილებების გარეშე"
+
+#: DirManager.cpp:1412
+#, c-format
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
+"Audacity can fully regenerate these summary files from the\n"
+"original audio data in the project."
+msgstr "პროექტის შემოწმებისას აღმოჩენილია %d ნაკლული რეზიუმეს ფაილ[ებ]ი (.auf).\n"
+"Audacity-ის შეუძლია ამ რეზიუმეს ფაილების რეგენერაცია\n"
+"ორიგინალური აუდიო მონაცემებიდან პროექტში,."
+
+#: DirManager.cpp:1417
+msgid "Regenerate summary files [safe and recommended]"
+msgstr "რეზიუმეს ფაილების რეგენერაცია [უსაფრთხო და რეკომენდებული]"
+
+#: DirManager.cpp:1418
+msgid "Fill in silence for missing display data [this session only]"
+msgstr "სიჩუმის ამოვსება  ნაკლული მონაცემებისთვის [მხოლოდ ეს სესია]"
+
+#: DirManager.cpp:1454
+#, c-format
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
+"probably due to a bug, system crash or accidental deletion.\n"
+"There is no way for Audacity to recover this lost data\n"
+"automatically; you may choose to permanently fill in silence\n"
+"for the missing data, temporarily fill in silence for this\n"
+"session only, or close the project now and try to restore the\n"
+"missing data by hand."
+msgstr "პროექტის შემოწმებისას აღმოჩენილია %d ნაკლული აუდიო მონაცემთა ბლოკფაილები[ებ]ი(.au), \n"
+"სავარაუდოდ სისტემური ხარვეზის, მარცხის ან შემთხვევითი წაშლის გამო.\n"
+"Audacity-ის არ შეუძლია დაკარგული მონაცემების\n"
+"ავტომატური აღდგენა, შეიძლება ნაკლული მონაცემების სიჩუმის მუდმივი შევსება,\n"
+"მხოლოდ ამ სესიისთვის დროებითი შევსება\n"
+"ან პროექტის დახურვა ახლა და შემდეგ აღდგენის მცდელობა\n"
+"ხელით."
+
+#: DirManager.cpp:1459
+msgid "Replace missing data with silence [permanent immediately]"
+msgstr "ნაკლული მონაცემების ჩანაცვლება სიჩუმით [მყისიერი მუდმივი]"
+
+#: DirManager.cpp:1487
+msgid "Cleaning up unused directories in project data..."
+msgstr "გამოუყენებელი დირექტორიების გაწმენდა პროექტის მონაცემებში.."
+
+#: DirManager.cpp:1558
+msgid "Caching audio"
+msgstr "აუდიოს ქეშირება"
+
+#: DirManager.cpp:1559
+msgid "Caching audio into memory..."
+msgstr "აუდიოს ქეშირება მეხსიერებაში..."
+
+#: DirManager.cpp:1592
+msgid "Saving recorded audio"
+msgstr "ჩაწერილი აუდიოს შენახვა"
+
+#: DirManager.cpp:1593
+msgid "Saving recorded audio to disk..."
+msgstr "ჩაწერილი აუდიოს შენახვა დისკზე"
+
+#: FFT.cpp:389
+msgid "Rectangular"
+msgstr "მართკუთხედი"
+
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "FFmpeg ბიბლიოთეკა ვერ მოიძებნა"
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr "FFmpeg მდებარეობის დადგენა"
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Audacity-ის სჭირდება ფაილი %s აუდიოს იმპორტისა და ექსპორტისთვის FFmpeg-ის საშუალებით."
+
+#: FFmpeg.cpp:196
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "%s'-ის მდებარეობა:"
+
+#: FFmpeg.cpp:205
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "%s'-ის მოსაძებნად აქ დაუწკაპუნეთ -->"
+
+#: FFmpeg.cpp:211
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "ამორჩევა..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "FFmpeg-ის უფასო ასლის მისაღებად აქ დააწკაპუნეთ -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "სად არის %s'?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "FFmpeg ვერ მოიძებნა"
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "მხოლოდ avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:103
+msgid "Frequency Analysis"
+msgstr "სიხშირის ანალიზი"
+
+#: FreqWindow.cpp:139
+#: TrackPanel.cpp:556
+#: prefs/GUIPrefs.cpp:156
+msgid "Spectrum"
+msgstr "სპექტრი"
+
+#: FreqWindow.cpp:140
+msgid "Standard Autocorrelation"
+msgstr "სტანდარტული ავტოკორექცია"
+
+#: FreqWindow.cpp:141
+msgid "Cuberoot Autocorrelation"
+msgstr "Cuberoot ავტოკორექცია"
+
+#: FreqWindow.cpp:142
+msgid "Enhanced Autocorrelation"
+msgstr "გაუმჯობესებული ავტოკორექცია"
+
+#. i18n-hint: This is a technical term, derived from the word
+#. "spectrum".  Do not translate it unless you are sure you
+#. know the correct technical word in your language.
+#: FreqWindow.cpp:146
+msgid "Cepstrum"
+msgstr "Cepstrum"
+
+#: FreqWindow.cpp:150
+#: FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "ალგორითმი"
+
+#: FreqWindow.cpp:169
+#: FreqWindow.cpp:173
+#: HistoryWindow.cpp:79
+msgid "Size"
+msgstr "ზომა"
+
+#. i18n-hint: This refers to a "window function", used in the
+#. Frequency analyze dialog box.
+#: FreqWindow.cpp:183
+msgid " window"
+msgstr "ფანჯარა"
+
+#: FreqWindow.cpp:187
+#: FreqWindow.cpp:191
+msgid "Function"
+msgstr "ფუნქცია"
+
+#: FreqWindow.cpp:196
+msgid "Linear frequency"
+msgstr "ლინეარული სიხშირე"
+
+#: FreqWindow.cpp:197
+msgid "Log frequency"
+msgstr "ჩანაწერის სიხშირე"
+
+#: FreqWindow.cpp:201
+#: FreqWindow.cpp:205
+msgid "Axis"
+msgstr "ღერძი"
+
+#: FreqWindow.cpp:212
+#: LabelDialog.cpp:130
+#: Menus.cpp:241
+#: Menus.cpp:276
+msgid "&Export..."
+msgstr "&ექსპორტი..."
+
+#: FreqWindow.cpp:213
+#: export/ExportCL.cpp:325
+#: export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "ექსპორტი"
+
+#: FreqWindow.cpp:216
+#: FreqWindow.cpp:217
+#: widgets/ErrorDialog.cpp:161
+msgid "Close"
+msgstr "დახურვა"
+
+#: FreqWindow.cpp:280
+#: FreqWindow.cpp:410
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:792
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1123
+#: effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133
+#: effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408
+#: effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367
+#: widgets/Meter.cpp:417
+msgid "dB"
+msgstr "dB"
+
+#. i18n-hint: This is the abbreviation for "Hertz", or
+#. cycles per second.
+#: FreqWindow.cpp:295
+#: FreqWindow.cpp:450
+#: effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195
+#: import/ImportRaw.cpp:399
+msgid "Hz"
+msgstr "Hz"
+
+#: FreqWindow.cpp:394
+msgid "Not enough data selected."
+msgstr "არ არის საკმარისი მონაცემები მონიშნული."
+
+#: FreqWindow.cpp:458
+#: effects/AutoDuck.cpp:794
+msgid "s"
+msgstr "s"
+
+#: FreqWindow.cpp:787
+#, c-format
+msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
+msgstr "კურსორი: %d Hz (%s) = %d dB   პიკი: %d Hz (%s) = %.1f dB"
+
+#: FreqWindow.cpp:796
+#, c-format
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "კურსორი: %.4f წ (%d Hz) (%s) = %f,   პიკი: %.4f წ (%d Hz) (%s) = %.3f"
+
+#: FreqWindow.cpp:1069
+msgid "spectrum.txt"
+msgstr "spectrum.txt"
+
+#: FreqWindow.cpp:1071
+msgid "Export Spectral Data As:"
+msgstr "სპექტრული მონაცემების ექსპორტი როგორც:"
+
+#: FreqWindow.cpp:1087
+#: LabelDialog.cpp:603
+#: Menus.cpp:2555
+#: Project.cpp:2604
+#: Project.cpp:3667
+#: prefs/KeyConfigPrefs.cpp:182
+msgid "Couldn't write to file: "
+msgstr "შეუძლებელია ფაილზე ჩაწერა:"
+
+#: FreqWindow.cpp:1092
+msgid "Frequency (Hz)\tLevel (dB)"
+msgstr "სიხშირის  (Hz)\tდონე(dB)"
+
+#: FreqWindow.cpp:1098
+msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
+msgstr "Lag (seconds)\tFrequency (Hz)\tLevel"
+
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
+msgstr "To [[welcome|Welcome screen]]"
+
+#: HelpText.cpp:92
+msgid "Welcome!"
+msgstr "მოგესალმებით!"
+
+#: HelpText.cpp:97
+msgid "Playing Audio"
+msgstr "აუდიოს დაკვრა"
+
+#: HelpText.cpp:101
+msgid "Recording Audio"
+msgstr "აუდიოს ჩაწერა"
+
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
+msgstr "ჩაწერა - შენატანი მოწყობილობის არჩევა"
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr "ჩაწერა - შენატანი წყაროს არჩევა"
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr "ჩაწერა - შენატანი დონის მომართვა"
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr "რედაქტირება და მონიშნული მენიუები"
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr "აუდიო ფაილის ექსპორტი"
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr "Audacity პროექტის შენახვა"
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr "მხარდაუჭერელი ფორმატები"
+
+#: HelpText.cpp:133
+msgid "Burn to CD"
+msgstr "CD-ზე ჩაწერა"
+
+#: HelpText.cpp:137
+msgid "No Local Help"
+msgstr "ლოკალური დახმარების გარეშე"
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr "</p><ცენტრი><h3>დაწყება</h3></center><br>"
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr "მოგესალმებათ Audacity "
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "როგორ: <ul><li>[[play|play]] არსებული აუდიო ფალი <li>[[ჩაწერეთ|ჩაწერეთ]] თქვენი ხმა, LP ან ჩაწერეთ <li>[[რედაქტირება|რედაქტირება]] ხმები <li>[[შენახვა|შენახვა ან Audacity პროექტის გახსნა]] <li>[[ექსპორტი|ექსპორტი]]  MP3 ან სხვა ფორმატად, ან [[cd-ის ჩაწერა| CD -ის ჩაწერა]]  </ul></p><p>"
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+
+#: HistoryWindow.cpp:53
+msgid "Undo History"
+msgstr "უკუსვლის ისტორია"
+
+#: HistoryWindow.cpp:72
+msgid "Manage History"
+msgstr "მართვის ისტორია"
+
+#: HistoryWindow.cpp:78
+msgid "Action"
+msgstr "მოქმედება"
+
+#: HistoryWindow.cpp:86
+msgid "&Undo Levels Available"
+msgstr "&უკუსვლის დონეები ხელმისაწვდომია"
+
+#: HistoryWindow.cpp:92
+msgid "Levels To Discard"
+msgstr "გასაუქმებელი დონეები"
+
+#: HistoryWindow.cpp:103
+msgid "&Discard"
+msgstr "&გაუქმება"
+
+#: HistoryWindow.cpp:112
+#: Tags.cpp:2081
+#: Tags.cpp:2083
+#: Tags.cpp:2385
+#: Tags.cpp:2387
+#: effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191
+#: export/ExportCL.cpp:399
+msgid "&OK"
+msgstr "&დიახ"
+
+#: Internat.cpp:191
+msgid "Unable to determine"
+msgstr "შეუძლებელია დადგენა"
+
+#: Internat.cpp:195
+#: import/ImportRaw.cpp:385
+msgid "bytes"
+msgstr " ბაიტები"
+
+#: Internat.cpp:197
+msgid "KB"
+msgstr "KB"
+
+#: Internat.cpp:200
+msgid "MB"
+msgstr "MB"
+
+#: Internat.cpp:203
+msgid "GB"
+msgstr "GB"
+
+#: LabelDialog.cpp:54
+msgid "Track"
+msgstr "ტრეკი"
+
+#: LabelDialog.cpp:55
+#: Menus.cpp:4677
+#: Menus.cpp:4712
+msgid "Label"
+msgstr "იარლიყი"
+
+#: LabelDialog.cpp:56
+#: TimerRecordDialog.cpp:279
+msgid "Start Time"
+msgstr "საწყისი დრო"
+
+#: LabelDialog.cpp:57
+#: TimerRecordDialog.cpp:298
+msgid "End Time"
+msgstr "დასრულების დრო"
+
+#: LabelDialog.cpp:100
+#: Menus.cpp:713
+msgid "&Edit Labels"
+msgstr "&იარლიყების რედაქტირება"
+
+#: LabelDialog.cpp:115
+msgid "Press F2 or double click to edit cell contents."
+msgstr "დააჭირეთ F2 ან დაუწკაპუნეთ უჯრედების შიგთავსის  რედაქტირებისთვის"
+
+#: LabelDialog.cpp:126
+msgid "Insert &After"
+msgstr "&შემდეგ ჩასმა"
+
+#: LabelDialog.cpp:127
+msgid "Insert &Before"
+msgstr "&წინ ჩასმა"
+
+#: LabelDialog.cpp:129
+msgid "&Import..."
+msgstr "&იმპორტი..."
+
+#: LabelDialog.cpp:157
+msgid "New..."
+msgstr "ახალი..."
+
+#: LabelDialog.cpp:354
+msgid "You have left blank label names.  These will be\n"
+"skipped when repopulating the Label Tracks.\n"
+"\n"
+"Would you like to go back and provide names?"
+msgstr "იარლიყის სახელები ცარიელი გაქვთ დატოვებული. იარლიყის ტრეკების\n"
+"თავიდან შექმნისას გამოტოვებული იქნება.\n"
+"\n"
+"გსურთ უკან დაბრუნება და სახელების დარქმევა?"
+
+#: LabelDialog.cpp:355
+msgid "Confirm"
+msgstr "დადასტურება"
+
+#: LabelDialog.cpp:516
+#: Menus.cpp:4101
+msgid "Select a text file containing labels..."
+msgstr "მონიშნეთ იარლიყების შემცველი ტექსტური ფაილი..."
+
+#: LabelDialog.cpp:520
+#: Menus.cpp:4105
+msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
+msgstr "ტექსტური (*.txt)|*.txt|ყველა ფაილი(*.*)|*.*"
+
+#: LabelDialog.cpp:534
+#: Menus.cpp:4117
+#: Project.cpp:1914
+#: Project.cpp:1922
+msgid "Could not open file: "
+msgstr "შეუძლებელია ფაილის გახსნა:"
+
+#: LabelDialog.cpp:560
+msgid "No labels to export."
+msgstr "საექსპორტო იარლიყები არ მოიძებნა."
+
+#: LabelDialog.cpp:566
+#: Menus.cpp:2518
+msgid "Export Labels As:"
+msgstr "იარლიყის ექსპორტი, როგორც:"
+
+#: LabelDialog.cpp:568
+#: Menus.cpp:2516
+msgid "labels.txt"
+msgstr "labels.txt"
+
+#: LabelDialog.cpp:703
+msgid "New Label Track"
+msgstr "ახალი იარლიყის ტრეკი"
+
+#: LabelDialog.cpp:704
+msgid "Enter track name"
+msgstr "ტრეკის სახელის შეყვანა"
+
+#: LabelDialog.cpp:705
+#: LabelDialog.h:52
+#: LabelTrack.cpp:89
+#: Menus.cpp:632
+msgid "&Label Track"
+msgstr "&იარლიყის ტრეკი"
+
+#: LangChoice.cpp:57
+msgid "Audacity First Run"
+msgstr "Audacity-ის პირველი გაშვება"
+
+#: LangChoice.cpp:89
+msgid "Choose Language for Audacity to use:"
+msgstr "ენის ამორჩევა Audacity-ისთვის:"
+
+#: Legacy.cpp:356
+#, c-format
+msgid "Converted a 1.0 project file to the new format.\n"
+"The old file has been saved as '%s'"
+msgstr "1.0 პროექტის ფაილი კონვერტირებულია ახალ ფორმატში.\n"
+"ძველი ფაილი შეინახა როგორც '%s'"
+
+#: Legacy.cpp:357
+msgid "Opening Audacity Project"
+msgstr "Audacity პროექტის გახსნა"
+
+#: Menus.cpp:194
+msgid "&File"
+msgstr "&ფაილი"
+
+#: Menus.cpp:196
+msgid "&New\tCtrl+N"
+msgstr "&ახალი\tCtrl+N"
+
+#: Menus.cpp:198
+msgid "&Open...\tCtrl+O"
+msgstr "&გახსნა...\tCtrl+O"
+
+#: Menus.cpp:203
+msgid "&Close\tCtrl+W"
+msgstr "&დახურვა\tCtrl+W"
+
+#: Menus.cpp:206
+msgid "&Save Project\tCtrl+S"
+msgstr "&პროექტის შენახვა\tCtrl+S"
+
+#: Menus.cpp:210
+#: Project.cpp:2896
+msgid "Save Project &As..."
+msgstr "პროექტის შენახვა, &როგორც..."
+
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr "პროექტის კომპრესირებული ასლის შენახვა..."
+
+#: Menus.cpp:216
+msgid "Chec&k Dependencies..."
+msgstr "დამოკიდებულებების &შემოწმება..."
+
+#: Menus.cpp:222
+msgid "Open Me&tadata Editor..."
+msgstr "მეტა%მონაცემების რედაქტორის გახსნა..."
+
+#: Menus.cpp:229
+#: import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&იმპორტი"
+
+#: Menus.cpp:231
+msgid "&Audio...\tCtrl+Shift+I"
+msgstr "&აუდიო...\tCtrl+Shift+I"
+
+#: Menus.cpp:232
+msgid "&Labels..."
+msgstr "&იარლიყები..."
+
+#: Menus.cpp:234
+msgid "&MIDI..."
+msgstr "&MIDI..."
+
+#: Menus.cpp:236
+msgid "&Raw Data..."
+msgstr "&დაუმუშავებელი მონაცემები..."
+
+#: Menus.cpp:247
+#: Menus.cpp:282
+msgid "Expo&rt Selection..."
+msgstr "ექსპორტის ამორჩევა..."
+
+#: Menus.cpp:254
+msgid "Export &Labels..."
+msgstr "იარლიყების ექსპორტი..."
+
+#: Menus.cpp:255
+msgid "Export &Multiple..."
+msgstr "მრავალჯერადი ექსპორტი..."
+
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr "MIDI ექსპორტი..."
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr "CleanSpeech ჯა&ჭვი..."
+
+#: Menus.cpp:291
+#: Menus.cpp:305
+msgid "Edit C&hains..."
+msgstr "ჯაჭ&ვების რედაქტირება..."
+
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr "CleanSpeech &პარამეტრების ექსპორტი..."
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr "CleanSpeech პარამეტრების &იმპორტი..."
+
+#: Menus.cpp:303
+msgid "Appl&y Chain..."
+msgstr "ჯაჭვის გააქტიურება..."
+
+#: Menus.cpp:310
+msgid "&Upload File..."
+msgstr "ფაილის &ატვირთვა.."
+
+#: Menus.cpp:316
+msgid "Pa&ge Setup..."
+msgstr "გვერ&დის მომართვა..."
+
+#: Menus.cpp:317
+msgid "&Print..."
+msgstr "&ამობეჭდვა..."
+
+#: Menus.cpp:330
+msgid "E&xit\tCtrl+Q"
+msgstr "&გამოსვლა\tCtrl+Q"
+
+#: Menus.cpp:338
+#: toolbars/EditToolBar.cpp:76
+msgid "&Edit"
+msgstr "&რედაქტირება"
+
+#: Menus.cpp:342
+msgid "&Undo\tCtrl+Z"
+msgstr "&უკუსვლა\tCtrl+Z"
+
+#: Menus.cpp:350
+#: prefs/KeyConfigPrefs.cpp:371
+#: toolbars/EditToolBar.cpp:146
+msgid "&Redo"
+msgstr "&გამეორება"
+
+#: Menus.cpp:363
+msgid "Cu&t\tCtrl+X"
+msgstr "ამ&ოჭრა\tCtrl+X"
+
+#: Menus.cpp:367
+msgid "Spl&it Cut\tCtrl+Alt+X"
+msgstr "დაყ&ოფის ამოჭრა\tCtrl+Alt+X"
+
+#: Menus.cpp:368
+msgid "&Copy\tCtrl+C"
+msgstr "&კპირება\tCtrl+C"
+
+#: Menus.cpp:372
+msgid "&Paste\tCtrl+V"
+msgstr "&ჩასმა\tCtrl+V"
+
+#: Menus.cpp:376
+msgid "Tri&m\tCtrl+T"
+msgstr "დაჭრ&რა\tCtrl+T"
+
+#: Menus.cpp:378
+msgid "&Delete\tCtrl+K"
+msgstr "&წაშლა\tCtrl+K"
+
+#: Menus.cpp:379
+msgid "Split D&elete\tCtrl+Alt+K"
+msgstr "დაყოფის  წაშლა\tCtrl+Alt+K"
+
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr "აუდ&იოს დაჩუმება\tCtrl+L"
+
+#: Menus.cpp:382
+msgid "Sp&lit\tCtrl+I"
+msgstr "დაყოფა\tCtrl+I"
+
+#: Menus.cpp:387
+msgid "Split Ne&w\tCtrl+Alt+I"
+msgstr "ა&ხლის დაყოფა\tCtrl+Alt+I"
+
+#: Menus.cpp:392
+msgid "&Join\tCtrl+J"
+msgstr "&შეერთება\tCtrl+J"
+
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "სიჩუმეებთან მი&ერთება\tCtrl+Alt+J"
+
+#: Menus.cpp:394
+msgid "Duplic&ate\tCtrl+D"
+msgstr "დუბ&ლირება\tCtrl+D"
+
+#: Menus.cpp:400
+#: Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr "სტერეო ტრე&კი მონოზე"
+
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr "და&ხარისხებული არეები"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:409
+msgid "&Cut\tAlt+X"
+msgstr "&ამოჭრა\tAlt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:414
+msgid "&Split Cut\tShift+Alt+X"
+msgstr "&დაყოფის ამოჭრა\tShift+Alt+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:419
+msgid "Co&py\tShift+Alt+C"
+msgstr "კო&პირება\tShift+Alt+C"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:425
+msgid "&Delete\tAlt+K"
+msgstr "&წაშლა\tAlt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:430
+msgid "Sp&lit Delete\tShift+Alt+K"
+msgstr "და&ყოფის წაშლა\tShift+Alt+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:435
+msgid "Sile&nce\tAlt+L"
+msgstr "სიჩუ&მე\tAlt+L"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:441
+msgid "Spli&t\tAlt+I"
+msgstr "დაყოფა\tAlt+I"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:446
+msgid "&Join\tAlt+J"
+msgstr "&შეერთება\tAlt+J"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr "სიჩუმეებზე შეერთ&ება\tShift+Alt+J"
+
+#: Menus.cpp:456
+msgid "&Select"
+msgstr "&Sამორჩევა"
+
+#: Menus.cpp:457
+msgid "&All\tCtrl+A"
+msgstr "&All\tCtrl+A"
+
+#: Menus.cpp:458
+msgid "&None\tCtrl+Shift+A"
+msgstr "&არცერთი\tCtrl+Shift+A"
+
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
+msgstr "დაკვრის პოზიციისას &მარცხენა Position\t["
+
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
+msgstr "დაკვრის პოზიციისას &მარჯვენა\t]"
+
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr "ტრეკის &საწყისი კურსორთან\tShift+J"
+
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr "კურსორი ტრეკის &დასასრულთან\tShift+K"
+
+#: Menus.cpp:474
+msgid "Find &Zero Crossings\tZ"
+msgstr "ნულოვანი ჯვარედინების მოძებნა\tZ"
+
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr "კურსორის გადატანა"
+
+#: Menus.cpp:478
+msgid "to Selection Star&t"
+msgstr "მონიშვნის დასაწყისამდე"
+
+#: Menus.cpp:479
+msgid "to Selection En&d"
+msgstr "მონიშვნის დასასრულამდე"
+
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr "ტრეკის დასაწყისამდე\tJ"
+
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr "ტრეკის დასასრულამდე\tK"
+
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr "ა&რეს შენახვა"
+
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr "არ&ეს აღდგენა"
+
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr "არეს და&კვრა"
+
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr "&ჩაკეტვა"
+
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr "&მოხსნა"
+
+#: Menus.cpp:511
+msgid "Turn Snap-To On"
+msgstr "გადაღების ჩართვა"
+
+#: Menus.cpp:512
+msgid "Turn Snap-To Off"
+msgstr "გადაღების გამორთვა"
+
+#: Menus.cpp:513
+msgid "Turn Grid Snap On"
+msgstr "უჯრედის გადაღების ჩართვა"
+
+#: Menus.cpp:514
+msgid "Turn Grid Snap Off"
+msgstr "უჯრედის გადაღების გამორთვა"
+
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "პარა&მეტრები...\tCtrl+,"
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr "პარა&მეტრები...\tCtrl+P"
+
+#: Menus.cpp:533
+msgid "&View"
+msgstr "&ნახვა"
+
+#: Menus.cpp:535
+msgid "Zoom &In\tCtrl+1"
+msgstr "შემცირება\tCtrl+1"
+
+#: Menus.cpp:538
+msgid "Zoom &Normal\tCtrl+2"
+msgstr "&ნორმალურ ზომაზეl\tCtrl+2"
+
+#: Menus.cpp:539
+msgid "Zoom &Out\tCtrl+3"
+msgstr "გადიდება\tCtrl+3"
+
+#: Menus.cpp:542
+msgid "&Fit in Window\tCtrl+F"
+msgstr "ფანჯარაზე მორგება\tCtrl+F"
+
+#: Menus.cpp:543
+msgid "Fit &Vertically\tCtrl+Shift+F"
+msgstr "&ვერტიკალური მორგებაtCtrl+Shift+F"
+
+#: Menus.cpp:544
+msgid "&Zoom to Selection\tCtrl+E"
+msgstr "მონიშვნამდე &გადიდება\tCtrl+E"
+
+#: Menus.cpp:547
+msgid "&Collapse All Tracks\tCtrl+Shift+C"
+msgstr "ყველა ტრეკის &მოშლა\tCtrl+Shift+C"
+
+#: Menus.cpp:548
+msgid "E&xpand All Tracks\tCtrl+Shift+X"
+msgstr "ყველა ტრეკის გ&აშლა\tCtrl+Shift+X"
+
+#: Menus.cpp:551
+msgid "&Show Clipping"
+msgstr "მიმაგრების &ჩვენება"
+
+#: Menus.cpp:560
+msgid "&History..."
+msgstr "&ისტორია..."
+
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr "&ხელსაწყოთა ზოლები"
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr "&მართვის ზოლი"
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr "&მოწყობილობათა ზოლი"
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr "ხელსაწყოთა ზოლის &რედაქტირება"
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr "&Meter Toolbar"
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr "მიქსერის ხელსაწყოთა ზოლი"
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr "&მონიშვნის ზოლი"
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr "ხ&ელსაწყოთა ზოლი"
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr "ტრანსკრი&პციის ხელსაწყოთა ზოლი"
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr "ხელსაწყოთა ზოლის ნაგულისხმევ პარამეტრებამდე დაყვანა"
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr "!გამარტივებული ხედი"
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr "&გადატანა"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr "&შეყოვნება\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:595
+#: Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "საწყისზე გადასვლა\tHome"
+
+#: Menus.cpp:597
+#: Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "ბოლოში გადასვლა\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr "&ჩაწერა\tR"
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr "&ტაიმერის ჩაწერა...\tShift+T"
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr "ჩაწერის დამატება\tShift+R"
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr "აუდიოს გადაწერა (ჩართვა/გამორთვა)"
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr "პროგრამული დაკვრა (ჩათვლა/გამორთვა)"
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr "ხმა-გააქტიურებული ჩაწერა (ჩართვა/გამორთვა)"
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr "ხმის გააქტიურების დონე..."
+
+#: Menus.cpp:622
+msgid "&Tracks"
+msgstr "&ტრეკები"
+
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr "&ახლის დამატება"
+
+#: Menus.cpp:630
+msgid "&Audio Track\tCtrl+Shift+N"
+msgstr "&აუდიო ტრეკი\tCtrl+Shift+N"
+
+#: Menus.cpp:631
+msgid "&Stereo Track"
+msgstr "&სტერეო ტრეკი"
+
+#: Menus.cpp:633
+#: TimeTrack.cpp:44
+msgid "&Time Track"
+msgstr "&დროის ტრეკი"
+
+#: Menus.cpp:643
+msgid "Mi&x and Render"
+msgstr "&შერევა და რენდერინგი"
+
+#: Menus.cpp:647
+msgid "Mix and Render to New Track\tCtrl+Shift+M"
+msgstr "ახალ ტრეკზე შერევა და რენდერინგი\tCtrl+Shift+M"
+
+#: Menus.cpp:651
+msgid "&Resample..."
+msgstr "&რესემპლირება..."
+
+#: Menus.cpp:661
+msgid "Remo&ve Tracks"
+msgstr "ტრეკების წაშლ&ა"
+
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr "ყველა ტრეკის &ჩაჩუმება\tCtrl+U"
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr "ყველა ტრეკის &ხმის აწევა\tCtrl+Shift+U"
+
+#: Menus.cpp:672
+msgid "Align with &Zero"
+msgstr "ნულამდე &გასწორება"
+
+#: Menus.cpp:673
+msgid "Align with &Cursor"
+msgstr "&კურსორით გასწორება"
+
+#: Menus.cpp:674
+msgid "Align with Selection &Start"
+msgstr "მონიშვნის &დასაწყისით გასწორება"
+
+#: Menus.cpp:675
+msgid "Align with Selection &End"
+msgstr "მონიშვნის &დასასრულით გასწორება"
+
+#: Menus.cpp:676
+msgid "Align End with Cu&rsor"
+msgstr "დასასრულის გასწორება &კურსორით"
+
+#: Menus.cpp:677
+msgid "Align End with Selection Star&t"
+msgstr "მონიშვნის დასაწყისი&თ დასასრულის გასწორება"
+
+#: Menus.cpp:678
+msgid "Align End with Selection En&d"
+msgstr "მონიშვნის დასასრული&თ დასასრულის გასწორება"
+
+#: Menus.cpp:679
+msgid "Align Tracks To&gether"
+msgstr "ტრეკების ერთმანეთზე სწორება"
+
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr "ტრეკების &გასწორება"
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr "გა&სწორება და კურსორის გადატანა"
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr "MIDI-ის სინქრონიზაცია აუდიოსთან"
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr "აუდიო და იარლიყების ტრეკების დაკავშირება"
+
+#: Menus.cpp:709
+msgid "Add &Label At Selection\tCtrl+B"
+msgstr "მონიშვნისას &იარლიყის დამატება\tCtrl+B"
+
+#: Menus.cpp:710
+msgid "Add Label At &Playback Position\tCtrl+M"
+msgstr "იარლიყის დამატება &დაკვრის პოზიციისას\tCtrl+M"
+
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr "ტრეკების &დახარისხება"
+
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr "&საწყისი დროით"
+
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr "&სახელით"
+
+#: Menus.cpp:730
+msgid "&Generate"
+msgstr "&გენერაცია"
+
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
+msgid "Unsorted"
+msgstr "დაუხარისხებელი"
+
+#: Menus.cpp:795
+msgid "Effe&ct"
+msgstr "ეფ&ექტი"
+
+#: Menus.cpp:799
+msgid "Repeat Last Effect\tCtrl+R"
+msgstr "ბოლო ეფექტის გამეორება\tCtrl+R"
+
+#: Menus.cpp:877
+msgid "&Analyze"
+msgstr "&ანალიზი"
+
+#: Menus.cpp:879
+msgid "Plot Spectrum..."
+msgstr "აგების სპექტრი..."
+
+#: Menus.cpp:947
+#: Menus.cpp:950
+msgid "&Help"
+msgstr "&დახმარება"
+
+#: Menus.cpp:953
+msgid "&About Audacity CleanSpeech..."
+msgstr "Audacity CleanSpeech-ის შესახებ..."
+
+#: Menus.cpp:957
+msgid "&Show Welcome Message..."
+msgstr "&მისალმების შეტყობინების &ჩვენება..."
+
+#: Menus.cpp:958
+msgid "&Index..."
+msgstr "&ინდექსი..."
+
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr "&ჩანაწერის ჩვენება ..."
+
+#: Menus.cpp:967
+msgid "&Screenshot Tools..."
+msgstr "&ეკრანის ანაბეჭდის ხელსაწყოები..."
+
+#: Menus.cpp:970
+msgid "&Run Benchmark..."
+msgstr "Benchmark-ის &გაშვება..."
+
+#: Menus.cpp:972
+msgid "&Audio Device Info..."
+msgstr "&აუდიო მოწყობილობის ინფორმაცია..."
+
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
+
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
+
+#: Menus.cpp:985
+msgid "Selection Tool\tF1"
+msgstr "მონიშვნის ხელსაწყო\tF1"
+
+#: Menus.cpp:986
+msgid "Envelope Tool\tF2"
+msgstr "კონვერტის ხელსაწყო\tF2"
+
+#: Menus.cpp:987
+msgid "Draw Tool\tF3"
+msgstr "დახატვის ხელსაწყო\tF3"
+
+#: Menus.cpp:988
+msgid "Zoom Tool\tF4"
+msgstr "გადიდების ხელსაწყო\tF4"
+
+#: Menus.cpp:989
+msgid "Time Shift Tool\tF5"
+msgstr "დროის ცვლის ხელსაწყო\tF5"
+
+#: Menus.cpp:990
+msgid "Multi Tool\tF6"
+msgstr "მრავალჯერადი ხელსაწყო\tF6"
+
+#: Menus.cpp:992
+msgid "Next Tool\tD"
+msgstr "შემდეგი ხელსაწყო\tD"
+
+#: Menus.cpp:993
+msgid "Previous Tool\tA"
+msgstr "წინა ხელსაწყო\tA"
+
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:996
+msgid "Stop\tS"
+msgstr "გაჩერება\tS"
+
+#: Menus.cpp:997
+msgid "Pause\tP"
+msgstr "შეჩერება\tP"
+
+#: Menus.cpp:998
+msgid "Record\tR"
+msgstr "ჩაწერა\tR"
+
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
+msgstr "ჩაწერის დამატება\tShift+R"
+
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr "დაკვრა/გაჩერებისა და მომართვის კურსორი\tShift+A"
+
+#: Menus.cpp:1004
+msgid "Play One Second\t1"
+msgstr "ერთი წამი დაკვრა\t1"
+
+#: Menus.cpp:1005
+msgid "Play To Selection\tB"
+msgstr "მონიშვნაზე დაკვრა\tB"
+
+#: Menus.cpp:1006
+msgid "Play Looped\tL"
+msgstr "ციკლის დაკვრა\tL"
+
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:1008
+msgid "Play Cut Preview\tC"
+msgstr "ამოჭრილი ესკიზის დაკვრა\tC"
+
+#: Menus.cpp:1013
+msgid "Selection to Start\tShift+Home"
+msgstr "დასაწყისზე მონიშვნა\tShift+Home"
+
+#: Menus.cpp:1014
+msgid "Selection to End\tShift+End"
+msgstr "დასარულზე მონიშვნა\tShift+End"
+
+#: Menus.cpp:1016
+msgid "DeleteKey\tBackspace"
+msgstr "გასაღების წაშლა\tBackspace"
+
+#: Menus.cpp:1021
+msgid "DeleteKey2\tDelete"
+msgstr "გასაღების წაშლა2\tDelete"
+
+#: Menus.cpp:1027
+msgid "Seek left short period during playback\tLeft"
+msgstr "დაკვრისას მარცხენა მოკლე პერიოდის ძიება\tLeft"
+
+#: Menus.cpp:1028
+msgid "Seek right short period during playback\tRight"
+msgstr "დაკვრისას მარჯვენა მოკლე პერიოდის ძიება\tRight"
+
+#: Menus.cpp:1029
+msgid "Seek left long period during playback\tShift+Left"
+msgstr "დაკვრისას მარცხენა გრძელი პერიოდის ძიება\tShift+Left"
+
+#: Menus.cpp:1030
+msgid "Seek right long period during playback\tShift+Right"
+msgstr "დაკვრისასმარჯვენა გრძელი პერიოდის ძიება\tShift+Right"
+
+#: Menus.cpp:1034
+msgid "Move Focus to Previous Track\tUp"
+msgstr "ფოკუსის წინა ტრეკზე გადატანა\tUp"
+
+#: Menus.cpp:1035
+msgid "Move Focus to Previous and Change Selection\tShift+Up"
+msgstr "ფოკუსის წინა ტრეკზე გადატანა და მონიშვნის შეცვლა\tShift+Up"
+
+#: Menus.cpp:1036
+msgid "Move Focus to Next Track\tDown"
+msgstr "ფოკუსის შემდეგ ტრეკზე გადატანა\tDown"
+
+#: Menus.cpp:1037
+msgid "Move Focus to Next and Change Selection\tShift+Down"
+msgstr "ფოკუსის შემდეგ ტრეკზე გადატანა და მონიშვნის შეცვლა\tShift+Down"
+
+#: Menus.cpp:1038
+msgid "Toggle Focused Track\tReturn"
+msgstr "ფოკუსირებული ტრეკის ჩართვა\tReturn"
+
+#: Menus.cpp:1039
+msgid "Toggle Focused Track\tNUMPAD_ENTER"
+msgstr "ფოკუსირებული ტრეკის ჩართვა\tNUMPAD_ENTER"
+
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
+
+#: Menus.cpp:1042
+msgid "Cursor Left\tLeft"
+msgstr "კურსორი მარცხნივ\tLeft"
+
+#: Menus.cpp:1043
+msgid "Cursor Right\tRight"
+msgstr "კურსორი მარჯვნივ\tRight"
+
+#: Menus.cpp:1044
+msgid "Cursor Short Jump Left\t,"
+msgstr "კურსორის მოკლე გადასვლა მარცხნივ\t,"
+
+#: Menus.cpp:1045
+msgid "Cursor Short Jump Right\t."
+msgstr "კურსორის მოკლე გადასვლა მარჯვნივ\t."
+
+#: Menus.cpp:1046
+msgid "Cursor Long Jump Left\tShift+,"
+msgstr "კურსორის გრძელი გადასვლა მარცხნივ\tShift+,"
+
+#: Menus.cpp:1047
+msgid "Cursor Long Jump Right\tShift+."
+msgstr "კურსორის გრძელი გადასვლა მარჯვნივ\tShift+."
+
+#: Menus.cpp:1049
+msgid "Selection Extend Left\tShift+Left"
+msgstr "მონიშვნის გაფართოება მარცხნივ\tShift+Left"
+
+#: Menus.cpp:1050
+msgid "Selection Extend Right\tShift+Right"
+msgstr "მონიშვნის გაფართოება მარჯვნივ\tShift+Right"
+
+#: Menus.cpp:1052
+msgid "Set (or Extend) Left Selection"
+msgstr "მარცხენა მონიშვნის მომართვა (ან გაფართოება)  "
+
+#: Menus.cpp:1053
+msgid "Set (or Extend) Right Selection"
+msgstr "მარჯვენამონიშვნის მომართვა (ან გაფართოება)  "
+
+#: Menus.cpp:1055
+msgid "Selection Contract Left\tCtrl+Shift+Right"
+msgstr "კონტრასტის მარცხნივ მონიშნვა\tCtrl+Shift+Right"
+
+#: Menus.cpp:1056
+msgid "Selection Contract Right\tCtrl+Shift+Left"
+msgstr "კონტრასტის მარჯვნივ მონიშნვა\tCtrl+Shift+Left"
+
+#: Menus.cpp:1058
+msgid "Change pan on focused track\tShift+P"
+msgstr "არეს შეცვლა ფოკუსირებულ ტრეკზე\tShift+P"
+
+#: Menus.cpp:1059
+msgid "Pan left on focused track\tAlt+Shift+Left"
+msgstr "ფოკუსირებულ ტრეკზე მარცხნივ მოტრიალება\tAlt+Shift+Left"
+
+#: Menus.cpp:1060
+msgid "Pan right on focused track\tAlt+Shift+Right"
+msgstr "ფოკუსირებულ ტრეკზე მარჯვნივ მოტრიალება\tAlt+Shift+Right"
+
+#: Menus.cpp:1061
+msgid "Change gain on focused track\tShift+G"
+msgstr "gain -ის შეცვლა ფოკუსირებულ ტრეკზე\tShift+G"
+
+#: Menus.cpp:1062
+msgid "Increase gain on focused track\tAlt+Shift+Up"
+msgstr "gain-ის აწევა ფოკუსირებულ ტრეკზე\tAlt+Shift+Up"
+
+#: Menus.cpp:1063
+msgid "Decrease gain on focused track\tAlt+Shift+Down"
+msgstr "gain-ის დაწევა ფოკუსირებულ ტრეკზე\tAlt+Shift+Down"
+
+#: Menus.cpp:1064
+msgid "Open menu on focused track\tShift+M"
+msgstr "მენიუს გახსნა ფოკუსირებულ ტრეკზე\tShift+M"
+
+#: Menus.cpp:1065
+msgid "Mute/Unmute focused track\tShift+U"
+msgstr "ფოკუსირებული ტრეკის დადუმება/ხმის აწევა\tShift+U"
+
+#: Menus.cpp:1066
+msgid "Solo/Unsolo focused track\tShift+S"
+msgstr "სოლო/არასოლო ფოკუსირებული ტრეკი\tShift+S"
+
+#: Menus.cpp:1067
+msgid "Close focused track\tShift+C"
+msgstr "ფოკუსირებული ტრეკის დახურვა\tShift+C"
+
+#: Menus.cpp:1069
+msgid "Snap To On"
+msgstr "გადაღების ჩართვა"
+
+#: Menus.cpp:1070
+msgid "Snap To Off"
+msgstr "გადაღების გამორთვა"
+
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
+#. i18n-hint: This is the name of the menu item on Mac OS X only
+#: Menus.cpp:1157
+msgid "Open Recent"
+msgstr "უკანასკნელის გახსნა"
+
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1160
+msgid "Recent &Files"
+msgstr "უკანასკნელი  &ფაილები"
+
+#: Menus.cpp:1209
+#, c-format
+msgid "&Undo %s"
+msgstr "%s &დაბრუნება"
+
+#: Menus.cpp:1235
+msgid "Can't Undo"
+msgstr "დაბრუნება შეუძლებელია"
+
+#: Menus.cpp:1244
+#, c-format
+msgid "&Redo %s"
+msgstr "&გამეორება %s"
+
+#: Menus.cpp:1250
+msgid "Can't Redo"
+msgstr "გამეორება შეუძლებელია"
+
+#: Menus.cpp:1856
+msgid "Sort By Time"
+msgstr "დროის მიხედვით დახარისხება"
+
+#: Menus.cpp:1856
+msgid "Tracks sorted by time"
+msgstr "დროის მიხედვით დახარისხებული ტრეკები"
+
+#: Menus.cpp:1882
+msgid "Sort By Name"
+msgstr "სახელის მიხედვით დახარისხება"
+
+#: Menus.cpp:1882
+msgid "Tracks sorted by name"
+msgstr "სახელის მიხედვით დახარისხებული ტრეკები"
+
+#: Menus.cpp:2033
+msgid "Set Left Selection Bound"
+msgstr "მარცხენა მონიშვნის საზღვრის მომართვა"
+
+#: Menus.cpp:2068
+msgid "Set Right Selection Bound"
+msgstr "მარჯვენა მონიშვნის საზღვრის მომართვა"
+
+#: Menus.cpp:2337
+msgid "You must select a track first."
+msgstr "ჯერ უნდა ამოირჩიოთ ტრეკი"
+
+#: Menus.cpp:2369
+#, c-format
+msgid "Repeat %s\tCtrl+R"
+msgstr "გამეორება %s\tCtrl+R"
+
+#: Menus.cpp:2512
+msgid "There are no label tracks to export."
+msgstr "ესპორტისთვის ლებელის ტრეკები არ მოიძებნა."
+
+#: Menus.cpp:2607
+msgid "Export MIDI As:"
+msgstr "MIDI ექსპორტი როგორც:"
+
+#: Menus.cpp:2611
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "MIDI ფაილი (*.mid)|*.mid|Allegro ფაილი (*.gro)|*.gro"
+
+#: Menus.cpp:2643
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr "თქვენ მონიშნული გაქვთ ფაილის სახელი ფაილის უცნობი გაფართოებით.\n"
+"გავაგრძელო?"
+
+#: Menus.cpp:2644
+msgid "Export MIDI"
+msgstr "MIDI-ის ექსპორტი"
+
+#: Menus.cpp:2702
+msgid "Nothing to undo"
+msgstr "დასაბრუნებელი მოქმედება არ არსებობს"
+
+#: Menus.cpp:2722
+msgid "Nothing to redo"
+msgstr "გასამეორებელი მოქმედება არ არსებობს"
+
+#: Menus.cpp:2809
+#: TrackPanel.cpp:596
+#: toolbars/EditToolBar.cpp:133
+msgid "Cut"
+msgstr "ამოჭრა"
+
+#: Menus.cpp:2809
+msgid "Cut to the clipboard"
+msgstr "გაცვლის ბუფერში დამატება"
+
+#: Menus.cpp:2849
+msgid "Split Cut"
+msgstr "დაყოფის ამოჭრა"
+
+#: Menus.cpp:2849
+msgid "Split-cut to the clipboard"
+msgstr "დაყოფა-ამოჭრა და გაცვლის ბუფერში შენახვა"
+
+#: Menus.cpp:2914
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+#: TrackPanel.cpp:598
+#: toolbars/EditToolBar.cpp:137
+msgid "Paste"
+msgstr "ჩასმა"
+
+#: Menus.cpp:2914
+msgid "Pasted text from the clipboard"
+msgstr "გაცვლის ბუფერიდან ჩასმული ტექსტი"
+
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+msgid "Pasted from the clipboard"
+msgstr "გაცვლის ბუფერიდან ჩასმული"
+
+#: Menus.cpp:3052
+msgid "Pasting one type of track into another is not allowed."
+msgstr "ერთი ტიპის ტრეკის მეორეში ჩასმა დაუშვებელია."
+
+#: Menus.cpp:3064
+msgid "Copying stereo audio into a mono track is not allowed."
+msgstr "სტერეო აუდიოდან მონო ტრეკზე კოპირება დაუშვებელია."
+
+#: Menus.cpp:3214
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim"
+msgstr "Trim"
+
+#: Menus.cpp:3214
+msgid "Trim file to selection"
+msgstr "ფაილის დაყოფა მონიშვნამდე"
+
+#: Menus.cpp:3243
+#, c-format
+msgid "Split-deleted %.2f seconds at t=%.2f"
+msgstr "დაყოფილი-წაშლილი %.2f წამი =%.2f"
+
+#: Menus.cpp:3246
+msgid "Split Delete"
+msgstr "დაყოფა წაშლა"
+
+#: Menus.cpp:3267
+#, c-format
+msgid "Disjoined %.2f seconds at t=%.2f"
+msgstr "განცალკევებული %.2f წამი at t=%.2f"
+
+#: Menus.cpp:3270
+msgid "Disjoin"
+msgstr "განცალკევება"
+
+#: Menus.cpp:3291
+#, c-format
+msgid "Joined %.2f seconds at t=%.2f"
+msgstr "შეერთება %.2f წამები t=%.2f"
+
+#: Menus.cpp:3294
+msgid "Join"
+msgstr "შეერთება"
+
+#: Menus.cpp:3313
+#, c-format
+msgid "Silenced selected tracks for %.2f seconds at %.2f"
+msgstr "დაჩუმებული მონუშნული ტრეკები %.2f-ისთვის.2f წამი %.2f"
+
+#: Menus.cpp:3315
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence"
+msgstr "დაჩუმება"
+
+#: Menus.cpp:3349
+msgid "Duplicate"
+msgstr "დუბლიკაცია"
+
+#: Menus.cpp:3349
+msgid "Duplicated"
+msgstr "დუბლირებული"
+
+#: Menus.cpp:3368
+msgid "Cut Labels"
+msgstr "იარლიყების ამოჭრა"
+
+#: Menus.cpp:3368
+msgid "Cut labeled regions to the clipboard"
+msgstr "იარლიყდადებული არეების ამოჭრა და გაცვლის ბუფერში გადატანა"
+
+#: Menus.cpp:3382
+msgid "SplitCut labeled regions to the clipboard"
+msgstr "იარლიყდადებული არეების დაყოფადაჭრა და გაცვლის ბუფერში გადატანა"
+
+#: Menus.cpp:3383
+msgid "Split Cut Labels"
+msgstr "იარლიყების დაყოფა დაჭრა"
+
+#: Menus.cpp:3397
+msgid "Copied labeled regions to the clipboard"
+msgstr "გაცვლის ბუფერში გადატანილი იარლიყდადებული არეები"
+
+#: Menus.cpp:3397
+msgid "Copy Labels"
+msgstr "იარლიყების კოპირება"
+
+#: Menus.cpp:3409
+msgid "Delete Labels"
+msgstr "იარლიყების წაშლა"
+
+#: Menus.cpp:3409
+msgid "Deleted labeled regions"
+msgstr "წაშლილი იარლიყდადებული არეები"
+
+#: Menus.cpp:3421
+msgid "Split Delete Labels"
+msgstr "იარლიყების დაყოფა და წაშლა"
+
+#: Menus.cpp:3421
+msgid "Split Deleted labeled regions"
+msgstr "დაყოფილი და წაშლილი იარლიყდადებული არეები"
+
+#: Menus.cpp:3433
+msgid "Silence Labels"
+msgstr "იარლიყების დაჩუმება"
+
+#: Menus.cpp:3433
+msgid "Silenced labeled regions"
+msgstr "დაჩუმებული იარლყიდადებული არეები"
+
+#: Menus.cpp:3445
+msgid "Split Labels"
+msgstr "იარლიყების დაყოფა"
+
+#: Menus.cpp:3445
+msgid "Split labeled regions"
+msgstr "იარლიყდადებული არეების დაყოფა"
+
+#: Menus.cpp:3457
+msgid "Join Labels"
+msgstr "იარლიყების შეერთება"
+
+#: Menus.cpp:3457
+msgid "Joined labeled regions"
+msgstr "შეერთებული იარლიყდადებული არეები"
+
+#: Menus.cpp:3469
+msgid "Disjoin Labels"
+msgstr "იარლიყების შეერთება"
+
+#: Menus.cpp:3469
+msgid "Disjoined labeled regions"
+msgstr "განცალკევებული იარლიყდადებული არეები"
+
+#: Menus.cpp:3491
+#: TrackPanel.cpp:6134
+msgid "Split"
+msgstr "დაყოფა"
+
+#: Menus.cpp:3585
+msgid "Split New"
+msgstr "ახლის დაყოფა"
+
+#: Menus.cpp:3585
+msgid "Split to new track"
+msgstr "ახალ ტრეკზე დაყოფა"
+
+#: Menus.cpp:3668
+msgid "Split at labels"
+msgstr "იარლიყებზე დაყოფა"
+
+#: Menus.cpp:3969
+msgid "To plot the spectrum, all selected tracks must be the same sample rate."
+msgstr "სპექტრის აგებისთვის ყველა მონიშნული ტრეკს უნდა ჰქონდეს სემპლის თანაბარი კოეფიციენტი."
+
+#: Menus.cpp:3995
+#, c-format
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "ზედმეტი აუდიო იყო მონიშნული. მხოლოდ პირველი %.1f წამის ანალიზი მოხდება."
+
+#: Menus.cpp:4130
+#, c-format
+msgid "Imported labels from '%s'"
+msgstr " '%s'-დან იარლიყების იმპორტი"
+
+#: Menus.cpp:4131
+msgid "Import Labels"
+msgstr "იარლიყების იმპორტი"
+
+#: Menus.cpp:4142
+msgid "Select a MIDI file..."
+msgstr "MIDI ფაილის ამორჩევა"
+
+#: Menus.cpp:4146
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "MIDI და Allegro ფაილები(*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+
+#: Menus.cpp:4162
+#, c-format
+msgid "Imported MIDI from '%s'"
+msgstr "იმპორტირებული MIDI '%s'-დან"
+
+#: Menus.cpp:4163
+msgid "Import MIDI"
+msgstr "MIDI იმპორტი"
+
+#: Menus.cpp:4177
+msgid "Select any uncompressed audio file..."
+msgstr "ნებისმიერი არაკომპრესირებული ფაილის არჩევა"
+
+#: Menus.cpp:4181
+msgid "All files (*)|*"
+msgstr "ყველა ფაილი(*)|*"
+
+#: Menus.cpp:4205
+msgid "Edit the metadata tags"
+msgstr "მეტამონაცემების ჭდეების რედაქტირება"
+
+#: Menus.cpp:4206
+#: export/Export.cpp:353
+msgid "Edit Metadata"
+msgstr "მეტამონაცემების რედაქტირება"
+
+#: Menus.cpp:4206
+msgid "Edit Metadata tags"
+msgstr "მეტამონაცემების ჭდეების რედაქტირება"
+
+#: Menus.cpp:4262
+#, c-format
+msgid "Rendered all audio in track '%s'"
+msgstr "ყველა აუდიოს რენდერი  '%s' ტრეკში"
+
+#: Menus.cpp:4263
+msgid "Render"
+msgstr "რენდერი"
+
+#: Menus.cpp:4268
+#, c-format
+msgid "Mixed and rendered %d tracks into one new stereo track"
+msgstr "%d ტრეკების ერთ ახალ სტერეო ტრეკში არევა და რენდერი "
+
+#: Menus.cpp:4271
+#, c-format
+msgid "Mixed and rendered %d tracks into one new mono track"
+msgstr "%d ტრეკების ერთ ახალ მონო ტრეკში არევა და რენდერი "
+
+#: Menus.cpp:4273
+#: Mix.cpp:121
+msgid "&Mix and Render"
+msgstr "&არევა და რენდერი"
+
+#: Menus.cpp:4403
+msgid "Aligned with zero"
+msgstr "ნულოვანი გასწორება"
+
+#: Menus.cpp:4407
+msgid "Aligned cursor"
+msgstr "გასწორებული კურსორი"
+
+#: Menus.cpp:4411
+msgid "Aligned with selection start"
+msgstr "მონიშვნის დასაწყისით გასწორებული"
+
+#: Menus.cpp:4415
+msgid "Aligned with selection end"
+msgstr "მონიშვნის დასასრულით გასწორებული"
+
+#: Menus.cpp:4419
+msgid "Aligned end with cursor"
+msgstr "კურსორით გასწორებული დასასრული"
+
+#: Menus.cpp:4423
+msgid "Aligned end with selection start"
+msgstr "მონიშვნის დასაწყისით გასწორებული დასასრული"
+
+#: Menus.cpp:4427
+msgid "Aligned end with selection end"
+msgstr "მონიშვნის დასასრულით გასწორებული დასასრული"
+
+#: Menus.cpp:4431
+msgid "Aligned"
+msgstr "გახსწორებული"
+
+#: Menus.cpp:4464
+msgid "Align"
+msgstr "გასწორება"
+
+#: Menus.cpp:4549
+msgid "Sync MIDI with Audio"
+msgstr "MIDI სინქრონიზაცია აუდიოსთან"
+
+#: Menus.cpp:4553
+msgid "Alignment completed."
+msgstr "გასწორება დასრულებულია."
+
+#: Menus.cpp:4564
+msgid "Created new audio track"
+msgstr "შექმნილია ახალი აუდიო ტრეკი"
+
+#: Menus.cpp:4564
+#: Menus.cpp:4587
+#: Menus.cpp:4602
+#: Menus.cpp:4622
+msgid "New Track"
+msgstr "ახალი ტრეკი"
+
+#: Menus.cpp:4587
+msgid "Created new stereo audio track"
+msgstr "ძშექმნილია ახალი სტერეო აუდიო ტრეკი"
+
+#: Menus.cpp:4602
+msgid "Created new label track"
+msgstr "შექმნილია ახალი იარლიყის ტრეკი"
+
+#: Menus.cpp:4611
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "Audacity-ის ამ ვერსიას არ გააჩნია მრავალჯერადი დროის ტრეკების მხარდაჭერა."
+
+#: Menus.cpp:4622
+msgid "Created new time track"
+msgstr "შექმნილი ახალი დროის ტრეკი"
+
+#: Menus.cpp:4677
+msgid "Added label"
+msgstr "დამატებული იარლიყი"
+
+#: Menus.cpp:4712
+msgid "Edited labels"
+msgstr "რედაქტირებული იარლიყები"
+
+#: Menus.cpp:4739
+msgid "Save CleanSpeech Preset File As:"
+msgstr "CleanSpeech პარამეტრის ფაილის შენახვა როგორც:"
+
+#: Menus.cpp:4743
+msgid "CleanSpeech Presets (*.csp)|*.csp"
+msgstr "CleanSpeech პარამეტრები(*.csp)|*.csp"
+
+#: Menus.cpp:4750
+#: export/Export.cpp:605
+msgid "Sorry, pathnames longer than 256 characters not supported."
+msgstr "ვწუხვართ, 256 სიმბოლოზე გრძელი გეზის სახელები არ არის მხარდაჭერილი."
+
+#: Menus.cpp:4796
+msgid "Problem encountered exporting presets."
+msgstr "პარამეტრების ექსპორტისას წარმოიქმნა პრობლემა."
+
+#: Menus.cpp:4797
+#: export/Export.cpp:468
+msgid "Unable to export"
+msgstr "შეუძლებელია ესპორტირება"
+
+#: Menus.cpp:4981
+msgid "Remove Track"
+msgstr "ტრეკის წაშლა"
+
+#: Menus.cpp:4981
+msgid "Removed audio track(s)"
+msgstr "წაშლილი აუდიო ტრეკ(ბ)ი"
+
+#: Menus.cpp:5138
+#: Menus.cpp:5193
+#: export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
+msgid "Resample"
+msgstr "რესემპლირება"
+
+#: Menus.cpp:5158
+#: TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr "სემპლის ახალი კოეფიციენტი (Hz):"
+
+#: Menus.cpp:5182
+#: TrackPanel.cpp:6385
+msgid "The entered value is invalid"
+msgstr "შეყვანილი მნიშვნელობა არასწორია"
+
+#: Menus.cpp:5191
+#, c-format
+msgid "Resampling track %d"
+msgstr " %d ტრეკის რესემპლირება"
+
+#: Menus.cpp:5200
+msgid "Resample Track"
+msgstr "ტრეკის რესემპლირება"
+
+#: Menus.cpp:5200
+msgid "Resampled audio track(s)"
+msgstr "რესემპლირებული აუდიო ტრეკ(ებ)ი"
+
+#: Mix.cpp:95
+#: Mix.cpp:102
+msgid "Mix"
+msgstr "არევა"
+
+#: Mix.cpp:122
+msgid "Mixing and rendering tracks"
+msgstr "ტრეკების არევა და რენდერინგი"
+
+#: NoteTrack.cpp:43
+msgid "Note Track"
+msgstr "გაითვალისწინეთ ტრეკი"
+
+#: Printing.cpp:192
+msgid "There was a problem printing."
+msgstr "ამობეჭდვის შეცდომა."
+
+#: Printing.cpp:193
+msgid "Print"
+msgstr "ამობეჭდვა"
+
+#: Project.cpp:673
+msgid "Main Mix"
+msgstr "ძირითადი არევა"
+
+#: Project.cpp:797
+#, c-format
+msgid "Welcome to Audacity version %s"
+msgstr "მოგესალმებათ Audacity-ის ვერსია %s"
+
+#: Project.cpp:957
+msgid "(Recovered)"
+msgstr "(აღდგენილია)"
+
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record"
+msgstr "ჩაწერა"
+
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+msgid "Recorded Audio"
+msgstr "ჩაწერილი აუდიო"
+
+#: Project.cpp:1564
+msgid "Save changes before closing?"
+msgstr "შევინახო ცვლილებები დახურვამდე?"
+
+#: Project.cpp:1567
+msgid "\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr "\n"
+"შენახვის შემთხვევაში პროექტს არ ექნება ტრეკები.\n"
+"\n"
+"ადრე გახსნილი ტრეკის შესანახად::\n"
+"გაუქმეთ, რედაქტირება>მოქმედება დააბრუნეთ\n"
+"სანამ ყველა ტრეკი გახსნილია, შემდეგ ფაილი > პროექტის შენახვა."
+
+#: Project.cpp:1570
+msgid "Save changes?"
+msgstr "შევინახო ცვლილებები?"
+
+#: Project.cpp:1772
+msgid "All files|*.*|All supported files|"
+msgstr "ყველა ფაილი|*.*|ყველა მხარდაჭერილი ფაილი|"
+
+#: Project.cpp:1802
+msgid "Select one or more audio files..."
+msgstr "ერთი ან მეტი აუდიო ფაილის მონიშვნა..."
+
+#: Project.cpp:1829
+msgid "Audacity projects|*.aup|"
+msgstr "Audacity პროექტები|*.aup|"
+
+#: Project.cpp:1882
+#: Project.cpp:2304
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr "ეს ფაილი შენახულია Audacity %s'-ის, უფრო ადრინდელი\n"
+"ვერსიის მიერ. ფორმატი შეცვლილია.\n"
+"\n"
+"Audacity გახსნისას შეიძლება დააზიანოს ფაილი,\n"
+"ამიტომ ჯერ დაამარქაფეთ.\n"
+"\n"
+"გავხსნა ეს ფაილი?"
+
+#: Project.cpp:1883
+msgid "1.0 or earlier"
+msgstr "1.0 ან უფრო ადრეული"
+
+#: Project.cpp:1889
+#: Project.cpp:2316
+msgid "Opening old project file"
+msgstr "ძველი პროექტის ფაილის გახსნა"
+
+#: Project.cpp:1915
+#: Project.cpp:1923
+msgid "Error opening file"
+msgstr "ფაილის გახსნის შეცდომა"
+
+#: Project.cpp:1929
+#, c-format
+msgid "File may be invalid or corrupted: \n"
+"%s"
+msgstr "ფაილი შესაძლოა არასწორია ან დაზიანებული: \n"
+"%s"
+
+#: Project.cpp:1930
+msgid "Error opening file or project"
+msgstr "ფაილის ან პროექტის გახსნის შეცდომა"
+
+#: Project.cpp:1950
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity-იმ ვერ შეძლოა  Audacity 1.0 პროექტის კონვერტაცია ახალი პროექტის ფორმატად."
+
+#: Project.cpp:2053
+msgid "Could not remove old auto save file"
+msgstr "შეუძლებელია ძველი ავტოშენახული ფაილის წაშლა"
+
+#: Project.cpp:2055
+msgid "Project was recovered"
+msgstr "პროექტი აღდგენილია"
+
+#: Project.cpp:2055
+msgid "Recover"
+msgstr "აღდგენა"
+
+#: Project.cpp:2084
+msgid "Project checker repaired file"
+msgstr "პროექტის შემმოწმებელმა აღადგინა ფაილი"
+
+#: Project.cpp:2084
+#: effects/Repair.h:29
+msgid "Repair"
+msgstr "აღდგნა"
+
+#: Project.cpp:2230
+#, c-format
+msgid "Couldn't find the project data folder: \"%s\""
+msgstr "შეუძლებელია პროექტის მონაცემთა საქაღალდის პოვნა: \"%s\""
+
+#: Project.cpp:2273
+#, c-format
+msgid "This file was saved using Audacity %s.\n"
+"You are using Audacity %s - you need to upgrade to\n"
+"a newer version to open this file."
+msgstr "ეს ფაილი შეინახული იყო Audacity %s-ის გამოყენებით.\n"
+"თქვენ გამოიყენებთ Audacity %s - ფაილის გასახსნელად საჭიროა განახლება\n"
+"ახალ ვერსიამდე."
+
+#: Project.cpp:2277
+msgid "Can't open project file"
+msgstr "შეუძლებელია პროექტის ფაილის გახსნა"
+
+#: Project.cpp:2311
+#, c-format
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
+"\n"
+"Open this file now?"
+msgstr "ეს ფაილი შენახული იყო Audacity %s.ის მიერ\n"
+"ამ ფაილის Audacity ამ ვერსიით  გახსნა შესაძლებელია, მაგრამ თუ მას ამ ვერსიით შეინახავთ, ძველი ვერსიით მისი გახსნა შეუძლებელი გახდება.\n"
+"\n"
+"გავხსნა ფაილი?"
+
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2588
+#, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr "შეუძლებელია პროექტის გახსნა. შესაძლოა%s \n"
+"არ არის ჩაწერადი ან დისკია გადავსებული."
+
+#: Project.cpp:2590
+#: Project.cpp:2605
+msgid "Error saving project"
+msgstr "პროექტის შენახვის შეცდომა"
+
+#: Project.cpp:2680
+#, c-format
+msgid "Saved %s"
+msgstr "შენახულია %s"
+
+#: Project.cpp:2806
+#, c-format
+msgid "Imported '%s'"
+msgstr "იმპორტირებულია '%s'"
+
+#: Project.cpp:2807
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "იმპორტი"
+
+#: Project.cpp:2840
+#: Project.cpp:2848
+msgid "Error importing"
+msgstr "იმპორტის შეცდომა"
+
+#: Project.cpp:2882
+msgid "Save Speech As:"
+msgstr "საუბრის შენახვა როგორც:"
+
+#: Project.cpp:2884
+msgid "Windows PCM Audio file (*.wav)|*.wav"
+msgstr "Windows PCM აუდიო ფაილი(*.wav)|*.wav"
+
+#: Project.cpp:2891
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
+"\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
+"Export commands."
+msgstr "Audacity-ს კომპრესირებული პროექტის ფაილები (.aup)  თქვენს ნამუშევარს შეინახავს უფრო მცირე, კომპრესირებულ (.ogg) ფორმატში. \n"
+"კომპრესირებული პროექტის ფაილები კარგი საშუალებაა თქვენი პროექტის ინტერნეტში გადასატანად, სიმცირის გამო. \n"
+"შეკუმშული პროექტის გახსნა უფრო მეტ დროს მოითხოვს, რადგან ახდენს თითოეული ტრეკის იმპორტირებას. \n"
+"\n"
+"უმეტესობა სხვა პროგრამებისა ვერ ხსნის Audacity პროექტის ფაილებს.\n"
+"როდესაც გსურთ ფაილის გახსნა პროგრამით, რომელსაც შეუძლია გახსნა, მონიშნეთ\n"
+"ექსპორტის ერთ-ერთი ბრძანება."
+
+#: Project.cpp:2894
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr "თქვენ ინხავთ  Audacity პროექტის ფაილს (.aup).\n"
+"\n"
+"პროექტის შენახვა ქმნის ფაილს, რომლის გახსნაც მხოლოდ Audacity-ის შეუძლია.\n"
+"\n"
+"აუდიო ფაილის სხვა პროგრამებით შენახვისთვის გამოიყენეთ ერთ-ერთი \"ფაილი >ექსპორტი\"  ბრძანება.\n"
+
+#: Project.cpp:2898
+msgid "Audacity projects (*.aup)|*.aup"
+msgstr "Audacity პროექტები(*.aup)|*.aup"
+
+#: Project.cpp:2952
+msgid "Created new project"
+msgstr "ახალი შექმნილი პროექტი"
+
+#: Project.cpp:3111
+#, c-format
+msgid "Deleted %.2f seconds at t=%.2f"
+msgstr "წაშლილია %.2f წამი t=%.2f"
+
+#: Project.cpp:3114
+#: effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
+msgid "Delete"
+msgstr "წაშლა"
+
+#: Project.cpp:3308
+#, c-format
+msgid "Disk space remains for recording %d hours and %d minutes."
+msgstr "ჩაწერისთვის დარჩენილი სივრცე %d საათი და %d წუთი."
+
+#: Project.cpp:3311
+#, c-format
+msgid "Disk space remains for recording 1 hour and %d minutes."
+msgstr "ჩაწერისთვის დარჩენილი სივრცე 1 საათი და %d წუთი"
+
+#: Project.cpp:3314
+#, c-format
+msgid "Disk space remains for recording %d minutes."
+msgstr "ჩაწერისთვის დარჩენილი სივრცე %d წუთი."
+
+#: Project.cpp:3317
+#, c-format
+msgid "Disk space remains for recording %d seconds."
+msgstr "ჩაწერისთვის დარჩენილი სივრცე %d წამი."
+
+#: Project.cpp:3320
+msgid "Out of disk space"
+msgstr "დისზე სივრცე აღარ დარჩა"
+
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr "იმპორტირება დასრულებულია. გაშვებულია %d მოთხოვნადი ტალღოვანი გამოთვლები. სულ %2.0f%%-ია დასრულებული"
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr "მპორტირება დასრულებულია. გაშვებულია მოთხოვნადი ტალღოვანი გამოთვლები. დასრულებულია %2.0f%%."
+
+#: Project.cpp:3614
+msgid "Could not remove old autosave file: "
+msgstr "შეუძლებელია ძველი ავტოშენახული ფაილის წაშლა:"
+
+#: Project.cpp:3655
+msgid "New Project"
+msgstr "ახალი პროექტი"
+
+#: Project.cpp:3668
+msgid "Error writing autosave file"
+msgstr "ავტოშენახვის ფაილის ჩაწერის შეცდომა"
+
+#: Project.cpp:3693
+msgid "Could not create autosave file: "
+msgstr "შეუძლებელია ავტოშენახვის ფაილის შექმნა:"
+
+#: Project.cpp:3719
+#, c-format
+msgid "Actual Rate: %d"
+msgstr "რეალური კოეფიციენტი: %d"
+
+#: Resample.cpp:42
+msgid "Libresample by Dominic Mazzoni and Julius Smith"
+msgstr "Libresample Dominic Mazzoni და Julius Smith მიერ"
+
+#: Resample.cpp:53
+msgid "High-quality Sinc Interpolation"
+msgstr "მაღალი ხარისხის Sinc ინტერპოლაცია"
+
+#: Resample.cpp:55
+msgid "Fast Sinc Interpolation"
+msgstr "სწრაფი Sinc ინტერპოლაცია"
+
+#: Resample.cpp:125
+msgid "Libsamplerate by Erik de Castro Lopo"
+msgstr "Libsamplerate Erik de Castro Lopo მიერ"
+
+#: Resample.cpp:218
+#, c-format
+msgid "Libsamplerate error: %d\n"
+msgstr "Libsamplerate შეცდომა: %d\n"
+
+#: Resample.cpp:240
+#: Resample.cpp:250
+msgid "Resampling disabled."
+msgstr "რესემპლინგი გაუქმებულია."
+
+#. i18n-hint: Audio data bit depth (precison): 16-bit integers
+#: SampleFormat.cpp:66
+msgid "16-bit PCM"
+msgstr "16-ბიტიანი PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 24-bit integers
+#: SampleFormat.cpp:69
+msgid "24-bit PCM"
+msgstr "24-ბიტიანი PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 32-bit floating point
+#: SampleFormat.cpp:72
+msgid "32-bit float"
+msgstr "32-ბიტიანი მცოცავი"
+
+#: Screenshot.cpp:384
+msgid "Saved "
+msgstr "შენახულია"
+
+#: Screenshot.cpp:387
+msgid "Error trying to save file: "
+msgstr "ფაილის შენახვის შეცდომა:"
+
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
+msgid "Gap detected in project file\n"
+msgstr "პროექტის ფაილში შეიმჩნევა რღვევა\n"
+
+#: ShuttleGui.cpp:1972
+#: effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
+msgid "Pre&view"
+msgstr "ეს&კიზი"
+
+#: ShuttleGui.cpp:1979
+msgid "&Debug"
+msgstr "&ხარვეზების აღმოფხვრა"
+
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "ხმაგააქტიურებული ჩაწერა"
+
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "აქტივაციის დონე (dB):"
+
+#: SplashDialog.cpp:60
+msgid "&Welcome to Audacity!"
+msgstr "&მოგესალმებათ Audacity!"
+
+#: SplashDialog.cpp:112
+msgid "Don't show this again at start up"
+msgstr "აღარ აჩვენო გაშვებისას"
+
+#: Tags.cpp:640
+msgid "Artist Name"
+msgstr "შემსრულებლის სახელი"
+
+#: Tags.cpp:641
+msgid "Track Title"
+msgstr "ტრეკის სახელი"
+
+#: Tags.cpp:642
+msgid "Album Title"
+msgstr "ალბომის სახელი"
+
+#: Tags.cpp:643
+msgid "Track Number"
+msgstr "ტრეკის ნომერი"
+
+#: Tags.cpp:644
+#: Tags.cpp:2147
+msgid "Year"
+msgstr "წელი"
+
+#: Tags.cpp:645
+msgid "Genre"
+msgstr "ჟანრი"
+
+#: Tags.cpp:646
+#: Tags.cpp:2157
+#: prefs/MousePrefs.cpp:96
+msgid "Comments"
+msgstr "კომენტარები"
+
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
+
+#: Tags.cpp:813
+msgid "Tag Name"
+msgstr "ჭდის სახელი"
+
+#: Tags.cpp:814
+msgid "Tag Value"
+msgstr "ჭდის მნიშვნელობა"
+
+#: Tags.cpp:829
+#: Tags.cpp:1486
+#: prefs/KeyConfigPrefs.cpp:116
+msgid "&Clear"
+msgstr "&გაწმენდა"
+
+#: Tags.cpp:835
+msgid "Genres"
+msgstr "ჟანრები"
+
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
+
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
+
+#: Tags.cpp:845
+#: Tags.cpp:1470
+#: Tags.cpp:1997
+msgid "Template"
+msgstr "შაბლონი"
+
+#: Tags.cpp:849
+#: Tags.cpp:1474
+#: Tags.cpp:2001
+#: prefs/KeyConfigPrefs.cpp:126
+msgid "&Load..."
+msgstr "&ჩატვირთვა..."
+
+#: Tags.cpp:850
+#: Tags.cpp:1475
+#: Tags.cpp:2002
+#: prefs/KeyConfigPrefs.cpp:125
+msgid "&Save..."
+msgstr "&შენახვა..."
+
+#: Tags.cpp:852
+#: Tags.cpp:1477
+#: Tags.cpp:2004
+msgid "S&et Default"
+msgstr "ნაგულისხმევი პარამეტრების დაყენება"
+
+#: Tags.cpp:1002
+#: Tags.cpp:1640
+#: Tags.cpp:2368
+msgid "Edit Genres"
+msgstr "ჟანრების რედაქტირება"
+
+#: Tags.cpp:1035
+#: Tags.cpp:1047
+#: Tags.cpp:1062
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1690
+#: Tags.cpp:1705
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2423
+#: Tags.cpp:2438
+#: Tags.cpp:2451
+msgid "Reset Genres"
+msgstr "ჟანრების ნაგულისხმევ პარამეტრებამდე დაყვანა"
+
+#: Tags.cpp:1035
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2451
+msgid "Unable to save genre file."
+msgstr "შეუძლებელია ჟანრის ფაილის შენახვა."
+
+#: Tags.cpp:1046
+#: Tags.cpp:1689
+#: Tags.cpp:2422
+msgid "Are you sure you want to reset the genre list to defaults?"
+msgstr "მართლა გსურთ ჟანრების ნუსხის ნაგულისხმევ პარამეტრებამდე დაყვანა?"
+
+#: Tags.cpp:1062
+#: Tags.cpp:1705
+#: Tags.cpp:2438
+msgid "Unable to open genre file."
+msgstr "შეუძლებელია ჟანრის ფაილის შენახვა."
+
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
+msgid "Error loading metadata"
+msgstr "მეტამონაცემების ჩატვირთვის შეცდომა"
+
+#: Tags.cpp:1097
+#: Tags.cpp:1151
+#: Tags.cpp:1751
+#: Tags.cpp:1787
+#: Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "მეტამონაცემების შენახვა როგორც:"
+
+#: Theme.cpp:638
+#, c-format
+msgid "Audacity could not write file:\n"
+"  %s."
+msgstr "Audacity ვერ შეძლო ფაილის ჩაწერა:\n"
+"  %s."
+
+#: Theme.cpp:656
+#, c-format
+msgid "Audacity could not open file:\n"
+"  %s\n"
+"for writing."
+msgstr "Audacity ვერ შეძლო:\n"
+"  %s\n"
+"ფაილის გახსნა ჩასაწერად."
+
+#: Theme.cpp:664
+#, c-format
+msgid "Audacity could not write images to file:\n"
+"  %s."
+msgstr "Audacity ვერ შეძლო გამოსახულებების ჩაწერა ფაილზე:\n"
+"  %s."
+
+#: Theme.cpp:799
+#, c-format
+msgid "Audacity could not find file:\n"
+"  %s.\n"
+"Theme not loaded."
+msgstr "Audacity-იმ ვერ გახსნა ფაილი:\n"
+"  %s.\n"
+"თემა არ ჩატვირთულა."
+
+#: Theme.cpp:807
+#: Theme.cpp:896
+#, c-format
+msgid "Audacity could not load file:\n"
+"  %s.\n"
+"Bad png format perhaps?"
+msgstr "Audacity-იმ ვერ ჩატვირთა ფაილი:\n"
+"  %s.\n"
+"იქნებ ცუდი png ფორმატია?"
+
+#: Theme.cpp:823
+msgid "Audacity could not read its default theme.\n"
+"Please report the problem."
+msgstr "Audacity ვერ წაიკითხა თავისი ნაგულისხმევი თემა.\n"
+"შეატყობინეთ ამ პრობლემის შესახებ."
+
+#: Theme.cpp:918
+#, c-format
+msgid "None of the expected theme component files\n"
+" were found in:\n"
+"  %s."
+msgstr "თემის კომპონენტების ფაილებიდან არცერთი მოსალოდნელი\n"
+" ვერ მოიძებნა:\n"
+"  %s."
+
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
+#, c-format
+msgid "Could not create directory:\n"
+"  %s"
+msgstr "შეუძლებელია დირექტორიის შექმნა:\n"
+"  %s"
+
+#: Theme.cpp:963
+#, c-format
+msgid "Audacity could not save file:\n"
+"  %s"
+msgstr "Audacity-ის არ შეუძლია ფაილის შენახვა:\n"
+"  %s"
+
+#: Theme.cpp:975
+#, c-format
+msgid "All required files in:\n"
+"  %s\n"
+"were already present."
+msgstr "ყველა მოთხოვნილი ფაილები:\n"
+"  %s\n"
+"უკვე არსებობს."
+
+#: TimeDialog.cpp:53
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "ხანგრძლოვობა"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity ტაიმერის ჩაწერა"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "ჩაწერის დაწყება"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "ჩაწერის დასასრული"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr "Audacity  ტაიმერის ჩაწერის მიმდინარეობა"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "საწყისი თარიღი და დრო"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr "საწყისი დრო"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "დასასრული თარიღი და დრო"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr "დასასრული თარიღი"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "კოდირების დაწყების მოლოდინი %s-ზე.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Audacity ტაიმერის ჩაწერა - დაწყების მოლოდინი"
+
+#: TrackPanel.cpp:457
+#: TrackPanel.cpp:458
+msgid "Track Panel"
+msgstr "ტრეკის ზოლი"
+
+#: TrackPanel.cpp:541
+#: prefs/QualityPrefs.cpp:97
+msgid "Other..."
+msgstr "სხვა..."
+
+#: TrackPanel.cpp:549
+#: TrackPanel.cpp:571
+#: TrackPanel.cpp:580
+#: TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
+msgid "Name..."
+msgstr "სახელი..."
+
+#: TrackPanel.cpp:551
+#: TrackPanel.cpp:573
+#: TrackPanel.cpp:584
+#: TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
+msgid "Move Track Up"
+msgstr "ტრეკის ატანა"
+
+#: TrackPanel.cpp:552
+#: TrackPanel.cpp:574
+#: TrackPanel.cpp:585
+#: TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
+msgid "Move Track Down"
+msgstr "ტრეკის ჩამოტანა"
+
+#: TrackPanel.cpp:554
+#: effects/ToneGen.cpp:319
+#: prefs/GUIPrefs.cpp:154
+msgid "Waveform"
+msgstr "ტალღოვანი"
+
+#: TrackPanel.cpp:555
+#: prefs/GUIPrefs.cpp:155
+msgid "Waveform (dB)"
+msgstr "ტალღოვანი (dB)"
+
+#: TrackPanel.cpp:557
+#: prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr "სპექტრის ჩანაწერი(f)"
+
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558
+#: prefs/GUIPrefs.cpp:158
+msgid "Pitch (EAC)"
+msgstr "Pitch (EAC)"
+
+#: TrackPanel.cpp:560
+#: TrackPanel.cpp:6096
+msgid "Mono"
+msgstr "მონო"
+
+#: TrackPanel.cpp:561
+#: TrackPanel.cpp:6095
+msgid "Left Channel"
+msgstr "მარცხენა არხი"
+
+#: TrackPanel.cpp:562
+#: TrackPanel.cpp:6095
+msgid "Right Channel"
+msgstr "მარჯვენა არხი"
+
+#: TrackPanel.cpp:563
+msgid "Make Stereo Track"
+msgstr "სტერეო ტრეკის შექმნა"
+
+#: TrackPanel.cpp:564
+msgid "Split Stereo Track"
+msgstr "სტერეო ტრეკის დაყოფა"
+
+#: TrackPanel.cpp:566
+msgid "Set Sample Format"
+msgstr "სემპლის ფორმატის მომართვა"
+
+#: TrackPanel.cpp:568
+#: TrackPanel.cpp:6341
+msgid "Set Rate"
+msgstr "კოეფიციენტის მომართვა"
+
+#: TrackPanel.cpp:576
+msgid "Up Octave"
+msgstr "ოქტავით მაღლა"
+
+#: TrackPanel.cpp:577
+msgid "Down Octave"
+msgstr "ოქტავით დაბლა"
+
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:5795
+msgid "Font..."
+msgstr "შრიფტი..."
+
+#: TrackPanel.cpp:593
+msgid "Set Range..."
+msgstr "დიაპაზონის მომართვა..."
+
+#: TrackPanel.cpp:597
+#: toolbars/EditToolBar.cpp:135
+msgid "Copy"
+msgstr "კოპირება"
+
+#: TrackPanel.cpp:1258
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "ვერტიკალური შემცირებისთვის დაუწკაპუნეთ, Shift-დაწკაპუნება გადიდებისთვის, გადათრევა კი ქმნის მასშტაბირების კონკრეტული არეს."
+
+#: TrackPanel.cpp:1263
+msgid "Drag the label vertically to change the order of the tracks."
+msgstr "იარლიყი გადაათრიეთ ვერტიკალურად ტრეკების რიგის შესაცვლელად."
+
+#: TrackPanel.cpp:1283
+msgid "Click and drag to adjust relative size of stereo tracks."
+msgstr "სტერეო ტრეკების რელატიური ზომის მოსარგებად დააწკაპუნეთ და გადაათრიეთ."
+
+#: TrackPanel.cpp:1286
+msgid "Click and drag to resize the track."
+msgstr "ტრეკის ზომის შესაცვლელად დაუწკაპუნეთ და გადაათრიეთ."
+
+#: TrackPanel.cpp:1317
+msgid "Drag one or more label boundaries"
+msgstr "ერთი ან მეტი იარლიყის საზღვრების გადათრევა"
+
+#: TrackPanel.cpp:1318
+msgid "Drag label boundary"
+msgstr "იარლიყის საზღვრის გადათრევა"
+
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1334
+msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
+msgstr "მრავალ-ხელსაწყოიანი რეჟიმი: Cmd-, მაუსისა და კლავიატურის პარამეტრებისთვის"
+
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1337
+msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
+msgstr "მრავალ-ხელსაწყოიანი რეჟიმი: Ctrl-P   მაუსისა და კლავიატურის პარამეტრებისთვის"
+
+#: TrackPanel.cpp:1383
+msgid "Click and drag to move left selection boundary."
+msgstr "დაუწკაპუნეთ და გადაათრიეთ მონიშვნის საზღვრის მარცხნივ გადატანისთვის."
+
+#: TrackPanel.cpp:1388
+msgid "Click and drag to move right selection boundary."
+msgstr "დაუწკაპუნეთ და გადაათრიეთ მონიშვნის საზღვრის მარჯვნივ გადატანისთვის."
+
+#: TrackPanel.cpp:1730
+#: TrackPanel.cpp:3959
+#: TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
+msgid "Modified Label"
+msgstr "შეცვლილი იარლიყი"
+
+#: TrackPanel.cpp:1731
+#: TrackPanel.cpp:3960
+#: TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
+msgid "Label Edit"
+msgstr "იარლიყის რედაქტირება"
+
+#: TrackPanel.cpp:1971
+msgid "Adjusted envelope."
+msgstr "მორგებული კონვერტი."
+
+#: TrackPanel.cpp:1972
+#: prefs/MousePrefs.cpp:115
+msgid "Envelope"
+msgstr "კონვერტი"
+
+#: TrackPanel.cpp:2123
+msgid "Moved clip to another track"
+msgstr "სხვა ტრეკზე გადატანილი სანიშნი"
+
+#: TrackPanel.cpp:2127
+msgid "left"
+msgstr "მარცხნივ"
+
+#: TrackPanel.cpp:2127
+msgid "right"
+msgstr "მარჯვენა"
+
+#. i18n-hint: %s is a direction like left or right
+#: TrackPanel.cpp:2129
+#, c-format
+msgid "Time shifted tracks/clips %s %.02f seconds"
+msgstr "დრო შენაცვლებული ტრეკები/კლიპები  %s %.02f  წამი"
+
+#: TrackPanel.cpp:2133
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
+msgid "Time-Shift"
+msgstr "დრო-ცვლა"
+
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr "აგების გამოსაყენებლად ამოირჩიეთ  'ტალღოვანი' ტრეკის ჩამოსაშლელი სიიდან."
+
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr "აგების გამოსაყენებლად გაადიდეთ იქამდე, სანამ არ დაინახავთ ინდივიდუალურ სემპლებს."
+
+#: TrackPanel.cpp:3205
+msgid "Moved Sample"
+msgstr "გადაადგილებული სემპლი"
+
+#: TrackPanel.cpp:3206
+msgid "Sample Edit"
+msgstr "სემპლის რედაქტირება"
+
+#: TrackPanel.cpp:3305
+#, c-format
+msgid "Removed track '%s.'"
+msgstr "წაშლილი ტრეკი '%s.'"
+
+#: TrackPanel.cpp:3307
+msgid "Track Remove"
+msgstr "ტრეკის წაშლა"
+
+#: TrackPanel.cpp:3448
+msgid "Moved gain slider"
+msgstr "გადაადგილებული gain ცოცია"
+
+#: TrackPanel.cpp:3448
+msgid "Moved pan slider"
+msgstr "გადაადგილებული pan ცოცია"
+
+#. i18n-hint: Title of the Gain slider, used to adjust the volume
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5703
+#: TrackPanel.cpp:7244
+msgid "Gain"
+msgstr "Gain"
+
+#. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5641
+#: TrackPanel.cpp:7251
+msgid "Pan"
+msgstr "Pan"
+
+#: TrackPanel.cpp:3576
+#: TrackPanel.cpp:6441
+msgid "up"
+msgstr "ზემოთ"
+
+#: TrackPanel.cpp:3580
+#: TrackPanel.cpp:6442
+msgid "down"
+msgstr "ქვემოთ"
+
+#: TrackPanel.cpp:3587
+#: TrackPanel.cpp:6437
+#, c-format
+msgid "Moved '%s' %s"
+msgstr "გადაადგილებული '%s' %s"
+
+#: TrackPanel.cpp:3590
+#: TrackPanel.cpp:6443
+msgid "Move Track"
+msgstr "ტრეკის გადაადგილება"
+
+#: TrackPanel.cpp:4155
+msgid "Expand"
+msgstr "გაფართოება"
+
+#: TrackPanel.cpp:4155
+msgid "Expanded Cut Line"
+msgstr "გაფართოებული ამოჭრის ხაზი"
+
+#: TrackPanel.cpp:4164
+msgid "Merge"
+msgstr "შერწყმა"
+
+#: TrackPanel.cpp:4164
+msgid "Merged Clips"
+msgstr "შერწყმული სანიშნები"
+
+#: TrackPanel.cpp:4176
+msgid "Removed Cut Line"
+msgstr "წაშლილი ამოჭრის ხაზი"
+
+#: TrackPanel.cpp:5641
+msgid "Adjusted Pan"
+msgstr "მორგებული Pan"
+
+#: TrackPanel.cpp:5703
+msgid "Adjusted gain"
+msgstr " მორგებული gain"
+
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr "Wave ტრეკის მიხედვით დაჯგუდება"
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr "დაჯგუფებების გაწმენდა"
+
+#: TrackPanel.cpp:5923
+msgid "Can't delete track with active audio"
+msgstr "აქტიური აუდიოს მქონე ტრეკის წაშლა შეუძლებელია"
+
+#: TrackPanel.cpp:6076
+msgid "Stereo, "
+msgstr "სტერეო,"
+
+#: TrackPanel.cpp:6079
+msgid "Mono, "
+msgstr "მონო,"
+
+#: TrackPanel.cpp:6081
+msgid "Left, "
+msgstr "მარცხენა,"
+
+#: TrackPanel.cpp:6083
+msgid "Right, "
+msgstr "მარჯვენა,"
+
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
+#, c-format
+msgid "Changed '%s' to %s"
+msgstr "შეცვლილი '%s'-დან %s-ზე"
+
+#: TrackPanel.cpp:6110
+msgid "Channel"
+msgstr "არხი"
+
+#: TrackPanel.cpp:6131
+#, c-format
+msgid "Split stereo track '%s'"
+msgstr "სტერო ტრეკის დაყოფა '%s'"
+
+#: TrackPanel.cpp:6169
+#, c-format
+msgid "Made '%s' a stereo track"
+msgstr "შექმნილი '%s' სტერეო ტრეკი"
+
+#: TrackPanel.cpp:6172
+msgid "Make Stereo"
+msgstr "სტერეოს შექმნა"
+
+#: TrackPanel.cpp:6215
+#, c-format
+msgid "Changed '%s' to %d Hz"
+msgstr "შეცვლილია '%s' -დან  %d ჰ-მდე"
+
+#: TrackPanel.cpp:6217
+msgid "Rate Change"
+msgstr "კოეფიციენტის შეცვლა"
+
+#: TrackPanel.cpp:6255
+msgid "Format Change"
+msgstr "ფორმატის შეცვლა"
+
+#: TrackPanel.cpp:6405
+msgid "Change lower speed limit (%) to:"
+msgstr "დაბალი სიჩქარის ლიმიტის შეცვლა (%):"
+
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
+msgid "Lower speed limit"
+msgstr "დაბალი სიჩქარის ლიმიტი"
+
+#: TrackPanel.cpp:6412
+msgid "Change upper speed limit (%) to:"
+msgstr "მაღალი სიჩქარის ლიმიტის შეცვლა (%):"
+
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
+msgid "Upper speed limit"
+msgstr "მაღალი სიჩქარის ლიმიტი"
+
+#: TrackPanel.cpp:6422
+#, c-format
+msgid "Set range to '%d' - '%d'"
+msgstr "დიაპაზონის მომართვა '%d'-დან '%d'-მდე"
+
+#: TrackPanel.cpp:6425
+msgid "Set Range"
+msgstr "დიაპაზონის მორგება"
+
+#: TrackPanel.cpp:6472
+msgid "Change track name to:"
+msgstr "ტრეკის სახელის შეცვლა:"
+
+#: TrackPanel.cpp:6473
+msgid "Track Name"
+msgstr "ტრეკის სახელი"
+
+#: TrackPanel.cpp:6476
+#, c-format
+msgid "Renamed '%s' to '%s'"
+msgstr "სახელშეცვლილია '%s' -დან  '%s'-ზე"
+
+#: TrackPanel.cpp:6479
+msgid "Name Change"
+msgstr "სახელის შეცვლა"
+
+#: TrackPanel.cpp:6580
+msgid "Label Track Font"
+msgstr "ტრეკის შრიფტის იარლიყი"
+
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
+msgid "Face name"
+msgstr "სახის სახელი"
+
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
+msgid "Face size"
+msgstr "სახის ზომა"
+
+#: TrackPanel.cpp:7171
+msgid "Mute"
+msgstr "დადუმება"
+
+#: TrackPanel.cpp:7171
+msgid "Solo"
+msgstr "სოლო"
+
+#: TrackPanelAx.cpp:273
+msgid "TrackView"
+msgstr "ტრეკის ხედი"
+
+#: TrackPanelAx.cpp:281
+msgid "Track Accessible out of sync"
+msgstr "ხელმისაწვდომი ტრეკი სინქრონიზაციის გარეთაა"
+
+#: TrackPanelAx.cpp:289
+#, c-format
+msgid "Track %d"
+msgstr "ტრეკი %d"
+
+#: TrackPanelAx.cpp:295
+msgid " Mute On"
+msgstr "დადუმება ჩართულია"
+
+#: TrackPanelAx.cpp:300
+msgid " Solo On"
+msgstr "სოლო ჩართულია"
+
+#: TrackPanelAx.cpp:304
+msgid " Select On"
+msgstr "მონიშვნა ჩართულია"
+
+#: VoiceKey.cpp:88
+#: VoiceKey.cpp:238
+#: VoiceKey.cpp:376
+#: VoiceKey.cpp:517
+msgid "Selection is too small to use voice key."
+msgstr "ხმის გასაღების გამოსაყენებლად მონიშვნა ძალიან მცირეა."
+
+#: VoiceKey.cpp:843
+msgid "Calibration Results\n"
+msgstr "კალიბრაზიის შედეგები\n"
+
+#: VoiceKey.cpp:844
+#, c-format
+msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "ენერგია                   -- ტოლია: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:845
+#, c-format
+msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "ნიშნების ცვლილებები       -- ტოლია: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:846
+#, c-format
+msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "მიმართულების ცვლილებები  -- ტოლია: %1.4f  sd: (%1.4f)\n"
+
+#: WaveTrack.cpp:88
+msgid "Audio Track"
+msgstr "აუდიო ტრეკი"
+
+#: WaveTrack.cpp:597
+#: WaveTrack.cpp:616
+#: WaveTrack.cpp:1057
+#: WaveTrack.cpp:1076
+msgid "There is not enough room available to paste the selection"
+msgstr "მონიშვნის ჩასასმელად არ არის საკმარისი სივრცე"
+
+#: WaveTrack.cpp:2086
+msgid "There is not enough room available to expand the cut line"
+msgstr "ამოჭრის ხაზის გასაფართოებლად არ არის საკმარისი სივრცე"
+
+#: commands/CommandManager.cpp:555
+#, c-format
+msgid "Plugins 1 to %i"
+msgstr "მოდულები 1-დან %i-მდე"
+
+#: commands/CommandManager.cpp:569
+#, c-format
+msgid "Plugins %i to %i"
+msgstr "მოდულები %i-დან  %i-მდე"
+
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "გაუქმებულია რაღაც მიზეზით. იქნებ რაიმე აუდიოს ამორჩევა სცადოთ ჯერ?"
+
+#: commands/CommandManager.cpp:892
+msgid "You can only do this when playing and recording are\n"
+" stopped.  [Pausing is not sufficient.]"
+msgstr "ამის გაკეთება შეგიძლიათ მარტო მაშინ, როდესაც დაკვრა და ჩაწერა\n"
+" შეჩერებულია.  [პაუზა არ არის საკმარისი.]"
+
+#: commands/CommandManager.cpp:894
+msgid "You must first select some stereo audio for this\n"
+" to use.  [You can't use this with mono.]"
+msgstr "ჯერ უნდა ამოირჩიოთ რაიმე სტერო აუდიო\n"
+"ამის გამოსაყენებლად [არ გამოიყენება მონოსთან.]"
+
+#: commands/CommandManager.cpp:896
+msgid "You must first select some audio for this to use."
+msgstr "ჯერ უნდა აირჩიოთ აუდიო."
+
+#: commands/CommandManager.cpp:898
+msgid "You must first select some audio for this\n"
+" to use. [Selecting other kinds of track won't work.]"
+msgstr "ჯერ უნდა აირჩიოთ რაიმე აუდიო\n"
+"ამის გამოსაყენებლად [სხვა სახის ტრეკების ამორჩევა უშედეგოა.]"
+
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr "გაუქმებული."
+
+#: commands/CommandManager.cpp:1083
+#, c-format
+msgid "Loaded %d keyboard shortcuts\n"
+msgstr "ჩატვირთულია %d კლავიატურის მალსახმობი\n"
+
+#: commands/CommandManager.cpp:1085
+msgid "Loading keyboard shortcuts"
+msgstr "კლავიატურის მალსახმობების ჩატვირთვა"
+
+#: effects/Amplify.cpp:52
+#, c-format
+msgid "Applied effect: %s %.1f dB"
+msgstr "გააქტიურებული ეფექტი: %s %.1f dB"
+
+#: effects/Amplify.cpp:139
+msgid "Amplify"
+msgstr "გაძლიერება"
+
+#: effects/Amplify.cpp:155
+#: effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "Dominic Mazzoni-ის მიერ"
+
+#: effects/Amplify.cpp:168
+msgid "Amplification (dB):"
+msgstr "გაძლიერება (dB):"
+
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:190
+msgid "New Peak Amplitude (dB):"
+msgstr "ამპლიტუდის ახალი პიკი (dB):"
+
+#: effects/Amplify.cpp:200
+msgid "Allow clipping"
+msgstr "სანიშნების დაშვება"
+
+#: effects/Amplify.cpp:222
+#: effects/Amplify.cpp:279
+#: effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr "-უსასრულობა"
+
+#: effects/Amplify.h:37
+msgid "Amplify..."
+msgstr "გაძლიერება..."
+
+#: effects/Amplify.h:51
+msgid "Amplifying"
+msgstr "გაძლიერება"
+
+#: effects/AutoDuck.cpp:125
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "მონიშნული გაქვთ ტრეკი, რომელიც არ შეიცავს აუდიოს. AutoDuck-ს მხოლოდ აუდიო ტრეკების დამუშავება შეუძლია."
+
+#: effects/AutoDuck.cpp:126
+#: effects/AutoDuck.cpp:138
+#: effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:570
+msgid "Auto Duck"
+msgstr "Auto Duck"
+
+#: effects/AutoDuck.cpp:137
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Auto Duck სჭირდება საკონტროლო ტრეკი, რომელიც მოთავსებული უნდა იყოს მონიშნული ტრეკ(ებ)ის ქვემოთ."
+
+#: effects/AutoDuck.cpp:465
+msgid "Auto Duck by Markus Meyer"
+msgstr "Auto Duck  Markus Meyer-ის მიერ"
+
+#: effects/AutoDuck.cpp:487
+msgid "Duck amount:"
+msgstr "Duck რაოდენობა:"
+
+#: effects/AutoDuck.cpp:492
+msgid "Maximum pause:"
+msgstr "მაქსიმალური პაუზა:"
+
+#. i18n-hint: Name of time display format that shows time in seconds
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: effects/Contrast.cpp:263
+#: effects/Contrast.cpp:286
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
+#: prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163
+#: prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
+msgid "seconds"
+msgstr "წამები"
+
+#: effects/AutoDuck.cpp:497
+msgid "Outer fade down length:"
+msgstr "გარე მინავლების სიგრძე:"
+
+#: effects/AutoDuck.cpp:502
+msgid "Outer fade up length:"
+msgstr "გარე ხმის აწევის სიგრძე:"
+
+#: effects/AutoDuck.cpp:507
+msgid "Inner fade down length:"
+msgstr "შიდა მინავლების სიგრძე:"
+
+#: effects/AutoDuck.cpp:512
+msgid "Inner fade up length:"
+msgstr "შიდა ხმის აწევის სიგრძე:"
+
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:494
+msgid "Threshold:"
+msgstr "ზღვარი:"
+
+#: effects/AutoDuck.cpp:570
+msgid "Please enter valid values."
+msgstr "გთხოვთ შეიყვანოთ სწორი მნიშვნელობები."
+
+#: effects/AutoDuck.cpp:705
+msgid "Preview not available"
+msgstr "დათვალიერება შეუძლებელია"
+
+#: effects/AutoDuck.h:98
+msgid "Auto Duck..."
+msgstr "Auto Duck..."
+
+#: effects/AutoDuck.h:115
+msgid "Processing Auto Duck..."
+msgstr "Auto Duck დამუშავება..."
+
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
+msgid "OK"
+msgstr "დიახ"
+
+#: effects/BassBoost.cpp:52
+#, c-format
+msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
+msgstr "გააქტიურებული ეფექტი: %s სიხშირე = %.0f Hz,  ძალა = %.0f dB"
+
+#: effects/BassBoost.cpp:169
+msgid "Bass Boost"
+msgstr "Bass Boost"
+
+#: effects/BassBoost.cpp:182
+#: effects/Phaser.cpp:219
+#: effects/Wahwah.cpp:214
+msgid "by Nasca Octavian Paul"
+msgstr "Nasca Octavian Paul-ის მიერ"
+
+#: effects/BassBoost.cpp:196
+#: effects/ChangePitch.cpp:322
+msgid "Frequency (Hz):"
+msgstr "სიხშირე (Hz):"
+
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
+msgid "Boost (dB):"
+msgstr "Boost (dB):"
+
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
+#: effects/BassBoost.h:35
+msgid "BassBoost..."
+msgstr "BassBoost..."
+
+#: effects/BassBoost.h:49
+msgid "Boosting Bass Frequencies"
+msgstr "ბასების სიხშირეების გაძლიერება"
+
+#: effects/ChangeLength.h:26
+msgid "Change Length..."
+msgstr "სიგრძის შეცვლა"
+
+#: effects/ChangeLength.h:34
+msgid "Changing Length..."
+msgstr "სიგრძის შეცვლა..."
+
+#: effects/ChangePitch.cpp:55
+#, c-format
+msgid "Applied effect: %s %.2f semitones"
+msgstr "გააქტიურებული ეფექტი: %s %.2f semitones"
+
+#: effects/ChangePitch.cpp:198
+msgid "Change Pitch"
+msgstr "Pitch შეცვლა"
+
+#: effects/ChangePitch.cpp:256
+msgid "Change Pitch without Changing Tempo"
+msgstr "Pitch  შეცვლა Tempo-ს შეცვლის გარეშე"
+
+#: effects/ChangePitch.cpp:258
+#: effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
+msgid "by Vaughan Johnson && Dominic Mazzoni"
+msgstr "Vaughan Johnson && Dominic Mazzoni მიერ"
+
+#: effects/ChangePitch.cpp:260
+#: effects/ChangeTempo.cpp:175
+msgid "using SoundTouch, by Olli Parviainen"
+msgstr "SoundTouch-ის გამოყენებით, Olli Parviainen-ის მიერ"
+
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr "Pitch:"
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr "დან:"
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr "Pitch-დან"
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr "ზემოთ"
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr "ქვემოთ"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr "კენ:"
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr "Pitch-კენ"
+
+#: effects/ChangePitch.cpp:311
+msgid "Semitones (half-steps):"
+msgstr "ნახევარტონები (ნახევარ-ნაბიჯები):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr "ნახევარტონები ნახევარნაბიჯებში"
+
+#: effects/ChangePitch.cpp:326
+#: effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206
+#: effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr "დან"
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr "სიხშირე hertz-ებში"
+
+#: effects/ChangePitch.cpp:331
+#: effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211
+#: effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "კენ"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr "სიხშირეზე წამებში"
+
+#: effects/ChangePitch.cpp:338
+#: effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
+msgid "Percent Change:"
+msgstr "პროცენტის შეცვლა:"
+
+#: effects/ChangePitch.cpp:343
+#: effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358
+#: effects/ChangeTempo.cpp:195
+msgid "Percent Change"
+msgstr "პროცენტის შეცვლა"
+
+#: effects/ChangePitch.h:31
+msgid "Change Pitch..."
+msgstr "Pitch-ის შეცვლა..."
+
+#: effects/ChangePitch.h:46
+msgid "Changing Pitch"
+msgstr "Pitch-ის შეცვლა..."
+
+#: effects/ChangeSpeed.cpp:54
+#: effects/ChangeTempo.cpp:55
+#, c-format
+msgid "Applied effect: %s %.1f%%"
+msgstr "გამოყენებული ეფექტი: %s %.1f%%"
+
+#: effects/ChangeSpeed.cpp:298
+msgid "Change Speed"
+msgstr "სიჩქარის შეცვლა"
+
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
+msgid "n/a"
+msgstr "მიუწვდომელია"
+
+#: effects/ChangeSpeed.cpp:334
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "სიჩქარის შეცვლა, გავლენას ახდენს ორივეზე -Tempo და Pitch-ზე"
+
+#: effects/ChangeSpeed.cpp:338
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "SampleRate-ის გამოყენება, Erik de Castro Lopo-ის  მიერ"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr "სტანდარტული Vinyl RPM:"
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr "RPM-დან"
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr "RPM-ზე"
+
+#: effects/ChangeSpeed.h:32
+msgid "Change Speed..."
+msgstr "სიჩქარის შეცვლა..."
+
+#: effects/ChangeSpeed.h:46
+msgid "Changing Speed"
+msgstr "სიჩქარის შეცვლა"
+
+#: effects/ChangeTempo.cpp:138
+msgid "Change Tempo"
+msgstr "ტემპის შეცვლა"
+
+#: effects/ChangeTempo.cpp:171
+msgid "Change Tempo without Changing Pitch"
+msgstr "ტემპის შეცვლა Pitch-ის შეცვლის გარეშე"
+
+#: effects/ChangeTempo.cpp:203
+msgid "Beats per minute:"
+msgstr "დარყმები წუთზე:"
+
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr "დარტყმებიდან წუთზე"
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr "დარტყმებზე წუთზე"
+
+#: effects/ChangeTempo.cpp:216
+msgid "Length (seconds):"
+msgstr "სიგრძე (წამები):"
+
+#: effects/ChangeTempo.cpp:220
+msgid "From length in seconds"
+msgstr "სიგრძიდან წამებში"
+
+#: effects/ChangeTempo.cpp:225
+msgid "To length in seconds"
+msgstr "სიგრძეზე წამებში"
+
+#: effects/ChangeTempo.h:35
+msgid "Change Tempo..."
+msgstr "ტემპის შეცვლა..."
+
+#: effects/ChangeTempo.h:49
+msgid "Changing Tempo"
+msgstr "ტემპის შეცვლა"
+
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
+msgstr "დაწკაპუნების წაშლა"
+
+#: effects/ClickRemoval.cpp:327
+msgid "Click and Pop Removal by Craig DeForest"
+msgstr "წკაპუნისა და ხტუნვის წაშლა Craig DeForest-ის მიერ"
+
+#: effects/ClickRemoval.cpp:341
+msgid "Select threshold (lower is more sensitive):"
+msgstr "ზღვარის ამორჩევა (დაბალი უფრო მგრძნობიარეა):"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:353
+msgid "Max spike width (higher is more sensitive):"
+msgstr "სპაიკის მაქსიმალური სიგანე (მაღალი უფრო მგრძNობიარეა):"
+
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
+#: effects/ClickRemoval.h:42
+msgid "Click Removal..."
+msgstr "დაწკაპუნების წაშლა..."
+
+#: effects/ClickRemoval.h:56
+msgid "Removing clicks and pops..."
+msgstr "წკაპუნისა და ხტუნვის წაშლა..."
+
+#: effects/Compressor.cpp:461
+msgid "Dynamic Range Compressor"
+msgstr "დინამიური დიაპაზონის კომპრესორი"
+
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr "ზღვარი"
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr "პროპორციები:"
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "პროპორციები"
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
+msgstr "შეტევის დრო:"
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr "შეტევის დრო"
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr "დაწევის დრო:"
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr "დაწევის დრო"
+
+#: effects/Compressor.cpp:530
+msgid "Normalize to 0dB after compressing"
+msgstr "0dB-მდე ნორმალიზაცია კომპრესირების შემდეგ"
+
+#: effects/Compressor.cpp:563
+#, c-format
+msgid "Threshold %d dB"
+msgstr "ზღვარი %d dB"
+
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr "%3d dB"
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr "პროპორცია %.0f to 1"
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr "პროპორცია %.1f to 1"
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr "%.1f:1"
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr "შეტევის დრო %.1f წამი"
+
+#: effects/Compressor.cpp:576
+#: effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr "%.1f წამი"
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr "დაწევის დრო %.1f წამი"
+
+#: effects/Compressor.h:36
+msgid "Compressor..."
+msgstr "კომპრესორი"
+
+#: effects/Compressor.h:50
+msgid "Applying Dynamic Range Compression..."
+msgstr "დინამიური დიაპაზონის კომპრესიის გააქტიურება..."
+
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr "გამარჯობა.\n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193
+#: effects/Contrast.cpp:204
+#: effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr "გაზომილი"
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr "კონტრასტის ანალიზატორი"
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr "პარამეტრები"
+
+#: effects/Contrast.cpp:242
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "დაწყება"
+
+#: effects/Contrast.cpp:243
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "დასასრული"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr "წინა პლანი:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr "ფონი:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr "შედეგი"
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr "კონტრასტის შედეგი:"
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+msgid "Reset"
+msgstr "პარამეტრების გარდაქმნა"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr "განსხვავება:"
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "ინფორმაცია"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "კონტროლი"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328
+#: effects/Contrast.cpp:336
+#: effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr "გაზომვა"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191
+#: effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f dB"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr "WCAG2 გავლა"
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr "WCAG2 მარცხი"
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr "ფონის გაზომვა"
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr "წინა პლანის გაზომვა"
+
+#: effects/DtmfGen.cpp:56
+msgid "DTMF Tone Generator"
+msgstr "DTMF ტონის გენერატორი"
+
+#: effects/DtmfGen.cpp:456
+msgid "by Salvo Ventura (2006)"
+msgstr "Salvo Ventura (2006)"
+
+#: effects/DtmfGen.cpp:460
+msgid "DTMF sequence:"
+msgstr "DTMF მიმსევრობა:"
+
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
+msgid "Amplitude (0-1)"
+msgstr "ამპლიტუდა (0-1)"
+
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr "ხანგრძლივობა:"
+
+#: effects/DtmfGen.cpp:486
+msgid "Tone/silence ratio:"
+msgstr "ტონის/სიჩუმის პარამეტრები:"
+
+#: effects/DtmfGen.cpp:496
+msgid "Duty cycle:"
+msgstr "მუშაობის ციკლი:"
+
+#: effects/DtmfGen.cpp:498
+msgid "Tone duration:"
+msgstr "ტონის ხანგრძლივობა:"
+
+#: effects/DtmfGen.cpp:499
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
+msgid "ms"
+msgstr "ms"
+
+#: effects/DtmfGen.cpp:500
+msgid "Silence duration:"
+msgstr "სიჩუმის ხანგრძლივობა:"
+
+#: effects/DtmfGen.h:39
+msgid "DTMF Tones..."
+msgstr "DTMF ტონები..."
+
+#: effects/DtmfGen.h:53
+#, c-format
+msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
+msgstr "გამოყენებული ეფექტი: DTMF ტონების გენერაცია, %.6lf წამი"
+
+#: effects/DtmfGen.h:57
+msgid "Generating DTMF tones"
+msgstr "DTMF ტონების გენერაცია"
+
+#: effects/Echo.cpp:48
+#, c-format
+msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
+msgstr "გამოყენებული ეფექტი: %s შეყოვნება = %f წამი, დაყოვნების ფაქტორი = %f"
+
+#: effects/Echo.cpp:170
+msgid "Echo"
+msgstr "ექო"
+
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/Echo.cpp:195
+#: effects/Repeat.cpp:200
+msgid "by Dominic Mazzoni && Vaughan Johnson"
+msgstr "Dominic Mazzoni && Vaughan Johnson"
+
+#: effects/Echo.cpp:207
+msgid "Delay time (seconds):"
+msgstr "შეყოვნების დრო (წამები):"
+
+#: effects/Echo.cpp:212
+msgid "Decay factor:"
+msgstr "შეყოვნების ფაქტორი:"
+
+#: effects/Echo.h:34
+msgid "Echo..."
+msgstr "ექო..."
+
+#: effects/Echo.h:48
+msgid "Performing Echo"
+msgstr "ექოს შესრულება"
+
+#: effects/Effect.cpp:467
+msgid "Preparing preview"
+msgstr "ხედის მომზადება"
+
+#: effects/Effect.cpp:497
+msgid "Previewing"
+msgstr "დათვალიერება"
+
+#: effects/Effect.cpp:512
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "ხმის მოწყობილობის გახსნის შეცდომა. გთხოვთ, შეამოწმოთ გამონატანი მოწყობილობის პარამეტრები და პროექტის სემპლის კოეფიციენტი."
+
+#: effects/Effect.h:100
+#, c-format
+msgid "Applied effect: %s"
+msgstr "გამოყენებული ეფექტი: %s"
+
+#: effects/Equalization.cpp:329
+msgid "B-spline"
+msgstr "B-spline"
+
+#: effects/Equalization.cpp:330
+msgid "Cosine"
+msgstr "Cosine"
+
+#: effects/Equalization.cpp:331
+msgid "Cubic"
+msgstr "კუბური"
+
+#: effects/Equalization.cpp:367
+#: effects/Equalization.cpp:416
+msgid "Equalization"
+msgstr "ეკვალიზაცია"
+
+#: effects/Equalization.cpp:994
+msgid "Error loading EQ curve"
+msgstr "EQ ხვეულას ჩატვირთვის შეცდომა"
+
+#: effects/Equalization.cpp:1033
+msgid "custom"
+msgstr "ინდივიდუალური"
+
+#. i18n-hint: && in here is an escape character to get a single &
+#. * on screen, so keep it as is
+#: effects/Equalization.cpp:1101
+msgid "Equalization, by Martyn Shaw && Mitch Golden"
+msgstr "Equalization, Martyn Shaw && Mitch Golden-ის მიერ"
+
+#: effects/Equalization.cpp:1122
+msgid "Max dB"
+msgstr "Max dB"
+
+#: effects/Equalization.cpp:1124
+msgid "Min dB"
+msgstr "Min dB"
+
+#: effects/Equalization.cpp:1197
+msgid "kHz"
+msgstr "kHz"
+
+#: effects/Equalization.cpp:1214
+msgid "Draw curves"
+msgstr "ხვეულების დახაზვა"
+
+#: effects/Equalization.cpp:1219
+msgid "Graphic EQ"
+msgstr "გრაფიკული EQ"
+
+#: effects/Equalization.cpp:1233
+msgid "Linear frequency scale"
+msgstr "ლინეარული სიხშირის მასშტაბი"
+
+#: effects/Equalization.cpp:1242
+msgid "Length of filter:"
+msgstr "ფილტრის სიგრძე:"
+
+#: effects/Equalization.cpp:1263
+msgid "Select curve:"
+msgstr "ხვეულას ამორჩევა:"
+
+#: effects/Equalization.cpp:1273
+#: effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
+msgid "Save As..."
+msgstr "შენახვა, როგორც..."
+
+#: effects/Equalization.cpp:1279
+msgid "Flat"
+msgstr "ბრტყელი"
+
+#: effects/Equalization.cpp:2511
+msgid "Enter the desired name of the curve"
+msgstr "შეიყვანეთ ხვეულას სასურველი სახელი"
+
+#: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
+msgid "Confirm Deletion"
+msgstr "წაშლის დადასტურება"
+
+#: effects/Equalization.h:84
+msgid "Equalization..."
+msgstr "ეკვალიზაცია..."
+
+#: effects/Equalization.h:98
+msgid "Performing Equalization"
+msgstr "ეკვალიზაციის შესრულება"
+
+#: effects/Fade.h:24
+msgid "Fade In"
+msgstr "მინავლება"
+
+#: effects/Fade.h:38
+msgid "Fading In"
+msgstr "მინავლება"
+
+#: effects/Fade.h:54
+msgid "Fade Out"
+msgstr "გამკვეთრება"
+
+#: effects/Fade.h:68
+msgid "Fading Out"
+msgstr "გამკვეთრება"
+
+#: effects/FindClipping.cpp:49
+msgid "Detect clipping"
+msgstr "კლიპინგის დადგენა"
+
+#: effects/FindClipping.cpp:91
+msgid "Clipping"
+msgstr "კლინინგი"
+
+#: effects/FindClipping.cpp:211
+msgid "Find Clipping"
+msgstr "კლიპინგის მოძიება"
+
+#: effects/FindClipping.cpp:222
+msgid "by Leland Lucius"
+msgstr "Leland Lucius-ის მიერ"
+
+#: effects/FindClipping.cpp:234
+msgid "Start threshold (samples):"
+msgstr "ზღვარის დაწყება (მაგალითები):"
+
+#: effects/FindClipping.cpp:238
+msgid "Stop threshold (samples):"
+msgstr "ზღვარის გაჩერება (მაგალითები):"
+
+#: effects/FindClipping.cpp:250
+msgid "Start and stop must be greater than 0."
+msgstr "დასაწყისი და დასასრული უნდა იყოს 0-ზე მეტი"
+
+#: effects/FindClipping.h:37
+msgid "Find Clipping..."
+msgstr "კლიპინგის მოძიება..."
+
+#: effects/FindClipping.h:54
+msgid "Detecting clipping"
+msgstr "კლიპინგის დადგენა"
+
+#: effects/Invert.h:27
+msgid "Invert"
+msgstr "ინვერსია"
+
+#: effects/Invert.h:41
+msgid "Inverting"
+msgstr "ინვერსია"
+
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "გამასწორებელი"
+
+#: effects/Leveller.cpp:203
+msgid "None-Skip"
+msgstr "არ-გამოტოვება"
+
+#: effects/Leveller.cpp:204
+msgid "Light"
+msgstr "მსუბუქი"
+
+#: effects/Leveller.cpp:205
+msgid "Moderate"
+msgstr "საშუალო"
+
+#: effects/Leveller.cpp:206
+msgid "Heavy"
+msgstr " მძიმე"
+
+#: effects/Leveller.cpp:207
+msgid "Heavier"
+msgstr "უფრო მძიმე"
+
+#: effects/Leveller.cpp:208
+msgid "Heaviest"
+msgstr "უმძიმესი"
+
+#: effects/Leveller.cpp:212
+#: effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "Lynn Allan-ის მიერ"
+
+#: effects/Leveller.cpp:222
+msgid "Degree of Leveling"
+msgstr "გასწორების ხარისხი"
+
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr "გასწორების ხარისხი:"
+
+#: effects/Leveller.cpp:234
+msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
+msgstr "ხარვეზის ზღვარი  (Hiss/Hum/Ambient ხარვეზი)"
+
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
+msgstr "ხარვეზის ზღვარი:"
+
+#: effects/Leveller.h:28
+msgid "Leveller..."
+msgstr "გამასწორებელი:"
+
+#: effects/Leveller.h:42
+msgid "Applying Leveller..."
+msgstr "გამასწორებლის გააქტიურება"
+
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr "გენერატორი"
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr "ინსტრუმენტი"
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr "რყევა"
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr "უტილიტა"
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr "კონვერტორი"
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr "ანალიზატორი"
+
+#: effects/LoadEffects.cpp:114
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "მიქსერი"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr "სიმულატორი"
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr "შეყოვნება"
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr "მოდულატორი"
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr "ექო"
+
+#: effects/LoadEffects.cpp:124
+#: effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "ფეიზერი"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr "ფლანგერი"
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr "ქორო"
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr "ფილტრი"
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr "დაბალი სიხშირის ფილტრი"
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr "სიბრტყოვანი ფილტრი"
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr "მაღალი სიხშირის ფილტრი"
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr "Comb"
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr "ფაზური ფილტრი"
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr "ეკვალაიზერი"
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr "პარამეტრული"
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr "Multiband"
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr "სპექტრული დამმუშავებელი"
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr "ხმის სიმაღლის წამნაცვლებელი"
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr "ამპლიფიკატორი"
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr "რღვევა"
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr "ვეივშეიპერი"
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr "დინამიური დამმუშავებელი"
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr "კომპრესორი"
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr "ექსპანდერი"
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr "ლიმიტერი"
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr "გეითი"
+
+#: effects/LoadEffects.cpp:199
+#: effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "ხარვეზების გაწმენდა"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr "Pitch დაTempo"
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr "დროის შემცვლელი"
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr "დრო"
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr "ონსეტი"
+
+#: effects/Noise.cpp:37
+msgid "White"
+msgstr "თეთრი"
+
+#: effects/Noise.cpp:38
+msgid "Pink"
+msgstr "ვარდისფერი"
+
+#: effects/Noise.cpp:39
+msgid "Brown"
+msgstr "ყავისფერი"
+
+#: effects/Noise.cpp:41
+msgid "Noise Generator"
+msgstr "ხარვეზების გენერატორი"
+
+#: effects/Noise.cpp:241
+msgid "Noise type"
+msgstr "ხარვეზის ტიპი"
+
+#: effects/Noise.h:41
+msgid "Noise..."
+msgstr "ხარვეზი..."
+
+#: effects/Noise.h:55
+#, c-format
+msgid "Applied effect: Generate Noise, %.6lf seconds"
+msgstr "დამატებული ეფექტი: ხარვეზის გენერაცია, %.6lf წამი"
+
+#: effects/Noise.h:59
+msgid "Generating Noise"
+msgstr "ხარვეზის გენერაცია"
+
+#: effects/NoiseRemoval.cpp:192
+#, c-format
+msgid "Could not open file:\n"
+"  %s"
+msgstr "შეუძლებელია ფაილის გახსნა:\n"
+"  %s"
+
+#: effects/NoiseRemoval.cpp:277
+msgid "Attempt to run Noise Removal without a noise profile.\n"
+msgstr "ხარვეზის გაწმენდის გაშვების მცდელობა ხარვეზის პროფილის გარეშე.\n"
+
+#: effects/NoiseRemoval.cpp:814
+msgid "Step 1"
+msgstr "ნაბიჯი 1"
+
+#: effects/NoiseRemoval.cpp:815
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
+"then click Get Noise Profile:"
+msgstr "მონიშნეთ ხარვეზის რამდენიმე წამი, რათა Audacity-მ იცოდეს რა უნდა გაფილტროს,\n"
+"შემდეგ დაუწკაპუნეთ ხარვეზის პროფილს:"
+
+#: effects/NoiseRemoval.cpp:816
+msgid "Step 2"
+msgstr "ნაბიჯი 2"
+
+#: effects/NoiseRemoval.cpp:817
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
+"filtered out, and then click 'OK' to remove noise.\n"
+msgstr "ამოირჩეით ყველა გასაფილტრი აუდიო, შემდეგ კი გასაფილტრი ხარვეზის ოდენობა\n"
+"შემდეგ კი დაუწკაპუნეთ \"დიახ\"-ს ხარვეზისგან გასაწმენდად.\n"
+
+#: effects/NoiseRemoval.cpp:822
+msgid "Noise Removal by Dominic Mazzoni"
+msgstr "ხარვეზის გაწმენდა Dominic Mazzoni-ის მიერ"
+
+#: effects/NoiseRemoval.cpp:830
+msgid "Get Noise Profile"
+msgstr "ხარვეზის პროფილი"
+
+#: effects/NoiseRemoval.cpp:841
+msgid "Noise reduction (dB):"
+msgstr "ხარვეზის შემცირება (dB):"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:849
+msgid "Frequency smoothing (Hz):"
+msgstr "სიხშირის დარბილება (Hz):"
+
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
+msgid "Attack/decay time (secs):"
+msgstr "შეტევის/დანებების დრო (წამები):"
+
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
+msgid "Noise Removal..."
+msgstr "ხარვეზის წაშლა..."
+
+#: effects/NoiseRemoval.h:50
+msgid "Creating Noise Profile"
+msgstr "ხარვეზის პროფილის შექმნა"
+
+#: effects/NoiseRemoval.h:52
+msgid "Removing Noise"
+msgstr "ხარვეზის წაშლა"
+
+#. i18n-hint: First %s is the effect name, 2nd and 3rd are either true or
+#. * false (translated below) if those options were selected
+#: effects/Normalize.cpp:70
+#, c-format
+msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
+msgstr "გააქტიურებული ეფექტი: %s dc ოფსეტის წაშლა = %s, ამპლიტუდის ნორმალიზაცია = %s"
+
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
+msgid "false"
+msgstr "ყალბი"
+
+#. i18n-hint: true here means that the option was
+#. * selected. Opposite false if not selected
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
+msgid "true"
+msgstr "სწორი"
+
+#: effects/Normalize.cpp:77
+#, c-format
+msgid ", maximum amplitude = %.1f dB"
+msgstr ", მაქსიმალური ამპლიტუდა = %.1f dB"
+
+#: effects/Normalize.cpp:327
+msgid "Normalize"
+msgstr "ნორმალიზაცია"
+
+#: effects/Normalize.cpp:351
+#: effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr "ნებისმიერი DC ოფსეტის წაშლა (ცენტრირება 0.0 ვერტიკალურად)"
+
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr "მაქსიმალური ამპლიტუდის ნორმალიზაცია :"
+
+#: effects/Normalize.cpp:362
+msgid "-"
+msgstr "-"
+
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:33
+msgid "Normalize..."
+msgstr "ნორმალიზაცია..."
+
+#: effects/Normalize.h:49
+msgid "Normalizing..."
+msgstr "ნორმალიზაცია..."
+
+#: effects/Phaser.cpp:65
+#, c-format
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "გააქტიურებული ეფექტი: %s %d დონე, %.0f%% wet, სიხშირე = %.1f Hz, საწყისი ფაზა= %.0f deg, სიღრმე = %d, გამოხმაურება = %.0f%%"
+
+#: effects/Phaser.cpp:226
+msgid "Stages:"
+msgstr "დონეები:"
+
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr "დონეები"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr "მშრალი/ნოტიო"
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr "მშრალი ნოტიო"
+
+#: effects/Phaser.cpp:236
+#: effects/Wahwah.cpp:221
+msgid "LFO Frequency (Hz):"
+msgstr "LFO სიხშირე (Hz):"
+
+#: effects/Phaser.cpp:239
+#: effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr "LFO სიხშირე ჰერცებში"
+
+#: effects/Phaser.cpp:241
+#: effects/Wahwah.cpp:226
+msgid "LFO Start Phase (deg.):"
+msgstr "LFO ფაზის დაწყება (deg.):"
+
+#: effects/Phaser.cpp:244
+#: effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr "LFO საწყისი ფაზა გრადუსებში"
+
+#: effects/Phaser.cpp:246
+msgid "Depth:"
+msgstr "სიღრმე"
+
+#: effects/Phaser.cpp:249
+#: effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr "სიღრმე პროცენტულად"
+
+#: effects/Phaser.cpp:251
+msgid "Feedback (%):"
+msgstr "გამოხმაურება (%):"
+
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr "გამოხმაურება პროცენტულად"
+
+#: effects/Phaser.h:45
+msgid "Phaser..."
+msgstr "ფეიზერი:"
+
+#: effects/Phaser.h:59
+msgid "Applying Phaser"
+msgstr "ფეიზერის გააქტიურება"
+
+#: effects/Repair.cpp:99
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+"\n"
+"Zoom in and select a tiny fraction of a second to repair."
+msgstr "აღდგენის ეფექტი გათვალისწინებულია დაზიანებული აუდიოს ძალზე მცირე მონაკვეთებზე (128 ნიმუშამდე).\n"
+"\n"
+"გაადიდეთ და მონიშნეთ წამის მცირე ფრაქცია აღსადგენად."
+
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr "აღდგენა მუშაობს მონიშვნის არეს გარეთა უდიო მონაცემების გამოყენებით.\n"
+"\n"
+"გთხოვთ მონიშნოთ არე, რომელსაც გააჩნია აუდიოს შეხება ერთი მისი ერთი გვერდით მაინც.\n"
+"\n"
+"რაც მეტია მოცულობითი აუდიო, მით უკეთ მუშაობს."
+
+#: effects/Repair.h:43
+msgid "Repairing damaged audio"
+msgstr "დაზიანებული აუდიოს აღდგენა"
+
+#: effects/Repeat.cpp:50
+#, c-format
+msgid "Repeated %d times"
+msgstr "გამეორდა %d-ჯერ"
+
+#: effects/Repeat.cpp:76
+msgid "Tracks are too long to repeat the selection."
+msgstr "ტრეკები ძალიან გრძელია მონიშვნის გასამეორებლად."
+
+#: effects/Repeat.cpp:77
+#: effects/Repeat.cpp:187
+msgid "Repeat"
+msgstr "გამეორება"
+
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
+msgstr "გასამეორებელი ჯერების ოდენობა:"
+
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr "ახალი მონიშვნის სიგრძე: სს:წწ:წწ"
+
+#: effects/Repeat.cpp:253
+msgid "New selection length: "
+msgstr "ახალი მონიშვნის სიგრძე:"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "სს:წწ:წწ"
+
+#: effects/Repeat.h:33
+msgid "Repeat..."
+msgstr "გამეორება..."
+
+#: effects/Repeat.h:47
+msgid "Performing Repeat"
+msgstr "გამეორების შესრულება"
+
+#: effects/Reverse.h:30
+msgid "Reverse"
+msgstr "რევერსია"
+
+#: effects/Reverse.h:44
+msgid "Reversing"
+msgstr "რევერსია"
+
+#: effects/Silence.cpp:32
+msgid "Silence Generator"
+msgstr "სიჩუმის გენერატორი"
+
+#: effects/Silence.h:34
+msgid "Silence..."
+msgstr "სიჩუმე..."
+
+#: effects/Silence.h:48
+msgid "Generating Silence"
+msgstr "სიჩუმის გენერაცია"
+
+#: effects/Silence.h:53
+#, c-format
+msgid "Applied effect: Generate Silence, %.6lf seconds"
+msgstr "დამატებული ეფექტი:  სიჩუმის გენერაცია,%.6lf წამი"
+
+#: effects/SimplePairedTwoTrack.h:120
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "ვწუხვართ, ეს ეფექტი ვერ შესრულდება სტერეო ტრეკებზე, სადაც ტრეკების ინდივიდუალური არხები არ ემთხვევა."
+
+#: effects/SpikeCleaner.cpp:69
+msgid "Spike Cleaner"
+msgstr "Spike Cleaner"
+
+#: effects/SpikeCleaner.cpp:160
+msgid "SpikeCleaner by Lynn Allan"
+msgstr "SpikeCleaner Lynn Allan-ის მიერ"
+
+#: effects/SpikeCleaner.cpp:165
+msgid "Max Spike Duration (milliseconds): \n"
+"(99999 or greater is off)"
+msgstr "მაქს  Spike ხანგრძლივობა (მილიწამები): \n"
+"(99999 ან მეტი გამორთულია)"
+
+#: effects/SpikeCleaner.cpp:178
+msgid "Theshold for silence: "
+msgstr "ზღვარი სიჩუმისთვის:"
+
+#: effects/SpikeCleaner.h:27
+msgid "Spike Cleaner..."
+msgstr "Spike Cleaner..."
+
+#: effects/SpikeCleaner.h:35
+msgid "Applying Spike Cleaner..."
+msgstr "Spike Cleaner-ის გააქტიურება..."
+
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&სტერეოდან მონოზე"
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr "სტეროდან მონოზე გააქტიურება"
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:61
+#, c-format
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "დამატებული ეფექტი: გენერაცია %s ტალღა %s, სიხშირე = %.2f Hz,ამპლიტუდა = %.2f, %.6lf წამები"
+
+#: effects/ToneGen.cpp:69
+#: widgets/Meter.cpp:416
+msgid "Linear"
+msgstr "ლინეარული"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr "ლოგარითმული"
+
+#: effects/ToneGen.cpp:71
+msgid "Chirp Generator"
+msgstr "ჩირპის გენერატორი"
+
+#: effects/ToneGen.cpp:71
+msgid "Tone Generator"
+msgstr "ტონის გენერატორი"
+
+#: effects/ToneGen.cpp:72
+msgid "Sine"
+msgstr "სინუსიოდი"
+
+#: effects/ToneGen.cpp:73
+msgid "Square"
+msgstr "კვადრატი"
+
+#: effects/ToneGen.cpp:74
+msgid "Sawtooth"
+msgstr "კბილოვანი ტალღა"
+
+#: effects/ToneGen.cpp:75
+msgid "Square, no alias"
+msgstr "კვადრატი, გასწორების გარეშე"
+
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
+msgid "Frequency (Hz)"
+msgstr "სიხშირე (Hz)"
+
+#: effects/ToneGen.cpp:348
+msgid "Waveform:"
+msgstr "ტალღოვანი:"
+
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr "ინტერპოლაცია:"
+
+#: effects/ToneGen.h:40
+msgid "Chirp..."
+msgstr "Chirp..."
+
+#: effects/ToneGen.h:40
+msgid "Tone..."
+msgstr "ტონი..."
+
+#: effects/ToneGen.h:54
+msgid "Generating Chirp"
+msgstr "Chirp გენერაცია"
+
+#: effects/ToneGen.h:54
+msgid "Generating Tone"
+msgstr "ტონის გენერაცია"
+
+#: effects/TruncSilence.cpp:113
+msgid "All tracks must have the same sample rate"
+msgstr "ყველა ტრეკს სემპლის თანაბარი კოეფიციენტი უნდა გააჩნდეს"
+
+#: effects/TruncSilence.cpp:113
+#: effects/TruncSilence.cpp:321
+msgid "Truncate Silence"
+msgstr "სიჩუმის ამოჭრა"
+
+#: effects/TruncSilence.cpp:345
+msgid "Max silence duration:"
+msgstr "სიჩუმის მაქს ხანგრძლივობა:"
+
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
+#: prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
+msgid "milliseconds"
+msgstr "მილიწამები"
+
+#: effects/TruncSilence.cpp:350
+msgid "Threshold for silence:"
+msgstr "სიჩუმის ზღვარი:"
+
+#: effects/TruncSilence.cpp:374
+msgid "   Duration must be at least 1 millisecond"
+msgstr "ხანგრძლივობა უნდა იყოს 1 მილიწამი მაინც"
+
+#: effects/TruncSilence.h:28
+msgid "Truncate Silence..."
+msgstr "სიჩუმის ამოჭრა..."
+
+#: effects/TruncSilence.h:42
+msgid "Truncating Silence..."
+msgstr "სიჩუმის ამოჭრა..."
+
+#: effects/VST/VSTEffect.cpp:172
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "ვწუხვართ, VST  ეფექტის შესრულება შეუძლებელია სტერეო ტრეკებზე, როდესაც ინდივიდუალური არხები ან ტრეკები ვერ ეთხვევა."
+
+#: effects/VST/VSTEffect.cpp:187
+msgid "Can't process replacing"
+msgstr "შეუძლებელია ჩანაცვლების დამუშავება"
+
+#: effects/VST/VSTEffect.cpp:410
+msgid "VST Plug-in parameters:"
+msgstr "VST მოდულის პარამეტრები:"
+
+#: effects/Wahwah.cpp:61
+#, c-format
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "გამოყენებული ეფექტი: %s სიხშირე= %.1f Hz, საწყისი ფაზა = %.0f deg, სიღრმე = %.0f%%, რეზონანსი= %.1f, სიხშირის ოფსეტი = %.0f%%"
+
+#: effects/Wahwah.cpp:203
+msgid "Wahwah"
+msgstr "Wahwah"
+
+#: effects/Wahwah.cpp:231
+msgid "Depth (%):"
+msgstr "სიღრმე (%):"
+
+#: effects/Wahwah.cpp:236
+msgid "Resonance:"
+msgstr "რეზონანსი:"
+
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr "რეზონანსი"
+
+#: effects/Wahwah.cpp:241
+msgid "Wah Frequency Offset (%):"
+msgstr "Wah სიხშირის ოფსეტი (%):"
+
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr "Wah სიხშირის ოფსეტი პროცენტულად"
+
+#: effects/Wahwah.h:41
+msgid "Wahwah..."
+msgstr "Wahwah..."
+
+#: effects/Wahwah.h:55
+msgid "Applying Wahwah"
+msgstr "Wahwah-ის გააქტიურება"
+
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176
+#: effects/lv2/LV2Effect.cpp:191
+#, c-format
+msgid "Performing Effect: %s"
+msgstr "ეფესტის შესრულება: %s"
+
+#: effects/ladspa/LadspaEffect.cpp:196
+#: effects/lv2/LV2Effect.cpp:211
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "ვწუხვართ, მოდულის ეფექტის შესულება შეუძლებელია სტერეო ტრეკებზე, სადაც ტრეკის ინდივიდუალური არხები არ ემთხვევა."
+
+#: effects/ladspa/LadspaEffect.cpp:580
+#: effects/ladspa/LadspaEffect.cpp:588
+#: prefs/GUIPrefs.cpp:51
+#: prefs/QualityPrefs.cpp:72
+msgid "None"
+msgstr "არცერთიი"
+
+#: effects/ladspa/LadspaEffect.cpp:582
+#: effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
+msgid "Author: "
+msgstr "ავტორი:"
+
+#: effects/ladspa/LadspaEffect.cpp:615
+#: effects/lv2/LV2Effect.cpp:823
+msgid "Effect Settings"
+msgstr "ეფექტის პარამეტრები"
+
+#: effects/ladspa/LadspaEffect.cpp:710
+#: effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
+msgid "Length (seconds)"
+msgstr "სიგრძე (წამებო)"
+
+#: effects/lv2/LV2Effect.cpp:849
+#: effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr "შენიშვნის სიგრძე (წამები)"
+
+#: effects/lv2/LV2Effect.cpp:860
+#: effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr "შენიშვნის სიჩქარე"
+
+#: effects/lv2/LV2Effect.cpp:871
+#: effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr "შენიშვნის გასაღები"
+
+#: effects/nyquist/Nyquist.cpp:257
+msgid "Applying Nyquist Effect..."
+msgstr "Nyquist ეფექტის გააქტიურება..."
+
+#: effects/nyquist/Nyquist.cpp:264
+#: effects/nyquist/Nyquist.cpp:326
+msgid "Nyquist Prompt..."
+msgstr "Nyquist Prompt..."
+
+#: effects/nyquist/Nyquist.cpp:327
+msgid "Enter Nyquist Command: "
+msgstr "Nyquist ბრძანების შეყვანა:"
+
+#: effects/nyquist/Nyquist.cpp:417
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "ვწუხვართ, შეუძლებელია ეფექტის გააქტიურება სტერეო ტრეკებზე, სადაც ტრეკები არ ემთხვევა."
+
+#: effects/nyquist/Nyquist.cpp:445
+msgid "Nyquist"
+msgstr "Nyquist"
+
+#: effects/nyquist/Nyquist.cpp:446
+msgid "Nyquist Output: "
+msgstr "Nyquist გამონატანი: "
+
+#: effects/nyquist/Nyquist.cpp:603
+#: effects/nyquist/Nyquist.cpp:614
+msgid "Nyquist returned the value:"
+msgstr "Nyquist-მა დააბრუნა მნიშვნელობა:"
+
+#: effects/nyquist/Nyquist.cpp:656
+msgid "Nyquist did not return audio.\n"
+msgstr "Nyquist არ დააბრუნა აუდიო.\n"
+
+#: effects/nyquist/Nyquist.cpp:667
+msgid "Nyquist returned too many audio channels.\n"
+msgstr "Nyquist ძალიან ბევრი აუდიო არხი დააბრუნა.\n"
+
+#: effects/vamp/VampEffect.cpp:86
+#, c-format
+msgid "Extracting features: %s"
+msgstr "ფუნქციების ამოღება: %s"
+
+#: effects/vamp/VampEffect.cpp:117
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "ვწუხვართ, Vamp მოდულების გაშვება შეუძლებელია სტერეო ტრეკებზე, სადაც ტრეკების ინდივიდუალური არხები არ ემთხვევა."
+
+#: effects/vamp/VampEffect.cpp:131
+msgid "Sorry, failed to load Vamp Plug-in."
+msgstr "Vamp მოდულის გაშვებამ მარცხი განიცადა."
+
+#: effects/vamp/VampEffect.cpp:239
+msgid "Sorry, Vamp Plug-in failed to initialize."
+msgstr "Vamp მოდულის დაწყებამ მარცხი განიცადა."
+
+#: effects/vamp/VampEffect.cpp:387
+msgid " - Vamp audio analysis plugin"
+msgstr " - Vamp აუდიო ანალიზის მოდული"
+
+#: effects/vamp/VampEffect.cpp:423
+msgid "Plugin Settings"
+msgstr "მოდულის პარამეტრები"
+
+#: effects/vamp/VampEffect.cpp:442
+#: effects/vamp/VampEffect.cpp:448
+msgid "Program"
+msgstr "პროგრამა"
+
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:522
+msgid "Export File"
+msgstr "ფაილის ექსპორტი"
+
+#: export/Export.cpp:530
+msgid "&Options..."
+msgstr "&პარამეტრები..."
+
+#: export/Export.cpp:571
+msgid "Are you sure you want to save the file as \""
+msgstr "მართლა გსურთ შეინახოთ ეს ფაილი როგორც \""
+
+#: export/Export.cpp:591
+#, c-format
+msgid "You are about to save a %s file with the name \"%s\".\n"
+"\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
+"\n"
+"Are you sure you want to save the file under this name?"
+msgstr "თქვენ ახლა ინახავთ %s ფაილს სახელით \"%s\".\n"
+"\n"
+"ჩვეულებისამებრ ეს ფაილები მთავრდება \".%s\"-ით, და ზოგიერთი პროგრამა არ გახსნის არასტანდარტული გაფართოების ფაილებს.\n"
+"\n"
+"მაინც გსურთ ფაილების შენახვა ამ სახელით?"
+
+#: export/Export.cpp:612
+#, c-format
+msgid "A file named \"%s\" already exists.  Replace?"
+msgstr "ფაილი სახელად  \"%s\"  უკვე არსებობს.  ჩავანაცვლო?"
+
+#: export/Export.cpp:710
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "თქვენი ტრეკების მიქსირება მოხდება ორი სტერო არხით ექსპორტირებულ ფაილში."
+
+#: export/Export.cpp:715
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "თქვენი ტრეკების მიქსირება მოხდება მონო არხით ექსპორტირებულ ფაილში."
+
+#: export/Export.cpp:726
+msgid "Advanced Mixing Options"
+msgstr "მიქსირების დამატებითი პარამეტრები"
+
+#: export/Export.cpp:930
+#, c-format
+msgid "Channel: %2d"
+msgstr "არხი: %2d"
+
+#: export/Export.cpp:1046
+msgid " - Left"
+msgstr "-მარცხენა"
+
+#: export/Export.cpp:1047
+msgid " - Right"
+msgstr "- მარჯვენა"
+
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr "მიქსერის ზოლი"
+
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
+#, c-format
+msgid "Output Channels: %2d"
+msgstr "გამონატანი არხები: %2d"
+
+#: export/ExportCL.cpp:55
+msgid "Specify Command Line Encoder"
+msgstr "განსაზღვრეთ ბრძანების სტრიქონის მაკოდირებელი"
+
+#: export/ExportCL.cpp:70
+msgid "Command Line Export Setup"
+msgstr "ბრძანების სტრიქონის ექსპორტირების მომართვა"
+
+#: export/ExportCL.cpp:75
+msgid "Command:"
+msgstr "ბრძანება:"
+
+#: export/ExportCL.cpp:80
+msgid "Show output"
+msgstr "გამონატანის ჩვენება"
+
+#: export/ExportCL.cpp:87
+#, c-format
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "მონაცემები დაუკავშირდება სტანდარტულს. \"%f\"-ს ჩაენაცვლება მონიშნული გამონატანი ფაილის სახელი."
+
+#: export/ExportCL.cpp:222
+msgid "(external program)"
+msgstr "(გარე პროგრამა)"
+
+#: export/ExportCL.cpp:253
+#: export/ExportPCM.cpp:457
+#, c-format
+msgid "Cannot export audio to %s"
+msgstr "შეუძლებელია აუდიოს ექსპორტი %s-ზე"
+
+#: export/ExportCL.cpp:327
+msgid "Exporting the selected audio using command-line encoder"
+msgstr "მონიშნული აუდიოს ბრძანების სტრიქონის მაკოდირებელის ექსპორტირება"
+
+#: export/ExportCL.cpp:328
+msgid "Exporting the entire project using command-line encoder"
+msgstr "მთლიანი პროექტის ბრძანების სტრიქონის მაკოდირებელის ექსპორტირება"
+
+#: export/ExportCL.cpp:390
+msgid "Command Output"
+msgstr "ბრძანების გამონატანი"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr "მონიშნული აუდიოს ექსპორტი როგორც %s"
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr "მთლიანი ფაილის ექსპორტი როფორც  %s"
+
+#: export/ExportFFmpeg.cpp:702
+#: export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "სემპლის არასწორი კოეფიციენტი"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr "პროექტის სემპლის კოეფიციენტი (%d) მიმდინარე გამონატანის ფაილის ფორმატით\n"
+"მხარდაჭერილი არ არის"
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr "პროექტის სემპლისა (%d) და ბიტური კოეფიციენტის (%d kbps) კომბინაცია მხარდაჭერილი არ არის\n"
+"მიმდინარე გამონატანის ფაილის ფორმატით."
+
+#: export/ExportFFmpeg.cpp:721
+#: export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "შეგიძლიათ მოახედინოთ ერთ-ერთი კოეფიციენტის რესემპლირება."
+
+#: export/ExportFFmpeg.cpp:749
+#: export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "სემპლის კ0ოეფიციენტები"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "AC3 პარამეტრების განსაზვრა"
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr "AC3 ექსპორტის მომართვა"
+
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "ბიტური კოეფიციენტი:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr "AAC პარამეტრების განსაზღვრა"
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr "AAC ექსპორტის მომართვა"
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr "AMR-NB პარამეტრების განსაზღვრა"
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr "AMR-NB  ექსპორტის მომართვა"
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr "AMR-WB პარამეტრების განსაზღვრა"
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr "AMR-WB Export Setup"
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr "WMA არამეტრების განსაზღვრა"
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr "WMA ექსპორტის მომართვა"
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "გადავაწერო '%s' პარამეტრებს?"
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr "გადაწერის დადასტურება"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr "სხვა პარამეტრების განსაზღვრა"
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr "პარამეტრები:"
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr "პარამეტრის ჩატვირთვა"
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr "პარამეტრის შენახვა"
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr "პარამეტრის წაშლა"
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr "პარამეტრების იმპორტი"
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr "პარამეტრების ექსპორტი"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "ფორმატი:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr "კოდეკი:"
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr "ყველა ფორმატი და კოდეკი არ არის მხარდაჭერილი. ზოგიერთი პარამეტრის (როგორიცაა ბიტური კოეფიციენტი და სემპლის კოეფიციენტი) კომბინაცია არათავსებადია ზოგიერთ კოდეკთანაც."
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr "ფორმატის ამომრჩევი:"
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr "კოდეკის ამომრჩევი:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr "ყველა ფორმატის ჩვენება"
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr "ყველა კოდეკის ჩვენება"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+#: prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "ენა:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr "ISO 639 3-სიმბოლოიანი ენის კოდი\n"
+"ნებაყოფლობითი\n"
+"ცარიელი - ავტომატური"
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr "ჭდე:"
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr "კოდეკის ჭდე (FOURCC)\n"
+"ნებაყოფლობითი\n"
+"ცარიელი - ავტომატური"
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr "ბიტური კოეფიციენტი (ბიტები/წამი) -გავლენას ახდენს შედეგად მიღებულ ფაილის ზომასა და ხარისხზე\n"
+"ზოგიერთი კოდეკი მხოლოდ სპეციფიურ მნიშვნელობებს იღებს (128k, 192k, 256k etc)\n"
+"0 -ავტომატური\n"
+"რეკომენდებული - 19200"
+
+#: export/ExportFFmpegDialogs.cpp:940
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "ხარისხი"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr "მთლიანი ხარისხი, გამოყენებული სხვადასხვაგვარად სხვადასხვა კოდეკების მიერ\n"
+"vorbis-თვის აუცილებელი\n"
+"0 - ავტომატური\n"
+"-1 - გამორთული (მის ნაცვლად გამოიყენეთ ბიტური კოეფიციენტი)"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr "სემპლის კოეფიციენტი:"
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr "სემპლის კოეფიციენტი (Hz)\n"
+"0 - არ შეცვალო სემპლის კოეფიციენტი"
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr "Cutoff Bandwidth:"
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr "აუდიოს მოჭრის სიხშირის გაშვების სიბრტყე (Hz)\n"
+"ნებაყოფლობითიl\n"
+"0 - ავტომატური\n"
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr "პროფილი:"
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr "AAC პროფილი\n"
+"დაბალი კომპლექსურობა - ნაგულისხმევი\n"
+"საკრავების უმეტესობა არ დაუკრავს არაფერს გარდა LC-ისა"
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr "კომპრესიის დონე:"
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr "კომპრესიის დონე\n"
+"საჭიროა FLAC-ისთვის\n"
+"-1 - ავტომატური \n"
+"წუთი - 0 (სწრაფი კოდირება, დიდი გამონატანი ფაილი)\n"
+"მაქს - 10 (ნელი კოდირება, პატარა გამონატანი ფაილი)"
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr "კადრის ზომა:"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr "კადრის ზომა\n"
+"ნებაყოფლობითიl\n"
+"0 - ნაგულისხმევი\n"
+"წუთი - 16\n"
+"მაქს - 65535"
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr "LPC კოეფიციენტების განსაზღვრა"
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr "LPC კოეფიციენტების განსაზღვრა\n"
+"ინდივიდუალური\n"
+"0 - ნაგულისხმევი\n"
+"მინ - 1\n"
+"მაქს - 15"
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr "მინიმალური პროგნოზის რიგი"
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr "ინდიოვიდუალური\n"
+"0 - ნაგულისხმევი\n"
+"მინ - 1\n"
+"მაქს -  32 (LPC-ით) ან 4 (LPC-ის გარეშე)"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr "მაქსიმალური პროგნოზის რიგი"
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr "მაქსიმალური პროგნოზის რიგი\n"
+"0 - ნაგულისხმევი\n"
+"მინ - 1\n"
+"მაქს -  32 (LPC-ით) ან 4 (LPC-ის გარეშე)"
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr "პროგნოზის რიგის მეთდი:"
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr "პროგნოზის რიგის მეთოდი\n"
+"დაახლოებითი - ყველაზე სწრაფი, დაბალი კომპრესია\n"
+"ჩანაწერის ძიება - ყველაზე დაბალი, საუკეთესო კომპრესიაn\n"
+"სრული ძიება - ნაგულისხმევი"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr "მინიმალური დაყოფის რიგი"
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr "ინდივიდუალური\n"
+"-1 - ნაგულისხმევი\n"
+"მინ - 0\n"
+"მაქს - 8"
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr "მაქსიმალური დაყოფის რიგი"
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr "მაქსიმალური დაყოფის რიგი\n"
+"ინდივიდუალური\n"
+"-1 - ნაგულისხმევი\n"
+"მინ - 0\n"
+"მაქს - 8"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr "მულტიპლექსირების კოეფიციენტი:"
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr "მულტიპლექსირებული ნაკადის მაქსიმალური ბიტური კოეფიციენტი\n"
+"ინდივიდუალური\n"
+"0 - ნაგულისხმევი"
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr "პაკეტის ზომა:"
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr "პაკეტის ზომა\n"
+"ინდივიდუალური\n"
+"0 - ნაგულისხმევი"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr "წავშალო '%s' პარამეტრი?"
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr "შეუძლებელია პროექტის შენახვა სახელის გარეშე"
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr "xml ფაილის შენახვა პარამეტრებით იმპორტირებისთვის "
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML ფაილები (*.xml)|*.xml|ყველა ფაილი (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr "xml  ფაილის შენახვა პარამეტრებით ექსპორტირებისთვის"
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "M4A (AAC) ფაილები (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "AC3 Fფაილები (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr "AMR (narrow band) ფაილები (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr "AMR (wide band) ფაილები (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "WMA (ვერსია 2) ფაილები (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "ინდივიდუალური FFmpeg ექსპორტირება"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr "დაბალი კომპლექსურობა"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr "ძირითადი პროფილი"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr "2-დონე"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr "4-დონე"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr "8-დონე"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr "დაახლოებითი"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr "სრული ძიება"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr "ჩანაწერის ძიება"
+
+#: export/ExportFLAC.cpp:67
+msgid "Specify FLAC Options"
+msgstr "FLAC პარამეტრების განსაზღვრა"
+
+#: export/ExportFLAC.cpp:81
+msgid "0 (fastest)"
+msgstr "0 (უსწრაფესი)"
+
+#: export/ExportFLAC.cpp:82
+msgid "1"
+msgstr "1"
+
+#: export/ExportFLAC.cpp:83
+msgid "2"
+msgstr "2"
+
+#: export/ExportFLAC.cpp:84
+msgid "3"
+msgstr "3"
+
+#: export/ExportFLAC.cpp:85
+msgid "4"
+msgstr "4"
+
+#: export/ExportFLAC.cpp:86
+msgid "5"
+msgstr "5"
+
+#: export/ExportFLAC.cpp:87
+msgid "6"
+msgstr "6"
+
+#: export/ExportFLAC.cpp:88
+msgid "7"
+msgstr "7"
+
+#: export/ExportFLAC.cpp:89
+msgid "8 (best)"
+msgstr "8 (საუკეთესო)"
+
+#: export/ExportFLAC.cpp:92
+msgid "16 bit"
+msgstr "16 ბიტი"
+
+#: export/ExportFLAC.cpp:93
+msgid "24 bit"
+msgstr "24 ბიტი"
+
+#: export/ExportFLAC.cpp:97
+msgid "FLAC Export Setup"
+msgstr "FLAC ექსპორტის მომართვა"
+
+#: export/ExportFLAC.cpp:101
+msgid "Level:"
+msgstr "დონე:"
+
+#: export/ExportFLAC.cpp:103
+msgid "Bit depth:"
+msgstr "ბიტური სიღრმე:"
+
+#: export/ExportFLAC.cpp:209
+msgid "FLAC Files"
+msgstr "FLAC ფაილები"
+
+#: export/ExportFLAC.cpp:312
+msgid "Exporting the selected audio as FLAC"
+msgstr "მონიშნული აუდიოს ექსპორტი FLAC ფორმატში"
+
+#: export/ExportFLAC.cpp:313
+msgid "Exporting the entire project as FLAC"
+msgstr "მთლიანი პროექტის ექსპორტი FLAC ფორმატში"
+
+#: export/ExportMP2.cpp:108
+msgid "Specify MP2 Options"
+msgstr "MP2 პარამეტრების განსაზღვრა"
+
+#: export/ExportMP2.cpp:129
+msgid "MP2 Export Setup"
+msgstr "MP2 ექსპორტის მომართვა"
+
+#: export/ExportMP2.cpp:202
+msgid "MP2 Files"
+msgstr "MP2 ფაილები"
+
+#: export/ExportMP2.cpp:232
+msgid "Cannot export MP2 with this sample rate and bit rate"
+msgstr "შეუძლებელია MP2 ექსპორტი თანაბარი სემპლისა და ბიტის კოეფიციენტით"
+
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1771
+#: export/ExportOGG.cpp:186
+msgid "Unable to open target file for writing"
+msgstr "შეუძლებელია სამიზნე ფაილის გახსნა ჩასაწერად"
+
+#: export/ExportMP2.cpp:274
+#, c-format
+msgid "Exporting selected audio at %d kbps"
+msgstr "მონიშნული აუდიოს ექსპორტი %d კბწ-ით"
+
+#: export/ExportMP2.cpp:275
+#, c-format
+msgid "Exporting entire file at %d kbps"
+msgstr "მთლიანი ფაილის ექსპორტი %d კბწით"
+
+#: export/ExportMP3.cpp:221
+#: export/ExportMP3.cpp:239
+#: export/ExportMP3.cpp:253
+msgid "kbps"
+msgstr "კბწ"
+
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr "(საუკეთესო ხარისხი)"
+
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr "(პატარა ფაილები)"
+
+#: export/ExportMP3.cpp:243
+msgid "Fast"
+msgstr "სწრაფი"
+
+#: export/ExportMP3.cpp:244
+#: export/ExportMP3.cpp:250
+#: prefs/GUIPrefs.cpp:41
+#: prefs/GUIPrefs.cpp:49
+msgid "Standard"
+msgstr "სტანდარტული"
+
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr "არანორმალური"
+
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr "ექსტრემალური"
+
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr "საშუალო"
+
+#: export/ExportMP3.cpp:303
+msgid "Specify MP3 Options"
+msgstr "MP3 პარამეტრების განსაზღვრა"
+
+#: export/ExportMP3.cpp:319
+msgid "MP3 Export Setup"
+msgstr "MP3 ექსპორტის მომართვა"
+
+#: export/ExportMP3.cpp:326
+msgid "Bit Rate Mode:"
+msgstr "ბიტური კოეფიციენტის რეჟიმი:"
+
+#: export/ExportMP3.cpp:331
+msgid "Preset"
+msgstr "წინასწარი მომართვა"
+
+#: export/ExportMP3.cpp:332
+msgid "Variable"
+msgstr "ცვლადი"
+
+#: export/ExportMP3.cpp:333
+msgid "Average"
+msgstr "საშუალო"
+
+#: export/ExportMP3.cpp:334
+msgid "Constant"
+msgstr "კონსტანტა"
+
+#: export/ExportMP3.cpp:373
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "ხარისხი"
+
+#: export/ExportMP3.cpp:379
+msgid "Variable Speed:"
+msgstr "ცვლადის სიჩქარე:"
+
+#: export/ExportMP3.cpp:386
+msgid "Channel Mode:"
+msgstr "არხის რეჯიმი"
+
+#: export/ExportMP3.cpp:391
+msgid "Joint Stereo"
+msgstr "გაერთიანებული სტერეო"
+
+#: export/ExportMP3.cpp:392
+msgid "Stereo"
+msgstr "სტერეო"
+
+#: export/ExportMP3.cpp:536
+msgid "Locate Lame"
+msgstr "Lame მდებარეობის განსაზღვრა"
+
+#: export/ExportMP3.cpp:556
+#, c-format
+msgid "Audacity needs the file %s to create MP3s."
+msgstr "Audacity საჭიროებს %s  ფაილს MP3 შესაქმნელად."
+
+#: export/ExportMP3.cpp:578
+msgid "To get a free copy of Lame, click here -->"
+msgstr "Lame უფასო ასლის მისაღებად დააწკაპუნეთ აქ -->"
+
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
+#: export/ExportMP3.cpp:1094
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "მხოლოდ lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+
+#: export/ExportMP3.cpp:1550
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "მხოლოდ libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+
+#: export/ExportMP3.cpp:1567
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "მხოლოდ ibmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+
+#: export/ExportMP3.cpp:1652
+msgid "MP3 Files"
+msgstr "MP3 ფაილები"
+
+#: export/ExportMP3.cpp:1676
+msgid "Could not open MP3 encoding library!"
+msgstr "შეუძლებელია MP3 კოდირების ბიბლიოთეკის გახსნა !"
+
+#: export/ExportMP3.cpp:1683
+msgid "Not a valid or supported MP3 encoding library!"
+msgstr "არასწორი ან მხარდაუჭერელი MP3 კოდირების ბიბლიოთეკა!"
+
+#: export/ExportMP3.cpp:1760
+msgid "Unable to initialize MP3 stream"
+msgstr "შეუძლებელია  MP3  ნაკადის დაწყება"
+
+#: export/ExportMP3.cpp:1802
+#, c-format
+msgid "Exporting selected audio with %s preset"
+msgstr "მონიშნული აუდიოს %s პარამეტრით ექსპორტი"
+
+#: export/ExportMP3.cpp:1803
+#, c-format
+msgid "Exporting entire file with %s preset"
+msgstr "მთლიანი ფაილის %s პარამეტრით ექსპორტი"
+
+#: export/ExportMP3.cpp:1808
+#, c-format
+msgid "Exporting selected audio with VBR quality %s"
+msgstr "მონიშნული აუდიოს VBR  %s ხარისხით ექსპორტი"
+
+#: export/ExportMP3.cpp:1809
+#, c-format
+msgid "Exporting entire file with VBR quality %s"
+msgstr "მთლიანი ფაილის VBR  %s ხარისხით ექსპორტი"
+
+#: export/ExportMP3.cpp:1814
+#, c-format
+msgid "Exporting selected audio at %d Kbps"
+msgstr "Exporting selected audio at %d Kbps"
+
+#: export/ExportMP3.cpp:1815
+#, c-format
+msgid "Exporting entire file at %d Kbps"
+msgstr "Exporting entire file at %d Kbps"
+
+#: export/ExportMP3.cpp:1849
+#, c-format
+msgid "Error %d returned from MP3 encoder"
+msgstr " MP3 მაკოდირებლის მიერ დაბრუნებული %d შეცდომა"
+
+#: export/ExportMP3.cpp:1933
+#, c-format
+msgid "The project sample rate (%d) is not supported by the MP3\n"
+"file format.  "
+msgstr "პროექტის სემპლის კოეფიციენტი (%d) არ არის მხარდაჭერილი არცერთი MP3\n"
+"ფაილის ფორმატით"
+
+#: export/ExportMP3.cpp:1936
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the MP3 file format.  "
+msgstr "პროექტის სემპლის (%d) და ბიტის (%d kbps)  კოეფიციენტის კომბინაცია არ არის მხარდაჭერილი არცერთი MP3\n"
+"ფაილის ფორმატით"
+
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
+
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
+msgid "Export Multiple"
+msgstr "მრავალჯერადი ექსპორტი"
+
+#: export/ExportMultiple.cpp:166
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
+"or if you have a Label Track, you can export a new file for each label.\n"
+"\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "თუ გაქვთ ერთ აუდიო ტრეკზე მეტი, შეგიძლიათ თვითეული ტრეკის ცალცალკე ექსპორტი,\n"
+"ან თუ გაქვთ იარლიყიანი ტრეკი, შეგიძლიათ ახალი ფაილის ექსპორტი თითოეული იარლიყისთვის.\n"
+"\n"
+"ამ პროექტს არ გააჩნია მრავალჯერადი ტრეკები ან იარლიყები, ასე, რომ არ შეგიძლიათ მრავალი ფაილის თანადროული ექსპორტი."
+
+#: export/ExportMultiple.cpp:167
+msgid "Can't export multiple files"
+msgstr "შეუძლებელია მრავალჯერადი ფაილების ექსპორტირება"
+
+#: export/ExportMultiple.cpp:232
+msgid "Export format:"
+msgstr "ექსპორტის ფორმატი:"
+
+#: export/ExportMultiple.cpp:237
+msgid "Options..."
+msgstr "პარამეტრები..."
+
+#: export/ExportMultiple.cpp:241
+msgid "Export location:"
+msgstr "მდებარეობის ექსპორტირება:"
+
+#: export/ExportMultiple.cpp:245
+#: prefs/DirectoriesPrefs.cpp:92
+msgid "Choose..."
+msgstr "არჩევა..."
+
+#: export/ExportMultiple.cpp:246
+msgid "Create"
+msgstr "შექმნა"
+
+#: export/ExportMultiple.cpp:253
+msgid "Split files based on:"
+msgstr "ფაილების დაყოფა:"
+
+#: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
+msgid "Labels"
+msgstr "იარლიყების მიხედვით"
+
+#: export/ExportMultiple.cpp:269
+msgid "Include audio before first label"
+msgstr "აუდიოს ჩართვა პირველ იარლიყამდე"
+
+#: export/ExportMultiple.cpp:275
+msgid "First file name:"
+msgstr "პირველი ფაილის სახელი:"
+
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr "პირველი ფაილის სახელი:"
+
+#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
+msgid "Tracks"
+msgstr "ტრეკები"
+
+#: export/ExportMultiple.cpp:297
+msgid "Name files:"
+msgstr "ფაილების სახელების დარქმევა:"
+
+#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
+msgid "Using Label/Track Name"
+msgstr "იარლიყის/ტრეკის სახელის გამოყენება"
+
+#: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
+msgid "Numbering consecutively"
+msgstr "მიმდევრობით დანომრვა"
+
+#: export/ExportMultiple.cpp:322
+msgid "File name prefix:"
+msgstr "ფაილის სახელის პრექფიქსი"
+
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr "ფაილის სახელის პრექფიქსი"
+
+#: export/ExportMultiple.cpp:341
+msgid "Overwrite existing files"
+msgstr "არსებულ ფაილებზე გადაწერა"
+
+#: export/ExportMultiple.cpp:424
+#, c-format
+msgid "\"%s\" successfully created."
+msgstr "\"%s\" წარმატებით შეიქმნა."
+
+#: export/ExportMultiple.cpp:433
+msgid "Choose a location to save the exported files"
+msgstr "ექსპორტირებული ფაილების შესანახი მდებარეობის არჩევა"
+
+#: export/ExportMultiple.cpp:539
+#, c-format
+msgid "\"%s\" doesn't exist.\n"
+"\n"
+"Would you like to create it?"
+msgstr "\"%s\" არ არსებობს\n"
+"\n"
+"გსურთ შექმნა?"
+
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr "მეტამონაცემების რედაქტირება"
+
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
+#, c-format
+msgid "Successfully exported %d file(s)."
+msgstr "%d ფაილების წარმატებული ექსპორტი."
+
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
+#, c-format
+msgid "Something went wrong after exporting %d file(s)."
+msgstr "%d ფაილ(ებ)ის ექსპორტისას რაღაც დაზიანდა."
+
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr "იარლიყი %s  არ არის ფაილის სწორი სახელი. არ შეგიძლიათ გამოიყენოთ:  %s\n"
+"გამოიყენეთ..."
+
+#: export/ExportOGG.cpp:64
+msgid "Specify Ogg Vorbis Options"
+msgstr "Ogg Vorbis პარამეტრების განსაზღვრა"
+
+#: export/ExportOGG.cpp:81
+msgid "Ogg Vorbis Export Setup"
+msgstr "Ogg Vorbis ექსპორტის მომართვა"
+
+#: export/ExportOGG.cpp:157
+msgid "Ogg Vorbis Files"
+msgstr "Ogg Vorbis ფაილები"
+
+#: export/ExportOGG.cpp:257
+msgid "Exporting the selected audio as Ogg Vorbis"
+msgstr "მონიშნული Ogg Vorbis აუდიოს ექსპორტირება"
+
+#: export/ExportOGG.cpp:258
+msgid "Exporting the entire project as Ogg Vorbis"
+msgstr "მთლიანი პროექტის Ogg Vorbis ექსპორტი"
+
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
+msgstr "არაკომპრესირებული პარამეტრების განსაზღვრა"
+
+#: export/ExportPCM.cpp:185
+msgid "Uncompressed Export Setup"
+msgstr "არაკომპრესირებული ექსპორტის მომართვა:"
+
+#: export/ExportPCM.cpp:191
+msgid "Header:"
+msgstr "ჰედერი:"
+
+#: export/ExportPCM.cpp:195
+#: import/ImportRaw.cpp:366
+msgid "Encoding:"
+msgstr "კოდირება:"
+
+#: export/ExportPCM.cpp:200
+msgid "(Not all combinations of headers and encodings are possible.)"
+msgstr "(ჰედერებისა და კოდირებების ყველა კომბინაცია არაა მხარდაჭერილი.)"
+
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr "სხვა არაკომპრესირებული ფაილები"
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr "AIFF (Apple) ხელმოწერილი 16 bit PCM"
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr "WAV (Microsoft) ხელმოწერილი 6 bit PCM"
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr "GSM 6.10 WAV (mobile)"
+
+#: export/ExportPCM.cpp:449
+msgid "Cannot export audio in this format."
+msgstr "შეუძლებელია აუდიოს ამ ფორმატით ექსპორტირება. "
+
+#: export/ExportPCM.cpp:491
+#, c-format
+msgid "Exporting the selected audio as %s"
+msgstr "მონიშნული აუდიოს ექსპორტირება როგორც %s"
+
+#: export/ExportPCM.cpp:493
+#, c-format
+msgid "Exporting the entire project as %s"
+msgstr "მთლიანი პროექტის ექსპორტირება როგორც %s"
+
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:531
+#, c-format
+msgid "Error (file may not have been written): %s"
+msgstr "შეცდომა (ფაილი შეიძლება არ ჩაწერილა): %s"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156
+#: import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "MP3 ფაილები"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr "ნაკადების მონიშვნა იმპორტირებისთვის"
+
+#: import/Import.cpp:227
+#, c-format
+msgid "This version of Audacity was not compiled with %s support."
+msgstr "Audacity ეს ვერსია არ იყო კომპილირებული %s მხარდაჭერით."
+
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr "\"%s\" \n"
+"MIDI ფაილია. \n"
+"Audacity-ს არ შეუძლია ამ ტიპის ფაილის გახსნა დასაკვრელად, მაგრამ\n"
+"მისი რედაქტირება შეგიძლია შემდეგნაირად ფაილი > იმპორტი > MIDI."
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:250
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
+"Audacity cannot open audio CDs directly. \n"
+"Extract (rip) the CD tracks to an audio format that \n"
+"Audacity can import, such as WAV or AIFF."
+msgstr "\"%s\" აუდიო CD ტრეკია. \n"
+"Audacity-ის არ შეუძლია აუდიო CD პირდაპირ გახსნა \n"
+"ამოიღეთ (დარიპეთ)   CD ტრეკები იმ აუდიო ფორმატში, რომლის \n"
+"იმპორტიც შეუძლია Audacity-ის როგორც WAV ან AIFF."
+
+#: import/Import.cpp:256
+#, c-format
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr "\"%s\" რეპერტუარის ფაილია \n"
+"Audacity-ს არ შეუძლია ამ ფაილია გახსნა, რადგან ის შეიცავს მხოლოდ ბმულებს სხვა ფაილებზე. \n"
+"მისი გახსნა შეგიძლიათ ტექსტურ რედაქტორში და შემდეგ რეალური აუდიო ფაილების ჩამოტვირთვა."
+
+#: import/Import.cpp:261
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
+"Audacity cannot open this type of file due to patent restrictions. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\"   Windows Media Audio ფაილია. \n"
+"Audacity-ის არ შეუძლია მისი გახსნა სალიცენზიო აკრძალვების გამო. \n"
+"გადაიყვანეთ მხარდაჭერილ ფორმატში, როგორიცაა WAV ან AIFF."
+
+#: import/Import.cpp:266
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+
+#: import/Import.cpp:271
+#, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
+"Audacity cannot open this type of file due to the encryption. \n"
+"Try recording the file into Audacity, or burn it to audio CD then \n"
+"extract the CD track to a supported audio format such as WAV or AIFF."
+msgstr "\"%s\" დაშიფრული აუდიო ფაილია. \n"
+"ეს ფაილები ძირითადად მოდის ინტერნეტ-მუსიკალური მაღაზიებიდან. \n"
+"Audacity-ს არ შეუძლია მისი გახსნა ფაილის დაშიფრვის გამო. \n"
+"შეეცადეთ ჩაიწეროთ ფაილი Audacity-ში, ან ჩაწეროთ CD-ზე, \n"
+"შემდეგ კი ამოიღოთ CD ტრეკი მხარდაჭერილ ფორმატში, მაგ. WAV ან AIFF."
+
+#: import/Import.cpp:276
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
+"Audacity cannot open this proprietary format. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" RealPlayer მედია ფაილი. \n"
+"Audacity-ის არ შეუძლია ამ ფორმატის გახსნა. \n"
+"გადაიყვანეთ მხარდაჭერილ აუდიო ფორმატშიt, მაგ. WAV or AIFF."
+
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr "\"%s\" შენიშვნებზე დაფუძნებული ფაილია, არა აუდიო. \n"
+"Audacity-ს არ შეუძლია ამ ტიპის ფაილის გახსნაe. \n"
+"მოახდინეთ კონვერტაცია - WAV ან AIFF ფორმატში \n"
+"შემდეგ მოახდინეთ იმპორტი ან ჩაწერეთ Audacity-ში."
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr "Audacity ვერ ამოიცნო ფაილი '%s'-ის ტიპი.\n"
+"ის არაკომპრესირებულია, შეეცადეთ მის იმპორტირებას  \"დაუმუშავებელის იმპორტი\"-ის საშალებით."
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr "Audacity-იმ ამოიცნა  '%s' ფაილის ტიპი,\n"
+"მაგრამ ვერ მოახერხა მისი იმპორტირება."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "FFmpeg-თავსებადი ფაილები"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:43
+msgid "FLAC files"
+msgstr "FLAC ფაილები"
+
+#: import/ImportLOF.cpp:95
+msgid "List of Files in basic text format"
+msgstr "ძირითადი ტექსტური ფორმატის ფაილთა სია"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:314
+msgid "Invalid window offset in LOF file."
+msgstr "LOF ფაილში არასწორი ფანჯრის ოფსეტია."
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:316
+#: import/ImportLOF.cpp:337
+#: import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
+msgid "LOF Error"
+msgstr "LOF შეცდომა"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:335
+msgid "Invalid duration in LOF file."
+msgstr "LOF ფაილში არასწორი ხანგრძლივობაა."
+
+#: import/ImportLOF.cpp:417
+msgid "MIDI tracks cannot be offset individually, only audio files can be."
+msgstr "MIDI ტრეკების ინდივიდუალური ოფსეტი შეუძებელია. მხოლოდ აუდიო ფაილები."
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:438
+msgid "Invalid track offset in LOF file."
+msgstr "LOF ფაილში არასწორი ტრეკის ოფსეტი."
+
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": ფაილის სახელი ძალიან მოკლეა."
+
+#: import/ImportMIDI.cpp:31
+#: import/ImportMIDI.cpp:39
+#: import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "შეუძლებელია ფაილის გახსნა"
+
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": ფაილის არასწორი ტიპი."
+
+#: import/ImportOGG.cpp:44
+msgid "Ogg Vorbis files"
+msgstr "Ogg Vorbis ფაილები"
+
+#: import/ImportOGG.cpp:184
+msgid "Media read error"
+msgstr "მედიის წაკითხვის შეცდომა"
+
+#: import/ImportOGG.cpp:187
+msgid "Not an Ogg Vorbis file"
+msgstr "ეს არ არის Ogg Vorbis ფაილი"
+
+#: import/ImportOGG.cpp:190
+msgid "Vorbis version mismatch"
+msgstr "Vorbis ვერსია არ დაემთხვა"
+
+#: import/ImportOGG.cpp:193
+msgid "Invalid Vorbis bitstream header"
+msgstr "Vorbis  ბიტური ნაკადის არასწორი ჰედერი"
+
+#: import/ImportOGG.cpp:196
+msgid "Internal logic fault"
+msgstr "შიდა ლოგიკური შეცდომა"
+
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, და სხვა არაკომპრესირებული ტიპები"
+
+#: import/ImportPlugin.h:142
+#: import/ImportRaw.cpp:203
+#, c-format
+msgid "Importing %s"
+msgstr "%s იმპორტირება"
+
+#: import/ImportQT.cpp:21
+msgid "QuickTime files"
+msgstr "QuickTime ფაილები"
+
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr "Raw იმპორტირება"
+
+#: import/ImportRaw.cpp:282
+msgid "Import Raw Data"
+msgstr "Raw მონაცემების იმპორტირება"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:327
+msgid "No endianness"
+msgstr "ბიტური რიგის გარეშე"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:330
+msgid "Little-endian"
+msgstr "მახვილბოლოიანი"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:333
+msgid "Big-endian"
+msgstr "ბლაგვბოლოიანი"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:336
+msgid "Default endianness"
+msgstr "ნაგულისხმევი ბიტური რიგი"
+
+#: import/ImportRaw.cpp:355
+msgid "1 Channel (Mono)"
+msgstr "1 არხი (მონო)"
+
+#: import/ImportRaw.cpp:356
+msgid "2 Channels (Stereo)"
+msgstr "2 არხი (სტერეო)"
+
+#: import/ImportRaw.cpp:358
+#, c-format
+msgid "%d Channels"
+msgstr "%d არხი"
+
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr "ბაიტების რიგი:"
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "არხები:"
+
+#: import/ImportRaw.cpp:382
+msgid "Start offset:"
+msgstr "ოფსეტის დაწყება:"
+
+#: import/ImportRaw.cpp:388
+msgid "Amount to import:"
+msgstr "იმპორტირების რაოდენობა:"
+
+#: import/ImportRaw.cpp:394
+msgid "Sample rate:"
+msgstr "სემპლის კოეფიციენტი"
+
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr "იმპორტი დასრულებულია. ტალღოვანის გამოთვლა"
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr "Waveform დეკოდირება"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr "%s %2.0f%% დასრულებულია. დაუწკაპუნეთ დავალების ფოკუსის წერტილის შესაცვლელად."
+
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44
+#: prefs/MidiIOPrefs.cpp:45
+msgid "Audio I/O"
+msgstr "აუდიო I/O"
+
+#: prefs/AudioIOPrefs.cpp:102
+#: prefs/MidiIOPrefs.cpp:99
+msgid "1 (Mono)"
+msgstr "1 (მონო)"
+
+#: prefs/AudioIOPrefs.cpp:103
+#: prefs/MidiIOPrefs.cpp:100
+msgid "2 (Stereo)"
+msgstr "2 (სტერეო)"
+
+#: prefs/AudioIOPrefs.cpp:117
+#: prefs/MidiIOPrefs.cpp:114
+msgid "Playback"
+msgstr "დაკვრა"
+
+#: prefs/AudioIOPrefs.cpp:121
+#: prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118
+#: prefs/MidiIOPrefs.cpp:136
+#: toolbars/DeviceToolBar.cpp:57
+msgid "Device"
+msgstr "მოწყობილობა"
+
+#: prefs/AudioIOPrefs.cpp:124
+#: prefs/MidiIOPrefs.cpp:121
+msgid "Using:"
+msgstr "გამოყენებით:"
+
+#: prefs/AudioIOPrefs.cpp:125
+#: prefs/MidiIOPrefs.cpp:122
+msgid "Portaudio v"
+msgstr "Portaudio v"
+
+#: prefs/AudioIOPrefs.cpp:135
+#: prefs/MidiIOPrefs.cpp:132
+msgid "Recording"
+msgstr "ჩაწერა"
+
+#: prefs/AudioIOPrefs.cpp:141
+#: prefs/MidiIOPrefs.cpp:138
+msgid "Channels"
+msgstr "არხები"
+
+#: prefs/AudioIOPrefs.cpp:147
+#: prefs/MidiIOPrefs.cpp:144
+msgid "Playthrough"
+msgstr "დაკვრა"
+
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "ოვერდუბლიკაცია: სხვა ტრეკების &დაკვრა ახლის ჩაწერის პარალელურად"
+
+#: prefs/AudioIOPrefs.cpp:152
+msgid "&Hardware Playthrough: Play new track while recording it"
+msgstr "&მოწყობილობის დაკვრა: ახალი ტრეკის დაკვრა და ჩაწერა"
+
+#: prefs/AudioIOPrefs.cpp:154
+msgid "&Software Playthrough: Play new track while recording it"
+msgstr "&მოწყობილობის დაკვრა: ახალი ტრეკის დაკვრა და ჩაწერა"
+
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "&მოწყობილობის დაკვრა: ახალი ტრეკის დაკვრა და ჩაწერა ან მონიტორინგი"
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr "(ამორთვა ჩაწერისას  \"სტერეო შერევა\")"
+
+#: prefs/AudioIOPrefs.cpp:168
+#: prefs/MidiIOPrefs.cpp:193
+msgid "Effects Preview"
+msgstr "ეფექტის დათვალიერება"
+
+#: prefs/AudioIOPrefs.cpp:171
+msgid "Length of preview:"
+msgstr "დათვალიერების რეჟიმის სიგრძე:"
+
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/MidiIOPrefs.cpp:157
+msgid "Cut Preview"
+msgstr "ესკიზის ამოჭრა"
+
+#: prefs/AudioIOPrefs.cpp:179
+msgid "Preview before cut region:"
+msgstr "არეს ამოჭრამდე დათვალიერება:"
+
+#: prefs/AudioIOPrefs.cpp:181
+msgid "Preview after cut region:"
+msgstr "ამოჭრის მერე დათვალიერება:"
+
+#: prefs/AudioIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:167
+msgid "Latency"
+msgstr "ლატენცია"
+
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr "გასაცვლელი აუდიო:\n"
+"(რაც მაღალია = მეტია ლატენცია)"
+
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr "ლატენციის გასწორება\n"
+"(ნეგატიური = უკან)"
+
+#: prefs/AudioIOPrefs.cpp:203
+msgid "Seek Time when playing"
+msgstr "დროის ძიება დაკვრისას"
+
+#: prefs/AudioIOPrefs.cpp:206
+#: prefs/MidiIOPrefs.cpp:186
+msgid "Short period:"
+msgstr "მოკლე პერიოდი:"
+
+#: prefs/AudioIOPrefs.cpp:208
+#: prefs/MidiIOPrefs.cpp:188
+msgid "Long period:"
+msgstr "გრძელი პერიოდი:"
+
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
+msgid "Batch"
+msgstr "ჯგუფური"
+
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:92
+msgid "Behaviors"
+msgstr "ქცევა"
+
+#: prefs/BatchPrefs.cpp:80
+msgid "&Don't apply effects in batch mode"
+msgstr "არ გააქტიურო ეფექტები ჯგუფურ რეჟიმში"
+
+#: prefs/BatchPrefs.cpp:83
+#: prefs/GUIPrefs.cpp:132
+msgid "Cl&eanSpeech Mode (Customized GUI)"
+msgstr "Cl&eanSpeech რეჟიმი (მორგებული GUI)"
+
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:267
+msgid "Directories"
+msgstr "დირექტორიები"
+
+#: prefs/DirectoriesPrefs.cpp:87
+msgid "Temporary files directory"
+msgstr "დროებითი ფაილების დირექტორია"
+
+#: prefs/DirectoriesPrefs.cpp:91
+msgid "Location:"
+msgstr "მდებარეობა:"
+
+#: prefs/DirectoriesPrefs.cpp:93
+msgid "Free Space:"
+msgstr "თავისუფალი სივრცე:"
+
+#: prefs/DirectoriesPrefs.cpp:99
+msgid "Auto save"
+msgstr "ავტოშენახვა"
+
+#: prefs/DirectoriesPrefs.cpp:101
+msgid "Auto save a copy of the project in a separate folder"
+msgstr "პროექტის ასლის ცალკე საქაღალდეში ავტოშენახვა"
+
+#: prefs/DirectoriesPrefs.cpp:104
+msgid "Auto save interval:"
+msgstr "ავტოშენახვის ინტერვალი:"
+
+#: prefs/DirectoriesPrefs.cpp:105
+msgid "minutes"
+msgstr "წუთები"
+
+#: prefs/DirectoriesPrefs.cpp:110
+msgid "Audio cache"
+msgstr "აუდიო ქეში"
+
+#: prefs/DirectoriesPrefs.cpp:112
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+
+#: prefs/DirectoriesPrefs.cpp:121
+msgid "Choose a location to place the temporary directory"
+msgstr "დროებითი დირექტორიის მოსათავსებელი მდებარეობის შერჩევა"
+
+#: prefs/DirectoriesPrefs.cpp:166
+#, c-format
+msgid "Directory %s does not exist. Create it?"
+msgstr "%s დირექტორია არ არსებობს. შევქმნა?"
+
+#: prefs/DirectoriesPrefs.cpp:168
+msgid "New Temporary Directory"
+msgstr "ახალი დროებითი დირექტორია"
+
+#: prefs/DirectoriesPrefs.cpp:187
+#, c-format
+msgid "Directory %s is not writable"
+msgstr "%s დირექტორია არაჩაწერადია"
+
+#: prefs/DirectoriesPrefs.cpp:199
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "დროებით დირექტორიაში შეტანილიც ცვლილებები არ გააქტიურდება Audacity-ის გადატვირთვამდე"
+
+#: prefs/FileFormatPrefs.cpp:53
+#: prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr "იმპორტი / ექსპორტი"
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr "MP3 ექსპორტის ბიბლიოთეკა"
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "MP3 Library Version:"
+msgstr "MP3 ბიბლიოთეკის ვერსია:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr "MP3 ბიბლიოთეკა:"
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr "LAME MP3 ბიბლიოთეკა:"
+
+#: prefs/FileFormatPrefs.cpp:101
+#: prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr "&ჩამოტვირთვა"
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "FFmpeg იმპორტი/ექსპორტის ბიბლიოთეკა"
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "FFmpeg  ბიბლიოთეკის ვერსია:"
+
+#: prefs/FileFormatPrefs.cpp:118
+#: prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "FFmpeg ბიბლიოთეკა:"
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "შენიშვნა: ხარისხის პარამეტრების ექსპორტის ამორჩევა შეიძლება პარამეტრების ღილაკზე დაწკაპუნებით ექსპორტის დიალოგურ სარკმელში.\n"
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr "აუდიოს ფაილების იმპორტისას "
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr "&შექმენით არაკომპრესირებული აუდიო ფაილების ასლი რედაქტირებამდე (უსაფრთხოა)"
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr "არაკომპრესირებული ფაილების &წაკითხვა პირდაპირ ორიგინალიდან (უფრო სწრაფია)"
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr "ყველა ტრეკის &ნორმალიზაცია პროექტში"
+
+#: prefs/FileFormatPrefs.cpp:148
+msgid "When saving a project that depends on other audio files"
+msgstr "პროექტის შენახვისას, რომელიც დამოკიდებულია სხვა აუდიო ფაილებზე"
+
+#: prefs/FileFormatPrefs.cpp:151
+msgid "Always &copy all audio into project (safest)"
+msgstr "ყოველთვის &დააკოპირე ყველა აუდიო პროექტში (უსაფრთხო)"
+
+#: prefs/FileFormatPrefs.cpp:152
+msgid "&Do not copy any audio"
+msgstr "&არ დააკოპირო არცერთი აუდიო"
+
+#: prefs/FileFormatPrefs.cpp:153
+msgid "&Ask user"
+msgstr "მომხმარებლისთვის კითხვა"
+
+#: prefs/FileFormatPrefs.cpp:157
+msgid "When exporting tracks to an audio file"
+msgstr "ტრეკების ექსპორტისას აუდიო ფაილში"
+
+#: prefs/FileFormatPrefs.cpp:160
+msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
+msgstr "&ყოველთვის დაიყვანე ყველა ტრეკი სტერეო ან მონო არხამდე."
+
+#: prefs/FileFormatPrefs.cpp:161
+msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
+msgstr "&ინდივიდუალური მიქსინგის გამოყენება (მაგ.  5.1 მულტიარხოვანი ფაილის ექსპორტირებისთვის)"
+
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
+msgstr "მეტამონაცემების რედაქტორის ჩვენება ექსპორტამდე"
+
+#: prefs/GUIPrefs.cpp:34
+#: prefs/GUIPrefs.cpp:35
+msgid "Interface"
+msgstr "ინტერფეისი"
+
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr "ბრაუზერში"
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr "ინტერნეტიდან"
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr "მარტივი"
+
+#: prefs/GUIPrefs.cpp:94
+msgid "&Update display while playing"
+msgstr "&ეკრანის განახლება დაკვრისას"
+
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr "უკანასკნელი ფანჯრის დახურვა იწვევს  Audacity-ის დახურვას"
+
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr "მარცხენა და მარჯვენა მონიშვნის კიდეების გადათრევის გააქტიურება"
+
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr "აუდიო  I/O ღილაკების ერ&გონომიული განლაგება"
+
+#: prefs/GUIPrefs.cpp:102
+msgid "Automatically &fit tracks vertically zoomed"
+msgstr "ვერტიკალურად გადიდებული ტრეკების ავტომატური მორგება"
+
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"ტრეკის ფოკუსის ციკლების გადაადგილება\" განმეორებითად ტრეკებზე"
+
+#: prefs/GUIPrefs.cpp:106
+msgid "Editing a &clip can move other clips"
+msgstr "კლიპის რედაქტირება გამოიწვევს სხვა კლიპების გადაადგილებას"
+
+#: prefs/GUIPrefs.cpp:108
+msgid "&Select all audio in project, if none selected"
+msgstr "ყველა აუდიოს მონიშვნა პროექტში, თუ არცერთი არაა მონიშნული"
+
+#: prefs/GUIPrefs.cpp:110
+msgid "&Beep on completion of longer activities"
+msgstr "დიდი ხანგრძლივობის მოქმედებების დასრულებისას სიგნალი"
+
+#: prefs/GUIPrefs.cpp:114
+msgid "Show / Hide"
+msgstr "ჩვენება / დამალვა"
+
+#: prefs/GUIPrefs.cpp:116
+msgid "Enable cut &lines"
+msgstr "ხაზების მოჭრის გააქტიურება"
+
+#: prefs/GUIPrefs.cpp:118
+msgid "Show warnings about &temp files"
+msgstr "დროებითი ფაილების გაფრთხილებების ჩვენება"
+
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr "შენახვის შეკითხვის ჩვენება, მაშინაც თუ პროექტი ცარიელია"
+
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
+msgstr "მისალმების &შეტყობინების ჩვენება პროგრამის დასაწყისში"
+
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr "რეჟიმები"
+
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr "არ გააქტიურო ეფექტები ჯგუფური დამუშავების რეჟიმში"
+
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr "დიაპაზონის მინიმუმის ჩვენება: მთვლელი და  'Waveform (dB)'"
+
+#: prefs/GUIPrefs.cpp:141
+msgid "-36 dB (shallow range for high-amplitude editing)"
+msgstr "-36 dB (მეჩხერი დიაპაზონი მაღალი ამპლიტუდის რედაქტირებისთვის)"
+
+#: prefs/GUIPrefs.cpp:142
+msgid "-48 dB (PCM range of 8 bit samples)"
+msgstr "-48 dB (PCM დიაპაზონი 8 ბიტიანი სემპლებისთვის)"
+
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr "-60 dB (PCM დიაპაზონი 10 ბიტიანი სემპლებისთვის)"
+
+#: prefs/GUIPrefs.cpp:144
+msgid "-96 dB (PCM range of 16 bit samples)"
+msgstr "-96 dB (PCM დიაპაზონი 16  ბიტიანი სემპლებისთვის)"
+
+#: prefs/GUIPrefs.cpp:145
+msgid "-120 dB (approximate limit of human hearing)"
+msgstr "-120 dB (დაახლოებითი ლიმიტი ადამიანის სმენადობისთვის)"
+
+#: prefs/GUIPrefs.cpp:146
+msgid "-145 dB (PCM range of 24 bit samples)"
+msgstr "-145 dB (PCM დიაპაზონი 24 ბიტიანი სემპლებისთვის)"
+
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr "ნაგულისხმები დათვალიერების რეჟიმი"
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr "ინტერფეისის სხვა არჩევანი"
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr "დახმარება:"
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr "სოლო ღილაკი:"
+
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
+msgid "Keyboard"
+msgstr "კლავიატურა"
+
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:95
+msgid "Key Bindings"
+msgstr "კლავიატურის ბმები"
+
+#: prefs/KeyConfigPrefs.cpp:115
+msgid "S&et"
+msgstr "მ&ორგება"
+
+#: prefs/KeyConfigPrefs.cpp:120
+msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
+msgstr "შენიშნვა: Cmd+Q-ზე დაჭერა გამოწვევს დახურვას. ყველა სხვა კლავიში დასაშვებია."
+
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
+msgid "&Defaults"
+msgstr "&ნაგულისხმევი პარამეტრები"
+
+#: prefs/KeyConfigPrefs.cpp:143
+msgid "Key Combination"
+msgstr "კლავიშთა კომბინაცია"
+
+#: prefs/KeyConfigPrefs.cpp:163
+msgid "Export Keyboard Shortcuts As:"
+msgstr "კლავიშების მალსახმობების ექსპორტი როგორც:"
+
+#: prefs/KeyConfigPrefs.cpp:183
+msgid "Error saving keyboard shortcuts"
+msgstr "კლავიშების მალსახმობები შენახვის შეცდომა"
+
+#: prefs/KeyConfigPrefs.cpp:198
+msgid "Select an XML file containing Audacity keyboard shortcuts..."
+msgstr "მონიშნეთ XML ფაილი, რომელიც შეიცავს Audacity კლავიშების მალსახმობებს..."
+
+#: prefs/KeyConfigPrefs.cpp:215
+msgid "Error loading keyboard shortcuts"
+msgstr "კლავიშების მალსახმობები ჩატვირთვის შეცდომა"
+
+#: prefs/KeyConfigPrefs.cpp:243
+#, c-format
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
+"\n"
+"'%s'"
+msgstr "კლავიშის '%s' მალსახმობს უკვე მინიშებული აქვს:\n"
+"\n"
+"'%s'"
+
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:144
+msgid "Undo"
+msgstr "დაბრუნება"
+
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "სხვა ტრეკების დაკვრა &ახალი ტრეკის ჩაწერისას"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "&მოწყობილობის მიერ დაკვრა (ახალი ტრეკის დაკვრა  ჩაწერისას)"
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "&პროგრამული დაკვრა (ახალი ტრეკის დაკვრა  ჩაწერისას)"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr "არეს ამოჭრამდე დაკვრა:"
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr "არეს ამოჭრის შემდეგ დაკვრა:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "გასაცვლელი აუდიო:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "ლატენციის კორექცია:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr "ძიების დრო"
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr "დაკვრა დათვალიერებისას:"
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
+msgid "Mouse"
+msgstr "მაუსი"
+
+#: prefs/MousePrefs.cpp:78
+msgid "Mouse Bindings (default values, not configurable)"
+msgstr "მაუსის ბმები (ნაგულისხმევი მნიშვნელობები, ვერ კონფიგურირდება)"
+
+#: prefs/MousePrefs.cpp:93
+msgid "Tool"
+msgstr "ხელსაწყო"
+
+#: prefs/MousePrefs.cpp:94
+msgid "Command Action"
+msgstr "ბრძანების ქმედება"
+
+#: prefs/MousePrefs.cpp:95
+msgid "Buttons"
+msgstr "ღილაკები"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
+msgid "Left-Click"
+msgstr "მარცხენა-წკაპი"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
+msgid "Select"
+msgstr "მონიშვნა"
+
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
+msgid "Set Selection Point"
+msgstr "მონიშვნის წერტილის დაყენება"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
+msgid "Left-Drag"
+msgstr "მარცხენა გადათრევა"
+
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
+msgid "Set Selection Range"
+msgstr "მონიშვნის დიაპაზონის მომართვა"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Extend Selection Range"
+msgstr "მონიშვნის დიაპაზონის გაფართოება"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Shift-Left-Click"
+msgstr "Shift-მარცხენა-წკაპი"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Left-Double-Click"
+msgstr "მარცხენა ორმაგი წკაპი"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Select Clip or Entire Track"
+msgstr "კლიპის ან მთლიანი ტრეკის მონიშვნა"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Ctrl-Left-Click"
+msgstr "Ctrl-მარცხენა წკაპი"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Set Selection Point and Play"
+msgstr "მონიშვნის წერილისა და დაკვრის მომართა"
+
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom"
+msgstr "გადიდება"
+
+#: prefs/MousePrefs.cpp:104
+msgid "Zoom in on Point"
+msgstr "წერტილზე მასშტაბირება"
+
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Zoom in on a Range"
+msgstr "დიაპაზონზე მასშტაბირება"
+
+#: prefs/MousePrefs.cpp:105
+msgid "same as right-drag"
+msgstr "იგივე, რაც მარჯვენა გადათრევა"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Right-Click"
+msgstr "მარჯვენა წკაპი"
+
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
+msgid "Zoom out one step"
+msgstr "ერთი ნაბიჯის შემცირება"
+
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
+msgid "Right-Drag"
+msgstr "მარჯვენა გადათრევა"
+
+#: prefs/MousePrefs.cpp:107
+msgid "same as left-drag"
+msgstr "იგივე, რაც მარცხენა გადათრევა"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Shift-Drag"
+msgstr "Shift-გადათრევა"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Zoom out on a Range"
+msgstr "დიაპაზონზე გადიდება"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Middle-Click"
+msgstr "შუა-წკაპი"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom default"
+msgstr "ნაგულისხმევი მასშტაბირება"
+
+#: prefs/MousePrefs.cpp:111
+msgid "Time shift clip or move up/down between tracks"
+msgstr "დროის ცვლის სანიშნი ან ტრეკებს შორის ატანა/ჩამოტანა "
+
+#: prefs/MousePrefs.cpp:112
+msgid "Shift-Left-Drag"
+msgstr "Shift-მარცხენა-გადათრევა"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Time shift all clips in track"
+msgstr "ყველა სანიშნის დროის ცვლა ტრეკში"
+
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
+msgid "Ctrl-Left-Drag"
+msgstr "Ctrl-მარცხენა-გადათრევა"
+
+#: prefs/MousePrefs.cpp:113
+msgid "Move clip up/down between tracks"
+msgstr "სანიშნის  ტრეკებს შორის ატანა/ჩამოტანა "
+
+#: prefs/MousePrefs.cpp:115
+msgid "Change Amplification Envelope"
+msgstr "გაძლიერების კონვერტის შეცვლა"
+
+#: prefs/MousePrefs.cpp:117
+msgid "Change Sample"
+msgstr "სემპლის შეცვლა"
+
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
+msgid "Pencil"
+msgstr "ფანქარი"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Alt-Left-Click"
+msgstr "Alt-მარცხნივ-წკაპი"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Smooth at Sample"
+msgstr "დაგულვება სემპლზე"
+
+#: prefs/MousePrefs.cpp:119
+msgid "Change Several Samples"
+msgstr "რამდენიმე სემპლის შეცვლა"
+
+#: prefs/MousePrefs.cpp:120
+msgid "Change ONE Sample only"
+msgstr "მხოლოდ ერთი სემპლის შეცვლა"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "Multi"
+msgstr "მრავალი"
+
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+msgid "same as select tool"
+msgstr "იგივე რაც მონიშვნის ხელსაწყო"
+
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "same as zoom tool"
+msgstr "იგივე რაც მასშტაბირების ხელსაწყო"
+
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
+msgid "Any"
+msgstr "ნებისმიერი"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Scroll up or down"
+msgstr "ატანა ან ჩამოტანა"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Wheel-Rotate"
+msgstr "ბორბალი-ტრიალი"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Scroll left or right"
+msgstr "მარჯვნივ ან მარცხნივ გადატანა"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Shift-Wheel-Rotate"
+msgstr "Shift-ბორბალი-ტრიალი"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Ctrl-Wheel-Rotate"
+msgstr "Ctrl-ბორბალი-ტრიალი"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Zoom in or out"
+msgstr "გადიდება ან შემცირება"
+
+#: prefs/PrefsDialog.cpp:94
+msgid "Audacity Preferences"
+msgstr "Audacity  პარამეტრები"
+
+#: prefs/QualityPrefs.cpp:73
+msgid "Rectangle"
+msgstr "მართკუთხედი"
+
+#: prefs/QualityPrefs.cpp:74
+msgid "Triangle"
+msgstr "სამკუთხედი"
+
+#: prefs/QualityPrefs.cpp:75
+msgid "Shaped"
+msgstr "ჩამოყალიბებული"
+
+#: prefs/QualityPrefs.cpp:122
+msgid "Sampling"
+msgstr "სემპლინგი"
+
+#: prefs/QualityPrefs.cpp:125
+msgid "Default Sample Rate:"
+msgstr "ნაგულისხმევი სემპლის კოეფიციენტი:"
+
+#: prefs/QualityPrefs.cpp:127
+msgid "Default Sample Format:"
+msgstr "სემპლის ნაგულისხმევი ფორმატი:"
+
+#: prefs/QualityPrefs.cpp:136
+msgid "Real-time sample rate converter:"
+msgstr "რეალურ დროში სემპლის კოეფიციენტის კონვერტორი:"
+
+#: prefs/QualityPrefs.cpp:139
+msgid "High-quality sample rate converter:"
+msgstr "მაღალი-ხარისხის სემპლის კოეფიციენტის კონვერტორი:"
+
+#: prefs/QualityPrefs.cpp:142
+msgid "Real-time dither:"
+msgstr "რეალური დროის დითერი:"
+
+#: prefs/QualityPrefs.cpp:145
+msgid "High-quality dither:"
+msgstr "მაღალი ხარისხის დითერი:"
+
+#: prefs/QualityPrefs.cpp:157
+msgid "Conversion"
+msgstr "კონვერსია"
+
+#: prefs/QualityPrefs.cpp:163
+msgid "Sample Rate Converter"
+msgstr "სემპლის კოეფიციენტის კონვერტორი"
+
+#: prefs/QualityPrefs.cpp:164
+msgid "Dither"
+msgstr "დითერი"
+
+#: prefs/QualityPrefs.cpp:165
+msgid "Real-time:"
+msgstr "რეალური-დრო:"
+
+#: prefs/QualityPrefs.cpp:171
+msgid "High-quality:"
+msgstr "მაღალი-ხარისხი:"
+
+#: prefs/SmartRecordPrefs.cpp:37
+#: prefs/SmartRecordPrefs.cpp:38
+msgid "Smart Recording"
+msgstr "სხარტი ჩაწერა"
+
+#: prefs/SmartRecordPrefs.cpp:64
+#: prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr "ხმის გააქტიურებული ჩაწერა"
+
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr "ხმის გააქტიურების დონე(dB):"
+
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
+msgid "Spectrograms"
+msgstr "სპექტოგრამები"
+
+#: prefs/SpectrumPrefs.cpp:91
+msgid "FFT Size"
+msgstr "FFT ზომა"
+
+#: prefs/SpectrumPrefs.cpp:94
+msgid "8 - most wideband"
+msgstr "8 - most wideband"
+
+#: prefs/SpectrumPrefs.cpp:99
+msgid "256 - default"
+msgstr "256 - ნაგულისხმევი"
+
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr "32768 - ყველაზე ვიწრო"
+
+#: prefs/SpectrumPrefs.cpp:109
+msgid "4096 - most narrowband"
+msgstr "4096 - ყველაზე ვიწრო"
+
+#: prefs/SpectrumPrefs.cpp:116
+msgid "Window type:"
+msgstr "ფანჯრის ტიპი"
+
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr "FFT  წერტილების გამოტოვება"
+
+#: prefs/SpectrumPrefs.cpp:140
+msgid "Display"
+msgstr "ეკრანი"
+
+#: prefs/SpectrumPrefs.cpp:144
+msgid "&Grayscale"
+msgstr "&ნაცრისფერტონები"
+
+#: prefs/SpectrumPrefs.cpp:147
+msgid "Minimum Frequency (Hz):"
+msgstr "მინიმალური სიხშირე (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:152
+msgid "Maximum Frequency (Hz):"
+msgstr "მაქსიმალური სიხშირე (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr "&Y-უჯრედი"
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr "&შენიშვნების ძება"
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr "&კვანტიაზაციის შენიშნები"
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr "მინიმალური ამპლიტუდა (dB):"
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr "შენიშვნების მაქსიმალური რაოდენობა (1..128):"
+
+#: prefs/SpectrumPrefs.cpp:197
+msgid "The maximum frequency must be an integer"
+msgstr "მაქსიმალური სიხშირე ინტეგრალი უნდა იყოს"
+
+#: prefs/SpectrumPrefs.cpp:201
+msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
+msgstr "მაქსიმალური სიხშირე უნდა იყოს 100 Hz - 100,000 Hz დიაპაზონში"
+
+#: prefs/SpectrumPrefs.cpp:209
+msgid "The minimum frequency must be an integer"
+msgstr "მინიმალური სიხშირე ინტეგრალი უნდა იყოს"
+
+#: prefs/SpectrumPrefs.cpp:213
+msgid "Minimum frequency must be at least 0 Hz"
+msgstr "მინიმალური სიხშირე 0 Hz მაინც უნდა იყოს"
+
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr "მინიმალური ამპლიტუდა  (dB) უნდა იყოს ინტეგრალი"
+
+#: prefs/SpectrumPrefs.cpp:226
+#: prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr "შენიშვნების მაქსიმალური რაოდენობა უნდა იყოს დიაპაზონის ინტეგრალი  1..128"
+
+#: prefs/ThemePrefs.cpp:62
+#: prefs/ThemePrefs.cpp:63
+msgid "Theme"
+msgstr "თემა"
+
+#. i18n-hint: && in here is an escape character to get a single & on screen,
+#. * so keep it as is
+#: prefs/ThemePrefs.cpp:93
+msgid "Theme Cache - Images && Color"
+msgstr "თემის ქეში - გამოსახულებები && ფერი"
+
+#: prefs/ThemePrefs.cpp:95
+msgid "Save Theme Cache"
+msgstr "თემის ქეშის შენახვა"
+
+#: prefs/ThemePrefs.cpp:96
+msgid "Load Theme Cache"
+msgstr "თემის ქეშის ჩატვირთვა"
+
+#: prefs/ThemePrefs.cpp:106
+msgid "Load Theme Cache At Startup"
+msgstr "თემის ქეშის ჩატვირთვა დაწყებისას"
+
+#: prefs/ThemePrefs.cpp:118
+msgid "Individual Theme Files"
+msgstr "ინდივიდუალური თემის ფაილები"
+
+#: prefs/ThemePrefs.cpp:120
+msgid "Save Files"
+msgstr "ფაილების შენახვა"
+
+#: prefs/ThemePrefs.cpp:121
+msgid "Load Files"
+msgstr "ფაილების ჩატვირთვა"
+
+#: prefs/ThemePrefs.cpp:126
+msgid "Info"
+msgstr "ინფო"
+
+#: prefs/ThemePrefs.cpp:129
+msgid "Themability is an experimental feature.\n"
+"\n"
+"To try it out, click \"Save Theme Cache\" then\n"
+"find and modify the images and colors in \n"
+"ImageCacheVxx.png using an image editor such \n"
+"as the Gimp.\n"
+"\n"
+"Click \"Load Theme Cache\" to load the changed images\n"
+"and colors back into Audacity.\n"
+"\n"
+"[Only the control toolbar and the colors on the \n"
+"wavetrack are currently affected, even though the\n"
+"image file shows other icons too.]\n"
+msgstr "Themability is an experimental feature.\n"
+"\n"
+"To try it out, click \"Save Theme Cache\" then\n"
+"find and modify the images and colors in \n"
+"ImageCacheVxx.png using an image editor such \n"
+"as the Gimp.\n"
+"\n"
+"Click \"Load Theme Cache\" to load the changed images\n"
+"and colors back into Audacity.\n"
+"\n"
+"[Only the control toolbar and the colors on the \n"
+"wavetrack are currently affected, even though the\n"
+"image file shows other icons too.]\n"
+
+#: prefs/ThemePrefs.cpp:134
+msgid "You have compiled Audacity with an extra button, \n"
+"'Output Sourcery'.  This will save a C version of \n"
+"the image cache that can be compiled in as a default.\n"
+msgstr "You have compiled Audacity with an extra button, \n"
+"'Output Sourcery'.  This will save a C version of \n"
+"the image cache that can be compiled in as a default.\n"
+
+#: prefs/ThemePrefs.cpp:139
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
+"the Theme Cache will be loaded when the program \n"
+"starts up.\n"
+"\n"
+msgstr "If 'Load Theme Cache At Startup' is checked, then \n"
+"the Theme Cache will be loaded when the program \n"
+"starts up.\n"
+"\n"
+
+#: prefs/ThemePrefs.cpp:142
+msgid "Saving and loading individual theme files uses a \n"
+"separate file for each image, but is otherwise the \n"
+"same idea.\n"
+"\n"
+msgstr "Saving and loading individual theme files uses a \n"
+"separate file for each image, but is otherwise the \n"
+"same idea.\n"
+"\n"
+
+#: toolbars/ControlToolBar.cpp:175
+msgid "Pause"
+msgstr "პაუზა"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play"
+msgstr "დაკვრა"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr "დაკვრა (ციკლური დაკვრისთვის დააჭირეთ Shift)"
+
+#: toolbars/ControlToolBar.cpp:183
+msgid "Stop"
+msgstr "გაჩერება"
+
+#: toolbars/ControlToolBar.cpp:186
+msgid "Skip to Start"
+msgstr "დასაწყისზე გადასვლა"
+
+#: toolbars/ControlToolBar.cpp:189
+msgid "Skip to End"
+msgstr "დასასრულზე გადასვლა"
+
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "ჩაწერა (ჩაწერის დამატებაზე გადასვლა)"
+
+#: toolbars/ControlToolBar.cpp:195
+msgid "Clean Speech"
+msgstr "Clean Speech"
+
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
+msgid "Error while opening sound device. "
+msgstr "ხმის მოწყობილობის გახსნის შეცდომა"
+
+#: toolbars/ControlToolBar.cpp:706
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "CleanSpeech ის რეჟიმში ჩაწერა შეუძლებელია როდესაც პროექტში გახსნილია ერთი ან მეტი ტრეკი."
+
+#: toolbars/ControlToolBar.cpp:707
+msgid "Recording not permitted"
+msgstr "ჩაწერა არ არის ნებადართული"
+
+#: toolbars/DeviceToolBar.cpp:113
+#: toolbars/DeviceToolBar.cpp:115
+msgid "Output Device"
+msgstr "გამონატანის მოწყობილობა"
+
+#: toolbars/DeviceToolBar.cpp:134
+#: toolbars/DeviceToolBar.cpp:136
+msgid "Input Device"
+msgstr "შენატანი მოწყობილობა"
+
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim outside selection"
+msgstr "ამოჭრა მონიშვნის გარეთ"
+
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence selection"
+msgstr "სიჩუმის მონიშვნა"
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr "ტრეკების გადაბმა"
+
+#: toolbars/EditToolBar.cpp:155
+msgid "Zoom In"
+msgstr "შემცირება"
+
+#: toolbars/EditToolBar.cpp:157
+msgid "Zoom Out"
+msgstr "გადიდება"
+
+#: toolbars/EditToolBar.cpp:161
+msgid "Zoom Toggle"
+msgstr "გადაბმის გადიდება"
+
+#: toolbars/EditToolBar.cpp:165
+msgid "Fit Selection"
+msgstr "მონიშვნის მორგება"
+
+#: toolbars/EditToolBar.cpp:165
+msgid "Fit selection in window"
+msgstr "მონიშვნის ფანჯარაში მორგება"
+
+#: toolbars/EditToolBar.cpp:167
+msgid "Fit Project"
+msgstr "პროექტის მორგება"
+
+#: toolbars/EditToolBar.cpp:167
+msgid "Fit project in window"
+msgstr "პროექტის ფანჯარაში მორგება"
+
+#: toolbars/MeterToolBar.cpp:50
+msgid "Meter"
+msgstr "მთვლელი"
+
+#: toolbars/MeterToolBar.cpp:80
+msgid "Play Meter"
+msgstr "მთვლელის დაკვრა"
+
+#: toolbars/MeterToolBar.cpp:81
+msgid "Meter-Play"
+msgstr "მთვლელი-დაკვრა"
+
+#: toolbars/MeterToolBar.cpp:89
+msgid "Record Meter"
+msgstr "რეკორდის გამზომავი"
+
+#: toolbars/MeterToolBar.cpp:90
+msgid "Meter-Record"
+msgstr "მთვლელი-ჩაწერა"
+
+#: toolbars/MeterToolBar.cpp:94
+msgid "Output level meter"
+msgstr "გამონატანის დონის მთვლელი"
+
+#: toolbars/MeterToolBar.cpp:95
+msgid "Input level meter - click to monitor input"
+msgstr "შენატანის დონის მთვლელი - შენატანის მონიტორინგისთვის დაუწკაპუნეთ"
+
+#: toolbars/MixerToolBar.cpp:90
+msgid "Output Volume"
+msgstr "გამონატანის ხმა"
+
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
+msgstr "ცოციას გამონატანი"
+
+#: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
+msgid "Input Volume"
+msgstr "შენატანის ხმა"
+
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
+msgstr "ცოციას შენატანი"
+
+#: toolbars/MixerToolBar.cpp:134
+msgid "Input Source"
+msgstr "შენატანი წყარო"
+
+#: toolbars/SelectionBar.cpp:86
+msgid "Selection"
+msgstr "მონიშვნა"
+
+#: toolbars/SelectionBar.cpp:135
+#: toolbars/SelectionBar.cpp:194
+msgid "Project Rate (Hz):"
+msgstr "პროექტის კოეფიციენტი (Hz):"
+
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:255
+msgid "Selection Start:"
+msgstr "მონიშვნის დაწყება"
+
+#: toolbars/SelectionBar.cpp:163
+#: toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
+msgid "Length"
+msgstr "სიგრძე"
+
+#: toolbars/SelectionBar.cpp:174
+msgid "hidden"
+msgstr "დაფარული"
+
+#: toolbars/SelectionBar.cpp:184
+#: toolbars/SelectionBar.cpp:272
+msgid "Audio Position:"
+msgstr "აუდიოს პოზიცია"
+
+#: toolbars/SelectionBar.cpp:236
+#: toolbars/SelectionBar.cpp:241
+msgid "Snap To"
+msgstr "გადაღება"
+
+#: toolbars/SelectionBar.cpp:260
+msgid "Selection "
+msgstr "მონიშVნა"
+
+#: toolbars/SelectionBar.cpp:325
+msgid "Selection Length"
+msgstr "მონიშვნის სიგრძე"
+
+#: toolbars/SelectionBar.cpp:333
+msgid "Selection End"
+msgstr "მონიშვნის დასასრული"
+
+#: toolbars/ToolBar.cpp:98
+#, c-format
+msgid "Audacity %s ToolBar"
+msgstr "Audacity %s ხელსაწყოთა ზოლი"
+
+#: toolbars/ToolDock.cpp:74
+#: toolbars/ToolDock.cpp:75
+msgid "ToolDock"
+msgstr "ხელსაწყოთა დამაგრება"
+
+#: toolbars/ToolsToolBar.cpp:63
+msgid "Click and drag to select audio"
+msgstr "აუდიოს მოსანიშნად დააწკაპუნეთ და გადაათრიეთ"
+
+#: toolbars/ToolsToolBar.cpp:64
+msgid "Click and drag to edit the amplitude envelope"
+msgstr "დააწკაპუნეთ და გადაათრიეთ აპლიტუდის კონვერტის რედაქტირებისთვის"
+
+#: toolbars/ToolsToolBar.cpp:65
+msgid "Click and drag to edit the samples"
+msgstr "დააწკაპუნეთ და გადაათრიეთ  სემპლების რედაქტირებისთვის"
+
+#: toolbars/ToolsToolBar.cpp:67
+msgid "Click to Zoom In, Shift-Click to Zoom Out"
+msgstr "გასადიდებლად დაუწკაპუნეთ, Shift-წკაპი შემცირებისთვის"
+
+#: toolbars/ToolsToolBar.cpp:69
+msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
+msgstr "არეების გასადიდებლად გადაათრიეთ, მარჯვენა წკაპი შემცირებისთვის"
+
+#: toolbars/ToolsToolBar.cpp:71
+msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
+msgstr "მარცხენა=გადიდება, მარჯვენა=შემცირება, შუა=ნორმალური"
+
+#: toolbars/ToolsToolBar.cpp:73
+msgid "Click and drag to move a track in time"
+msgstr "დაუწკაპუნეთ და გადაათრიეთ ტრეკის დროში გადასაადგილებლად"
+
+#: toolbars/ToolsToolBar.cpp:90
+msgid "Tools"
+msgstr "ხელსაწყოები"
+
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
+msgid "Selection Tool"
+msgstr "მონიშვნის ხელსაწყო"
+
+#: toolbars/ToolsToolBar.cpp:148
+msgid "Envelope Tool"
+msgstr "კონვერტის ხელსაწყო"
+
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
+msgid "Time Shift Tool"
+msgstr "დროის ცვლის ხელსაწყო"
+
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
+msgid "Zoom Tool"
+msgstr "გადიდების ხელსაწყო"
+
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
+msgid "Draw Tool"
+msgstr "ხელსაწყოს აგება"
+
+#: toolbars/ToolsToolBar.cpp:152
+msgid "Multi-Tool Mode"
+msgstr "მრავალი-ხელსაწყოს რეჟიმი"
+
+#: toolbars/ToolsToolBar.cpp:186
+msgid "Slide Tool"
+msgstr "ცოციას ხელსაწყო"
+
+#: toolbars/ToolsToolBar.cpp:187
+msgid "Multi Tool"
+msgstr "მრავალიხელსაწყო"
+
+#: toolbars/TranscriptionToolBar.cpp:84
+msgid "Transcription"
+msgstr "ტრანსკრიპცია"
+
+#: toolbars/TranscriptionToolBar.cpp:171
+msgid "Play at selected speed"
+msgstr "მონიშნული სიჩქარით დაკვრა"
+
+#: toolbars/TranscriptionToolBar.cpp:172
+msgid "Play-at-speed"
+msgstr "დაკვრა სიჩქარით"
+
+#: toolbars/TranscriptionToolBar.cpp:178
+#: toolbars/TranscriptionToolBar.cpp:183
+msgid "Playback Speed"
+msgstr "დაკვრის სიჩქარე"
+
+#: toolbars/TranscriptionToolBar.cpp:196
+msgid "Adjust left selection to next onset"
+msgstr "მარჯვენა მონიშვნის შემდეგ ონსეტზე მორგება"
+
+#: toolbars/TranscriptionToolBar.cpp:197
+msgid "Left-to-On"
+msgstr "მარცხნივ"
+
+#: toolbars/TranscriptionToolBar.cpp:199
+msgid "Adjust right selection to previous offset"
+msgstr "მარჯვენა მონიშვნის წინა ოფსეტზე მორგება"
+
+#: toolbars/TranscriptionToolBar.cpp:200
+msgid "Right-to-Off"
+msgstr "მარჯვნივ"
+
+#: toolbars/TranscriptionToolBar.cpp:202
+msgid "Adjust left selection to next offset"
+msgstr "მარჯვენა მონიშვნის წინა ოფსეტზე მორგება"
+
+#: toolbars/TranscriptionToolBar.cpp:203
+msgid "Left-to-Off"
+msgstr "მარცხნივ"
+
+#: toolbars/TranscriptionToolBar.cpp:205
+msgid "Adjust right selection to previous onset"
+msgstr "მარჯვენა მონიშვნის წინა ონსეტზე მორგება"
+
+#: toolbars/TranscriptionToolBar.cpp:206
+msgid "Right-to-On"
+msgstr "მარჯვნივ"
+
+#: toolbars/TranscriptionToolBar.cpp:208
+msgid "Select region of sound around cursor"
+msgstr "ხმის არეს მონიშვნა კურსორის გარშემო"
+
+#: toolbars/TranscriptionToolBar.cpp:209
+msgid "Select-Sound"
+msgstr "მონიშვნა - ხმა"
+
+#: toolbars/TranscriptionToolBar.cpp:211
+msgid "Select region of silence around cursor"
+msgstr "სიჩუმის არეს მონიშვნა კურსორის გარშემო"
+
+#: toolbars/TranscriptionToolBar.cpp:212
+msgid "Select-Silence"
+msgstr "მონიშვნა - სიჩუმე"
+
+#: toolbars/TranscriptionToolBar.cpp:214
+msgid "Automatically make labels from words"
+msgstr "იარლიყების ავტომატური შექმნა სიტყვებუდან"
+
+#: toolbars/TranscriptionToolBar.cpp:215
+msgid "Make Labels"
+msgstr "იარლიყების შექმნა"
+
+#: toolbars/TranscriptionToolBar.cpp:217
+msgid "Add label at selection"
+msgstr "იარლიყის დამატება მონიშვნისას"
+
+#: toolbars/TranscriptionToolBar.cpp:218
+msgid "Add Label"
+msgstr "იარლიყის დამატება"
+
+#: toolbars/TranscriptionToolBar.cpp:220
+msgid "Calibrate voicekey"
+msgstr "ხმის გასაღების კალიბრაცია"
+
+#: toolbars/TranscriptionToolBar.cpp:221
+msgid "Calibrate"
+msgstr "კალიბრაცია"
+
+#: toolbars/TranscriptionToolBar.cpp:225
+msgid "Adjust Sensitivity"
+msgstr "მგრძნობელობის მორგება"
+
+#: toolbars/TranscriptionToolBar.cpp:230
+msgid "Sensitivity"
+msgstr "მგრძNობელობა"
+
+#: toolbars/TranscriptionToolBar.cpp:235
+msgid "Energy"
+msgstr "ენერგია"
+
+#: toolbars/TranscriptionToolBar.cpp:236
+msgid "Sign Changes (Low Threshold)"
+msgstr "ნიშნის ცვლილებები  (დაბალი ზღვარი)"
+
+#: toolbars/TranscriptionToolBar.cpp:237
+msgid "Sign Changes (High Threshold)"
+msgstr "ნიშნის ცვლილებები  (მაღალი ზღვარი)"
+
+#: toolbars/TranscriptionToolBar.cpp:238
+msgid "Direction Changes (Low Threshold)"
+msgstr "მიმართულების ცვლილებები (დაბალი ზღვარი)"
+
+#: toolbars/TranscriptionToolBar.cpp:239
+msgid "Direction Changes (High Threshold)"
+msgstr "მიმართულების ცვლილებები (მაღალი ზღვარი)"
+
+#: toolbars/TranscriptionToolBar.cpp:247
+msgid "Key type"
+msgstr "გასაღების ტიპი"
+
+#: widgets/AButton.cpp:303
+msgid " (disabled)"
+msgstr "(გაუქმებულია)"
+
+#: widgets/AButton.cpp:461
+msgid "Press"
+msgstr "დააჭირე"
+
+#: widgets/AButton.cpp:540
+msgid "Button"
+msgstr "ღილაკს"
+
+#. i18n-hint: One-letter abbreviation for Left, in VU Meter
+#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#: widgets/ASlider.cpp:612
+#: widgets/Meter.cpp:248
+msgid "L"
+msgstr "მარცხ"
+
+#. i18n-hint: One-letter abbreviation for Right, in VU Meter
+#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#: widgets/ASlider.cpp:615
+#: widgets/Meter.cpp:250
+msgid "R"
+msgstr "მარჯ"
+
+#: widgets/ASlider.cpp:678
+msgid "Center"
+msgstr "ცენტრში"
+
+#: widgets/ASlider.cpp:682
+msgid "Left"
+msgstr "მარცენა"
+
+#: widgets/ASlider.cpp:685
+msgid "Right"
+msgstr "მარჯვენა"
+
+#: widgets/ErrorDialog.cpp:98
+msgid "Help"
+msgstr "დახმარება"
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr "<"
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ">"
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr "წინ"
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr "უაკნ"
+
+#: widgets/ErrorDialog.cpp:255
+msgid "Help on the Internet"
+msgstr "დახმარება ინტერნეტით"
+
+#: widgets/Grabber.cpp:62
+msgid "Grabber"
+msgstr "Grabber"
+
+#: widgets/Grid.cpp:643
+#, c-format
+msgid "%d rows, %d columns"
+msgstr "%d რიგი, %d სვეტი"
+
+#: widgets/Grid.cpp:649
+#: widgets/Grid.cpp:776
+#, c-format
+msgid "Row %d"
+msgstr "რიგი %d"
+
+#: widgets/Grid.cpp:791
+msgid "Empty"
+msgstr "ცარიელი"
+
+#: widgets/Meter.cpp:396
+msgid "Enable Meter"
+msgstr "მთვლელის გააქტიურება"
+
+#: widgets/Meter.cpp:398
+msgid "Disable Meter"
+msgstr "მთვლელის გაუქმება"
+
+#: widgets/Meter.cpp:401
+msgid "Stop Monitoring"
+msgstr "მონიტორინგის შეჩერება"
+
+#: widgets/Meter.cpp:403
+msgid "Start Monitoring"
+msgstr "მონიტორინგის დაწყება"
+
+#: widgets/Meter.cpp:407
+msgid "Horizontal Stereo"
+msgstr "ჰორიზონტალური სტერეო"
+
+#: widgets/Meter.cpp:408
+msgid "Vertical Stereo"
+msgstr "ვერტიკალური სტერეო"
+
+#: widgets/Meter.cpp:425
+msgid "Preferences..."
+msgstr "პარამეტრები..."
+
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr "ხმის არევა..."
+
+#: widgets/Meter.cpp:1145
+msgid "This determines how often the meter is refreshed.\n"
+"If you have a slower PC you may want to select a\n"
+"lower refresh rate (30 per second or lower), so that\n"
+"audio qualtiy is not affected by the meter display."
+msgstr "This determines how often the meter is refreshed.\n"
+"If you have a slower PC you may want to select a\n"
+"lower refresh rate (30 per second or lower), so that\n"
+"audio qualtiy is not affected by the meter display."
+
+#: widgets/Meter.cpp:1146
+msgid "Meter refresh rate per second [1-100]: "
+msgstr "განახლების კოეფიციენტის თვლა ყოველ წამზე  [1-100]: "
+
+#: widgets/Meter.cpp:1147
+msgid "Meter Preferences"
+msgstr "მთვლელის პარამეტრები"
+
+#: widgets/MultiDialog.cpp:82
+msgid " Please select an action "
+msgstr "გთხოვთ, ამოირჩიოთ მოქმედება"
+
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "გთხოვთ, ამოირჩიოთ მოქმედება"
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr "გასული დრო:"
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr "დარჩენილი დრო"
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr "გაუქმება"
+
+#: widgets/Ruler.cpp:1445
+#: widgets/Ruler.cpp:1446
+msgid "Vertical Ruler"
+msgstr "ვერტიკალური სახაზავი"
+
+#. i18n-hint: Format string for displaying time in seconds. Change the comma
+#. * in the middle to the 1000s separator for your locale, and the 'seconds'
+#. * on the end to the word for seconds. Don't change the numbers.
+#: widgets/TimeTextCtrl.cpp:267
+msgid "01000,01000 seconds"
+msgstr "01000,01000 წამი"
+
+#. i18n-hint: Format string for displaying time in hours, minutes and
+#. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
+#. * change the numbers unless there aren't 60 seconds in a minute in your
+#. * locale
+#: widgets/TimeTextCtrl.cpp:276
+msgid "0100 h 060 m 060 s"
+msgstr "0100 ს 060 წ 060 წ"
+
+#. i18n-hint: Name of time display format that shows time in days, hours,
+#. * minutes and seconds
+#: widgets/TimeTextCtrl.cpp:279
+msgid "dd:hh:mm:ss"
+msgstr "სს:წწ:წწ"
+
+#. i18n-hint: Format string for displaying time in days, hours, minutes and
+#. * seconds. Change the 'days' to the word for days, 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes and 's' to the
+#. * abbreviation for seconds. Don't change the numbers unless there aren't
+#. * 24 hours in a day in your locale
+#: widgets/TimeTextCtrl.cpp:285
+msgid "0100 days 024 h 060 m 060 s"
+msgstr "0100 დღე 024 ს 060 წ 060 წ"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and milliseconds (1/1000 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + milliseconds"
+msgstr "სს:წწ:წწ + მილიწამები"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * milliseconds are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.01000 s"
+msgstr "0100 ს 060 წ 060.01000 წ"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and samples (at the current project sample rate)
+#: widgets/TimeTextCtrl.cpp:297
+msgid "hh:mm:ss + samples"
+msgstr "სს:წწ:წწ + სემპლები"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and samples. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes, 's' to the abbreviation for seconds and
+#. * translate samples . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:303
+msgid "0100 h 060 m 060 s+.# samples"
+msgstr "0100 ს 060 წ 060 წ+.# სემპლები"
+
+#. i18n-hint: Name of time display format that shows time in samples (at the
+#. * current project sample rate)
+#: widgets/TimeTextCtrl.cpp:306
+msgid "samples"
+msgstr "სემპლები"
+
+#. i18n-hint: Format string for displaying time in samples (lots of samples).
+#. * Change the ',' to the 1000s separator for your locale, and translate
+#. * samples. If 1000s aren't a base multiple for your number system, then you
+#. * can change the numbers to an appropriate one, and put a 0 on the front
+#: widgets/TimeTextCtrl.cpp:311
+msgid "01000,01000,01000 samples|#"
+msgstr "01000,01000,01000 სემპლები|#"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:314
+msgid "hh:mm:ss + film frames (24 fps)"
+msgstr "სს წწ წწ + ფილმის კადრები (24 fps)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames at 24 frames per second. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames' . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:320
+msgid "0100 h 060 m 060 s+.24 frames"
+msgstr "0100 ს 060 წ 060 წ+.24 კადრები"
+
+#. i18n-hint: Name of time display format that shows time in frames (lots of
+#. * frames) at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:323
+msgid "film frames (24 fps)"
+msgstr "ფილმის კადრები(24 fps)"
+
+#. i18n-hint: Format string for displaying time in frames at 24 frames per
+#. * second. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:326
+msgid "01000,01000 frames|24"
+msgstr "01000,01000 კადრები|24"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV drop-frame rate (used for American /
+#. * Japananese TV, and very odd)
+#: widgets/TimeTextCtrl.cpp:330
+msgid "hh:mm:ss + NTSC drop frames"
+msgstr "hh:mm:ss + NTSC კადრების ჩაგდება"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the |N alone, it's important!
+#: widgets/TimeTextCtrl.cpp:335
+msgid "0100 h 060 m 060 s+.30 frames|N"
+msgstr "0100 ს 060 წ 060 წ+.30 კადრები"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV non-drop-frame rate (used for American /
+#. * Japananese TV, and doesn't quite match wall time
+#: widgets/TimeTextCtrl.cpp:339
+msgid "hh:mm:ss + NTSC non-drop frames"
+msgstr "hh:mm:ss + NTSC არაჩაგდებადი კადრები"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the | .999000999 alone,
+#. * the whole things really is slightly off-speed!
+#: widgets/TimeTextCtrl.cpp:345
+msgid "0100 h 060 m 060 s+.030 frames| .999000999"
+msgstr "0100 h 060 m 060 s+.030 კადრები| .999000999"
+
+#. i18n-hint: Name of time display format that shows time in frames at NTSC
+#. * TV frame rate (used for American / Japananese TV
+#: widgets/TimeTextCtrl.cpp:348
+msgid "NTSC frames"
+msgstr "NTSCკადრები"
+
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone. That really is the frame
+#. * rate!
+#: widgets/TimeTextCtrl.cpp:352
+msgid "01000,01000 frames|29.97002997"
+msgstr "01000,01000 კადრები|29.97002997"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at PAL TV frame rate (used for European TV)
+#: widgets/TimeTextCtrl.cpp:355
+msgid "hh:mm:ss + PAL frames (25 fps)"
+msgstr "სს:წწ:წწ + PAL frames (25 fps)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with PAL TV frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Nice simple time code!
+#: widgets/TimeTextCtrl.cpp:360
+msgid "0100 h 060 m 060 s+.25 frames"
+msgstr "0100 ს 060 წ 060 წ+.25 კადრები"
+
+#. i18n-hint: Name of time display format that shows time in frames at PAL
+#. * TV frame rate (used for European TV
+#: widgets/TimeTextCtrl.cpp:363
+msgid "PAL frames (25 fps)"
+msgstr "PAL კადრი (25 fps)"
+
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone.
+#: widgets/TimeTextCtrl.cpp:366
+msgid "01000,01000 frames|25"
+msgstr "01000,01000 კადრი|25"
+
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at CD Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:369
+msgid "hh:mm:ss + CDDA frames (75 fps)"
+msgstr "სს წწ წწ+ CDDA კადრი(75 fps)"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with CD Audio frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'.
+#: widgets/TimeTextCtrl.cpp:374
+msgid "0100 h 060 m 060 s+.75 frames"
+msgstr "0100 ს 060 წ 060 წ+.75 კადრი"
+
+#. i18n-hint: Name of time display format that shows time in frames at CD
+#. * Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:377
+msgid "CDDA frames (75 fps)"
+msgstr "CDDA კადრი (75 fps)"
+
+#. i18n-hint: Format string for displaying time in frames with CD Audio
+#. * frames. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:380
+msgid "01000,01000 frames|75"
+msgstr "01000,01000 კადრი|75"
+
+#: widgets/TimeTextCtrl.cpp:451
+msgid "Use right mouse button or context key to change format"
+msgstr "ფორმატის შესაცვლელად გამოიყენეთ მარჯვენა კლავიში ან კონტექსტური გასაღები"
+
+#: widgets/TimeTextCtrl.cpp:1485
+msgid "Time Control"
+msgstr "დროის კონტროლი"
+
+#: widgets/Warning.cpp:64
+msgid "Don't show this warning again"
+msgstr "მეტჯერ აღარ აჩვენო ეს გაფრთხილება"
+
+#: xml/XMLFileReader.cpp:49
+#, c-format
+msgid "Could not open file: \"%s\""
+msgstr "შეუძლებელია ფაილის გახსნა: \"%s\""
+
+#: xml/XMLFileReader.cpp:63
+#, c-format
+msgid "Error: %hs at line %lu"
+msgstr "შეცდომა: %hs at line %lu"
+
+#: xml/XMLFileReader.cpp:79
+#, c-format
+msgid "Could not load file: \"%s\""
+msgstr "შეუძლებელია ფაილის ჩატვირთვა: \"%s\""
+
diff --git a/locale/km.po b/locale/km.po
new file mode 100644
index 0000000..2d17c18
--- /dev/null
+++ b/locale/km.po
@@ -0,0 +1,8741 @@
+# translation of audacity.po to Khmer
+# Khoem Sokhem <khoemsokhem at khmeros.info>, 2007, 2008.
+# Eng Vannak <evannak at khmeros.info>, 2008.
+# translation of audacity.po to
+msgid ""
+msgstr "Project-Id-Version: audacity\n"
+"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-10-01 22:40+0100\n"
+"PO-Revision-Date: 2008-07-09 13:48+0700\n"
+"Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
+"Language-Team: Khmer <en at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: AboutDialog.cpp:141 AudacityApp.cpp:726 Menus.cpp:733
+msgid "&About Audacity..."
+msgstr "អំពី Audacity..."
+
+#: AboutDialog.cpp:157
+msgid "OK... Audacious!"
+msgstr ""
+
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
+
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
+
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
+
+#. i18n-hint: The translation of "translator_credits" will appear
+#. in the credits in the About Audacity window.  Use this to add
+#. your own name(s) to the credits.
+#.
+#. For example:  "English translation by Dominic Mazzoni."
+#.
+#: AboutDialog.cpp:256 AboutDialog.cpp:258
+msgid "translator_credits"
+msgstr "ខឹម សុខែម, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
+
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
+
+#: AboutDialog.cpp:277
+msgid "Credits"
+msgstr "អ្នក​ចូលរួម"
+
+#: AboutDialog.cpp:281
+#, c-format
+msgid "Audacity %s Development Team"
+msgstr "ក្រុម​​អភិវឌ្ឍន៍​របស់​ Audacity %s"
+
+#: AboutDialog.cpp:286
+#, c-format
+msgid "Audacity %s Support Team"
+msgstr "ក្រុម​​​គាំទ្រ​​របស់ Audacity %s"
+
+#: AboutDialog.cpp:291
+msgid "Emeritus Developers"
+msgstr "អ្នក​អភិវឌ្ឍន៍​​ដែល​​ចូល​និវត្តន៍"
+
+#: AboutDialog.cpp:296
+msgid "Other Emeritus Team Members"
+msgstr "សមាជិក​​​ក្រុម​​ដែល​​ចូល​​និវត្តន៍​​ផ្សេង​ទៀត"
+
+#: AboutDialog.cpp:301
+msgid "Other Contributors"
+msgstr "អ្នក​ចូលរួម​​ផ្សេងៗ​ទៀត"
+
+#: AboutDialog.cpp:306
+msgid "Audacity is based on code from the following projects:"
+msgstr "Audacity មាន​មូលដ្ឋាន​លើ​កូដ​ពី​គម្រោង​ដូច​ខាង​ក្រោម ៖"
+
+#: AboutDialog.cpp:311
+msgid "Special thanks:"
+msgstr "អរគុណ​ជា​ពិសេស​ ៖"
+
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:320
+msgid "Audacity"
+msgstr "Audacity"
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: AboutDialog.cpp:165 effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "បាន​អនុញ្ញាត"
+
+#: AboutDialog.cpp:166
+msgid "Disabled"
+msgstr "មិន​បាន​អនុញ្ញាត"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:229
+msgid "Program build date: "
+msgstr "កាល​បរិច្ឆេទ​ស្ថាបនា​កម្មវិធី ៖"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:234
+msgid "Settings folder: "
+msgstr "ការ​កំណត់​ថត ៖ "
+
+#: AboutDialog.cpp:388
+msgid "GPL License"
+msgstr "អាជ្ញាបណ្ណ GPL"
+
+#: AudacityApp.cpp:458 Project.cpp:1751
+#, c-format
+msgid "%s is already open in another window."
+msgstr "%s បើក​រួច​ហើយ​នៅ​ក្នុង​បង្អួច​ផ្សេង ។"
+
+#: AudacityApp.cpp:460 Project.cpp:1753 Project.cpp:1834 Project.cpp:1978
+#: Project.cpp:2080
+msgid "Error opening project"
+msgstr "កំហុស​​ក្នុង​​កា​របើក​​គម្រោង"
+
+#: AudacityApp.cpp:492
+#, c-format
+msgid "%s does not exist and could not be opened.\n"
+"\n"
+"It has been removed from the history list."
+msgstr "មិន​ទាន់​មាន %s នៅ​ឡើយ​ទេ ហើយ​មិន​អាច​ត្រូវ​បានបើក ទេ ។ \n"
+"\n"
+"វា​ត្រូវ​បាន​យកចេញ​ពី​បញ្ជី​ប្រវត្តិ ។"
+
+#: AudacityApp.cpp:544
+msgid "Master Gain Control"
+msgstr "ការ​ត្រួតពិនិត្យ​​កំណើន​​មេ"
+
+#: AudacityApp.cpp:545
+msgid "Input Meter"
+msgstr "ចូល"
+
+#: AudacityApp.cpp:546
+msgid "Output Meter"
+msgstr "ចេញ"
+
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: AudacityApp.cpp:728 Menus.cpp:470
+msgid "&Preferences...\tCtrl+,"
+msgstr "ចំណូល​ចិត្ត...\tCtrl+,"
+
+#: AudacityApp.cpp:810 AudacityApp.cpp:887
+#, c-format
+msgid "Using block size of %ld\n"
+msgstr "ប្រើ​ទំហំ​ប្លុក​របស់ %ld\n"
+
+#: AudacityApp.cpp:832 AudacityApp.cpp:902
+#, c-format
+msgid "Unknown command line option: %s\n"
+msgstr "មិនស្គាល់​ជម្រើស​​បន្ទាត់​​ពាក្យ​បញ្ជា ៖ %s\n"
+
+#: AudacityApp.cpp:1021
+msgid "Audacity could not find a place to store temporary files.\n"
+"Please enter an appropriate directory in the preferences dialog."
+msgstr "Audacity មិនអាច​រក​កន្លែង​ដើម្បីទុក​ឯកសា​របណ្ដោះអាសន្ន​បានទេ ។\n"
+"សូម​បញ្ចូល​ថត​ដែលសមរម្យ​នៅ​ក្នុង​ប្រអប់​ចំណូលចិត្ត ។"
+
+#: AudacityApp.cpp:1027
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity នឹង​បិទ​ឥឡូវ ។ សូម​ចាប់ផ្ដើម Audacity ម្ដង​ទៀត ដើម្បី​ប្រើ​ថត​បណ្ដោះ​អាសន្ន​ថ្មី ។"
+
+#: AudacityApp.cpp:1059
+msgid "Running two copies of Audacity simultaneously may cause\n"
+"data loss or cause your system to crash.\n"
+"\n"
+msgstr "កំពុង​រង់​ច្បាប់​ចម្លង​របស់​ Audacity ពីរ​ដំណាល​គ្នា អាច​បណ្ដាល​ឲ្យ\n"
+"បាត់បង់​ទិន្នន័យ ឬ​បណ្ដាល​ឲ្យ​ប្រព័ន្ធ​របស់​អ្នក​គាំង ។\n"
+"\n"
+
+#: AudacityApp.cpp:1066
+msgid "Audacity was not able to lock the temporary files directory.\n"
+"This folder may be in use by another copy of Audacity.\n"
+msgstr "Audacity មិនអាច​ចាក់សោ​ថត​ឯកសារ​បណ្ដោះអាសន្ន​បាន​ទេ ។\n"
+"ថត​នេះ​អាច​កំពុង​ប្រើ​ដោ​យ​ច្បាប់​ចម្លង​របស់​ Audacity ផ្សេង ។\n"
+
+#: AudacityApp.cpp:1068
+msgid "Do you still want to start Audacity?"
+msgstr "តើ​អ្នក​នៅ​តែ​ចង់​ចាប់ផ្ដើម Audacity មែន​ទេ ?"
+
+#: AudacityApp.cpp:1070
+msgid "Error locking temporary folder"
+msgstr "កំហុស​ក្នុង​ការ​ចាក់សោ​ថត​បណ្ដោះអាសន្ន"
+
+#: AudacityApp.cpp:1108
+msgid "The system has detected that another copy of Audacity is running.\n"
+msgstr "ប្រព័ន្ធ​បាន​​ដឹង​ថា មាន​ច្បាប់ចម្លង​របស់ Audacity ផ្សេង​កំពុង​រត់ ។\n"
+
+#: AudacityApp.cpp:1110
+msgid "Use the New or Open commands in the currently running Audacity\n"
+"process to open multiple projects simultaneously.\n"
+msgstr "ប្រើ​ពាក្យ​បញ្ជា​ថ្មី ឬ​ពាក្យ​បញ្ជា​ដែល​បើក​​នៅ​ក្នុង​ Audacity ដែលកំពុង​រត់​បច្ចុប្បន្ន\n"
+"ដំណើរការ​ដើម្បី​បើក​គម្រោង​ច្រើន​ដំណាល​គ្នា ។\n"
+
+#: AudacityApp.cpp:1111
+msgid "Audacity is already running"
+msgstr "Audacity កំពុង​រត់​​រួច​​ហើយ"
+
+#: AudacityApp.cpp:1128
+msgid "Command-line options supported:"
+msgstr "បានគាំទ្រ​ជម្រើស​​បន្ទាត់​​ពាក្យ​​បញ្ជា ៖"
+
+#. i18n-hint: '-help' is the option and needs to stay in
+#. * English. This displays a list of available options
+#: AudacityApp.cpp:1131
+msgid "\t-help (this message)"
+msgstr "\t-help (សារ​នេះ)"
+
+#. i18n-hint '-version' needs to stay in English.
+#: AudacityApp.cpp:1133
+msgid "\t-version (display Audacity version)"
+msgstr "\t-version (បង្ហាញ​​កំណែ​​របស់ Audacity)"
+
+#. i18n-hint '-test' is the option and needs to stay in
+#. * English. This runs a set of automatic tests on audacity
+#. * itself
+#: AudacityApp.cpp:1137
+msgid "\t-test (run self diagnostics)"
+msgstr "\t-test (រត់​​ការ​វិនិច្ឆ័យ​ដោយ​​ខ្លួន​ឯង)"
+
+#. i18n-hint '-blocksize' is the option and needs to stay in
+#. * English. 'nnn' is any integer number. This controls the
+#. * size pieces that audacity uses when writing files to the
+#. * disk
+#: AudacityApp.cpp:1142
+msgid "\t-blocksize nnn (set max disk block size in bytes)"
+msgstr "\t-blocksize nnn (កំណត់​​ទំហំ​ប្លុក​​ថាស​​អតិបរមា​​គិត​ជា​​បៃ)"
+
+#: AudacityApp.cpp:1143
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "ជា​ការ​បន្ថែម បញ្ជាក់​ឈ្មោះ​របស់​ឯកសារ​អូឌីយ៉ូ គម្រោង​របស់ Audacity ដើម្បី​បើក​វា ។"
+
+#: AudacityApp.cpp:1415
+msgid "Audacity project (.AUP) files are not currently \n"
+"associated with Audacity. \n"
+"\n"
+"Associate them, so they open on double-click?"
+msgstr "ឯកសារ​គម្រោង Audacity (.AUP) បច្ចុប្បន្ន​មិន \n"
+"ទាក់ទង​ជាមួយ Audacity ទេ ។\n"
+"\n"
+"ភ្ជាប់​​ពួកវា ដូច្នេះ​ពួកវា​បើ​ក​ដោយ​ចុច​ទ្វេដង ?"
+
+#: AudacityApp.cpp:1416
+msgid "Audacity Project Files"
+msgstr "ឯកសារ​​គម្រោង​​របស់ Audacity"
+
+#: AudioIO.cpp:219
+msgid "Could not find any audio devices.\n"
+msgstr "មិន​អាច​​រក​ឧបករណ៍​អូឌីយ៉ូ​ណាមួយ​បាន​ទេ ។\n"
+
+#: AudioIO.cpp:220
+msgid "You will not be able to play or record audio.\n"
+"\n"
+msgstr "អ្នក​នឹង​មិនអាច​ចាក់ ឬ​ថត​អូឌីយ៉ូ​បាន​ទេ ។\n"
+"\n"
+
+#: AudioIO.cpp:223
+msgid "Error: "
+msgstr "កំហុស ៖ "
+
+#: AudioIO.cpp:226
+msgid "Error Initializing Audio"
+msgstr "កំហុស​ក្នុង​កា​រចាប់ផ្ដើម​អូឌីយ៉ូ"
+
+#: AudioIO.cpp:1236
+msgid "Latency problem"
+msgstr "បញ្ហា​​ជាក់ស្ដែង"
+
+#: AudioIO.cpp:1236
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "ការ​កំណត់ជាក់ស្ដែង​បានបណ្ដាល​ឲ្យ​អូឌីយ៉ូ​ដែល​បានថត​លាក់​មុន​សូន្យ ។\n"
+"Audacity បាន​នាំវា​ត្រឡប់ដើម្បី​ចាប់ផ្ដើម​នៅ​សូន្យ ។\n"
+"អ្នក​អាច​ត្រូវ​ប្រើឧបករណ៍​ប្ដូរ​ពេលវេលា (Time Shift Tool) (<---> ឬ F5) ដើម្បី​អូស​បទ​ទៅ​កន្លែង​ដែល​ត្រឹមត្រូវ ។"
+
+#: AutoRecovery.cpp:54
+msgid "Automatic Crash Recovery"
+msgstr "សង្គ្រោះ​ការគាំង​ដោយ​ស្វ័យ​ប្រវត្តិ"
+
+#: AutoRecovery.cpp:73
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
+"Fortunately, the following projects can automatically be recovered:"
+msgstr "គម្រោង​មួយ​ចំនួន​មិន​ត្រូវ​បាន​រក្សាទុកត្រឹមត្រូវ​ទេ នៅ​ពេលចុង​ក្រោយដែល Audacity ត្រូវ​បាន​រត់ ។\n"
+"ជា​កុសល គម្រោង​ដូច​ខាង​ក្រោម​អាច​ត្រូវ​បាន​សង្គ្រោះ​ដោយ​ស្វ័យ​ប្រវត្តិ ៖"
+
+#: AutoRecovery.cpp:75
+msgid "Recoverable projects"
+msgstr "គម្រោង​​ដែល​​អាច​​សង្គ្រោះ​បាន"
+
+#: AutoRecovery.cpp:78 Tags.cpp:1999
+msgid "Name"
+msgstr "ឈ្មោះ"
+
+#: AutoRecovery.cpp:84
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "កា​រសង្គ្រោះ​គម្រោង​នឹង​មិន​ផ្លាស់ប្ដូរ​ឯកសារ​ណាមួយ​នៅ​លើ​ថាស​ទេ​មុន​ពេល​អ្នក​រក្សា​វា​ទុក ។"
+
+#: AutoRecovery.cpp:88
+msgid "Quit Audacity"
+msgstr "បិទ Audacity"
+
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr ""
+
+#: AutoRecovery.cpp:90
+#, fuzzy
+msgid "Recover Projects"
+msgstr "សង្គ្រោះ​​គម្រោង"
+
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
+
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr ""
+
+#: AutoRecovery.cpp:146 AutoRecovery.cpp:183
+msgid "Could not enumerate files in auto save directory"
+msgstr "មិន​អាច​រាយ​ឈ្មោះ​​ឯកសារ​​នៅ​​ក្នុង​ថត​​រក្សាទុក​​ដោយ​​ស្វ័យ​ប្រវត្តិ​​បានទេ"
+
+#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2545 Menus.cpp:4443
+#: Project.cpp:1937 Project.cpp:3281 Project.cpp:3360 WaveTrack.cpp:542
+#: WaveTrack.cpp:561 WaveTrack.cpp:1650 effects/Effect.cpp:346
+#: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
+#: toolbars/ControlToolBar.cpp:840
+msgid "Error"
+msgstr "កំហុស"
+
+#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
+#: BatchCommandDialog.cpp:61
+msgid "Select Command"
+msgstr "ជ្រើស​​ពាក្យ​បញ្ជា"
+
+#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
+msgid "&Command"
+msgstr "ពាក្យ​បញ្ជា"
+
+#: BatchCommandDialog.cpp:82
+msgid "&Edit Parameters"
+msgstr "កែសម្រួល​ប៉ារ៉ាម៉ែត្រ"
+
+#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:455
+msgid "&Parameters"
+msgstr "ប៉ារ៉ាម៉ែត្រ"
+
+#: BatchCommandDialog.cpp:94
+msgid "C&hoose command"
+msgstr "ជ្រើស​ពាក្យ​បញ្ជា"
+
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
+msgstr "រក​មិន​ឃើញ​​បែបផែន​​ស្តេរ៉េអូ​ទៅ​​ជា​​ម៉ូណូ"
+
+#: BatchCommands.cpp:497
+msgid "Ogg Vorbis support is not included in this build of Audacity"
+msgstr "ការ​គាំទ្រ Ogg Vorbis មិន​ត្រូវ​បាន​រួម​បញ្ចូល​នៅ​ក្នុង​ការ​ស្ថាបនា​របស់ Audacity ទេ"
+
+#: BatchCommands.cpp:509
+msgid "FLAC support is not included in this build of Audacity"
+msgstr "ការ​គាំទ្រ FLAC មិន​ត្រូវ​បាន​រួម​បញ្ចូល​ក្នុង​ការ​ស្ថាបនា​របស់ Audacity ទេ"
+
+#: BatchCommands.cpp:513
+#, c-format
+msgid "Command %s not implemented yet"
+msgstr "មិន​បាន​​អនុវត្ត​​ពាក្យ​បញ្ជា %s នៅ​​ឡើយ​ទេ"
+
+#: BatchCommands.cpp:529
+#, c-format
+msgid "Could not set parameters of effect %s\n"
+" to %s."
+msgstr "មិនអាច​កំណត់​ប៉ារ៉ាម៉ែត្រ​របស់បែបផែន %s\n"
+" ទៅ %s បាន​ទេ ។"
+
+#: BatchCommands.cpp:583
+#, c-format
+msgid "Your batch command of %s was not recognised."
+msgstr "មិន​ស្គាល់​ពាក្យ​​បញ្ជា​បាច់​របស់ %s ។"
+
+#: BatchCommands.cpp:674
+#, c-format
+msgid "Apply %s with parameter(s)\n"
+"\n"
+"%s"
+msgstr "អនុវត្ត %s ជា​មួយ​ប៉ារ៉ាម៉ែត្រ\n"
+"\n"
+"%s"
+
+#: BatchCommands.cpp:675 BatchCommands.cpp:680
+msgid "Test Mode"
+msgstr "របៀប​​សាកល្បង"
+
+#: BatchCommands.cpp:679
+#, c-format
+msgid "Apply %s"
+msgstr "អនុវត្ត %s"
+
+#: BatchProcessDialog.cpp:60 BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
+msgid "Apply Chain"
+msgstr "អនុវត្ត​ច្រវាក់"
+
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
+#: BatchProcessDialog.cpp:94
+msgid "&Select chain"
+msgstr "ជ្រើស​ច្រវាក់"
+
+#: BatchProcessDialog.cpp:99
+msgid "Chain"
+msgstr "ច្រវាក់"
+
+#: BatchProcessDialog.cpp:106
+msgid "Apply to Current &Project"
+msgstr "អនុវត្ត​ទៅ​គម្រោង​បច្ចុប្បន្ន"
+
+#: BatchProcessDialog.cpp:107
+msgid "Apply to &Files..."
+msgstr "អនុវត្ត​ទៅ​ឯកសារ..."
+
+#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2038
+#: Tags.cpp:2042 Tags.cpp:2342 Tags.cpp:2346 UploadDialog.cpp:180
+#: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:183
+#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:437
+#: effects/audiounits/AudioUnitEffect.cpp:882 effects/vamp/VampEffect.cpp:411
+msgid "&Cancel"
+msgstr "បោះបង់"
+
+#: BatchProcessDialog.cpp:146 BatchProcessDialog.cpp:191
+msgid "No chain selected"
+msgstr "គ្មាន​ស្រវាក់​បានជ្រើស"
+
+#: BatchProcessDialog.cpp:159
+#, c-format
+msgid "Applying '%s' to current project"
+msgstr "អនុវត្ត '%s' ទៅ​គម្រោង​បច្ចុប្បន្ន"
+
+#: BatchProcessDialog.cpp:200
+msgid "Please save and close the current project first."
+msgstr "សូម​រក្សាទុក និង​បិទ​គម្រោង​បច្ចុប្បន្ន​សិន ។"
+
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
+#: BatchProcessDialog.cpp:207
+msgid "Select file(s) for batch processing..."
+msgstr "ជ្រើស​ឯកសារ​សម្រាប់​ដំណើរការ​បាច់..."
+
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "ឯកសារ​ទាំងអស់ (*.*)|*.*|ឯកសារ WAV (*.wav)|*.wav|ឯកសារ AIFF (*.aif)|*.aif|ឯកសារ AU (*.au)|*.au|ឯកសារ MP3 (*.mp3)|*.mp3|ឯកសារ Ogg Vorbis​ (*.ogg)|*.ogg|ឯកសារ FLAC​ (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:231
+msgid "Applying..."
+msgstr "កំពុង​​អនុវត្ត..."
+
+#: BatchProcessDialog.cpp:241
+msgid "File"
+msgstr "ឯកសារ"
+
+#: BatchProcessDialog.cpp:356 BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
+msgid "Edit Chains"
+msgstr "កែសម្រួល​​ច្រវាក់"
+
+#: BatchProcessDialog.cpp:416
+msgid "&Chains"
+msgstr "ច្រវាក់"
+
+#: BatchProcessDialog.cpp:435 Tags.cpp:782 Tags.cpp:1422 Tags.cpp:2022
+msgid "&Add"
+msgstr "បន្ថែម"
+
+#: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:783 Tags.cpp:1423
+#: Tags.cpp:2023 TrackPanel.cpp:3985
+msgid "&Remove"
+msgstr "យកចេញ"
+
+#: BatchProcessDialog.cpp:437
+msgid "Re&name"
+msgstr "ប្ដូរ​ឈ្មោះ"
+
+#: BatchProcessDialog.cpp:443
+msgid "C&hain (Double-Click or press SPACE to edit)"
+msgstr "ច្រវាក់ (ចុចទ្វេ​ដង ឬ​ចុច​ចន្លោះ​មិនឃើញ (SPACE) ដើម្បី​កែសម្រួល)"
+
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
+msgid "No"
+msgstr "លេខ​រៀង"
+
+#: BatchProcessDialog.cpp:459
+msgid "&Insert"
+msgstr "បញ្ចូល"
+
+#: BatchProcessDialog.cpp:460
+msgid "De&lete"
+msgstr "លុប"
+
+#: BatchProcessDialog.cpp:461
+msgid "Move &Up"
+msgstr "ផ្លាស់ទី​ឡើងលើ"
+
+#: BatchProcessDialog.cpp:462
+msgid "Move &Down"
+msgstr "ផ្លាស់ទី​ចុះក្រោម"
+
+#: BatchProcessDialog.cpp:463
+msgid "De&faults"
+msgstr "លំនាំដើម"
+
+#: BatchProcessDialog.cpp:507
+msgid "- END -"
+msgstr "- ចប់ -"
+
+#: BatchProcessDialog.cpp:540
+#, c-format
+msgid "%s changed"
+msgstr "បាន​ផ្លាស់ប្ដូរ %s"
+
+#: BatchProcessDialog.cpp:541
+msgid "Do you want to save the changes?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​រក្សាទុក​កា​រផ្លាស់ប្ដូរ​មែនទេ ?"
+
+#: BatchProcessDialog.cpp:623
+msgid "Enter name of new chain"
+msgstr "បញ្ចូល​ឈ្មោះ​របស់​ច្រវាក់​ថ្មី"
+
+#: BatchProcessDialog.cpp:634
+msgid "Name must not be blank"
+msgstr "ឈ្មោះ​មិន​អាច​ទទេ​បាន​ទេ"
+
+#: BatchProcessDialog.cpp:643
+#, c-format
+msgid "Names may not contain '%c' and '%c'"
+msgstr "ឈ្មោះ​​មិន​​អាច​​មាន '%c' និង '%c'"
+
+#: BatchProcessDialog.cpp:673
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "តើ​​អ្នក​​ប្រាកដ​​ជា​​ចង់​​លុប %s ឬ ?"
+
+#: Dependencies.cpp:139
+msgid "Removing Dependencies"
+msgstr "យក​​ភាព​អាស្រ័យ​​ចេញ"
+
+#: Dependencies.cpp:140
+msgid "Copying audio data into project..."
+msgstr "កំពុង​​ចម្លង​​ទិន្នន័យ​​អូឌីយ៉ូ​​ទៅ​​គម្រោង..."
+
+#: Dependencies.cpp:219
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
+"This will need more disc space but is safer."
+msgstr "បច្ចុប្បន្ន​គម្រោង​របស់​អ្នក​អាស្រ័យ​លើ​វត្តមាន​របស់​ឯកសារ​ផ្សេង ។\n"
+"ចម្លង​អូឌីយ៉ូ​ពី​ឯកសារ​ដូច​ខាង​ក្រោម ទៅ​ក្នុងគម្រោង​របស់​អ្នក​​ដើម្បី​ធ្វើ​ឲ្យ​វាមានដោយ​ខ្លួន​ឯង ?\n"
+"វា​នឹង​ត្រូវការ​ទំហំ​ថាស​បន្ថែម ប៉ុន្តែ​សុវត្ថិភាព​ជាង ។"
+
+#: Dependencies.cpp:266
+msgid "Project depends on other audio files"
+msgstr "គម្រោង​​ផ្អែក​​លើ​​ឯកសារ​​អូឌីយ៉ូ​​ផ្សេង​​ទៀត"
+
+#: Dependencies.cpp:287
+msgid "Project Dependencies"
+msgstr "ភាព​​អាស្រ័យ​​របស់​​គម្រោង"
+
+#: Dependencies.cpp:290
+msgid "Audio file"
+msgstr "ឯកសារ​​អូឌីយ៉ូ"
+
+#: Dependencies.cpp:292
+msgid "Disk space"
+msgstr "ទំហំ​ថាស"
+
+#: Dependencies.cpp:297
+msgid "Copy Selected Audio Into Project"
+msgstr "ចម្លង​​អូឌីយ៉ូ​​ដែល​​បាន​ជ្រើស​​ទៅ​​គម្រោង"
+
+#: Dependencies.cpp:304 Dependencies.cpp:413
+msgid "Cancel Save"
+msgstr "បោះបង់​​ការ​រក្សាទុក"
+
+#: Dependencies.cpp:310
+msgid "Do Not Copy Any Audio"
+msgstr ""
+
+#: Dependencies.cpp:312
+msgid "Copy All Audio into Project (Safer)"
+msgstr ""
+
+#: Dependencies.cpp:320 Dependencies.cpp:325
+msgid "Ask me"
+msgstr "សួរ​ខ្ញុំ"
+
+#: Dependencies.cpp:321
+msgid "Always copy all audio (safest)"
+msgstr "ចម្លង​​អូឌីយ៉ូ​​ទាំងអស់​​ជា​និច្ច (សុវត្ថិភាព​បំផុត)"
+
+#: Dependencies.cpp:322
+msgid "Never copy any audio"
+msgstr "កុំ​​​ចម្លង​​​អូឌីយ៉ូ​​​ណាមួយ"
+
+#: Dependencies.cpp:324
+msgid "Whenever a project depends on other files:"
+msgstr "នៅ​​ពេល​ណា​​​ដែល​​គម្រោង​​ផ្អែក​លើ​ឯកសារ​​ផ្សេង​​ទៀត ៖"
+
+#: Dependencies.cpp:412
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "បើសិនជា​អ្នក​បន្ត គម្រោង​របស់​អ្នក​នឹង​មិន​ត្រូវ​បាន​រក្សាទុក​ក្នុង​ថាស​ទេ ។ តើនេះ​ជា​អ្វី​ដែលអ្នក​ចង់​បាន​មែនទេ ?"
+
+#: Dependencies.cpp:452
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "គម្រោង​របស់​អ្នក​មាន​ខ្លួន​ឯង វា​មិន​អាស្រ័យ​លើ​ឯកសារ​អូឌីយ៉ូ​ខាង​ក្រៅ​ណាមួយ​ទេ ។"
+
+#: Dependencies.cpp:453
+msgid "Dependency check"
+msgstr "ការ​ពិនិត្យ​​ភាព​អាស្រ័យ"
+
+#: DirManager.cpp:136
+msgid "Warning: there is very little free disk space left on this volume.\n"
+"Please select another temporary directory in your preferences."
+msgstr "ព្រមាន ៖ មាន​ទំហំថាស​ទំនេរ​តិចតួច​បំផុត​ដែល​នៅ​សល់​​នៅ​​លើ​​ភាគ​ថាស​​នេះ ។\n"
+"សូម​​ជ្រើស​​ថត​​បណ្ដោះអាសន្ន​​ផ្សេង​​ទៀត​​នៅ​ក្នុង​​ចំណូល​ចិត្ត​​របស់​អ្នក​ ។"
+
+#: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
+msgid "Progress"
+msgstr "វឌ្ឍនភាព"
+
+#: DirManager.cpp:285
+msgid "Cleaning up temporary files"
+msgstr "ជម្រះ​​ឯកសារ​​បណ្ដោះ​​អាសន្ន"
+
+#: DirManager.cpp:333
+msgid "Saving project data files"
+msgstr "រក្សាទុក​​ឯកសារ​​ទិន្នន័យ​​គម្រោង"
+
+#: DirManager.cpp:406
+msgid "Cleaning up cache directories"
+msgstr "ជម្រះ​​ថត​​ឃ្លាំង​សម្ងាត់"
+
+#: DirManager.cpp:493
+#, c-format
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "Audacity រកឃើញ​ឯកសា​រ​ប្លុក​​ដែល​កំព្រា %s ! \n"
+"សូម​​ពិចារណា​​រក្សាទុក និង​ផ្ទុក​​គម្រោង​​ឡើងវិញ​​ដើម្បី​​អនុវត្ត​ការ​​ពិនិត្យ​​គម្រោង​​ពេញលេញ ។\n"
+
+#. i18n-hint: This is the pattern for filenames that are created
+#. when a file needs to be backed up to a different name.  For
+#. example, mysong would become mysong-old1, mysong-old2, etc.
+#: DirManager.cpp:985
+#, c-format
+msgid "%s-old%d"
+msgstr "%s-old%d"
+
+#: DirManager.cpp:993
+msgid "Unable to open/create test file"
+msgstr "មិន​​អាច​​បើក/បង្កើត​​ឯកសារ​​សាកល្បង"
+
+#: DirManager.cpp:1002
+#, c-format
+msgid "Unable to remove '%s'"
+msgstr "មិន​អាច​យក '%s' ចេញ​បាន​ទេ"
+
+#: DirManager.cpp:1007
+#, c-format
+msgid "Renamed file: %s\n"
+msgstr "បាន​​ប្ដូ​រឈ្មោះ​​ឯកសារ ៖ %s\n"
+
+#: DirManager.cpp:1051
+#, c-format
+msgid "Unable to rename '%s' to '%s'"
+msgstr "មិន​អាច​​ប្ដូរ​ឈ្មោះ '%s' ទៅ​​ជា '%s'"
+
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1115 DirManager.cpp:1403
+msgid "Inspecting project file data..."
+msgstr "កំពុង​​ពិនិត្យ​​មើល​​ទិន្នន័យ​​ឯកសារ​​គម្រោង..."
+
+#: DirManager.cpp:1128
+#, c-format
+msgid "Orphaned blockfile: (%s)"
+msgstr "ឯកសារ​ប្លុក​​ដែល​កំព្រា ៖ (%s)"
+
+#: DirManager.cpp:1153
+#, c-format
+msgid "Missing alias file: (%s)"
+msgstr "បាត់​ឯកសារ​​ឈ្មោះ​​ក្លែងក្លាយ ៖ (%s)"
+
+#: DirManager.cpp:1173
+#, c-format
+msgid "Missing summary file: (%s.auf)"
+msgstr "បាត់​​ឯកសារ​​សង្ខេប ៖ (%s.auf)"
+
+#: DirManager.cpp:1193
+#, c-format
+msgid "Missing data file: (%s.au)"
+msgstr "បាត់​​ឯកសារ​​ទិន្នន័យ ៖ (%s.au)"
+
+#: DirManager.cpp:1207
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "រក​ឃើញ​​កា​រពិនិត្យ​​គម្រោង​​មិន​​ស្ថិតស្ថេរ ដោយ​ពិនិត្យ​ទិន្នន័យ​គម្រោង​ដែល​បាន​ផ្ទុក\n"
+"ចុច 'សេចក្ដីលម្អិត' សម្រាប់​កំហុស​បញ្ជី​ពេញលេញ ឬ 'យល់ព្រម' ដើម្បី​​បន្ត​​ទៅ​​ជម្រើស​​ជា​ច្រើន​​ទៀត ។"
+
+#: DirManager.cpp:1219
+#, c-format
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
+"unused and probably left over from a crash or some other bug.\n"
+"They should be deleted to avoid disk contention."
+msgstr "កា​រពិនិត្យ​គម្រោង​រកឃើញ​ឯកសារ​ប្លុក​កំព្រា %d ។ ឯកសារ​ទាំងនេះ​មិន​ត្រូវ​បានប្រើ\n"
+"និង​ត្រូវ​បានពន្យារពេល​ពី​ការគាំង ឬ​កំហុស​ផ្សេង​ទៀត ។\n"
+"ពួកវា​គួរ​ត្រូវ​បានលុប​ដើម្បី​ជៀសវាង​កា​រអះអាង​ថាស ។"
+
+#: DirManager.cpp:1224
+msgid "Delete orphaned files [safe and recommended]"
+msgstr "លុប​​ឯកសារ​​កំព្រា [សុវត្ថិភាព និង​​បានផ្ដល់​​អនុសាសន៍]"
+
+#: DirManager.cpp:1225
+msgid "Continue without deleting; silently work around the extra files"
+msgstr "បន្ត​​ដោយ​​មិន​លុប ដំណើរការ​​ដោយ​​ស្ងាត់​​ជុំវិញ​​ឯកសារ​​បន្ថែម"
+
+#: DirManager.cpp:1226
+msgid "Close project immediately with no changes"
+msgstr "បិទ​​គម្រោង​​ភ្លាមៗ​​ដោយ​​គ្មាន​ការ​ផ្លាស់ប្ដួរ"
+
+#: DirManager.cpp:1228 DirManager.cpp:1263 DirManager.cpp:1309
+#: DirManager.cpp:1351 export/Export.cpp:484 export/Export.cpp:501
+#: export/Export.cpp:520 widgets/Warning.cpp:55
+msgid "Warning"
+msgstr "ការ​ព្រមាន"
+
+#: DirManager.cpp:1254
+#, c-format
+msgid "Project check detected %d input file[s] being used in place\n"
+"('alias files') are now missing.  There is no way for Audacity\n"
+"to recover these files automatically; you may choose to\n"
+"permanently fill in silence for the missing files, temporarily\n"
+"fill in silence for this session only, or close the project now\n"
+"and try to restore the missing files by hand."
+msgstr "ការ​​ពិនិត្យ​​គម្រោង​​បាន​​រក​ឃើញ​​ឯកសារ​​បញ្ចូល %d ​កំពុង​​ត្រូវ​​បាន​​ប្រើ​​​នៅ​​នឹង​​កន្លែង\n"
+"('ឯកសារ​​ឈ្មោះ​​ក្លែងក្លាយ') ឥឡូវ​​បាត់បង់ ។  គ្មាន​​វិធី​​សម្រាប់ Audacity\n"
+"ដើម្បី​សង្គ្រោះ​ឯកសារ​ទាំងនេះ​ដោយ​ស្វ័យ​ប្រវត្តិ អ្នក​អាច​ជ្រើស​ដើម្បី\n"
+"បំពេញ​អចិន្ត្រៃយ៍​ដោយ​ស្ងាត់ៗ​សម្រាប់​ឯកសារ​ដែលបាត់ ជា​បណ្ដោះ​អាសន្ន\n"
+"កា​របំពេញ​ដោយ​ស្ងាត់​សម្រាប់​សម័យ​នេះ​តែប៉ុណ្ណោះ ឬ​បិទ​គម្រោង​ឥឡូវ\n"
+"និង​ព្យាយាម​ម្ដង​ទៀត​ដើម្បី​ស្ដារ​ឯកសារ​ដែល​បាត់​ដោយ​ដៃ ។"
+
+#: DirManager.cpp:1259
+msgid "Replace missing data with silence [permanent upon save]"
+msgstr "ជំនួស​​ទិន្នន័យ​​ដែល​បាត់​​​ដោយ​​ស្ងាត់ [អចិន្ត្រៃយ៍​​នៅ​​ពេល​រក្សាទុក]"
+
+#: DirManager.cpp:1260 DirManager.cpp:1348
+msgid "Temporarily replace missing data with silence [this session only]"
+msgstr "ជំនួស​​ទិន្នន័យ​​ដែល​​បាត់​ជា​​បណ្ដោះអាសន្ន​​ដោយ​​ស្ងាត់ [តែ​សម័យ​នេះ​ប៉ុណ្ណោះ]"
+
+#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
+msgid "Close project immediately with no further changes"
+msgstr "បិទ​​គម្រោង​​ភ្លាមៗ​​ដោយ​​គ្មាន​​កា​រផ្លាស់ប្ដូរ​​ផ្សេង​​ទៀត"
+
+#: DirManager.cpp:1300
+#, c-format
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
+"Audacity can fully regenerate these summary files from the\n"
+"original audio data in the project."
+msgstr "កា​រ​ពិនិត្យ​​គម្រោង​​បាន​រក​ឃើញ​​ឯកសារ​​សង្ខេប​​ដែល​​បាត់ %d (.auf) ។\n"
+"Audacity អាច​​បង្កើត​​ឯកសារ​​សង្ខេប​​ទាំងនេះ​​ពី​​ទិន្នន័យ​​អូឌីយ៉ូ​​ដើម​​នៅ​​ក្នុង​គម្រោង ។"
+
+#: DirManager.cpp:1305
+msgid "Regenerate summary files [safe and recommended]"
+msgstr "បង្កើត​​ឯកសារ​​សង្ខេប​​ឡើង​វិញ [សុវត្ថិភាព​ និង​បាន​ផ្ដល់​អនុសាសន៍]"
+
+#: DirManager.cpp:1306
+msgid "Fill in silence for missing display data [this session only]"
+msgstr "បំពេញ​​ដោយ​​ស្ងាត់​​សម្រាប់​​ទិន្នន័យ​​បង្ហាញ​​ដែល​​បាត់ [តែ​សម័យ​​នេះ​ប៉ុណ្ណោះ]"
+
+#: DirManager.cpp:1342
+#, c-format
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
+"probably due to a bug, system crash or accidental deletion.\n"
+"There is no way for Audacity to recover this lost data\n"
+"automatically; you may choose to permanently fill in silence\n"
+"for the missing data, temporarily fill in silence for this\n"
+"session only, or close the project now and try to restore the\n"
+"missing data by hand."
+msgstr "ការ​​ពិនិត្យ​​គម្រោង​​បាន​​រក​ឃើញ​​ឯកសារ​​ប្លុក​​ទិន្នន័យ​​អូឌីយ៉ូ​​ដែល​​បាត់ %d (.au)\n"
+"ប្រហែល​​ជា​​ដោយ​សារ​​កំហុស ការ​គាំង​របស់​ប្រព័ន្ធ ឬ​លុប​ដោយ​អចេតនា ។\n"
+"គ្មាន​វិធី​សម្រាប់ Audacity ដើម្បី​សង្គ្រោះ​ទិន្នន័យ​ដែល​បាត់\n"
+"ដោយ​ស្វ័យ​ប្រវត្តិ អ្នក​អាច​ជ្រើស​កា​របំពេញ​អចិន្ត្រៃយ៍​ដោយស្ងាត់\n"
+"សម្រាប់​ទិន្នន័យ​ដែល​បាត់ កា​របំពេញ​បណ្ដោះអាសន្ន​ដោយស្ងាត់​សម្រាប់\n"
+"តែ​សម័យ​ប៉ុណ្ណោះ​ ឬ​បិទ​គម្រោង​ឥឡូវ និង​ព្យាយាម​ស្ដារ​\n"
+"ទិន្នន័យ​ដែល​បាត់​ដោយ​ដៃ ។"
+
+#: DirManager.cpp:1347
+msgid "Replace missing data with silence [permanent immediately]"
+msgstr "ជំនួស​​ទិន្នន័យ​​ដែល​​បាត់​​ដោយ​​ស្ងាត់ [អចិន្ត្រៃយ៍​​ភ្លាម]"
+
+#: DirManager.cpp:1375
+msgid "Cleaning up unused directories in project data..."
+msgstr "កំពុង​​ជម្រះ​​ថត​​ដែល​​មិន​បាន​​ប្រើ​នៅ​​ក្នុង​​ទិន្នន័យ​​គម្រោង..."
+
+#: DirManager.cpp:1448
+msgid "Caching audio"
+msgstr "​​ដាក់​​អូឌីយ៉ូ​​ក្នុង​​ឃ្លាំង​សម្ងាត់"
+
+#: DirManager.cpp:1449
+msgid "Caching audio into memory..."
+msgstr "​​ដាក់​​អូឌីយ៉ូ​​ក្នុង​​ឃ្លាំង​សម្ងាត់​​ទៅ​​ក្នុង​​សតិ..."
+
+#: DirManager.cpp:1486
+msgid "Saving recorded audio"
+msgstr "រក្សាទុក​​អូឌីយ៉ូ​​ដែល​​បាន​ថត"
+
+#: DirManager.cpp:1487
+msgid "Saving recorded audio to disk..."
+msgstr "កំពុង​​រក្សាទុក​​អូឌីយ៉ូ​​ដែល​​បាន​ថត​​ទៅ​​ថាស..."
+
+#: FFT.cpp:379
+msgid "Rectangular"
+msgstr "ចតុកោណកែង"
+
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:112
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:172
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:192
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr "ទី​តាំង​របស់ %s ៖"
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "ដើម្បី​​ស្វែង​រក %s​ ចុច​ទី​នេះ -->"
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr "រក​មើល..."
+
+#: FFmpeg.cpp:214
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:546
+#, c-format
+msgid "Where is %s?"
+msgstr "តើឯកសារ %s នៅទីណា ?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:87
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:242
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:104
+msgid "Frequency Analysis"
+msgstr "កា​រវិភាគ​​ប្រេកង់"
+
+#: FreqWindow.cpp:140 TrackPanel.cpp:507
+msgid "Spectrum"
+msgstr "វិសាលគម"
+
+#: FreqWindow.cpp:141
+msgid "Standard Autocorrelation"
+msgstr "ទំនាក់ទំនង​ដោយស្វ័យ​​ប្រវត្តិ​​ស្តង់ដារ"
+
+#: FreqWindow.cpp:142
+msgid "Cuberoot Autocorrelation"
+msgstr "ទំនាក់ទំនង​​ដោយ​ស្វ័យ​​ប្រវត្តិ​របស់ Cuberoot​"
+
+#: FreqWindow.cpp:143
+msgid "Enhanced Autocorrelation"
+msgstr "ទំនាក់ទំនង​​ដោយ​​ស្វ័យ​ប្រវត្តិ​​ដែល​​បាន​​បង្កើន"
+
+#. i18n-hint: This is a technical term, derived from the word
+#. "spectrum".  Do not translate it unless you are sure you
+#. know the correct technical word in your language.
+#: FreqWindow.cpp:147
+msgid "Cepstrum"
+msgstr "Cepstrum"
+
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
+msgstr "ក្បួន​ដោះស្រាយ ៖"
+
+#: FreqWindow.cpp:168 HistoryWindow.cpp:79
+msgid "Size"
+msgstr "ទំហំ"
+
+#. i18n-hint: This refers to a "window function", used in the
+#. Frequency analyze dialog box.
+#: FreqWindow.cpp:181
+msgid " window"
+msgstr " បង្អួច"
+
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
+
+#: FreqWindow.cpp:192
+msgid "Linear frequency"
+msgstr "ប្រេកង់​​លីនេអ៊ែរ"
+
+#: FreqWindow.cpp:193
+msgid "Log frequency"
+msgstr "ប្រេកង់​​កំណត់​ហេតុ"
+
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
+
+#: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:202 Menus.cpp:231
+msgid "&Export..."
+msgstr "នាំចេញ..."
+
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr "នាំចេញ"
+
+#: AboutDialog.cpp:688 Dependencies.cpp:308 FreqWindow.cpp:209
+#: widgets/ErrorDialog.cpp:135
+msgid "Close"
+msgstr "បិទ"
+
+#: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:487
+#: effects/AutoDuck.cpp:521 effects/AutoDuck.cpp:789
+#: effects/Compressor.cpp:349 effects/Compressor.cpp:357
+#: effects/Equalization.cpp:1086 effects/Equalization.cpp:1088
+#: effects/Equalization.cpp:1096 effects/Equalization.cpp:1162
+#: effects/Equalization.cpp:1371 effects/Equalization.cpp:1382
+#: effects/Normalize.cpp:354 widgets/Meter.cpp:363
+msgid "dB"
+msgstr "dB"
+
+#. i18n-hint: This is the abbreviation for "Hertz", or
+#. cycles per second.
+#: FreqWindow.cpp:287 FreqWindow.cpp:442 effects/Equalization.cpp:1127
+#: effects/Equalization.cpp:1158 import/ImportRaw.cpp:416
+msgid "Hz"
+msgstr "Hz"
+
+#: FreqWindow.cpp:386
+msgid "Not enough data selected."
+msgstr "មិន​បាន​​ជ្រើស​​ទិន្នន័យ​​គ្រប់គ្រាន់ ។"
+
+#: FreqWindow.cpp:450 effects/AutoDuck.cpp:791
+msgid "s"
+msgstr "s"
+
+#: FreqWindow.cpp:779
+#, c-format
+msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
+msgstr "ទស្សន៍​ទ្រនិច ៖ %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
+
+#: FreqWindow.cpp:788
+#, c-format
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "ទស្សន៍​ទ្រនិច ៖ %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+
+#: FreqWindow.cpp:1059
+msgid "spectrum.txt"
+msgstr "spectrum.txt"
+
+#: FreqWindow.cpp:1061
+msgid "Export Spectral Data As:"
+msgstr "នាំចេញ​ទិន្នន័យ​វិសាល​គម​​ជា ៖"
+
+#: FreqWindow.cpp:1077 LabelDialog.cpp:599 Menus.cpp:2177 Project.cpp:2379
+#: Project.cpp:3333 prefs/KeyConfigPrefs.cpp:180
+msgid "Couldn't write to file: "
+msgstr "មិន​អាច​សរសេរ​ទៅ​កាន់​ឯកសារ ៖ "
+
+#: FreqWindow.cpp:1082
+msgid "Frequency (Hz)\tLevel (dB)"
+msgstr "ប្រេកង់ (Hz)\tកម្រិត (dB)"
+
+#: FreqWindow.cpp:1088
+msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
+msgstr "រយៈពេល​​ខុស​គ្នា (វិនាទី)\tប្រេកង់ (Hz)\tកម្រិត"
+
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
+msgstr ""
+
+#: HelpText.cpp:92
+msgid "Welcome!"
+msgstr ""
+
+#: HelpText.cpp:65
+msgid "Playing Audio"
+msgstr "កំពុង​ចាក់​​អូឌីយ៉ូ"
+
+#: HelpText.cpp:69
+msgid "Recording Audio"
+msgstr "កំពុង​​ថត​​អូឌីយ៉ូ"
+
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
+msgstr ""
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr ""
+
+#: HelpText.cpp:133
+msgid "Burn to CD"
+msgstr ""
+
+#: HelpText.cpp:85
+msgid "No Local Help"
+msgstr "គ្មាន​ជំនួយ​​មូលដ្ឋាន"
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+#, fuzzy
+msgid "Welcome to Audacity "
+msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity !"
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
+
+#: HistoryWindow.cpp:53
+msgid "Undo History"
+msgstr "មិនធ្វើ​ប្រវត្តិ​វិញ"
+
+#: HistoryWindow.cpp:72
+msgid "Manage History"
+msgstr "គ្រប់គ្រង​​ប្រវត្តិ"
+
+#: HistoryWindow.cpp:78
+msgid "Action"
+msgstr "សកម្មភាព"
+
+#: HistoryWindow.cpp:86
+msgid "&Undo Levels Available"
+msgstr "មិន​ធ្វើ​កម្រិត​​ដែល​​មាន​វិញ"
+
+#: HistoryWindow.cpp:92
+msgid "Levels To Discard"
+msgstr "កម្រិត​​ត្រូវ​​បោះបង់"
+
+#: HistoryWindow.cpp:102
+msgid "&Discard"
+msgstr "បោះបង់"
+
+#: HistoryWindow.cpp:111 Tags.cpp:2039 Tags.cpp:2041 Tags.cpp:2343
+#: Tags.cpp:2345 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
+#: effects/vamp/VampEffect.cpp:414 export/ExportCL.cpp:396
+msgid "&OK"
+msgstr "យល់ព្រម"
+
+#: Internat.cpp:176
+msgid "Unable to determine"
+msgstr "មិន​អាច​​កំណត់"
+
+#: Internat.cpp:180 import/ImportRaw.cpp:392
+msgid "bytes"
+msgstr "បៃ"
+
+#: Internat.cpp:182
+msgid "KB"
+msgstr "គីឡូបៃ"
+
+#: Internat.cpp:185
+msgid "MB"
+msgstr "មេកាបៃ"
+
+#: Internat.cpp:188
+msgid "GB"
+msgstr "ជីកាបៃ"
+
+#: LabelDialog.cpp:52
+msgid "Track"
+msgstr "បទ"
+
+#: LabelDialog.cpp:53 Menus.cpp:4019 Menus.cpp:4047
+msgid "Label"
+msgstr "ស្លាក"
+
+#: LabelDialog.cpp:54
+msgid "Start Time"
+msgstr "ពេលវេលា​​ចាប់ផ្ដើម"
+
+#: LabelDialog.cpp:55
+msgid "End Time"
+msgstr "ពេលវេលា​​បញ្ចប់"
+
+#: LabelDialog.cpp:98 Menus.cpp:615
+msgid "&Edit Labels"
+msgstr "កែសម្រួល​​ស្លាក"
+
+#: LabelDialog.cpp:113
+msgid "Press F2 or double click to edit cell contents."
+msgstr "ចុច F2 ឬ​​ចុច​​ទ្វេ​ដង​​ដើម្បី​​កែសម្រួល​​មាតិកា​​ក្រឡា ។"
+
+#: LabelDialog.cpp:124
+msgid "Insert &After"
+msgstr "បញ្ចូល​​​​បន្ទាប់"
+
+#: LabelDialog.cpp:125
+msgid "Insert &Before"
+msgstr "បញ្ចូល​​មុន"
+
+#: LabelDialog.cpp:127 Menus.cpp:192
+msgid "&Import..."
+msgstr "នាំចូល..."
+
+#: LabelDialog.cpp:155
+msgid "New..."
+msgstr "ថ្មី..."
+
+#: LabelDialog.cpp:352
+msgid "You have left blank label names.  These will be\n"
+"skipped when repopulating the Label Tracks.\n"
+"\n"
+"Would you like to go back and provide names?"
+msgstr "អ្នក​​មាន​​ឈ្មោះ​ស្លាក​​​​ទទេ​​​ដែល​​នៅ​សល់ ។  ទាំងនេះ​​​នឹង​​ត្រូវ​​បាន​\n"
+"រំលង នៅ​ពេល​​គណនា​​បទ​ស្លាក​​ឡើងវិញ ។\n"
+"\n"
+"តើ​​អ្នក​ចង់​​ត្រឡប់​ក្រោយ និង​​ដាក់​​ឈ្មោះ​​ដែរ​​ឬទេ ?"
+
+#: LabelDialog.cpp:353
+msgid "Confirm"
+msgstr "អះអាង"
+
+#: LabelDialog.cpp:514 Menus.cpp:3517
+msgid "Select a text file containing labels..."
+msgstr "ជ្រើស​​ឯកសារ​​អត្ថបទ​​ដែល​​មាន​​ស្លាក..."
+
+#: LabelDialog.cpp:518 Menus.cpp:3521
+msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
+msgstr "ឯកសារ​​អត្ថបទ (*.txt)|*.txt|ឯកសារ​​ទាំង​អស់ (*.*)|*.*"
+
+#: LabelDialog.cpp:532 Menus.cpp:3533 Project.cpp:1800 Project.cpp:1808
+#: import/ImportMIDI.cpp:31
+msgid "Could not open file: "
+msgstr "មិន​​អាច​​បើក​​ឯកសារ ៖ "
+
+#: LabelDialog.cpp:558
+msgid "No labels to export."
+msgstr "គ្មាន​​ស្លាក​​ត្រូវ​នាំចេញ ។"
+
+#: LabelDialog.cpp:564 Menus.cpp:2142
+msgid "Export Labels As:"
+msgstr "នាំចេញ​​ស្លាក​ជា ៖"
+
+#: LabelDialog.cpp:566 Menus.cpp:2140
+msgid "labels.txt"
+msgstr "labels.txt"
+
+#: LabelDialog.cpp:699
+msgid "New Label Track"
+msgstr "បទ​ស្លាក​​ថ្មី"
+
+#: LabelDialog.cpp:700
+msgid "Enter track name"
+msgstr "បញ្ចូល​ឈ្មោះ​​បទ"
+
+#: LabelDialog.cpp:701 LabelDialog.h:52 LabelTrack.cpp:88 Menus.cpp:547
+msgid "&Label Track"
+msgstr "បទ​​ស្លាក"
+
+#: LangChoice.cpp:57
+msgid "Audacity First Run"
+msgstr "ដំបូង​រត់ Audacity"
+
+#: LangChoice.cpp:84
+msgid "Choose Language for Audacity to use:"
+msgstr "ជ្រើស​​ភាសា​​សម្រាប់ Audacity ដើម្បី​​ប្រើ ៖"
+
+#: Legacy.cpp:356
+#, c-format
+msgid "Converted a 1.0 project file to the new format.\n"
+"The old file has been saved as '%s'"
+msgstr "បាន​បម្លែង​​ឯកសារ​​គម្រោង ១.០ ទៅ​​ជា​​ទ្រង់ទ្រាយ​​ថ្មី ។\n"
+"ឯកសារ​​ចាស់​​ត្រូវ​បាន​​រក្សាទុក​​ជា '%s'"
+
+#: Legacy.cpp:357
+msgid "Opening Audacity Project"
+msgstr "បើក​​គម្រោង Audacity"
+
+#: Menus.cpp:162
+msgid "&File"
+msgstr "ឯកសារ"
+
+#: Menus.cpp:164
+msgid "&New\tCtrl+N"
+msgstr "ថ្មី\tបញ្ជា(Ctrl)+N"
+
+#: Menus.cpp:166
+msgid "&Open...\tCtrl+O"
+msgstr "បើក...\tបញ្ជា(Ctrl)+O"
+
+#: Menus.cpp:171
+msgid "&Close\tCtrl+W"
+msgstr "បិទ\tបញ្ជា(Ctrl)+W"
+
+#: Menus.cpp:174
+msgid "&Save Project\tCtrl+S"
+msgstr "រក្សាទុក​គម្រោង\tបញ្ជា(Ctrl)+S"
+
+#: Menus.cpp:178 Project.cpp:2628
+msgid "Save Project &As..."
+msgstr "រក្សាទុក​គម្រោង​ជា..."
+
+#: Menus.cpp:213
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
+#: Menus.cpp:181
+msgid "Chec&k Dependencies..."
+msgstr "ពិនិត្យ​មើល​ភាព​អាស្រ័យ..."
+
+#: Menus.cpp:185
+msgid "Open Me&tadata Editor..."
+msgstr "បើក​​កម្មវិធី​​កែសម្រួល​​ទិន្នន័យ​​មេតា..."
+
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "នាំចូល"
+
+#: Menus.cpp:194
+msgid "&Audio...\tCtrl+Shift+I"
+msgstr "អូឌីយ៉ូ...\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+I"
+
+#: Menus.cpp:195
+msgid "&Labels..."
+msgstr "ស្លាក..."
+
+#: Menus.cpp:196
+msgid "&MIDI..."
+msgstr "មីឌី..."
+
+#: Menus.cpp:197
+msgid "&Raw Data..."
+msgstr "ទិន្នន័យ​ដើម..."
+
+#: Menus.cpp:208 Menus.cpp:237
+msgid "Expo&rt Selection..."
+msgstr "នាំចេញ​ជម្រើស..."
+
+#: Menus.cpp:215
+msgid "Export &Labels..."
+msgstr "នាំចេញ​ស្លាក..."
+
+#: Menus.cpp:216
+msgid "Export &Multiple..."
+msgstr "នាំចេញ​ច្រើន..."
+
+#: Menus.cpp:258
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:291
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
+#: Menus.cpp:246 Menus.cpp:260
+msgid "Edit C&hains..."
+msgstr "កែសម្រួល​ច្រវាក់..."
+
+#: Menus.cpp:293
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:294
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
+#: Menus.cpp:258
+msgid "Appl&y Chain..."
+msgstr "អនុវត្ត​ច្រវាក់..."
+
+#: Menus.cpp:265
+msgid "&Upload File..."
+msgstr "ផ្ទុក​ឯកសារ​ឡើង..."
+
+#: Menus.cpp:271
+msgid "Pa&ge Setup..."
+msgstr "រៀបចំ​​ទំព័រ..."
+
+#: Menus.cpp:272
+msgid "&Print..."
+msgstr "បោះពុម្ព..."
+
+#: Menus.cpp:285
+msgid "E&xit\tCtrl+Q"
+msgstr "ចេញ\tបញ្ជា(Ctrl)+Q"
+
+#: Menus.cpp:293 toolbars/EditToolBar.cpp:76
+msgid "&Edit"
+msgstr "កែសម្រួល"
+
+#: Menus.cpp:297
+msgid "&Undo\tCtrl+Z"
+msgstr "មិន​ធ្វើ​វិញ\tបញ្ជា(Ctrl)+Z"
+
+#: Menus.cpp:305 prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:146
+msgid "&Redo"
+msgstr "ធ្វើ​វិញ"
+
+#: Menus.cpp:318
+msgid "Cu&t\tCtrl+X"
+msgstr "កាត់\tបញ្ជា(Ctrl)+X"
+
+#: Menus.cpp:322
+msgid "Spl&it Cut\tCtrl+Alt+X"
+msgstr "បំបែក​ការកាត់\tបញ្ជា(Ctrl)+ជំនួស(Alt)+X"
+
+#: Menus.cpp:323
+msgid "&Copy\tCtrl+C"
+msgstr "ចម្លង\tបញ្ជា(Ctrl)+C"
+
+#: Menus.cpp:327
+msgid "&Paste\tCtrl+V"
+msgstr "បិទភ្ជាប់\tបញ្ជា(Ctrl)+V"
+
+#: Menus.cpp:331
+msgid "Tri&m\tCtrl+T"
+msgstr "កាត់​តម្រឹម\tបញ្ជា(Ctrl)+T"
+
+#: Menus.cpp:333
+msgid "&Delete\tCtrl+K"
+msgstr "លុប\tបញ្ជា(Ctrl)+K"
+
+#: Menus.cpp:334
+msgid "Split D&elete\tCtrl+Alt+K"
+msgstr "បំបែក​ការ​លុប\tបញ្ជា(Ctrl)+ជំនួស(Alt)+K"
+
+#: Menus.cpp:381
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
+
+#: Menus.cpp:337
+msgid "Sp&lit\tCtrl+I"
+msgstr "បំបែក\tបញ្ជា(Ctrl)+I"
+
+#: Menus.cpp:342
+msgid "Split Ne&w\tCtrl+Alt+I"
+msgstr "បំបែក​ថ្មី\tបញ្ជា(Ctrl)+ជំនួស(Alt)+I"
+
+#: Menus.cpp:347
+msgid "&Join\tCtrl+J"
+msgstr "ភ្ជាប់\tបញ្ជា(Ctrl)+J"
+
+#: Menus.cpp:394
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
+
+#: Menus.cpp:350
+msgid "Duplic&ate\tCtrl+D"
+msgstr "ស្ទួន\tបញ្ជា(Ctrl)+D"
+
+#: Menus.cpp:401 Menus.cpp:641
+msgid "Stereo Trac&k to Mono"
+msgstr ""
+
+#: Menus.cpp:408
+msgid "La&beled Regions"
+msgstr ""
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:365
+msgid "&Cut\tAlt+X"
+msgstr "កាត់\tជំនួស(Alt)+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:370
+msgid "&Split Cut\tShift+Alt+X"
+msgstr "បំបែក​ការ​កាត់\tប្ដូរ(Shift)+ជំនួស(Alt)+X"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:375
+msgid "Co&py\tShift+Alt+C"
+msgstr "ចម្លង\tប្ដូរ(Shift)+ជំនួស(Alt)+C"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:381
+msgid "&Delete\tAlt+K"
+msgstr "លុប\tជំនួស(Alt)+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:386
+msgid "Sp&lit Delete\tShift+Alt+K"
+msgstr "បំបែក​កា​រលុប\tប្ដូរ(Shift)+ជំនួស(Alt)+K"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:391
+msgid "Sile&nce\tAlt+L"
+msgstr "ស្ងាត់\tជំនួស(Alt)+L"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:397
+msgid "Spli&t\tAlt+I"
+msgstr "បំបែក\tជំនួស(Alt)+I"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:402
+msgid "&Join\tAlt+J"
+msgstr "ភ្ជាប់\tជំនួស(Alt)+J"
+
+#. i18n-hint: Labeled Regions submenu
+#: Menus.cpp:452
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
+
+#: Menus.cpp:457
+msgid "&Select"
+msgstr ""
+
+#: Menus.cpp:414
+msgid "&All\tCtrl+A"
+msgstr "ទាំងអស់\tបញ្ជា(Ctrl)+A"
+
+#: Menus.cpp:415
+msgid "&None\tCtrl+Shift+A"
+msgstr "គ្មាន\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+A"
+
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Left at Playback Position\t["
+msgstr "ទុក​នៅ​ទីតាំង​ចាក់​ឡើង​វិញ\t["
+
+#: Menus.cpp:464
+#, fuzzy
+msgid "&Right at Playback Position\t]"
+msgstr "ខាង​ស្ដាំ​​ទីតាំង​ចាក់​ឡើង​វិញ\t]"
+
+#: Menus.cpp:468
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
+
+#: Menus.cpp:469
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
+
+#: Menus.cpp:431
+msgid "Find &Zero Crossings\tZ"
+msgstr "រក​កា​រ​ខ្វែង​​សូន្យ\tZ"
+
+#: Menus.cpp:478
+msgid "Mo&ve Cursor"
+msgstr ""
+
+#: Menus.cpp:480
+#, fuzzy
+msgid "to Selection Star&t"
+msgstr "ទៅ​ដើម​​​ជម្រើស"
+
+#: Menus.cpp:481
+#, fuzzy
+msgid "to Selection En&d"
+msgstr "ទៅ​ចុង​​ជម្រើស"
+
+#: Menus.cpp:485
+msgid "to Track &Start\tJ"
+msgstr ""
+
+#: Menus.cpp:486
+msgid "to Track &End\tK"
+msgstr ""
+
+#: Menus.cpp:493
+msgid "Re&gion Save"
+msgstr ""
+
+#: Menus.cpp:494
+msgid "Regio&n Restore"
+msgstr ""
+
+#: Menus.cpp:505
+msgid "Pla&y Region"
+msgstr ""
+
+#: Menus.cpp:506
+msgid "&Lock"
+msgstr ""
+
+#: Menus.cpp:507
+msgid "&Unlock"
+msgstr ""
+
+#: Menus.cpp:462
+msgid "Turn Snap-To On"
+msgstr "បើក​ការ​​ខ្ទាស់"
+
+#: Menus.cpp:463
+msgid "Turn Snap-To Off"
+msgstr "បិទ​កា​រ​ខ្ទាស់"
+
+#: Menus.cpp:464
+msgid "Turn Grid Snap On"
+msgstr "បើក​កា​រ​​ខ្ទាស់​​​​ក្រឡាចត្រង្គ"
+
+#: Menus.cpp:465
+msgid "Turn Grid Snap Off"
+msgstr "បិទ​ការ​ខ្ទាស់​​ក្រឡាចត្រង្គ"
+
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:521
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:525
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
+
+#: Menus.cpp:484
+msgid "&View"
+msgstr "មើល"
+
+#: Menus.cpp:486
+msgid "Zoom &In\tCtrl+1"
+msgstr "ពង្រីក\tបញ្ជា(Ctrl)+1"
+
+#: Menus.cpp:489
+msgid "Zoom &Normal\tCtrl+2"
+msgstr "ពង្រីក​ធម្មតា\tបញ្ជា(Ctrl)+2"
+
+#: Menus.cpp:490
+msgid "Zoom &Out\tCtrl+3"
+msgstr "បង្រួម​\tបញ្ជា(Ctrl)+3"
+
+#: Menus.cpp:493
+msgid "&Fit in Window\tCtrl+F"
+msgstr "សម​នឹង​បង្អួច\tបញ្ជា(Ctrl)+F"
+
+#: Menus.cpp:494
+msgid "Fit &Vertically\tCtrl+Shift+F"
+msgstr "សម​នឹង​បញ្ឈរ\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+F"
+
+#: Menus.cpp:495
+msgid "&Zoom to Selection\tCtrl+E"
+msgstr "ពង្រីក​សម​នឹង​ជម្រើស\tបញ្ជា(Ctrl)+E"
+
+#: Menus.cpp:498
+msgid "&Collapse All Tracks\tCtrl+Shift+C"
+msgstr "វេញ​​បទ​ទាំងអស់\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+C"
+
+#: Menus.cpp:499
+msgid "E&xpand All Tracks\tCtrl+Shift+X"
+msgstr "ពង្រីក​​បទ​​ទាំង​អស់\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+X"
+
+#: Menus.cpp:553
+#, fuzzy
+msgid "&Show Clipping"
+msgstr "បង្ហាញ​​កា​រច្រឹប"
+
+#: Menus.cpp:511
+msgid "&History..."
+msgstr "ប្រវត្តិ..."
+
+#: Menus.cpp:568
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Control Toolbar"
+msgstr "របារ​​​ឧបករណ៍​​ត្រួតពិនិត្យ"
+
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Device Toolbar"
+msgstr "របារ​​ឧបករណ៍​​ឧបករណ៍"
+
+#: Menus.cpp:571
+#, fuzzy
+msgid "&Edit Toolbar"
+msgstr "របារ​ឧបករណ៍​​កែសម្រួល"
+
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Meter Toolbar"
+msgstr "របារ​ឧបករណ៍​​ម៉ែត្រ"
+
+#: Menus.cpp:573
+#, fuzzy
+msgid "Mi&xer Toolbar"
+msgstr "របារ​​ឧបករណ៍​​ឧបករណ៍​​លាយ​​សំឡេង​"
+
+#: Menus.cpp:574
+#, fuzzy
+msgid "&Selection Toolbar"
+msgstr "របារ​ឧបករណ៍​​ជម្រើស"
+
+#: Menus.cpp:575
+#, fuzzy
+msgid "T&ools Toolbar"
+msgstr "របារ​​ឧបករណ៍​ ឧបករណ៍"
+
+#: Menus.cpp:576
+#, fuzzy
+msgid "Transcri&ption Toolbar"
+msgstr "របារ​​ឧបករណ៍​​​កា​រចម្លង​"
+
+#: Menus.cpp:578
+#, fuzzy
+msgid "&Reset Toolbars"
+msgstr "របារ​​ឧបករណ៍​​កំណត់​​ឡើង​វិញ"
+
+#: Menus.cpp:580
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:589
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:595
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:786
+msgid "Skip to Start\tHome"
+msgstr "រំលង​ដើម្បី​ចាប់ផ្ដើម ដើម"
+
+#: Menus.cpp:787
+msgid "Skip to End\tEnd"
+msgstr "រំលង​​ដើម្បី​បញ្ចប់ ចុង"
+
+#: Menus.cpp:602
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:606
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:611
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:616
+msgid "Sound Activation Level..."
+msgstr ""
+
+#: Menus.cpp:537
+msgid "&Tracks"
+msgstr "បទ"
+
+#: Menus.cpp:631
+msgid "Add &New"
+msgstr ""
+
+#: Menus.cpp:545
+msgid "&Audio Track\tCtrl+Shift+N"
+msgstr "បទ​អូឌីយ៉ូ\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+N"
+
+#: Menus.cpp:546
+msgid "&Stereo Track"
+msgstr "បទ​​ស្តេរីអូ"
+
+#: Menus.cpp:548 TimeTrack.cpp:44
+msgid "&Time Track"
+msgstr "បទ​​ពេលវេលា"
+
+#: Menus.cpp:645
+msgid "Mi&x and Render"
+msgstr ""
+
+#: Menus.cpp:564
+msgid "Mix and Render to New Track\tCtrl+Shift+M"
+msgstr "លាយ និង​​បង្ហាញ​​ទៅ​​បទ​ថ្មី\tបញ្ជា(Ctrl)+ប្ដូរ(Shift)+M"
+
+#: Menus.cpp:568
+msgid "&Resample..."
+msgstr "សាកល្បង​​ឡើងវិញ"
+
+#: Menus.cpp:578
+msgid "Remo&ve Tracks"
+msgstr "យក​បទ​​ចេញ"
+
+#: Menus.cpp:669
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:670
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
+#: Menus.cpp:585
+msgid "Align with &Zero"
+msgstr "តម្រឹម​​ដោយ​សូន្យ"
+
+#: Menus.cpp:586
+msgid "Align with &Cursor"
+msgstr "តម្រឹម​​ដោយ​​ទស្សន៍​ទ្រនិច"
+
+#: Menus.cpp:587
+msgid "Align with Selection &Start"
+msgstr "តម្រឹម​​ដោយ​​ដើម​ជម្រើស"
+
+#: Menus.cpp:588
+msgid "Align with Selection &End"
+msgstr "តម្រឹម​​ដោយ​ចុង​ជម្រើស"
+
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Cu&rsor"
+msgstr "តម្រឹម​​ចុង​​ដោយ​​ទស្សន៍​ទ្រនិច"
+
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align End with Selection Star&t"
+msgstr "តម្រឹម​​ចុង​​ដោយ​​ដើម​​ជម្រើស"
+
+#: Menus.cpp:680
+#, fuzzy
+msgid "Align End with Selection En&d"
+msgstr "តម្រឹម​​ចុង​​ដោយ​​ចុង​​ជម្រើស"
+
+#: Menus.cpp:681
+#, fuzzy
+msgid "Align Tracks To&gether"
+msgstr "តម្រឹម​បទ​​ជាមួយ​គ្នា"
+
+#: Menus.cpp:683
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:692
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:699
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:708
+msgid "Link Audio and Label Tracks"
+msgstr ""
+
+#: Menus.cpp:611
+msgid "Add &Label At Selection\tCtrl+B"
+msgstr "បន្ថែម​​ស្លាក​​នៅ​​ជម្រើស\tបញ្ជា (Ctrl) + B"
+
+#: Menus.cpp:612
+msgid "Add Label At &Playback Position\tCtrl+M"
+msgstr "បន្ថែម​​ស្លាក​​​នៅ​ទីតាំង​ចាក់​​ឡើង​វិញ\tបញ្ជា(Ctrl)+M"
+
+#: Menus.cpp:718
+msgid "S&ort tracks"
+msgstr ""
+
+#: Menus.cpp:719
+msgid "by &Start time"
+msgstr ""
+
+#: Menus.cpp:721
+msgid "by &Name"
+msgstr ""
+
+#: Menus.cpp:631
+msgid "&Generate"
+msgstr "បង្កើត"
+
+#: Menus.cpp:778 Menus.cpp:862 Menus.cpp:924
+msgid "Unsorted"
+msgstr ""
+
+#: Menus.cpp:654
+msgid "Effe&ct"
+msgstr "បែបផែន"
+
+#: Menus.cpp:658
+msgid "Repeat Last Effect\tCtrl+R"
+msgstr "ធ្វើ​​បែបផែន​​ចុង​ក្រោយ​​ម្ដង​​ទៀត\tបញ្ជា(Ctrl)+R"
+
+#: Menus.cpp:690
+msgid "&Analyze"
+msgstr "ធ្វើ​​វិភាគ"
+
+#: Menus.cpp:692
+msgid "Plot Spectrum..."
+msgstr "វិសាលគម​​គ្រោង..."
+
+#: Menus.cpp:725 Menus.cpp:728
+msgid "&Help"
+msgstr "ជំនួយ"
+
+#: Menus.cpp:731
+msgid "&About Audacity CleanSpeech..."
+msgstr "អំពី Audacity CleanSpeech..."
+
+#: Menus.cpp:735
+msgid "&Show Welcome Message..."
+msgstr "បង្ហាញ​​សារ​ស្វាគមន៍..."
+
+#: Menus.cpp:736
+msgid "&Index..."
+msgstr "លិបិក្រម..."
+
+#: Menus.cpp:961
+msgid "Show &Log..."
+msgstr ""
+
+#: Menus.cpp:744
+msgid "&Screenshot Tools..."
+msgstr "ឧបករណ៍​​រូបថត​​អេក្រង់..."
+
+#: Menus.cpp:747
+msgid "&Run Benchmark..."
+msgstr "រត់ Benchmark..."
+
+#: Menus.cpp:749
+msgid "&Audio Device Info..."
+msgstr "ព័ត៌មាន​​ឧបករណ៍​​អូឌីយ៉ូ..."
+
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
+
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
+
+#: Menus.cpp:762
+msgid "Selection Tool\tF1"
+msgstr "ឧបករណ៍​​ជ្រើស F1"
+
+#: Menus.cpp:763
+msgid "Envelope Tool\tF2"
+msgstr "ឧបករណ៍​​ស្រោម​​សំបុត្រ F2"
+
+#: Menus.cpp:764
+msgid "Draw Tool\tF3"
+msgstr "ឧបករណ៍​គូរ F3"
+
+#: Menus.cpp:765
+msgid "Zoom Tool\tF4"
+msgstr "ឧបករណ៍​ពង្រីក F4"
+
+#: Menus.cpp:766
+msgid "Time Shift Tool\tF5"
+msgstr "ឧបករណ៍​ប្ដូរ​ពេល​វេលា F5"
+
+#: Menus.cpp:767
+msgid "Multi Tool\tF6"
+msgstr "ឧបករណ៍​​ច្រើន\t F6"
+
+#: Menus.cpp:769
+msgid "Next Tool\tD"
+msgstr "ឧបករណ៍​​​បន្ទាប់ D"
+
+#: Menus.cpp:770
+msgid "Previous Tool\tA"
+msgstr "ឧបករណ៍​​មុន A"
+
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:773
+msgid "Stop\tS"
+msgstr "បញ្ឈប់ S"
+
+#: Menus.cpp:774
+msgid "Pause\tP"
+msgstr "ផ្អាក P"
+
+#: Menus.cpp:775
+msgid "Record\tR"
+msgstr "ថត R"
+
+#: Menus.cpp:1001
+msgid "Record Append\tShift+R"
+msgstr ""
+
+#: Menus.cpp:1003
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr ""
+
+#: Menus.cpp:780
+msgid "Play One Second\t1"
+msgstr "ចាក់​​មួយ​​វិនាទី\t១"
+
+#: Menus.cpp:781
+msgid "Play To Selection\tB"
+msgstr "ចាក់​ដល់​​កន្លែង​​ជ្រើស B"
+
+#: Menus.cpp:782
+msgid "Play Looped\tL"
+msgstr "ចាក់​រង្វិល​ជុំ L"
+
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:784
+msgid "Play Cut Preview\tC"
+msgstr "លេង កាត់ មើល​ជាមុន C"
+
+#: Menus.cpp:789
+msgid "Selection to Start\tShift+Home"
+msgstr "ជជ្រើស​ដើម្បី​ចាប់ផ្ដើម ប្ដូរ(Shift)+ដើម(Home)"
+
+#: Menus.cpp:790
+msgid "Selection to End\tShift+End"
+msgstr "ជម្រើស​ទៅ​ចុង ប្ដូរ(Shift)+ចុង(End)"
+
+#: Menus.cpp:792
+msgid "DeleteKey\tBackspace"
+msgstr "គ្រាប់​ចុច​លុប (Delete)\tលុប​ថយ​ក្រោយ (Backspace)"
+
+#: Menus.cpp:797
+msgid "DeleteKey2\tDelete"
+msgstr "គ្រាប់​ចុច​លុប ២ លុប (Delete)"
+
+#: Menus.cpp:803
+msgid "Seek left short period during playback\tLeft"
+msgstr "ស្វែងរក​រយៈ​ពេល​ខ្លី​​ទៅ​ឆ្វេង​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ឆ្វេង"
+
+#: Menus.cpp:804
+msgid "Seek right short period during playback\tRight"
+msgstr "ស្វែងរក​រយៈ​ពេល​ខ្លី​ទៅ​​ស្ដាំ​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ស្ដាំ"
+
+#: Menus.cpp:805
+msgid "Seek left long period during playback\tShift+Left"
+msgstr "ស្វែងរក​​រយៈ​ពេល​​វែង​ទៅ​​ឆ្វេង​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ប្ដូរ(Shift)+ឆ្វេង"
+
+#: Menus.cpp:806
+msgid "Seek right long period during playback\tShift+Right"
+msgstr "ស្វែងរក​រយៈ​ពេល​វែង​ទៅ​​ស្ដាំ​កំឡុង​ពេល​ចាក់​ឡើង​វិញ ប្ដូរ(Shift)+ស្ដាំ"
+
+#: Menus.cpp:810
+msgid "Move Focus to Previous Track\tUp"
+msgstr "ផ្លាស់ទី​​ការ​​ផ្ដោត​​ទៅ​បទ​​មុន ឡើង​​លើ"
+
+#: Menus.cpp:811
+msgid "Move Focus to Previous and Change Selection\tShift+Up"
+msgstr "ផ្លាស់ទី​ការ​ផ្ដោត​ទៅ​បទ​មុខ ហើយ​ផ្លាស់ប្ដូរ​ជម្រើស ប្ដូរ(Shift)+ឡើង​លើ"
+
+#: Menus.cpp:812
+msgid "Move Focus to Next Track\tDown"
+msgstr "ផ្លាស់ទី​​ការ​​ផ្ដោត​​ទៅ​​បទ​​បន្ទាប់\tចុះ​​ក្រោម"
+
+#: Menus.cpp:813
+msgid "Move Focus to Next and Change Selection\tShift+Down"
+msgstr "ផ្លាស់ទី​​ការ​​ផ្ដោត​​ទៅ​​បទ​បន្ទាប់ និង​ផ្លាស់ប្ដូរ​ជម្រើស​ ប្ដូរ(Shift)+ចុះ​ក្រោម"
+
+#: Menus.cpp:814
+msgid "Toggle Focused Track\tReturn"
+msgstr "បិទ​​បើក​បទ​​ដែល​​ផ្ដោត\tត្រឡប់"
+
+#: Menus.cpp:815
+msgid "Toggle Focused Track\tNUMPAD_ENTER"
+msgstr "បិទ​បើក​​បទ​​ដែល​ផ្ដោត\tNUMPAD_ENTER"
+
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
+
+#: Menus.cpp:818
+msgid "Cursor Left\tLeft"
+msgstr "ទស្សន៍​​ទ្រនិច​ឆ្វេង ឆ្វេង"
+
+#: Menus.cpp:819
+msgid "Cursor Right\tRight"
+msgstr "ទស្សន៍​ទ្រនិច​​ស្ដាំ ស្ដាំ"
+
+#: Menus.cpp:820
+msgid "Cursor Short Jump Left\t,"
+msgstr "ទស្សន៍​ទ្រនិច​​ខ្លី​​លោត​​ទៅ​ឆ្វេង\t,"
+
+#: Menus.cpp:821
+msgid "Cursor Short Jump Right\t."
+msgstr "ទស្សន៍​ទ្រនិច​ខ្លីលោត​ទៅ​ស្ដាំ\t."
+
+#: Menus.cpp:822
+msgid "Cursor Long Jump Left\tShift+,"
+msgstr "ទស្សន៍​ទ្រនិច​វែង​​លោត​​ទៅ​ឆ្វេង ប្ដូរ​(Shift)+"
+
+#: Menus.cpp:823
+msgid "Cursor Long Jump Right\tShift+."
+msgstr "ទស្សន៍​ទ្រនិច​​វែង​​លោត​​ទៅ​ស្ដាំ\tប្ដូរ(Shift)+ ។"
+
+#: Menus.cpp:825
+msgid "Selection Extend Left\tShift+Left"
+msgstr "ពង្រីក​ជម្រើស​​ទៅ​ឆ្វេង ប្ដូរ(Shift)+ឆ្វេង"
+
+#: Menus.cpp:826
+msgid "Selection Extend Right\tShift+Right"
+msgstr "ពង្រីក​​ជម្រើស​​ទៅ​ស្ដាំ ប្ដូរ(Shift)+ស្ដាំ"
+
+#: Menus.cpp:828
+msgid "Set (or Extend) Left Selection"
+msgstr "កំណត់ (ឬ​ពង្រីក) ជម្រើស​​ឆ្វេង"
+
+#: Menus.cpp:829
+msgid "Set (or Extend) Right Selection"
+msgstr "កំណត់ (ឬ​ពង្រីក) ជម្រើស​​​ស្ដាំ"
+
+#: Menus.cpp:831
+msgid "Selection Contract Left\tCtrl+Shift+Right"
+msgstr "បង្រួញ​​ជម្រើស​ទៅ​ឆ្វេង បញ្ជា(Ctrl)+ប្ដូរ(Shift)+ស្ដាំ"
+
+#: Menus.cpp:832
+msgid "Selection Contract Right\tCtrl+Shift+Left"
+msgstr "បង្រួញ​ជម្រើស​ទៅ​ស្ដាំ បញ្ជា(Ctrl)+ប្ដូរ(Shift)+ឆ្វេង"
+
+#: Menus.cpp:834
+msgid "Change pan on focused track\tShift+P"
+msgstr "ផ្លាស់ប្ដូរ​​បន្ទះ​​លើ​​បទ​​ដែល​​ផ្ដោត ប្ដូរ(Shift)+P"
+
+#: Menus.cpp:835
+msgid "Pan left on focused track\tAlt+Shift+Left"
+msgstr "បន្ទះ​​ឆ្វេង​​លើ​​បទ​​ដែល​​ផ្ដោត ជំនួស(Alt)+ប្ដូរ(Shift)+ឆ្វេង"
+
+#: Menus.cpp:836
+msgid "Pan right on focused track\tAlt+Shift+Right"
+msgstr "បន្ទះ​​ស្ដាំ​​លើ​បទ​​ដែល​​ផ្ដោត ជំនួស(Alt)+ប្ដូរ(Shift)+ស្ដាំ"
+
+#: Menus.cpp:837
+msgid "Change gain on focused track\tShift+G"
+msgstr "ផ្លាស់ប្តូរ​​កំណើន​​បទ​​ដែល​​ផ្តោត​​លើ ប្តូរ(Shift)+G"
+
+#: Menus.cpp:838
+msgid "Increase gain on focused track\tAlt+Shift+Up"
+msgstr "បង្កើន​​ការ​​ទទួល​​លើ​បទ​ដែល​​ផ្ដោត ជំនួស(Alt)+ប្ដូរ(Shift)+លើ"
+
+#: Menus.cpp:839
+msgid "Decrease gain on focused track\tAlt+Shift+Down"
+msgstr "បន្ថយ​​ការ​​ទទួល​​លើ​​បទ​​ដែល​​ផ្ដោត ជំនួស​(Alt)+ប្ដូរ(Shift)+ចុះ"
+
+#: Menus.cpp:840
+msgid "Open menu on focused track\tShift+M"
+msgstr "បើក​​ម៉ឺនុយ​​លើ​​បទ​​ដែល​​ផ្ដោត ប្ដូរ(Shift)+M"
+
+#: Menus.cpp:841
+msgid "Mute/Unmute focused track\tShift+U"
+msgstr "ស្ងាត់/លឺ​បទ​ដែល​​ផ្ដោត ប្ដូរ(Shift)+U"
+
+#: Menus.cpp:842
+msgid "Solo/Unsolo focused track\tShift+S"
+msgstr "សូឡូ/ដោះ​សូឡូ បទ​ដែល​ផ្ដោត ប្ដូរ(Shift)+S"
+
+#: Menus.cpp:843
+msgid "Close focused track\tShift+C"
+msgstr "បិទ​បទ​​ដែលបាន​​ផ្ដោត ប្ដូរ(Shift)+C"
+
+#: Menus.cpp:845
+msgid "Snap To On"
+msgstr "បើក​ការ​ខ្ទាស់"
+
+#: Menus.cpp:846
+msgid "Snap To Off"
+msgstr "បិទ​កា​រខ្ទាស់"
+
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
+#. i18n-hint: This is the name of the menu item on Mac OS X only
+#: Menus.cpp:860
+msgid "Open Recent"
+msgstr "បើក​​ថ្មីៗ"
+
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1158
+msgid "Recent &Files"
+msgstr ""
+
+#: Menus.cpp:910
+#, c-format
+msgid "&Undo %s"
+msgstr "មិន​​ធ្វើ​វិញ %s"
+
+#: Menus.cpp:936
+msgid "Can't Undo"
+msgstr "មិន​អាច​​មិន​​ធ្វើ​វិញ"
+
+#: Menus.cpp:945
+#, c-format
+msgid "&Redo %s"
+msgstr "ធ្វើ​វិញ %s"
+
+#: Menus.cpp:951
+msgid "Can't Redo"
+msgstr "មិន​អាច​​ធ្វើ​​​វិញ"
+
+#: Menus.cpp:1498
+msgid "Sort By Time"
+msgstr "តម្រៀប​​តាម​​ពេល​វេលា"
+
+#: Menus.cpp:1498
+msgid "Tracks sorted by time"
+msgstr "បទ​​បាន​​​តម្រៀប​​តាម​​ពេល​វេលា"
+
+#: Menus.cpp:1524
+msgid "Sort By Name"
+msgstr "តម្រៀប​​តាម​​ឈ្មោះ"
+
+#: Menus.cpp:1524
+msgid "Tracks sorted by name"
+msgstr "បទ​បាន​​តម្រៀប​​តាម​​ឈ្មោះ"
+
+#: Menus.cpp:1675
+msgid "Set Left Selection Bound"
+msgstr "កំណត់​​ស៊ុម​​ជ្រើស​​ខាង​​ឆ្វេង"
+
+#: Menus.cpp:1709
+msgid "Set Right Selection Bound"
+msgstr "កំណត់​​ស៊ុម​​ជ្រើស​ខាង​​ស្ដាំ"
+
+#: Menus.cpp:1976
+msgid "You must select a track first."
+msgstr "អ្នក​ត្រូវ​​តែ​ជ្រើស​​បទ​​ជាមុន ។​​"
+
+#: Menus.cpp:2005
+#, c-format
+msgid "Repeat %s\tCtrl+R"
+msgstr "ធ្វើ %s ម្ដង​ទៀត បញ្ជា(Ctrl)+R"
+
+#: Menus.cpp:2136
+msgid "There are no label tracks to export."
+msgstr "គ្មាន​​បទ​​ស្លាក​​ត្រូវ​​នាំ​ចេញ"
+
+#: Menus.cpp:2619
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2623
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2655
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2656
+msgid "Export MIDI"
+msgstr ""
+
+#: Menus.cpp:2241
+msgid "Nothing to undo"
+msgstr "គ្មាន​​អ្វី​​ត្រូវ​​មិន​​ធ្វើ​វិញ​​ទេ"
+
+#: Menus.cpp:2261
+msgid "Nothing to redo"
+msgstr "គ្មាន​​អ្វី​ត្រូវ​​ធ្វើ​វិញ​​ទេ"
+
+#: Menus.cpp:2336 TrackPanel.cpp:546 toolbars/EditToolBar.cpp:133
+msgid "Cut"
+msgstr "កាត់"
+
+#: Menus.cpp:2336
+msgid "Cut to the clipboard"
+msgstr "កាត់​​ទៅ​ក្ដារ​​តម្បៀត​​ខ្ទាស់"
+
+#: Menus.cpp:2374
+msgid "Split Cut"
+msgstr "ពុះ​កា​រកាត់"
+
+#: Menus.cpp:2374
+msgid "Split-cut to the clipboard"
+msgstr "ពុះ​កា​រកាត់​ទៅ​ក្ដារតម្បៀតខ្ទាស់"
+
+#: Menus.cpp:2439 Menus.cpp:2510 Menus.cpp:2604 TrackPanel.cpp:548
+#: toolbars/EditToolBar.cpp:137
+msgid "Paste"
+msgstr "បិទ​ភ្ជាប់"
+
+#: Menus.cpp:2439
+msgid "Pasted text from the clipboard"
+msgstr "បាន​បិទភ្ជាប់​អត្ថបទ​ពី​ក្ដារតម្បៀតខ្ទាស់"
+
+#: Menus.cpp:2510 Menus.cpp:2604
+msgid "Pasted from the clipboard"
+msgstr "បាន​បិទភ្ជាប់​ពី​ក្ដារ​តម្បៀតខ្ទាស់"
+
+#: Menus.cpp:3094
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
+#: Menus.cpp:2544
+msgid "Copying stereo audio into a mono track is not allowed."
+msgstr "ចម្លង​​អូឌីយ៉ូ​​ស្តេរ៉េអូ​​ទៅ​​ក្នុង​​បទ​​ម៉ូណូ​​មិន​​ត្រូវ​​បាន​​អនុញ្ញាត​​ទេ ។"
+
+#: Menus.cpp:2640 toolbars/EditToolBar.cpp:139
+msgid "Trim"
+msgstr "កាត់​​តម្រឹម"
+
+#: Menus.cpp:2640
+msgid "Trim file to selection"
+msgstr "កាត់​​តម្រឹម​​ឯកសារ​​ទៅ​​ការ​​ជ្រើស"
+
+#: Menus.cpp:2669
+#, c-format
+msgid "Split-deleted %.2f seconds at t=%.2f"
+msgstr "លុប​​ពុះ %.2f វិនាទី នៅ t=%.2f"
+
+#: Menus.cpp:2672
+msgid "Split Delete"
+msgstr "លុប​​ការ​ពុះ"
+
+#: Menus.cpp:2693
+#, c-format
+msgid "Disjoined %.2f seconds at t=%.2f"
+msgstr "បំបែក %.2f វិនាទី នៅ t=%.2f"
+
+#: Menus.cpp:2696
+msgid "Disjoin"
+msgstr "បំបែក"
+
+#: Menus.cpp:2717
+#, c-format
+msgid "Joined %.2f seconds at t=%.2f"
+msgstr "ភ្ជាប់ %.2f វិនាទី នៅ t=%.2f"
+
+#: Menus.cpp:2720
+msgid "Join"
+msgstr "ភ្ជាប់"
+
+#: Menus.cpp:2739
+#, c-format
+msgid "Silenced selected tracks for %.2f seconds at %.2f"
+msgstr "ធ្វើ​​ឲ្យ​​ស្ងាត់​​បទ​​ដែល​​ជ្រើស %.2f វិនាទី នៅ %.2f"
+
+#: Menus.cpp:2741 toolbars/EditToolBar.cpp:141
+msgid "Silence"
+msgstr "ស្ងាត់"
+
+#: Menus.cpp:2775
+msgid "Duplicate"
+msgstr "ស្ទួន"
+
+#: Menus.cpp:2775
+msgid "Duplicated"
+msgstr "បាន​ស្ទួន"
+
+#: Menus.cpp:2794
+msgid "Cut Labels"
+msgstr "កាត់​​ស្លាក"
+
+#: Menus.cpp:2794
+msgid "Cut labeled regions to the clipboard"
+msgstr "កាត់​តំបន់​ដែល​មាន​​ស្លាក​​ទៅ​​ក្ដារ​​តម្បៀត​​ខ្ទាស់"
+
+#: Menus.cpp:2808
+msgid "SplitCut labeled regions to the clipboard"
+msgstr "កាត់​ពុះ​​​តំបន់​​​ដែល​មាន​ស្លាក​​​ទៅ​​​ក្ដារ​​ត​ម្បៀត​​​ខ្ទាស់"
+
+#: Menus.cpp:2809
+msgid "Split Cut Labels"
+msgstr "កាត់​ពុះ​​ស្លាក"
+
+#: Menus.cpp:2823
+msgid "Copied labeled regions to the clipboard"
+msgstr "ចម្លង​​តំបន់​​ស្លាក​ទៅ​​ក្ដារ​​តម្បៀត​ខ្ទាស់"
+
+#: Menus.cpp:2823
+msgid "Copy Labels"
+msgstr "ចម្លង​ស្លាក"
+
+#: Menus.cpp:2835
+msgid "Delete Labels"
+msgstr "លុប​ស្លាក"
+
+#: Menus.cpp:2835
+msgid "Deleted labeled regions"
+msgstr "លុប​តំបន់​​ដែល​មាន​ស្លាក"
+
+#: Menus.cpp:2847
+msgid "Split Delete Labels"
+msgstr "លុប​ការ​ពុះស្លាក"
+
+#: Menus.cpp:2847
+msgid "Split Deleted labeled regions"
+msgstr "ពុះ​តំបន់​​ដែល​មានស្លា​ដែល​បាន​លុប"
+
+#: Menus.cpp:2859
+msgid "Silence Labels"
+msgstr "ស្លាក​​ស្ងាត់"
+
+#: Menus.cpp:2859
+msgid "Silenced labeled regions"
+msgstr "តំបន់​​ដែល​មាន​​ស្លាក​​ដែល​​ស្ងាត់"
+
+#: Menus.cpp:2871
+msgid "Split Labels"
+msgstr "ពុះ​​ស្លាក"
+
+#: Menus.cpp:2871
+msgid "Split labeled regions"
+msgstr "ពុះ​តំបន់​ដែល​មាន​ស្លាក"
+
+#: Menus.cpp:2883
+msgid "Join Labels"
+msgstr "តស្លាក"
+
+#: Menus.cpp:2883
+msgid "Joined labeled regions"
+msgstr "បាន​តតំបន់​ដែល​មាន​ស្លាក"
+
+#: Menus.cpp:2895
+msgid "Disjoin Labels"
+msgstr "មិន​​ត​​ស្លាក"
+
+#: Menus.cpp:2895
+msgid "Disjoined labeled regions"
+msgstr "មិន​បាន​ត​តំបន់​ដែល​មាន​ស្លាក"
+
+#: Menus.cpp:2917 TrackPanel.cpp:5861
+msgid "Split"
+msgstr "ពុះ"
+
+#: Menus.cpp:3011
+msgid "Split New"
+msgstr "ពុះ​​ថ្មី"
+
+#: Menus.cpp:3011
+msgid "Split to new track"
+msgstr "ពុះ​​ទៅ​​បទ​​ថ្មី"
+
+#: Menus.cpp:3094
+msgid "Split at labels"
+msgstr "ពុះ​​នៅ​ស្លាក"
+
+#: Menus.cpp:3394
+msgid "To plot the spectrum, all selected tracks must be the same sample rate."
+msgstr "ដើម្បី​​គ្រោង​​វិសាលគម បទ​​ដែល​​ជ្រើស​​ទាំងអស់​ត្រូវ​តែ​មាន​អត្រា​​គំរូ​​ដូច​គ្នា ។"
+
+#: Menus.cpp:3420
+#, c-format
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "មាន​​អូឌីយ៉ូ​​ច្រើន​​ពេក​​ត្រូវ​​បាន​​ជ្រើស ។ មាន​​​តែ %.1f វិនាទី ដំបូង​​នឹង​​ត្រូវ​បាន​​វិភាគ ។"
+
+#: Menus.cpp:3546
+#, c-format
+msgid "Imported labels from '%s'"
+msgstr "ស្លាក​ដែល​បាន​នាំ​ចូល​ពី '%s'"
+
+#: Menus.cpp:3547
+msgid "Import Labels"
+msgstr "នាំ​ចូល​​ស្លាក"
+
+#: Menus.cpp:3557
+msgid "Select a MIDI file..."
+msgstr "ជ្រើស​​ឯកសារ​​មីឌី..."
+
+#: Menus.cpp:4196
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
+
+#: Menus.cpp:3577
+#, c-format
+msgid "Imported MIDI from '%s'"
+msgstr "មីឌី​ដែល​បាន​នាំចូល​ពី '%s'"
+
+#: Menus.cpp:3579
+msgid "Import MIDI"
+msgstr "នាំ​ចូល​​មីឌី"
+
+#: Menus.cpp:3592
+msgid "Select any uncompressed audio file..."
+msgstr "ជ្រើស​​ឯកសារ​​អូឌីយ៉ូ​​ដែល​​មិន​​បាន​​បង្ហាប់..."
+
+#: Menus.cpp:3596
+msgid "All files (*)|*"
+msgstr "ឯកសារ​​ទាំងអស់ (*)|*"
+
+#: Menus.cpp:3630
+msgid "Edit the metadata tags"
+msgstr "កែ​សម្រួល​​ស្លាក​​ទិន្នន័យ​​មេតា"
+
+#: Menus.cpp:3631
+msgid "Edit Metadata"
+msgstr "កែ​សម្រួល​​ទិន្នន័យ​​មេតា"
+
+#: Menus.cpp:3631
+msgid "Edit Metadata tags"
+msgstr "កែ​សម្រួល​​ស្លាក​​ទិន្នន័យ​មេតា"
+
+#: Menus.cpp:3687
+#, c-format
+msgid "Rendered all audio in track '%s'"
+msgstr "បាន​បង្ហាញ​​អូឌីយ៉ូ​​ទាំងអស់​​ក្នុង​​បទ '%s'"
+
+#: Menus.cpp:3688
+msgid "Render"
+msgstr "បង្ហាញ"
+
+#: Menus.cpp:3693
+#, c-format
+msgid "Mixed and rendered %d tracks into one new stereo track"
+msgstr "លាយ និង​​បង្ហាញ %d បទ​​ទៅ​​ក្នុង​​បទ​​ស្តេរ៉េអូ​​ថ្មី​​មួយ"
+
+#: Menus.cpp:3696
+#, c-format
+msgid "Mixed and rendered %d tracks into one new mono track"
+msgstr "លាយ និង​បង្ហាញ %d បទ​ទៅ​ក្នុង​បទ​ម៉ូណូ​ថ្មី​មួយ"
+
+#: Menus.cpp:560 Menus.cpp:3698 Mix.cpp:120
+msgid "&Mix and Render"
+msgstr "លាយ និង​​បង្ហាញ"
+
+#: Menus.cpp:3828
+msgid "Aligned with zero"
+msgstr "តម្រឹម​​​ដោយ​​​សូន្យ"
+
+#: Menus.cpp:3832
+msgid "Aligned cursor"
+msgstr "តម្រឹម​​ទស្សន៍​ទ្រនិច"
+
+#: Menus.cpp:3836
+msgid "Aligned with selection start"
+msgstr "តម្រឹម​​ដោយ​​ដើម​​ជម្រើស​"
+
+#: Menus.cpp:3840
+msgid "Aligned with selection end"
+msgstr "តម្រឹម​​ដោយ​​ចុង​​ជម្រើស"
+
+#: Menus.cpp:3844
+msgid "Aligned end with cursor"
+msgstr "តម្រឹម​​ចុង​​ដោយ​​ទស្សន៍​ទ្រនិច"
+
+#: Menus.cpp:3848
+msgid "Aligned end with selection start"
+msgstr "តម្រឹម​​ចុង​​ដោយ​​ដើម​​ជម្រើស"
+
+#: Menus.cpp:3852
+msgid "Aligned end with selection end"
+msgstr "តម្រឹម​ចុង​ដោយ​ចុង​ជម្រើស"
+
+#: Menus.cpp:3856
+msgid "Aligned"
+msgstr "បាន​តម្រឹម"
+
+#: Menus.cpp:3889
+msgid "Align"
+msgstr "តម្រឹម"
+
+#: Menus.cpp:4599
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4603
+msgid "Alignment completed."
+msgstr ""
+
+#: Menus.cpp:3912
+msgid "Created new audio track"
+msgstr "បង្កើត​​បទ​​អូឌីយ៉ូ​​ថ្មី"
+
+#: Menus.cpp:3912 Menus.cpp:3935 Menus.cpp:3950 Menus.cpp:3970
+msgid "New Track"
+msgstr "បទ​​ថ្មី"
+
+#: Menus.cpp:3935
+msgid "Created new stereo audio track"
+msgstr "បង្កើត​​បទ​​​អូឌីយ៉ូ​​ស្តេរ៉េអូ​​ថ្មី"
+
+#: Menus.cpp:3950
+msgid "Created new label track"
+msgstr "បាន​បង្កើត​បទ​ស្លាក​ថ្មី"
+
+#: Menus.cpp:3959
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "កំណែ Audacity ដែល​អ្នក​កំពុង​ប្រើ​​មិន​​គាំទ្រ​​បទ​​ពេល​វេលា​​ច្រើន​​ទេ ។"
+
+#: Menus.cpp:3970
+msgid "Created new time track"
+msgstr "បាន​បង្កើត​​បទ​​ពេល​វេលា​​​ថ្មី"
+
+#: Menus.cpp:4019
+msgid "Added label"
+msgstr "បាន​បន្ថែម​​ស្លាក"
+
+#: Menus.cpp:4047
+msgid "Edited labels"
+msgstr "បាន​កែ​សម្រួល​​ស្លាក"
+
+#: Menus.cpp:4074
+msgid "Save CleanSpeech Preset File As:"
+msgstr "រក្សា​ទុក​​ឯកសារ​កំណត់​ជា​មុន​របស់ CleanSpeech ជា ៖"
+
+#: Menus.cpp:4078
+msgid "CleanSpeech Presets (*.csp)|*.csp"
+msgstr "CleanSpeech កំណត់​​ជា​មុន (*.csp)|*.csp"
+
+#: Menus.cpp:4085 export/Export.cpp:509
+msgid "Sorry, pathnames longer than 256 characters not supported."
+msgstr "សូម​អភ័យ​ទោស ឈ្មោះ​ផ្លូវ​វែង​ជាង  ២៦៥ តួ​អក្សរ​​មិន​ត្រូវ​​បាន​​គាំទ្រ​​ទេ ។"
+
+#: Menus.cpp:4131
+msgid "Problem encountered exporting presets."
+msgstr "មាន​បញ្ហា​ក្នុងកា​រនាំចេញ​ការ​កំណត់​ជា​មុន ។"
+
+#: Menus.cpp:4132 export/Export.cpp:402
+msgid "Unable to export"
+msgstr "មិន​អាច​នាំ​ចេញ"
+
+#: Menus.cpp:4316
+msgid "Remove Track"
+msgstr "យក​បទ​ចេញ"
+
+#: Menus.cpp:4316
+msgid "Removed audio track(s)"
+msgstr "បាន​យក​បទ​អូឌីយ៉ូ​ចេញ"
+
+#: Menus.cpp:4437 Menus.cpp:4456 export/ExportMP3.cpp:1871
+msgid "Resample"
+msgstr "ធ្វើ​គំរូ​ឡើង​វិញ"
+
+#: Menus.cpp:5208 TrackPanel.cpp:6400
+msgid "New sample rate (Hz):"
+msgstr ""
+
+#: Menus.cpp:4443
+msgid "The entered value is invalid"
+msgstr "តម្លៃ​ដែល​បញ្ចូល​មិន​ត្រឹមត្រូវ"
+
+#: Menus.cpp:4454
+#, c-format
+msgid "Resampling track %d"
+msgstr "ធ្វើ​គំរូ​បទ %d ឡើង​វិញ"
+
+#: Menus.cpp:4465
+msgid "Resample Track"
+msgstr "ធ្វើ​គំរូ​បទ​ឡើង​វិញ"
+
+#: Menus.cpp:4465
+msgid "Resampled audio track(s)"
+msgstr "ធ្វើ​គំរូ​បទ​អូឌីយ៉ូ​ឡើង​វិញ"
+
+#: Mix.cpp:94 Mix.cpp:101
+msgid "Mix"
+msgstr "លាយ"
+
+#: Mix.cpp:121
+msgid "Mixing and rendering tracks"
+msgstr "លាយ និង​បង្ហាញ​បទ"
+
+#: NoteTrack.cpp:36
+msgid "Note Track"
+msgstr "កំណត់​ចំណាំ​បទ"
+
+#: Printing.cpp:187
+msgid "There was a problem printing."
+msgstr "មាន​បញ្ហា​ក្នុង​ការ​បោះពុម្ព ។"
+
+#: Printing.cpp:188
+msgid "Print"
+msgstr "បោះពុម្ព"
+
+#: Project.cpp:635
+msgid "Main Mix"
+msgstr "លាយ​មេ"
+
+#: Project.cpp:760
+#, c-format
+msgid "Welcome to Audacity version %s"
+msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity កំណែ %s"
+
+#: Project.cpp:912
+msgid "(Recovered)"
+msgstr "(ការ​សង្គ្រោះ​ឯកសារ)"
+
+#: Project.cpp:1472 TrackPanel.cpp:772 toolbars/ControlToolBar.cpp:191
+msgid "Record"
+msgstr "ថត"
+
+#: Project.cpp:1472 TrackPanel.cpp:772
+msgid "Recorded Audio"
+msgstr "ថត​អូឌីយ៉ូ"
+
+#: Project.cpp:1490
+msgid "Save changes before closing?"
+msgstr "រក្សា​ទុក​ការ​ផ្លាស់ប្ដូរ មុន​ពេល​បិទ ?"
+
+#: Project.cpp:1604
+msgid "\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr ""
+
+#: Project.cpp:1496
+msgid "Save changes?"
+msgstr "រក្សា​ទុក​ការ​ផ្លាស់ប្ដូរ ?"
+
+#: Project.cpp:1684
+msgid "All files|*.*|All supported files|"
+msgstr "ឯកសារ​ទាំងអស់​|*.*|​ឯកសារ​ដែល​គាំទ្រ​ទាំងអស់|"
+
+#: Project.cpp:1709
+msgid "Select one or more audio files..."
+msgstr "ជ្រើស​ឯកសារ​អូឌីយ៉ូ​មួយ ឬ​ច្រើន..."
+
+#: Project.cpp:1736
+msgid "Audacity projects|*.aup|"
+msgstr "គម្រោង Audacity​|*.aup|"
+
+#: Project.cpp:1928 Project.cpp:2350
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1929
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2143
+msgid "Opening old project file"
+msgstr "បើក​ឯកសារ​គម្រោង​ចាស់"
+
+#: Project.cpp:1801 Project.cpp:1809
+msgid "Error opening file"
+msgstr "កំហុស​ក្នុង​ការ​បើក​ឯកសារ"
+
+#: Project.cpp:1815
+#, c-format
+msgid "File may be invalid or corrupted: \n"
+"%s"
+msgstr "ឯកសារ​ប្រហែល​ជា​មិន​ត្រឹមត្រូវ ឬ​ខូច ៖ \n"
+"%s"
+
+#: Project.cpp:1816
+msgid "Error opening file or project"
+msgstr "កំហុស​ក្នុង​ការ​បើក​ឯកសារ ឬ​គម្រោង"
+
+#: Project.cpp:1833
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity មិន​អាច​បម្លែង​គម្រោង Audacity ១.០ ទៅ​ទ្រង់ទ្រាយ​គម្រោង​ថ្មី​បាន​ទេ ។"
+
+#: Project.cpp:1936
+msgid "Could not remove old auto save file"
+msgstr "មិន​អាច​យក​ចេញ​ឯកសារ​រក្សា​ទុក​ស្វ័យ​ប្រវត្តិ​ចាស់"
+
+#: Project.cpp:1938
+msgid "Project was recovered"
+msgstr "គម្រោង​​ត្រូវ​បាន​សង្គ្រោះ"
+
+#: Project.cpp:1938
+msgid "Recover"
+msgstr "សង្គ្រោះ​"
+
+#: Project.cpp:1967
+msgid "Project checker repaired file"
+msgstr "កម្មវិធី​ពិនិត្យ​គម្រោង​បាន​ជួសជុល​ឯកសារ"
+
+#: Project.cpp:1967 effects/Repair.h:29
+msgid "Repair"
+msgstr "ជួសជុល"
+
+#: Project.cpp:2078
+#, c-format
+msgid "Couldn't find the project data folder: \"%s\""
+msgstr "មិន​អាច​រក​ឃើញ​ថត​ទិន្នន័យ​គម្រោង ៖ \"%s\""
+
+#: Project.cpp:2116
+#, c-format
+msgid "This file was saved using Audacity %s.\n"
+"You are using Audacity %s - you need to upgrade to\n"
+"a newer version to open this file."
+msgstr "ឯកសារ​នេះ​ត្រូវ​បាន​រក្សា​ទុក​ដោយ​ប្រើ Audacity %s ។\n"
+"អ្នក​កំពុង​ប្រើ Audacity %s - អ្នក​ត្រូវ​ធ្វើ​ឲ្យ​ប្រសើរ​ទៅ\n"
+"កំណែ​ថ្មី​ដើម្បី​បើក​ឯកសារ​នេះ ។"
+
+#: Project.cpp:2120
+msgid "Can't open project file"
+msgstr "មិន​អាច​បើក​ឯកសារ​គម្រោង"
+
+#: Project.cpp:2357
+#, c-format
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2647
+#, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
+
+#: Project.cpp:2366 Project.cpp:2380
+msgid "Error saving project"
+msgstr "កំហុស​ក្នុង​ការ​រក្សា​ទុក​គម្រោង"
+
+#: Project.cpp:2442
+#, c-format
+msgid "Saved %s"
+msgstr "បាន​រក្សា​ទុក %s"
+
+#: Project.cpp:2524
+#, c-format
+msgid "Imported '%s'"
+msgstr "បាន​នាំ​ចូល '%s'"
+
+#: Menus.cpp:3611 Project.cpp:2525 Project.cpp:2550 import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "នាំ​ចូល"
+
+#: Project.cpp:2577 Project.cpp:2585
+msgid "Error importing"
+msgstr "កំហុស​ក្នុង​ការ​នាំ​ចូល"
+
+#: Project.cpp:2619
+msgid "Save Speech As:"
+msgstr "រក្សា​ទុក​ការ​និយាយ​ជា ៖"
+
+#: Project.cpp:2621
+msgid "Windows PCM Audio file (*.wav)|*.wav"
+msgstr "ឯកសារ​អូឌីយ៉ូ PCM វីនដូ (*.wav)|*.wav"
+
+#: Project.cpp:2938
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
+"\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
+"Export commands."
+msgstr ""
+
+#: Project.cpp:2941
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
+#: Project.cpp:2630
+msgid "Audacity projects (*.aup)|*.aup"
+msgstr "គម្រោង Audacity (*.aup)|*.aup"
+
+#: Project.cpp:2674
+msgid "Created new project"
+msgstr "គម្រោង​ថ្មី​ដែល​បាន​បង្កើត"
+
+#: Project.cpp:2794
+#, c-format
+msgid "Deleted %.2f seconds at t=%.2f"
+msgstr "%.2f seconds at t=%.2f ដែល​បាន​លុប"
+
+#: Project.cpp:2797 effects/Equalization.cpp:1239
+#: effects/Equalization.cpp:2494
+msgid "Delete"
+msgstr "លុប"
+
+#: Project.cpp:2990
+#, c-format
+msgid "Disk space remains for recording %d hours and %d minutes."
+msgstr "នៅ​តែ​មាន​ទំហំ​ថាស​សម្រាប់​ថត %d ម៉ោង និង %d នាទី ។"
+
+#: Project.cpp:2993
+#, c-format
+msgid "Disk space remains for recording 1 hour and %d minutes."
+msgstr "នៅ​មាន​ទំហំ​ថាស​សម្រាប់​ថត ១ ម៉ោង និង %d នាទី ។"
+
+#: Project.cpp:2996
+#, c-format
+msgid "Disk space remains for recording %d minutes."
+msgstr "មាន​ទំហំ​ថាស​សម្រាប់​ថត %d នាទី ។"
+
+#: Project.cpp:2999
+#, c-format
+msgid "Disk space remains for recording %d seconds."
+msgstr "នៅ​មាន​ទំហំ​ថាស​សម្រាប់​ថត %d វិនាទី ។"
+
+#: Project.cpp:3002
+msgid "Out of disk space"
+msgstr "អស់​ទំហំ​ថាស"
+
+#: Project.cpp:3380
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3383
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3280
+msgid "Could not remove old autosave file: "
+msgstr "មិន​អាច​យក​ឯកសារ​ដែល​រក្សាទុក​ដោយ​ស្វ័យ​ប្រវត្តិ​ចាស់ចេញ​បាន​ទេ ៖"
+
+#: Project.cpp:3321
+msgid "New Project"
+msgstr "គម្រោង​ថ្មី"
+
+#: Project.cpp:3334
+msgid "Error writing autosave file"
+msgstr "កំហុស​ក្នុង​ការ​សរសេរ​ឯកសារ​រក្សា​ទុក​ស្វ័យ​ប្រវត្តិ"
+
+#: Project.cpp:3359
+msgid "Could not create autosave file: "
+msgstr "មិន​អាច​បង្កើត​ឯកសារ​រក្សា​ទុក​ស្វ័យ​ប្រវត្តិ ៖ "
+
+#: Project.cpp:3385
+#, c-format
+msgid "Actual Rate: %d"
+msgstr "អត្រា​ពិត ៖ %d"
+
+#: Resample.cpp:42
+msgid "Libresample by Dominic Mazzoni and Julius Smith"
+msgstr "Libresample ដោយ Dominic Mazzoni និង Julius Smith"
+
+#: Resample.cpp:53
+msgid "High-quality Sinc Interpolation"
+msgstr "ការ​កែខៃ​ធ្វើ​សមកាលកម្ម​គុណភាព​ខ្ពស់"
+
+#: Resample.cpp:55
+msgid "Fast Sinc Interpolation"
+msgstr "ការ​កែខៃ​ធ្វើ​សមកាលកម្ម​រហ័ស"
+
+#: Resample.cpp:125
+msgid "Libsamplerate by Erik de Castro Lopo"
+msgstr "Libsamplerate ដោយ Erik de Castro Lopo"
+
+#: Resample.cpp:218
+#, c-format
+msgid "Libsamplerate error: %d\n"
+msgstr "កំហុស Libsamplerate ៖ %d\n"
+
+#: Resample.cpp:240 Resample.cpp:250
+msgid "Resampling disabled."
+msgstr "បិទ​ការ​ធ្វើ​គំរូ​ឡើង​វិញ ។"
+
+#. i18n-hint: Audio data bit depth (precison): 16-bit integers
+#: SampleFormat.cpp:66
+msgid "16-bit PCM"
+msgstr "១៦ ប៊ីត PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 24-bit integers
+#: SampleFormat.cpp:69
+msgid "24-bit PCM"
+msgstr "២៤ ប៊ីត PCM"
+
+#. i18n-hint: Audio data bit depth (precison): 32-bit floating point
+#: SampleFormat.cpp:72
+msgid "32-bit float"
+msgstr "៣២ ប៊ីត float"
+
+#: Screenshot.cpp:384
+msgid "Saved "
+msgstr "បាន​រក្សាទុក "
+
+#: Screenshot.cpp:387
+msgid "Error trying to save file: "
+msgstr "កំហុស​ក្នុង​ការ​ព្យាយាម​រក្សា​ទុក​ឯកសារ ៖ "
+
+#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
+msgid "Gap detected in project file\n"
+msgstr "ចន្លោះ​រក​ឃើញ​ក្នុង​ឈ្មោះ​គម្រោង\n"
+
+#: ShuttleGui.cpp:1852 effects/Effect.cpp:255
+#: effects/audiounits/AudioUnitEffect.cpp:872
+msgid "Pre&view"
+msgstr "មើល​ជាមុន"
+
+#: ShuttleGui.cpp:1859
+msgid "&Debug"
+msgstr "បំបាត់​កំហុស"
+
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
+
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
+
+#: SplashDialog.cpp:57
+msgid "&Welcome to Audacity!"
+msgstr "សូម​ស្វាគមន៍​មក​កាន់ Audacity !"
+
+#: SplashDialog.cpp:94
+msgid "Don't show this again at start up"
+msgstr "កុំ​បង្ហាញ​វា​​ម្ដង​ទៀត​នៅ​ពេល​ចាប់ផ្ដើម"
+
+#: Tags.cpp:621
+msgid "Artist Name"
+msgstr "ឈ្មោះ​សិល្បករ"
+
+#: Tags.cpp:622
+msgid "Track Title"
+msgstr "ចំណង​ជើង​បទ"
+
+#: Tags.cpp:623
+msgid "Album Title"
+msgstr "ចំណង​ជើង​អាល់ប៊ុម"
+
+#: Tags.cpp:624
+msgid "Track Number"
+msgstr "លេខ​បទ"
+
+#: Tags.cpp:625 Tags.cpp:2105
+msgid "Year"
+msgstr "ឆ្នាំ"
+
+#: Tags.cpp:626
+msgid "Genre"
+msgstr "ចង្វាក់"
+
+#: Tags.cpp:627 Tags.cpp:2115 prefs/MousePrefs.cpp:96
+msgid "Comments"
+msgstr "មតិយោបល់"
+
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
+
+#: Tags.cpp:769
+msgid "Tag Name"
+msgstr "ឈ្មោះ​ស្លាក"
+
+#: Tags.cpp:770
+msgid "Tag Value"
+msgstr "តម្លៃ​ស្លាក"
+
+#: Tags.cpp:785 Tags.cpp:1443 prefs/KeyConfigPrefs.cpp:116
+msgid "&Clear"
+msgstr "ជម្រះ"
+
+#: Tags.cpp:791
+msgid "Genres"
+msgstr "ចង្វាក់"
+
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
+
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
+
+#: Tags.cpp:801 Tags.cpp:1427 Tags.cpp:1955
+msgid "Template"
+msgstr "ពុម្ព"
+
+#: Tags.cpp:805 Tags.cpp:1431 Tags.cpp:1959 prefs/KeyConfigPrefs.cpp:126
+msgid "&Load..."
+msgstr "ផ្ទុក..."
+
+#: Tags.cpp:806 Tags.cpp:1432 Tags.cpp:1960 prefs/KeyConfigPrefs.cpp:125
+msgid "&Save..."
+msgstr "រក្សា​ទុក..."
+
+#: Tags.cpp:839
+#, fuzzy
+msgid "S&et Default"
+msgstr "កំណត់​លំនាំដើម"
+
+#: Tags.cpp:958 Tags.cpp:1597 Tags.cpp:2326
+msgid "Edit Genres"
+msgstr "កែសម្រួល​ចង្វាក់"
+
+#: Tags.cpp:991 Tags.cpp:1003 Tags.cpp:1019 Tags.cpp:1032 Tags.cpp:1635
+#: Tags.cpp:1647 Tags.cpp:1663 Tags.cpp:1676 Tags.cpp:2369 Tags.cpp:2381
+#: Tags.cpp:2397 Tags.cpp:2410
+msgid "Reset Genres"
+msgstr "កំណត់​ចង្វាក់​ឡើង​វិញ"
+
+#: Tags.cpp:991 Tags.cpp:1032 Tags.cpp:1635 Tags.cpp:1676 Tags.cpp:2369
+#: Tags.cpp:2410
+msgid "Unable to save genre file."
+msgstr "មិនអាច​រក្សាទុក​ឯកសារ​ចង្វាក់"
+
+#: Tags.cpp:1002 Tags.cpp:1646 Tags.cpp:2380
+msgid "Are you sure you want to reset the genre list to defaults?"
+msgstr "តើ​អ្នក​ប្រាកដ​ជា​ចង់​កំណត់​បញ្ជី​ចង្វាក់​​ទៅ​ជា​លំនាំ​ដើម​​ឡើង​វិញ ?"
+
+#: Tags.cpp:1019 Tags.cpp:1663 Tags.cpp:2397
+msgid "Unable to open genre file."
+msgstr "មិន​អាច​បើក​ឯកសារ​ចង្វាក់ ។"
+
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
+msgid "Error loading metadata"
+msgstr "កំហុស​ក្នុង​ការ​ផ្ទុក​ទិន្នន័យ​មេតា"
+
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
+msgstr "រក្សាទុក​ទិន្នន័យ​មេតា​ជា ៖"
+
+#: Theme.cpp:638
+#, c-format
+msgid "Audacity could not write file:\n"
+"  %s."
+msgstr "Audacity មិន​អាច​សរសេរ​ឯកសារ ៖\n"
+"  %s ។"
+
+#: Theme.cpp:656
+#, c-format
+msgid "Audacity could not open file:\n"
+"  %s\n"
+"for writing."
+msgstr "Audacity មិន​អាច​បើក​ឯកសារ ៖\n"
+"  %s\n"
+"សម្រាប់​សរសេរ ។"
+
+#: Theme.cpp:664
+#, c-format
+msgid "Audacity could not write images to file:\n"
+"  %s."
+msgstr "Audacity មិន​អាច​សរសេរ​រូបភាព​ទៅ​ឯកសារ ៖\n"
+"  %s ។"
+
+#: Theme.cpp:799
+#, c-format
+msgid "Audacity could not find file:\n"
+"  %s.\n"
+"Theme not loaded."
+msgstr "Audacity មិន​អាច​រក​ឯកសារ ៖\n"
+"  %s.\n"
+"មិន​បាន​ផ្ទុក​ស្បែក ។"
+
+#: Theme.cpp:807 Theme.cpp:896
+#, c-format
+msgid "Audacity could not load file:\n"
+"  %s.\n"
+"Bad png format perhaps?"
+msgstr "Audacity មិន​អាច​ផ្ទុក​ឯកសារ ៖\n"
+"  %s.\n"
+"ប្រហែល​ជា​ទ្រង់ទ្រាយ png មិន​ល្អ ?"
+
+#: Theme.cpp:823
+msgid "Audacity could not read its default theme.\n"
+"Please report the problem."
+msgstr "Audacity មិន​អាច​អាន​ស្បែក​លំនាំ​ដើម​របស់​វា ។\n"
+"សូម​រាយការណ៍​អំពី​​បញ្ហា ។"
+
+#: Theme.cpp:918
+#, c-format
+msgid "None of the expected theme component files\n"
+" were found in:\n"
+"  %s."
+msgstr "រក​មិន​ឃើញ​ឯកសារ​សមាសភាគ​ស្បែក​ដែល​រំពឹង​ទុក\n"
+" នៅ​ក្នុង ៖\n"
+"  %s."
+
+#: Theme.cpp:942 effects/NoiseRemoval.cpp:173
+#, c-format
+msgid "Could not create directory:\n"
+"  %s"
+msgstr "មិន​អាច​បង្កើត​ថត ៖\n"
+"  %s"
+
+#: Theme.cpp:963
+#, c-format
+msgid "Audacity could not save file:\n"
+"  %s"
+msgstr "Audacity មិន​អាច​រក្សាទុក​ឯកសារ ៖\n"
+"  %s"
+
+#: Theme.cpp:975
+#, c-format
+msgid "All required files in:\n"
+"  %s\n"
+"were already present."
+msgstr "ឯកសារ​ដែល​ត្រូវការ​ទាំងអស់​នៅ​ក្នុង ៖\n"
+"  %s\n"
+"បាន​បង្ហាញ​រួច​ហើយ ។"
+
+#: SmartRecordDialog.cpp:303
+msgid "Duration"
+msgstr "ថិរវេលា"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "ឧបករណ៍​កំណត់​ពេល​ថត​របស់ Audacity"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording start"
+msgstr ""
+
+#: TimerRecordDialog.cpp:226
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:231
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:269
+msgid "Start Date and Time"
+msgstr "កាលបរិច្ឆេទ និង​ពេល​វេលា​ចាប់ផ្ដើម"
+
+#: TimerRecordDialog.cpp:324
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "កាល​បរិច្ឆេទ និង​ពេល​វេលា​បញ្ចប់"
+
+#: TimerRecordDialog.cpp:344
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:431
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:432
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
+#: TrackPanel.cpp:448 TrackPanel.cpp:449
+msgid "Track Panel"
+msgstr "បន្ទះ​បទ"
+
+#: TrackPanel.cpp:492 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
+msgid "Other..."
+msgstr "ផ្សេងៗទៀត..."
+
+#: TrackPanel.cpp:500 TrackPanel.cpp:521 TrackPanel.cpp:530 TrackPanel.cpp:538
+msgid "Name..."
+msgstr "ឈ្មោះ..."
+
+#: TrackPanel.cpp:502 TrackPanel.cpp:523 TrackPanel.cpp:534 TrackPanel.cpp:540
+msgid "Move Track Up"
+msgstr "ផ្លាស់ទី​បទ​ឡើង​លើ"
+
+#: TrackPanel.cpp:503 TrackPanel.cpp:524 TrackPanel.cpp:535 TrackPanel.cpp:541
+msgid "Move Track Down"
+msgstr "ផ្លាស់ទី​បទ​ចុះ​ក្រោម"
+
+#: TrackPanel.cpp:505 effects/ToneGen.cpp:295
+msgid "Waveform"
+msgstr "ទ្រង់ទ្រាយ​រលក"
+
+#: TrackPanel.cpp:506
+msgid "Waveform (dB)"
+msgstr "ទ្រង់ទ្រាយ​រលក (dB)"
+
+#: TrackPanel.cpp:554 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
+#: TrackPanel.cpp:508
+msgid "Pitch (EAC)"
+msgstr "កម្ពស់​សំឡេង (EAC)"
+
+#: TrackPanel.cpp:510 TrackPanel.cpp:5831
+msgid "Mono"
+msgstr "ម៉ូណូ"
+
+#: TrackPanel.cpp:511 TrackPanel.cpp:5830
+msgid "Left Channel"
+msgstr "ឆានែល​ឆ្វេង"
+
+#: TrackPanel.cpp:512 TrackPanel.cpp:5830
+msgid "Right Channel"
+msgstr "ឆានែល​ស្ដាំ"
+
+#: TrackPanel.cpp:513
+msgid "Make Stereo Track"
+msgstr "បង្កើត​បទ​ស្តេរ៉េអូ"
+
+#: TrackPanel.cpp:514
+msgid "Split Stereo Track"
+msgstr "ពុះ​បទ​ស្តេរ៉េអូ"
+
+#: TrackPanel.cpp:516
+msgid "Set Sample Format"
+msgstr "កំណត់​ទ្រង់ទ្រាយ​គំរូ"
+
+#: TrackPanel.cpp:518 TrackPanel.cpp:6048
+msgid "Set Rate"
+msgstr "កំណត់​អត្រា"
+
+#: TrackPanel.cpp:526
+msgid "Up Octave"
+msgstr "Octave ឡើង"
+
+#: TrackPanel.cpp:527
+msgid "Down Octave"
+msgstr "Octave ចុះ"
+
+#: TrackPanel.cpp:532
+msgid "Font..."
+msgstr "ពុម្ពអក្សរ..."
+
+#: TrackPanel.cpp:543
+msgid "Set Range..."
+msgstr "កំណត់​ជួរ..."
+
+#: TrackPanel.cpp:547 toolbars/EditToolBar.cpp:135
+msgid "Copy"
+msgstr "ចម្លង"
+
+#: TrackPanel.cpp:1239
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "ចុច​ដើម្បី​​ពង្រីក​បញ្ឈរ ប្ដូរ​(Shift) - ចុច ដើម្បី​បង្រួម អូស​ដើម្បី​បង្កើត​តំបន់​ពង្រីក​ជាក់លាក់ ។"
+
+#: TrackPanel.cpp:1244
+msgid "Drag the label vertically to change the order of the tracks."
+msgstr "អូស​ស្លាក​បញ្ឈរ​ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​បទ ។"
+
+#: TrackPanel.cpp:1264
+msgid "Click and drag to adjust relative size of stereo tracks."
+msgstr "ចុច និង​អូស​ដើម្បី​លៃ​តម្រូវ​ទំហំ​បទ​ស្តេរ៉េអូ​នីមួយៗ ។"
+
+#: TrackPanel.cpp:1267
+msgid "Click and drag to resize the track."
+msgstr "ចុច និង​អូស​ដើម្បី​ប្ដូរ​ទំហំ​បទ ។"
+
+#: TrackPanel.cpp:1298
+msgid "Drag one or more label boundaries"
+msgstr "អូស​ស៊ុម​ស្លាក​មួយ ឬ​ច្រើន"
+
+#: TrackPanel.cpp:1299
+msgid "Drag label boundary"
+msgstr "អូស​ស៊ុម​ស្លាក"
+
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1315
+msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
+msgstr "របៀប​ឧបករណ៍​ច្រើន ៖ Cmd- សម្រាប់​ចំណូល​ចិត្ត​ក្ដារ​ចុច និង​កណ្ដុរ"
+
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1318
+msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
+msgstr "របៀប​ឧបករណ៍​ច្រើន ៖ បញ្ជា (Ctrl) - P សម្រាប់​ចំណូល​ចិត្ត​កណ្ដុរ និង​ក្ដារ​ចុច"
+
+#: TrackPanel.cpp:1338
+msgid "Click and drag to move left selection boundary."
+msgstr "ចុច និង​អូស​ដើម្បី​ផ្លាស់ទី​ស៊ុម​ការ​ជ្រើស ។"
+
+#: TrackPanel.cpp:1343
+msgid "Click and drag to move right selection boundary."
+msgstr "ចុច និង​អូស​ដើម្បី​ផ្លាស់ទី​ស៊ុម​ការ​ជ្រើស​ខាង​ស្ដាំ ។"
+
+#: TrackPanel.cpp:1669 TrackPanel.cpp:3777 TrackPanel.cpp:3809
+#: TrackPanel.cpp:4064 TrackPanel.cpp:6160 TrackPanel.cpp:6180
+msgid "Modified Label"
+msgstr "ស្លាក​ដែល​បានកែប្រែ"
+
+#: TrackPanel.cpp:1670 TrackPanel.cpp:3778 TrackPanel.cpp:3810
+#: TrackPanel.cpp:4065 TrackPanel.cpp:6161 TrackPanel.cpp:6181
+msgid "Label Edit"
+msgstr "កែសម្រួល​ស្លាក"
+
+#: TrackPanel.cpp:1897
+msgid "Adjusted envelope."
+msgstr "​ស្រោម​សំបុត្រ​ដែល​បាន​លៃតម្រូវ ។"
+
+#: TrackPanel.cpp:1898 prefs/MousePrefs.cpp:115
+msgid "Envelope"
+msgstr "ស្រោម​សំបុត្រ"
+
+#: TrackPanel.cpp:2034
+msgid "Moved clip to another track"
+msgstr "ផ្លាស់ទី​ឈុត​ទៅ​បទ​មួយផ្សេង​ទៀត"
+
+#: TrackPanel.cpp:2038
+msgid "left"
+msgstr "ឆ្វេង"
+
+#: TrackPanel.cpp:2038
+msgid "right"
+msgstr "ស្ដាំ"
+
+#. i18n-hint: %s is a direction like left or right
+#: TrackPanel.cpp:2040
+#, c-format
+msgid "Time shifted tracks/clips %s %.02f seconds"
+msgstr "ពេលវេលា​ប្តូរ​បទ/ឈុត %s %.02f វិនាទី"
+
+#: TrackPanel.cpp:2044 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
+msgid "Time-Shift"
+msgstr "អង្កិល​ពេល​វេលា"
+
+#: TrackPanel.cpp:2921
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
+
+#: TrackPanel.cpp:2938
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
+
+#: TrackPanel.cpp:3025
+msgid "Moved Sample"
+msgstr "គំរូ​ដែលបានផ្លាស់ទី"
+
+#: TrackPanel.cpp:3026
+msgid "Sample Edit"
+msgstr "កែសម្រួល​គំរូ"
+
+#: TrackPanel.cpp:3125
+#, c-format
+msgid "Removed track '%s.'"
+msgstr "បទ '%s.' ដែលបាន​យក​ចេញ"
+
+#: TrackPanel.cpp:3127
+msgid "Track Remove"
+msgstr "យក​បទ​ចេញ"
+
+#: TrackPanel.cpp:3268
+msgid "Moved gain slider"
+msgstr "​គ្រាប់​រំកិល​កំណើន​ដែល​បាន​ផ្លាស់ទី"
+
+#: TrackPanel.cpp:3268
+msgid "Moved pan slider"
+msgstr "​គ្រាប់រុញ​រំកិល​ដែល​បាន​ផ្លាស់ទី​"
+
+#. i18n-hint: Title of the Gain slider, used to adjust the volume
+#: TrackPanel.cpp:3269 TrackPanel.cpp:5478 TrackPanel.cpp:6829
+msgid "Gain"
+msgstr "កំណើន"
+
+#. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
+#: TrackPanel.cpp:3269 TrackPanel.cpp:5416 TrackPanel.cpp:6836
+msgid "Pan"
+msgstr "បន្ទះ"
+
+#: TrackPanel.cpp:3394 TrackPanel.cpp:6113 effects/ChangePitch.cpp:282
+msgid "up"
+msgstr "ឡើង​លើ"
+
+#: TrackPanel.cpp:3398 TrackPanel.cpp:6114 effects/ChangePitch.cpp:282
+msgid "down"
+msgstr "ចុះ​ក្រោម"
+
+#: TrackPanel.cpp:3405 TrackPanel.cpp:6109
+#, c-format
+msgid "Moved '%s' %s"
+msgstr "ផ្លាស់ទី '%s' %s"
+
+#: TrackPanel.cpp:3408 TrackPanel.cpp:6115
+msgid "Move Track"
+msgstr "ផ្លាស់ទី​បទ"
+
+#: TrackPanel.cpp:3964
+msgid "Expand"
+msgstr "ពង្រីក"
+
+#: TrackPanel.cpp:3964
+msgid "Expanded Cut Line"
+msgstr "ពង្រីក​បន្ទាត់​កាត់"
+
+#: TrackPanel.cpp:3973
+msgid "Merge"
+msgstr "បញ្ចូល​ចូល​គ្នា"
+
+#: TrackPanel.cpp:3973
+msgid "Merged Clips"
+msgstr "បញ្ចូល​ឈុត​ចូល​គ្នា"
+
+#: TrackPanel.cpp:3985
+msgid "Removed Cut Line"
+msgstr "​បន្ទាត់​កាត់​ដែល​បាន​យកចេញ"
+
+#: TrackPanel.cpp:5416
+msgid "Adjusted Pan"
+msgstr "បន្ទះ​ដែល​បាន​លៃតម្រូវ"
+
+#: TrackPanel.cpp:5478
+msgid "Adjusted gain"
+msgstr "កំណើន​ដែល​បាន​លៃតម្រូវ"
+
+#: TrackPanel.cpp:5796
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5797
+msgid "Clear any grouping"
+msgstr ""
+
+#: TrackPanel.cpp:5658
+msgid "Can't delete track with active audio"
+msgstr "មិន​អាច​លុប​បទ​ដែល​មាន​អូឌីយ៉ូ​សកម្ម"
+
+#: TrackPanel.cpp:5811
+msgid "Stereo, "
+msgstr "ស្តេរ៉េអូ "
+
+#: TrackPanel.cpp:5814
+msgid "Mono, "
+msgstr "ម៉ូណូ "
+
+#: TrackPanel.cpp:5816
+msgid "Left, "
+msgstr "ឆ្វេង "
+
+#: TrackPanel.cpp:5818
+msgid "Right, "
+msgstr "ស្ដាំ "
+
+#: TrackPanel.cpp:5840 TrackPanel.cpp:5953
+#, c-format
+msgid "Changed '%s' to %s"
+msgstr "ផ្លាស់ប្ដូរ '%s' ទៅ %s"
+
+#: TrackPanel.cpp:5845
+msgid "Channel"
+msgstr "ឆានែល"
+
+#: TrackPanel.cpp:5858
+#, c-format
+msgid "Split stereo track '%s'"
+msgstr "ពុះ​បទ​ស្តេរ៉េអូ '%s'"
+
+#: TrackPanel.cpp:5879
+#, c-format
+msgid "Made '%s' a stereo track"
+msgstr "បង្កើត​បទ​ស្តេរ៉េអូ '%s'"
+
+#: TrackPanel.cpp:5882
+msgid "Make Stereo"
+msgstr "បង្កើត​ស្តេរ៉េអូ"
+
+#: TrackPanel.cpp:5917
+#, c-format
+msgid "Changed '%s' to %d Hz"
+msgstr "ផ្លាស់ប្ដូរ '%s' ទៅ %d Hz"
+
+#: TrackPanel.cpp:5919
+msgid "Rate Change"
+msgstr "ផ្លាស់ប្ដូរ​អត្រា"
+
+#: TrackPanel.cpp:5957
+msgid "Format Change"
+msgstr "ផ្លាស់ប្ដូរ​ទ្រង់ទ្រាយ"
+
+#: TrackPanel.cpp:6077
+msgid "Change lower speed limit (%) to:"
+msgstr "ផ្លាស់ប្ដូរ​ដែន​កំណត់​ល្បឿន​ទាប​ជាង (%) ទៅ ៖"
+
+#: TrackPanel.cpp:6078 TrackPanel.cpp:6079
+msgid "Lower speed limit"
+msgstr "ដែន​កំណត់​ល្បឿន​ទាប​ជាង"
+
+#: TrackPanel.cpp:6084
+msgid "Change upper speed limit (%) to:"
+msgstr "ផ្លាស់ប្ដូរ​ដែន​កំណត់​ល្បឿន​ខ្ពស់​ជាង (%) ទៅ ៖"
+
+#: TrackPanel.cpp:6085 TrackPanel.cpp:6086
+msgid "Upper speed limit"
+msgstr "ដែន​កំណត់​ល្បឿន​ខ្ពស់​ជាង"
+
+#: TrackPanel.cpp:6094
+#, c-format
+msgid "Set range to '%d' - '%d'"
+msgstr "កំណត់​ជួរ​ទៅ '%d' - '%d'"
+
+#: TrackPanel.cpp:6097
+msgid "Set Range"
+msgstr "កំណត់​ជួរ"
+
+#: TrackPanel.cpp:6142
+msgid "Change track name to:"
+msgstr "ផ្លាស់ប្ដូរ​ឈ្មោះ​បទ​ទៅ ៖"
+
+#: TrackPanel.cpp:6143
+msgid "Track Name"
+msgstr "ឈ្មោះ​បទ"
+
+#: TrackPanel.cpp:6146
+#, c-format
+msgid "Renamed '%s' to '%s'"
+msgstr "បាន​ប្ដូរ​ឈ្មោះ '%s' ទៅ '%s'"
+
+#: TrackPanel.cpp:6149
+msgid "Name Change"
+msgstr "ផ្លាស់ប្ដូរ​ឈ្មោះ"
+
+#: TrackPanel.cpp:6215
+msgid "Label Track Font"
+msgstr "ដាក់ស្លាក​ពុម្ពអក្សរ​បទ"
+
+#: TrackPanel.cpp:6227
+msgid "Face name"
+msgstr "ឈ្មោះ​មុខ"
+
+#: TrackPanel.cpp:6236
+msgid "Face size"
+msgstr "ទំហំ​មុខ"
+
+#: TrackPanel.cpp:6756
+msgid "Mute"
+msgstr "ស្ងាត់"
+
+#: TrackPanel.cpp:6756
+msgid "Solo"
+msgstr "សូឡូ"
+
+#: TrackPanelAx.cpp:265
+msgid "TrackView"
+msgstr "ទិដ្ឋភាព​បទ"
+
+#: TrackPanelAx.cpp:273
+msgid "Track Accessible out of sync"
+msgstr "អាច​ចូល​ដំណើរការ​បទ​ក្រៅ sync"
+
+#: TrackPanelAx.cpp:281
+#, c-format
+msgid "Track %d"
+msgstr "បទ %d"
+
+#: TrackPanelAx.cpp:287
+msgid " Mute On"
+msgstr "ស្ងាត់"
+
+#: TrackPanelAx.cpp:292
+msgid " Solo On"
+msgstr " បើក​សូឡូ"
+
+#: TrackPanelAx.cpp:296
+msgid " Select On"
+msgstr "ជ្រើស​បើក"
+
+#: VoiceKey.cpp:88 VoiceKey.cpp:238 VoiceKey.cpp:376 VoiceKey.cpp:517
+msgid "Selection is too small to use voice key."
+msgstr "ជម្រើស​តូច​ពេក​មិន​អាច​ប្រើ​គ្រាប់​ចុច​សំឡេង​បានទេ ។"
+
+#: VoiceKey.cpp:843
+msgid "Calibration Results\n"
+msgstr "លទ្ធផល​កម្រិត​តាមខ្នាត\n"
+
+#: VoiceKey.cpp:844
+#, c-format
+msgid "Energy                  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "ថាមពល            -- mean: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:845
+#, c-format
+msgid "Sign Changes        -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "សញ្ញា​ផ្លាស់ប្តូរ       -- mean: %1.4f  sd: (%1.4f)\n"
+
+#: VoiceKey.cpp:846
+#, c-format
+msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
+msgstr "ទិស​ផ្លាស់ប្តូរ  -- mean: %1.4f  sd: (%1.4f)\n"
+
+#: WaveTrack.cpp:75
+msgid "Audio Track"
+msgstr "បទ​អូឌីយ៉ូ"
+
+#: WaveTrack.cpp:541 WaveTrack.cpp:560
+msgid "There is not enough room available to paste the selection"
+msgstr "មិន​មាន​បន្ទប់​គ្រប់គ្រាន់​ដើម្បី​បិទ​ភ្ជាប់​​ជម្រើស​ទេ"
+
+#: WaveTrack.cpp:1649
+msgid "There is not enough room available to expand the cut line"
+msgstr "មិន​មាន​បន្ទប់​គ្រប់គ្រាន់​ដើម្បី​ពង្រីក​បន្ទាត់​កាត់"
+
+#: commands/CommandManager.cpp:395
+#, c-format
+msgid "Plugins 1 to %i"
+msgstr "កម្មវិធី​ជំនួយ​ពី 1 ដល់ %i"
+
+#: commands/CommandManager.cpp:409
+#, c-format
+msgid "Plugins %i to %i"
+msgstr "កម្មវិធី​ជំនួយពី %i ដល់ %i"
+
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "មិន​អនុញ្ញាត​ចំពោះ​ហេតុផល​មួយ​ចំនួន ។  ព្យាយាម​ជ្រើស​អូឌីយ៉ូ​ខ្លះ​ជាមុន ?"
+
+#: commands/CommandManager.cpp:724
+msgid "You can only do this when playing and recording are\n"
+" stopped.  [Pausing is not sufficient.]"
+msgstr "អ្នក​អាច​ធ្វើ​នេះ ពេល​ការ​ចាក់ និង​ថត\n"
+" ត្រូវ​បាន​បញ្ឈប់ ។  [ការ​ផ្អាក​មិន​មាន​ប្រសិទ្ធិភាព ។]"
+
+#: commands/CommandManager.cpp:726
+msgid "You must first select some stereo audio for this\n"
+" to use.  [You can't use this with mono.]"
+msgstr "អ្នក​ត្រូវ​តែ​ជ្រើស​អូឌីយ៉ូ និង​ស្តេរ៉េអូ​មួយ​ចំនួន​សម្រាប់​វា\n"
+" ដើម្បី​ប្រើ ។  [អ្នក​មិន​អាច​ប្រើ​វា​ជា​មួយ​ម៉ូណូ​ទេ ។]"
+
+#: commands/CommandManager.cpp:728
+msgid "You must first select some audio for this to use."
+msgstr "អ្នក​ត្រូវ​តែ​ជ្រើស​អូឌីយ៉ូ​ខ្លះ​សម្រាប់​ប្រើ​នេះ ។"
+
+#: commands/CommandManager.cpp:730
+msgid "You must first select some audio for this\n"
+" to use. [Selecting other kinds of track won't work.]"
+msgstr "អ្នក​ត្រូវ​តែ​ជ្រើស​អូឌីយ៉ូ​មួយ​ចំនួន​ដើម្បី​\n"
+" ប្រើ ។ [ដោយ​ជ្រើស​ប្រភេទ​បទ​ផ្សេងៗ​ដែល​នឹង​មិន​ដំណើរការ ។]"
+
+#: commands/CommandManager.cpp:872
+msgid "Disallowed"
+msgstr ""
+
+#: commands/CommandManager.cpp:912
+#, c-format
+msgid "Loaded %d keyboard shortcuts\n"
+msgstr "បាន​ផ្ទុក​ផ្លូវកាត់​ក្ដារចុច %d\n"
+
+#: commands/CommandManager.cpp:914
+msgid "Loading keyboard shortcuts"
+msgstr "​ផ្ទុក​ផ្លូវកាត់​ក្ដារ​ចុច"
+
+#: effects/Amplify.cpp:52
+#, c-format
+msgid "Applied effect: %s %.1f dB"
+msgstr "បាន​អនុវត្ត​បែបផែន ៖ %s %.1f dB"
+
+#: effects/Amplify.cpp:87
+msgid "Amplify"
+msgstr "ពង្រីក"
+
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
+
+#: effects/Amplify.cpp:159
+msgid "Amplification (dB):"
+msgstr "ការ​ពង្រីក (dB) ៖"
+
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:179
+msgid "New Peak Amplitude (dB):"
+msgstr "អាំភ្លី​កំពូល​ថ្មី (dB) ៖"
+
+#: effects/Amplify.cpp:191
+msgid "Allow clipping"
+msgstr "អនុញ្ញាត​ឲ្យ​ច្រឹប"
+
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
+#: effects/Amplify.h:46
+msgid "Amplify..."
+msgstr "ពង្រីក..."
+
+#: effects/Amplify.h:54
+msgid "Amplifying"
+msgstr "ពង្រីក"
+
+#: effects/AutoDuck.cpp:125
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "អ្នក​ជ្រើស​បទ ដែល​មិន​មាន​អូឌីយ៉ូ ។ AutoDuck អាច​ដំណើរ​ការ​បាន​តែ​បទ​អូឌីយ៉ូ​ប៉ុណ្ណោះ ។"
+
+#: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:451
+#: effects/AutoDuck.cpp:568
+msgid "Auto Duck"
+msgstr "Auto Duck"
+
+#: effects/AutoDuck.cpp:137
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Auto Duck ត្រូវតែ​ត្រួតពិនិត្យ​បទ​​ ដែល​ត្រូវ​បាន​ដាក់​ពី​ក្រោម​បទ​ដែល​ជ្រើស ។"
+
+#: effects/AutoDuck.cpp:463
+msgid "Auto Duck by Markus Meyer"
+msgstr "Auto Duck ដោយ Markus Meyer"
+
+#: effects/AutoDuck.cpp:485
+msgid "Duck amount:"
+msgstr "ចំនួន​ Duck សរុប ៖"
+
+#: effects/AutoDuck.cpp:490
+msgid "Maximum pause:"
+msgstr "ការ​ផ្អាក​អតិបរមា ៖"
+
+#: effects/AutoDuck.cpp:492 effects/AutoDuck.cpp:497 effects/AutoDuck.cpp:502
+#: effects/AutoDuck.cpp:507 effects/AutoDuck.cpp:512
+#: prefs/AudioIOPrefs.cpp:166 prefs/AudioIOPrefs.cpp:174
+#: prefs/AudioIOPrefs.cpp:176 prefs/AudioIOPrefs.cpp:201
+#: prefs/AudioIOPrefs.cpp:203 widgets/TimeTextCtrl.cpp:197
+msgid "seconds"
+msgstr "វិនាទី"
+
+#: effects/AutoDuck.cpp:495
+msgid "Outer fade down length:"
+msgstr "ប្រវែង​ផត​ចុះ​ខាង​ក្រៅ​ ៖"
+
+#: effects/AutoDuck.cpp:500
+msgid "Outer fade up length:"
+msgstr "ប្រវែង​ផុសចេញ​ខាង​ក្រៅ ៖"
+
+#: effects/AutoDuck.cpp:505
+msgid "Inner fade down length:"
+msgstr "ប្រវែង​ផតចុះ​ខាង​ក្នុង ៖"
+
+#: effects/AutoDuck.cpp:510
+msgid "Inner fade up length:"
+msgstr "ប្រវែង​ផុសចេញ​ខាង​ក្នុង ៖"
+
+#: effects/AutoDuck.cpp:519 effects/Compressor.cpp:479
+msgid "Threshold:"
+msgstr "កម្រិត​ពន្លឺ ៖"
+
+#: effects/AutoDuck.cpp:568
+msgid "Please enter valid values."
+msgstr "សូម​បញ្ចូល​តម្លៃ​ដែល​​ត្រឹមត្រូវ ។"
+
+#: effects/AutoDuck.cpp:702
+msgid "Preview not available"
+msgstr "មិន​មាន​ការ​មើល​ជាមុន"
+
+#: effects/AutoDuck.h:97
+msgid "Auto Duck..."
+msgstr "Auto Duck..."
+
+#: effects/AutoDuck.h:107
+msgid "Processing Auto Duck..."
+msgstr "កំពុង​ដំណើរ​ការ Auto Duck..."
+
+#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:439
+#: effects/audiounits/AudioUnitEffect.cpp:877 effects/nyquist/Nyquist.cpp:1037
+#: widgets/ErrorDialog.cpp:74 widgets/ErrorDialog.cpp:100
+#: widgets/Warning.cpp:67
+msgid "OK"
+msgstr "យល់ព្រម"
+
+#: effects/BassBoost.cpp:52
+#, c-format
+msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
+msgstr "អនុវត្ត​បែបផែន ៖ %s ប្រេកង់ = %.0f Hz boost = %.0f dB"
+
+#: effects/BassBoost.cpp:169
+msgid "Bass Boost"
+msgstr "ដំឡើង​បាស"
+
+#: effects/BassBoost.cpp:182
+msgid "by Nasca Octavian Paul"
+msgstr "ដោយ Nasca Octavian Paul"
+
+#: effects/BassBoost.cpp:196
+msgid "Frequency (Hz):"
+msgstr "ប្រេកង់ (Hz) ៖"
+
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
+msgid "Boost (dB):"
+msgstr "ដំឡើង (dB) ៖"
+
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
+#: effects/BassBoost.h:35
+msgid "BassBoost..."
+msgstr "ដំឡើង​បាស..."
+
+#: effects/BassBoost.h:43
+msgid "Boosting Bass Frequencies"
+msgstr "ប្រេកង់​ដំឡើង​បាស"
+
+#: effects/ChangeLength.h:26
+msgid "Change Length..."
+msgstr "ផ្លាស់ប្ដូរ​ប្រវែង..."
+
+#: effects/ChangeLength.h:34
+msgid "Changing Length..."
+msgstr "កំពុង​ផ្លាស់ប្ដូរ​ប្រវែង..."
+
+#: effects/ChangePitch.cpp:55
+#, c-format
+msgid "Applied effect: %s %.2f semitones"
+msgstr "អនុវត្ត​បែបផែន ៖ %s %.2f សំឡេង​ពាក់​កណ្តាល"
+
+#: effects/ChangePitch.cpp:118
+msgid "Change Pitch"
+msgstr "ផ្លាស់ប្តូរ​កម្ពស់​សំឡេង"
+
+#: effects/ChangePitch.cpp:247
+msgid "Change Pitch without Changing Tempo"
+msgstr "ផ្លាស់ប្តូរ​កម្ពស់​សំឡេង​ដោយ​មិន​ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង"
+
+#: effects/ChangePitch.cpp:252 effects/ChangeSpeed.cpp:304
+#: effects/ChangeTempo.cpp:180
+msgid "by Vaughan Johnson && Dominic Mazzoni"
+msgstr "ដោយ Vaughan Johnson និង Dominic Mazzoni"
+
+#: effects/ChangePitch.cpp:257 effects/ChangeTempo.cpp:185
+msgid "using SoundTouch, by Olli Parviainen"
+msgstr "ប្រើប្រាស់​ SoundTouch ដោយ Olli Parviainen"
+
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:304
+msgid "Semitones (half-steps):"
+msgstr "សំឡេង​ពាក់​កណ្តាល (ជំហាន​ពាក់​កណ្តាល) ៖"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289 effects/ChangePitch.cpp:335
+#: effects/ChangeSpeed.cpp:368 effects/ChangeTempo.cpp:239
+#: effects/ChangeTempo.cpp:270
+msgid "to"
+msgstr "ទៅ"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
+
+#: effects/ChangePitch.cpp:358 effects/ChangeSpeed.cpp:322
+#: effects/ChangeTempo.cpp:198
+msgid "Percent Change:"
+msgstr "ភាគរយ​ផ្លាស់ប្តូរ ៖"
+
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
+#: effects/ChangePitch.h:31
+msgid "Change Pitch..."
+msgstr "ផ្លាស់ប្តូរ​​កម្ពស់​​សំឡេង..."
+
+#: effects/ChangePitch.h:39
+msgid "Changing Pitch"
+msgstr "ផ្លាស់ប្តូរ​​កម្ពស់​​សំឡេង"
+
+#: effects/ChangeSpeed.cpp:53 effects/ChangeTempo.cpp:55
+#, c-format
+msgid "Applied effect: %s %.1f%%"
+msgstr "អនុវត្ត​បែបផែន ៖ %s %.1f%%"
+
+#: effects/ChangeSpeed.cpp:60
+msgid "Change Speed"
+msgstr "ផ្លាស់ប្តូរ​ល្បឿន"
+
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:355
+msgid "n/a"
+msgstr "មិនមាន"
+
+#: effects/ChangeSpeed.cpp:299
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "ផ្លាស់ប្តូរ​ល្បឿន​ប៉ះពាល់​ទាំង​ចង្វាក់​ភ្លេង និង​កម្ពស់​សំឡេង"
+
+#: effects/ChangeSpeed.cpp:309
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "ប្រើ​អត្រា​គំរូ​ដោយ Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.h:32
+msgid "Change Speed..."
+msgstr "ផ្លាស់ប្តូរ​ល្បឿន..."
+
+#: effects/ChangeSpeed.h:40
+msgid "Changing Speed"
+msgstr "កំពុង​ផ្លាស់ប្តូរ​ល្បឿន"
+
+#: effects/ChangeTempo.cpp:74
+msgid "Change Tempo"
+msgstr "ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង"
+
+#: effects/ChangeTempo.cpp:175
+msgid "Change Tempo without Changing Pitch"
+msgstr "ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង​ដោយ​មិន​ផ្លាស់ប្តូរ​កម្ពស់​សំឡេង"
+
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.h:35
+msgid "Change Tempo..."
+msgstr "ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង..."
+
+#: effects/ChangeTempo.h:43
+msgid "Changing Tempo"
+msgstr "កំពុង​ផ្លាស់ប្តូរ​ចង្វាក់​ភ្លេង"
+
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
+msgstr "យក​ក្លីកចេញ"
+
+#: effects/ClickRemoval.cpp:330
+msgid "Click and Pop Removal by Craig DeForest"
+msgstr "ការ​យក​ក្លីក និង​​ផប់​ចេញ​ដោយ Craig DeForest"
+
+#: effects/ClickRemoval.cpp:344
+msgid "Select threshold (lower is more sensitive):"
+msgstr "ជ្រើស​កម្រិត​​ពន្លឺ (កាន់​តែ​ទាប​ កាន់​តែ​​ប្រសើរ) ៖"
+
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:356
+msgid "Max spike width (higher is more sensitive):"
+msgstr "ទទឹង​ spike អតិបរមា (កាន់​តែ​ខ្ពស់​ កាន់​តែ​ប្រសើរ) ៖"
+
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
+#: effects/ClickRemoval.h:42
+msgid "Click Removal..."
+msgstr "យក​ក្លីក​ចេញ..."
+
+#: effects/ClickRemoval.h:50
+msgid "Removing clicks and pops..."
+msgstr "កំពុង​យក​ក្លីក និង​ផប់​ចេញ..."
+
+#: effects/Compressor.cpp:73
+msgid "Dynamic Range Compressor"
+msgstr "ឧបករណ៍​បង្ហាប់​ជួរ​ថាមវន្ត"
+
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
+msgstr "​ពេល​វេលា​វាយ ៖"
+
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
+#: effects/Compressor.cpp:504
+msgid "Normalize to 0dB after compressing"
+msgstr "ធ្វើឲ្យ​ទៅ​ជា 0dB ធម្មតាម​បន្ទាប់​ពី​ក​បង្ហាប់​"
+
+#: effects/Compressor.cpp:563
+#, c-format
+#, fuzzy
+msgid "Threshold %d dB"
+msgstr "កម្រិត​ពន្លឺ ៖ %d dB"
+
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
+msgstr "ពេល​វេលា​វាយ ៖ %.1f វិនាទី"
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr ""
+
+#: effects/Compressor.h:36
+msgid "Compressor..."
+msgstr "ឧបករណ៍​បង្ហាប់..."
+
+#: effects/Compressor.h:44
+msgid "Applying Dynamic Range Compression..."
+msgstr "កំពុង​​អនុវត្ត​​ការ​​បង្ហាប់​​ជួរ​​ថាមវន្ត..."
+
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:190
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:277 effects/Contrast.cpp:288 effects/Contrast.cpp:371
+#: effects/Contrast.cpp:415
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:318
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:321
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:330 toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "ចាប់ផ្ដើម"
+
+#: effects/ToneGen.cpp:331 toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:141 toolbars/SelectionBar.cpp:242
+msgid "End"
+msgstr "ចុង"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:335
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:378
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:426
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:430
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr "កំណត់​ឡើង​វិញ"
+
+#: effects/Contrast.cpp:434
+msgid "Difference:"
+msgstr ""
+
+#: AboutDialog.cpp:275
+msgid "Information"
+msgstr "ព័ត៌មាន"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "ត្រួតពិនិត្យ"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:466 effects/Contrast.cpp:472 effects/Contrast.cpp:478
+#: effects/Contrast.cpp:484
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:517 effects/Contrast.cpp:527
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:532
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:534
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr ""
+
+#: effects/DtmfGen.cpp:47
+msgid "DTMF Tone Generator"
+msgstr "កម្មវិធី​​បង្កើត​​​សំឡេង DTMF"
+
+#: effects/DtmfGen.cpp:397
+msgid "by Salvo Ventura (2006)"
+msgstr "ដោយ Salvo Ventura (២០០៦)"
+
+#: effects/DtmfGen.cpp:401
+msgid "DTMF sequence:"
+msgstr "លំដាប់ DTMF ៖"
+
+#: effects/ToneGen.cpp:298 effects/ToneGen.cpp:334
+msgid "Amplitude (0-1)"
+msgstr "អាំភ្លី (០-១)"
+
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
+
+#: effects/DtmfGen.cpp:422
+msgid "Tone/silence ratio:"
+msgstr "សមាមាត្រ​​​សំឡេង/ស្ងាត់ ៖"
+
+#: effects/DtmfGen.cpp:433
+msgid "Duty cycle:"
+msgstr "ខួបមុខងារ ៖"
+
+#: effects/DtmfGen.cpp:435
+msgid "Tone duration:"
+msgstr "ថិរវេលា​​សំឡេង ៖"
+
+#: effects/DtmfGen.cpp:436 effects/DtmfGen.cpp:438 effects/DtmfGen.cpp:512
+#: effects/DtmfGen.cpp:513
+msgid "ms"
+msgstr "មីល្លីវិនាទី"
+
+#: effects/DtmfGen.cpp:437
+msgid "Silence duration:"
+msgstr "ថិរវេលាស្ងាត់ ៖"
+
+#: effects/DtmfGen.h:41
+msgid "DTMF Tones..."
+msgstr "សំឡេង DTMF..."
+
+#: effects/DtmfGen.h:49
+#, c-format
+msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
+msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ បង្កើតសំឡេង DTMF , %.6lf វិនាទី"
+
+#: effects/DtmfGen.h:53
+msgid "Generating DTMF tones"
+msgstr "​បង្កើត​​សំឡេង DTMF"
+
+#: effects/Echo.cpp:48
+#, c-format
+msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
+msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s ពន្យារ = %f វិនាទី កត្តា​បន្ថយ = %f"
+
+#: effects/Echo.cpp:163
+msgid "Echo"
+msgstr "អេកូ"
+
+#: effects/Echo.cpp:186
+msgid "by Dominic Mazzoni && Vaughan Johnson"
+msgstr "ដោយ Dominic Mazzoni និង Vaughan Johnson"
+
+#: effects/Echo.cpp:198
+msgid "Delay time (seconds):"
+msgstr "ពេលវេលា​ពន្យារ (វិនាទី) ៖"
+
+#: effects/Echo.cpp:203
+msgid "Decay factor:"
+msgstr "កត្តា​បន្ថយ ៖"
+
+#: effects/Echo.h:34
+msgid "Echo..."
+msgstr "អេកូ..."
+
+#: effects/Echo.h:42
+msgid "Performing Echo"
+msgstr "អនុវត្ត​អេកូ"
+
+#: effects/Effect.cpp:303
+msgid "Preparing preview"
+msgstr "រៀបចំការ​​មើល​ជា​មុន"
+
+#: effects/Effect.cpp:329
+msgid "Previewing"
+msgstr "ការ​មើលជា​មុន"
+
+#: effects/Effect.cpp:345
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "កំហុស​​ពេល​​កំពុង​​បើក​​ឧបករណ៍​សំឡេង។ សូម​ត្រួតពិនិត្យ​មើល​ការ​កំណត់​ឧបករណ៍​លទ្ធផល និង​​អត្រា​​គំរូ​​គម្រោង"
+
+#: effects/Effect.h:107
+#, c-format
+msgid "Applied effect: %s"
+msgstr "បែបផែន​ដែលបានអនុវត្ត ៖ %s"
+
+#: effects/Equalization.cpp:300
+msgid "B-spline"
+msgstr "B-spline"
+
+#: effects/Equalization.cpp:300
+msgid "Cosine"
+msgstr "កូស៊ីនុស"
+
+#: effects/Equalization.cpp:300
+msgid "Cubic"
+msgstr "គូប"
+
+#: effects/Equalization.cpp:353 effects/Equalization.cpp:404
+msgid "Equalization"
+msgstr "អេហ្គុយ"
+
+#: effects/Equalization.cpp:959
+msgid "Error loading EQ curve"
+msgstr "កំហុស​​ក្នុង​ការ​ផ្ទុក​​ខ្សែ​កោង EQ"
+
+#: effects/Equalization.cpp:998
+msgid "custom"
+msgstr "ផ្ទាល់​ខ្លួន"
+
+#: effects/Equalization.cpp:1064
+msgid "Equalization, by Martyn Shaw && Mitch Golden"
+msgstr "អេហ្គុយ​ដោយ Martyn Shaw និង Mitch Golden"
+
+#: effects/Equalization.cpp:1085
+msgid "Max dB"
+msgstr "dB អតិបរមា"
+
+#: effects/Equalization.cpp:1087
+msgid "Min dB"
+msgstr "dB អប្បបរមា"
+
+#: effects/Equalization.cpp:1160
+msgid "kHz"
+msgstr "kHz"
+
+#: effects/Equalization.cpp:1177
+msgid "Draw curves"
+msgstr "គូរ​ខ្សែ​កោង"
+
+#: effects/Equalization.cpp:1182
+msgid "Graphic EQ"
+msgstr "ក្រាហ្វិក EQ"
+
+#: effects/Equalization.cpp:1196
+msgid "Linear frequency scale"
+msgstr "មាត្រដ្ឋាន​ប្រេកង់​លីនេអ៊ែរ"
+
+#: effects/Equalization.cpp:1205
+msgid "Length of filter:"
+msgstr "ប្រវែង​តម្រង ៖"
+
+#: effects/Equalization.cpp:1226
+msgid "Select curve:"
+msgstr "ជ្រើស​ខ្សែ​កោង ៖"
+
+#: effects/Equalization.cpp:1236 effects/Equalization.cpp:2399
+msgid "Save As..."
+msgstr "រក្សាទុក​ជា..."
+
+#: effects/Equalization.cpp:1242
+msgid "Flat"
+msgstr "រាបស្មើ"
+
+#: effects/Equalization.cpp:2398
+msgid "Enter the desired name of the curve"
+msgstr "បញ្ចូល​ឈ្មោះ​ខ្សែ​កោង​ដែល​ចង់​បាន"
+
+#: effects/Equalization.cpp:2498
+msgid "Confirm Deletion"
+msgstr "អះអាង​ការលុប"
+
+#: effects/Equalization.h:87
+msgid "Equalization..."
+msgstr "អេហ្គុយ..."
+
+#: effects/Equalization.h:95
+msgid "Performing Equalization"
+msgstr "អនុវត្ត​អេហ្គុយ"
+
+#: effects/Fade.h:24
+msgid "Fade In"
+msgstr "ផុសចេញ"
+
+#: effects/Fade.h:32
+msgid "Fading In"
+msgstr "កំពុងផុសចេញ"
+
+#: effects/Fade.h:48
+msgid "Fade Out"
+msgstr "ផតចុះ"
+
+#: effects/Fade.h:56
+msgid "Fading Out"
+msgstr "កំពុង​ផតចុះ"
+
+#: effects/FindClipping.cpp:49
+msgid "Detect clipping"
+msgstr "រកឃើញការ​ខ្ទាស់"
+
+#: effects/FindClipping.cpp:86
+msgid "Clipping"
+msgstr "ខ្ទាស់"
+
+#: effects/FindClipping.cpp:199
+msgid "Find Clipping"
+msgstr "រក​កា​ខ្ទាស់"
+
+#: effects/FindClipping.cpp:210
+msgid "by Leland Lucius"
+msgstr "ដោយ Leland Lucius"
+
+#: effects/FindClipping.cpp:222
+msgid "Start threshold (samples):"
+msgstr "កម្រិត​ពន្លឺ​ចាប់ផ្ដើម (គំរូ) ៖"
+
+#: effects/FindClipping.cpp:226
+msgid "Stop threshold (samples):"
+msgstr "កម្រិត​ពន្លឺ​បញ្ចប់ (គំរូ) ៖"
+
+#: effects/FindClipping.cpp:250
+msgid "Start and stop must be greater than 0."
+msgstr ""
+
+#: effects/FindClipping.h:37
+msgid "Find Clipping..."
+msgstr "រក​ការ​ខ្ទាស់..."
+
+#: effects/FindClipping.h:47
+msgid "Detecting clipping"
+msgstr "រក​ឃើញ​កា​រខ្ទាស់"
+
+#: effects/Invert.h:27
+msgid "Invert"
+msgstr "ដាក់​បញ្ច្រាស"
+
+#: effects/Invert.h:35
+msgid "Inverting"
+msgstr "ការ​ដាក់​បញ្ច្រាស"
+
+#: effects/Leveller.cpp:129
+msgid "Leveller"
+msgstr "Leveller"
+
+#: effects/Leveller.cpp:47
+msgid "None-Skip"
+msgstr "មិន​រំលង"
+
+#: effects/Leveller.cpp:47
+msgid "Light"
+msgstr "ស្រាល"
+
+#: effects/Leveller.cpp:47
+msgid "Moderate"
+msgstr "ល្មម"
+
+#: effects/Leveller.cpp:47
+msgid "Heavy"
+msgstr "ធ្ងន់"
+
+#: effects/Leveller.cpp:47
+msgid "Heavier"
+msgstr "ធ្ងន់​ជាង"
+
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
+msgstr "ធ្ងន់​បំផុត"
+
+#: effects/TruncSilence.cpp:328
+msgid "by Lynn Allan"
+msgstr "ដោយ Lynn Allan"
+
+#: effects/Leveller.cpp:219 effects/Leveller.cpp:224
+msgid "Degree of Leveling"
+msgstr "កម្រិត​នៃ Leveling"
+
+#: effects/Leveller.cpp:228
+msgid "Degree of Leveling:"
+msgstr ""
+
+#: effects/Leveller.cpp:235
+msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
+msgstr "កម្រិត​ពន្លឺ​ការរំខាន (Hiss/Hum/Ambient Noise)"
+
+#: effects/Leveller.cpp:240
+#, fuzzy
+msgid "Threshold for Noise:"
+msgstr "កម្រិត​​ពន្លឺ​​សម្រាប់​​ការ​រំខាន ៖"
+
+#: effects/Leveller.h:28
+msgid "Leveller..."
+msgstr "Leveller..."
+
+#: effects/Leveller.h:36
+msgid "Applying Leveller..."
+msgstr "កំពុង​​អនុវត្ត​ Leveller..."
+
+#: effects/LoadEffects.cpp:103
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:105
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:107
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:109
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:111
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:113
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "ឧបករណ៍​លាយ"
+
+#: effects/LoadEffects.cpp:117
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:119
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:121
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:123
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "ឧបករណ៍​កំណត់​ដំណាក់កាល"
+
+#: effects/LoadEffects.cpp:127
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:129
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:131
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:133
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:135
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:137
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:139
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:141
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:143
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:145
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:147
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:149
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:151
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:153
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:155
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:157
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:159
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:161
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:163
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:165
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:167
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:715
+msgid "Noise Removal"
+msgstr "ការ​​យក​ការ​​រំខាន​​ចេញ"
+
+#: effects/LoadEffects.cpp:202
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:204
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:206
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:208
+msgid "Onsets"
+msgstr ""
+
+#: effects/Noise.cpp:37
+msgid "White"
+msgstr "ពណ៌ស"
+
+#: effects/Noise.cpp:38
+msgid "Pink"
+msgstr "ពណ៌ផ្កាឈូក"
+
+#: effects/Noise.cpp:39
+msgid "Brown"
+msgstr "ពណ៌ត្នោត"
+
+#: effects/Noise.cpp:41
+msgid "Noise Generator"
+msgstr "ឧបករណ៍​​បង្កើត​​ការ​រំខាន"
+
+#: effects/Noise.cpp:246
+msgid "Noise type"
+msgstr "ប្រភេទ​ការរំខាន"
+
+#: effects/Noise.h:41
+msgid "Noise..."
+msgstr "ការ​រំខាន..."
+
+#: effects/Noise.h:49
+#, c-format
+msgid "Applied effect: Generate Noise, %.6lf seconds"
+msgstr "អនុវត្ត​បែបផែន ៖ បង្កើត​ការ​រំខាន %.6lf វិនាទី"
+
+#: effects/Noise.h:53
+msgid "Generating Noise"
+msgstr "បង្កើត​ការ​រំខាន"
+
+#: effects/NoiseRemoval.cpp:192
+#, c-format
+msgid "Could not open file:\n"
+"  %s"
+msgstr "មិន​អាច​បើក ៖\n"
+"  %s"
+
+#: effects/NoiseRemoval.cpp:275
+msgid "Attempt to run Noise Removal without a noise profile.\n"
+msgstr "ប៉ុនប៉ង​​រត់​​ការ​​យក​​ការ​​រំខាន​​ចេញ​​ដោយ​គ្មាន​ទម្រង់​ការ​រំខាន ។\n"
+
+#: effects/NoiseRemoval.cpp:804
+msgid "Step 1"
+msgstr "ជំហាន​ ១"
+
+#: effects/NoiseRemoval.cpp:805
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
+"then click Get Noise Profile:"
+msgstr "ជ្រើស​​វិនាទី​ខ្លះ​​របស់​​ការ​រំខាន ដូច្នេះ Audacity អាច​ដឹង​ថា​អ្វី​ដែល​ត្រូវ​ត្រង​ចេញ បន្ទាប់​មក​ចុច​យក​ទម្រង់​ការ​រំខាន ៖"
+
+#: effects/NoiseRemoval.cpp:806
+msgid "Step 2"
+msgstr "ជំហាន ២"
+
+#: effects/NoiseRemoval.cpp:807
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
+"filtered out, and then click 'OK' to remove noise.\n"
+msgstr "ជ្រើស​អូឌីយ៉ូ​ទាំងអស់​ដែល​អ្នក​ចង់​ត្រង​​ ជ្រើស​​ចំនួន​​ការ​រំខាន​ដែល​អ្នក​ចង់​ត្រង​ចេញ បន្ទាប់​មក​ចុច​ 'យល់ព្រម' ដើម្បី​យក​​ការ​​រំខាន​ចេញ ។\n"
+
+#: effects/NoiseRemoval.cpp:812
+msgid "Noise Removal by Dominic Mazzoni"
+msgstr "ការ​យក​​​ការ​រំខាន​​ចេញ​​ដោយ Dominic Mazzoni"
+
+#: effects/NoiseRemoval.cpp:820
+msgid "Get Noise Profile"
+msgstr "យក​ទម្រង់​ការ​រំខាន"
+
+#: effects/NoiseRemoval.cpp:831
+msgid "Noise reduction (dB):"
+msgstr "បន្ថយ​ការ​រំខាន (dB) ៖"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:839
+msgid "Frequency smoothing (Hz):"
+msgstr "ធ្វើ​ឲ្យ​ប្រេកង់​រលូន (Hz) ៖"
+
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:847
+msgid "Attack/decay time (secs):"
+msgstr "ពេល​វេលា​វាយ/បន្ថយ (វិនាទី) ៖"
+
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
+msgid "Noise Removal..."
+msgstr "ការយក​ការរំខាន​ចេញ..."
+
+#: effects/NoiseRemoval.h:44
+msgid "Creating Noise Profile"
+msgstr "បង្កើត​ទម្រង់​ការ​រំខាន"
+
+#: effects/NoiseRemoval.h:46
+msgid "Removing Noise"
+msgstr "​យក​ការ​រំខាន​ចេញ"
+
+#: effects/Normalize.cpp:68
+#, c-format
+msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
+msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s យក​អុហ្វសិត dc = %s​ ចេញ ធ្វើ​ឲ្យ​អាំភ្លី​ធម្មតា = %s"
+
+#: effects/Normalize.cpp:70 effects/Normalize.cpp:71
+msgid "false"
+msgstr "មិនពិត"
+
+#: effects/Normalize.cpp:70 effects/Normalize.cpp:71
+msgid "true"
+msgstr "ពិត"
+
+#: effects/Normalize.cpp:73
+#, c-format
+msgid ", maximum amplitude = %.1f dB"
+msgstr " អាំភ្លី​អតិបរមា = %.1f dB"
+
+#: effects/Normalize.cpp:109
+msgid "Normalize"
+msgstr "ធ្វើ​​ឲ្យ​ធម្មតា"
+
+#: effects/Normalize.cpp:351
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
+
+#: effects/Normalize.cpp:354
+#, fuzzy
+msgid "Normalize maximum amplitude to:"
+msgstr "ធ្វើ​ឲ្យ​អាំភ្លី​អតិបរមា​ធម្មតា​ទៅ"
+
+#: effects/Normalize.cpp:350
+msgid "-"
+msgstr "-"
+
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:32
+msgid "Normalize..."
+msgstr "ធ្វើ​ឲ្យ​ធម្មតា..."
+
+#: effects/Normalize.h:41
+msgid "Normalizing..."
+msgstr "កំពុង​ធ្វើ​ឲ្យ​ធម្មតា..."
+
+#: effects/Phaser.cpp:65
+#, c-format
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s %d ដំណាក់កាល %.0f%% wet ប្រេកង់ = %.1f Hz ដំណាក់កាល​ចាប់ផ្ដើម = %.0f deg ជម្រៅ = %d មតិយោបល់ = %.0f%%"
+
+#: effects/Phaser.cpp:222
+msgid "Stages:"
+msgstr "ដំណាក់កាល ៖"
+
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
+
+#: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
+msgid "LFO Frequency (Hz):"
+msgstr "ប្រេកង់ LFO (Hz) ៖"
+
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
+#: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
+msgid "LFO Start Phase (deg.):"
+msgstr "ដំណាក់​ចាប់ផ្តើម LFO (deg.) ៖"
+
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
+#: effects/Phaser.cpp:296
+msgid "Depth:"
+msgstr "ជម្រៅ ៖"
+
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
+#: effects/Phaser.cpp:312
+msgid "Feedback (%):"
+msgstr "មតិ​អ្នកប្រើ (%) ៖"
+
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
+#: effects/Phaser.h:38
+msgid "Phaser..."
+msgstr "ឧបករណ៍​កំណត់​ដំណាក់កាល..."
+
+#: effects/Phaser.h:46
+msgid "Applying Phaser"
+msgstr "កំពុង​អនុវត្ត​ដំណាក់កាល"
+
+#: effects/Repair.cpp:94
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+"\n"
+"Zoom in and select a tiny fraction of a second to repair."
+msgstr "ជួសជុល​បែបផែន​ដែល​មាន​បំណង​ត្រូវ​ប្រើ​នៅ​លើ​ផ្នែក​ខ្លី​បំផុត​របស់​អូឌីយ៉ូ​ដែល​ខូច (រហូត​ដល់ ១២៨ គំរូ) ។\n"
+"\n"
+"ពង្រីក និង​ជ្រើស​ប្រភាគ​តូច​នៃ​ទីពីរ​ដើម្បី​ជួសជុល ។"
+
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
+#: effects/Repair.h:37
+msgid "Repairing damaged audio"
+msgstr "ជួសជុល​អូឌីយ៉ូ​ដែល​ខូច"
+
+#: effects/Repeat.cpp:49
+#, c-format
+msgid "Repeated %d times"
+msgstr "បាន​ធ្វើ​ឡើងវិញ %d ដង"
+
+#: effects/Repeat.cpp:75
+msgid "Tracks are too long to repeat the selection."
+msgstr "ដាន​វែងពេក​ដើម្បី​ធ្វើ​កា​រជ្រើស​ឡើង​វិញ ។"
+
+#: effects/Repeat.cpp:76 effects/Repeat.cpp:80
+msgid "Repeat"
+msgstr "ធ្វើ​​ម្ដង​​ទៀត"
+
+#: effects/Repeat.cpp:211
+#, fuzzy
+msgid "Number of times to repeat:"
+msgstr "ចំនួន​ដង​ដើម្បី​ធ្វើ​ម្តង​ទៀត ៖"
+
+#: effects/Repeat.cpp:220
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
+#: effects/Repeat.cpp:190 effects/Repeat.cpp:220
+msgid "New selection length: "
+msgstr "ប្រវែងជម្រើស​ថ្មី ៖"
+
+#: widgets/TimeTextCtrl.cpp:202
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
+
+#: effects/Repeat.h:32
+msgid "Repeat..."
+msgstr "ធ្វើ​​ម្ដង​ទៀត..."
+
+#: effects/Repeat.h:40
+msgid "Performing Repeat"
+msgstr "អនុវត្ត​ការ​​ធ្វើ​ម្តង​ទៀត"
+
+#: effects/Reverse.h:30
+msgid "Reverse"
+msgstr "ដាក់​បញ្ច្រាស"
+
+#: effects/Reverse.h:38
+msgid "Reversing"
+msgstr "កំពុង​​ដាក់​បញ្ច្រាស"
+
+#: effects/Silence.cpp:32
+msgid "Silence Generator"
+msgstr "កម្មវិធី​បង្កើត​ស្ងាត់ៗ"
+
+#: effects/Silence.h:34
+msgid "Silence..."
+msgstr "ស្ងាត់..."
+
+#: effects/Silence.h:42
+msgid "Generating Silence"
+msgstr "កំពុង​បង្កើត​ស្ងាត់ៗ"
+
+#: effects/Silence.h:47
+#, c-format
+msgid "Applied effect: Generate Silence, %.6lf seconds"
+msgstr "បែបផែន​ដែល​បាន​​អនុវត្ត ៖ បង្កើត​ស្ងាត់ៗ %.6lf វិនាទី"
+
+#: effects/SimplePairedTwoTrack.h:120
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "សូម​អភ័យទោស បែបផែន​នេះ​មិន​អាច​ត្រូវ​បាន​​អនុវត្ត​លើ​បទ​ស្តេរ៉េអូ ដែល​ឆានែល​នីមួយៗ​របស់​បទ​មិន​ផ្គូផ្គង​គ្នា ។"
+
+#: effects/SpikeCleaner.cpp:69
+msgid "Spike Cleaner"
+msgstr "ឧបករណ៍​ជម្រះ Spike"
+
+#: effects/SpikeCleaner.cpp:160
+msgid "SpikeCleaner by Lynn Allan"
+msgstr "ឧបករណ៍​ជម្រះ Spike ដោយ Lynn Allan"
+
+#: effects/SpikeCleaner.cpp:165
+msgid "Max Spike Duration (milliseconds): \n"
+"(99999 or greater is off)"
+msgstr "ថិរវេលា Spike អតិបរមា (មីល្លីវិនាទី) ៖ \n"
+"(៩៩៩៩៩ ឬ​ធំ​ជាង​នេះ​គឺ​បិទ)"
+
+#: effects/SpikeCleaner.cpp:178
+msgid "Theshold for silence: "
+msgstr "កម្រិត​ពន្លឺ​សម្រាប់​ស្ងាត់ៗ ៖"
+
+#: effects/SpikeCleaner.h:27
+msgid "Spike Cleaner..."
+msgstr "ឧបករណ៍​ជម្រះ Spike..."
+
+#: effects/SpikeCleaner.h:35
+msgid "Applying Spike Cleaner..."
+msgstr "កំពុង​អនុវត្ត​ឧបករណ៍​ជម្រះ Spike..."
+
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "ស្តេរីអូ​ទៅ​ជា​ម៉ូណូ"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
+msgstr "អនុវត្ត​ស្តេរ៉េអូ​ទៅជា​​ម៉ូណូ"
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:59
+#, c-format
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ បង្កើត %s រលក %s ប្រេកង់ = %.2f Hz អាំភ្លី = %.2f, %.6lf វិនាទី"
+
+#: widgets/Meter.cpp:362
+msgid "Linear"
+msgstr "លីនេអ៊ែរ"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
+#: effects/ToneGen.cpp:66
+msgid "Chirp Generator"
+msgstr "ឧបករណ៍​​បង្កើត Chirp"
+
+#: effects/ToneGen.cpp:66
+msgid "Tone Generator"
+msgstr "ឧបករណ៍​បង្កើត​សំឡេង"
+
+#: effects/ToneGen.cpp:67
+msgid "Sine"
+msgstr "ស៊ីនុស"
+
+#: effects/ToneGen.cpp:68
+msgid "Square"
+msgstr "ការេ"
+
+#: effects/ToneGen.cpp:69
+msgid "Sawtooth"
+msgstr "ធ្មេញ​រណារ"
+
+#: effects/ToneGen.cpp:70
+msgid "Square, no alias"
+msgstr "ការេ គ្មាន​​ឈ្មោះ​ក្លែងក្លាយ"
+
+#: effects/ToneGen.cpp:297
+msgid "Frequency (Hz)"
+msgstr "ប្រេកង់ (Hz)"
+
+#: effects/ToneGen.cpp:323
+msgid "Waveform:"
+msgstr "ទ្រង់ទ្រាយ​រលក ៖"
+
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:366
+msgid "Interpolation:"
+msgstr ""
+
+#: effects/ToneGen.h:39
+msgid "Chirp..."
+msgstr "Chirp..."
+
+#: effects/ToneGen.h:39
+msgid "Tone..."
+msgstr "សំឡេង..."
+
+#: effects/ToneGen.h:47
+msgid "Generating Chirp"
+msgstr "កំពុង​បង្កើត Chirp"
+
+#: effects/ToneGen.h:47
+msgid "Generating Tone"
+msgstr "កំពុង​បង្កើត​សំឡេង"
+
+#: effects/TruncSilence.cpp:113
+msgid "All tracks must have the same sample rate"
+msgstr "បទ​ទាំងអស់​ត្រូវ​តែ​មាន​អត្រា​គំរូ​ដូចគ្នា"
+
+#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:318
+msgid "Truncate Silence"
+msgstr "កាត់​ស្ងាត់​ឲ្យ​ខ្លី"
+
+#: effects/TruncSilence.cpp:342
+msgid "Max silence duration:"
+msgstr "ថិរវេលា​ស្ងាត់​អតិ. ៖"
+
+#: effects/TruncSilence.cpp:345 prefs/AudioIOPrefs.cpp:190
+#: prefs/AudioIOPrefs.cpp:193
+msgid "milliseconds"
+msgstr "មីល្លីវិនាទី"
+
+#: effects/TruncSilence.cpp:347
+msgid "Threshold for silence:"
+msgstr "កម្រិត​​ពន្លឺ​សម្រាប់​ស្ងាត់ ៖"
+
+#: effects/TruncSilence.cpp:371
+msgid "   Duration must be at least 1 millisecond"
+msgstr "   ថិរវេលា​ត្រូវ​តែ​តិច​បំផុត ១​ មីល្លីវិនាទី"
+
+#: effects/TruncSilence.h:28
+msgid "Truncate Silence..."
+msgstr "កាត់​ស្ងាត់​ឲ្យ​ខ្លី..."
+
+#: effects/TruncSilence.h:36
+msgid "Truncating Silence..."
+msgstr "កំពុង​កាត់​ស្ងាត់​ឲ្យ​ខ្លី..."
+
+#: effects/VST/VSTEffect.cpp:165
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "សូម​អភយទោស បែបផែន VST មិនអាច​ត្រូវ​បាន​អនុវត្ត​នៅ​លើ​បទ​ស្តេរ៉េអូ​បានទេ ដែល​ឆានែល​នីមួយៗ​របស់​បទ​មិនផ្គូផ្គង​គ្នា​ទេ ។"
+
+#: effects/VST/VSTEffect.cpp:180
+msgid "Can't process replacing"
+msgstr "មិនអាច​ដំណើរការ​ជំនួស​បានទេ"
+
+#: effects/VST/VSTEffect.cpp:394
+msgid "VST Plug-in parameters:"
+msgstr "ប៉ារ៉ាម៉ែត្រ​កម្មវិធី​ជំនួយ VST  ៖"
+
+#: effects/Wahwah.cpp:61
+#, c-format
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "បែបផែន​ដែល​បាន​អនុវត្ត ៖ %s ប្រេកង់ = %.1f Hz ដំណាក់កាល​ចាប់ផ្ដើម = %.0f deg ជម្រៅ = %.0f%% ខ្ទរ = %.1f អុហ្វសិត​ប្រេកង់ = %.0f%%"
+
+#: effects/Wahwah.cpp:72
+msgid "Wahwah"
+msgstr "Wahwah"
+
+#: effects/Wahwah.cpp:253
+msgid "Depth (%):"
+msgstr "ជម្រៅ (%) ៖"
+
+#: effects/Wahwah.cpp:269
+msgid "Resonance:"
+msgstr "សំឡេង​ខ្ទរ ៖"
+
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
+#: effects/Wahwah.cpp:285
+msgid "Wah Frequency Offset (%):"
+msgstr "អុហ្វសិតប្រេកង់ Wah (%) ៖"
+
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
+#: effects/Wahwah.h:34
+msgid "Wahwah..."
+msgstr "Wahwah..."
+
+#: effects/Wahwah.h:42
+msgid "Applying Wahwah"
+msgstr "អនុវត្ត Wahwah"
+
+#: effects/audiounits/AudioUnitEffect.cpp:133
+#: effects/ladspa/LadspaEffect.cpp:169
+#, c-format
+msgid "Performing Effect: %s"
+msgstr "អនុវត្ត​បែបផែន ៖ %s"
+
+#: effects/ladspa/LadspaEffect.cpp:189
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "សូម​អភ័យ​ទោស បែបផែន​កម្មវិធី​ជំនួយ​​មិនអាច​ត្រូវ​បាន​អនុវត្ត​នៅ​លើ​បទ​ស្តេរ៉េអូ​បានទេ ដែល​ឆានែល​នីមួយៗ​របស់​បទ​មិនផ្គូផ្គង​គ្នា ។"
+
+#: effects/ladspa/LadspaEffect.cpp:572 effects/ladspa/LadspaEffect.cpp:580
+#: prefs/QualityPrefs.cpp:72
+msgid "None"
+msgstr "គ្មាន"
+
+#: effects/ladspa/LadspaEffect.cpp:574 effects/vamp/VampEffect.cpp:384
+msgid "Author: "
+msgstr "អ្នកនិពន្ធ ៖"
+
+#: effects/ladspa/LadspaEffect.cpp:607
+msgid "Effect Settings"
+msgstr "ការ​កំណត់​បែបផែន"
+
+#: effects/ladspa/LadspaEffect.cpp:698
+msgid "Length (seconds)"
+msgstr "ប្រវែង (វិនាទី)"
+
+#: effects/lv2/LV2Effect.cpp:850 effects/lv2/LV2Effect.cpp:853
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:861 effects/lv2/LV2Effect.cpp:864
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:872 effects/lv2/LV2Effect.cpp:875
+msgid "Note key"
+msgstr ""
+
+#: effects/nyquist/Nyquist.cpp:252
+msgid "Applying Nyquist Effect..."
+msgstr "អនុវត្ត​បែបផែន Nyquist..."
+
+#: effects/nyquist/Nyquist.cpp:259 effects/nyquist/Nyquist.cpp:321
+msgid "Nyquist Prompt..."
+msgstr "ប្រអប់​​បញ្ចូល Nyquist..."
+
+#: effects/nyquist/Nyquist.cpp:322
+msgid "Enter Nyquist Command: "
+msgstr "បញ្ចូល​ពាក្យបញ្ជា Nyquist ៖"
+
+#: effects/nyquist/Nyquist.cpp:411
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "សូម​អភ័យទោស មិនអាច​អនុវត្ត​បែបផែន​លើ​បទ​ស្តេរ៉េអូ​បានទេ ដែល​បទ​មិនផ្គូផ្គង​គ្នា ។"
+
+#: effects/nyquist/Nyquist.cpp:438
+msgid "Nyquist"
+msgstr "Nyquist"
+
+#: effects/nyquist/Nyquist.cpp:439
+msgid "Nyquist Output: "
+msgstr "លទ្ធផល Nyquist ៖ "
+
+#: effects/nyquist/Nyquist.cpp:593 effects/nyquist/Nyquist.cpp:604
+msgid "Nyquist returned the value:"
+msgstr "Nyquist បាន​ត្រឡប់​តម្លៃ ៖"
+
+#: effects/nyquist/Nyquist.cpp:646
+msgid "Nyquist did not return audio.\n"
+msgstr "Nyquist មិន​បាន​ត្រឡប់​អូឌីយ៉ូ ។\n"
+
+#: effects/nyquist/Nyquist.cpp:657
+msgid "Nyquist returned too many audio channels.\n"
+msgstr "Nyquist បាន​ត្រឡប់​ឆានែល​អូឌីយ៉ូ​ច្រើន​ពេក ។\n"
+
+#: effects/vamp/VampEffect.cpp:75
+#, c-format
+msgid "Extracting features: %s"
+msgstr "​ស្រង់​លក្ខណៈ​ពិសេស​ចេញ ៖ %s"
+
+#: effects/vamp/VampEffect.cpp:106
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "សូម​អភ័យ​ទោស កម្មវិធី​ជំនួយ Vamp មិនអាចត្រូវ​បាន​រត់​នៅ​លើបទ​ស្តេរ៉េអូ​បានទេ ដែល​ឆានែល​នីមួយ​របស់​បទ​មិនផ្គូផ្គង​គ្នា ។"
+
+#: effects/vamp/VampEffect.cpp:120
+msgid "Sorry, failed to load Vamp Plug-in."
+msgstr "សូម​អភ័យ​ទោស បាន​បរាជ័យ​ក្នុងការ​ផ្ទុក​កម្មវិធី​ជំនួយ Vamp ។"
+
+#: effects/vamp/VampEffect.cpp:228
+msgid "Sorry, Vamp Plug-in failed to initialize."
+msgstr "សូម​អភ័យ​ទោស កម្មវិធី​ជំនួយ Vamp បាន​បរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម ។"
+
+#: effects/vamp/VampEffect.cpp:376
+msgid " - Vamp audio analysis plugin"
+msgstr " - កម្មវិធី​ជំនួយ​វិភាគ​អូឌីយ៉ូ​ Vamp"
+
+#: effects/vamp/VampEffect.cpp:423
+msgid "Plugin Settings"
+msgstr "ការ​កំណត់​កម្មវិធី​ជំនួយ"
+
+#: effects/vamp/VampEffect.cpp:446
+msgid "Program"
+msgstr "កម្មវិធី"
+
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:445
+msgid "Export File"
+msgstr "នាំ​ឯកសារ​ចេញ"
+
+#: export/Export.cpp:453
+msgid "&Options..."
+msgstr "ជម្រើស..."
+
+#: export/Export.cpp:479
+msgid "Are you sure you want to save the file as \""
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​រក្សា​ទុក​ឯកសារ​នេះ​ជា \""
+
+#: export/Export.cpp:495
+#, c-format
+msgid "You are about to save a %s file with the name \"%s\".\n"
+"\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
+"\n"
+"Are you sure you want to save the file under this name?"
+msgstr "អ្នក​រៀបនឹង​រក្សាទុក​ឯកសារ %s ដោយ​ដាក់​ឈ្មោះ \"%s\" ។\n"
+"\n"
+"តាម​ធម្មតា ឯកសារ​ទាំងនេះ​បញ្ចប់ដោយ \".%s\", និង​កម្មវិធី​មួយ​ចំនួន​នឹង​មិន​បើក​ឯកសារជា​មួយ​ផ្នែកបន្ថែម​ដែល​គ្មាន​ស្តង់ដារ​ទេ ។\n"
+"\n"
+"តើ​អ្នក​ប្រាកដ​ជា​ចង់​រក្សាទុក​ឯកសារ​ដោយ​ដាក់​ឈ្មោះ​នេះ​ឬ ?"
+
+#: export/Export.cpp:516
+#, c-format
+msgid "A file named \"%s\" already exists.  Replace?"
+msgstr "មាន​ឯកសារ​ដែល​មាន​ឈ្មោះ \"%s\" រួច​ហើយ ។ ជំនួសវា​ឬ ?"
+
+#: export/Export.cpp:598
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "បទ​របស់​អ្នក​នឹង​ត្រូវ​បាន​លាយ​ជា​ឆានែល​ស្តេរ៉េអូ​ពីរ​នៅ​ក្នុង​ឯកសារ​ដែល​បាន​នាំចេញ ។"
+
+#: export/Export.cpp:603
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "បទ​របស់​អ្នក​នឹង​ត្រូវ​បាន​លាយ​ជា​ឆានែល​ម៉ូណូ​តែ​មួយ​នៅ​ក្នុង​ឯកសារ​ដែល​បាន​នាំចេញ ។"
+
+#: export/Export.cpp:613
+msgid "Advanced Mixing Options"
+msgstr "ជម្រើស​លាយ​កម្រិត​ខ្ពស់"
+
+#: export/Export.cpp:815
+#, c-format
+msgid "Channel: %2d"
+msgstr "ឆានែល ៖ %2d"
+
+#: export/Export.cpp:938
+msgid " - Left"
+msgstr " - ឆ្វេង"
+
+#: export/Export.cpp:939
+msgid " - Right"
+msgstr " - ស្ដាំ"
+
+#: export/Export.cpp:1082
+msgid "Mixer Panel"
+msgstr ""
+
+#: export/Export.cpp:961 export/Export.cpp:1006
+#, c-format
+msgid "Output Channels: %2d"
+msgstr "ឆានែល​លទ្ធផល ៖ %2d"
+
+#: export/ExportCL.cpp:55
+msgid "Specify Command Line Encoder"
+msgstr "បញ្ជាក់​ឧបករណ៍​អ៊ិនកូដ​បន្ទាត់​ពាក្យ​បញ្ជា"
+
+#: export/ExportCL.cpp:70
+msgid "Command Line Export Setup"
+msgstr "រៀបចំ​ការ​នាំចេញ​បន្ទាត់​ពាក្យ​បញ្ជា"
+
+#: export/ExportCL.cpp:75
+msgid "Command:"
+msgstr "ពាក្យបញ្ជា ៖"
+
+#: export/ExportCL.cpp:80
+msgid "Show output"
+msgstr "បង្ហាញ​លទ្ធផល"
+
+#: export/ExportCL.cpp:87
+#, c-format
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "ទិន្នន័យ​នឹង​ត្រូវ​បាន​ដាក់ជា​ស្តង់ដារ​ ​​។ \"%f\" នឹង​ត្រូវ​បាន​ជំនួស​ដោយ​លទ្ធផល​ឈ្មោះ​ឯកសារ​ដែល​បាន​ជ្រើស ។"
+
+#: export/ExportCL.cpp:219
+msgid "(external program)"
+msgstr "(កម្មវិធី​ខាងក្រៅ)"
+
+#: export/ExportCL.cpp:248 export/ExportPCM.cpp:367
+#, c-format
+msgid "Cannot export audio to %s"
+msgstr "មិនអាច​នាំចេញ​អូឌីយ៉ូ​ទៅ %s​ បាន​ទេ"
+
+#: export/ExportCL.cpp:322
+msgid "Exporting the selected audio using command-line encoder"
+msgstr "នាំចេញ​អូឌីយ៉ូ​ដែល​បានជ្រើស​ ដោយ​ប្រើ​អ៊ិនកូឌ័រ​​បន្ទាត់​ពាក្យ​បញ្ជា"
+
+#: export/ExportCL.cpp:323
+msgid "Exporting the entire project using command-line encoder"
+msgstr "កំពុង​នាំចេញ​គម្រោង​ទាំងមូល​ដោយ​ប្រើប្រាស់​អ៊ិនកូឌ័រ​បន្ទាត់​ពាក្យ​បញ្ជា"
+
+#: export/ExportCL.cpp:387
+msgid "Command Output"
+msgstr "លទ្ធផល​ពាក្យបញ្ជា"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:643
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:644
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr "អត្រា​គំរូ​មិន​ត្រឹមត្រូវ"
+
+#: export/ExportFFmpeg.cpp:720
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:723
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr "អ្នក​ប្រហែល​ជា​ប្ដូរ​គុណភាព​ទៅ​អត្រា​ណា​មួយ​ដូច​ខាង​ក្រោម ។"
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr "អត្រា​គំរូ"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:112
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "អត្រា​ប៊ីត ៖"
+
+#: export/ExportFFmpegDialogs.cpp:157
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:168
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:211
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:230
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:275
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:294
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:341
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:360
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:488
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:489
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:795
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:884
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:885
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:886
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:887
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:888
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:889
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "ទ្រង់ទ្រាយ ៖"
+
+#: export/ExportFFmpegDialogs.cpp:896
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:903
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:904
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:906
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:109
+msgid "Language:"
+msgstr "ភាសា ៖"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:921
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:922
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:925
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "គុណភាព ៖"
+
+#: export/ExportFFmpegDialogs.cpp:928
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:930
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:933
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:936
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:952
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:953
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:955
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:956
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:958
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:959
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:961
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:962
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:964
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:967
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:989
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:991
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:992
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1211
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1230
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1270
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "ឯកសារ XML (*.xml)|*.xml|All files (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1290
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
+#: export/ExportFLAC.cpp:68
+msgid "Specify FLAC Options"
+msgstr "បញ្ជាក់​ជម្រើស FLAC"
+
+#: export/ExportFLAC.cpp:82
+msgid "0 (fastest)"
+msgstr "0 (លឿនបំផុត)"
+
+#: export/ExportFLAC.cpp:83
+msgid "1"
+msgstr "១"
+
+#: export/ExportFLAC.cpp:84
+msgid "2"
+msgstr "២"
+
+#: export/ExportFLAC.cpp:85
+msgid "3"
+msgstr "៣"
+
+#: export/ExportFLAC.cpp:86
+msgid "4"
+msgstr "៤"
+
+#: export/ExportFLAC.cpp:87
+msgid "5"
+msgstr "៥"
+
+#: export/ExportFLAC.cpp:88
+msgid "6"
+msgstr "៦"
+
+#: export/ExportFLAC.cpp:89
+msgid "7"
+msgstr "៧"
+
+#: export/ExportFLAC.cpp:90
+msgid "8 (best)"
+msgstr "៨ (ប្រសើរបំផុត)"
+
+#: export/ExportFLAC.cpp:93
+msgid "16 bit"
+msgstr "១៦​​ ប៊ីត"
+
+#: export/ExportFLAC.cpp:94
+msgid "24 bit"
+msgstr "២៤ ប៊ីត"
+
+#: export/ExportFLAC.cpp:98
+msgid "FLAC Export Setup"
+msgstr "រៀបចំការ​​​នាំចេញ FLAC"
+
+#: export/ExportFLAC.cpp:102
+msgid "Level:"
+msgstr "កម្រិត ៖"
+
+#: export/ExportFLAC.cpp:104
+msgid "Bit depth:"
+msgstr "ជម្រៅ​ប៊ីត ៖"
+
+#: export/ExportFLAC.cpp:208
+msgid "FLAC Files"
+msgstr "ឯកសារ FLAC"
+
+#: export/ExportFLAC.cpp:310
+msgid "Exporting the selected audio as FLAC"
+msgstr "កំពុង​នាំ​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស​ចេញ​ជា FLAC"
+
+#: export/ExportFLAC.cpp:311
+msgid "Exporting the entire project as FLAC"
+msgstr "នាំ​គម្រោង​ទាំងមូល​ចេញ​ជា FLAC"
+
+#: export/ExportMP2.cpp:108
+msgid "Specify MP2 Options"
+msgstr "បញ្ជាក់​ជម្រើស MP2"
+
+#: export/ExportMP2.cpp:129
+msgid "MP2 Export Setup"
+msgstr "រៀបចំ​នាំចេញ MP2"
+
+#: export/ExportMP2.cpp:200
+msgid "MP2 Files"
+msgstr "ឯកសារ MP2"
+
+#: export/ExportMP2.cpp:229
+msgid "Cannot export MP2 with this sample rate and bit rate"
+msgstr "មិនអាច​នាំចេញ MP2 ជាមួយ​អត្រា​គំរូ និង​អត្រា​ប៊ីត​នេះ​បាន​ទេ"
+
+#: export/ExportMP2.cpp:243 export/ExportMP3.cpp:1713 export/ExportOGG.cpp:183
+msgid "Unable to open target file for writing"
+msgstr "មិន​អាច​បើក​ឯកសារ​គោលដៅ​សម្រាប់​សរសេរ​បាន​ទេ"
+
+#: export/ExportMP2.cpp:274
+#, c-format
+msgid "Exporting selected audio at %d kbps"
+msgstr "នាំចេញ​អូឌីយ៉ូ​ដែលបាន​ជ្រើស​នៅល្បឿន %d kbps"
+
+#: export/ExportMP2.cpp:275
+#, c-format
+msgid "Exporting entire file at %d kbps"
+msgstr "នាំ​ចេញ​ឯកសារ​ទាំងមូល​នៅ​ល្បឿន %d kbps"
+
+#. i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second
+#: export/ExportMP3.cpp:142 export/ExportMP3.cpp:143 export/ExportMP3.cpp:144
+#: export/ExportMP3.cpp:145 export/ExportMP3.cpp:146 export/ExportMP3.cpp:147
+#: export/ExportMP3.cpp:148 export/ExportMP3.cpp:149 export/ExportMP3.cpp:150
+#: export/ExportMP3.cpp:151 export/ExportMP3.cpp:152 export/ExportMP3.cpp:153
+#: export/ExportMP3.cpp:154 export/ExportMP3.cpp:155 export/ExportMP3.cpp:156
+#: export/ExportMP3.cpp:157 export/ExportMP3.cpp:158 export/ExportMP3.cpp:159
+msgid "kbps"
+msgstr "kbps"
+
+#: export/ExportMP3.cpp:242
+msgid "(Best Quality)"
+msgstr ""
+
+#: export/ExportMP3.cpp:243
+msgid "(Smaller files)"
+msgstr ""
+
+#: export/ExportMP3.cpp:178
+msgid "Fast"
+msgstr "លឿន"
+
+#: export/ExportMP3.cpp:179
+msgid "Standard"
+msgstr "ស្តង់ដារ"
+
+#: export/ExportMP3.cpp:250
+msgid "Insane"
+msgstr ""
+
+#: export/ExportMP3.cpp:251
+msgid "Extreme"
+msgstr ""
+
+#: export/ExportMP3.cpp:253
+msgid "Medium"
+msgstr ""
+
+#: export/ExportMP3.cpp:249
+msgid "Specify MP3 Options"
+msgstr "បញ្ជាក់​ជម្រើស MP3"
+
+#: export/ExportMP3.cpp:264 prefs/FileFormatPrefs.cpp:101
+msgid "MP3 Export Setup"
+msgstr "រៀបចំ​​នាំ​ចេញ MP3"
+
+#: export/ExportMP3.cpp:271
+msgid "Bit Rate Mode:"
+msgstr "របៀប​អត្រា​ប៊ីត ៖"
+
+#: export/ExportMP3.cpp:276
+msgid "Preset"
+msgstr "ការ​​កំណត់ជា​​ស្រេច"
+
+#: export/ExportMP3.cpp:277
+msgid "Variable"
+msgstr "អថេរ"
+
+#: export/ExportMP3.cpp:278
+msgid "Average"
+msgstr "មធ្យម"
+
+#: export/ExportMP3.cpp:279
+msgid "Constant"
+msgstr "ថេរ"
+
+#: prefs/QualityPrefs.cpp:42 prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "គុណភាព"
+
+#: export/ExportMP3.cpp:324
+msgid "Variable Speed:"
+msgstr "ល្បឿន​អថេរ ៖"
+
+#: export/ExportMP3.cpp:331
+msgid "Channel Mode:"
+msgstr "របៀប​ឆានែល ៖"
+
+#: export/ExportMP3.cpp:336
+msgid "Joint Stereo"
+msgstr "ភ្ជាប់​ស្តេរ៉េអូ"
+
+#: export/ExportMP3.cpp:337
+msgid "Stereo"
+msgstr "ស្តេរ៉េអូ"
+
+#: export/ExportMP3.cpp:481
+msgid "Locate Lame"
+msgstr "រក​ទី​តាំង Lame"
+
+#: export/ExportMP3.cpp:501
+#, c-format
+msgid "Audacity needs the file %s to create MP3s."
+msgstr "Audacity ត្រូវ​ការ​ឯកសារ %s ដើម្បី​បង្កើត MP3 ។"
+
+#: export/ExportMP3.cpp:523
+msgid "To get a free copy of Lame, click here -->"
+msgstr "ដើម្បី​យក​ច្បាប់​ថត​ចម្លង Lame ដោយ​ឥត​គិត​ថ្លៃ​ ចុចត្រង់នេះ -->"
+
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
+#: export/ExportMP3.cpp:1038
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "មានតែ lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|ឯកសារទាំងអស់ (*.*)|*"
+
+#: export/ExportMP3.cpp:1493
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "មានតែ libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|ឯកសារទាំងអស់ (*)|*"
+
+#: export/ExportMP3.cpp:1363
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "មានតែ libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|ឯកសារទាំងអស់ (*)|*"
+
+#: export/ExportMP3.cpp:1592
+msgid "MP3 Files"
+msgstr "ឯកសារ MP3"
+
+#: export/ExportMP3.cpp:1615
+msgid "Could not open MP3 encoding library!"
+msgstr "មិនអាច​បើក​បណ្ណាល័យ​អ៊ិនកូឌីង MP3 បាន​ទេ !"
+
+#: export/ExportMP3.cpp:1622
+msgid "Not a valid or supported MP3 encoding library!"
+msgstr "មិនមែន​​ជា​បណ្ណាល័យ​​អ៊ិនកូឌីង​​ត្រឹមត្រូវ ឬ ​MP3 ដែល​បាន​គាំទ្រ"
+
+#: export/ExportMP3.cpp:1699
+msgid "Unable to initialize MP3 stream"
+msgstr "មិនអាចចាប់ផ្តើមស្ទ្រីម MP3​ បាន​ទេ"
+
+#: export/ExportMP3.cpp:1744
+#, c-format
+msgid "Exporting selected audio with %s preset"
+msgstr "នាំចេញ​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស​ជាមួយ %s ការ​​កំណត់ជា​​ស្រេច"
+
+#: export/ExportMP3.cpp:1745
+#, c-format
+msgid "Exporting entire file with %s preset"
+msgstr "នាំចេញ​ឯកសារ​ទាំងអស់​ជាមួយ %s ​កំណត់​ជា​ស្រេច"
+
+#: export/ExportMP3.cpp:1750
+#, c-format
+msgid "Exporting selected audio with VBR quality %s"
+msgstr "នាំចេញ​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស​ជាមួយ​គុណភាព VBR %s"
+
+#: export/ExportMP3.cpp:1751
+#, c-format
+msgid "Exporting entire file with VBR quality %s"
+msgstr "នាំចេញ​ឯកសារ​ទាំងអស់​ជា​មួយ​គុណភាព VBR %s"
+
+#: export/ExportMP3.cpp:1756
+#, c-format
+msgid "Exporting selected audio at %d Kbps"
+msgstr "​នាំចេញ​អូឌីយ៉ូ​នៅ​ល្បឿន %d Kbps"
+
+#: export/ExportMP3.cpp:1757
+#, c-format
+msgid "Exporting entire file at %d Kbps"
+msgstr "នាំចេញ​ឯកសារ​ទាំងអស់​នៅ​ល្បឿន %d Kbps"
+
+#: export/ExportMP3.cpp:1790
+#, c-format
+msgid "Error %d returned from MP3 encoder"
+msgstr "កំហុស %d ត្រឡប់​ពី​អ៊ិនកូឌ័រ MP3"
+
+#: export/ExportMP3.cpp:1876
+#, c-format
+msgid "The project sample rate (%d) is not supported by the MP3\n"
+"file format.  "
+msgstr "អត្រា​គំរូ​គម្រោង (%d) មិន​គាំទ្រ​ដោយ​ទ្រង់ទ្រាយ​ឯកសារ MP3។"
+
+#: export/ExportMP3.cpp:1879
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the MP3 file format.  "
+msgstr "បន្សំ​រវាង​អត្រាគំរូ​គម្រោង (%d) និង​អត្រាប៊ីត (%d kbps)មិន​គាំទ្រ​ដោយ​ទ្រង់ទ្រាយ​ឯកសារ MP3 ទេ ។  "
+
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
+
+#: export/ExportMultiple.cpp:88 export/ExportMultiple.cpp:362
+#: export/ExportMultiple.cpp:609 export/ExportMultiple.cpp:717
+msgid "Export Multiple"
+msgstr "នាំចេញ​ច្រើន"
+
+#: export/ExportMultiple.cpp:152
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
+"or if you have a Label Track, you can export a new file for each label.\n"
+"\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "ប្រសិនបើ​អ្នក​មាន​បទ​អូឌីយ៉ូ​ច្រើនជា​ង​មួយ អ្នក​អាច​នាំចេញ​បទនីមួយៗ​ជា​ឯកសារ​ដោយឡែក\n"
+"ឬ​ប្រសិន​បើ​អ្នក​មាន​ដាន​ស្លាក អ្នក​អាច​នាំចេញ​ឯកសារ​ថ្មី​សម្រាប់​ស្លាក​នីមួយៗ ។\n"
+"\n"
+"គម្រោង​នេះ​មិន​មាន​បទ​ ឬ​​​ដាន​ស្លាក​ច្រើន​ទេ ដូច្នេះ​អ្នក​មិន​អាច​នាំចេញ​ឯកសារ​ជា​ច្រើន​បានទេ ។"
+
+#: export/ExportMultiple.cpp:153
+msgid "Can't export multiple files"
+msgstr "មិន​អាច​នាំ​ចេញ​ឯកសារជា​​ច្រើន​​បាន​​ទេ"
+
+#: export/ExportMultiple.cpp:188
+msgid "Export format:"
+msgstr "ទ្រង់ទ្រាយ​នាំចេញ ៖"
+
+#: export/ExportMultiple.cpp:195
+msgid "Options..."
+msgstr "ជម្រើស..."
+
+#: export/ExportMultiple.cpp:198
+msgid "Export location:"
+msgstr "ទីតាំង​នាំចេញ ៖"
+
+#: export/ExportMultiple.cpp:204 prefs/DirectoriesPrefs.cpp:92
+msgid "Choose..."
+msgstr "ជ្រើស..."
+
+#: export/ExportMultiple.cpp:205
+msgid "Create"
+msgstr "បង្កើត"
+
+#: export/ExportMultiple.cpp:212
+msgid "Split files based on:"
+msgstr "ពុះ​ឯកសារ​ផ្អែក​លើ ៖"
+
+#: export/ExportMultiple.cpp:222
+msgid "Labels"
+msgstr "ស្លាក"
+
+#: export/ExportMultiple.cpp:227
+msgid "Include audio before first label"
+msgstr "រួម​បញ្ចូល​អូឌីយ៉ូ​មុន​ស្លាក​ដំបូង"
+
+#: export/ExportMultiple.cpp:233
+msgid "First file name:"
+msgstr "ឈ្មោះ​ឯកសារ​ដំបូង ៖"
+
+#: export/ExportMultiple.cpp:277
+msgid "First file name"
+msgstr ""
+
+#: export/ExportMultiple.cpp:246
+msgid "Tracks"
+msgstr "បទ"
+
+#: export/ExportMultiple.cpp:253
+msgid "Name files:"
+msgstr "ឈ្មោះ​ឯកសារ ៖"
+
+#: export/ExportMultiple.cpp:263
+msgid "Using Label/Track Name"
+msgstr "ប្រើប្រាស់​ស្លាក/ឈ្មោះ​បទ"
+
+#: export/ExportMultiple.cpp:270
+msgid "Numbering consecutively"
+msgstr "លេខ​រៀង​ត​គ្នា"
+
+#: export/ExportMultiple.cpp:276
+msgid "File name prefix:"
+msgstr "បុព្វបទ​ឈ្មោះ​ឯកសារ ៖"
+
+#: export/ExportMultiple.cpp:324
+msgid "File name prefix"
+msgstr ""
+
+#: export/ExportMultiple.cpp:294
+msgid "Overwrite existing files"
+msgstr "សរសេរ​ជាន់​លើ​ឯកសារ​ដែល​មាន​ស្រាប់"
+
+#: export/ExportMultiple.cpp:360
+#, c-format
+msgid "\"%s\" successfully created."
+msgstr "\"%s\" បាន​បង្កើត​​ដោយ​ជោគជ័យ ។"
+
+#: export/ExportMultiple.cpp:369
+msgid "Choose a location to save the exported files"
+msgstr "ជ្រើស​ទីតាំង​ដើម្បី​រក្សា​ទុក​ឯកសារ​ដែល​​ដែលបាននាំចេញ"
+
+#: export/ExportMultiple.cpp:480
+#, c-format
+msgid "\"%s\" doesn't exist.\n"
+"\n"
+"Would you like to create it?"
+msgstr "\"%s\" មិន​ទាន់​មាន\n"
+"\n"
+"តើ​អ្នក​ចង់​បង្កើត​វា​ទេ?"
+
+#: export/ExportMultiple.cpp:640 export/ExportMultiple.cpp:785
+msgid "Edit metadata"
+msgstr ""
+
+#: export/ExportMultiple.cpp:606 export/ExportMultiple.cpp:714
+#, c-format
+msgid "Successfully exported %d file(s)."
+msgstr "នាំ​ចេញ​ឯកសារ​ %d ដោយ​ជោគជ័យ ។"
+
+#: export/ExportMultiple.cpp:607 export/ExportMultiple.cpp:715
+#, c-format
+msgid "Something went wrong after exporting %d file(s)."
+msgstr "បញ្ហា​ខ្លះ​បាន​កើត​ឡើង​បន្ទាប់​ពី​នាំ​ចេញ​ឯកសារ %d ។"
+
+#: export/ExportMultiple.cpp:898
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
+#: export/ExportOGG.cpp:64
+msgid "Specify Ogg Vorbis Options"
+msgstr "បញ្ជាក់​ជម្រើស​ Ogg Vorbis"
+
+#: export/ExportOGG.cpp:81
+msgid "Ogg Vorbis Export Setup"
+msgstr "រៀបចំ​​នាំ​ចេញ Ogg Vorbis"
+
+#: export/ExportOGG.cpp:155
+msgid "Ogg Vorbis Files"
+msgstr "ឯកសារ Ogg Vorbis"
+
+#: export/ExportOGG.cpp:254
+msgid "Exporting the selected audio as Ogg Vorbis"
+msgstr "នាំ​ចេញ​អូឌីយ៉ូ​ទៅ​ជា Ogg Vorbis"
+
+#: export/ExportOGG.cpp:255
+msgid "Exporting the entire project as Ogg Vorbis"
+msgstr "​នាំ​ចេញ​គម្រោង​ទាំងមូល​ទៅ​ជា Ogg Vorbis"
+
+#: export/ExportPCM.cpp:119
+msgid "Specify Uncompressed Options"
+msgstr ""
+
+#: export/ExportPCM.cpp:171
+msgid "Uncompressed Export Setup"
+msgstr "រៀបចំ​នាំចេញ​​ដែល​មិន​បង្ហាប់"
+
+#: export/ExportPCM.cpp:181
+msgid "Header:"
+msgstr "បឋមកថា ៖"
+
+#: export/ExportPCM.cpp:185
+msgid "Encoding:"
+msgstr "អ៊ិនកូឌីង ៖"
+
+#: export/ExportPCM.cpp:190
+msgid "(Not all combinations of headers and encodings are possible.)"
+msgstr "(មិនអាច​ផ្សំ​បឋមកថា និង​ការ​អ៊ិនកូដ​ទាំងអស់​បានទេ ។)"
+
+#: export/ExportPCM.cpp:359
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:377
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:388
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:399
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "Cannot export audio in this format."
+msgstr "មិន​អាច​នាំចេញ​អូឌីយ៉ូ​ក្នុង​ទ្រង់ទ្រាយ​នេះ ។"
+
+#: export/ExportPCM.cpp:400
+#, c-format
+msgid "Exporting the selected audio as %s"
+msgstr "​នាំចេញ​អូឌីយ៉ូ​ទៅជា %s"
+
+#: export/ExportPCM.cpp:402
+#, c-format
+msgid "Exporting the entire project as %s"
+msgstr "កំពុង​នាំចេញ​គម្រោង​ទាំងមូល​ទៅជា %s"
+
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:556
+#, c-format
+#, fuzzy
+msgid "Error (file may not have been written): %s"
+msgstr "កំហុស (ឯកសារ​អាច​មិន​ទាន់​ត្រូវ​បាន​សរសេរ) ៖ %hs"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr "ឯកសារ MP3"
+
+#: import/Import.cpp:176
+msgid "Select stream(s) to import"
+msgstr ""
+
+#: import/Import.cpp:154
+#, c-format
+msgid "This version of Audacity was not compiled with %s support."
+msgstr "Audacity កំណែ​នេះ​មិនទាន់​បាន​ចង​ក្រង​ជាមួយ %s គាំទ្រ ។"
+
+#: import/Import.cpp:242
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:252
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
+"Audacity cannot open audio CDs directly. \n"
+"Extract (rip) the CD tracks to an audio format that \n"
+"Audacity can import, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:258
+#, c-format
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr ""
+
+#: import/Import.cpp:263
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
+"Audacity cannot open this type of file due to patent restrictions. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:268
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:273
+#, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
+"Audacity cannot open this type of file due to the encryption. \n"
+"Try recording the file into Audacity, or burn it to audio CD then \n"
+"extract the CD track to a supported audio format such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:278
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
+"Audacity cannot open this proprietary format. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:284
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:290
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:296
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:302
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:308
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:314
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:319
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:324
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:35
+msgid "FLAC files"
+msgstr "ឯកសារ FLAC"
+
+#: import/ImportLOF.cpp:92
+msgid "List of Files in basic text format"
+msgstr "បញ្ជី​ឯកសារ​នៅ​ក្នុង​ទ្រង់ទ្រាយ​អត្ថបទ​មូលដ្ឋាន"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:318
+msgid "Invalid window offset in LOF file."
+msgstr "អុហ្វសិត​បង្អួច​មិន​ត្រឹមត្រូវ​នៅក្នុង​ឯកសារ LOF​ ។"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:320 import/ImportLOF.cpp:341 import/ImportLOF.cpp:415
+#: import/ImportLOF.cpp:435
+msgid "LOF Error"
+msgstr "កំហុស LOF"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:339
+msgid "Invalid duration in LOF file."
+msgstr "ថិរវេលា​មិន​ត្រឹមត្រូវ​នៅ​ក្នុង​ឯកសារ LOF​ ។"
+
+#: import/ImportLOF.cpp:414
+msgid "MIDI tracks cannot be offset individually, only audio files can be."
+msgstr "បទ​មីឌី​មិន​អាច​អុហ្វសិត​​ដោយ​ផ្ទាល់ខ្លួន​បានទេ មានតែ​ឯកសារ​អូឌីយ៉ូ​​ប៉ុណ្ណោះ​ទើប​​អាច​​ធ្វើ​បាន ​​។"
+
+#. i18n-hint: You do not need to translate "LOF"
+#: import/ImportLOF.cpp:434
+msgid "Invalid track offset in LOF file."
+msgstr "អុហ្វសិត​បទ​មិន​ត្រឹមត្រូវ​នៅ​ក្នុង​ឯកសារ LOF ។"
+
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
+
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
+
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
+
+#: import/ImportOGG.cpp:35
+msgid "Ogg Vorbis files"
+msgstr "ឯកសារ Ogg Vorbis"
+
+#: import/ImportOGG.cpp:141
+msgid "Media read error"
+msgstr "កំហុស​អាន​មេឌៀ"
+
+#: import/ImportOGG.cpp:144
+msgid "Not an Ogg Vorbis file"
+msgstr "មិនមែន​ជា​ឯកសារ Ogg Vorbis"
+
+#: import/ImportOGG.cpp:147
+msgid "Vorbis version mismatch"
+msgstr "កំណែ Vorbis មិន​ត្រូវគ្នា"
+
+#: import/ImportOGG.cpp:150
+msgid "Invalid Vorbis bitstream header"
+msgstr "បឋមកថា​​ប៊ីត​ស្ទ្រីម Vorbis មិន​ត្រឹមត្រូវ"
+
+#: import/ImportOGG.cpp:153
+msgid "Internal logic fault"
+msgstr "កំហុស​តក្ក​ខាងក្នុង"
+
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF និង​ប្រភេទ​ឯកសារ​មិន​បង្ហាប់​ផ្សេង​ទៀត"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
+#, c-format
+msgid "Importing %s"
+msgstr ""
+
+#: import/ImportQT.cpp:21
+msgid "QuickTime files"
+msgstr "ឯកសារ QuickTime"
+
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
+#: import/ImportRaw.cpp:278
+msgid "Import Raw Data"
+msgstr "នាំចូល​ទិន្នន័យ​មិនទាន់​ដើម"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:337
+msgid "No endianness"
+msgstr "គ្មាន endianness"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:340
+msgid "Little-endian"
+msgstr "endian​ តូច"
+
+#. i18n-hint: Refers to byte-order.  Don't translate this if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:343
+msgid "Big-endian"
+msgstr "endian ធំ"
+
+#. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
+#. know the correct technical word.
+#: import/ImportRaw.cpp:346
+msgid "Default endianness"
+msgstr "endianness លំនាំដើម"
+
+#: import/ImportRaw.cpp:370
+msgid "1 Channel (Mono)"
+msgstr "ឆានែល ១ (ម៉ូណូ)"
+
+#: import/ImportRaw.cpp:371
+msgid "2 Channels (Stereo)"
+msgstr "ឆានែល ២​ (ស្តេរ៉េអូ)"
+
+#: import/ImportRaw.cpp:373
+#, c-format
+msgid "%d Channels"
+msgstr "ឆានែល %d"
+
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
+#: import/ImportRaw.cpp:386
+msgid "Start offset:"
+msgstr "អុហ្វសិត​ចាប់ផ្ដើម ៖"
+
+#: import/ImportRaw.cpp:397
+msgid "Amount to import:"
+msgstr "ចំនួន​ត្រូវ​នាំចូល ៖"
+
+#: import/ImportRaw.cpp:408
+msgid "Sample rate:"
+msgstr "អត្រាគំរូ ៖"
+
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
+msgid "Audio I/O"
+msgstr "អូឌីយ៉ូ I/O"
+
+#: prefs/AudioIOPrefs.cpp:100
+msgid "1 (Mono)"
+msgstr "១​ (ម៉ូណូ)"
+
+#: prefs/AudioIOPrefs.cpp:101
+msgid "2 (Stereo)"
+msgstr "២ (ស្តេរ៉េអូ)"
+
+#: prefs/AudioIOPrefs.cpp:115
+msgid "Playback"
+msgstr "ចាក់ឡើងវិញ"
+
+#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
+#: toolbars/DeviceToolBar.cpp:54
+msgid "Device"
+msgstr "ឧបករណ៍"
+
+#: prefs/AudioIOPrefs.cpp:122
+msgid "Using:"
+msgstr "ការ​ប្រើ ៖"
+
+#: prefs/AudioIOPrefs.cpp:123
+msgid "Portaudio v"
+msgstr "ច្រក​អូឌីយ៉ូ v"
+
+#: prefs/AudioIOPrefs.cpp:133
+msgid "Recording"
+msgstr "ថត"
+
+#: prefs/AudioIOPrefs.cpp:139
+msgid "Channels"
+msgstr "ឆានែល"
+
+#: prefs/AudioIOPrefs.cpp:145
+msgid "Playthrough"
+msgstr "ចាក់តាម"
+
+#: prefs/AudioIOPrefs.cpp:150
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:150
+msgid "&Hardware Playthrough: Play new track while recording it"
+msgstr "ចាក់តាម​ផ្នែក​រឹង​ ៖ ចាក់បទ​ថ្មី​ខណៈពេល​កំពុង​ថត​វា"
+
+#: prefs/AudioIOPrefs.cpp:152
+msgid "&Software Playthrough: Play new track while recording it"
+msgstr "ចាក់តាម​ផ្នែក​ទន់​ ៖ ចាក់បទ​ថ្មី​​ខណៈពេល​​កំពុង​ថត​វា"
+
+#: prefs/AudioIOPrefs.cpp:158
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:161
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:162
+msgid "Effects Preview"
+msgstr "មើល​បែបផែន​ជាមុន"
+
+#: prefs/AudioIOPrefs.cpp:165
+msgid "Length of preview:"
+msgstr "ប្រវែង​នៃ​ការ​​មើល​ជាមុន"
+
+#: prefs/AudioIOPrefs.cpp:170
+msgid "Cut Preview"
+msgstr "កាត់​មើលជាមុន"
+
+#: prefs/AudioIOPrefs.cpp:173
+msgid "Preview before cut region:"
+msgstr "មើល​ជា​មុន​ មុននឹង​​កាត់​តំបន់ ៖"
+
+#: prefs/AudioIOPrefs.cpp:175
+msgid "Preview after cut region:"
+msgstr "មើល​ជា​មុន​ បន្ទាប់​ពី​កាត់​តំបន់ ៖"
+
+#: prefs/AudioIOPrefs.cpp:183
+msgid "Latency"
+msgstr "គម្លាត​ពេល"
+
+#: prefs/AudioIOPrefs.cpp:196
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:199
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:197
+msgid "Seek Time when playing"
+msgstr "ស្វែងរក​ពេលវេលា​ពេល​កំពុង​ចាក់"
+
+#: prefs/AudioIOPrefs.cpp:200
+msgid "Short period:"
+msgstr "កំឡុង​ពេល​ខ្លី ៖"
+
+#: prefs/AudioIOPrefs.cpp:202
+msgid "Long period:"
+msgstr "កំឡុង​ពេល​វែង ៖"
+
+#: prefs/BatchPrefs.cpp:55 prefs/BatchPrefs.cpp:56
+msgid "Batch"
+msgstr "បាច់"
+
+#: prefs/BatchPrefs.cpp:77 prefs/GUIPrefs.cpp:70
+msgid "Behaviors"
+msgstr "ឥរិយាបថ"
+
+#: prefs/BatchPrefs.cpp:80
+msgid "&Don't apply effects in batch mode"
+msgstr "កុំ​អនុវត្ត​បែបផែន​ក្នុង​របៀប​បាច់"
+
+#: prefs/BatchPrefs.cpp:85
+msgid "Cl&eanSpeech Mode (Customized GUI)"
+msgstr "របៀប​ CleanSpeech (GUI ដែល​បាន​ប្តូរតាម​បំណង)"
+
+#: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:279
+msgid "Directories"
+msgstr "ថត"
+
+#: prefs/DirectoriesPrefs.cpp:87
+msgid "Temporary files directory"
+msgstr "ថត​ឯកសារ​បណ្ដោះ​អាសន្ន"
+
+#: prefs/DirectoriesPrefs.cpp:91
+msgid "Location:"
+msgstr "ទីតាំង ៖"
+
+#: prefs/DirectoriesPrefs.cpp:93
+msgid "Free Space:"
+msgstr "ទំហំទំនេរ ៖"
+
+#: prefs/DirectoriesPrefs.cpp:99
+msgid "Auto save"
+msgstr "រក្សាទុក​ដោយ​ស្វ័យប្រវត្តិ"
+
+#: prefs/DirectoriesPrefs.cpp:101
+msgid "Auto save a copy of the project in a separate folder"
+msgstr "រក្សាទុក​ដោយ​​ស្វ័យប្រវត្តិ​ច្បាប់ចម្លង​នៃ​គម្រោង​ក្នុង​ថត​ដាច់​ដោយ​ឡែក"
+
+#: prefs/DirectoriesPrefs.cpp:104
+msgid "Auto save interval:"
+msgstr ""
+
+#: prefs/DirectoriesPrefs.cpp:105
+msgid "minutes"
+msgstr "នាទី"
+
+#: prefs/DirectoriesPrefs.cpp:110
+msgid "Audio cache"
+msgstr "ឃ្លាំង​សម្ងាត់​អូឌីយ៉ូ"
+
+#: prefs/DirectoriesPrefs.cpp:112
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
+
+#: prefs/DirectoriesPrefs.cpp:121
+msgid "Choose a location to place the temporary directory"
+msgstr "ជ្រើស​ទីតាំង​ត្រូវ​ដាក់​ថត​បណ្ដោះអាសន្ន"
+
+#: prefs/DirectoriesPrefs.cpp:166
+#, c-format
+msgid "Directory %s does not exist. Create it?"
+msgstr "មិន​ទាន់​មាន​ថត %s ទេ ។ បង្កើត​វា​ឬទេ ?"
+
+#: prefs/DirectoriesPrefs.cpp:168
+msgid "New Temporary Directory"
+msgstr "ថត​បណ្ដោះ​អាសន្ន​ថ្មី"
+
+#: prefs/DirectoriesPrefs.cpp:187
+#, c-format
+msgid "Directory %s is not writable"
+msgstr "ថត %s មិនអាច​សរសេរ​បាន"
+
+#: prefs/DirectoriesPrefs.cpp:199
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "ផ្លាស់ប្ដូរ​ទៅ​ថត​បណ្ដោះអាសន្ន នឹង​គ្មាន​ប្រសិទ្ធភាព​ទេ រហូត​ដល់ Audacity ត្រូវ​បាន​ចាប់ផ្ដើម​ឡើង​វិញ"
+
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:104
+msgid "MP3 Library Version:"
+msgstr "កំណែ​បណ្ណាល័យ MP3 ៖"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "When saving a project that depends on other audio files"
+msgstr "នៅ​ពេល​រក្សាទុក​គម្រោង ដែល​អាស្រ័យ​លើ​ឯកសារ​អូឌីយ៉ូ​ផ្សេងៗ​ទៀត"
+
+#: prefs/FileFormatPrefs.cpp:151
+msgid "Always &copy all audio into project (safest)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:152
+msgid "&Do not copy any audio"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "&Ask user"
+msgstr "សួរ​អ្នក​ប្រើ"
+
+#: prefs/FileFormatPrefs.cpp:157
+msgid "When exporting tracks to an audio file"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96
+msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
+msgstr "តែងតែ​លាយ​​បទ​ទាំងអស់​​ទៅជាឆានែល​​ស្តេរ៉េអូ ឬ​ម៉ូណូ ។"
+
+#: prefs/FileFormatPrefs.cpp:97
+msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
+msgstr "ប្រើការ​​លាយ​​ផ្លាល់ខ្លួ​ន (ឧទាហរណ៍ នាំចេញ​ឯកសារ​ពហុ​ឆានែល ៥.១)"
+
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:33 prefs/GUIPrefs.cpp:34
+msgid "Interface"
+msgstr "ចំណុច​ប្រទាក់"
+
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:72
+msgid "&Update display while playing"
+msgstr "ធ្វើ​ឲ្យ​ការ​បង្ហាញ​ទាន់សម័យ​ ខណៈពេល​ចាក់"
+
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:102
+msgid "Automatically &fit tracks vertically zoomed"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:86
+msgid "Editing a &clip can move other clips"
+msgstr "ការ​កែសម្រួល​ឈុត​អាចផ្លាស់ទី​ឈុត​ដទៃ​ទៀត"
+
+#: prefs/GUIPrefs.cpp:108
+msgid "&Select all audio in project, if none selected"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:90
+msgid "&Beep on completion of longer activities"
+msgstr "បន្លឺ​សំឡេង​ប៊ីត​នៅ​ពេល​​បញ្ចប់​សកម្មភាព​វែងៗ"
+
+#: prefs/BatchPrefs.cpp:89 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr "បង្ហាញ/លាក់"
+
+#: prefs/GUIPrefs.cpp:96
+msgid "Enable cut &lines"
+msgstr "អនុញ្ញាត​ឲ្យ​កាត់​បន្ទាត់"
+
+#: prefs/GUIPrefs.cpp:98
+msgid "Show warnings about &temp files"
+msgstr "បង្ហាញ​ការព្រមាន​អំពី​ឯកសារ​បណ្តោះ​អាសន្ន"
+
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:115
+msgid "-36 dB (shallow range for high-amplitude editing)"
+msgstr "-៣៦ dB (ជួរ​រាក់​សម្រាប់​ការ​កែសម្រួល​អាំភ្លី​ខ្ពស់)"
+
+#: prefs/GUIPrefs.cpp:116
+msgid "-48 dB (PCM range of 8 bit samples)"
+msgstr "-៤៨ dB (ជួរ PCM នៃគំរូ ៨ ប៊ីត)"
+
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:117
+msgid "-96 dB (PCM range of 16 bit samples)"
+msgstr "-៩៦ dB (ជួរ PCM នៃ គំរូ ១៦ ប៊ីត)"
+
+#: prefs/GUIPrefs.cpp:118
+msgid "-120 dB (approximate limit of human hearing)"
+msgstr "-១២០ dB (ព្រំដែន​ប្រហែល​នៃ​ការស្តាប់​របស់​មនុស្ស)"
+
+#: prefs/GUIPrefs.cpp:119
+msgid "-145 dB (PCM range of 24 bit samples)"
+msgstr "-145 dB (ជួរ PCM នៃ គំរូ ២៤ ប៊ីត)"
+
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:64 prefs/KeyConfigPrefs.cpp:65
+msgid "Keyboard"
+msgstr "ក្ដារចុច"
+
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:95
+msgid "Key Bindings"
+msgstr "ចងគ្រាប់ចុច"
+
+#: prefs/KeyConfigPrefs.cpp:115
+msgid "S&et"
+msgstr "កំណត់"
+
+#: prefs/KeyConfigPrefs.cpp:120
+msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
+msgstr "ចំណាំ ៖ ចុច Cmd+Q នឹងចេញ ។ គ្រាប់ចុច​ផ្សេង​ទៀត​ទាំងអស់​​គឺ​ត្រឹមត្រូវ ។"
+
+#: prefs/KeyConfigPrefs.cpp:124 prefs/ThemePrefs.cpp:103
+msgid "&Defaults"
+msgstr "លំនាំដើម"
+
+#: prefs/KeyConfigPrefs.cpp:143
+msgid "Key Combination"
+msgstr "បន្សំ​គ្រាប់ចុច"
+
+#: prefs/KeyConfigPrefs.cpp:163
+msgid "Export Keyboard Shortcuts As:"
+msgstr "នាំចេញ​ផ្លូវកាត់​ក្តារចុច​ជា ៖"
+
+#: prefs/KeyConfigPrefs.cpp:181
+msgid "Error saving keyboard shortcuts"
+msgstr "កំហុស​ក្នុងការ​រក្សាទុក​ផ្លូវកាត់​ក្តារចុច"
+
+#: prefs/KeyConfigPrefs.cpp:196
+msgid "Select an XML file containing Audacity keyboard shortcuts..."
+msgstr "ជ្រើស​ឯកសារ XML ដែល​មាន​ផ្លូវកាត់​ក្តារចុច Audacity"
+
+#: prefs/KeyConfigPrefs.cpp:213
+msgid "Error loading keyboard shortcuts"
+msgstr "កំហុស​ក្នុង​ការផ្ទុក​ផ្លូវកាត់​ក្តារចុច"
+
+#: prefs/KeyConfigPrefs.cpp:241
+#, c-format
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
+"\n"
+"'%s'"
+msgstr "ផ្លូវកាត់​ក្ដារចុច '%s' ត្រូវ​បាន​ផ្ដល់​ទៅ ៖\n"
+"\n"
+"'%s' រួច​ហើយ"
+
+#: prefs/KeyConfigPrefs.cpp:367 toolbars/EditToolBar.cpp:144
+msgid "Undo"
+msgstr "មិន​ធ្វើ​វិញ"
+
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "ចាក់​បទ​ផ្សេងៗ​ខណៈពេល​ថត​ប​ទ​ថ្មី"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:189
+msgid "Audio to buffer:"
+msgstr "អូឌីយ៉ូ​ទៅ​សតិ​​បណ្ដោះ​អាសន្ន"
+
+#: prefs/AudioIOPrefs.cpp:192
+msgid "Latency correction:"
+msgstr "កែតម្រូវ​គម្លាត​ពេល ៖"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
+msgid "Mouse"
+msgstr "កណ្តុរ"
+
+#: prefs/MousePrefs.cpp:78
+msgid "Mouse Bindings (default values, not configurable)"
+msgstr "ការ​ចង​កណ្តុរ (តម្លៃ​លំនាំដើម​មិន​អាច​កំណត់​រចនា​សម្ព័ន្ធ​បានទេ)"
+
+#: prefs/MousePrefs.cpp:93
+msgid "Tool"
+msgstr "ឧបករណ៍"
+
+#: prefs/MousePrefs.cpp:94
+msgid "Command Action"
+msgstr "ពាក្យ​បញ្ជា​អំពើ"
+
+#: prefs/MousePrefs.cpp:95
+msgid "Buttons"
+msgstr "ប៊ូតុង"
+
+#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:104 prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
+msgid "Left-Click"
+msgstr "ចុចឆ្វេង"
+
+#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101 prefs/MousePrefs.cpp:102
+msgid "Select"
+msgstr "ជ្រើស"
+
+#: prefs/MousePrefs.cpp:98 prefs/MousePrefs.cpp:122
+msgid "Set Selection Point"
+msgstr "កំណត់​ចំណុច​ជម្រើស"
+
+#: prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115 prefs/MousePrefs.cpp:119 prefs/MousePrefs.cpp:123
+msgid "Left-Drag"
+msgstr "អូស​ឆ្វេង"
+
+#: prefs/MousePrefs.cpp:99 prefs/MousePrefs.cpp:123
+msgid "Set Selection Range"
+msgstr "កំណត់ជួរ​ជម្រើស"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Extend Selection Range"
+msgstr "ពង្រើក​ជួរ​ជម្រើស"
+
+#: prefs/MousePrefs.cpp:100
+msgid "Shift-Left-Click"
+msgstr "ប្តូរ(Shift)​ខាង​ឆ្វេង-ចុចស្តាំ"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Left-Double-Click"
+msgstr "ចុច​ខាង​ឆ្វេង​ទ្វេដង"
+
+#: prefs/MousePrefs.cpp:101
+msgid "Select Clip or Entire Track"
+msgstr "ជ្រើស​ច្រឹប ឬ​បទ​ទាំងមូល"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Ctrl-Left-Click"
+msgstr "បញ្ជា(Ctrl) ចុចឆ្វេង"
+
+#: prefs/MousePrefs.cpp:102
+msgid "Set Selection Point and Play"
+msgstr "កំណត់​ចំណុចជ្រើស​ និង​ចាក់"
+
+#: prefs/MousePrefs.cpp:104 prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:108 prefs/MousePrefs.cpp:109
+msgid "Zoom"
+msgstr "ពង្រីក"
+
+#: prefs/MousePrefs.cpp:104
+msgid "Zoom in on Point"
+msgstr "ពង្រីក​លើ​ចំណុច"
+
+#: prefs/MousePrefs.cpp:105 prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:125
+msgid "Zoom in on a Range"
+msgstr "ពង្រីក​លើ​ជួរ"
+
+#: prefs/MousePrefs.cpp:105
+msgid "same as right-drag"
+msgstr "ដូច​ទៅនឹង​អូស​ស្តាំ"
+
+#: prefs/MousePrefs.cpp:106 prefs/MousePrefs.cpp:124
+msgid "Right-Click"
+msgstr "ចុចស្តាំ"
+
+#: prefs/MousePrefs.cpp:106 prefs/MousePrefs.cpp:124
+msgid "Zoom out one step"
+msgstr "បង្រួម​លើ​ជំហាន"
+
+#: prefs/MousePrefs.cpp:107 prefs/MousePrefs.cpp:125
+msgid "Right-Drag"
+msgstr "អូសស្តាំ"
+
+#: prefs/MousePrefs.cpp:107
+msgid "same as left-drag"
+msgstr "ដូច​ទៅ​នឹង​អូស​ឆ្វេង"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Shift-Drag"
+msgstr "ប្តូរ(Shift) អូស"
+
+#: prefs/MousePrefs.cpp:108
+msgid "Zoom out on a Range"
+msgstr "បង្រួម​លើ​ជួរ"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Middle-Click"
+msgstr "ចុច​កណ្តាល"
+
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom default"
+msgstr "ពង្រីក​លំនាំដើម"
+
+#: prefs/MousePrefs.cpp:111
+msgid "Time shift clip or move up/down between tracks"
+msgstr "អង្កិល​ពេលវេលា​ច្រឹប ឬ​ផ្លាស់ទី​ឡើង​ចុះ​រវាង​បទ"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Shift-Left-Drag"
+msgstr "ប្តូរ(Shift) អូស​ឆ្វេង"
+
+#: prefs/MousePrefs.cpp:112
+msgid "Time shift all clips in track"
+msgstr "អង្កិល​ពេលវេលា​គ្រប់​ឈុត​ក្នុង​បទ"
+
+#: prefs/MousePrefs.cpp:113 prefs/MousePrefs.cpp:120
+msgid "Ctrl-Left-Drag"
+msgstr "បញ្ជា(Ctrl) អូស​ឆ្វេង"
+
+#: prefs/MousePrefs.cpp:113
+msgid "Move clip up/down between tracks"
+msgstr "ផ្លាស់ទី​ឈុត​ឡើងលើ/ចុះក្រោម​រវាង​បទ"
+
+#: prefs/MousePrefs.cpp:115
+msgid "Change Amplification Envelope"
+msgstr "ផ្លាស់ប្ដូរ​ការ​ពង្រីក​ស្រោម​សំបុត្រ​"
+
+#: prefs/MousePrefs.cpp:117
+msgid "Change Sample"
+msgstr "ផ្លាស់ប្តូរ​គំរូ"
+
+#: prefs/MousePrefs.cpp:117 prefs/MousePrefs.cpp:118 prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
+msgid "Pencil"
+msgstr "ខ្មៅដៃ"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Alt-Left-Click"
+msgstr "ជំនួស(Alt) ចុចឆ្វេង"
+
+#: prefs/MousePrefs.cpp:118
+msgid "Smooth at Sample"
+msgstr "រលោង​នៅ​លើ​គំរូ"
+
+#: prefs/MousePrefs.cpp:119
+msgid "Change Several Samples"
+msgstr "ផ្លាស់ប្ដូរ​គំរូ​ជា​ច្រើន"
+
+#: prefs/MousePrefs.cpp:120
+msgid "Change ONE Sample only"
+msgstr "ផ្លាស់ប្តូ​រគំរូ​តែមួយ"
+
+#: prefs/MousePrefs.cpp:122 prefs/MousePrefs.cpp:123 prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
+msgid "Multi"
+msgstr "ច្រើន"
+
+#: prefs/MousePrefs.cpp:122 prefs/MousePrefs.cpp:123
+msgid "same as select tool"
+msgstr "ដូច​ទៅនឹង​ឧបករណ៍​ជ្រើស"
+
+#: prefs/MousePrefs.cpp:124 prefs/MousePrefs.cpp:125
+msgid "same as zoom tool"
+msgstr "ដូច​ទៅនឹង​ឧបករណ៍​ពង្រីក"
+
+#: prefs/MousePrefs.cpp:127 prefs/MousePrefs.cpp:128 prefs/MousePrefs.cpp:129
+msgid "Any"
+msgstr "ខ្លះ"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Scroll up or down"
+msgstr "រមូរ​ឡើង ឬ​ចុះ"
+
+#: prefs/MousePrefs.cpp:127
+msgid "Wheel-Rotate"
+msgstr "កង់​បង្វិល"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Scroll left or right"
+msgstr "រមូរ​ឆ្វេង ឬ​ស្តាំ"
+
+#: prefs/MousePrefs.cpp:128
+msgid "Shift-Wheel-Rotate"
+msgstr "ប្តូរ(Shift) ​កង់​បង្វិល"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Ctrl-Wheel-Rotate"
+msgstr "បញ្ជា(Ctrl) កង់​បង្វិល"
+
+#: prefs/MousePrefs.cpp:129
+msgid "Zoom in or out"
+msgstr "ពង្រីក ឬ​បង្រួម"
+
+#: prefs/PrefsDialog.cpp:89
+msgid "Audacity Preferences"
+msgstr "ចំណូល​ចិត្ត Audacity"
+
+#: prefs/QualityPrefs.cpp:73
+msgid "Rectangle"
+msgstr "ចតុកោណកែង"
+
+#: prefs/QualityPrefs.cpp:74
+msgid "Triangle"
+msgstr "ត្រីកោណ"
+
+#: prefs/QualityPrefs.cpp:75
+msgid "Shaped"
+msgstr "រាង"
+
+#: prefs/QualityPrefs.cpp:122
+msgid "Sampling"
+msgstr "ធ្វើគំរូ"
+
+#: prefs/QualityPrefs.cpp:125
+msgid "Default Sample Rate:"
+msgstr "អត្រា​គំរូ​លំនាំដើម ៖"
+
+#: prefs/QualityPrefs.cpp:127
+msgid "Default Sample Format:"
+msgstr "ទ្រង់ទ្រាយ​គំរូ​លំនាំដើម ៖"
+
+#: prefs/QualityPrefs.cpp:136
+msgid "Real-time sample rate converter:"
+msgstr "កម្មវិធី​បម្លែង​អត្រា​គំរូ​ពេលវេលាពិត ៖"
+
+#: prefs/QualityPrefs.cpp:139
+msgid "High-quality sample rate converter:"
+msgstr "កម្មវិធី​បម្លែង​អត្រាគំរូ​គុណភាព​ខ្ពស់ ៖"
+
+#: prefs/QualityPrefs.cpp:142
+msgid "Real-time dither:"
+msgstr "បំរែបំរួល​ពេលវេលា​ពិត ៖"
+
+#: prefs/QualityPrefs.cpp:145
+msgid "High-quality dither:"
+msgstr "បំរែបំរួល​គុណភាពខ្ពស់ ៖"
+
+#: prefs/QualityPrefs.cpp:157
+msgid "Conversion"
+msgstr "ការ​បម្លែង"
+
+#: prefs/QualityPrefs.cpp:163
+msgid "Sample Rate Converter"
+msgstr "កម្មវិធី​បម្លែង​អត្រា​គំរូ"
+
+#: prefs/QualityPrefs.cpp:164
+msgid "Dither"
+msgstr "ប្រែប្រួល"
+
+#: prefs/QualityPrefs.cpp:165
+msgid "Real-time:"
+msgstr "ពេលវេលាពិត ៖"
+
+#: prefs/QualityPrefs.cpp:171
+msgid "High-quality:"
+msgstr "គុណភាព​ខ្ពស់ ៖"
+
+#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
+msgid "Smart Recording"
+msgstr "ការ​ថត​ដ៏​ឆ្លាត"
+
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
+
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:36 prefs/SpectrumPrefs.cpp:37
+msgid "Spectrograms"
+msgstr "ក្រាហ្វិក​វិសាលគម"
+
+#: prefs/SpectrumPrefs.cpp:72
+msgid "FFT Size"
+msgstr "ទំហំ FFT"
+
+#: prefs/SpectrumPrefs.cpp:75
+msgid "8 - most wideband"
+msgstr "៨ - ក្រុម​ទូលាយ​បំផុត"
+
+#: prefs/SpectrumPrefs.cpp:80
+msgid "256 - default"
+msgstr "២៥៦ - លំនាំដើម"
+
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:84
+msgid "4096 - most narrowband"
+msgstr "៤០៩៦ - ក្រុម​ចង្អៀត​​បំផុត"
+
+#: prefs/SpectrumPrefs.cpp:90
+msgid "Window type:"
+msgstr "ប្រភេទ​បង្អួច ៖"
+
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:96
+msgid "Display"
+msgstr "បង្ហាញ"
+
+#: prefs/SpectrumPrefs.cpp:100
+msgid "&Grayscale"
+msgstr "មាត្រដ្ឋាន​ប្រផេះ"
+
+#: prefs/SpectrumPrefs.cpp:103
+msgid "Minimum Frequency (Hz):"
+msgstr "ប្រេកង់​អប្បបរមា (Hz) ៖"
+
+#: prefs/SpectrumPrefs.cpp:108
+msgid "Maximum Frequency (Hz):"
+msgstr "ប្រេកង់​អតិបរមា (Hz) ៖"
+
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:134
+msgid "The maximum frequency must be an integer"
+msgstr "ប្រេកង់​អតិបរមា​ត្រូវតែ​ជា​លេខ​គត់"
+
+#: prefs/SpectrumPrefs.cpp:138
+msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
+msgstr "ប្រេកង់​អតិបរមា​ត្រូវតែ​នៅ​ក្នុង​ជួរ​ពី ១០០ Hz - ១០០.០០០ Hz"
+
+#: prefs/SpectrumPrefs.cpp:146
+msgid "The minimum frequency must be an integer"
+msgstr "ប្រេកង់​អប្បបរមា​ត្រូវតែ​ជា​លេខគត់"
+
+#: prefs/SpectrumPrefs.cpp:150
+msgid "Minimum frequency must be at least 0 Hz"
+msgstr "ប្រេកង់​អប្បបរមា​ត្រូវតែ​មាន​តម្លៃ​តូចបំផុត ០ Hz"
+
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+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 "ស្បែក"
+
+#: prefs/ThemePrefs.cpp:91
+msgid "Theme Cache - Images && Color"
+msgstr "ឃ្លាំងសម្ងាត់ស្បែក - រូបភាព និង​ពណ៌"
+
+#: prefs/ThemePrefs.cpp:93
+msgid "Save Theme Cache"
+msgstr "រក្សា​ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក"
+
+#: prefs/ThemePrefs.cpp:94
+msgid "Load Theme Cache"
+msgstr "ផ្ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក​"
+
+#: prefs/ThemePrefs.cpp:104
+msgid "Load Theme Cache At Startup"
+msgstr "ផ្ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក​នៅ​ពេល​ចាប់​ផ្តើម​"
+
+#: prefs/ThemePrefs.cpp:116
+msgid "Individual Theme Files"
+msgstr "ឯកសារ​ស្បែក​នីមួយៗ"
+
+#: prefs/ThemePrefs.cpp:118
+msgid "Save Files"
+msgstr "រក្សាទុក​ឯកសារ"
+
+#: prefs/ThemePrefs.cpp:119
+msgid "Load Files"
+msgstr "ផ្ទុក​ឯកសារ"
+
+#: prefs/ThemePrefs.cpp:124
+msgid "Info"
+msgstr "ព័ត៌មាន"
+
+#: prefs/ThemePrefs.cpp:127
+msgid "Themability is an experimental feature.\n"
+"\n"
+"To try it out, click \"Save Theme Cache\" then\n"
+"find and modify the images and colors in \n"
+"ImageCacheVxx.png using an image editor such \n"
+"as the Gimp.\n"
+"\n"
+"Click \"Load Theme Cache\" to load the changed images\n"
+"and colors back into Audacity.\n"
+"\n"
+"[Only the control toolbar and the colors on the \n"
+"wavetrack are currently affected, even though the\n"
+"image file shows other icons too.]\n"
+msgstr "Themability គឺ​ជា​លក្ខណៈពិសេស​ពិសោធន៍ ។\n"
+"\n"
+"ដើម្បី​សាកល្បង​វា ចុច \"រក្សា​ទុក​​ឃ្លាំង​សម្ងាត់​ស្បែក\" បន្ទាប់​មក\n"
+"រក​ និង​កែប្រែ​រូបភាព​ និង​ពណ៌​នៅ​ក្នុង \n"
+"ImageCacheVxx.png ដោយ​ប្រើ​កម្មវិធី​កែសម្រួល​រូបភាព​ដូចជា \n"
+"Gimp.\n"
+"\n"
+"ចុច \"ផ្ទុក​ឃ្លាំង​សម្ងាត់​ស្បែក\" ដើម្បី​ផ្ទុក​រូបភាព​ដែល​បាន​ផ្លាស់ប្ដូរ\n"
+"និង​ពណ៌​ត្រឡប់​ទៅ​ក្នុង Audacity ។\n"
+"\n"
+"[មាន​តែ​របារ​ឧបករណ៍​​ត្រួតពិនិត្យ និង​ពណ៌​នៅ​លើ \n"
+"ដាន​រលក​ត្រូវ​បាន​ប៉ះពាល់​បច្ចុប្បន្ន​នេះ ទោះ​បីជា\n"
+"ឯកសារ​រូបភាព​បង្ហាញ​រូបតំណាង​ផ្សេង​ក៏​ដោយ ។]\n"
+
+#: prefs/ThemePrefs.cpp:132
+msgid "You have compiled Audacity with an extra button, \n"
+"'Output Sourcery'.  This will save a C version of \n"
+"the image cache that can be compiled in as a default.\n"
+msgstr "អ្នក​បាន​ចង​ក្រង​ Audacity ជាមួយប៊ូតុង​បន្ថែម​ \n"
+"'ប្រភព​លទ្ធផល' ។  នេះនឹងរក្សា​ទុក​កំណែ​ C របស់ \n"
+"ឃ្លាំងសម្ងាត់​​រូបភាព​​ដែល​​អាច​​ត្រូវ​បាន​ចងក្រង​ជា​លំនាំដើម ។\n"
+
+#: prefs/ThemePrefs.cpp:137
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
+"the Theme Cache will be loaded when the program \n"
+"starts up.\n"
+"\n"
+msgstr "ប្រសិន​បើ​​បាន​​គូសធីក 'ផ្ទុក​ឃ្លាំងសម្ងាត់​ស្បែក​នៅពេល​ចាប់ផ្ដើម' បន្ទាប់​មក \n"
+"ឃ្លាំង​សម្ងាត់​ស្បែក​នឹង​ត្រូវ​បាន​ផ្ទុក​​ នៅ​ពេល​កម្មវិធី \n"
+"ចាប់ផ្ដើម ។\n"
+"\n"
+
+#: prefs/ThemePrefs.cpp:140
+msgid "Saving and loading individual theme files uses a \n"
+"separate file for each image, but is otherwise the \n"
+"same idea.\n"
+"\n"
+msgstr "រក្សាទុក​ និង​ផ្ទុក​ឯកសារ​ស្បែក​នីមួយៗ​ ដោយ​ប្រើ \n"
+"ឯកសារ​ផ្សេង​សម្រាប់​រូបភាព​នីមួយៗ ប៉ុន្តែ​ម្យ៉ាងវិញ​ទៀត \n"
+"មាន​គំនិត​ដូចគ្នា ។\n"
+"\n"
+
+#: toolbars/ControlToolBar.cpp:174
+msgid "Pause"
+msgstr "ផ្អាក"
+
+#: toolbars/ControlToolBar.cpp:177
+msgid "Play"
+msgstr "ចាក់"
+
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:182
+msgid "Stop"
+msgstr "បញ្ឈប់"
+
+#: toolbars/ControlToolBar.cpp:185
+msgid "Skip to Start"
+msgstr "រំលង​ទៅ​ដើម"
+
+#: toolbars/ControlToolBar.cpp:188
+msgid "Skip to End"
+msgstr "រំលង​ទៅ​ចុង"
+
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:194
+msgid "Clean Speech"
+msgstr "Clean Speech"
+
+#: toolbars/ControlToolBar.cpp:530 toolbars/ControlToolBar.cpp:838
+msgid "Error while opening sound device. "
+msgstr "កំហុស​ខណៈពេល​​បើក​ឧបករណ៍​សំឡេង ។ "
+
+#: toolbars/ControlToolBar.cpp:696
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "ការ​ថត​នៅក្នុង​របៀប CleanSpeech មិន​អាច​ធ្វើទៅបាន​​ នៅពេល​ដែល​បទ ឬ​គម្រោង​ច្រើន​ជាង​មួយ​បានបើក ។"
+
+#: toolbars/ControlToolBar.cpp:697
+msgid "Recording not permitted"
+msgstr "មិន​បាន​អនុញ្ញាត​ឲ្យ​ថត"
+
+#: toolbars/DeviceToolBar.cpp:113 toolbars/DeviceToolBar.cpp:115
+msgid "Output Device"
+msgstr "ឧបករណ៍​លទ្ធផល"
+
+#: toolbars/DeviceToolBar.cpp:134 toolbars/DeviceToolBar.cpp:136
+msgid "Input Device"
+msgstr "ឧបករណ៍​បញ្ចូល"
+
+#: toolbars/EditToolBar.cpp:139
+msgid "Trim outside selection"
+msgstr "កាត់​តម្រឹម​ខាង​ក្រៅ​ជម្រើស"
+
+#: toolbars/EditToolBar.cpp:141
+msgid "Silence selection"
+msgstr "ជម្រើស​ស្ងាត់"
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
+msgid "Zoom In"
+msgstr "ពង្រីក"
+
+#: toolbars/EditToolBar.cpp:152
+msgid "Zoom Out"
+msgstr "បង្រួម"
+
+#: toolbars/EditToolBar.cpp:156
+msgid "Zoom Toggle"
+msgstr "បិទ/បើកការ​ពង្រីក"
+
+#: toolbars/EditToolBar.cpp:160
+msgid "Fit Selection"
+msgstr "ធ្វើ​ឲ្យ​សម​នឹង​ជម្រើស"
+
+#: toolbars/EditToolBar.cpp:160
+msgid "Fit selection in window"
+msgstr "ធ្វើ​ឲ្យ​ជម្រើស​សម​នឹង​បង្អួច"
+
+#: toolbars/EditToolBar.cpp:162
+msgid "Fit Project"
+msgstr "ធ្វើ​ឲ្យ​សម​នឹង​​​​គម្រោង"
+
+#: toolbars/EditToolBar.cpp:162
+msgid "Fit project in window"
+msgstr "ធ្វើ​ឲ្យ​គម្រោង​សម​​នៅ​ក្នុង​បង្អួច"
+
+#: toolbars/MeterToolBar.cpp:50
+msgid "Meter"
+msgstr "ម៉ែត្រ"
+
+#: toolbars/MeterToolBar.cpp:80
+msgid "Play Meter"
+msgstr "ឧបករណ៍​វាស់​ពេលចាក់"
+
+#: toolbars/MeterToolBar.cpp:81
+msgid "Meter-Play"
+msgstr "ម៉ែត្រ-ចាក់"
+
+#: toolbars/MeterToolBar.cpp:89
+msgid "Record Meter"
+msgstr "ឧបករណ៍​ចាក់​ពេលថត"
+
+#: toolbars/MeterToolBar.cpp:90
+msgid "Meter-Record"
+msgstr "ម៉ែត្រ-ថត"
+
+#: toolbars/MeterToolBar.cpp:94
+msgid "Output level meter"
+msgstr "ឧបករណ៍​វាស់​កម្រិត​លទ្ធផល"
+
+#: toolbars/MeterToolBar.cpp:95
+msgid "Input level meter - click to monitor input"
+msgstr "ឧបករណ៍​វាស់​កម្រិត​បញ្ចូល​ - ចុច​ដើម្បី​ត្រួតពិនិត្យ​ការ​បញ្ចូល"
+
+#: toolbars/MixerToolBar.cpp:91
+msgid "Output Volume"
+msgstr "សំឡេង​លទ្ធផល"
+
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
+msgstr "គ្រាប់​រំកិល​លទ្ធផល"
+
+#: toolbars/MixerToolBar.cpp:102
+msgid "Input Volume"
+msgstr "សំឡេង​ចូល"
+
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
+msgstr "គ្រាប់​រំកិល​បញ្ចូល"
+
+#: toolbars/MixerToolBar.cpp:117
+msgid "Input Source"
+msgstr "ប្រភព​ចូល"
+
+#: toolbars/SelectionBar.cpp:80
+msgid "Selection"
+msgstr "ជម្រើស"
+
+#: toolbars/SelectionBar.cpp:120 toolbars/SelectionBar.cpp:177
+msgid "Project Rate (Hz):"
+msgstr "អត្រា​គម្រោង (Hz) ៖"
+
+#: toolbars/SelectionBar.cpp:134 toolbars/SelectionBar.cpp:235
+msgid "Selection Start:"
+msgstr "ដើម​ចម្រើស ៖"
+
+#: effects/ToneGen.cpp:299 effects/ToneGen.cpp:340
+#: toolbars/SelectionBar.cpp:147 toolbars/SelectionBar.cpp:241
+msgid "Length"
+msgstr "ប្រវែង"
+
+#: toolbars/SelectionBar.cpp:157
+msgid "hidden"
+msgstr "បាន​លាក់"
+
+#: toolbars/SelectionBar.cpp:167 toolbars/SelectionBar.cpp:252
+msgid "Audio Position:"
+msgstr "ទីតាំងអូឌីយ៉ូ ៖"
+
+#: toolbars/SelectionBar.cpp:217 toolbars/SelectionBar.cpp:222
+msgid "Snap To"
+msgstr "ខ្ទាស់ទៅ"
+
+#: toolbars/SelectionBar.cpp:240
+msgid "Selection "
+msgstr "ជម្រើស"
+
+#: toolbars/SelectionBar.cpp:305
+msgid "Selection Length"
+msgstr "ប្រវែង​ជម្រើស"
+
+#: toolbars/SelectionBar.cpp:313
+msgid "Selection End"
+msgstr "ចុង​ជម្រើស"
+
+#: toolbars/ToolBar.cpp:97
+#, c-format
+msgid "Audacity %s ToolBar"
+msgstr "របារ​ឧបករណ៍​របស់ Audacity %s"
+
+#: toolbars/ToolDock.cpp:74 toolbars/ToolDock.cpp:75
+msgid "ToolDock"
+msgstr "ToolDock"
+
+#: toolbars/ToolsToolBar.cpp:63
+msgid "Click and drag to select audio"
+msgstr "ចុច និង​អូស​ដើម្បី​ជ្រើស​អូឌីយ៉ូ"
+
+#: toolbars/ToolsToolBar.cpp:64
+msgid "Click and drag to edit the amplitude envelope"
+msgstr "ចុច​ និង​អូស​ដើម្បី​កែសម្រួល​ស្រោមសំបុត្រ​អាំភ្លី"
+
+#: toolbars/ToolsToolBar.cpp:65
+msgid "Click and drag to edit the samples"
+msgstr "ចុច និង​អូស​ដើម្បី​កែសម្រួល​គំរូ"
+
+#: toolbars/ToolsToolBar.cpp:67
+msgid "Click to Zoom In, Shift-Click to Zoom Out"
+msgstr "ចុច​ដើម្បី​ពង្រីក ប្តូរ(Shift)-ចុច ដើម្បី​បង្រួម"
+
+#: toolbars/ToolsToolBar.cpp:69
+msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
+msgstr "អូស​ដើម្បី​ពង្រីក​ទៅ​ក្នុង​តំបន់ ចុច​ខាងស្តាំ​ដើម្បី​បង្រួម"
+
+#: toolbars/ToolsToolBar.cpp:71
+msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
+msgstr "ឆ្វេង=ពង្រីក ស្តាំ=បង្រួម កណ្តាល=ធម្មតា"
+
+#: toolbars/ToolsToolBar.cpp:73
+msgid "Click and drag to move a track in time"
+msgstr "ចុច និង​អូស​ដើម្បី​ផ្លាស់ទី​បទ​នៅ​ក្នុង​ពេលវេលា"
+
+#: toolbars/ToolsToolBar.cpp:90
+msgid "Tools"
+msgstr "ឧបករណ៍"
+
+#: toolbars/ToolsToolBar.cpp:147 toolbars/ToolsToolBar.cpp:182
+msgid "Selection Tool"
+msgstr "ឧបករណ៍​ជម្រើស"
+
+#: toolbars/ToolsToolBar.cpp:148
+msgid "Envelope Tool"
+msgstr "ឧបករណ៍​ស្រោមសំបុត្រ"
+
+#: toolbars/ToolsToolBar.cpp:149 toolbars/ToolsToolBar.cpp:183
+msgid "Time Shift Tool"
+msgstr "ឧបករណ៍​ប្តូរ​ពេលវេលា"
+
+#: toolbars/ToolsToolBar.cpp:150 toolbars/ToolsToolBar.cpp:185
+msgid "Zoom Tool"
+msgstr "ឧបករណ៍​ពង្រីក"
+
+#: toolbars/ToolsToolBar.cpp:151 toolbars/ToolsToolBar.cpp:184
+msgid "Draw Tool"
+msgstr "ឧបករណ៍​គូរ"
+
+#: toolbars/ToolsToolBar.cpp:152
+msgid "Multi-Tool Mode"
+msgstr "របៀប​ពហុ​ឧបករណ៍"
+
+#: toolbars/ToolsToolBar.cpp:186
+msgid "Slide Tool"
+msgstr "ឧបករណ៍​រំកិល"
+
+#: toolbars/ToolsToolBar.cpp:187
+msgid "Multi Tool"
+msgstr "ពហុ​ឧបករណ៍"
+
+#: toolbars/TranscriptionToolBar.cpp:82
+msgid "Transcription"
+msgstr "ការ​ចម្លង"
+
+#: toolbars/TranscriptionToolBar.cpp:163
+msgid "Play at selected speed"
+msgstr "ចាក់​នៅ​ល្បឿន​ដែល​បាន​ជ្រើស"
+
+#: toolbars/TranscriptionToolBar.cpp:164
+msgid "Play-at-speed"
+msgstr "ចាក់​នៅ​ល្បឿន"
+
+#: toolbars/TranscriptionToolBar.cpp:170 toolbars/TranscriptionToolBar.cpp:175
+msgid "Playback Speed"
+msgstr "ល្បឿន​ចាក់​ឡើងវិញ"
+
+#: toolbars/TranscriptionToolBar.cpp:180
+msgid "Adjust left selection to next onset"
+msgstr "​លៃតម្រូវ​ជម្រើស​ឆ្វេង​ទៅនឹង​អនសិត​​បន្ទាប់"
+
+#: toolbars/TranscriptionToolBar.cpp:181
+msgid "Left-to-On"
+msgstr "ឆ្វេង​ដើម្បី​បើក"
+
+#: toolbars/TranscriptionToolBar.cpp:183
+msgid "Adjust right selection to previous offset"
+msgstr "លៃតម្រូវ​ជម្រើស​ស្តាំ​ទៅនឹង​អុហ្វសិត​មុន"
+
+#: toolbars/TranscriptionToolBar.cpp:184
+msgid "Right-to-Off"
+msgstr "ស្តាំ​ដើម្បី​បិទ"
+
+#: toolbars/TranscriptionToolBar.cpp:186
+msgid "Adjust left selection to next offset"
+msgstr "លៃតម្រូវ​ជម្រើស​ឆ្វេង​ទៅនឹង​អុហ្វសិត​បន្ទាប់"
+
+#: toolbars/TranscriptionToolBar.cpp:187
+msgid "Left-to-Off"
+msgstr "ឆ្វេង​ដើម្បី​បិទ"
+
+#: toolbars/TranscriptionToolBar.cpp:189
+msgid "Adjust right selection to previous onset"
+msgstr "លៃតម្រូវ​ជម្រើស​ស្តាំ​ទៅនឹង​អនសិត​មុន"
+
+#: toolbars/TranscriptionToolBar.cpp:190
+msgid "Right-to-On"
+msgstr "ស្ដាំ​ដើម្បី​បើក"
+
+#: toolbars/TranscriptionToolBar.cpp:192
+msgid "Select region of sound around cursor"
+msgstr "ជ្រើស​តំបន់​សំឡេង​នៅ​ជុំវិញ​ទស្សន៍ទ្រនិច"
+
+#: toolbars/TranscriptionToolBar.cpp:193
+msgid "Select-Sound"
+msgstr "ជ្រើស​សំឡេង"
+
+#: toolbars/TranscriptionToolBar.cpp:195
+msgid "Select region of silence around cursor"
+msgstr "ជ្រើស​តំបន់​ស្ងាត់​នៅ​ជុំវិញ​ទស្សន៍​ទ្រនិច"
+
+#: toolbars/TranscriptionToolBar.cpp:196
+msgid "Select-Silence"
+msgstr "ជ្រើស​ស្ងាត់"
+
+#: toolbars/TranscriptionToolBar.cpp:198
+msgid "Automatically make labels from words"
+msgstr "បង្កើត​​ស្លាក​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ពាក្យ"
+
+#: toolbars/TranscriptionToolBar.cpp:199
+msgid "Make Labels"
+msgstr "បង្កើត​ស្លាក"
+
+#: toolbars/TranscriptionToolBar.cpp:201
+msgid "Add label at selection"
+msgstr "បន្ថែម​ស្លាក​នៅ​ជម្រើស"
+
+#: toolbars/TranscriptionToolBar.cpp:202
+msgid "Add Label"
+msgstr "បន្ថែម​ស្លាក"
+
+#: toolbars/TranscriptionToolBar.cpp:204
+msgid "Calibrate voicekey"
+msgstr "ក្រិត​​កូនសោរ​សំឡេង​តាម​ខ្នាត​"
+
+#: toolbars/TranscriptionToolBar.cpp:205
+msgid "Calibrate"
+msgstr "ក្រិត​តាម​ខ្នាត"
+
+#: toolbars/TranscriptionToolBar.cpp:209
+msgid "Adjust Sensitivity"
+msgstr "លៃតម្រូវ​ភាព​យល់ដឹង"
+
+#: toolbars/TranscriptionToolBar.cpp:214
+msgid "Sensitivity"
+msgstr "ភាព​យល់ដឹង"
+
+#: toolbars/TranscriptionToolBar.cpp:219
+msgid "Energy"
+msgstr "ថាមពល"
+
+#: toolbars/TranscriptionToolBar.cpp:220
+msgid "Sign Changes (Low Threshold)"
+msgstr "សញ្ញា​ផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ទាប)"
+
+#: toolbars/TranscriptionToolBar.cpp:221
+msgid "Sign Changes (High Threshold)"
+msgstr "សញ្ញាផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ខ្ពស់)"
+
+#: toolbars/TranscriptionToolBar.cpp:222
+msgid "Direction Changes (Low Threshold)"
+msgstr "ទិសផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ទាប)"
+
+#: toolbars/TranscriptionToolBar.cpp:223
+msgid "Direction Changes (High Threshold)"
+msgstr "ទិសផ្លាស់ប្តូរ (កម្រិត​ពន្លឺ​ខ្ពស់)"
+
+#: toolbars/TranscriptionToolBar.cpp:231
+msgid "Key type"
+msgstr "ប្រភេទ​គ្រាប់ចុច"
+
+#: widgets/AButton.cpp:302
+msgid " (disabled)"
+msgstr " (បិទ)"
+
+#: widgets/AButton.cpp:447
+msgid "Press"
+msgstr "ចុច"
+
+#: widgets/AButton.cpp:526
+msgid "Button"
+msgstr "ប៊ូតុង"
+
+#. i18n-hint: One-letter abbreviation for Left, in VU Meter
+#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#: widgets/ASlider.cpp:604 widgets/Meter.cpp:211
+msgid "L"
+msgstr "ឆ្វេង"
+
+#. i18n-hint: One-letter abbreviation for Right, in VU Meter
+#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#: widgets/ASlider.cpp:607 widgets/Meter.cpp:213
+msgid "R"
+msgstr "ស្តាំ"
+
+#: widgets/ASlider.cpp:670
+msgid "Center"
+msgstr "កណ្តាល"
+
+#: widgets/ASlider.cpp:674
+msgid "Left"
+msgstr "ឆ្វេង"
+
+#: widgets/ASlider.cpp:677
+msgid "Right"
+msgstr "ស្តាំ"
+
+#: widgets/ErrorDialog.cpp:73 widgets/ErrorDialog.cpp:97
+msgid "Help"
+msgstr "ជំនួយ"
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:190
+msgid "Help on the Internet"
+msgstr "ជំនួយ​នៅ​លើ​អ៊ីនធឺណិត"
+
+#: widgets/Grabber.cpp:62
+msgid "Grabber"
+msgstr "ឧបករណ៍​ចាប់​យក"
+
+#: widgets/Grid.cpp:635
+#, c-format
+msgid "%d rows, %d columns"
+msgstr "%d ជួរដេក %d ជួរឈរ"
+
+#: widgets/Grid.cpp:641 widgets/Grid.cpp:768
+#, c-format
+msgid "Row %d"
+msgstr "ជួរ​ដេក %d"
+
+#: widgets/Grid.cpp:783
+msgid "Empty"
+msgstr "ទទេ"
+
+#: widgets/Meter.cpp:342
+msgid "Enable Meter"
+msgstr "អនុញ្ញាត​ម៉ែត្រ"
+
+#: widgets/Meter.cpp:344
+msgid "Disable Meter"
+msgstr "មិន​អនុញ្ញាត​ម៉ែត្រ"
+
+#: widgets/Meter.cpp:347
+msgid "Stop Monitoring"
+msgstr "ឈប់​ត្រួតពិនិត្យ"
+
+#: widgets/Meter.cpp:349
+msgid "Start Monitoring"
+msgstr "ចាប់ផ្តើម​ត្រួតពិនិត្យ"
+
+#: widgets/Meter.cpp:353
+msgid "Horizontal Stereo"
+msgstr "ស្តេរ៉េអូ​ផ្ដេក"
+
+#: widgets/Meter.cpp:354
+msgid "Vertical Stereo"
+msgstr "ស្តេរ៉េអូ​បញ្ឈរ"
+
+#: widgets/Meter.cpp:371
+msgid "Preferences..."
+msgstr "​ចំណូលចិត្ត..."
+
+#: widgets/Meter.cpp:872
+msgid "Mix Volume"
+msgstr ""
+
+#: widgets/Meter.cpp:1061
+msgid "This determines how often the meter is refreshed.\n"
+"If you have a slower PC you may want to select a\n"
+"lower refresh rate (30 per second or lower), so that\n"
+"audio qualtiy is not affected by the meter display."
+msgstr "វា​កំណត់​ថាតើ​ម៉ែត្រ​ត្រូវ​បាន​ធ្វើ​ឲ្យ​ស្រស់​ក្នុង​រយៈពេលប៉ុន្មាន ។\n"
+"ប្រសិន​បើ​អ្នក​មាន​កុំព្យូទ័រ​យឺត អ្នក​​ត្រូវ​ជ្រើស\n"
+"អត្រា​ធ្វើ​ឲ្យស្រស់​ទាប (៣០ ក្នុង​មួយ​វិនាទី ឬ​ទាប​ជាង​នេះ) ដូច្នេះ\n"
+"គុណភាព​អូឌីយ៉ូ​មិន​ត្រូវ​បាន​ប៉ះពាល់​ដោយ​ការ​បង្ហាញ​ម៉ែត្រ​ទេ ។"
+
+#: widgets/Meter.cpp:1062
+msgid "Meter refresh rate per second [1-100]: "
+msgstr "អត្រា​ធ្វើ​ឲ្យ​ម៉ែត្រ​ស្រស់ក្នុង​មួយ​វិនាទី​ [១-១០០] ៖ "
+
+#: widgets/Meter.cpp:1063
+msgid "Meter Preferences"
+msgstr "ចំណូលចិត្ត​ម៉ែត្រ"
+
+#: widgets/MultiDialog.cpp:82
+msgid " Please select an action "
+msgstr "សូមជ្រើស​អំពើ"
+
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1058
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1078
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:1095
+msgid "Cancel"
+msgstr ""
+
+#: widgets/Ruler.cpp:1138 widgets/Ruler.cpp:1139
+msgid "Vertical Ruler"
+msgstr "បន្ទាត់​បញ្ឈរ"
+
+#. i18n-hint: These strings control the formatting of time units in the
+#. * display. They are fairly complex, see the comments in
+#. * widgets/TimeTextCtrl.cpp for how they work
+#: widgets/TimeTextCtrl.cpp:201
+msgid "01000,01000 seconds"
+msgstr "01000,01000 វិនាទី"
+
+#: widgets/TimeTextCtrl.cpp:203
+msgid "0100 h 060 m 060 s"
+msgstr "0100 ម៉ោង 060 នាទី 060 វិនាទី"
+
+#: widgets/TimeTextCtrl.cpp:204
+msgid "dd:hh:mm:ss"
+msgstr "dd:hh:mm:ss"
+
+#: widgets/TimeTextCtrl.cpp:205
+msgid "0100 days 024 h 060 m 060 s"
+msgstr "0100 ថ្ងៃ 024 ម៉ោង 060 នាទី 060 វិនាទី"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#: widgets/TimeTextCtrl.cpp:206
+msgid "hh:mm:ss + milliseconds"
+msgstr "hh:mm:ss + មិល្លីវិនាទី"
+
+#: widgets/TimeTextCtrl.cpp:207
+msgid "0100 h 060 m 060.01000 s"
+msgstr "0100 ម៉ោង 060 នាទី 060.01000 វិនាទី"
+
+#: widgets/TimeTextCtrl.cpp:208
+msgid "hh:mm:ss + samples"
+msgstr "hh:mm:ss + គំរូ"
+
+#: widgets/TimeTextCtrl.cpp:209
+msgid "0100 h 060 m 060 s+.# samples"
+msgstr "0100 ម៉ោង 060 នាទី 060 វិនាទី+.# គំរូ"
+
+#: widgets/TimeTextCtrl.cpp:210
+msgid "samples"
+msgstr "គំរូ"
+
+#: widgets/TimeTextCtrl.cpp:211
+msgid "01000,01000,01000 samples|#"
+msgstr "01000,01000,01000 គំរូ|#"
+
+#: widgets/TimeTextCtrl.cpp:212
+msgid "hh:mm:ss + film frames (24 fps)"
+msgstr "hh:mm:ss + ស៊ុម​ហ្វីល (២៤ fps)"
+
+#: widgets/TimeTextCtrl.cpp:213
+msgid "0100 h 060 m 060 s+.24 frames"
+msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វិនាទី+.២៤ ស៊ុម"
+
+#: widgets/TimeTextCtrl.cpp:214
+msgid "film frames (24 fps)"
+msgstr "ស៊ុមហ្វិល (២៤ fps)"
+
+#: widgets/TimeTextCtrl.cpp:215
+msgid "01000,01000 frames|24"
+msgstr "០១០០០,០១០០០ ស៊ុម|២៤"
+
+#: widgets/TimeTextCtrl.cpp:216
+msgid "hh:mm:ss + NTSC drop frames"
+msgstr "hh:mm:ss + NTSC ទម្លាក់​ស៊ុម"
+
+#: widgets/TimeTextCtrl.cpp:217
+msgid "0100 h 060 m 060 s+.30 frames|N"
+msgstr "0100 ម៉ោង 060 នាទី 060 វិនាទី+.30 ស៊ុម|N"
+
+#: widgets/TimeTextCtrl.cpp:218
+msgid "hh:mm:ss + NTSC non-drop frames"
+msgstr "hh:mm:ss + NTSC មិន​ទម្លាក់​ស៊ុម"
+
+#: widgets/TimeTextCtrl.cpp:219
+msgid "0100 h 060 m 060 s+.030 frames| .999000999"
+msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វិនាទី+.០៣០ ស៊ុម| .៩៩៩០០០៩៩៩"
+
+#: widgets/TimeTextCtrl.cpp:220
+msgid "NTSC frames"
+msgstr "ស៊ុម NTSC"
+
+#: widgets/TimeTextCtrl.cpp:221
+msgid "01000,01000 frames|29.97002997"
+msgstr "០១០០០,០១០០០ ស៊ុម|២៩.៩៧០០២៩៩៧"
+
+#: widgets/TimeTextCtrl.cpp:222
+msgid "hh:mm:ss + PAL frames (25 fps)"
+msgstr "hh:mm:ss + ស៊ុម PAL​ (២៥ fps)"
+
+#: widgets/TimeTextCtrl.cpp:223
+msgid "0100 h 060 m 060 s+.25 frames"
+msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វនាទី+.២៥ ស៊ុម"
+
+#: widgets/TimeTextCtrl.cpp:224
+msgid "PAL frames (25 fps)"
+msgstr "ស៊ុម PAL (២៥ fps)"
+
+#: widgets/TimeTextCtrl.cpp:225
+msgid "01000,01000 frames|25"
+msgstr "០១០០០,០១០០០ ស៊ុម|២៥"
+
+#: widgets/TimeTextCtrl.cpp:226
+msgid "hh:mm:ss + CDDA frames (75 fps)"
+msgstr "hh:mm:ss + ស៊ុម​ CDDA (75 fps)"
+
+#: widgets/TimeTextCtrl.cpp:227
+msgid "0100 h 060 m 060 s+.75 frames"
+msgstr "០១០០ ម៉ោង ០៦០ នាទី ០៦០ វិនាទី+.75 ស៊ុម"
+
+#: widgets/TimeTextCtrl.cpp:228
+msgid "CDDA frames (75 fps)"
+msgstr "ស៊ុម CDDA (75 fps)"
+
+#: widgets/TimeTextCtrl.cpp:229
+msgid "01000,01000 frames|75"
+msgstr "01000,01000 ស៊ុម|75"
+
+#: widgets/TimeTextCtrl.cpp:366
+msgid "Use right mouse button or context key to change format"
+msgstr "ប្រើ​ប៊ូតុង​កណ្តុរ​​ស្តាំ​​ ឬ​គ្រាប់​ចុច​បរិបទ​ដើម្បី​ផ្លាស់ប្តូរ​ទ្រង់ទ្រាយ"
+
+#: widgets/TimeTextCtrl.cpp:1380
+msgid "Time Control"
+msgstr "គ្រប់គ្រង​ពេលវេលា"
+
+#: widgets/Warning.cpp:64
+msgid "Don't show this warning again"
+msgstr "កុំ​បង្ហាញ​ការ​ព្រមាន​នេះ​ម្តងទៀត"
+
+#: xml/XMLFileReader.cpp:49
+#, c-format
+msgid "Could not open file: \"%s\""
+msgstr "មិន​អាច​បើក​ឯកសារ ៖ \"%s\""
+
+#: xml/XMLFileReader.cpp:63
+#, c-format
+msgid "Error: %hs at line %lu"
+msgstr ""
+
+#: xml/XMLFileReader.cpp:79
+#, c-format
+msgid "Could not load file: \"%s\""
+msgstr "មិនអាច​ផ្ទុក​ឯកសារ ៖ \"%s\""
+
diff --git a/locale/ko.po b/locale/ko.po
index e511f49..e70df8d 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -22,34 +22,24 @@ msgstr "Project-Id-Version: Audacity 1.3.3\n"
 msgid "&About Audacity..."
 msgstr "Audacity ì •ë³´(&A)..."
 
-#: AboutDialog.cpp:148
-#: effects/AvcCompressor.cpp:674
-msgid "Enabled"
-msgstr "사용"
-
-#: AboutDialog.cpp:149
-msgid "Disabled"
-msgstr "사용하지 않음"
-
-#: AboutDialog.cpp:205
-msgid "Program build date: "
-msgstr "프로그램 빌드 일자: "
-
-#: AboutDialog.cpp:210
-msgid "Settings folder: "
-msgstr "폴더 설정: "
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
+msgstr ""
 
-#: AboutDialog.cpp:215
-msgid "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."
-msgstr "Audacity는 세계의 자원 봉사 개발자들에 의해 쓰여진 무료 프로그램입니다. 아울러 오픈 소스 프로젝트 무료 도구 온라인 서비스를 제공하는 SourceForge.net에 감사드립니다. Audacity는 윈도우즈 98 및 그 이후 버전, 맥 OS, 리눅스, 기타 유닉스 유사 운영 체제를 지원합니다. 구버전의 Audacity는 맥 OS 9를 지원합니다."
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
-#: AboutDialog.cpp:219
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "이 프로그램은 베타 버전입니다. 버그 및 구현이 완료되지 않은 일부 기능이 포함될 수 있습니다. 웹사이트를 방문하여 버그 보고 및 기능 제안을 해 주시기를 기대합니다."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:222
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "이 버전은 정식 출시된 안정된 버전입니다. 만약 버그나 기능 제안이 있으면 꼭 알려주십시오. Audacity를 개선시키기 위해 사용자 보고에 많이 의존하고 있습니다. 더 많은 정보는 웹사이트를 방문해 주십시오."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -62,13 +52,9 @@ msgstr "이 버전은 정식 출시된 안정된 버전입니다. 만약 버그
 msgid "translator_credits"
 msgstr "번역"
 
-#: AboutDialog.cpp:247
-msgid "A Free Digital Audio Editor"
-msgstr "무료 디지털 오디오 편집기"
-
-#: AboutDialog.cpp:251
-msgid "Information"
-msgstr "ì •ë³´"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:253
 msgid "Credits"
@@ -104,26 +90,118 @@ msgstr "Audacity는 다음 프로젝트로부터의 코드에 기초함:"
 msgid "Special thanks:"
 msgstr "특별히 감사할 분:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: AboutDialog.cpp:148
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "사용"
+
+#: AboutDialog.cpp:149
+msgid "Disabled"
+msgstr "사용하지 않음"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
 msgstr ""
 
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:205
+msgid "Program build date: "
+msgstr "프로그램 빌드 일자: "
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:210
+msgid "Settings folder: "
+msgstr "폴더 설정: "
+
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: Dependencies.cpp:308
-#: FreqWindow.cpp:209
-msgid "Close"
-msgstr "닫기"
-
 #: AudacityApp.cpp:418
 #: Project.cpp:1654
 #, c-format
@@ -335,12 +413,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr "프로젝트 복구"
 
-#: AutoRecovery.cpp:113
-msgid "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?"
-msgstr "복구할 프로젝트가 선택되지 않았습니다. 이후에는 복구가 불가능합니다. 정말 복구하지 않고 계속 하시겠습니까?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132
@@ -392,8 +471,9 @@ msgstr "인수(&P)"
 msgid "C&hoose command"
 msgstr "명령 선택(&h)"
 
-#: BatchCommands.cpp:472
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
 msgstr "스테레오에서 모노 효과를 찾지 못함"
 
 #: BatchCommands.cpp:490
@@ -446,6 +526,10 @@ msgstr "%s 적용"
 msgid "Apply Chain"
 msgstr "체인 적용"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "체인 선택(&S)"
@@ -529,10 +613,18 @@ msgstr "'%s' 을(를) 현재 프로젝트에 적용 중"
 msgid "Please save and close the current project first."
 msgstr "먼저 현재 프로젝트를 저장한 후 닫으십시오."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "일괄 처리 파일 선택..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "모든 파일 (*.*)|*.*|WAV 파일 (*.wav)|*.wav|AIFF 파일 (*.aif)|*.aif|AU 파일 (*.au)|*.au|MP3 파일 (*.mp3)|*.mp3|Ogg Vorbis 파일 (*.ogg)|*.ogg|FLAC 파일 (*.flac)|*.flac"
@@ -760,16 +852,16 @@ msgstr "'%s'을(를) 제거할 수 없습니다"
 msgid "Renamed file: %s\n"
 msgstr "파일 이름 바꾸기: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "%s 블록 변경 중\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "'%s' 에서 '%s'(으)로 이름을 변경할 수 없습니다"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -925,6 +1017,95 @@ msgstr "디스크로 녹음된 오디오 저장 중..."
 msgid "Rectangular"
 msgstr "직사각형"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:958
+#, c-format
+msgid "Location of %s:"
+msgstr "%s 위치:"
+
+#: export/ExportMP3.cpp:967
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "%s을(를) 찾으려면 이곳을 누르십시오 -->"
+
+#: export/ExportMP3.cpp:973
+msgid "Browse..."
+msgstr "찾아보기..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:1011
+#, c-format
+msgid "Where is %s?"
+msgstr "%s은(는) 어디에 있습니까?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "주파수 분석"
@@ -953,8 +1134,9 @@ msgstr "향상된 자동 상관관계"
 msgid "Cepstrum"
 msgstr "캡스트럼"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "알고리즘:"
 
 #: FreqWindow.cpp:168
@@ -968,9 +1150,9 @@ msgstr "크기"
 msgid " window"
 msgstr " ì°½"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "기능:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -980,9 +1162,9 @@ msgstr "선형 주파수"
 msgid "Log frequency"
 msgstr "로그 주파수"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "축:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:130
@@ -991,6 +1173,17 @@ msgstr "축:"
 msgid "&Export..."
 msgstr "내보내기(&E)..."
 
+#: export/ExportCL.cpp:188
+#: export/ExportOGG.cpp:121
+#: export/ExportPCM.cpp:114
+msgid "Export"
+msgstr "내보내기"
+
+#: Dependencies.cpp:308
+#: FreqWindow.cpp:209
+msgid "Close"
+msgstr "닫기"
+
 #: FreqWindow.cpp:272
 #: FreqWindow.cpp:395
 #: effects/AutoDuck.cpp:487
@@ -1064,7 +1257,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "래그 (초)\t주파수 (Hz)\t레벨"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -1080,15 +1273,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -1099,40 +1308,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: HistoryWindow.cpp:53
@@ -1373,6 +1606,10 @@ msgstr "프로젝트 저장(&S)\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "다른 이름으로 프로젝트 저장(&A)..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:224
 msgid "Chec&k Dependencies..."
 msgstr "의존성 검사(&k)..."
@@ -1381,6 +1618,10 @@ msgstr "의존성 검사(&k)..."
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:237
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "오디오(&A)...\tCtrl+Shift+I"
@@ -1410,11 +1651,27 @@ msgstr "라벨 내보내기(&L)..."
 msgid "Export &Multiple..."
 msgstr "다중으로 내보내기(&M)..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:289
 #: Menus.cpp:303
 msgid "Edit C&hains..."
 msgstr "체인 편집(&h)..."
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:301
 msgid "Appl&y Chain..."
 msgstr "체인 적용(&y)..."
@@ -1479,9 +1736,9 @@ msgstr "삭제(&D)\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "분할 삭제(&e)\tCtrl+Alt+K"
 
-#: Menus.cpp:385
-msgid "&Silence\tCtrl+L"
-msgstr "무음(&S)\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:387
 msgid "Sp&lit\tCtrl+I"
@@ -1495,23 +1752,21 @@ msgstr "새 분할(&w)\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "합치기(&J)\tCtrl+J"
 
-#: Menus.cpp:398
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "분리(&o)\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:400
 msgid "Duplic&ate\tCtrl+D"
 msgstr "사본 생성(&a)\tCtrl+D"
 
-#: Menus.cpp:406
-#: Menus.cpp:610
-#: effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
-msgstr "스테레오에서 모노로(&S)"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:413
-msgid "Labeled Re&gions..."
-msgstr "라벨 영역(&g)..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:415
@@ -1554,13 +1809,13 @@ msgid "&Join\tAlt+J"
 msgstr "ê²°í•©(&J)\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:457
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "분리(&o)\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:463
-msgid "&Select..."
-msgstr "선택(&S)..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:464
 msgid "&All\tCtrl+A"
@@ -1570,65 +1825,69 @@ msgstr "모두 선택(&A)\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr "선택 없음(&N)\tCtrl+Shift+A"
 
-#: Menus.cpp:469
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
 msgstr "현재 커서 위치에서 왼쪽 경계 지정\t["
 
-#: Menus.cpp:470
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
 msgstr "현재 커서 위치에서 오른쪽 경계 지정\t]"
 
-#: Menus.cpp:474
-msgid "Start to Cursor"
-msgstr "처음부터 커서 위치까지 선택"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: Menus.cpp:475
-msgid "Cursor to End"
-msgstr "커서 위치부터 끝까지 선택"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:481
 msgid "Find &Zero Crossings\tZ"
 msgstr "0 교차 찾기(&Z)\tZ"
 
-#: Menus.cpp:483
-msgid "Mo&ve Cursor..."
-msgstr "커서 이동(&v)..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: Menus.cpp:485
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "선택 부분의 시작 위치"
 
-#: Menus.cpp:486
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "선택 부분의 종료 위치"
 
-#: Menus.cpp:490
-msgid "to Track Start"
-msgstr "트랙의 시작 위치"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: Menus.cpp:491
-msgid "to Track End"
-msgstr "트랙의 종료 위치"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: Menus.cpp:498
-msgid "Selection Save"
-msgstr "선택 부분 저장"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: Menus.cpp:499
-msgid "Selection Restore"
-msgstr "선택 부분 복원"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:515
-msgid "Play &Region..."
-msgstr "영역 재생(&R)..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
-#: Menus.cpp:516
-msgid "Lock"
-msgstr "잠금"
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr ""
 
-#: Menus.cpp:517
-msgid "Unlock"
-msgstr "잠금 해제"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr ""
 
 #: Menus.cpp:523
 msgid "Turn Snap-To On"
@@ -1646,9 +1905,14 @@ msgstr "그리드 스냅 켜기"
 msgid "Turn Grid Snap Off"
 msgstr "그리드 스냅 끄기"
 
-#: Menus.cpp:535
-msgid "&Preferences...\tCtrl+P"
-msgstr "설정(&P)...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:545
 msgid "&View"
@@ -1686,77 +1950,131 @@ msgstr "모든 트랙 감추기(&C)\tCtrl+Shift+C"
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "모든 트랙 보이기(&x)\tCtrl+Shift+X"
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: Menus.cpp:568
 msgid "&History..."
 msgstr "히스토리(&H)..."
 
-#: Menus.cpp:573
-msgid "&Toolbars..."
-msgstr "도구 모음(&T)..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
-#: Menus.cpp:574
-#: Menus.cpp:1151
-#: Menus.cpp:1152
-msgid "Control Toolbar"
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
 msgstr "제어 도구 모음"
 
-#: Menus.cpp:575
-#: Menus.cpp:1155
-#: Menus.cpp:1156
-msgid "Device Toolbar"
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
 msgstr "장치 도구 모음"
 
-#: Menus.cpp:576
-#: Menus.cpp:1159
-#: Menus.cpp:1160
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
 msgstr "편집 도구 모음"
 
-#: Menus.cpp:577
-#: Menus.cpp:1163
-#: Menus.cpp:1164
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
 msgstr "미터 도구 모음"
 
-#: Menus.cpp:578
-#: Menus.cpp:1167
-#: Menus.cpp:1168
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
 msgstr "믹서 도구 모음"
 
-#: Menus.cpp:579
-#: Menus.cpp:1171
-#: Menus.cpp:1172
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
 msgstr "선택 도구 모음"
 
-#: Menus.cpp:580
-#: Menus.cpp:1175
-#: Menus.cpp:1176
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
 msgstr "도구 도구 모음"
 
-#: Menus.cpp:581
-#: Menus.cpp:1179
-#: Menus.cpp:1180
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
 msgstr "편곡 도구 모음"
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:827
+msgid "Skip to Start\tHome"
+msgstr "시작까지 건너뛰기\tHome"
+
+#: Menus.cpp:828
+msgid "Skip to End\tEnd"
+msgstr "종료까지 건너뛰기\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:591
 msgid "&Tracks"
 msgstr "트랙(&T)"
 
-#: Menus.cpp:598
-msgid "Add &New..."
-msgstr "새로 추가(&N)..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:599
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1771,16 +2089,10 @@ msgstr "스테레오 트랙(&S)"
 msgid "&Time Track"
 msgstr "시간 트랙(&T)"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
-#: Menus.cpp:614
-#: Menus.cpp:3698
-#: Mix.cpp:119
-msgid "&Mix and Render"
-msgstr "믹스 및 렌더(&M)"
-
 #: Menus.cpp:564
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr ""
@@ -1793,6 +2105,14 @@ msgstr "리샘플링(&R)..."
 msgid "Remo&ve Tracks"
 msgstr "트랙 제거(&v)"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: Menus.cpp:635
 msgid "Align with &Zero"
 msgstr "0점 정렬(&Z)"
@@ -1809,29 +2129,41 @@ msgstr "선택 부분의 시작 위치로 정렬(&S)"
 msgid "Align with Selection &End"
 msgstr "선택 부분의 종료 위치로 정렬(&E)"
 
-#: Menus.cpp:639
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "현재 커서 위치에 종료 부분 정렬"
 
-#: Menus.cpp:640
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "선택 부분의 시작 위치에 종료 부분 정렬"
 
-#: Menus.cpp:641
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "선택 부분의 종료 위치에 종료 부분 정렬"
 
-#: Menus.cpp:642
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "트랙 공동 정렬"
 
-#: Menus.cpp:644
-msgid "&Align Tracks..."
-msgstr "트랙 정렬(&A)..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
 
-#: Menus.cpp:653
-msgid "Ali&gn And Move Cursor..."
-msgstr "정렬 및 커서 이동(&g)..."
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:661
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1841,22 +2173,26 @@ msgstr "선택 부분에 라벨 추가(&L)\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "재생 위치에 라벨 추가(&P)\tCtrl+M"
 
-#: Menus.cpp:668
-msgid "S&ort tracks by..."
-msgstr "트랙 정렬(&o)..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:669
-msgid "&Start time"
-msgstr "시작 시간순(&S)"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:671
-msgid "&Name"
-msgstr "이름순(&N)"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:681
 msgid "&Generate"
 msgstr "생성(&G)"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:704
 msgid "Effe&ct"
 msgstr "효과(&c)"
@@ -1891,6 +2227,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1903,13 +2243,13 @@ msgstr "벤치마크 실행(&R)..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:800
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Dock을 통해 싸이클 뒤로, 트랙 보기 및 선택바\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:801
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Dock을 통해 싸이클 앞으로, 트랙 보기 및 선택바\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:804
 msgid "Selection Tool\tF1"
@@ -1943,9 +2283,9 @@ msgstr "다음 도구\tD"
 msgid "Previous Tool\tA"
 msgstr "이전 도구\tA"
 
-#: Menus.cpp:814
-msgid "Play/Stop\tSpacebar"
-msgstr "재생/중지\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:815
 msgid "Stop\tS"
@@ -1959,13 +2299,13 @@ msgstr "일시 멈춤\tP"
 msgid "Record\tR"
 msgstr "녹음\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:819
-msgid "Stop and Select\tShift+A"
-msgstr "중지 후 선택\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr ""
 
 #: Menus.cpp:821
 msgid "Play One Second\t1"
@@ -1979,22 +2319,14 @@ msgstr "선택 부분까지 재생\tB"
 msgid "Play Looped\tL"
 msgstr "구간 재생\tL"
 
-#: Menus.cpp:824
-msgid "Play Looped\tShift+Spacebar"
-msgstr "구간 재생\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:825
 msgid "Play Cut Preview\tC"
 msgstr "잘라내기 미리 듣기 재생\tC"
 
-#: Menus.cpp:827
-msgid "Skip to Start\tHome"
-msgstr "시작까지 건너뛰기\tHome"
-
-#: Menus.cpp:828
-msgid "Skip to End\tEnd"
-msgstr "종료까지 건너뛰기\tEnd"
-
 #: Menus.cpp:830
 msgid "Selection to Start\tShift+Home"
 msgstr "시작 선택 부분\tShift+Home"
@@ -2051,9 +2383,9 @@ msgstr "선택 트랙 토글\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "선택 트랙 토글\tNUMPAD_ENTER"
 
-#: Menus.cpp:857
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "선택 트랙 토글\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:859
 msgid "Cursor Left\tLeft"
@@ -2151,15 +2483,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:890
 msgid "Open Recent"
 msgstr "최근 파일 열기"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:893
-msgid "Recent &Files..."
-msgstr "최근 파일(&F)..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:940
 #, c-format
@@ -2216,6 +2552,23 @@ msgstr "%s 반복\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "내보낼 라벨 트랙이 없습니다."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2224
 msgid "Nothing to undo"
 msgstr "되돌리기 대상 없음"
@@ -2259,6 +2612,10 @@ msgstr "클립보드로부터 텍스트 붙여넣기"
 msgid "Pasted from the clipboard"
 msgstr "클립보드로부터 붙여넣기"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2550
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "스테레오 오디오는 모노 트랙으로 복사할 수 없습니다."
@@ -2428,9 +2785,9 @@ msgstr "라벨 가져오기"
 msgid "Select a MIDI file..."
 msgstr "미디 파일 선택..."
 
-#: Menus.cpp:3566
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "모든 파일 (*.*)|*.*|미디 파일 (*.mid)|*.mid|알레그로 파일 (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3582
 #, c-format
@@ -2449,15 +2806,6 @@ msgstr "압축되지 않은 오디오 파일 선택..."
 msgid "All files (*)|*"
 msgstr "모든 파일 (*)|*"
 
-#: Menus.cpp:3616
-#: Project.cpp:2419
-#: Project.cpp:2444
-#: import/ImportPCM.cpp:405
-#: import/ImportPCM.cpp:449
-#: import/ImportRaw.cpp:446
-msgid "Import"
-msgstr "가져오기"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2489,6 +2837,12 @@ msgstr "하나의 새 스테레오 트랙으로 %d 트랙이 믹스 및 랜더
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "하나의 새 모노 트랙으로 %d 트랙이 믹스 및 랜더링 됨"
 
+#: Menus.cpp:614
+#: Menus.cpp:3698
+#: Mix.cpp:119
+msgid "&Mix and Render"
+msgstr "믹스 및 렌더(&M)"
+
 #: Menus.cpp:3815
 msgid "Aligned with zero"
 msgstr "0점에 정렬됨"
@@ -2525,6 +2879,14 @@ msgstr "정렬됨"
 msgid "Align"
 msgstr "ì •ë ¬"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3899
 msgid "Created new audio track"
 msgstr "새 오디오 트랙 생성됨"
@@ -2591,14 +2953,14 @@ msgid "Removed audio track(s)"
 msgstr "개의 오디오 트랙 제거됨"
 
 #: Menus.cpp:4380
-msgid "Enter new samplerate:"
-msgstr "새 샘플링 속도 입력:"
-
-#: Menus.cpp:4380
 #: Menus.cpp:4399
 msgid "Resample"
 msgstr "리샘플링"
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4386
 msgid "The entered value is invalid"
 msgstr "유효하지 않은 값"
@@ -2665,14 +3027,13 @@ msgstr "녹음된 오디오"
 msgid "Save changes before closing?"
 msgstr "프로그램을 종료하기 전에 저장하시겠습니까?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: Project.cpp:1457
@@ -2692,6 +3053,25 @@ msgstr "하나 또는 여러 오디오 파일 선택..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2035
+msgid "Opening old project file"
+msgstr "구 프로젝트 파일을 여는 중"
+
 #: Project.cpp:1704
 #: Project.cpp:1712
 msgid "Error opening file"
@@ -2751,41 +3131,34 @@ msgstr "이 파일은 Audacity %s (으)로 저장되었습니다.\n"
 msgid "Can't open project file"
 msgstr "프로젝트 파일을 열 수 없음"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:2035
-msgid "Opening old project file"
-msgstr "구 프로젝트 파일을 여는 중"
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
 
-#: Project.cpp:2258
+#: Project.cpp:2591
 #, c-format
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "프로젝트를 저장할 수 없습니다.\n"
-"%s 에 저장할 수 없거나 공간이 부족합니다."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: Project.cpp:2260
 #: Project.cpp:2274
@@ -2797,22 +3170,20 @@ msgstr "프로젝트 저장 중 오류"
 msgid "Saved %s"
 msgstr "%s 저장됨"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2352
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: Project.cpp:2418
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s' 가져옴"
 
+#: Menus.cpp:3616
+#: Project.cpp:2419
+#: Project.cpp:2444
+#: import/ImportPCM.cpp:405
+#: import/ImportPCM.cpp:449
+#: import/ImportRaw.cpp:446
+msgid "Import"
+msgstr "가져오기"
+
 #: Project.cpp:2458
 msgid "Error importing"
 msgstr "가져오는 중 오류"
@@ -2825,17 +3196,23 @@ msgstr "다른 이름으로 스피치 저장:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "윈도우즈 PCM 오디오 파일 (*.wav)|*.wav"
 
-#: Project.cpp:2507
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity 프로젝트 (.aup) 파일은 화면 상에 표시된 모든 작업을 정확히 저장합니다.\n"
-"단, 대부분의 응용 프로그램은 Audacity 프로젝트 파일을 열 수 없습니다.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"다른 응용 프로그램에서 열 수 있는 파일로 저장하려면\n"
-"내보내기 명령 중 하나를 선택하십시오."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2510
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2880,6 +3257,16 @@ msgstr "남은 디스크 녹음 공간: %d 초"
 msgid "Out of disk space"
 msgstr "빈 공간 없음"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3161
 msgid "Could not remove old autosave file: "
 msgstr "구 자동 저장 파일을 제거할 수 없음: "
@@ -2970,45 +3357,14 @@ msgstr "미리 듣기(&v)"
 msgid "&Debug"
 msgstr "디버그(&D)"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity 타이머 기록"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr "길이"
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity 스마트 녹음 진행"
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr "시작 일자 및 시간"
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr "종료 일자 및 시간"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity 스마트 녹음 - 시작 대기 중"
-
 #: SplashDialog.cpp:58
 msgid "&Welcome to Audacity!"
 msgstr ""
@@ -3048,8 +3404,8 @@ msgstr "장르"
 msgid "Comments"
 msgstr "주석"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -3068,12 +3424,12 @@ msgstr "비우기(&C)"
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -3118,103 +3474,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: Tags.cpp:701
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "'%s' 속성의 최대 길이는 %d 자입니다. 데이터가 일부 정리되었습니다."
-
-#: Tags.cpp:707
-#: Tags.cpp:917
-msgid "Title"
-msgstr "제목"
-
-#: Tags.cpp:717
-#: Tags.cpp:927
-msgid "Artist"
-msgstr "ìž‘ê°€"
-
-#: Tags.cpp:727
-#: Tags.cpp:937
-msgid "Album"
-msgstr "앨범"
-
 #: Theme.cpp:628
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3295,9 +3567,52 @@ msgstr "다음 위치에 파일이:\n"
 "  %s\n"
 "이미 존재합니다."
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "시간 지정"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr "길이"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity 타이머 기록"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr "시작 일자 및 시간"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr "종료 일자 및 시간"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: TrackPanel.cpp:452
 #: TrackPanel.cpp:453
@@ -3340,6 +3655,10 @@ msgstr "파형"
 msgid "Waveform (dB)"
 msgstr "파형 (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: TrackPanel.cpp:512
 msgid "Pitch (EAC)"
 msgstr "피치 (EAC)"
@@ -3491,13 +3810,13 @@ msgstr "시간이 %s %.02f 초의 트랙/클립으로 이동됨"
 msgid "Time-Shift"
 msgstr "시간-이동"
 
-#: TrackPanel.cpp:2700
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "현재 그리기는 선형-보기 파형에서만 동작됩니다."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: TrackPanel.cpp:2717
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "확대가 충분하지 않습니다. 개별 샘플이 보일 때까지 확대하십시오."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: TrackPanel.cpp:2988
 msgid "Moved Sample"
@@ -3589,6 +3908,14 @@ msgstr "조정된 팬"
 msgid "Adjusted gain"
 msgstr "조정된 게인"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5432
 msgid "Can't delete track with active audio"
 msgstr "활성 오디오 트랙은 삭제할 수 없음"
@@ -3646,14 +3973,6 @@ msgstr "비율 변경"
 msgid "Format Change"
 msgstr "형식 변경"
 
-#: TrackPanel.cpp:5822
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "헤르쯔(Hz) 단위로 샘플링 속도를 입력하십시오.(1에서 100000 사이):"
-
-#: TrackPanel.cpp:5832
-msgid "Invalid rate."
-msgstr "유효하지 않은 비율."
-
 #: TrackPanel.cpp:5852
 msgid "Change lower speed limit (%) to:"
 msgstr "다음으로 하위 속도 제한 (%) 변경:"
@@ -3792,8 +4111,8 @@ msgstr "플러그인 1 to %i"
 msgid "Plugins %i to %i"
 msgstr "플러그인 %i to %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3815,8 +4134,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: commands/CommandManager.cpp:854
@@ -3837,14 +4156,19 @@ msgstr "적용된 효과: %s %.1f dB"
 msgid "Amplify"
 msgstr "증폭"
 
-#: effects/Amplify.cpp:153
-msgid "Amplify by Dominic Mazzoni"
-msgstr "제작: Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:160
 msgid "Amplification (dB):"
 msgstr "증폭 (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:180
 msgid "New Peak Amplitude (dB):"
 msgstr "새 피크 진폭 (dB):"
@@ -3853,6 +4177,10 @@ msgstr "새 피크 진폭 (dB):"
 msgid "Allow clipping"
 msgstr "클립핑 허용"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "증폭..."
@@ -3967,10 +4295,18 @@ msgstr "제작: Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "주파수 (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "부스트 (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "베이스부스트..."
@@ -4011,9 +4347,50 @@ msgstr "제작: Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "도구: SoundTouch, by Olli Parviainen"
 
-#: effects/ChangePitch.cpp:266
-msgid "Pitch:   from"
-msgstr "피치:   시작값"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:303
+msgid "Semitones (half-steps):"
+msgstr "세미톤 (하프 스텝):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:288
 #: effects/ChangePitch.cpp:334
@@ -4023,13 +4400,9 @@ msgstr "피치:   시작값"
 msgid "to"
 msgstr "종료값"
 
-#: effects/ChangePitch.cpp:303
-msgid "Semitones (half-steps):"
-msgstr "세미톤 (하프 스텝):"
-
-#: effects/ChangePitch.cpp:322
-msgid "Frequency (Hz):   from"
-msgstr "주파수 (Hz):   시작값"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:357
 #: effects/ChangeSpeed.cpp:323
@@ -4037,6 +4410,11 @@ msgstr "주파수 (Hz):   시작값"
 msgid "Percent Change:"
 msgstr "퍼센트 변경:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "피치 변경..."
@@ -4055,6 +4433,14 @@ msgstr "적용된 효과: %s %.1f%%"
 msgid "Change Speed"
 msgstr "속도 변경"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:356
+msgid "n/a"
+msgstr "n/a"
+
 #: effects/ChangeSpeed.cpp:300
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "속도 변경은 템포와 피치에 영향을 미칩니다."
@@ -4063,17 +4449,17 @@ msgstr "속도 변경은 템포와 피치에 영향을 미칩니다."
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "도구: SampleRate, by Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:356
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:359
-msgid "Standard Vinyl RPM:   from"
-msgstr "표준 비닐 RPM:   시작값"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4091,13 +4477,29 @@ msgstr "템포 변경"
 msgid "Change Tempo without Changing Pitch"
 msgstr "피치 변경없이 템포를 변경합니다."
 
-#: effects/ChangeTempo.cpp:226
-msgid "Beats per Minute (BPM):   from"
-msgstr "분당 비트 수 (BPM):   시작값"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:256
-msgid "Length (seconds):   from"
-msgstr "길이 (초):   시작값"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4107,8 +4509,8 @@ msgstr "템포 변경..."
 msgid "Changing Tempo"
 msgstr "템포 변경 중"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: effects/ClickRemoval.cpp:359
@@ -4119,10 +4521,18 @@ msgstr "제작: Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "클릭 제거..."
@@ -4135,49 +4545,84 @@ msgstr "클릭 및 팝 제거 중..."
 msgid "Dynamic Range Compressor"
 msgstr "동적 범위 압축기"
 
-#: effects/Compressor.cpp:468
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "제작: Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:486
-msgid "Ratio: "
-msgstr "비율: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:493
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "어택 시간: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr "압축 후 0dB로 평균화"
 
-#: effects/Compressor.cpp:559
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "스레쉬홀드: %d dB"
 
-#: effects/Compressor.cpp:562
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "비율: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:564
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "비율: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "어택 시간: %.1f 초"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: effects/Compressor.h:36
@@ -4188,6 +4633,250 @@ msgstr "압축기..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "동적 범위 압축 적용 중..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:324
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "시작 위치"
+
+#: effects/ToneGen.cpp:325
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:130
+#: toolbars/SelectionBar.cpp:228
+msgid "End"
+msgstr "종료 위치"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: AboutDialog.cpp:251
+msgid "Information"
+msgstr "ì •ë³´"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "제어"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr "DTMF 톤 생성기"
@@ -4205,9 +4894,9 @@ msgstr "DTMF 순서:"
 msgid "Amplitude (0-1)"
 msgstr "진폭 (0-1)"
 
-#: effects/DtmfGen.cpp:393
-msgid "DTMF duration:"
-msgstr "DTMF 길이:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
 
 #: effects/DtmfGen.cpp:411
 msgid "Tone/silence ratio:"
@@ -4439,17 +5128,13 @@ msgstr "반전"
 msgid "Inverting"
 msgstr "반전 중"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr "더 무겁게"
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
-msgstr "가장 무겁게"
+#: effects/Leveller.cpp:129
+msgid "Leveller"
+msgstr "레벨러"
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
-msgstr "헤비하게"
+msgid "None-Skip"
+msgstr "건너뛰기 없음"
 
 #: effects/Leveller.cpp:47
 msgid "Light"
@@ -4460,32 +5145,37 @@ msgid "Moderate"
 msgstr "적당하게"
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
-msgstr "건너뛰기 없음"
+msgid "Heavy"
+msgstr "헤비하게"
 
-#: effects/Leveller.cpp:129
-msgid "Leveller"
-msgstr "레벨러"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
+msgstr "더 무겁게"
 
-#: effects/Leveller.cpp:213
-msgid "Leveller by Lynn Allan"
-msgstr "제작: Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
+msgstr "가장 무겁게"
 
-#: effects/Leveller.cpp:216
-msgid "Equalize soft and loud sections"
-msgstr "부드럽고 강하게 구역을 균등화합니다."
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr ""
 
 #: effects/Leveller.cpp:219
 #: effects/Leveller.cpp:224
 msgid "Degree of Leveling"
 msgstr "레벨링 각도"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:235
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "잡음 스레쉬홀드 (Hiss/Hum/Ambient 잡음)"
 
 #: effects/Leveller.cpp:238
-msgid "Threshold for Noise: "
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "노이즈 스레쉬홀드: "
 
 #: effects/Leveller.h:28
@@ -4496,6 +5186,158 @@ msgstr "레벨러..."
 msgid "Applying Leveller..."
 msgstr "레벨러 적용 중..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "믹서"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:78
+msgid "Phaser"
+msgstr "파서"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:675
+msgid "Noise Removal"
+msgstr "노이즈 제거"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "백색"
@@ -4512,10 +5354,6 @@ msgstr "갈색"
 msgid "Noise Generator"
 msgstr "잡음 생성기"
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr "잡음 길이"
-
 #: effects/Noise.cpp:256
 #, fuzzy
 msgid "Noise type"
@@ -4546,10 +5384,6 @@ msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "노이즈 프로파일없이 노이즈 제거 시도\n"
 ".\n"
 
-#: effects/NoiseRemoval.cpp:675
-msgid "Noise Removal"
-msgstr "노이즈 제거"
-
 #: effects/NoiseRemoval.cpp:764
 msgid "Step 1"
 msgstr "단계 1"
@@ -4582,14 +5416,26 @@ msgstr "노이즈 프로파일 가져오기"
 msgid "Noise reduction (dB):"
 msgstr "노이즈 감소 (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr "주파수 평활 (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr "어택/감쇠 시간 (초):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "잡음 제거..."
@@ -4624,22 +5470,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "평균화"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: effects/Normalize.cpp:323
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "어떤 DC 옵셋도 제거합니다. (수직 0 중심)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
-msgstr "최대 진폭으로 평균화"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "평균화..."
@@ -4653,44 +5499,56 @@ msgstr "평균화 중..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "적용된 효과: %s %d 단계, %.0f%% wet, 주파수 = %.1f Hz, 시작 위상 = %.0f 도, 깊이 = %d, 피드백 = %.0f%%"
 
-#: effects/Phaser.cpp:78
-msgid "Phaser"
-msgstr "파서"
-
-#: effects/Phaser.cpp:477
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "제작: Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:484
 msgid "Stages:"
 msgstr "단계:"
 
-#: effects/Phaser.cpp:505
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:512
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:526
 #: effects/Wahwah.cpp:497
 msgid "LFO Frequency (Hz):"
 msgstr "LFO 주파수 (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:542
 #: effects/Wahwah.cpp:513
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO 시작 위상 (도):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:558
 msgid "Depth:"
 msgstr "깊이:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:574
 msgid "Feedback (%):"
 msgstr "피드백 (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "파서..."
@@ -4707,6 +5565,14 @@ msgstr "복구 효과는 손상된 오디오 (128 샘플까지)의 매우 짧은
 "\n"
 "확대한 후 복구하기 위해 초의 작은 일부분을 선택하십시오."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "손상된 오디오 복구 중"
@@ -4725,28 +5591,23 @@ msgstr "선택 부분을 반복하기에 트랙이 너무 깁니다."
 msgid "Repeat"
 msgstr "반복"
 
-#: effects/Repeat.cpp:245
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "제작: Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:252
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "반복 횟수: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:264
 #: effects/Repeat.cpp:302
 msgid "New selection length: "
 msgstr "새 선택 부분 길이: "
 
-#: effects/Repeat.cpp:304
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d 분, %d 초"
-
-#: effects/Repeat.cpp:307
-#, c-format
-msgid "%d seconds"
-msgstr "%d ì´ˆ"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr "시간:분:초"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -4814,15 +5675,73 @@ msgstr "스파이크 클리너..."
 msgid "Applying Spike Cleaner..."
 msgstr "스파이크 클리너 적용 중..."
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "스테레오에서 모노로(&S)"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
 msgstr "스테레오에서 모노로 적용 중"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:59
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr "적용된 효과: 생성 %s 파형 %s, 주파수 = %.2f Hz, 진폭 = %.2f, %.6lf 초"
 
+#: widgets/Meter.cpp:356
+msgid "Linear"
+msgstr "선형"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr "Chirp 생성기"
@@ -4851,28 +5770,29 @@ msgstr "정사각형, 별칭 없음"
 msgid "Frequency (Hz)"
 msgstr "주파수 (Hz)"
 
-#: effects/ToneGen.cpp:296
-#: effects/ToneGen.cpp:334
-#: toolbars/SelectionBar.cpp:136
-#: toolbars/SelectionBar.cpp:227
-msgid "Length"
-msgstr "길이"
-
 #: effects/ToneGen.cpp:317
 msgid "Waveform:"
 msgstr "파형:"
 
-#: effects/ToneGen.cpp:324
-#: toolbars/ControlToolBar.cpp:186
-msgid "Start"
-msgstr "시작 위치"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:325
-#: toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:130
-#: toolbars/SelectionBar.cpp:228
-msgid "End"
-msgstr "종료 위치"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr ""
 
 #: effects/ToneGen.h:39
 msgid "Chirp..."
@@ -4898,10 +5818,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4949,10 +5865,6 @@ msgstr "적용된 효과: %s 주파수 = %.1f Hz, 시작 위상 = %.0f 도, 깊
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:490
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "제작: Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:529
 msgid "Depth (%):"
 msgstr "깊이 (%):"
@@ -4961,10 +5873,18 @@ msgstr "깊이 (%):"
 msgid "Resonance:"
 msgstr "공명:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:561
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah 주파수 옵셋 (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5001,6 +5921,18 @@ msgstr "효과 설정"
 msgid "Length (seconds)"
 msgstr "길이 (초)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:253
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist Effect 적용 중..."
@@ -5068,11 +6000,13 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:370
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr "트랙이 선택되지 않음! Ctrl-A 사용 (모두 선택)\n"
-"모든 트랙을 내보내기 위해 내보내기를 선택하십시오."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
 
 #: export/Export.cpp:414
 msgid "Export File"
@@ -5129,6 +6063,10 @@ msgstr " - 왼쪽"
 msgid " - Right"
 msgstr " - 오른쪽"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:939
 #: export/Export.cpp:993
 #, c-format
@@ -5166,12 +6104,6 @@ msgstr "(외부 응용 프로그램)"
 msgid "Cannot export audio to %s"
 msgstr "%s (으)로 오디오를 내보낼 수 없음"
 
-#: export/ExportCL.cpp:188
-#: export/ExportOGG.cpp:121
-#: export/ExportPCM.cpp:114
-msgid "Export"
-msgstr "내보내기"
-
 #: export/ExportCL.cpp:190
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "명령라인 인코더를 이용하여 선택된 오디오 내보내기 중"
@@ -5184,6 +6116,477 @@ msgstr "명령라인 인코더를 이용하여 전체 프로젝트 내보내기
 msgid "Command Output"
 msgstr "명령 출력"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:225
+msgid "Bit Rate:"
+msgstr "비트율:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:246
+msgid "Format:"
+msgstr "형식:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:105
+msgid "Language:"
+msgstr "언어:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:227
+msgid "Quality:"
+msgstr "품질:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML 파일 (*.xml)|*.xml|모든 파일 (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:180
 msgid "Specify FLAC Options"
 msgstr "FLAC 옵션 지정"
@@ -5256,10 +6659,6 @@ msgstr "선택된 오디오를 FLAC으로 내보내는 중"
 msgid "Exporting the entire project as FLAC"
 msgstr "전체 프로젝트를 FLAC으로 내보내는 중"
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:201
 msgid "Specify MP2 Options"
 msgstr "MP2 옵션 지정"
@@ -5268,10 +6667,6 @@ msgstr "MP2 옵션 지정"
 msgid "MP2 Export Setup"
 msgstr "MP2 내보내기 설정"
 
-#: export/ExportMP2.cpp:225
-msgid "Bit Rate:"
-msgstr "비트율:"
-
 #: export/Export.cpp:259
 msgid "MP2 Files"
 msgstr "MP2 파일"
@@ -5280,10 +6675,6 @@ msgstr "MP2 파일"
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "현재 샘플링 속도와 비트율로는 MP2로 내보낼 수 없음"
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: export/ExportMP2.cpp:102
 #: export/ExportMP3.cpp:1249
 #: export/ExportOGG.cpp:53
@@ -5312,45 +6703,13 @@ msgstr "전체 파일을 %d kbps로 내보내는 중"
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:161
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "0, 220-260 kbps (최고 품질)"
-
-#: export/ExportMP3.cpp:162
-msgid "1, 200-250 kbps"
-msgstr "1, 200-250 kbps"
-
-#: export/ExportMP3.cpp:163
-msgid "2, 170-210 kbps"
-msgstr "2, 170-210 kbps"
-
-#: export/ExportMP3.cpp:164
-msgid "3, 155-195 kbps"
-msgstr "3, 155-195 kbps"
-
-#: export/ExportMP3.cpp:165
-msgid "4, 145-185 kbps"
-msgstr "4, 145-185 kbps"
-
-#: export/ExportMP3.cpp:166
-msgid "5, 110-150 kbps"
-msgstr "5, 110-150 kbps"
-
-#: export/ExportMP3.cpp:167
-msgid "6, 95-135 kbps"
-msgstr "6, 95-135 kbps"
-
-#: export/ExportMP3.cpp:168
-msgid "7, 80-120 kbps"
-msgstr "7, 80-120 kbps"
-
-#: export/ExportMP3.cpp:169
-msgid "8, 65-105 kbps"
-msgstr "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "9, 45-85 kbps (Smaller files)"
-msgstr "9, 45-85 kbps (작은 크기 파일)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr ""
 
 #: export/ExportMP3.cpp:175
 msgid "Fast"
@@ -5360,21 +6719,17 @@ msgstr "빠름"
 msgid "Standard"
 msgstr "표준"
 
-#: export/ExportMP3.cpp:181
-msgid "Insane, 320 kbps"
-msgstr "이상, 320 kbps"
-
-#: export/ExportMP3.cpp:182
-msgid "Extreme, 220-260 kbps"
-msgstr "극도, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr ""
 
-#: export/ExportMP3.cpp:183
-msgid "Standard, 170-210 kbps"
-msgstr "표준, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Medium, 145-185 kbps"
-msgstr "중간, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr ""
 
 #: export/ExportMP3.cpp:1417
 msgid "Specify MP3 Options"
@@ -5405,6 +6760,11 @@ msgstr "평균"
 msgid "Constant"
 msgstr "상수"
 
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "품질"
+
 #: export/ExportMP3.cpp:1491
 msgid "Variable Speed:"
 msgstr "변수 속도:"
@@ -5430,35 +6790,15 @@ msgstr "Lame 위치"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "MP3 파일을 생성하려면 %s 파일이 필요합니다."
 
-#: export/ExportMP3.cpp:958
-#, c-format
-msgid "Location of %s:"
-msgstr "%s 위치:"
-
-#: export/ExportMP3.cpp:967
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "%s을(를) 찾으려면 이곳을 누르십시오 -->"
-
-#: export/ExportMP3.cpp:973
-msgid "Browse..."
-msgstr "찾아보기..."
-
 #: export/ExportMP3.cpp:974
 msgid "To get a free copy of Lame, click here -->"
 msgstr "무료 Lame을 얻으려면 이곳을 누르십시오 -->"
 
-#: export/ExportMP3.cpp:975
-msgid "Download..."
-msgstr "다운로드..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:1011
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "%s은(는) 어디에 있습니까?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:527
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5468,8 +6808,9 @@ msgstr "단지 lame_enc.dll|lame_enc.dll|동적 링크 라이브러리 (*.dll)|*
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr "단지 libmp3lame.dylib|libmp3lame.dylib|동적 라이브러리 (*.dylib)|*.dylib|모든 파일 (*)|*"
 
-#: export/ExportMP3.cpp:887
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "단지 libmp3lame.so|libmp3lame.so|주 공유 오브젝트 파일 (*.so)|*.so|확장된 라이브러리 (*.so*)|*.so*|모든 파일 (*)|*"
 
 #: export/Export.cpp:245
@@ -5488,11 +6829,6 @@ msgstr "유효하지 않거나 지원하지 않는 MP3 인코딩 라이브러리
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: export/ExportMP2.cpp:94
-#: export/ExportMP3.cpp:1260
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "MP3용 ID3 태그 편집"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5528,10 +6864,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5544,18 +6876,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:123
-msgid "MP3 exporting plugin not found"
-msgstr "MP3 내보내기 플러그인을 찾을 수 없음"
-
 #: export/ExportMultiple.cpp:88
 #: export/ExportMultiple.cpp:371
 #: export/ExportMultiple.cpp:620
@@ -5614,6 +6938,10 @@ msgstr "첫번째 라벨 이전에 오디오 포함"
 msgid "First file name:"
 msgstr "첫번째 파일명:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:246
 msgid "Tracks"
 msgstr "트랙"
@@ -5634,15 +6962,14 @@ msgstr "연속적으로 번호 부여"
 msgid "File name prefix:"
 msgstr "파일명 접두어:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:295
 msgid "Overwrite existing files"
 msgstr "파일이 존재하면 덮어쓰기"
 
-#: export/ExportMultiple.cpp:303
-#: export/ExportMultiple.cpp:305
-msgid "E&xport"
-msgstr "내보내기(&x)"
-
 #: export/ExportMultiple.cpp:369
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5652,10 +6979,6 @@ msgstr "\"%s\" 이(가) 성공적으로 생성되었습니다."
 msgid "Choose a location to save the exported files"
 msgstr "내보낸 파일이 저장될 위치 선택"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:491
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5665,6 +6988,10 @@ msgstr "\"%s\" 이(가) 존재하지 않습니다.\n"
 "\n"
 "새로 만드시겠습니까?"
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:617
 #: export/ExportMultiple.cpp:725
 #, c-format
@@ -5677,6 +7004,12 @@ msgstr "성공적으로 %d 개 파일을 내보냈습니다."
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "%d 개 파일을 내보내는 중 알 수 없는 오류가 발생했습니다."
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5685,10 +7018,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:227
-msgid "Quality:"
-msgstr "품질:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5701,22 +7030,14 @@ msgstr "선택된 오디오를 Ogg Vorbis 로 내보내는 중"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "전체 프로젝트를 Ogg Vorbis 로 내보내는 중"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:240
 msgid "Uncompressed Export Setup"
 msgstr "압축되지 않은 내보내기 설정"
 
-#: export/ExportPCM.cpp:246
-msgid "Format:"
-msgstr "형식:"
-
 #: export/ExportPCM.cpp:250
 msgid "Header:"
 msgstr "헤더:"
@@ -5729,9 +7050,21 @@ msgstr "인코딩:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(모든 헤더와 인코딩 조합이 가능하지 않습니다.)"
 
-#: export/Export.cpp:242
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF 및 기타 비압축 형식"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:84
 msgid "Cannot export audio in this format."
@@ -5754,8 +7087,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "오류 (파일은 기록되지 않음): %hs"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: import/Import.cpp:177
@@ -5763,6 +7124,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "현재 버전의 Audacity에서는 %s 을(를) 지원하지 않습니다."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5796,9 +7165,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5811,19 +7181,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
 msgstr ""
 
-#: import/Import.cpp:226
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity가 이 형식의 파일을 인식하지 못했습니다.\n"
-"압축되지 않은 형식이라면 \"가져오기-로우 데이터\" 로 시도해 보십시오."
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5861,16 +7283,17 @@ msgstr "미디 트랙은 개별적으로 옵셋될 수 없습니다, 오디오 
 msgid "Invalid track offset in LOF file."
 msgstr "LOF 파일 내에 트랙 옵셋이 유효하지 않습니다."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "알레그로 파일 파싱 중 오류."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "미디 파일 파싱 중 오류."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5897,16 +7320,23 @@ msgstr "Vorbis 비트스트림 헤더가 유효하지 않음"
 msgid "Internal logic fault"
 msgstr "내부 로직 오류"
 
-#: Project.cpp:2357
-#: import/ImportPCM.cpp:361
+#: export/Export.cpp:242
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF 및 기타 비압축 형식"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "%s 파일을 가져오는 중..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:277
 msgid "Import Raw Data"
 msgstr "로우 데이터 가져오기"
@@ -5948,6 +7378,14 @@ msgstr "2 채널 (스테레오)"
 msgid "%d Channels"
 msgstr "%d 채널"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "시작 옵셋:"
@@ -5960,8 +7398,17 @@ msgstr "가져올 용량:"
 msgid "Sample rate:"
 msgstr "샘플링 속도:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
@@ -6007,9 +7454,9 @@ msgstr "채널"
 msgid "Playthrough"
 msgstr "우선 재생"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "새 녹음 중 다른 트랙 재생(&P)"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6019,8 +7466,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -6047,13 +7498,15 @@ msgstr ""
 msgid "Latency"
 msgstr "지연"
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
-msgstr "버퍼 지연:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
-msgstr "지연 정정:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
 msgid "Seek Time when playing"
@@ -6082,22 +7535,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "Cl&eanSpeech 모드 (사용자 GUI)"
 
-#: prefs/BatchPrefs.cpp:87
-#: prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr "보이기 / 숨기기"
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: prefs/DirectoriesPrefs.cpp:55
 #: prefs/DirectoriesPrefs.cpp:56
 #: prefs/PrefsDialog.cpp:276
@@ -6137,7 +7577,7 @@ msgid "Audio cache"
 msgstr "오디오 캐시"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
@@ -6162,21 +7602,65 @@ msgstr "%s 폴더는 쓰기 불가 상태"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Audacity가 재시작한 후 변경된 임시 폴더 적용"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:104
+msgid "MP3 Library Version:"
+msgstr "MP3 라이브러리 버전:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:79
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "편집하기 전 파일 사본 만들기 (안전) (&M)"
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:80
-msgid "&Read directly from the original file (faster)"
-msgstr "원본 파일에서 직접 읽어오기 (빠름) (&R)"
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:84
 msgid "When saving a project that depends on other audio files"
@@ -6206,20 +7690,8 @@ msgstr "항상 스테레오 또는 모노 채널로 모든 트랙 믹스 다운(
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
-msgstr ""
-
-#: prefs/FileFormatPrefs.cpp:104
-msgid "MP3 Library Version:"
-msgstr "MP3 라이브러리 버전:"
-
-#: prefs/FileFormatPrefs.cpp:110
-msgid "&Find Library"
-msgstr "라이브러리 찾기(&F)"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:33
@@ -6227,34 +7699,42 @@ msgstr ""
 msgid "Interface"
 msgstr "인터페이스"
 
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "인간공학적으로 오디오 I/O 버튼 배열(&E)"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
-msgstr "접근 보조 기구로 트랙 번호 퍼센트(&P)"
-
 #: prefs/GUIPrefs.cpp:90
 msgid "Editing a &clip can move other clips"
 msgstr "클립 편집은 다른 클립 이동 가능(&c)"
@@ -6267,6 +7747,11 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87
+#: prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr "보이기 / 숨기기"
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr "커트라인 사용(&l)"
@@ -6275,25 +7760,25 @@ msgstr "커트라인 사용(&l)"
 msgid "Show warnings about &temp files"
 msgstr "임시 파일에 대해 경고 보이기(&t)"
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
-msgstr "언어"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:105
-msgid "Language:"
-msgstr "언어:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:108
-msgid "Minimum of dB mode display range"
-msgstr "최소 dB 모드 표시 범위"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:111
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6303,6 +7788,10 @@ msgstr "-36 dB (고진폭 편집에 매우 작은 범위)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (8비트 샘플 PCM 범위)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:113
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (16비트 샘플 PCM 범위)"
@@ -6315,11 +7804,35 @@ msgstr "-120 dB (인간 가청 한계)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (24비트 샘플 PCM 범위)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:64
 #: prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "키보드"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "키 연결"
@@ -6353,10 +7866,6 @@ msgstr "키보드 바로 가기 저장 중 오류"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Audacity 키보드 바로 가기가 포함된 XML 파일 선택..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML 파일 (*.xml)|*.xml|모든 파일 (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "키보드 바로 가기를 불러오는 중 오류"
@@ -6375,6 +7884,42 @@ msgstr "키보드 바로 가기 '%s' 은(는) 이미 다음에 할당되어 있
 msgid "Undo"
 msgstr "되돌리기"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "새 녹음 중 다른 트랙 재생(&P)"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr "버퍼 지연:"
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr "지연 정정:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -6610,11 +8155,6 @@ msgstr "확대 또는 축소"
 msgid "Audacity Preferences"
 msgstr "Audacity 설정"
 
-#: prefs/QualityPrefs.cpp:42
-#: prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "품질"
-
 #: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "직사각형"
@@ -6679,12 +8219,12 @@ msgstr "고품질:"
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:36
@@ -6704,6 +8244,10 @@ msgstr "8 - 가장 넓은 밴드"
 msgid "256 - default"
 msgstr "256 - 기본값"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:84
 msgid "4096 - most narrowband"
 msgstr "4096 - 가장 좁은 밴드"
@@ -6712,6 +8256,10 @@ msgstr "4096 - 가장 좁은 밴드"
 msgid "Window type:"
 msgstr "창 형식:"
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr "표시"
@@ -6728,6 +8276,26 @@ msgstr "최소 주파수 (Hz):"
 msgid "Maximum Frequency (Hz):"
 msgstr "최대 주파수 (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:134
 msgid "The maximum frequency must be an integer"
 msgstr "최대 주파수값은 정수이어야 함"
@@ -6744,6 +8312,14 @@ msgstr "최소 주파수값은 정수이어야 함"
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr "최소 주파수값은 적어도 0 Hz 이어야 함"
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61
 #: prefs/ThemePrefs.cpp:62
 msgid "Theme"
@@ -6832,10 +8408,6 @@ msgid "Saving and loading individual theme files uses a \n"
 msgstr "개별 테마 파일을 저장하고 불러올 때에는\n"
 "각각의 이미지마다 별도의 파일을 사용합니다.\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "제어"
-
 #: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "일시 멈춤"
@@ -6845,8 +8417,8 @@ msgid "Play"
 msgstr "재생"
 
 #: toolbars/ControlToolBar.cpp:178
-msgid "Play (Shift for loop-play)"
-msgstr "재생 (구간 반복 재생)"
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
@@ -6860,6 +8432,10 @@ msgstr "시작 부분으로 가기"
 msgid "Skip to End"
 msgstr "종료 부분으로 가기"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Clean Speech"
@@ -6896,6 +8472,10 @@ msgid "Silence selection"
 msgstr "무음 선택"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "확대"
 
@@ -6951,24 +8531,22 @@ msgstr "출력 레벨 미터"
 msgid "Input level meter - click to monitor input"
 msgstr "입력 레벨 미터 - 입력을 모니터 하려면 클릭하십시오."
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "믹서"
-
 #: toolbars/MixerToolBar.cpp:91
 msgid "Output Volume"
 msgstr "출력 음량"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
 msgstr "슬라이더-출력"
 
 #: toolbars/MixerToolBar.cpp:102
 msgid "Input Volume"
 msgstr "입력 음량"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
 msgstr "슬라이더-입력"
 
 #: toolbars/MixerToolBar.cpp:117
@@ -6989,6 +8567,13 @@ msgstr "프로젝트 주파수 (Hz):"
 msgid "Selection Start:"
 msgstr "선택 시작 위치:"
 
+#: effects/ToneGen.cpp:296
+#: effects/ToneGen.cpp:334
+#: toolbars/SelectionBar.cpp:136
+#: toolbars/SelectionBar.cpp:227
+msgid "Length"
+msgstr "길이"
+
 #: toolbars/SelectionBar.cpp:146
 msgid "hidden"
 msgstr "숨김"
@@ -7255,6 +8840,22 @@ msgstr "오른쪽"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -7302,14 +8903,14 @@ msgstr "수평 스테레오"
 msgid "Vertical Stereo"
 msgstr "수직 스테레오"
 
-#: widgets/Meter.cpp:356
-msgid "Linear"
-msgstr "선형"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr "설정..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7332,6 +8933,22 @@ msgstr "미터 설정"
 msgid " Please select an action "
 msgstr " 동작을 선택하십시오"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110
 #: widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
@@ -7341,10 +8958,6 @@ msgstr "수직 눈금"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 ì´ˆ"
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr "시간:분:초"
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr "0100 시간 060 분 060 초"
@@ -7357,6 +8970,21 @@ msgstr "일:시간:분:초"
 msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 일 024 시간 060 분 060 초"
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr "시간:분:초 + 밀리초"
@@ -7470,10 +9098,10 @@ msgstr "이 경고를 다시 표시하지 않음"
 msgid "Could not open file: \"%s\""
 msgstr "파일을 열 수 없음: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "오류: %hs 행 위치 %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/lt.po b/locale/lt.po
index 011ccc8..257e620 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -17,36 +17,24 @@ msgstr "Project-Id-Version: Vertimas 1,0\n"
 msgid "&About Audacity..."
 msgstr "&Apie Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Įjungtas"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Programos sukūrimo data:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity  yra nemokama programa, parašyta savanorių komandos iš viso pasaulio. Už koordinacijos pagalbą ačiū SourceForge.net online servisui, kuris aprūpina nemokamais įrankiais atviro kodo programinės įrangos projektus. Audacity pritaikytas Windows 98 ir naujasnioms, Mac OS X, Linux bei kitoms Unix šeimos operacinėms sistemoms. Senesnės Audacity versijos pritaikytos ir Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Tai beta versijos programa. Joje gali pasitaikyti klaidų ir nebaigtų funkcijų. Mes laukiame jūsų raportų, taigi prašau apsilankykite mūsų svetainėje ir atiduokite savo raportus ar pageidavimus."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Tai stabili, išbaigta Audacity versija. Vis dėlto, jei rasite klaidų ar turite pasiūlymų, prašau susisiekite. Mes laukiame patarimų iš vartotojų, kad galėtumėme pagerinti Audacity. Daugiau informacijos rasite mūsų svetainėje."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -58,13 +46,9 @@ msgstr "Tai stabili, išbaigta Audacity versija. Vis dėlto, jei rasite klaidų
 msgid "translator_credits"
 msgstr "Lithuanian translation by Šarūnas Gliebus"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Nemokamas Skaitmeninis Audio Redaktorius"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Informacija"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -100,28 +84,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Ypač ačiū"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Įjungtas"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Programos sukūrimo data:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Uždaryti"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -327,12 +401,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -368,8 +443,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -417,6 +492,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -465,10 +544,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -686,16 +773,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Pervardintas failas: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Keičiamas blokas %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -824,6 +911,96 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Stačiakampis"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#  i18n-hint: It's asking for the location of a file, for
+#  example, "Where is lame_enc.dll?" - you could translate
+#  "Where would I find the file %s" instead if you want.
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Kur galėčiau rasi  %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Dažnio Analizė"
@@ -853,8 +1030,8 @@ msgstr "Padidinti Autokoreliacija"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -868,8 +1045,8 @@ msgstr "Dydis"
 msgid " window"
 msgstr " Langas"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -880,14 +1057,25 @@ msgstr "Linijinis dažnis"
 msgid "Log frequency"
 msgstr "Log dažnis"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Uždaryti"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
@@ -943,7 +1131,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Atsilikimas (sek)\tDažnis (Hz)\tLygis"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -959,15 +1147,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -978,40 +1182,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1207,6 +1435,10 @@ msgstr "&IÅ¡saugoti projektÄ…\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "IÅ¡saugoti ProjektÄ… K&aip"
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1215,6 +1447,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1243,10 +1479,26 @@ msgstr "Eksportuoti Pavadinimus..."
 msgid "Export &Multiple..."
 msgstr "Daugialypis eksportavi&mas..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1308,9 +1560,9 @@ msgstr "&Trinti\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Tyla\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1324,22 +1576,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1383,12 +1633,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1399,66 +1649,67 @@ msgstr "&ViskÄ…\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "Pradedant nuo žymeklio"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Nuo kursoriaus iki pabaigos"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Rasti Susikirtimus ties Nuliu \tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Perkelti pelÄ™..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "į Apibraukimo Pradžią"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "į Apibraukimo Pabaigą"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "į Takelio Pradžią"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "į Takelio Pabaigą"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Pabraukimo IÅ¡saugojimas"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Pabraukimo Atstatymas"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1477,10 +1728,14 @@ msgstr "Įjungti Grotelų Prikibimą"
 msgid "Turn Grid Snap Off"
 msgstr "Išjungti Grotelų Prikibimą"
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Nuostatos"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1518,60 +1773,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Istorija..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:578
+msgid "!Simplified View"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Perkelti į Pradžią\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Perkelti į Pabaiga\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1587,12 +1904,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Laiko takelis"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1607,6 +1920,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "P&ašalinti Takelius"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Perkelti prie &Nulio"
@@ -1623,29 +1944,40 @@ msgstr "Perkelti prie Apibraukimo Pradžio&s"
 msgid "Align with Selection &End"
 msgstr "Perkelti pri&e Apibraukimo Pabaigos"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Perkelti PabaigÄ… prie PelÄ—s"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Perkelti Pabaigą prie Apibraukimo Pradžios"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Perkelti PabaigÄ… prie Apibraukimo Galo"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Rikiuoti Takelius Kartu"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Surikiuoti Takelius..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1658,22 +1990,26 @@ msgstr "PridÄ—ti PavadinimÄ… Apibraukime\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "PridÄ—ti PavadinimÄ… Grojimo Vietoje\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Generuoti"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Efe&ktai"
@@ -1709,6 +2045,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1721,12 +2061,12 @@ msgstr "&Paleisti BandymÄ…..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1761,9 +2101,9 @@ msgstr "Kitas įrankis\tD"
 msgid "Previous Tool\tA"
 msgstr "Buvęs Įrankis\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Groti/Stop\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1777,12 +2117,12 @@ msgstr "PauzÄ—\tP"
 msgid "Record\tR"
 msgstr "Įrašyti\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1797,22 +2137,14 @@ msgstr "Pagroti iki Apibraukimo\tB"
 msgid "Play Looped\tL"
 msgstr "Kartojamas Grojimas\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Kartojamas Grojimas\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Perkelti į Pradžią\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Perkelti į Pabaiga\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Apibraukti iki Pradžios\tShift+Home"
@@ -1869,8 +2201,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1969,14 +2301,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "Paskutiniai &Failai..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2033,6 +2370,23 @@ msgstr "Kartoti %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Nėra ekspotuojamų takelių pavadinimų."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Nėra ko atšaukti"
@@ -2073,6 +2427,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Įterpta iš iškirptinės"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2241,9 +2599,9 @@ msgstr "Importuoti Pavadinimus"
 msgid "Select a MIDI file..."
 msgstr "Pasirinkti MIDI failÄ…..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Visi failai  (*.*)|*.*|MIDI failai (*.mid)|*.mid|Allegro failai (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2262,14 +2620,6 @@ msgstr "Pasirinkite bet kurį nesuspaustą audio failą..."
 msgid "All files (*)|*"
 msgstr "Visi failai (*)|*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Importuoti"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2301,6 +2651,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Perkelta prie nulio"
@@ -2337,6 +2691,14 @@ msgstr "Surikiuota"
 msgid "Align"
 msgstr "Rikiuoti"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Sukurtas naujas audio takelis"
@@ -2400,14 +2762,14 @@ msgstr "Pašalinti takelį"
 msgid "Removed audio track(s)"
 msgstr "Pašalinti takeliai(-is)"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2474,14 +2836,13 @@ msgstr "Įrašytas Audio"
 msgid "Save changes before closing?"
 msgstr "Ar išsaugoti pakeitimus prieš išeinant?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2501,6 +2862,25 @@ msgstr "Pasirinkite vieną ar daugiau audio failų..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2558,42 +2938,34 @@ msgstr "Šis failas buvo išsaugotas naudojantis Audacity %s.\n"
 msgid "Can't open project file"
 msgstr "Negaliu atidaryti projekto failo."
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Negaiu išsaugoti projekto. Gal %s neįrašomas, o gal\n"
-"diskas pilnas..."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2605,23 +2977,19 @@ msgstr "Klaida išsaugant projektą"
 msgid "Saved %s"
 msgstr "IÅ¡saugotas %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importuota '%s'"
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Importuoti"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Klaida importuojant"
@@ -2634,16 +3002,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity projekto failai (.aup) leidžia išsaugoti viską tiksliai kaip matote dabar, dėja daugelis\n"
-"programų negali atidaryti Audacity projekto failų.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Kai norite, kad failą būtų galima atidaryti ir kitomis programomis, pasirinkite Eksportavimo komandą."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2686,6 +3061,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Diske neužtenka vietos"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2769,43 +3154,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2845,8 +3199,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Komentarai"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2865,12 +3219,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2912,100 +3266,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Didžiausias atributo %s ilgis yra %d ženklai. Galas buvo nukirstas."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Pavadinimas"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "AtlikÄ—jas"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Albumas"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3070,8 +3343,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3114,6 +3430,10 @@ msgstr "Bangos Forma"
 msgid "Waveform (dB)"
 msgstr "Bangos Forma (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Nuolydis (EAC)"
@@ -3247,13 +3567,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Laiko-PerkÄ—limas"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Jūs nepakankamai prisiartinote vaizdą. Prisartinkite taip, kad matytumėt taškučius."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3341,6 +3661,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3398,15 +3726,6 @@ msgstr "Dažnio Pakeitimas"
 msgid "Format Change"
 msgstr "Formato Pakeitimas"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Įveskite pavyzdžio dažnį Hercais tarp 1 ir 100000:"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Neteisingas dažnis."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Pakeisti mažesnio greičio limitą (%) į:"
@@ -3541,8 +3860,8 @@ msgstr "Priedas 1 iš %i"
 msgid "Plugins %i to %i"
 msgstr "Priedai %i iš %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3564,8 +3883,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3586,14 +3905,19 @@ msgstr "Priimtas efektas: %s %.1f dB"
 msgid "Amplify"
 msgstr "Sustiprinti"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Sustiprinimas by Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Padidinimas (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Nauja Aukščiausia amplitudė (dB):"
@@ -3602,6 +3926,10 @@ msgstr "Nauja Aukščiausia amplitudė (dB):"
 msgid "Allow clipping"
 msgstr "Leisti IÅ¡kirpimÄ…"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Sustiprinimas"
@@ -3725,10 +4053,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Dažnis  (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Pakelti (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3770,9 +4106,50 @@ msgstr "by Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "naudojant SoundTouch, by Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Aukščiausias:  nuo"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Pustonis:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284
 #: ../src/effects/ChangePitch.cpp:330
@@ -3782,13 +4159,9 @@ msgstr "Aukščiausias:  nuo"
 msgid "to"
 msgstr "į"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Pustonis:"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Dažnis  (Hz):    iš"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
@@ -3796,6 +4169,11 @@ msgstr "Dažnis  (Hz):    iš"
 msgid "Percent Change:"
 msgstr "Procentinis Pakeitimas:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Keisti SkardumÄ…..."
@@ -3814,14 +4192,6 @@ msgstr "Priimtas efektas: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Keisti Greitį"
 
-#: ../src/effects/ChangeSpeed.cpp:282
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Keisti greitį, įskaitant Tempą ir Skardumą"
-
-#: ../src/effects/ChangeSpeed.cpp:292
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "naudojant SampleRate, by Erik de Castro Lopo"
-
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
@@ -3831,9 +4201,25 @@ msgstr "naudojant SampleRate, by Erik de Castro Lopo"
 msgid "n/a"
 msgstr "n/a"
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standartinis Vinyl RPM:    nuo"
+#: ../src/effects/ChangeSpeed.cpp:282
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Keisti greitį, įskaitant Tempą ir Skardumą"
+
+#: ../src/effects/ChangeSpeed.cpp:292
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "naudojant SampleRate, by Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3851,13 +4237,29 @@ msgstr "Keisti TempÄ…"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Keisti Tempą nekeičiant Skardumo"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Smūgiai per Minutę (BMP):   iš"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Ilgis (sekundėmis):   iš"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3867,8 +4269,8 @@ msgstr "Keisti TempÄ…..."
 msgid "Changing Tempo"
 msgstr "Keičiams Tempas"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3879,10 +4281,18 @@ msgstr "Spragtelėjimų ir trakštelėjimų Pašalinimas by Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Trakštelėjimų Pašalinimas..."
@@ -3895,49 +4305,84 @@ msgstr "Pašalinu spragtelėjimus ir trakštelėjimus..."
 msgid "Dynamic Range Compressor"
 msgstr "Dinaminis Dažnio Kompresorius"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dinaminis Dažnio Kompresorius by Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Santykis:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Iki Pilno Garso:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizuoti iki 0dB po suspaudimao"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Riba:  %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Santykis: %.0f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:568
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Santykis: %.1f:1"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Iki Pilno Garso: %.1f sek"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3948,6 +4393,247 @@ msgstr "Kompresorius..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Pritaikomas Dinaminis Dažnio Kompresorius..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Informacija"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3964,8 +4650,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Stiprumas (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4194,16 +4880,12 @@ msgstr "Invertuoti"
 msgid "Inverting"
 msgstr "Invertuojama"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4215,31 +4897,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4250,6 +4936,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Fazeris"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Triukšmo pašalinimas"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4266,10 +5104,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4297,10 +5131,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Triukšmo pašalinimas"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "1 Žingsnis"
@@ -4331,14 +5161,26 @@ msgstr "Gauti Trukšmo Profilį"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Triukšmo pašalinimas..."
@@ -4373,22 +5215,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalizuoti"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Pašalinti visus DC ofsetus (centras ties 0 vertikaliai)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normalizuoti..."
@@ -4402,44 +5244,56 @@ msgstr "Normalizuoju..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Priimtas efektas: %s %d stadijos, %.0f%% wet, dažnis = %.1f Hz, pradžios fazė= %.0f deg, gylis= %d, atsakomoji reakcija= %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Fazeris"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Fazeris by Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Pakopos:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "Mažiau"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "Daugiau"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
 #: ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO Dažnis (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO Pradžios Fazė (laipsn.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Gylis:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Atsakomoji reakcija (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Fazeris..."
@@ -4454,6 +5308,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4472,28 +5334,23 @@ msgstr "Takeliai per ilgi, kad būtų galima pakartoti apibraukimą."
 msgid "Repeat"
 msgstr "Kartoti"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Kartoti by Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Kiek kartų kartoti:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Naujas apibraukimo ilgis:"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutÄ—s, %d sekundÄ—s"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundÄ—s"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4557,8 +5414,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4566,6 +5471,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Linijinis"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4594,22 +5507,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Bangos Forma:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4636,10 +5555,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4685,10 +5600,6 @@ msgstr "Priimtas efektas: %s dažnis= %.1f Hz, pradžios fazė = %.0f deg, gylis
 msgid "Wahwah"
 msgstr "VachVach"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "VachVach by Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Gylis (%):"
@@ -4697,10 +5608,18 @@ msgstr "Gylis (%):"
 msgid "Resonance:"
 msgstr "Rezonansas:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Vach Dažnio Ofsetas (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "VachVach..."
@@ -4737,6 +5656,18 @@ msgstr "Efektų nustatymai"
 msgid "Length (seconds)"
 msgstr "Ilgis (sekundÄ—mis)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Priimamas Nyquist Efektas..."
@@ -4802,9 +5733,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4858,6 +5792,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4893,10 +5831,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Negaliu eksportuoti audio į %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Pasirinktas audio eksportuojamas naudojant komandinės eilutės dekoderį"
@@ -4909,6 +5843,477 @@ msgstr "Visas projektas eksportuojamas naudojantis komandinÄ—s eilutÄ—s dekoder
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bitų Skaičius:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Kalba:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML failai(*.xml)|*.xml|Visi Failai (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4981,10 +6386,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4993,10 +6394,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bitų Skaičius:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -5005,10 +6402,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -5034,44 +6427,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5082,20 +6443,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5126,6 +6483,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "KokybÄ—"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5151,36 +6512,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#  i18n-hint: It's asking for the location of a file, for
-#  example, "Where is lame_enc.dll?" - you could translate
-#  "Where would I find the file %s" instead if you want.
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Kur galėčiau rasi  %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5190,8 +6530,9 @@ msgstr "Tik lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Tik libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|Visi Failai (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5210,10 +6551,6 @@ msgstr "Negaliojanti arba nepritaikyta MP3 dekodavimo biblioteka!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Redaguoti ID3 priesagas MP3 failui"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5249,10 +6586,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5265,18 +6598,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "MP3 eksportavimo įskiepis nerastas"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5334,6 +6659,10 @@ msgstr "Įterpti audio prieš pirmąjį pavadinimą"
 msgid "First file name:"
 msgstr "Pirmo failo vardas:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Takelius"
@@ -5354,15 +6683,14 @@ msgstr "Numeruojant iš eilės"
 msgid "File name prefix:"
 msgstr "Failo prefiksas:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Perrašyti egzistuojančius failus"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5372,10 +6700,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Pasirinkite vietą eksportuotiems failams išsaugoti"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5383,6 +6707,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5393,6 +6721,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5401,10 +6735,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5417,22 +6747,14 @@ msgstr "Pasirinktas Audio eksportuojamas kaip Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Visas projektas eksportuojamas kaip Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5448,8 +6770,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Ne visos antraščių kombinacijos ir\n"
 "dekoderiai galimi.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5473,8 +6807,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Klaida (failas gali būti neįrašytas): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5482,6 +6844,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Å i Audacity versija buvo sukompiluota be %s palaikymo."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5512,9 +6882,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5527,19 +6898,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity neatpažysta šio failo tipo. Jei jis nesuspaustas, \n"
-"bandykite importuoti naudodamiesi \"Imporuoti Raw doumenis\"."
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5582,16 +7005,17 @@ msgstr "MIDI takeliai negali pasidengti tarpusavyje, tai gali tik audio takeliai
 msgid "Invalid track offset in LOF file."
 msgstr "Blogas takelio ofsetas LOF faile."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Klaida nagrinÄ—jant Allegro failÄ…"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Klaida nagrinÄ—jant MIDI failÄ…"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5618,15 +7042,23 @@ msgstr "Neteisinga Vorbis kodo antraštė"
 msgid "Internal logic fault"
 msgstr "Vidinis logikos gedimas"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importuojamas '%s' Failas..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Importuoti Raw duomenis"
@@ -5672,6 +7104,14 @@ msgstr "2 Kanalai (Stereo)"
 msgid "%d Channels"
 msgstr "%d Kanalai"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "PradÄ—ti ofsetÄ…:"
@@ -5684,8 +7124,17 @@ msgstr "Importavimo kiekis:"
 msgid "Sample rate:"
 msgstr "Modelio dažnis:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5729,10 +7178,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Groti kitus takelius kol įrašinėjamas naujas"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5742,8 +7190,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5770,12 +7222,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5803,21 +7257,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5856,7 +7298,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5881,23 +7323,65 @@ msgstr "Vieta yra %s neįrašoma"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Laikinos vietos keitimas bus priimtas tik perkrovus Audacity"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Padaryti failo kopiją prieš redagavimą (saugiau)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "MP3 Bibliotekos Versija:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Skaityti tiesiai iš orginalo (greičiau)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5927,53 +7411,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "MP3 Bibliotekos Versija:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Interfeisas"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Nurodyt BibliotekÄ…"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Interfeisas"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5988,6 +7467,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5996,25 +7479,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Kalba:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Db režimo rodomo dažnio minimumas."
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6024,6 +7507,10 @@ msgstr "-36 dB (negilus ruožas aukštos amplitudės redagavimui)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM diapazonas 8 bitų modeliams)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM diapazonas 16 bitų medeliams)"
@@ -6036,10 +7523,34 @@ msgstr "-120 dB (apytikris žmogaus klausos limitas)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM diapazonas 24 bitų modeliams)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Klaviatūra"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6072,10 +7583,6 @@ msgstr "Klaida išsaugant sparčuosius klavišus"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Pasirinkite XML failą kuriame laikote Audacity klavetūros sparčuosius klavišus..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML failai(*.xml)|*.xml|Visi Failai (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Klaida kraunant sparčuosius klavišus"
@@ -6091,6 +7598,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Atšaukti"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Groti kitus takelius kol įrašinėjamas naujas"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "PelÄ—"
@@ -6315,10 +7859,6 @@ msgstr "Priartinti arba Tolinti"
 msgid "Audacity Preferences"
 msgstr "Audacity Nuostatos"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "KokybÄ—"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Stačiakampis"
@@ -6383,12 +7923,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6407,6 +7947,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - įprastas"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - pats siauriausias ruožas"
@@ -6415,6 +7959,10 @@ msgstr "4096 - pats siauriausias ruožas"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6431,6 +7979,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Didžiausias Dažnis (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Didžiausias dažnis turi būti sveikasis skaičius"
@@ -6447,6 +8015,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6519,10 +8095,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "PauzÄ—"
@@ -6531,9 +8103,9 @@ msgstr "PauzÄ—"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Groti (Shift grojimo kartojimui)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6547,6 +8119,10 @@ msgstr "Perkelti į Pradžią"
 msgid "Skip to End"
 msgstr "Perkelti į Pabaigą"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6579,6 +8155,10 @@ msgstr "Nukirpti kas Å¡onuose"
 msgid "Silence selection"
 msgstr "Paversti apibraukimÄ… tyla"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Artinti"
@@ -6635,24 +8215,20 @@ msgstr "IÅ¡vesties lygio matuoklis"
 msgid "Input level meter - click to monitor input"
 msgstr "Įvesties lygio matuoklis - paspauskite kad pradėtų rodyti"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "IÅ¡vesties Garsumas"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Įvesties Garsumas"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6671,6 +8247,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6932,6 +8513,22 @@ msgstr "Dešinė "
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6978,14 +8575,14 @@ msgstr "Horizontalus Stereo"
 msgid "Vertical Stereo"
 msgstr "Vertikalus Stereo"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Linijinis"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7005,6 +8602,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -7013,10 +8626,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -7029,6 +8638,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7142,11 +8766,10 @@ msgstr "Daugiau nerodyti Å¡io perspÄ—jimo"
 msgid "Could not open file: \"%s\""
 msgstr "Negaliu atidaryti failo: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Klaida: %s linijoje %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/mk.po b/locale/mk.po
index c640e98..9cfcb13 100644
--- a/locale/mk.po
+++ b/locale/mk.po
@@ -20,34 +20,23 @@ msgstr "Project-Id-Version: audacity_mk\n"
 msgid "&About Audacity..."
 msgstr "З&а Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Вклучено"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Дата на програмата:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity е слободен програм започнат од развојниот тим со користење на Sourceforge и сервисите на врска за проекти со отворен извор. Базиран е на wxWindows алатките и е достапен за Windows, MacOS 9 и X, Linux, идруги Unix-оидни системи."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Ова е бета програма. Може да содржи бубачки и недовршени можности. Се надеваме на ваши реакции, затоа посетете ја нашата веб страна и дајте ни извештај за бубачките и бараните можности."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
@@ -60,14 +49,9 @@ msgstr ""
 msgid "translator_credits"
 msgstr ""
 
-#: ../src/AboutDialog.cpp:141
-#, fuzzy
-msgid "A Free Digital Audio Editor"
-msgstr "Нов дигитален аудио едитор"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Информација"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -103,26 +87,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Посебна благодарност:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Вклучено"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Дата на програмата:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
-#: ../src/effects/NoiseRemoval.cpp:463 ../src/effects/ClickRemoval.cpp:371
-msgid "Close"
-msgstr "Затвори"
-
 #: ../src/AudacityApp.cpp:304 ../src/Project.cpp:1770
 #, fuzzy, c-format
 msgid "%s is already open in another window."
@@ -321,12 +397,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -360,8 +437,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -409,6 +486,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -457,10 +538,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -677,16 +766,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr ""
 
-#: ../src/DirManager.cpp:660
-#, fuzzy, c-format
-msgid "Changing block %s\n"
-msgstr "Менување висина\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -815,6 +904,95 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Правоаголно"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Каде е %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Анализа на фрекфенции"
@@ -842,8 +1020,8 @@ msgstr "Проширен автосооднос"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -856,8 +1034,8 @@ msgstr "Големина"
 msgid " window"
 msgstr "прозорец"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -868,14 +1046,23 @@ msgstr "Линиска фрекфенција"
 msgid "Log frequency"
 msgstr "Log фрекфенција"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
+#: ../src/effects/NoiseRemoval.cpp:463 ../src/effects/ClickRemoval.cpp:371
+msgid "Close"
+msgstr "Затвори"
+
 #: ../src/widgets/Meter.cpp:293
 msgid "dB"
 msgstr ""
@@ -926,7 +1113,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Lag (секунди)\tФрекфенција (Hz)\tНиво"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -942,15 +1129,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -961,40 +1164,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1189,6 +1416,10 @@ msgstr "&Сними проект\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Зачувај го проектот к&ако..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1197,6 +1428,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1226,10 +1461,26 @@ msgstr "Експорт на нас&лови..."
 msgid "Export &Multiple..."
 msgstr "Експорт на нас&лови..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1292,9 +1543,9 @@ msgstr "&Бриши\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Тишина\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1308,22 +1559,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1367,12 +1616,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1384,73 +1633,66 @@ msgstr "Означи &се\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-#, fuzzy
-msgid "Start to Cursor"
-msgstr "Означи старт од покажувач"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-#, fuzzy
-msgid "Cursor to End"
-msgstr "Покажувач на крај од нумерата"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 msgid "Find &Zero Crossings\tZ"
 msgstr ""
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Порамни и мрдни покажувач"
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
+#: Menus.cpp:478
 #, fuzzy
-msgid "to Selection Start"
+msgid "to Selection Star&t"
 msgstr "Покажувач на почеток на селекцијата"
 
-#: ../src/Menus.cpp:293
+#: Menus.cpp:479
 #, fuzzy
-msgid "to Selection End"
+msgid "to Selection En&d"
 msgstr "Покажувач на крај од селекцијата"
 
-#: ../src/Menus.cpp:288
-#, fuzzy
-msgid "to Track Start"
-msgstr "Покажувач на почеток од нумерата"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-#, fuzzy
-msgid "to Track End"
-msgstr "Покажувач на крај од нумерата"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-#, fuzzy
-msgid "Selection Save"
-msgstr "Покажувач или селекција снимени"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-#, fuzzy
-msgid "Selection Restore"
-msgstr "Покажувач или селекција обновени"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1469,9 +1711,14 @@ msgstr ""
 msgid "Turn Grid Snap Off"
 msgstr ""
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Поставки\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1509,60 +1756,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Историја"
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Скокни до почеток\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Скокни до крај\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1578,12 +1887,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Временска нумера"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1598,6 +1903,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "&Тргни нумери"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Порамни со &нула"
@@ -1614,29 +1927,40 @@ msgstr "Порамни со п&очеток на селекцијата"
 msgid "Align with Selection &End"
 msgstr "Порамни со &крај на селекцијата"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Порамни крај со покажувач"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Порамни крај со почеток на селекција"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Порамни крај со крај на селекција"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Порамни ги нумерите меѓусебно"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Порамни..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1649,22 +1973,26 @@ msgstr "Дај наслов на селекција\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Дај наслов на селекција\tCtrl+B"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Генерирај"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 #, fuzzy
 msgid "Effe&ct"
@@ -1699,6 +2027,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1711,12 +2043,12 @@ msgstr "Почни &брзинар..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1757,9 +2089,9 @@ msgstr ""
 msgid "Previous Tool\tA"
 msgstr ""
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Свири/Стоп\tПразно место"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1773,12 +2105,12 @@ msgstr "Пауза\tP"
 msgid "Record\tR"
 msgstr "Снимај\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1794,23 +2126,14 @@ msgstr "Свири една секунда\t1"
 msgid "Play Looped\tL"
 msgstr ""
 
-#: ../src/Menus.cpp:567
-#, fuzzy
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Свири/Стоп\tПразно место"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Скокни до почеток\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Скокни до крај\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Селекција на почеток\tShift+Home"
@@ -1869,8 +2192,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1969,13 +2292,18 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
 msgstr ""
 
 #: ../src/Menus.cpp:620
@@ -2033,6 +2361,23 @@ msgstr "&Врати\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Нема наслови за експортирање."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Ништо за врати"
@@ -2069,6 +2414,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Залепено од амбар"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2237,9 +2586,9 @@ msgstr "Внеси нас&лови..."
 msgid "Select a MIDI file..."
 msgstr "Означи MIDI датотека..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Сите видови (*.*)|*.*|MIDI датотеки (*.mid)|*.mid|Allegro датотеки (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2260,12 +2609,6 @@ msgstr "Одберете која било некомпресирана ауди
 msgid "All files (*)|*"
 msgstr "Сите видови (*.*)|*.*"
 
-#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Внеси"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2297,6 +2640,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Порамнето со нула"
@@ -2334,6 +2681,14 @@ msgstr "Порамнето"
 msgid "Align"
 msgstr "Порамнето"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Создадена нова аудио нумера"
@@ -2397,14 +2752,14 @@ msgstr "&Тргни нумери"
 msgid "Removed audio track(s)"
 msgstr "Отстрани аудио нумера/и"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2470,14 +2825,13 @@ msgstr "Снимање"
 msgid "Save changes before closing?"
 msgstr "Да снимам измени пред затворање?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2497,6 +2851,25 @@ msgstr "Одберете аудио фајл..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821 ../src/Project.cpp:1829
 msgid "Error opening file"
 msgstr "Грешка при вчитување датотека."
@@ -2552,42 +2925,34 @@ msgstr ""
 msgid "Can't open project file"
 msgstr "Неможно да се отвори проектот."
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Неможно да го снимам проектот. Можеби %s не е снимлив,\n"
-"или дискот е полн."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148 ../src/Project.cpp:2160
 msgid "Error saving project"
@@ -2598,22 +2963,17 @@ msgstr "Грешка при снимање проект"
 msgid "Saved %s"
 msgstr "Снимено %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Внесено '%s'"
 
+#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Внеси"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Грешка при внес"
@@ -2626,14 +2986,24 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
 
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Аudacity проекти (*.aup)|*.aup"
@@ -2676,6 +3046,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Над диск просторот"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2762,43 +3142,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2840,8 +3189,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Коментари:"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2860,12 +3209,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2907,103 +3256,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, fuzzy, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Макс. должината на атрибутот 'Година' е 4 знаци. Датотеката е деформирана."
-
-#: ../src/Tags.cpp:435
-#, fuzzy
-msgid "Title"
-msgstr "Име:"
-
-#: ../src/Tags.cpp:445
-#, fuzzy
-msgid "Artist"
-msgstr "Исполнител:"
-
-#: ../src/Tags.cpp:455
-#, fuzzy
-msgid "Album"
-msgstr "Албум:"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3068,8 +3333,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3104,6 +3412,10 @@ msgstr "Брановидна форма"
 msgid "Waveform (dB)"
 msgstr "Брановидна форма (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Висина (EAC)"
@@ -3237,12 +3549,12 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Временска алатка"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
@@ -3330,6 +3642,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3390,14 +3710,6 @@ msgstr "Да снимам промени?"
 msgid "Format Change"
 msgstr "Процент на промени:"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Внеси рата во Hz (по секунда) меѓу 1 и 100000:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Невалидна рата."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Смени го долното нивото на брзина за (%) :"
@@ -3533,8 +3845,8 @@ msgstr "Додавка 1 за %i"
 msgid "Plugins %i to %i"
 msgstr "Додавки %i за %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3556,8 +3868,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3578,14 +3890,19 @@ msgstr "Применет ефект: %s %.1f dB"
 msgid "Amplify"
 msgstr "Засилувач"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Засилувач од Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Засилување (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Нов амплитуден врв (dB):"
@@ -3595,6 +3912,10 @@ msgstr "Нов амплитуден врв (dB):"
 msgid "Allow clipping"
 msgstr "Не дозволувај преку"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Засилувач..."
@@ -3707,10 +4028,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Фрекфенција (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Истакнување (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3750,9 +4079,50 @@ msgstr "од Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "Звучен допир, од Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Висина:   од"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Полутонови (полустепени):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
 #: ../src/effects/ChangeSpeed.cpp:351 ../src/effects/ChangeTempo.cpp:223
@@ -3760,19 +4130,20 @@ msgstr "Висина:   од"
 msgid "to"
 msgstr "до"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Полутонови (полустепени):"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Фрекфенција (Hz):   од"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
 #: ../src/effects/ChangeTempo.cpp:182
 msgid "Percent Change:"
 msgstr "Процент на промени:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Смени висина..."
@@ -3790,6 +4161,14 @@ msgstr "Применет ефект: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Смени брзина"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "n/a"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Смени брзина менувајќи и темпо и висина"
@@ -3798,17 +4177,17 @@ msgstr "Смени брзина менувајќи и темпо и висина
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "Рата на семпл, од Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Стандарден Винил RPM:   од"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3826,13 +4205,29 @@ msgstr "Смени темпо"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Смени темпо без менување висина"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Битови по минута (BPM):     Од"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Должина (секунди):     од"
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3842,8 +4237,8 @@ msgstr "Смени темпо..."
 msgid "Changing Tempo"
 msgstr "Менување темпо"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3854,10 +4249,18 @@ msgstr ""
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 #, fuzzy
 msgid "Click Removal..."
@@ -3872,49 +4275,84 @@ msgstr "Отстранување шум"
 msgid "Dynamic Range Compressor"
 msgstr "Динамичен компресор"
 
-#: ../src/effects/Compressor.cpp:428
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Динамичен компресор од Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:446
-msgid "Ratio: "
-msgstr "Размер: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:453
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Ударно време: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:520
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Богатство: %d dB"
 
-#: ../src/effects/Compressor.cpp:523
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Размер: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Размер: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:527
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Ударно време: %.1f сек"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3925,6 +4363,247 @@ msgstr "Збивач..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Применета динамичка компресија"
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Информација"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3941,8 +4620,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Амплитуда (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4171,16 +4850,12 @@ msgstr "Вртено"
 msgid "Inverting"
 msgstr "Вртење"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4192,31 +4867,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4227,6 +4906,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Фазер"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Отстранувач на шум"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4243,10 +5074,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4274,10 +5101,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Отстранувач на шум"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Чекор 1"
@@ -4308,14 +5131,26 @@ msgstr "Земи профил на шум"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Отстранувач на шум..."
@@ -4350,22 +5185,22 @@ msgstr ""
 msgid "Normalize"
 msgstr ""
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr ""
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 #, fuzzy
 msgid "Normalize..."
@@ -4381,42 +5216,54 @@ msgstr "Еквилизација..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Применет ефект: %s %d патеки, %.0f%% влажност, фрекфенција = %.1f Hz, почетна фаза = %.0f степени, длабина = %d, враќање = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Фазер"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Фазер од Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Патеки:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "СУВО"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "Влажно"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO фрекфенција (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO почетна фаза (степени):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Длабина:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Враќање (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Фазер..."
@@ -4431,6 +5278,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4448,28 +5303,22 @@ msgstr ""
 msgid "Repeat"
 msgstr ""
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr ""
-
-#: ../src/effects/Repeat.cpp:229
+#: effects/Repeat.cpp:212
 #, fuzzy
-msgid "Number of times to repeat: "
+msgid "Number of times to repeat:"
 msgstr "Број на уредувања:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
 #, fuzzy
 msgid "New selection length: "
 msgstr "Постави формат на селекција"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr ""
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
 msgstr ""
 
 #: ../src/effects/Repeat.h:34
@@ -4535,8 +5384,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4544,6 +5441,15 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+#, fuzzy
+msgid "Linear"
+msgstr "Година:"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4572,22 +5478,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Брановидна форма:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4614,10 +5526,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4664,10 +5572,6 @@ msgstr "Примент ефект: %s фрекфенција = %.1f Hz, поче
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah од Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Длабина (%):"
@@ -4676,10 +5580,18 @@ msgstr "Длабина (%):"
 msgid "Resonance:"
 msgstr "Резонанца:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah фрекфентен поместување (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4717,6 +5629,18 @@ msgstr "Ladspa ефект поставки"
 msgid "Length (seconds)"
 msgstr "Должина (секунди):     од"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Применет Nyquist ефект..."
@@ -4785,9 +5709,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4841,6 +5768,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4876,10 +5807,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Неможно да експортирам на %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 #, fuzzy
 msgid "Exporting the selected audio using command-line encoder"
@@ -4894,6 +5821,477 @@ msgstr "Експорт на проектот како mp3"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Бит рата:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Јазик:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML датотеки (*.xml)|*.xml|сите датотеки (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4966,10 +6364,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4978,10 +6372,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Бит рата:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4990,10 +6380,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345 ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
 msgstr "Неможно да се отвори бараната датотека за запис"
@@ -5018,44 +6404,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5066,20 +6420,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5110,6 +6460,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Квалитет"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5135,35 +6489,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Каде е %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5173,8 +6507,9 @@ msgstr "Само lame_enc.dll|lame_enc.dll|динамички врзани би
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Само libmp3lame.so|libmp3lame.so|примарно деливи објекти (*.so)|*.so|зајакнати библиотеки (*.so*)|*.so*|сите датотеки (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5193,10 +6528,6 @@ msgstr "Невалидна или неподдржана MP3 енкодирач
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Уреди ID3 таг за MP3 датотека"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5232,10 +6563,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5248,18 +6575,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "MP3 експорт додавка не е пронајдена"
-
 #: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
 #, fuzzy
@@ -5317,6 +6636,10 @@ msgstr ""
 msgid "First file name:"
 msgstr ""
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 #, fuzzy
 msgid "Tracks"
@@ -5339,13 +6662,12 @@ msgstr ""
 msgid "File name prefix:"
 msgstr ""
 
-#: ../src/export/ExportMultiple.cpp:677
-msgid "Overwrite existing files"
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
 msgstr ""
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
+#: ../src/export/ExportMultiple.cpp:677
+msgid "Overwrite existing files"
 msgstr ""
 
 #: export/ExportMultiple.cpp:360
@@ -5358,10 +6680,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Одбери локација за сместување на привремениот именик"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5369,6 +6687,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5379,6 +6701,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5387,10 +6715,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5403,22 +6727,14 @@ msgstr "Експорт на селектираното аудио како Ogg V
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Експорт на проектот како Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5434,8 +6750,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Не сите комбинации на наслови\n"
 "и енкодери се возможни.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5459,8 +6787,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Грешка (датотеката можеби не е снимена): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5468,6 +6824,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Оваа верзија на Audacity не е преведена со %s подршка."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5498,9 +6862,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5513,19 +6878,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity не го препознава типот на датотеката.\n"
-"Ако е незбиен, пробајте да го внесете со \"Внеси Raw\""
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5561,16 +6978,17 @@ msgstr "MIDI нумерата неможно да биде поместена с
 msgid "Invalid track offset in LOF file."
 msgstr "Невалидно поместување на нумера во LOF датотеката."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Грешка при читање Allegro датотека."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Грешка при читање MIDI датотека."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5597,15 +7015,23 @@ msgstr "Невалидно Vorbis bitstream заглавие"
 msgid "Internal logic fault"
 msgstr "Интерен логички фаул"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Внесувам %s датотека..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Внеси Raw датотека"
@@ -5649,6 +7075,14 @@ msgstr "2 (Стерео)"
 msgid "%d Channels"
 msgstr "Канали:"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Почетно поместување:"
@@ -5661,8 +7095,17 @@ msgstr "Подготви за внес:"
 msgid "Sample rate:"
 msgstr "Рата на семпл:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5706,10 +7149,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Свири други нумери додека снимаш нова"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5719,8 +7161,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5747,12 +7193,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5780,21 +7228,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88 ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
 msgstr "Именици"
@@ -5832,7 +7268,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5857,23 +7293,65 @@ msgstr "Именикот %s не е снимлив"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Промените во привремениот именик нема да имаат ефект се додека Audacity не се превклучи."
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Направи копија од датотеката за едитирање(побезбедно)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Верзија на MP3 библиотека:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Читај директно од оригиналот(побрзо)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5903,53 +7381,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Верзија на MP3 библиотека:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Интерфејс"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Барај библиотека"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Интерфејс"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5964,6 +7437,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5972,24 +7449,24 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Јазик:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
@@ -6000,6 +7477,10 @@ msgstr ""
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr ""
@@ -6012,10 +7493,34 @@ msgstr ""
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Клавијатура"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6048,10 +7553,6 @@ msgstr "Грешка при снимање кратенка"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Селектирајте XML датотека која содржи Audacity кратенки..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML датотеки (*.xml)|*.xml|сите датотеки (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Грешка при внес на кратенка"
@@ -6067,6 +7568,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Врати"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Свири други нумери додека снимаш нова"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Глушец"
@@ -6280,10 +7818,6 @@ msgstr "Зум во или од"
 msgid "Audacity Preferences"
 msgstr "Аudacity поставки"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Квалитет"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Правоаголник"
@@ -6348,12 +7882,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6372,6 +7906,10 @@ msgstr ""
 msgid "256 - default"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr ""
@@ -6380,6 +7918,10 @@ msgstr ""
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6396,6 +7938,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Максимална фрекфенција (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Максималната фрекфенција мора да биде делива"
@@ -6412,6 +7974,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6484,10 +8054,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Пауза"
@@ -6496,8 +8062,8 @@ msgstr "Пауза"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
 msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
@@ -6512,6 +8078,10 @@ msgstr "Скокни до почеток"
 msgid "Skip to End"
 msgstr "Скокни до крај"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6545,6 +8115,10 @@ msgstr "Отсечи се вон селекцијата"
 msgid "Silence selection"
 msgstr "Тивка селекција"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Зум во"
@@ -6603,24 +8177,20 @@ msgstr ""
 msgid "Input level meter - click to monitor input"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6639,6 +8209,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6896,6 +8471,22 @@ msgstr "Десен"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6943,15 +8534,14 @@ msgstr ""
 msgid "Vertical Stereo"
 msgstr "Направи стерео нумера"
 
-#: ../src/widgets/Meter.cpp:292
-#, fuzzy
-msgid "Linear"
-msgstr "Година:"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6971,6 +8561,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6979,10 +8585,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6995,6 +8597,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7108,11 +8725,10 @@ msgstr ""
 msgid "Could not open file: \"%s\""
 msgstr "Неможно да ја отворам датотеката: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Грешка: %s во линија %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/nb.po b/locale/nb.po
index 5cb7031..59c42f0 100644
--- a/locale/nb.po
+++ b/locale/nb.po
@@ -4,8 +4,7 @@
 # Audacity Team <audacity-translation at lists.sourceforge.net>, 1999 and beyond.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity 1.3.3\n"
+msgstr "Project-Id-Version: Audacity 1.3.3\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
 "PO-Revision-Date: 2008-05-10 15:35+0200\n"
@@ -25,41 +24,16 @@ msgid "OK... Audacious!"
 msgstr "OK... Audacious!"
 
 #: AboutDialog.cpp:175
-msgid ""
-"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."
-msgstr ""
-"Audacity er et gratis program skrevet av en gruppe med frivillige utviklere "
-"fra hele verden. Samarbeidet er mulig takket være SourceForge.net, en "
-"internettjeneste som tilbyr gratis verktøy til programvareprosjekter med "
-"åpen kildekode. Audacity finnes for Windows 98 og nyere, Mac OS X, Linux og "
-"andre Unix-lignende operativsystemer. Eldre versjoner av Audacity er "
-"tilgjengelige for Mac OS 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"Dette er en betaversjon av programmet. Det kan inneholde leif og uferdige "
-"funksjoner. Vi har bruk for dine tilbakemeldinger, så besøk gjerne vårt "
-"nettsted og gi oss feilrapporter og ønsker om nye funksjoner."
 
 #: AboutDialog.cpp:182
-msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"Dette er en stabil, ferdiggjort utgave av Audacity. Hvis du allikevel skulle "
-"finne en feil eller ha forslag til forbedringer, ta gjerne kontakt med oss. "
-"Vi er avhengige av tilbakemelding fra brukere for å fortsette å forbedre "
-"Audacity. For mer informasjon, se vårt nettsted."
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -76,8 +50,8 @@ msgid "translator_credits"
 msgstr "Norwegian (bokmål) translation by Kevin Brubeck Unhammer."
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Et gratis digitalt lydredigeringsprogram"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -113,6 +87,10 @@ msgstr "Audacity er basert p
 msgid "Special thanks:"
 msgstr "Særlig takk til:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -232,12 +210,10 @@ msgstr "Feil ved 
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s eksisterer ikke og kunne ikke åpnes.\n"
+msgstr "%s eksisterer ikke og kunne ikke åpnes.\n"
 "\n"
 "Den har blitt fjernet fra historielisten."
 
@@ -270,37 +246,27 @@ msgid "Unknown command line option: %s\n"
 msgstr "Ukjent kommandolinjevalg: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity kunne ikke finne et sted å lagre midlertidig filer.\n"
+msgstr "Audacity kunne ikke finne et sted å lagre midlertidig filer.\n"
 "Vennligst legg inn en passende mappe i innstillinger-dialogboksen."
 
 #: AudacityApp.cpp:1050
-msgid ""
-"Audacity is now going to exit. Please launch Audacity again to use the new "
-"temporary directory."
-msgstr ""
-"Audacity vil nå avsluttes. Vennligst kjør Audacity igjen for å benytte den "
-"nye midlertidige mappen."
+msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
+msgstr "Audacity vil nå avsluttes. Vennligst kjør Audacity igjen for å benytte den nye midlertidige mappen."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Å kjøre to kopier av Audacity samtidig kan forårsake\n"
+msgstr "Å kjøre to kopier av Audacity samtidig kan forårsake\n"
 "tap av data eller få systemet ditt til å krasje.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity klarte ikke å låse mappen med midlertidige filer.\n"
+msgstr "Audacity klarte ikke å låse mappen med midlertidige filer.\n"
 "Denne mappen er kanskje i bruk av en annen kopi av Audacity.\n"
 
 #: AudacityApp.cpp:1091
@@ -316,11 +282,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Systemet har oppdaget at en annen kopi av Audacity kjører.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Bruk Ny eller Åpne-kommandoene i den kjørende\n"
+msgstr "Bruk Ny eller Åpne-kommandoene i den kjørende\n"
 "Audacity-prosessen for å åpne flere prosjekter samtidig.\n"
 
 #: AudacityApp.cpp:1134
@@ -358,20 +322,15 @@ msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (velg maksimal størrelse på diskblokker, i bytes)"
 
 #: AudacityApp.cpp:1166
-msgid ""
-"In addition, specify the name of an audio file or Audacity project to open "
-"it."
-msgstr ""
-"I tillegg, gi navnet på en lydfil eller et Audacity-prosjekt for å åpne det."
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr "I tillegg, gi navnet på en lydfil eller et Audacity-prosjekt for å åpne det."
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Audacity prosjektfiler (.AUP) er ikke \n"
+msgstr "Audacity prosjektfiler (.AUP) er ikke \n"
 "assosiert med Audacity.\n"
 "\n"
 "Vil du rette dette, så de kan åpnes med et dobbeltklikk?"
@@ -385,11 +344,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Kunne ikke finne noen lydenheter.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Du vil ikke kunne spille av eller inn lyd.\n"
+msgstr "Du vil ikke kunne spille av eller inn lyd.\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -405,27 +362,21 @@ msgid "Latency problem"
 msgstr "Latensproblem"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
-"You may have to use the Time Shift Tool (<---> or F5) to drag the track to "
-"the right place."
-msgstr ""
-"En latensinnstilling skjulte lydopptaket foran nullpunktet.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr "En latensinnstilling skjulte lydopptaket foran nullpunktet.\n"
 "Audacity flyttet det tilbake så det starter på null.\n"
-"Du må kanskje bruke tidsforskyvningsverktøyet (<---> eller F5) for å dra "
-"sporet til korrekt sted."
+"Du må kanskje bruke tidsforskyvningsverktøyet (<---> eller F5) for å dra sporet til korrekt sted."
 
 #: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
 msgstr "Automatisk krasjgjenoppretting"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Noen prosjekter ble ikke lagret skikkelig siste gang Audacity ble kjørt.\n"
+msgstr "Noen prosjekter ble ikke lagret skikkelig siste gang Audacity ble kjørt.\n"
 "Heldigvis kan de følgende prosjektene automatisk gjenopprettes:"
 
 #: AutoRecovery.cpp:75
@@ -437,11 +388,8 @@ msgid "Name"
 msgstr "Navn"
 
 #: AutoRecovery.cpp:84
-msgid ""
-"Recovering a project will not change any files on disk before you save it."
-msgstr ""
-"Gjenoppretting av et prosjekt vil ikke endre filer på disken før du lagrer "
-"det."
+msgid "Recovering a project will not change any files on disk before you save it."
+msgstr "Gjenoppretting av et prosjekt vil ikke endre filer på disken før du lagrer det."
 
 #: AutoRecovery.cpp:88
 msgid "Quit Audacity"
@@ -456,11 +404,9 @@ msgid "Recover Projects"
 msgstr "Gjenopprett prosjekter"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Er du sikker på at du ikke vil gjenopprette noen prosjekt?\n"
+msgstr "Er du sikker på at du ikke vil gjenopprette noen prosjekt?\n"
 "De kan ikke gjenopprettes senere."
 
 #: AutoRecovery.cpp:128
@@ -521,11 +467,9 @@ msgstr "Kommandoen %s er ikke implementert enn
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Klarte ikke endre parametrene på effekten %s\n"
+msgstr "Klarte ikke endre parametrene på effekten %s\n"
 " til %s."
 
 #: BatchCommands.cpp:583
@@ -535,12 +479,10 @@ msgstr "Klarte ikke gjenkjenne satsvis kommando %s."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Anvend %s med parameter(e)\n"
+msgstr "Anvend %s med parameter(e)\n"
 "\n"
 "%s"
 
@@ -558,6 +500,10 @@ msgstr "Anvend %s"
 msgid "Apply Chain"
 msgstr "Anvend kjede"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Velg kjede"
@@ -595,19 +541,21 @@ msgstr "Anvender '%s' p
 msgid "Please save and close the current project first."
 msgstr "Vennligst lagre og lukk dette prosjektet først."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Velg fil(er) for satsvis prosessering..."
 
-#: BatchProcessDialog.cpp:210
-msgid ""
-"All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
-"files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|"
-"FLAC files (*.flac)|*.flac"
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
 msgstr ""
-"Alle filer (*.*)|*.*|WAV-filer (*.wav)|*.wav|AIFF-filer (*.aif)|*.aif|AU-"
-"filer (*.au)|*.au|MP3-filer (*.mp3)|*.mp3|Ogg Vorbis-filer (*.ogg)|*.ogg|"
-"FLAC-filer (*.flac)|*.flac"
+
+#: BatchProcessDialog.cpp:210
+msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
+msgstr "Alle filer (*.*)|*.*|WAV-filer (*.wav)|*.wav|AIFF-filer (*.aif)|*.aif|AU-filer (*.au)|*.au|MP3-filer (*.mp3)|*.mp3|Ogg Vorbis-filer (*.ogg)|*.ogg|FLAC-filer (*.flac)|*.flac"
 
 #: BatchProcessDialog.cpp:231
 msgid "Applying..."
@@ -709,15 +657,11 @@ msgid "Copying audio data into project..."
 msgstr "Kopierer lyddata inn i prosjekt..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
-"Copy audio from the following files into your project to make it self-"
-"contained?\n"
+msgid "Your project currently depends on the presence of other files.\n"
+"Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Prosjektet ditt er foreløpig avhengig av tilgang til andre filer.\n"
-"Vil du kopiere lyd fra de følgende filene inn i prosjektet ditt for å gjøre "
-"det uavhengig?\n"
+msgstr "Prosjektet ditt er foreløpig avhengig av tilgang til andre filer.\n"
+"Vil du kopiere lyd fra de følgende filene inn i prosjektet ditt for å gjøre det uavhengig?\n"
 "Dette vil kreve mer diskplass, men det er sikrere."
 
 #: Dependencies.cpp:266
@@ -769,30 +713,21 @@ msgid "Whenever a project depends on other files:"
 msgstr "Hver gang et prosjekt er avhengig av andre filer:"
 
 #: Dependencies.cpp:409
-msgid ""
-"If you proceed, your project will not be saved to disk. Is this what you "
-"want?"
-msgstr ""
-"Hvis du fortsetter vil prosjektet ikke bli lagret til disk. Er dette hva du "
-"vil?"
+msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
+msgstr "Hvis du fortsetter vil prosjektet ikke bli lagret til disk. Er dette hva du vil?"
 
 #: Dependencies.cpp:449
-msgid ""
-"Your project is self-contained; it does not depend on any external audio "
-"files."
-msgstr ""
-"Prosjektet ditt er selvberget; det er ikke avhengig av eksterne lydfiler."
+msgid "Your project is self-contained; it does not depend on any external audio files."
+msgstr "Prosjektet ditt er selvberget; det er ikke avhengig av eksterne lydfiler."
 
 #: Dependencies.cpp:450
 msgid "Dependency check"
 msgstr "Avhengighetskontroll"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Advarsel: det er veldig lite ledig diskplass på denne harddisken.\n"
+msgstr "Advarsel: det er veldig lite ledig diskplass på denne harddisken.\n"
 "Vennligst velg en annen midlertidig mappe i innstillingene dine."
 
 #: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
@@ -813,14 +748,10 @@ msgstr "Rensker opp mellomlagringsmapper"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
-"Please consider saving and reloading the project to perform a complete "
-"project check.\n"
-msgstr ""
-"Audacity fant en avsondret blokkfil %s! \n"
-"Vennligst overvei å lagre og gjenåpne prosjektet for å utføre en komplett "
-"prosjektkontroll.\n"
+msgid "Audacity found an orphaned blockfile %s! \n"
+"Please consider saving and reloading the project to perform a complete project check.\n"
+msgstr "Audacity fant en avsondret blokkfil %s! \n"
+"Vennligst overvei å lagre og gjenåpne prosjektet for å utføre en komplett prosjektkontroll.\n"
 
 #  i18n-hint: This is the pattern for filenames that are created
 #  when a file needs to be backed up to a different name.  For
@@ -850,17 +781,16 @@ msgstr "Klarte ikke fjerne '%s'"
 msgid "Renamed file: %s\n"
 msgstr "Endret filnavn: %s\n"
 
-# "block" usage?
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Endrer blokk %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Klarte ikke omdøpe '%s' til '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr "Inspiserer prosjektfilinformasjon..."
@@ -886,24 +816,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "Mangler datafil: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
-"click 'Details' for a complete list of errors, or 'OK' to proceed to more "
-"options."
-msgstr ""
-"Prosjektkontrollen fant uoverensstemmelser ved inspeksjon av innlastet "
-"prosjektdata;\n"
-"klikk 'Detaljer' for en fullstendig liste med feil, eller 'OK' for å "
-"fortsette til flere valg."
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
+"click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
+msgstr "Prosjektkontrollen fant uoverensstemmelser ved inspeksjon av innlastet prosjektdata;\n"
+"klikk 'Detaljer' for en fullstendig liste med feil, eller 'OK' for å fortsette til flere valg."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Prosjektkontroll fant %d avsondrede blokkfil[er]. Disse filene er\n"
+msgstr "Prosjektkontroll fant %d avsondrede blokkfil[er]. Disse filene er\n"
 "ubrukte og sannsynligvis rester fra et krasj eller en annen programfeil.\n"
 "De bør slettes for å unngå diskkonflikt."
 
@@ -927,15 +850,13 @@ msgstr "Advarsel"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Prosjektkontrollen oppdaget at %d inndatafil[er] brukt på\n"
+msgstr "Prosjektkontrollen oppdaget at %d inndatafil[er] brukt på\n"
 "stedet ('alias-filer') nå mangler. Det er umulig for Audacity å\n"
 "gjenopprette disse filene automatisk; du kan velge å\n"
 "permanent fylle inn stillhet for disse manglende filene,\n"
@@ -957,12 +878,10 @@ msgstr "Lukk prosjektet omg
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Prosjektkontrollen oppdaget %d manglende sammendragsfil[er] (.auf).\n"
+msgstr "Prosjektkontrollen oppdaget %d manglende sammendragsfil[er] (.auf).\n"
 "Audacity kan fullstendig gjenopprette disse sammendragsfilene fra\n"
 "den original lydinformasjonen i prosjektet."
 
@@ -976,16 +895,14 @@ msgstr "Fyll inn stillhet for manglende visningsdata [bare for denne 
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Prosjektkontrollen oppdaget %d manglende lyd-blokkfil[er] (.au), \n"
+msgstr "Prosjektkontrollen oppdaget %d manglende lyd-blokkfil[er] (.au), \n"
 "kanskje pga. en programfeil, et systemkrasj eller utilsiktet sletting.\n"
 "Det er ingen måte Audacity kan gjenopprette den tapte informasjonen\n"
 "automatisk; du kan velge å permanent fylle inn stillhet for den\n"
@@ -1021,6 +938,98 @@ msgstr "Lagrer innspilt lyd til disken..."
 msgid "Rectangular"
 msgstr "Rektangulær"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Plasseringen til %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "For å finne %s, klikk her -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Bla gjennom..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#  i18n-hint: It's asking for the location of a file, for
+#  example, "Where is lame_enc.dll?" - you could translate
+#  "Where would I find the file %s" instead if you want.
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Hvor finnes filen %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Frekvensanalyse"
@@ -1051,8 +1060,9 @@ msgstr "Forbedret autosamsvar"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algoritme:"
 
 #: FreqWindow.cpp:168 HistoryWindow.cpp:79
@@ -1069,9 +1079,9 @@ msgstr "St
 msgid " window"
 msgstr " vindu"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Funksjon:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1081,14 +1091,19 @@ msgstr "Lin
 msgid "Log frequency"
 msgstr "Logaritmisk frekvens"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Akse:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:204 Menus.cpp:233
 msgid "&Export..."
 msgstr "&Eksporter..."
 
+# Visstnok brukt to ganger, men som substantiv begge gangene?
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Eksport"
+
 #: FreqWindow.cpp:209 widgets/ErrorDialog.cpp:159
 msgid "Close"
 msgstr "Lukk"
@@ -1128,10 +1143,8 @@ msgstr "Mark
 
 #: FreqWindow.cpp:788
 #, c-format
-msgid ""
-"Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
-msgstr ""
-"Markør: %.4f sek (%d Hz) (%s) = %f,    Toppunkt: %.4f sek (%d Hz) (%s) = %.3f"
+msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
+msgstr "Markør: %.4f sek (%d Hz) (%s) = %f,    Toppunkt: %.4f sek (%d Hz) (%s) = %.3f"
 
 #: FreqWindow.cpp:1061
 msgid "spectrum.txt"
@@ -1216,360 +1229,65 @@ msgid "Welcome to Audacity "
 msgstr "Velkommen til Audacity"
 
 #: HelpText.cpp:151
-msgid ""
-"Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|"
-"record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or "
-"open an Audacity project]] <li>[[export|export]] to an MP3 or other audio "
-"file, or [[burncd|burn to a CD]]  </ul></p><p>"
-msgstr ""
-"Lær å: <ul><li>[[play|spille av]] en eksisterende lydfil <li>[[record|spille "
-"inn]] stemmen din, en LP eller kassett <li>[[edit|redigere]] lyd <li>[[save|"
-"lagre eller åpne et Audacity-prosjekt]] <li>[[export|eksportere]] til MP3 "
-"eller andre lydformat, eller [[burncd|brenne til CD]]  </ul></p><p>"
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr "Lær å: <ul><li>[[play|spille av]] en eksisterende lydfil <li>[[record|spille inn]] stemmen din, en LP eller kassett <li>[[edit|redigere]] lyd <li>[[save|lagre eller åpne et Audacity-prosjekt]] <li>[[export|eksportere]] til MP3 eller andre lydformat, eller [[burncd|brenne til CD]]  </ul></p><p>"
 
 #: HelpText.cpp:159
-msgid ""
-"This screen can be viewed at any time by clicking the <i>Help</i> menu, then "
-"<i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus "
-"and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a "
-"href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf"
-"\">full Manual</a> in PDF format.</p>"
-msgstr ""
-"Denne skjermen kan vises når som helst ved å klikke <i>Hjelp</i>-menyen, så "
-"<i>Vis velkomstmelding</i>. For en detaljert guide til alle menyene og "
-"kontrollene i Audacity, klikk  <i>Hjelp</i>-menyen, så <i>Hovedmeny</i>, "
-"eller last ned den <a href=\"http://audacity.sourceforge.net/help/"
-"documentation/manual_1.4.pdf\">fullstendige manualen</a> i PDF-format.</p>"
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr "Denne skjermen kan vises når som helst ved å klikke <i>Hjelp</i>-menyen, så <i>Vis velkomstmelding</i>. For en detaljert guide til alle menyene og kontrollene i Audacity, klikk  <i>Hjelp</i>-menyen, så <i>Hovedmeny</i>, eller last ned den <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">fullstendige manualen</a> i PDF-format.</p>"
 
 #: HelpText.cpp:172
-msgid ""
-"<p><b>Opening audio files:</b> Either drag the files into the current "
-"project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be "
-"opened into a new project window with <i>File &gt; Open</i>. The main "
-"formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), "
-"<b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if "
-"your file is in some other format. <b>To import a CD:</b> extract it to WAV "
-"or AIFF using iTunes, Windows Media Player 11 or similar. See our online "
-"guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:"
-"</b> Press the green Play button to start playback. Press the blue Pause "
-"button once to pause playback, and again to resume. To stop, press the "
-"yellow Stop button. Spacebar can be used to either play or stop. After "
-"stopping, playback resumes from its last starting point. To change the "
-"starting point, click in the track at your desired starting point. The <b>|"
-"&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start "
-"or end of the track respectively. </p><br><br>"
-msgstr ""
-"<p><b>Åpne lydfiler:</b> Enten dra filene til det åpne prosjektvinduet, "
-"eller klikk <i>Fil &gt; Importer... &gt; Lyd...</i>. Filer kan åpnes til nye "
-"prosjekt med <i>Fil &gt; Åpne...</i>. Hovedformatene som Audacity støtter er "
-"<b>AIFF, AU, FLAC, M4A</b> (bare på Mac), <b>MP2/MP3, OGG Vorbis</b> og "
-"<b>WAV</b>. Klikk [[wma-proprietary|her]] hvis filen din er i et annet "
-"format. <b>For å importere en CD:</b> trekk ut (rip) sporene til WAV eller "
-"AIFF vha. iTunes, Windows Media Player 11 eller lignende. Les "
-"retningslinjene våre på nettet: [[wiki:How_to_import_CDs|importere CD-er]].</"
-"p><p> <p><b>Spille av lyd:</b> Klikk den grønne Spill av-knappen for å sette "
-"i gang avspilling. Klikk den blåe Pause-knappen én gang for å pause, og "
-"igjen for å fortsette. For å stoppe, klikk den gule Stopp-knappen. "
-"Mellomromstasten kan brukes for å enten sette i gang eller stoppe "
-"avspilling. Etter stopping vil avspilling starte fra forrige startpunkt. For "
-"å endre startpunktet, klikk på sporet der du vil at avspillingen skal starte "
-"fra. Knappene <b>|&lt;&lt;</b> og <b>&gt;&gt;|</b> kan brukes for å flytte "
-"til henholdsvis begynnelsen eller slutten av sporet. </p><br><br>"
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "<p><b>Åpne lydfiler:</b> Enten dra filene til det åpne prosjektvinduet, eller klikk <i>Fil &gt; Importer... &gt; Lyd...</i>. Filer kan åpnes til nye prosjekt med <i>Fil &gt; Åpne...</i>. Hovedformatene som Audacity støtter er <b>AIFF, AU, FLAC, M4A</b> (bare på Mac), <b>MP2/MP3, OGG Vorbis</b> og <b>WAV</b>. Klikk [[wma-proprietary|her]] hvis filen din er i et annet format. <b>For å importere en CD:</b> trekk ut (rip) sporene til WAV eller AIFF vha. iTunes, Windows Media Player 11 eller lignende. Les retningslinjene våre på nettet: [[wiki:How_to_import_CDs|importere CD-er]].</p><p> <p><b>Spille av lyd:</b> Klikk den grønne Spill av-knappen for å sette i gang avspilling. Klikk den blåe Pause-knappen én gang for å pause, og igjen for å fortsette. For å stoppe, klikk den gule Stopp-knappen. Mellomromstasten kan brukes for å enten sette i gang eller stoppe avspilling. Etter stopping vil avspilling starte fra forrige startpunkt. For å endre startpunktet, klikk på sporet der du vil at avspillingen skal starte fra. Knappene <b>|&lt;&lt;</b> og <b>&gt;&gt;|</b> kan brukes for å flytte til henholdsvis begynnelsen eller slutten av sporet. </p><br><br>"
 
 #: HelpText.cpp:194
-msgid ""
-"<p><b>To record:</b> Set the recording device and input source, adjust the "
-"input level, then press the red Record button.</b></p><p> 1) [[inputdevice|"
-"Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or "
-"in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo "
-"recording if required.<br> 2) [[inputsource|Set input source]] for that "
-"device (for example, microphone or line-in) in the dropdown selector of the "
-"<i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the "
-"<i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) "
-"[[inputlevel|Adjust input level]] using the right-hand slider on the "
-"<i>Mixer Toolbar</i>. Correct adjustment of level before recording is "
-"essential to avoid noise or distortion. </p><p> More help at: \"Recording\" "
-"<a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial "
-"<a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-"
-"_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://"
-"www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our "
-"Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:"
-"Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
-msgstr ""
-"<p><b>For å spille inn:</b> Velg opptaksenhet og inndatakilde, juster "
-"inndatavolumet og klikk på den røde Spill inn-knappen.</b></p><p> 1) "
-"[[inputdevice|Velg opptaksenhet]] enten med <i>Lyd I/O-fanen i "
-"Innstillinger</i> eller i <i>Enhetsverktøylinjen</i>. Innstillingene for Lyd "
-"I/O lar deg velge stereo-opptak hvis nødvendig.<br> 2) [[inputsource|Velg\n"
-"inndatakilde]] for enheten (for eksempel, mikrofon eller innlinje) i "
-"nedtrekksmenyen for <i>Mikserverktøylinjen</i>, eller (på visse system) i "
-"opptaksenheten i <i>Lyd I/O-fanen i Innstillinger</i> eller i "
-"<i>Enhetsverktøylinjen</i>.<br> 3) [[inputlevel|Juster inndatavolumet]] vha. "
-"glidebryteren på <i>Mikserverktøylinjen</i>. Korrekt volumjustering er av "
-"vesentlig betydning for å unngå støy eller forvrenging. </p><p> Mer hjelp "
-"finnes under: <a\n"
-"href=\"http://audacity.sourceforge.net/help/faq\">Ofte Spurte Spørsmål</a> "
-"om innspilling, brukerveiledningen <a\n"
-"href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-"
-"_Your_First_Recording\">\n"
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr "<p><b>For å spille inn:</b> Velg opptaksenhet og inndatakilde, juster inndatavolumet og klikk på den røde Spill inn-knappen.</b></p><p> 1) [[inputdevice|Velg opptaksenhet]] enten med <i>Lyd I/O-fanen i Innstillinger</i> eller i <i>Enhetsverktøylinjen</i>. Innstillingene for Lyd I/O lar deg velge stereo-opptak hvis nødvendig.<br> 2) [[inputsource|Velg\n"
+"inndatakilde]] for enheten (for eksempel, mikrofon eller innlinje) i nedtrekksmenyen for <i>Mikserverktøylinjen</i>, eller (på visse system) i opptaksenheten i <i>Lyd I/O-fanen i Innstillinger</i> eller i <i>Enhetsverktøylinjen</i>.<br> 3) [[inputlevel|Juster inndatavolumet]] vha. glidebryteren på <i>Mikserverktøylinjen</i>. Korrekt volumjustering er av vesentlig betydning for å unngå støy eller forvrenging. </p><p> Mer hjelp finnes under: <a\n"
+"href=\"http://audacity.sourceforge.net/help/faq\">Ofte Spurte Spørsmål</a> om innspilling, brukerveiledningen <a\n"
+"href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\">\n"
 "Din første innspilling</a> i <a\n"
-"href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page"
-"\">manualen</a> vår,\n"
+"href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">manualen</a> vår,\n"
 "og sidene [[wiki:Recording_Tips|Innspillingstips]] og\n"
 "[[wiki:Troubleshooting_Recordings|Feilsøking for innspilling]]\n"
 "på wikien. </p><br><br>"
 
 #: HelpText.cpp:221
-msgid ""
-"<p>The input device is the actual physical sound device you are recording "
-"from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of "
-"Preferences</i>, On Windows and Linux, Preferences are at the bottom of the "
-"<i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also "
-"conveniently select Recording Device in the <i>Device Toolbar</i>, which can "
-"be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity "
-"uses the device currently being used by the system, (usually your inbuilt "
-"sound device), so it is often not necessary to change the input device. On "
-"Windows, this current system device can be selected as \"Microsoft Sound "
-"Mapper\". If you are recording from an external USB or Firewire device such "
-"as a USB turntable, select it explicitly by name as recording device after "
-"conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
-"<p>Inndataenheten er den fysiske lydenheten som du spiller inn fra. Dette "
-"velger du under \"Opptaksenhet\" i <i>Lyd I/O-fanen i Innstillinger</i>. På "
-"Windows og Linux er innstillingene nederst i <i>Rediger</i>-menyen. På Mac "
-"er de i <i>Audacity</i>-menyen. Du kan også enkelt velge opptaksenhet under "
-"<i>Enhetsverktøylinjen</i>, som du skrur på i <i>Vis &gt; Verktøylinjer...</"
-"i>. </p><p> Standardvalget er at Audacity bruker den enheten som systemet "
-"benytter nå (vanligvis den innebygde lydenheten), så det er ofte unødvendig "
-"å endre enhet. På Windows er den nåværende systemenheten angitt som "
-"\"Microsoft lydtilordning\". Hvis du spiller inn fra en ekstern USB- eller "
-"Firewire-enhet, f.eks. en USB-platespiller, kan du velge denne som "
-"opptaksenhet ved navn etter at du har koplet den til.</p><p>\n"
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Inndataenheten er den fysiske lydenheten som du spiller inn fra. Dette velger du under \"Opptaksenhet\" i <i>Lyd I/O-fanen i Innstillinger</i>. På Windows og Linux er innstillingene nederst i <i>Rediger</i>-menyen. På Mac er de i <i>Audacity</i>-menyen. Du kan også enkelt velge opptaksenhet under <i>Enhetsverktøylinjen</i>, som du skrur på i <i>Vis &gt; Verktøylinjer...</i>. </p><p> Standardvalget er at Audacity bruker den enheten som systemet benytter nå (vanligvis den innebygde lydenheten), så det er ofte unødvendig å endre enhet. På Windows er den nåværende systemenheten angitt som \"Microsoft lydtilordning\". Hvis du spiller inn fra en ekstern USB- eller Firewire-enhet, f.eks. en USB-platespiller, kan du velge denne som opptaksenhet ved navn etter at du har koplet den til.</p><p>\n"
 "Tilbake til [[record|Spille inn lyd]] <br></p>"
 
 #: HelpText.cpp:244
-msgid ""
-"<p>Select the input source (such as microphone or line-in) for your "
-"[[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and "
-"<b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</"
-"i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the "
-"<i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source "
-"will be shown as part of the parent device (for example, <i>High Def Audio "
-"Card: Microphone</i>). If necessary, Mac users can choose the input source "
-"at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire "
-"recording devices don't have a choice of inputs, so this step is not "
-"necessary. If in doubt, see the documentation for your device. </i></p><p> "
-"<b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?"
-"s=recording&i=streaming\">record audio playing on the computer</a>, Windows "
-"and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or "
-"comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
-msgstr ""
-"<p>Velg inndatakilden (f.eks. mikrofon eller innlinje) for din [[inputdevice|"
-"opptaksenhet]]:<br> - <b>På Windows (utenom Vista)</b> og <b>Linux</b> gjør "
-"du dette i nedtrekksmenyen til høyre på <i>Mikserverktøylinjen</i>.<br> - "
-"<b>På Windows Vista</b> og <b>Mac</b> gjøres dette under Opptaksenhet i "
-"<i>Lyd I/O-fanen i Innstillinger</i>, eller i <i>Enhetsverktøylinjen</i>. "
-"Kilden blir vist som en del av foreldreenheten (f.eks. "
-"<i>Høykvalitetslydkort: Mikrofon</i>). Hvis nødvendig kan Mac-brukere velge "
-"inndatakilden under Apples Lyd- og MIDI-oppsett. <br><i><b>Merk:</b> mange "
-"opptaksenheter for USB eller Firewire har ingen inndatavalg, så dette steget "
-"er ikke nødvendig. Hvis du er usikker bør du lese dokumentasjonen for "
-"enheten din. </i></p><p> <b>Tips:</b> For å <a href=\"http://audacity."
-"sourceforge.net/help/faq?s=recording&i=streaming\">spille inn lyd som "
-"spilles av på datamaskinen</a> kan Windows- og Linux-brukere velge «Stereo "
-"miks», «Wave Out», «Sum» eller lignende lydkilder. </p><p> Tilbake til "
-"[[record|Spille inn lyd]] <br></p>"
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr "<p>Velg inndatakilden (f.eks. mikrofon eller innlinje) for din [[inputdevice|opptaksenhet]]:<br> - <b>På Windows (utenom Vista)</b> og <b>Linux</b> gjør du dette i nedtrekksmenyen til høyre på <i>Mikserverktøylinjen</i>.<br> - <b>På Windows Vista</b> og <b>Mac</b> gjøres dette under Opptaksenhet i <i>Lyd I/O-fanen i Innstillinger</i>, eller i <i>Enhetsverktøylinjen</i>. Kilden blir vist som en del av foreldreenheten (f.eks. <i>Høykvalitetslydkort: Mikrofon</i>). Hvis nødvendig kan Mac-brukere velge inndatakilden under Apples Lyd- og MIDI-oppsett. <br><i><b>Merk:</b> mange opptaksenheter for USB eller Firewire har ingen inndatavalg, så dette steget er ikke nødvendig. Hvis du er usikker bør du lese dokumentasjonen for enheten din. </i></p><p> <b>Tips:</b> For å <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">spille inn lyd som spilles av på datamaskinen</a> kan Windows- og Linux-brukere velge «Stereo miks», «Wave Out», «Sum» eller lignende lydkilder. </p><p> Tilbake til [[record|Spille inn lyd]] <br></p>"
 
 #: HelpText.cpp:267
-msgid ""
-"<p>The input level must be set correctly. If the level is too low, there "
-"will be background noise. If the level is too high, there will be distortion "
-"in the loud parts. </p><p>To set the level, either see this [[wiki:"
-"Recording_levels|illustrated online guide]] or follow these steps: "
-"<ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two "
-"<i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If "
-"the meters are not visible, click <i>View &gt; Toolbars</i> and check "
-"\"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</"
-"i> (by the microphone symbol), so that the red bars in the meter come close "
-"to <b>but do not touch</b> the right edge of the scale. If you can't hear "
-"the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check "
-"\"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording "
-"Audio]] <br></p>"
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr "<p>Inndatavolumet må være korrekt justert. Hvis nivået er for lavt vil der være bakgrunnsstøy. Hvis nivået er for høyt vil der være forvrenging i de høylydte delene. </p><p>For å justere nivået kan du enten lese denne [[wiki:Recording_levels|illustrerte veiledningen på nettet]] eller følge disse stegene: <ol><li>Skru på <b>overvåking</b>. Dobbeltklikk på <i>lydnivåmåleren</i> til høyre (eller høyreklikk over det) og klikk «Start overvåking». Hvis lydnivåmålerne ikke er synlige klikker du <i>Vis &gt Verktøylinjer...</i> og merker av for «Lydnivåverktøylinje». </li><li>Juster inndatavolumet med glidebryteren på <i>Mikserverktøylinjen</i> (ved mikrofonsymbolet) slik at de røde stolpene kommer nær den høyre kanten av skalaen <b>uten å komme borti</b>. Hvis du ikke klarer å høre den overvåkede lyden åpner du <i>Lyd I/O-fanen i Innstillinger</i> og merker av for «Spill gjennom med programvare». </li></ol></p><p> Tilbake til [[record|Spille inn lyd]]<br></p>"
 
 #: HelpText.cpp:292
-msgid ""
-"<p>The main commands for editing audio are under the <i>Edit</i> menu (such "
-"as cut, copy and paste) and the <i>Effect</i> menu (you can do things like "
-"boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity "
-"applies edits to selected areas of the audio track. To select a particular "
-"area, click in the track and drag the shaded area with the mouse. If no "
-"audio is selected, Audacity selects all the audio in the project window.</"
-"p><p> When playing or recording, the Edit and Effect menus will appear "
-"greyed out, because a moving track can't be edited. Commands can sometimes "
-"be unavailable for other reasons too. For example, you can't run effects "
-"until you have audio on the screen, and you can't paste audio until you've "
-"cut or copied it to Audacity's clipboard. </p><br><br>"
-msgstr ""
-"<p>Hovedkommandoene for lydredigering er under <i>Rediger</i>-menyen (f.eks. "
-"klipp, lim og kopier) og under <i>Effekt</i>-menyen (du kan gjøre slikt som "
-"å forsterke bassen, endre tonehøyde eller tempo, eller fjerne støy). </p><p> "
-"Audacity anvender redigeringen på det markerte området i lydsporet. For å "
-"markere et visst område klikker du i sporet og drar det gråe området med "
-"musen. Hvis ingen lyd er valgt vil Audacity først velge all lyden i "
-"prosjektvinduet.</p><p> Ved avspilling eller opptak vis Rediger- og Effekt-"
-"menyene være gråe, siden et spor som beveger seg ikke kan redigeres. "
-"Kommandoer kan av og til være utilgjengelige av andre grunner også. F.eks. "
-"kan du ikke bruke effekter før du har lyd på skjermen, og du kan ikke lime "
-"inn lyd før du har klippet ut eller kopiert noe lyd til Audacitys "
-"utklippstavl. </p><br><br>"
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "<p>Hovedkommandoene for lydredigering er under <i>Rediger</i>-menyen (f.eks. klipp, lim og kopier) og under <i>Effekt</i>-menyen (du kan gjøre slikt som å forsterke bassen, endre tonehøyde eller tempo, eller fjerne støy). </p><p> Audacity anvender redigeringen på det markerte området i lydsporet. For å markere et visst område klikker du i sporet og drar det gråe området med musen. Hvis ingen lyd er valgt vil Audacity først velge all lyden i prosjektvinduet.</p><p> Ved avspilling eller opptak vis Rediger- og Effekt-menyene være gråe, siden et spor som beveger seg ikke kan redigeres. Kommandoer kan av og til være utilgjengelige av andre grunner også. F.eks. kan du ikke bruke effekter før du har lyd på skjermen, og du kan ikke lime inn lyd før du har klippet ut eller kopiert noe lyd til Audacitys utklippstavl. </p><br><br>"
 
 #: HelpText.cpp:311
-msgid ""
-"<p>To return later to your unfinished work in Audacity with all tracks and "
-"edits as you left them, save an Audacity project. To play your current work "
-"in other media programs or send it to others, [[export|export]] an audio "
-"file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>."
-"aup</b> project file and  a <b>_data</b> folder containing the actual audio. "
-"To re-open a saved project, click <i>File &gt; Open</i> and open the .aup "
-"file. If you save and exit more than once, an .aup.bak backup file is "
-"created, but the .aup file should always be opened if present. When your "
-"final exported file is exactly as you want, delete the project files and "
-"_data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> "
-"is for saving an empty project. It also lets you save an existing Project to "
-"a <b> new</b> name. This is the only safe way to rename a project. The .aup "
-"file and _data folder should not be moved or renamed manually. </p><p>"
-msgstr ""
-"<p>Hvis du vil returnere til et uferdig arbeid i Audacity på et senere "
-"tidspunkt, med alle sporene og redigeringene slik som du forlot dem, så "
-"lagrer du som et Audacity-prosjekt. Hvis du vil spille av arbeidet ditt i "
-"andre mediaprogram eller sende det til andre, så [[export|eksporterer]] du "
-"det til en lydfil, f.eks. WAV eller MP3. </p><p> <i>Fil &gt; Lagre prosjekt</"
-"i> lager en <b>.aup</b>-prosjektfil og en <b>_data</b>-mappe som inneholder "
-"den faktiske lyden. For å gjenåpne et lagret prosjekt klikker du <i>Fil &gt; "
-"Åpne</i> og åpner .aup-filen. Hvis du lagrer og avslutter mer enn èn gang, "
-"vil en .aup.bak-fil, en sikkerhetskopi, bli laget, men det er .aup-filen du "
-"bør åpne, så lenge den finnes. Når den endelige versjonen av den eksporterte "
-"filen er ferdiglaget kan du slette prosjektfilene og _data-mappen for å "
-"frigjøre harddiskplass. </p><p>Bruk <i>Fil &gt; Lagre prosjekt som...</i> "
-"for å lagre et tomt prosjekt. Denne kommandoen kan du også bruke for å lagre "
-"et eksisterende prosjekt under et <b>nytt</b> navn. Dette er den eneste "
-"sikre måten å omdøpe et prosjekt. .aup-filen og _data-mappen bør ikke "
-"flyttes rundt på eller omdøpes manuelt. </p><p>"
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr "<p>Hvis du vil returnere til et uferdig arbeid i Audacity på et senere tidspunkt, med alle sporene og redigeringene slik som du forlot dem, så lagrer du som et Audacity-prosjekt. Hvis du vil spille av arbeidet ditt i andre mediaprogram eller sende det til andre, så [[export|eksporterer]] du det til en lydfil, f.eks. WAV eller MP3. </p><p> <i>Fil &gt; Lagre prosjekt</i> lager en <b>.aup</b>-prosjektfil og en <b>_data</b>-mappe som inneholder den faktiske lyden. For å gjenåpne et lagret prosjekt klikker du <i>Fil &gt; Åpne</i> og åpner .aup-filen. Hvis du lagrer og avslutter mer enn èn gang, vil en .aup.bak-fil, en sikkerhetskopi, bli laget, men det er .aup-filen du bør åpne, så lenge den finnes. Når den endelige versjonen av den eksporterte filen er ferdiglaget kan du slette prosjektfilene og _data-mappen for å frigjøre harddiskplass. </p><p>Bruk <i>Fil &gt; Lagre prosjekt som...</i> for å lagre et tomt prosjekt. Denne kommandoen kan du også bruke for å lagre et eksisterende prosjekt under et <b>nytt</b> navn. Dette er den eneste sikre måten å omdøpe et prosjekt. .aup-filen og _data-mappen bør ikke flyttes rundt på eller omdøpes manuelt. </p><p>"
 
 #: HelpText.cpp:335
-msgid ""
-"To hear your work in other media programs, export it to an audio file such "
-"as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|"
-"Saving an Audacity project]] creates a project file (and linked _data "
-"folder) containing all your edited tracks, so you can return to your work "
-"later. However, other programs can't read Audacity projects. </p><p> To "
-"export, click <i>File &gt; Export</i> then choose the file format you want "
-"to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for "
-"standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:"
-"Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; "
-"Export Selection</i> exports only a selected area of audio. <i>Use File &gt; "
-"Export Multiple</i> to export multiple files at the same time, either one "
-"for each audio track, or one for each labeled area in a single track. "
-"<i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:"
-"Splitting_recordings_into_separate_tracks|split the tracks]] from an album "
-"for multiple export as separate files. </p><br><br>"
-msgstr ""
-"Hvis du vil høre arbeidet ditt i andre mediaprogram kan du eksportere det "
-"til en lydfil, f.eks. WAV eller MP3 (visse format er [[wma-proprietary|ikke "
-"støttet]]). Ved å [[save|lagre et Audacity-prosjekt]] lager du en prosjekt-"
-"fil (lenket til en _data-mappe) som inneholder alle dine redigerte spor, "
-"slik at du kan gå tilbake til arbeidet på et senere tidspunkt. Men, andre "
-"program kan ikke lese Audacity-prosjekt. </p><p> For å eksportere klikker du "
-"<i>Fil &gt; Eksporter</i> og velger filformatet du ønsker å eksportere til i "
-"nedtrekksmenyen «Format». Vil du [[burncd|brenne CD]] som skal spilles av i "
-"vanlige CD-spillere, velger du WAV eller AIFF. For å eksportere til MP3 må "
-"du ha installert [[wiki:Lame_Installation|Lame-omkoderen]]. </p><p> <i>Fil "
-"&gt; Eksporter markering</i> eksporterer bare et markert lydområde. <i>Bruk "
-"Fil &gt; Eksporter flere filer</i> for å eksportere multiple filer samtidig, "
-"enten en for hvert lydspor eller en for hvert kommenterte område i et "
-"enkeltspor.<i>Spor &gt; Legg til kommentar ved markering</i> lar deg [[wiki:"
-"Splitting_recordings_into_separate_tracks|dele opp sporene]] fra et album "
-"for å eksportere flere spor som ulike filer. </p><br><br>"
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr "Hvis du vil høre arbeidet ditt i andre mediaprogram kan du eksportere det til en lydfil, f.eks. WAV eller MP3 (visse format er [[wma-proprietary|ikke støttet]]). Ved å [[save|lagre et Audacity-prosjekt]] lager du en prosjekt-fil (lenket til en _data-mappe) som inneholder alle dine redigerte spor, slik at du kan gå tilbake til arbeidet på et senere tidspunkt. Men, andre program kan ikke lese Audacity-prosjekt. </p><p> For å eksportere klikker du <i>Fil &gt; Eksporter</i> og velger filformatet du ønsker å eksportere til i nedtrekksmenyen «Format». Vil du [[burncd|brenne CD]] som skal spilles av i vanlige CD-spillere, velger du WAV eller AIFF. For å eksportere til MP3 må du ha installert [[wiki:Lame_Installation|Lame-omkoderen]]. </p><p> <i>Fil &gt; Eksporter markering</i> eksporterer bare et markert lydområde. <i>Bruk Fil &gt; Eksporter flere filer</i> for å eksportere multiple filer samtidig, enten en for hvert lydspor eller en for hvert kommenterte område i et enkeltspor.<i>Spor &gt; Legg til kommentar ved markering</i> lar deg [[wiki:Splitting_recordings_into_separate_tracks|dele opp sporene]] fra et album for å eksportere flere spor som ulike filer. </p><br><br>"
 
 #: HelpText.cpp:359
-msgid ""
-"<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in "
-"<b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due "
-"to licensing and patent restrictions.  On a Mac computer, unprotected "
-"<b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are "
-"not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files "
-"protected by any kind of Digital Rights Management (DRM), including most "
-"purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</"
-"p><p> If you can't import your file into Audacity, then if it is not DRM-"
-"protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, "
-"burn it to an audio CD in the program licensed to play it, then extract the "
-"CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos."
-"sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could "
-"also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;"
-"i=streaming\">record</a> the CD to your computer. <i>To export to an "
-"unsupported format, export to WAV or AIFF and convert it to the desired "
-"format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">SUPER</a>. </i></p><p>"
-msgstr ""
-"<p>Audacity <b>kan ikke</b> [[play|spille av]] eller [[export|eksportere "
-"til]] formatene <b>WMA, RealAudio, Shorten (SHN)</b> eller de fleste andre "
-"proprietære format, pga. lisens- og patentbegrensninger. På en Mac kan du "
-"importere ubeskyttede <b>AAC</b>-format, f.eks. <b>M4A</b>. Visse åpne "
-"format er ennå ikke støttet, dette inkluderer <b>Ogg Speex</b> og "
-"<b>Musepack</b>. Filer som er beskyttet av en form for digital "
-"rettighetsadministrasjon (DRA/DRM), inkludert de fleste filer kjøpt på "
-"nettet fra iTunes, Napster ol., <b>kan ikke</b> importeres.</p><p> Hvis du "
-"ikke kan importere filen din til Audacity, og den ikke er beskyttet med DRM, "
-"kan du likevel bruke iTunes eller <a href=\"http://www.erightsoft.com/SUPER."
-"html#Dnload\">SUPER</a> for å konvertere den til WAV eller AIFF. Hvis den er "
-"beskyttet kan du brenne til lyd-CD med programmet som er lisensiert til å "
-"spille den av, og så trekke ut CD-sporet til WAV eller AIFF med iTunes eller "
-"(på Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> "
-"eller Windows Media Player 11. Du kan også <a href=\"http://audacity."
-"sourceforge.net/help/faq?s=recording&amp;i=streaming\">spille inn</a> CD-en "
-"til datamaskinen din. <i>Vil du eksportere til et ustøttet format kan du "
-"først eksportere til WAV eller AIFF og så konvertere til det ønskede "
-"formatet i iTunes eller <a href=\"http://www.erightsoft.com/SUPER.html#Dnload"
-"\">SUPER</a>. </i></p><p>"
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr "<p>Audacity <b>kan ikke</b> [[play|spille av]] eller [[export|eksportere til]] formatene <b>WMA, RealAudio, Shorten (SHN)</b> eller de fleste andre proprietære format, pga. lisens- og patentbegrensninger. På en Mac kan du importere ubeskyttede <b>AAC</b>-format, f.eks. <b>M4A</b>. Visse åpne format er ennå ikke støttet, dette inkluderer <b>Ogg Speex</b> og <b>Musepack</b>. Filer som er beskyttet av en form for digital rettighetsadministrasjon (DRA/DRM), inkludert de fleste filer kjøpt på nettet fra iTunes, Napster ol., <b>kan ikke</b> importeres.</p><p> Hvis du ikke kan importere filen din til Audacity, og den ikke er beskyttet med DRM, kan du likevel bruke iTunes eller <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> for å konvertere den til WAV eller AIFF. Hvis den er beskyttet kan du brenne til lyd-CD med programmet som er lisensiert til å spille den av, og så trekke ut CD-sporet til WAV eller AIFF med iTunes eller (på Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> eller Windows Media Player 11. Du kan også <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">spille inn</a> CD-en til datamaskinen din. <i>Vil du eksportere til et ustøttet format kan du først eksportere til WAV eller AIFF og så konvertere til det ønskede formatet i iTunes eller <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 
 #: HelpText.cpp:383
-msgid ""
-"<p>To burn your work to an audio CD for standalone CD players, first "
-"[[export|export]] it as WAV or AIFF. The exported file should be stereo, "
-"44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in "
-"the \"Options\" button in the file export dialog). These are Audacity's "
-"default settings, so normally you will not need to change these before "
-"exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" "
-"or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media "
-"Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. "
-"</p><p>"
-msgstr ""
-"<p>For å brenne arbeidet ditt til lyd-CD for vanlige CD-spillere må du først "
-"[[export|eksportere]] som WAV eller AIFF. Den eksporterte filen bør være i "
-"stereo, 44100 Hz (still dette inn med «Prosjektrate»-knappen nede til "
-"venstre) og 16 bit (still inn med «Valg»-knappen i dialogen for "
-"eksportering). Dette er standardinnstillingene til Audacity, så normalt sett "
-"vil du ikke trenge å endre disse før eksportering. <p>Brenn den eksporterte "
-"filen til en «lyd-CD» - ikke en «data-CD» eller «MP3-CD» - med et CD-"
-"brenningsprogram som iTunes eller Windows Media Player. Vil du ha mer hjelp "
-"kan du lese [[wiki:How_to_burn_CDs|Hvordan brenne CD-er]] på nettet. </p><p>"
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr "<p>For å brenne arbeidet ditt til lyd-CD for vanlige CD-spillere må du først [[export|eksportere]] som WAV eller AIFF. Den eksporterte filen bør være i stereo, 44100 Hz (still dette inn med «Prosjektrate»-knappen nede til venstre) og 16 bit (still inn med «Valg»-knappen i dialogen for eksportering). Dette er standardinnstillingene til Audacity, så normalt sett vil du ikke trenge å endre disse før eksportering. <p>Brenn den eksporterte filen til en «lyd-CD» - ikke en «data-CD» eller «MP3-CD» - med et CD-brenningsprogram som iTunes eller Windows Media Player. Vil du ha mer hjelp kan du lese [[wiki:How_to_burn_CDs|Hvordan brenne CD-er]] på nettet. </p><p>"
 
 #: HelpText.cpp:403
-msgid ""
-"<p>You don't appear to have Audacity help files on your machine. Either <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the "
-"help files and then access them again from Audacity by clicking <i>Help</i> "
-"then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr ""
-"<p>Det ser ut til at du ikke har hjelpefilene til Audacity på maskinen din. "
-"Enten kan du <a href=\"http://audacity.sourceforge.net/help/documentation"
-"\">laste ned</a> hjelpefilene og deretter få tilgang til dem fra Audacity "
-"igjen ved å klikke <i>Hjelp</i> og så <i>Hovedmeny</i>, eller du kan klikke "
-"<a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page"
-"\">her</a> for å lese hele brukermanualen på nettet."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1662,13 +1380,11 @@ msgid "New..."
 msgstr "Ny..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Du har tomme kommentarnavn. Disse vil ikke\n"
+msgstr "Du har tomme kommentarnavn. Disse vil ikke\n"
 "tas med ved gjenoppfylling av kommentarsporene.\n"
 "\n"
 "Vil du gå tilbake og navngi?"
@@ -1726,11 +1442,9 @@ msgstr "Velg spr
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Konverterte en 1.0 prosjektfil til det nye formatet.\n"
+msgstr "Konverterte en 1.0 prosjektfil til det nye formatet.\n"
 "Den gamle filen har blitt lagret som '%s'"
 
 #: Legacy.cpp:357
@@ -1761,6 +1475,10 @@ msgstr "Lagre &prosjekt\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Lagre prosjekt &som..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Sjekk av&hengigheter..."
@@ -1769,6 +1487,10 @@ msgstr "Sjekk av&hengigheter..."
 msgid "Open Me&tadata Editor..."
 msgstr "Rediger me&tadata..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Importer"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Lyd...\tCtrl+Shift+I"
@@ -1797,6 +1519,10 @@ msgstr "Eksporter &kommentarer..."
 msgid "Export &Multiple..."
 msgstr "Eksporter &flere filer..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "&CleanSpeech-kjede..."
@@ -1873,9 +1599,9 @@ msgstr "&Slett\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Kløy&v og slett\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "Still&het\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1889,21 +1615,21 @@ msgstr "Kl
 msgid "&Join\tCtrl+J"
 msgstr "Sammen&føy\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "A&dskill\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Du&pliser\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&Stereo til mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Kommenterte re&gioner..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1946,13 +1672,13 @@ msgid "&Join\tAlt+J"
 msgstr "Sammen&føy\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "A&dskill\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Velg..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1982,9 +1708,9 @@ msgstr "Fra &mark
 msgid "Find &Zero Crossings\tZ"
 msgstr "Finn &nullpunkt\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Flytt &markør..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -2010,9 +1736,9 @@ msgstr "La&gre markering"
 msgid "Regio&n Restore"
 msgstr "Gjen&opprett markering"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "A&vspill &region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -2038,9 +1764,14 @@ msgstr "Sl
 msgid "Turn Grid Snap Off"
 msgstr "Slå Smett-til-Gitter av"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Innstillinger...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -2086,10 +1817,9 @@ msgstr "Vis klip&ping"
 msgid "&History..."
 msgstr "&Historie..."
 
-# Hvis alle de følgende strengene er under samme meny kan vi kutte "-verktøylinje" fra ordene... men referansene er multiple da 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "Verkt&øylinjer..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -2131,13 +1861,71 @@ msgstr "&Gjenopprett verkt
 msgid "!Simplified View"
 msgstr "!Forenklet visning"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Gå til begynnelse\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Gå til slutt\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "&Spor"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Legg til &nytt..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -2151,10 +1939,6 @@ msgstr "&Stereospor"
 msgid "&Time Track"
 msgstr "&Tidsspor"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "Ned&tellingsopptak..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "&Miks og rendre"
@@ -2211,13 +1995,21 @@ msgstr "Koordiner slutt til markeringenss&lutt"
 msgid "Align Tracks To&gether"
 msgstr "Koordiner s&por sammen"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "K&oordiner spor..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "&Koordiner og flytt markør..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -2227,22 +2019,26 @@ msgstr "&Legg til kommentar ved markering\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Legg til kommentar ved a&vspillingsmarkering\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "Sorter s&por etter..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "Starttids&punkt"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Navn"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "&Lag"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "&Effekt"
@@ -2275,6 +2071,10 @@ msgstr "Vi&s velkomstmelding..."
 msgid "&Index..."
 msgstr "Ho&vedmeny..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Skjermbildeverktøy..."
@@ -2287,17 +2087,13 @@ msgstr "&Kj
 msgid "&Audio Device Info..."
 msgstr "&Lydenhetsinformasjon..."
 
-#: Menus.cpp:770
-msgid ""
-"Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
-"Bla baklengs gjennom Verktøyområdet, Sporvisning og Markeringslinjen\tCtrl"
-"+Shift+F6"
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
-"Bla framover gjennom Verktøyområdet, Sporvisning og Markeringslinjen\tCtrl+F6"
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2331,9 +2127,9 @@ msgstr "Neste verkt
 msgid "Previous Tool\tA"
 msgstr "Forrige verktøy\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Spill av/Stopp\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2367,22 +2163,14 @@ msgstr "Spill til markering\tB"
 msgid "Play Looped\tL"
 msgstr "Spill i løkke\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Spill i løkke\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "Forhåndsvis utklipping\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Gå til begynnelse\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Gå til slutt\tEnd"
-
 # "Home" something else on Norwegian keyboards?
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
@@ -2441,9 +2229,9 @@ msgstr "Fokusert spor av/p
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Fokusert spor av/på\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Fokusert spor av/på\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2541,15 +2329,19 @@ msgstr "Smett-p
 msgid "Snap To Off"
 msgstr "Smett-på-plass av"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Åpne nylig brukte"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Nylig &brukte filer..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2606,6 +2398,23 @@ msgstr "Repeter %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Det er ingen kommentarspor å eksportere."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "Ingenting å angre"
@@ -2643,6 +2452,10 @@ msgstr "Tekst limt inn fra utklippstavlen"
 msgid "Pasted from the clipboard"
 msgstr "Limt inn fra utklippstavlen"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Det går ikke an å kopiere stereolyd til et monospor."
@@ -2793,12 +2606,8 @@ msgstr "For 
 
 #: Menus.cpp:3451
 #, c-format
-msgid ""
-"Too much audio was selected.  Only the first %.1f seconds of audio will be "
-"analyzed."
-msgstr ""
-"For mye lyd ble markert. Bare de første %.1f sekundene med lyd vil bli "
-"analysert."
+msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
+msgstr "For mye lyd ble markert. Bare de første %.1f sekundene med lyd vil bli analysert."
 
 #: Menus.cpp:3584
 #, c-format
@@ -2813,11 +2622,9 @@ msgstr "Importer kommentarer"
 msgid "Select a MIDI file..."
 msgstr "Velg en MIDI fil..."
 
-#: Menus.cpp:3599
-msgid ""
-"All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
 msgstr ""
-"Alle filer (*.*)|*.*|MIDI-filer (*.mid)|*.mid|Allegro-filer (*.gro)|*.gro"
 
 #: Menus.cpp:3615
 #, c-format
@@ -2836,11 +2643,6 @@ msgstr "Velg en ukomprimert lydfil..."
 msgid "All files (*)|*"
 msgstr "Alle filer (*)|*"
 
-#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importer"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Rediger metadata-tags"
@@ -2912,6 +2714,14 @@ msgstr "Koordinert"
 msgid "Align"
 msgstr "Koordiner"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "Lagte nytt lydspor"
@@ -2929,10 +2739,8 @@ msgid "Created new label track"
 msgstr "Lagte nytt kommentarspor"
 
 #: Menus.cpp:3997
-msgid ""
-"The version of Audacity you are using does not support multiple time tracks."
-msgstr ""
-"Versjonen av Audacity som du bruker har ikke støtte for flere tidsspor."
+msgid "The version of Audacity you are using does not support multiple time tracks."
+msgstr "Versjonen av Audacity som du bruker har ikke støtte for flere tidsspor."
 
 #: Menus.cpp:4008
 msgid "Created new time track"
@@ -2974,14 +2782,14 @@ msgstr "Fjern spor"
 msgid "Removed audio track(s)"
 msgstr "Fjernede lydspor"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Ny datarate (Hz):"
-
 #: Menus.cpp:4508 Menus.cpp:4527 export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Gi ny datarate"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Ny datarate (Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "Verdien du skrev inn er ugyldig"
@@ -3046,15 +2854,13 @@ msgid "Save changes before closing?"
 msgstr "Lagre endringer før lukking?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "Ved lagring vil ikke prosjektet ha noen spor.\n"
 "\n"
 "For å lagre tidligere åpnede spor:\n"
@@ -3079,16 +2885,14 @@ msgstr "Audacity-prosjekt|*.aup|"
 
 #: Project.cpp:1799 Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Denne filen ble lagret av Audacity %s, en \n"
+msgstr "Denne filen ble lagret av Audacity %s, en \n"
 "mye eldre versjon. Formatet har blitt endret.\n"
 "\n"
 "Audacity kan ødelegge filen ved åpning,\n"
@@ -3110,11 +2914,9 @@ msgstr "Feil ved 
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Filen kan være ugyldig eller korrumpert: \n"
+msgstr "Filen kan være ugyldig eller korrumpert: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -3122,12 +2924,8 @@ msgid "Error opening file or project"
 msgstr "Feil ved åpning av fil eller prosjekt"
 
 #: Project.cpp:1867
-msgid ""
-"Audacity was unable to convert an Audacity 1.0 project to the new project "
-"format."
-msgstr ""
-"Audacity klarte ikke å konvertere et Audacity 1.0 prosjekt til det nye "
-"prosjektformatet."
+msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
+msgstr "Audacity klarte ikke å konvertere et Audacity 1.0 prosjekt til det nye prosjektformatet."
 
 #: Project.cpp:1970
 msgid "Could not remove old auto save file"
@@ -3156,12 +2954,10 @@ msgstr "Kunne ikke finne prosjektdatamappen: \"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Denne filen ble lagret vha. Audacity %s.\n"
+msgstr "Denne filen ble lagret vha. Audacity %s.\n"
 "Du bruker Audacity %s - du må oppgradere til\n"
 "en nyere versjon for å åpne denne filen."
 
@@ -3171,27 +2967,35 @@ msgstr "Kan ikke 
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
-"You 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"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Denne filen ble lagret av Audacity %s.\n"
-"Du kan åpne filen med denne versjonen av Audacity, men hvis du lagrer i "
-"denne versjonen kan du ikke lenger åpne filen i eldre versjoner.\n"
+msgstr "Denne filen ble lagret av Audacity %s.\n"
+"Du kan åpne filen med denne versjonen av Audacity, men hvis du lagrer i denne versjonen kan du ikke lenger åpne filen i eldre versjoner.\n"
 "\n"
 "Åpne denne filen nå?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Kunne ikke lagre prosjektet. Kanskje er %s ikke skrivbar,\n"
-"eller disken er full."
 
 #: Project.cpp:2428 Project.cpp:2442
 msgid "Error saving project"
@@ -3202,24 +3006,16 @@ msgstr "Feil ved lagring av prosjekt"
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Rå"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Importerer %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importerte '%s'"
 
+#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Importer"
+
 #: Project.cpp:2639 Project.cpp:2647
 msgid "Error importing"
 msgstr "Feil ved importering"
@@ -3232,24 +3028,23 @@ msgstr "Lagre tale som:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM-lydfil (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
-"When you want to save a file that can be opened by other programs, select "
-"one of the\n"
+"Most other programs can't open Audacity project files.\n"
+"When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Audacity-prosjektfiler (.aup) lar deg lagre alt du jobber med nøyaktig slik "
-"som det\n"
-"vises på skjermen, men de fleste andre programmer kan ikke åpne Audacity "
-"prosjektfiler.\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Når du vil lagre en fil som kan åpnes med andre programmer, velg en av\n"
-"Eksport-kommandoene."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3293,6 +3088,16 @@ msgstr "Nok ledig diskplass til %d sekunder med opptak."
 msgid "Out of disk space"
 msgstr "Tom for diskplass"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "Kunne ikke fjerne gammel autolagret fil: "
@@ -3375,45 +3180,13 @@ msgstr "Forh
 msgid "&Debug"
 msgstr "&Feilsøk"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity nedtellingsopptak"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Opptaksstart"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Opptaksslutt"
-
-#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
-#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Varighet"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Fremgang for Audacity Smart-opptak "
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Startdato og tidspunkt"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Sluttdato og tidspunkt"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Venter på å begynnelse innspilling %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity Smart-opptak - venter på å starte"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3451,9 +3224,9 @@ msgstr "Sjanger"
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: Tags.cpp:778 Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Trykk F2 eller dobbeltklikk for å redigere."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3471,13 +3244,13 @@ msgstr "T&
 msgid "Genres"
 msgstr "Sjangere"
 
-#: Tags.cpp:828 Tags.cpp:1439 Tags.cpp:1980
-msgid "Edit"
-msgstr "Rediger"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829 Tags.cpp:1981
-msgid "Reset"
-msgstr "Gjenopprett"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834 Tags.cpp:1460 Tags.cpp:1988
 msgid "Template"
@@ -3512,206 +3285,152 @@ msgstr "Klarte ikke 
 
 #: Tags.cpp:1035 Tags.cpp:1679 Tags.cpp:2413
 msgid "Are you sure you want to reset the genre list to defaults?"
-msgstr ""
-"Er du sikker på at du vil tilbakestille sjangerlisten til standardverdiene?"
+msgstr "Er du sikker på at du vil tilbakestille sjangerlisten til standardverdiene?"
 
 #: Tags.cpp:1052 Tags.cpp:1696 Tags.cpp:2430
 msgid "Unable to open genre file."
 msgstr "Klarte ikke å åpne sjangerfil."
 
-#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "Lagre metadata som:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
 #: Tags.cpp:1112 Tags.cpp:1763 Tags.cpp:2486
 msgid "Error loading metadata"
 msgstr "Feil ved innlasting av metadata"
 
-#: Tags.cpp:1409 Tags.cpp:1968
-msgid "Title:"
-msgstr "Tittel:"
-
-#: Tags.cpp:1410 Tags.cpp:1969
-msgid "Artist:"
-msgstr "Artist:"
-
-#: Tags.cpp:1411 Tags.cpp:1970
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Komponist:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Tekstforfatter:"
-
-#: Tags.cpp:1414 Tags.cpp:1973
-msgid "Comments:"
-msgstr "Kommentarer:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Innkodet av:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Opphavsrett:"
-
-#: Tags.cpp:1424 Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Spornummer:"
-
-#: Tags.cpp:1428 Tags.cpp:1972
-msgid "Year:"
-msgstr "År:"
-
-#: Tags.cpp:1432 Tags.cpp:1974
-msgid "Genre:"
-msgstr "Sjanger:"
-
-#: Tags.cpp:1490 Tags.cpp:2089
-msgid "No Genres"
-msgstr "Ingen sjangere"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Gjenopprett standardverdier"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Enkel"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Avansert"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Verdi"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "T&øm"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maksimal lengde på attributten '%s' er %d tegn. Data ble kuttet bort."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Tittel"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Artist"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album"
+#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
+#: Tags.cpp:2501
+msgid "Save Metadata As:"
+msgstr "Lagre metadata som:"
 
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity klarte ikke skrive til filen:\n"
+msgstr "Audacity klarte ikke skrive til filen:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity klarte ikke åpne filen:\n"
+msgstr "Audacity klarte ikke åpne filen:\n"
 "  %s\n"
 "for skriving."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity klarte ikke skrive bilder til fil:\n"
+msgstr "Audacity klarte ikke skrive bilder til fil:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity klarte ikke finne filen:\n"
+msgstr "Audacity klarte ikke finne filen:\n"
 "  %s.\n"
 "Tema vil ikke åpnes."
 
 #: Theme.cpp:807 Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity klarte ikke åpne filen:\n"
+msgstr "Audacity klarte ikke åpne filen:\n"
 "  %s.\n"
 "Har den kanskje dårlig png-format?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity klarte ikke lese standardtemaet sitt.\n"
+msgstr "Audacity klarte ikke lese standardtemaet sitt.\n"
 "Vennligst rapporter problemet."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Ingen av de forventede temakomponentfilene\n"
+msgstr "Ingen av de forventede temakomponentfilene\n"
 " ble funnet i:\n"
 "  %s."
 
 #: Theme.cpp:942 effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Klarte ikke opprette mappe:\n"
+msgstr "Klarte ikke opprette mappe:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity klarte ikke lagre filen:\n"
+msgstr "Audacity klarte ikke lagre filen:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Alle de påkrevde filene i:\n"
+msgstr "Alle de påkrevde filene i:\n"
 "  %s\n"
 "var allerede tilstede."
 
+#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
+#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Varighet"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity nedtellingsopptak"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Opptaksstart"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Opptaksslutt"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Startdato og tidspunkt"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Sluttdato og tidspunkt"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Venter på å begynnelse innspilling %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464 TrackPanel.cpp:465
 msgid "Track Panel"
 msgstr "Sporpanel"
@@ -3797,12 +3516,8 @@ msgid "Copy"
 msgstr "Kopier"
 
 #: TrackPanel.cpp:1272
-msgid ""
-"Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
-"particular zoom region."
-msgstr ""
-"Klikk for å zoome inn vertikalt, skift-klikk for å zoome ut, dra for å lage "
-"et spesielt zoom-område."
+msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
+msgstr "Klikk for å zoome inn vertikalt, skift-klikk for å zoome ut, dra for å lage et spesielt zoom-område."
 
 #: TrackPanel.cpp:1277
 msgid "Drag the label vertically to change the order of the tracks."
@@ -3974,6 +3689,14 @@ msgstr "Justerte panorering"
 msgid "Adjusted gain"
 msgstr "Justerte sporvolum"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "Kan ikke slette spor med aktiv lyd"
@@ -4030,15 +3753,6 @@ msgstr "Endret rate"
 msgid "Format Change"
 msgstr "Formatendring"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Skriv inn en datapunktrate i Hz (per sekund) mellom 1 og 100000:"
-
-# "frekvens"?
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Ugyldig rate."
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "Endre nedre hastighetsgrense (%) til:"
@@ -4171,24 +3885,21 @@ msgstr "Programtillegg 1 til %i"
 msgid "Plugins %i to %i"
 msgstr "Programtillegg %i til %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Dette gikk ikke. Hva med å markere noe lyd først?"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Du kan bare gjøre dette når avspilling og opptak er\n"
+msgstr "Du kan bare gjøre dette når avspilling og opptak er\n"
 " stoppet. [Pause er ikke nok.]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Du må først markere litt stereolyd som dette skal\n"
+msgstr "Du må først markere litt stereolyd som dette skal\n"
 " benytte. [Du kan ikke bruke dette med mono.]"
 
 #: commands/CommandManager.cpp:785
@@ -4196,16 +3907,14 @@ msgid "You must first select some audio for this to use."
 msgstr "Du må først velge noe lyd som dette skal benytte."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Du må først velge noe lyd som dette skal benytte.\n"
+msgstr "Du må først velge noe lyd som dette skal benytte.\n"
 " [Det går ikke å velge andre typer spor.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Beskjed"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4225,14 +3934,19 @@ msgstr "Anvendt effekt: %s %.1f dB"
 msgid "Amplify"
 msgstr "Forsterk"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Forsterk av Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Forsterkning (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Ny toppamplitude (dB):"
@@ -4254,12 +3968,8 @@ msgid "Amplifying"
 msgstr "Forsterker"
 
 #: effects/AutoDuck.cpp:125
-msgid ""
-"You selected a track which does not contain audio. AutoDuck can only process "
-"audio tracks."
-msgstr ""
-"Du valgte et spor som ikke inneholder lyd. Auto Duck kan bare behandle "
-"lydspor."
+msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
+msgstr "Du valgte et spor som ikke inneholder lyd. Auto Duck kan bare behandle lydspor."
 
 #: effects/AutoDuck.cpp:126 effects/AutoDuck.cpp:138 effects/AutoDuck.cpp:453
 #: effects/AutoDuck.cpp:570
@@ -4267,11 +3977,8 @@ msgid "Auto Duck"
 msgstr "Auto Duck"
 
 #: effects/AutoDuck.cpp:137
-msgid ""
-"Auto Duck needs a control track which must be placed below the selected track"
-"(s)."
-msgstr ""
-"Auto Duck trenger et kontrollspor som må plasseres under de valgte sporene."
+msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
+msgstr "Auto Duck trenger et kontrollspor som må plasseres under de valgte sporene."
 
 #: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
@@ -4354,10 +4061,18 @@ msgstr "av Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Frekvens (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Boost (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "BassBoost..."
@@ -4399,8 +4114,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "bruker SoundTouch, av Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Tonehøyde:   fra"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Halvtoner (halv-steg):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
 #: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
@@ -4408,19 +4164,20 @@ msgstr "Toneh
 msgid "to"
 msgstr "til"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Halvtoner (halv-steg):"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frekvens(Hz):   fra"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
 #: effects/ChangeTempo.cpp:198
 msgid "Percent Change:"
 msgstr "Prosentverdi:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Endre tonehøyde..."
@@ -4438,14 +4195,6 @@ msgstr "Anvendt effekt: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Endre hastighet"
 
-#: effects/ChangeSpeed.cpp:308
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Endre hastighet, med endring av både tempo og tonehøyde"
-
-#: effects/ChangeSpeed.cpp:318
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "bruker SampleRate, av Erik de Castro Lopo"
-
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
@@ -4458,9 +4207,25 @@ msgstr "bruker SampleRate, av Erik de Castro Lopo"
 msgid "n/a"
 msgstr "(ingen)"
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standard Vinyl RPM:   fra"
+#: effects/ChangeSpeed.cpp:308
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Endre hastighet, med endring av både tempo og tonehøyde"
+
+#: effects/ChangeSpeed.cpp:318
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "bruker SampleRate, av Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4478,13 +4243,29 @@ msgstr "Endre tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Endre tempo uten å endre tonehøyde"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Taktslag per minutt (BPM):   fra"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Lengde (sekund):   fra"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4494,8 +4275,9 @@ msgstr "Endre tempo..."
 msgid "Changing Tempo"
 msgstr "Endrer tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Klikkfjerning"
 
 #: effects/ClickRemoval.cpp:336
@@ -4506,10 +4288,18 @@ msgstr "Klikk og pop-fjerning av Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Velg terskel (lavere er mer ømfintlig):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Breieste spike (høyere er mer ømfintlighet):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Klikk-fjerning..."
@@ -4522,49 +4312,86 @@ msgstr "Fjerner klikk og pop..."
 msgid "Dynamic Range Compressor"
 msgstr "Dynamisk områdekomprimering"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dynamisk områdekomprimering av Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Forhold: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Reaksjonstid: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Falltid: "
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Normaliser til 0dB etter komprimering"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Terskel: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Forhold: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Forhold: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Reaksjonstid: %.1f sek"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Falltid: %.1f sek"
 
 #: effects/Compressor.h:36
@@ -4575,6 +4402,247 @@ msgstr "Komprimering..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Anvender Dynamisk områdekomprimering"
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Start"
+
+#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Slutt"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829 Tags.cpp:1981
+msgid "Reset"
+msgstr "Gjenopprett"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Kontroll"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "DTMF-tonegenerator"
@@ -4670,12 +4738,8 @@ msgid "Previewing"
 msgstr "Forhåndsviser"
 
 #: effects/Effect.cpp:435
-msgid ""
-"Error while opening sound device. Please check the output device settings "
-"and the project sample rate."
-msgstr ""
-"Feil ved åpning av lyd-enheten. Vennligst sjekk innstillingene for enhetens "
-"lydavspilling og datarate for prosjektet."
+msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
+msgstr "Feil ved åpning av lyd-enheten. Vennligst sjekk innstillingene for enhetens lydavspilling og datarate for prosjektet."
 
 # "Anvende" or "Legge til"? (not all marked fuzzy)
 #: effects/Effect.h:107
@@ -4830,6 +4894,10 @@ msgstr "Inverter"
 msgid "Inverting"
 msgstr "Inverterer"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Utjevner"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Ingen-hopp over"
@@ -4854,28 +4922,25 @@ msgstr "Tyngre"
 msgid "Heaviest"
 msgstr "Tyngst"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Utjevner"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Utjevner av Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Utlign myke og høylydte deler"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "av Lynn Allan"
 
 #: effects/Leveller.cpp:226 effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Utjevningsgrad"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Støyterskel (Visling/Summing/Bakgrunnsstøy)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Støyterskel:"
 
 #: effects/Leveller.h:28
@@ -4886,6 +4951,158 @@ msgstr "Utjevner..."
 msgid "Applying Leveller..."
 msgstr "Anvender Utjevner"
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mikser"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Støyfjerning"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Hvit"
@@ -4921,31 +5138,23 @@ msgstr "Lager st
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Klarte ikke åpne fil:\n"
+msgstr "Klarte ikke åpne fil:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Prøv å kjøre støyfjerning uten en støyprofil.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Støyfjerning"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "Steg 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Marker noen sekunder med bare støy slik at Audacity\n"
+msgstr "Marker noen sekunder med bare støy slik at Audacity\n"
 "vet hva som skal filtreres ut, klikk så på Skaff støyprofil:"
 
 #: effects/NoiseRemoval.cpp:815
@@ -4953,11 +5162,9 @@ msgid "Step 2"
 msgstr "Steg 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Marker all lyden du vil filtrere, velg hvor mye støy du vil filtrere ut,\n"
+msgstr "Marker all lyden du vil filtrere, velg hvor mye støy du vil filtrere ut,\n"
 "klikk så på 'OK' for å fjerne støy.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4972,14 +5179,26 @@ msgstr "Skaff st
 msgid "Noise reduction (dB):"
 msgstr "Støyreduksjon (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Frekvensglatting (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Reaksjonstid / falltid (sekunder):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Støyfjerning..."
@@ -4997,8 +5216,7 @@ msgstr "Fjerner st
 #: effects/Normalize.cpp:70
 #, c-format
 msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
-msgstr ""
-"Anvendt effekt: %s fjern dc startposisjon = %s, normaliser amplitude = %s"
+msgstr "Anvendt effekt: %s fjern dc startposisjon = %s, normaliser amplitude = %s"
 
 #: effects/Normalize.cpp:74 effects/Normalize.cpp:75
 msgid "false"
@@ -5019,23 +5237,23 @@ msgstr ", maksimal amplitude = %.1f dB"
 msgid "Normalize"
 msgstr "Normaliser"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normaliser, av Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Fjern enhver DC startposisjon (midstill vertikalt på 0)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Normaliser maksimal amplitude til"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 #, fuzzy
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Normaliser..."
@@ -5046,50 +5264,57 @@ msgstr "Normaliserer..."
 
 #: effects/Phaser.cpp:65
 #, c-format
-msgid ""
-"Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = "
-"%.0f deg, depth = %d, feedback = %.0f%%"
-msgstr ""
-"Anvendt effekt: %s %d trinn, %.0f%% våt, frekvens = %.1f Hz, startfase = "
-"%.0f grader, dybde = %d, feedback = %.0f%%"
-
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser av Nasca Octavian Paul"
+msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
+msgstr "Anvendt effekt: %s %d trinn, %.0f%% våt, frekvens = %.1f Hz, startfase = %.0f grader, dybde = %d, feedback = %.0f%%"
 
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Trinn:"
 
-# alright to translate here?
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "TØRR"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "VÅTT"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO frekvens (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO startfase (grader):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Dybde:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Feedback (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -5099,17 +5324,21 @@ msgid "Applying Phaser"
 msgstr "Anvender Phaser"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged "
-"audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Reparer-effekten er ment å brukes på veldig korte bolker med skadet lyd (opp "
-"til 128 datapunkter).\n"
+msgstr "Reparer-effekten er ment å brukes på veldig korte bolker med skadet lyd (opp til 128 datapunkter).\n"
 "\n"
 "Zoom inn og velg en liten brøkdel av et sekund som skal repareres."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Reparerer skadet lyd"
@@ -5127,29 +5356,24 @@ msgstr "Sporene er for lange til 
 msgid "Repeat"
 msgstr "Repeter"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repeter av Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Antall ganger å repetere:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207 effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Lengde på ny markering:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutter, %d sekunder"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekunder"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "tt:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5185,12 +5409,8 @@ msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Anvendt effekt: Lag stillhet, %.6lf sekunder"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid ""
-"Sorry, this effect cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Beklager, denne effekten kan ikke utføres på stereospor hvor de enkelte "
-"sporkanalene ikke passer sammen."
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Beklager, denne effekten kan ikke utføres på stereospor hvor de enkelte sporkanalene ikke passer sammen."
 
 #: effects/SpikeCleaner.cpp:69
 msgid "Spike Cleaner"
@@ -5201,11 +5421,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Spike-renser av Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Maksimal Spike-varighet (millisekunder):\n"
+msgstr "Maksimal Spike-varighet (millisekunder):\n"
 "(99999 eller høyere for å skru av)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5220,18 +5438,62 @@ msgstr "Spike-renser..."
 msgid "Applying Spike Cleaner..."
 msgstr "Anvender Spike-renser..."
 
+#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Stereo til mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Anvender Stereo til mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
-msgid ""
-"Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
-"%.6lf seconds"
-msgstr ""
-"Anvendt effekt: Lag %s bølge %s, frekvens = %.2f Hz, amplitude = %.2f, %.6lf "
-"sekunder"
+msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
+msgstr "Anvendt effekt: Lag %s bølge %s, frekvens = %.2f Hz, amplitude = %.2f, %.6lf sekunder"
 
 #: effects/ToneGen.cpp:75 widgets/Meter.cpp:379
 msgid "Linear"
@@ -5273,14 +5535,21 @@ msgstr "Frekvens (Hz)"
 msgid "Waveform:"
 msgstr "Bølgeform:"
 
-#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Slutt"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5310,10 +5579,6 @@ msgstr "Alle spor m
 msgid "Truncate Silence"
 msgstr "Fjern stillhet"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "av Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Maksimal lengde på stillhet:"
@@ -5340,12 +5605,8 @@ msgid "Truncating Silence..."
 msgstr "Fjerner stillhet..."
 
 #: effects/VST/VSTEffect.cpp:165
-msgid ""
-"Sorry, VST Effects cannot be performed on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Beklager, VST-effekter kan ikke utføres på stereospor hvor de enkelte "
-"kanalene ikke passer sammen."
+msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Beklager, VST-effekter kan ikke utføres på stereospor hvor de enkelte kanalene ikke passer sammen."
 
 #: effects/VST/VSTEffect.cpp:180
 msgid "Can't process replacing"
@@ -5357,21 +5618,13 @@ msgstr "VST-programtillegg, parametere:"
 
 #: effects/Wahwah.cpp:61
 #, c-format
-msgid ""
-"Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%"
-"%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr ""
-"Anvendt effekt: %s frekvens = %.1f Hz, startfase = %.0f grader, dybde = %.0f%"
-"%, resonans = %.1f, frekvens startposisjon = %.0f%%"
+msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
+msgstr "Anvendt effekt: %s frekvens = %.1f Hz, startfase = %.0f grader, dybde = %.0f%%, resonans = %.1f, frekvens startposisjon = %.0f%%"
 
 #: effects/Wahwah.cpp:72
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah av Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Dybde (%):"
@@ -5380,10 +5633,18 @@ msgstr "Dybde (%):"
 msgid "Resonance:"
 msgstr "Resonans:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah-frekvens startposisjon (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5399,12 +5660,8 @@ msgid "Performing Effect: %s"
 msgstr "Utfører Effekt: %s"
 
 #: effects/ladspa/LadspaEffect.cpp:189
-msgid ""
-"Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
-"individual channels of the track do not match."
-msgstr ""
-"Beklager, tilleggseffekter kan ikke benyttes på stereospor hvor de enkelte "
-"sporkanalene ikke passer sammen."
+msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
+msgstr "Beklager, tilleggseffekter kan ikke benyttes på stereospor hvor de enkelte sporkanalene ikke passer sammen."
 
 #: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
 #: prefs/GUIPrefs.cpp:51 prefs/QualityPrefs.cpp:72
@@ -5423,6 +5680,18 @@ msgstr "Effektinnstillinger"
 msgid "Length (seconds)"
 msgstr "Lengde (sekund)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Anvender Nyquist-effekt..."
@@ -5436,11 +5705,8 @@ msgid "Enter Nyquist Command: "
 msgstr "Skriv inn en Nyquist-kommando"
 
 #: effects/nyquist/Nyquist.cpp:412
-msgid ""
-"Sorry, cannot apply effect on stereo tracks where the tracks don't match."
-msgstr ""
-"Beklager, kan ikke utføre effekten på stereospor hvor de enkelte kanalene "
-"ikke passer sammen."
+msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
+msgstr "Beklager, kan ikke utføre effekten på stereospor hvor de enkelte kanalene ikke passer sammen."
 
 #: effects/nyquist/Nyquist.cpp:440
 msgid "Nyquist"
@@ -5468,12 +5734,8 @@ msgid "Extracting features: %s"
 msgstr "Henter ut trekk: %s"
 
 #: effects/vamp/VampEffect.cpp:106
-msgid ""
-"Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
-"channels of the track do not match."
-msgstr ""
-"Beklager, Vamp-tillegg kan ikke kjøres på stereospor hvor de individuelle "
-"kanalene i sporet ikke passer sammen."
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr "Beklager, Vamp-tillegg kan ikke kjøres på stereospor hvor de individuelle kanalene i sporet ikke passer sammen."
 
 #: effects/vamp/VampEffect.cpp:120
 msgid "Sorry, failed to load Vamp Plug-in."
@@ -5495,13 +5757,13 @@ msgstr "Innstillinger for tillegg"
 msgid "Program"
 msgstr "Program"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Ingen spor er valgt! Bruk Ctrl-A (Velg alt)\n"
-"Velg Eksporter... for å eksportere alle spor."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5517,18 +5779,14 @@ msgstr "Er du sikker p
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
-"Normally these files end in \".%s\", and some programs will not open files "
-"with nonstandard extensions.\n"
+"Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Du er i ferd med å lagre en %s-fil med navnet \"%s\".\n"
+msgstr "Du er i ferd med å lagre en %s-fil med navnet \"%s\".\n"
 "\n"
-"Vanligvis pleier slike filer å slutte på \".%s\", og visse program kommer "
-"ikke til å åpne filer uten standard filtyper.\n"
+"Vanligvis pleier slike filer å slutte på \".%s\", og visse program kommer ikke til å åpne filer uten standard filtyper.\n"
 "\n"
 "Er du sikker på at du vil lagre filen under dette navnet?"
 
@@ -5538,18 +5796,12 @@ msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "Det fins allerede en fil kalt \"%s\". Erstatt?"
 
 #: export/Export.cpp:604
-msgid ""
-"Your tracks will be mixed down to two stereo channels in the exported file."
-msgstr ""
-"Sporene dine vil bli mikset ned til to stereo-kanaler i den eksporterte "
-"filen."
+msgid "Your tracks will be mixed down to two stereo channels in the exported file."
+msgstr "Sporene dine vil bli mikset ned til to stereo-kanaler i den eksporterte filen."
 
 #: export/Export.cpp:609
-msgid ""
-"Your tracks will be mixed down to a single mono channel in the exported file."
-msgstr ""
-"Sporene dine vil bli mikset ned til en enkel mono-kanal i den eksporterte "
-"filen."
+msgid "Your tracks will be mixed down to a single mono channel in the exported file."
+msgstr "Sporene dine vil bli mikset ned til en enkel mono-kanal i den eksporterte filen."
 
 #: export/Export.cpp:619
 msgid "Advanced Mixing Options"
@@ -5568,6 +5820,10 @@ msgstr " - Venstre"
 msgid " - Right"
 msgstr " - Høyre"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976 export/Export.cpp:1021
 #, c-format
 msgid "Output Channels: %2d"
@@ -5591,12 +5847,8 @@ msgstr "Vis utdata"
 
 #: export/ExportCL.cpp:87
 #, c-format
-msgid ""
-"Data will be piped to standard in. \"%f\" will be replaced with output "
-"filename selected."
-msgstr ""
-"Data sendes via en «pipe» til standard in. \"%f\" blir erstattet av det "
-"valgte output-filnavnet."
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr "Data sendes via en «pipe» til standard in. \"%f\" blir erstattet av det valgte output-filnavnet."
 
 #: export/ExportCL.cpp:220
 msgid "(external program)"
@@ -5607,11 +5859,6 @@ msgstr "(eksternt program)"
 msgid "Cannot export audio to %s"
 msgstr "Kan ikke eksportere lyd til %s"
 
-# Visstnok brukt to ganger, men som substantiv begge gangene?
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Eksport"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Eksporterer markert lyd med kommandolinjeomkoder"
@@ -5624,6 +5871,477 @@ msgstr "Eksporterer hele prosjektet med kommandolinjeomkoder"
 msgid "Command Output"
 msgstr "Utdata fra kommando"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Ugyldig datarate"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Du kan endre dataraten til en av de nedenstående."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Datarater"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bitrate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Språk:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kvalitet:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML filer (*.xml)|*.xml|Alle filer (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Angi FLAC-valg"
@@ -5704,10 +6422,6 @@ msgstr "Angi MP2-valg"
 msgid "MP2 Export Setup"
 msgstr "MP2-eksportoppsett"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Bitrate:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "MP2-filer"
@@ -5821,62 +6535,27 @@ msgstr "Finn Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity trenger filen %s for å lage MP3-er. "
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Plasseringen til %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "For å finne %s, klikk her -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Bla gjennom..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "For å få en gratis utgave av Lame, klikk her -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Last ned..."
-
-#  i18n-hint: It's asking for the location of a file, for
-#  example, "Where is lame_enc.dll?" - you could translate
-#  "Where would I find the file %s" instead if you want.
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Hvor finnes filen %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
-msgid ""
-"Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
-"All Files (*.*)|*"
-msgstr ""
-"Bare lame_enc.dll|lame_enc.dll|Dynamisk lenkede bibliotek (*.dll)|*.dll|Alle "
-"filer (*.*)|*"
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Bare lame_enc.dll|lame_enc.dll|Dynamisk lenkede bibliotek (*.dll)|*.dll|Alle filer (*.*)|*"
 
 #: export/ExportMP3.cpp:1550
-msgid ""
-"Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
-"All Files (*)|*"
-msgstr ""
-"Bare libmp3lame.dylib|libmp3lame.dylib|Dynamiske bibliotek (*.dylib)|*.dylib|"
-"Alle filer (*)|*"
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Bare libmp3lame.dylib|libmp3lame.dylib|Dynamiske bibliotek (*.dylib)|*.dylib|Alle filer (*)|*"
 
 #: export/ExportMP3.cpp:1567
-msgid ""
-"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
-"Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr ""
-"Bare libmp3lame.so|libmp3lame.so|Primære delte objektfiler (*.so)|*.so|"
-"Utvidede bibliotek (*.so*)|*.so*|Alle filer (*)|*"
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Bare libmp3lame.so|libmp3lame.so|Primære delte objektfiler (*.so)|*.so|Utvidede bibliotek (*.so*)|*.so*|Alle filer (*)|*"
 
 #: export/ExportMP3.cpp:1650
 msgid "MP3 Files"
@@ -5929,37 +6608,22 @@ msgstr "Eksportere hele filen med %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "Feilkode %d returnert fra MP3-omkoder"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Ugyldig datarate"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr "Prosjektdataraten (%d) støttes ikke av MP3-filformatet. "
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"Kombinasjonen av prosjektdataraten (%d) og bitraten (%d kbps) støttes\n"
+msgstr "Kombinasjonen av prosjektdataraten (%d) og bitraten (%d kbps) støttes\n"
 "ikke av MP3-filformatet. "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Du kan endre dataraten til en av de nedenstående."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Datarater"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Programtillegg for MP3-eksport ikke funnet"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95 export/ExportMultiple.cpp:374
 #: export/ExportMultiple.cpp:598 export/ExportMultiple.cpp:765
@@ -5967,21 +6631,14 @@ msgid "Export Multiple"
 msgstr "Eksporter flere filer..."
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a "
-"separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
-"This project does not have multiple tracks or a Label Track, so you cannot "
-"export multiple files."
-msgstr ""
-"Hvis du har mer enn ett lydspor kan du eksportere hvert spor som en separat "
-"fil,\n"
-"eller hvis du har ett kommentarspor kan du eksportere en ny fil for hver "
-"kommentar.\n"
+"This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
+msgstr "Hvis du har mer enn ett lydspor kan du eksportere hvert spor som en separat fil,\n"
+"eller hvis du har ett kommentarspor kan du eksportere en ny fil for hver kommentar.\n"
 "\n"
-"Dette prosjektet har ikke flere enn ett lydspor eller et kommentarspor, så "
-"du kan \n"
+"Dette prosjektet har ikke flere enn ett lydspor eller et kommentarspor, så du kan \n"
 "ikke eksportere flere filer fra det."
 
 #: export/ExportMultiple.cpp:165
@@ -6024,6 +6681,10 @@ msgstr "Inkluder lyd f
 msgid "First file name:"
 msgstr "Første filnavn:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Spor"
@@ -6044,14 +6705,14 @@ msgstr "Nummererer fortl
 msgid "File name prefix:"
 msgstr "Filnavn-prefiks:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Overskriv eksisterende filer"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&ksport"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -6063,12 +6724,10 @@ msgstr "Velg en plassering for 
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" eksisterer ikke.\n"
+msgstr "\"%s\" eksisterer ikke.\n"
 "\n"
 "Vil du opprette den?"
 
@@ -6088,11 +6747,9 @@ msgstr "Noe gikk galt ved eksportering av %d fil(er)."
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"Kommentaren %s er ikke et lovlig filnavn. Du kan ikke benytte:   %s\n"
+msgstr "Kommentaren %s er ikke et lovlig filnavn. Du kan ikke benytte:   %s\n"
 "Bruk..."
 
 #: export/ExportOGG.cpp:64
@@ -6103,10 +6760,6 @@ msgstr "Angi Ogg Vorbis-valg"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Innstillinger for Ogg Vorbis-eksport"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Kvalitet:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis-filer"
@@ -6127,10 +6780,6 @@ msgstr "Angi valg for ukomprimert eksport"
 msgid "Uncompressed Export Setup"
 msgstr "Innstillinger for ukomprimert eksport"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Format:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Filhode:"
@@ -6143,9 +6792,21 @@ msgstr "Omkoding: "
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Ikke alle kombinasjoner av filhoder og omkodinger er mulige.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF og andre ukomprimerte filtyper"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -6167,181 +6828,187 @@ msgstr "Eksporterer hele prosjektet som %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Feil (filen ble muligens ikke skrevet): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "MP3-filer"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Denne versjonen av Audacity ble ikke kompilert med støtte for %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er et spor på en lyd-CD. \n"
+msgstr "\"%s\" er et spor på en lyd-CD. \n"
 "Audacity kan ikke åpne lyd-CD-er direkte.\n"
 "Trekk ut (rip) CD-sporene til et filformat \n"
 "som Audacity kan importere, f.eks. WAV eller AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
-"Audacity cannot open this file because it only contains links to other "
-"files. \n"
-"You may be able to open it in a text editor and download the actual audio "
-"files."
-msgstr ""
-" er en spillelistefil. \n"
-"Audacity kan ikke åpne denne filen fordi den bare inneholder referanser til "
-"andre filer. \n"
-"Det kan hende at du kan åpne den i et tekstredigeringsprogram og laste ned "
-"de relevante lydfilene."
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
+"You may be able to open it in a text editor and download the actual audio files."
+msgstr " er en spillelistefil. \n"
+"Audacity kan ikke åpne denne filen fordi den bare inneholder referanser til andre filer. \n"
+"Det kan hende at du kan åpne den i et tekstredigeringsprogram og laste ned de relevante lydfilene."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en Windows Media Audio-fil. \n"
+msgstr "\"%s\" er en Windows Media Audio-fil. \n"
 "Audacity kan ikke åpne denne filtypen grunnet patentbeskyttelse. \n"
 "Du må konvertere den til et støttet filformat, f.eks. WAV eller AIFF."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en Advanced Audio Coding-fil. \n"
+msgstr "\"%s\" er en Advanced Audio Coding-fil. \n"
 "Audacity kan ikke åpne denne filtypen. \n"
 "Du må konvertere den til et støttet filformat, f.eks. WAV eller AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en kryptert lydfil. Disse er ofte fra musikkbutikker på nettet. \n"
+msgstr "\"%s\" er en kryptert lydfil. Disse er ofte fra musikkbutikker på nettet. \n"
 "Audacity kan ikke åpne denne filtypen grunnet krypteringen. \n"
 "Prøv å spille inn filen til Audacity, eller brenn den til en lyd-CD, \n"
 "for så å trekke ut CD-sporet til et støttet filformat, f.eks. WAV eller AIFF."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en RealPlayer media-fil. \n"
+msgstr "\"%s\" er en RealPlayer media-fil. \n"
 "Audacity kan ikke åpne dette produsenteide formatet. \n"
 "Du må konvertere den til et støttet filformat, f.eks. WAV eller AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" er en MIDI fil, ikke en lydfil.\n"
-"Audacity kan ikke åpne denne filtypen for avspilling eller redigering, men "
-"du kan vise den ved å klikke Fil > Importere > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" er en note-basert fil, ikke en lydfil.\n"
+msgstr "\"%s\" er en note-basert fil, ikke en lydfil.\n"
 "Audacity kan ikke åpne denne filtypen.\n"
-"Prøv å konvertere den til et filformat som WAV eller AIFF og så importere "
-"den, eller spill den inn med Audacity."
+"Prøv å konvertere den til et filformat som WAV eller AIFF og så importere den, eller spill den inn med Audacity."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
-"and try importing it again. Otherwise you need to convert it to a supported "
-"audio \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en Musepack-lydfil.\n"
+msgstr "\"%s\" er en Musepack-lydfil.\n"
 "Audacity kan ikke åpne denne filtypen.\n"
-"Hvis du tror det kan være en mp3-fil, endre filnavnet slik at det slutter "
-"med \".mp3\" og prøv å importere på nytt. Hvis ikke må du konvertere den til "
-"et støttet filformat, som WAV eller AIFF."
+"Hvis du tror det kan være en mp3-fil, endre filnavnet slik at det slutter med \".mp3\" og prøv å importere på nytt. Hvis ikke må du konvertere den til et støttet filformat, som WAV eller AIFF."
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en Wavpack-lydfil.\n"
+msgstr "\"%s\" er en Wavpack-lydfil.\n"
 "Audacity kan ikke åpne denne filtypen.\n"
 "Du må konvertere den til et støttet filformat, som WAV eller AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en Dolby Digital-lydfil.\n"
+msgstr "\"%s\" er en Dolby Digital-lydfil.\n"
 "Audacity kan foreløpig ikke åpne denne filtypen.\n"
 "Du må konvertere den til et støttet filformat, som WAV eller AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" er en Ogg Speex-lydfil.\n"
+msgstr "\"%s\" er en Ogg Speex-lydfil.\n"
 "Audacity kan foreløpig ikke åpne denne filtypen.\n"
 "Du må konvertere den til et støttet filformat, som WAV eller AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity måtte gjette på filtypen.\n"
-"Lyden er kanskje ugyldig.\n"
-"\n"
-"Hvis lyden er ugyldig, prøv å gi filen et nytt navn slik\n"
-"at den har korrekt filtype før du åpner den."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity gjenkjente ikke denne filtypen.\n"
-"Hvis den er ukomprimert, prøv å importere den med \"Importer Rå\""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6380,17 +7047,18 @@ msgstr "MIDI-spor kan ikke forskyves individuelt, det kan kun lydfiler."
 msgid "Invalid track offset in LOF file."
 msgstr "Sporet har feil startposisjon i LOF-filen"
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Feil ved tolking av Allegro-fil"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Feil ved tolking av MIDI-fil"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "MP3-filer"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6416,15 +7084,23 @@ msgstr "Ugyldig Vorbis bitstr
 msgid "Internal logic fault"
 msgstr "Intern logisk feil"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF og andre ukomprimerte filtyper"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importerer %s-fil..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime-filer"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Importer rå data"
@@ -6476,6 +7152,14 @@ msgstr "2 kanaler (stereo)"
 msgid "%d Channels"
 msgstr "%d kanaler"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Standard startpunkt:"
@@ -6488,9 +7172,18 @@ msgstr "Mengde 
 msgid "Sample rate:"
 msgstr "Datapunktrate:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importer"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
 msgid "Audio I/O"
@@ -6534,9 +7227,9 @@ msgstr "Kanaler"
 msgid "Playthrough"
 msgstr "Spill gjennom"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "S&pill andre spor samtidig med innspilling av nytt"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6546,13 +7239,13 @@ msgstr "Spill gjennom med &maskinvare: Spill av nytt spor under innspilling"
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Spill gjennom med &programvare: Spill av nytt spor under innspilling"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
-"Spill gjennom med &programvare: Spill av nytt spor under innspilling (ikke "
-"huk av ved innspilling av «stereo-miks»)"
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6579,19 +7272,15 @@ msgid "Latency"
 msgstr "Latens"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Lyd til buffer:\n"
+msgstr "Lyd til buffer:\n"
 "(høyere = mer latens)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Latenskorreksjon:\n"
+msgstr "Latenskorreksjon:\n"
 "(negativ = baklengs)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6660,8 +7349,8 @@ msgid "Audio cache"
 msgstr "Lydmellomlager"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Hold innspilt data i minnet til innspillingen er ferdig"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6682,12 +7371,8 @@ msgid "Directory %s is not writable"
 msgstr "Mappen %s er ikke skrivbar"
 
 #: prefs/DirectoriesPrefs.cpp:199
-msgid ""
-"Changes to temporary directory will not take effect until Audacity is "
-"restarted"
-msgstr ""
-"Endringer til den midlertidige mappen trer først i kraft når Audacity "
-"startes på nytt"
+msgid "Changes to temporary directory will not take effect until Audacity is restarted"
+msgstr "Endringer til den midlertidige mappen trer først i kraft når Audacity startes på nytt"
 
 #: prefs/FileFormatPrefs.cpp:48 prefs/FileFormatPrefs.cpp:49
 msgid "Import / Export"
@@ -6705,9 +7390,9 @@ msgstr "MP3-bibliotek versjon:"
 msgid "MP3 Library:"
 msgstr "MP3-bibliotek:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Finn bibliotek"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6717,13 +7402,22 @@ msgstr "LAME MP3-bibliotek:"
 msgid "&Download"
 msgstr "Last ne&d"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid ""
-"Note: Export quality options can be chosen by clicking the Options button in "
-"the Export dialog."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
 msgstr ""
-"Merk: Du kan endre innstillingene for eksportkvalitet ved å klikke Valg-"
-"knappen i eksport-dialogen."
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Merk: Du kan endre innstillingene for eksportkvalitet ved å klikke Valg-knappen i eksport-dialogen.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6767,8 +7461,7 @@ msgstr "Alltid &miks alle spor ned til stereo- eller monokanal(er)."
 
 #: prefs/FileFormatPrefs.cpp:124
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
-msgstr ""
-"&Bruk en egendefinert miks (f.eks. for å eksportere en 5.1 multikanalfil)"
+msgstr "&Bruk en egendefinert miks (f.eks. for å eksportere en 5.1 multikanalfil)"
 
 #: prefs/FileFormatPrefs.cpp:126
 msgid "S&how Metadata Editor prior to export step"
@@ -6795,7 +7488,8 @@ msgid "&Update display while playing"
 msgstr "&Oppdater grensesnitt under avspilling"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Avslutt Audacity ved lukking av siste vindu"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6803,17 +7497,17 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "&Venstre og høyre markeringskanter kan dras"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Knapper for lyd-I/O i &ergonomisk rekkefølge"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 # bedre formulering?
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Vertikalt zoom og tilpass spor automatisk"
 
-# kunne vært bedre formulert..
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "«Flytt sporfokus» &veksler gjennom spor gjentatte ganger"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6841,17 +7535,22 @@ msgid "Show warnings about &temp files"
 msgstr "Vis advarsler om midler&tidige filer"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&Spør om å lagre selv om prosjektet er tomt"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Vis velkomstmelding når programmet starter"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Modi"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Minste rekkevidde for visningene Lydnivåmåler og 'Bølgeform (dB)'"
@@ -6885,34 +7584,10 @@ msgstr "-145 dB (PCM-omr
 msgid "Default View Mode"
 msgstr "Standard visningsmodus"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "Bølgeformvisning"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "BølgeformDBvisning"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "Spektrumvisning"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "Spektrumloggvisning"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "Tonehøydevisning"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Andre grensesnittvalg"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Språk:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Hjelp:"
@@ -6925,6 +7600,14 @@ msgstr "Solo-knapp:"
 msgid "Keyboard"
 msgstr "Tastatur"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Tastaturoppsett"
@@ -6957,22 +7640,16 @@ msgstr "Feil ved lagring av tastatur-snarveier"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Velg en XML-fil som inneholder Audacity tastatur-snarveier..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML filer (*.xml)|*.xml|Alle filer (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Feil ved lasting av tastatur-snarveier"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Tastatursnarveien '%s' er allerede tilegnet:\n"
+msgstr "Tastatursnarveien '%s' er allerede tilegnet:\n"
 "\n"
 "'%s'"
 
@@ -6980,6 +7657,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Angre"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "S&pill andre spor samtidig med innspilling av nytt"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Mus"
@@ -7258,13 +7971,13 @@ msgstr "H
 msgid "Smart Recording"
 msgstr "Smartopptak"
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Sett innspillingen på pause ved stillhet"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Stillhetsnivå (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
@@ -7398,8 +8111,7 @@ msgid "Info"
 msgstr "Info"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7412,8 +8124,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"Tema er en eksperimentell funksjon.\n"
+msgstr "Tema er en eksperimentell funksjon.\n"
 "\n"
 "For å prøve det, klikk \"Lagre tema-\n"
 "mellomlager\", finn så fram og modifiser\n"
@@ -7428,41 +8139,31 @@ msgstr ""
 "bildefilen viser andre ikon også.]\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Du har kompilert Audacity med en ekstra knapp, \n"
+msgstr "Du har kompilert Audacity med en ekstra knapp, \n"
 "'Output Sourcery'. Dette vil lagre en C-versjon av\n"
 "bildemellomlageret som kan kompileres inn som standard.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Hvis 'Åpne tema-mellomlager ved oppstart' er huket av, så \n"
+msgstr "Hvis 'Åpne tema-mellomlager ved oppstart' er huket av, så \n"
 "vil tema-mellomlageret lastes inn når programmet starter\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Lagring og åpning av individuelle temafiler bruker\n"
+msgstr "Lagring og åpning av individuelle temafiler bruker\n"
 "en adskilt fil for hvert bilde, men er ellers likt.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Kontroll"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Pause"
@@ -7471,9 +8172,9 @@ msgstr "Pause"
 msgid "Play"
 msgstr "Spill av"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Spill av (skift for å spille i løkke)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7487,6 +8188,10 @@ msgstr "G
 msgid "Skip to End"
 msgstr "Gå til slutt"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "Clean Speech"
@@ -7496,12 +8201,8 @@ msgid "Error while opening sound device. "
 msgstr "Feil ved åpning av lydenhet."
 
 #: toolbars/ControlToolBar.cpp:696
-msgid ""
-"Recording in CleanSpeech mode is not possible when a track, or more than one "
-"project, is already open."
-msgstr ""
-"Innspilling i CleanSpeech-modus er ikke mulig når et spor, eller mer enn ett "
-"prosjekt, allerede er åpent."
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
+msgstr "Innspilling i CleanSpeech-modus er ikke mulig når et spor, eller mer enn ett prosjekt, allerede er åpent."
 
 #: toolbars/ControlToolBar.cpp:697
 msgid "Recording not permitted"
@@ -7524,6 +8225,10 @@ msgid "Silence selection"
 msgstr "Stillhetsmarkering"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Zoom Inn"
 
@@ -7579,16 +8284,13 @@ msgstr "Output-niv
 msgid "Input level meter - click to monitor input"
 msgstr "Input-nivåmåler - klikk for å overvåke inndata "
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mikser"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Outputvolum"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "Glidebryter-output"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7596,7 +8298,8 @@ msgid "Input Volume"
 msgstr "Inputvolum"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "Glidebryter-input"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7946,14 +8649,16 @@ msgstr "Vertikal stereo"
 msgid "Preferences..."
 msgstr "Innstillinger..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Dette avgjør hvor ofte lydnivåmålerne oppfriskes. Hvis\n"
+msgstr "Dette avgjør hvor ofte lydnivåmålerne oppfriskes. Hvis\n"
 "du har en treg datamaskin bør du kanskje velge en\n"
 "lavere oppfriskingsrate (maks. 30 per sekund), slik at\n"
 "lydkvaliteten ikke påvirkes av målerframvisningen."
@@ -7970,6 +8675,22 @@ msgstr "Innstillinger for lydniv
 msgid " Please select an action "
 msgstr " Vennligst velg en handling "
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478 widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
 msgstr "Vertikal linjal"
@@ -7981,12 +8702,6 @@ msgstr "Vertikal linjal"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 sekunder"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "tt:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -8012,6 +8727,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dager 024 t 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8197,10 +8927,11 @@ msgstr "Kunne ikke 
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Feil: %s ved linje %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
 msgstr "Klarte ikke å laste fil: \"%s\""
+
diff --git a/locale/nl.po b/locale/nl.po
index 0e65fa6..73b164c 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -38,17 +38,17 @@ msgstr "&Over Audacity…"
 msgid "OK... Audacious!"
 msgstr "OK… Audacieus!"
 
-#: AboutDialog.cpp:214
-msgid "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."
-msgstr "Audacity is vrije software, gemaakt door een wereldwijd verspreid team van ontwikkelaars. De coördinatie gebeurt via Sourceforge; een gratis online service voor open-source projecten.  Audacity is beschikbaar voor Windows 98 en hoger, MacOS X, Linux, en andere Unix-achtige systemen. Voor Mac OS 9 zijn oudere versies van Audacity beschikbaar."
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Dit is een beta-versie van het programma. Het kan fouten bevatten en slechts deels werkende functies. We zijn afhankelijk van uw feedback, dus bezoek onze website en stuur ons uw bugreports en verzoeken voor nieuwe functies."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Dit is een stabiele en voltooide versie van Audacity.  Mocht u onverhoops toch een fout ontdekken, of u heeft een suggestie, willen we graag dat u contact met ons opneemt.  Om Audacity te kunnen verbeteren zijn we afhankelijk van uw feedback.  Voor meer informatie kunt u onze website bezoeken."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -60,9 +60,9 @@ msgstr "Dit is een stabiele en voltooide versie van Audacity.  Mocht u onverhoop
 msgid "translator_credits"
 msgstr "Nederlandse vertaling door Tino Meinen <a.t.meinen at chello.nl>"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Een vrije digitale audio-editor"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -100,6 +100,10 @@ msgstr "Audacity maakt gebruik van computercode van de volgende projecten:"
 msgid "Special thanks:"
 msgstr "Bijzondere dank aan:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:314
 msgid "Audacity"
 msgstr "Audacity"
@@ -422,8 +426,7 @@ msgstr "Projecten herstellen"
 #: AutoRecovery.cpp:127
 msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Weet u zeker dat u geen projecten wilt herstellen?\n"
+msgstr "Weet u zeker dat u geen projecten wilt herstellen?\n"
 "Ze kunnen niet later nog hersteld worden."
 
 #: AutoRecovery.cpp:128
@@ -516,6 +519,10 @@ msgstr "%s toepassen"
 msgid "Apply Chain"
 msgstr "Opdrachtenreeks toepassen"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr "Opdrachtenreeks &selecteren"
@@ -565,11 +572,19 @@ msgstr "‘%s’ wordt toegepast op het huidige project"
 msgid "Please save and close the current project first."
 msgstr "Sla eerst het huidige project op en sluit het af."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 # in meervoud gehouden
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr "Selecteer de bestand die verwerkt moeten worden…"
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Alle bestanden (*.*)|*.*|Wav-bestanden (*.wav)|*.wav|Aiff-bestanden (*.aif)|*.aif|Au-bestanden (*.au)|*.au|Mp3-bestanden (*.mp3)|*.mp3|Ogg Vorbis-bestanden (*.ogg)|*.ogg|Flac-bestanden (*.flac)|*.flac"
@@ -799,16 +814,16 @@ msgstr "Kon ‘%s’ niet verwijderen"
 msgid "Renamed file: %s\n"
 msgstr "Bestand hernoemd: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Aanpassen van blok %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Kon ‘%s’ niet naar ‘%s’ hernoemen"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 # vrij vertaald
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -960,6 +975,95 @@ msgstr "Opname wordt op de harde schijf opgeslagen…"
 msgid "Rectangular"
 msgstr "Rechthoekig"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:639
+#, c-format
+msgid "Location of %s:"
+msgstr "Locatie van %s:"
+
+#: export/ExportMP3.cpp:648
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Om %s op te zoeken, klik hier -->"
+
+#: export/ExportMP3.cpp:654
+msgid "Browse..."
+msgstr "Bladeren…"
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Waar is %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Frequentieanalyse"
@@ -987,8 +1091,9 @@ msgstr "Verhoogde autocorrelatie"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algoritme:"
 
 #: ../src/HistoryWindow.cpp:58
@@ -1004,11 +1109,9 @@ msgstr "Grootte"
 msgid " window"
 msgstr " "
 
-# het is hier een wiskundige functie, geen gebruikersfunctie
-# venstertype ipv functie is beter
-#: FreqWindow.cpp:182
-msgid "Function:"
-msgstr "Venstertype:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 # Frequentieas [Linear]/[Logaritmisch]
 #: ../src/FreqWindow.cpp:177
@@ -1020,15 +1123,18 @@ msgstr "Lineair"
 msgid "Log frequency"
 msgstr "Logaritmisch"
 
-# frequentie-as
-#: FreqWindow.cpp:194
-msgid "Axis:"
-msgstr "Frequentie-as:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr "&Exporteren…"
 
+#: export/ExportCL.cpp:188 export/ExportOGG.cpp:121 export/ExportPCM.cpp:114
+msgid "Export"
+msgstr "Exporteren"
+
 #: ../src/Benchmark.cpp:223 ../src/FreqWindow.cpp:123
 #: ../src/effects/ClickRemoval.cpp:371 ../src/effects/NoiseRemoval.cpp:463
 msgid "Close"
@@ -1196,7 +1302,7 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr ""
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 # Actiegeschiedenis hier duidelijker dan Herstelgeschiedenis
@@ -1405,6 +1511,10 @@ msgstr "Project op&slaan\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Project opslaan &als…"
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr "Afhankelijkheids&controle…"
@@ -1413,6 +1523,10 @@ msgstr "Afhankelijkheids&controle…"
 msgid "Open Me&tadata Editor..."
 msgstr "Me&tadata-editor openen…"
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "I&mporteren"
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audio…\tCtrl+Shift+I"
@@ -1442,6 +1556,10 @@ msgstr "&Labels exporteren…"
 msgid "Export &Multiple..."
 msgstr "&Meervoudig exporteren…"
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr ""
@@ -1519,10 +1637,9 @@ msgstr "&Verwijderen\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Splitsen+v&erwijderen\tCtrl+Alt+K"
 
-# staat in het menu Bewerken
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Stil maken\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1537,22 +1654,21 @@ msgstr "A&fsplitsen\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "S&amenvoegen\tCtrl+J"
 
-# losmaken
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "&Losmaken\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr "&Dupliceren\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&Van stereo naar mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "&Gelabelde gebieden..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:460
@@ -1597,14 +1713,13 @@ msgid "&Join\tAlt+J"
 msgstr "S&amenvoegen\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "&Losmaken\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-# BUG: de ellipsis met een sneltoets?
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "Selec&teren…"
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: ../src/Menus.cpp:269
 msgid "&All\tCtrl+A"
@@ -1635,9 +1750,9 @@ msgstr "Van de cursorpositie tot het einde\tShift+K"
 msgid "Find &Zero Crossings\tZ"
 msgstr "Nulpunten &zoeken\tZ"
 
-#: Menus.cpp:527
-msgid "Mo&ve Cursor..."
-msgstr "&Cursor verplaatsen…"
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1666,10 +1781,9 @@ msgstr "&Gebied opslaan"
 msgid "Regio&n Restore"
 msgstr "Gebied &herstellen"
 
-# play region > [lock][unlock]
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "A&fspeelgebied…"
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1695,9 +1809,14 @@ msgstr "Raster aanzetten"
 msgid "Turn Grid Snap Off"
 msgstr "Raster uitzetten"
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Voorkeuren…\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1745,9 +1864,9 @@ msgstr "&Oversturing opsporen"
 msgid "&History..."
 msgstr "&Geschiedenis…"
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
-msgstr "&Werkbalken…"
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1790,15 +1909,71 @@ msgstr "We&rkbalken herstellen"
 msgid "!Simplified View"
 msgstr ""
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:566
+msgid "Skip to Start\tHome"
+msgstr "Naar begin springen\tHome"
+
+#: ../src/Menus.cpp:567
+msgid "Skip to End\tEnd"
+msgstr "Naar einde springen\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr "&Sporen"
 
-# menu: Tracks->Add new... ->Audio track/Label track/Stereo track
-# Sporen->Toevoegen... -> audiospoor/labelspoor/stereospoor
-#: Menus.cpp:642
-msgid "Add &New..."
-msgstr "&Toevoegen…"
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1812,11 +1987,6 @@ msgstr "&Stereospoor"
 msgid "&Time Track"
 msgstr "&Tijdspoor"
 
-# Opname tijdsklok/inplannen/plannen/timer/inplannen
-#: Menus.cpp:549
-msgid "&Timer Record..."
-msgstr "&Opname inplannen…"
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "Mi&xen en doorrekenen"
@@ -1874,13 +2044,21 @@ msgstr "Einde uitlijnen op &Einde Selectie"
 msgid "Align Tracks To&gether"
 msgstr "&Sporen op elkaar uitlijnen"
 
-#: Menus.cpp:688
-msgid "&Align Tracks..."
-msgstr "Sporen &uitlijnen…"
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
-msgstr "Uitlijnen en &cursor verplaatsen…"
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:705
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1890,22 +2068,26 @@ msgstr "&Label toevoegen bij selectie\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Label toevoegen bij afs&peelpositie\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
-msgstr "Sp&oren sorteren op…"
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
-msgstr "&Begintijd"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
-msgstr "&Naam"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Genereren"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 # meervoud is mooier/beter
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
@@ -1941,6 +2123,10 @@ msgstr "&Welkomstbericht tonen…"
 msgid "&Index..."
 msgstr "&Index…"
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:790
 msgid "&Screenshot Tools..."
 msgstr "&Schermafdrukken…"
@@ -1954,13 +2140,13 @@ msgstr "&Prestaties testen…"
 msgid "&Audio Device Info..."
 msgstr "&Audio-apparaat info…"
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Achterwaarts doorlopen: dock, sporenvenster, en selectiebalk\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Voorwaarts doorlopen: dock, sporenvenster en selectiebalk\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 # overal Tool (functie) weglaten en werkwoord gebruiken
 #: ../src/Menus.cpp:546
@@ -2003,9 +2189,9 @@ msgstr "Volgende tool\tD"
 msgid "Previous Tool\tA"
 msgstr "Vorige tool\tA"
 
-#: ../src/Menus.cpp:556
-msgid "Play/Stop\tSpacebar"
-msgstr "Afspelen/Stoppen\tSpatiebalk"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:557
 msgid "Stop\tS"
@@ -2040,22 +2226,14 @@ msgstr "Afspelen op selectie\tB"
 msgid "Play Looped\tL"
 msgstr "Herhaaldelijk afspelen\tL"
 
-#: ../src/Menus.cpp:564
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Herhaaldelijk afspelen\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr "Luistervoorbeeld snijpunt\tC"
 
-#: ../src/Menus.cpp:566
-msgid "Skip to Start\tHome"
-msgstr "Naar begin springen\tHome"
-
-#: ../src/Menus.cpp:567
-msgid "Skip to End\tEnd"
-msgstr "Naar einde springen\tEnd"
-
 #: ../src/Menus.cpp:569
 msgid "Selection to Start\tShift+Home"
 msgstr "Selecteren vanaf Begin\tShift+Home"
@@ -2074,57 +2252,57 @@ msgstr "DeleteKey2\tDelete"
 
 #: Menus.cpp:892
 msgid "Seek left short period during playback\tLeft"
-msgstr "Tijdens afspelen klein stapje terug spoelen\tPijl links"
+msgstr "Tijdens afspelen klein stapje terug spoelen\tLeft"
 
 #: Menus.cpp:893
 msgid "Seek right short period during playback\tRight"
-msgstr "Tijdens afspelen klein stapje vooruit spoelen\tPijl rechts"
+msgstr "Tijdens afspelen klein stapje vooruit spoelen\tRight"
 
 #: Menus.cpp:894
 msgid "Seek left long period during playback\tShift+Left"
-msgstr "Tijdens afspelen grote stap terug spoelen\tShift+Pijl links"
+msgstr "Tijdens afspelen grote stap terug spoelen\tShift+Left"
 
 #: Menus.cpp:895
 msgid "Seek right long period during playback\tShift+Right"
-msgstr "Tijdens afspelen grote stap vooruit spoelen\tShift+Pijl rechts"
+msgstr "Tijdens afspelen grote stap vooruit spoelen\tShift+Right"
 
 # bovenliggend/onderliggend vorige/volgende
 #: Menus.cpp:899
 msgid "Move Focus to Previous Track\tUp"
-msgstr "Focus naar vorige spoor\tPijl op"
+msgstr "Focus naar vorige spoor\tUp"
 
 #: Menus.cpp:900
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
-msgstr "Focus naar vorige spoor en wijzig selectie\tShift+Pijl up"
+msgstr "Focus naar vorige spoor en wijzig selectie\tShift+Up"
 
 #: Menus.cpp:901
 msgid "Move Focus to Next Track\tDown"
-msgstr "Focus naar volgende spoor\tPijl neer"
+msgstr "Focus naar volgende spoor\tDown"
 
 #: Menus.cpp:902
 msgid "Move Focus to Next and Change Selection\tShift+Down"
-msgstr "Focus naar volgende spoor en wijzig selectie\tShift+Pijl neer"
+msgstr "Focus naar volgende spoor en wijzig selectie\tShift+Down"
 
 # return = enter
 #: Menus.cpp:903
 msgid "Toggle Focused Track\tReturn"
-msgstr "Focus op spoor aan/uit\tEnter"
+msgstr "Focus op spoor aan/uit\tReturn"
 
 #: Menus.cpp:904
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Focus op spoor aan/uit\tNUMPAD_ENTER"
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Focus op spoor aan/uit\tCtrl+Spatiebalk"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: ../src/Menus.cpp:582
 msgid "Cursor Left\tLeft"
-msgstr "Cursor links\tLinks"
+msgstr "Cursor links\tLeft"
 
 #: ../src/Menus.cpp:583
 msgid "Cursor Right\tRight"
-msgstr "Cursor rechts\tRechts"
+msgstr "Cursor rechts\tRight"
 
 #: Menus.cpp:820
 msgid "Cursor Short Jump Left\t,"
@@ -2145,12 +2323,12 @@ msgstr "Cursor grote sprong rechts\tShift+."
 # uitbreiden/vergroten
 #: ../src/Menus.cpp:584
 msgid "Selection Extend Left\tShift+Left"
-msgstr "Selectie naar links vergroten\tShift+Links"
+msgstr "Selectie naar links vergroten\tShift+Left"
 
 # uitbreiden/vergroten
 #: ../src/Menus.cpp:585
 msgid "Selection Extend Right\tShift+Right"
-msgstr "Selectie naar rechts vergroten\tShift+Rechts"
+msgstr "Selectie naar rechts vergroten\tShift+Right"
 
 # (or extend) weggelaten om dat je de rand niet kunt uitbreiden, 
 # de selectie zelf wel.
@@ -2164,11 +2342,11 @@ msgstr "Rechter selectierand instellen"
 
 #: ../src/Menus.cpp:586
 msgid "Selection Contract Left\tCtrl+Shift+Right"
-msgstr "Selectie naar links verkleinen\tCtrl+Shift+Links"
+msgstr "Selectie naar links verkleinen\tCtrl+Shift+Right"
 
 #: ../src/Menus.cpp:587
 msgid "Selection Contract Right\tCtrl+Shift+Left"
-msgstr "Selectie naar rechts verkleinen\tCtrl+Shift+Rechts"
+msgstr "Selectie naar rechts verkleinen\tCtrl+Shift+Left"
 
 #: Menus.cpp:916
 msgid "Change pan on focused track\tShift+P"
@@ -2176,11 +2354,11 @@ msgstr "Balans wijzigen op spoor met focus\tShift+P"
 
 #: Menus.cpp:917
 msgid "Pan left on focused track\tAlt+Shift+Left"
-msgstr "Balans naar links op spoor met focus\tAlt+Shift+Pijl links"
+msgstr "Balans naar links op spoor met focus\tAlt+Shift+Left"
 
 #: Menus.cpp:918
 msgid "Pan right on focused track\tAlt+Shift+Right"
-msgstr "Balans naar rechts op spoor met focus\tAlt+Shift+Pijl rechts"
+msgstr "Balans naar rechts op spoor met focus\tAlt+Shift+Right"
 
 #: Menus.cpp:919
 msgid "Change gain on focused track\tShift+G"
@@ -2188,11 +2366,11 @@ msgstr "Versterking wijzigen op spoor met focus\tShift+G"
 
 #: Menus.cpp:920
 msgid "Increase gain on focused track\tAlt+Shift+Up"
-msgstr "Meer versterking op spoor met focus\tAlt+Shift+Pijl op"
+msgstr "Meer versterking op spoor met focus\tAlt+Shift+Up"
 
 #: Menus.cpp:921
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
-msgstr "Minder versterking op spoor met focus\tAlt+Shift+Pijl neer"
+msgstr "Minder versterking op spoor met focus\tAlt+Shift+Down"
 
 #: Menus.cpp:922
 msgid "Open menu on focused track\tShift+M"
@@ -2219,14 +2397,19 @@ msgstr "Raster (Snap-To) aanzetten"
 msgid "Snap To Off"
 msgstr "Raster (Snap-To) uitzetten"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr "Recent project openen"
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "&Recente bestanden…"
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:617
 #, c-format
@@ -2286,6 +2469,23 @@ msgstr "%s herhalen\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Er zijn geen labelsporen om te exporteren."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1633
 msgid "Nothing to undo"
 msgstr "Niets te herstellen"
@@ -2324,6 +2524,10 @@ msgstr "Tekst van het klembord geplakt"
 msgid "Pasted from the clipboard"
 msgstr "Geplakt van het klembord"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Stereogeluid kopiëren naar een monospoor is niet toegestaan."
@@ -2496,9 +2700,9 @@ msgstr "Labels importeren"
 msgid "Select a MIDI file..."
 msgstr "Selecteer een MIDI-bestand…"
 
-#: ../src/Menus.cpp:2673
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "All files (*.*)|*.*|MIDI bestanden (*.mid)|*.mid|Allegro bestanden (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2691
 #, c-format
@@ -2517,12 +2721,6 @@ msgstr "Selecteer een audiobestand zonder compressie…"
 msgid "All files (*)|*"
 msgstr "Alle bestanden (*)|*"
 
-#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Importeren"
-
 #: Menus.cpp:3547
 msgid "Edit the metadata tags"
 msgstr "De metadata-tags bewerken"
@@ -2600,6 +2798,14 @@ msgstr "Uitgelijnd"
 msgid "Align"
 msgstr "Uitlijnen"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2974
 msgid "Created new audio track"
 msgstr "Nieuw audiospoor aangemaakt"
@@ -2662,14 +2868,14 @@ msgstr "Spoor verwijderen"
 msgid "Removed audio track(s)"
 msgstr "Audiosporen verwijderd"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nieuwe samplefrequentie (Hz):"
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr "Resampelen"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Nieuwe samplefrequentie (Hz):"
+
 # ongeldige waarde!
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
@@ -2772,8 +2978,7 @@ msgid "This file was saved by Audacity %s, a much\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Dit bestand is opgeslagen met Audacity %s, een veel\n"
+msgstr "Dit bestand is opgeslagen met Audacity %s, een veel\n"
 "oudere versie. De bestandsindeling is inmiddels \n"
 "gewijzigd.\n"
 "\n"
@@ -2857,11 +3062,26 @@ msgid "This file was saved by Audacity %s.\n"
 "Open this file now?"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Het project kon niet opslagen worden. Misschien is %s niet beschrijfbaar of is de schijf vol."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148 ../src/Project.cpp:2160
 msgid "Error saving project"
@@ -2872,22 +3092,17 @@ msgstr "Fout bij opslaan project"
 msgid "Saved %s"
 msgstr "%s Opgeslagen"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr "Importeren van %s…"
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "‘%s’ is geïmporteerd"
 
+#: ../src/Project.cpp:2236 ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Importeren"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Fout bij importeren"
@@ -2900,19 +3115,23 @@ msgstr "Spraak opslaan als:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM-audiobestand *.wav)|*.wav"
 
-# Een beetje vrij vertaald, maar de boodschap is zo wel duidelijk
-# LET OP! dit bericht mag maximaal 5 regels bevatten, alle overige regels
-# worden niet in het dialoog getoond.
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "In Audacity-projectbestanden (.aup) wordt alle informatie opgeslagen, precies zoals die op het scherm\n"
-"te zien is. Andere programma's kunnen echter de projectbestanden van Audacity vaak niet openen.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Als u het bestand ook in andere programma's wilt kunnen openen moet u ‘Exporteren als…’ gebruiken."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2955,6 +3174,16 @@ msgstr "Vrije schijfruimte voor opname van %d seconden."
 msgid "Out of disk space"
 msgstr "Geen vrije schijfruimte over"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr "Kon oud autosavebestand niet verwijderen: "
@@ -3041,49 +3270,14 @@ msgstr "&Voorbeeld"
 msgid "&Debug"
 msgstr "&Debuggen"
 
-#  =venstertitel
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity opname inplannen"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
-# tijdsduur
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr "Tijdsduur"
-
-#  =venstertitel
-# 'smart' niet meevertaald
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity opnamevoortgang"
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr "Begindatum en tijd"
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr "Einddatum en tijd"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Wachten voor opname op %s.\n"
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity ingeplande opname - Wachten op begin opname"
-
 #: SplashDialog.cpp:57
 msgid "&Welcome to Audacity!"
 msgstr "&Welkom bij Audacity!"
@@ -3121,11 +3315,9 @@ msgstr "Genre"
 msgid "Comments"
 msgstr "Opmerkingen"
 
-# F2/op F2
-# om de inhoud van de cel te bewerken/om te bewerken
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
-msgstr "Toets F2 of dubbelklik om te bewerken."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:769
 msgid "Tag Name"
@@ -3143,14 +3335,13 @@ msgstr "&Wissen"
 msgid "Genres"
 msgstr "Genres"
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
-msgstr "Bewerken"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-# Resetten/herstellen
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
-msgstr "Herstellen"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:1070
 msgid "Template"
@@ -3191,102 +3382,18 @@ msgstr "Weet u zeker dat u de genrelijst naar de standaardlijst wilt herstellen?
 msgid "Unable to open genre file."
 msgstr "Niet in staat het genrebestand te openen."
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
-msgstr "Metadata opslaan als:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr "Fout bij het laden van de metadata"
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr "Titel:"
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr "Artiest:"
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr "Componist:"
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr "Tekstschrijver:"
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr "Opmerkingen:"
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr "Gecodeerd met:"
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr "Spoornummer:"
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr "Jaar:"
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr "Genre:"
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr "Geen genres"
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr "H&erstellen naar standaardlijst"
-
-# eenvoudig/simpel
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr "Eenvoudig"
-
-# extra/geavanceerd
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-# bitrate is variabel of contstant
-#: Tags.cpp:2000
-msgid "Value"
-msgstr "Waarde"
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr "&Wissen"
-
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maximumlengte van attribuut ‘%s’ is %d tekens. Data afgekapt."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artiest"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
+msgstr "Metadata opslaan als:"
 
 #: Theme.cpp:629
 #, c-format
@@ -3370,6 +3477,55 @@ msgstr "Alle vereiste bestanden in:\n"
 "  %s\n"
 "waren al aanwezig."
 
+# tijdsduur
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr "Tijdsduur"
+
+#  =venstertitel
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity opname inplannen"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr "Begindatum en tijd"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr "Einddatum en tijd"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Wachten voor opname op %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 # sporenpaneel
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
 msgid "Track Panel"
@@ -3642,6 +3798,14 @@ msgstr "Balans aangepast"
 msgid "Adjusted gain"
 msgstr "Versterking aangepast"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 # actieve audio/terwijl audio nog bewerkt wordt?
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
@@ -3703,14 +3867,6 @@ msgstr "Snelheidsverandering"
 msgid "Format Change"
 msgstr "Formatwijziging"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Geef een samplefrequentie in Hz (per seconde) tussen 1 en 100000:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Ongeldige frequentie"
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Onderlimiet snelheidspercentage wijzigen naar:"
@@ -3856,8 +4012,9 @@ msgstr "Plugins 1 tot %i"
 msgid "Plugins %i to %i"
 msgstr "Plugins %i tot %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Niet toegestaan door een of andere oorzaak. Probeer eerst wat audio te selecteren."
 
 #: commands/CommandManager.cpp:724
@@ -3882,9 +4039,9 @@ msgid "You must first select some audio for this\n"
 msgstr "U moet hiervoor eerst wat audio selecteren.\n"
 "[U kunt dit niet bij andere soorten tracks gebruiken.]"
 
-#: commands/CommandManager.cpp:732
-msgid "Message"
-msgstr "Bericht"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
 #, c-format
@@ -3904,14 +4061,19 @@ msgstr "Effect toegepast: %s %.1f dB"
 msgid "Amplify"
 msgstr "Versterken"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Versterken door: Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Versterking (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Nieuwe piekamplitude (dB):"
@@ -4043,11 +4205,19 @@ msgstr "door Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Frequentie (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 # versterking/boost
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Boost (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 # bassen versterken
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
@@ -4092,9 +4262,50 @@ msgstr "van Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "gebruik makend van SoundTouch, van Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Toonhoogte:   van"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Halve tonen:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 # van A naar B
 #: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
@@ -4103,13 +4314,9 @@ msgstr "Toonhoogte:   van"
 msgid "to"
 msgstr "naar"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Halve tonen:"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frequentie (Hz):   van"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 # verandering/wijziging/aanpassing
 #: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
@@ -4117,6 +4324,11 @@ msgstr "Frequentie (Hz):   van"
 msgid "Percent Change:"
 msgstr "Percentage verandering:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 # aanpassen/wijzigen (aanpassen hier mooier)
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
@@ -4136,14 +4348,6 @@ msgstr "Effect toegepast: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Snelheid wijzigen"
 
-#: ../src/effects/ChangeSpeed.cpp:282
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Snelheid wijzigen, zowel tempo als toonhoogte worden beïnvloed"
-
-#: ../src/effects/ChangeSpeed.cpp:292
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "gebruik makend van SampleRate, van Erik de Castro Lopo"
-
 # not available - niet beschikbaar
 # niet n/b maar 'niet beschikbaar' vertalen (sander)
 # n/b is een bekende term die ook in bijv. excel wordt gebruikt.
@@ -4157,11 +4361,25 @@ msgstr "gebruik makend van SampleRate, van Erik de Castro Lopo"
 msgid "n/a"
 msgstr "n/b"
 
-# consequentie , als je kiest voor BPM in NL dan ook RPM in NL (sander)
-# BPM Beats per minuut, TPM toeren per minuut. (Revolutions per minute)
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standaard vinyl RPM:   van"
+#: ../src/effects/ChangeSpeed.cpp:282
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Snelheid wijzigen, zowel tempo als toonhoogte worden beïnvloed"
+
+#: ../src/effects/ChangeSpeed.cpp:292
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "gebruik makend van SampleRate, van Erik de Castro Lopo"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -4180,13 +4398,29 @@ msgstr "Tempo wijzigen"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Tempo wijzigen, toonhoogte blijft gelijk"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Beats per Minuut (BPM):    van"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Lengte (seconden):   Van"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -4197,8 +4431,9 @@ msgstr "Tempo wijzigen…"
 msgid "Changing Tempo"
 msgstr "Tempo wordt aangepast"
 
-#: effects/ClickRemoval.cpp:316
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "ClickRemoval"
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -4209,10 +4444,18 @@ msgstr "Click en pop verwijderen door Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Drempelwaarde selecteren (lager is gevoeliger):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:355
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Maximum piekbreedte (hoger is gevoeliger):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 # betere vertaling?
 # tikken, geknetter, butsen, statische electriciteit
 # knarsen, kliks, klikken, clicks ...
@@ -4232,54 +4475,86 @@ msgstr "Clicks en pops worden verwijderd…"
 msgid "Dynamic Range Compressor"
 msgstr "Dynamisch bereik compressor"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dynamisch bereik compressor door Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Verhouding: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-# attack/invaltijd/invalstijd
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Invalstijd: "
 
-# decay/uitvalstijd
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Uitvalstijd: "
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Normaliseren op 0dB na compressie"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Drempelwaarde: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Verhouding: %.0f:1"
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Verhouding: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-# Wanneer de compressie in werking treedt?
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Invalstijd: %.1f sec"
 
-# hoelang het duurt voordat (besloten wordt dat) er niet meer 
-# gecomprimeerd wordt
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Uitvalstijd: %.1f sec"
 
 #: ../src/effects/Compressor.h:36
@@ -4291,6 +4566,252 @@ msgstr "Compressor…"
 msgid "Applying Dynamic Range Compression..."
 msgstr "Dynamische bereik-compressie wordt toegepast…"
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+# begin en eind/start en einde
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Begin"
+
+# eind/einde
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr "Einde"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+# Resetten/herstellen
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr "Herstellen"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+# dit wordt: Audacity bedienings-werkbalk/bedieningsknoppen-werkbalk
+# Audacity %s-werkbalk
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "bedieningsknoppen"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr "DTMF-geluidstonen genereren"
@@ -4556,6 +5077,11 @@ msgstr "Spiegelen"
 msgid "Inverting"
 msgstr "Bezig met spiegelen"
 
+# de extremen eruit halen/nivelleren
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
+msgstr "Nivelleren"
+
 #: effects/Leveller.cpp:47
 msgid "None-Skip"
 msgstr "Niet-overslaand"
@@ -4580,30 +5106,26 @@ msgstr "Zwaarder"
 msgid "Heaviest"
 msgstr "Zwaarst"
 
-# de extremen eruit halen/nivelleren
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
-msgstr "Nivelleren"
-
 # egaliseren/nivelleren
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
-msgstr "Nivelleren door Lynn Allan"
-
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
-msgstr "Zachte en luide secties nivelleren"
+#: effects/TruncSilence.cpp:320
+msgid "by Lynn Allan"
+msgstr "door Lynn Allan"
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr "Mate van nivellering"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Ruisdrempelwaarde"
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Drempelwaarde voor ruis: "
 
 #: effects/Leveller.h:28
@@ -4615,6 +5137,158 @@ msgstr "Nivelleren…"
 msgid "Applying Leveller..."
 msgstr "Nivelleren…"
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "Mixer"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Ruis verwijderen"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 # witte (ruis)
 #: effects/Noise.cpp:37
 msgid "White"
@@ -4662,10 +5336,6 @@ msgstr "Kon bestand: ‘%s’ niet openen"
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Probeer ruis te verwijderen zonder een ruisprofiel.\n"
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Ruis verwijderen"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Stap 1"
@@ -4699,17 +5369,29 @@ msgstr "Ruisprofiel verkrijgen"
 msgid "Noise reduction (dB):"
 msgstr "Ruisonderdrukking (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 # verloop/gladheid/gladstrijken/gladmaken/uitsmeren/uitvlakken
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr "Frequenties uitsmeren (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 # Attack/decay wordt niet vertaald?
 # inval/uitval?
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr "Attack/decay tijd (seconden):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 # ruis onderdrukken
 # noise suppression/reduction
 #: ../src/effects/NoiseRemoval.h:38
@@ -4749,23 +5431,22 @@ msgstr ", maximum amplitude = %.1f dB"
 msgid "Normalize"
 msgstr "Normaliseren"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normaliseren door Dominic Mazzoni"
-
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "DC-offset verwijderen (verticaal op 0 centreren)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-# normaliseren op
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
-msgstr "Maximum amplitude normaliseren op"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normaliseren…"
@@ -4779,48 +5460,55 @@ msgstr "Normaliseren…"
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Effect toegepast: %s %d stappen, %.0f%% wet, frequentie = %.1f Hz, beginfase = %.0f deg, bereik = %d, feedback = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Phaser"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser door: Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Stappen:"
 
-# Deze moet je echt eens aan een geluidstechnicus vragen want bv 'kaal' 
-# dekt de lading beter, maar ze hebben er vast nederlands jargon voor. (Sander)
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "DROOG"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
 
-# vraag ook aan geluidstechnicus.
-# Ik heb  in jaren clubwerk nog nooit een technicus over 'nat' horen spreken.
-# Bij klaverjassen ga je nat :-) (sander)
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO-frequentie (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO beginfase (graden):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 # diepte/bereik
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Bereik:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Feedback (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Phaser…"
@@ -4838,6 +5526,14 @@ msgstr "‘Repareren’ is bedoeld voor zeer korte stukjes beschadigde audio (ma
 "\n"
 "Zoom in en selecteer een fractie van een seconde om te repareren."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr "Beschadigde audio wordt gerepareerd"
@@ -4855,27 +5551,22 @@ msgstr "Sporen zijn te lang om de selectie te herhalen."
 msgid "Repeat"
 msgstr "Herhalen"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Herhalen door Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Aantal herhalingen: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Nieuwe selectielengte: "
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minuten, %d seconden"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d seconden"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr "uu:mm:ss"
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4944,10 +5635,58 @@ msgstr "Pieken verwijderen…"
 msgid "Applying Spike Cleaner..."
 msgstr "‘Pieken verwijderen’ toepassen…"
 
+#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Van stereo naar mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Van stereo naar mono toepassen"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:59
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -4995,16 +5734,21 @@ msgstr "Frequentie (Hz)"
 msgid "Waveform:"
 msgstr "Golfvorm:"
 
-# begin en eind/start en einde
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
-msgstr "Begin"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-# eind/einde
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
-msgstr "Einde"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5035,11 +5779,6 @@ msgstr "Alle sporen moeten dezelfde samplefrequentie hebben"
 msgid "Truncate Silence"
 msgstr "Stilte afkappen"
 
-# egaliseren/nivelleren
-#: effects/TruncSilence.cpp:320
-msgid "by Lynn Allan"
-msgstr "door Lynn Allan"
-
 # maximale tijdsduur/lengte stilte
 #: effects/TruncSilence.cpp:342
 msgid "Max silence duration:"
@@ -5090,10 +5829,6 @@ msgstr "Effect toegepast: %s frequentie = %.1f Hz, beginfase = %.0f deg, bereik
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah door: Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Bereik (%):"
@@ -5102,10 +5837,18 @@ msgstr "Bereik (%):"
 msgid "Resonance:"
 msgstr "Resonantie:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Wahwah Frequentieverschuiving (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah…"
@@ -5141,6 +5884,18 @@ msgstr "Effect-instellingen"
 msgid "Length (seconds)"
 msgstr "Lengte (seconden)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist-effect toepassen…."
@@ -5208,11 +5963,13 @@ msgstr "Plugin-instellingen"
 msgid "Program"
 msgstr "Programma"
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr "Er zijn geen sporen geselecteerd! Gebruik Ctrl-A (Alles selecteren)\n"
-"En kies dan Exporteren… om alle sporen te exporteren."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
 
 #: export/Export.cpp:333
 msgid "Export File"
@@ -5269,6 +6026,10 @@ msgstr " - Links"
 msgid " - Right"
 msgstr " - Rechts"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 # uitgangskanalen/uitgang/uitvoerkanalen
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
@@ -5305,10 +6066,6 @@ msgstr "(extern programma)"
 msgid "Cannot export audio to %s"
 msgstr "Kan audio niet exporteren naar %s"
 
-#: export/ExportCL.cpp:188 export/ExportOGG.cpp:121 export/ExportPCM.cpp:114
-msgid "Export"
-msgstr "Exporteren"
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "De geselecteerde audio wordt met codeerprogramma op de opdrachtregel geëxporteerd"
@@ -5322,6 +6079,477 @@ msgstr "Het gehele project wordt met codeerprogramma op de opdrachtregel geëxpo
 msgid "Command Output"
 msgstr "Opdrachtregel uitvoer"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1860
+msgid "Invalid sample rate"
+msgstr "Ongeldige samplefrequentie"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1879
+msgid "You may resample to one of the rates below."
+msgstr "U kunt een van de onderstaande samplefrequenties kiezen."
+
+#: export/ExportMP3.cpp:1902
+msgid "Sample Rates"
+msgstr "Samplefrequenties"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bitrate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:246
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Taal:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:219
+msgid "Quality:"
+msgstr "Kwaliteit:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Xml-bestanden (*.xml)|*.xml|Alle bestanden (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:139
 msgid "Specify FLAC Options"
 msgstr "FLAC-opties specificeren"
@@ -5404,10 +6632,6 @@ msgstr "MP2-opties specificeren"
 msgid "MP2 Export Setup"
 msgstr "MP2-export instellingen"
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bitrate:"
-
 #: export/Export.cpp:259
 msgid "MP2 Files"
 msgstr "Mp2-bestanden"
@@ -5529,35 +6753,15 @@ msgstr "Lame opzoeken"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity heeft het bestand %s nodig om MP3S aan te kunnen maken."
 
-#: export/ExportMP3.cpp:639
-#, c-format
-msgid "Location of %s:"
-msgstr "Locatie van %s:"
-
-#: export/ExportMP3.cpp:648
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Om %s op te zoeken, klik hier -->"
-
-#: export/ExportMP3.cpp:654
-msgid "Browse..."
-msgstr "Bladeren…"
-
 #: export/ExportMP3.cpp:655
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Voor een gratis kopie van Lame, klik hier -->"
 
-#: export/ExportMP3.cpp:656
-msgid "Download..."
-msgstr "Downloaden…"
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Waar is %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5622,10 +6826,6 @@ msgstr "Het gehele bestand exporteren met %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "Foutmelding %d teruggekregen van mp3-codeerprogramma"
 
-#: export/ExportMP3.cpp:1860
-msgid "Invalid sample rate"
-msgstr "Ongeldige samplefrequentie"
-
 #: export/ExportMP3.cpp:1873
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5640,18 +6840,9 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 msgstr "De combinatie van samplefrequentie (%d) en bit-rate (%d kbps) binnen \n"
 "het project is niet mogelijk in het mp3-bestandsformaat."
 
-#: export/ExportMP3.cpp:1879
-msgid "You may resample to one of the rates below."
-msgstr "U kunt een van de onderstaande samplefrequenties kiezen."
-
-#: export/ExportMP3.cpp:1902
-msgid "Sample Rates"
-msgstr "Samplefrequenties"
-
-# exportplugin/export plugin
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "MP3-export plugin niet gevonden"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 # meerdere exorteren
 #: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
@@ -5714,6 +6905,10 @@ msgstr "Audio die voor het eerste label zit ook meenemen"
 msgid "First file name:"
 msgstr "Eerste bestandsnaam:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Sporen"
@@ -5738,15 +6933,14 @@ msgstr "Oplopend nummeren"
 msgid "File name prefix:"
 msgstr "Bestandsnaam voorzetsel:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Bestaande bestanden overschrijven"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr "E&xporteren"
-
 #: export/ExportMultiple.cpp:369
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5785,8 +6979,7 @@ msgstr "Er ging iets mis nadat %d bestanden geëxporteerd waren."
 #, c-format
 msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"Label %s is geen geldige bestandsnaam. U kunt het volgende gebruiken:  %s\n"
+msgstr "Label %s is geen geldige bestandsnaam. U kunt het volgende gebruiken:  %s\n"
 "Gebruik…"
 
 # aangeven/specificeren
@@ -5798,10 +6991,6 @@ msgstr "Ogg Vorbis-opties specificeren"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg Vorbis exportinstellingen"
 
-#: prefs/FileFormatPrefs.cpp:219
-msgid "Quality:"
-msgstr "Kwaliteit:"
-
 #: export/ExportOGG.cpp:154
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis-bestanden"
@@ -5822,10 +7011,6 @@ msgstr ""
 msgid "Uncompressed Export Setup"
 msgstr "Exportinstellingen voor bestanden zonder compressie"
 
-#: export/ExportPCM.cpp:246
-msgid "Format:"
-msgstr "Format:"
-
 #: export/ExportPCM.cpp:250
 msgid "Header:"
 msgstr "Header:"
@@ -5838,9 +7023,21 @@ msgstr "Codering:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Niet alle combinaties van headers en coderingen zijn mogelijk.)"
 
-#: export/Export.cpp:242
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "Wav, Aiff, en andere types zonder compressie"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
 msgid "Cannot export audio in this format."
@@ -5862,12 +7059,52 @@ msgstr "Het gehele project exporteren als %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Fout (bestand is mogelijk nog niet geschreven): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr "MP3-bestanden"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 # is er geen ondersteuning voor %s
 #: ../src/import/Import.cpp:159
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "In deze versie van Audacity is ondersteuning voor %s niet meegecompileerd."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5875,8 +7112,7 @@ msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"‘%s’ is een audio-cd bestand.\n"
+msgstr "‘%s’ is een audio-cd bestand.\n"
 "Audacity kan audio-cd's niet rechtstreeks openen.\n"
 "U moet nummers op de cd rippen naar een audioformaat\n"
 "dat Audacity kan importeren zoals wav or aiff."
@@ -5886,8 +7122,7 @@ msgstr ""
 msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"‘%s’ is een afspeellijst-bestand.\n"
+msgstr "‘%s’ is een afspeellijst-bestand.\n"
 "Audacity kan dit soort bestanden niet openen omdat het enkel verwijzigen naar\n"
 "andere bestanden bevat. Misschien kunt u het openen in een teksteditor en \n"
 "zelf de eigenlijke audiobestanden downloaden."
@@ -5897,8 +7132,7 @@ msgstr ""
 msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"‘%s’ is een Windows Media audio-bestand.\n"
+msgstr "‘%s’ is een Windows Media audio-bestand.\n"
 "Audacity kan dit type bestand niet openen vanwege octrooirechten.\n"
 "U moet het omzetten naar een ondersteund audioformaat zoals wav or aiff."
 
@@ -5907,19 +7141,19 @@ msgstr ""
 msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"‘%s’ is een Advanced Audio Coding bestand. \n"
+msgstr "‘%s’ is een Advanced Audio Coding bestand. \n"
 "Audacity kan dit soort bestanden niet openen. \n"
 "U moet het omzetten naar een ondersteund audioformaat zoals wav of aiff."
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"‘%s’ is een versleuteld audio-bestand.\n"
+msgstr "‘%s’ is een versleuteld audio-bestand.\n"
 "Deze gewoonlijk afkomstig van een on-line muziekwinkel. \n"
 "Audacity kan dit type bestanden niet openen vanwege de versleuteling.\n"
 "U kunt proberen een opname van het bestand te maken met Audacity, of \n"
@@ -5931,21 +7165,10 @@ msgstr ""
 msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"‘%s’ is een RealPlayer media-bestand.\n"
+msgstr "‘%s’ is een RealPlayer media-bestand.\n"
 "Audacity kan dit bedrijfseigen formaat niet openen.\n"
 "U moet het omzetten naar een ondersteund audioformaat zoals wav or aiff."
 
-#: import/Import.cpp:200
-#, c-format
-msgid "\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"‘%s’ is een MIDI-bestand, geen audiobestand. \n"
-"Audacity kan dit type bestand niet afspelen of bewerken, maar u kunt het wel \n"
-"weergeven via Bestand > Importeren > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
 msgid "\"%s\" is a notes-based file, not an audio file. \n"
@@ -5984,23 +7207,33 @@ msgid "\"%s\" is an Ogg Speex audio file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
-msgstr "Audacity moest het type van het bestand raden.\n"
-"Hierdoor is het resultaat van de audio mogelijk onzin.\n"
-"\n"
-"Wanneer de audio onzinnig klinkt, probeer dan het bestand te\n"
-"hernoemen zodat het de juiste extensie heeft voor het openen."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity herkende het type bestand niet.\n"
-"Als het geen compressie-bestand is, probeer het dan te importeren met ‘Raw importeren’"
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6035,17 +7268,18 @@ msgstr "MIDI-sporen kunnen niet afzonderlijk worden verschoven. Dat kan alleen b
 msgid "Invalid track offset in LOF file."
 msgstr "Ongeldige verschuiving van spoor in LOF-bestand."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Fout bij verwerken Allegro-bestand."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Fout bij verwerken MIDI-bestand."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr "MP3-bestanden"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:35
 msgid "Ogg Vorbis files"
@@ -6071,16 +7305,23 @@ msgstr "Ongeldige Vorbis bitstream header"
 msgid "Internal logic fault"
 msgstr "Interne logische fout"
 
-# Importing MP3 file...
-#: ../src/Project.cpp:2233
+#: export/Export.cpp:242
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "Wav, Aiff, en andere types zonder compressie"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Het %s-bestand wordt geïmporteerd…"
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime-bestanden"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Raw data importeren"
@@ -6122,6 +7363,14 @@ msgstr "2 kanalen (Stereo)"
 msgid "%d Channels"
 msgstr "%d kanalen"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Beginverschuiving:"
@@ -6134,9 +7383,18 @@ msgstr "Hoeveelheid te importeren:"
 msgid "Sample rate:"
 msgstr "Samplefrequentie:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "I&mporteren"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
 msgid "Audio I/O"
@@ -6185,10 +7443,9 @@ msgstr "kanalen"
 msgid "Playthrough"
 msgstr "Playthrough"
 
-# gelijktijdig/tegelijkertijd
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Bij het opnemen van een spoor, gelijktijdig de andere sporen afspelen"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6198,9 +7455,13 @@ msgstr "&Hardwarematig playthrough: Nieuw spoor afspelen tijdens opname"
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "&Softwarematig playthrough: Nieuw spoor afspelen tijdens opname"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "&Softwarematig playthrough: Nieuw spoor afspelen tijdens opname (uitvinken bij ‘stereo mix’ opname)"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 # luistervoorbeeld/luisterproeve
 #: prefs/AudioIOPrefs.cpp:194
@@ -6234,15 +7495,13 @@ msgstr "Tijdsvertraging (Latency)"
 #: prefs/AudioIOPrefs.cpp:189
 msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Audio bufferen:\n"
+msgstr "Audio bufferen:\n"
 "(hoger = meer vertraging)"
 
 #: prefs/AudioIOPrefs.cpp:192
 msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Vertragingscorrectie:\n"
+msgstr "Vertragingscorrectie:\n"
 "(negatief = achterwaarts)"
 
 # dit is de titel van het kader
@@ -6321,8 +7580,8 @@ msgid "Audio cache"
 msgstr "Audio-buffer"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Opnamedata in het geheugen houden totdat de opname stopt"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
 msgid "Choose a location to place the temporary directory"
@@ -6362,10 +7621,9 @@ msgstr "Mp3-bibliotheekversie:"
 msgid "MP3 Library:"
 msgstr "Mp3-bibliotheek:"
 
-# bibliotheekbestand
-#: prefs/FileFormatPrefs.cpp:185
-msgid "&Find Library"
-msgstr "&Bibliotheek opzoeken"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6375,8 +7633,20 @@ msgstr "LAME mp3-bibliotheek:"
 msgid "&Download"
 msgstr "&Downloaden"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
 msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:100
@@ -6413,7 +7683,7 @@ msgstr "&Gebruiker vragen"
 
 #: prefs/FileFormatPrefs.cpp:93
 msgid "When exporting tracks to an audio file"
-msgstr ""
+msgstr "Bij het exporteren tot een audiobestand"
 
 #: prefs/FileFormatPrefs.cpp:144
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
@@ -6448,25 +7718,25 @@ msgid "&Update display while playing"
 msgstr "&Meeschuiven tijdens afspelen"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Sluiten van het laatste venster sluit Audacity af"
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr "&Selectieranden mogen worden versleept"
 
-# het gaat niet specifiek om de i/o knoppen, maar ook de bedieningsknoppen
-# zoals 'naar het begin/einde'
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&Ergonomische volgorde van de bedieningsknoppen"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Automatisch &zoomen tot sporen verticaal in venster passen"
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#: prefs/GUIPrefs.cpp:104
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "Focus verplaatst zich &circulair door de sporen"
 
 # verplaatsen/verschuiven/doen verschuiven
@@ -6494,12 +7764,13 @@ msgstr "S&nijlijnen inschakelen"
 msgid "Show warnings about &temp files"
 msgstr "&Waarschuwen voor tijdelijke bestanden"
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
-msgstr "\"Zelfs le&ge projecten aanbieden op te slaan"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Welkomstbericht tonen bij opstarten"
 
 # er is maar 1 optie hier: cleanspeech modus
@@ -6507,6 +7778,10 @@ msgstr "Welkomstbericht tonen bij opstarten"
 msgid "Modes"
 msgstr "Weergavemodus"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Ondergrens weergave bij Vu-meters en ‘Golfvorm (dB)’"
@@ -6540,33 +7815,9 @@ msgstr "-145 dB (het PCM-bereik bij 24-bit samples)"
 msgid "Default View Mode"
 msgstr "Standaard weergavemodus"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr ""
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
-msgstr ""
-
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Taal:"
+msgstr "Andere interface opties"
 
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
@@ -6582,6 +7833,14 @@ msgstr "Solo-knop:"
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr "Toetsbindingen"
@@ -6615,10 +7874,6 @@ msgstr "Fout bij opslaan sneltoetsen"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Een XML-bestand selecteren dat de sneltoets-configuratie voor Audacity bevat."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Xml-bestanden (*.xml)|*.xml|Alle bestanden (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Fout bij laden van sneltoetsen"
@@ -6637,6 +7892,43 @@ msgstr "De sneltoets ‘%s’ is al toegekend aan:\n"
 msgid "Undo"
 msgstr "Herstellen"
 
+# gelijktijdig/tegelijkertijd
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&Bij het opnemen van een spoor, gelijktijdig de andere sporen afspelen"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Muis"
@@ -6927,14 +8219,13 @@ msgstr "Hoge-kwaliteit:"
 msgid "Smart Recording"
 msgstr "Slim opnemen"
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Opname pauzeren bij stilte"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-# labels stil/stil maken/stiltelabels/
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Stilteniveau (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
 msgid "Spectrograms"
@@ -7126,12 +8417,6 @@ msgstr "Bij het opslaan en laden van afzonderlijke themabestanden wordt\n"
 "is het hetzelfde idee.\n"
 "\n"
 
-# dit wordt: Audacity bedienings-werkbalk/bedieningsknoppen-werkbalk
-# Audacity %s-werkbalk
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "bedieningsknoppen"
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pauzeren"
@@ -7141,11 +8426,9 @@ msgstr "Pauzeren"
 msgid "Play"
 msgstr "Afspelen"
 
-# doorlopend afspelen (tino)
-# herhalend afspelen (sander)
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Afspelen (Shift voor herhaaldelijk afspelen)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -7159,6 +8442,10 @@ msgstr "Naar begin springen"
 msgid "Skip to End"
 msgstr "Naar einde springen"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 # tooltip bij de CleenSpeech knop
 # erop klikken brengt het 'apply chain' dialoog naar voren
 #: toolbars/ControlToolBar.cpp:195
@@ -7197,6 +8484,10 @@ msgstr "Alles buiten de selectie wegknippen"
 msgid "Silence selection"
 msgstr "De selectie geluidloos maken"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Inzoomen"
@@ -7261,17 +8552,14 @@ msgstr "Weergavevolume"
 msgid "Input level meter - click to monitor input"
 msgstr "Opnamevolume - klik op de meter om het ingangssignaal te meten"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "Mixer"
-
 # Uitgansvolume/weergavevolume/afspeelvolume
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Weergavevolume"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
 msgstr "Uitgang-schuif"
 
 # opnamevolume
@@ -7279,8 +8567,9 @@ msgstr "Uitgang-schuif"
 msgid "Input Volume"
 msgstr "Ingangsvolume"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
 msgstr "Ingang-schuif"
 
 #: toolbars/MixerToolBar.cpp:119
@@ -7662,6 +8951,10 @@ msgstr "Stereo verticaal"
 msgid "Preferences..."
 msgstr "Voorkeuren…"
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 # engels BUG: qualtiy moet quality zijn
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
@@ -7687,6 +8980,22 @@ msgstr "Vu-meter voorkeuren"
 msgid " Please select an action "
 msgstr " Selecteer een actie "
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 # lineaal/meetlat/meetlint
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
@@ -7696,10 +9005,6 @@ msgstr "Verticale lineaal"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 seconden"
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr "uu:mm:ss"
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr "0100 u 060 m 060 s"
@@ -7712,6 +9017,21 @@ msgstr "dd:uu:mm:ss"
 msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dagen 024 u 060 m 060 s"
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr "uu:mm:ss + milliseconden"
@@ -7830,10 +9150,10 @@ msgstr "Deze melding niet meer tonen"
 msgid "Could not open file: \"%s\""
 msgstr "Kon bestand ‘%s’ niet openen"
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Fout: %hs op regel %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/oc.po b/locale/oc.po
index 96fe24b..32d8087 100644
--- a/locale/oc.po
+++ b/locale/oc.po
@@ -13,34 +13,23 @@ msgstr "Project-Id-Version: Audacity 1.2.4\n"
 msgid "&About Audacity..."
 msgstr "&A prepaus de \"Audacity\"..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Activat"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Data de creacion del programa :"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity es un programa a res non còst escrich per una còla internacionala de desvolopaires benevòls. La coordinacion merceja SourceForge.net, un servici en linha que provesís d'aisinas als projèctes de programas en sorga libre. Audacity es disponible per Windows 98 e mai, MacOS9 e X, Linux, e d'autres sistèmas basats sus Unix. De versions mai ancianas d'Audacity son disponiblas pour Mac OS 9. "
-
-#: AboutDialog.cpp:218
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 
-#: AboutDialog.cpp:221
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
@@ -53,13 +42,9 @@ msgstr ""
 msgid "translator_credits"
 msgstr ""
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Un editor audiò numeric libre"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Informacion"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -95,28 +80,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Mercejaments particulièrs :"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Activat"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Data de creacion del programa :"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Barrar"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -320,12 +395,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -361,8 +437,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -410,6 +486,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -458,10 +538,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -678,16 +766,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Tornar nomenar lo fichièr : %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Cambiament de blòc %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -817,6 +905,95 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Rectangular"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:129
+#, c-format
+msgid "Where is %s?"
+msgstr ""
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Analisi de frequéncias"
@@ -845,8 +1022,8 @@ msgstr "Autocorrelacion Avan
 msgid "Cepstrum"
 msgstr "Cepstre"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -858,8 +1035,8 @@ msgstr "Talha"
 msgid " window"
 msgstr "fenèstra"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -870,14 +1047,25 @@ msgstr "Frequ
 msgid "Log frequency"
 msgstr ""
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Barrar"
+
 #: FreqWindow.cpp:270 FreqWindow.cpp:393 effects/AutoDuck.cpp:487
 #: effects/AutoDuck.cpp:521 effects/AutoDuck.cpp:799
 #: effects/Compressor.cpp:348 effects/Compressor.cpp:356
@@ -935,7 +1123,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Desencalatge (segondas)\tFrequéncia (Hz)\tNivèl"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -951,15 +1139,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -970,40 +1174,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: HistoryWindow.cpp:53
@@ -1199,6 +1427,10 @@ msgstr "&Enregistrar lo proj
 msgid "Save Project &As..."
 msgstr "Enregistrar lo projècte &jos..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1207,6 +1439,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1235,10 +1471,26 @@ msgstr "Exportar los ma&rcadors..."
 msgid "Export &Multiple..."
 msgstr "Expòrt &Multiple..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1300,9 +1552,9 @@ msgstr "&Escafar\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Silenci\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1316,22 +1568,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1375,12 +1625,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1391,66 +1641,65 @@ msgstr "&Tot selectionar\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: Menus.cpp:518
-msgid "Start to Cursor"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
 msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Del cursor cap a la fin"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Cercar las crosadas amb lo zerò\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Bolegar le cursor..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: Menus.cpp:529
-msgid "to Selection Start"
+#: Menus.cpp:478
+msgid "to Selection Star&t"
 msgstr ""
 
-#: Menus.cpp:530
-msgid "to Selection End"
+#: Menus.cpp:479
+msgid "to Selection En&d"
 msgstr ""
 
-#: Menus.cpp:534
-msgid "to Track Start"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
 msgstr ""
 
-#: Menus.cpp:535
-msgid "to Track End"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
 msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Enregistrar la seleccion"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Restaurar la seleccion"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: Menus.cpp:567
@@ -1469,10 +1718,14 @@ msgstr ""
 msgid "Turn Grid Snap Off"
 msgstr ""
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Préférences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1510,60 +1763,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Istoric..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Enrèire a la començança\tComençança"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Anar a la fin\tFin"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1578,12 +1893,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr ""
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1598,6 +1909,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Suprimir la (las) pista(s)"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Alinhar amb lo &Zèro"
@@ -1614,29 +1933,40 @@ msgstr "Alinhar amb la comen
 msgid "Align with Selection &End"
 msgstr "Alinhar amb la &fin de la seleccion"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Alinhar la fin amb lo cursor"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Alinhar la fin amb la començança de la seleccion"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Alinhar la fin amb la fin de la seleccion"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Aligner les pistes entre elles"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Aligner les pistes...."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1649,22 +1979,26 @@ msgstr "Apondre una marca a la seleccion\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Apondre una marca al punt de lectura\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Congrear"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Efiè&ch"
@@ -1699,6 +2033,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1711,12 +2049,12 @@ msgstr "&Lan
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1751,9 +2089,9 @@ msgstr "Aisina seguenta\tD"
 msgid "Previous Tool\tA"
 msgstr "Aisina precedenta\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Lectura/Stòp\tBarra d'espaci"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:863
 msgid "Stop\tS"
@@ -1767,12 +2105,12 @@ msgstr "Pausa\tP"
 msgid "Record\tR"
 msgstr "Enregistrar\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1787,22 +2125,14 @@ msgstr "Legir fins a la seleccion\tB"
 msgid "Play Looped\tL"
 msgstr "Lectura en bocla\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Lectura en bocla\tMaj+Barra d'espaci"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Enrèire a la començança\tComençança"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Anar a la fin\tFin"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Seleccionar dempuèi la començança\tMaj.t+Començança"
@@ -1859,8 +2189,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1959,14 +2289,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "Projèctes recents..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2023,6 +2358,23 @@ msgstr "R
 msgid "There are no label tracks to export."
 msgstr ""
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Ren d'anullar"
@@ -2063,6 +2415,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Empegar dins del pòrtapapièr"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2230,9 +2586,9 @@ msgstr "Importar los m&arcadors"
 msgid "Select a MIDI file..."
 msgstr "Causir un fichièr MIDI MIDI..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Totes los fichièrs (*.*)|*.*|Fichièrs MIDI (*.mid)|*.mid|Fichièrs Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2251,14 +2607,6 @@ msgstr "Causir un fichi
 msgid "All files (*)|*"
 msgstr "Totes los fichièrs (*.*)|*.*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Importar"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2290,6 +2638,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Alinhat amb lo zèro"
@@ -2326,6 +2678,14 @@ msgstr "Alinhat"
 msgid "Align"
 msgstr "Alinhar"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Novèla·pista audiò creada"
@@ -2389,14 +2749,14 @@ msgstr "Suprimir
 msgid "Removed audio track(s)"
 msgstr "Pista(s) audiò suprimidas(s)"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2463,14 +2823,13 @@ msgstr "Audio gravat"
 msgid "Save changes before closing?"
 msgstr "Enregistrar las modificacions abans de sortir ?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2490,6 +2849,25 @@ msgstr "Causir un o mantun fichi
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2545,42 +2923,34 @@ msgstr ""
 msgid "Can't open project file"
 msgstr "Impossible de dubrir lo fichièr projècte"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Impossible de salvagardar lo projècte. %s es benlèu protegit en escritura, \n"
-"o lo disc es plen"
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2592,21 +2962,19 @@ msgstr "Error d'enregistrament del proj
 msgid "Saved %s"
 msgstr " %s enregistré"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "donadas brutas (Raw)"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr " '%s' importat"
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Importar"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Error d'importacion"
@@ -2619,17 +2987,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Los projèctes Audacity (.aup) vos permeton d'enregistrar vòstre travalh exactament tal t\n"
-"qu'apareis a l'ecran, mas sovent los autres programas los pòdon pas dubrir.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Se volètz enregistrar un fichièr que se dubrigue per d'autres programas, seleccionatz\n"
-"una de las comandas d'exportacion."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2672,6 +3046,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Disc plen"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2755,43 +3139,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2830,8 +3183,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Comentaris "
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2850,12 +3203,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2897,100 +3250,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr ""
-
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "La longor maximala dels atributs de  '%s' es de %d caractèrs. Las donadas seran troncadas."
-
-#: Tags.cpp:707 Tags.cpp:917
-msgid "Title"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artista"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3055,8 +3327,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3099,6 +3414,10 @@ msgstr ""
 msgid "Waveform (dB)"
 msgstr ""
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Nautor (EAC)"
@@ -3233,12 +3552,12 @@ msgstr ""
 msgid "Time-Shift"
 msgstr ""
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: TrackPanel.cpp:2713
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
@@ -3323,6 +3642,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3380,15 +3707,6 @@ msgstr "Cambiament de taus"
 msgid "Format Change"
 msgstr "Format :"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Intrar un taus d'escandalhatge en Hz (per segonda) entre 1 e 100 000 :"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Taus invalid."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Passar la velocitat minimala de (%) a :"
@@ -3522,8 +3840,8 @@ msgstr "Moduls de 1 a %i"
 msgid "Plugins %i to %i"
 msgstr "Moduls de %i a %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3545,8 +3863,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3567,14 +3885,19 @@ msgstr "Efi
 msgid "Amplify"
 msgstr "Amplificacion"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplificacion per Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Amplificacion (dB) :"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Novèla cresta (dB ):"
@@ -3583,6 +3906,10 @@ msgstr "Nov
 msgid "Allow clipping"
 msgstr "Autorisar la saturacion"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Amplificacion..."
@@ -3705,10 +4032,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Frequéncia (Hz) :"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Amplificacion (dB) :"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3748,23 +4083,60 @@ msgstr ""
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr ""
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Nautor : dempuèi"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
 
-#: effects/ChangePitch.cpp:290 effects/ChangePitch.cpp:336
-#: effects/ChangeSpeed.cpp:369 effects/ChangeTempo.cpp:240
-#: effects/ChangeTempo.cpp:271
-msgid "to"
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
 msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:299
 msgid "Semitones (half-steps):"
 msgstr "Mièches tons :"
 
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frequéncia (Hz) : dempuèi"
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
+
+#: effects/ChangePitch.cpp:290 effects/ChangePitch.cpp:336
+#: effects/ChangeSpeed.cpp:369 effects/ChangeTempo.cpp:240
+#: effects/ChangeTempo.cpp:271
+msgid "to"
+msgstr ""
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
@@ -3772,6 +4144,11 @@ msgstr "Frequ
 msgid "Percent Change:"
 msgstr "Percentatge de modificacion :"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Cambiament la nautor..."
@@ -3790,6 +4167,14 @@ msgstr "Efi
 msgid "Change Speed"
 msgstr "Cambiar la velocitat"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:356
+msgid "n/a"
+msgstr ""
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Cambiar la velocitat en modificar tempò e nautor"
@@ -3798,16 +4183,16 @@ msgstr "Cambiar la velocitat en modificar temp
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr ""
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:356
-msgid "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
 msgstr ""
 
-#: effects/ChangeSpeed.cpp:359
-msgid "Standard Vinyl RPM:   from"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
 msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
@@ -3826,13 +4211,29 @@ msgstr "Cambiar lo temp
 msgid "Change Tempo without Changing Pitch"
 msgstr "Cambiar lo tempò sens modificar la nautor"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Batements Per Minuta (BPM ) :   per"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Durada (segondas): dempuèi"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3842,8 +4243,8 @@ msgstr "Cambiar lo temp
 msgid "Changing Tempo"
 msgstr "Cambiament de tempò"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3854,10 +4255,18 @@ msgstr "Supression
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Supression dels clics..."
@@ -3870,49 +4279,83 @@ msgstr "Supression
 msgid "Dynamic Range Compressor"
 msgstr "Compresseur dynamique"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Compresseur dynamique par Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Ratio : "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Atac :"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizar a 0dB aprèp la compression."
 
-#: effects/Compressor.cpp:559
+#: effects/Compressor.cpp:563
+#, c-format
+msgid "Threshold %d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Threshold: %d dB"
+msgid "%3d dB"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Ratio : %.0f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:568
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Ratio : %.1f:1"
+msgid "%.0f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Atac : %.1i/s"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3923,6 +4366,247 @@ msgstr "Compressor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Aplicacion de compression dinamica..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Informacion"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3939,8 +4623,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Amplitud (0 a 1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4169,16 +4853,12 @@ msgstr "Inversar"
 msgid "Inverting"
 msgstr "Inversion"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4190,31 +4870,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4225,6 +4909,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Faser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Eliminacion del bruch"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4241,10 +5077,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4272,10 +5104,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Eliminacion del bruch"
-
 #: effects/NoiseRemoval.cpp:764
 msgid "Step 1"
 msgstr ""
@@ -4306,14 +5134,26 @@ msgstr "Prene lo perfil del bruch"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Eliminacion del bruch..."
@@ -4348,22 +5188,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalizar"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Suprimir· tot desencalatge DC (centrar verticalament a 0)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normalizar......"
@@ -4377,24 +5217,20 @@ msgstr "Normalizacion"
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Effet appliqué: %s %d phases, %.0f%% maxi, fréquence = %.1f Hz, phase de départ = %.0f deg, amplitude = %d, retour = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Faser"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Faser per Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:484
 msgid "Stages:"
 msgstr ""
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "Mini"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:512
-msgid "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
 msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
@@ -4402,19 +5238,35 @@ msgstr ""
 msgid "LFO Frequency (Hz):"
 msgstr "Frequéncia LFO (Hz) :"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "Fasa de començança LFO (deg.) :"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Pregondor :"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Enrèire (%) :"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Faser..."
@@ -4429,6 +5281,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4447,28 +5307,23 @@ msgstr ""
 msgid "Repeat"
 msgstr "Repetir"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repeticion per Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Nombre de repeticions :"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Longor de la seleccion novèla :"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutas, %d segondas"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d segondas"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4532,8 +5387,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4541,6 +5444,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Lineariá"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4569,22 +5480,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: effects/ToneGen.cpp:321
 msgid "Waveform:"
 msgstr ""
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4611,10 +5528,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4660,10 +5573,6 @@ msgstr "Efi
 msgid "Wahwah"
 msgstr ""
 
-#: effects/Wahwah.cpp:490
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr ""
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Pregondor (%) :"
@@ -4672,10 +5581,18 @@ msgstr "Pregondor (%) :"
 msgid "Resonance:"
 msgstr "Resonància:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:561
 msgid "Wah Frequency Offset (%):"
 msgstr ""
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr ""
@@ -4712,6 +5629,18 @@ msgstr "Reglatges de l'efi
 msgid "Length (seconds)"
 msgstr "Durada (segondas)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Aplicacion d'efièch \"Nyquist\"..."
@@ -4777,9 +5706,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4833,6 +5765,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4868,10 +5804,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Impossible d'exportar l'audiò vers %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Exportacion·de·la·seleccion· audio en utilizant un encodaire a linha de comanda"
@@ -4884,6 +5816,477 @@ msgstr "Exportacion del proj
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Debit :"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Lenga :"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:198
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4956,10 +6359,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4968,10 +6367,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Debit :"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4980,10 +6375,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: export/ExportMP2.cpp:114 export/ExportMP3.cpp:1632 export/ExportOGG.cpp:55
 msgid "Unable to open target file for writing"
 msgstr ""
@@ -5008,44 +6399,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5056,20 +6415,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5100,6 +6455,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Qualitat"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5125,34 +6484,14 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:129
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
 msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
@@ -5163,8 +6502,9 @@ msgstr "Sonque lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Sonque· libmp3lame.so|libmp3lame.so|Fichiers Primary Shared Object (*.so)|*.so|Librarias espandidas (*.so*)|*.so*|Tot fichièrs (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5183,10 +6523,6 @@ msgstr "La librari
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Editar·los Tags ID3 pel fichièr MP3"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5222,10 +6558,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5238,18 +6570,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Modul d'exportacion MP3 pas trapat"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5307,6 +6631,10 @@ msgstr "enclure l'audi
 msgid "First file name:"
 msgstr "Primièr nom de fichièr :"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:784
 msgid "Tracks"
 msgstr ""
@@ -5327,15 +6655,14 @@ msgstr "Numerotacion continua"
 msgid "File name prefix:"
 msgstr "Prefix de nom de fichièr :"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Espotir los fichièrs existissents"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5345,10 +6672,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Causir un luòc per salvagardar los fichièrs exportats"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5356,6 +6679,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5366,6 +6693,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5374,10 +6707,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5390,22 +6719,14 @@ msgstr "Exportacion
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Exportacion del projècte entièr en Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5422,8 +6743,20 @@ msgstr "(Las combinasons d'encap\n"
 "e d'encodatge son pas\n"
 "totas possiblas."
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5447,8 +6780,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Error (lo fichièr pòt èsser pas estat escrich) : %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: import/Import.cpp:177
@@ -5456,6 +6817,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr ""
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5486,9 +6855,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5501,19 +6871,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity reconeguèt pas aquel tipe de fichièr.\n"
-"S'es non compressat, ensajatz de l'importar en utilizant \"Importar Raw\""
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5554,16 +6976,17 @@ msgstr "Las pistas MIDI p
 msgid "Invalid track offset in LOF file."
 msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Error de tractamentde fichièr Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Error de tractament de fichièr Midi."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5590,15 +7013,23 @@ msgstr "Encap Vorbis bitstream invalid"
 msgid "Internal logic fault"
 msgstr "Error de logica intèrna"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importacion del fichièr %s ..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Importar de donadas brutas (Raw)"
@@ -5638,6 +7069,14 @@ msgstr "2 Canals (Estereofonic)"
 msgid "%d Channels"
 msgstr "%d Canals"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr ""
@@ -5650,8 +7089,17 @@ msgstr "Tr
 msgid "Sample rate:"
 msgstr "Frequéncia d'escandalhatge :"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5695,10 +7143,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Lectura de las autras pistas pendent l'enregistrament d'una novèla"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5708,8 +7155,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5736,12 +7187,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5769,21 +7222,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5822,7 +7263,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5847,23 +7288,65 @@ msgstr "Lo repert
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Los cambiaments de dorsièr temporari prendràn efièch sonque aprèp aveire demarat Audacity tornamai "
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Far una copia del fichièr abans que d'editar es mai segur."
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Version de la libraria MP3 :"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Lectura dirècta dempuèi lo fichièr original (mai rapid)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5893,53 +7376,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Version de la libraria MP3 :"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Interfàcia"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Cercar la librariá"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Interfàcia"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5954,6 +7432,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5962,25 +7444,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Lenga :"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Amplitud minimala de l'afichatge en dB"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5990,6 +7472,10 @@ msgstr "-36 dB (per edicion d'amplitud b
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (amplitud PCM en escandalhatge 8 bits)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (amplitud PCM en escandalhatge 16 bits)"
@@ -6002,10 +7488,34 @@ msgstr "-120 dB (limit aproximativa de l'audicion umana)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (amplitud PCM en escandalhatge 24 bits)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Clavièr"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6038,10 +7548,6 @@ msgstr "Error d'enregistrament de las acorchas clavi
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Causir un fichièr XML que conten d'acorchas clavièr..."
 
-#: prefs/KeyConfigPrefs.cpp:198
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr ""
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Error de cargament de las acorchas clavièr"
@@ -6057,6 +7563,43 @@ msgstr ""
 msgid "Undo"
 msgstr ""
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Lectura de las autras pistas pendent l'enregistrament d'una novèla"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Mirga"
@@ -6280,10 +7823,6 @@ msgstr ""
 msgid "Audacity Preferences"
 msgstr "Preferéncias d'Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Qualitat"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Rectangular"
@@ -6348,12 +7887,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6372,6 +7911,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - per defaut"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - benda mai estrecha"
@@ -6380,6 +7923,10 @@ msgstr "4096 - benda mai estrecha"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6396,6 +7943,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Frequéncia maximum (Hz) :"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:134
 msgid "The maximum frequency must be an integer"
 msgstr ""
@@ -6412,6 +7979,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6484,10 +8059,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pausa"
@@ -6496,9 +8067,9 @@ msgstr "Pausa"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Lectura (+Maj per lectura en bocla)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
@@ -6512,6 +8083,10 @@ msgstr "Enr
 msgid "Skip to End"
 msgstr "Anar a la fin"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6545,6 +8120,10 @@ msgid "Silence selection"
 msgstr "Fa venir la seleccion muda"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr ""
 
@@ -6600,24 +8179,20 @@ msgstr "Vistm
 msgid "Input level meter - click to monitor input"
 msgstr "Vistmètre d'intrada - clicar per visualizar"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Volum de sortida"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Volum d'intrada"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6636,6 +8211,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6893,6 +8473,22 @@ msgstr "Drecha"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6939,14 +8535,14 @@ msgstr "Afichatge orizontal"
 msgid "Vertical Stereo"
 msgstr ""
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Lineariá"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6966,6 +8562,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6974,10 +8586,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6990,6 +8598,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7103,11 +8726,10 @@ msgstr "Pas pus mostrar aquel avertiment."
 msgid "Could not open file: \"%s\""
 msgstr "Impossible de dubrir lo fichièr : \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Error : %s a la linha %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/pl.po b/locale/pl.po
index 0400b48..3d3937c 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,53 +1,45 @@
 # translation of pl.po to
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.#: ../src/ToolBar.cpp:419 ../src/prefs/KeyConfigPrefs.cpp:151.
-# Tomasz Bañdura <to.mek at wp.pl>, 2004,2002.
+# Tomasz Bańdura <to.mek at wp.pl>, 2004,2002.
 # Marek Mularczyk <marer13 at wp.pl>, 2005, 2007.
 # POLISH TRANSLATION FOR AUDACITY
 # Copyright (C) 2004,2002, 2005, 2007 Free Software Foundation, Inc.
 msgid ""
-msgstr ""
-"Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 20:01-0800\n"
-"PO-Revision-Date: 2008-01-02 09:54-0000\n"
-"Last-Translator: Marek <marer13 at wp.pl>\n"
+msgstr "Project-Id-Version: pl\n"
+"Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-11-09 20:10+0000\n"
+"PO-Revision-Date: 2008-11-14 21:38+0100\n"
+"Last-Translator: Richard Ash <richard at audacityteam.org>\n"
 "Language-Team:  <en at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: ../src/Menus.cpp:493
+#: AboutDialog.cpp:143
+#: AudacityApp.cpp:807
+#: Menus.cpp:955
 msgid "&About Audacity..."
 msgstr "&O Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Odblokowany"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
-msgstr "Zablokowany"
-
-#: AboutDialog.cpp:204
-msgid "Program build date: "
-msgstr "Data  budowy programu:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
-msgstr "Folder ustawieñ:"
+#: AboutDialog.cpp:157
+msgid "OK... Audacious!"
+msgstr "Åšwietnie... Audacity!"
 
-#: AboutDialog.cpp:214
-msgid "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."
-msgstr "Audacity jest programem darmowym pisanym przez grupê wolontariuszy na ca³ym ¶wiecie. Dziêkujemy SourceForge.net , serwisowi on-line za udostêpnienie darmowych narzêdzi open source. Audacity jest dostêpne dla systemów Windows 98 i nowszych, Mac OS X, Linuks oraz pozosta³ych Unixowych systemów operacyjnych. Starsze wersje Audacity s± dostêpne dla systemu Mac OS 9."
+#: AboutDialog.cpp:175
+#, fuzzy
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Audacity jest programem darmowym pisanym przez grupę wolontariuszy na całym świecie. Dziękujemy SourceForge.net , serwisowi on-line za udostępnienie darmowych narzędzi open source. Audacity jest dostępne dla systemów Windows 98 i nowszych, Mac OS X, Linuks oraz pozostałych Unixowych systemów operacyjnych. Starsze wersje Audacity są dostępne dla systemu Mac OS 9."
 
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "To jest wersja beta programu Audacity. Mo¿e zawieraæ b³êdy i niedokoñczone funkcje. Modyfikacje zale¿± równie¿ od sygna³ów u¿ytkowników. Proszê odwiedziæ nasz± stronê i przekazaæ nam informacjê o znalezionych b³êdach i spostrze¿eniach."
+#: AboutDialog.cpp:179
+#, fuzzy
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "To jest wersja beta programu Audacity. Może zawierać błędy i niedokończone funkcje. Modyfikacje zależą również od sygnałów użytkowników. Proszę odwiedzić naszą stronę i przekazać nam informację o znalezionych błędach i spostrzeżeniach."
 
-#: AboutDialog.cpp:221
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Jest to stabilna i pe³na wersja programu Audacity.Mimo to, je¿eli znajdziesz b³±d lub bêdziesz mieæ sugestie, proszê skontaktuj siê z nami. Rozwój i poprawa dzia³ania programu Audacity zale¿y od wspó³dzia³ania z u¿ytkownikami. Aby uzyskaæ wiêcej informacji, odwied¼ nasz± stronê internetow±."
+#: AboutDialog.cpp:182
+#, fuzzy
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "Jest to stabilna i pełna wersja programu Audacity.Mimo to, jeżeli znajdziesz błąd lub będziesz mieć sugestie, proszę skontaktuj się z nami. Rozwój i poprawa działania programu Audacity zależy od współdziałania z użytkownikami. Aby uzyskać więcej informacji, odwiedź naszą stronę internetową."
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -63,297 +55,391 @@ msgstr "Jest to stabilna i pe
 #.
 #. For example:  "English translation by Dominic Mazzoni."
 #.
-#: ../src/AboutDialog.cpp:127
-#: ../src/AboutDialog.cpp:129
+#: AboutDialog.cpp:192
+#: AboutDialog.cpp:194
 msgid "translator_credits"
-msgstr "Polskie t³umaczenie: Sebastian Pacholski,Tomasz Bañdura.Marek Mularczyk"
+msgstr "Polskie tłumaczenie: Sebastian Pacholski,Tomasz Bańdura.Marek Mularczyk"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
+#: AboutDialog.cpp:207
+#, fuzzy
+msgid "A Free Digital Audio Editor<br>"
 msgstr "Darmowy Cyfrowy Edytor Audio"
 
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Wprowadzenie"
-
-#: ../src/AboutDialog.cpp:154
+#: AboutDialog.cpp:211
 msgid "Credits"
-msgstr "Wspó³twórcy"
+msgstr "Współtwórcy"
 
-#: AboutDialog.cpp:256
+#: AboutDialog.cpp:215
 #, c-format
 msgid "Audacity %s Development Team"
-msgstr "Zespó³ wspó³tworz±cy %s Audacity"
+msgstr "Zespół współtworzący %s Audacity"
 
-#: AboutDialog.cpp:261
+#: AboutDialog.cpp:220
 #, c-format
 msgid "Audacity %s Support Team"
-msgstr "Zespó³ wspieraj±cy %s Audacity"
+msgstr "Zespół wspierający %s Audacity"
 
-#: AboutDialog.cpp:266
+#: AboutDialog.cpp:225
 msgid "Emeritus Developers"
 msgstr "Deweloperzy Emeritus"
 
-#: AboutDialog.cpp:271
+#: AboutDialog.cpp:230
 msgid "Other Emeritus Team Members"
-msgstr "Inni cz³onkowie zespo³u Emeritus"
+msgstr "Inni członkowie zespołu Emeritus"
 
-#: AboutDialog.cpp:276
+#: AboutDialog.cpp:235
 msgid "Other Contributors"
-msgstr "Inni wspó³twórcy"
+msgstr "Inni współtwórcy"
 
-#: AboutDialog.cpp:281
+#: AboutDialog.cpp:240
 msgid "Audacity is based on code from the following projects:"
-msgstr "Audacity jest oparte na kodzie z poni¿szych projektów:"
+msgstr "Audacity jest oparte na kodzie z poniższych projektów:"
 
-#: ../src/AboutDialog.cpp:237
+#: AboutDialog.cpp:245
 msgid "Special thanks:"
-msgstr "Specjalne podziêkowania dla:"
+msgstr "Specjalne podziękowania dla:"
 
-#: AboutDialog.cpp:320
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
 msgstr "Audacity"
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
+#, fuzzy
+msgid "Build Information"
+msgstr "Wprowadzenie"
+
+#: AboutDialog.cpp:310
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Odblokowany"
+
+#: AboutDialog.cpp:311
+msgid "Disabled"
+msgstr "Zablokowany"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
+#, fuzzy
+msgid "MP3 Importing"
+msgstr "Importowanie %s..."
+
 #: AboutDialog.cpp:340
-#: AboutDialog.cpp:371
-#: SplashDialog.cpp:111
-msgid "OK... Audacious!"
-msgstr "¦wietnie... Audacity!"
+#: AboutDialog.cpp:343
+#, fuzzy
+msgid "Ogg Vorbis Import and Export"
+msgstr "Ustawienia Eksportu Ogg Vorbis"
+
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
+#, fuzzy
+msgid "FLAC import and export"
+msgstr "Ustawienia eksportu FLAC"
+
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
+#, fuzzy
+msgid "MP2 export"
+msgstr "Ustawienia eksportu MP2"
+
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389
+#: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+#, fuzzy
+msgid "Sample rate conversion"
+msgstr "Konwerter próbkowania"
+
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:430
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:438
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:477
+msgid "Program build date: "
+msgstr "Data  budowy programu:"
+
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
+#, fuzzy
+msgid "Build type:"
+msgstr "Rodzaj okna:"
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
 
-#: AboutDialog.cpp:388
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:491
+msgid "Settings folder: "
+msgstr "Folder ustawień:"
+
+#: AboutDialog.cpp:506
 msgid "GPL License"
 msgstr "Licencja GPL"
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Zamknij"
-
-#: ../src/Project.cpp:1766
+#: AudacityApp.cpp:507
+#: Project.cpp:1844
 #, c-format
 msgid "%s is already open in another window."
-msgstr "Projekt %s jest ju¿ otwarty w innym oknie."
+msgstr "Projekt %s jest już otwarty w innym oknie."
 
-#: ../src/Project.cpp:1768
-#: ../src/Project.cpp:1837
-#: ../src/Project.cpp:1888
-#: ../src/Project.cpp:1899
-#: ../src/Project.cpp:1928
+#: AudacityApp.cpp:509
+#: Project.cpp:1846
+#: Project.cpp:1951
+#: Project.cpp:2095
+#: Project.cpp:2232
 msgid "Error opening project"
-msgstr "B³±d otwarcia projektu"
+msgstr "BÅ‚Ä…d otwarcia projektu"
 
-#: AudacityApp.cpp:310
+#: AudacityApp.cpp:541
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s nie istnieje i nie móg³ zostaæ otwarty.\n"
+msgstr "%s nie istnieje i nie mógł zostać otwarty.\n"
 "\n"
-"zosta³ usuniêty z listy historii."
+"został usunięty z listy historii."
 
-#: ../src/AudacityApp.cpp:288
+#: AudacityApp.cpp:643
 msgid "Master Gain Control"
-msgstr "G³ówna kontrola wzmocnienia"
+msgstr "Główna kontrola wzmocnienia"
 
-#: ../src/AudacityApp.cpp:289
+#: AudacityApp.cpp:644
 msgid "Input Meter"
-msgstr "Miernik wej¶ciowy"
+msgstr "Miernik wejściowy"
 
-#: ../src/AudacityApp.cpp:290
+#: AudacityApp.cpp:645
 msgid "Output Meter"
-msgstr "Miernik wyj¶ciowy"
+msgstr "Miernik wyjściowy"
 
 #. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:534
-#: Menus.cpp:575
+#: AudacityApp.cpp:809
 msgid "&Preferences...\tCtrl+,"
 msgstr "&Ustawienia...\tCtrl+,"
 
-#: ../src/AudacityApp.cpp:547
-#: ../src/AudacityApp.cpp:617
+#: AudacityApp.cpp:901
+#: AudacityApp.cpp:978
 #, c-format
 msgid "Using block size of %ld\n"
-msgstr "U¿ycie bloku o rozmiarze %ld\n"
+msgstr "Użycie bloku o rozmiarze %ld\n"
 
-#: ../src/AudacityApp.cpp:562
-#: ../src/AudacityApp.cpp:632
+#: AudacityApp.cpp:923
+#: AudacityApp.cpp:993
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Nieznana opcja linii komend: %s\n"
 
-#: ../src/AudacityApp.cpp:694
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+#: AudacityApp.cpp:1127
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity nie mo¿e znale¼æ miejsca na przechowywanie\n"
-"plików tymczasowych. Proszê podaæ odpowiedni katalog w oknie dialogowym Ustawienia."
+msgstr "Audacity nie może znaleźć miejsca na przechowywanie\n"
+"plików tymczasowych. Proszę podać odpowiedni katalog w oknie dialogowym Ustawienia."
 
-#: AudacityApp.cpp:845
+#: AudacityApp.cpp:1133
 #, fuzzy
 msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
-msgstr "Audacity zakoñczy swoj± pracê. Proszê uruchomiæ Audacity ponownie, aby u¿ywaæ nowego katalogu tymczasowego."
+msgstr "Audacity zakończy swoją pracę. Proszę uruchomić Audacity ponownie, aby używać nowego katalogu tymczasowego."
 
-#: AudacityApp.cpp:877
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+#: AudacityApp.cpp:1165
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Uruchamianie dwóch kopii Audacity równocze¶nie mo¿e powodowaæ \n"
-"utratê danych albo zawieszenie siê systemu.\n"
+msgstr "Uruchamianie dwóch kopii Audacity równocześnie może powodować \n"
+"utratÄ™ danych albo zawieszenie siÄ™ systemu.\n"
 "\n"
 
-#: AudacityApp.cpp:884
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+#: AudacityApp.cpp:1172
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity nie by³o w stanie zablokowaæ katalogu z plikami tymczasowymi.\n"
-"Ten katalog mo¿e byæ u¿ywany przez inn± kopiê Audacity.\n"
+msgstr "Audacity nie było w stanie zablokować katalogu z plikami tymczasowymi.\n"
+"Ten katalog może być używany przez inną kopię Audacity.\n"
 
-#: AudacityApp.cpp:886
+#: AudacityApp.cpp:1174
 msgid "Do you still want to start Audacity?"
-msgstr "Czy nadal chcesz uruchomiæ Audacity?"
+msgstr "Czy nadal chcesz uruchomić Audacity?"
 
-#: ../src/AudacityApp.cpp:750
+#: AudacityApp.cpp:1176
 msgid "Error locking temporary folder"
-msgstr "B³±d podczas blokowania tymczasowego katalogu "
+msgstr "BÅ‚Ä…d podczas blokowania tymczasowego katalogu "
 
-#: AudacityApp.cpp:900
+#: AudacityApp.cpp:1214
 msgid "The system has detected that another copy of Audacity is running.\n"
-msgstr "System wykry³, ¿e uruchomiona jest jeszcze jedna kopia Audacity.\n"
+msgstr "System wykrył, że uruchomiona jest jeszcze jedna kopia Audacity.\n"
 
-#: AudacityApp.cpp:902
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+#: AudacityApp.cpp:1216
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"U¿yj poleceñ Nowy lub Otwórz w aktualnie uruchomionym procesie Audacity,\n"
-"aby otworzyæ wiele projektów naraz.\n"
+msgstr "Użyj poleceń Nowy lub Otwórz w aktualnie uruchomionym procesie Audacity,\n"
+"aby otworzyć wiele projektów naraz.\n"
 
-#: ../src/AudacityApp.cpp:767
+#: AudacityApp.cpp:1217
 msgid "Audacity is already running"
-msgstr "Audacity jest ju¿ uruchomione"
+msgstr "Audacity jest już uruchomione"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1234
 msgid "Command-line options supported:"
-msgstr "Wspierane opcje linii poleceñ"
+msgstr "Wspierane opcje linii poleceń"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1137
+#: AudacityApp.cpp:1237
 msgid "\t-help (this message)"
-msgstr "\t-help (ta wiadomo¶æ)"
+msgstr "\t-help (ta wiadomość)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1139
+#: AudacityApp.cpp:1239
 msgid "\t-version (display Audacity version)"
-msgstr "\t-version (wy¶wietl wersjê Audacity)"
+msgstr "\t-version (wyświetl wersję Audacity)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1143
+#: AudacityApp.cpp:1243
 msgid "\t-test (run self diagnostics)"
-msgstr "\t-test (uruchom diagnostykê)"
+msgstr "\t-test (uruchom diagnostykÄ™)"
 
 #. i18n-hint '-blocksize' is the option and needs to stay in
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1148
+#: AudacityApp.cpp:1248
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
-msgstr "\t-blocksize nnn (ustaw maksymaln± wielko¶æ bloku dysku w bajtach)"
+msgstr "\t-blocksize nnn (ustaw maksymalną wielkość bloku dysku w bajtach)"
 
-#: AudacityApp.cpp:1149
+#: AudacityApp.cpp:1249
 msgid "In addition, specify the name of an audio file or Audacity project to open it."
-msgstr "Dodatkowo, ustal nazwê pliku d¿wiêkowego lub projektu Audacity, aby go otworzyæ."
+msgstr "Dodatkowo, ustal nazwę pliku dżwiękowego lub projektu Audacity, aby go otworzyć."
 
-#: ../src/AudacityApp.cpp:1020
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+#: AudacityApp.cpp:1529
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Pliki projektu Audacity (.AUP) nie s± \n"
+msgstr "Pliki projektu Audacity (.AUP) nie sÄ… \n"
 "obecnie przypisane do programu Audacity. \n"
 "\n"
-"Czy przypisaæ je aby móc otworzyæ program poprzez podwójne klikniêcie myszy?"
+"Czy przypisać je aby móc otworzyć program poprzez podwójne kliknięcie myszy?"
 
-#: ../src/AudacityApp.cpp:1021
+#: AudacityApp.cpp:1530
 msgid "Audacity Project Files"
 msgstr "Pliki projektu Audacity"
 
-#: AudioIO.cpp:214
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
-msgstr "Nie znaleziono ¿adnych urz±dzeñ d¼wiêkowych.\n"
+msgstr "Nie znaleziono żadnych urządzeń dźwiękowych.\n"
 
-#: ../src/AudioIO.cpp:167
-msgid ""
-"You will not be able to play or record audio.\n"
+#: AudioIO.cpp:255
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Nie bêdzie mo¿na odtwarzaæ/nagrywaæ d¼wieku.\n"
+msgstr "Nie będzie można odtwarzać/nagrywać dźwieku.\n"
 "\n"
 
-#: ../src/AudioIO.cpp:170
+#: AudioIO.cpp:258
 msgid "Error: "
-msgstr "B³±d."
+msgstr "BÅ‚Ä…d."
 
-#: ../src/AudioIO.cpp:173
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
-msgstr "B³±d podczas uruchamiania audio"
+msgstr "BÅ‚Ä…d podczas uruchamiania audio"
 
-#: AudioIO.cpp:1236
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr "Problem z czasem oczekiwania"
 
-#: AudioIO.cpp:1236
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+#: AudioIO.cpp:1375
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"Ustawienie czasu oczekiwania spowodowa³o, ¿e nagrywany d¼wiêk zosta³ ukryty.\n"
-"Audacity zwróci³o go z powrotem do pozycji startowej.\n"
-"Byæ mo¿e trzeba bêdzie u¿yæ Narzêdzia do Przemieszczania Czasu (<---> lub F5) aby przesun±æ d¼wiêk w odpowiednie miejsce."
+msgstr "Ustawienie czasu oczekiwania spowodowało, że nagrywany dźwięk został ukryty.\n"
+"Audacity zwróciło go z powrotem do pozycji startowej.\n"
+"Być może trzeba będzie użyć Narzędzia do Przemieszczania Czasu (<---> lub F5) aby przesunąć dźwięk w odpowiednie miejsce."
 
-#: AutoRecovery.cpp:40
+#: AutoRecovery.cpp:54
 msgid "Automatic Crash Recovery"
-msgstr "Automatyczne odzysk po zawieszeniu siê"
+msgstr "Automatyczne odzysk po zawieszeniu siÄ™"
 
-#: AutoRecovery.cpp:59
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+#: AutoRecovery.cpp:73
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Niektóre projekty nie zosta³y poprawnie zapisane podczas ostatniego u¿ywania Audacity.\n"
-"Na szczêscie nastêpuj±ce projekty mog± byæ automatycznie odzyskane:"
+msgstr "Niektóre projekty nie zostały poprawnie zapisane podczas ostatniego używania Audacity.\n"
+"Na szczęscie następujące projekty mogą być automatycznie odzyskane:"
 
-#: AutoRecovery.cpp:61
+#: AutoRecovery.cpp:75
 msgid "Recoverable projects"
 msgstr "Odzyskiwalne projekty"
 
-#: AutoRecovery.cpp:64
+#: AutoRecovery.cpp:78
+#: Tags.cpp:2041
 msgid "Name"
 msgstr "Nazwa"
 
-#: AutoRecovery.cpp:70
+#: AutoRecovery.cpp:84
 msgid "Recovering a project will not change any files on disk before you save it."
-msgstr "Odzyskiwanie projektu nie wp³ynie na ¿adne pliki na dysku zanim ich nie zapiszesz."
+msgstr "Odzyskiwanie projektu nie wpłynie na żadne pliki na dysku zanim ich nie zapiszesz."
 
-#: AutoRecovery.cpp:74
+#: AutoRecovery.cpp:88
 msgid "Quit Audacity"
-msgstr "Opu¶æ Audacity"
+msgstr "Opuść Audacity"
 
 #: AutoRecovery.cpp:89
 msgid "Do Not Recover"
@@ -363,389 +449,396 @@ msgstr "Nie odzyskuj"
 msgid "Recover Projects"
 msgstr "Odzyskaj Projekty"
 
-#: AutoRecovery.cpp:113
-msgid "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?"
-msgstr "Zrezygnowa³e¶ z odzyskiwania projektów. Nie bêdziesz móg³ ich odzyskaæ pó¼niej, je¶li zmienisz zdanie. Czy na pewno chcesz kontynuowaæ bez odzyskiwania?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
-msgstr "Naprawdê nie odzyskiwaæ projektów?"
+#, fuzzy
+msgid "Confirm?"
+msgstr "Potwierdź"
 
-#: AutoRecovery.cpp:132
-#: AutoRecovery.cpp:169
+#: AutoRecovery.cpp:146
+#: AutoRecovery.cpp:183
 msgid "Could not enumerate files in auto save directory"
-msgstr "Pliki w katalogu zapisywalnym nie zosta³y ponumerowane"
-
-#: ../src/ControlToolBar.cpp:723
-#: ../src/ControlToolBar.cpp:884
-#: ../src/effects/Effect.cpp:332
-#: ../src/prefs/DirectoriesPrefs.cpp:204
+msgstr "Pliki w katalogu zapisywalnym nie zostały ponumerowane"
+
+#: AutoRecovery.cpp:147
+#: AutoRecovery.cpp:184
+#: Menus.cpp:3053
+#: Menus.cpp:3065
+#: Menus.cpp:5182
+#: Project.cpp:2054
+#: Project.cpp:3615
+#: Project.cpp:3694
+#: TrackPanel.cpp:6385
+#: WaveTrack.cpp:598
+#: WaveTrack.cpp:617
+#: WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077
+#: WaveTrack.cpp:2087
+#: effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233
+#: prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:247
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
-msgstr "B³±d"
+msgstr "BÅ‚Ä…d"
 
-#: BatchCommandDialog.cpp:56
-#: BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr "Wybierz Polecenie"
 
-#: BatchCommandDialog.cpp:80
-#: BatchProcessDialog.cpp:451
-#: prefs/KeyConfigPrefs.cpp:140
+#: BatchCommandDialog.cpp:82
+#: BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
 msgstr "&Polecenie"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr "&Edytuj parametry"
 
-#: BatchCommandDialog.cpp:89
-#: BatchProcessDialog.cpp:452
+#: BatchCommandDialog.cpp:91
+#: BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr "&Parametry"
 
-#: BatchCommandDialog.cpp:93
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr "W&ybierz polecenie"
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
 msgstr "Nie znaleziono Efektu Stereo do Mono"
 
-#: ../src/export/Export.cpp:366
+#: BatchCommands.cpp:476
 msgid "Ogg Vorbis support is not included in this build of Audacity"
 msgstr "Ogg Vorbis nie jest zawarty w tej kompilacji Audacity"
 
-#: BatchCommands.cpp:509
+#: BatchCommands.cpp:488
 msgid "FLAC support is not included in this build of Audacity"
 msgstr "W tej wersji Audacity brak wsparcia dla FLAC"
 
-#: BatchCommands.cpp:513
+#: BatchCommands.cpp:492
 #, c-format
 msgid "Command %s not implemented yet"
 msgstr "Brak implementacji komendy %s"
 
-#: BatchCommands.cpp:529
+#: BatchCommands.cpp:508
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Nie mo¿na ustawiæ parametrów efektu %s\n"
+msgstr "Nie można ustawić parametrów efektu %s\n"
 "do %s."
 
-#: BatchCommands.cpp:583
+#: BatchCommands.cpp:561
 #, c-format
 msgid "Your batch command of %s was not recognised."
-msgstr "Twoja komenda wsadowa %s nie zosta³a rozpoznana."
+msgstr "Twoja komenda wsadowa %s nie została rozpoznana."
 
-#: BatchCommands.cpp:674
+#: BatchCommands.cpp:652
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Zastosuj %s z parametrem\n"
+msgstr "Zastosuj %s z parametrem\n"
 "\n"
 "%s"
 
-#: BatchCommands.cpp:675
-#: BatchCommands.cpp:680
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
 msgid "Test Mode"
 msgstr "Tryb testowy"
 
-#: BatchCommands.cpp:679
+#: BatchCommands.cpp:657
 #, c-format
 msgid "Apply %s"
 msgstr "Zastosuj %s"
 
-#: BatchProcessDialog.cpp:58
-#: BatchProcessDialog.cpp:68
-#: BatchProcessDialog.cpp:69
+#: BatchProcessDialog.cpp:60
+#: BatchProcessDialog.cpp:70
+#: BatchProcessDialog.cpp:71
 msgid "Apply Chain"
 msgstr "Zastosuj Tor"
 
-#: BatchProcessDialog.cpp:92
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
+#: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Wybierz tor"
 
-#: BatchProcessDialog.cpp:97
+#: BatchProcessDialog.cpp:99
 msgid "Chain"
 msgstr "Tor"
 
-#: BatchProcessDialog.cpp:104
+#: BatchProcessDialog.cpp:106
 msgid "Apply to Current &Project"
 msgstr "Zastosuj do aktualnego &Projektu"
 
-#: BatchProcessDialog.cpp:105
+#: BatchProcessDialog.cpp:107
 msgid "Apply to &Files..."
-msgstr "Zastosuj do &Plików..."
-
-#: BatchProcessDialog.cpp:106
-#: BatchProcessDialog.cpp:245
-#: LabelDialog.cpp:134
-#: LabelDialog.cpp:138
-#: UploadDialog.cpp:178
-#: effects/Amplify.cpp:209
-#: effects/AutoDuck.cpp:528
-#: effects/AutoDuck.cpp:532
+msgstr "Zastosuj do &Plików..."
+
+#: BatchProcessDialog.cpp:108
+#: BatchProcessDialog.cpp:247
+#: Tags.cpp:2080
+#: Tags.cpp:2084
+#: Tags.cpp:2384
+#: Tags.cpp:2388
+#: UploadDialog.cpp:180
 #: effects/AvcCompressor.cpp:732
-#: effects/ChangeLength.cpp:184
-#: effects/ChangePitch.cpp:395
-#: effects/ChangeSpeed.cpp:393
-#: effects/ChangeTempo.cpp:297
-#: effects/ClickRemoval.cpp:429
-#: effects/Compressor.cpp:516
-#: effects/Effect.cpp:387
-#: effects/Effect.cpp:393
-#: effects/Equalization.cpp:1166
-#: effects/Leveller.cpp:266
-#: effects/Normalize.cpp:353
-#: effects/Phaser.cpp:600
-#: effects/Repeat.cpp:271
+#: effects/ChangeLength.cpp:183
 #: effects/SpikeCleaner.cpp:188
-#: effects/TruncSilence.cpp:278
-#: effects/VST/VSTEffect.cpp:95
-#: effects/VST/VSTEffect.cpp:452
-#: effects/Wahwah.cpp:587
-#: effects/audiounits/AudioUnitEffect.cpp:862
-#: effects/ladspa/LadspaEffect.cpp:589
-#: effects/nyquist/Nyquist.cpp:823
-#: effects/nyquist/Nyquist.cpp:987
-#: export/Export.cpp:788
-#: export/ExportMultiple.cpp:844
-#: import/ImportRaw.cpp:443
-#: prefs/FileFormatPrefs.cpp:407
-#: prefs/PrefsDialog.cpp:169
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
 msgstr "&Cofnij"
 
-#: BatchProcessDialog.cpp:144
-#: BatchProcessDialog.cpp:189
+#: BatchProcessDialog.cpp:146
+#: BatchProcessDialog.cpp:191
 msgid "No chain selected"
 msgstr "Nie zaznaczono toru"
 
-#: BatchProcessDialog.cpp:157
+#: BatchProcessDialog.cpp:159
 #, c-format
 msgid "Applying '%s' to current project"
 msgstr "Stosowanie %s do danego projektu"
 
-#: BatchProcessDialog.cpp:198
+#: BatchProcessDialog.cpp:200
 msgid "Please save and close the current project first."
-msgstr "Proszê najpierw zapisaæ i zamkn±æ aktualny projekt."
+msgstr "Proszę najpierw zapisać i zamknąć aktualny projekt."
+
+#: BatchProcessDialog.cpp:206
+#, fuzzy
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "Zaznacz plik(i) do przetwarzania wsadowego..."
 
-#: BatchProcessDialog.cpp:205
+#: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Zaznacz plik(i) do przetwarzania wsadowego..."
 
-#: BatchProcessDialog.cpp:208
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
+#: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Wszystkie pliki (*.*)|*.*|pliki WAV (*.wav)|*.wav|Pliki AIFF (*.aif)|*.aif|Pliki AU (*.au)|*.au|Pliki MP3 (*.mp3)|*.mp3|Pliki Ogg Vorbis (*.ogg)|*.ogg|Pliki FLAC (*.flac)|*.flac"
 
-#: BatchProcessDialog.cpp:229
+#: BatchProcessDialog.cpp:231
 msgid "Applying..."
 msgstr "Przetwarzanie..."
 
-#: BatchProcessDialog.cpp:239
+#: BatchProcessDialog.cpp:241
 msgid "File"
 msgstr "Plik"
 
-#: BatchProcessDialog.cpp:354
-#: BatchProcessDialog.cpp:358
-#: BatchProcessDialog.cpp:359
+#: BatchProcessDialog.cpp:356
+#: BatchProcessDialog.cpp:360
+#: BatchProcessDialog.cpp:361
 msgid "Edit Chains"
 msgstr "Edytuj Tory"
 
-#: BatchProcessDialog.cpp:414
+#: BatchProcessDialog.cpp:416
 msgid "&Chains"
 msgstr "&Tory"
 
-#: BatchProcessDialog.cpp:433
+#: BatchProcessDialog.cpp:435
+#: Tags.cpp:826
+#: Tags.cpp:1465
+#: Tags.cpp:2064
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: BatchProcessDialog.cpp:434
-#: LabelDialog.cpp:126
-#: TrackPanel.cpp:3925
+#: BatchProcessDialog.cpp:436
+#: LabelDialog.cpp:128
+#: Tags.cpp:827
+#: Tags.cpp:1466
+#: Tags.cpp:2065
+#: TrackPanel.cpp:4176
 msgid "&Remove"
-msgstr "&Usuñ"
+msgstr "&Usuń"
 
-#: BatchProcessDialog.cpp:435
+#: BatchProcessDialog.cpp:437
 msgid "Re&name"
-msgstr "Zmieñ&Nazwê"
+msgstr "Zmień&Nazwę"
 
-#: BatchProcessDialog.cpp:441
+#: BatchProcessDialog.cpp:443
 msgid "C&hain (Double-Click or press SPACE to edit)"
-msgstr "T&or (Kliknij dwukrotnie lub naci¶nij spacjê, aby edytowaæ)"
+msgstr "T&or (Kliknij dwukrotnie lub naciśnij spację, aby edytować)"
 
-#: BatchProcessDialog.cpp:450
+#. i18n-hint: This is the number of the command in the list
+#: BatchProcessDialog.cpp:453
 msgid "No"
 msgstr "Nie"
 
-#: BatchProcessDialog.cpp:456
+#: BatchProcessDialog.cpp:459
 msgid "&Insert"
 msgstr "&Wstaw"
 
-#: BatchProcessDialog.cpp:457
+#: BatchProcessDialog.cpp:460
 msgid "De&lete"
-msgstr "Us&uñ"
+msgstr "Us&uń"
 
-#: BatchProcessDialog.cpp:458
+#: BatchProcessDialog.cpp:461
 msgid "Move &Up"
-msgstr "Przesuñ &w górê"
+msgstr "Przesuń &w górę"
 
-#: BatchProcessDialog.cpp:459
+#: BatchProcessDialog.cpp:462
 msgid "Move &Down"
-msgstr "Przesuñ &w dó³"
+msgstr "Przesuń &w dół"
 
-#: BatchProcessDialog.cpp:460
+#: BatchProcessDialog.cpp:463
 msgid "De&faults"
-msgstr "Ustawienia & domy¶lne"
+msgstr "Ustawienia & domyślne"
 
-#: BatchProcessDialog.cpp:504
+#: BatchProcessDialog.cpp:507
 msgid "- END -"
 msgstr "- Koniec -"
 
-#: BatchProcessDialog.cpp:531
+#: BatchProcessDialog.cpp:540
 #, c-format
 msgid "%s changed"
 msgstr "%s zmienione"
 
-#: BatchProcessDialog.cpp:532
+#: BatchProcessDialog.cpp:541
 msgid "Do you want to save the changes?"
-msgstr "Czy chcesz zachowaæ zmiany?"
+msgstr "Czy chcesz zachować zmiany?"
 
-#: BatchProcessDialog.cpp:614
+#: BatchProcessDialog.cpp:623
 msgid "Enter name of new chain"
-msgstr "Wprowad¼ nazwê nowego Toru"
+msgstr "Wprowadź nazwę nowego Toru"
 
-#: BatchProcessDialog.cpp:625
+#: BatchProcessDialog.cpp:634
 msgid "Name must not be blank"
-msgstr "Nazwa nie mo¿e byæ pusta"
+msgstr "Nazwa nie może być pusta"
 
-#: BatchProcessDialog.cpp:634
+#: BatchProcessDialog.cpp:643
 #, c-format
 msgid "Names may not contain '%c' and '%c'"
-msgstr "Nazwy nie mog± zawieraæ %c ani %c"
+msgstr "Nazwy nie mogą zawierać %c ani %c"
 
-#: BatchProcessDialog.cpp:664
+#: BatchProcessDialog.cpp:673
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Czy napewno chcesz usun±æ %s?"
+msgstr "Czy napewno chcesz usunąć %s?"
 
 #: Dependencies.cpp:139
 msgid "Removing Dependencies"
-msgstr "Usuwanie zale¿no¶ci"
+msgstr "Usuwanie zależności"
 
 #: Dependencies.cpp:140
 msgid "Copying audio data into project..."
-msgstr "Kopiowanie danych d¼wiêkowych do projektu..."
+msgstr "Kopiowanie danych dźwiękowych do projektu..."
 
-#: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+#: Dependencies.cpp:223
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Twój projekt zale¿y od obecno¶ci innych plików. \n"
-"Kopiowaæ d¼wiêk z tych plików do projektu, aby zawiera³y siê w projekcie?\n"
-"Wymagana jest do tego wiêksza przestrzeñ dyskowa, lecz jest to bezpieczniejsze."
+msgstr "Twój projekt zależy od obecności innych plików. \n"
+"Kopiować dźwięk z tych plików do projektu, aby zawierały się w projekcie?\n"
+"Wymagana jest do tego większa przestrzeń dyskowa, lecz jest to bezpieczniejsze."
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
-msgstr "Projekt zale¿y od innych plików d¼wiêkowych"
+msgstr "Projekt zależy od innych plików dźwiękowych"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
-msgstr "Zale¿no¶ci peojektowe"
+msgstr "Zależności peojektowe"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
-msgstr "Plik d¼wiêkowy"
+msgstr "Plik dźwiękowy"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
-msgstr "Przestrzeñ dyskowa"
+msgstr "Przestrzeń dyskowa"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
-msgstr "Skopiuj zaznaczone d¼wiêki do projektu"
+msgstr "Skopiuj zaznaczone dźwięki do projektu"
 
-#: Dependencies.cpp:304
-#: Dependencies.cpp:413
+#: Dependencies.cpp:308
+#: Dependencies.cpp:414
 msgid "Cancel Save"
 msgstr "Cofnij Zapisz"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
-msgstr "Nie kopiuj d¼wiêku"
+msgstr "Nie kopiuj dźwięku"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
-msgstr "Skopiuj ca³y d¼wiêk do projektu (Bezpieczniejsze)"
+msgstr "Skopiuj cały dźwięk do projektu (Bezpieczniejsze)"
 
-#: Dependencies.cpp:320
-#: Dependencies.cpp:325
+#: Dependencies.cpp:321
+#: Dependencies.cpp:326
 msgid "Ask me"
 msgstr "Zapytaj mnie"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
-msgstr "Zawsze kopiuj ca³y d¼wiêk (Najbezpieczniejsze)"
+msgstr "Zawsze kopiuj cały dźwięk (Najbezpieczniejsze)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
-msgstr "Nigdy nie kopiuj ¿adnego d¼wiêku"
+msgstr "Nigdy nie kopiuj żadnego dźwięku"
 
-#: Dependencies.cpp:324
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
-msgstr "Gdy projekt jest zale¿ny od innych plików:"
+msgstr "Gdy projekt jest zależny od innych plików:"
 
-#: Dependencies.cpp:412
+#: Dependencies.cpp:413
 msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
-msgstr "Je¶li bêdziesz kontynuowa³, twój projekt nie zostanie zapisany na dysku. Czy tego chcesz?"
+msgstr "Jeśli będziesz kontynuował, twój projekt nie zostanie zapisany na dysku. Czy tego chcesz?"
 
-#: Dependencies.cpp:452
+#: Dependencies.cpp:453
 msgid "Your project is self-contained; it does not depend on any external audio files."
-msgstr "Twój projekt jest niezale¿ny od ¿adnych zawnêtrznych plików d¼wiêkowych."
+msgstr "Twój projekt jest niezależny od żadnych zawnętrznych plików dźwiękowych."
 
-#: Dependencies.cpp:453
+#: Dependencies.cpp:454
 msgid "Dependency check"
-msgstr "Sprawdzanie zale¿no¶ci"
+msgstr "Sprawdzanie zależności"
 
-#: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+#: DirManager.cpp:137
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Ostrze¿enie: Pozosta³o bardzo ma³o miejsca w tym katalogu.\n"
-"Proszê wybraæ jeszcze jeden tymczasowy katalog w ustawieniach programu."
+msgstr "Ostrzeżenie: Pozostało bardzo mało miejsca w tym katalogu.\n"
+"Proszę wybrać jeszcze jeden tymczasowy katalog w ustawieniach programu."
 
-#: ../src/DirManager.cpp:157
+#: DirManager.cpp:223
+#: DirManager.cpp:254
+#: DirManager.cpp:337
 msgid "Progress"
-msgstr "Postêp"
+msgstr "Postęp"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
-msgstr "Usuwanie plików tymczasowych"
+msgstr "Usuwanie plików tymczasowych"
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "Zapisywanie danych projektu"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
-msgstr "Usuwanie plików z katalogów cache"
+msgstr "Usuwanie plików z katalogów cache"
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity znalaz³o odosobniony blok plików%s! \n"
-"Rozwa¿ zapisanie i prze³adowanie projektu, aby dokonaæ kompletnego sprawdzenia projektu.\n"
+msgstr "Audacity znalazło odosobniony blok plików%s! \n"
+"Rozważ zapisanie i przeładowanie projektu, aby dokonać kompletnego sprawdzenia projektu.\n"
 
 #  i18n-hint: This is the pattern for filenames that are created
 #  when a file needs to be backed up to a different name.  For
@@ -756,222 +849,323 @@ msgstr ""
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: ../src/DirManager.cpp:627
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-stary%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
-msgstr "Nie mo¿na otworzyæ/utworzyæ pliku testowego"
+msgstr "Nie można otworzyć/utworzyć pliku testowego"
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
-msgstr "Nie mo¿na usun±æ %s'"
+msgstr "Nie można usunąć %s'"
 
-#: ../src/DirManager.cpp:643
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
-msgstr "Zmieniono nazwê plku: %s\n"
+msgstr "Zmieniono nazwÄ™ plku: %s\n"
 
-#: ../src/DirManager.cpp:660
+#: DirManager.cpp:1160
 #, c-format
-msgid "Changing block %s\n"
-msgstr "Zmiana bloku %s\n"
+msgid "Unable to rename '%s' to '%s'"
+msgstr "Nie można zmienić nazwy %s na %s'"
 
-#: DirManager.cpp:1051
+#: DirManager.cpp:1183
 #, c-format
-msgid "Unable to rename '%s' to '%s'"
-msgstr "Nie mo¿na zmieniæ nazwy %s na %s'"
+msgid "Changed block %s to new alias name\n"
+msgstr ""
 
-#: DirManager.cpp:1115
-#: DirManager.cpp:1403
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
 msgid "Inspecting project file data..."
-msgstr "Sprawdzanie plików projektu..."
+msgstr "Sprawdzanie plików projektu..."
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr "Odosobniony plik blokowy: (%s)"
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
-msgstr "Brakuj±cy plik aliasowy: (%s)"
+msgstr "BrakujÄ…cy plik aliasowy: (%s)"
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
-msgstr "Brakuj±cy plik podsumowuj±cy: (%s.auf)"
+msgstr "BrakujÄ…cy plik podsumowujÄ…cy: (%s.auf)"
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
-msgstr "Brakuj±cy plik danych: (%s.au)"
+msgstr "BrakujÄ…cy plik danych: (%s.au)"
 
-#: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+#: DirManager.cpp:1319
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"Test projektu znalaz³ niespójno¶ci w danych projektu;\n"
-"kliknij na 'Szczegó³y', aby uzyskaæ pe³n± listê b³êdów, lub kliknij'OK', aby kontynuowaæ i uzyskaæ wiêcej opcji."
+msgstr "Test projektu znalazł niespójności w danych projektu;\n"
+"kliknij na 'Szczegóły', aby uzyskać pełną listę błędów, lub kliknij'OK', aby kontynuować i uzyskać więcej opcji."
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1331
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Test projektu znalaz³ %d odosbniony plik[i]. Pliki te\n"
-"s± nieu¿ywane i s± prawdopodobnie pozosta³o¶ciami po zawieszeniu siê lub innym b³êdzie.\n"
-"Powinny zostaæ usuniête, aby unikn±æ ryzyka konfliktu."
+msgstr "Test projektu znalazł %d odosbniony plik[i]. Pliki te\n"
+"są nieużywane i są prawdopodobnie pozostałościami po zawieszeniu się lub innym błędzie.\n"
+"Powinny zostać usunięte, aby uniknąć ryzyka konfliktu."
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
-msgstr "Usuñ odosobnione pliki [bezpieczne i zalecane]"
+msgstr "Usuń odosobnione pliki [bezpieczne i zalecane]"
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "Kontynuuj bez usuwania,  pracuj z dodatkowymi plikami"
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr "Natychmiast zamknij projekt bez bez zmian"
 
-#: ../src/widgets/Warning.cpp:45
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
+#: widgets/Warning.cpp:55
 msgid "Warning"
-msgstr "Ostrze¿enie"
+msgstr "Ostrzeżenie"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1366
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Test projektu wykry³ %d, ¿e brakuje plików wsadowych u¿ywanych\n"
-"('pliki aliasowe') w projekcie. Audacity nie potrafi odzyskaæ ich\n"
-"automatycznie, mo¿esz wstawiæ ciszê w miejsce brakuj±cych\n"
-"plików lub zamkn±æ projekt i próbowaæ odzyskaæ brakuj±ce pliki rêcznie."
+msgstr "Test projektu wykrył %d, że brakuje plików wsadowych używanych\n"
+"('pliki aliasowe') w projekcie. Audacity nie potrafi odzyskać ich\n"
+"automatycznie, możesz wstawić ciszę w miejsce brakujących\n"
+"plików lub zamknąć projekt i próbować odzyskać brakujące pliki ręcznie."
 
-#: DirManager.cpp:1259
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
-msgstr "Uzupe³nij brakuj±ce dane cisz± [nie do cofniêcia po zapisaniu]"
+msgstr "Uzupełnij brakujące dane ciszą [nie do cofnięcia po zapisaniu]"
 
-#: DirManager.cpp:1260
-#: DirManager.cpp:1348
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
-msgstr "Tymczasowo uzupe³nij brakuj±ce dane cisz± [tylko w tej sesji]"
+msgstr "Tymczasowo uzupełnij brakujące dane ciszą [tylko w tej sesji]"
 
-#: DirManager.cpp:1261
-#: DirManager.cpp:1307
-#: DirManager.cpp:1349
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr "Natychmiast zamknij projekt bez dalszych zmian"
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1412
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Test projektu wykry³ %d brakuj±ce pliki (.auf).\n"
-"Audacity mo¿e je w pe³ni odzyskaæ z oryginalnych\n"
+msgstr "Test projektu wykrył %d brakujące pliki (.auf).\n"
+"Audacity może je w pełni odzyskać z oryginalnych\n"
 "danych z projektu."
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr "Odzyskaj pliki [bezpieczne i zalecane]"
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
-msgstr "Wype³nij cisz± brakuj±ce dane [tylko w tej sesji]"
+msgstr "Wypełnij ciszą brakujące dane [tylko w tej sesji]"
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1454
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Test projektu wykry³ %d brakuj±ce bloki d¼wiêku (.au), \n"
-"prawdopodobnie z powodu b³êdu, zawieszenia siê systemu lub przypadkowego usuniêcia.\n"
-"Audacity nie jest w stanie odzyskaæ tych danych automatycznie,\n"
-"mo¿esz wstawiæ ciszê w miejsce brakuj±cych danych na zawsze lub\n"
-"tylko chwilowo, lub zamkn±æ projekt i spróbowaæ odzyskaæ dane rêcznie."
+msgstr "Test projektu wykrył %d brakujące bloki dźwięku (.au), \n"
+"prawdopodobnie z powodu błędu, zawieszenia się systemu lub przypadkowego usunięcia.\n"
+"Audacity nie jest w stanie odzyskać tych danych automatycznie,\n"
+"możesz wstawić ciszę w miejsce brakujących danych na zawsze lub\n"
+"tylko chwilowo, lub zamknąć projekt i spróbować odzyskać dane ręcznie."
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
-msgstr "Zast±p brakuj±ce dane cisz± [na zawsze]"
+msgstr "ZastÄ…p brakujÄ…ce dane ciszÄ… [na zawsze]"
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
-msgstr "Czyszczenie nieu¿ywanych katalogów w danych projektu..."
+msgstr "Czyszczenie nieużywanych katalogów w danych projektu..."
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1558
 msgid "Caching audio"
-msgstr "Przechowywanie d¼wiêku w pamiêci cache"
+msgstr "Przechowywanie dźwięku w pamięci cache"
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
-msgstr "Przechowywanie d¼wiêku w pamiêci..."
+msgstr "Przechowywanie dźwięku w pamięci..."
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
-msgstr "Zapisywanie nagranego d¼wiêku"
+msgstr "Zapisywanie nagranego dźwięku"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
-msgstr "Zapisywanie nagranego d¼wiêku na dysk..."
+msgstr "Zapisywanie nagranego dźwięku na dysk..."
 
-#: ../src/FFT.cpp:364
+#: FFT.cpp:389
 msgid "Rectangular"
-msgstr "Prostok±t"
+msgstr "ProstokÄ…t"
+
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+#, fuzzy
+msgid "Locate FFmpeg"
+msgstr "Zlokalizuj Lame"
 
-#: ../src/FreqWindow.cpp:68
+#: FFmpeg.cpp:190
+#, fuzzy, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Audacity potrzebuje pliku %s do stworzenia pliku MP3."
+
+#: FFmpeg.cpp:196
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Lokalizacja %s:"
+
+#: FFmpeg.cpp:205
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Aby znaleźć %s, kliknij tutaj -->"
+
+#: FFmpeg.cpp:211
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Wybierz..."
+
+#: FFmpeg.cpp:212
+#, fuzzy
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Aby otrzymać darmową kopię Lame, kliknij tutaj -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#  i18n-hint: It's asking for the location of a file, for
+#  example, "Where is lame_enc.dll?" - you could translate
+#  "Where would I find the file %s" instead if you want.
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Gdzie jest %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+#, fuzzy
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Tylko lame_enc.dll|lame_enc.dll|Biblioteki dynamiczne (*.dll)|*.dll|All Files (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "Analiza widma"
 
-#: ../src/FreqWindow.cpp:129
-#: ../src/TrackPanel.cpp:837
+#: FreqWindow.cpp:139
+#: TrackPanel.cpp:556
+#: prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: ../src/FreqWindow.cpp:130
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "Standardowa autokorelacja"
 
-#: ../src/FreqWindow.cpp:131
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "Autokorelacja Cuberoot"
 
-#: ../src/FreqWindow.cpp:132
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "Ulepszona autokorelacja"
 
 #. i18n-hint: This is a technical term, derived from the word
 #. "spectrum".  Do not translate it unless you are sure you
 #. know the correct technical word in your language.
-#: ../src/FreqWindow.cpp:136
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150
+#: FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algorytm:"
 
-#: ../src/HistoryWindow.cpp:63
+#: FreqWindow.cpp:169
+#: FreqWindow.cpp:173
+#: HistoryWindow.cpp:79
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -981,1956 +1175,2234 @@ msgstr "Rozmiar"
 #  Frequency analyze dialog box.
 #. i18n-hint: This refers to a "window function", used in the
 #. Frequency analyze dialog box.
-#: ../src/FreqWindow.cpp:167
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr " (okno)"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187
+#: FreqWindow.cpp:191
+#, fuzzy
+msgid "Function"
 msgstr "Funkcja:"
 
-#: ../src/FreqWindow.cpp:177
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "Skala liniowa"
 
-#: ../src/FreqWindow.cpp:178
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "Skala logarytmiczna"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
-msgstr "O¶:"
+#: FreqWindow.cpp:201
+#: FreqWindow.cpp:205
+#, fuzzy
+msgid "Axis"
+msgstr "OÅ›:"
 
-#: FreqWindow.cpp:204
-#: LabelDialog.cpp:128
+#: FreqWindow.cpp:212
+#: LabelDialog.cpp:130
+#: Menus.cpp:241
+#: Menus.cpp:276
 msgid "&Export..."
 msgstr "&Eksportuj..."
 
-#: ../src/widgets/Meter.cpp:293
+#: FreqWindow.cpp:213
+#: export/ExportCL.cpp:325
+#: export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "Eksportuj"
+
+#: FreqWindow.cpp:216
+#: FreqWindow.cpp:217
+#: widgets/ErrorDialog.cpp:161
+msgid "Close"
+msgstr "Zamknij"
+
+#: FreqWindow.cpp:280
+#: FreqWindow.cpp:410
+#: effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523
+#: effects/AutoDuck.cpp:792
+#: effects/Compressor.cpp:352
+#: effects/Compressor.cpp:360
+#: effects/Equalization.cpp:1123
+#: effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133
+#: effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408
+#: effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367
+#: widgets/Meter.cpp:417
 msgid "dB"
 msgstr "dB"
 
 #. i18n-hint: This is the abbreviation for "Hertz", or
 #. cycles per second.
-#: ../src/import/ImportRaw.cpp:378
+#: FreqWindow.cpp:295
+#: FreqWindow.cpp:450
+#: effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195
+#: import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/FreqWindow.cpp:463
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
-msgstr "Za ma³o zaznaczonych danych."
+msgstr "Za mało zaznaczonych danych."
 
-#: FreqWindow.cpp:441
-#: effects/AutoDuck.cpp:801
+#: FreqWindow.cpp:458
+#: effects/AutoDuck.cpp:794
 msgid "s"
 msgstr "s"
 
-#: FreqWindow.cpp:769
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr "Kursor: %d Hz (%s) = %d dB    Szczyt: %d Hz (%s) = %.1f dB"
 
-#: FreqWindow.cpp:778
+#: FreqWindow.cpp:796
 #, c-format
 msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
 msgstr "Kursor: %.4f sek (%d Hz) (%s) = %f,    Szczyt: %.4f sek (%d Hz) (%s) = %.3f"
 
-#: ../src/FreqWindow.cpp:996
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "spectrum.txt"
 
-#: ../src/FreqWindow.cpp:998
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "Eksportuj dane widma jako:"
 
-#: ../src/FreqWindow.cpp:1014
-#: ../src/Menus.cpp:1357
-#: ../src/Project.cpp:2120
-#: ../src/prefs/KeyConfigPrefs.cpp:173
+#: FreqWindow.cpp:1087
+#: LabelDialog.cpp:603
+#: Menus.cpp:2555
+#: Project.cpp:2604
+#: Project.cpp:3667
+#: prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
-msgstr "Nie mo¿na zapisaæ do pliku: "
+msgstr "Nie można zapisać do pliku: "
 
-#: ../src/FreqWindow.cpp:1019
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
-msgstr "Czêstotliwo¶æ (Hz)\tPoziom (dB)"
+msgstr "Częstotliwość (Hz)\tPoziom (dB)"
 
-#: ../src/FreqWindow.cpp:1025
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
-msgstr "Lag (sekundy)\tCzêstotliwo¶æ (Hz)\tPoziom"
+msgstr "Lag (sekundy)\tCzęstotliwość (Hz)\tPoziom"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
-msgstr "Powrót do strony [[witamy|Witamy]]."
+#, fuzzy
+msgid "To [[welcome|Welcome screen]]"
+msgstr "Powrót do strony [[witamy|Witamy]]."
 
-#: HelpText.cpp:60
+#: HelpText.cpp:92
 msgid "Welcome!"
 msgstr "Witamy!"
 
-#: HelpText.cpp:65
+#: HelpText.cpp:97
 msgid "Playing Audio"
-msgstr "Odtwarzanie d¼wiêku"
+msgstr "Odtwarzanie dźwięku"
 
-#: HelpText.cpp:69
+#: HelpText.cpp:101
 msgid "Recording Audio"
-msgstr "Nagrywanie d¼wiêku"
+msgstr "Nagrywanie dźwięku"
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
-msgstr "Edytowanie a nieaktywne menu"
+msgid "Recording - Choosing the Input Device"
+msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
-msgstr "Eksportowanie i zapisywanie"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:117
+#, fuzzy
+msgid "Editing and greyed out Menus"
+msgstr "Edytowanie a nieaktywne menu"
+
+#: HelpText.cpp:121
+#, fuzzy
+msgid "Exporting an Audio File"
+msgstr "Podczas eksportowania ścieżek do pliku audio"
+
+#: HelpText.cpp:125
+#, fuzzy
+msgid "Saving an Audacity Project"
+msgstr "Otwieranie projektu Audacity"
+
+#: HelpText.cpp:129
+#, fuzzy
+msgid "Unsupported Formats"
 msgstr "Wspierane formaty"
 
-#: HelpText.cpp:85
+#: HelpText.cpp:133
 msgid "Burn to CD"
-msgstr "Wypal na p³ytê"
+msgstr "Wypal na płytę"
 
-#: HelpText.cpp:89
+#: HelpText.cpp:137
 msgid "No Local Help"
 msgstr "Brak lokalnej pomocy"
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+#, fuzzy
+msgid "Welcome to Audacity "
 msgstr "<p>Witaj w 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
-msgstr "Zacznijmy!</p><p>Mo¿esz klikn±æ na linkach poni¿ej, aby dowiedzieæ siê jak:<ul><li>[[odtwarzaæ|odtwarzaæ]] istniej±c± ¶cie¿kê d¼wiêkow±.<li>Jak [[nagrywaæ|nagrywaæ]] nowy plik d¼wiêkowy.<li>Jak [[edytowaæ|edytowaæ]] d¿wiêk i  [[eksportowaæ|eksportowaæ]] do pliku d¼wiêkowego jak MP3.</ul><br><br>Te linki pomog± ci, je¶li znajdziesz problem taki jak [[nieaktywna|opcja menu nieaktywna]] lub ¿e Audacity [[nie nagrywa|nie nagrywa poprawnie]] lub ¿e nie mo¿esz [[paliæ p³yty|paliæ p³yty]]. Mo¿esz w ka¿dej chwili wróciæ do tych instrukcji klikaj±c na menu 'Pomoc', nastêpnie 'Poka¿ wiadomo¶æ powitaln±.' Aby uzyskaæ wiêcej informacji, przeczytaj ca³± nasz± Pomoc klikaj±c na menu 'Pomoc', nastêpnie 'Index', or <a href=\"http://audacity.sourceforge.net/help/documentation\">pobierz nasz podrêcznik</a> w formacie PDF.<br><br>Witaj znowu w Audacity."
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+#, fuzzy
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr "Możesz przenieść istniejące pliki do Audacity, lub użyj polecenia <b>Plik > Importuj > Dźwięk</b>. <b>Plik > Otwórz</b> robi to samo, lecz otwiera nowe okno Audacity dla każdego pliku po pierwszym.<br/><br/>Główne formaty, które Audacity odtwarza to: <b>AIFF, AU, FLAC, M4A</b> (tylko na Mac-u), <b>MP2/MP3, OGG Vorbis, WAV</b>.  Jeśli twój plik jest w innym formacie zajrzyj do pomocy. Jeśli chcesz importować płytę audio, zajrzyj na [[wiki:Jak importować płyty|Jak importować płyty]]<br><br>Aby rozpocząć odtwarzanie dźwięku, naciśnij zielony przycisk Odtwarzaj. Aby zatrzymać, naciśnij żółty przycisk Zatrzymaj. Możesz równiez użyć spacji do odtwarzania i zatrzymywania. Gdy zaczynasz odtwarzać ponownie po zatrzymaniu, odtwarzanie rozpoczyna się od poprzedniego momentu rozpoczęcia odtwarzania. Aby zmienić punkt początkowy, użyj przycisków <b>|&lt;&lt;</b> i <b>&gt;&gt;|</b> aby przeskoczyć do początku lub końca, lub kliknij na ścieżce w danym miejscu.<br><br>"
 
-#: HelpText.cpp:158
-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 "Mo¿esz przenie¶æ istniej±ce pliki do Audacity, lub u¿yj polecenia <b>Plik > Importuj > D¼wiêk</b>. <b>Plik > Otwórz</b> robi to samo, lecz otwiera nowe okno Audacity dla ka¿dego pliku po pierwszym.<br/><br/>G³ówne formaty, które Audacity odtwarza to: <b>AIFF, AU, FLAC, M4A</b> (tylko na Mac-u), <b>MP2/MP3, OGG Vorbis, WAV</b>.  Je¶li twój plik jest w innym formacie zajrzyj do pomocy. Je¶li chcesz importowaæ p³ytê audio, zajrzyj na [[wiki:Jak importowaæ p³yty|Jak importowaæ p³yty]]<br><br>Aby rozpocz±æ odtwarzanie d¼wiêku, naci¶nij zielony przycisk Odtwarzaj. Aby zatrzymaæ, naci¶nij ¿ó³ty przycisk Zatrzymaj. Mo¿esz równiez u¿yæ spacji do odtwarzania i zatrzymywania. Gdy zaczynasz odtwarzaæ ponownie po zatrzymaniu, odtwarzanie rozpoczyna siê od poprzedniego momentu rozpoczêcia odtwarzania. Aby zmieniæ punkt pocz±tkowy, u¿yj przycisków <b>|&lt;&lt;</b> i <b>&gt;&gt;|</b> aby przeskoczyæ do pocz±tku lub koñca, lub kliknij na ¶cie¿ce w danym miejscu.<br><br>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
 
-#: HelpText.cpp:181
-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>"
-msgstr "<b>Aby rozpocz±æ nagrywanie, naci¶nij czerwony przycisk Nagrywaj</b>. Zanim jednak to zrobisz, s± trzy bardzo wa¿ne ustawienia, które powiniene¶ sprawdziæ:<br><br>(1) <b>Urz±dzenie nagrywaj±ce</b>, w zak³adce We/Wy D¼wiêkowe w Ustawieniach. Audacity standardowo u¿ywa twojego urz±dzenia systemowego, którym jest zazwyczaj wbudowana karta d¼wiêkowa, wiêc byæ mo¿e nie trzeba bêdzie tego zmieniaæ. Lecz je¶li u¿ywasz urz±dzenia zewnêtrznego takiego jak adapter USB, sprawd¼ czy jest ono zaznaczone jako twoje urz±dzenie nagrywaj±ce. <br><br>(2) <b>¬ród³o d¼wiêku</b> dla twojego urz±dzenia, takie jak mikrofon lub wej¶cie liniowe. <ul><li><b>W Windowsie</b>, wej¶cie mo¿na ustawiæ po prawej stronie <b>Paska Narzêdzi Miksera<b> <i>uwaga: w Vi¶cie, nale¿y to zrobiæ w zak³adce Urz±dzenia Nagrywaj±cego w ustawieniach We/Wy.</i></li><li><b>W Mac-u</b>, ¼ród³a d¼wiêku s± ustawiane poza Audacity, w ustawieniach Apple Audio-MIDI.</li></ul><i>Uwaga: wiele urz±dzeñ USB lub Firewire nie posiada ró¿nych wej¶æ,wiêc mo¿esz zignorowaæ ten krok - zajrzyj do dokumentacji twojego urz±dzenia. <br><br>(3) <b>G³o¶no¶æ wej¶ciowa</b>. Zanim zaczniesz nagrywaæ, przetestuj nagrywanie, aby ustawiæ poziom nagrywania na wej¶ciu, aby nie by³ za niski lub za wysoki.Aby to zrobiæ, zajrzyj na [[wiki:Poziom nagrywania|Przewodnik ilustrowany]] lub: <ol><li>W³±cz <b>monitoring</b>, dwukrotnie klikaj±c po prawej stronie mierników VU, lub klikaj±c prawym klawiszem myszy i wybieraj±c \"Zacznij Monitoring\". Je¶li nie widzisz wska¼ników, kliknij na Widok > Paski Narzêdzi i zaznacz \"Pasek Wska¼nika\". <li>Naci¶nij Nagrywaj i wyreguluj poziom wysterowania na Pasku Miksera (lub obok symbolu mikrofonu), tak aby czerwone paski dochodzi³y blisko koñca skali, ale go nie dotyka³y. Je¶li nie s³yszysz d¼wiêku, id¼ do zak³adki We/Wy D¼wiêkowe w Ustawieniach i odznacz \"Odtwarzanie podczas nagrywania\". </ol><br><br>Wiêcej pomocy mo¿esz uzyskaæ w: naszych FAQ Nagrywania, naszym tutorialu  <b>Twoje pierwsze nagrywanie </b> w Podrêczniku oraz na naszym Wiki [[wiki:Porady Nagrywania|Porady Nagrywania]], zw³aszcza w dziale[[wiki:|Problemy z nagrywaniem|Problemy z nagrywaniem]]. <br><br>"
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
-msgstr "Edytowanie: Audacity jest potê¿nym edytorem, wiêc zapewne chcia³by¶ zobaczyæ co jest w stanie zrobiæ z twoim importowanym plikiem lub nagraniem.  G³ówne komendy, których bêdziesz u¿ywa³ znajduj± siê pod menu <b>Edytuj</b>  (jak np. wytnij, kopiuj i wklej) oraz pod menu <b>Efekt</b> (mo¿esz tu podbijaæ basy, zmieniaæ tempo lub usuwaæ szum). <br><br>Audacity stosuje zmiany do obszarów ¶cie¿ki d¼wiêkowej. Mo¿esz zaznaczyæ dany obszar d¼wiêku poprzez klikniêcie i przeci±gniêcie myszy po ekranie. Je¶li nie zaznaczysz ¿adnego obszaru, Audacity zaznaczy wszystko na ekranie.<br><br>Dwie bardzo wa¿ne rzeczy podczas edytowania:<br><br>(1) Je¶li nadal odtwarzasz lub nagrywasz, u¿yj ¿ó³tego przycisku Zatrzymaj, poniewa¿ nie mo¿esz edytowaæ ani eksportowaæ takiej ¶cie¿ki! <br><br>(2) Czasami, niektóre menu lub przyciski s± wy³±czone lub  \"Nieaktywne\" -  to normalne. Na przyk³ad, poniewa¿ nie mo¿esz edytowaæ ¶cie¿ki podczas odtwarzania lub nagrywania, polecenia s± deaktywowane dopóki nie naci¶niesz Zatrzymaj. Polecenia mog± byæ równie¿ czasami nieaktywne z innych powodów - na przyk³ad nie mo¿esz uruchomiæ efektów dopóki masz d¼wiêk na ekraniei nie mo¿esz wkleiæ d¼wiêku dopóki go nie skopiujesz do schowku Audacity. <br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
-msgstr "Eksportowanie i zapisywanie ma wiele powodów. \"Zapisujesz\" projekt Audacity je¶li chcesz do niego powróciæ pó¼niej.W ten sposób nie musisz ponownie importowaæ lub nagrywaæ d¼wiêku.Je¶li chcesz pos³uchaæ tego, nad czym pracowa³e¶, mo¿esz \"eksportowaæ\" projekt jako plik WAV, AIFF lub MP3. Je¶li chcesz go wypaliæ na p³ytê, eksportujesz go jako WAV lub AIFF.<br><br>Aby zapisaæ projekt Audacity, u¿ywasz <b>Plik > Zapisz Projekt</b>. To zapisze plik <b>.aup</b> oraz folder <b>_data</b> zawieraj±cy d¼wiêk. Upewnij siê, ¿e nie zmieniasz nazwy ¿adnego z plików, poniewa¿ Audacity odnosi siê do nich. U¿yj Plik > Zapisz Projekt Jako... tylko je¶li zapisujesz pusty projekt lub je¶li chcesz zapisaæ projekt z <i> now±</i> nazw±. Je¶li chcesz ponownie otworzyæ zapisany Projekt, kliknij na Plik > Otwórz i otwórz plik .aup. <br><br>Je¶li chcesz eksportowaæ twój projekt do pliku audio, u¿yj <b>Plik > Eksportuj</b> i wybierz dany format z listy \"Zapisz jako\".Kliknij na przycisk z opcjami zaawansowanymi takimi jak czêstotliwo¶æ próbkowania dla formatu MP3.S± równie¿ dwa inne polecenia Eksportu w menu Plik.\"Eksportuj Zaznaczenie\" eksportuje tylko zaznaczony obszar d¼wiêku.\"Eksportuj Wiele\" eksportuje wiele plików, na przyk³ad poczas, gdy masz na ekranie wiele ¶cie¿ek i chcesz je eksportowaæ jako osobne pliki. Podczas eksportowania ¶cie¿ek z p³yty LP lub kasety do wielu plików, u¿yj [[wiki:Rozdzielanie nagrañ w osobne ¶cie¿ki|etykiety z eksportowaniem wielu]]. <br><br>Zanim eksportujesz jako <b>MP3</b>, bêdziesz potrzebowa³ enkodera LAME MP3 na swoim komputerze.Aby uzyskaæ pomoc z LAME, zajrzyj na [[wiki:Instalacja Lame|Instalacja Lame ]]. Mo¿esz równie¿ znale¼æ pomoc w  [[wypalanie p³yt|wypalanie p³yt]].<br><br>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
-msgstr "<h2>Czy Audacity mo¿e importowaæ pliki takie jak WMA, AAC, RealAudio  itp.?</h2> <p>Audacity nie mo¿e importowaæ ani  eksportowaæ plików w formatach<b>WMA, RealAudio, Shorten (SHN)</b>, i wiêkszo¶ci formatów zamkniêtych z powodów licencyjnych. Audacity nie mo¿e równie¿ importowaæ plików zabezpieczonych Digital Rights Management (DRM), wliczaj±c w to pliki zakupione online w iTunes lub Napsterze.Je¶li pracujesz na Mac-u, mo¿esz importowaæ <b>AAC</b> pliki zakodowane (takie jak <b>M4A</b>) je¶li nie s± one zabezpieczne DRM,ale nie mo¿esz eksportowaæ do tych formatów.</p> <p>Niektóre formaty otwarte nie s± jeszcze wspierane przez Audacity, wliczaj±c <b>Ogg Speex</b> i <b>Musepack</b>.Mamy nadziejê w³±czyæ je w naszych przysz³ych wersjach Audacity.</p> <p>Je¶li nie mo¿esz importowaæ swojego pliku do Audacity, mo¿esz przekonwertowaæ go do WAV lub AIFF. Je¶li nie jest to plik zabezpieczony DRM, mo¿esz tak zrobiæ z plikami z iTunes lub z odtwarzaczem<a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>.Je¶li jest to plik zabezpieczony DRM, mo¿esz go wypaliæ jako p³ytê audio w programie, który jest licencjonowany do odtwarzania tych plików, nastêpnie wypakuj go do WAV lub AIFF.Mo¿esz równie¿ u¿yæ iTunes do przekonwertowania do WAV lub AIFF, plus Windows Media Player 11 lub <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> na Windows.Mo¿esz równie¿ odtwarzaæ plik na swoim komputerze i nagrywaæ go - zajrzyj <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:292
+#, fuzzy
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr "Edytowanie: Audacity jest potężnym edytorem, więc zapewne chciałbyś zobaczyć co jest w stanie zrobić z twoim importowanym plikiem lub nagraniem.  Główne komendy, których będziesz używał znajdują się pod menu <b>Edytuj</b>  (jak np. wytnij, kopiuj i wklej) oraz pod menu <b>Efekt</b> (możesz tu podbijać basy, zmieniać tempo lub usuwać szum). <br><br>Audacity stosuje zmiany do obszarów ścieżki dźwiękowej. Możesz zaznaczyć dany obszar dźwięku poprzez kliknięcie i przeciągnięcie myszy po ekranie. Jeśli nie zaznaczysz żadnego obszaru, Audacity zaznaczy wszystko na ekranie.<br><br>Dwie bardzo ważne rzeczy podczas edytowania:<br><br>(1) Jeśli nadal odtwarzasz lub nagrywasz, użyj żółtego przycisku Zatrzymaj, ponieważ nie możesz edytować ani eksportować takiej ścieżki! <br><br>(2) Czasami, niektóre menu lub przyciski są wyłączone lub  \"Nieaktywne\" -  to normalne. Na przykład, ponieważ nie możesz edytować ścieżki podczas odtwarzania lub nagrywania, polecenia są deaktywowane dopóki nie naciśniesz Zatrzymaj. Polecenia mogą być również czasami nieaktywne z innych powodów - na przykład nie możesz uruchomić efektów dopóki masz dźwięk na ekraniei nie możesz wkleić dźwięku dopóki go nie skopiujesz do schowku Audacity. <br><br>"
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
-msgstr "Je¶li chcesz wypaliæ p³ytê audio, najpierw zajrzyj na  [[eksport|eksportuj jako WAV lub AIFF]] i nastêpnie wypal plik na p³ytê u¿ywaj±c programu do wypalania p³yt takiego jak np iTunes - zajrzyj na [[wiki:Jak wypalaæ p³yty|Jak wypalaæ p³yty]].<br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
-msgstr "<p>Wygl±da na to, ¿e nie masz na swojej maszynie plików pomocy Audacity. Mo¿esz je <a href=\"http://audacity.sourceforge.net/help/documentation\">pobraæ</a> i mieæ do nich dostêp z Audacity lub kliknij  <a href=\"*URL*\">tutaj</a> aby czytaæ online."
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
 
-#: ../src/HistoryWindow.cpp:49
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
+
+#: HistoryWindow.cpp:53
 msgid "Undo History"
 msgstr "Cofnij Historie"
 
 #: HistoryWindow.cpp:72
 msgid "Manage History"
-msgstr "Zarz±dzaj histori±"
+msgstr "ZarzÄ…dzaj historiÄ…"
 
-#: ../src/HistoryWindow.cpp:62
+#: HistoryWindow.cpp:78
 msgid "Action"
 msgstr "Akcja"
 
 #: HistoryWindow.cpp:86
 msgid "&Undo Levels Available"
-msgstr "&Cofnij Poziomy mo¿liwe"
+msgstr "&Cofnij Poziomy możliwe"
 
 #: HistoryWindow.cpp:92
 msgid "Levels To Discard"
 msgstr "Poziomy do zredukowania"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "&Zredukuj"
 
-#: HistoryWindow.cpp:111
-#: LabelDialog.cpp:135
-#: LabelDialog.cpp:137
-#: effects/Amplify.cpp:214
-#: effects/AutoDuck.cpp:529
-#: effects/AutoDuck.cpp:531
-#: effects/ChangeLength.cpp:187
-#: effects/ChangePitch.cpp:399
-#: effects/ChangeSpeed.cpp:397
-#: effects/ChangeTempo.cpp:301
-#: effects/Compressor.cpp:519
-#: effects/Effect.cpp:389
-#: effects/Effect.cpp:391
-#: effects/Equalization.cpp:1169
-#: effects/Leveller.cpp:269
-#: effects/Normalize.cpp:356
-#: effects/Phaser.cpp:605
-#: effects/Repeat.cpp:274
+#: HistoryWindow.cpp:112
+#: Tags.cpp:2081
+#: Tags.cpp:2083
+#: Tags.cpp:2385
+#: Tags.cpp:2387
+#: effects/ChangeLength.cpp:186
 #: effects/SpikeCleaner.cpp:191
-#: effects/VST/VSTEffect.cpp:98
-#: effects/Wahwah.cpp:592
-#: effects/ladspa/LadspaEffect.cpp:592
-#: effects/nyquist/Nyquist.cpp:829
-#: export/Export.cpp:791
-#: prefs/FileFormatPrefs.cpp:408
-#: prefs/PrefsDialog.cpp:164
+#: export/ExportCL.cpp:399
 msgid "&OK"
 msgstr "&OK"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:114
+#: Internat.cpp:191
 msgid "Unable to determine"
-msgstr "Niezdolny do okre¶lenia"
+msgstr "Niezdolny do określenia"
 
-#: ../src/import/ImportRaw.cpp:354
+#: Internat.cpp:195
+#: import/ImportRaw.cpp:385
 msgid "bytes"
-msgstr "bajtów"
+msgstr "bajtów"
 
-#: Internat.cpp:182
+#: Internat.cpp:197
 msgid "KB"
 msgstr "KB"
 
-#: Internat.cpp:185
+#: Internat.cpp:200
 msgid "MB"
 msgstr "MB"
 
-#: Internat.cpp:188
+#: Internat.cpp:203
 msgid "GB"
 msgstr "GB"
 
-#: LabelDialog.cpp:50
+#: LabelDialog.cpp:54
 msgid "Track"
-msgstr "¦cie¿ka"
+msgstr "Ścieżka"
 
-#: ../src/Menus.cpp:3052
+#: LabelDialog.cpp:55
+#: Menus.cpp:4677
+#: Menus.cpp:4712
 msgid "Label"
 msgstr "Etykieta"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56
+#: TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr "Czas startu"
 
-#: LabelDialog.cpp:53
+#: LabelDialog.cpp:57
+#: TimerRecordDialog.cpp:298
 msgid "End Time"
-msgstr "Czas zakoñczenia"
+msgstr "Czas zakończenia"
 
-#: LabelDialog.cpp:98
-#: Menus.cpp:709
+#: LabelDialog.cpp:100
+#: Menus.cpp:713
 msgid "&Edit Labels"
 msgstr "&Edytuj etykiety"
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
-msgstr "Naci¶nij F2 lub kliknij podwójnie, aby edytowaæ zawarto¶æ komórek."
+msgstr "Naciśnij F2 lub kliknij podwójnie, aby edytować zawartość komórek."
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr "Wstaw &Po"
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr "Wstaw &Przed"
 
-#: LabelDialog.cpp:127
-#: Menus.cpp:234
+#: LabelDialog.cpp:129
 msgid "&Import..."
 msgstr "&Importuj..."
 
-#: LabelDialog.cpp:163
+#: LabelDialog.cpp:157
 msgid "New..."
 msgstr "Nowy..."
 
-#: LabelDialog.cpp:349
-msgid ""
-"You have left blank label names.  These will be\n"
+#: LabelDialog.cpp:354
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Zostawi³e¶ puste etykiety. Zostan± one\n"
-"ominiête podczas odczytywania ¶cie¿ek etykiet.\n"
+msgstr "Zostawiłeś puste etykiety. Zostaną one\n"
+"ominięte podczas odczytywania ścieżek etykiet.\n"
 "\n"
-"Czy chcesz wróciæ i wprowadziæ nazwy?"
+"Czy chcesz wrócić i wprowadzić nazwy?"
 
-#: LabelDialog.cpp:350
+#: LabelDialog.cpp:355
 msgid "Confirm"
-msgstr "Potwierd¼"
+msgstr "Potwierdź"
 
-#: ../src/Menus.cpp:2595
+#: LabelDialog.cpp:516
+#: Menus.cpp:4101
 msgid "Select a text file containing labels..."
-msgstr "Zaznacz plik tekstowy zawieraj±cy etykiety..."
+msgstr "Zaznacz plik tekstowy zawierajÄ…cy etykiety..."
 
-#: ../src/Menus.cpp:2599
+#: LabelDialog.cpp:520
+#: Menus.cpp:4105
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Pliki tekstowe (*.txt)|*.txt|Wszystkie pliki (*.*)|*.*"
 
-#: ../src/Menus.cpp:2611
-#: ../src/Project.cpp:1814
-#: ../src/Project.cpp:1822
-#: ../src/import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534
+#: Menus.cpp:4117
+#: Project.cpp:1914
+#: Project.cpp:1922
 msgid "Could not open file: "
-msgstr "Nie mo¿na otworzyæ pliku:"
+msgstr "Nie można otworzyć pliku:"
 
-#: LabelDialog.cpp:549
+#: LabelDialog.cpp:560
 msgid "No labels to export."
 msgstr "Brak etykiet do eksportu."
 
-#: ../src/Menus.cpp:1322
+#: LabelDialog.cpp:566
+#: Menus.cpp:2518
 msgid "Export Labels As:"
 msgstr "Eksportuj etykiety jako:"
 
-#: ../src/Menus.cpp:1320
+#: LabelDialog.cpp:568
+#: Menus.cpp:2516
 msgid "labels.txt"
 msgstr "labels.txt"
 
-#: LabelDialog.cpp:690
+#: LabelDialog.cpp:703
 msgid "New Label Track"
-msgstr "Nowa Etykieta ¦cie¿ki"
+msgstr "Nowa Etykieta Ścieżki"
 
-#: LabelDialog.cpp:691
+#: LabelDialog.cpp:704
 msgid "Enter track name"
-msgstr "Wprowad¼ nazwê ¶cie¿ki"
+msgstr "Wprowadź nazwę ścieżki"
 
-#: LabelDialog.cpp:692
-#: LabelDialog.h:50
-#: LabelTrack.cpp:87
-#: Menus.cpp:645
+#: LabelDialog.cpp:705
+#: LabelDialog.h:52
+#: LabelTrack.cpp:89
+#: Menus.cpp:632
 msgid "&Label Track"
-msgstr "&Etykieta ¶cie¿ki"
+msgstr "&Etykieta ścieżki"
 
-#: ../src/LangChoice.cpp:47
+#: LangChoice.cpp:57
 msgid "Audacity First Run"
 msgstr "Pierwsze uruchomienie programu Audacity"
 
-#: ../src/LangChoice.cpp:74
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
-msgstr "Wybierz jêzyk u¿ywany w Audacity:"
+msgstr "Wybierz język używany w Audacity:"
 
-#: ../src/Legacy.cpp:337
+#: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Przekonwertowano projekt w formacie 1.0 do nowego formatu.\n"
-"Stary plik zosta³ zapisany jako '%s'"
+msgstr "Przekonwertowano projekt w formacie 1.0 do nowego formatu.\n"
+"Stary plik został zapisany jako '%s'"
 
-#: ../src/Legacy.cpp:338
+#: Legacy.cpp:357
 msgid "Opening Audacity Project"
 msgstr "Otwieranie projektu Audacity"
 
-#: ../src/Menus.cpp:138
+#: Menus.cpp:194
 msgid "&File"
 msgstr "&Plik"
 
-#: ../src/Menus.cpp:140
+#: Menus.cpp:196
 msgid "&New\tCtrl+N"
 msgstr "&Nowy\tCtrl+N"
 
-#: ../src/Menus.cpp:142
+#: Menus.cpp:198
 msgid "&Open...\tCtrl+O"
-msgstr "&Otwórz...\tCtrl+O"
+msgstr "&Otwórz...\tCtrl+O"
 
-#: ../src/Menus.cpp:144
+#: Menus.cpp:203
 msgid "&Close\tCtrl+W"
 msgstr "&Zamknij\tCtrl+W"
 
-#: ../src/Menus.cpp:145
+#: Menus.cpp:206
 msgid "&Save Project\tCtrl+S"
 msgstr "&Zapisz projekt\tCtrl+S"
 
-#: ../src/Menus.cpp:149
+#: Menus.cpp:210
+#: Project.cpp:2896
 msgid "Save Project &As..."
 msgstr "Zapisz projekt &jako..."
 
-#: Menus.cpp:223
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
+#: Menus.cpp:216
 msgid "Chec&k Dependencies..."
-msgstr "Sprawd&¼ Zale¿no¶ci..."
+msgstr "Sprawd&ź Zależności..."
 
-#: Menus.cpp:185
+#: Menus.cpp:222
 msgid "Open Me&tadata Editor..."
-msgstr "Otwórz Edytor Me&tadanych..."
+msgstr "Otwórz Edytor Me&tadanych..."
 
-#: Menus.cpp:236
+#: Menus.cpp:229
+#: import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Importuj"
+
+#: Menus.cpp:231
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Audio...\tCtrl+Shift+I"
 
-#: Menus.cpp:237
+#: Menus.cpp:232
 msgid "&Labels..."
 msgstr "&Etykiety..."
 
-#: Menus.cpp:238
+#: Menus.cpp:234
 msgid "&MIDI..."
 msgstr "&MIDI..."
 
-#: Menus.cpp:239
+#: Menus.cpp:236
 msgid "&Raw Data..."
 msgstr "&Surowe dane..."
 
-#: Menus.cpp:252
-#: Menus.cpp:281
+#: Menus.cpp:247
+#: Menus.cpp:282
 msgid "Expo&rt Selection..."
 msgstr "Ekspo&rtuj zaznaczenie..."
 
-#: ../src/Menus.cpp:163
+#: Menus.cpp:254
 msgid "Export &Labels..."
 msgstr "Eksportuj &Etykiety..."
 
-#: ../src/Menus.cpp:164
+#: Menus.cpp:255
 msgid "Export &Multiple..."
-msgstr "Eksportuj &Wiele plików..."
+msgstr "Eksportuj &Wiele plików..."
+
+#: Menus.cpp:257
+#, fuzzy
+msgid "Export MIDI..."
+msgstr "&Eksportuj..."
+
+#: Menus.cpp:290
+#, fuzzy
+msgid "CleanSpeech C&hain..."
+msgstr "Czysta mowa"
 
-#: Menus.cpp:340
-#: Menus.cpp:354
+#: Menus.cpp:291
+#: Menus.cpp:305
 msgid "Edit C&hains..."
 msgstr "Edytuj T&ory..."
 
-#: Menus.cpp:352
+#: Menus.cpp:292
+#, fuzzy
+msgid "Export CleanSpeech &Presets..."
+msgstr "Ustawienia CzystejMowy (*.csp)|*.csp"
+
+#: Menus.cpp:293
+#, fuzzy
+msgid "I&mport CleanSpeech Presets..."
+msgstr "Ustawienia CzystejMowy (*.csp)|*.csp"
+
+#: Menus.cpp:303
 msgid "Appl&y Chain..."
 msgstr "Zasto&suj Tor..."
 
-#: Menus.cpp:358
+#: Menus.cpp:310
 msgid "&Upload File..."
-msgstr "&Za³aduj plik..."
+msgstr "&Załaduj plik..."
 
-#: Menus.cpp:363
+#: Menus.cpp:316
 msgid "Pa&ge Setup..."
 msgstr "Us&tawienia strony..."
 
-#: Menus.cpp:364
+#: Menus.cpp:317
 msgid "&Print..."
 msgstr "&Drukuj..."
 
-#: Menus.cpp:382
-#: Menus.cpp:385
+#: Menus.cpp:330
 msgid "E&xit\tCtrl+Q"
-msgstr "W&yj¶cie\tCtrl+Q"
+msgstr "W&yjście\tCtrl+Q"
 
-#: ../src/Menus.cpp:218
+#: Menus.cpp:338
+#: toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "&Edytuj"
 
-#: ../src/Menus.cpp:222
+#: Menus.cpp:342
 msgid "&Undo\tCtrl+Z"
 msgstr "&Cofnij\tCtrl+Z"
 
-#: ../src/Menus.cpp:230
+#: Menus.cpp:350
+#: prefs/KeyConfigPrefs.cpp:371
+#: toolbars/EditToolBar.cpp:146
 msgid "&Redo"
-msgstr "&Przywróæ"
+msgstr "&Przywróć"
 
-#: ../src/Menus.cpp:243
+#: Menus.cpp:363
 msgid "Cu&t\tCtrl+X"
 msgstr "Wy&tnij\tCtrl+X"
 
-#: Menus.cpp:420
+#: Menus.cpp:367
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr "Rozdz&iel Wytnij\tCtrl+Alt+X"
 
-#: ../src/Menus.cpp:244
+#: Menus.cpp:368
 msgid "&Copy\tCtrl+C"
 msgstr "&Kopiuj\tCtrl+C"
 
-#: ../src/Menus.cpp:245
+#: Menus.cpp:372
 msgid "&Paste\tCtrl+V"
 msgstr "&Wstaw\tCtrl+V"
 
-#: Menus.cpp:426
+#: Menus.cpp:376
 msgid "Tri&m\tCtrl+T"
 msgstr "Przy&tnij\tCtrl+T"
 
-#: ../src/Menus.cpp:251
+#: Menus.cpp:378
 msgid "&Delete\tCtrl+K"
 msgstr "&Kasuj\tCtrl+K"
 
-#: Menus.cpp:429
+#: Menus.cpp:379
 msgid "Split D&elete\tCtrl+Alt+K"
-msgstr "Rozdziel U&suñ\tCtrl+Alt+K"
+msgstr "Rozdziel U&suń\tCtrl+Alt+K"
 
-#: ../src/Menus.cpp:252
-msgid "&Silence\tCtrl+L"
+#: Menus.cpp:380
+#, fuzzy
+msgid "Silence Audi&o\tCtrl+L"
 msgstr "&Cisza\tCtrl+L"
 
-#: Menus.cpp:432
+#: Menus.cpp:382
 msgid "Sp&lit\tCtrl+I"
 msgstr "Rozdz&iel\tCtrl+I"
 
-#: Menus.cpp:393
+#: Menus.cpp:387
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "Rozdziel No&wy\tCtrl+Alt+I"
 
-#: Menus.cpp:442
+#: Menus.cpp:392
 msgid "&Join\tCtrl+J"
-msgstr "&Po³±cz\tCtrl+J"
+msgstr "&Połącz\tCtrl+J"
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Rozdz&iel\tCtrl+Alt+J"
+#: Menus.cpp:393
+#, fuzzy
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "&Cisza\tCtrl+L"
 
-#: Menus.cpp:445
+#: Menus.cpp:394
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Dupli&kuj\tCtrl+D"
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232
-#: BatchCommands.cpp:466
-#: BatchCommands.cpp:468
-#: Menus.cpp:451
-#: Menus.cpp:654
-#: effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400
+#: Menus.cpp:639
+#, fuzzy
+msgid "Stereo Trac&k to Mono"
 msgstr "& Stereo do Mono"
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+#, fuzzy
+msgid "La&beled Regions"
 msgstr "Zaznaczone Re&giony..."
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:460
+#: Menus.cpp:409
 msgid "&Cut\tAlt+X"
 msgstr "&Wytnij\tAlt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:465
+#: Menus.cpp:414
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "&Rozdziel Wytnij\tShift+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:470
+#: Menus.cpp:419
 msgid "Co&py\tShift+Alt+C"
 msgstr "Kop&iuj\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:476
+#: Menus.cpp:425
 msgid "&Delete\tAlt+K"
-msgstr "&Usuñ\tAlt+K"
+msgstr "&Usuń\tAlt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:481
+#: Menus.cpp:430
 msgid "Sp&lit Delete\tShift+Alt+K"
-msgstr "Rozdz&iel Usuñ\tShift+Alt+K"
+msgstr "Rozdz&iel Usuń\tShift+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:486
+#: Menus.cpp:435
 msgid "Sile&nce\tAlt+L"
 msgstr "Cisz&a\tAlt+L"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:492
+#: Menus.cpp:441
 msgid "Spli&t\tAlt+I"
 msgstr "Rozdz&iel\tAlt+I"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:497
+#: Menus.cpp:446
 msgid "&Join\tAlt+J"
-msgstr "&Po³±cz\tAlt+J"
+msgstr "&Połącz\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+#, fuzzy
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr "Roz&dziel\tShift+Alt+J"
 
-#: Menus.cpp:464
-msgid "&Select..."
-msgstr "&Zaznacz.."
+#: Menus.cpp:456
+#, fuzzy
+msgid "&Select"
+msgstr "Zaznacz "
 
-#: ../src/Menus.cpp:260
+#: Menus.cpp:457
 msgid "&All\tCtrl+A"
 msgstr "&Wszystko\tCtrl+A"
 
-#: Menus.cpp:466
+#: Menus.cpp:458
 msgid "&None\tCtrl+Shift+A"
-msgstr "&¯aden\tCtrl+Shift+A"
+msgstr "&Żaden\tCtrl+Shift+A"
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
 msgstr "Na lewo od miejsca odtwarzania\t["
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
 msgstr "Na prawo od miejsca odtwarzania\t["
 
-#: ../src/Menus.cpp:263
-msgid "Start to Cursor"
-msgstr "Od pocz±tku do kursora"
+#: Menus.cpp:467
+#, fuzzy
+msgid "Track &Start to Cursor\tShift+J"
+msgstr "Od poczÄ…tku do kursora"
 
-#: ../src/Menus.cpp:264
-msgid "Cursor to End"
-msgstr "Kursor do koñca"
+#: Menus.cpp:468
+#, fuzzy
+msgid "Cursor to Track &End\tShift+K"
+msgstr "Kursor do końca"
 
-#: Menus.cpp:525
+#: Menus.cpp:474
 msgid "Find &Zero Crossings\tZ"
-msgstr "Znajd¼ &Przej¶cie przez zero\tZ"
+msgstr "Znajdź &Przejście przez zero\tZ"
 
-#: Menus.cpp:527
-msgid "Mo&ve Cursor..."
-msgstr "Prze&suñ kursor..."
+#: Menus.cpp:476
+#, fuzzy
+msgid "Mo&ve Cursor"
+msgstr "Prze&suń kursor..."
 
-#: ../src/Menus.cpp:283
-msgid "to Selection Start"
-msgstr "do pocz±tku zaznaczenia"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
+msgstr "do poczÄ…tku zaznaczenia"
 
-#: ../src/Menus.cpp:284
-msgid "to Selection End"
-msgstr "do koñca zaznaczenia"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
+msgstr "do końca zaznaczenia"
 
-#: ../src/Menus.cpp:279
-msgid "to Track Start"
-msgstr "do pocz±tku ¶cie¿ki"
+#: Menus.cpp:483
+#, fuzzy
+msgid "to Track &Start\tJ"
+msgstr "do początku ścieżki"
 
-#: ../src/Menus.cpp:280
-msgid "to Track End"
-msgstr "do koñca ¶cie¿ki"
+#: Menus.cpp:484
+#, fuzzy
+msgid "to Track &End\tK"
+msgstr "do końca ścieżki"
 
-#: ../src/Menus.cpp:271
-msgid "Selection Save"
+#: Menus.cpp:491
+#, fuzzy
+msgid "Re&gion Save"
 msgstr "Zapisz zaznaczenie"
 
-#: ../src/Menus.cpp:272
-msgid "Selection Restore"
+#: Menus.cpp:492
+#, fuzzy
+msgid "Regio&n Restore"
 msgstr "Odzyskaj zaznaczenie"
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+#, fuzzy
+msgid "Pla&y Region"
 msgstr "Odtwarzaj &Region..."
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+#, fuzzy
+msgid "&Lock"
 msgstr "Zablokuj"
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+#, fuzzy
+msgid "&Unlock"
 msgstr "Odblokuj"
 
-#: ../src/Menus.cpp:302
+#: Menus.cpp:511
 msgid "Turn Snap-To On"
-msgstr "Aktywuj przyci±ganie"
+msgstr "Aktywuj przyciÄ…ganie"
 
-#: ../src/Menus.cpp:303
+#: Menus.cpp:512
 msgid "Turn Snap-To Off"
-msgstr "Zablokuj przyci±ganie"
+msgstr "Zablokuj przyciÄ…ganie"
 
-#: ../src/Menus.cpp:304
+#: Menus.cpp:513
 msgid "Turn Grid Snap On"
-msgstr "W³±cz przyci±ganie do siatki"
+msgstr "WÅ‚Ä…cz przyciÄ…ganie do siatki"
 
-#: ../src/Menus.cpp:305
+#: Menus.cpp:514
 msgid "Turn Grid Snap Off"
-msgstr "Wy³±cz przyci±ganie do siatki"
+msgstr "Wyłącz przyciąganie do siatki"
 
-#: ../src/Menus.cpp:201
-#: ../src/Menus.cpp:207
-msgid "&Preferences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+#, fuzzy
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "&Ustawienia...\tCtrl+,"
+
+#: Menus.cpp:523
+#, fuzzy
+msgid "Pre&ferences...\tCtrl+P"
 msgstr "&Ustawienia...\tCtrl+P"
 
-#: ../src/Menus.cpp:313
+#: Menus.cpp:533
 msgid "&View"
 msgstr "&Widok"
 
-#: ../src/Menus.cpp:315
+#: Menus.cpp:535
 msgid "Zoom &In\tCtrl+1"
-msgstr "Po&wiêksz\tCtrl+!"
+msgstr "Po&większ\tCtrl+!"
 
-#: ../src/Menus.cpp:318
+#: Menus.cpp:538
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "&Normalny rozmiar\tCtrl+2"
 
-#: ../src/Menus.cpp:319
+#: Menus.cpp:539
 msgid "Zoom &Out\tCtrl+3"
 msgstr "P&omniejsz\tCtrl+3"
 
-#: ../src/Menus.cpp:322
+#: Menus.cpp:542
 msgid "&Fit in Window\tCtrl+F"
 msgstr "&Dopasuj do okna\tCtrl+F"
 
-#: ../src/Menus.cpp:323
+#: Menus.cpp:543
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "Dopasuj w &pionie\tCtrl+Shift+F"
 
-#: ../src/Menus.cpp:324
+#: Menus.cpp:544
 msgid "&Zoom to Selection\tCtrl+E"
-msgstr "&Powiêksz zaznaczenie\tCtrl+E"
+msgstr "&Powiększ zaznaczenie\tCtrl+E"
 
-#: Menus.cpp:603
+#: Menus.cpp:547
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
-msgstr "&Zwiñ wszystkie ¶cie¿ki\tCtrl+Shift+C"
+msgstr "&Zwiń wszystkie ścieżki\tCtrl+Shift+C"
 
-#: Menus.cpp:604
+#: Menus.cpp:548
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
-msgstr "R&ozwiñ wszystkie ¶cie¿ki\tCtrl+Shift+X"
+msgstr "R&ozwiń wszystkie ścieżki\tCtrl+Shift+X"
 
-#: Menus.cpp:502
-msgid "Show Clipping"
-msgstr "Poka¿ obciêcie"
+#: Menus.cpp:551
+#, fuzzy
+msgid "&Show Clipping"
+msgstr "Pokaż obcięcie"
 
-#: ../src/Menus.cpp:332
+#: Menus.cpp:560
 msgid "&History..."
 msgstr "&Historia"
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
-msgstr "&Paski narzêdzi..."
-
-#: Menus.cpp:618
-#: Menus.cpp:1203
-#: Menus.cpp:1204
-msgid "Control Toolbar"
-msgstr "Pasek narzêdzi kontrolnych"
-
-#: Menus.cpp:619
-#: Menus.cpp:1207
-#: Menus.cpp:1208
-msgid "Device Toolbar"
-msgstr "Pasek narzêdzi urz±dzeñ"
-
-#: Menus.cpp:620
-#: Menus.cpp:1211
-#: Menus.cpp:1212
-msgid "Edit Toolbar"
-msgstr "Pasek narzêdzi edycji"
-
-#: Menus.cpp:621
-#: Menus.cpp:1215
-#: Menus.cpp:1216
-msgid "Meter Toolbar"
-msgstr "Pasek narzêdzi pomiaru"
+#: Menus.cpp:566
+#, fuzzy
+msgid "&Toolbars"
+msgstr "&Paski narzędzi..."
+
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
+msgstr "Pasek narzędzi kontrolnych"
+
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
+msgstr "Pasek narzędzi urządzeń"
+
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
+msgstr "Pasek narzędzi edycji"
+
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
+msgstr "Pasek narzędzi pomiaru"
+
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
+msgstr "Pasek narzędzi miksera"
+
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
+msgstr "Pasek narzędzi selekcji"
+
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
+msgstr "Pasek narzędzi"
+
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
+msgstr "Pasek narzędzi transkrypcji"
+
+#: Menus.cpp:576
+#, fuzzy
+msgid "&Reset Toolbars"
+msgstr "Zresetuj Paski Narzędzi"
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+#, fuzzy
+msgid "T&ransport"
+msgstr "Transkrypcja"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+#, fuzzy
+msgid "&Pause\tP"
+msgstr "Pauza\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:595
+#: Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "Skocz do poczÄ…tku\tHome"
+
+#: Menus.cpp:597
+#: Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "Skocz do końca\tEnd"
+
+#: Menus.cpp:600
+#, fuzzy
+msgid "&Record\tR"
+msgstr "Nagrywanie\tR"
+
+#: Menus.cpp:602
+#, fuzzy
+msgid "&Timer Record...\tShift+T"
+msgstr "&Nagrywanie czasowe..."
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
 
 #: Menus.cpp:622
-#: Menus.cpp:1219
-#: Menus.cpp:1220
-msgid "Mixer Toolbar"
-msgstr "Pasek narzêdzi miksera"
-
-#: Menus.cpp:623
-#: Menus.cpp:1223
-#: Menus.cpp:1224
-msgid "Selection Toolbar"
-msgstr "Pasek narzêdzi selekcji"
-
-#: Menus.cpp:624
-#: Menus.cpp:1227
-#: Menus.cpp:1228
-msgid "Tools Toolbar"
-msgstr "Pasek narzêdzi"
-
-#: Menus.cpp:625
-#: Menus.cpp:1231
-#: Menus.cpp:1232
-msgid "Transcription Toolbar"
-msgstr "Pasek narzêdzi transkrypcji"
-
-#: Menus.cpp:527
-msgid "Reset Toolbars"
-msgstr "Zresetuj Paski Narzêdzi"
-
-#: Menus.cpp:635
 msgid "&Tracks"
-msgstr "&¦cie¿ki"
+msgstr "&Ścieżki"
 
-#: Menus.cpp:642
-msgid "Add &New..."
-msgstr "Dodaj &Now±..."
+#: Menus.cpp:629
+#, fuzzy
+msgid "Add &New"
+msgstr "Dodaj &NowÄ…..."
 
-#: Menus.cpp:643
+#: Menus.cpp:630
 msgid "&Audio Track\tCtrl+Shift+N"
-msgstr "&¦cie¿ka d¼wiêkowa\tCtrl+Shift+N"
+msgstr "&Ścieżka dźwiękowa\tCtrl+Shift+N"
 
-#: Menus.cpp:644
+#: Menus.cpp:631
 msgid "&Stereo Track"
-msgstr "&¦cie¿ka stereo"
+msgstr "&Ścieżka stereo"
 
-#: Menus.cpp:646
+#: Menus.cpp:633
 #: TimeTrack.cpp:44
 msgid "&Time Track"
-msgstr "&¦cie¿ka czasowa"
+msgstr "&Ścieżka czasowa"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr "&Nagrywanie czasowe..."
-
-#: Menus.cpp:658
-#: Menus.cpp:3760
-#: Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+#, fuzzy
+msgid "Mi&x and Render"
 msgstr "&Miksuj i renderuj"
 
-#: Menus.cpp:564
+#: Menus.cpp:647
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
-msgstr "Miksuj i przetwarzaj do Nowej ¦cie¿ki\tCtrl+Shift+M"
+msgstr "Miksuj i przetwarzaj do Nowej Ścieżki\tCtrl+Shift+M"
 
-#: Menus.cpp:662
+#: Menus.cpp:651
 msgid "&Resample..."
 msgstr "&Resampluj"
 
-#: ../src/Menus.cpp:370
+#: Menus.cpp:661
 msgid "Remo&ve Tracks"
-msgstr "&Usuñ ¦cie¿ki"
+msgstr "&Usuń Ścieżki"
+
+#: Menus.cpp:667
+#, fuzzy
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr "&Zwiń wszystkie ścieżki\tCtrl+Shift+C"
 
-#: ../src/Menus.cpp:377
+#: Menus.cpp:668
+#, fuzzy
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr "R&ozwiń wszystkie ścieżki\tCtrl+Shift+X"
+
+#: Menus.cpp:672
 msgid "Align with &Zero"
-msgstr "Wyrównaj do &zera"
+msgstr "Wyrównaj do &zera"
 
-#: ../src/Menus.cpp:378
+#: Menus.cpp:673
 msgid "Align with &Cursor"
-msgstr "Wyrównaj do &Kursora"
+msgstr "Wyrównaj do &Kursora"
 
-#: ../src/Menus.cpp:379
+#: Menus.cpp:674
 msgid "Align with Selection &Start"
-msgstr "Wyrównaj z pocz±tkiem &zaznaczenia"
+msgstr "Wyrównaj z początkiem &zaznaczenia"
 
-#: ../src/Menus.cpp:380
+#: Menus.cpp:675
 msgid "Align with Selection &End"
-msgstr "Wyrównaj z koñcem zaznacz&enia"
+msgstr "Wyrównaj z końcem zaznacz&enia"
+
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
+msgstr "Wyrównaj koniec do kursora"
 
-#: ../src/Menus.cpp:381
-msgid "Align End with Cursor"
-msgstr "Wyrównaj koniec do kursora"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
+msgstr "Wyrównaj koniec z początkiem zaznaczenia"
 
-#: ../src/Menus.cpp:382
-msgid "Align End with Selection Start"
-msgstr "Wyrównaj koniec z pocz±tkiem zaznaczenia"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
+msgstr "Wyrównaj koniec do końca zaznaczenia"
 
-#: ../src/Menus.cpp:383
-msgid "Align End with Selection End"
-msgstr "Wyrównaj koniec do koñca zaznaczenia"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
+msgstr "Wyrównaj ścieżki "
 
-#: ../src/Menus.cpp:384
-msgid "Align Tracks Together"
-msgstr "Wyrównaj ¶cie¿ki "
+#: Menus.cpp:681
+#, fuzzy
+msgid "&Align Tracks"
+msgstr "&Wyrównaj ścieżki..."
 
-#: Menus.cpp:688
-msgid "&Align Tracks..."
-msgstr "&Wyrównaj ¶cie¿ki..."
+#: Menus.cpp:690
+#, fuzzy
+msgid "Ali&gn and Move Cursor"
+msgstr "Wyró&wnaj i rusz kursor"
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
-msgstr "Wyró&wnaj i rusz kursor"
+msgid "Synchronize MIDI with Audio"
+msgstr ""
 
-#: Menus.cpp:705
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
+
+#: Menus.cpp:709
 msgid "Add &Label At Selection\tCtrl+B"
-msgstr "Dodaj &Etykietê do zaznaczenia\tCtrl+B"
+msgstr "Dodaj &EtykietÄ™ do zaznaczenia\tCtrl+B"
 
-#: Menus.cpp:706
+#: Menus.cpp:710
 msgid "Add Label At &Playback Position\tCtrl+M"
-msgstr "Dodaj etykietê w pozycji &Odtwarzania\tCtrl+M"
+msgstr "Dodaj etykietÄ™ w pozycji &Odtwarzania\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
-msgstr "Sort&uj ¶cie¿ki..."
+#: Menus.cpp:716
+#, fuzzy
+msgid "S&ort tracks"
+msgstr "Sort&uj ścieżki..."
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+#, fuzzy
+msgid "by &Start time"
 msgstr "&Czas startu"
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+#, fuzzy
+msgid "by &Name"
 msgstr "&Nazwa"
 
-#: ../src/Menus.cpp:413
+#: Menus.cpp:730
 msgid "&Generate"
 msgstr "&Generowanie Tonu"
 
-#: ../src/Menus.cpp:436
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
+#: Menus.cpp:795
 msgid "Effe&ct"
 msgstr "Efe&kty"
 
-#: ../src/Menus.cpp:440
+#: Menus.cpp:799
 msgid "Repeat Last Effect\tCtrl+R"
-msgstr "Powtórz ostatni efekt\tCtrl+R"
+msgstr "Powtórz ostatni efekt\tCtrl+R"
 
-#: ../src/Menus.cpp:466
+#: Menus.cpp:877
 msgid "&Analyze"
 msgstr "&Analiza"
 
-#: Menus.cpp:692
+#: Menus.cpp:879
 msgid "Plot Spectrum..."
 msgstr "Wykres spektrum..."
 
-#. i18n-hint: The name of the Help menu
-#: ../src/Menus.cpp:489
-#: ../src/Menus.cpp:504
+#: Menus.cpp:947
+#: Menus.cpp:950
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: Menus.cpp:829
+#: Menus.cpp:953
 msgid "&About Audacity CleanSpeech..."
-msgstr "&O czysto¶ci wymowy Audacity..."
+msgstr "&O czystości wymowy Audacity..."
 
-#: Menus.cpp:735
+#: Menus.cpp:957
 msgid "&Show Welcome Message..."
-msgstr "&Poka¿ wiadomo¶æ powitaln±..."
+msgstr "&Pokaż wiadomość powitalną..."
 
-#: Menus.cpp:736
+#: Menus.cpp:958
 msgid "&Index..."
 msgstr "&Index..."
 
-#: Menus.cpp:790
+#: Menus.cpp:959
+#, fuzzy
+msgid "Show &Log..."
+msgstr "&Ładuj..."
+
+#: Menus.cpp:967
 msgid "&Screenshot Tools..."
-msgstr "&Narzêdzia do zrzutu ekranu..."
+msgstr "&Narzędzia do zrzutu ekranu..."
 
-#: ../src/Menus.cpp:497
+#: Menus.cpp:970
 msgid "&Run Benchmark..."
 msgstr "U&ruchom Benchmark"
 
-#: Menus.cpp:749
+#: Menus.cpp:972
 msgid "&Audio Device Info..."
-msgstr "&Informacja o Urz±dzeniu D¼wiêkowym..."
+msgstr "&Informacja o Urządzeniu Dźwiękowym..."
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Poruszanie siê wstecz po Doku, WIdoku ¶cie¿ki i Pasku selekcji\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Poruszanie siê do przodu po Doku, WIdoku ¶cie¿ki i Pasku selekcji\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
-#: ../src/Menus.cpp:513
+#: Menus.cpp:985
 msgid "Selection Tool\tF1"
 msgstr "Zaznaczanie\tF1"
 
-#: ../src/Menus.cpp:514
+#: Menus.cpp:986
 msgid "Envelope Tool\tF2"
-msgstr "Narzêdzie obwiedni\tF2"
+msgstr "Narzędzie obwiedni\tF2"
 
-#: ../src/Menus.cpp:515
+#: Menus.cpp:987
 msgid "Draw Tool\tF3"
-msgstr "Narzêdzie rysowania\tF3"
+msgstr "Narzędzie rysowania\tF3"
 
-#: ../src/Menus.cpp:516
+#: Menus.cpp:988
 msgid "Zoom Tool\tF4"
 msgstr "Lupa\tF4"
 
-#: ../src/Menus.cpp:517
+#: Menus.cpp:989
 msgid "Time Shift Tool\tF5"
-msgstr "Narzêdzie do przesuwania w czasie\tF5"
+msgstr "Narzędzie do przesuwania w czasie\tF5"
 
-#: ../src/Menus.cpp:518
+#: Menus.cpp:990
 msgid "Multi Tool\tF6"
-msgstr "Multi narzêdzie\tF6"
+msgstr "Multi narzędzie\tF6"
 
-#: ../src/Menus.cpp:520
+#: Menus.cpp:992
 msgid "Next Tool\tD"
-msgstr "Nastêpne narzêdzie\tD"
+msgstr "Następne narzędzie\tD"
 
-#: ../src/Menus.cpp:521
+#: Menus.cpp:993
 msgid "Previous Tool\tA"
-msgstr "Poprzednie narzêdzie\tA"
+msgstr "Poprzednie narzędzie\tA"
 
-#: ../src/Menus.cpp:523
-msgid "Play/Stop\tSpacebar"
-msgstr "Odtwarzaj/Zatrzymaj\tSpacja"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
-#: ../src/Menus.cpp:524
+#: Menus.cpp:996
 msgid "Stop\tS"
 msgstr "Stop\tS"
 
-#: ../src/Menus.cpp:525
+#: Menus.cpp:997
 msgid "Pause\tP"
 msgstr "Pauza\tP"
 
-#: ../src/Menus.cpp:526
+#: Menus.cpp:998
 msgid "Record\tR"
 msgstr "Nagrywanie\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
-msgstr "Odtwarzaj/Zatrzymaj i Zaznacz\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
+msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
-msgstr "Zatrzymaj i zaznacz\tShift+A"
+#: Menus.cpp:1001
+#, fuzzy
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr "Odtwarzaj/Zatrzymaj i Zaznacz\tShift+Return"
 
-#: ../src/Menus.cpp:528
+#: Menus.cpp:1004
 msgid "Play One Second\t1"
-msgstr "Odtwarzaj 1 sekundê"
+msgstr "Odtwarzaj 1 sekundÄ™"
 
-#: ../src/Menus.cpp:529
+#: Menus.cpp:1005
 msgid "Play To Selection\tB"
 msgstr "Odtwarzaj do zaznaczenia\tB"
 
-#: ../src/Menus.cpp:530
+#: Menus.cpp:1006
 msgid "Play Looped\tL"
-msgstr "Odtwarzaj zapêtlone\tL"
+msgstr "Odtwarzaj zapętlone\tL"
 
-#: ../src/Menus.cpp:531
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Odtwarzaj zapêtlone\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
-#: Menus.cpp:873
+#: Menus.cpp:1008
 msgid "Play Cut Preview\tC"
-msgstr "Odtwarzaj Wytnij Podgl±d\tC"
-
-#: ../src/Menus.cpp:533
-msgid "Skip to Start\tHome"
-msgstr "Skocz do pocz±tku\tHome"
+msgstr "Odtwarzaj Wytnij PodglÄ…d\tC"
 
-#: ../src/Menus.cpp:534
-msgid "Skip to End\tEnd"
-msgstr "Skocz do koñca\tEnd"
-
-#: ../src/Menus.cpp:536
+#: Menus.cpp:1013
 msgid "Selection to Start\tShift+Home"
-msgstr "Zaznaczenie do Pocz±tku\tShift+Home"
+msgstr "Zaznaczenie do PoczÄ…tku\tShift+Home"
 
-#: ../src/Menus.cpp:537
+#: Menus.cpp:1014
 msgid "Selection to End\tShift+End"
-msgstr "Zaznaczenie do koñca\tShift+End"
+msgstr "Zaznaczenie do końca\tShift+End"
 
-#: ../src/Menus.cpp:539
+#: Menus.cpp:1016
 msgid "DeleteKey\tBackspace"
-msgstr "Klawisz kasowania­\tBackspace"
+msgstr "Klawisz kasowania­\tBackspace"
 
-#: ../src/Menus.cpp:544
+#: Menus.cpp:1021
 msgid "DeleteKey2\tDelete"
 msgstr "Klawisz kasowania 2\tDelete"
 
-#: Menus.cpp:892
+#: Menus.cpp:1027
 msgid "Seek left short period during playback\tLeft"
-msgstr "Krótkie przeszukiwanie w lewo podczas odtwarzania\tLewa strza³ka"
+msgstr "Krótkie przeszukiwanie w lewo podczas odtwarzania\tLewa strzałka"
 
-#: Menus.cpp:893
+#: Menus.cpp:1028
 msgid "Seek right short period during playback\tRight"
-msgstr "Krótkie przeszukiwanie w prawo podczas odtwarzania\tPrawa strza³ka"
+msgstr "Krótkie przeszukiwanie w prawo podczas odtwarzania\tPrawa strzałka"
 
-#: Menus.cpp:894
+#: Menus.cpp:1029
 msgid "Seek left long period during playback\tShift+Left"
-msgstr "D³ugie przeszukiwanie w lewo podczas odtwarzania\tShift+Lewa strza³ka"
+msgstr "Długie przeszukiwanie w lewo podczas odtwarzania\tShift+Lewa strzałka"
 
-#: Menus.cpp:895
+#: Menus.cpp:1030
 msgid "Seek right long period during playback\tShift+Right"
-msgstr "D³ugie przeszukiwanie w prawo podczas odtwarzania\tShift+Prawa strza³ka"
+msgstr "Długie przeszukiwanie w prawo podczas odtwarzania\tShift+Prawa strzałka"
 
-#: Menus.cpp:899
+#: Menus.cpp:1034
 msgid "Move Focus to Previous Track\tUp"
-msgstr "Przesuñ do poprzedniej ¶cie¿ki\tStrza³ka w górê"
+msgstr "Przesuń do poprzedniej ścieżki\tStrzałka w górę"
 
-#: Menus.cpp:900
+#: Menus.cpp:1035
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
-msgstr "Przesuñ do poprzedniej i zmieñ zaznaczenie\tShift+Strza³ka do góry"
+msgstr "Przesuń do poprzedniej i zmień zaznaczenie\tShift+Strzałka do góry"
 
-#: Menus.cpp:901
+#: Menus.cpp:1036
 msgid "Move Focus to Next Track\tDown"
-msgstr "Przesuñ do nastêpnej ¶cie¿ki\tStrza³ka w dó³"
+msgstr "Przesuń do następnej ścieżki\tStrzałka w dół"
 
-#: Menus.cpp:902
+#: Menus.cpp:1037
 msgid "Move Focus to Next and Change Selection\tShift+Down"
-msgstr "Przesuñ do nastêpnej i zmieñ zaznaczenie\tShift+Strza³ka w dó³"
+msgstr "Przesuń do następnej i zmień zaznaczenie\tShift+Strzałka w dół"
 
-#: Menus.cpp:903
+#: Menus.cpp:1038
 msgid "Toggle Focused Track\tReturn"
-msgstr "Przemieszczaj siê pomiêdzy ¶cie¿kami\tReturn"
+msgstr "Przemieszczaj się pomiędzy ścieżkami\tReturn"
 
-#: Menus.cpp:904
+#: Menus.cpp:1039
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
-msgstr "Przemieszczaj siê pomiêdzy ¶cie¿kami\tNUMPAD_ENTER"
+msgstr "Przemieszczaj się pomiędzy ścieżkami\tNUMPAD_ENTER"
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Przemieszczaj siê pomiêdzy ¶cie¿kami\tCtrl+Spacja"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
-#: ../src/Menus.cpp:549
+#: Menus.cpp:1042
 msgid "Cursor Left\tLeft"
 msgstr "Kursor Lewy\tLewy"
 
-#: ../src/Menus.cpp:550
+#: Menus.cpp:1043
 msgid "Cursor Right\tRight"
 msgstr "Kursor Prawy\tPrawy"
 
-#: Menus.cpp:820
+#: Menus.cpp:1044
 msgid "Cursor Short Jump Left\t,"
 msgstr "Kursor lekko w lewo\t,"
 
-#: Menus.cpp:821
+#: Menus.cpp:1045
 msgid "Cursor Short Jump Right\t."
 msgstr "Kursor lekko w prawo\t."
 
-#: Menus.cpp:822
+#: Menus.cpp:1046
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr "Kursor mocno w lewo\tShift+,"
 
-#: Menus.cpp:823
+#: Menus.cpp:1047
 msgid "Cursor Long Jump Right\tShift+."
 msgstr "Kursor mocno w prawo\tShift+."
 
-#: ../src/Menus.cpp:551
+#: Menus.cpp:1049
 msgid "Selection Extend Left\tShift+Left"
-msgstr "Powiêksz zaznaczenie w Lewo\tShift+Lewo"
+msgstr "Powiększ zaznaczenie w Lewo\tShift+Lewo"
 
-#: ../src/Menus.cpp:552
+#: Menus.cpp:1050
 msgid "Selection Extend Right\tShift+Right"
-msgstr "Powiêksz zaznaczenie w prawo\tShift+Prawo"
+msgstr "Powiększ zaznaczenie w prawo\tShift+Prawo"
 
-#: Menus.cpp:828
+#: Menus.cpp:1052
 msgid "Set (or Extend) Left Selection"
 msgstr "Ustaw (lub Rozszerz) Lewe Zaznaczenie"
 
-#: Menus.cpp:829
+#: Menus.cpp:1053
 msgid "Set (or Extend) Right Selection"
 msgstr "Ustaw (lub Rozszerz) Prawe Zaznaczenie"
 
-#: ../src/Menus.cpp:553
+#: Menus.cpp:1055
 msgid "Selection Contract Left\tCtrl+Shift+Right"
-msgstr "Zmniejszenie zaznaczenia od lewej\tCtrl+Shift+Prawa strza³ka"
+msgstr "Zmniejszenie zaznaczenia od lewej\tCtrl+Shift+Prawa strzałka"
 
-#: ../src/Menus.cpp:554
+#: Menus.cpp:1056
 msgid "Selection Contract Right\tCtrl+Shift+Left"
-msgstr "Zmniejszenie zaznaczenia z prawej strony\tCtrl+Shift+Lewa strza³ka"
+msgstr "Zmniejszenie zaznaczenia z prawej strony\tCtrl+Shift+Lewa strzałka"
 
-#: Menus.cpp:916
+#: Menus.cpp:1058
 msgid "Change pan on focused track\tShift+P"
-msgstr "Zmieñ przesuniêcie na zaznaczonej ¶cie¿ce\tShift+P"
+msgstr "Zmień przesunięcie na zaznaczonej ścieżce\tShift+P"
 
-#: Menus.cpp:917
+#: Menus.cpp:1059
 msgid "Pan left on focused track\tAlt+Shift+Left"
-msgstr "Przesuñ w lewo na zaznaczonej ¶cie¿ce\tAlt+Shift+Lewa strza³ka"
+msgstr "Przesuń w lewo na zaznaczonej ścieżce\tAlt+Shift+Lewa strzałka"
 
-#: Menus.cpp:918
+#: Menus.cpp:1060
 msgid "Pan right on focused track\tAlt+Shift+Right"
-msgstr "Przesuñ w prawo na zaznaczonej ¶cie¿ce\tAlt+Shift+Prawa strza³ka"
+msgstr "Przesuń w prawo na zaznaczonej ścieżce\tAlt+Shift+Prawa strzałka"
 
-#: Menus.cpp:919
+#: Menus.cpp:1061
 msgid "Change gain on focused track\tShift+G"
-msgstr "Zmieñ moc sygna³u na zaznaczonej ¶cie¿ce\tShift+G"
+msgstr "Zmień moc sygnału na zaznaczonej ścieżce\tShift+G"
 
-#: Menus.cpp:920
+#: Menus.cpp:1062
 msgid "Increase gain on focused track\tAlt+Shift+Up"
-msgstr "Podnie¶ moc sygna³u na zaznaczonej ¶cie¿ce\tAlt+Shift+Strza³ka w górê"
+msgstr "Podnieś moc sygnału na zaznaczonej ścieżce\tAlt+Shift+Strzałka w górę"
 
-#: Menus.cpp:921
+#: Menus.cpp:1063
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
-msgstr "Obni¿yæ moc sygna³u na zaznaczonej ¶cie¿ce\tAlt+Shift+Strza³ka w dó³"
+msgstr "Obniżyć moc sygnału na zaznaczonej ścieżce\tAlt+Shift+Strzałka w dół"
 
-#: Menus.cpp:922
+#: Menus.cpp:1064
 msgid "Open menu on focused track\tShift+M"
-msgstr "Otwórz menu na zaznaczonej ¶cie¿ce\tShift+M"
+msgstr "Otwórz menu na zaznaczonej ścieżce\tShift+M"
 
-#: Menus.cpp:923
+#: Menus.cpp:1065
 msgid "Mute/Unmute focused track\tShift+U"
-msgstr "Wycisz/Zg³o¶nij zaznaczon± ¶cie¿kê\tShift+U"
+msgstr "Wycisz/Zgłośnij zaznaczoną ścieżkę\tShift+U"
 
-#: Menus.cpp:924
+#: Menus.cpp:1066
 msgid "Solo/Unsolo focused track\tShift+S"
-msgstr "Oddziel/Rozdziel zaznaczon± ¶cie¿kê\tShift+S"
+msgstr "Oddziel/Rozdziel zaznaczoną ścieżkę\tShift+S"
 
-#: Menus.cpp:925
+#: Menus.cpp:1067
 msgid "Close focused track\tShift+C"
-msgstr "Zamknij zaznaczon± ¶cie¿kê\tShift+C"
+msgstr "Zamknij zaznaczoną ścieżkę\tShift+C"
 
-#: Menus.cpp:845
+#: Menus.cpp:1069
 msgid "Snap To On"
-msgstr "W³±cz"
+msgstr "WÅ‚Ä…cz"
 
-#: Menus.cpp:846
+#: Menus.cpp:1070
 msgid "Snap To Off"
-msgstr "Wy³±cz"
+msgstr "Wyłącz"
+
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
 
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:939
+#: Menus.cpp:1157
 msgid "Open Recent"
-msgstr "Otwórz niedawne"
+msgstr "Otwórz niedawne"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:942
-msgid "Recent &Files..."
+#: Menus.cpp:1160
+#, fuzzy
+msgid "Recent &Files"
 msgstr "Niedawne &Pliki..."
 
-#: ../src/Menus.cpp:584
+#: Menus.cpp:1209
 #, c-format
 msgid "&Undo %s"
 msgstr "&Cofnij %s"
 
-#: ../src/Menus.cpp:590
+#: Menus.cpp:1235
 msgid "Can't Undo"
-msgstr "Nie mo¿na cofn±æ"
+msgstr "Nie można cofnąć"
 
-#: ../src/Menus.cpp:597
+#: Menus.cpp:1244
 #, c-format
 msgid "&Redo %s"
-msgstr "&Przywróæ %s"
+msgstr "&Przywróć %s"
 
-#: ../src/Menus.cpp:603
+#: Menus.cpp:1250
 msgid "Can't Redo"
-msgstr "Nie mo¿na przywróciæ"
+msgstr "Nie można przywrócić"
 
-#: Menus.cpp:1557
+#: Menus.cpp:1856
 msgid "Sort By Time"
-msgstr "Sortuj wed³ug czasu"
+msgstr "Sortuj według czasu"
 
-#: Menus.cpp:1557
+#: Menus.cpp:1856
 msgid "Tracks sorted by time"
-msgstr "¦cie¿ki posortowane wed³ug czasu"
+msgstr "Ścieżki posortowane według czasu"
 
-#: Menus.cpp:1583
+#: Menus.cpp:1882
 msgid "Sort By Name"
-msgstr "Sortuj wed³ug nazw"
+msgstr "Sortuj według nazw"
 
-#: Menus.cpp:1583
+#: Menus.cpp:1882
 msgid "Tracks sorted by name"
-msgstr "¦cie¿ki posortowane wed³ug nazwy"
+msgstr "Ścieżki posortowane według nazwy"
 
-#: Menus.cpp:1710
+#: Menus.cpp:2033
 msgid "Set Left Selection Bound"
-msgstr "Wyznacz lew± granicê zaznaczenia"
+msgstr "Wyznacz lewÄ… granicÄ™ zaznaczenia"
 
-#: Menus.cpp:1744
+#: Menus.cpp:2068
 msgid "Set Right Selection Bound"
-msgstr "Wyznacz praw± granicê zaznaczenia"
+msgstr "Wyznacz prawÄ… granicÄ™ zaznaczenia"
 
-#: ../src/Menus.cpp:1189
+#: Menus.cpp:2337
 msgid "You must select a track first."
-msgstr "Proszê najpierw zaznaczyæ ¶cie¿kê."
+msgstr "Proszę najpierw zaznaczyć ścieżkę."
 
-#: ../src/Menus.cpp:1212
+#: Menus.cpp:2369
 #, c-format
 msgid "Repeat %s\tCtrl+R"
-msgstr "Powtórz %s\tCtrl+R"
+msgstr "Powtórz %s\tCtrl+R"
 
-#: ../src/Menus.cpp:1316
+#: Menus.cpp:2512
 msgid "There are no label tracks to export."
-msgstr "Nie ma ¶cie¿ek z etykiet± do eksportu."
+msgstr "Nie ma ścieżek z etykietą do eksportu."
 
-#: ../src/Menus.cpp:1600
+#: Menus.cpp:2607
+#, fuzzy
+msgid "Export MIDI As:"
+msgstr "Importuj MIDI..."
+
+#: Menus.cpp:2611
+#, fuzzy
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "Wszystkie pliki (*.*)|*.*|Pliki MIDI (*.mid)|*.mid|Pliki Allegro (*.gro)|*.gro"
+
+#: Menus.cpp:2643
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2644
+#, fuzzy
+msgid "Export MIDI"
+msgstr "Importuj MIDI..."
+
+#: Menus.cpp:2702
 msgid "Nothing to undo"
-msgstr "Nic do cofniêcia"
+msgstr "Nic do cofnięcia"
 
-#: ../src/Menus.cpp:1619
+#: Menus.cpp:2722
 msgid "Nothing to redo"
-msgstr "Nic do przywrócenia"
+msgstr "Nic do przywrócenia"
 
-#: ../src/EditToolBar.cpp:148
-#: ../src/Menus.cpp:1677
+#: Menus.cpp:2809
+#: TrackPanel.cpp:596
+#: toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Wytnij"
 
-#: ../src/Menus.cpp:1677
+#: Menus.cpp:2809
 msgid "Cut to the clipboard"
 msgstr "Wytnij do schowka"
 
-#: Menus.cpp:2468
+#: Menus.cpp:2849
 msgid "Split Cut"
-msgstr "Rozdziel ciêcie"
+msgstr "Rozdziel cięcie"
 
-#: Menus.cpp:2468
+#: Menus.cpp:2849
 msgid "Split-cut to the clipboard"
-msgstr "Rozdziel ciêcie do schowka"
+msgstr "Rozdziel cięcie do schowka"
 
-#: ../src/EditToolBar.cpp:152
-#: ../src/Menus.cpp:1782
-#: ../src/Menus.cpp:1826
+#: Menus.cpp:2914
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+#: TrackPanel.cpp:598
+#: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Wklej"
 
-#: Menus.cpp:2530
+#: Menus.cpp:2914
 msgid "Pasted text from the clipboard"
 msgstr "Wklejony tekst ze schowka"
 
-#: ../src/Menus.cpp:1782
-#: ../src/Menus.cpp:1826
+#: Menus.cpp:2986
+#: Menus.cpp:3178
 msgid "Pasted from the clipboard"
 msgstr "Wklejone ze schowka"
 
-#: Menus.cpp:2628
+#: Menus.cpp:3052
+#, fuzzy
+msgid "Pasting one type of track into another is not allowed."
+msgstr "Nie wolno kopiować dźwięku stereo do ścieżki mono."
+
+#: Menus.cpp:3064
 msgid "Copying stereo audio into a mono track is not allowed."
-msgstr "Nie wolno kopiowaæ d¼wiêku stereo do ¶cie¿ki mono."
+msgstr "Nie wolno kopiować dźwięku stereo do ścieżki mono."
 
-#: ../src/Menus.cpp:1866
+#: Menus.cpp:3214
+#: toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "Przytnij"
 
-#: ../src/Menus.cpp:1866
+#: Menus.cpp:3214
 msgid "Trim file to selection"
 msgstr "Przytnij plik do zaznaczenia"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3243
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
-msgstr "Rozdziel-usuniête %.2f seconds at t=%.2f"
+msgstr "Rozdziel-usunięte %.2f seconds at t=%.2f"
 
-#: Menus.cpp:2750
+#: Menus.cpp:3246
 msgid "Split Delete"
-msgstr "Rozdziel Usuñ"
+msgstr "Rozdziel Usuń"
 
-#: Menus.cpp:2771
+#: Menus.cpp:3267
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr "Rozdzielone %.2f sekundy w t=%.2f"
 
-#: Menus.cpp:2774
+#: Menus.cpp:3270
 msgid "Disjoin"
 msgstr "Rozdziel"
 
-#: Menus.cpp:2795
+#: Menus.cpp:3291
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
-msgstr "Po³±czone %.2f sekundy w t=%.2f"
+msgstr "Połączone %.2f sekundy w t=%.2f"
 
-#: Menus.cpp:2798
+#: Menus.cpp:3294
 msgid "Join"
-msgstr "Po³±cz"
+msgstr "Połącz"
 
-#: ../src/Menus.cpp:1890
+#: Menus.cpp:3313
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
-msgstr "Wyciszono zaznaczone ¶cie¿ki o d³ugo¶ci %.2f sekund od pozycji %.2f"
+msgstr "Wyciszono zaznaczone ścieżki o długości %.2f sekund od pozycji %.2f"
 
-#: ../src/Menus.cpp:1892
-#: ../src/effects/Silence.h:27
+#: Menus.cpp:3315
+#: toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Cisza"
 
-#: ../src/Menus.cpp:1926
+#: Menus.cpp:3349
 msgid "Duplicate"
 msgstr "Duplikuj"
 
-#: ../src/Menus.cpp:1926
+#: Menus.cpp:3349
 msgid "Duplicated"
 msgstr "Zduplikowane"
 
-#: Menus.cpp:2872
+#: Menus.cpp:3368
 msgid "Cut Labels"
 msgstr "Wytnij Etykiety"
 
-#: Menus.cpp:2872
+#: Menus.cpp:3368
 msgid "Cut labeled regions to the clipboard"
 msgstr "Wytnij zaznaczone obszary do schowka"
 
-#: Menus.cpp:2886
+#: Menus.cpp:3382
 msgid "SplitCut labeled regions to the clipboard"
-msgstr "Rozdziel Wyciête zaznaczone obszary do schowka"
+msgstr "Rozdziel Wycięte zaznaczone obszary do schowka"
 
-#: Menus.cpp:2887
+#: Menus.cpp:3383
 msgid "Split Cut Labels"
-msgstr "Rozdziel Wyciête Etykiety"
+msgstr "Rozdziel Wycięte Etykiety"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3397
 msgid "Copied labeled regions to the clipboard"
 msgstr "Skopiowane zaznaczone obszary do schowka"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3397
 msgid "Copy Labels"
 msgstr "Kopiuj etykiety"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3409
 msgid "Delete Labels"
-msgstr "Usuñ etykiety"
+msgstr "Usuń etykiety"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3409
 msgid "Deleted labeled regions"
-msgstr "Usuniête zaznaczone obszary "
+msgstr "Usunięte zaznaczone obszary "
 
-#: Menus.cpp:2925
+#: Menus.cpp:3421
 msgid "Split Delete Labels"
-msgstr "Rozdziel Usuñ Etykiety"
+msgstr "Rozdziel Usuń Etykiety"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3421
 msgid "Split Deleted labeled regions"
-msgstr "Rozdziel Usuniête obszary etykiet"
+msgstr "Rozdziel Usunięte obszary etykiet"
 
-#: Menus.cpp:2937
+#: Menus.cpp:3433
 msgid "Silence Labels"
 msgstr "Cisza Etykiety"
 
-#: Menus.cpp:2937
+#: Menus.cpp:3433
 msgid "Silenced labeled regions"
 msgstr "Wyciszone zaznaczone obszary"
 
-#: Menus.cpp:2949
+#: Menus.cpp:3445
 msgid "Split Labels"
 msgstr "Rozdziel Etykiety"
 
-#: Menus.cpp:2949
+#: Menus.cpp:3445
 msgid "Split labeled regions"
 msgstr "Rozdziel zaznaczone obszary"
 
-#: Menus.cpp:2961
+#: Menus.cpp:3457
 msgid "Join Labels"
-msgstr "Po³±cz Etykiety"
+msgstr "Połącz Etykiety"
 
-#: Menus.cpp:2961
+#: Menus.cpp:3457
 msgid "Joined labeled regions"
-msgstr "Po³±czone zaznaczone obszary"
+msgstr "Połączone zaznaczone obszary"
 
-#: Menus.cpp:2973
+#: Menus.cpp:3469
 msgid "Disjoin Labels"
 msgstr "Rozdziel etykiety"
 
-#: Menus.cpp:2973
+#: Menus.cpp:3469
 msgid "Disjoined labeled regions"
 msgstr "Rozdzielone zaznaczone obszary"
 
-#: ../src/Menus.cpp:1973
-#: ../src/TrackPanel.cpp:4134
+#: Menus.cpp:3491
+#: TrackPanel.cpp:6134
 msgid "Split"
 msgstr "Rozdziel"
 
-#: Menus.cpp:3089
+#: Menus.cpp:3585
 msgid "Split New"
 msgstr "Rozdziel Nowy"
 
-#: Menus.cpp:3089
+#: Menus.cpp:3585
 msgid "Split to new track"
-msgstr "Rozdziel do nowej ¶cie¿ki"
+msgstr "Rozdziel do nowej ścieżki"
 
-#: ../src/Menus.cpp:2056
+#: Menus.cpp:3668
 msgid "Split at labels"
 msgstr "Rozdziel przy etykietach"
 
-#: ../src/Menus.cpp:2333
+#: Menus.cpp:3969
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
-msgstr "Aby wykre¶liæ widmo, wszystkie ¶cie¿ki musz± mieæ tê sam± czêstotliwo¶æ próbkowania."
+msgstr "Aby wykreślić widmo, wszystkie ścieżki muszą mieć tę samą częstotliwość próbkowania."
 
-#: ../src/Menus.cpp:2359
+#: Menus.cpp:3995
 #, c-format
 msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
-msgstr "Zaznaczono zbyt du¿± próbkê audio. Tylko pierwsze %.1f sekund zostanie przeanalizowane."
+msgstr "Zaznaczono zbyt dużą próbkę audio. Tylko pierwsze %.1f sekund zostanie przeanalizowane."
 
-#: ../src/Menus.cpp:2624
+#: Menus.cpp:4130
 #, c-format
 msgid "Imported labels from '%s'"
 msgstr "Zaimportowano etykiety z '%s'"
 
-#: ../src/Menus.cpp:2625
+#: Menus.cpp:4131
 msgid "Import Labels"
 msgstr "Importuj Etykiety"
 
-#: ../src/Menus.cpp:2636
+#: Menus.cpp:4142
 msgid "Select a MIDI file..."
 msgstr "Zaznacz plik MIDI..."
 
-#: ../src/Menus.cpp:2640
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
+#: Menus.cpp:4146
+#, fuzzy
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
 msgstr "Wszystkie pliki (*.*)|*.*|Pliki MIDI (*.mid)|*.mid|Pliki Allegro (*.gro)|*.gro"
 
-#: ../src/Menus.cpp:2658
+#: Menus.cpp:4162
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "Zaimportowano MIDI z '%s'"
 
-#: ../src/Menus.cpp:2660
+#: Menus.cpp:4163
 msgid "Import MIDI"
 msgstr "Importuj MIDI..."
 
-#: ../src/Menus.cpp:2673
+#: Menus.cpp:4177
 msgid "Select any uncompressed audio file..."
-msgstr "Zaznacz jaki¶ niezkompresowany plik audio..."
+msgstr "Zaznacz jakiÅ› niezkompresowany plik audio..."
 
-#: ../src/Menus.cpp:2677
+#: Menus.cpp:4181
 msgid "All files (*)|*"
 msgstr "Wszystkie pliki (*.*)|*.*"
 
-#: ../src/Project.cpp:2197
-#: ../src/Project.cpp:2244
-#: ../src/import/ImportRaw.cpp:408
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-msgid "Import"
-msgstr "Importuj"
-
-#: Menus.cpp:3630
+#: Menus.cpp:4205
 msgid "Edit the metadata tags"
 msgstr "Edytuj tagi metadanych"
 
-#: Menus.cpp:3631
+#: Menus.cpp:4206
+#: export/Export.cpp:353
 msgid "Edit Metadata"
 msgstr "Edytuj Metadane"
 
-#: Menus.cpp:3631
+#: Menus.cpp:4206
 msgid "Edit Metadata tags"
 msgstr "Edytuj tagi Metadanych"
 
-#: Menus.cpp:3749
+#: Menus.cpp:4262
 #, c-format
 msgid "Rendered all audio in track '%s'"
-msgstr "Wszystkie d¼wiêki renderowane w ¶cie¿ce'%s'"
+msgstr "Wszystkie dźwięki renderowane w ścieżce'%s'"
 
-#: Menus.cpp:3750
+#: Menus.cpp:4263
 msgid "Render"
 msgstr "Renderuj"
 
-#: Menus.cpp:3755
+#: Menus.cpp:4268
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
-msgstr "Wymieszane i renderowane &d ¶cie¿ki w jedn± now± ¶cie¿kê stereo"
+msgstr "Wymieszane i renderowane %d ścieżki w jedną nową ścieżkę stereo"
 
-#: Menus.cpp:3758
+#: Menus.cpp:4271
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
-msgstr "Wymieszane i renderowane &d ¶cie¿ki w jedn± now± ¶cie¿kê mono"
+msgstr "Wymieszane i renderowane %d ścieżki w jedną nową ścieżkę mono"
 
-#: ../src/Menus.cpp:2856
+#: Menus.cpp:4273
+#: Mix.cpp:121
+msgid "&Mix and Render"
+msgstr "&Miksuj i renderuj"
+
+#: Menus.cpp:4403
 msgid "Aligned with zero"
-msgstr "Wyrównane do zera"
+msgstr "Wyrównane do zera"
 
-#: ../src/Menus.cpp:2860
+#: Menus.cpp:4407
 msgid "Aligned cursor"
-msgstr "Wyrównane do kursora"
+msgstr "Wyrównane do kursora"
 
-#: ../src/Menus.cpp:2864
+#: Menus.cpp:4411
 msgid "Aligned with selection start"
-msgstr "Wyrównano z pocz±tkiem zaznaczenia"
+msgstr "Wyrównano z początkiem zaznaczenia"
 
-#: ../src/Menus.cpp:2868
+#: Menus.cpp:4415
 msgid "Aligned with selection end"
-msgstr "Wyrównano z koñcem zaznaczenia"
+msgstr "Wyrównano z końcem zaznaczenia"
 
-#: ../src/Menus.cpp:2872
+#: Menus.cpp:4419
 msgid "Aligned end with cursor"
-msgstr "Wyrównano koniec z kursorem"
+msgstr "Wyrównano koniec z kursorem"
 
-#: ../src/Menus.cpp:2876
+#: Menus.cpp:4423
 msgid "Aligned end with selection start"
-msgstr "Wyrównano koniec z pocz±tkiem zaznaczenia"
+msgstr "Wyrównano koniec z początkiem zaznaczenia"
 
-#: ../src/Menus.cpp:2880
+#: Menus.cpp:4427
 msgid "Aligned end with selection end"
-msgstr "Wyrównano koniec z koñcem zaznaczenia"
+msgstr "Wyrównano koniec z końcem zaznaczenia"
 
-#: ../src/Menus.cpp:2884
+#: Menus.cpp:4431
 msgid "Aligned"
-msgstr "Wyrównane"
+msgstr "Wyrównane"
 
-#: ../src/Menus.cpp:2917
+#: Menus.cpp:4464
 msgid "Align"
-msgstr "Wyrównaj"
+msgstr "Wyrównaj"
+
+#: Menus.cpp:4549
+msgid "Sync MIDI with Audio"
+msgstr ""
 
-#: ../src/Menus.cpp:2941
+#: Menus.cpp:4553
+msgid "Alignment completed."
+msgstr ""
+
+#: Menus.cpp:4564
 msgid "Created new audio track"
-msgstr "Utworzono now± ¶cie¿kê audio"
+msgstr "Utworzono nową ścieżkę audio"
 
-#: ../src/Menus.cpp:2941
-#: ../src/Menus.cpp:2965
-#: ../src/Menus.cpp:2980
-#: ../src/Menus.cpp:3016
+#: Menus.cpp:4564
+#: Menus.cpp:4587
+#: Menus.cpp:4602
+#: Menus.cpp:4622
 msgid "New Track"
-msgstr "Nowa ¦cie¿ka"
+msgstr "Nowa Ścieżka"
 
-#: ../src/Menus.cpp:2965
+#: Menus.cpp:4587
 msgid "Created new stereo audio track"
-msgstr "Utworzono now± stereofoniczn± ¶cie¿kê audio"
+msgstr "Utworzono nową stereofoniczną ścieżkę audio"
 
-#: ../src/Menus.cpp:2980
+#: Menus.cpp:4602
 msgid "Created new label track"
-msgstr "Utworzono now± etykietê ¶cie¿ki"
+msgstr "Utworzono nową etykietę ścieżki"
 
-#: ../src/Menus.cpp:3005
+#: Menus.cpp:4611
 msgid "The version of Audacity you are using does not support multiple time tracks."
-msgstr "Wersja Audacity, której u¿ywasz, nie wspiera wielu utworów naraz"
+msgstr "Wersja Audacity, której używasz, nie wspiera wielu utworów naraz"
 
-#: ../src/Menus.cpp:3016
+#: Menus.cpp:4622
 msgid "Created new time track"
-msgstr "Utworzono now± ¶cie¿kê"
+msgstr "Utworzono nową ścieżkę"
 
-#: ../src/Menus.cpp:3052
+#: Menus.cpp:4677
 msgid "Added label"
-msgstr "Dodaj etykietê"
+msgstr "Dodaj etykietÄ™"
 
-#: Menus.cpp:4119
+#: Menus.cpp:4712
 msgid "Edited labels"
 msgstr "Edytowane etykiety"
 
-#: Menus.cpp:4146
+#: Menus.cpp:4739
 msgid "Save CleanSpeech Preset File As:"
 msgstr "Zapisz Ustawienie CzystejMowy jako:"
 
-#: Menus.cpp:4150
+#: Menus.cpp:4743
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr "Ustawienia CzystejMowy (*.csp)|*.csp"
 
-#: ../src/export/Export.cpp:185
+#: Menus.cpp:4750
+#: export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
-msgstr "Przykro mi ale ¶cie¿ki do plików d³u¿sze ni¿ 256 znaków nie s± obs³ugiwane."
+msgstr "Przykro mi ale ścieżki do plików dłuższe niż 256 znaków nie są obsługiwane."
 
-#: Menus.cpp:4203
+#: Menus.cpp:4796
 msgid "Problem encountered exporting presets."
-msgstr "Problem podczas eksportowania ustawieñ."
+msgstr "Problem podczas eksportowania ustawień."
 
-#: Menus.cpp:4204
-#: export/Export.cpp:136
+#: Menus.cpp:4797
+#: export/Export.cpp:468
 msgid "Unable to export"
-msgstr "Nie mo¿na wyeskportowaæ"
+msgstr "Nie można wyeskportować"
 
-#: ../src/Menus.cpp:3086
+#: Menus.cpp:4981
 msgid "Remove Track"
-msgstr "Usuñ ¦cie¿kê "
+msgstr "Usuń Ścieżkę "
 
-#: ../src/Menus.cpp:3086
+#: Menus.cpp:4981
 msgid "Removed audio track(s)"
-msgstr "Usuniêta(e) ¶cie¿ki(a) audio"
+msgstr "Usunięta(e) ścieżki(a) audio"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr "Wprowad¼ now± czêstotliwo¶æ próbkowania:"
-
-#: Menus.cpp:4480
-#: Menus.cpp:4499
+#: Menus.cpp:5138
+#: Menus.cpp:5193
+#: export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr "Resampluj"
 
-#: Menus.cpp:4486
+#: Menus.cpp:5158
+#: TrackPanel.cpp:6361
+#, fuzzy
+msgid "New sample rate (Hz):"
+msgstr "Wprowadź nową częstotliwość próbkowania:"
+
+#: Menus.cpp:5182
+#: TrackPanel.cpp:6385
 msgid "The entered value is invalid"
-msgstr "Wprowadzona warto¶æ jest nieprawid³owa"
+msgstr "Wprowadzona wartość jest nieprawidłowa"
 
-#: Menus.cpp:4497
+#: Menus.cpp:5191
 #, c-format
 msgid "Resampling track %d"
-msgstr "Resamplowanie ¶cie¿ki &d"
+msgstr "Resamplowanie ścieżki %d"
 
-#: Menus.cpp:4508
+#: Menus.cpp:5200
 msgid "Resample Track"
-msgstr "Resampluj ¶cie¿kê"
+msgstr "Resampluj ścieżkę"
 
-#: Menus.cpp:4508
+#: Menus.cpp:5200
 msgid "Resampled audio track(s)"
-msgstr "Resamplowane ¶cie¿ki d¼wiêkowe"
+msgstr "Resamplowane ścieżki dźwiękowe"
 
-#: ../src/Mix.cpp:74
-#: ../src/Mix.cpp:82
+#: Mix.cpp:95
+#: Mix.cpp:102
 msgid "Mix"
 msgstr "Mikser"
 
-#: Mix.cpp:120
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
-msgstr "Miksowanie i renderowanie ¶cie¿ek"
+msgstr "Miksowanie i renderowanie ścieżek"
 
-#: ../src/NoteTrack.cpp:30
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "Note Track"
 
-#: ../src/Menus.cpp:1581
+#: Printing.cpp:192
 msgid "There was a problem printing."
-msgstr "Wyst±pi³ problem przy próbie wydruku"
+msgstr "Wystąpił problem przy próbie wydruku"
 
-#: ../src/Menus.cpp:1582
+#: Printing.cpp:193
 msgid "Print"
 msgstr "Drukuj"
 
-#: Project.cpp:573
+#: Project.cpp:673
 msgid "Main Mix"
-msgstr "G³owny mikser"
+msgstr "GÅ‚owny mikser"
 
-#: Project.cpp:693
+#: Project.cpp:797
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Witamy w wersji %s Audacity"
 
-#: Project.cpp:831
+#: Project.cpp:957
 msgid "(Recovered)"
 msgstr "(Odzyskane)"
 
-#: ../src/ControlToolBar.cpp:469
-#: ../src/Project.cpp:1703
-#: ../src/TrackPanel.cpp:1208
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+#: toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Nagrywanie"
 
-#: ../src/Project.cpp:1703
-#: ../src/TrackPanel.cpp:1208
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "Nagrano audio"
 
-#: ../src/Project.cpp:1712
+#: Project.cpp:1564
 msgid "Save changes before closing?"
-msgstr "Zapisaæ zmiany przed zamkniêciem?"
+msgstr "Zapisać zmiany przed zamknięciem?"
 
-#: Project.cpp:1493
-msgid ""
-"\n"
-"\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
-msgstr ""
+#: Project.cpp:1567
+#, fuzzy
+msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr "\n"
 "\n"
-"Zapisany projekt bêdzie pusty!!\n"
+"Zapisany projekt będzie pusty!!\n"
 "\n"
-"Aby zapisaæ ¶cie¿ki, które by³y poprzednio\n"
-"otwarte, kliknij Anuluj, Edytuj > Cofnij a¿ wszystkie \n"
-"¶cie¿ki bêd± otwarte i wybierz Plik > Zapisz Projekt."
+"Aby zapisać ścieżki, które były poprzednio\n"
+"otwarte, kliknij Anuluj, Edytuj > Cofnij aż wszystkie \n"
+"ścieżki będą otwarte i wybierz Plik > Zapisz Projekt."
 
-#: ../src/Project.cpp:1713
+#: Project.cpp:1570
 msgid "Save changes?"
-msgstr "Zapisaæ zmiany?"
+msgstr "Zapisać zmiany?"
 
-#: Project.cpp:1684
+#: Project.cpp:1772
 msgid "All files|*.*|All supported files|"
 msgstr "Wszystkie pliki|*.*|Wszystkie wspierane pliki|"
 
-#: ../src/Menus.cpp:2559
-#: ../src/Project.cpp:1734
+#: Project.cpp:1802
 msgid "Select one or more audio files..."
-msgstr "Zaznacz jeden lub wiêcej plików audio..."
+msgstr "Zaznacz jeden lub więcej plików audio..."
 
-#: Project.cpp:1736
+#: Project.cpp:1829
 msgid "Audacity projects|*.aup|"
 msgstr "Projekty Audacity|*.aup|"
 
-#: ../src/Project.cpp:1815
-#: ../src/Project.cpp:1823
+#: Project.cpp:1882
+#: Project.cpp:2304
+#, fuzzy, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr "Plik został zapisany przez Audacity %s, o wiele\n"
+"starszą wersję Audacity.  Format się zmienił.\n"
+"Audacity prawdopodobnie zniszczy plik\n"
+"próbując go otworzyć. Powinieneś najpierw stworzyć\n"
+"kopiÄ™ projektu.\n"
+"\n"
+"Czy chciałbyś spróbować otworzyć plik\n"
+"mimo wszystko?"
+
+#: Project.cpp:1883
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1889
+#: Project.cpp:2316
+msgid "Opening old project file"
+msgstr "Otwieranie starego pliku projektu"
+
+#: Project.cpp:1915
+#: Project.cpp:1923
 msgid "Error opening file"
-msgstr "B³±d otwarcia pliku"
+msgstr "BÅ‚Ä…d otwarcia pliku"
 
-#: Project.cpp:1585
+#: Project.cpp:1929
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Plik mo¿e byæ skorumpowany  \n"
+msgstr "Plik może być skorumpowany  \n"
 "%s"
 
-#: Project.cpp:1586
+#: Project.cpp:1930
 msgid "Error opening file or project"
-msgstr "B³±d podczas otwierania pliku lub projektu"
+msgstr "BÅ‚Ä…d podczas otwierania pliku lub projektu"
 
-#: ../src/Project.cpp:1836
+#: Project.cpp:1950
 msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
-msgstr "Audacity nie mog³o przekonwertowaæ plików projektu  Audacity 1.0 do nowego formatu."
+msgstr "Audacity nie mogło przekonwertować plików projektu  Audacity 1.0 do nowego formatu."
 
-#: Project.cpp:1706
+#: Project.cpp:2053
 msgid "Could not remove old auto save file"
-msgstr "Nie mo¿na usun±æ starego, zachowanego pliku"
+msgstr "Nie można usunąć starego, zachowanego pliku"
 
-#: Project.cpp:1708
+#: Project.cpp:2055
 msgid "Project was recovered"
-msgstr "Projekt zosta³ odzyskany"
+msgstr "Projekt został odzyskany"
 
-#: Project.cpp:1708
+#: Project.cpp:2055
 msgid "Recover"
 msgstr "Odzyskaj"
 
-#: Project.cpp:1737
+#: Project.cpp:2084
 msgid "Project checker repaired file"
-msgstr "Tester projektu odzyska³ plik"
+msgstr "Tester projektu odzyskał plik"
 
-#: Project.cpp:1737
+#: Project.cpp:2084
 #: effects/Repair.h:29
 msgid "Repair"
 msgstr "Napraw"
 
-#: ../src/Project.cpp:1926
+#: Project.cpp:2230
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
-msgstr "Nie mo¿na odnale¼æ katalogu projektu: \"%s\""
+msgstr "Nie można odnaleźć katalogu projektu: \"%s\""
 
-#: Project.cpp:1886
+#: Project.cpp:2273
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Plik zosta³ zapisany u¿ywaj±c Audacity %s. \n"
-"U¿ywasz Audacity %s - powiniene¶ uaktualniæ do  \n"
-"nowszej wersji, aby otworzyæ ten plik."
+msgstr "Plik został zapisany używając Audacity %s. \n"
+"Używasz Audacity %s - powinieneś uaktualnić do  \n"
+"nowszej wersji, aby otworzyć ten plik."
 
-#: Project.cpp:1890
+#: Project.cpp:2277
 msgid "Can't open project file"
-msgstr "Nie mo¿na otworzyæ pliku projektu"
+msgstr "Nie można otworzyć pliku projektu"
 
-#: Project.cpp:2131
-#, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+#: Project.cpp:2311
+#, fuzzy, c-format
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
-msgstr ""
-"Plik zosta³ zapisany przez Audacity %s, o wiele\n"
-"starsz± wersjê Audacity.  Format siê zmieni³.\n"
-"Audacity prawdopodobnie zniszczy plik\n"
-"próbuj±c go otworzyæ. Powiniene¶ najpierw stworzyæ\n"
-"kopiê projektu.\n"
+"Open this file now?"
+msgstr "Plik został zapisany przez Audacity %s i format się\n"
+"zmienił.  Ta wersja Audacity może spróbować\n"
+"go otworzyć, ale mogą pojawić się problemy. Powinieneś\n"
+"stworzyć kopię.\n"
 "\n"
-"Czy chcia³by¶ spróbowaæ otworzyæ plik\n"
+"Po zapisaniu pliku w tej wersji  Audacity,\n"
+"nie będziesz mógł już go otworzyć w starszej\n"
+"wersji. Czy chciałbyś otworzyć plik\n"
 "mimo wszystko?"
 
-#: Project.cpp:2138
-#, c-format
-msgid ""
-"This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
-msgstr ""
-"Plik zosta³ zapisany przez Audacity %s i format siê\n"
-"zmieni³.  Ta wersja Audacity mo¿e spróbowaæ\n"
-"go otworzyæ, ale mog± pojawiæ siê problemy. Powiniene¶\n"
-"stworzyæ kopiê.\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"Po zapisaniu pliku w tej wersji  Audacity,\n"
-"nie bêdziesz móg³ ju¿ go otworzyæ w starszej\n"
-"wersji. Czy chcia³by¶ otworzyæ plik\n"
-"mimo wszystko?"
-
-#: Project.cpp:1902
-msgid "Opening old project file"
-msgstr "Otwieranie starego pliku projektu"
+"Save anyway?"
+msgstr ""
 
-#: Project.cpp:2124
-#, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
-"Nie mo¿na zapisaæ projektu. Mo¿e %s nie jest zapisywalny,\n"
-" lub dysk jest zape³niony."
 
-#: ../src/Project.cpp:2109
-#: ../src/Project.cpp:2121
+#: Project.cpp:2588
+#, fuzzy, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr "Nie można zapisać projektu. Może %s nie jest zapisywalny,\n"
+" lub dysk jest zapełniony."
+
+#: Project.cpp:2590
+#: Project.cpp:2605
 msgid "Error saving project"
-msgstr "B³±d zapisu projektu"
+msgstr "BÅ‚Ä…d zapisu projektu"
 
-#: ../src/Project.cpp:2161
+#: Project.cpp:2680
 #, c-format
 msgid "Saved %s"
 msgstr "Zapisany %s7"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2189
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr "Importowanie %s..."
-
-#: ../src/Project.cpp:2243
+#: Project.cpp:2806
 #, c-format
 msgid "Imported '%s'"
 msgstr "Zaimportowano '%s'"
 
-#: ../src/Project.cpp:2285
+#: Project.cpp:2807
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "Importuj"
+
+#: Project.cpp:2840
+#: Project.cpp:2848
 msgid "Error importing"
-msgstr "B³±d podczas importu"
+msgstr "BÅ‚Ä…d podczas importu"
 
-#: Project.cpp:2365
+#: Project.cpp:2882
 msgid "Save Speech As:"
-msgstr "Zapisz mowê jako:"
+msgstr "Zapisz mowÄ™ jako:"
 
-#: Project.cpp:2499
+#: Project.cpp:2884
 msgid "Windows PCM Audio file (*.wav)|*.wav"
-msgstr "Plik d¿wiêkowy Windows PCM (*.wav)|*.wav"
+msgstr "Plik dżwiękowy Windows PCM (*.wav)|*.wav"
 
-#: ../src/Project.cpp:2313
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2891
+#, fuzzy
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr ""
-"Plik projektu programu Audacity (.aup) zapamiêtuje ca³± Twoj± pracê dok³adnie tak\n"
-" jak jest przedstawiona na ekranie, jednak wiêkszo¶æ programów nie potrafi otworzyæ projektów utworzonych przy pomocy Audacity.\n"
+msgstr "Plik projektu programu Audacity (.aup) zapamiętuje całą Twoją pracę dokładnie tak\n"
+" jak jest przedstawiona na ekranie, jednak większość programów nie potrafi otworzyć projektów utworzonych przy pomocy Audacity.\n"
 "\n"
-"Je¿eli chcesz zapisaæ plik tak ¿eby mo¿na go by³o otworzyæ przy pomocy innych progamów, wybierz jedn± z dostêpnych opcji Eksportu."
+"Jeżeli chcesz zapisać plik tak żeby można go było otworzyć przy pomocy innych progamów, wybierz jedną z dostępnych opcji Eksportu."
 
-#: ../src/Project.cpp:2323
+#: Project.cpp:2894
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
+
+#: Project.cpp:2898
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Projekty Audacity (*.aup)|*.aup"
 
-#: ../src/Project.cpp:2350
+#: Project.cpp:2952
 msgid "Created new project"
 msgstr "Utworzono nowy projekt"
 
-#: ../src/Project.cpp:2463
+#: Project.cpp:3111
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Skasowane %.2f sekund przy t=%.2f"
 
-#: ../src/Project.cpp:2466
+#: Project.cpp:3114
+#: effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Kasuj"
 
-#: Project.cpp:2738
+#: Project.cpp:3308
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
-msgstr "Pozosta³a ilo¶æ przestrzeni dyskowej %d godzin i %d minut."
+msgstr "Pozostała ilość przestrzeni dyskowej %d godzin i %d minut."
 
-#: Project.cpp:2741
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
-msgstr "Pozosta³a przestrzeñ dyskowa 1 godzina i %d minut."
+msgstr "Pozostała przestrzeń dyskowa 1 godzina i %d minut."
 
-#: Project.cpp:2744
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording %d minutes."
-msgstr "Pozosta³a przestrzeæ dyskowa %d minut."
+msgstr "Pozostała przestrzeć dyskowa %d minut."
 
-#: Project.cpp:2747
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d seconds."
-msgstr "Pozosta³a przestrzeæ dyskowa %d sekund."
+msgstr "Pozostała przestrzeć dyskowa %d sekund."
 
-#: ../src/Project.cpp:2642
+#: Project.cpp:3320
 msgid "Out of disk space"
-msgstr "Za ma³o miejsca na dysku"
+msgstr "Za mało miejsca na dysku"
+
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
 
-#: Project.cpp:3027
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3614
 msgid "Could not remove old autosave file: "
-msgstr "Nie mo¿na usun±æ starych plików"
+msgstr "Nie można usunąć starych plików"
 
-#: Project.cpp:3068
+#: Project.cpp:3655
 msgid "New Project"
 msgstr "Nowy projekt"
 
-#: Project.cpp:3081
+#: Project.cpp:3668
 msgid "Error writing autosave file"
-msgstr "B³±d podczas automatycznego zapisu pliku"
+msgstr "BÅ‚Ä…d podczas automatycznego zapisu pliku"
 
-#: Project.cpp:3102
+#: Project.cpp:3693
 msgid "Could not create autosave file: "
-msgstr "Nie mo¿na stworzyæ pliku automatycznego zapisu"
+msgstr "Nie można stworzyć pliku automatycznego zapisu"
 
-#: Project.cpp:3385
+#: Project.cpp:3719
 #, c-format
 msgid "Actual Rate: %d"
-msgstr "Aktualna czêstotliwo¶æ %d"
+msgstr "Aktualna częstotliwość %d"
 
-#: ../src/Resample.cpp:35
+#: Resample.cpp:42
 msgid "Libresample by Dominic Mazzoni and Julius Smith"
 msgstr "Libresample ( autorzy: Dominic Mazzoni & Julius Smith)"
 
-#: ../src/Resample.cpp:46
+#: Resample.cpp:53
 msgid "High-quality Sinc Interpolation"
-msgstr "Wysokiej jako¶ci Sinc Interpolation "
+msgstr "Wysokiej jakości Sinc Interpolation "
 
-#: ../src/Resample.cpp:48
+#: Resample.cpp:55
 msgid "Fast Sinc Interpolation"
 msgstr "Fast Sinc Interpolation"
 
-#: ../src/Resample.cpp:118
+#: Resample.cpp:125
 msgid "Libsamplerate by Erik de Castro Lopo"
 msgstr "Libsamplerate (autor: Erik de Castro Lopo)"
 
-#: ../src/Resample.cpp:211
+#: Resample.cpp:218
 #, c-format
 msgid "Libsamplerate error: %d\n"
-msgstr "B³±d Libsamplerate: %d\n"
+msgstr "BÅ‚Ä…d Libsamplerate: %d\n"
 
-#: ../src/Resample.cpp:233
-#: ../src/Resample.cpp:243
+#: Resample.cpp:240
+#: Resample.cpp:250
 msgid "Resampling disabled."
-msgstr "Zmiana czêstotliwo¶ci próbkowania zablokowana."
+msgstr "Zmiana częstotliwości próbkowania zablokowana."
 
 #. i18n-hint: Audio data bit depth (precison): 16-bit integers
 #: SampleFormat.cpp:66
@@ -2953,834 +3425,793 @@ msgstr "Zapisane"
 
 #: Screenshot.cpp:387
 msgid "Error trying to save file: "
-msgstr "B³±d zapisu pliku:"
+msgstr "BÅ‚Ä…d zapisu pliku:"
 
-#: Sequence.cpp:732
-#: Sequence.cpp:742
-#: Sequence.cpp:749
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
 msgid "Gap detected in project file\n"
-msgstr "W projekcie wykryto przerwê\n"
+msgstr "W projekcie wykryto przerwÄ™\n"
 
-#: effects/Effect.cpp:254
-#: effects/Effect.cpp:370
-#: effects/Phaser.cpp:595
-#: effects/Wahwah.cpp:582
-#: effects/audiounits/AudioUnitEffect.cpp:852
+#: ShuttleGui.cpp:1972
+#: effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
-msgstr "Pod&gl±d"
+msgstr "Pod&glÄ…d"
 
-#: effects/nyquist/Nyquist.cpp:826
-#: effects/nyquist/Nyquist.cpp:990
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "&Naprawianie"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
+#: SoundActivatedRecord.cpp:36
+#, fuzzy
+msgid "Sound Activated Record"
 msgstr "Nagrywanie czasowe Audacity"
 
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Pocz±tek nagrywania"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Koniec nagrywania"
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr "Czas trwania"
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr "Postêp nagrywania Audacity"
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr "Data i czas pocz±tku"
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr "Data i czas koñca"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Oczekiwanie na rozpoczêcie nagrywania o %s.\n"
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Nagrywanie Audacity - Oczekiwanie na rozpoczêcie"
+#: SoundActivatedRecord.cpp:58
+#, fuzzy
+msgid "Activation level (dB):"
+msgstr "Poziom Ciszy (dB):"
 
-#: SplashDialog.cpp:58
+#: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
 msgstr "&Witamy w Audacity!"
 
-#: SplashDialog.cpp:110
+#: SplashDialog.cpp:112
 msgid "Don't show this again at start up"
-msgstr "Nie pokazuj tego wiêcej na starcie"
+msgstr "Nie pokazuj tego więcej na starcie"
 
-#: Tags.cpp:621
+#: Tags.cpp:640
 msgid "Artist Name"
 msgstr "Nazwisko Artysty"
 
-#: Tags.cpp:622
+#: Tags.cpp:641
 msgid "Track Title"
-msgstr "Tytu³ utworu"
+msgstr "Tytuł utworu"
 
-#: Tags.cpp:623
+#: Tags.cpp:642
 msgid "Album Title"
-msgstr "Tytu³ albumu"
+msgstr "Tytuł albumu"
 
-#: Tags.cpp:953
+#: Tags.cpp:643
 msgid "Track Number"
-msgstr "Numer ¶cie¿ki"
+msgstr "Numer ścieżki"
 
-#: ../src/Tags.cpp:465
+#: Tags.cpp:644
+#: Tags.cpp:2147
 msgid "Year"
 msgstr "Rok"
 
-#: Tags.cpp:979
+#: Tags.cpp:645
 msgid "Genre"
 msgstr "Gatunek"
 
-#: ../src/Tags.cpp:475
+#: Tags.cpp:646
+#: Tags.cpp:2157
+#: prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Komentarze"
 
-#: Tags.cpp:745
-#: Tags.cpp:1985
-msgid "Press F2 or double click to edit."
-msgstr "Naci¶nij F2 lub kliknij dwukrotnie, aby edytowaæ."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
-#: Tags.cpp:769
+#: Tags.cpp:813
 msgid "Tag Name"
 msgstr "Nazwa Tagu"
 
-#: Tags.cpp:770
+#: Tags.cpp:814
 msgid "Tag Value"
-msgstr "Warto¶æ Tagu"
+msgstr "Wartość Tagu"
 
-#: prefs/KeyConfigPrefs.cpp:114
+#: Tags.cpp:829
+#: Tags.cpp:1486
+#: prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
-msgstr "&Wyczy¶æ"
+msgstr "&Wyczyść"
 
-#: Tags.cpp:791
+#: Tags.cpp:835
 msgid "Genres"
 msgstr "Rodzaje"
 
-#: toolbars/EditToolBar.cpp:75
-msgid "Edit"
-msgstr "Edytuj"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:796
-#: Tags.cpp:1948
-msgid "Reset"
-msgstr "Resetuj"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
-#: Tags.cpp:1070
+#: Tags.cpp:845
+#: Tags.cpp:1470
+#: Tags.cpp:1997
 msgid "Template"
-msgstr "Wzór"
+msgstr "Wzór"
 
-#: Tags.cpp:1073
-#: prefs/KeyConfigPrefs.cpp:124
+#: Tags.cpp:849
+#: Tags.cpp:1474
+#: Tags.cpp:2001
+#: prefs/KeyConfigPrefs.cpp:126
 msgid "&Load..."
-msgstr "&£aduj..."
+msgstr "&Ładuj..."
 
-#: Tags.cpp:1078
-#: prefs/KeyConfigPrefs.cpp:123
+#: Tags.cpp:850
+#: Tags.cpp:1475
+#: Tags.cpp:2002
+#: prefs/KeyConfigPrefs.cpp:125
 msgid "&Save..."
 msgstr "&Zapisz"
 
-#: Tags.cpp:808
-#: Tags.cpp:1434
-#: Tags.cpp:1962
+#: Tags.cpp:852
+#: Tags.cpp:1477
+#: Tags.cpp:2004
 msgid "S&et Default"
-msgstr "U&staw domy¶lne"
+msgstr "U&staw domyślne"
 
-#: Tags.cpp:958
-#: Tags.cpp:1597
-#: Tags.cpp:2326
+#: Tags.cpp:1002
+#: Tags.cpp:1640
+#: Tags.cpp:2368
 msgid "Edit Genres"
 msgstr "Edytuj Rodzaje"
 
-#: Tags.cpp:991
-#: Tags.cpp:1003
-#: Tags.cpp:1019
-#: Tags.cpp:1032
-#: Tags.cpp:1635
-#: Tags.cpp:1647
-#: Tags.cpp:1663
-#: Tags.cpp:1676
-#: Tags.cpp:2369
-#: Tags.cpp:2381
-#: Tags.cpp:2397
-#: Tags.cpp:2410
+#: Tags.cpp:1035
+#: Tags.cpp:1047
+#: Tags.cpp:1062
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1690
+#: Tags.cpp:1705
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2423
+#: Tags.cpp:2438
+#: Tags.cpp:2451
 msgid "Reset Genres"
 msgstr "Resetuj Rodzaje"
 
-#: Tags.cpp:991
-#: Tags.cpp:1032
-#: Tags.cpp:1635
-#: Tags.cpp:1676
-#: Tags.cpp:2369
-#: Tags.cpp:2410
+#: Tags.cpp:1035
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2451
 msgid "Unable to save genre file."
-msgstr "Nie mo¿na zapisaæ pliku rodzaju."
+msgstr "Nie można zapisać pliku rodzaju."
 
-#: Tags.cpp:1002
-#: Tags.cpp:1646
-#: Tags.cpp:2380
+#: Tags.cpp:1046
+#: Tags.cpp:1689
+#: Tags.cpp:2422
 msgid "Are you sure you want to reset the genre list to defaults?"
-msgstr "Czy jeste¶ pewny, ¿e chcesz zresetowaæ listê rodzajów?"
+msgstr "Czy jesteś pewny, że chcesz zresetować listę rodzajów?"
 
-#: Tags.cpp:1019
-#: Tags.cpp:1663
-#: Tags.cpp:2397
+#: Tags.cpp:1062
+#: Tags.cpp:1705
+#: Tags.cpp:2438
 msgid "Unable to open genre file."
-msgstr "Nie mo¿na otworzyæ pliku z rodzajami."
-
-#: Tags.cpp:1054
-#: Tags.cpp:1108
-#: Tags.cpp:1709
-#: Tags.cpp:1745
-#: Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
-msgstr "Zapisz Metadane jako:"
+msgstr "Nie można otworzyć pliku z rodzajami."
 
-#: Tags.cpp:1079
-#: Tags.cpp:1730
-#: Tags.cpp:2453
-msgid "Error loading metadata"
-msgstr "B³±d podczas ³adowania metadanych"
-
-#: Tags.cpp:1376
-#: Tags.cpp:1935
-msgid "Title:"
-msgstr "Tytu³:"
-
-#: Tags.cpp:1377
-#: Tags.cpp:1936
-msgid "Artist:"
-msgstr "Artysta:"
-
-#: Tags.cpp:1378
-#: Tags.cpp:1937
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr "Kompozytor:"
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr "Autor tekstów:"
-
-#: Tags.cpp:1381
-#: Tags.cpp:1940
-msgid "Comments:"
-msgstr "Komentarze:"
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr "Zakodowane przez:"
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr "Prawa autorskie:"
-
-#: Tags.cpp:1391
-#: Tags.cpp:1938
-msgid "Track Number:"
-msgstr "Numer ¶cie¿ki:"
-
-#: Tags.cpp:1395
-#: Tags.cpp:1939
-msgid "Year:"
-msgstr "Rok:"
-
-#: Tags.cpp:1399
-#: Tags.cpp:1941
-msgid "Genre:"
-msgstr "Rodzaj:"
-
-#: Tags.cpp:1457
-#: Tags.cpp:2056
-msgid "No Genres"
-msgstr "Brak rodzajów:"
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr "Zresetuj"
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr "Podstawowe"
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr "Warto¶æ"
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr "Wyczy¶&æ"
-
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maksymalna d³ugo¶æ atrybutu '%s' wynosi %d znaków. Dane zosta³y uszkodzone."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Nazwa"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artysta:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album:"
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
+msgid "Error loading metadata"
+msgstr "BÅ‚Ä…d podczas Å‚adowania metadanych"
+
+#: Tags.cpp:1097
+#: Tags.cpp:1151
+#: Tags.cpp:1751
+#: Tags.cpp:1787
+#: Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "Zapisz Metadane jako:"
 
-#: Theme.cpp:629
+#: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity nie mog³a zapisaæ pliku::\n"
+msgstr "Audacity nie mogła zapisać pliku::\n"
 "  %s."
 
-#: Theme.cpp:647
+#: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity nie mog³a otworzyæ pliku:\n"
+msgstr "Audacity nie mogła otworzyć pliku:\n"
 "  %s\n"
 "do zapisu."
 
-#: Theme.cpp:655
+#: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity nie mog³a zapisaæ obrazów do pliku:\n"
+msgstr "Audacity nie mogła zapisać obrazów do pliku:\n"
 "  %s."
 
-#: Theme.cpp:790
+#: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity nie mog³a znale¼c pliku:\n"
+msgstr "Audacity nie mogła znaleźc pliku:\n"
 "  %s.\n"
-"Temat nie za³adowany."
+"Temat nie załadowany."
 
-#: Theme.cpp:798
-#: Theme.cpp:886
+#: Theme.cpp:807
+#: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity nie mog³a za³adowaæ pliku:\n"
+msgstr "Audacity nie mogła załadować pliku:\n"
 "  %s.\n"
-"Byæ mo¿e z³y format png?"
+"Być może zły format png?"
 
-#: Theme.cpp:814
-msgid ""
-"Audacity could not read its default theme.\n"
+#: Theme.cpp:823
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity nie mog³a odczytaæ domy¶lnego tematu.\n"
-"Zg³o¶ problem."
+msgstr "Audacity nie mogła odczytać domyślnego tematu.\n"
+"Zgłoś problem."
 
-#: Theme.cpp:908
+#: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Nie znaleziono ¿adnego z \n"
-" elementów tematu w:\n"
+msgstr "Nie znaleziono żadnego z \n"
+" elementów tematu w:\n"
 "  %s."
 
-#: Theme.cpp:932
+#: Theme.cpp:942
+#: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Nie uda³o siê stworzyæ katalogu:\n"
+msgstr "Nie udało się stworzyć katalogu:\n"
 "  %s"
 
-#: Theme.cpp:953
+#: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity nie mog³a zapisaæ pliku:\n"
+msgstr "Audacity nie mogła zapisać pliku:\n"
 "  %s"
 
-#: Theme.cpp:965
+#: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Wszystkie wymagane pliki w:\n"
+msgstr "Wszystkie wymagane pliki w:\n"
 "  %s\n"
-"by³y juz obecne."
+"były juz obecne."
 
 #: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "Okre¶l czas"
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "Czas trwania"
 
-#: TrackPanel.cpp:452
-#: TrackPanel.cpp:453
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Nagrywanie czasowe Audacity"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "PoczÄ…tek nagrywania"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "Koniec nagrywania"
+
+#: TimerRecordDialog.cpp:230
+#, fuzzy
+msgid "Audacity Timer Record Progress"
+msgstr "Postęp nagrywania Audacity"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "Data i czas poczÄ…tku"
+
+#: TimerRecordDialog.cpp:274
+#, fuzzy
+msgid "Start Date"
+msgstr "&Czas startu"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Data i czas końca"
+
+#: TimerRecordDialog.cpp:294
+#, fuzzy
+msgid "End Date"
+msgstr "Data i czas końca"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Oczekiwanie na rozpoczęcie nagrywania o %s.\n"
+
+#: TimerRecordDialog.cpp:382
+#, fuzzy
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Nagrywanie Audacity - Oczekiwanie na rozpoczęcie"
+
+#: TrackPanel.cpp:457
+#: TrackPanel.cpp:458
 msgid "Track Panel"
-msgstr "Panel ¶ledz±cy"
+msgstr "Panel śledzący"
 
-#: ../src/AStatus.cpp:81
-#: ../src/prefs/FileFormatPrefs.cpp:105
-#: ../src/prefs/QualityPrefs.cpp:91
-#: ../src/TrackPanel.cpp:822
+#: TrackPanel.cpp:541
+#: prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Inne..."
 
-#: ../src/TrackPanel.cpp:830
-#: ../src/TrackPanel.cpp:851
-#: ../src/TrackPanel.cpp:860
-#: ../src/TrackPanel.cpp:868
+#: TrackPanel.cpp:549
+#: TrackPanel.cpp:571
+#: TrackPanel.cpp:580
+#: TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "Nazwa..."
 
-#: ../src/TrackPanel.cpp:832
-#: ../src/TrackPanel.cpp:853
-#: ../src/TrackPanel.cpp:864
-#: ../src/TrackPanel.cpp:870
+#: TrackPanel.cpp:551
+#: TrackPanel.cpp:573
+#: TrackPanel.cpp:584
+#: TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
-msgstr "Przesuñ ¶cie¿kê w górê"
+msgstr "Przesuń ścieżkę w górę"
 
-#: ../src/TrackPanel.cpp:833
-#: ../src/TrackPanel.cpp:854
-#: ../src/TrackPanel.cpp:865
-#: ../src/TrackPanel.cpp:871
+#: TrackPanel.cpp:552
+#: TrackPanel.cpp:574
+#: TrackPanel.cpp:585
+#: TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
-msgstr "Przesuñ ¶cie¿kê w dó³"
+msgstr "Przesuń ścieżkę w dół"
 
-#: ../src/TrackPanel.cpp:835
+#: TrackPanel.cpp:554
+#: effects/ToneGen.cpp:319
+#: prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Przebieg czasowy"
 
-#: ../src/TrackPanel.cpp:836
+#: TrackPanel.cpp:555
+#: prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "Przebieg czasowy (dB)"
 
-#: ../src/TrackPanel.cpp:838
+#: TrackPanel.cpp:557
+#: prefs/GUIPrefs.cpp:157
+#, fuzzy
+msgid "Spectrum log(f)"
+msgstr "Spektrum"
+
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558
+#: prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
-msgstr "Wysoko¶ci (EAC)"
+msgstr "Wysokości (EAC)"
 
-#: ../src/TrackPanel.cpp:840
+#: TrackPanel.cpp:560
+#: TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "Mono"
 
-#: ../src/TrackPanel.cpp:841
+#: TrackPanel.cpp:561
+#: TrackPanel.cpp:6095
 msgid "Left Channel"
-msgstr "Lewy kana³"
+msgstr "Lewy kanał"
 
-#: ../src/TrackPanel.cpp:842
+#: TrackPanel.cpp:562
+#: TrackPanel.cpp:6095
 msgid "Right Channel"
-msgstr "Prawy kana³"
+msgstr "Prawy kanał"
 
-#: ../src/TrackPanel.cpp:843
+#: TrackPanel.cpp:563
 msgid "Make Stereo Track"
-msgstr "Utwórz ¶cie¿kê stereo"
+msgstr "Utwórz ścieżkę stereo"
 
-#: ../src/TrackPanel.cpp:844
+#: TrackPanel.cpp:564
 msgid "Split Stereo Track"
-msgstr "Podziel ¶cie¿kê stereo"
+msgstr "Podziel ścieżkę stereo"
 
-#: ../src/TrackPanel.cpp:846
+#: TrackPanel.cpp:566
 msgid "Set Sample Format"
-msgstr "Ustaw rozdzielczo¶æ"
+msgstr "Ustaw rozdzielczość"
 
-#: ../src/AStatus.cpp:352
-#: ../src/TrackPanel.cpp:848
-#: ../src/TrackPanel.cpp:4322
+#: TrackPanel.cpp:568
+#: TrackPanel.cpp:6341
 msgid "Set Rate"
-msgstr "Ustaw czêstotliwo¶æ"
+msgstr "Ustaw częstotliwość"
 
-#: ../src/TrackPanel.cpp:856
+#: TrackPanel.cpp:576
 msgid "Up Octave"
-msgstr "Oktawa w Górê"
+msgstr "Oktawa w Górę"
 
-#: ../src/TrackPanel.cpp:857
+#: TrackPanel.cpp:577
 msgid "Down Octave"
-msgstr "Oktawê w dó³"
+msgstr "Oktawę w dół"
 
-#: ../src/TrackPanel.cpp:862
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "Font..."
 
-#: ../src/TrackPanel.cpp:873
+#: TrackPanel.cpp:593
 msgid "Set Range..."
 msgstr "Ustaw zakres..."
 
-#: ../src/EditToolBar.cpp:150
+#: TrackPanel.cpp:597
+#: toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: ../src/TrackPanel.cpp:1513
+#: TrackPanel.cpp:1258
 msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
-msgstr "Kliknij aby powiêkszyæ w pionie.Kliknij z shift'em aby pomniejszyæ. Przeci±gnij aby powiêkszyæ konkretny obszar."
+msgstr "Kliknij aby powiększyć w pionie.Kliknij z shift'em aby pomniejszyć. Przeciągnij aby powiększyć konkretny obszar."
 
-#: ../src/TrackPanel.cpp:1519
+#: TrackPanel.cpp:1263
 msgid "Drag the label vertically to change the order of the tracks."
-msgstr "Przesuñ etykietê pionowo aby zmieniæ kolejno¶æ ¶cie¿ek."
+msgstr "Przesuń etykietę pionowo aby zmienić kolejność ścieżek."
 
-#: ../src/TrackPanel.cpp:1616
+#: TrackPanel.cpp:1283
 msgid "Click and drag to adjust relative size of stereo tracks."
-msgstr "Kliknij i przeci±gnij aby okre¶liæ relatywny rozmiar ¶cie¿ek stereo."
+msgstr "Kliknij i przeciągnij aby określić relatywny rozmiar ścieżek stereo."
 
-#: ../src/TrackPanel.cpp:1621
+#: TrackPanel.cpp:1286
 msgid "Click and drag to resize the track."
-msgstr "Kliknij i przeci±gnij aby zmieniæ rozmiar ¶cie¿ki."
+msgstr "Kliknij i przeciągnij aby zmienić rozmiar ścieżki."
 
-#: TrackPanel.cpp:1298
+#: TrackPanel.cpp:1317
 msgid "Drag one or more label boundaries"
-msgstr "Poci±gnij za jedn± lub wiêcej granic etykiety"
+msgstr "Pociągnij za jedną lub więcej granic etykiety"
 
-#: TrackPanel.cpp:1299
+#: TrackPanel.cpp:1318
 msgid "Drag label boundary"
-msgstr "Poci±gnij za granicê etykiety"
+msgstr "PociÄ…gnij za granicÄ™ etykiety"
 
-#: ../src/TrackPanel.cpp:1541
+#. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
+#: TrackPanel.cpp:1334
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
-msgstr "Tryb multi narzêdzia: naci¶nij :Cmd-, aby toworzyæ preferencje myszy i klawiatury"
+msgstr "Tryb multi narzędzia: naciśnij :Cmd-, aby toworzyć preferencje myszy i klawiatury"
 
-#: ../src/TrackPanel.cpp:1543
+#. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
+#: TrackPanel.cpp:1337
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
-msgstr "Tryb multi narzêdzia: naci¶nij Ctrl+P aby toworzyæ preferencje myszy i klawiatury"
+msgstr "Tryb multi narzędzia: naciśnij Ctrl+P aby toworzyć preferencje myszy i klawiatury"
 
-#: ../src/TrackPanel.cpp:1574
+#: TrackPanel.cpp:1383
 msgid "Click and drag to move left selection boundary."
-msgstr "Kliknij i przeci±gnij aby przesun±æ lew± granicê zaznaczenia."
+msgstr "Kliknij i przeciągnij aby przesunąć lewą granicę zaznaczenia."
 
-#: ../src/TrackPanel.cpp:1579
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move right selection boundary."
-msgstr "Kliknij i przeci±gnij aby przesun±æ praw± granicê zaznaczenia."
-
-#: ../src/TrackPanel.cpp:3314
+msgstr "Kliknij i przeciągnij aby przesunąć prawą granicę zaznaczenia."
+
+#: TrackPanel.cpp:1730
+#: TrackPanel.cpp:3959
+#: TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
 msgid "Modified Label"
 msgstr "Zmodyfikowana etykieta"
 
-#: ../src/TrackPanel.cpp:3315
+#: TrackPanel.cpp:1731
+#: TrackPanel.cpp:3960
+#: TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
 msgid "Label Edit"
 msgstr "Etykieta edycji"
 
-#: ../src/TrackPanel.cpp:1904
+#: TrackPanel.cpp:1971
 msgid "Adjusted envelope."
-msgstr "Wyrównana obwiednia."
+msgstr "Wyrównana obwiednia."
 
-#: ../src/prefs/MousePrefs.cpp:98
-#: ../src/TrackPanel.cpp:1905
+#: TrackPanel.cpp:1972
+#: prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Obwiednia"
 
-#: TrackPanel.cpp:2033
+#: TrackPanel.cpp:2123
 msgid "Moved clip to another track"
-msgstr "Klip przeniesiony do innej ¶cie¿ki"
+msgstr "Klip przeniesiony do innej ścieżki"
 
-#: ../src/TrackPanel.cpp:2012
+#: TrackPanel.cpp:2127
 msgid "left"
 msgstr "lewy"
 
-#: ../src/TrackPanel.cpp:2012
+#: TrackPanel.cpp:2127
 msgid "right"
 msgstr "prawy"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2039
+#: TrackPanel.cpp:2129
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
-msgstr "¦cie¿ki/klipy z przesuniêciem czasu %s %.02f sekund"
+msgstr "Ścieżki/klipy z przesunięciem czasu %s %.02f sekund"
 
-#: ../src/prefs/MousePrefs.cpp:97
+#: TrackPanel.cpp:2133
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:112
+#: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
-msgstr "Przesuniêcie fazowe"
+msgstr "Przesunięcie fazowe"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "Sondowanie dzia³a aktualnie tylko z falami d¼wiêkowymi w formie linearnej"
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Brak wystarczaj±cego powiêkszenia.Powiêksz a¿ zobaczysz pojedyncze próbki."
+#: TrackPanel.cpp:2933
+#, fuzzy
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr "Brak wystarczającego powiększenia.Powiększ aż zobaczysz pojedyncze próbki."
 
-#: ../src/TrackPanel.cpp:2637
+#: TrackPanel.cpp:3205
 msgid "Moved Sample"
-msgstr "Przesuniêto próbkê"
+msgstr "Przesunięto próbkę"
 
-#: ../src/TrackPanel.cpp:2638
+#: TrackPanel.cpp:3206
 msgid "Sample Edit"
-msgstr "Edycja próbki"
+msgstr "Edycja próbki"
 
-#: ../src/TrackPanel.cpp:2703
+#: TrackPanel.cpp:3305
 #, c-format
 msgid "Removed track '%s.'"
-msgstr "Usuniêta ¶cie¿ka '%s'"
+msgstr "Usunięta ścieżka '%s'"
 
-#: ../src/TrackPanel.cpp:2705
+#: TrackPanel.cpp:3307
 msgid "Track Remove"
-msgstr "Usuniêcie ¶cie¿ki"
+msgstr "Usunięcie ścieżki"
 
-#: ../src/TrackPanel.cpp:2806
+#: TrackPanel.cpp:3448
 msgid "Moved gain slider"
-msgstr "Przesuniêto suwak czu³o¶ci"
+msgstr "Przesunięto suwak czułości"
 
-#: ../src/TrackPanel.cpp:2806
+#: TrackPanel.cpp:3448
 msgid "Moved pan slider"
-msgstr "Przesuniêto suwak panoramiczny"
+msgstr "Przesunięto suwak panoramiczny"
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: ../src/TrackPanel.cpp:2807
-#: ../src/TrackPanel.cpp:4726
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5703
+#: TrackPanel.cpp:7244
 msgid "Gain"
-msgstr "Czu³o¶æ"
+msgstr "Czułość"
 
 #  i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: ../src/TrackPanel.cpp:2807
-#: ../src/TrackPanel.cpp:4733
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5641
+#: TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "Pan"
 
-#: ../src/effects/ChangePitch.cpp:279
-#: ../src/TrackPanel.cpp:4387
+#: TrackPanel.cpp:3576
+#: TrackPanel.cpp:6441
 msgid "up"
-msgstr "góra"
+msgstr "góra"
 
-#: ../src/effects/ChangePitch.cpp:279
-#: ../src/TrackPanel.cpp:4388
+#: TrackPanel.cpp:3580
+#: TrackPanel.cpp:6442
 msgid "down"
-msgstr "dó³"
+msgstr "dół"
 
-#: ../src/TrackPanel.cpp:4383
+#: TrackPanel.cpp:3587
+#: TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
-msgstr "Przesuniêty '%s' %s"
+msgstr "Przesunięty '%s' %s"
 
-#: ../src/TrackPanel.cpp:4389
+#: TrackPanel.cpp:3590
+#: TrackPanel.cpp:6443
 msgid "Move Track"
-msgstr "Przesuñ ¶cie¿kê"
+msgstr "Przesuń ścieżkę"
 
-#: TrackPanel.cpp:3905
+#: TrackPanel.cpp:4155
 msgid "Expand"
 msgstr "Rozszerz"
 
-#: TrackPanel.cpp:3905
+#: TrackPanel.cpp:4155
 msgid "Expanded Cut Line"
-msgstr "Rozszerzona linia ciêcia"
+msgstr "Rozszerzona linia cięcia"
 
-#: TrackPanel.cpp:3973
+#: TrackPanel.cpp:4164
 msgid "Merge"
-msgstr "Po³±cz"
+msgstr "Połącz"
 
-#: TrackPanel.cpp:3973
+#: TrackPanel.cpp:4164
 msgid "Merged Clips"
-msgstr "Po³±czone klipy"
+msgstr "Połączone klipy"
 
-#: TrackPanel.cpp:3925
+#: TrackPanel.cpp:4176
 msgid "Removed Cut Line"
-msgstr "Usuniêta linia ciêcia"
+msgstr "Usunięta linia cięcia"
 
-#: TrackPanel.cpp:5210
+#: TrackPanel.cpp:5641
 msgid "Adjusted Pan"
-msgstr "Dostrojone przesuniêcie"
+msgstr "Dostrojone przesunięcie"
 
-#: TrackPanel.cpp:5272
+#: TrackPanel.cpp:5703
 msgid "Adjusted gain"
 msgstr "Dostrojone wzmocnienie"
 
-#: TrackPanel.cpp:5428
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
-msgstr "Nie mo¿na usun±æ ¶cie¿ki z aktywnym d¼wiêkiem"
+msgstr "Nie można usunąć ścieżki z aktywnym dźwiękiem"
 
-#: ../src/TrackPanel.cpp:4087
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Stereo, "
 
-#: ../src/TrackPanel.cpp:4090
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Mono, "
 
-#: ../src/TrackPanel.cpp:4092
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "Lewy, "
 
-#: ../src/TrackPanel.cpp:4094
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "Prawy, "
 
-#: ../src/TrackPanel.cpp:4116
-#: ../src/TrackPanel.cpp:4225
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "Zmieniono '%s' na %s"
 
-#: ../src/TrackPanel.cpp:4121
+#: TrackPanel.cpp:6110
 msgid "Channel"
-msgstr "Kana³"
+msgstr "Kanał"
 
-#: ../src/TrackPanel.cpp:4131
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
-msgstr "Podziel ¶cie¿kê stereo '%s'"
+msgstr "Podziel ścieżkę stereo '%s'"
 
-#: ../src/TrackPanel.cpp:4153
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
-msgstr "Utwórz '%s' ¶cie¿kê stereo"
+msgstr "Utwórz '%s' ścieżkę stereo"
 
-#: ../src/TrackPanel.cpp:4156
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
-msgstr "Utwórz stereo "
+msgstr "Utwórz stereo "
 
-#: ../src/TrackPanel.cpp:4189
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "Zmieniono '%s' na %d Hz"
 
-#: ../src/TrackPanel.cpp:4191
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "Zmiana stosunku"
 
-#: ../src/TrackPanel.cpp:4229
+#: TrackPanel.cpp:6255
 msgid "Format Change"
-msgstr "Zmieñ format"
-
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Podaj czêstotliwo¶æ próbkowania w Hz (na sekundê) w zakresie 1 do 100000:"
+msgstr "Zmień format"
 
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Z³a czêstotliwo¶æ"
-
-#: ../src/TrackPanel.cpp:4351
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
-msgstr "Zmieñ minimaln± prêdko¶æ (%) do:"
+msgstr "Zmień minimalną prędkość (%) do:"
 
-#: ../src/TrackPanel.cpp:4352
-#: ../src/TrackPanel.cpp:4353
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
 msgid "Lower speed limit"
-msgstr "Minimalna prêdko¶æ "
+msgstr "Minimalna prędkość "
 
-#: ../src/TrackPanel.cpp:4358
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
-msgstr "Zmieñ maksymaln± prêdko¶æ (%) do:"
+msgstr "Zmień maksymalną prędkość (%) do:"
 
-#: ../src/TrackPanel.cpp:4359
-#: ../src/TrackPanel.cpp:4360
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
 msgid "Upper speed limit"
-msgstr "Szybko¶æ maksymalna"
+msgstr "Szybkość maksymalna"
 
-#: ../src/TrackPanel.cpp:4368
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Ustaw zakres: '%d' - '%d'"
 
-#: ../src/TrackPanel.cpp:4371
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "Ustaw zakres"
 
-#: ../src/TrackPanel.cpp:4416
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
-msgstr "Zmieñ nazwê ¶cie¿ki na:"
+msgstr "Zmień nazwę ścieżki na:"
 
-#: ../src/TrackPanel.cpp:4417
+#: TrackPanel.cpp:6473
 msgid "Track Name"
-msgstr "Nazwa ¶cie¿ki"
+msgstr "Nazwa ścieżki"
 
-#: ../src/TrackPanel.cpp:4420
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "Zmiana nazwy z '%s' na '%s'"
 
-#: ../src/TrackPanel.cpp:4423
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "Zmiana nazwy"
 
-#: ../src/TrackPanel.cpp:4454
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
-msgstr "Fonty ¶cie¿ki etykiet"
+msgstr "Fonty ścieżki etykiet"
 
-#: TrackPanel.cpp:6227
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
 msgid "Face name"
-msgstr "Nazwa p³aszczyzny"
+msgstr "Nazwa płaszczyzny"
 
-#: TrackPanel.cpp:6236
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
 msgid "Face size"
-msgstr "Rozmiar p³aszczyzny"
+msgstr "Rozmiar płaszczyzny"
 
-#: ../src/TrackPanel.cpp:4701
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Cisza"
 
-#: ../src/TrackPanel.cpp:4701
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Solo"
 
-#: TrackPanelAx.cpp:266
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
-msgstr "Widok¦cie¿ki"
+msgstr "WidokŚcieżki"
 
-#: TrackPanelAx.cpp:274
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
-msgstr "¦cie¿ka niezsynchronizowana"
+msgstr "Ścieżka niezsynchronizowana"
 
-#: TrackPanelAx.cpp:282
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
-msgstr "¦cie¿ka %d"
+msgstr "Ścieżka %d"
 
-#: TrackPanelAx.cpp:288
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr "Wyciszone"
 
-#: TrackPanelAx.cpp:293
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
-msgstr "W³±czone solo"
+msgstr "WÅ‚Ä…czone solo"
 
-#: TrackPanelAx.cpp:297
+#: TrackPanelAx.cpp:304
 msgid " Select On"
-msgstr "W³±czone zaznaczenie"
+msgstr "WÅ‚Ä…czone zaznaczenie"
 
 #: VoiceKey.cpp:88
 #: VoiceKey.cpp:238
 #: VoiceKey.cpp:376
 #: VoiceKey.cpp:517
 msgid "Selection is too small to use voice key."
-msgstr "Zaznaczenie jest zbyt ma³e, aby u¿yæ klucza g³osowego."
+msgstr "Zaznaczenie jest zbyt małe, aby użyć klucza głosowego."
 
 #: VoiceKey.cpp:843
 msgid "Calibration Results\n"
@@ -3801,657 +4232,1064 @@ msgstr "Zmiany znaku        -- znaczy: %1.4f  sd: (%1.4f)\n"
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr "Zmiany kierunku  -- znaczy: %1.4f  sd: (%1.4f)\n"
 
-#: ../src/WaveTrack.cpp:128
+#: WaveTrack.cpp:88
 msgid "Audio Track"
-msgstr "¦cie¿ka audio"
+msgstr "Ścieżka audio"
 
-#: WaveTrack.cpp:515
-#: WaveTrack.cpp:534
+#: WaveTrack.cpp:597
+#: WaveTrack.cpp:616
+#: WaveTrack.cpp:1057
+#: WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
-msgstr "Nie ma wystarczaj±co miejsca, aby wkleiæ zaznaczenie"
+msgstr "Nie ma wystarczająco miejsca, aby wkleić zaznaczenie"
 
-#: WaveTrack.cpp:1583
+#: WaveTrack.cpp:2086
 msgid "There is not enough room available to expand the cut line"
-msgstr "Nie ma wystarczaj±co miejsca, aby rozszerzyæ liniê ciêcia"
+msgstr "Nie ma wystarczająco miejsca, aby rozszerzyć linię cięcia"
 
-#: ../src/commands/CommandManager.cpp:321
+#: commands/CommandManager.cpp:555
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "Wtyczki 1do %i"
 
-#: ../src/commands/CommandManager.cpp:335
+#: commands/CommandManager.cpp:569
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "Wtyczki %i do %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
-msgstr "Zakazane  z pewnego powodu. Czy chcesz najpierw spróbowaæ zaznaczyæ d¼wiêk?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "Zakazane  z pewnego powodu. Czy chcesz najpierw spróbować zaznaczyć dźwięk?"
 
-#: commands/CommandManager.cpp:724
-msgid ""
-"You can only do this when playing and recording are\n"
+#: commands/CommandManager.cpp:892
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Mo¿esz to zrobiæ tylko, gdy nagrywanie lub odtwarzanie s±\n"
-"zatrzymane. [Pauza nie jest wystarczaj±ca.]"
+msgstr "Możesz to zrobić tylko, gdy nagrywanie lub odtwarzanie są\n"
+"zatrzymane. [Pauza nie jest wystarczajÄ…ca.]"
 
-#: commands/CommandManager.cpp:726
-msgid ""
-"You must first select some stereo audio for this\n"
+#: commands/CommandManager.cpp:894
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Najpierw trzeba zaznaczyæ d¼wiêk stereo.\n"
-"[Nie mo¿na u¿æ tego z mono.]"
+msgstr "Najpierw trzeba zaznaczyć dźwięk stereo.\n"
+"[Nie można użć tego z mono.]"
 
-#: commands/CommandManager.cpp:728
+#: commands/CommandManager.cpp:896
 msgid "You must first select some audio for this to use."
-msgstr "Najpierw trzeba zaznaczyæ d¼wiêk."
+msgstr "Najpierw trzeba zaznaczyć dźwięk."
 
-#: commands/CommandManager.cpp:730
-msgid ""
-"You must first select some audio for this\n"
+#: commands/CommandManager.cpp:898
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Najpierw trzeba zaznaczyæ d¼wiêk. \n"
-"[Zaznaczanie innych rodzajów ¶cie¿ki nie zadzia³a.]"
+msgstr "Najpierw trzeba zaznaczyć dźwięk. \n"
+"[Zaznaczanie innych rodzajów ścieżki nie zadziała.]"
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
-msgstr "Wiadomo¶æ"
+#: commands/CommandManager.cpp:903
+#, fuzzy
+msgid "Disallowed"
+msgstr "Zablokowany"
 
-#: ../src/commands/CommandManager.cpp:638
+#: commands/CommandManager.cpp:1083
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
-msgstr "Za³adowano %d skróty klawiaturowe\n"
+msgstr "Załadowano %d skróty klawiaturowe\n"
 
-#: ../src/commands/CommandManager.cpp:641
+#: commands/CommandManager.cpp:1085
 msgid "Loading keyboard shortcuts"
-msgstr "£adowanie skrótów klawiaturowych"
+msgstr "Ładowanie skrótów klawiaturowych"
 
-#: ../src/effects/Amplify.cpp:34
+#: effects/Amplify.cpp:52
 #, c-format
 msgid "Applied effect: %s %.1f dB"
 msgstr "Dodano efekt: %s %.1f dB"
 
-#: ../src/effects/Amplify.cpp:63
+#: effects/Amplify.cpp:139
 msgid "Amplify"
 msgstr "Wzmacniaj"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
+#: effects/Amplify.cpp:155
+#: effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+#, fuzzy
+msgid "by Dominic Mazzoni"
 msgstr "Wzmacnianie (Dominic Mazzoni)"
 
-#: ../src/effects/Amplify.cpp:132
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "Wzmocnienie (dB):"
 
-#: ../src/effects/Amplify.cpp:152
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "Nowy Szczyt Amplitudy (dB):"
 
-#: effects/Amplify.cpp:192
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
-msgstr "Pozwól na obcinanie"
+msgstr "Pozwól na obcinanie"
+
+#: effects/Amplify.cpp:222
+#: effects/Amplify.cpp:279
+#: effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
 
-#: ../src/effects/Amplify.h:47
+#: effects/Amplify.h:37
 msgid "Amplify..."
 msgstr "Wzmacniaj..."
 
-#: ../src/effects/Amplify.h:51
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "Wzmocnienie"
 
 #: effects/AutoDuck.cpp:125
 msgid "You selected a track which does not contain audio. AutoDuck can only process audio tracks."
-msgstr "Zaznaczy³e¶ ¶cie¿kê, która nie zawiera d¼wiêku. AutoDuck mo¿e tylko przetwarzaæ ¶cie¿ki d¼wiêkowe."
+msgstr "Zaznaczyłeś ścieżkę, która nie zawiera dźwięku. AutoDuck może tylko przetwarzać ścieżki dźwiękowe."
 
 #: effects/AutoDuck.cpp:126
 #: effects/AutoDuck.cpp:138
-#: effects/AutoDuck.cpp:451
-#: effects/AutoDuck.cpp:578
+#: effects/AutoDuck.cpp:453
+#: effects/AutoDuck.cpp:570
 msgid "Auto Duck"
 msgstr "Auto Duck"
 
 #: effects/AutoDuck.cpp:137
 msgid "Auto Duck needs a control track which must be placed below the selected track(s)."
-msgstr "Auto Duck potrzebuje ¶cie¿ki kontrolnej, która ma byæ umieszczona poni¿ej zaznaczonej ¶cie¿ki."
+msgstr "Auto Duck potrzebuje ścieżki kontrolnej, która ma być umieszczona poniżej zaznaczonej ścieżki."
 
-#: effects/AutoDuck.cpp:463
+#: effects/AutoDuck.cpp:465
 msgid "Auto Duck by Markus Meyer"
 msgstr "Auto Duck Markusa Meyera"
 
-#: effects/AutoDuck.cpp:485
+#: effects/AutoDuck.cpp:487
 msgid "Duck amount:"
-msgstr "Ilo¶æ Duck:"
+msgstr "Ilość Duck:"
 
-#: effects/AutoDuck.cpp:490
+#: effects/AutoDuck.cpp:492
 msgid "Maximum pause:"
 msgstr "Maksymalna pauza:"
 
-#: effects/AutoDuck.cpp:492
-#: effects/AutoDuck.cpp:497
-#: effects/AutoDuck.cpp:502
-#: effects/AutoDuck.cpp:507
-#: effects/AutoDuck.cpp:512
-#: prefs/AudioIOPrefs.cpp:162
-#: prefs/AudioIOPrefs.cpp:164
-#: prefs/AudioIOPrefs.cpp:188
-#: prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:198
-#: widgets/TimeTextCtrl.cpp:197
+#. i18n-hint: Name of time display format that shows time in seconds
+#: effects/AutoDuck.cpp:494
+#: effects/AutoDuck.cpp:499
+#: effects/AutoDuck.cpp:504
+#: effects/AutoDuck.cpp:509
+#: effects/AutoDuck.cpp:514
+#: effects/Contrast.cpp:263
+#: effects/Contrast.cpp:286
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
+#: prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163
+#: prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
 msgstr "sekund"
 
-#: effects/AutoDuck.cpp:495
+#: effects/AutoDuck.cpp:497
 msgid "Outer fade down length:"
-msgstr "D³ugo¶æ zewnêtrznego ¶ciszenia:"
+msgstr "Długość zewnętrznego ściszenia:"
 
-#: effects/AutoDuck.cpp:500
+#: effects/AutoDuck.cpp:502
 msgid "Outer fade up length:"
-msgstr "D³ugo¶æ zewnêtrznego zg³o¶nienia:"
+msgstr "Długość zewnętrznego zgłośnienia:"
 
-#: effects/AutoDuck.cpp:505
+#: effects/AutoDuck.cpp:507
 msgid "Inner fade down length:"
-msgstr "D³ugo¶æ wewnêtrznego ¶ciszenia:"
+msgstr "Długość wewnętrznego ściszenia:"
 
-#: effects/AutoDuck.cpp:510
+#: effects/AutoDuck.cpp:512
 msgid "Inner fade up length:"
-msgstr "D³ugo¶æ wewnêtrznego zg³o¶nienia:"
+msgstr "Długość wewnętrznego zgłośnienia:"
 
-#: effects/AutoDuck.cpp:519
-#: effects/Compressor.cpp:479
+#: effects/AutoDuck.cpp:521
+#: effects/Compressor.cpp:494
 msgid "Threshold:"
-msgstr "Próg:"
+msgstr "Próg:"
 
-#: effects/AutoDuck.cpp:578
+#: effects/AutoDuck.cpp:570
 msgid "Please enter valid values."
-msgstr "Wprowad¼ wa¿ne warto¶ci."
+msgstr "Wprowadź ważne wartości."
 
-#: effects/AutoDuck.cpp:712
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
-msgstr "Niemo¿liwy podgl±d"
+msgstr "Niemożliwy podgląd"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr "Auto Duck..."
 
-#: effects/AutoDuck.h:102
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr "Przetwarzanie Auto Duck..."
 
-#: ../src/LangChoice.cpp:94
-#: ../src/Tags.cpp:721
-#: ../src/effects/VST/VSTEffect.cpp:98
-#: ../src/effects/VST/VSTEffect.cpp:455
-#: ../src/effects/Amplify.cpp:187
-#: ../src/effects/AvcCompressor.cpp:716
-#: ../src/effects/BassBoost.cpp:332
-#: ../src/effects/ChangePitch.cpp:395
-#: ../src/effects/ChangeSpeed.cpp:380
-#: ../src/effects/ChangeTempo.cpp:285
-#: ../src/effects/Compressor.cpp:468
-#: ../src/effects/Echo.cpp:242
-#: ../src/effects/Equalization.cpp:734
-#: ../src/effects/Filter.cpp:482
-#: ../src/effects/Normalize.cpp:258
-#: ../src/effects/Phaser.cpp:576
-#: ../src/effects/Repeat.cpp:251
-#: ../src/effects/Wahwah.cpp:563
-#: ../src/effects/ladspa/LadspaEffect.cpp:498
-#: ../src/effects/nyquist/Nyquist.cpp:736
-#: ../src/effects/nyquist/Nyquist.cpp:883
-#: ../src/effects/nyquist/Nyquist.cpp:949
-#: ../src/prefs/FileFormatPrefs.cpp:471
-#: ../src/prefs/PrefsDialog.cpp:100
-#: ../src/widgets/Warning.cpp:56
+#: effects/AvcCompressor.cpp:738
+#: effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "OK"
 
-#: ../src/effects/BassBoost.cpp:36
+#: effects/BassBoost.cpp:52
 #, c-format
 msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
-msgstr "Dodano efekt: %s czêstotliwo¶æ = %.0f Hz, podbicie = %.0f dB"
+msgstr "Dodano efekt: %s częstotliwość = %.0f Hz, podbicie = %.0f dB"
 
 #: effects/BassBoost.cpp:169
 msgid "Bass Boost"
-msgstr "Podbicie basów"
+msgstr "Podbicie basów"
 
 #: effects/BassBoost.cpp:182
+#: effects/Phaser.cpp:219
+#: effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr "autorstwa Nasca Octavian Paul"
 
-#: ../src/effects/BassBoost.cpp:286
+#: effects/BassBoost.cpp:196
+#: effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
-msgstr "Czêstotliwo¶æ (Hz):"
+msgstr "Częstotliwość (Hz):"
 
-#: ../src/effects/BassBoost.cpp:302
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
+#: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Wzmocnienie (dB):"
 
-#: ../src/effects/BassBoost.h:44
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
+#: effects/BassBoost.h:35
 msgid "BassBoost..."
-msgstr "Podbicie basów..."
+msgstr "Podbicie basów..."
 
-#: ../src/effects/BassBoost.h:48
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
-msgstr "Podbijanie niskich czêstotliwo¶ci "
+msgstr "Podbijanie niskich częstotliwości "
 
 #: effects/ChangeLength.h:26
 msgid "Change Length..."
-msgstr "Zmieñ d³ugo¶æ..."
+msgstr "Zmień długość..."
 
-#: effects/ChangeLength.h:30
+#: effects/ChangeLength.h:34
 msgid "Changing Length..."
-msgstr "Zmiana d³ugo¶ci..."
+msgstr "Zmiana długości..."
 
-#: ../src/effects/ChangePitch.cpp:56
+#: effects/ChangePitch.cpp:55
 #, c-format
 msgid "Applied effect: %s %.2f semitones"
-msgstr "Dodano efekt %s %.2f pó³tonów"
+msgstr "Dodano efekt %s %.2f półtonów"
 
-#: ../src/effects/ChangePitch.cpp:119
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
-msgstr "Zmieñ wysoko¶æ"
+msgstr "Zmień wysokość"
 
-#: ../src/effects/ChangePitch.cpp:244
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
-msgstr "Zmieñ wysoko¶æ bez zmiany tempa"
+msgstr "Zmień wysokość bez zmiany tempa"
 
-#: ../src/effects/ChangePitch.cpp:249
-#: ../src/effects/ChangeSpeed.cpp:288
-#: ../src/effects/ChangeTempo.cpp:165
+#: effects/ChangePitch.cpp:258
+#: effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "autorzy: Vaughan Johnson i Dominic Mazzoni"
 
-#: ../src/effects/ChangePitch.cpp:254
-#: ../src/effects/ChangeTempo.cpp:170
+#: effects/ChangePitch.cpp:260
+#: effects/ChangeTempo.cpp:175
 msgid "using SoundTouch, by Olli Parviainen"
-msgstr "u¿ywa­ SoundTouch ( autor : Olli Parviainen)"
+msgstr "używa­ SoundTouch ( autor : Olli Parviainen)"
 
-#: ../src/effects/ChangePitch.cpp:264
-msgid "Pitch:   from"
-msgstr "Wysoko¶æ   z"
+#: effects/ChangePitch.cpp:269
+#, fuzzy
+msgid "Pitch:"
+msgstr "Wysokość   z"
 
-#: ../src/effects/ChangePitch.cpp:286
-#: ../src/effects/ChangePitch.cpp:332
-#: ../src/effects/ChangeSpeed.cpp:352
-#: ../src/effects/ChangeTempo.cpp:224
-#: ../src/effects/ChangeTempo.cpp:255
-msgid "to"
-msgstr "do"
+#: effects/ChangePitch.cpp:274
+#, fuzzy
+msgid "From:"
+msgstr "Format:"
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+#, fuzzy
+msgid "Down"
+msgstr "dół"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
 
-#: ../src/effects/ChangePitch.cpp:301
+#: effects/ChangePitch.cpp:300
+#, fuzzy
+msgid "To Pitch"
+msgstr "Zmień wysokość"
+
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
-msgstr "Pó³tony"
+msgstr "Półtony"
+
+#: effects/ChangePitch.cpp:316
+#, fuzzy
+msgid "Semitones in half-steps"
+msgstr "Półtony"
+
+#: effects/ChangePitch.cpp:326
+#: effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206
+#: effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+#, fuzzy
+msgid "From frequency in hertz"
+msgstr "Skala logarytmiczna"
 
-#: ../src/effects/ChangePitch.cpp:320
-msgid "Frequency (Hz):   from"
-msgstr "Czêstotliwo¶æ (Hz): "
+#: effects/ChangePitch.cpp:331
+#: effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211
+#: effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "do"
 
-#: ../src/effects/ChangePitch.cpp:355
-#: ../src/effects/ChangeSpeed.cpp:306
-#: ../src/effects/ChangeTempo.cpp:183
+#: effects/ChangePitch.cpp:332
+#, fuzzy
+msgid "To frequency in seconds"
+msgstr "Skala logarytmiczna"
+
+#: effects/ChangePitch.cpp:338
+#: effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
 msgid "Percent Change:"
 msgstr "Procentowa zmiana:"
 
-#: ../src/effects/ChangePitch.h:31
+#: effects/ChangePitch.cpp:343
+#: effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358
+#: effects/ChangeTempo.cpp:195
+#, fuzzy
+msgid "Percent Change"
+msgstr "Procentowa zmiana:"
+
+#: effects/ChangePitch.h:31
 msgid "Change Pitch..."
-msgstr "Zmieñ wysoko¶æ..."
+msgstr "Zmień wysokość..."
 
-#: ../src/effects/ChangePitch.h:35
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
-msgstr "Zmiana wysoko¶ci"
+msgstr "Zmiana wysokości"
 
-#: ../src/effects/ChangeSpeed.cpp:40
-#: ../src/effects/ChangeTempo.cpp:43
+#: effects/ChangeSpeed.cpp:54
+#: effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "Dodano efekt %s %.1f%%"
 
-#: ../src/effects/ChangeSpeed.cpp:47
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
-msgstr "Zmieñ prêdko¶æ"
-
-#: ../src/effects/ChangeSpeed.cpp:283
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "Zmiana prêdko¶ci ze zmian± tempa i wysoko¶ci"
-
-#: ../src/effects/ChangeSpeed.cpp:293
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "u¿ywa SampleRate (autor: Erik de Castro Lopo)"
+msgstr "Zmień prędkość"
 
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
 #  unimportant, not relevant).
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:339
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
 msgid "n/a"
-msgstr "niedostêpne"
+msgstr "niedostępne"
+
+#: effects/ChangeSpeed.cpp:334
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "Zmiana prędkości ze zmianą tempa i wysokości"
+
+#: effects/ChangeSpeed.cpp:338
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "używa SampleRate (autor: Erik de Castro Lopo)"
+
+#: effects/ChangeSpeed.cpp:366
+#, fuzzy
+msgid "Standard Vinyl RPM:"
+msgstr "\"Czarna\" płyta -obrotów na  minutę:   z"
 
-#: ../src/effects/ChangeSpeed.cpp:342
-msgid "Standard Vinyl RPM:   from"
-msgstr "\"Czarna\" p³yta -obrotów na  minutê:   z"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.h:37
+#: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
-msgstr "Zmieñ prêdko¶æ..."
+msgstr "Zmień prędkość..."
 
-#: ../src/effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
-msgstr "Zmiana prêdko¶ci"
+msgstr "Zmiana prędkości"
 
-#: ../src/effects/ChangeTempo.cpp:62
+#: effects/ChangeTempo.cpp:138
 msgid "Change Tempo"
-msgstr "Zmieñ tempo"
+msgstr "Zmień tempo"
 
-#: ../src/effects/ChangeTempo.cpp:160
+#: effects/ChangeTempo.cpp:171
 msgid "Change Tempo without Changing Pitch"
-msgstr "Zmieñ tempo bez zmiany czêstotliwo¶ci"
+msgstr "Zmień tempo bez zmiany częstotliwości"
 
-#: ../src/effects/ChangeTempo.cpp:212
-msgid "Beats per Minute (BPM):   from"
-msgstr "Uderzeñ na minutê (BPM):   od"
+#: effects/ChangeTempo.cpp:203
+#, fuzzy
+msgid "Beats per minute:"
+msgstr "Uderzeń na minutę (BPM):   od"
 
-#: ../src/effects/ChangeTempo.cpp:242
-msgid "Length (seconds):   from"
-msgstr "D³ugo¶æ (sekund): "
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.h:40
+#: effects/ChangeTempo.cpp:216
+#, fuzzy
+msgid "Length (seconds):"
+msgstr "Długość (sekund)"
+
+#: effects/ChangeTempo.cpp:220
+#, fuzzy
+msgid "From length in seconds"
+msgstr "Długość (sekund)"
+
+#: effects/ChangeTempo.cpp:225
+#, fuzzy
+msgid "To length in seconds"
+msgstr "Długość (sekund)"
+
+#: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
-msgstr "Zmieñ tempo..."
+msgstr "Zmień tempo..."
 
-#: ../src/effects/ChangeTempo.h:44
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
 msgstr "Zmiana tempa"
 
-#: effects/ClickRemoval.cpp:316
-msgid "ClickRemoval"
-msgstr "UsuwanieKlikniêæ"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
+msgstr "UsuwanieKliknięć"
 
-#: effects/ClickRemoval.cpp:359
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
-msgstr "Usuwanie stukotu i trzasków autorstwa Craiga DeForest"
+msgstr "Usuwanie stukotu i trzasków autorstwa Craiga DeForest"
 
-#: effects/ClickRemoval.cpp:343
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
-msgstr "Zaznacz próg (ni¿szy jest bardziej wra¿liwy):"
+msgstr "Zaznacz próg (niższy jest bardziej wrażliwy):"
 
-#: effects/ClickRemoval.cpp:355
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
-msgstr "Maksymalna warto¶æ szczytowa (wy¿sza jest bardziej wra¿liwa):"
+msgstr "Maksymalna wartość szczytowa (wyższa jest bardziej wrażliwa):"
+
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
 
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Usuwanie stukotu..."
 
-#: effects/ClickRemoval.h:46
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
-msgstr "Usuwanie stukotu i trzasków..."
+msgstr "Usuwanie stukotu i trzasków..."
 
-#: ../src/effects/Compressor.cpp:43
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "Kompresor dynamiki"
 
-#: ../src/effects/Compressor.cpp:417
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Kompresor dynamiki (Dominic Mazzoni)"
+#: effects/Compressor.cpp:498
+#, fuzzy
+msgid "Threshold"
+msgstr "Próg:"
+
+#: effects/Compressor.cpp:502
+#, fuzzy
+msgid "Ratio:"
+msgstr "Stosunek:"
 
-#: ../src/effects/Compressor.cpp:435
-msgid "Ratio: "
+#: effects/Compressor.cpp:506
+#, fuzzy
+msgid "Ratio"
 msgstr "Stosunek:"
 
-#: ../src/effects/Compressor.cpp:442
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Czas narastania:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+#, fuzzy
+msgid "Attack Time"
+msgstr "Czas narastania:"
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
+msgstr "Czas zanikania progu:"
+
+#: effects/Compressor.cpp:522
+#, fuzzy
+msgid "Decay Time"
 msgstr "Czas zanikania progu:"
 
-#: effects/Compressor.cpp:504
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizuj do 0dB po kompresji"
 
-#: ../src/effects/Compressor.cpp:509
-#, c-format
-msgid "Threshold: %d dB"
-msgstr "Próg: %d dB"
+#: effects/Compressor.cpp:563
+#, fuzzy, c-format
+msgid "Threshold %d dB"
+msgstr "Próg: %d dB"
 
-#: ../src/effects/Compressor.cpp:512
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, fuzzy, c-format
+msgid "Ratio %.0f to 1"
 msgstr "Stosunek: %.0f:1"
 
-#: ../src/effects/Compressor.cpp:514
-#, c-format
-msgid "Ratio: %.1f:1"
+#: effects/Compressor.cpp:568
+#, fuzzy, c-format
+msgid "%.0f:1"
+msgstr "Stosunek: %.0f:1"
+
+#: effects/Compressor.cpp:571
+#, fuzzy, c-format
+msgid "Ratio %.1f to 1"
 msgstr "Stosunek: %.1f:1"
 
-#: ../src/effects/Compressor.cpp:516
-#, c-format
-msgid "Attack Time: %.1f secs"
+#: effects/Compressor.cpp:572
+#, fuzzy, c-format
+msgid "%.1f:1"
+msgstr "Stosunek: %.1f:1"
+
+#: effects/Compressor.cpp:575
+#, fuzzy, c-format
+msgid "Attack Time %.1f secs"
 msgstr "Czas narastania: %.1f sek."
 
-#: effects/Compressor.cpp:570
-#, c-format
-msgid "Decay Time: %.1f secs"
+#: effects/Compressor.cpp:576
+#: effects/Compressor.cpp:579
+#, fuzzy, c-format
+msgid "%.1f secs"
+msgstr "%d sekund"
+
+#: effects/Compressor.cpp:578
+#, fuzzy, c-format
+msgid "Decay Time %.1f secs"
 msgstr "Czas zanikania progu: %.1f sekund"
 
-#: ../src/effects/Compressor.h:36
+#: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "Kompresor..."
 
-#: ../src/effects/Compressor.h:40
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
-msgstr "Dodano kompresjê dynamiki"
+msgstr "Dodano kompresjÄ™ dynamiki"
 
-#: effects/DtmfGen.cpp:47
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193
+#: effects/Contrast.cpp:204
+#: effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+#, fuzzy
+msgid "Measured"
+msgstr "Połącz"
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+#, fuzzy
+msgid "Parameters"
+msgstr "&Parametry"
+
+#: effects/Contrast.cpp:242
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "PoczÄ…tek"
+
+#: effects/Contrast.cpp:243
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Koniec"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+#, fuzzy
+msgid "Result"
+msgstr "Resetuj"
+
+#: effects/Contrast.cpp:302
+#, fuzzy
+msgid "Contrast Result:"
+msgstr "Wyniki kalibracji"
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+msgid "Reset"
+msgstr "Resetuj"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "Wprowadzenie"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "Kontrola"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328
+#: effects/Contrast.cpp:336
+#: effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+#, fuzzy
+msgid "Measure"
+msgstr "Połącz"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191
+#: effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
-msgstr "Generator d¼wiêku DTMF"
+msgstr "Generator dźwięku DTMF"
 
-#: effects/DtmfGen.cpp:382
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "autorstwa Salvo Ventury (2006)"
 
-#: effects/DtmfGen.cpp:386
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "sekwencja DTMF:"
 
-#: ../src/effects/ToneGen.cpp:308
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "Amplituda (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
-msgstr "Czas trwania DTMF:"
+#: effects/DtmfGen.cpp:465
+#, fuzzy
+msgid "Duration:"
+msgstr "Czas trwania"
 
-#: effects/DtmfGen.cpp:407
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
-msgstr "Wspó³czynnik d¼wiêk/cisza"
+msgstr "Współczynnik dźwięk/cisza"
 
-#: effects/DtmfGen.cpp:418
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr "Cykl:"
 
-#: effects/DtmfGen.cpp:420
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
-msgstr "Czas trwania d¼wiêku:"
+msgstr "Czas trwania dźwięku:"
 
-#: effects/DtmfGen.cpp:421
-#: effects/DtmfGen.cpp:423
-#: effects/DtmfGen.cpp:494
-#: effects/DtmfGen.cpp:495
+#: effects/DtmfGen.cpp:499
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
 msgstr "ms"
 
-#: effects/DtmfGen.cpp:422
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr "Czas trwania ciszy:"
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
-msgstr "D¼wiêki DTMF..."
+msgstr "Dźwięki DTMF..."
 
-#: effects/DtmfGen.h:45
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
-msgstr "Zastosowany efekt: Generuj d¼wiêki DTMF, % 6lf sekund"
+msgstr "Zastosowany efekt: Generuj dźwięki DTMF, % 6lf sekund"
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
-msgstr "Generowanie d¼wiêków DTMF"
+msgstr "Generowanie dźwięków DTMF"
 
-#: ../src/effects/Echo.cpp:33
+#: effects/Echo.cpp:48
 #, c-format
 msgid "Applied effect: %s delay = %f seconds, decay factor = %f"
-msgstr "Dodano efekt: %s opó¼nienie = %f sekund, wsp. zaniku = %f"
+msgstr "Dodano efekt: %s opóźnienie = %f sekund, wsp. zaniku = %f"
 
-#: ../src/effects/Echo.cpp:39
-#: ../src/effects/Echo.cpp:177
+#: effects/Echo.cpp:170
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/effects/Echo.cpp:182
+#. i18n-hint: && in here is an escape character to get a single & on
+#. * screen, so keep it as is
+#: effects/Echo.cpp:195
+#: effects/Repeat.cpp:200
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "autorzy: Dominia Mazzoni && Vaughan Johnson"
 
-#: ../src/effects/Echo.cpp:192
+#: effects/Echo.cpp:207
 msgid "Delay time (seconds):"
-msgstr "Czas opó¼nienia (sekund):"
+msgstr "Czas opóźnienia (sekund):"
 
-#: ../src/effects/Echo.cpp:211
+#: effects/Echo.cpp:212
 msgid "Decay factor:"
-msgstr "Wspó³czynnik zaniku (decay):"
+msgstr "Współczynnik zaniku (decay):"
 
-#: ../src/effects/Echo.h:36
+#: effects/Echo.h:34
 msgid "Echo..."
 msgstr "Echo..."
 
-#: ../src/effects/Echo.h:40
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "Tworzenie echa"
 
-#: effects/Effect.cpp:303
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
-msgstr "Przygotowywanie podgl±du"
+msgstr "Przygotowywanie podglÄ…du"
 
-#: effects/Effect.cpp:329
+#: effects/Effect.cpp:497
 msgid "Previewing"
-msgstr "Podgl±d"
+msgstr "PodglÄ…d"
 
-#: ../src/ControlToolBar.cpp:721
-#: ../src/effects/Effect.cpp:330
+#: effects/Effect.cpp:512
 msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
-msgstr "B³±d podczas otwarcia urz±dzenia audio. Proszê sprawdziæ ustawienia urz±dzenia wyj¶ciowego audio i czêstotliwo¶æ próbkowania projektu."
+msgstr "Błąd podczas otwarcia urządzenia audio. Proszę sprawdzić ustawienia urządzenia wyjściowego audio i częstotliwość próbkowania projektu."
 
-#: ../src/effects/Effect.h:84
+#: effects/Effect.h:100
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Dodano efekt %s"
 
-#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:329
 msgid "B-spline"
 msgstr "Klin-B"
 
-#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:330
 msgid "Cosine"
 msgstr "Cosinus"
 
-#: effects/Equalization.cpp:1119
+#: effects/Equalization.cpp:331
 msgid "Cubic"
-msgstr "Sze¶cienny"
+msgstr "Sześcienny"
 
-#: ../src/effects/Equalization.cpp:156
+#: effects/Equalization.cpp:367
+#: effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "Korekcja graficzna"
 
-#: effects/Equalization.cpp:865
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
-msgstr "B³±d podczas ³adowania krzywej EQ"
+msgstr "BÅ‚Ä…d podczas Å‚adowania krzywej EQ"
 
-#: effects/Equalization.cpp:1013
+#: effects/Equalization.cpp:1033
 msgid "custom"
-msgstr "na zamówienie"
+msgstr "na zamówienie"
 
-#: effects/Equalization.cpp:971
+#. i18n-hint: && in here is an escape character to get a single &
+#. * on screen, so keep it as is
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr "Korekcja autorstwa Martyn Shaw && Mitcha Golden"
 
-#: effects/Equalization.cpp:992
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr "Maks dB"
 
-#: effects/Equalization.cpp:994
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr "MIn dB"
 
-#: effects/Equalization.cpp:1093
+#: effects/Equalization.cpp:1197
 msgid "kHz"
 msgstr "kHz"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
-msgstr "Twórz krzywe"
+msgstr "Twórz krzywe"
 
-#: effects/Equalization.cpp:1115
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
 msgstr "Korektor graficzny"
 
-#: effects/Equalization.cpp:1131
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
-msgstr "Linearna skala czêstotliwo¶ci"
+msgstr "Linearna skala częstotliwości"
 
-#: effects/Equalization.cpp:1140
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
-msgstr "D³ugo¶æ filtra:"
+msgstr "Długość filtra:"
 
-#: effects/Equalization.cpp:1048
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
-msgstr "Zaznacz krzyw±:"
+msgstr "Zaznacz krzywÄ…:"
 
-#: effects/Equalization.cpp:1058
-#: effects/Equalization.cpp:2244
+#: effects/Equalization.cpp:1273
+#: effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: effects/Equalization.cpp:1064
+#: effects/Equalization.cpp:1279
 msgid "Flat"
-msgstr "P³askie"
+msgstr "PÅ‚askie"
 
-#: effects/Equalization.cpp:2243
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
-msgstr "Wprowad¼ nazwê dla "
+msgstr "Wprowadź nazwę dla "
 
-#: effects/Equalization.cpp:2343
+#: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
 msgid "Confirm Deletion"
-msgstr "Potwierd¼ Usuniêcie"
+msgstr "Potwierdź Usunięcie"
 
-#: ../src/effects/Equalization.h:38
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "Korekcja graficzna..."
 
-#: ../src/effects/Equalization.h:42
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "Tworzenie korekcji graficznej"
 
-#: ../src/effects/Fade.h:23
+#: effects/Fade.h:24
 msgid "Fade In"
 msgstr "Narastanie poziomu"
 
-#: ../src/effects/Fade.h:27
+#: effects/Fade.h:38
 msgid "Fading In"
-msgstr "Podg³a¶nianie (fading in)"
+msgstr "Podgłaśnianie (fading in)"
 
-#: ../src/effects/Fade.h:43
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "Wyciszanie"
 
-#: ../src/effects/Fade.h:47
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "Wyciszanie (fading out)"
 
@@ -4465,7 +5303,7 @@ msgstr "Obcinanie"
 
 #: effects/FindClipping.cpp:211
 msgid "Find Clipping"
-msgstr "Znajd¼ obcinanie"
+msgstr "Znajdź obcinanie"
 
 #: effects/FindClipping.cpp:222
 msgid "by Leland Lucius"
@@ -4473,363 +5311,566 @@ msgstr "Lelanda Luciusa"
 
 #: effects/FindClipping.cpp:234
 msgid "Start threshold (samples):"
-msgstr "Zacznij próg (próbki):"
+msgstr "Zacznij próg (próbki):"
 
 #: effects/FindClipping.cpp:238
 msgid "Stop threshold (samples):"
-msgstr "Zatrzymaj próg (próbki):"
+msgstr "Zatrzymaj próg (próbki):"
 
 #: effects/FindClipping.cpp:250
 msgid "Start and stop must be greater than 0."
-msgstr "Pocz±tek i koniec musz± byæ wiêksze ni¿ 0."
+msgstr "Początek i koniec muszą być większe niż 0."
 
 #: effects/FindClipping.h:37
 msgid "Find Clipping..."
-msgstr "Znajd¼ obcinanie..."
+msgstr "Znajdź obcinanie..."
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr "Wykryj obcinanie"
 
-#: ../src/effects/Invert.h:27
+#: effects/Invert.h:27
 msgid "Invert"
-msgstr "Odwróæ w pionie"
+msgstr "Odwróć w pionie"
 
-#: ../src/effects/Invert.h:31
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "Odwracanie"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr "Ciê¿szy"
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
-msgstr "Najciê¿szy"
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "Wyrównywacz"
 
-#: effects/Leveller.cpp:47
-msgid "Heavy"
-msgstr "Ciê¿ki"
+#: effects/Leveller.cpp:203
+msgid "None-Skip"
+msgstr "Bez-przeskoku"
 
-#: effects/Leveller.cpp:47
+#: effects/Leveller.cpp:204
 msgid "Light"
 msgstr "Lekki"
 
-#: effects/Leveller.cpp:47
+#: effects/Leveller.cpp:205
 msgid "Moderate"
-msgstr "¦redni"
+msgstr "Åšredni"
 
-#: effects/Leveller.cpp:47
-msgid "None-Skip"
-msgstr "Bez-przeskoku"
+#: effects/Leveller.cpp:206
+msgid "Heavy"
+msgstr "Ciężki"
 
-#: BatchCommands.cpp:237
-#: effects/Leveller.cpp:129
-msgid "Leveller"
-msgstr "Wyrównywacz"
+#: effects/Leveller.cpp:207
+msgid "Heavier"
+msgstr "Cięższy"
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
-msgstr "Wyrównywacz stworzony przez Lynn Allan"
+#: effects/Leveller.cpp:208
+msgid "Heaviest"
+msgstr "Najcięższy"
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
-msgstr "Wyrównaj ciche i g³o¶ne sekcje."
+#: effects/Leveller.cpp:212
+#: effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "Lynn Allan"
 
-#: effects/Leveller.cpp:220
-#: effects/Leveller.cpp:233
+#: effects/Leveller.cpp:222
 msgid "Degree of Leveling"
 msgstr "Poziom wysterowania"
 
-#: effects/Leveller.cpp:244
+#: effects/Leveller.cpp:226
+#, fuzzy
+msgid "Degree of Leveling:"
+msgstr "Poziom wysterowania"
+
+#: effects/Leveller.cpp:234
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
-msgstr "Próg ha³asu"
+msgstr "Próg hałasu"
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
-msgstr "Próg dla ha³asu: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
+msgstr "Próg dla hałasu: "
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
-msgstr "Wyrównywacz..."
+msgstr "Wyrównywacz..."
 
-#: effects/Leveller.h:32
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
-msgstr "Stosowanie Wyrównywacza..."
+msgstr "Stosowanie Wyrównywacza..."
+
+#: effects/LoadEffects.cpp:102
+#, fuzzy
+msgid "Generator"
+msgstr "Generator tonu"
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+#, fuzzy
+msgid "Converter"
+msgstr "Odwróć w pionie"
+
+#: effects/LoadEffects.cpp:112
+#, fuzzy
+msgid "Analyser"
+msgstr "&Analiza"
+
+#: effects/LoadEffects.cpp:114
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mikser"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+#, fuzzy
+msgid "Delay"
+msgstr "Wyświetlacz"
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+#, fuzzy
+msgid "Reverb"
+msgstr "Odzyskaj"
+
+#: effects/LoadEffects.cpp:124
+#: effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Fazer"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+#, fuzzy
+msgid "Filter"
+msgstr "Plik"
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+#, fuzzy
+msgid "Parametric"
+msgstr "&Parametry"
+
+#: effects/LoadEffects.cpp:146
+#, fuzzy
+msgid "Multiband"
+msgstr "Multi"
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+#, fuzzy
+msgid "Pitch Shifter"
+msgstr "Wysokość   z"
+
+#: effects/LoadEffects.cpp:152
+#, fuzzy
+msgid "Amplifier"
+msgstr "Wzmacniaj"
+
+#: effects/LoadEffects.cpp:154
+#, fuzzy
+msgid "Distortion"
+msgstr "Rozdziel"
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+#, fuzzy
+msgid "Dynamics Processor"
+msgstr "Kompresor dynamiki"
+
+#: effects/LoadEffects.cpp:160
+#, fuzzy
+msgid "Compressor"
+msgstr "Kompresor..."
+
+#: effects/LoadEffects.cpp:162
+#, fuzzy
+msgid "Expander"
+msgstr "Rozszerz"
+
+#: effects/LoadEffects.cpp:164
+#, fuzzy
+msgid "Limiter"
+msgstr "Wahania"
+
+#: effects/LoadEffects.cpp:166
+#, fuzzy
+msgid "Gate"
+msgstr "Wklej"
+
+#: effects/LoadEffects.cpp:199
+#: effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "Odszumiacz"
+
+#: effects/LoadEffects.cpp:201
+#, fuzzy
+msgid "Pitch and Tempo"
+msgstr "Zmień tempo"
+
+#: effects/LoadEffects.cpp:203
+#, fuzzy
+msgid "Timeline Changer"
+msgstr "Zmiana nazwy"
+
+#: effects/LoadEffects.cpp:205
+#, fuzzy
+msgid "Time"
+msgstr "Przytnij"
+
+#: effects/LoadEffects.cpp:207
+#, fuzzy
+msgid "Onsets"
+msgstr "&Wstaw"
 
 #: effects/Noise.cpp:37
 msgid "White"
-msgstr "Bia³y"
+msgstr "Biały"
 
 #: effects/Noise.cpp:38
 msgid "Pink"
-msgstr "Ró¿owy"
+msgstr "Różowy"
 
 #: effects/Noise.cpp:39
 msgid "Brown"
-msgstr "Br±zowy"
+msgstr "BrÄ…zowy"
 
 #: effects/Noise.cpp:41
 msgid "Noise Generator"
-msgstr "Generator ha³asu"
-
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr "D³ugo¶æ ha³asu"
+msgstr "Generator hałasu"
 
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
-msgstr "Rodzaj ha³asu"
+msgstr "Rodzaj hałasu"
 
 #: effects/Noise.h:41
 msgid "Noise..."
 msgstr "Szum..."
 
-#: effects/Noise.h:45
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
-msgstr "Zastosowany efekt: Generuj Ha³as, %.6lf sekund"
+msgstr "Zastosowany efekt: Generuj Hałas, %.6lf sekund"
 
-#: effects/Noise.h:49
+#: effects/Noise.h:59
 msgid "Generating Noise"
-msgstr "Generowanie ha³asu"
+msgstr "Generowanie hałasu"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Nie mo¿na otworzyæ pliku:\n"
+msgstr "Nie można otworzyć pliku:\n"
 " %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
-msgstr "Próba zastosowania Usuwania Ha³asu bez profilu ha³asu.\n"
+msgstr "Próba zastosowania Usuwania Hałasu bez profilu hałasu.\n"
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Odszumiacz"
-
-#: ../src/effects/NoiseRemoval.cpp:410
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "Krok 1"
 
-#: effects/NoiseRemoval.cpp:765
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+#: effects/NoiseRemoval.cpp:815
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Zaznacz kilka sekund szumu, aby Audacity wiedzia³o co odfiltrowaæ,\n"
-"nastêpnie kliknij na Pobierz profil ha³asu:"
+msgstr "Zaznacz kilka sekund szumu, aby Audacity wiedziało co odfiltrować,\n"
+"następnie kliknij na Pobierz profil hałasu:"
 
-#: ../src/effects/NoiseRemoval.cpp:427
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "Krok 2"
 
-#: effects/NoiseRemoval.cpp:767
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+#: effects/NoiseRemoval.cpp:817
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Zaznacz ca³y d¼wiêk, który chcesz przefiltrowaæ, wybierz ilo¶æ szumów do\n"
-"przefiltrowania i kliknij na OK, aby usun±æ szumy.\n"
+msgstr "Zaznacz cały dźwięk, który chcesz przefiltrować, wybierz ilość szumów do\n"
+"przefiltrowania i kliknij na OK, aby usunąć szumy.\n"
 
-#: ../src/effects/NoiseRemoval.cpp:403
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Usuwanie szumu (Dominic Mazzoni)"
 
-#: ../src/effects/NoiseRemoval.cpp:419
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
-msgstr "Pobierz próbkê szumu"
+msgstr "Pobierz próbkę szumu"
 
-#: effects/NoiseRemoval.cpp:791
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
-msgstr "Redukcja szumów (dB):"
+msgstr "Redukcja szumów (dB):"
+
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
 
-#: effects/NoiseRemoval.cpp:799
+#: effects/NoiseRemoval.cpp:849
 msgid "Frequency smoothing (Hz):"
-msgstr "Wyg³adzanie czêstotliwo¶ci (Hz):"
+msgstr "Wygładzanie częstotliwości (Hz):"
 
-#: effects/NoiseRemoval.cpp:807
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr "Czas reakcji (sekund):"
 
-#: ../src/effects/NoiseRemoval.h:38
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
+#: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Odszumiacz..."
 
-#: ../src/effects/NoiseRemoval.h:43
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "Tworzenie profilu szumu"
 
-#: ../src/effects/NoiseRemoval.h:45
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "Usuwanie szumu"
 
-#: effects/Normalize.cpp:68
+#. i18n-hint: First %s is the effect name, 2nd and 3rd are either true or
+#. * false (translated below) if those options were selected
+#: effects/Normalize.cpp:70
 #, c-format
 msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
-msgstr "Zastosowany efekt: %s usuñ offset = %s, normalizuj amplitudê = %s"
+msgstr "Zastosowany efekt: %s usuń offset = %s, normalizuj amplitudę = %s"
 
-#: effects/Normalize.cpp:70
-#: effects/Normalize.cpp:71
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
 msgid "false"
-msgstr "fa³sz"
+msgstr "fałsz"
 
-#: effects/Normalize.cpp:70
-#: effects/Normalize.cpp:71
+#. i18n-hint: true here means that the option was
+#. * selected. Opposite false if not selected
+#: effects/Normalize.cpp:74
+#: effects/Normalize.cpp:75
 msgid "true"
 msgstr "prawda"
 
-#: effects/Normalize.cpp:73
+#: effects/Normalize.cpp:77
 #, c-format
 msgid ", maximum amplitude = %.1f dB"
 msgstr ", maksymalna amplituda = %.1f dB"
 
-#: ../src/effects/Normalize.cpp:29
+#: effects/Normalize.cpp:327
 msgid "Normalize"
 msgstr "Normalizacja "
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalizuj Dominica Mazzoni"
-
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Usuwanie sk³adowej sta³ej"
+#: effects/Normalize.cpp:351
+#: effects/Normalize.cpp:352
+#, fuzzy
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr "Usuwanie składowej stałej"
 
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
-msgstr "Znormalizuj maksymaln± amplitudê do"
+#: effects/Normalize.cpp:357
+#, fuzzy
+msgid "Normalize maximum amplitude to:"
+msgstr "Znormalizuj maksymalnÄ… amplitudÄ™ do"
 
-#: effects/Normalize.cpp:336
+#: effects/Normalize.cpp:362
 msgid "-"
 msgstr "-"
 
-#: ../src/effects/Normalize.h:34
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "Normalizuj..."
 
-#: ../src/effects/Normalize.h:38
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "Normalizacja..."
 
-#: ../src/effects/Phaser.cpp:47
+#: effects/Phaser.cpp:65
 #, c-format
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
-msgstr "Dodano efekt: %s %d, %.0f%% poziomów, czêstotliwo¶æ = %.1f Hz, pocz±tkowe przesuniêcie fazowe = %.0f stopni, g³êboko¶æ = %d, sprzê¿enie zwrotne = %.0f%%"
+msgstr "Dodano efekt: %s %d, %.0f%% poziomów, częstotliwość = %.1f Hz, początkowe przesunięcie fazowe = %.0f stopni, głębokość = %d, sprzężenie zwrotne = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Fazer"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Fazer (autor:Nasca Octavian Paul)"
-
-#: ../src/effects/Phaser.cpp:455
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "Plany:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+#, fuzzy
+msgid "Stages"
+msgstr "Plany:"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:497
-#: ../src/effects/Wahwah.cpp:468
+#: effects/Phaser.cpp:236
+#: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
-msgstr "Czêstotliwo¶æ LFO (Hz)"
+msgstr "Częstotliwość LFO (Hz)"
 
-#: ../src/effects/Phaser.cpp:513
-#: ../src/effects/Wahwah.cpp:484
+#: effects/Phaser.cpp:239
+#: effects/Wahwah.cpp:224
+#, fuzzy
+msgid "LFO frequency in hertz"
+msgstr "Częstotliwość LFO (Hz)"
+
+#: effects/Phaser.cpp:241
+#: effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
-msgstr "Pocz±tkowe Przesuniêcie LFO (deg.):"
+msgstr "Początkowe Przesunięcie LFO (deg.):"
+
+#: effects/Phaser.cpp:244
+#: effects/Wahwah.cpp:229
+#, fuzzy
+msgid "LFO start phase in degrees"
+msgstr "Początkowe Przesunięcie LFO (deg.):"
 
-#: ../src/effects/Phaser.cpp:529
+#: effects/Phaser.cpp:246
 msgid "Depth:"
-msgstr "G³êboko¶æ:"
+msgstr "Głębokość:"
 
-#: ../src/effects/Phaser.cpp:545
+#: effects/Phaser.cpp:249
+#: effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
-msgstr "Sprzê¿enie (%):"
+msgstr "Sprzężenie (%):"
+
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
 
-#: ../src/effects/Phaser.h:41
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "Fazer..."
 
-#: ../src/effects/Phaser.h:45
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "Dodawanie efektu Phaser"
 
-#: effects/Repair.cpp:94
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+#: effects/Repair.cpp:99
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Efekt naprawy jest pomy¶lany do u¿ytku na krótkich sekcjach uszkodzonego d¼wiêku (do 128 próbek).\n"
+msgstr "Efekt naprawy jest pomyślany do użytku na krótkich sekcjach uszkodzonego dźwięku (do 128 próbek).\n"
 "\n"
-"Przybli¿ i zaznacz u³amek sekundy do naprawy."
+"Przybliż i zaznacz ułamek sekundy do naprawy."
 
-#: effects/Repair.h:33
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
-msgstr "Naprawianie uszkodzonego d¼wiêku"
+msgstr "Naprawianie uszkodzonego dźwięku"
 
-#: ../src/effects/Repeat.cpp:31
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
-msgstr "Powtórzono %d-razy"
+msgstr "Powtórzono %d-razy"
 
-#: ../src/effects/Repeat.cpp:57
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
-msgstr "¦cie¿ki s± zbyt d³ugie aby powtórnie wstawiæ zaznaczenie."
+msgstr "Ścieżki są zbyt długie aby powtórnie wstawić zaznaczenie."
 
-#: ../src/effects/Repeat.cpp:58
-#: ../src/effects/Repeat.cpp:62
+#: effects/Repeat.cpp:77
+#: effects/Repeat.cpp:187
 msgid "Repeat"
-msgstr "Powtórz"
+msgstr "Powtórz"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Powtarzanie (autorzy: Dominic Mazzoni  && Vaughan Johnson)"
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
+msgstr "Ilość powtórzeń :"
 
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
-msgstr "Ilo¶æ powtórzeñ :"
+#: effects/Repeat.cpp:221
+#, fuzzy
+msgid "New selection length: hh:mm:ss"
+msgstr "Nowa długość zaznaczenia:"
 
-#: ../src/effects/Repeat.cpp:241
-#: ../src/effects/Repeat.cpp:280
+#: effects/Repeat.cpp:253
 msgid "New selection length: "
-msgstr "Nowa d³ugo¶æ zaznaczenia:"
-
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minut, %d sekund"
+msgstr "Nowa długość zaznaczenia:"
 
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "gg:mm:ss"
 
-#: ../src/effects/Repeat.h:34
+#: effects/Repeat.h:33
 msgid "Repeat..."
-msgstr "Powtórz..."
+msgstr "Powtórz..."
 
-#: ../src/effects/Repeat.h:38
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
-msgstr "Tworzenie powtórzenia"
+msgstr "Tworzenie powtórzenia"
 
-#: ../src/effects/Reverse.h:30
+#: effects/Reverse.h:30
 msgid "Reverse"
-msgstr "Odwróæ w czasie"
+msgstr "Odwróć w czasie"
 
-#: ../src/effects/Reverse.h:34
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "Odwracanie"
 
@@ -4841,380 +5882,474 @@ msgstr "Generator ciszy"
 msgid "Silence..."
 msgstr "Cisza..."
 
-#: ../src/effects/Silence.h:31
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "Generowanie ciszy"
 
-#: effects/Silence.h:43
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
-msgstr "Zastosowany efekt: Generuj ciszê, %.6lf sekund"
+msgstr "Zastosowany efekt: Generuj ciszÄ™, %.6lf sekund"
 
 #: effects/SimplePairedTwoTrack.h:120
 msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
-msgstr "Niestety ten efekt nie dzia³a na ¶cie¿kach stereo, gdzie poszczególne kana³y nie pasuj±."
+msgstr "Niestety ten efekt nie działa na ścieżkach stereo, gdzie poszczególne kanały nie pasują."
 
 #: effects/SpikeCleaner.cpp:69
 msgid "Spike Cleaner"
-msgstr "Opró¿niacz warto¶ci szczytowej"
+msgstr "Opróżniacz wartości szczytowej"
 
 #: effects/SpikeCleaner.cpp:160
 msgid "SpikeCleaner by Lynn Allan"
-msgstr "Opró¿niacz warto¶ci szczytowej autorstwa Lynn Allan"
+msgstr "Opróżniacz wartości szczytowej autorstwa Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Maksymalny czas trwania warto¶ci szczytowej (milisekund): \n"
-"(99999 lub wiêcej jest wy³±czone)"
+msgstr "Maksymalny czas trwania wartości szczytowej (milisekund): \n"
+"(99999 lub więcej jest wyłączone)"
 
 #: effects/SpikeCleaner.cpp:178
-#: effects/TruncSilence.cpp:269
 msgid "Theshold for silence: "
-msgstr "Próg ciszy: "
+msgstr "Próg ciszy: "
 
 #: effects/SpikeCleaner.h:27
 msgid "Spike Cleaner..."
-msgstr "Opró¿niacz warto¶ci szczytowej..."
+msgstr "Opróżniacz wartości szczytowej..."
 
-#: effects/SpikeCleaner.h:31
+#: effects/SpikeCleaner.h:35
 msgid "Applying Spike Cleaner..."
-msgstr "Stosowanie opró¿niacza warto¶ci szczytowej..."
+msgstr "Stosowanie opróżniacza wartości szczytowej..."
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "& Stereo do Mono"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
 msgstr "Stosowanie stereo do mono"
 
-#: effects/ToneGen.cpp:59
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:61
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
-msgstr "Zastosowany efekt: Generuj %s falê %s, czêstotliwo¶æ = %.2f Hz, amplituda = %.2f, %.6lf sekund"
+msgstr "Zastosowany efekt: Generuj %s falę %s, częstotliwość = %.2f Hz, amplituda = %.2f, %.6lf sekund"
 
-#: effects/ToneGen.cpp:66
+#: effects/ToneGen.cpp:69
+#: widgets/Meter.cpp:416
+msgid "Linear"
+msgstr "Liniowy"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
-msgstr "Generator æwierkania"
+msgstr "Generator ćwierkania"
 
-#: ../src/effects/ToneGen.cpp:40
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "Generator tonu"
 
-#: ../src/effects/ToneGen.cpp:45
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "Sinus"
 
-#: ../src/effects/ToneGen.cpp:46
+#: effects/ToneGen.cpp:73
 msgid "Square"
-msgstr "Prostok±t"
+msgstr "ProstokÄ…t"
 
-#: ../src/effects/ToneGen.cpp:47
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
-msgstr "Pi³okszta³tny"
+msgstr "Piłokształtny"
 
-#: effects/ToneGen.cpp:70
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
-msgstr "Kwadratowy, bez aliasów"
+msgstr "Kwadratowy, bez aliasów"
 
-#: effects/ToneGen.cpp:298
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
-msgstr "Czêstotliwo¶æ (Hz)"
-
-#: effects/ToneGen.cpp:300
-#: effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135
-#: toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr "D³ugo¶æ"
+msgstr "Częstotliwość (Hz)"
 
-#: ../src/effects/ToneGen.cpp:278
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "Przebieg czasowy:"
 
-#: effects/ToneGen.cpp:328
-#: toolbars/ControlToolBar.cpp:186
-msgid "Start"
-msgstr "Pocz±tek"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:329
-#: toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129
-#: toolbars/SelectionBar.cpp:226
-msgid "End"
-msgstr "Koniec"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+#, fuzzy
+msgid "Interpolation:"
+msgstr "Fast Sinc Interpolation"
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.h:40
 msgid "Chirp..."
-msgstr "¦wiergot..."
+msgstr "Åšwiergot..."
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.h:40
 msgid "Tone..."
 msgstr "Ton..."
 
-#: effects/ToneGen.h:43
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
-msgstr "Generowanie æwierkania"
+msgstr "Generowanie ćwierkania"
 
-#: ../src/effects/ToneGen.h:44
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "Generowanie Tonu"
 
 #: effects/TruncSilence.cpp:113
 msgid "All tracks must have the same sample rate"
-msgstr "Wszystkie ¶cie¿ki powinny mieæ t± sam± czêstotliwo¶æ próbkowania"
+msgstr "Wszystkie ścieżki powinny mieć tą samą częstotliwość próbkowania"
 
 #: effects/TruncSilence.cpp:113
-#: effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr "Wyciszenie"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "Lynn Allan"
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
-msgstr "Maksymalna d³ugo¶æ wyciszenia:"
+msgstr "Maksymalna długość wyciszenia:"
 
-#: prefs/AudioIOPrefs.cpp:175
-#: prefs/AudioIOPrefs.cpp:178
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
+#: prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "milisekundy"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
-msgstr "Próg dla wyciszenia:"
+msgstr "Próg dla wyciszenia:"
 
-#: effects/TruncSilence.cpp:375
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
-msgstr "D³ugo¶æ minimum 1 milisekunda"
+msgstr "Długość minimum 1 milisekunda"
 
-#: BatchCommands.cpp:236
-#: effects/TruncSilence.cpp:84
-#: effects/TruncSilence.h:29
+#: effects/TruncSilence.h:28
 msgid "Truncate Silence..."
-msgstr "Wytnij Ciszê"
+msgstr "Wytnij CiszÄ™"
 
-#: effects/TruncSilence.h:33
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr "Skracanie ciszy..."
 
-#: ../src/effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:172
 msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
-msgstr "Przykro nam,  efekty VST nie mog± zostaæ u¿yte do ¶cie¿ek stereo je¿eli ¶cie¿ki sk³adowe do siebie nie pasuj±."
+msgstr "Przykro nam,  efekty VST nie mogą zostać użyte do ścieżek stereo jeżeli ścieżki składowe do siebie nie pasują."
 
-#: ../src/effects/VST/VSTEffect.cpp:196
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
-msgstr "Nie mo¿na dokonaæ zamiany"
+msgstr "Nie można dokonać zamiany"
 
-#: ../src/effects/VST/VSTEffect.cpp:410
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "Parametry wtyczek VST"
 
-#: ../src/effects/Wahwah.cpp:41
+#: effects/Wahwah.cpp:61
 #, c-format
 msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
-msgstr "Dodano efekt: %s czêstotliwo¶æ = %.1f, pocz±tkowe przesuniêcie fazowe = %.0f stopni, g³êboko¶æ = %.0f%%, rezonans = %.1f, czêstotliwo¶æ odciêcia = %.0f%%"
+msgstr "Dodano efekt: %s częstotliwość = %.1f, początkowe przesunięcie fazowe = %.0f stopni, głębokość = %.0f%%, rezonans = %.1f, częstotliwość odcięcia = %.0f%%"
 
-#: ../src/effects/Wahwah.cpp:52
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah ( Nasca Octavian Paul )"
-
-#: ../src/effects/Wahwah.cpp:500
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
-msgstr "G³êboko¶æ (%):"
+msgstr "Głębokość (%):"
 
-#: ../src/effects/Wahwah.cpp:516
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "Rezonans:"
 
-#: ../src/effects/Wahwah.cpp:532
+#: effects/Wahwah.cpp:239
+#, fuzzy
+msgid "Resonance"
+msgstr "Rezonans:"
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
-msgstr "Ograniczenie czêstotliwo¶ci Wah (%):"
+msgstr "Ograniczenie częstotliwości Wah (%):"
+
+#: effects/Wahwah.cpp:244
+#, fuzzy
+msgid "Wah frequency offset in percent"
+msgstr "Ograniczenie częstotliwości Wah (%):"
 
-#: ../src/effects/Wahwah.h:39
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "Wahwah..."
 
-#: ../src/effects/Wahwah.h:43
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "Dodawanie Wahwah"
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:137
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176
+#: effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "Tworzenie efektu: %s"
 
-#: effects/ladspa/LadspaEffect.cpp:189
+#: effects/ladspa/LadspaEffect.cpp:196
+#: effects/lv2/LV2Effect.cpp:211
 msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
-msgstr "Niestety, Efekty wtyczek nie dzia³aj± na ¶cie¿kach stereo, gdzie poszczególne kana³y nie pasuj±."
+msgstr "Niestety, Efekty wtyczek nie działają na ścieżkach stereo, gdzie poszczególne kanały nie pasują."
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:435
-#: ../src/effects/ladspa/LadspaEffect.cpp:443
-#: ../src/prefs/QualityPrefs.cpp:160
+#: effects/ladspa/LadspaEffect.cpp:580
+#: effects/ladspa/LadspaEffect.cpp:588
+#: prefs/GUIPrefs.cpp:51
+#: prefs/QualityPrefs.cpp:72
 msgid "None"
-msgstr "¯aden"
+msgstr "Żaden"
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:437
+#: effects/ladspa/LadspaEffect.cpp:582
+#: effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../src/effects/ladspa/LadspaEffect.cpp:452
+#: effects/ladspa/LadspaEffect.cpp:615
+#: effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "Ustawienia efektu"
 
-#: effects/ladspa/LadspaEffect.cpp:692
+#: effects/ladspa/LadspaEffect.cpp:710
+#: effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
-msgstr "D³ugo¶æ (sekund)"
+msgstr "Długość (sekund)"
+
+#: effects/lv2/LV2Effect.cpp:849
+#: effects/lv2/LV2Effect.cpp:852
+#, fuzzy
+msgid "Note length (seconds)"
+msgstr "Długość (sekund)"
+
+#: effects/lv2/LV2Effect.cpp:860
+#: effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
 
-#: ../src/effects/nyquist/Nyquist.cpp:217
+#: effects/lv2/LV2Effect.cpp:871
+#: effects/lv2/LV2Effect.cpp:874
+#, fuzzy
+msgid "Note key"
+msgstr "Note Track"
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "Dodano efekt Nyquist'a"
 
-#: ../src/effects/nyquist/Nyquist.cpp:224
+#: effects/nyquist/Nyquist.cpp:264
+#: effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Nyquist Prompt..."
 
-#: ../src/effects/nyquist/Nyquist.cpp:282
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
-msgstr "Wprowad¼ instrukcjê Nyquist'a:"
+msgstr "Wprowadź instrukcję Nyquist'a:"
 
-#: ../src/effects/nyquist/Nyquist.cpp:370
+#: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
-msgstr "Przykro mi ale nie mo¿na u¿ywaæ efektu na ¶cie¿kach stereo je¿eli ¶cie¿ki do siebie nie pasuj±."
+msgstr "Przykro mi ale nie można używać efektu na ścieżkach stereo jeżeli ścieżki do siebie nie pasują."
 
-#: ../src/effects/nyquist/Nyquist.cpp:397
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Nyquist"
 
-#: ../src/effects/nyquist/Nyquist.cpp:398
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
-msgstr "Wyj¶cie Nyquist: "
+msgstr "Wyjście Nyquist: "
 
-#: effects/nyquist/Nyquist.cpp:594
-#: effects/nyquist/Nyquist.cpp:605
+#: effects/nyquist/Nyquist.cpp:603
+#: effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
-msgstr "Nyquist zwróci³ warto¶æ:"
+msgstr "Nyquist zwrócił wartość:"
 
-#: ../src/effects/nyquist/Nyquist.cpp:594
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
-msgstr "Nyquist nie zwróci³ audio.\n"
+msgstr "Nyquist nie zwrócił audio.\n"
 
-#: ../src/effects/nyquist/Nyquist.cpp:604
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
-msgstr "Nyquist zwróci³ zbyt du¿o kana³ów audio.\n"
+msgstr "Nyquist zwrócił zbyt dużo kanałów audio.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:86
 #, c-format
 msgid "Extracting features: %s"
 msgstr "Cechy ekstrakcji: %s"
 
-#: effects/vamp/VampEffect.cpp:106
+#: effects/vamp/VampEffect.cpp:117
 msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
-msgstr "Niestety, Wtyczka Vamp nie dzia³a na ¶cie¿kach stereo, gdzie poszczególne kana³y nie pasuj±."
+msgstr "Niestety, Wtyczka Vamp nie działa na ścieżkach stereo, gdzie poszczególne kanały nie pasują."
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:131
 msgid "Sorry, failed to load Vamp Plug-in."
-msgstr "Niestety, b³±d przy ³adowaniu Wtyczki Vamp."
+msgstr "Niestety, błąd przy ładowaniu Wtyczki Vamp."
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:239
 msgid "Sorry, Vamp Plug-in failed to initialize."
-msgstr "Niestety, b³±d przy uruchamianiu Wtyczki Vamp."
+msgstr "Niestety, błąd przy uruchamianiu Wtyczki Vamp."
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:387
 msgid " - Vamp audio analysis plugin"
-msgstr " - wtyczka analizowania d¼wiêku Vamp"
+msgstr " - wtyczka analizowania dźwięku Vamp"
 
 #: effects/vamp/VampEffect.cpp:423
 msgid "Plugin Settings"
 msgstr "Ustawienia Wtyczki"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:442
+#: effects/vamp/VampEffect.cpp:448
 msgid "Program"
 msgstr "Program"
 
-#: export/Export.cpp:135
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
 msgstr ""
-"¯adne ¶cie¿ki nie zosta³y zaznaczone! U¿yj Ctrl-A (Zaznacz wszystkie)\n"
-"Wybierz Eksportuj... , aby eksportowaæ wszystkie ¶cie¿ki."
 
-#: export/Export.cpp:444
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
+
+#: export/Export.cpp:522
 msgid "Export File"
 msgstr "Eksportuj Plik"
 
-#: export/Export.cpp:452
+#: export/Export.cpp:530
 msgid "&Options..."
 msgstr "&Opcje..."
 
-#: ../src/export/Export.cpp:202
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
-msgstr "Czy jeste¶ pewien ¿e chcesz zapisaæ plik jako \""
+msgstr "Czy jesteś pewien że chcesz zapisać plik jako \""
 
-#: export/Export.cpp:499
+#: export/Export.cpp:591
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Plik %s zostanie zapisany z nazw± \"%s\".\n"
+msgstr "Plik %s zostanie zapisany z nazwÄ… \"%s\".\n"
 "\n"
-"Pliki te zazwyczaj koñcz± siê z \".%s\", niektóre programy nie otworz± tych plików z niestandardowymi rozszerzeniami.\n"
+"Pliki te zazwyczaj kończą się z \".%s\", niektóre programy nie otworzą tych plików z niestandardowymi rozszerzeniami.\n"
 "\n"
-"Czy jeste¶ pewny, ¿e chcesz zapisaæ ten plik z t± nazw±?"
+"Czy jesteś pewny, że chcesz zapisać ten plik z tą nazwą?"
 
-#: export/Export.cpp:520
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
-msgstr "Plik o nazwie \"%s\" ju¿ istnieje.  Zast±piæ?"
+msgstr "Plik o nazwie \"%s\" już istnieje.  Zastąpić?"
 
-#: ../src/export/Export.cpp:142
+#: export/Export.cpp:710
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
-msgstr "Twoje ¶cie¿ki bêd± zmiksowane do dwóch kana³ów stereo w wyeksportowanym pliku."
+msgstr "Twoje ścieżki będą zmiksowane do dwóch kanałów stereo w wyeksportowanym pliku."
 
-#: ../src/export/Export.cpp:147
+#: export/Export.cpp:715
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
-msgstr "Twoje ¶cie¿ki bêd± zmiksowane do pojedynczego kana³u mono w wyeksportowanym pliku."
+msgstr "Twoje ścieżki będą zmiksowane do pojedynczego kanału mono w wyeksportowanym pliku."
 
-#: export/Export.cpp:171
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr "Zaawansowane opcje miksowania"
 
-#: export/Export.cpp:632
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
-msgstr "Kana³: %2d"
+msgstr "Kanał: %2d"
 
-#: export/Export.cpp:755
+#: export/Export.cpp:1046
 msgid " - Left"
 msgstr " - Lewy"
 
-#: export/Export.cpp:756
+#: export/Export.cpp:1047
 msgid " - Right"
 msgstr " - Prawy"
 
-#: export/Export.cpp:775
-#: export/Export.cpp:829
+#: export/Export.cpp:1072
+#, fuzzy
+msgid "Mixer Panel"
+msgstr "Panel śledzący"
+
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
-msgstr "Kana³y wyj¶ciowe: %2d"
+msgstr "Kanały wyjściowe: %2d"
 
 #: export/ExportCL.cpp:55
 msgid "Specify Command Line Encoder"
-msgstr "Sprecyzuj Enkoder Linii Poleceñ"
+msgstr "Sprecyzuj Enkoder Linii Poleceń"
 
 #: export/ExportCL.cpp:70
 msgid "Command Line Export Setup"
-msgstr "Ustawienia eksportu Linii Poleceñ"
+msgstr "Ustawienia eksportu Linii Poleceń"
 
 #: export/ExportCL.cpp:75
 msgid "Command:"
@@ -5222,39 +6357,548 @@ msgstr "Polecenie:"
 
 #: export/ExportCL.cpp:80
 msgid "Show output"
-msgstr "Poka¿ efekt wyj¶ciowy"
+msgstr "Pokaż efekt wyjściowy"
 
 #: export/ExportCL.cpp:87
 #, c-format
 msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
-msgstr "Dane zostan± podane standardowo.\"%f\" zostanie zast±pione plikiem zaznaczonym."
+msgstr "Dane zostanÄ… podane standardowo.\"%f\" zostanie zastÄ…pione plikiem zaznaczonym."
 
-#: export/ExportCL.cpp:227
+#: export/ExportCL.cpp:222
 msgid "(external program)"
-msgstr "(program zewnêtrzny)"
+msgstr "(program zewnętrzny)"
 
-#: ../src/export/ExportPCM.cpp:79
+#: export/ExportCL.cpp:253
+#: export/ExportPCM.cpp:457
 #, c-format
 msgid "Cannot export audio to %s"
-msgstr "Nie mo¿na eksportowaæ audio do %s"
-
-#: export/ExportCL.cpp:328
-#: export/ExportOGG.cpp:252
-#: export/ExportPCM.cpp:391
-msgid "Export"
-msgstr "Eksportuj"
+msgstr "Nie można eksportować audio do %s"
 
-#: ../src/export/ExportCL.cpp:144
+#: export/ExportCL.cpp:327
 msgid "Exporting the selected audio using command-line encoder"
-msgstr "Eksportuj zaznaczenie przy u¿yciu komendy z wiersza poleceñ"
+msgstr "Eksportuj zaznaczenie przy użyciu komendy z wiersza poleceń"
 
-#: ../src/export/ExportCL.cpp:146
+#: export/ExportCL.cpp:328
 msgid "Exporting the entire project using command-line encoder"
-msgstr "Eksportowanie ca³ego projektu przy u¿yciu enkodera z lini poleceñ"
+msgstr "Eksportowanie całego projektu przy użyciu enkodera z lini poleceń"
 
-#: export/ExportCL.cpp:395
+#: export/ExportCL.cpp:390
 msgid "Command Output"
-msgstr "Polecenie Wyj¶ciowe"
+msgstr "Polecenie Wyjściowe"
+
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, fuzzy, c-format
+msgid "Exporting selected audio as %s"
+msgstr "Eksportowanie zaznaczonego dźwięku jako %s"
+
+#: export/ExportFFmpeg.cpp:639
+#, fuzzy, c-format
+msgid "Exporting entire file as %s"
+msgstr "Eksportowanie całego pliku %d kbps"
+
+#: export/ExportFFmpeg.cpp:702
+#: export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "Niewłaściwa częstotliwość próbkowania"
+
+#: export/ExportFFmpeg.cpp:715
+#, fuzzy, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr "Częstotliwość próbkowania (%d) nie jest wspierana przez format\n"
+"plików MP3."
+
+#: export/ExportFFmpeg.cpp:718
+#, fuzzy, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr "Częstotliwość próbkowania (%d) nie jest wspierana przez format\n"
+"plików MP3."
+
+#: export/ExportFFmpeg.cpp:721
+#: export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "Możesz resamplować do jednej z częstotliwości poniżej."
+
+#: export/ExportFFmpeg.cpp:749
+#: export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "Częstotliwości Próbkowania"
+
+#: export/ExportFFmpegDialogs.cpp:93
+#, fuzzy
+msgid "Specify AC3 Options"
+msgstr "Sprecyzuj Opcje FLAC"
+
+#: export/ExportFFmpegDialogs.cpp:117
+#, fuzzy
+msgid "AC3 Export Setup"
+msgstr "Ustawienia eksportu FLAC"
+
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Częstotliwość próbkowania:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+#, fuzzy
+msgid "Specify AAC Options"
+msgstr "Sprecyzuj Opcje FLAC"
+
+#: export/ExportFFmpegDialogs.cpp:178
+#, fuzzy
+msgid "AAC Export Setup"
+msgstr "Ustawienia eksportu FLAC"
+
+#: export/ExportFFmpegDialogs.cpp:217
+#, fuzzy
+msgid "Specify AMR-NB Options"
+msgstr "Sprecyzuj Opcje MP2"
+
+#: export/ExportFFmpegDialogs.cpp:241
+#, fuzzy
+msgid "AMR-NB Export Setup"
+msgstr "Ustawienia eksportu MP2"
+
+#: export/ExportFFmpegDialogs.cpp:286
+#, fuzzy
+msgid "Specify AMR-WB Options"
+msgstr "Sprecyzuj Opcje MP2"
+
+#: export/ExportFFmpegDialogs.cpp:310
+#, fuzzy
+msgid "AMR-WB Export Setup"
+msgstr "Ustawienia eksportu MP2"
+
+#: export/ExportFFmpegDialogs.cpp:357
+#, fuzzy
+msgid "Specify WMA Options"
+msgstr "Sprecyzuj Opcje MP2"
+
+#: export/ExportFFmpegDialogs.cpp:381
+#, fuzzy
+msgid "WMA Export Setup"
+msgstr "Ustawienia eksportu MP2"
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, fuzzy, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "Nadpisz istniejÄ…ce pliki"
+
+#: export/ExportFFmpegDialogs.cpp:510
+#, fuzzy
+msgid "Confirm Overwrite"
+msgstr "Potwierdź Usunięcie"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+#, fuzzy
+msgid "Specify Other Options"
+msgstr "Sprecyzuj Opcje MP2"
+
+#: export/ExportFFmpegDialogs.cpp:897
+#, fuzzy
+msgid "Preset:"
+msgstr "Ustawienie"
+
+#: export/ExportFFmpegDialogs.cpp:898
+#, fuzzy
+msgid "Load Preset"
+msgstr "Ustawienie"
+
+#: export/ExportFFmpegDialogs.cpp:899
+#, fuzzy
+msgid "Save Preset"
+msgstr "Ustawienie"
+
+#: export/ExportFFmpegDialogs.cpp:900
+#, fuzzy
+msgid "Delete Preset"
+msgstr "Usuń etykiety"
+
+#: export/ExportFFmpegDialogs.cpp:901
+#, fuzzy
+msgid "Import Presets"
+msgstr "Importuj Etykiety"
+
+#: export/ExportFFmpegDialogs.cpp:902
+#, fuzzy
+msgid "Export Presets"
+msgstr "Eksportuj etykiety jako:"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+#, fuzzy
+msgid "Format selector:"
+msgstr "Dopasuj zaznaczenie"
+
+#: export/ExportFFmpegDialogs.cpp:917
+#, fuzzy
+msgid "Codec selector:"
+msgstr "Wycisz zaznaczenie"
+
+#: export/ExportFFmpegDialogs.cpp:919
+#, fuzzy
+msgid "Show All Formats"
+msgstr "Wspierane formaty"
+
+#: export/ExportFFmpegDialogs.cpp:920
+#, fuzzy
+msgid "Show All Codecs"
+msgstr "Pokaż/Ukryj"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+#: prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Język:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Jakość:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+#, fuzzy
+msgid "Sample Rate:"
+msgstr "Częstotliwości Próbkowania"
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+#, fuzzy
+msgid "Frame Size:"
+msgstr "Rozmiar płaszczyzny"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+#, fuzzy
+msgid "Mux Rate:"
+msgstr "Częstotliwość próbkowania:"
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+#, fuzzy
+msgid "Packet Size:"
+msgstr "Rozmiar płaszczyzny"
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, fuzzy, c-format
+msgid "Delete preset '%s'?"
+msgstr "Nie można usunąć %s'"
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Pliki xml (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+#, fuzzy
+msgid "Select xml file to export presets into"
+msgstr "Zaznacz plik(i) do przetwarzania wsadowego..."
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+#, fuzzy
+msgid "Main profile"
+msgstr "GÅ‚owny mikser"
+
+#: export/ExportFFmpegDialogs.h:676
+#, fuzzy
+msgid "2-level"
+msgstr "Poziom:"
+
+#: export/ExportFFmpegDialogs.h:676
+#, fuzzy
+msgid "4-level"
+msgstr "Poziom:"
+
+#: export/ExportFFmpegDialogs.h:676
+#, fuzzy
+msgid "8-level"
+msgstr "Poziom:"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
 
 #: export/ExportFLAC.cpp:67
 msgid "Specify FLAC Options"
@@ -5296,15 +6940,15 @@ msgstr "7"
 msgid "8 (best)"
 msgstr "8 (Najlepsze)"
 
-#: prefs/FileFormatPrefs.cpp:193
+#: export/ExportFLAC.cpp:92
 msgid "16 bit"
-msgstr "16 bitów"
+msgstr "16 bitów"
 
-#: prefs/FileFormatPrefs.cpp:194
+#: export/ExportFLAC.cpp:93
 msgid "24 bit"
 msgstr "24 bity"
 
-#: prefs/FileFormatPrefs.cpp:190
+#: export/ExportFLAC.cpp:97
 msgid "FLAC Export Setup"
 msgstr "Ustawienia eksportu FLAC"
 
@@ -5312,463 +6956,382 @@ msgstr "Ustawienia eksportu FLAC"
 msgid "Level:"
 msgstr "Poziom:"
 
-#: prefs/FileFormatPrefs.cpp:197
+#: export/ExportFLAC.cpp:103
 msgid "Bit depth:"
-msgstr "Ilo¶æ bitów:"
+msgstr "Ilość bitów:"
 
-#: export/ExportFLAC.cpp:201
+#: export/ExportFLAC.cpp:209
 msgid "FLAC Files"
 msgstr "Pliki FLAC"
 
-#: export/ExportFLAC.cpp:93
+#: export/ExportFLAC.cpp:312
 msgid "Exporting the selected audio as FLAC"
-msgstr "Eksportowanie zaznaczonych d¼wiêków jako FLAC"
+msgstr "Eksportowanie zaznaczonych dźwięków jako FLAC"
 
-#: export/ExportFLAC.cpp:94
+#: export/ExportFLAC.cpp:313
 msgid "Exporting the entire project as FLAC"
-msgstr "Eksportowanie ca³ego projektu jako FLAC"
-
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr "Edytuj metadane dla pliku FLAC"
+msgstr "Eksportowanie całego projektu jako FLAC"
 
-#: export/ExportMP2.cpp:96
+#: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr "Sprecyzuj Opcje MP2"
 
-#: prefs/FileFormatPrefs.cpp:204
+#: export/ExportMP2.cpp:129
 msgid "MP2 Export Setup"
 msgstr "Ustawienia eksportu MP2"
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Czêstotliwo¶æ próbkowania:"
-
-#: export/ExportMP2.cpp:190
+#: export/ExportMP2.cpp:202
 msgid "MP2 Files"
 msgstr "Pliki MP2"
 
-#: export/ExportMP2.cpp:94
+#: export/ExportMP2.cpp:232
 msgid "Cannot export MP2 with this sample rate and bit rate"
-msgstr "Nie mo¿na eksportowaæ MP2 z t± czêstotliwo¶ci± próbkowania"
+msgstr "Nie można eksportować MP2 z tą częstotliwością próbkowania"
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr "Edytuj tagi ID3 dla pliku MP2"
-
-#: ../src/export/ExportMP3.cpp:1345
-#: ../src/export/ExportOGG.cpp:53
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1771
+#: export/ExportOGG.cpp:186
 msgid "Unable to open target file for writing"
-msgstr "Nie mo¿na otworzyæ pliku do zapisu"
+msgstr "Nie można otworzyć pliku do zapisu"
 
-#: export/ExportMP2.cpp:144
-#: export/ExportMP3.cpp:1680
+#: export/ExportMP2.cpp:274
 #, c-format
 msgid "Exporting selected audio at %d kbps"
-msgstr "Eksportowanie zaznaczonego d¼wiêku %d kbps"
+msgstr "Eksportowanie zaznaczonego dźwięku %d kbps"
 
-#: export/ExportMP2.cpp:145
-#: export/ExportMP3.cpp:1681
+#: export/ExportMP2.cpp:275
 #, c-format
 msgid "Exporting entire file at %d kbps"
-msgstr "Eksportowanie ca³ego pliku %d kbps"
-
-#. i18n-hint: kbps is the bitrate of the MP3 file, kilobits per second
-#: export/ExportMP3.cpp:142
-#: export/ExportMP3.cpp:143
-#: export/ExportMP3.cpp:144
-#: export/ExportMP3.cpp:145
-#: export/ExportMP3.cpp:146
-#: export/ExportMP3.cpp:147
-#: export/ExportMP3.cpp:148
-#: export/ExportMP3.cpp:149
-#: export/ExportMP3.cpp:150
-#: export/ExportMP3.cpp:151
-#: export/ExportMP3.cpp:152
-#: export/ExportMP3.cpp:153
-#: export/ExportMP3.cpp:154
-#: export/ExportMP3.cpp:155
-#: export/ExportMP3.cpp:156
-#: export/ExportMP3.cpp:157
-#: export/ExportMP3.cpp:158
-#: export/ExportMP3.cpp:159
+msgstr "Eksportowanie całego pliku %d kbps"
+
+#: export/ExportMP3.cpp:221
+#: export/ExportMP3.cpp:239
+#: export/ExportMP3.cpp:253
 msgid "kbps"
 msgstr "kbps"
 
-#: export/ExportMP3.cpp:156
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "0, 220-260 kbps (Najlepsza jako¶æ)"
-
-#: export/ExportMP3.cpp:157
-msgid "1, 200-250 kbps"
-msgstr "1, 200-250 kbps"
-
-#: export/ExportMP3.cpp:158
-msgid "2, 170-210 kbps"
-msgstr "2, 170-210 kbps"
-
-#: export/ExportMP3.cpp:159
-msgid "3, 155-195 kbps"
-msgstr "3, 155-195 kbps"
-
-#: export/ExportMP3.cpp:160
-msgid "4, 145-185 kbps"
-msgstr "4, 145-185 kbps"
-
-#: export/ExportMP3.cpp:161
-msgid "5, 110-150 kbps"
-msgstr "5, 110-150 kbps"
-
-#: export/ExportMP3.cpp:162
-msgid "6, 95-135 kbps"
-msgstr "6, 95-135 kbps"
-
-#: export/ExportMP3.cpp:163
-msgid "7, 80-120 kbps"
-msgstr "7, 80-120 kbps"
-
-#: export/ExportMP3.cpp:164
-msgid "8, 65-105 kbps"
-msgstr "8, 65-105 kbps"
+#: export/ExportMP3.cpp:240
+#, fuzzy
+msgid "(Best Quality)"
+msgstr "Jakość"
 
-#: export/ExportMP3.cpp:165
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+#, fuzzy
+msgid "(Smaller files)"
 msgstr "9, 45-85 kbps (Mniejsze pliki)"
 
-#: export/ExportMP3.cpp:170
+#: export/ExportMP3.cpp:243
 msgid "Fast"
 msgstr "Szybkie"
 
-#: export/ExportMP3.cpp:171
+#: export/ExportMP3.cpp:244
+#: export/ExportMP3.cpp:250
+#: prefs/GUIPrefs.cpp:41
+#: prefs/GUIPrefs.cpp:49
 msgid "Standard"
 msgstr "Standard"
 
-#: export/ExportMP3.cpp:176
-msgid "Insane, 320 kbps"
-msgstr "Szalone. 320 kbps"
-
-#: export/ExportMP3.cpp:177
-msgid "Extreme, 220-260 kbps"
-msgstr "Ekstremum, 220-260kbps"
+#: export/ExportMP3.cpp:248
+#, fuzzy
+msgid "Insane"
+msgstr "&Wstaw"
 
-#: export/ExportMP3.cpp:178
-msgid "Standard, 170-210 kbps"
-msgstr "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr ""
 
-#: export/ExportMP3.cpp:179
-msgid "Medium, 145-185 kbps"
-msgstr "¦rednie, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
+msgstr ""
 
-#: export/ExportMP3.cpp:228
+#: export/ExportMP3.cpp:303
 msgid "Specify MP3 Options"
 msgstr "Sprecyzuj Opcje MP3"
 
-#: ../src/prefs/FileFormatPrefs.cpp:172
+#: export/ExportMP3.cpp:319
 msgid "MP3 Export Setup"
 msgstr "Ustawienia eksportu dla MP3"
 
-#: export/ExportMP3.cpp:250
+#: export/ExportMP3.cpp:326
 msgid "Bit Rate Mode:"
-msgstr "Tryb Czêstotliwo¶ci Próbkowania"
+msgstr "Tryb Częstotliwości Próbkowania"
 
-#: export/ExportMP3.cpp:255
+#: export/ExportMP3.cpp:331
 msgid "Preset"
 msgstr "Ustawienie"
 
-#: export/ExportMP3.cpp:256
+#: export/ExportMP3.cpp:332
 msgid "Variable"
 msgstr "Zmienna"
 
-#: export/ExportMP3.cpp:257
+#: export/ExportMP3.cpp:333
 msgid "Average"
-msgstr "¦rednia"
+msgstr "Åšrednia"
 
-#: export/ExportMP3.cpp:258
+#: export/ExportMP3.cpp:334
 msgid "Constant"
-msgstr "Sta³a"
+msgstr "Stała"
 
-#: export/ExportMP3.cpp:303
+#: export/ExportMP3.cpp:373
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Jakość"
+
+#: export/ExportMP3.cpp:379
 msgid "Variable Speed:"
-msgstr "Zmienna Szybko¶æ:"
+msgstr "Zmienna Szybkość:"
 
-#: export/ExportMP3.cpp:310
+#: export/ExportMP3.cpp:386
 msgid "Channel Mode:"
-msgstr "Tryb Kana³u:"
+msgstr "Tryb Kanału:"
 
-#: export/ExportMP3.cpp:315
+#: export/ExportMP3.cpp:391
 msgid "Joint Stereo"
-msgstr "Po³±czone Stereo"
+msgstr "Połączone Stereo"
 
-#: export/ExportMP3.cpp:316
+#: export/ExportMP3.cpp:392
 msgid "Stereo"
 msgstr "Stereo"
 
-#: export/ExportMP3.cpp:468
+#: export/ExportMP3.cpp:536
 msgid "Locate Lame"
 msgstr "Zlokalizuj Lame"
 
-#: export/ExportMP3.cpp:488
+#: export/ExportMP3.cpp:556
 #, c-format
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity potrzebuje pliku %s do stworzenia pliku MP3."
 
-#: export/ExportMP3.cpp:494
-#, c-format
-msgid "Location of %s:"
-msgstr "Lokalizacja %s:"
-
-#: export/ExportMP3.cpp:503
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Aby znale¼æ %s, kliknij tutaj -->"
-
-#: export/ExportMP3.cpp:509
-msgid "Browse..."
-msgstr "Wybierz..."
-
-#: export/ExportMP3.cpp:510
+#: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
-msgstr "Aby otrzymaæ darmow± kopiê Lame, kliknij tutaj -->"
-
-#: export/ExportMP3.cpp:511
-msgid "Download..."
-msgstr "Pobierz..."
+msgstr "Aby otrzymać darmową kopię Lame, kliknij tutaj -->"
 
-#  i18n-hint: It's asking for the location of a file, for
-#  example, "Where is lame_enc.dll?" - you could translate
-#  "Where would I find the file %s" instead if you want.
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Gdzie jest %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1116
+#: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
 msgstr "Tylko lame_enc.dll|lame_enc.dll|Biblioteki dynamiczne (*.dll)|*.dll|All Files (*.*)|*"
 
-#: export/ExportMP3.cpp:536
+#: export/ExportMP3.cpp:1550
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr "Tylko libmp3lame.dylib|libmp3lame.dylib|Biblioteki dynamiczne (*.dylib)|*.dylib|Wszystkie pliki (*)|*"
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr "Tylko libmp3lame.so|libmp3lame.so|Podstawowe biblioteki wspó³dzielone (*.so)|*.so|Biblioteki rozszerzaj±ce (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Tylko libmp3lame.so|libmp3lame.so|Podstawowe biblioteki współdzielone (*.so)|*.so|Biblioteki rozszerzające (*.so*)|*.so*|All Files (*)|*"
 
-#: export/ExportMP3.cpp:1557
+#: export/ExportMP3.cpp:1652
 msgid "MP3 Files"
 msgstr "Pliki MP3"
 
-#: ../src/export/ExportMP3.cpp:1328
+#: export/ExportMP3.cpp:1676
 msgid "Could not open MP3 encoding library!"
-msgstr "Nie mo¿na otworzyæ biblioteki kodeka MP3!"
+msgstr "Nie można otworzyć biblioteki kodeka MP3!"
 
-#: ../src/export/ExportMP3.cpp:1335
+#: export/ExportMP3.cpp:1683
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "Nieaktualna lub niewspierana biblioteka MP3!"
 
-#: export/ExportMP3.cpp:1699
+#: export/ExportMP3.cpp:1760
 msgid "Unable to initialize MP3 stream"
-msgstr "Nie mo¿na zainicjowaæ strumienia MP3"
-
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Edycja tagów ID3 pliku MP3"
+msgstr "Nie można zainicjować strumienia MP3"
 
-#: export/ExportMP3.cpp:1684
+#: export/ExportMP3.cpp:1802
 #, c-format
 msgid "Exporting selected audio with %s preset"
-msgstr "Eksportowanie zaznaczonego d¼wiêku z ustawieniem %s"
+msgstr "Eksportowanie zaznaczonego dźwięku z ustawieniem %s"
 
-#: export/ExportMP3.cpp:1685
+#: export/ExportMP3.cpp:1803
 #, c-format
 msgid "Exporting entire file with %s preset"
-msgstr "Eksportowanie ca³ego pliku z ustawieniem %s"
+msgstr "Eksportowanie całego pliku z ustawieniem %s"
 
-#: export/ExportMP3.cpp:1690
+#: export/ExportMP3.cpp:1808
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
-msgstr "Eksportowanie zaznaczonego d¼wiêku z jako¶ci± VBR %s"
+msgstr "Eksportowanie zaznaczonego dźwięku z jakością VBR %s"
 
-#: export/ExportMP3.cpp:1691
+#: export/ExportMP3.cpp:1809
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
-msgstr "Eksportowanie ca³ego pliku z jako¶ci± VBR %s"
+msgstr "Eksportowanie całego pliku z jakością VBR %s"
 
-#: export/ExportMP3.cpp:1696
+#: export/ExportMP3.cpp:1814
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
-msgstr "Eksportowanie zaznaczonego d¼wiêku %d Kbps"
+msgstr "Eksportowanie zaznaczonego dźwięku %d Kbps"
 
-#: export/ExportMP3.cpp:1697
+#: export/ExportMP3.cpp:1815
 #, c-format
 msgid "Exporting entire file at %d Kbps"
-msgstr "Eksportowanie ca³ego pliku %d Kbps"
+msgstr "Eksportowanie całego pliku %d Kbps"
 
-#: export/ExportMP3.cpp:1790
+#: export/ExportMP3.cpp:1849
 #, c-format
 msgid "Error %d returned from MP3 encoder"
-msgstr "B³±d %d zwrócony z enkodera MP3"
-
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr "Niew³a¶ciwa czêstotliwo¶æ próbkowania"
+msgstr "Błąd %d zwrócony z enkodera MP3"
 
-#: export/ExportMP3.cpp:1876
+#: export/ExportMP3.cpp:1933
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"Czêstotliwo¶æ próbkowania (%d) nie jest wspierana przez format\n"
-"plików MP3."
+msgstr "Częstotliwość próbkowania (%d) nie jest wspierana przez format\n"
+"plików MP3."
 
-#: export/ExportMP3.cpp:1879
+#: export/ExportMP3.cpp:1936
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"Czêstotliwo¶æ próbkowania (%d) nie jest wspierana przez format\n"
-"plików MP3."
-
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr "Mo¿esz resamplowaæ do jednej z czêstotliwo¶ci poni¿ej."
+msgstr "Częstotliwość próbkowania (%d) nie jest wspierana przez format\n"
+"plików MP3."
 
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
-msgstr "Czêstotliwo¶ci Próbkowania"
-
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Wtyczka do eksportu MP3 nie zosta³a znaleziona"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
-#: ../src/export/ExportMultiple.cpp:367
-#: ../src/export/ExportMultiple.cpp:469
-#: ../src/export/ExportMultiple.cpp:557
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "Wielokrotny eksport"
 
-#: ../src/export/ExportMultiple.cpp:482
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+#: export/ExportMultiple.cpp:166
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Je¿eli masz wiêcej ni¿ jedn± ¶cie¿kê audio, mo¿esz eksportowaæ ka¿d± z nich do osobnego pliku,\n"
-"lub je¿eli masz ¶cie¿k± etykiet, mo¿esz eksportowaæ do nowego pliku dla ka¿dej etykiety.\n"
+msgstr "Jeżeli masz więcej niż jedną ścieżkę audio, możesz eksportować każdą z nich do osobnego pliku,\n"
+"lub jeżeli masz ścieżką etykiet, możesz eksportować do nowego pliku dla każdej etykiety.\n"
 "\n"
-"Ten projekt nie ma wiêcej ni¿ jedna ¶cie¿ka lub nie posiada ¶cie¿ki etykiet, st±d nie mo¿na "
+"Ten projekt nie ma więcej niż jedna ścieżka lub nie posiada ścieżki etykiet, stąd nie można "
 
-#: ../src/export/ExportMultiple.cpp:488
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
-msgstr "Nie mo¿na eksportowaæ wielu plików"
+msgstr "Nie można eksportować wielu plików"
 
-#: ../src/export/ExportMultiple.cpp:571
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "Format eksportu:"
 
-#: export/ExportMultiple.cpp:194
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
 msgstr "Opcje..."
 
-#: ../src/export/ExportMultiple.cpp:589
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "Lokalizacja eksportu:"
 
-#: ../src/export/ExportMultiple.cpp:595
-#: ../src/prefs/DirectoriesPrefs.cpp:82
+#: export/ExportMultiple.cpp:245
+#: prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Wybierz..."
 
-#: export/ExportMultiple.cpp:204
+#: export/ExportMultiple.cpp:246
 msgid "Create"
-msgstr "Twórz"
+msgstr "Twórz"
 
-#: ../src/export/ExportMultiple.cpp:607
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "Podziel pliki na podstawie:"
 
-#: ../src/export/ExportMultiple.cpp:610
+#: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
 msgid "Labels"
 msgstr "Etykiety"
 
-#: ../src/export/ExportMultiple.cpp:618
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
-msgstr "Do³±cz audio przed pierwsz± etykiet±"
+msgstr "Dołącz audio przed pierwszą etykietą"
 
-#: ../src/export/ExportMultiple.cpp:624
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "Nazwa pierwszego pliku:"
 
-#: ../src/export/ExportMultiple.cpp:631
+#: export/ExportMultiple.cpp:280
+#, fuzzy
+msgid "First file name"
+msgstr "Nazwa pierwszego pliku:"
+
+#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
 msgid "Tracks"
-msgstr "¦cie¿ki"
+msgstr "Ścieżki"
 
-#: ../src/export/ExportMultiple.cpp:641
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
 msgstr "Nazwij pliki:"
 
-#: ../src/export/ExportMultiple.cpp:644
+#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
-msgstr "U¿yj Etykiety/Nazwy ¶cie¿ki"
+msgstr "Użyj Etykiety/Nazwy ścieżki"
 
-#: ../src/export/ExportMultiple.cpp:650
+#: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
-msgstr "Numeracja narastaj±ca"
+msgstr "Numeracja narastajÄ…ca"
 
-#: ../src/export/ExportMultiple.cpp:655
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "Rozszerzenie pliku:"
 
-#: ../src/export/ExportMultiple.cpp:672
-msgid "Overwrite existing files"
-msgstr "Nadpisz istniej±ce pliki"
+#: export/ExportMultiple.cpp:327
+#, fuzzy
+msgid "File name prefix"
+msgstr "Rozszerzenie pliku:"
 
-#: export/ExportCL.cpp:113
-#: export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123
-#: export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr "E&ksport"
+#: export/ExportMultiple.cpp:341
+msgid "Overwrite existing files"
+msgstr "Nadpisz istniejÄ…ce pliki"
 
-#: export/ExportMultiple.cpp:369
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr "\"%s\" utworzone."
 
-#: ../src/export/ExportMultiple.cpp:761
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
-msgstr "Okre¶l lokalizacjê dla eksportowanych plików"
+msgstr "Określ lokalizację dla eksportowanych plików"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr "Edytuj metadane"
-
-#: export/ExportMultiple.cpp:491
+#: export/ExportMultiple.cpp:539
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" nie istnieje.\n"
+msgstr "\"%s\" nie istnieje.\n"
 "\n"
-"Czy chcesz go stworzyæ?"
+"Czy chcesz go stworzyć?"
 
-#: export/ExportMultiple.cpp:590
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
+#, fuzzy
+msgid "Edit metadata"
+msgstr "Edytuj Metadane"
+
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
-msgstr "Eksport zakoñczy³ siê %d sukcesem."
+msgstr "Eksport zakończył się %d sukcesem."
 
-#: export/ExportMultiple.cpp:597
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
-msgstr "Po eksporcie %d pliku(ów) nast±pi³ nieoczekiwany b³±d."
+msgstr "Po eksporcie %d pliku(ów) nastąpił nieoczekiwany błąd."
+
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
 
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
@@ -5778,263 +7341,365 @@ msgstr "Sprecyzuj Opcje Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ustawienia Eksportu Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Jako¶æ:"
-
-#: export/ExportOGG.cpp:155
+#: export/ExportOGG.cpp:157
 msgid "Ogg Vorbis Files"
 msgstr "Pliki Ogg Vorbis"
 
-#: ../src/export/ExportOGG.cpp:191
+#: export/ExportOGG.cpp:257
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "Eksportuj zaznaczenie jako Ogg Vorbis"
 
-#: ../src/export/ExportOGG.cpp:192
+#: export/ExportOGG.cpp:258
 msgid "Exporting the entire project as Ogg Vorbis"
-msgstr "Eksportuj ca³y projekt jako Ogg Vorbis"
-
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr "Edytuj metadane dla pliku OGG"
+msgstr "Eksportuj cały projekt jako Ogg Vorbis"
 
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
-msgstr "Ustal Opcje PCM"
+#: export/ExportPCM.cpp:116
+#, fuzzy
+msgid "Specify Uncompressed Options"
+msgstr "Sprecyzuj Opcje Ogg Vorbis"
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:185
 msgid "Uncompressed Export Setup"
 msgstr "Ustawienia eksportu nieskompresowanego"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Format:"
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:191
 msgid "Header:"
-msgstr "Nag³ówek:"
+msgstr "Nagłówek:"
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:195
+#: import/ImportRaw.cpp:366
 #, fuzzy
 msgid "Encoding:"
 msgstr "Kodowanie: "
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:200
 msgid "(Not all combinations of headers and encodings are possible.)"
-msgstr "(Nie wszystkie kombinacje nag³ówkówi kodowañ s± mo¿liwe.)"
+msgstr "(Nie wszystkie kombinacje nagłówkówi kodowań są możliwe.)"
 
-#: export/ExportPCM.cpp:321
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF i inne nieskompresowane rodzaje"
+#: export/ExportPCM.cpp:369
+#, fuzzy
+msgid "Other uncompressed files"
+msgstr "Podczas importowania nieskompresowanych plików audio"
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
-#: ../src/export/ExportPCM.cpp:73
+#: export/ExportPCM.cpp:449
 msgid "Cannot export audio in this format."
-msgstr "Nie mo¿na eksportowaæ danych w tym formacie."
+msgstr "Nie można eksportować danych w tym formacie."
 
-#: export/ExportPCM.cpp:400
+#: export/ExportPCM.cpp:491
 #, c-format
 msgid "Exporting the selected audio as %s"
-msgstr "Eksportowanie zaznaczonego d¼wiêku jako %s"
+msgstr "Eksportowanie zaznaczonego dźwięku jako %s"
 
-#: export/ExportPCM.cpp:402
+#: export/ExportPCM.cpp:493
 #, c-format
 msgid "Exporting the entire project as %s"
-msgstr "Eksportowanie ca³ego projektu jako %s"
+msgstr "Eksportowanie całego projektu jako %s"
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:436
+#: export/ExportPCM.cpp:531
 #, c-format
 msgid "Error (file may not have been written): %s"
-msgstr "B³±d (mo¿liwe ¿e plik nie zosta³ zapisany): %hs"
+msgstr "Błąd (możliwe że plik nie został zapisany): %hs"
+
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
-msgstr "Edytuj metadane dla nieskompresowanego pliku"
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156
+#: import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "Pliki MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
 
-#: ../src/import/Import.cpp:159
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
-msgstr "Ta wersja Audacity nie by³a kompilowane ze wsparciem %s."
+msgstr "Ta wersja Audacity nie była kompilowane ze wsparciem %s."
+
+#: import/Import.cpp:240
+#, fuzzy, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
 
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:167
+#: import/Import.cpp:250
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" jest ¶cie¿k± audio. \n"
-"Audacity nie otwiera bezpo¶rednio ¶cie¿ek audio. \n"
-"Wypakuj ¶cie¿ki do formatu, który \n"
-"Audacity mo¿e importowaæ, jak na przyk³ad WAV lub AIFF."
+msgstr "\"%s\" jest ścieżką audio. \n"
+"Audacity nie otwiera bezpośrednio ścieżek audio. \n"
+"Wypakuj ścieżki do formatu, który \n"
+"Audacity może importować, jak na przykład WAV lub AIFF."
 
-#: import/Import.cpp:173
+#: import/Import.cpp:256
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"jest plikiem listy.\n"
-"Audacity nie mo¿e otworzyæ tego pliku, poniewa¿ zawiera on tylko linki do innych plików.\n"
-"Mo¿esz go otworzyæ w edytorze tekstowym i pobraæ w³a¶ciwe pliki d¼wiêkowe."
+msgstr "jest plikiem listy.\n"
+"Audacity nie może otworzyć tego pliku, ponieważ zawiera on tylko linki do innych plików.\n"
+"Możesz go otworzyć w edytorze tekstowym i pobrać właściwe pliki dźwiękowe."
 
-#: import/Import.cpp:178
+#: import/Import.cpp:261
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" jest plikiem Windows Media Audio. \n"
-"Audacity nie otwiera tych plików z powodów patentowych. \n"
-"Powiniene¶ przekonwertowaæ ten plik do formatu takiego jak WAV lub AIFF."
+msgstr "\"%s\" jest plikiem Windows Media Audio. \n"
+"Audacity nie otwiera tych plików z powodów patentowych. \n"
+"Powinieneś przekonwertować ten plik do formatu takiego jak WAV lub AIFF."
 
-#: import/Import.cpp:183
+#: import/Import.cpp:266
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" jesy plikiem Advanced Audio Coding. \n"
-"Audacity nie otwiera tych plików. \n"
-"Powiniene¶ je przekonwertowaæ do wspieranych formatów takich jak WAV lub AIFF."
-
-#: import/Import.cpp:188
-#, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
+
+#: import/Import.cpp:271
+#, fuzzy, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" jest zakodowanym plikiem. Pliki te pochodz± zazwyczaj z internetowych sklepów muzycznych. \n"
-"Audacity nie mo¿e otworzyæ tego pliku z powodu zakodowania go. \n"
-"Spróbuj zgraæ plik w Audacity lub wypal go na p³ytê, a nastêpnie \n"
-"wypakuj ¶cie¿kê do formatu wspieranego takiego jak WAV lub AIFF."
+msgstr "\"%s\" jest zakodowanym plikiem. Pliki te pochodzą zazwyczaj z internetowych sklepów muzycznych. \n"
+"Audacity nie może otworzyć tego pliku z powodu zakodowania go. \n"
+"Spróbuj zgrać plik w Audacity lub wypal go na płytę, a następnie \n"
+"wypakuj ścieżkę do formatu wspieranego takiego jak WAV lub AIFF."
 
-#: import/Import.cpp:193
+#: import/Import.cpp:276
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" jest plikiem RealPlayer. \n"
-"Audacity nie mo¿e otworzyæ tego pliku. \n"
-"Powiniene¶ go przekonwertowaæ do wspieranego formatu, takiego jak WAV lub AIFF."
+msgstr "\"%s\" jest plikiem RealPlayer. \n"
+"Audacity nie może otworzyć tego pliku. \n"
+"Powinieneś go przekonwertować do wspieranego formatu, takiego jak WAV lub AIFF."
 
-#: import/Import.cpp:221
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, fuzzy, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
+
+#: import/Import.cpp:288
+#, fuzzy, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr "\"%s\" jest plikiem Windows Media Audio. \n"
+"Audacity nie otwiera tych plików z powodów patentowych. \n"
+"Powinieneś przekonwertować ten plik do formatu takiego jak WAV lub AIFF."
+
+#: import/Import.cpp:294
+#, fuzzy, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
+
+#: import/Import.cpp:300
+#, fuzzy, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
+
+#: import/Import.cpp:306
+#, fuzzy, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
+
+#: import/Import.cpp:312
+#, fuzzy, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr "\"%s\" jesy plikiem Advanced Audio Coding. \n"
+"Audacity nie otwiera tych plików. \n"
+"Powinieneś je przekonwertować do wspieranych formatów takich jak WAV lub AIFF."
+
+#: import/Import.cpp:317
+#, fuzzy, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr "Audacity nie rozpoznało formatu tego pliku.\n"
+"Jeżeli jest nieskopresowany, to spróbuj opcji \"Importuj RAW\""
+
+#: import/Import.cpp:322
+#, fuzzy, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr "Audacity nie rozpoznało formatu tego pliku.\n"
+"Jeżeli jest nieskopresowany, to spróbuj opcji \"Importuj RAW\""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
 msgstr ""
-"Audacity próbuje odgadn±c rodzaj pliku.\n"
-"D¼wiêk mo¿e byæ niew³a¶ciwy.\n"
-"\n"
-"Je¶li d¼wiêk nie zgadza siê, spróbuj zmieniæ nazwê pliku\n"
-"aby rozszerzenie by³o w³a¶ciwe."
 
-#: ../src/import/Import.cpp:170
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity nie rozpozna³o formatu tego pliku.\n"
-"Je¿eli jest nieskopresowany, to spróbuj opcji \"Importuj RAW\""
 
-#: import/ImportFLAC.cpp:35
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "Pliki FLAC"
 
-#: ../src/import/ImportLOF.cpp:151
-#: ../src/import/ImportLOF.cpp:177
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
-msgstr "Lista plików w podstawowym formacie tekstowym"
+msgstr "Lista plików w podstawowym formacie tekstowym"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:268
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
-msgstr "Nieprawid³owe przesuniêcie okna w pliku LOF."
+msgstr "Nieprawidłowe przesunięcie okna w pliku LOF."
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:270
-#: ../src/import/ImportLOF.cpp:291
-#: ../src/import/ImportLOF.cpp:364
-#: ../src/import/ImportLOF.cpp:384
+#: import/ImportLOF.cpp:316
+#: import/ImportLOF.cpp:337
+#: import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
-msgstr "B³±d LOF"
+msgstr "BÅ‚Ä…d LOF"
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:289
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
-msgstr "Z³y czas trwania LFO"
+msgstr "ZÅ‚y czas trwania LFO"
 
-#: import/ImportLOF.cpp:407
+#: import/ImportLOF.cpp:417
 #, fuzzy
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
-msgstr "¦cie¿ki MIDI nie mog± byæ przesuwane indywidualnie, a jedynie pliki audio."
+msgstr "Ścieżki MIDI nie mogą być przesuwane indywidualnie, a jedynie pliki audio."
 
 #  i18n-hint: You do not need to translate "LOF"
 #. i18n-hint: You do not need to translate "LOF"
-#: ../src/import/ImportLOF.cpp:383
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
-msgstr "Nieprawid³owe przesuniêcie ¶cie¿ki w pliku LOF."
+msgstr "Nieprawidłowe przesunięcie ścieżki w pliku LOF."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "B³±d analizy pliku Allegro"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "B³±d analizy pliku MIDI"
+#: import/ImportMIDI.cpp:31
+#: import/ImportMIDI.cpp:39
+#: import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+#, fuzzy
+msgid "Could not open file "
+msgstr "Nie można otworzyć pliku:"
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
-msgstr "Pliki MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
-#: import/ImportOGG.cpp:35
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
 msgstr "Pliki Ogg Vorbis"
 
-#: ../src/import/ImportOGG.cpp:124
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
-msgstr "B³±d odczytu"
+msgstr "BÅ‚Ä…d odczytu"
 
-#: ../src/import/ImportOGG.cpp:127
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "To nie jest plik Ogg Vorbis"
 
-#: ../src/import/ImportOGG.cpp:130
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
-msgstr "B³±d wersji Vorbis"
+msgstr "BÅ‚Ä…d wersji Vorbis"
 
-#: ../src/import/ImportOGG.cpp:133
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
-msgstr "Z³y nag³ówek strumienia Vorbis"
+msgstr "Zły nagłówek strumienia Vorbis"
 
-#: ../src/import/ImportOGG.cpp:136
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
-msgstr "Wewnêtrzny b³±d logiczny"
+msgstr "Wewnętrzny błąd logiczny"
 
-#: ../src/Project.cpp:2194
-#, c-format
-msgid "Importing %s File..."
-msgstr "Importowanie pliku %s..."
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF i inne nieskompresowane rodzaje"
+
+#: import/ImportPlugin.h:142
+#: import/ImportRaw.cpp:203
+#, fuzzy, c-format
+msgid "Importing %s"
+msgstr "Importowanie %s..."
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Pliki QuickTime"
 
-#: ../src/import/ImportRaw.cpp:256
+#: import/ImportRaw.cpp:205
+#, fuzzy
+msgid "Import Raw"
+msgstr "Importuj Surowe Dane"
+
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Importuj Surowe Dane"
 
@@ -6042,206 +7707,242 @@ msgstr "Importuj Surowe Dane"
 #  know the correct technical word.
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: ../src/import/ImportRaw.cpp:299
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "Bez endianness"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: ../src/import/ImportRaw.cpp:302
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "Little-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: ../src/import/ImportRaw.cpp:305
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "Big-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: ../src/import/ImportRaw.cpp:308
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "Standardowy endianess"
 
-#: ../src/import/ImportRaw.cpp:332
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
-msgstr "1 kana³ (Mono)"
+msgstr "1 kanał (Mono)"
 
-#: ../src/import/ImportRaw.cpp:333
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
-msgstr "2 kana³y (Stereo)"
+msgstr "2 kanały (Stereo)"
 
-#: ../src/import/ImportRaw.cpp:335
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
-msgstr "%d kana³ów"
+msgstr "%d kanałów"
+
+#: import/ImportRaw.cpp:369
+#, fuzzy
+msgid "Byte order:"
+msgstr "Tryb Częstotliwości Próbkowania"
+
+#: import/ImportRaw.cpp:372
+#, fuzzy
+msgid "Channels:"
+msgstr "Kanały"
 
-#: ../src/import/ImportRaw.cpp:348
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
-msgstr "Pocz±tek przesuniêcia:"
+msgstr "Początek przesunięcia:"
 
-#: ../src/import/ImportRaw.cpp:359
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
-msgstr "Wielko¶æ do importu:"
+msgstr "Wielkość do importu:"
 
-#: ../src/import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
-msgstr "Czêstotliwo¶æ próbkowania:"
+msgstr "Częstotliwość próbkowania:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importuj"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+#, fuzzy
+msgid "Decoding Waveform"
+msgstr "Przebieg czasowy"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:84
+#: prefs/AudioIOPrefs.cpp:41
+#: prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44
+#: prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "Audio I/O"
 
-#: ../src/prefs/AudioIOPrefs.cpp:212
+#: prefs/AudioIOPrefs.cpp:102
+#: prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (Mono)"
 
-#: ../src/prefs/AudioIOPrefs.cpp:213
+#: prefs/AudioIOPrefs.cpp:103
+#: prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (Stereo)"
 
-#: ../src/prefs/AudioIOPrefs.cpp:80
+#: prefs/AudioIOPrefs.cpp:117
+#: prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: prefs/AudioIOPrefs.cpp:119
-#: prefs/AudioIOPrefs.cpp:137
-#: toolbars/DeviceToolBar.cpp:54
+#: prefs/AudioIOPrefs.cpp:121
+#: prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118
+#: prefs/MidiIOPrefs.cpp:136
+#: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
-msgstr "Urz±dzenie"
+msgstr "UrzÄ…dzenie"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:124
+#: prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
-msgstr "U¿ywaj±c:"
+msgstr "Używając:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:125
+#: prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
-msgstr "Port d¼wiêkowy v"
+msgstr "Port dźwiękowy v"
 
-#: ../src/prefs/AudioIOPrefs.cpp:148
+#: prefs/AudioIOPrefs.cpp:135
+#: prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "Nagrywanie"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:141
+#: prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
-msgstr "Kana³y"
+msgstr "Kanały"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:147
+#: prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr "Odtwarzanie"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Odtwarzaj inne ¶cie¿ki podczas nagrywania nowej"
+#: prefs/AudioIOPrefs.cpp:149
+#, fuzzy
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "&Odtwarzaj inne ścieżki podczas nagrywania nowej"
 
-#: prefs/AudioIOPrefs.cpp:150
+#: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
-msgstr "&Odtwarzanie sprzêtowe: Odtwarzaj ¶cie¿kê podczas nagrywania jej"
+msgstr "&Odtwarzanie sprzętowe: Odtwarzaj ścieżkę podczas nagrywania jej"
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
-msgstr "&Odtwarzanie programowe: Odtwarzaj ¶cie¿kê podczas nagrywania jej"
+msgstr "&Odtwarzanie programowe: Odtwarzaj ścieżkę podczas nagrywania jej"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "&Odtwarzanie programowe: Otwarzaj now± ¶cie¿kê podczas nagrywania jej (odznacz podczas nagrywania  \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+#, fuzzy
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "&Odtwarzanie programowe: Odtwarzaj ścieżkę podczas nagrywania jej"
 
-#: prefs/AudioIOPrefs.cpp:194
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:168
+#: prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
-msgstr "Podgl±d efektów"
+msgstr "Podgląd efektów"
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
-msgstr "D³ugo¶æ podgl±du:"
+msgstr "Długość podglądu:"
 
-#: prefs/AudioIOPrefs.cpp:158
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
-msgstr "Wytnij Podgl±d"
+msgstr "Wytnij PodglÄ…d"
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
-msgstr "Podgl±d przed obszarem obciêcia:"
+msgstr "Podgląd przed obszarem obcięcia:"
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
-msgstr "Podgl±d po obszarze obciêcia:"
+msgstr "Podgląd po obszarze obcięcia:"
 
-#: prefs/AudioIOPrefs.cpp:168
+#: prefs/AudioIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
-msgstr "Bezczynno¶æ"
+msgstr "Bezczynność"
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
-msgstr "D¼wiêk do bufora:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
-msgstr "Korekcja bezczynno¶ci"
+#: prefs/AudioIOPrefs.cpp:198
+#, fuzzy
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr "Korekcja bezczynności"
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr "Przeszukuj podczas odtwarzania"
 
-#: prefs/AudioIOPrefs.cpp:187
+#: prefs/AudioIOPrefs.cpp:206
+#: prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
-msgstr "Krótka przerwa:"
+msgstr "Krótka przerwa:"
 
-#: prefs/AudioIOPrefs.cpp:189
+#: prefs/AudioIOPrefs.cpp:208
+#: prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
-msgstr "D³uga przerwa:"
+msgstr "DÅ‚uga przerwa:"
 
-#: prefs/BatchPrefs.cpp:53
-#: prefs/BatchPrefs.cpp:54
+#: prefs/BatchPrefs.cpp:55
+#: prefs/BatchPrefs.cpp:56
 msgid "Batch"
 msgstr "Wsad"
 
-#: prefs/BatchPrefs.cpp:75
-#: prefs/GUIPrefs.cpp:70
+#: prefs/BatchPrefs.cpp:77
+#: prefs/GUIPrefs.cpp:92
 msgid "Behaviors"
 msgstr "Zachowania"
 
 #: prefs/BatchPrefs.cpp:80
 msgid "&Don't apply effects in batch mode"
-msgstr "&Nie stosuje efektów w trybie wsadowym"
-
-#: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr "&Podczas importowania d¼wiêku, normalizuj wszystkie ¶cie¿ki w projekcie"
+msgstr "&Nie stosuje efektów w trybie wsadowym"
 
 #: prefs/BatchPrefs.cpp:83
+#: prefs/GUIPrefs.cpp:132
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "Tryb czystej mowy"
 
-#: prefs/BatchPrefs.cpp:87
-#: prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr "Poka¿/Ukryj"
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr "P&oka¿ Edytor Metadanych przed ustawieniami eksportu"
-
-#: ../src/prefs/PrefsDialog.cpp:88
-#: ../src/prefs/PrefsDialog.cpp:216
+#: prefs/DirectoriesPrefs.cpp:55
+#: prefs/DirectoriesPrefs.cpp:56
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Katalogi"
 
 #: prefs/DirectoriesPrefs.cpp:87
 msgid "Temporary files directory"
-msgstr "Katalog plików tymczasowych"
+msgstr "Katalog plików tymczasowych"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:57
+#: prefs/DirectoriesPrefs.cpp:91
 msgid "Location:"
-msgstr "Po³o¿enie:"
+msgstr "Położenie:"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:78
+#: prefs/DirectoriesPrefs.cpp:93
 msgid "Free Space:"
-msgstr "Wolna przestrzeñ:"
+msgstr "Wolna przestrzeń:"
 
 #: prefs/DirectoriesPrefs.cpp:99
 msgid "Auto save"
@@ -6249,7 +7950,7 @@ msgstr "Zapisz automatycznie"
 
 #: prefs/DirectoriesPrefs.cpp:101
 msgid "Auto save a copy of the project in a separate folder"
-msgstr "Zapisz automatycznie kopiê projektu w osobnym folderze"
+msgstr "Zapisz automatycznie kopiÄ™ projektu w osobnym folderze"
 
 #: prefs/DirectoriesPrefs.cpp:104
 msgid "Auto save interval:"
@@ -6261,357 +7962,508 @@ msgstr "minut"
 
 #: prefs/DirectoriesPrefs.cpp:110
 msgid "Audio cache"
-msgstr "Pamiêæ cache d¼wiêku"
+msgstr "Pamięć cache dźwięku"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Przechowywuje dane zapisu w pamiêci a¿ nagrywanie zostanie zatrzymane"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
-#: ../src/prefs/DirectoriesPrefs.cpp:135
+#: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
-msgstr "Okre¶l lokalizacjê dla katalogu tymczasowego"
+msgstr "Określ lokalizację dla katalogu tymczasowego"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:181
+#: prefs/DirectoriesPrefs.cpp:166
 #, c-format
 msgid "Directory %s does not exist. Create it?"
-msgstr "Katalog %s nie istnieje. Czy go utworzyæ?"
+msgstr "Katalog %s nie istnieje. Czy go utworzyć?"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:183
+#: prefs/DirectoriesPrefs.cpp:168
 msgid "New Temporary Directory"
 msgstr "Nowy katalog tymczasowy"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:202
+#: prefs/DirectoriesPrefs.cpp:187
 #, c-format
 msgid "Directory %s is not writable"
-msgstr "Nie da siê zapisaæ do katalogu %s"
+msgstr "Nie da się zapisać do katalogu %s"
 
-#: ../src/prefs/DirectoriesPrefs.cpp:214
+#: prefs/DirectoriesPrefs.cpp:199
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
-msgstr "Zmiana katalogu tymczasowego bêdzie nieaktywna a¿ do zrestartowania programu Audacity."
+msgstr "Zmiana katalogu tymczasowego będzie nieaktywna aż do zrestartowania programu Audacity."
+
+#: prefs/FileFormatPrefs.cpp:53
+#: prefs/FileFormatPrefs.cpp:54
+#, fuzzy
+msgid "Import / Export"
+msgstr "Importuj Surowe Dane"
+
+#: prefs/FileFormatPrefs.cpp:84
+#, fuzzy
+msgid "MP3 Export Library"
+msgstr "Lokalizacja biblioteki MP3"
+
+#: prefs/FileFormatPrefs.cpp:87
+msgid "MP3 Library Version:"
+msgstr "Wersja biblioteki MP3:"
+
+#: prefs/FileFormatPrefs.cpp:93
+#, fuzzy
+msgid "MP3 Library:"
+msgstr "Wersja biblioteki MP3:"
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+#, fuzzy
+msgid "LAME MP3 Library:"
+msgstr "Wersja biblioteki MP3:"
+
+#: prefs/FileFormatPrefs.cpp:101
+#: prefs/FileFormatPrefs.cpp:125
+#, fuzzy
+msgid "&Download"
+msgstr "Pobierz..."
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+#, fuzzy
+msgid "FFmpeg Library Version:"
+msgstr "Wersja biblioteki MP3:"
+
+#: prefs/FileFormatPrefs.cpp:118
+#: prefs/FileFormatPrefs.cpp:122
+#, fuzzy
+msgid "FFmpeg Library:"
+msgstr "&Znajdź Bibliotekę"
 
-#: prefs/FileFormatPrefs.cpp:47
-#: prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
-msgstr "Pliki audio"
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+#, fuzzy
+msgid "When importing audio files"
+msgstr "Podczas importowania nieskompresowanych plików audio"
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
-msgstr "Podczas importowania nieskompresowanych plików audio"
+#: prefs/FileFormatPrefs.cpp:140
+#, fuzzy
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr "&Utwórz kopię tego pliku przed edycją (bezpieczniejsze)"
 
-#: prefs/FileFormatPrefs.cpp:127
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "&Utwórz kopiê tego pliku przed edycj± (bezpieczniejsze)"
+#: prefs/FileFormatPrefs.cpp:141
+#, fuzzy
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr "&Czytaj bezpośredno z oryginalnego pliku (szybsze)"
 
-#: prefs/FileFormatPrefs.cpp:128
-msgid "&Read directly from the original file (faster)"
-msgstr "&Czytaj bezpo¶redno z oryginalnego pliku (szybsze)"
+#: prefs/FileFormatPrefs.cpp:143
+#, fuzzy
+msgid "&Normalize all tracks in project"
+msgstr "&Podczas importowania dźwięku, normalizuj wszystkie ścieżki w projekcie"
 
-#: prefs/FileFormatPrefs.cpp:132
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
-msgstr "Podczas zapisywania projektu, który jest zale¿ny od innych plików d¼wiêkowych"
+msgstr "Podczas zapisywania projektu, który jest zależny od innych plików dźwiękowych"
 
-#: prefs/FileFormatPrefs.cpp:87
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
-msgstr "Zawsze &kopiuj ca³y d¼wiêk do projektu (najbezpieczniejsze)"
+msgstr "Zawsze &kopiuj cały dźwięk do projektu (najbezpieczniejsze)"
 
-#: prefs/FileFormatPrefs.cpp:88
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
-msgstr "&Nie kopiuj d¼wiêku"
+msgstr "&Nie kopiuj dźwięku"
 
-#: prefs/FileFormatPrefs.cpp:135
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
-msgstr "&Zapytaj u¿ytkownika"
+msgstr "&Zapytaj użytkownika"
 
-#: prefs/FileFormatPrefs.cpp:93
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
-msgstr "Podczas eksportowania ¶cie¿ek do pliku audio"
+msgstr "Podczas eksportowania ścieżek do pliku audio"
 
-#: prefs/FileFormatPrefs.cpp:144
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
-msgstr "Z&awsze miksuj wszystkie ¶cie¿ki do kana³u stereo lub mono."
+msgstr "Z&awsze miksuj wszystkie ścieżki do kanału stereo lub mono."
 
-#: prefs/FileFormatPrefs.cpp:97
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
-msgstr "&U¿yj miksowania (na przyk³ad eksportuj do pliku wielokana³owego 5.1)"
+msgstr "&Użyj miksowania (na przykład eksportuj do pliku wielokanałowego 5.1)"
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
-msgstr "Lokalizacja biblioteki MP3"
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
+msgstr "P&okaż Edytor Metadanych przed ustawieniami eksportu"
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Wersja biblioteki MP3:"
+#: prefs/GUIPrefs.cpp:34
+#: prefs/GUIPrefs.cpp:35
+msgid "Interface"
+msgstr "WyglÄ…d"
 
-#: prefs/FileFormatPrefs.cpp:185
-msgid "&Find Library"
-msgstr "&Znajd¼ Bibliotekê"
+#: prefs/GUIPrefs.cpp:42
+#, fuzzy
+msgid "In Browser"
+msgstr "Wybierz..."
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
-msgstr "&Pobierz darmow± kopiê LAME"
+#: prefs/GUIPrefs.cpp:43
+#, fuzzy
+msgid "From Internet"
+msgstr "Pomoc w Internecie"
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Wygl±d"
+#: prefs/GUIPrefs.cpp:50
+#, fuzzy
+msgid "Simple"
+msgstr "Cisza"
 
-#: prefs/GUIPrefs.cpp:72
+#: prefs/GUIPrefs.cpp:94
 msgid "&Update display while playing"
-msgstr "&Uaktualnia wy¶wietlacz poczas odtwarzania"
+msgstr "&Uaktualnia wyświetlacz poczas odtwarzania"
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
-msgstr "Polecenie Zamknij/Wyjd¼ &zamyka Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:76
+#: prefs/GUIPrefs.cpp:98
 msgid "Enable &dragging of left and right selection edges"
-msgstr "Uaktywnia &przeci±ganie krawêdzi zaznaczenia w lewo lub w prawo"
+msgstr "Uaktywnia &przeciąganie krawędzi zaznaczenia w lewo lub w prawo"
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&Ergonomiczny uk³ad guzików We/Wy"
+#: prefs/GUIPrefs.cpp:100
+#, fuzzy
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr "&Ergonomiczny układ guzików We/Wy"
 
-#: prefs/GUIPrefs.cpp:80
+#: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
-msgstr "Automatycznie &wpasowuje ¶cie¿ki"
-
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr "\"Przesuñ po ¶cie¿ce\" &przesuwa siê po ¶cie¿ce"
+msgstr "Automatycznie &wpasowuje ścieżki"
 
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
-msgstr "& Aktualny numer ¶cie¿ki do pomocy dostêpu"
+#: prefs/GUIPrefs.cpp:104
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "\"Przesuń po ścieżce\" &przesuwa się po ścieżce"
 
-#: prefs/GUIPrefs.cpp:90
+#: prefs/GUIPrefs.cpp:106
 msgid "Editing a &clip can move other clips"
-msgstr "Edytowanie &klipu mo¿e przesun±æ inne klipy"
+msgstr "Edytowanie &klipu może przesunąć inne klipy"
 
-#: prefs/GUIPrefs.cpp:88
+#: prefs/GUIPrefs.cpp:108
 msgid "&Select all audio in project, if none selected"
-msgstr "&Zaznacz ca³y d¼wiêk w projekcie, je¶li nic nie jest zaznaczone"
+msgstr "&Zaznacz cały dźwięk w projekcie, jeśli nic nie jest zaznaczone"
 
-#: prefs/GUIPrefs.cpp:90
+#: prefs/GUIPrefs.cpp:110
 msgid "&Beep on completion of longer activities"
-msgstr "&Daj sygna³ d¼wiêkowy po zakoñczeniu czynno¶ci"
+msgstr "&Daj sygnał dźwiękowy po zakończeniu czynności"
 
-#: prefs/GUIPrefs.cpp:96
+#: prefs/GUIPrefs.cpp:114
+msgid "Show / Hide"
+msgstr "Pokaż/Ukryj"
+
+#: prefs/GUIPrefs.cpp:116
 msgid "Enable cut &lines"
-msgstr "Umo¿liw ciêcie & liñ"
+msgstr "Umożliw cięcie & liń"
 
-#: prefs/GUIPrefs.cpp:98
+#: prefs/GUIPrefs.cpp:118
 msgid "Show warnings about &temp files"
-msgstr "Poka¿ ostrze¿enia o &plikach tymczasowych"
+msgstr "Pokaż ostrzeżenia o &plikach tymczasowych"
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&Poka¿ okno zapisu, nawet je¶li projekt jest pusty"
+#: prefs/GUIPrefs.cpp:120
+#, fuzzy
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr "&Pokaż okno zapisu, nawet jeśli projekt jest pusty"
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
-msgstr "Poka¿ Wiadomo¶æ Powitaln± przy starcie programu"
+#: prefs/GUIPrefs.cpp:122
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
+msgstr "Pokaż Wiadomość Powitalną przy starcie programu"
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
-msgstr "Jêzyk"
+#: prefs/GUIPrefs.cpp:126
+#, fuzzy
+msgid "Modes"
+msgstr "Åšredni"
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Jêzyk:"
+#: prefs/GUIPrefs.cpp:129
+#, fuzzy
+msgid "Don't a&pply effects in batch mode"
+msgstr "&Nie stosuje efektów w trybie wsadowym"
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "Minimalny pokazywany poziom sygna³u [dB]"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:150
+#: prefs/GUIPrefs.cpp:141
 msgid "-36 dB (shallow range for high-amplitude editing)"
-msgstr "-36 dB (\"p³ytki\" zakres do edycji przy du¿ych amplitudach)"
+msgstr "-36 dB (\"płytki\" zakres do edycji przy dużych amplitudach)"
 
-#: ../src/prefs/GUIPrefs.cpp:157
+#: prefs/GUIPrefs.cpp:142
 msgid "-48 dB (PCM range of 8 bit samples)"
-msgstr "-48 dB (PCM zakres 8 bitowych próbek)"
+msgstr "-48 dB (PCM zakres 8 bitowych próbek)"
 
-#: ../src/prefs/GUIPrefs.cpp:164
+#: prefs/GUIPrefs.cpp:143
+#, fuzzy
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr "-96 dB (PCM zakres 16 bitowych próbek)"
+
+#: prefs/GUIPrefs.cpp:144
 msgid "-96 dB (PCM range of 16 bit samples)"
-msgstr "-96 dB (PCM zakres 16 bitowych próbek)"
+msgstr "-96 dB (PCM zakres 16 bitowych próbek)"
 
-#: ../src/prefs/GUIPrefs.cpp:171
+#: prefs/GUIPrefs.cpp:145
 msgid "-120 dB (approximate limit of human hearing)"
-msgstr "-120 dB (przybli¿ony zakres s³yszenia cz³owieka)"
+msgstr "-120 dB (przybliżony zakres słyszenia człowieka)"
 
-#: ../src/prefs/GUIPrefs.cpp:178
+#: prefs/GUIPrefs.cpp:146
 msgid "-145 dB (PCM range of 24 bit samples)"
-msgstr "-145 dB (PCM zakres 24 bitowych próbek)"
+msgstr "-145 dB (PCM zakres 24 bitowych próbek)"
+
+#: prefs/GUIPrefs.cpp:151
+#, fuzzy
+msgid "Default View Mode"
+msgstr "Standardowy endianess"
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+#, fuzzy
+msgid "Help:"
+msgstr "Pomoc"
+
+#: prefs/GUIPrefs.cpp:168
+#, fuzzy
+msgid "Solo Button:"
+msgstr "przycisk"
 
-#: ../src/prefs/PrefsDialog.cpp:90
+#: prefs/KeyConfigPrefs.cpp:64
+#: prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: prefs/KeyConfigPrefs.cpp:93
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
-msgstr "Powi±zania klawiaturowe"
+msgstr "PowiÄ…zania klawiaturowe"
 
-#: prefs/KeyConfigPrefs.cpp:113
+#: prefs/KeyConfigPrefs.cpp:115
 msgid "S&et"
 msgstr "U&staw"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:115
+#: prefs/KeyConfigPrefs.cpp:120
 msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
-msgstr "Uwaga: Naci¶niêcie Cmd+Q spowoduje wyj¶cie. Pozosta³e klawisze s± prawid³owe."
+msgstr "Uwaga: Naciśnięcie Cmd+Q spowoduje wyjście. Pozostałe klawisze są prawidłowe."
 
-#: prefs/KeyConfigPrefs.cpp:122
-#: prefs/ThemePrefs.cpp:102
+#: prefs/KeyConfigPrefs.cpp:124
+#: prefs/ThemePrefs.cpp:105
 msgid "&Defaults"
-msgstr "&Domy¶lne"
+msgstr "&Domyślne"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:79
+#: prefs/KeyConfigPrefs.cpp:143
 msgid "Key Combination"
 msgstr "Kombinacja klawiszy"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:159
+#: prefs/KeyConfigPrefs.cpp:163
 msgid "Export Keyboard Shortcuts As:"
-msgstr "Eksportuj skróty klawiszowe jako:"
+msgstr "Eksportuj skróty klawiszowe jako:"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:174
+#: prefs/KeyConfigPrefs.cpp:183
 msgid "Error saving keyboard shortcuts"
-msgstr "B³±d zapisu skrótów klawiszowych"
+msgstr "Błąd zapisu skrótów klawiszowych"
 
-#: ../src/prefs/KeyConfigPrefs.cpp:188
+#: prefs/KeyConfigPrefs.cpp:198
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
-msgstr "Zaznacz plik XML zawieraj±cy skróty klawiszowe programu Audacity..."
+msgstr "Zaznacz plik XML zawierający skróty klawiszowe programu Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Pliki xml (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*"
-
-#: ../src/prefs/KeyConfigPrefs.cpp:206
+#: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
-msgstr "B³±d podczas wczytywania skrótów klawiszowych"
+msgstr "Błąd podczas wczytywania skrótów klawiszowych"
 
-#: prefs/KeyConfigPrefs.cpp:239
+#: prefs/KeyConfigPrefs.cpp:243
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Skrót klawiaturowy %s jest ju¿ przypisany do:\n"
+msgstr "Skrót klawiaturowy %s jest już przypisany do:\n"
 "\n"
 " %s'"
 
-#: ../src/EditToolBar.cpp:159
+#: prefs/KeyConfigPrefs.cpp:369
+#: toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ../src/prefs/PrefsDialog.cpp:91
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "&Odtwarzaj inne ścieżki podczas nagrywania nowej"
+
+#: prefs/MidiIOPrefs.cpp:149
+#, fuzzy
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "&Odtwarzanie sprzętowe: Odtwarzaj ścieżkę podczas nagrywania jej"
+
+#: prefs/MidiIOPrefs.cpp:152
+#, fuzzy
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "&Odtwarzanie programowe: Odtwarzaj ścieżkę podczas nagrywania jej"
+
+#: prefs/MidiIOPrefs.cpp:160
+#, fuzzy
+msgid "Play before cut region:"
+msgstr "Podgląd przed obszarem obcięcia:"
+
+#: prefs/MidiIOPrefs.cpp:162
+#, fuzzy
+msgid "Play after cut region:"
+msgstr "Podgląd po obszarze obcięcia:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "Dźwięk do bufora:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "Korekcja bezczynności"
+
+#: prefs/MidiIOPrefs.cpp:183
+#, fuzzy
+msgid "Seek Time"
+msgstr "Określ czas"
+
+#: prefs/MidiIOPrefs.cpp:196
+#, fuzzy
+msgid "Play when previewing:"
+msgstr "PodglÄ…d"
+
+#: prefs/MousePrefs.cpp:55
+#: prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Mysz"
 
-#: ../src/prefs/MousePrefs.cpp:71
+#: prefs/MousePrefs.cpp:78
 msgid "Mouse Bindings (default values, not configurable)"
-msgstr "Przypisania myszy (domy¶lne warto¶ci, nie konfigurowalne)"
+msgstr "Przypisania myszy (domyślne wartości, nie konfigurowalne)"
 
-#: ../src/prefs/MousePrefs.cpp:84
+#: prefs/MousePrefs.cpp:93
 msgid "Tool"
-msgstr "Narzêdzie "
+msgstr "Narzędzie "
 
-#: ../src/prefs/MousePrefs.cpp:85
+#: prefs/MousePrefs.cpp:94
 msgid "Command Action"
 msgstr "Komenda"
 
-#: ../src/prefs/MousePrefs.cpp:86
+#: prefs/MousePrefs.cpp:95
 msgid "Buttons"
 msgstr "Klawisze"
 
-#: ../src/prefs/MousePrefs.cpp:88
-#: ../src/prefs/MousePrefs.cpp:92
-#: ../src/prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:122
 msgid "Left-Click"
 msgstr "Lewy klawisz myszy"
 
-#: ../src/prefs/MousePrefs.cpp:88
-#: ../src/prefs/MousePrefs.cpp:89
-#: ../src/prefs/MousePrefs.cpp:90
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:102
 msgid "Select"
 msgstr "Zaznacz "
 
-#: ../src/prefs/MousePrefs.cpp:88
+#: prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:122
 msgid "Set Selection Point"
 msgstr "Ustaw punkt zaznaczenia"
 
-#: ../src/prefs/MousePrefs.cpp:89
-#: ../src/prefs/MousePrefs.cpp:93
-#: ../src/prefs/MousePrefs.cpp:97
-#: ../src/prefs/MousePrefs.cpp:98
-#: ../src/prefs/MousePrefs.cpp:102
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:115
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:123
 msgid "Left-Drag"
-msgstr "Lewy klawisz - przeci±gnij"
+msgstr "Lewy klawisz - przeciÄ…gnij"
 
-#: ../src/prefs/MousePrefs.cpp:89
+#: prefs/MousePrefs.cpp:99
+#: prefs/MousePrefs.cpp:123
 msgid "Set Selection Range"
 msgstr "Ustaw zakres zaznaczenia"
 
-#: ../src/prefs/MousePrefs.cpp:90
+#: prefs/MousePrefs.cpp:100
 msgid "Extend Selection Range"
-msgstr "Powiêksz zaznaczony obszar"
+msgstr "Powiększ zaznaczony obszar"
 
-#: ../src/prefs/MousePrefs.cpp:90
+#: prefs/MousePrefs.cpp:100
 msgid "Shift-Left-Click"
 msgstr "Shift - lewy przycisk myszy"
 
 #: prefs/MousePrefs.cpp:101
 msgid "Left-Double-Click"
-msgstr "Powójne-lewe-klikniêcie"
+msgstr "Powójne-lewe-kliknięcie"
 
 #: prefs/MousePrefs.cpp:101
 msgid "Select Clip or Entire Track"
-msgstr "Zaznacz klip lub ca³± ¶cie¿kê"
+msgstr "Zaznacz klip lub całą ścieżkę"
 
 #: prefs/MousePrefs.cpp:102
 msgid "Ctrl-Left-Click"
-msgstr "Ctrl-Lewe-Klikniêcie"
+msgstr "Ctrl-Lewe-Kliknięcie"
 
 #: prefs/MousePrefs.cpp:102
 msgid "Set Selection Point and Play"
 msgstr "Ustaw punkt zaznaczenia i Odtwarzaj"
 
-#: ../src/prefs/MousePrefs.cpp:92
-#: ../src/prefs/MousePrefs.cpp:93
-#: ../src/prefs/MousePrefs.cpp:94
-#: ../src/prefs/MousePrefs.cpp:95
+#: prefs/MousePrefs.cpp:104
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:109
 msgid "Zoom"
-msgstr "Powiêksz"
+msgstr "Powiększ"
 
-#: ../src/prefs/MousePrefs.cpp:92
+#: prefs/MousePrefs.cpp:104
 msgid "Zoom in on Point"
-msgstr "Powiêksz w punkcie"
+msgstr "Powiększ w punkcie"
 
-#: ../src/prefs/MousePrefs.cpp:93
+#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
 msgid "Zoom in on a Range"
-msgstr "Powiêksz zakres"
+msgstr "Powiększ zakres"
 
-#: prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:105
 msgid "same as right-drag"
-msgstr "tak jak przesuniêcie w prawo"
+msgstr "tak jak przesunięcie w prawo"
 
-#: ../src/prefs/MousePrefs.cpp:94
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
 msgid "Right-Click"
 msgstr "Prawy klawisz myszy"
 
-#: ../src/prefs/MousePrefs.cpp:94
+#: prefs/MousePrefs.cpp:106
+#: prefs/MousePrefs.cpp:124
 msgid "Zoom out one step"
 msgstr "Pomniejsz "
 
-#: ../src/prefs/MousePrefs.cpp:95
+#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:125
 msgid "Right-Drag"
-msgstr "Przeci±gnij prawym klawiszem myszy"
+msgstr "PrzeciÄ…gnij prawym klawiszem myszy"
 
-#: prefs/MousePrefs.cpp:105
+#: prefs/MousePrefs.cpp:107
 msgid "same as left-drag"
-msgstr "tak jak przesuniêcie w lewo"
+msgstr "tak jak przesunięcie w lewo"
 
 #: prefs/MousePrefs.cpp:108
 msgid "Shift-Drag"
-msgstr "Shift-Przeci±gnij"
+msgstr "Shift-PrzeciÄ…gnij"
 
 #: prefs/MousePrefs.cpp:108
 msgid "Zoom out on a Range"
@@ -6619,156 +8471,154 @@ msgstr "Oddal Obszar"
 
 #: prefs/MousePrefs.cpp:109
 msgid "Middle-Click"
-msgstr "¦rodkowe-Klikniêcie"
+msgstr "Środkowe-Kliknięcie"
 
 #: prefs/MousePrefs.cpp:109
 msgid "Zoom default"
-msgstr "Domy¶lne ustawienie Zbli¿eñ"
+msgstr "Domyślne ustawienie Zbliżeń"
 
-#: prefs/MousePrefs.cpp:107
+#: prefs/MousePrefs.cpp:111
 msgid "Time shift clip or move up/down between tracks"
-msgstr "Przesuñ klip w czasie lub przesuñ siê w górê/w dó³ pomiêdzy ¶cie¿kami"
+msgstr "Przesuń klip w czasie lub przesuń się w górę/w dół pomiędzy ścieżkami"
 
-#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:112
 msgid "Shift-Left-Drag"
-msgstr "Shift-Przesuñ w lewo"
+msgstr "Shift-Przesuń w lewo"
 
-#: prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:112
 msgid "Time shift all clips in track"
-msgstr "Przesuñ w czasie wszystkie klipy w ¶cie¿ce"
+msgstr "Przesuń w czasie wszystkie klipy w ścieżce"
 
-#: ../src/prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:113
+#: prefs/MousePrefs.cpp:120
 msgid "Ctrl-Left-Drag"
-msgstr "Ctrl- Lewy-przeci±gnij"
+msgstr "Ctrl- Lewy-przeciÄ…gnij"
 
-#: prefs/MousePrefs.cpp:109
+#: prefs/MousePrefs.cpp:113
 msgid "Move clip up/down between tracks"
-msgstr "Przesuñ klip w górê/w dó³ pomiêdzy ¶cie¿kami"
+msgstr "Przesuń klip w górę/w dół pomiędzy ścieżkami"
 
-#: ../src/prefs/MousePrefs.cpp:98
+#: prefs/MousePrefs.cpp:115
 msgid "Change Amplification Envelope"
-msgstr "Zmieñ obwiedniê wzmocnienia"
+msgstr "Zmień obwiednię wzmocnienia"
 
-#: ../src/prefs/MousePrefs.cpp:100
+#: prefs/MousePrefs.cpp:117
 msgid "Change Sample"
-msgstr "Zmieñ próbkê"
+msgstr "Zmień próbkę"
 
-#: ../src/prefs/MousePrefs.cpp:100
-#: ../src/prefs/MousePrefs.cpp:101
-#: ../src/prefs/MousePrefs.cpp:102
-#: ../src/prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:117
+#: prefs/MousePrefs.cpp:118
+#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:120
 msgid "Pencil"
-msgstr "Pióro"
+msgstr "Pióro"
 
-#: ../src/prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:118
 msgid "Alt-Left-Click"
 msgstr "Alt-Lewy klawisz myszy"
 
-#: ../src/prefs/MousePrefs.cpp:101
+#: prefs/MousePrefs.cpp:118
 msgid "Smooth at Sample"
-msgstr "Wyg³ad¼ próbkê"
+msgstr "Wygładź próbkę"
 
-#: ../src/prefs/MousePrefs.cpp:102
+#: prefs/MousePrefs.cpp:119
 msgid "Change Several Samples"
-msgstr "Zmiana kilku próbek"
+msgstr "Zmiana kilku próbek"
 
-#: ../src/prefs/MousePrefs.cpp:103
+#: prefs/MousePrefs.cpp:120
 msgid "Change ONE Sample only"
-msgstr "Zmiana tylko JEDNEJ próbki"
+msgstr "Zmiana tylko JEDNEJ próbki"
 
-#: ../src/prefs/MousePrefs.cpp:105
-#: ../src/prefs/MousePrefs.cpp:106
-#: ../src/prefs/MousePrefs.cpp:107
-#: ../src/prefs/MousePrefs.cpp:108
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
 msgid "Multi"
 msgstr "Multi"
 
-#: prefs/MousePrefs.cpp:118
-#: prefs/MousePrefs.cpp:119
+#: prefs/MousePrefs.cpp:122
+#: prefs/MousePrefs.cpp:123
 msgid "same as select tool"
-msgstr "to samo co narzêdzie do zaznaczania"
+msgstr "to samo co narzędzie do zaznaczania"
 
-#: prefs/MousePrefs.cpp:120
-#: prefs/MousePrefs.cpp:121
+#: prefs/MousePrefs.cpp:124
+#: prefs/MousePrefs.cpp:125
 msgid "same as zoom tool"
-msgstr "tak samo jak narzêdzie do powiêkszania"
+msgstr "tak samo jak narzędzie do powiększania"
 
-#: ../src/prefs/MousePrefs.cpp:110
-#: ../src/prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:127
+#: prefs/MousePrefs.cpp:128
+#: prefs/MousePrefs.cpp:129
 msgid "Any"
 msgstr "Dowolny"
 
-#: ../src/prefs/MousePrefs.cpp:110
+#: prefs/MousePrefs.cpp:127
 msgid "Scroll up or down"
-msgstr "Przewiñ w górê lub w dó³"
+msgstr "Przewiń w górę lub w dół"
 
-#: ../src/prefs/MousePrefs.cpp:110
+#: prefs/MousePrefs.cpp:127
 msgid "Wheel-Rotate"
-msgstr "Obrót kó³kiem myszy"
+msgstr "Obrót kółkiem myszy"
 
 #: prefs/MousePrefs.cpp:128
 msgid "Scroll left or right"
-msgstr "Przesuñ w lewo lub prawo"
+msgstr "Przesuń w lewo lub prawo"
 
 #: prefs/MousePrefs.cpp:128
 msgid "Shift-Wheel-Rotate"
-msgstr "Shift-Obróæ"
+msgstr "Shift-Obróć"
 
-#: ../src/prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:129
 msgid "Ctrl-Wheel-Rotate"
-msgstr "Ctrl-kó³ko myszy"
+msgstr "Ctrl-kółko myszy"
 
-#: ../src/prefs/MousePrefs.cpp:111
+#: prefs/MousePrefs.cpp:129
 msgid "Zoom in or out"
-msgstr "Powiêksz lub pomniejsz"
+msgstr "Powiększ lub pomniejsz"
 
-#: ../src/prefs/PrefsDialog.cpp:52
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
-msgstr "W³a¶ciwo¶ci Audacity"
+msgstr "Właściwości Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Jako¶æ"
-
-#: ../src/prefs/QualityPrefs.cpp:161
+#: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
-msgstr "Prostok±tny"
+msgstr "ProstokÄ…tny"
 
-#: ../src/prefs/QualityPrefs.cpp:162
+#: prefs/QualityPrefs.cpp:74
 msgid "Triangle"
-msgstr "Trójk±tny"
+msgstr "Trójkątny"
 
-#: ../src/prefs/QualityPrefs.cpp:163
+#: prefs/QualityPrefs.cpp:75
 msgid "Shaped"
 msgstr "Uformowany"
 
 #: prefs/QualityPrefs.cpp:122
 msgid "Sampling"
-msgstr "Próbkowanie"
+msgstr "Próbkowanie"
 
-#: ../src/prefs/QualityPrefs.cpp:80
+#: prefs/QualityPrefs.cpp:125
 msgid "Default Sample Rate:"
-msgstr "Standardowa czêstotliwo¶æ:"
+msgstr "Standardowa częstotliwość:"
 
-#: ../src/prefs/QualityPrefs.cpp:114
+#: prefs/QualityPrefs.cpp:127
 msgid "Default Sample Format:"
-msgstr "Standardowa rozdzielczo¶æ:"
+msgstr "Standardowa rozdzielczość:"
 
-#: ../src/prefs/QualityPrefs.cpp:136
+#: prefs/QualityPrefs.cpp:136
 msgid "Real-time sample rate converter:"
-msgstr "Konwerter czêstotl. próbkowania ( w czasie rzeczywistym)"
+msgstr "Konwerter częstotl. próbkowania ( w czasie rzeczywistym)"
 
-#: ../src/prefs/QualityPrefs.cpp:147
+#: prefs/QualityPrefs.cpp:139
 msgid "High-quality sample rate converter:"
-msgstr "Wysokiej jako¶ci konwerter czêstotliwo¶ci próbkowania:"
+msgstr "Wysokiej jakości konwerter częstotliwości próbkowania:"
 
-#: ../src/prefs/QualityPrefs.cpp:171
+#: prefs/QualityPrefs.cpp:142
 msgid "Real-time dither:"
 msgstr "Dithering w czasie rzeczywistym"
 
-#: ../src/prefs/QualityPrefs.cpp:186
+#: prefs/QualityPrefs.cpp:145
 msgid "High-quality dither:"
-msgstr "Wysokiej jako¶ci dither:"
+msgstr "Wysokiej jakości dither:"
 
 #: prefs/QualityPrefs.cpp:157
 msgid "Conversion"
@@ -6776,7 +8626,7 @@ msgstr "Konwersja"
 
 #: prefs/QualityPrefs.cpp:163
 msgid "Sample Rate Converter"
-msgstr "Konwerter próbkowania"
+msgstr "Konwerter próbkowania"
 
 #: prefs/QualityPrefs.cpp:164
 msgid "Dither"
@@ -6788,118 +8638,162 @@ msgstr "Czas rzeczywisty:"
 
 #: prefs/QualityPrefs.cpp:171
 msgid "High-quality:"
-msgstr "Wysoka jako¶æ:"
+msgstr "Wysoka jakość:"
 
-#: prefs/SmartRecordPrefs.cpp:54
-#: prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37
+#: prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
-msgstr "M±dre Nagrywanie"
+msgstr "MÄ…dre Nagrywanie"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Zatrzyjmaj Nagrywanie na Ciszy"
+#: prefs/SmartRecordPrefs.cpp:64
+#: prefs/SmartRecordPrefs.cpp:66
+#, fuzzy
+msgid "Sound Activated Recording"
+msgstr "MÄ…dre Nagrywanie"
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Poziom Ciszy (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:87
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
 msgstr "Spektrogramy"
 
-#: ../src/prefs/SpectrumPrefs.cpp:70
+#: prefs/SpectrumPrefs.cpp:91
 msgid "FFT Size"
 msgstr "Rozmiar FFT"
 
-#: prefs/SpectrumPrefs.cpp:75
+#: prefs/SpectrumPrefs.cpp:94
 msgid "8 - most wideband"
 msgstr "8 - najszersze"
 
-#: ../src/prefs/SpectrumPrefs.cpp:40
+#: prefs/SpectrumPrefs.cpp:99
 msgid "256 - default"
-msgstr "256 - domy¶lnie"
+msgstr "256 - domyślnie"
+
+#: prefs/SpectrumPrefs.cpp:107
+#, fuzzy
+msgid "32768 - most narrowband"
+msgstr "4096 - największa rozdzielczość"
 
-#: ../src/prefs/SpectrumPrefs.cpp:44
+#: prefs/SpectrumPrefs.cpp:109
 msgid "4096 - most narrowband"
-msgstr "4096 - najwiêksza rozdzielczo¶æ"
+msgstr "4096 - największa rozdzielczość"
 
-#: prefs/SpectrumPrefs.cpp:90
+#: prefs/SpectrumPrefs.cpp:116
 msgid "Window type:"
 msgstr "Rodzaj okna:"
 
-#: prefs/SpectrumPrefs.cpp:96
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:140
 msgid "Display"
-msgstr "Wy¶wietlacz"
+msgstr "Wyświetlacz"
 
-#: prefs/SpectrumPrefs.cpp:100
+#: prefs/SpectrumPrefs.cpp:144
 msgid "&Grayscale"
-msgstr "&Skala szaro¶ci"
+msgstr "&Skala szarości"
 
-#: prefs/SpectrumPrefs.cpp:103
+#: prefs/SpectrumPrefs.cpp:147
 msgid "Minimum Frequency (Hz):"
-msgstr "Minimalna czêstotliwo¶æ (Hz):"
+msgstr "Minimalna częstotliwość (Hz):"
 
-#: ../src/prefs/SpectrumPrefs.cpp:104
+#: prefs/SpectrumPrefs.cpp:152
 msgid "Maximum Frequency (Hz):"
-msgstr "Maksymalna czêstotliwo¶æ (Hz):"
+msgstr "Maksymalna częstotliwość (Hz):"
+
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
 
-#: ../src/prefs/SpectrumPrefs.cpp:148
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+#, fuzzy
+msgid "Minimum Amplitude (dB):"
+msgstr "Nowy Szczyt Amplitudy (dB):"
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:197
 msgid "The maximum frequency must be an integer"
-msgstr "Maksymalna czêstotliwo¶æ musi byæ liczb± ca³kowit±"
+msgstr "Maksymalna częstotliwość musi być liczbą całkowitą"
 
-#: ../src/prefs/SpectrumPrefs.cpp:152
+#: prefs/SpectrumPrefs.cpp:201
 msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
-msgstr "Maksymalna czêstotliwo¶æ musi by¶ w przedziale 100 Hz - 100,000 Hz"
+msgstr "Maksymalna częstotliwość musi byś w przedziale 100 Hz - 100,000 Hz"
 
-#: prefs/SpectrumPrefs.cpp:146
+#: prefs/SpectrumPrefs.cpp:209
 msgid "The minimum frequency must be an integer"
-msgstr "Minimalna czêstotliwo¶æ musi byæ liczb± ca³kowit±"
+msgstr "Minimalna częstotliwość musi być liczbą całkowitą"
 
-#: prefs/SpectrumPrefs.cpp:150
+#: prefs/SpectrumPrefs.cpp:213
 msgid "Minimum frequency must be at least 0 Hz"
-msgstr "MInimalna czêstotliwo¶æ musi byæ przynajmniej 0 Hz"
+msgstr "MInimalna częstotliwość musi być przynajmniej 0 Hz"
+
+#: prefs/SpectrumPrefs.cpp:220
+#, fuzzy
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr "Minimalna częstotliwość musi być liczbą całkowitą"
+
+#: prefs/SpectrumPrefs.cpp:226
+#: prefs/SpectrumPrefs.cpp:230
+#, fuzzy
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr "Maksymalna częstotliwość musi być liczbą całkowitą"
 
-#: prefs/ThemePrefs.cpp:61
 #: prefs/ThemePrefs.cpp:62
+#: prefs/ThemePrefs.cpp:63
 msgid "Theme"
 msgstr "Temat"
 
-#: prefs/ThemePrefs.cpp:90
+#. i18n-hint: && in here is an escape character to get a single & on screen,
+#. * so keep it as is
+#: prefs/ThemePrefs.cpp:93
 msgid "Theme Cache - Images && Color"
-msgstr "Pamiêæ tematu - Obrazy && Kolor"
+msgstr "Pamięć tematu - Obrazy && Kolor"
 
-#: prefs/ThemePrefs.cpp:92
+#: prefs/ThemePrefs.cpp:95
 msgid "Save Theme Cache"
-msgstr "Zapisz pamiêæ tematu"
+msgstr "Zapisz pamięć tematu"
 
-#: prefs/ThemePrefs.cpp:93
+#: prefs/ThemePrefs.cpp:96
 msgid "Load Theme Cache"
-msgstr "Za³aduj pamiêæ tematu"
+msgstr "Załaduj pamięć tematu"
 
-#: prefs/ThemePrefs.cpp:103
+#: prefs/ThemePrefs.cpp:106
 msgid "Load Theme Cache At Startup"
-msgstr "Za³aduj pamiêæ tematu przy starcie"
+msgstr "Załaduj pamięć tematu przy starcie"
 
-#: prefs/ThemePrefs.cpp:115
+#: prefs/ThemePrefs.cpp:118
 msgid "Individual Theme Files"
 msgstr "Indywidualne pliki tematu"
 
-#: prefs/ThemePrefs.cpp:117
+#: prefs/ThemePrefs.cpp:120
 msgid "Save Files"
 msgstr "Zapisz pliki"
 
-#: prefs/ThemePrefs.cpp:118
+#: prefs/ThemePrefs.cpp:121
 msgid "Load Files"
-msgstr "Za³aduj pliki"
+msgstr "Załaduj pliki"
 
-#: prefs/ThemePrefs.cpp:123
+#: prefs/ThemePrefs.cpp:126
 msgid "Info"
 msgstr "Info"
 
-#: prefs/ThemePrefs.cpp:126
-msgid ""
-"Themability is an experimental feature.\n"
+#: prefs/ThemePrefs.cpp:129
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -6912,60 +8806,49 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"Tematyczno¶æ jest w fazie eksperymentów.\n"
+msgstr "Tematyczność jest w fazie eksperymentów.\n"
 "\n"
-"Aby wypróbowaæ, kliknij nak \"Zapisz Temat\" nastêpnie\n"
-"znajd¼ i zmodyfikuj obrazy i kolory \n"
-"PamiêæObrazuVxx.png u¿ywaj±c edytora takiego jak \n"
+"Aby wypróbować, kliknij nak \"Zapisz Temat\" następnie\n"
+"znajdź i zmodyfikuj obrazy i kolory \n"
+"PamięćObrazuVxx.png używając edytora takiego jak \n"
 "Gimp.\n"
 "\n"
-"Kliknij \"Za³adujTemat\" aby za³adowaæ zmienione obrazy\n"
+"Kliknij \"ZaładujTemat\" aby załadować zmienione obrazy\n"
 "i kolory z powrotem do Audacity.\n"
 "\n"
-"[Mo¿na zmieniæ tylko pasek narzêdzi i kolory na \n"
-"¶cie¿ce, nawet mimo tego, ¿e\n"
-"plik obrazu pokazuje równie¿ inne ikony.]\n"
+"[Można zmienić tylko pasek narzędzi i kolory na \n"
+"ścieżce, nawet mimo tego, że\n"
+"plik obrazu pokazuje również inne ikony.]\n"
 
-#: prefs/ThemePrefs.cpp:131
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+#: prefs/ThemePrefs.cpp:134
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Skompilowa³e¶ Audacity z dodatkowym przyciskiem, \n"
-"'¯ród³o Wyj¶ciowe'.  To zapisze wersjê C \n"
-"pamiêci obrazu, która mo¿e zostaæ skompilowana.\n"
+msgstr "Skompilowałeś Audacity z dodatkowym przyciskiem, \n"
+"'Żródło Wyjściowe'.  To zapisze wersję C \n"
+"pamięci obrazu, która może zostać skompilowana.\n"
 
-#: prefs/ThemePrefs.cpp:136
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+#: prefs/ThemePrefs.cpp:139
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Je¶li zaznaczysz  'Za³aduj Pamiêæ Tematu przy starcie', \n"
-"Pamiêæ Tematu zostanie za³adowana przy uruchamianiu \n"
+msgstr "Jeśli zaznaczysz  'Załaduj Pamięć Tematu przy starcie', \n"
+"Pamięć Tematu zostanie załadowana przy uruchamianiu \n"
 "programu.\n"
 "\n"
 
-#: prefs/ThemePrefs.cpp:139
-msgid ""
-"Saving and loading individual theme files uses a \n"
+#: prefs/ThemePrefs.cpp:142
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Zapisywanie i ³adowanie plików tematu u¿ywa  \n"
-"osobnych plików do ka¿dego obrazu, ale poza tym jest to ten sam  \n"
-"pomys³.\n"
+msgstr "Zapisywanie i ładowanie plików tematu używa  \n"
+"osobnych plików do każdego obrazu, ale poza tym jest to ten sam  \n"
+"pomysł.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Kontrola"
-
-#: ../src/ControlToolBar.cpp:470
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Pauza"
 
@@ -6973,178 +8856,193 @@ msgstr "Pauza"
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Odtwórz (odtwarzanie w pêtli: z klawiszem Shift)"
+#: toolbars/ControlToolBar.cpp:178
+#, fuzzy
+msgid "Play (Shift for Loop Play)"
+msgstr "Odtwórz (odtwarzanie w pętli: z klawiszem Shift)"
 
-#: ../src/ControlToolBar.cpp:471
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/ControlToolBar.cpp:467
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
-msgstr "Skocz do pocz±tku"
+msgstr "Skocz do poczÄ…tku"
 
-#: ../src/ControlToolBar.cpp:472
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
-msgstr "Skocz do koñca"
+msgstr "Skocz do końca"
+
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Czysta mowa"
 
-#: toolbars/ControlToolBar.cpp:524
-#: toolbars/ControlToolBar.cpp:776
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
-msgstr "B³±d podczas otwierania urz±dzenia d¼wiêkowego. "
+msgstr "Błąd podczas otwierania urządzenia dźwiękowego. "
 
-#: toolbars/ControlToolBar.cpp:696
+#: toolbars/ControlToolBar.cpp:706
 msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
-msgstr "Nagrywanie w trybie CzystaMowa nie jest mo¿liwe, gdy jedna ¶cie¿ka lub wiêcej ni¿ jeden projekt s± otwarte."
+msgstr "Nagrywanie w trybie CzystaMowa nie jest możliwe, gdy jedna ścieżka lub więcej niż jeden projekt są otwarte."
 
-#: toolbars/ControlToolBar.cpp:685
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "Nagrywanie zabronione"
 
 #: toolbars/DeviceToolBar.cpp:113
 #: toolbars/DeviceToolBar.cpp:115
 msgid "Output Device"
-msgstr "Urz±dzenie wyj¶cia"
+msgstr "Urządzenie wyjścia"
 
 #: toolbars/DeviceToolBar.cpp:134
 #: toolbars/DeviceToolBar.cpp:136
 msgid "Input Device"
-msgstr "Urz±dzenie wej¶cia"
+msgstr "Urządzenie wejścia"
 
-#: ../src/EditToolBar.cpp:154
+#: toolbars/EditToolBar.cpp:139
 msgid "Trim outside selection"
 msgstr "Wytnij poza zaznaczeniem"
 
-#: ../src/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:141
 msgid "Silence selection"
 msgstr "Wycisz zaznaczenie"
 
-#: ../src/EditToolBar.cpp:164
+#: toolbars/EditToolBar.cpp:150
+#, fuzzy
+msgid "Link Tracks"
+msgstr "Ścieżki"
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
-msgstr "Powiêksz"
+msgstr "Powiększ"
 
-#: ../src/EditToolBar.cpp:166
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "Pomniejsz"
 
-#: ../src/EditToolBar.cpp:170
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
-msgstr "Narzêdzie powiêkszania"
+msgstr "Narzędzie powiększania"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr "Dopasuj zaznaczenie"
 
-#: ../src/EditToolBar.cpp:174
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "Dopasuj zaznaczenie do okna"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr "Dopasuj projekt"
 
-#: ../src/EditToolBar.cpp:176
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
-msgstr "Poka¿ ca³y projekt w oknie"
+msgstr "Pokaż cały projekt w oknie"
 
-#: toolbars/MeterToolBar.cpp:49
+#: toolbars/MeterToolBar.cpp:50
 msgid "Meter"
 msgstr "Miernik"
 
-#: toolbars/MeterToolBar.cpp:79
+#: toolbars/MeterToolBar.cpp:80
 msgid "Play Meter"
 msgstr "Miernik odtwarzania"
 
-#: toolbars/MeterToolBar.cpp:80
+#: toolbars/MeterToolBar.cpp:81
 msgid "Meter-Play"
 msgstr "Miernik-odtwarzacz"
 
-#: toolbars/MeterToolBar.cpp:88
+#: toolbars/MeterToolBar.cpp:89
 msgid "Record Meter"
 msgstr "Miernik nagrywania"
 
-#: toolbars/MeterToolBar.cpp:89
+#: toolbars/MeterToolBar.cpp:90
 msgid "Meter-Record"
 msgstr "Miernik-nagrywanie"
 
-#: ../src/MeterToolBar.cpp:65
+#: toolbars/MeterToolBar.cpp:94
 msgid "Output level meter"
-msgstr "Miernik poziomu wyj¶ciowego"
+msgstr "Miernik poziomu wyjściowego"
 
-#: ../src/MeterToolBar.cpp:66
+#: toolbars/MeterToolBar.cpp:95
 msgid "Input level meter - click to monitor input"
-msgstr "Miernik poziomu wej¶ciowego - kliknij, aby monitorowaæ sygna³ wej¶ciowy"
-
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "Mikser"
+msgstr "Miernik poziomu wejściowego - kliknij, aby monitorować sygnał wejściowy"
 
-#: ../src/MixerToolBar.cpp:135
+#: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
-msgstr "Wzmocnienie wyj¶ciowe"
+msgstr "Wzmocnienie wyjściowe"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
-msgstr "Suwak do wyj¶cia"
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
+msgstr "Suwak do wyjścia"
 
-#: ../src/MixerToolBar.cpp:138
+#: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
 msgid "Input Volume"
-msgstr "Wzmocnienie wej¶ciowe"
+msgstr "Wzmocnienie wejściowe"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
-msgstr "Suwak do wej¶cia"
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
+msgstr "Suwak do wejścia"
 
-#: toolbars/MixerToolBar.cpp:119
+#: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
-msgstr "¯ród³o wej¶cia"
+msgstr "Żródło wejścia"
 
-#: toolbars/SelectionBar.cpp:75
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: toolbars/SelectionBar.cpp:115
-#: toolbars/SelectionBar.cpp:168
+#: toolbars/SelectionBar.cpp:135
+#: toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
-msgstr "Czêstotliwo¶æ projektu (Hz)"
+msgstr "Częstotliwość projektu (Hz)"
 
-#: toolbars/SelectionBar.cpp:120
-#: toolbars/SelectionBar.cpp:211
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
-msgstr "Pocz±tek zaznaczenia:"
+msgstr "PoczÄ…tek zaznaczenia:"
 
-#: toolbars/SelectionBar.cpp:145
+#: toolbars/SelectionBar.cpp:163
+#: toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
+msgid "Length"
+msgstr "Długość"
+
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
 msgstr "ukryty"
 
-#: toolbars/SelectionBar.cpp:155
-#: toolbars/SelectionBar.cpp:239
+#: toolbars/SelectionBar.cpp:184
+#: toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
-msgstr "Pozycja d¼wiêku"
+msgstr "Pozycja dźwięku"
 
-#: toolbars/SelectionBar.cpp:217
-#: toolbars/SelectionBar.cpp:222
+#: toolbars/SelectionBar.cpp:236
+#: toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr "Przyczep do"
 
-#: toolbars/SelectionBar.cpp:224
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
 msgstr "Zaznaczenie"
 
-#: toolbars/SelectionBar.cpp:289
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
-msgstr "D³ugo¶æ zaznaczenia"
+msgstr "Długość zaznaczenia"
 
-#: toolbars/SelectionBar.cpp:297
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
 msgstr "Koniec zaznaczenia"
 
-#: toolbars/ToolBar.cpp:96
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr "Pasek %s Audacity"
@@ -7152,463 +9050,598 @@ msgstr "Pasek %s Audacity"
 #: toolbars/ToolDock.cpp:74
 #: toolbars/ToolDock.cpp:75
 msgid "ToolDock"
-msgstr "Dok z narzêdziami"
+msgstr "Dok z narzędziami"
 
-#: ../src/ControlToolBar.cpp:76
+#: toolbars/ToolsToolBar.cpp:63
 msgid "Click and drag to select audio"
-msgstr "Kliknij i przeci±gnij aby zaznaczyæ"
+msgstr "Kliknij i przeciągnij aby zaznaczyć"
 
-#: ../src/ControlToolBar.cpp:77
+#: toolbars/ToolsToolBar.cpp:64
 msgid "Click and drag to edit the amplitude envelope"
-msgstr "Kliknij i przeci±gnij aby edytowaæ obwiedniê wzmocnienia"
+msgstr "Kliknij i przeciągnij aby edytować obwiednię wzmocnienia"
 
-#: ../src/ControlToolBar.cpp:78
+#: toolbars/ToolsToolBar.cpp:65
 msgid "Click and drag to edit the samples"
-msgstr "Kliknij i przeci±gnij aby edytowaæ próbkê"
+msgstr "Kliknij i przeciągnij aby edytować próbkę"
 
-#: ../src/ControlToolBar.cpp:80
+#: toolbars/ToolsToolBar.cpp:67
 msgid "Click to Zoom In, Shift-Click to Zoom Out"
-msgstr "Kliknij aby zwiêkszyæ podgl±d, Kliknij z klawiszem shift aby zmniejszyæ"
+msgstr "Kliknij aby zwiększyć podgląd, Kliknij z klawiszem shift aby zmniejszyć"
 
-#: ../src/ControlToolBar.cpp:82
+#: toolbars/ToolsToolBar.cpp:69
 msgid "Drag to Zoom Into Region, Right-Click to Zoom Out"
-msgstr "Lewy klawisz myszki zwiêksza, Prawy klawisz myszki zmniejsza "
+msgstr "Lewy klawisz myszki zwiększa, Prawy klawisz myszki zmniejsza "
 
-#: ../src/ControlToolBar.cpp:84
+#: toolbars/ToolsToolBar.cpp:71
 msgid "Left=Zoom In, Right=Zoom Out, Middle=Normal"
-msgstr "Lewy=Powiêksz, Prawy=Pomniejsz, ¦rodek=Normalny"
+msgstr "Lewy=Powiększ, Prawy=Pomniejsz, Środek=Normalny"
 
-#: ../src/ControlToolBar.cpp:86
+#: toolbars/ToolsToolBar.cpp:73
 msgid "Click and drag to move a track in time"
-msgstr "Kliknij i przeci±gnij aby przesun±æ ¶cie¿kê w odniesieniu do czasu"
+msgstr "Kliknij i przeciągnij aby przesunąć ścieżkę w odniesieniu do czasu"
 
 #: toolbars/ToolsToolBar.cpp:90
 msgid "Tools"
-msgstr "Narzêdzia"
+msgstr "Narzędzia"
 
-#: ../src/ControlToolBar.cpp:355
+#: toolbars/ToolsToolBar.cpp:147
+#: toolbars/ToolsToolBar.cpp:182
 msgid "Selection Tool"
 msgstr "Zaznaczanie"
 
-#: ../src/ControlToolBar.cpp:356
+#: toolbars/ToolsToolBar.cpp:148
 msgid "Envelope Tool"
-msgstr "Narzêdzie obwiedni"
+msgstr "Narzędzie obwiedni"
 
-#: ../src/ControlToolBar.cpp:357
+#: toolbars/ToolsToolBar.cpp:149
+#: toolbars/ToolsToolBar.cpp:183
 msgid "Time Shift Tool"
-msgstr "Narzêdzie do przesuwania w czasie"
+msgstr "Narzędzie do przesuwania w czasie"
 
-#: ../src/ControlToolBar.cpp:358
+#: toolbars/ToolsToolBar.cpp:150
+#: toolbars/ToolsToolBar.cpp:185
 msgid "Zoom Tool"
 msgstr "Lupa"
 
-#: ../src/ControlToolBar.cpp:359
+#: toolbars/ToolsToolBar.cpp:151
+#: toolbars/ToolsToolBar.cpp:184
 msgid "Draw Tool"
-msgstr "Narzêdzie rysowania­"
+msgstr "Narzędzie rysowania­"
 
-#: ../src/ControlToolBar.cpp:360
+#: toolbars/ToolsToolBar.cpp:152
 msgid "Multi-Tool Mode"
-msgstr "Tryb multi narzêdzia"
+msgstr "Tryb multi narzędzia"
 
 #: toolbars/ToolsToolBar.cpp:186
 msgid "Slide Tool"
-msgstr "Narzêdzie Przesuwania"
+msgstr "Narzędzie Przesuwania"
 
 #: toolbars/ToolsToolBar.cpp:187
 msgid "Multi Tool"
-msgstr "Wielofunkcyjne Narzêdzie"
+msgstr "Wielofunkcyjne Narzędzie"
 
-#: toolbars/TranscriptionToolBar.cpp:81
+#: toolbars/TranscriptionToolBar.cpp:84
 msgid "Transcription"
 msgstr "Transkrypcja"
 
-#: toolbars/TranscriptionToolBar.cpp:183
+#: toolbars/TranscriptionToolBar.cpp:171
 msgid "Play at selected speed"
-msgstr "Odtwarzaj z podan± prêdko¶ci±"
+msgstr "Odtwarzaj z podaną prędkością"
 
-#: toolbars/TranscriptionToolBar.cpp:184
+#: toolbars/TranscriptionToolBar.cpp:172
 msgid "Play-at-speed"
-msgstr "Odtwarzaj z prêdko¶ci±"
+msgstr "Odtwarzaj z prędkością"
 
-#: toolbars/TranscriptionToolBar.cpp:190
-#: toolbars/TranscriptionToolBar.cpp:195
+#: toolbars/TranscriptionToolBar.cpp:178
+#: toolbars/TranscriptionToolBar.cpp:183
 msgid "Playback Speed"
-msgstr "Prêdko¶æ odtwarzania"
+msgstr "Prędkość odtwarzania"
 
-#: toolbars/TranscriptionToolBar.cpp:180
+#: toolbars/TranscriptionToolBar.cpp:196
 #, fuzzy
 msgid "Adjust left selection to next onset"
-msgstr "Koryguj lewe zaznaczenie do nastêpnego pocz±tku"
+msgstr "Koryguj lewe zaznaczenie do następnego początku"
 
-#: toolbars/TranscriptionToolBar.cpp:201
+#: toolbars/TranscriptionToolBar.cpp:197
 msgid "Left-to-On"
-msgstr "Lewe w³±czone"
+msgstr "Lewe włączone"
 
-#: toolbars/TranscriptionToolBar.cpp:203
+#: toolbars/TranscriptionToolBar.cpp:199
 msgid "Adjust right selection to previous offset"
 msgstr "Koryguj prawe zaznaczenie do poprzedniego offsetu"
 
-#: toolbars/TranscriptionToolBar.cpp:204
+#: toolbars/TranscriptionToolBar.cpp:200
 msgid "Right-to-Off"
-msgstr "Prawe wy³±czone"
+msgstr "Prawe wyłączone"
 
-#: toolbars/TranscriptionToolBar.cpp:206
+#: toolbars/TranscriptionToolBar.cpp:202
 msgid "Adjust left selection to next offset"
-msgstr "Koryguj lewe zaznaczenie do nastêpnego offsetu"
+msgstr "Koryguj lewe zaznaczenie do następnego offsetu"
 
-#: toolbars/TranscriptionToolBar.cpp:207
+#: toolbars/TranscriptionToolBar.cpp:203
 msgid "Left-to-Off"
-msgstr "Lewe wy³±czone"
+msgstr "Lewe wyłączone"
 
-#: toolbars/TranscriptionToolBar.cpp:209
+#: toolbars/TranscriptionToolBar.cpp:205
 msgid "Adjust right selection to previous onset"
-msgstr "Koryguj prawe zaznaczenie do poprzedniego pocz±tku"
+msgstr "Koryguj prawe zaznaczenie do poprzedniego poczÄ…tku"
 
-#: toolbars/TranscriptionToolBar.cpp:210
+#: toolbars/TranscriptionToolBar.cpp:206
 msgid "Right-to-On"
-msgstr "Prawe w³±czone"
+msgstr "Prawe włączone"
 
-#: toolbars/TranscriptionToolBar.cpp:212
+#: toolbars/TranscriptionToolBar.cpp:208
 msgid "Select region of sound around cursor"
-msgstr "Zaznacz obszar d¼wiêku naoko³o kursora"
+msgstr "Zaznacz obszar dźwięku naokoło kursora"
 
-#: toolbars/TranscriptionToolBar.cpp:213
+#: toolbars/TranscriptionToolBar.cpp:209
 msgid "Select-Sound"
-msgstr "Zaznacz d¼wiêk"
+msgstr "Zaznacz dźwięk"
 
-#: toolbars/TranscriptionToolBar.cpp:215
+#: toolbars/TranscriptionToolBar.cpp:211
 msgid "Select region of silence around cursor"
-msgstr "Zaznacz obszar ciszy naoko³o kursora"
+msgstr "Zaznacz obszar ciszy naokoło kursora"
 
-#: toolbars/TranscriptionToolBar.cpp:216
+#: toolbars/TranscriptionToolBar.cpp:212
 msgid "Select-Silence"
-msgstr "Zaznacz ciszê"
+msgstr "Zaznacz ciszÄ™"
 
-#: toolbars/TranscriptionToolBar.cpp:218
+#: toolbars/TranscriptionToolBar.cpp:214
 msgid "Automatically make labels from words"
-msgstr "Stwórz automatycznie etykiety z wyrazów"
+msgstr "Stwórz automatycznie etykiety z wyrazów"
 
-#: toolbars/TranscriptionToolBar.cpp:219
+#: toolbars/TranscriptionToolBar.cpp:215
 msgid "Make Labels"
-msgstr "Stwórz etykiety"
+msgstr "Stwórz etykiety"
 
-#: toolbars/TranscriptionToolBar.cpp:221
+#: toolbars/TranscriptionToolBar.cpp:217
 msgid "Add label at selection"
-msgstr "Dodaj etykietê do zaznaczenia"
+msgstr "Dodaj etykietÄ™ do zaznaczenia"
 
-#: toolbars/TranscriptionToolBar.cpp:222
+#: toolbars/TranscriptionToolBar.cpp:218
 msgid "Add Label"
-msgstr "Dodaj etykietê"
+msgstr "Dodaj etykietÄ™"
 
-#: toolbars/TranscriptionToolBar.cpp:224
+#: toolbars/TranscriptionToolBar.cpp:220
 msgid "Calibrate voicekey"
-msgstr "Skalibruj czujnik natê¿enia d¼wiêku"
+msgstr "Skalibruj czujnik natężenia dźwięku"
 
-#: toolbars/TranscriptionToolBar.cpp:225
+#: toolbars/TranscriptionToolBar.cpp:221
 msgid "Calibrate"
 msgstr "Kalibruj"
 
-#: toolbars/TranscriptionToolBar.cpp:229
+#: toolbars/TranscriptionToolBar.cpp:225
 msgid "Adjust Sensitivity"
-msgstr "Skoryguj czu³o¶æ"
+msgstr "Skoryguj czułość"
 
-#: toolbars/TranscriptionToolBar.cpp:234
+#: toolbars/TranscriptionToolBar.cpp:230
 msgid "Sensitivity"
-msgstr "Czu³o¶æ"
+msgstr "Czułość"
 
-#: toolbars/TranscriptionToolBar.cpp:239
+#: toolbars/TranscriptionToolBar.cpp:235
 msgid "Energy"
 msgstr "Energia"
 
-#: toolbars/TranscriptionToolBar.cpp:240
+#: toolbars/TranscriptionToolBar.cpp:236
 msgid "Sign Changes (Low Threshold)"
-msgstr "Zmiany znaku (Niski próg)"
+msgstr "Zmiany znaku (Niski próg)"
 
-#: toolbars/TranscriptionToolBar.cpp:241
+#: toolbars/TranscriptionToolBar.cpp:237
 msgid "Sign Changes (High Threshold)"
-msgstr "Zmiany znaku (Wysoki próg)"
+msgstr "Zmiany znaku (Wysoki próg)"
 
-#: toolbars/TranscriptionToolBar.cpp:242
+#: toolbars/TranscriptionToolBar.cpp:238
 msgid "Direction Changes (Low Threshold)"
-msgstr "Zmiany kierunku (Niski próg)"
+msgstr "Zmiany kierunku (Niski próg)"
 
-#: toolbars/TranscriptionToolBar.cpp:243
+#: toolbars/TranscriptionToolBar.cpp:239
 msgid "Direction Changes (High Threshold)"
-msgstr "Zmiany kierunku (Wysoki próg)"
+msgstr "Zmiany kierunku (Wysoki próg)"
 
-#: toolbars/TranscriptionToolBar.cpp:251
+#: toolbars/TranscriptionToolBar.cpp:247
 msgid "Key type"
 msgstr "Rodzaj klawisza"
 
-#: ../src/widgets/AButton.cpp:181
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr " (nieaktywny)"
 
-#: widgets/AButton.cpp:443
+#: widgets/AButton.cpp:461
 msgid "Press"
-msgstr "Naci¶nij"
+msgstr "Naciśnij"
 
-#: widgets/AButton.cpp:522
+#: widgets/AButton.cpp:540
 msgid "Button"
 msgstr "przycisk"
 
-#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
-#: ../src/widgets/ASlider.cpp:329
-#: ../src/widgets/Meter.cpp:165
+#. i18n-hint: One-letter abbreviation for Left, in the Pan slider
+#: widgets/ASlider.cpp:612
+#: widgets/Meter.cpp:248
 msgid "L"
 msgstr "L"
 
 #  i18n-hint: One-letter abbreviation for Right, in the Pan slider
 #  i18n-hint: One-letter abbreviation for Right, in VU Meter
-#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
-#: ../src/widgets/ASlider.cpp:332
-#: ../src/widgets/Meter.cpp:167
+#. i18n-hint: One-letter abbreviation for Right, in the Pan slider
+#: widgets/ASlider.cpp:615
+#: widgets/Meter.cpp:250
 msgid "R"
 msgstr "P"
 
-#: ../src/widgets/ASlider.cpp:484
+#: widgets/ASlider.cpp:678
 msgid "Center"
-msgstr "Wy¶rodkuj"
+msgstr "Wyśrodkuj"
 
-#: ../src/widgets/ASlider.cpp:488
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "Lewy"
 
-#: ../src/widgets/ASlider.cpp:491
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "Prawy"
 
-#: widgets/ErrorDialog.cpp:73
-#: widgets/ErrorDialog.cpp:97
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
 msgstr "Pomoc"
 
-#: widgets/ErrorDialog.cpp:190
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:255
 msgid "Help on the Internet"
 msgstr "Pomoc w Internecie"
 
-#: widgets/Grabber.cpp:61
+#: widgets/Grabber.cpp:62
 msgid "Grabber"
 msgstr "Uchwyt"
 
-#: widgets/Grid.cpp:616
+#: widgets/Grid.cpp:643
 #, c-format
 msgid "%d rows, %d columns"
-msgstr "%d rzêdów, %d kolumn"
+msgstr "%d rzędów, %d kolumn"
 
-#: widgets/Grid.cpp:622
-#: widgets/Grid.cpp:749
+#: widgets/Grid.cpp:649
+#: widgets/Grid.cpp:776
 #, c-format
 msgid "Row %d"
-msgstr "Rz±d %d"
+msgstr "RzÄ…d %d"
 
-#: widgets/Grid.cpp:764
+#: widgets/Grid.cpp:791
 msgid "Empty"
 msgstr "Pusty"
 
-#: widgets/Meter.cpp:336
+#: widgets/Meter.cpp:396
 msgid "Enable Meter"
 msgstr "Uruchom miernik"
 
-#: widgets/Meter.cpp:338
+#: widgets/Meter.cpp:398
 msgid "Disable Meter"
-msgstr "Wy³±cz miernik"
+msgstr "Wyłącz miernik"
 
-#: widgets/Meter.cpp:341
+#: widgets/Meter.cpp:401
 msgid "Stop Monitoring"
-msgstr "Przestañ monitorowaæ"
+msgstr "Przestań monitorować"
 
-#: widgets/Meter.cpp:343
+#: widgets/Meter.cpp:403
 msgid "Start Monitoring"
-msgstr "Rozpocznij monitorowaæ"
+msgstr "Rozpocznij monitorować"
 
-#: ../src/widgets/Meter.cpp:285
+#: widgets/Meter.cpp:407
 msgid "Horizontal Stereo"
 msgstr "Stereo poziomo"
 
-#: ../src/widgets/Meter.cpp:286
+#: widgets/Meter.cpp:408
 msgid "Vertical Stereo"
 msgstr "Stereo pionowo"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Liniowy"
-
-#: widgets/Meter.cpp:365
+#: widgets/Meter.cpp:425
 msgid "Preferences..."
 msgstr "Preferencje..."
 
-#: widgets/Meter.cpp:1037
-msgid ""
-"This determines how often the meter is refreshed.\n"
+#: widgets/Meter.cpp:876
+#, fuzzy
+msgid "Mix Volume"
+msgstr "Wzmocnienie wejściowe"
+
+#: widgets/Meter.cpp:1145
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Okre¶la to, jak czêsto odbywa siê od¶wie¿anie miernika.\n"
-"Je¶li masz wolny komputer, mo¿esz zaznaczyæ\n"
-"wolniejsze od¶wie¿anie (30 razy na sekundê lub wolniej), aby\n"
-"wy¶wietlacz miernika nie wp³ywa³ na jako¶æ d¼wiêku."
+msgstr "Określa to, jak często odbywa się odświeżanie miernika.\n"
+"Jeśli masz wolny komputer, możesz zaznaczyć\n"
+"wolniejsze odświeżanie (30 razy na sekundę lub wolniej), aby\n"
+"wyświetlacz miernika nie wpływał na jakość dźwięku."
 
-#: widgets/Meter.cpp:1038
+#: widgets/Meter.cpp:1146
 msgid "Meter refresh rate per second [1-100]: "
-msgstr "Czêstotliwo¶æ od¶wie¿ania miernika na sekundê [1-100]:"
+msgstr "Częstotliwość odświeżania miernika na sekundę [1-100]:"
 
-#: widgets/Meter.cpp:1039
+#: widgets/Meter.cpp:1147
 msgid "Meter Preferences"
 msgstr "Ustawienia Miernika"
 
 #: widgets/MultiDialog.cpp:82
 msgid " Please select an action "
-msgstr "Wybierz akcjê "
+msgstr "Wybierz akcjÄ™ "
+
+#: widgets/MultiDialog.cpp:86
+#, fuzzy
+msgid "Please select an action"
+msgstr "Wybierz akcjÄ™ "
+
+#: widgets/ProgressDialog.cpp:97
+#, fuzzy
+msgid "Elapsed Time:"
+msgstr "Czas zakończenia"
+
+#: widgets/ProgressDialog.cpp:117
+#, fuzzy
+msgid "Remaining Time:"
+msgstr "Usuwanie szumu"
+
+#: widgets/ProgressDialog.cpp:134
+#, fuzzy
+msgid "Cancel"
+msgstr "&Cofnij"
 
-#: widgets/Ruler.cpp:1110
-#: widgets/Ruler.cpp:1111
+#: widgets/Ruler.cpp:1445
+#: widgets/Ruler.cpp:1446
 msgid "Vertical Ruler"
 msgstr "Pionowa linijka"
 
-#: widgets/TimeTextCtrl.cpp:198
+#. i18n-hint: Format string for displaying time in seconds. Change the comma
+#. * in the middle to the 1000s separator for your locale, and the 'seconds'
+#. * on the end to the word for seconds. Don't change the numbers.
+#: widgets/TimeTextCtrl.cpp:267
 msgid "01000,01000 seconds"
 msgstr "01000,01000 sekund"
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr "gg:mm:ss"
-
-#: widgets/TimeTextCtrl.cpp:200
+#. i18n-hint: Format string for displaying time in hours, minutes and
+#. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
+#. * change the numbers unless there aren't 60 seconds in a minute in your
+#. * locale
+#: widgets/TimeTextCtrl.cpp:276
 msgid "0100 h 060 m 060 s"
 msgstr "0100 g 060 m 060 s"
 
-#: widgets/TimeTextCtrl.cpp:201
+#. i18n-hint: Name of time display format that shows time in days, hours,
+#. * minutes and seconds
+#: widgets/TimeTextCtrl.cpp:279
 msgid "dd:hh:mm:ss"
 msgstr "gg:mm:ss"
 
-#: widgets/TimeTextCtrl.cpp:202
+#. i18n-hint: Format string for displaying time in days, hours, minutes and
+#. * seconds. Change the 'days' to the word for days, 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes and 's' to the
+#. * abbreviation for seconds. Don't change the numbers unless there aren't
+#. * 24 hours in a day in your locale
+#: widgets/TimeTextCtrl.cpp:285
 msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dni 024 g 060 m 060 s"
 
-#: widgets/TimeTextCtrl.cpp:203
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and milliseconds (1/1000 second)
+#: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
 msgstr "gg:mm:ss + milisekund"
 
-#: widgets/TimeTextCtrl.cpp:204
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * milliseconds are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
 msgid "0100 h 060 m 060.01000 s"
 msgstr "0100 g 060 m 060.01000 s"
 
-#: widgets/TimeTextCtrl.cpp:205
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and samples (at the current project sample rate)
+#: widgets/TimeTextCtrl.cpp:297
 msgid "hh:mm:ss + samples"
-msgstr "gg:mm:ss + próbki"
-
-#: widgets/TimeTextCtrl.cpp:206
+msgstr "gg:mm:ss + próbki"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and samples. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * abbreviation for minutes, 's' to the abbreviation for seconds and
+#. * translate samples . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:303
 msgid "0100 h 060 m 060 s+.# samples"
-msgstr "0100 g 060 m 060 s+.# próbki"
+msgstr "0100 g 060 m 060 s+.# próbki"
 
-#: widgets/TimeTextCtrl.cpp:207
+#. i18n-hint: Name of time display format that shows time in samples (at the
+#. * current project sample rate)
+#: widgets/TimeTextCtrl.cpp:306
 msgid "samples"
-msgstr "próbki"
+msgstr "próbki"
 
-#: widgets/TimeTextCtrl.cpp:208
+#. i18n-hint: Format string for displaying time in samples (lots of samples).
+#. * Change the ',' to the 1000s separator for your locale, and translate
+#. * samples. If 1000s aren't a base multiple for your number system, then you
+#. * can change the numbers to an appropriate one, and put a 0 on the front
+#: widgets/TimeTextCtrl.cpp:311
 msgid "01000,01000,01000 samples|#"
-msgstr "01000,01000,01000 próbki|#"
+msgstr "01000,01000,01000 próbki|#"
 
-#: widgets/TimeTextCtrl.cpp:209
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:314
 msgid "hh:mm:ss + film frames (24 fps)"
 msgstr "gg:mm:ss + klatek filmu (24 fps)"
 
-#: widgets/TimeTextCtrl.cpp:210
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames at 24 frames per second. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames' . Don't change the numbers
+#. * unless there aren't 60 seconds in a minute in your locale
+#: widgets/TimeTextCtrl.cpp:320
 msgid "0100 h 060 m 060 s+.24 frames"
 msgstr "0100 g 060 m 060 s+.24 klatek"
 
-#: widgets/TimeTextCtrl.cpp:211
+#. i18n-hint: Name of time display format that shows time in frames (lots of
+#. * frames) at 24 frames per second (commonly used for films)
+#: widgets/TimeTextCtrl.cpp:323
 msgid "film frames (24 fps)"
 msgstr "klatek filmu (24 fps)"
 
-#: widgets/TimeTextCtrl.cpp:212
+#. i18n-hint: Format string for displaying time in frames at 24 frames per
+#. * second. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:326
 msgid "01000,01000 frames|24"
 msgstr "0100 g 060 m 060 s+.24 klatek"
 
-#: widgets/TimeTextCtrl.cpp:213
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV drop-frame rate (used for American /
+#. * Japananese TV, and very odd)
+#: widgets/TimeTextCtrl.cpp:330
 msgid "hh:mm:ss + NTSC drop frames"
-msgstr "gg:mm:ss + odpadniêtych klatek NTSC "
+msgstr "gg:mm:ss + odpadniętych klatek NTSC "
 
-#: widgets/TimeTextCtrl.cpp:214
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the |N alone, it's important!
+#: widgets/TimeTextCtrl.cpp:335
 msgid "0100 h 060 m 060 s+.30 frames|N"
 msgstr "0100 g 060 m 060 s+.30 klatek|N"
 
-#: widgets/TimeTextCtrl.cpp:215
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at NTSC TV non-drop-frame rate (used for American /
+#. * Japananese TV, and doesn't quite match wall time
+#: widgets/TimeTextCtrl.cpp:339
 msgid "hh:mm:ss + NTSC non-drop frames"
-msgstr "ggf:mm:ss + nie-odpadniêtych klatek NTSC"
-
-#: widgets/TimeTextCtrl.cpp:216
+msgstr "ggf:mm:ss + nie-odpadniętych klatek NTSC"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Leave the | .999000999 alone,
+#. * the whole things really is slightly off-speed!
+#: widgets/TimeTextCtrl.cpp:345
 msgid "0100 h 060 m 060 s+.030 frames| .999000999"
 msgstr "0100 g 060 m 060 s+.030 klatek| .999000999"
 
-#: widgets/TimeTextCtrl.cpp:217
+#. i18n-hint: Name of time display format that shows time in frames at NTSC
+#. * TV frame rate (used for American / Japananese TV
+#: widgets/TimeTextCtrl.cpp:348
 msgid "NTSC frames"
 msgstr "klatek NTSC"
 
-#: widgets/TimeTextCtrl.cpp:218
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone. That really is the frame
+#. * rate!
+#: widgets/TimeTextCtrl.cpp:352
 msgid "01000,01000 frames|29.97002997"
 msgstr "01000,01000 klatek|29.97002997"
 
-#: widgets/TimeTextCtrl.cpp:219
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at PAL TV frame rate (used for European TV)
+#: widgets/TimeTextCtrl.cpp:355
 msgid "hh:mm:ss + PAL frames (25 fps)"
 msgstr "gg:mm:ss + klatek PAL (25 fps)"
 
-#: widgets/TimeTextCtrl.cpp:220
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with PAL TV frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'. Nice simple time code!
+#: widgets/TimeTextCtrl.cpp:360
 msgid "0100 h 060 m 060 s+.25 frames"
 msgstr "0100 g 060 m 060 s+.25 klatek"
 
-#: widgets/TimeTextCtrl.cpp:221
+#. i18n-hint: Name of time display format that shows time in frames at PAL
+#. * TV frame rate (used for European TV
+#: widgets/TimeTextCtrl.cpp:363
 msgid "PAL frames (25 fps)"
 msgstr "klatek PAL (25 fps)"
 
-#: widgets/TimeTextCtrl.cpp:222
+#. i18n-hint: Format string for displaying time in frames with NTSC frames.
+#. * Translate 'frames' and leave the rest alone.
+#: widgets/TimeTextCtrl.cpp:366
 msgid "01000,01000 frames|25"
 msgstr "01000,01000 klatek|25"
 
-#: widgets/TimeTextCtrl.cpp:223
+#. i18n-hint: Name of time display format that shows time in hours, minutes,
+#. * seconds and frames at CD Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:369
 msgid "hh:mm:ss + CDDA frames (75 fps)"
 msgstr "gg:mm:ss + klatek CDDA (75 fps)"
 
-#: widgets/TimeTextCtrl.cpp:224
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and frames with CD Audio frames. Change the 'h' to the abbreviation
+#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
+#. * for seconds and translate 'frames'.
+#: widgets/TimeTextCtrl.cpp:374
 msgid "0100 h 060 m 060 s+.75 frames"
 msgstr "0100 g 060 m 060 s+.75 klatek"
 
-#: widgets/TimeTextCtrl.cpp:225
+#. i18n-hint: Name of time display format that shows time in frames at CD
+#. * Audio frame rate (75 frames per second)
+#: widgets/TimeTextCtrl.cpp:377
 msgid "CDDA frames (75 fps)"
 msgstr "klatek CDDA (75 fps)"
 
-#: widgets/TimeTextCtrl.cpp:226
+#. i18n-hint: Format string for displaying time in frames with CD Audio
+#. * frames. Translate 'frames' and leave the rest alone
+#: widgets/TimeTextCtrl.cpp:380
 msgid "01000,01000 frames|75"
 msgstr "01000,01000 klatek|75"
 
-#: widgets/TimeTextCtrl.cpp:363
+#: widgets/TimeTextCtrl.cpp:451
 msgid "Use right mouse button or context key to change format"
-msgstr "U¿yj prawego klawisza myszy lub klawisza kontekstowego, aby zmieniæ format"
+msgstr "Użyj prawego klawisza myszy lub klawisza kontekstowego, aby zmienić format"
 
-#: widgets/TimeTextCtrl.cpp:1376
+#: widgets/TimeTextCtrl.cpp:1485
 msgid "Time Control"
 msgstr "Kontrola czasu"
 
-#: ../src/widgets/Warning.cpp:53
+#: widgets/Warning.cpp:64
 msgid "Don't show this warning again"
-msgstr "Nie pokazuj tego ostrze¿enia ponownie"
+msgstr "Nie pokazuj tego ostrzeżenia ponownie"
 
-#: ../src/xml/XMLFileReader.cpp:45
+#: xml/XMLFileReader.cpp:49
 #, c-format
 msgid "Could not open file: \"%s\""
-msgstr "Nie mo¿na otworzyæ pliku: \"%s\""
+msgstr "Nie można otworzyć pliku: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
-#, c-format
-msgid "Error: %hs at line %d"
-msgstr "B³±d: %hs w lini %d"
+#: xml/XMLFileReader.cpp:63
+#, fuzzy, c-format
+msgid "Error: %hs at line %lu"
+msgstr "BÅ‚Ä…d: %hs w lini %d"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
-msgstr "Nie mo¿na za³adowaæ pliku: \"%s\""
+msgstr "Nie można załadować pliku: \"%s\""
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d41ba7c..c90babf 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -3,8 +3,7 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity 1.3\n"
+msgstr "Project-Id-Version: Audacity 1.3\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
 "PO-Revision-Date: 2008-05-03 01:48-0300\n"
@@ -28,16 +27,16 @@ msgid "OK... Audacious!"
 msgstr "OK... Audacioso!!"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "O Audacity é um programa gratuito escrito por um time de desenvolvedores utilizando recursos do Sourceforge, um serviço online para projetos de código-fonte aberto. Está baseado no wxWindows e está disponível para MS-Windows, MacOS X e Linux."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Esta é uma versão beta do programa, para testes. Podem haver problemas ou recursos não implementados. Dependemos de sua ajuda para tornar este programa cada vez melhor. Visite nosso site e reporte qualquer problema que possa ter."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Esta é uma versão estável e completa do Audacity. No entanto, se você encontrar alguma falha ou se tiver uma sugestão, por favor entre em contato. Este projeto depende do retorno dos usuários para melhorar cada vez mais. Visite nosso site."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -51,8 +50,8 @@ msgid "translator_credits"
 msgstr "Tradução ao português brasileiro (pt_BR) por Cleber Tavano"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "O editor de áudio digital gratuito"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -88,6 +87,10 @@ msgstr "O Audacity é baseado em código fonte dos seguintes projetos:"
 msgid "Special thanks:"
 msgstr "Agradecimentos + q Especiais:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -231,12 +234,10 @@ msgstr "Erro abrindo projeto"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s não existe e não pôde ser aberto. \n"
+msgstr "%s não existe e não pôde ser aberto. \n"
 "\n"
 "Esta entrada foi removida do histórico."
 
@@ -272,11 +273,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "Comando não-reconhecido: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity não conseguiu encontrar uma pasta para guardar os arquivos temporários. \n"
+msgstr "Audacity não conseguiu encontrar uma pasta para guardar os arquivos temporários. \n"
 "Por favor, digite um nome de pasta apropriado na caixa de diálogos \"Preferências\"."
 
 #: AudacityApp.cpp:1050
@@ -284,21 +283,17 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr "Audacity irá se encerrar agora. Abra o programa novamente para utilizar a nova pasta temporária."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Executar duas cópias do Audacity simultaneamente \n"
+msgstr "Executar duas cópias do Audacity simultaneamente \n"
 "pode causar perda de dados e tornar o sistema instável.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Não foi possível estabelecer o vínculo exclusivo \n"
+msgstr "Não foi possível estabelecer o vínculo exclusivo \n"
 "com os arquivos temporários.\n"
 "A pasta pode estar em uso por outra cópia \n"
 "do Audacity em execução.\n"
@@ -316,11 +311,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "O sistema detectou que outra cópia do Audacity está sendo executada.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Use o comando Novo ou Abrir na janela existente do Audacity\n"
+msgstr "Use o comando Novo ou Abrir na janela existente do Audacity\n"
 "para abrir outros arquivos de projeto simultaneamente.\n"
 
 #: AudacityApp.cpp:1134
@@ -362,13 +355,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr "Especifique o nome do arquivo ou projeto que deverá ser aberto pelo Audacity"
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Os arquivos de projeto do Audacity (.AUP) \n"
+msgstr "Os arquivos de projeto do Audacity (.AUP) \n"
 "não estão associados ao programa. \n"
 "\n"
 "Deseja associá-los ao Audacity, permitindo que\n"
@@ -383,11 +374,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Não foi possível localizar um dispositivo de áudio.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Não será possível ler ou gravar áudio\n"
+msgstr "Não será possível ler ou gravar áudio\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -403,12 +392,10 @@ msgid "Latency problem"
 msgstr "Problemas de latência"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"A latência atual fez com que o áudio fosse colocado antes da posição zero inicial.\n"
+msgstr "A latência atual fez com que o áudio fosse colocado antes da posição zero inicial.\n"
 "O Audacity ajustou o áudio de volta à posição zero inicial.\n"
 "Pode ser necessário usar a ferramenta Deslizar para arrastar a faixa de áudio para o local adequado."
 
@@ -417,11 +404,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Recuperação automática de falhas"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Alguns arquivos de projeto não foram salvos corretamente desde a última execução do Audacity.\n"
+msgstr "Alguns arquivos de projeto não foram salvos corretamente desde a última execução do Audacity.\n"
 "Os seguintes arquivos puderam ser recuperados automaticamente:"
 
 #: AutoRecovery.cpp:75
@@ -450,11 +435,9 @@ msgid "Recover Projects"
 msgstr "Recuperar Projetos"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Tem certeza que não deseja recuperar nenhum dos projetos?\n"
+msgstr "Tem certeza que não deseja recuperar nenhum dos projetos?\n"
 "Não será possível recuperá-los mais tarde."
 
 #: AutoRecovery.cpp:128
@@ -529,11 +512,9 @@ msgstr "Comando %s ainda não implementado"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Não foi possível ajustar os parâmetros do efeito %s\n"
+msgstr "Não foi possível ajustar os parâmetros do efeito %s\n"
 " para %s."
 
 #: BatchCommands.cpp:583
@@ -543,12 +524,10 @@ msgstr "Seu arquivo de lote de %s não foi reconhecido."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Aplicar %s com os parâmetro(s)\n"
+msgstr "Aplicar %s com os parâmetro(s)\n"
 "\n"
 "%s"
 
@@ -568,6 +547,10 @@ msgstr "Aplicar %s"
 msgid "Apply Chain"
 msgstr "Aplicar arquivo de lote"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Selecionar arquivo de lote"
@@ -614,10 +597,18 @@ msgstr "Aplicando '%s' no projeto atual"
 msgid "Please save and close the current project first."
 msgstr "Por favor, salve e encerre o projeto atual primeiro."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Selecione os arquivos para processamento em lote..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Todos os arquivos (*.*)|*.*|Arquivos WAV (*.wav)|*.wav|Arquivos AIFF (*.aif)|*.aif|Arquivos AU (*.au)|*.au|Arquivos MP3 (*.mp3)|*.mp3|Arquivos Ogg Vorbis (*.ogg)|*.ogg|Arquivos FLAC (*.flac)|*.flac"
@@ -731,12 +722,10 @@ msgid "Copying audio data into project..."
 msgstr "Copiando dados de áudio para o arquivo de projeto..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Seu projeto depende de áudio de arquivos externos.\n"
+msgstr "Seu projeto depende de áudio de arquivos externos.\n"
 "Deseja copiar o áudio dos seguintes arquivos para esta pasta de projeto para torná-lo auto suficiente?\n"
 "Esta ação requer mais espaço em disco, mas garante a integridade do projeto."
 
@@ -804,11 +793,9 @@ msgid "Dependency check"
 msgstr "Verificar dependências"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Aviso: Há pouco espaço disponível nesta unidade. \n"
+msgstr "Aviso: Há pouco espaço disponível nesta unidade. \n"
 "Selecione outra pasta em outra unidade para os arquivos temporários."
 
 #: DirManager.cpp:221
@@ -831,11 +818,9 @@ msgstr "Removendo diretórios temporários"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"O Audacity encontrou um arquivo sem procedência  %s! \n"
+msgstr "O Audacity encontrou um arquivo sem procedência  %s! \n"
 "Por favor, encerre e abra novamente o projeto para uma verificação completa dos arquivos.\n"
 
 #  i18n-hint: This is the pattern for filenames that are created
@@ -863,16 +848,16 @@ msgstr "Não foi possível remover '%s'"
 msgid "Renamed file: %s\n"
 msgstr "Arquivo renomeado: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Alterando bloco %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Não foi possível renomear '%s' para '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -900,21 +885,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "Arquivo não encontrado:  (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"A Verificação Automática de Projeto encontrou problemas ao inspecionar os dados salvos;\n"
+msgstr "A Verificação Automática de Projeto encontrou problemas ao inspecionar os dados salvos;\n"
 "clique em 'Detalhes' para a lista completa dos erros ou 'OK' para mais opções."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"A Verificação Automática de Projeto encontrou %d arquivos sem procedência.\n"
+msgstr "A Verificação Automática de Projeto encontrou %d arquivos sem procedência.\n"
 "Estes arquivos não tem uso e provavelmente restaram de uma falha anterior\n"
 "no sistema.\n"
 "Estes arquivos devem ser apagados para liberar espaço em disco."
@@ -944,15 +925,13 @@ msgstr "Aviso"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"A Verificação Automática de Projetos detectou que\n"
+msgstr "A Verificação Automática de Projetos detectou que\n"
 "%d arquivos não estão mais acessíveis. É impossível \n"
 "recuperá-los automaticamente. Você pode inserir silêncios nas posições ocupadas por \n"
 "estes arquivos permanentemente ou apenas para \n"
@@ -976,12 +955,10 @@ msgstr "Fechar projeto sem alterações"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Foi detectada a falta de %d arquivo(s) de sumário (.auf).\n"
+msgstr "Foi detectada a falta de %d arquivo(s) de sumário (.auf).\n"
 "O Audacity pode recuperá-los automaticamente a partir\n"
 "dos arquivos de áudio originais."
 
@@ -995,16 +972,14 @@ msgstr "Preencher dados não encontrados com silêncio (apenas para esta sessão
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"A Verificação Automática de Projetos detectou que %d arquivos\n"
+msgstr "A Verificação Automática de Projetos detectou que %d arquivos\n"
 "de áudio não estão mais acessíveis. \n"
 "É impossível recuperar estes arquivos automaticamente. \n"
 "Você pode inserir silêncios nas posições ocupadas por estes \n"
@@ -1041,6 +1016,95 @@ msgstr "Salvando áudio gravado em disco ..."
 msgid "Rectangular"
 msgstr "Retangular"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Localização de %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Para localizar %s, clique aqui -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Localizar..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Onde se localiza o arquivo %s ?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Análise de freqüência"
@@ -1069,8 +1133,9 @@ msgstr "Autocorrelação melhorada"
 msgid "Cepstrum"
 msgstr "Cepstro"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algoritmo:"
 
 #: FreqWindow.cpp:168
@@ -1084,9 +1149,9 @@ msgstr "Tamanho"
 msgid " window"
 msgstr " "
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Função janela de:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1096,9 +1161,9 @@ msgstr "Freqüência linear"
 msgid "Log frequency"
 msgstr "Freqüência logarítmica"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Eixo:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1107,6 +1172,10 @@ msgstr "Eixo:"
 msgid "&Export..."
 msgstr "&Exportar..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Exportar"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1294,8 +1363,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr "<p>Se você deseja gravar seu projeto em um CD de áudio, você deve primeiro [[export|exportá-lo]] como WAV ou AIFF. Os arquivos devem estar em estéreo, a 44100 Hz (ajustados pelo comando \"Taxa do Projeto\" no canto inferior esquerdo) e com 16 bits (ajustáveis no botão \"Opções\" da janela de Exportação). </p><p>Estes são os valores padrão do Audacity, então normalmente não é necessário proceder nenhum ajuste. <p>Grave o arquivo exportado em um Cd de áudio utilizando um programa apropriado como o Windows Media Player ou iTunes. Para maiores informações, veja na wiki em inglês [[wiki:How to burn CDs|Como gravar CDs]].</p><p>"
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Os arquivos de ajuda do Audacity não estão instalados. Você pode <a href=\"http://audacity.sourceforge.net/help/documentation\">copiá-los da Internet </a> e eles estarão disponíveis pelo menu Índice da Ajuda ou <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">clique aqui</a> para ler a ajuda online."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1399,13 +1468,11 @@ msgid "New..."
 msgstr "Novo..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Alguns títulos foram deixados em branco.\n"
+msgstr "Alguns títulos foram deixados em branco.\n"
 "Estes títulos serão ignorados ao continuar.\n"
 "\n"
 "Deseja retornar e preencher os campos em branco?"
@@ -1471,11 +1538,9 @@ msgstr "Escolha o idioma dos menus do Audacity:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Foi convertido o arquivo de projeto da versão 1.0 para o novo formato.\n"
+msgstr "Foi convertido o arquivo de projeto da versão 1.0 para o novo formato.\n"
 "Uma cópia foi salva como  '%s'"
 
 #: Legacy.cpp:357
@@ -1507,6 +1572,10 @@ msgstr "&Salvar projeto\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Salvar &projeto como..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Verificar De&pendências..."
@@ -1515,6 +1584,10 @@ msgstr "Verificar De&pendências..."
 msgid "Open Me&tadata Editor..."
 msgstr "Abrir editor de Me&tadados..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Importar"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "Áu&dio...\tCtrl+Shift+I"
@@ -1544,6 +1617,10 @@ msgstr "Exportar títulos"
 msgid "Export &Multiple..."
 msgstr "Exportar &múltiplos..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "Cadeias do Clean Speec&h..."
@@ -1624,9 +1701,9 @@ msgstr "&Apagar\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "S&eparar e Deletar\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "S&ilenciar\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1640,23 +1717,21 @@ msgstr "Separar e criar no&vo\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&Unir\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Desu&nir\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "&Duplicar\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "E&stéreo para Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Áreas com &títulos..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1699,13 +1774,13 @@ msgid "&Join\tAlt+J"
 msgstr "&Unir\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Desu&nir\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Selecionar..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1735,9 +1810,9 @@ msgstr "Selecionar do cursor até o &final\tShift+K"
 msgid "Find &Zero Crossings\tZ"
 msgstr "Encontrar cruzamentos em &zero\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Mo&ver Cursor"
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1763,9 +1838,9 @@ msgstr "Salva&r seleção"
 msgid "Regio&n Restore"
 msgstr "Res&taurar seleção"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Area de reprodu&ção"
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1791,9 +1866,14 @@ msgstr "Ligar rede da antecipação"
 msgid "Turn Grid Snap Off"
 msgstr "Desligar rede da antecipação"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Preferências...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1839,9 +1919,9 @@ msgstr "E&xibir Clipping"
 msgid "&History..."
 msgstr "&Histórico..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&Barras de Ferramentas"
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1883,13 +1963,71 @@ msgstr "&Reiniciar barras de ferramentas"
 msgid "!Simplified View"
 msgstr "!Visualização simples"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Ir para o início\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Ir para o final\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "&Faixas"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "&Nova faixa"
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1904,11 +2042,6 @@ msgstr "Faixa E&stéreo"
 msgid "&Time Track"
 msgstr "Faixa de &Tempo"
 
-# Gravação programada
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&Gravação programada..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "&Mixar e renderizar"
@@ -1965,13 +2098,21 @@ msgstr "Alinhar término com o final &da seleção"
 msgid "Align Tracks To&gether"
 msgstr "Alinhar faixas &juntas"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Alinhar faixas"
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "A&linhar e mover o cursor"
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1981,22 +2122,26 @@ msgstr "Adicionar &título à seleção\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Adicionar título à &posição atual\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "&Organizar faixas por"
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Tempo inicial"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Nome"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "&Inserir"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "Efeito&s"
@@ -2030,6 +2175,10 @@ msgstr "&Exibir tela de boas-vindas..."
 msgid "&Index..."
 msgstr "Índ&ice da Ajuda..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Fotos de tela..."
@@ -2042,13 +2191,13 @@ msgstr "E&xecutar diagnóstico..."
 msgid "&Audio Device Info..."
 msgstr "&Dispositivos de áudio..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Alternar entre o Dock, Visualização de Faixas e Barra de Seleção\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Alternar entre Barra de Seleção, Visualização de Faixas e Dock\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2082,9 +2231,9 @@ msgstr "Próxima ferramenta\tD"
 msgid "Previous Tool\tA"
 msgstr "Ferramenta anterior\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Reproduzir/Parar\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2118,22 +2267,14 @@ msgstr "Reproduzir seleção\tB"
 msgid "Play Looped\tL"
 msgstr "Reproduzir continuamente\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Reprodução contínua\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "Reproduzir recorte da previsão\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Ir para o início\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Ir para o final\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "Seleção desde o início\tShift+Home"
@@ -2190,9 +2331,9 @@ msgstr "Alterar foco sobre a faixa\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Alterar foco sobre a faixa\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Alterar foco sobre a faixa\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2290,16 +2431,19 @@ msgstr "Antecipação ligada"
 msgid "Snap To Off"
 msgstr "Antecipação desligada"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Abrir recente"
 
-# ver a questao do atalho d teclado
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Ar&quivos recentes"
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2356,6 +2500,23 @@ msgstr "Repetir %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Não há títulos para exportar."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "Não há mais o que desfazer"
@@ -2399,6 +2560,10 @@ msgstr "Texto copiado para a Área de Transferência"
 msgid "Pasted from the clipboard"
 msgstr "Colado da área de transferência"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Não é possível copiar áudio estéreo em faixas mono"
@@ -2568,9 +2733,9 @@ msgstr "Importar títulos"
 msgid "Select a MIDI file..."
 msgstr "Selecione um arquivo MIDI..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Todos os arquivos (*.*)|*.*|Arquivos MIDI (*.mid)|*.mid|Arquivos Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2589,14 +2754,6 @@ msgstr "Selecione um arquivo de áudio não-comprimido..."
 msgid "All files (*)|*"
 msgstr "Todos os arquivos (*)|*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importar"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Editar tags de metadados"
@@ -2670,6 +2827,14 @@ msgstr "Alinhado"
 msgid "Align"
 msgstr "Alinhar"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "Criada nova faixa de áudio"
@@ -2736,15 +2901,15 @@ msgid "Removed audio track(s)"
 msgstr "Remover faixas de áudio"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nova taxa de amostragem (Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Reamostrar"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Nova taxa de amostragem (Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "O valor digitado não é válido"
@@ -2812,15 +2977,13 @@ msgid "Save changes before closing?"
 msgstr "Deseja salvar as alterações no arquivo?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "O projeto será salvo vazio!!\n"
 "\n"
@@ -2848,16 +3011,14 @@ msgstr "Projetos do Audacity|*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Este arquivo foi salvo pelo Audacity %s, uma\n"
+msgstr "Este arquivo foi salvo pelo Audacity %s, uma\n"
 "versão muito antiga do programa. O formato\n"
 "de arquivo mudou desde então. \n"
 "Tentar abrir este arquivo provavelmente o\n"
@@ -2883,11 +3044,9 @@ msgstr "Erro abrindo arquivo"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"O arquivo pode estar corrompido ou inválido: \n"
+msgstr "O arquivo pode estar corrompido ou inválido: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -2926,12 +3085,10 @@ msgstr "Não foi encontrado o arquivo de projeto na pasta: \"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Este arquivo foi feito no Audacity versão %s.\n"
+msgstr "Este arquivo foi feito no Audacity versão %s.\n"
 "Você está utilizando a versão %s do programa.\n"
 "Visite http://audacity.sf.net e atualize o Audacity para abrir este arquivo."
 
@@ -2941,13 +3098,11 @@ msgstr "Não foi possível abrir o arquivo de projeto"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Este arquivo foi salvo pelo Audacity %s, e\n"
+msgstr "Este arquivo foi salvo pelo Audacity %s, e\n"
 "o formato de arquivo mudou desde então. \n"
 "O Audacity pode tentar abrir este arquivo\n"
 "mas provavelmente haverão problemas.\n"
@@ -2960,15 +3115,26 @@ msgstr ""
 "\n"
 "Tem certeza que deseja abrir este arquivo?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Não foi possível salvar o projeto.\n"
-"O disco %s pode estar cheio ou protegido\n"
-"contra gravação."
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2980,22 +3146,19 @@ msgstr "Erro salvando projeto"
 msgid "Saved %s"
 msgstr "Salvo como %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Importando %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importado: '%s'"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Importar"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -3009,18 +3172,23 @@ msgstr "Salvar Fala como:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Arquivo de áudio Windows PCM (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Arquivos de projeto do Audacity (.AUP) permitem que se salve todo o projeto exatamente\n"
-"como aparecem na tela. No entanto, a maioria dos programas de edição de áudio não\n"
-"é capaz de abrir estes arquivos. \n"
-"Para salvar em um formato executável por outros programas de edição, selecione Exportar."
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3065,6 +3233,16 @@ msgstr "Espaço em disco suficiente para %d segundos."
 msgid "Out of disk space"
 msgstr "Disco cheio"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "Não foi possível apagar o arquivo para salvar automaticamente:"
@@ -3151,49 +3329,13 @@ msgstr "&Testar"
 msgid "&Debug"
 msgstr "&Debug"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Gravação programada"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Início da gravação"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Final da gravação"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Duração"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Gravação programada do Audacity em progresso"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Data e hora de início"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Data e hora de término"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Iniciando a gravação em %s .\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Gravação progaramada do Audacity - Aguardando para iniciar"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3234,10 +3376,9 @@ msgstr "Gênero"
 msgid "Comments"
 msgstr "Comentários"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Pressione F2 ou clique duplo para editar."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3257,16 +3398,13 @@ msgstr "&Limpar"
 msgid "Genres"
 msgstr "Gêneros"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Editar"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "Reiniciar"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3336,6 +3474,16 @@ msgstr "Tem certeza que deseja reiniciar a lista de Gêneros para padrão?"
 msgid "Unable to open genre file."
 msgstr "Não foi possível abrir o arquivo de Gêneros."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "Erro ao carregar metadados"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3345,206 +3493,139 @@ msgstr "Não foi possível abrir o arquivo de Gêneros."
 msgid "Save Metadata As:"
 msgstr "Salvar metadados como:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "Erro ao carregar metadados"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Título:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Artista:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Álbum:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Compositor:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Letras:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Comentários:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Codificado por:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Diretos de cópia:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Número da faixa:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Ano:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Gênero:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Sem gêneros"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Reiniciar para o padrão"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Básico"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Avançado"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Valor"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "Limpa&r"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Tamanho máximo do atributo '%s' é %d caracteres. Os dados foram excluídos."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Título:"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Artista:"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Álbum:"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"O Audacity não pode gravar o arquivo:\n"
+msgstr "O Audacity não pode gravar o arquivo:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"O Audacity não pode abrir o arquivo:\n"
+msgstr "O Audacity não pode abrir o arquivo:\n"
 "  %s\n"
 "para gravação."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"O Audacity não pode gravar as imagens para o arquivo:\n"
+msgstr "O Audacity não pode gravar as imagens para o arquivo:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"O Audacity não localizou o arquivo:\n"
+msgstr "O Audacity não localizou o arquivo:\n"
 "  %s.\n"
 "Tema não carregado."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"O Audacity não pôde carregar o arquivo:\n"
+msgstr "O Audacity não pôde carregar o arquivo:\n"
 "  %s.\n"
 "Provável problema no arquivo PNG. "
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"O Audacity não pode ler o tema padrão.\n"
+msgstr "O Audacity não pode ler o tema padrão.\n"
 "Por favor, relate este problema em nosso site."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Nenhum dos componentes de tema\n"
+msgstr "Nenhum dos componentes de tema\n"
 " foi encontrado em:\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Não foi possível criar a pasta:\n"
+msgstr "Não foi possível criar a pasta:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"O Audacity não pôde salvar o arquivo:\n"
+msgstr "O Audacity não pôde salvar o arquivo:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Todos os arquivos necessários em:\n"
+msgstr "Todos os arquivos necessários em:\n"
 "  %s\n"
 "estão presentes."
 
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Duração"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Gravação programada"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Início da gravação"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Final da gravação"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Data e hora de início"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Data e hora de término"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Iniciando a gravação em %s .\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
 msgid "Track Panel"
@@ -3842,6 +3923,14 @@ msgstr "Balanço ajustado"
 msgid "Adjusted gain"
 msgstr "Ganho ajustado"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "Não é possível deletar a faixa com o áudio ativo"
@@ -3899,14 +3988,6 @@ msgstr "Alterar taxa"
 msgid "Format Change"
 msgstr "Alterar formato"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Digite a nova taxa de amostragem em Hz, entre 1 e 100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Taxa inválida."
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "Alterar limite mínimo de velocidade (%) para:"
@@ -4046,24 +4127,21 @@ msgstr "Plugins 1a %i"
 msgid "Plugins %i to %i"
 msgstr "Plugins %i a %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Desabilitado. Experimente selecionar um trecho de áudio antes de executar o comando."
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Só é possível executar este comando com a reprodução parada,\n"
+msgstr "Só é possível executar este comando com a reprodução parada,\n"
 "não apenas em Pause."
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"É necessário selecionar áudio estéreo para este comando.\n"
+msgstr "É necessário selecionar áudio estéreo para este comando.\n"
 "[Impossível utilizar áudio mono]"
 
 #: commands/CommandManager.cpp:785
@@ -4071,16 +4149,14 @@ msgid "You must first select some audio for this to use."
 msgstr "Você deve selecionar o áudio antes de executar este comando."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Você deve selecionar a faixa de áudio antes de executar este comando.\n"
+msgstr "Você deve selecionar a faixa de áudio antes de executar este comando.\n"
 "[Outros tipos de faixas não podem ser utilizadas.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Mensagem"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4100,14 +4176,19 @@ msgstr "Efeito aplicado: %s %.1f dB"
 msgid "Amplify"
 msgstr "Amplificar"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplificar por Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Amplificação (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Novo pico de amplitude (dB):"
@@ -4236,10 +4317,18 @@ msgstr "por Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Freqüência (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Ganho (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Aumento de graves..."
@@ -4283,8 +4372,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "usando SoundTouch, por Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Altura:   de"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Semitons (meio-passos):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4294,13 +4424,9 @@ msgstr "Altura:   de"
 msgid "to"
 msgstr "a "
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Semitons (meio-passos):"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Freqüência (Hz):   de"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4308,6 +4434,11 @@ msgstr "Freqüência (Hz):   de"
 msgid "Percent Change:"
 msgstr "Percentagem de alteração:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Alterar altura..."
@@ -4326,6 +4457,14 @@ msgstr "Efeito aplicado: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Alterar velocidade"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "n/d"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Alterar velocidade, afetando tempo e altura"
@@ -4334,17 +4473,17 @@ msgstr "Alterar velocidade, afetando tempo e altura"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "usando SampleRate, por Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "n/d"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "RPM do vinil padrão:   de"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4362,13 +4501,29 @@ msgstr "Alterar tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Alterar tempo sem alteração na altura"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Batidas por Minuto (BPM):   de"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Tamanho (segundos):   de"
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4378,8 +4533,9 @@ msgstr "Alterar tempo..."
 msgid "Changing Tempo"
 msgstr "Alterando tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Remoção de cliques"
 
 #: effects/ClickRemoval.cpp:336
@@ -4390,10 +4546,18 @@ msgstr "Remover Sons de Cliques por Craig deForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Selecione limiar (mais baixo, mais sensível):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Tam. max. de pico (quanto maior, mais sensível):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Remover cliques..."
@@ -4406,49 +4570,86 @@ msgstr "Removendo sons de cliques..."
 msgid "Dynamic Range Compressor"
 msgstr "Compressor de extensão dinâmica"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Compressor de extensão dinâmica por Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Proporção (Ratio):"
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Tempo de Ataque:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Tempo de caída:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalizar para 0dB após a compressão"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Threshold: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Proporção: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Proporção: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Tempo decorrido: %.1f segs"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Tempo de caída: %.1f segs"
 
 #: effects/Compressor.h:36
@@ -4460,6 +4661,251 @@ msgstr "Compressor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Aplicando compressão de extensão dinâmica..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Inícial"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Final"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Controle"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "Gerador de Tom DTMF"
@@ -4718,6 +5164,10 @@ msgstr "Inverter verticalmente"
 msgid "Inverting"
 msgstr "Invertendo"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Nivelador"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Nenhum - omitir"
@@ -4742,30 +5192,27 @@ msgstr "Mais pesado"
 msgid "Heaviest"
 msgstr "Muito mais pesado"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Nivelador"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Nivelador por Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Equalizar sessões altas e baixas"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "por Lynn Allan"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Grau de nivelação"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 # Limiar de ruído (Chiado/Zunido/Ruído ambiente) nao ta cabendo na janela!
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Limiar de ruído (Chiado/Zunido/Ruído ambiente)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Limiar de ruído:"
 
 #: effects/Leveller.h:28
@@ -4776,6 +5223,158 @@ msgstr "Nivelador..."
 msgid "Applying Leveller..."
 msgstr "Aplicando nivelador..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mixer"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Remoção de ruídos"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Branco"
@@ -4811,31 +5410,23 @@ msgstr "Gerando ruído"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Não foi possível abrir o arquivo:\n"
+msgstr "Não foi possível abrir o arquivo:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Tentou-se executar a Remoção de Ruído sem um perfil de ruído definido.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Remoção de ruídos"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "Passo 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Selecione alguns segundos de áudio contendo apenas os ruídos que devem ser filtrados.\n"
+msgstr "Selecione alguns segundos de áudio contendo apenas os ruídos que devem ser filtrados.\n"
 "Quando estiver pronto, clique em \"Perceber perfil de ruído\":"
 
 #: effects/NoiseRemoval.cpp:815
@@ -4843,11 +5434,9 @@ msgid "Step 2"
 msgstr "Passo 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Selecione todo o áudio que deverá ser filtrado, escolha a quantidade de\n"
+msgstr "Selecione todo o áudio que deverá ser filtrado, escolha a quantidade de\n"
 "ruído a ser filtrado e clique OK para remover o ruído.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4862,14 +5451,26 @@ msgstr "Perceber perfil de ruído"
 msgid "Noise reduction (dB):"
 msgstr "Redução de ruído (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Suavização de freqüência (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Tempo de ataque/caída (segs):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Remover ruído..."
@@ -4910,22 +5511,22 @@ msgstr ", amplitude máxima = %.1f dB"
 msgid "Normalize"
 msgstr "Normalizar"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalizar por Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Remover compensação DC (centralizar verticalmente em 0)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Normalizar a amplitude máxima para"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Normalizar..."
@@ -4939,44 +5540,56 @@ msgstr "Normalizando"
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Efeito aplicado: %s %d estágios, %.0f%% wet, freqüência = %.1f Hz, fase inicial = %.0f graus, prof. = %d, retorno = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser por Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Estágios:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Freqüência LFO (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "Fase inicial LFO (Graus):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Profundidade:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Feedback (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4986,16 +5599,22 @@ msgid "Applying Phaser"
 msgstr "Aplicando Phaser"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"O efeito Reparar foi desenvolvido para ser usado apenas em partes pequenas de áudio danificado \n"
+msgstr "O efeito Reparar foi desenvolvido para ser usado apenas em partes pequenas de áudio danificado \n"
 "(até 128 amostras).\n"
 "\n"
 "Aumente o nível de Zoom e selecione apenas uma pequena fração de segundo para reparar."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Reparando áudio danificado"
@@ -5014,30 +5633,25 @@ msgstr "Faixas longas demais para repetir a seleção."
 msgid "Repeat"
 msgstr "Repetir"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repeat por Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Número de vezes a repetir:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Novo tamanho da seleção:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minutos, %d segundos"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5085,11 +5699,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Limpador de arestas por Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Duração máxima do surto transiente (miliseg.):\n"
+msgstr "Duração máxima do surto transiente (miliseg.):\n"
 "(99999 ou mais = desligado)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5104,10 +5716,60 @@ msgstr "Limpar arestas..."
 msgid "Applying Spike Cleaner..."
 msgstr "Aplicando Limpar Arestas..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "E&stéreo para Mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Aplicando Estéreo para Mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5156,17 +5818,21 @@ msgstr "Frequência (Hz)"
 msgid "Waveform:"
 msgstr "Formato:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Inícial"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Final"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5199,10 +5865,6 @@ msgstr "Todas as faixas devem ter a mesma taxa de amostragem"
 msgid "Truncate Silence"
 msgstr "Excluir silêncio"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "por Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Duração máxima do silêncio:"
@@ -5250,10 +5912,6 @@ msgstr "Efeito aplicado: %s freqüência = %.1f Hz, fase inicial = %.0f graus, p
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah por Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Profundidade (%):"
@@ -5262,10 +5920,18 @@ msgstr "Profundidade (%):"
 msgid "Resonance:"
 msgstr "Ressonância:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Freqüência de Compensação Offset (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5304,6 +5970,18 @@ msgstr "Ajustes de Efeitos"
 msgid "Length (seconds)"
 msgstr "Tamanho (segundos)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Aplicando efeito Nyquist..."
@@ -5371,13 +6049,13 @@ msgstr "Ajustes do plug-in"
 msgid "Program"
 msgstr "Programa"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Não há faixas selecionadas. Use Ctrl+A (Selecionar tudo)\n"
-"Selecione Exportar... para exportar todas as faixas."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5393,14 +6071,12 @@ msgstr "Deseja salvar arquivo como \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"O Audacity salvará o arquivo do tipo %s com o nome %s.\n"
+msgstr "O Audacity salvará o arquivo do tipo %s com o nome %s.\n"
 "Normalmente estes arquivos terminam com a extensão %s e alguns programas podem não reconhecer\n"
 "este arquivo como válido.\n"
 "Deseja salvar o arquivo com este nome?"
@@ -5435,6 +6111,10 @@ msgstr " - Esquerdo"
 msgid " - Right"
 msgstr " - Direito"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5472,10 +6152,6 @@ msgstr "(programa externo)"
 msgid "Cannot export audio to %s"
 msgstr "Não é possível exportar áudio como %s."
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Exportar"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Exportando o trecho selecionado usando o intepretador de linha de comando"
@@ -5488,6 +6164,477 @@ msgstr "Exportando todo o projeto usando o intepretador de linha de comando"
 msgid "Command Output"
 msgstr "Saída do Comando"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Taxa de amostragem inválida"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Você deve reamostrar para uma das taxas abaixo."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Taxas de amostragem "
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Taxa de Bits:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Formato"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Idioma da interface:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Qualidade:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML Arquivos (*.xml)|*.xml|Todos os arquivos (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Especificar as opções de FLAC"
@@ -5568,10 +6715,6 @@ msgstr "Especificar as opções de MP2"
 msgid "MP2 Export Setup"
 msgstr "Configurações de exportação MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Taxa de Bits:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Arquivos MP2"
@@ -5692,35 +6835,15 @@ msgstr "Localizar Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "O Audacity precisa do arquivo %s para salvar em formato MP3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Localização de %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Para localizar %s, clique aqui -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Localizar..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Para salvar uma cópia gratuita do Lame, clique aqui -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Copiar..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Onde se localiza o arquivo %s ?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5785,35 +6908,21 @@ msgstr "Exportando arquivo completo à %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "Erro retornado pelo codificador de MP3: %d "
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Taxa de amostragem inválida"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr "A taxa de amostragem (%d) não é suportada pelo formato MP3.  "
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr "A taxa de amostragem (%d) e o bit rate (%d kbps) não são suportados pelo formato MP3.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Você deve reamostrar para uma das taxas abaixo."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Taxas de amostragem "
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Biblioteca de exportação em MP3 não encontrada!"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
@@ -5823,13 +6932,11 @@ msgid "Export Multiple"
 msgstr "Exportar múltiplos"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Se você tiver várias faixas de áudio, é possível exportá-las em arquivos separados,\n"
+msgstr "Se você tiver várias faixas de áudio, é possível exportá-las em arquivos separados,\n"
 "ou se houverem faixas de título, é possível exportar um novo arquivo para cada título.\n"
 "\n"
 "Este projeto não pode ser exportado em múltiplos arquivos por conter apenas uma faixa de áudio e nenhuma faixa de título."
@@ -5875,6 +6982,10 @@ msgstr "Incluir áudio antes da primeira faixa"
 msgid "First file name:"
 msgstr "Primeiro nome:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Faixas"
@@ -5895,14 +7006,14 @@ msgstr "Numerando consecutivamente"
 msgid "File name prefix:"
 msgstr "Prefixo do nome de arquivo:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Sobregravar arquivos existentes"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&xportar"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5914,12 +7025,10 @@ msgstr "Escolha uma pasta para os arquivos exportados"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" não existe.\n"
+msgstr "\"%s\" não existe.\n"
 "\n"
 "Deseja criá-lo?"
 
@@ -5942,11 +7051,9 @@ msgstr "Erro ao exportar %d arquivo(s),"
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"O título %s não é um nome de arquivo válido. Não é possível utilizar:   %s\n"
+msgstr "O título %s não é um nome de arquivo válido. Não é possível utilizar:   %s\n"
 "Use..."
 
 #: export/ExportOGG.cpp:64
@@ -5957,10 +7064,6 @@ msgstr "Especificar opções Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Configurações de exportação em Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Qualidade:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Arquivos Ogg Vorbis"
@@ -5981,10 +7084,6 @@ msgstr "Especificar opções para não-compactado"
 msgid "Uncompressed Export Setup"
 msgstr "Configuração de exportação de arquivos sem compressão"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Formato"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Cabeçalho:"
@@ -5997,10 +7096,21 @@ msgstr "Encodificação:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Nem todas as possibilidades entre tipos e formatos estão disponíveis.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, e outros arquivos não-compactados"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -6022,44 +7132,78 @@ msgstr "Exportando arquivo completo como %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Erro %s. O arquivo pode não ter sido salvo corretamente."
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "Arquivos MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Esta versão do Audacity não foi criada com suporte para %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" é uma faixa de áudio de CD. \n"
+msgstr "O arquivo \"%s\" é uma faixa de áudio de CD. \n"
 "O Audacity não abre arquivos diretamente de CDs. \n"
 "Extraia o áudio das faixas do CD em um formato que\n"
 "o Audacity possa importar, como WAV ou AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\" é um arquivo de lista de músicas.\n"
+msgstr "\"%s\" é um arquivo de lista de músicas.\n"
 "O Audacity não pode abrir este arquivo porque existem apenas links para outros arquivos.\n"
 "Você pode editar este arquivo em um editor de textos e localizar manualmente os arquivos de áudio reais."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato Windows Media Audio. \n"
+msgstr "O arquivo \"%s\" está em formato Windows Media Audio. \n"
 "O Audacity não abre estes arquivos diretamente por\n"
 "restrições de patentes. \n"
 "Converta o arquivo em um formato que o Audacity \n"
@@ -6067,25 +7211,23 @@ msgstr ""
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato  Advanced Audio Coding. \n"
+msgstr "O arquivo \"%s\" está em formato  Advanced Audio Coding. \n"
 "O Audacity não abre estes arquivos diretamente.\n"
 "Converta o arquivo em um formato que o Audacity \n"
 "possa importar, como WAV ou AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em encriptado e provavelmente\n"
+msgstr "O arquivo \"%s\" está em encriptado e provavelmente\n"
 "tem sua origem em uma loja de músicas online. \n"
 "O Audacity não abre estes arquivos diretamente pois\n"
 "sua encriptação não permite. \n"
@@ -6095,52 +7237,34 @@ msgstr ""
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato Real Player. \n"
+msgstr "O arquivo \"%s\" está em formato Real Player. \n"
 "O Audacity não abre diretamente arquivos em\n"
 "formatos proprietários. \n"
 "Converta o arquivo em um formato que o Audacity \n"
 "possa importar, como WAV ou AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"O arquivo \"%s\" está em formato MIDI. \n"
-"O Audacity não executa ou edita estes arquivos\n"
-"diretamente, mas é possível exibí-los pelo comando\n"
-"Arquivo > Importar > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" é um arquivo de notas e não de áudio. \n"
+msgstr "\"%s\" é um arquivo de notas e não de áudio. \n"
 "O Audacity não abre estes arquivos diretamente.\n"
 "Converta o arquivo em um formato que o Audacity \n"
 "possa importar, como WAV ou AIFF."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato Musepack. \n"
+msgstr "O arquivo \"%s\" está em formato Musepack. \n"
 "O Audacity não abre estes arquivos diretamente.\n"
 "Caso se trate de um arquivo MP3, renomeie a sua\n"
 "extensão para .MP3 ou converta-o em um formato\n"
@@ -6148,61 +7272,60 @@ msgstr ""
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato Wavpack. \n"
+msgstr "O arquivo \"%s\" está em formato Wavpack. \n"
 "O Audacity não abre estes arquivos diretamente.\n"
 "Converta o arquivo em um formato que o Audacity \n"
 "possa importar, como WAV ou AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato Dolby Digital. \n"
+msgstr "O arquivo \"%s\" está em formato Dolby Digital. \n"
 "O Audacity não abre estes arquivos diretamente.\n"
 "Converta o arquivo em um formato que o Audacity \n"
 "possa importar, como WAV ou AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"O arquivo \"%s\" está em formato Ogg Speex. \n"
+msgstr "O arquivo \"%s\" está em formato Ogg Speex. \n"
 "O Audacity não abre estes arquivos diretamente.\n"
 "Converta o arquivo em um formato importável, como WAV ou AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"O Audacity teve de supor qual tipo de arquivo está tentando\n"
-"abrir e o áudio pode estar incorreto.\n"
-"\n"
-"Caso o áudio não soe corretamente, renomeie\n"
-"o arquivo com a extensão correta e tente novamente."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity não reconhece este tipo de arquivo como válido.\n"
-"Se este som não estiver comprimido, tente importar\n"
-"como \"Arquivo RAW\"."
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6239,17 +7362,18 @@ msgstr "Faixas MIDI não podem ser compensadas individualmente, disponível apen
 msgid "Invalid track offset in LOF file."
 msgstr "Faixa com compensação inválida no arquivo LOF."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Erro analisando arquivo Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Erro analisando arquivo MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Arquivos MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6275,15 +7399,24 @@ msgstr "Cabeçalho bitstream inválido para o Vorbis"
 msgid "Internal logic fault"
 msgstr "Falha lógica interna!"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, e outros arquivos não-compactados"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importando arquivo tipo %s..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Arquivos Quicktime"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Importar dados Raw"
@@ -6327,6 +7460,14 @@ msgstr "2 Canais (Estéreo)"
 msgid "%d Channels"
 msgstr "%d Canais"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Iniciar compensação:"
@@ -6339,9 +7480,18 @@ msgstr "Quantidade a importar:"
 msgid "Sample rate:"
 msgstr "Taxa de amostragem:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importar"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6386,9 +7536,9 @@ msgstr "Canais"
 msgid "Playthrough"
 msgstr "Gravação e reprodução simultâneas"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Ao gravar, reproduzir outras faixas simultaneamente "
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6398,9 +7548,13 @@ msgstr "Reprodução simultânea via &hardware"
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Reprodução simultânea via &software"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "Reprodução simultânea via s&oftware (desabilite ao gravar em estéreo)"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6427,19 +7581,15 @@ msgid "Latency"
 msgstr "Latência"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Cópiar áudio na memória:\n"
+msgstr "Cópiar áudio na memória:\n"
 "(maior = mais latência)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Correção de latência:\n"
+msgstr "Correção de latência:\n"
 "(negativo = retroativo)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6513,8 +7663,8 @@ msgid "Audio cache"
 msgstr "Cache de áudio"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Guardar dados na memória até parar a gravação"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6555,9 +7705,9 @@ msgstr "Versão da biblioteca:"
 msgid "MP3 Library:"
 msgstr "Biblioteca MP3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "Localizar &Biblioteca"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6567,9 +7717,22 @@ msgstr "Biblioteca MP3 LAME:"
 msgid "&Download"
 msgstr "&Copiar"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "Aviso: As opções de qualidade da exportação podem ser configuradas pelo botão Opções na janela do comando Exportar."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Aviso: As opções de qualidade da exportação podem ser configuradas pelo botão Opções na janela do comando Exportar.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6641,7 +7804,8 @@ msgid "&Update display while playing"
 msgstr "&Atualizar tela durante a reprodução"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Fechar a última janela aberta descarrega o Audacity da memória"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6649,15 +7813,16 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "&Habilitar o arraste das bordas da seleção"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Ordem &ergonômica dos botões de E/S de áudio"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Ajustar &zoom vertical das faixas automaticamente"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "Alterar foco entre as faixas de maneira circular"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6685,17 +7850,22 @@ msgid "Show warnings about &temp files"
 msgstr "Exibir avisos sobre os arquivos &temporários"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&Pedir para salvar mesmo em projetos em branco"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Exibir tela de boas-vindas ao iniciar"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Modos"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Extensão mínima para a visualização dos medidores e 'Formato de onda' (dB)"
@@ -6730,34 +7900,10 @@ msgstr "-145 dB (extensão PCM para amostras de 24 bit)"
 msgid "Default View Mode"
 msgstr "Modo de visualização padrão"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "Exibir Forma de onda"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "Exibir Forma de onda em DB"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "Exibir Espectro"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "Exibir log de Espectro"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "ExibirAltura"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Outras opções da interface"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Idioma da interface:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Ajuda:"
@@ -6771,6 +7917,14 @@ msgstr "Botão solo:"
 msgid "Keyboard"
 msgstr "Teclado"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Atalhos de teclado"
@@ -6804,22 +7958,16 @@ msgstr "Erro salvando atalhos de teclado"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Selecionar arquivo XML contendo os atalhos de teclado do Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML Arquivos (*.xml)|*.xml|Todos os arquivos (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Erro carregando atalhos de teclado"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"O atalho de teclado '%s\" já está associado a:\n"
+msgstr "O atalho de teclado '%s\" já está associado a:\n"
 "\n"
 "'%s'"
 
@@ -6828,6 +7976,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Desfazer"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&Ao gravar, reproduzir outras faixas simultaneamente "
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7136,14 +8320,13 @@ msgstr "De alta-qualidade:"
 msgid "Smart Recording"
 msgstr "Gravação programada"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Pausar gravação ao detectar silêncio"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Nível de silêncio (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7279,8 +8462,7 @@ msgid "Info"
 msgstr "Info"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7293,8 +8475,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"O uso de temas é um recurso experimental\n"
+msgstr "O uso de temas é um recurso experimental\n"
 "\n"
 "Para utilizá-lo, clique em \"Salvar arquivo de temas\" \n"
 "e edite o arquivo de nome ImageCacheVxx.png\n"
@@ -7309,43 +8490,33 @@ msgstr ""
 "que o arquivo apresente outros icones.)\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"O Audacity foi compilado com um botão extra, \n"
+msgstr "O Audacity foi compilado com um botão extra, \n"
 "'Output Sourcery'.  Ele irá salvar uma versão \n"
 "em C da imagem em cache que pode ser \n"
 "compilada como padrão.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Se 'Abrir pasta de temas na inicialização' estiver selecionado, \n"
+msgstr "Se 'Abrir pasta de temas na inicialização' estiver selecionado, \n"
 "o arquivo de temas será aberto ao iniciar o Audacity.\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Salvar e abrir arquivos individuais usa o mesmo\n"
+msgstr "Salvar e abrir arquivos individuais usa o mesmo\n"
 "esquema de edição de arquivos, mas utilizando\n"
 "um arquivo diferente para cada imagem.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Controle"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Pausar"
@@ -7354,9 +8525,9 @@ msgstr "Pausar"
 msgid "Play"
 msgstr "Reproduzir"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Executar (Shift para reprodução contínua)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7370,6 +8541,10 @@ msgstr "Ir para o início"
 msgid "Skip to End"
 msgstr "Ir para o final"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "Clean Speech"
@@ -7406,6 +8581,10 @@ msgid "Silence selection"
 msgstr "Silenciar seleção"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Mais Zoom"
 
@@ -7461,16 +8640,13 @@ msgstr "Medidor de nível de saída"
 msgid "Input level meter - click to monitor input"
 msgstr "Medidor de nível de entrada - clique para monitorar"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mixer"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Volume de saída"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "Sinal-Saída"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7478,7 +8654,8 @@ msgid "Input Volume"
 msgstr "Volume de entrada"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "Sinal-Entrada"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7840,14 +9017,16 @@ msgstr "Estéreo - vertical"
 msgid "Preferences..."
 msgstr "Preferências..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Determina a freqüência com que o medidor de som é alterado.\n"
+msgstr "Determina a freqüência com que o medidor de som é alterado.\n"
 "Se você estiver em um PC mais lento, pode ser necessário \n"
 "diminuir esta freqüência (30 vezes por segundo ou menos),\n"
 "para que o áudio não seja afetado pela exibição do medidor."
@@ -7864,6 +9043,22 @@ msgstr "Preferências do Medidor"
 msgid " Please select an action "
 msgstr "Por favor, selecione uma ação"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7876,12 +9071,6 @@ msgstr "Régua Vertical"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 segundos"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7907,6 +9096,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dias 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8092,250 +9296,11 @@ msgstr "Não foi possível abrir o arquivo: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Erro %s na linha %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
 msgstr "Não foi possível carregar o arquivo: \"%s\""
 
-#~ msgid ""
-#~ "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?"
-#~ msgstr ""
-#~ "Você escolheu por não recuperar os arquivos de projeto. Não será possível "
-#~ "recuperá-los em outra oportunidade. Você tem certeza de que deseja "
-#~ "continuar sem recuperar os arquivos?"
-#~ msgid "Really not recover projects?"
-#~ msgstr "Deseja não recuperar o projeto?"
-#~ msgid "Export and Saving"
-#~ msgstr "Exportar e Salvar"
-#~ 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>"
-#~ msgstr ""
-#~ "<b>Para iniciar a gravação, pressione o botão vermelho Gravar</b>. Antes "
-#~ "de iniciar no entanto, há três ajustes que devem ser feitos:<br><br>(1) O "
-#~ "<b>Dispositivo de Gravação</b>, configurado nas Preferências, na aba "
-#~ "Dispositivos. Por padrão, o Audacity usa o dispositivo padrão de áudio, o "
-#~ "que na maioria dos casos não necessita de ajuste. No entanto, caso você "
-#~ "tenha mais de uma placa de som ou um dispositivo de áudio externo USB, "
-#~ "certifique-se de que este dispositivo está selecionado em \"Gravação\". "
-#~ "<br><br>(2) A <b>fonte de entrada</b> para o seu dispositivo, como o "
-#~ "microfone ou entrada de linha. <ul><li><b>No  Windows</b>, seleciona-se a "
-#~ "fonte de entrada no menu de seleção à direita da <b>Barra de "
-#~ "Dispositivos</b>. <i>nota: no Vista, você deve selecionar os dispositivos "
-#~ "pelas Preferências do programa, na aba Dispositivos.</i></li><li><b>No "
-#~ "Mac</b>, selecionam-se os dispositivos pelo Apple Audio-MIDI Setup.</li></"
-#~ "ul><i>Nota: muitos dispositivos USB ou Firewire não oferecem opção de "
-#~ "entrada, e este passo pode ser ignorado.<br><br>(3) <b>Volume de Entrada</"
-#~ "b>. Antes de prosseguir a gravação, teste o nível do volume de entrada, "
-#~ "para garantir que ele não está alto ou baixo demais. Para ajustar, veja o "
-#~ "wiki em inglês [[wiki:Recording levels|Recording Levels]] ou siga estes "
-#~ "dois passos: <ol><li>Ligue o <b>monitoramento</b>, clicando com o botão "
-#~ "direito sobre a Barra de Medição e selecionando \"Iniciar monitoramento"
-#~ "\". Caso a barra não esteja disponível, selecione o menu Exibir > Barras "
-#~ "de Ferramentas > Barra de medição . <li>Pressione Gravar e ajuste o "
-#~ "controle de volume na Barra de medição até que as barras vermelhas "
-#~ "cheguem próximas ao lado direito do medidor, sem no entanto tocá-las. "
-#~ "Caso não consiga ouvir nenhum som, configure as Preferências do programa, "
-#~ "na aba Dispositivos e ligue a opção \"Reprodução simultânea via software"
-#~ "\".</ol><br><br>Há outras fontes de ajuda: as Perguntas Freqüentes no "
-#~ "site do Audacity, o Tutorial <b>Sua primeira gravação</b> disponível no "
-#~ "Manual e o nosso wiki em inglês [[wiki:Recording Tips|Recording Tips]], "
-#~ "especialmente a sessão [[wiki:Troubleshooting Recordings|Troubleshooting "
-#~ "Recordings]].<br><br>"
-#~ msgid ""
-#~ "Exporting and Saving have different purposes.You \"save\" an Audacity "
-#~ "project file when you want to return to your work in Audacity later.This "
-#~ "means you don't then have to re-import or re-record audio, or redo "
-#~ "editing you have done so far.When you want to listen to your work in "
-#~ "other computer programs you \"export\" it as an audio file such as a WAV, "
-#~ "AIFF or MP3. If burning to an audio CD for standalone CD players, you "
-#~ "must export as WAV or AIFF.<br><br>To save an Audacity project, use "
-#~ "<b>File > Save Project</b>. This will save an <b>.aup</b> Project file, "
-#~ "plus a <b>_data</b> folder containing the actual audio. Make sure you "
-#~ "don't rename or move either of these, because Audacity needs to refer to "
-#~ "both.Only use File > Save Project As... when you either need to save an "
-#~ "empty Project, or if you want to save an existing Project to a <i> new</"
-#~ "i> name. When you want to re-open a saved Project, simply click File > "
-#~ "Open and open the .aup file. <br><br>When you want to export your work to "
-#~ "an audio file, use <b>File > Export</b> and choose your desired format in "
-#~ "the \"Save as type\" dropdown.Click the Options button for advanced "
-#~ "choices, such as the bit rate to use for MP3 export.There are two other "
-#~ "Export commands under the File menu.\"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]]. <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]]. There is "
-#~ "also some help on how to [[burncd|burn to a CD]].<br><br>"
-#~ msgstr ""
-#~ "Exportar e Salvar tem propósitos diferentes. Você \"salva\" um projeto do "
-#~ "Audacity quando pretende retomá-lo depois. Ou seja, não é necessário "
-#~ "importar todo o áudio novamente e refazer a edição já feita. Quando você "
-#~ "quer ouvir o trabalho em outro programa de áudio, deve \"Exportar\" para "
-#~ "um arquivo WAV ou AIFF. <br> <br> Para salvar como um projeto do "
-#~ "Audacity, use <b>Arquivo > Salvar Projeto</b>. Assim, o projeto será "
-#~ "salvo como um arquivo <b>.AUP</b> e mais uma pasta com o nome <b>_data</"
-#~ "b> contendo todo o áudio do projeto. Assegure-se de não apagar ou "
-#~ "renomear nenhum dos dois, ou o Audacity não irá encontrar os arquivos "
-#~ "necessários para editar seu projeto novamente. Use <b>Arquivo > Salvar "
-#~ "projeto como</b> para alterar o nome de um projeto já salvo ou para "
-#~ "salvar um projeto vazio. Para abrir novamente um projeto já salvo, clique "
-#~ "em <b>Arquivo > Abrir</b> e selecione o arquivo .AUP. <br><br> Para "
-#~ "exportar seu projeto em um arquivo de áudio, use <b>Arquivo > Exportar..."
-#~ "</b> e selecione o formato desejado na janela \"Exportar como\". Clique "
-#~ "no botão Opções para selecionar as opções avançadas, como a taxa do "
-#~ "arquivo MP3. Há outros dois comandos de Exportar: \"Exportar seleção como"
-#~ "\", que exporta apenas a área selecionada, e \"Exportar múltiplos\" que "
-#~ "exporta em diferentes arquivos, para por exemplo quando você tem mais de "
-#~ "uma faixa num mesmo projeto e deseja exportar cada faixa separadamente. "
-#~ "Ao exportar partes de uma gravação longa, como as faixas de um cassete ou "
-#~ "LP, veja as instruções em inglês na wiki [[wiki:Splitting recordings into "
-#~ "separate tracks|labels with Export Multiple]]. <br><br>Antes de exportar "
-#~ "arquivos como <b>MP3</b>, você precisará instalar a biblioteca LAME MP3 "
-#~ "em seu computador. Para ajuda em como proceder a instalação, veja a nossa "
-#~ "página em inglês no wiki [[wiki:Lame_Installation|Lame Installation]]. Há "
-#~ "também algumas dicas sobre [[burncd|como gravar em um CD]].<br><br>"
-#~ msgid ""
-#~ "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> "
-#~ "<p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten "
-#~ "(SHN)</b>, or most other proprietary formats, because of licensing and "
-#~ "patent restrictions. Audacity also cannot import any kind of Digital "
-#~ "Rights Management (DRM) protected file, including most purchased online "
-#~ "such as from iTunes or Napster.If you are on a Mac, you can import "
-#~ "<b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not "
-#~ "DRM protected, but you cannot export to these formats.</p> <p>Some open "
-#~ "formats are not yet supported by Audacity, including <b>Ogg Speex</b> and "
-#~ "<b>Musepack</b>.We hope to support these formats in future versions of "
-#~ "Audacity.</p> <p>If you cannot import your file into Audacity, you can as "
-#~ "a workround convert it to WAV or AIFF.As long as it's not a DRM-protected "
-#~ "file, you could do this with iTunes or with <a href=\"http://www."
-#~ "erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-"
-#~ "protected file, you can burn it to an audio CD in the application that is "
-#~ "licensed to play it, then extract (rip) the CD track to WAV or AIFF.You "
-#~ "can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or "
-#~ "<a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows."
-#~ "Or you can play the file on your computer and record it - see <a href="
-#~ "\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
-#~ msgstr ""
-#~ "<h2>O Audacity pode importar formato como WMA, AAC, RealAudio  etc.?</h2> "
-#~ "<p>O Audacity não pode importar ou exportar arquivos em formatos <b>WMA, "
-#~ "RealAudio, Shorten (SHN)</b>, ou outros formatos proprietários devido à "
-#~ "restrições de patentes. O Audacity também não pode importar arquivos "
-#~ "protegidos por DRM (Direitos de Cópia), o que inclui a maioria das "
-#~ "músicas compradas em lojas on-line de música. Na versão para Macintosh, é "
-#~ "possível importar áudio em formato <b>AAC</b> não protegido (como os com "
-#~ "extensão <b>M4A</B>).</p><p>Alguns formatos não-proprietários ainda não "
-#~ "estão disponível no Audacity, como <b>Ogg Speex</b> e <b>Musepack</b>. "
-#~ "Estes formatos serão disponibilizados em versões futuras do programa.</"
-#~ "p><p>Se não for possível importar arquivos de áudio para o Audacity, você "
-#~ "pode contornar esta restrição convertendo o arquivo em um formato não "
-#~ "compactado como WAV ou AIFF. Para arquivos não protegidos, o iTunes ou o "
-#~ "<a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player "
-#~ "podem ajudar na conversão. No caso de arquivos protegidos por DRM, você "
-#~ "pode tentar gravá-lo num CD de áudio e extraí-lo novamente do CD em "
-#~ "formato WAV ou AIFF, utilizando o iTunes no Macintosh e Windows Media "
-#~ "Player ou <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> "
-#~ "no Windows.</P><p>Como alternativa, você pode reproduzir o arquivo em seu "
-#~ "computador e gravar o fluxo de áudio. Veja a <a href=\"http://audacity."
-#~ "sourceforge.net/help/faq?s=recording&amp;i=streaming\">página em inglês</"
-#~ "a>."
-#~ msgid ""
-#~ "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]].<br><br>"
-#~ msgstr ""
-#~ "Se você deseja gravar seu projeto em um CD de áudio, você deve primeiro "
-#~ "[[export|exportá-lo como WAV ou AIFF]] e então gravar o CD com um "
-#~ "programa apropriado. Para maiores informações, veja o wiki em inglês "
-#~ "[[wiki:How to burn CDs|How to burn CDs]].<br><br>"
-#~ msgid "Specify Time"
-#~ msgstr "Especificar tempo"
-#~ msgid "Draw currently only works with linear-view waveforms."
-#~ msgstr "Desenhar só funciona em formas de onda lineares."
-#~ msgid "DTMF duration:"
-#~ msgstr "Duração DTMF:"
-#~ msgid "Noise duration"
-#~ msgstr "Duração do ruído"
-#~ msgid "Edit the metadata for the FLAC file"
-#~ msgstr "Editar metadados para o arquivo FLAC"
-#~ msgid "Edit the ID3 tags for the MP2 file"
-#~ msgstr "Editar metadados para o arquivo MP2"
-#~ msgid "0, 220-260 kbps (Best Quality)"
-#~ msgstr "0, 220-260 kbps (Melhor qualidade)"
-#~ msgid "1, 200-250 kbps"
-#~ msgstr "1, 200-250 kbps"
-#~ msgid "2, 170-210 kbps"
-#~ msgstr "2, 170-210 kbps"
-#~ msgid "3, 155-195 kbps"
-#~ msgstr "3, 155-195 kbps"
-#~ msgid "4, 145-185 kbps"
-#~ msgstr "4, 145-185 kbps"
-#~ msgid "5, 110-150 kbps"
-#~ msgstr "5, 110-150 kbps"
-#~ msgid "6, 95-135 kbps"
-#~ msgstr "6,   95-135 kbps"
-#~ msgid "7, 80-120 kbps"
-#~ msgstr "7,   80-120 kbps"
-#~ msgid "8, 65-105 kbps"
-#~ msgstr "8,   65-105 kbps"
-#~ msgid "Insane, 320 kbps"
-#~ msgstr "Insano, 320 kbps"
-#~ msgid "Extreme, 220-260 kbps"
-#~ msgstr "Extremo, 220-260 kbps"
-#~ msgid "Standard, 170-210 kbps"
-#~ msgstr "Padrão, 170-210 kbps"
-#~ msgid "Medium, 145-185 kbps"
-#~ msgstr "Médio, 145-185 kbps"
-#~ msgid "Edit the ID3 tags for the MP3 file"
-#~ msgstr "Edita tags ID3 para arquivos MP3"
-#~ msgid "Edit the metadata"
-#~ msgstr "Editar metadados"
-#~ msgid "Edit the metadata for the OGG file"
-#~ msgstr "Editar metadados para o arquivo OGG"
-#~ msgid "Specify PCM Options"
-#~ msgstr "Especificar opções PCM"
-#~ msgid "Edit the metadata for the uncompressed file"
-#~ msgstr "Editar metadados do arquivo não-comprimido"
-#~ msgid "Audio Files"
-#~ msgstr "Arquivos de áudio"
-#~ msgid "&Download Free Copy of LAME"
-#~ msgstr "Copiar &LAME gratuitamente"
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
diff --git a/locale/ro.po b/locale/ro.po
index daf2c1a..eeb74c3 100644
--- a/locale/ro.po
+++ b/locale/ro.po
@@ -14,36 +14,24 @@ msgstr "Project-Id-Version: Romanian Translation for Audacity 0.0.1\n"
 msgid "&About Audacity..."
 msgstr "&Despre Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Activat"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Data construirii programului:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity este un program gratuit scris de o echipă de dezvoltatori voluntari. Coordonarea are loc mulţumită SourceForge.net, un serviciu online care oferă unelte gratuite pentru proiectele open source. Audacity este disponibil pentru Windows 98 şi versiunile mai noi, Mac OS X, Linux şi alte sisteme de operare bazate pe Unix. Versiunile mai vechi ale programului Audacity sunt disponibile şi pentru Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Aceasta este o versiune beta a programului. Ea poate să conţină unele erori sau funcţii incomplete. Depindem de feedbackul dumneavoastră aşa că vă rugăm sa vizitaţi siteul nostru şi să ne aduceţi la cunostinţă eventualele erori sau sugestii."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Această versiunea este una stabilă şi completă. Dacă găsiţi erori sau aveţi sugestii, vă rugăm să ne contactaţi. Depindem de feedbackul de la utilizatori pentru a putea imbunătăţi Audacity. Pentru mai multe informaţii, vizitaţi siteul."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: ../src/AboutDialog.cpp:127
@@ -51,13 +39,9 @@ msgstr "Această versiunea este una stabilă şi completă. Dacă găsiţi erori
 msgid "translator_credits"
 msgstr "creditele translatorilor"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Un editor audio digital gratuit"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Informaţii"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -93,28 +77,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Mulţumiri speciale:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Activat"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Data construirii programului:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "ÃŽnchide"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -321,12 +395,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -362,8 +437,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -411,6 +486,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -459,10 +538,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -677,14 +764,14 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "FiÅŸierul %s a fost redenumit\n"
 
-#: ../src/DirManager.cpp:660
+#: DirManager.cpp:1051
 #, c-format
-msgid "Changing block %s\n"
+msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
-#: DirManager.cpp:1051
+#: DirManager.cpp:1183
 #, c-format
-msgid "Unable to rename '%s' to '%s'"
+msgid "Changed block %s to new alias name\n"
 msgstr ""
 
 #: DirManager.cpp:1115 DirManager.cpp:1403
@@ -815,6 +902,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Unde se găseşte %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Analiza frecvenţei"
@@ -841,8 +1015,8 @@ msgstr ""
 msgid "Cepstrum"
 msgstr ""
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -854,8 +1028,8 @@ msgstr "Mărime"
 msgid " window"
 msgstr "Fereastră"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -866,14 +1040,25 @@ msgstr ""
 msgid "Log frequency"
 msgstr "Frecvenţă scăzută"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "ÃŽnchide"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
@@ -927,7 +1112,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr ""
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -943,15 +1128,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -962,40 +1163,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1190,6 +1415,10 @@ msgstr "&Salvează Proiect\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Salvează proiectul c&a şi..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1198,6 +1427,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1226,10 +1459,26 @@ msgstr ""
 msgid "Export &Multiple..."
 msgstr ""
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1291,9 +1540,9 @@ msgstr "&Åžtergere\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&LiniÅŸte\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1307,22 +1556,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1366,12 +1613,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1382,64 +1629,66 @@ msgstr "&Toate\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
 msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Cursorul la sfârşit"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 msgid "Find &Zero Crossings\tZ"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Mo&ve Cursor..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
 msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "spre începutul Selecţiei"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "spre sfârşitull Selecţiei"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "Spre începutul piesei."
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "Spre sfârşitul piesei"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Salvează selecţia"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
 msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1458,10 +1707,14 @@ msgstr ""
 msgid "Turn Grid Snap Off"
 msgstr ""
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Setări...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1499,60 +1752,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Istoric..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Sari la ÃŽnceput\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Sari la Sfârşit\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1567,12 +1882,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr ""
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1587,6 +1898,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "Elimină Pie&sele"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr ""
@@ -1603,29 +1922,36 @@ msgstr ""
 msgid "Align with Selection &End"
 msgstr ""
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+msgid "Align End with Cu&rsor"
 msgstr ""
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+msgid "Align End with Selection Star&t"
 msgstr ""
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+msgid "Align End with Selection En&d"
 msgstr ""
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+msgid "Align Tracks To&gether"
 msgstr ""
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Aliniază piesele..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1638,22 +1964,26 @@ msgstr "Adaugă etichetă la selecţie\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Adaugă etichetă la pozitia de redare\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Generează"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Efe&ct"
@@ -1688,6 +2018,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1700,12 +2034,12 @@ msgstr "&Execută Test"
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1740,9 +2074,9 @@ msgstr "Urmâtoare unealtă\tD"
 msgid "Previous Tool\tA"
 msgstr "Unelata precedentă"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Play/Stop\tTasta Space"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1756,12 +2090,12 @@ msgstr "Pauză\tP"
 msgid "Record\tR"
 msgstr "Înregistrează\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1776,22 +2110,14 @@ msgstr ""
 msgid "Play Looped\tL"
 msgstr "Redă repetând"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Redă repentând\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Sari la ÃŽnceput\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Sari la Sfârşit\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr ""
@@ -1848,8 +2174,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1948,14 +2274,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "&FiÅŸiere Recente"
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2012,6 +2343,23 @@ msgstr "Repetă %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Nu existe nici o piesă care să fie exportată."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Nu există nimic de desfăcut"
@@ -2052,6 +2400,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "LipreÅŸte din Memoria Clipboard"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2220,9 +2572,9 @@ msgstr "Importează etichete"
 msgid "Select a MIDI file..."
 msgstr "Selectează un fişier MIDI..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Toate FiÅŸierele (*.*)|*.*|FiÅŸiere MIDI (*.mid)|*.mid|Fisiere Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2241,14 +2593,6 @@ msgstr ""
 msgid "All files (*)|*"
 msgstr "Toate FiÅŸierele (*)|*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Importează"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2280,6 +2624,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr ""
@@ -2316,6 +2664,14 @@ msgstr "Aliniat"
 msgid "Align"
 msgstr "Aliniare"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "A fost creată o nouă piesă audio"
@@ -2379,14 +2735,14 @@ msgstr "Elimină piesa"
 msgid "Removed audio track(s)"
 msgstr "Piesă(e) eliminate"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2453,14 +2809,13 @@ msgstr "Sunete înregistrate"
 msgid "Save changes before closing?"
 msgstr "Salvează modificările înainte de a închide?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2480,6 +2835,25 @@ msgstr ""
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2537,42 +2911,34 @@ msgstr "FiÅŸierul a fost dalvat folosind Audacity %s.\n"
 msgid "Can't open project file"
 msgstr "Nu se poate deschide Proiectul"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Proiectul nu a putut fi salvat. Probabil ca %s nu este reinscriptibil\n"
-"sau discul este plin."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2584,21 +2950,19 @@ msgstr "Eroare la salvarea proiectului"
 msgid "Saved %s"
 msgstr "Salvat %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Brut"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importat '%s'"
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Importează"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Eroare la importare"
@@ -2611,17 +2975,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Fişierele proiect Audacity (.aup) te lasă sa salvezi tot ceea ce lucrezi\n"
-" exact cum apare pe ecran, dar cele mai multe programe nu pot opera cu fiÅŸiere proiect Audacity.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Când doreşti să salvezi un fişier astfel încât să poată fi deschis şi de alte programe atunci selectează una dintre\n"
-"comenzile de export. "
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2664,6 +3034,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Nu mai există spaţiu pe disk"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2747,43 +3127,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2823,8 +3172,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Comentarii"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2843,12 +3192,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2890,100 +3239,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
-msgstr ""
-
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Titlu"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Artist"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3048,8 +3316,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3092,6 +3403,10 @@ msgstr ""
 msgid "Waveform (dB)"
 msgstr ""
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "ÃŽnalte (EAC)"
@@ -3225,13 +3540,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr ""
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Nu ai mărit destul. Măreşte până vezi mostrele individuale."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3317,6 +3632,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3374,15 +3697,6 @@ msgstr "Schimbă rata"
 msgid "Format Change"
 msgstr "Schimbare formatului"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Introdu o rată în Hz (pe secundă) între 1 şi 100000:"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr ""
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Schimbă valoarea vitezei minime (%) la:"
@@ -3517,8 +3831,8 @@ msgstr "Plug-in-urile de la 1 la %i"
 msgid "Plugins %i to %i"
 msgstr "Plug-in-urile de la %i la %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3540,8 +3854,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3562,14 +3876,19 @@ msgstr "Se aplică efectul: %s %.1f dB"
 msgid "Amplify"
 msgstr "Amplifică"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Amplificare de Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Amplificare (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr ""
@@ -3578,6 +3897,10 @@ msgstr ""
 msgid "Allow clipping"
 msgstr ""
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Amplifică..."
@@ -3700,10 +4023,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Frecvenţa (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Câştig (dB)"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3745,9 +4076,50 @@ msgstr "de Vaughan Johnson && Dominic Mazzoni"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "FoloseÅŸte SoundTouch de Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "ÃŽnalte:    de la"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr ""
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284
 #: ../src/effects/ChangePitch.cpp:330
@@ -3757,20 +4129,21 @@ msgstr "ÃŽnalte:    de la"
 msgid "to"
 msgstr "spre"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
 msgstr ""
 
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frecvenţa (Hz): de la"
-
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
 #: ../src/effects/ChangeTempo.cpp:182
 msgid "Percent Change:"
 msgstr "Procent schimbat:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Ajusteaza Inaltele..."
@@ -3789,6 +4162,11 @@ msgstr "Se aplică efectul: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Schimbă viteza"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr ""
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Schimbă viteza afectând atât Tempoul cât şi Înălţimea"
@@ -3797,13 +4175,16 @@ msgstr "Schimbă viteza afectând atât Tempoul cât şi Înălţimea"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "foloseÅŸte SampleRate de Erik de Castri Lopo"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
 msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
 msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
@@ -3822,13 +4203,29 @@ msgstr "Ajusteaza Tempoul"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Ajusteaza Tempoul fara a schimba Inaltele"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Bătăi pe minut (BPM)Ş   de la"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Lungime (secunde):    de la"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3838,8 +4235,8 @@ msgstr "Ajusteaza Tempoul..."
 msgid "Changing Tempo"
 msgstr "Schimbarea Tempoului"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3850,10 +4247,18 @@ msgstr ""
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr ""
@@ -3866,49 +4271,81 @@ msgstr ""
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
+
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
 msgstr ""
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
+#, c-format
+msgid "Threshold %d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Threshold: %d dB"
+msgid "%3d dB"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.0f:1"
+msgid "Ratio %.0f to 1"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:568
 #, c-format
-msgid "Ratio: %.1f:1"
+msgid "%.0f:1"
 msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "Ratio %.1f to 1"
 msgstr ""
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3919,6 +4356,247 @@ msgstr "Compresor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr ""
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Informaţii"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3935,8 +4613,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr ""
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4165,16 +4843,12 @@ msgstr ""
 msgid "Inverting"
 msgstr ""
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4186,31 +4860,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4221,6 +4899,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Scoaterea zgomotului"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4237,10 +5067,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4268,10 +5094,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Scoaterea zgomotului"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Pasul 1"
@@ -4302,14 +5124,26 @@ msgstr "Generează profilul zgomotului"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Scoate zgomotul..."
@@ -4344,22 +5178,22 @@ msgstr ""
 msgid "Normalize"
 msgstr ""
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr ""
-
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr ""
@@ -4373,44 +5207,56 @@ msgstr ""
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr ""
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr ""
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr ""
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Nivele:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
 msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
 #: ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr ""
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr ""
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Adâncime:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr ""
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr ""
@@ -4425,6 +5271,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4443,28 +5297,23 @@ msgstr "Piesele sunt prea lungi pentru a repeta selecţia"
 msgid "Repeat"
 msgstr "Repetă"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repetiţie de Dominic Mazzoni && Vaughan Johnson"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Numărul de repetiţii:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr ""
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minute, %d secunde"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d secunde"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4528,8 +5377,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4537,6 +5434,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr ""
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4565,22 +5470,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr ""
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4607,10 +5518,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4656,10 +5563,6 @@ msgstr ""
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah de Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Adâncime (%):"
@@ -4668,10 +5571,18 @@ msgstr "Adâncime (%):"
 msgid "Resonance:"
 msgstr "Rezonanţa:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr ""
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4708,6 +5619,18 @@ msgstr "Setările efectului"
 msgid "Length (seconds)"
 msgstr "Lungime (secunde)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Aplicarea Efectelor Nyquist..."
@@ -4773,9 +5696,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4829,6 +5755,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4864,10 +5794,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Suntetul nu poate fi exportat ca ÅŸi %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Se exportă sunetele selectate folosind un encoder linie de comandă"
@@ -4880,6 +5806,477 @@ msgstr "Se exportă întregul fişier folosind un encoder linie de comandă"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bit Rate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Limba:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "FiÅŸiere XML (*.xml)|*.xml|Toate fiÅŸierele (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4952,10 +6349,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4964,10 +6357,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bit Rate:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4976,10 +6365,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -5005,44 +6390,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5053,20 +6406,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5097,6 +6446,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Calitate"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5122,33 +6475,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Unde se găseşte %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5158,8 +6493,9 @@ msgstr "Doar lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dl
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Doar libmp3lame.so|libmp3lame.so|Fişiere împărtăşite primar (*.so)|*.so|Librării extinse (*.so*)|*.so*|Toate fişierele (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5178,10 +6514,6 @@ msgstr "Nu este o librărie de codare MP3 validă sau nu este suportată!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Editează tagurile ID3 pentru fişierul MP3"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5217,10 +6549,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5233,18 +6561,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Plug-in-ul de export MP3 nu a fost găsit"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5299,6 +6619,10 @@ msgstr ""
 msgid "First file name:"
 msgstr ""
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Piese"
@@ -5319,15 +6643,14 @@ msgstr ""
 msgid "File name prefix:"
 msgstr ""
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "ÃŽnlocuieÅŸte fiÅŸierele existente"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5337,10 +6660,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Alege o locaţie unde vor fi salvate fişierele exportate."
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5348,6 +6667,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5358,6 +6681,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5366,10 +6695,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5382,22 +6707,14 @@ msgstr "Se exportă sunetele selectate ca şi Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Exportă tot proiectul ca şi Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5413,8 +6730,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Nu toate combinaţiile de antete\n"
 "şi codări sunt posibile.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5438,8 +6767,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Eroare (este posibil ca fişierul să nu fi fost scris): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5447,6 +6804,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Aceasră versiune de Audacity nu a fost compilată cu suport %s"
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5477,9 +6842,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5492,19 +6858,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity nu a putut recunoaÅŸte acest tip de fiÅŸier.\n"
-" Dacă este necomprimat, încercati să îl importaţi folosind comanda \"Importează RAW\"."
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5542,16 +6960,17 @@ msgstr ""
 msgid "Invalid track offset in LOF file."
 msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
 msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
 msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5578,15 +6997,23 @@ msgstr ""
 msgid "Internal logic fault"
 msgstr ""
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Se importează fişierul %s"
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Importă date brute"
@@ -5624,6 +7051,14 @@ msgstr "2 canale (Stereo)"
 msgid "%d Channels"
 msgstr "%d Canale"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr ""
@@ -5636,8 +7071,17 @@ msgstr "Cantitate de importat:"
 msgid "Sample rate:"
 msgstr ""
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5681,10 +7125,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Redă alte piese în timp ce înregistrezi o piesă nouă"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5694,8 +7137,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5722,12 +7169,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5755,21 +7204,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5808,7 +7245,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5833,20 +7270,64 @@ msgstr "ÃŽn directorul %s nu se poate scrie"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Schimbarile directorului temporar nu vor avea efect pana Audacity nu este restartat"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-msgid "&Make a copy of the file before editing (safer)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Versiunea librăriilor MP3:"
+
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:128
-msgid "&Read directly from the original file (faster)"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
 msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
@@ -5877,53 +7358,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Versiunea librăriilor MP3:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Interfaţă"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Găseşte librăria"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Interfaţă"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5938,6 +7414,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5946,24 +7426,24 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Limba:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
@@ -5974,6 +7454,10 @@ msgstr ""
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr ""
@@ -5986,10 +7470,34 @@ msgstr "-120 dB (apozimativ limita auzului uman)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr ""
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Tastatură"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6022,10 +7530,6 @@ msgstr "Eroare la salvarea scurtăturilor tastaturii"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Selectează un fişier XML care conţine scurtăturile din tastatură ale Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "FiÅŸiere XML (*.xml)|*.xml|Toate fiÅŸierele (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "eroare la încărcarea scurtăturilor din tastatură"
@@ -6041,6 +7545,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Desfă"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Redă alte piese în timp ce înregistrezi o piesă nouă"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Mouse"
@@ -6266,10 +7807,6 @@ msgstr "Măreşte sau Micşorează"
 msgid "Audacity Preferences"
 msgstr "Setări Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Calitate"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr ""
@@ -6334,12 +7871,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6358,6 +7895,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - implicit"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - laţimea de bandă cea mai îngustă"
@@ -6366,6 +7907,10 @@ msgstr "4096 - laţimea de bandă cea mai îngustă"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6382,6 +7927,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Frecvenţa maximă trebuie să fie un număr mai mare ca 0."
@@ -6398,6 +7963,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6470,10 +8043,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pauză"
@@ -6482,9 +8051,9 @@ msgstr "Pauză"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Redă (Shift pentru a repeta)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6498,6 +8067,10 @@ msgstr "Sari la ÃŽnceput"
 msgid "Skip to End"
 msgstr "Sari la Sfârşit"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6530,6 +8103,10 @@ msgstr ""
 msgid "Silence selection"
 msgstr ""
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Zoom In"
@@ -6586,24 +8163,20 @@ msgstr ""
 msgid "Input level meter - click to monitor input"
 msgstr ""
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Volumul ieÅŸire"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Volumul la intrare"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6622,6 +8195,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6879,6 +8457,22 @@ msgstr "Dreapta"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6925,14 +8519,14 @@ msgstr ""
 msgid "Vertical Stereo"
 msgstr ""
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr ""
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6952,6 +8546,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6960,10 +8570,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6976,6 +8582,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7089,11 +8710,10 @@ msgstr "Nu mai arăta acest avertisment!"
 msgid "Could not open file: \"%s\""
 msgstr "Fisierul \"%s\" nu a putut fi deschis"
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Eroare: %s la linia %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/ru.po b/locale/ru.po
index d93e819..6828ce0 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,16 +1,14 @@
-# Russian translation of Audacity 1.3.3
+# Russian translation of Audacity 1.3.6
 # Copyright (C) 2002,2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # Alexandre Prokoudine <avp at altlinux.ru>, 2002.#: ../src/ToolBar.cpp:419.
 # Alexandre Prokoudine <avp at altlinux.ru>, 2003, 2004.
 # Alexandre Prokoudine <techwriter at land.ru>, 2004.
-# Alexandre Prokoudine <avp at localhost.localdomain>, 2004.
 # Alexandre Prokoudine <alexandre.prokoudine at gmail.com>, 2005, 2006.
 msgid ""
-msgstr ""
-"Project-Id-Version: ru\n"
+msgstr "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-08-09 00:03+0400\n"
-"PO-Revision-Date: 2008-10-21 02:54+0300\n"
+"POT-Creation-Date: 2008-12-06 21:32+0300\n"
+"PO-Revision-Date: 2008-12-24 12:47+0300\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine at gmail.com>\n"
 "Language-Team: Russian <gnome-cyr at gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +20,8 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
 #: AboutDialog.cpp:143
-#: AudacityApp.cpp:797
-#: Menus.cpp:904
+#: AudacityApp.cpp:812
+#: Menus.cpp:955
 msgid "&About Audacity..."
 msgstr "&О программе..."
 
@@ -32,15 +30,18 @@ msgid "OK... Audacious!"
 msgstr "OK... Audacious!"
 
 #: AboutDialog.cpp:175
-msgid "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."
+#, fuzzy
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr "Audacity — это свободная программа, созданная группой программистов на базе SourceForge — онлайнового сервиса для проектов с открытым исходным кодом. Программа написана на основе кроссплатформенной технологии wxWindows и доступна для операционных систем Windows 98 и новее, MacOS X, Linux и прочих Unix-подобных систем.  Существует более старая версия для Mac OS 9."
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
+#, fuzzy
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr "Это бета-версия программы. В ней могут быть как ошибки, так и невоплощенные функции. Продуктивность нашей работы зависит от ваших откликов, поэтому мы признательны за оставленные на нашем сайте сообщения об ошибках и функциональные запросы."
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+#, fuzzy
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr "Это стабильная и завершённая версия Audacity.  Так или иначе, если вы обнаружите ошибку или захотите предложить что-либо, свяжитесь с нами. Постоянный контакт с пользователями позволяет нам улучшать Audacity.  Для получения подробной информации посетите наш веб-сайт."
 
 #. i18n-hint: The translation of "translator_credits" will appear
@@ -55,7 +56,8 @@ msgid "translator_credits"
 msgstr "Русская локализация — Alexandre Prokoudine"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
+#, fuzzy
+msgid "A Free Digital Audio Editor<br>"
 msgstr "Свободный цифровой редактор звуковых файлов"
 
 #: AboutDialog.cpp:211
@@ -92,261 +94,255 @@ msgstr "Audacity использует код следующих проектов
 msgid "Special thanks:"
 msgstr "Особые благодарности:"
 
-#: AboutDialog.cpp:254
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
 msgstr "Audacity"
 
 #. i18n-hint: Information about when audacity was compiled
-#: AboutDialog.cpp:300
-#: AboutDialog.cpp:313
-#: AboutDialog.cpp:469
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
 msgid "Build Information"
 msgstr "Информация о сборке"
 
-#: AboutDialog.cpp:306
+#: AboutDialog.cpp:310
 #: effects/AvcCompressor.cpp:674
 msgid "Enabled"
 msgstr "Включено"
 
-#: AboutDialog.cpp:307
+#: AboutDialog.cpp:311
 msgid "Disabled"
 msgstr "Отключено"
 
-#: AboutDialog.cpp:317
+#: AboutDialog.cpp:321
 msgid "File Format Support"
 msgstr "Поддержка форматов файлов"
 
 #. i18n-hint: This is what the library (libmad) does - imports MP3 files
-#: AboutDialog.cpp:327
-#: AboutDialog.cpp:329
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
 msgid "MP3 Importing"
 msgstr "Импорт MP3"
 
-#: AboutDialog.cpp:336
-#: AboutDialog.cpp:339
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:343
 msgid "Ogg Vorbis Import and Export"
 msgstr "Импорт и экспорт Ogg Vorbis"
 
-#: AboutDialog.cpp:343
-#: AboutDialog.cpp:346
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
 msgid "ID3 tag support"
 msgstr "Поддержка тэгов ID3"
 
-#: AboutDialog.cpp:353
-#: AboutDialog.cpp:356
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
 msgid "FLAC import and export"
 msgstr "Импорт и экспорт FLAC"
 
-#: AboutDialog.cpp:361
-#: AboutDialog.cpp:364
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
 msgid "MP2 export"
 msgstr "Экспорт MP2"
 
-#: AboutDialog.cpp:369
-#: AboutDialog.cpp:372
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
 msgid "Import via QuickTime"
 msgstr "Импорт средствами QuickTime"
 
 #. i18n-hint: Libraries that are essential to audacity
-#: AboutDialog.cpp:379
+#: AboutDialog.cpp:383
 msgid "Core Libraries"
 msgstr "Основные библиотеки"
 
-#: AboutDialog.cpp:385
-#: AboutDialog.cpp:388
-#: AboutDialog.cpp:391
-#: AboutDialog.cpp:393
+#: AboutDialog.cpp:389
+#: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
 msgid "Sample rate conversion"
 msgstr "Преобразование частоты сэмплирования"
 
-#: AboutDialog.cpp:398
-#: AboutDialog.cpp:401
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
 msgid "Audio playback and recording"
 msgstr "Воспроизведение и запись звука"
 
-#: AboutDialog.cpp:414
+#: AboutDialog.cpp:418
 msgid "Features"
 msgstr "Возможности"
 
-#: AboutDialog.cpp:418
-#: AboutDialog.cpp:421
-#: AboutDialog.cpp:426
-#: AboutDialog.cpp:429
-#: AboutDialog.cpp:434
-#: AboutDialog.cpp:437
-#: AboutDialog.cpp:442
-#: AboutDialog.cpp:445
+#: AboutDialog.cpp:422
+#: AboutDialog.cpp:425
+#: AboutDialog.cpp:430
+#: AboutDialog.cpp:433
+#: AboutDialog.cpp:438
+#: AboutDialog.cpp:441
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
 msgid "Plug-in support"
 msgstr "Поддержка расширений"
 
-#: AboutDialog.cpp:450
-#: AboutDialog.cpp:453
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
 msgid "Sound card mixer support"
 msgstr "Поддержка встроенного микшера звуковой карты"
 
-#: AboutDialog.cpp:458
-#: AboutDialog.cpp:461
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
 msgid "Pitch and Tempo Change support"
 msgstr "Поддержка смены темпа и высоты тона"
 
-#: AboutDialog.cpp:473
+#: AboutDialog.cpp:477
 msgid "Program build date: "
 msgstr "Дата сборки программы: "
 
-#: AboutDialog.cpp:476
-#: AboutDialog.cpp:478
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
 msgid "Build type:"
 msgstr "Тип сборки:"
 
-#: AboutDialog.cpp:476
+#: AboutDialog.cpp:480
 msgid "Debug build"
 msgstr "Сборка с отладочными сообщениями"
 
-#: AboutDialog.cpp:478
+#: AboutDialog.cpp:482
 msgid "Release build"
 msgstr "Сборка для конечных пользователей"
 
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
-#: AboutDialog.cpp:483
+#: AboutDialog.cpp:487
 msgid "Installation Prefix: "
 msgstr "Префикс установки:"
 
-#: AboutDialog.cpp:487
+#: AboutDialog.cpp:491
 msgid "Settings folder: "
 msgstr "Папка с настройками: "
 
-#: AboutDialog.cpp:502
+#: AboutDialog.cpp:506
 msgid "GPL License"
 msgstr "Лицензия GPL"
 
-#: AudacityApp.cpp:497
-#: Project.cpp:1816
+#: AudacityApp.cpp:512
+#: Project.cpp:1847
 #, c-format
 msgid "%s is already open in another window."
 msgstr "%s уже открыт в другом окне."
 
-#: AudacityApp.cpp:499
-#: Project.cpp:1818
-#: Project.cpp:1923
-#: Project.cpp:2102
-#: Project.cpp:2204
+#: AudacityApp.cpp:514
+#: Project.cpp:1849
+#: Project.cpp:1954
+#: Project.cpp:2098
+#: Project.cpp:2235
 msgid "Error opening project"
 msgstr "Ошибка при открытии проекта"
 
-#: AudacityApp.cpp:531
+#: AudacityApp.cpp:546
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s не существует и не может быть открыт.\n"
+msgstr "%s не существует и не может быть открыт.\n"
 "\n"
 "Файл удалён из списка открывавшихся ранее."
 
-#: AudacityApp.cpp:633
+#: AudacityApp.cpp:648
 msgid "Master Gain Control"
 msgstr "Общий регулятор громкости"
 
-#: AudacityApp.cpp:634
+#: AudacityApp.cpp:649
 msgid "Input Meter"
 msgstr "Индикатор уровня на входе"
 
-#: AudacityApp.cpp:635
+#: AudacityApp.cpp:650
 msgid "Output Meter"
 msgstr "Индикатор уровня на выходе"
 
 #. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#: AudacityApp.cpp:799
+#: AudacityApp.cpp:814
 msgid "&Preferences...\tCtrl+,"
 msgstr "Параметр&ы...\tCtrl+,"
 
-#: AudacityApp.cpp:884
-#: AudacityApp.cpp:961
+#: AudacityApp.cpp:908
+#: AudacityApp.cpp:985
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "Используются блоки размером %ld\n"
 
-#: AudacityApp.cpp:906
-#: AudacityApp.cpp:976
+#: AudacityApp.cpp:930
+#: AudacityApp.cpp:1000
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Неизвестная опция командной строки: %s\n"
 
-#: AudacityApp.cpp:1115
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+#: AudacityApp.cpp:1134
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Программа не может найти каталог для хранения временных файлов.\n"
+msgstr "Программа не может найти каталог для хранения временных файлов.\n"
 "Укажите подходящий каталог в диалоге параметров программы."
 
-#: AudacityApp.cpp:1121
+#: AudacityApp.cpp:1140
 msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
 msgstr "Audacity готовится к выходу.  Повторно загрузите программу для использования нового каталога для временных файлов."
 
-#: AudacityApp.cpp:1153
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+#: AudacityApp.cpp:1172
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Попытка запустить две копии Audacity одновременно\n"
+msgstr "Попытка запустить две копии Audacity одновременно\n"
 "может привести к потере данных или сбою системы.\n"
 "\n"
 
-#: AudacityApp.cpp:1160
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+#: AudacityApp.cpp:1179
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity не удалось заблокировать каталог с временными файлами.\n"
+msgstr "Audacity не удалось заблокировать каталог с временными файлами.\n"
 "Возможно, этот каталог используется другой копией Audacity.\n"
 
-#: AudacityApp.cpp:1162
+#: AudacityApp.cpp:1181
 msgid "Do you still want to start Audacity?"
 msgstr "Вы по-прежнему хотите запустить Audacity?"
 
-#: AudacityApp.cpp:1164
+#: AudacityApp.cpp:1183
 msgid "Error locking temporary folder"
 msgstr "Ошибка при блокировании каталога для временных файлов"
 
-#: AudacityApp.cpp:1202
+#: AudacityApp.cpp:1221
 msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Система обнаружила другую запущенную копию Audacity.\n"
 
-#: AudacityApp.cpp:1204
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+#: AudacityApp.cpp:1223
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Используйте команды «Создать» или «Открыть» в\n"
+msgstr "Используйте команды «Создать» или «Открыть» в\n"
 "текущей копии Audacity для одновременной работы\n"
 "с несколькими проектами.\n"
 
-#: AudacityApp.cpp:1205
+#: AudacityApp.cpp:1224
 msgid "Audacity is already running"
 msgstr "Audacity уже загружен"
 
-#: AudacityApp.cpp:1222
+#: AudacityApp.cpp:1241
 msgid "Command-line options supported:"
 msgstr "Поддерживаемые ключи для командной строки:"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1225
+#: AudacityApp.cpp:1244
 msgid "\t-help (this message)"
 msgstr "\t-help (это сообщение)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1227
+#: AudacityApp.cpp:1246
 msgid "\t-version (display Audacity version)"
 msgstr "\t-version (показать номер версии Audacity)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1231
+#: AudacityApp.cpp:1250
 msgid "\t-test (run self diagnostics)"
 msgstr "\t-test (запустить самодиагностику)"
 
@@ -354,28 +350,26 @@ msgstr "\t-test (запустить самодиагностику)"
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1236
+#: AudacityApp.cpp:1255
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (установить максимальный размер блока в байтах)"
 
-#: AudacityApp.cpp:1237
+#: AudacityApp.cpp:1256
 msgid "In addition, specify the name of an audio file or Audacity project to open it."
 msgstr "Кроме того, укажите имя звукового файла или проекта Audacity, который нужно открыть."
 
-#: AudacityApp.cpp:1514
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+#: AudacityApp.cpp:1536
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Файлы проектов Audacity (.AUP) сейчас не  \n"
+msgstr "Файлы проектов Audacity (.AUP) сейчас не  \n"
 "ассоциированы с Audacity. \n"
 "\n"
 "Ассоциировать их, чтобы они открывались\n"
 "по двойному щелчку мышью?"
 
-#: AudacityApp.cpp:1515
+#: AudacityApp.cpp:1537
 msgid "Audacity Project Files"
 msgstr "Проектные файлы Audacity"
 
@@ -384,11 +378,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Не удалось найти звуковые устройства.\n"
 
 #: AudioIO.cpp:255
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Вы не сможете воспроизводить или записывать звук.\n"
+msgstr "Вы не сможете воспроизводить или записывать звук.\n"
 "\n"
 
 #: AudioIO.cpp:258
@@ -404,8 +396,7 @@ msgid "Latency problem"
 msgstr "Неполадки с задержкой исгнала"
 
 #: AudioIO.cpp:1375
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
 msgstr ""
@@ -415,11 +406,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Автоматическое восстановление после аварии"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Некоторые проекты не были корректно сохранены когда вы в предыдущий раз \n"
+msgstr "Некоторые проекты не были корректно сохранены когда вы в предыдущий раз \n"
 "работали с Audacity. К счастью, некоторые из них можно восстановить:"
 
 #: AutoRecovery.cpp:75
@@ -433,8 +422,7 @@ msgstr "Имя"
 
 #: AutoRecovery.cpp:84
 msgid "Recovering a project will not change any files on disk before you save it."
-msgstr ""
-"При восстановлении проекта ни один файл на диске не изменится, \n"
+msgstr "При восстановлении проекта ни один файл на диске не изменится, \n"
 "пока вы не сохраните проект."
 
 #: AutoRecovery.cpp:88
@@ -450,11 +438,9 @@ msgid "Recover Projects"
 msgstr "Восстановить проекты"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Вы действительно не хотите восстанавливать данные проектов?\n"
+msgstr "Вы действительно не хотите восстанавливать данные проектов?\n"
 "Сделать это позднее не получится."
 
 #: AutoRecovery.cpp:128
@@ -468,100 +454,98 @@ msgstr "Не удалось пронумеровать файлы в папке
 
 #: AutoRecovery.cpp:147
 #: AutoRecovery.cpp:184
-#: Menus.cpp:2977
-#: Menus.cpp:2986
-#: Menus.cpp:5101
-#: Project.cpp:2061
-#: Project.cpp:3450
-#: Project.cpp:3529
-#: TrackPanel.cpp:6383
+#: Menus.cpp:3049
+#: Menus.cpp:3061
+#: Menus.cpp:5178
+#: Project.cpp:2057
+#: Project.cpp:3618
+#: Project.cpp:3697
+#: TrackPanel.cpp:6385
 #: WaveTrack.cpp:598
 #: WaveTrack.cpp:617
 #: WaveTrack.cpp:1058
 #: WaveTrack.cpp:1077
-#: WaveTrack.cpp:2044
+#: WaveTrack.cpp:2087
+#: effects/Contrast.cpp:127
+#: effects/Contrast.cpp:137
 #: effects/Effect.cpp:513
 #: export/ExportMP2.cpp:233
 #: prefs/DirectoriesPrefs.cpp:189
 #: prefs/KeyConfigPrefs.cpp:247
-#: toolbars/ControlToolBar.cpp:539
-#: toolbars/ControlToolBar.cpp:868
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "Ошибка"
 
-#: BatchCommandDialog.cpp:56
-#: BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr "Выберите команду"
 
-#: BatchCommandDialog.cpp:80
+#: BatchCommandDialog.cpp:82
 #: BatchProcessDialog.cpp:454
 #: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
 msgstr "&Команда"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr "&Изменить параметры"
 
-#: BatchCommandDialog.cpp:89
+#: BatchCommandDialog.cpp:91
 #: BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr "&Параметры"
 
-#: BatchCommandDialog.cpp:94
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr "&Выберите команду"
 
-#: BatchCommands.cpp:477
+#: BatchCommands.cpp:456
 msgid "Stereo to Mono Effect not found"
 msgstr "Эффект «Стерео в моно» не найден"
 
-#: BatchCommands.cpp:497
+#: BatchCommands.cpp:476
 msgid "Ogg Vorbis support is not included in this build of Audacity"
 msgstr "Поддержка Ogg Vorbis не включена в эту сборку Audacity"
 
-#: BatchCommands.cpp:509
+#: BatchCommands.cpp:488
 msgid "FLAC support is not included in this build of Audacity"
 msgstr "Поддержка FLAC не включена в эту сборку Audacity"
 
-#: BatchCommands.cpp:513
+#: BatchCommands.cpp:492
 #, c-format
 msgid "Command %s not implemented yet"
 msgstr "Команда %s пока не реализована"
 
-#: BatchCommands.cpp:529
+#: BatchCommands.cpp:508
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Не удалось загрузить параметры эффекта %s\n"
+msgstr "Не удалось загрузить параметры эффекта %s\n"
 "в %s."
 
-#: BatchCommands.cpp:583
+#: BatchCommands.cpp:561
 #, c-format
 msgid "Your batch command of %s was not recognised."
 msgstr "Команда пакетной обработки %s не была распознана."
 
-#: BatchCommands.cpp:674
+#: BatchCommands.cpp:652
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Применить %s с параметром (-ами)\n"
+msgstr "Применить %s с параметром (-ами)\n"
 "\n"
 "%s"
 
-#: BatchCommands.cpp:675
-#: BatchCommands.cpp:680
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
 msgid "Test Mode"
 msgstr "Тестовый режим"
 
-#: BatchCommands.cpp:679
+#: BatchCommands.cpp:657
 #, c-format
 msgid "Apply %s"
 msgstr "Применить %s"
@@ -744,12 +728,10 @@ msgid "Copying audio data into project..."
 msgstr "Звуковые файлы копируются в проект..."
 
 #: Dependencies.cpp:223
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Ваш проект зависит от присутствия в системе внешних файлов.\n"
+msgstr "Ваш проект зависит от присутствия в системе внешних файлов.\n"
 "Вы хотите, чтобы эти данные были включены в проект, чтобы сделать его самодостаточным?\n"
 "Это приведёт к расходу места на диске, но обезопасит проект от потери данных."
 
@@ -816,186 +798,175 @@ msgid "Dependency check"
 msgstr "Проверка зависимостей"
 
 #: DirManager.cpp:137
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Предупреждение: на данном разделе осталось очень мало свободного места.\n"
+msgstr "Предупреждение: на данном разделе осталось очень мало свободного места.\n"
 "Выберите другой каталог для временных файлов в диалоге настроек программы."
 
 #: DirManager.cpp:223
 #: DirManager.cpp:254
-#: DirManager.cpp:333
+#: DirManager.cpp:337
 msgid "Progress"
 msgstr "Прогресс"
 
 #: DirManager.cpp:288
 msgid "Cleaning up temporary files"
-msgstr "Идёт очистка временных файлов"
+msgstr "Выполняется очистка временных файлов"
 
-#: DirManager.cpp:334
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "Сохраняются данные проекта"
 
-#: DirManager.cpp:404
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
-msgstr "Идёт очистка каталогов с кэшем"
+msgstr "Выполняется очистка каталогов с кэшем"
 
-#: DirManager.cpp:491
+#: DirManager.cpp:505
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Программа нашла осиротевший блочный файл %s! \n"
+msgstr "Программа нашла осиротевший блочный файл %s! \n"
 "Вам стоит сохранить и перезагрузить проект, чтобы пройти полную проверку проекта.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:1078
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-old%d"
 
-#: DirManager.cpp:1086
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr "Невозможно открыть/создать тестовый файл"
 
-#: DirManager.cpp:1095
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr "Невозможно удалить '%s'"
 
-#: DirManager.cpp:1100
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "Переименован файл: %s\n"
 
-#: DirManager.cpp:1116
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Изменяется блок %s\n"
-
-#: DirManager.cpp:1144
+#: DirManager.cpp:1160
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Название переименовать '%s' в '%s'"
 
-#: DirManager.cpp:1208
-#: DirManager.cpp:1496
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
 msgid "Inspecting project file data..."
 msgstr "Проверяются данные проектного файла..."
 
-#: DirManager.cpp:1221
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr "Осиротевший блочный файл: (%s)"
 
-#: DirManager.cpp:1246
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr "Отсутствует файл алиаса: (%s)"
 
-#: DirManager.cpp:1266
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr "Отсутствует файл резюме: (%s.auf)"
 
-#: DirManager.cpp:1286
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
 msgstr "Отсутствует файл данных: (%s.au)"
 
-#: DirManager.cpp:1300
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+#: DirManager.cpp:1319
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"Проверка проекта выявила несоответствия при загрузке данных проекта; \n"
+msgstr "Проверка проекта выявила несоответствия при загрузке данных проекта; \n"
 "щёлкните кнопку «Подробности» для получения полного списка ошибок, \n"
 "либо «ОК», чтобы выбрать способ решения это незадачи."
 
-#: DirManager.cpp:1312
+#: DirManager.cpp:1331
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 msgstr ""
 
-#: DirManager.cpp:1317
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
 msgstr "Удалить осиротевшие файлы (безопасно, рекомендуется)"
 
-#: DirManager.cpp:1318
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "Продолжить без удаления; тихо разобраться с дополнительными файлами"
 
-#: DirManager.cpp:1319
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr "Немедленно закрыть проект, не внося изменений"
 
-#: DirManager.cpp:1321
-#: DirManager.cpp:1356
-#: DirManager.cpp:1402
-#: DirManager.cpp:1444
-#: export/Export.cpp:568
-#: export/Export.cpp:585
-#: export/Export.cpp:604
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
 #: widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1366
 #, fuzzy, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Проверка проекта выявила %d входящий файл, используемый\n"
+msgstr "Проверка проекта выявила %d входящий файл, используемый\n"
 "вместо \"alias\" файлов, которые теперь отсутствуют. files'  несоответствия при загрузке данных проекта; щёлкните кнопку «Подробности» для получения полного списка ошибок, \n"
 "либо «ОК», чтобы выбрать способ решения это незадачи."
 
-#: DirManager.cpp:1352
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr "Заменить отсутствующие данные тишиной (насовсем при сохранении)"
 
-#: DirManager.cpp:1353
-#: DirManager.cpp:1441
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr "Временно заменить отсутствующие данные тишиной (только на эту сессию)"
 
-#: DirManager.cpp:1354
-#: DirManager.cpp:1400
-#: DirManager.cpp:1442
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr "Немедленно закрыть проект, не внося дальнейших изменений"
 
-#: DirManager.cpp:1393
+#: DirManager.cpp:1412
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
 msgstr ""
 
-#: DirManager.cpp:1398
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr "Повторно создать файлы сводки [безопасно и рекомендовано]"
 
-#: DirManager.cpp:1399
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
 msgstr ""
 
-#: DirManager.cpp:1435
+#: DirManager.cpp:1454
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
@@ -1004,27 +975,27 @@ msgid ""
 "missing data by hand."
 msgstr ""
 
-#: DirManager.cpp:1440
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr "Заменить отсутствующие данные тишиной (немедленно и насовсем)"
 
-#: DirManager.cpp:1468
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
 msgstr "Одёт очистка неиспользуемых каталогов в проектных данных"
 
-#: DirManager.cpp:1539
+#: DirManager.cpp:1558
 msgid "Caching audio"
 msgstr "Кэшируются звуковые данные"
 
-#: DirManager.cpp:1540
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
 msgstr "Звуковые данные копируются в память..."
 
-#: DirManager.cpp:1573
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
 msgstr "Сохраняется записанный звук"
 
-#: DirManager.cpp:1574
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
 msgstr "Записанный звук сохраняется на диск"
 
@@ -1032,64 +1003,99 @@ msgstr "Записанный звук сохраняется на диск"
 msgid "Rectangular"
 msgstr "Rectangular"
 
-#: FFmpeg.cpp:115
-msgid "FFmpeg library is not found"
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:112
+#, fuzzy
+msgid "FFmpeg library not found"
 msgstr "Библиотека FFmpeg не найдена"
 
-#: FFmpeg.cpp:131
+#: FFmpeg.cpp:167
 msgid "Locate FFmpeg"
 msgstr "Указать FFmpeg"
 
-#: FFmpeg.cpp:151
+#: FFmpeg.cpp:187
 #, c-format
 msgid "Audacity needs the file %s to import and export audio via FFmpeg."
 msgstr ""
 
-#: FFmpeg.cpp:157
+#: FFmpeg.cpp:193
 #: export/ExportMP3.cpp:562
 #, c-format
 msgid "Location of %s:"
 msgstr "Расположение %s:"
 
-#: FFmpeg.cpp:166
+#: FFmpeg.cpp:202
 #: export/ExportMP3.cpp:571
 #, c-format
 msgid "To find %s, click here -->"
 msgstr "Чтобы найти %s, щелкните здесь -->"
 
-#: FFmpeg.cpp:172
+#: FFmpeg.cpp:208
 #: export/ExportMP3.cpp:577
 msgid "Browse..."
 msgstr "Обзор..."
 
-#: FFmpeg.cpp:173
+#: FFmpeg.cpp:209
 msgid "To get a free copy of FFmpeg, click here -->"
 msgstr "Чтобы получить копию FFmpeg, щелкните тут →"
 
-#: FFmpeg.cpp:174
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Скачать..."
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
 
 #. i18n-hint: It's asking for the location of a file, for
 #. example, "Where is lame_enc.dll?" - you could translate
 #. "Where would I find the file %s" instead if you want.
-#: FFmpeg.cpp:196
+#: FFmpeg.cpp:232
 #: export/ExportMP3.cpp:601
 #, c-format
 msgid "Where is %s?"
 msgstr "Где находится %s?"
 
-#: FFmpeg.cpp:250
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:102
 msgid "FFmpeg not found"
 msgstr "Библиотека FFmpeg не найдена"
 
-#: FFmpeg.h:160
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:257
 msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
 msgstr "Только avformat.dll|*avformat*.dll|Динамически слинкованные библиотеки (*.dll)|*.dll|Все файлы (*.*)|*"
 
-#: FFmpeg.h:175
-msgid "Only avformat.so|*avformat*.so*|Dynamically Linked Libraries (*.so)|*.so|All Files (*)|*"
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:311
+#, fuzzy
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Только avformat.sol|*avformat*.so|Динамически слинкованные библиотеки (*.so)|*.dll|Все файлы (*.*)|*"
 
 #: FreqWindow.cpp:103
@@ -1158,14 +1164,15 @@ msgstr "Ось"
 
 #: FreqWindow.cpp:212
 #: LabelDialog.cpp:130
-#: Menus.cpp:236
-#: Menus.cpp:269
+#: Menus.cpp:241
+#: Menus.cpp:276
 msgid "&Export..."
 msgstr "&Экспортировать..."
 
 #: FreqWindow.cpp:213
+#: effects/Contrast.cpp:444
 #: export/ExportCL.cpp:325
-#: export/ExportMultiple.cpp:345
+#: export/ExportMultiple.cpp:347
 msgid "Export"
 msgstr "Экспорт"
 
@@ -1189,7 +1196,7 @@ msgstr "Закрыть"
 #: effects/Equalization.cpp:1408
 #: effects/Equalization.cpp:1419
 #: effects/Normalize.cpp:367
-#: widgets/Meter.cpp:380
+#: widgets/Meter.cpp:417
 msgid "dB"
 msgstr "Дб"
 
@@ -1232,9 +1239,10 @@ msgstr "Экспортировать результаты спектрально
 
 #: FreqWindow.cpp:1087
 #: LabelDialog.cpp:603
-#: Menus.cpp:2485
-#: Project.cpp:2533
-#: Project.cpp:3502
+#: Menus.cpp:2551
+#: Project.cpp:2607
+#: Project.cpp:3670
+#: effects/Contrast.cpp:552
 #: prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
 msgstr "Не удалось произвести запись в файл: "
@@ -1379,11 +1387,11 @@ msgstr "&Доступное кол-во уровней отмены"
 msgid "Levels To Discard"
 msgstr "Уровней отмены"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "От&казаться"
 
-#: HistoryWindow.cpp:111
+#: HistoryWindow.cpp:112
 #: Tags.cpp:2081
 #: Tags.cpp:2083
 #: Tags.cpp:2385
@@ -1420,23 +1428,23 @@ msgid "Track"
 msgstr "Дорожка"
 
 #: LabelDialog.cpp:55
-#: Menus.cpp:4596
-#: Menus.cpp:4631
+#: Menus.cpp:4673
+#: Menus.cpp:4708
 msgid "Label"
 msgstr "Пометка"
 
 #: LabelDialog.cpp:56
-#: TimerRecordDialog.cpp:278
+#: TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr "Время начала"
 
 #: LabelDialog.cpp:57
-#: TimerRecordDialog.cpp:297
+#: TimerRecordDialog.cpp:298
 msgid "End Time"
 msgstr "Время завершения"
 
 #: LabelDialog.cpp:100
-#: Menus.cpp:706
+#: Menus.cpp:713
 msgid "&Edit Labels"
 msgstr "&Изменить пометки"
 
@@ -1461,8 +1469,7 @@ msgid "New..."
 msgstr "Новая..."
 
 #: LabelDialog.cpp:354
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
@@ -1473,19 +1480,19 @@ msgid "Confirm"
 msgstr "Подтверждение"
 
 #: LabelDialog.cpp:516
-#: Menus.cpp:4020
+#: Menus.cpp:4097
 msgid "Select a text file containing labels..."
 msgstr "Выберите текстовый файл, содержащий пометки..."
 
 #: LabelDialog.cpp:520
-#: Menus.cpp:4024
+#: Menus.cpp:4101
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Текстовые файлы (*.txt)|*.txt|Все файлы (*.*)|*.*"
 
 #: LabelDialog.cpp:534
-#: Menus.cpp:4036
-#: Project.cpp:1886
-#: Project.cpp:1894
+#: Menus.cpp:4113
+#: Project.cpp:1917
+#: Project.cpp:1925
 msgid "Could not open file: "
 msgstr "Не удалось открыть файл: "
 
@@ -1494,12 +1501,12 @@ msgid "No labels to export."
 msgstr "Нет меток для экспорта."
 
 #: LabelDialog.cpp:566
-#: Menus.cpp:2448
+#: Menus.cpp:2514
 msgid "Export Labels As:"
 msgstr "Экспортировать пометки как:"
 
 #: LabelDialog.cpp:568
-#: Menus.cpp:2446
+#: Menus.cpp:2512
 msgid "labels.txt"
 msgstr "labels.txt"
 
@@ -1514,7 +1521,7 @@ msgstr "Введите название дорожки"
 #: LabelDialog.cpp:705
 #: LabelDialog.h:52
 #: LabelTrack.cpp:89
-#: Menus.cpp:625
+#: Menus.cpp:632
 msgid "&Label Track"
 msgstr "Дорожка по&меток"
 
@@ -1528,1405 +1535,1404 @@ msgstr "Выберите язык интерфейса для Audacity:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Проект формата 1.0 преобразован в проект нового формата.\n"
+msgstr "Проект формата 1.0 преобразован в проект нового формата.\n"
 "Старый файл сохранён под именем '%s'"
 
 #: Legacy.cpp:357
 msgid "Opening Audacity Project"
 msgstr "Открывается проект Audacity"
 
-#: Menus.cpp:192
+#: Menus.cpp:194
 msgid "&File"
 msgstr "&Файл"
 
-#: Menus.cpp:194
+#: Menus.cpp:196
 msgid "&New\tCtrl+N"
 msgstr "&Создать проект\tCtrl+N"
 
-#: Menus.cpp:196
+#: Menus.cpp:198
 msgid "&Open...\tCtrl+O"
 msgstr "&Открыть...\tCtrl+O"
 
-#: Menus.cpp:201
+#: Menus.cpp:203
 msgid "&Close\tCtrl+W"
 msgstr "&Закрыть\tCtrl+W"
 
-#: Menus.cpp:204
+#: Menus.cpp:206
 msgid "&Save Project\tCtrl+S"
 msgstr "&Сохранить проект\tCtrl+S"
 
-#: Menus.cpp:208
-#: Project.cpp:2741
+#: Menus.cpp:210
+#: Project.cpp:2899
 msgid "Save Project &As..."
 msgstr "Сохранить проект &как...\tCtrl+Shift+S"
 
-#: Menus.cpp:208
+#: Menus.cpp:212
 msgid "Save Compressed Copy of Project..."
 msgstr "Сохранить сжатую копию проекта..."
 
-#: Menus.cpp:211
+#: Menus.cpp:216
 msgid "Chec&k Dependencies..."
 msgstr "П&роверить зависимости..."
 
-#: Menus.cpp:217
+#: Menus.cpp:222
 msgid "Open Me&tadata Editor..."
 msgstr "Открыть редактор &метаданных..."
 
-#: Menus.cpp:224
+#: Menus.cpp:229
 #: import/ImportRaw.cpp:411
 msgid "&Import"
 msgstr "&Импортировать "
 
-#: Menus.cpp:226
+#: Menus.cpp:231
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Звуковой файл...\tCtrl+Shift+I"
 
-#: Menus.cpp:227
+#: Menus.cpp:232
 msgid "&Labels..."
 msgstr "По&метки..."
 
-#: Menus.cpp:229
+#: Menus.cpp:234
 msgid "&MIDI..."
 msgstr "&MIDI..."
 
-#: Menus.cpp:231
+#: Menus.cpp:236
 msgid "&Raw Data..."
 msgstr "Звуковой файл &без заголовка (Raw)..."
 
-#: Menus.cpp:242
-#: Menus.cpp:275
+#: Menus.cpp:247
+#: Menus.cpp:282
 msgid "Expo&rt Selection..."
 msgstr "Экспортировать &выделенное..."
 
-#: Menus.cpp:249
+#: Menus.cpp:254
 msgid "Export &Labels..."
 msgstr "Экспортировать &пометки..."
 
-#: Menus.cpp:250
+#: Menus.cpp:255
 msgid "Export &Multiple..."
 msgstr "Экспортировать в &несколько файлов..."
 
-#: Menus.cpp:251
+#: Menus.cpp:257
 msgid "Export MIDI..."
 msgstr "Экспортировать MIDI..."
 
-#: Menus.cpp:283
+#: Menus.cpp:290
 msgid "CleanSpeech C&hain..."
 msgstr "&Цепочка CleanSpeech..."
 
-#: Menus.cpp:284
-#: Menus.cpp:298
+#: Menus.cpp:291
+#: Menus.cpp:305
 msgid "Edit C&hains..."
 msgstr "Изменить це&почки..."
 
-#: Menus.cpp:285
+#: Menus.cpp:292
 msgid "Export CleanSpeech &Presets..."
 msgstr "&Экспортировать предустановки CleenSpeach..."
 
-#: Menus.cpp:286
+#: Menus.cpp:293
 msgid "I&mport CleanSpeech Presets..."
 msgstr "Им&портировать предустановки CleanSpeech..."
 
-#: Menus.cpp:296
+#: Menus.cpp:303
 msgid "Appl&y Chain..."
 msgstr "Применить &цепочку..."
 
-#: Menus.cpp:303
+#: Menus.cpp:310
 msgid "&Upload File..."
 msgstr "З&агрузить файл на FTP-сервер..."
 
-#: Menus.cpp:309
+#: Menus.cpp:316
 msgid "Pa&ge Setup..."
 msgstr "&Параметры страницы..."
 
-#: Menus.cpp:310
+#: Menus.cpp:317
 msgid "&Print..."
 msgstr "П&ечать..."
 
-#: Menus.cpp:323
+#: Menus.cpp:330
 msgid "E&xit\tCtrl+Q"
 msgstr "В&ыйти\tCtrl+Q"
 
-#: Menus.cpp:331
+#: Menus.cpp:338
 #: toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "&Правка"
 
-#: Menus.cpp:335
+#: Menus.cpp:342
 msgid "&Undo\tCtrl+Z"
 msgstr "О&тменить\tCtrl+Z"
 
-#: Menus.cpp:343
+#: Menus.cpp:350
 #: prefs/KeyConfigPrefs.cpp:371
 #: toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "&Повторить"
 
-#: Menus.cpp:356
+#: Menus.cpp:363
 msgid "Cu&t\tCtrl+X"
 msgstr "Выре&зать\tCtrl+X"
 
-#: Menus.cpp:360
+#: Menus.cpp:367
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr "Разделить в&ырезанием\tCtrl+Alt+X"
 
-#: Menus.cpp:361
+#: Menus.cpp:368
 msgid "&Copy\tCtrl+C"
 msgstr "С&копировать\tCtrl+C"
 
-#: Menus.cpp:365
+#: Menus.cpp:372
 msgid "&Paste\tCtrl+V"
 msgstr "&Вставить\tCtrl+V"
 
-#: Menus.cpp:369
+#: Menus.cpp:376
 msgid "Tri&m\tCtrl+T"
 msgstr "Об&резать по краям\tCtrl+T"
 
-#: Menus.cpp:371
+#: Menus.cpp:378
 msgid "&Delete\tCtrl+K"
 msgstr "&Удалить\tCtrl+K"
 
-#: Menus.cpp:372
+#: Menus.cpp:379
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Разделить &удалением\tCtrl+Alt+K"
 
-#: Menus.cpp:373
+#: Menus.cpp:380
 msgid "Silence Audi&o\tCtrl+L"
 msgstr "Заполнить ти&шиной\tCtrl+L"
 
-#: Menus.cpp:375
+#: Menus.cpp:382
 msgid "Sp&lit\tCtrl+I"
 msgstr "Раз&делить\tCtrl+I"
 
-#: Menus.cpp:380
+#: Menus.cpp:387
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "Разделить в &новую дорожку\tCtrl+Alt+I"
 
-#: Menus.cpp:385
+#: Menus.cpp:392
 msgid "&Join\tCtrl+J"
 msgstr "О&бъединить\tCtrl+J"
 
-#: Menus.cpp:386
+#: Menus.cpp:393
 msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr "Раз&делить по тишине\tCtrl+Alt+J"
 
-#: Menus.cpp:387
+#: Menus.cpp:394
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Про&дублировать\tCtrl+D"
 
-#: Menus.cpp:393
-#: Menus.cpp:632
+#: Menus.cpp:400
+#: Menus.cpp:639
 msgid "Stereo Trac&k to Mono"
 msgstr "Стерео в &моно"
 
-#: Menus.cpp:400
+#: Menus.cpp:407
 msgid "La&beled Regions"
 msgstr "Поме&ченные области"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:402
+#: Menus.cpp:409
 msgid "&Cut\tAlt+X"
 msgstr "Выре&зать\tAlt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:407
+#: Menus.cpp:414
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "Разделить в&ырезанием\tShift+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:412
+#: Menus.cpp:419
 msgid "Co&py\tShift+Alt+C"
 msgstr "С&копировать\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:418
+#: Menus.cpp:425
 msgid "&Delete\tAlt+K"
 msgstr "&Удалить\tAlt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:423
+#: Menus.cpp:430
 msgid "Sp&lit Delete\tShift+Alt+K"
 msgstr "Разделить &удалением\tShift+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:428
+#: Menus.cpp:435
 msgid "Sile&nce\tAlt+L"
 msgstr "&Заполнить тишиной\tAlt+L"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:434
+#: Menus.cpp:441
 msgid "Spli&t\tAlt+I"
 msgstr "&Разделить\tAlt+I"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:439
+#: Menus.cpp:446
 msgid "&Join\tAlt+J"
 msgstr "О&бъединить\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:444
+#: Menus.cpp:451
 msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr "Ра&зделить по тишине\tShift+Alt+J"
 
-#: Menus.cpp:449
+#: Menus.cpp:456
 msgid "&Select"
 msgstr "&Выделить"
 
-#: Menus.cpp:450
+#: Menus.cpp:457
 msgid "&All\tCtrl+A"
 msgstr "&Всё\tCtrl+A"
 
-#: Menus.cpp:451
+#: Menus.cpp:458
 msgid "&None\tCtrl+Shift+A"
 msgstr "С&нять выделение\tCtrl+Shift+A"
 
-#: Menus.cpp:455
+#: Menus.cpp:462
 msgid "&Left at Playback Position\t["
 msgstr "&Слева от позиции воспроизведения\t["
 
-#: Menus.cpp:456
+#: Menus.cpp:463
 msgid "&Right at Playback Position\t]"
 msgstr "С&права от точки воспроизведения\t]"
 
-#: Menus.cpp:460
+#: Menus.cpp:467
 msgid "Track &Start to Cursor\tShift+J"
 msgstr "&От начала дорожки до курсора\tShift+J"
 
-#: Menus.cpp:461
+#: Menus.cpp:468
 msgid "Cursor to Track &End\tShift+K"
 msgstr "От &курсора до конца дорожки\tShift+K"
 
-#: Menus.cpp:467
+#: Menus.cpp:474
 msgid "Find &Zero Crossings\tZ"
 msgstr "Найти бли&жайшие нулевые точки\tZ"
 
-#: Menus.cpp:469
+#: Menus.cpp:476
 msgid "Mo&ve Cursor"
 msgstr "Переместить к&урсор"
 
-#: Menus.cpp:471
+#: Menus.cpp:478
 msgid "to Selection Star&t"
 msgstr "к &началу выделения"
 
-#: Menus.cpp:472
+#: Menus.cpp:479
 msgid "to Selection En&d"
 msgstr "к &концу выделения"
 
-#: Menus.cpp:476
+#: Menus.cpp:483
 msgid "to Track &Start\tJ"
 msgstr "к началу &дорожки\tJ"
 
-#: Menus.cpp:477
+#: Menus.cpp:484
 msgid "to Track &End\tK"
 msgstr "к &концу дорожки\tK"
 
-#: Menus.cpp:484
+#: Menus.cpp:491
 msgid "Re&gion Save"
 msgstr "&Запомнить область"
 
-#: Menus.cpp:485
+#: Menus.cpp:492
 msgid "Regio&n Restore"
 msgstr "Восстановить об&ласть"
 
-#: Menus.cpp:496
+#: Menus.cpp:503
 msgid "Pla&y Region"
 msgstr "Воспроизводима&я область"
 
-#: Menus.cpp:497
+#: Menus.cpp:504
 msgid "&Lock"
 msgstr "&Запереть"
 
-#: Menus.cpp:498
+#: Menus.cpp:505
 msgid "&Unlock"
 msgstr "&Отпереть"
 
-#: Menus.cpp:504
+#: Menus.cpp:511
 msgid "Turn Snap-To On"
 msgstr "Включить привязку"
 
-#: Menus.cpp:505
+#: Menus.cpp:512
 msgid "Turn Snap-To Off"
 msgstr "Выключить привязку"
 
-#: Menus.cpp:506
+#: Menus.cpp:513
 msgid "Turn Grid Snap On"
 msgstr "Включить привязку по сетке"
 
-#: Menus.cpp:507
+#: Menus.cpp:514
 msgid "Turn Grid Snap Off"
 msgstr "Выключить привязку по сетке"
 
 #. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: Menus.cpp:512
+#: Menus.cpp:519
 msgid "Pre&ferences...\tCtrl+,"
 msgstr "&Параметры\tCtrl+,"
 
-#: Menus.cpp:516
+#: Menus.cpp:523
 msgid "Pre&ferences...\tCtrl+P"
 msgstr "&Параметры\tCtrl+P"
 
-#: Menus.cpp:526
+#: Menus.cpp:533
 msgid "&View"
 msgstr "&Вид"
 
-#: Menus.cpp:528
+#: Menus.cpp:535
 msgid "Zoom &In\tCtrl+1"
 msgstr "При&близить\tCtrl+1"
 
-#: Menus.cpp:531
+#: Menus.cpp:538
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "Обы&чный масштаб\tCtrl+2"
 
-#: Menus.cpp:532
+#: Menus.cpp:539
 msgid "Zoom &Out\tCtrl+3"
 msgstr "От&далить\tCtrl+3"
 
-#: Menus.cpp:535
+#: Menus.cpp:542
 msgid "&Fit in Window\tCtrl+F"
 msgstr "&Уместить в окне\tCtrl+F"
 
-#: Menus.cpp:536
+#: Menus.cpp:543
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "Уместить по &вертикали\tCtrl+Shift+F"
 
-#: Menus.cpp:537
+#: Menus.cpp:544
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "Масштабировать в &выделение\tCtrl+E"
 
-#: Menus.cpp:540
+#: Menus.cpp:547
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr "&Свернуть все дорожки\tCtrl+Shift+C"
 
-#: Menus.cpp:541
+#: Menus.cpp:548
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "&Развернуть все дорожки\tCtrl+Shift+X"
 
-#: Menus.cpp:544
+#: Menus.cpp:551
 msgid "&Show Clipping"
-msgstr "&Показывать клиппинг"
+msgstr "&Показывать перегрузку"
 
-#: Menus.cpp:553
+#: Menus.cpp:560
 msgid "&History..."
 msgstr "&История изменений в проекте..."
 
-#: Menus.cpp:559
+#: Menus.cpp:566
 msgid "&Toolbars"
 msgstr "&Панели"
 
-#: Menus.cpp:560
+#: Menus.cpp:567
 msgid "&Control Toolbar"
 msgstr "Панель &управления"
 
-#: Menus.cpp:561
+#: Menus.cpp:568
 msgid "&Device Toolbar"
 msgstr "Панель у&стройств"
 
-#: Menus.cpp:562
+#: Menus.cpp:569
 msgid "&Edit Toolbar"
 msgstr "Панель &редактирования"
 
-#: Menus.cpp:563
+#: Menus.cpp:570
 msgid "&Meter Toolbar"
 msgstr "Панель &индикаторов"
 
-#: Menus.cpp:564
+#: Menus.cpp:571
 msgid "Mi&xer Toolbar"
 msgstr "Панель &микшера"
 
-#: Menus.cpp:565
+#: Menus.cpp:572
 msgid "&Selection Toolbar"
 msgstr "Панель &выделения"
 
-#: Menus.cpp:566
+#: Menus.cpp:573
 msgid "T&ools Toolbar"
 msgstr "Панель и&нструментов"
 
-#: Menus.cpp:567
+#: Menus.cpp:574
 msgid "Transcri&ption Toolbar"
 msgstr "Панель &транскрипции"
 
-#: Menus.cpp:569
+#: Menus.cpp:576
 msgid "&Reset Toolbars"
 msgstr "В&ернуть исходные панели"
 
-#: Menus.cpp:571
+#: Menus.cpp:578
 msgid "!Simplified View"
 msgstr "Упрощенный интерфейс"
 
 #. i18n-hint: 'Transport' is the name given to the set of controls that
 #. play, record, pause etc.
-#: Menus.cpp:580
+#: Menus.cpp:587
 msgid "T&ransport"
 msgstr "&Управление"
 
-#: Menus.cpp:582
-msgid "Play\tSpacebar"
-msgstr "Воспроизвести\tSpacebar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
 
-#: Menus.cpp:584
-msgid "&Loop Play\tShift+Spacebar"
-msgstr "Воспроизвести в &цикле\tShift+Spacebar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
 
-#: Menus.cpp:586
+#: Menus.cpp:593
 msgid "&Pause\tP"
 msgstr "&Приостановить\tP"
 
-#: Menus.cpp:587
-msgid "&Stop\tSpacebar"
-msgstr "&Остановить\tSpacebar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
 
-#: Menus.cpp:588
-#: Menus.cpp:959
+#: Menus.cpp:595
+#: Menus.cpp:1010
 msgid "Skip to Start\tHome"
 msgstr "Перейти к началу дорожки\tHome"
 
-#: Menus.cpp:590
-#: Menus.cpp:960
+#: Menus.cpp:597
+#: Menus.cpp:1011
 msgid "Skip to End\tEnd"
 msgstr "Перейти к концу дорожки\tEnd"
 
-#: Menus.cpp:593
+#: Menus.cpp:600
 msgid "&Record\tR"
 msgstr "&Записать\tR"
 
-#: Menus.cpp:595
+#: Menus.cpp:602
 msgid "&Timer Record...\tShift+T"
 msgstr "&Таймер записи...\tShift+T"
 
-#: Menus.cpp:597
+#: Menus.cpp:604
 msgid "Append Record\tShift+R"
 msgstr "Записать в конец\tShift+R"
 
-#: Menus.cpp:600
+#: Menus.cpp:607
 msgid "Overdub (on/off)"
 msgstr "Запись врезкой (вкл/выкл)"
 
-#: Menus.cpp:602
+#: Menus.cpp:609
 msgid "Software Playthrough (on/off)"
-msgstr "Программное сквозное воспроизведение (вкл/выкл)"
+msgstr "Программный мониторинг записи (вкл/выкл)"
 
-#: Menus.cpp:605
+#: Menus.cpp:612
 msgid "Sound Activated Recording (on/off)"
 msgstr "Запись с активацией по уровню громкости (вкл/выкл)"
 
-#: Menus.cpp:607
+#: Menus.cpp:614
 msgid "Sound Activation Level..."
 msgstr "Уровень громкости для активации..."
 
-#: Menus.cpp:615
+#: Menus.cpp:622
 msgid "&Tracks"
 msgstr "Дорож&ки"
 
-#: Menus.cpp:622
+#: Menus.cpp:629
 msgid "Add &New"
 msgstr "&Создать"
 
-#: Menus.cpp:623
+#: Menus.cpp:630
 msgid "&Audio Track\tCtrl+Shift+N"
-msgstr "З&вуковая дорожка\tCtrl+Shift+N"
+msgstr "&Монофоническая дорожка\tCtrl+Shift+N"
 
-#: Menus.cpp:624
+#: Menus.cpp:631
 msgid "&Stereo Track"
-msgstr "&Стереодорожка"
+msgstr "&Стереофоническая дорожка"
 
-#: Menus.cpp:626
+#: Menus.cpp:633
 #: TimeTrack.cpp:44
 msgid "&Time Track"
 msgstr "Дорожка &времени"
 
-#: Menus.cpp:636
+#: Menus.cpp:643
 msgid "Mi&x and Render"
 msgstr "&Свести в одну дорожку"
 
-#: Menus.cpp:640
+#: Menus.cpp:647
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr "Свести в новую дорожку\tCtrl+Shift+M"
 
-#: Menus.cpp:644
+#: Menus.cpp:651
 msgid "&Resample..."
 msgstr "Сменить частоту диск&ретизации дорожки"
 
-#: Menus.cpp:654
+#: Menus.cpp:661
 msgid "Remo&ve Tracks"
 msgstr "&Удалить дорожки"
 
-#: Menus.cpp:660
+#: Menus.cpp:667
 msgid "&Mute All Tracks\tCtrl+U"
 msgstr "&Приглушить все дорожки\tCtrl+U"
 
-#: Menus.cpp:661
+#: Menus.cpp:668
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
 msgstr "&Вернуть громкость всем дорожкам\tCtrl+Shift+U"
 
-#: Menus.cpp:665
+#: Menus.cpp:672
 msgid "Align with &Zero"
 msgstr "Выровнять по &нулю"
 
-#: Menus.cpp:666
+#: Menus.cpp:673
 msgid "Align with &Cursor"
 msgstr "Выровнять по &курсору"
 
-#: Menus.cpp:667
+#: Menus.cpp:674
 msgid "Align with Selection &Start"
 msgstr "Выровнять по &началу выделения"
 
-#: Menus.cpp:668
+#: Menus.cpp:675
 msgid "Align with Selection &End"
 msgstr "Выровнять по концу &выделения"
 
-#: Menus.cpp:669
+#: Menus.cpp:676
 msgid "Align End with Cu&rsor"
 msgstr "&Выровнять окончание в позицию курсора"
 
-#: Menus.cpp:670
+#: Menus.cpp:677
 msgid "Align End with Selection Star&t"
 msgstr "Выровнять &окончание в начало выделения"
 
-#: Menus.cpp:671
+#: Menus.cpp:678
 msgid "Align End with Selection En&d"
 msgstr "Выровнять окончание в &конец выделения"
 
-#: Menus.cpp:672
+#: Menus.cpp:679
 msgid "Align Tracks To&gether"
 msgstr "Выровнять &дорожки"
 
-#: Menus.cpp:674
+#: Menus.cpp:681
 msgid "&Align Tracks"
 msgstr "В&ыровнять дорожки"
 
-#: Menus.cpp:683
+#: Menus.cpp:690
 msgid "Ali&gn and Move Cursor"
 msgstr "Выровнять и переместить &курсор"
 
-#: Menus.cpp:690
+#: Menus.cpp:697
 msgid "Synchronize MIDI with Audio"
 msgstr "Синхронизировать MIDI со звуком"
 
-#: Menus.cpp:699
+#: Menus.cpp:706
 msgid "Link Audio and Label Tracks"
 msgstr "Связывать звуковые и пометочные дорожки"
 
-#: Menus.cpp:702
+#: Menus.cpp:709
 msgid "Add &Label At Selection\tCtrl+B"
 msgstr "До&бавить пометку к выделению\tCtrl+B"
 
-#: Menus.cpp:703
+#: Menus.cpp:710
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Доб&авить пометку в точку воспроизведения\tCtrl+M"
 
-#: Menus.cpp:709
+#: Menus.cpp:716
 msgid "S&ort tracks"
 msgstr "Отсортировать &дорожки"
 
-#: Menus.cpp:710
+#: Menus.cpp:717
 msgid "by &Start time"
 msgstr "по &времени начала"
 
-#: Menus.cpp:712
+#: Menus.cpp:719
 msgid "by &Name"
 msgstr "по н&азванию"
 
-#: Menus.cpp:722
+#: Menus.cpp:730
 msgid "&Generate"
 msgstr "Созда&ние"
 
-#: Menus.cpp:809
-#: Menus.cpp:871
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
 msgid "Unsorted"
 msgstr "Без сортировки"
 
-#: Menus.cpp:745
+#: Menus.cpp:795
 msgid "Effe&ct"
 msgstr "Эффек&ты"
 
-#: Menus.cpp:749
+#: Menus.cpp:799
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "Повторить последний эффект\tCtrl+R"
 
-#: Menus.cpp:826
+#: Menus.cpp:877
 msgid "&Analyze"
 msgstr "&Анализ"
 
-#: Menus.cpp:828
+#: Menus.cpp:879
 msgid "Plot Spectrum..."
 msgstr "Построить график спектра..."
 
-#: Menus.cpp:896
-#: Menus.cpp:899
+#: Menus.cpp:947
+#: Menus.cpp:950
 msgid "&Help"
 msgstr "&Справка"
 
-#: Menus.cpp:902
+#: Menus.cpp:953
 msgid "&About Audacity CleanSpeech..."
 msgstr "&Об Audacity CleanSpeech..."
 
-#: Menus.cpp:906
+#: Menus.cpp:957
 msgid "&Show Welcome Message..."
 msgstr "&Вводный курс..."
 
-#: Menus.cpp:907
+#: Menus.cpp:958
 msgid "&Index..."
 msgstr "&Содержание..."
 
-#: Menus.cpp:908
+#: Menus.cpp:959
 msgid "Show &Log..."
 msgstr "Показать &журнал..."
 
-#: Menus.cpp:916
+#: Menus.cpp:967
 msgid "&Screenshot Tools..."
 msgstr "&Захват снимков экрана..."
 
-#: Menus.cpp:919
+#: Menus.cpp:970
 msgid "&Run Benchmark..."
 msgstr "&Запустить тест производительности..."
 
-#: Menus.cpp:921
+#: Menus.cpp:972
 msgid "&Audio Device Info..."
 msgstr "&Информация о звуковом устройстве..."
 
-#: Menus.cpp:930
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:931
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
-#: Menus.cpp:934
+#: Menus.cpp:985
 msgid "Selection Tool\tF1"
 msgstr "Выделение\tF1"
 
-#: Menus.cpp:935
+#: Menus.cpp:986
 msgid "Envelope Tool\tF2"
 msgstr "Изменение огибающей\tF2"
 
-#: Menus.cpp:936
+#: Menus.cpp:987
 msgid "Draw Tool\tF3"
 msgstr "Изменение огибающей\tF3"
 
-#: Menus.cpp:937
+#: Menus.cpp:988
 msgid "Zoom Tool\tF4"
 msgstr "Масштабирование\tF4"
 
-#: Menus.cpp:938
+#: Menus.cpp:989
 msgid "Time Shift Tool\tF5"
 msgstr "Перемещение\tF5"
 
-#: Menus.cpp:939
+#: Menus.cpp:990
 msgid "Multi Tool\tF6"
 msgstr "Универсальный инструмент\tF6"
 
-#: Menus.cpp:941
+#: Menus.cpp:992
 msgid "Next Tool\tD"
 msgstr "Следующий инструмент\tD"
 
-#: Menus.cpp:942
+#: Menus.cpp:993
 msgid "Previous Tool\tA"
 msgstr "Предыдущий инструмент\tA"
 
-#: Menus.cpp:944
-msgid "Play/Stop\tSpacebar"
-msgstr "Воспроизвести/Остановить\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
-#: Menus.cpp:945
+#: Menus.cpp:996
 msgid "Stop\tS"
 msgstr "Остановить\tS"
 
-#: Menus.cpp:946
+#: Menus.cpp:997
 msgid "Pause\tP"
 msgstr "Приостановить\tP"
 
-#: Menus.cpp:947
+#: Menus.cpp:998
 msgid "Record\tR"
 msgstr "Записать\tR"
 
-#: Menus.cpp:948
+#: Menus.cpp:999
 msgid "Record Append\tShift+R"
 msgstr "Записать в конец дорожки\tShift+R"
 
-#: Menus.cpp:950
+#: Menus.cpp:1001
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "Воспроисти/Остановить и установить курсор\tShift+A"
 
-#: Menus.cpp:953
+#: Menus.cpp:1004
 msgid "Play One Second\t1"
 msgstr "Воспроизвести 1 с\t1"
 
-#: Menus.cpp:954
+#: Menus.cpp:1005
 msgid "Play To Selection\tB"
 msgstr "Воспроизвести выделение\tB"
 
-#: Menus.cpp:955
+#: Menus.cpp:1006
 msgid "Play Looped\tL"
 msgstr "Воспроизводить в цикле\tL"
 
-#: Menus.cpp:956
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Воспроизвести в цикле\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
-#: Menus.cpp:957
+#: Menus.cpp:1008
 msgid "Play Cut Preview\tC"
 msgstr "Проиграть результат вырезания\tC"
 
-#: Menus.cpp:962
+#: Menus.cpp:1013
 msgid "Selection to Start\tShift+Home"
 msgstr "Выделить до начала дорожки\tShift+Home"
 
-#: Menus.cpp:963
+#: Menus.cpp:1014
 msgid "Selection to End\tShift+End"
 msgstr "Выделить от курсора до конца\tShift+End"
 
-#: Menus.cpp:965
+#: Menus.cpp:1016
 msgid "DeleteKey\tBackspace"
 msgstr "Клавиша удаления\tBackspace"
 
-#: Menus.cpp:970
+#: Menus.cpp:1021
 msgid "DeleteKey2\tDelete"
 msgstr "Вторая клавиша удаления\tDelete"
 
-#: Menus.cpp:976
+#: Menus.cpp:1027
 msgid "Seek left short period during playback\tLeft"
 msgstr ""
 
-#: Menus.cpp:977
+#: Menus.cpp:1028
 msgid "Seek right short period during playback\tRight"
 msgstr ""
 
-#: Menus.cpp:978
+#: Menus.cpp:1029
 msgid "Seek left long period during playback\tShift+Left"
 msgstr ""
 
-#: Menus.cpp:979
+#: Menus.cpp:1030
 msgid "Seek right long period during playback\tShift+Right"
 msgstr ""
 
-#: Menus.cpp:983
+#: Menus.cpp:1034
 msgid "Move Focus to Previous Track\tUp"
 msgstr "Перейти на дорожку вверх\tUp"
 
-#: Menus.cpp:984
+#: Menus.cpp:1035
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
 msgstr "Перейти на дорожку вверх и сменить выделение\tShift+Up"
 
-#: Menus.cpp:985
+#: Menus.cpp:1036
 msgid "Move Focus to Next Track\tDown"
 msgstr "Перейти на дорожку вниз\tDown"
 
-#: Menus.cpp:986
+#: Menus.cpp:1037
 msgid "Move Focus to Next and Change Selection\tShift+Down"
 msgstr "Перейти на дорожку вниз и сменить выделение\tShift+Down"
 
-#: Menus.cpp:987
+#: Menus.cpp:1038
 msgid "Toggle Focused Track\tReturn"
 msgstr "Переключить фокус дорожки\tReturn"
 
-#: Menus.cpp:988
+#: Menus.cpp:1039
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Переключить фокус дорожки\tNUMPAD_ENTER"
 
-#: Menus.cpp:989
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Переключить фокус дорожки\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
-#: Menus.cpp:991
+#: Menus.cpp:1042
 msgid "Cursor Left\tLeft"
 msgstr "Курсор влево\tLeft"
 
-#: Menus.cpp:992
+#: Menus.cpp:1043
 msgid "Cursor Right\tRight"
 msgstr "Курсор вправо\tRight"
 
-#: Menus.cpp:993
+#: Menus.cpp:1044
 msgid "Cursor Short Jump Left\t,"
 msgstr ""
 
-#: Menus.cpp:994
+#: Menus.cpp:1045
 msgid "Cursor Short Jump Right\t."
 msgstr ""
 
-#: Menus.cpp:995
+#: Menus.cpp:1046
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr ""
 
-#: Menus.cpp:996
+#: Menus.cpp:1047
 msgid "Cursor Long Jump Right\tShift+."
 msgstr ""
 
-#: Menus.cpp:998
+#: Menus.cpp:1049
 msgid "Selection Extend Left\tShift+Left"
 msgstr "Растянуть выделение слева\tShift+Left"
 
-#: Menus.cpp:999
+#: Menus.cpp:1050
 msgid "Selection Extend Right\tShift+Right"
 msgstr "Растянуть выделение справа\tShift+Right"
 
-#: Menus.cpp:1001
+#: Menus.cpp:1052
 msgid "Set (or Extend) Left Selection"
 msgstr ""
 
-#: Menus.cpp:1002
+#: Menus.cpp:1053
 msgid "Set (or Extend) Right Selection"
 msgstr ""
 
-#: Menus.cpp:1004
+#: Menus.cpp:1055
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "Стянуть выделение слева\tCtrl+Shift+Right"
 
-#: Menus.cpp:1005
+#: Menus.cpp:1056
 msgid "Selection Contract Right\tCtrl+Shift+Left"
 msgstr "Стянуть выделение справа\tCtrl+Shift+Left"
 
-#: Menus.cpp:1007
+#: Menus.cpp:1058
 msgid "Change pan on focused track\tShift+P"
 msgstr "Изменить панораму активной дорожки\tShift+G"
 
-#: Menus.cpp:1008
+#: Menus.cpp:1059
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr "Панорамирование влево для активной дорожки\tCtrl+Shift+Left"
 
-#: Menus.cpp:1009
+#: Menus.cpp:1060
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr "Панорамирование влево для активной дорожки\tCtrl+Shift+Right"
 
-#: Menus.cpp:1010
+#: Menus.cpp:1061
 msgid "Change gain on focused track\tShift+G"
 msgstr "Изменить усиление активной дорожки\tShift+G"
 
-#: Menus.cpp:1011
+#: Menus.cpp:1062
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr "Увеличить усиление активной дорожки\tAlt+Shift+Up"
 
-#: Menus.cpp:1012
+#: Menus.cpp:1063
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr "Уменьшить усиление активной дорожки\tAlt+Shift+Down"
 
-#: Menus.cpp:1013
+#: Menus.cpp:1064
 msgid "Open menu on focused track\tShift+M"
 msgstr "Открыть меню активной дорожки\tShift+M"
 
-#: Menus.cpp:1014
+#: Menus.cpp:1065
 msgid "Mute/Unmute focused track\tShift+U"
 msgstr "Приглушить/вернуть звук дорожке в фокусе\tShift+U"
 
-#: Menus.cpp:1015
+#: Menus.cpp:1066
 msgid "Solo/Unsolo focused track\tShift+S"
 msgstr "Включить или отключить соло для активной дорожки\tShift+S"
 
-#: Menus.cpp:1016
+#: Menus.cpp:1067
 msgid "Close focused track\tShift+C"
 msgstr "Закрыть активную дорожку\tShift+C"
 
-#: Menus.cpp:1018
+#: Menus.cpp:1069
 msgid "Snap To On"
 msgstr "Включить прилипание"
 
-#: Menus.cpp:1019
+#: Menus.cpp:1070
 msgid "Snap To Off"
 msgstr "Отключить прилипание"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:1100
+#: Menus.cpp:1153
 msgid "Open Recent"
 msgstr "Недавние файлы"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:1103
+#: Menus.cpp:1156
 msgid "Recent &Files"
 msgstr "&Недавние файлы"
 
-#: Menus.cpp:1152
+#: Menus.cpp:1205
 #, c-format
 msgid "&Undo %s"
 msgstr "&Отменить операцию \"%s\""
 
-#: Menus.cpp:1178
+#: Menus.cpp:1231
 msgid "Can't Undo"
 msgstr "Невозможно отменить"
 
-#: Menus.cpp:1187
+#: Menus.cpp:1240
 #, c-format
 msgid "&Redo %s"
 msgstr "&Повторить операцию \"%s\""
 
-#: Menus.cpp:1193
+#: Menus.cpp:1246
 msgid "Can't Redo"
 msgstr "Невозможно повторить"
 
-#: Menus.cpp:1797
+#: Menus.cpp:1852
 msgid "Sort By Time"
 msgstr "По времени"
 
-#: Menus.cpp:1797
+#: Menus.cpp:1852
 msgid "Tracks sorted by time"
 msgstr "Дорожки выстроены по времени"
 
-#: Menus.cpp:1823
+#: Menus.cpp:1878
 msgid "Sort By Name"
 msgstr "По названию"
 
-#: Menus.cpp:1823
+#: Menus.cpp:1878
 msgid "Tracks sorted by name"
 msgstr "Дорожки выстроены по имени"
 
-#: Menus.cpp:1974
+#: Menus.cpp:2029
 msgid "Set Left Selection Bound"
 msgstr "Указать левый край выделения"
 
-#: Menus.cpp:2008
+#: Menus.cpp:2064
 msgid "Set Right Selection Bound"
 msgstr "Указать правый край выделения"
 
-#: Menus.cpp:2276
+#: Menus.cpp:2333
 msgid "You must select a track first."
 msgstr "Предварительно выделите дорожку."
 
-#: Menus.cpp:2306
+#: Menus.cpp:2365
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "Повторить %s\tCtrl+R"
 
-#: Menus.cpp:2442
+#: Menus.cpp:2508
 msgid "There are no label tracks to export."
 msgstr "Экспортируемых дорожек для пометок нет"
 
-#: Menus.cpp:2535
+#: Menus.cpp:2603
 msgid "Export MIDI As:"
 msgstr "Экспортировать файл MIDI под именем:"
 
-#: Menus.cpp:2539
+#: Menus.cpp:2607
 msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
 msgstr "Файлы MIDI (*.mid)|*.mid|Файлы Allegro (*.gro)|*.gro"
 
-#: Menus.cpp:2572
-msgid ""
-"You have selected a filename with an unrecognized file extension.\n"
+#: Menus.cpp:2639
+msgid "You have selected a filename with an unrecognized file extension.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: Menus.cpp:2577
+#: Menus.cpp:2640
 msgid "Export MIDI"
 msgstr "Экспорт MIDI"
 
-#: Menus.cpp:2634
+#: Menus.cpp:2698
 msgid "Nothing to undo"
 msgstr "Нечего отменить"
 
-#: Menus.cpp:2654
+#: Menus.cpp:2718
 msgid "Nothing to redo"
 msgstr "Нечего повторить"
 
-#: Menus.cpp:2738
+#: Menus.cpp:2805
 #: TrackPanel.cpp:596
 #: toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Вырезать"
 
-#: Menus.cpp:2738
+#: Menus.cpp:2805
 msgid "Cut to the clipboard"
 msgstr "Вырезать в буфер"
 
-#: Menus.cpp:2778
+#: Menus.cpp:2845
 msgid "Split Cut"
-msgstr "Разделить вырезанием"
+msgstr "Вырезать с разделением"
 
-#: Menus.cpp:2778
+#: Menus.cpp:2845
 msgid "Split-cut to the clipboard"
-msgstr "Разделено вырезанием в буфер обмена"
+msgstr "Вырезано в буфер обмена с разделением"
 
-#: Menus.cpp:2843
-#: Menus.cpp:2915
-#: Menus.cpp:3094
+#: Menus.cpp:2910
+#: Menus.cpp:2982
+#: Menus.cpp:3174
 #: TrackPanel.cpp:598
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Вставить"
 
-#: Menus.cpp:2843
+#: Menus.cpp:2910
 msgid "Pasted text from the clipboard"
 msgstr "Вставка текста из буфера обмена"
 
-#: Menus.cpp:2915
-#: Menus.cpp:3094
+#: Menus.cpp:2982
+#: Menus.cpp:3174
 msgid "Pasted from the clipboard"
 msgstr "Вставка из буфера обмена"
 
-#: Menus.cpp:3042
+#: Menus.cpp:3048
 msgid "Pasting one type of track into another is not allowed."
 msgstr ""
 
-#: Menus.cpp:2985
+#: Menus.cpp:3060
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
 
-#: Menus.cpp:3134
+#: Menus.cpp:3210
 #: toolbars/EditToolBar.cpp:139
 msgid "Trim"
-msgstr "Обрезать по краям"
+msgstr "Обрезать края"
 
-#: Menus.cpp:3134
+#: Menus.cpp:3210
 msgid "Trim file to selection"
 msgstr "Оставить в файле только выделенное"
 
-#: Menus.cpp:3163
+#: Menus.cpp:3239
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
-msgstr "Удалено разделением %.2f с начиная с t=%.2f"
+msgstr "Удалено с разделением %.2f с начиная с t=%.2f"
 
-#: Menus.cpp:3166
+#: Menus.cpp:3242
 msgid "Split Delete"
-msgstr "Разделить удалением"
+msgstr "Удалить с разделением"
 
-#: Menus.cpp:3187
+#: Menus.cpp:3263
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr "Разъединено %.2f с начиная с t=%.2f"
 
-#: Menus.cpp:3190
+#: Menus.cpp:3266
 msgid "Disjoin"
 msgstr "Разъединить"
 
-#: Menus.cpp:3211
+#: Menus.cpp:3287
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr "Объединено %.2f с начиная с t=%.2f"
 
-#: Menus.cpp:3214
+#: Menus.cpp:3290
 msgid "Join"
 msgstr "Объединить"
 
-#: Menus.cpp:3233
+#: Menus.cpp:3309
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "В выделенные дорожки записано %.2f с с отметки %.2f"
 
-#: Menus.cpp:3235
+#: Menus.cpp:3311
 #: toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Создать тишину"
 
-#: Menus.cpp:3269
+#: Menus.cpp:3345
 msgid "Duplicate"
 msgstr "Продублировать"
 
-#: Menus.cpp:3269
+#: Menus.cpp:3345
 msgid "Duplicated"
 msgstr "Продублированный"
 
-#: Menus.cpp:3288
+#: Menus.cpp:3364
 msgid "Cut Labels"
 msgstr "Вырезать пометки"
 
-#: Menus.cpp:3288
+#: Menus.cpp:3364
 msgid "Cut labeled regions to the clipboard"
 msgstr "Вырезать помеченные области в буфер обмена"
 
-#: Menus.cpp:3302
+#: Menus.cpp:3378
 msgid "SplitCut labeled regions to the clipboard"
 msgstr ""
 
-#: Menus.cpp:3303
+#: Menus.cpp:3379
 msgid "Split Cut Labels"
 msgstr "Разделить вырезанием по пометкам"
 
-#: Menus.cpp:3317
+#: Menus.cpp:3393
 msgid "Copied labeled regions to the clipboard"
 msgstr "Копирование помеченных областей в буфер обмена"
 
-#: Menus.cpp:3317
+#: Menus.cpp:3393
 msgid "Copy Labels"
 msgstr "Скопировать пометки"
 
-#: Menus.cpp:3329
+#: Menus.cpp:3405
 msgid "Delete Labels"
 msgstr "Удалить пометки"
 
-#: Menus.cpp:3329
+#: Menus.cpp:3405
 msgid "Deleted labeled regions"
 msgstr "Удалены помеченные области"
 
-#: Menus.cpp:3341
+#: Menus.cpp:3417
 msgid "Split Delete Labels"
 msgstr "Разделить удалением по пометкам"
 
-#: Menus.cpp:3341
+#: Menus.cpp:3417
 msgid "Split Deleted labeled regions"
 msgstr "Удалены разделением помеченные области"
 
-#: Menus.cpp:3353
+#: Menus.cpp:3429
 msgid "Silence Labels"
 msgstr "Заполнить тишиной помеченные области"
 
-#: Menus.cpp:3353
+#: Menus.cpp:3429
 msgid "Silenced labeled regions"
 msgstr "Заполнены тишиной помеченные области"
 
-#: Menus.cpp:3365
+#: Menus.cpp:3441
 msgid "Split Labels"
 msgstr "Разделить по пометкам"
 
-#: Menus.cpp:3365
+#: Menus.cpp:3441
 msgid "Split labeled regions"
 msgstr "Разделить помеченные области"
 
-#: Menus.cpp:3377
+#: Menus.cpp:3453
 msgid "Join Labels"
 msgstr "Объединить пометки"
 
-#: Menus.cpp:3377
+#: Menus.cpp:3453
 msgid "Joined labeled regions"
 msgstr "Объединены помеченные области"
 
-#: Menus.cpp:3389
+#: Menus.cpp:3465
 msgid "Disjoin Labels"
 msgstr "Разъединить пометки"
 
-#: Menus.cpp:3389
+#: Menus.cpp:3465
 msgid "Disjoined labeled regions"
 msgstr "Разъединены помеченные области"
 
-#: Menus.cpp:3411
-#: TrackPanel.cpp:6132
+#: Menus.cpp:3487
+#: TrackPanel.cpp:6134
 msgid "Split"
 msgstr "Разделить"
 
-#: Menus.cpp:3505
+#: Menus.cpp:3581
 msgid "Split New"
 msgstr "Разделить в новую дорожку"
 
-#: Menus.cpp:3505
+#: Menus.cpp:3581
 msgid "Split to new track"
 msgstr "Разделить в новую дорожку"
 
-#: Menus.cpp:3588
+#: Menus.cpp:3664
 msgid "Split at labels"
 msgstr "Разделить по пометкам"
 
-#: Menus.cpp:3889
+#: Menus.cpp:3965
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
-msgstr ""
-"Для построения спектрограммы все выбранные дорожки\n"
+msgstr "Для построения спектрограммы все выбранные дорожки\n"
 "должны иметь одинаковую частоту"
 
-#: Menus.cpp:3915
+#: Menus.cpp:3991
 #, c-format
 msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
-msgstr ""
-"Выделен слишком большой звуковой фрагмент.\n"
+msgstr "Выделен слишком большой звуковой фрагмент.\n"
 "Будут проанализированы только первые %.1f секунд."
 
-#: Menus.cpp:4049
+#: Menus.cpp:4126
 #, c-format
 msgid "Imported labels from '%s'"
 msgstr "Импортированы пометки из файла '%s'"
 
-#: Menus.cpp:4050
+#: Menus.cpp:4127
 msgid "Import Labels"
 msgstr "Импорт пометок"
 
-#: Menus.cpp:4061
+#: Menus.cpp:4138
 msgid "Select a MIDI file..."
 msgstr "Выбрать MIDI-файл..."
 
-#: Menus.cpp:4136
+#: Menus.cpp:4142
 msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
 msgstr "Файлы MIDI и Allegro (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|Файлы MIDI (*.mid;*.midi)|*.mid;*.midi|Файлы Allegro (*.gro)|*.gro|Все файлы (*.*)|*.*"
 
-#: Menus.cpp:4081
+#: Menus.cpp:4158
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "Импортирован MIDI-файл из '%s'"
 
-#: Menus.cpp:4082
+#: Menus.cpp:4159
 msgid "Import MIDI"
 msgstr "Импорт MIDI-файла"
 
-#: Menus.cpp:4096
+#: Menus.cpp:4173
 msgid "Select any uncompressed audio file..."
 msgstr "Выберите любой некомпрессированный звуковой файл..."
 
-#: Menus.cpp:4100
+#: Menus.cpp:4177
 msgid "All files (*)|*"
 msgstr "Все файлы (*)|*"
 
-#: Menus.cpp:4124
+#: Menus.cpp:4201
 msgid "Edit the metadata tags"
 msgstr "Правка метаданных"
 
-#: Menus.cpp:4125
-#: export/Export.cpp:345
+#: Menus.cpp:4202
+#: export/Export.cpp:353
 msgid "Edit Metadata"
 msgstr "Правка метаданных"
 
-#: Menus.cpp:4125
+#: Menus.cpp:4202
 msgid "Edit Metadata tags"
 msgstr "Правка метаданных"
 
-#: Menus.cpp:4181
+#: Menus.cpp:4258
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr ""
 
-#: Menus.cpp:4182
+#: Menus.cpp:4259
 msgid "Render"
 msgstr ""
 
-#: Menus.cpp:4187
+#: Menus.cpp:4264
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
 msgstr ""
 
-#: Menus.cpp:4190
+#: Menus.cpp:4267
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
-#: Menus.cpp:4192
+#: Menus.cpp:4269
 #: Mix.cpp:121
 msgid "&Mix and Render"
 msgstr "С&вести"
 
-#: Menus.cpp:4322
+#: Menus.cpp:4399
 msgid "Aligned with zero"
 msgstr "Выровненные по нулю"
 
-#: Menus.cpp:4326
+#: Menus.cpp:4403
 msgid "Aligned cursor"
 msgstr "Выровнено по курсору"
 
-#: Menus.cpp:4330
+#: Menus.cpp:4407
 msgid "Aligned with selection start"
 msgstr "Выровнять по началу выделения"
 
-#: Menus.cpp:4334
+#: Menus.cpp:4411
 msgid "Aligned with selection end"
 msgstr "Выровнять по концу выделения"
 
-#: Menus.cpp:4338
+#: Menus.cpp:4415
 msgid "Aligned end with cursor"
 msgstr "Выровнять окончание в позицию курсора"
 
-#: Menus.cpp:4342
+#: Menus.cpp:4419
 msgid "Aligned end with selection start"
 msgstr "Выровнять окончание в начало выделения"
 
-#: Menus.cpp:4346
+#: Menus.cpp:4423
 msgid "Aligned end with selection end"
 msgstr "Выровнять окончание в конец выделения"
 
-#: Menus.cpp:4350
+#: Menus.cpp:4427
 msgid "Aligned"
 msgstr "Дорожки выровнены"
 
-#: Menus.cpp:4383
+#: Menus.cpp:4460
 msgid "Align"
 msgstr "Выровнять"
 
-#: Menus.cpp:4468
+#: Menus.cpp:4545
 msgid "Sync MIDI with Audio"
 msgstr "Синхронизировать MIDI со звуком"
 
-#: Menus.cpp:4472
+#: Menus.cpp:4549
 msgid "Alignment completed."
 msgstr "Выравнивание завершено."
 
-#: Menus.cpp:4483
+#: Menus.cpp:4560
 msgid "Created new audio track"
 msgstr "Создана новая звуковая дорожка"
 
-#: Menus.cpp:4483
-#: Menus.cpp:4506
-#: Menus.cpp:4521
-#: Menus.cpp:4541
+#: Menus.cpp:4560
+#: Menus.cpp:4583
+#: Menus.cpp:4598
+#: Menus.cpp:4618
 msgid "New Track"
 msgstr "Новая дорожка"
 
-#: Menus.cpp:4506
+#: Menus.cpp:4583
 msgid "Created new stereo audio track"
 msgstr "Создана новая стереодорожка"
 
-#: Menus.cpp:4521
+#: Menus.cpp:4598
 msgid "Created new label track"
 msgstr "Создан новая дорожка для пометок"
 
-#: Menus.cpp:4530
+#: Menus.cpp:4607
 msgid "The version of Audacity you are using does not support multiple time tracks."
-msgstr ""
-"Загруженная версия Audacity не может использовать\n"
+msgstr "Загруженная версия Audacity не может использовать\n"
 "несколько дорожек времени в одном проекте."
 
-#: Menus.cpp:4541
+#: Menus.cpp:4618
 msgid "Created new time track"
 msgstr "Создана новая дорожка времени"
 
-#: Menus.cpp:4596
+#: Menus.cpp:4673
 msgid "Added label"
 msgstr "Заметка добавлена"
 
-#: Menus.cpp:4631
+#: Menus.cpp:4708
 msgid "Edited labels"
 msgstr "Изменены пометки"
 
-#: Menus.cpp:4658
+#: Menus.cpp:4735
 msgid "Save CleanSpeech Preset File As:"
 msgstr "Сохранить пресет CleanSpeech как:"
 
-#: Menus.cpp:4662
+#: Menus.cpp:4739
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr "Предустановки CleanSpeech (*.csp)|*.csp"
 
-#: Menus.cpp:4669
-#: export/Export.cpp:593
+#: Menus.cpp:4746
+#: export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "Извините, но пути, содержащие более 256 символов, не поддерживаются."
 
-#: Menus.cpp:4715
+#: Menus.cpp:4792
 msgid "Problem encountered exporting presets."
 msgstr "Обнаружена неполадка при экспорте предустановок."
 
-#: Menus.cpp:4716
-#: export/Export.cpp:460
+#: Menus.cpp:4793
+#: export/Export.cpp:468
 msgid "Unable to export"
 msgstr "Невозможно экспортировать"
 
-#: Menus.cpp:4900
+#: Menus.cpp:4977
 msgid "Remove Track"
 msgstr "Удалить дорожку"
 
-#: Menus.cpp:4900
+#: Menus.cpp:4977
 msgid "Removed audio track(s)"
 msgstr "Удалена(ы) дорожка(и)"
 
-#: Menus.cpp:5057
-#: Menus.cpp:5112
-#: export/ExportFFmpeg.cpp:2681
+#: Menus.cpp:5134
+#: Menus.cpp:5189
+#: export/ExportFFmpeg.cpp:710
 #: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr "Смена частоты сэмплирования"
 
-#: Menus.cpp:5077
-#: TrackPanel.cpp:6359
+#: Menus.cpp:5154
+#: TrackPanel.cpp:6361
 msgid "New sample rate (Hz):"
 msgstr "Новая частота сэмплирования (Гц):"
 
-#: Menus.cpp:5101
-#: TrackPanel.cpp:6383
+#: Menus.cpp:5178
+#: TrackPanel.cpp:6385
 msgid "The entered value is invalid"
 msgstr "Введенное значение некорректно"
 
-#: Menus.cpp:5110
+#: Menus.cpp:5187
 #, c-format
 msgid "Resampling track %d"
 msgstr "Меняется частота сэмплирования дорожки %d"
 
-#: Menus.cpp:5119
+#: Menus.cpp:5196
 msgid "Resample Track"
 msgstr "Поменять частоту сэмплирования дорожки"
 
-#: Menus.cpp:5119
+#: Menus.cpp:5196
 msgid "Resampled audio track(s)"
 msgstr "Изменена частота сэмплирования дорожек"
 
@@ -2951,73 +2957,78 @@ msgstr "При печати возникла проблема."
 msgid "Print"
 msgstr "Напечатать"
 
-#: Project.cpp:648
+#: Project.cpp:676
 msgid "Main Mix"
 msgstr ""
 
-#: Project.cpp:772
+#: Project.cpp:800
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Добро пожаловать в Audacity версии %s"
 
-#: Project.cpp:932
+#: Project.cpp:960
 msgid "(Recovered)"
 msgstr "(Восстановлено)"
 
-#: Project.cpp:1521
+#: Project.cpp:1549
 #: TrackPanel.cpp:796
 #: toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Записать"
 
-#: Project.cpp:1521
+#: Project.cpp:1549
 #: TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "Записан звук"
 
-#: Project.cpp:1539
+#: Project.cpp:1567
 msgid "Save changes before closing?"
 msgstr "Сохранить изменения перед закрытием?"
 
-#: Project.cpp:1542
-msgid ""
-"\n"
+#: Project.cpp:1570
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
+msgstr "\n"
+"Если сохранить, в проекте не будет\n"
+"ни одной дорожки.\n"
+"\n"
+"Чтобы вернуть дорожки, нажмите\n"
+"кнопку «Отмена», и последовательно\n"
+"выбирайте пункт меню «Правка > Отменить»,\n"
+"пока все дорожки не будут возвращены,\n"
+"затем выберите «Файл > Сохранить проект»."
 
-#: Project.cpp:1545
+#: Project.cpp:1573
 msgid "Save changes?"
 msgstr "Сохранить изменения?"
 
-#: Project.cpp:1744
+#: Project.cpp:1775
 msgid "All files|*.*|All supported files|"
 msgstr "Все файлы|*.*|Все поддерживаемые файлы|"
 
-#: Project.cpp:1774
+#: Project.cpp:1805
 msgid "Select one or more audio files..."
 msgstr "Выберите один или несколько звуковых файлов..."
 
-#: Project.cpp:1801
+#: Project.cpp:1832
 msgid "Audacity projects|*.aup|"
 msgstr "Проекты Audacity|*.aup|"
 
-#: Project.cpp:1854
-#: Project.cpp:2276
+#: Project.cpp:1885
+#: Project.cpp:2307
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Этот файл был сохранен в Audacity %s — достаточно\n"
+msgstr "Этот файл был сохранен в Audacity %s — достаточно\n"
 "старой версии программы. С тех пор формат файлов изменился.\n"
 "\n"
 "Audacity может нечаянно испортить данные при открытии,\n"
@@ -3025,141 +3036,147 @@ msgstr ""
 "\n"
 "Открыть этот файл?"
 
-#: Project.cpp:1855
+#: Project.cpp:1886
 msgid "1.0 or earlier"
 msgstr "1.0 или ранее"
 
-#: Project.cpp:1861
-#: Project.cpp:2288
+#: Project.cpp:1892
+#: Project.cpp:2319
 msgid "Opening old project file"
 msgstr "Открывается файл старого формата проектов"
 
-#: Project.cpp:1887
-#: Project.cpp:1895
+#: Project.cpp:1918
+#: Project.cpp:1926
 msgid "Error opening file"
 msgstr "Ошибка при чтении файла"
 
-#: Project.cpp:1901
+#: Project.cpp:1932
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Файл может быть неподдерживаемого формата или испорчен: \n"
+msgstr "Файл может быть неподдерживаемого формата или испорчен: \n"
 "%s"
 
-#: Project.cpp:1902
+#: Project.cpp:1933
 msgid "Error opening file or project"
 msgstr "Ошибка при открытии файла или проекта"
 
-#: Project.cpp:1922
+#: Project.cpp:1953
 msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
 msgstr "Audacity не удалось проеобразовать проект формата Audacity 1.0 в проект нового формата."
 
-#: Project.cpp:2060
+#: Project.cpp:2056
 msgid "Could not remove old auto save file"
 msgstr "Не удалось удалить старый файл автосохранения"
 
-#: Project.cpp:2062
+#: Project.cpp:2058
 msgid "Project was recovered"
 msgstr "Проект восстановлен"
 
-#: Project.cpp:2062
+#: Project.cpp:2058
 msgid "Recover"
 msgstr "Восстановить"
 
-#: Project.cpp:2091
+#: Project.cpp:2087
 msgid "Project checker repaired file"
 msgstr "Подпрограмма проверки проекта залечила файл"
 
-#: Project.cpp:2091
+#: Project.cpp:2087
 #: effects/Repair.h:29
 msgid "Repair"
 msgstr "Восстановить"
 
-#: Project.cpp:2202
+#: Project.cpp:2233
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "Не удалось найти папку с данными проекта: \"%s\""
 
-#: Project.cpp:2245
+#: Project.cpp:2276
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Этот файл был сохранён в Audacity %s.\n"
+msgstr "Этот файл был сохранён в Audacity %s.\n"
 "Сейчас вы используете Audacity %s — вам нужно \n"
 "установить более новую версию, чтобы открыть этот файл."
 
-#: Project.cpp:2249
+#: Project.cpp:2280
 msgid "Can't open project file"
 msgstr "Невозможно открыть файл проекта"
 
-#: Project.cpp:2283
+#: Project.cpp:2314
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
 msgstr ""
 
-#: Project.cpp:2588
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s \n"
+msgid "Could not save project. Perhaps %s \n"
 "is not writeable or the disk is full."
-msgstr ""
-"Не удалось сохранить проект. Возможно, у вас нет прав\n"
+msgstr "Не удалось сохранить проект. Возможно, у вас нет прав\n"
 "на запись в %s, либо диск переполнен."
 
-#: Project.cpp:2520
-#: Project.cpp:2534
+#: Project.cpp:2593
+#: Project.cpp:2608
 msgid "Error saving project"
 msgstr "Ошибка при сохранении проекта"
 
-#: Project.cpp:2596
+#: Project.cpp:2683
 #, c-format
 msgid "Saved %s"
 msgstr "Сохранён %s"
 
-#: Project.cpp:2656
+#: Project.cpp:2809
 #, c-format
 msgid "Imported '%s'"
 msgstr "Импортирован файл '%s'"
 
-#: Project.cpp:2657
-#: import/ImportPCM.cpp:469
-#: import/ImportPCM.cpp:513
+#: Project.cpp:2810
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
 msgid "Import"
 msgstr "Импорт"
 
-#: Project.cpp:2690
-#: Project.cpp:2698
+#: Project.cpp:2843
+#: Project.cpp:2851
 msgid "Error importing"
 msgstr "Ошибка при импорте"
 
-#: Project.cpp:2732
+#: Project.cpp:2885
 msgid "Save Speech As:"
 msgstr "Сохранить речь как:"
 
-#: Project.cpp:2734
+#: Project.cpp:2887
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Файлы Windows PCM Audio (*.wav)|*.wav"
 
-#: Project.cpp:2891
-msgid ""
-"Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
 "Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
 "To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
 "Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr ""
-"Сжатые проектные файлы Audacity (.aup) сохраняют вашу работу в небольших\n"
+msgstr "Сжатые проектные файлы Audacity (.aup) сохраняют вашу работу в небольших\n"
 "файлах формата Ogg Vorbis (.ogg) с некоторой потерей в качестве звучания.\n"
 "Такой вариант хорошо подходит для передачи ваших проектов по сети.\n"
 "Открытие сжатого проекта занимает больше времени чем обычно, поскольку\n"
@@ -3169,91 +3186,89 @@ msgstr ""
 "Если вам нужен файл, который будет прочитан другой программой, выберите\n"
 "подходящий формат, воспользовавшись командой »Файл → Экспортировать»."
 
-#: Project.cpp:2740
-msgid ""
-"You are saving an Audacity project file (.aup).\n"
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
 "Saving a project creates a file that only Audacity can open.\n"
 "\n"
 "To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
-msgstr ""
-"Вы сохраняете файл проекта Audacity (.aup).\n"
+msgstr "Вы сохраняете файл проекта Audacity (.aup).\n"
 "\n"
 "Полученный файл сможет открыть только Audacity\n"
 "\n"
 "Чтобы сохранить файл в формате, читаемом извне, \n"
 "используйте диалог экспорта («Файл → Экспортировать»).\n"
 
-#: Project.cpp:2743
+#: Project.cpp:2901
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Проекты Audacity (*.aup)|*.aup"
 
-#: Project.cpp:2787
+#: Project.cpp:2955
 msgid "Created new project"
 msgstr "Создан новый проект"
 
-#: Project.cpp:2946
+#: Project.cpp:3114
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Удалено %.2f с начиная с t=%.2f"
 
-#: Project.cpp:2949
+#: Project.cpp:3117
 #: effects/Equalization.cpp:1276
 #: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Удалить"
 
-#: Project.cpp:3143
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr "Времени до конца записи: %d часов и %d минут."
 
-#: Project.cpp:3146
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr "Время до конца записи: 1 час и %d минут."
 
-#: Project.cpp:3149
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr "Время до конца записи в мин: %d"
 
-#: Project.cpp:3152
+#: Project.cpp:3320
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr "Время до конца записи (с): %d"
 
-#: Project.cpp:3155
+#: Project.cpp:3323
 msgid "Out of disk space"
 msgstr "Свободное пространство на диске закончилось"
 
-#: Project.cpp:3168
+#: Project.cpp:3336
 #, c-format
 msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
 msgstr ""
 
-#: Project.cpp:3171
+#: Project.cpp:3339
 #, c-format
 msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
 msgstr ""
 
-#: Project.cpp:3449
+#: Project.cpp:3617
 msgid "Could not remove old autosave file: "
 msgstr "Не удалось удалить файл автосохранения"
 
-#: Project.cpp:3490
+#: Project.cpp:3658
 msgid "New Project"
 msgstr "Новый проект"
 
-#: Project.cpp:3503
+#: Project.cpp:3671
 msgid "Error writing autosave file"
 msgstr "Ошибка при записи файла автосохранения"
 
-#: Project.cpp:3528
+#: Project.cpp:3696
 msgid "Could not create autosave file: "
 msgstr "Не удалось создать автосохраняемый файл: "
 
-#: Project.cpp:3554
+#: Project.cpp:3722
 #, c-format
 msgid "Actual Rate: %d"
 msgstr "Реальная частота: %d Гц"
@@ -3307,19 +3322,19 @@ msgstr ""
 msgid "Error trying to save file: "
 msgstr "Ошибка при попытке сохранить файл: "
 
-#: Sequence.cpp:737
-#: Sequence.cpp:747
-#: Sequence.cpp:754
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
 msgid "Gap detected in project file\n"
 msgstr ""
 
-#: ShuttleGui.cpp:1973
+#: ShuttleGui.cpp:1972
 #: effects/Effect.cpp:417
 #: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
 msgstr "Про&слушать"
 
-#: ShuttleGui.cpp:1980
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "От&ладка"
 
@@ -3327,7 +3342,7 @@ msgstr "От&ладка"
 msgid "Sound Activated Record"
 msgstr "Активация записи по сигналу"
 
-#: SoundActivatedRecord.cpp:57
+#: SoundActivatedRecord.cpp:58
 msgid "Activation level (dB):"
 msgstr "Уровень громкости для активации (Дб):"
 
@@ -3370,10 +3385,9 @@ msgstr "Жанр"
 msgid "Comments"
 msgstr "Комментарии"
 
-#: Tags.cpp:789
-#: Tags.cpp:2027
-msgid "Press F2 or double click to edit."
-msgstr "Нажмите F2 или дважды щёлкните для изменения."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:813
 msgid "Tag Name"
@@ -3393,16 +3407,13 @@ msgstr "О&чистить"
 msgid "Genres"
 msgstr "Жанры"
 
-#: Tags.cpp:839
-#: Tags.cpp:1449
-#: Tags.cpp:1989
-msgid "Edit"
-msgstr "Изменить"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:840
-#: Tags.cpp:1990
-msgid "Reset"
-msgstr "Сбросить"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:845
 #: Tags.cpp:1470
@@ -3472,6 +3483,16 @@ msgstr "Вы уверены, что хотите восстановить исх
 msgid "Unable to open genre file."
 msgstr "Невозможно открыть файл с жанрами."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
+msgid "Error loading metadata"
+msgstr "Ошибка при загрузке метаданных"
+
 #: Tags.cpp:1097
 #: Tags.cpp:1151
 #: Tags.cpp:1751
@@ -3481,213 +3502,94 @@ msgstr "Невозможно открыть файл с жанрами."
 msgid "Save Metadata As:"
 msgstr "Сохранить метаданные как:"
 
-#: Tags.cpp:1122
-#: Tags.cpp:1772
-#: Tags.cpp:2494
-msgid "Error loading metadata"
-msgstr "Ошибка при загрузке метаданных"
-
-#: Tags.cpp:1419
-#: Tags.cpp:1977
-msgid "Title:"
-msgstr "Название:"
-
-#: Tags.cpp:1420
-#: Tags.cpp:1978
-msgid "Artist:"
-msgstr "Исполнитель:"
-
-#: Tags.cpp:1421
-#: Tags.cpp:1979
-msgid "Album:"
-msgstr "Альбом:"
-
-#: Tags.cpp:1422
-msgid "Composer:"
-msgstr "Композитор:"
-
-#: Tags.cpp:1423
-msgid "Lyricist:"
-msgstr "Автор текста:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1982
-msgid "Comments:"
-msgstr "Комментарии:"
-
-#: Tags.cpp:1426
-msgid "Encoded By:"
-msgstr "Кодировщик:"
-
-#: Tags.cpp:1430
-msgid "Copyright:"
-msgstr "Авторские права:"
-
-#: Tags.cpp:1434
-#: Tags.cpp:1980
-msgid "Track Number:"
-msgstr "Номер дорожки:"
-
-#: Tags.cpp:1438
-#: Tags.cpp:1981
-msgid "Year:"
-msgstr "Год:"
-
-#: Tags.cpp:1442
-#: Tags.cpp:1983
-msgid "Genre:"
-msgstr "Жанр:"
-
-#: Tags.cpp:1500
-#: Tags.cpp:2098
-msgid "No Genres"
-msgstr "Не указан"
-
-#: Tags.cpp:1653
-msgid "Reset to Defaults"
-msgstr "Сбросить"
-
-#: Tags.cpp:1965
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:2017
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2042
-msgid "Value"
-msgstr "Значение"
-
-#: Tags.cpp:2078
-msgid "Clea&r"
-msgstr "О&чистить"
-
-#: Tags.cpp:2111
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Максимально возможная продолжительность атрибута '%s' - %d. Остальное удалено."
-
-#: Tags.cpp:2117
-msgid "Title"
-msgstr "Название"
-
-#: Tags.cpp:2127
-msgid "Artist"
-msgstr "Исполнитель"
-
-#: Tags.cpp:2137
-msgid "Album"
-msgstr "Альбом"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity не удалось записать файл:\n"
+msgstr "Audacity не удалось записать файл:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity не удалось открыть файл:\n"
+msgstr "Audacity не удалось открыть файл:\n"
 "  %s\n"
 "на запись."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity не удалось записать изображения в файл:\n"
+msgstr "Audacity не удалось записать изображения в файл:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity не удалось найти файл:\n"
+msgstr "Audacity не удалось найти файл:\n"
 "  %s.\n"
 "Тема не загружена."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity не удалось найти файл:\n"
+msgstr "Audacity не удалось найти файл:\n"
 "  %s.\n"
 "Может быть, неправильный формат PNG?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity не смог прочитать свою исходную тему.\n"
+msgstr "Audacity не смог прочитать свою исходную тему.\n"
 "Сообщите разработчикам  о возникшей проблеме."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Ни один из ожидаемых компонентов темы\n"
+msgstr "Ни один из ожидаемых компонентов темы\n"
 "не был найден в:\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Не удалось создать каталог:\n"
+msgstr "Не удалось создать каталог:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity не удалось сохранить файл:\n"
+msgstr "Audacity не удалось сохранить файл:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Все требуемые файлы:\n"
+msgstr "Все требуемые файлы:\n"
 "  %s\n"
 "уже присутствуют."
 
 #: TimeDialog.cpp:53
-#: TimerRecordDialog.cpp:226
-#: TimerRecordDialog.cpp:304
-#: TimerRecordDialog.cpp:308
-#: effects/Noise.cpp:241
-#: effects/ToneGen.cpp:322
-#: effects/ToneGen.cpp:365
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
 msgid "Duration"
 msgstr "Длительность"
 
@@ -3695,42 +3597,42 @@ msgstr "Длительность"
 msgid "Audacity Timer Record"
 msgstr "Таймер записи Audacity"
 
-#: TimerRecordDialog.cpp:223
+#: TimerRecordDialog.cpp:224
 msgid "Recording start"
 msgstr "Начало записи"
 
-#: TimerRecordDialog.cpp:224
+#: TimerRecordDialog.cpp:225
 msgid "Recording end"
 msgstr "Конец записи"
 
-#: TimerRecordDialog.cpp:229
+#: TimerRecordDialog.cpp:230
 msgid "Audacity Timer Record Progress"
 msgstr "Прогресс записи по таймеру"
 
-#: TimerRecordDialog.cpp:266
+#: TimerRecordDialog.cpp:267
 msgid "Start Date and Time"
 msgstr "Дата и время начала"
 
-#: TimerRecordDialog.cpp:273
+#: TimerRecordDialog.cpp:274
 msgid "Start Date"
 msgstr "Дата начала"
 
-#: TimerRecordDialog.cpp:285
+#: TimerRecordDialog.cpp:286
 msgid "End Date and Time"
 msgstr "Дата и время завершения"
 
-#: TimerRecordDialog.cpp:293
+#: TimerRecordDialog.cpp:294
 msgid "End Date"
 msgstr "Дата конца"
 
 #. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
 #. * but hopefully translated by wxwidgets will be inserted into this
-#: TimerRecordDialog.cpp:380
+#: TimerRecordDialog.cpp:381
 #, c-format
 msgid "Waiting to start recording at %s.\n"
 msgstr "Ожидание начала записи %s.\n"
 
-#: TimerRecordDialog.cpp:381
+#: TimerRecordDialog.cpp:382
 msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
@@ -3748,7 +3650,7 @@ msgstr "Другая..."
 #: TrackPanel.cpp:571
 #: TrackPanel.cpp:580
 #: TrackPanel.cpp:588
-#: TrackPanel.cpp:5791
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "Название..."
 
@@ -3756,7 +3658,7 @@ msgstr "Название..."
 #: TrackPanel.cpp:573
 #: TrackPanel.cpp:584
 #: TrackPanel.cpp:590
-#: TrackPanel.cpp:5795
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
 msgstr "Переместить дорожку вверх"
 
@@ -3764,12 +3666,12 @@ msgstr "Переместить дорожку вверх"
 #: TrackPanel.cpp:574
 #: TrackPanel.cpp:585
 #: TrackPanel.cpp:591
-#: TrackPanel.cpp:5796
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
 msgstr "Переместить дорожку вниз"
 
 #: TrackPanel.cpp:554
-#: effects/ToneGen.cpp:318
+#: effects/ToneGen.cpp:319
 #: prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Волна"
@@ -3791,17 +3693,17 @@ msgid "Pitch (EAC)"
 msgstr "Высота тона (EAC)"
 
 #: TrackPanel.cpp:560
-#: TrackPanel.cpp:6094
+#: TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "Моно"
 
 #: TrackPanel.cpp:561
-#: TrackPanel.cpp:6093
+#: TrackPanel.cpp:6095
 msgid "Left Channel"
 msgstr "Левый канал"
 
 #: TrackPanel.cpp:562
-#: TrackPanel.cpp:6093
+#: TrackPanel.cpp:6095
 msgid "Right Channel"
 msgstr "Правый канал"
 
@@ -3815,10 +3717,10 @@ msgstr "Разделить стереодорожку"
 
 #: TrackPanel.cpp:566
 msgid "Set Sample Format"
-msgstr "Размер сэмпла"
+msgstr "Разрядность"
 
 #: TrackPanel.cpp:568
-#: TrackPanel.cpp:6339
+#: TrackPanel.cpp:6341
 msgid "Set Rate"
 msgstr "Частота сэмплирования"
 
@@ -3831,7 +3733,7 @@ msgid "Down Octave"
 msgstr "Октавой ниже"
 
 #: TrackPanel.cpp:582
-#: TrackPanel.cpp:5793
+#: TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "Шрифт..."
 
@@ -3890,8 +3792,8 @@ msgstr "Щёлкните и перетащите отметку для уста
 #: TrackPanel.cpp:3959
 #: TrackPanel.cpp:3991
 #: TrackPanel.cpp:4255
-#: TrackPanel.cpp:6488
-#: TrackPanel.cpp:6508
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
 msgid "Modified Label"
 msgstr "Метка изменена"
 
@@ -3899,8 +3801,8 @@ msgstr "Метка изменена"
 #: TrackPanel.cpp:3960
 #: TrackPanel.cpp:3992
 #: TrackPanel.cpp:4256
-#: TrackPanel.cpp:6489
-#: TrackPanel.cpp:6509
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
 msgid "Label Edit"
 msgstr "Правка пометки"
 
@@ -3974,35 +3876,35 @@ msgstr "Регулятор панорамы смещён"
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
 #: TrackPanel.cpp:3449
 #: TrackPanel.cpp:5703
-#: TrackPanel.cpp:7242
+#: TrackPanel.cpp:7244
 msgid "Gain"
 msgstr "Громкость"
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
 #: TrackPanel.cpp:3449
 #: TrackPanel.cpp:5641
-#: TrackPanel.cpp:7249
+#: TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "Панорама"
 
 #: TrackPanel.cpp:3576
-#: TrackPanel.cpp:6439
+#: TrackPanel.cpp:6441
 msgid "up"
 msgstr "вверх"
 
 #: TrackPanel.cpp:3580
-#: TrackPanel.cpp:6440
+#: TrackPanel.cpp:6442
 msgid "down"
 msgstr "вниз"
 
 #: TrackPanel.cpp:3587
-#: TrackPanel.cpp:6435
+#: TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "Смещено '%s' %s"
 
 #: TrackPanel.cpp:3590
-#: TrackPanel.cpp:6441
+#: TrackPanel.cpp:6443
 msgid "Move Track"
 msgstr "Переместить дорожку"
 
@@ -4034,134 +3936,134 @@ msgstr "Панорамирование скорректировано"
 msgid "Adjusted gain"
 msgstr "Усиление скорректированно"
 
-#: TrackPanel.cpp:5797
+#: TrackPanel.cpp:5799
 msgid "Group with Wave Track"
 msgstr ""
 
-#: TrackPanel.cpp:5798
+#: TrackPanel.cpp:5800
 msgid "Clear any grouping"
 msgstr ""
 
-#: TrackPanel.cpp:5921
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
 msgstr "Невозможно удалить дорожку с активным звуком"
 
-#: TrackPanel.cpp:6074
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Стерео, "
 
-#: TrackPanel.cpp:6077
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Моно, "
 
-#: TrackPanel.cpp:6079
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "Левый, "
 
-#: TrackPanel.cpp:6081
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "Правый, "
 
-#: TrackPanel.cpp:6103
-#: TrackPanel.cpp:6249
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "'%s' изменено на %s"
 
-#: TrackPanel.cpp:6108
+#: TrackPanel.cpp:6110
 msgid "Channel"
 msgstr "Канал"
 
-#: TrackPanel.cpp:6129
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "Разделить стереодорожку '%s'"
 
-#: TrackPanel.cpp:6167
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "Сделать '%s' стереодорожку"
 
-#: TrackPanel.cpp:6170
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
 msgstr "Сделать стереофонической"
 
-#: TrackPanel.cpp:6213
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "'%s' изменено на %d Гц"
 
-#: TrackPanel.cpp:6215
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "Изменить частоту"
 
-#: TrackPanel.cpp:6253
+#: TrackPanel.cpp:6255
 msgid "Format Change"
 msgstr "Смена формата"
 
-#: TrackPanel.cpp:6403
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
 msgstr "Изменить нижний предел скорости (%) на:"
 
-#: TrackPanel.cpp:6404
-#: TrackPanel.cpp:6405
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
 msgid "Lower speed limit"
 msgstr "Предел понижения скорости"
 
-#: TrackPanel.cpp:6410
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
 msgstr "Изменить верхний предел скорости (%) на:"
 
-#: TrackPanel.cpp:6411
-#: TrackPanel.cpp:6412
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
 msgid "Upper speed limit"
 msgstr "Предел повышения скорости"
 
-#: TrackPanel.cpp:6420
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Установить предел как %d'' - '%d'"
 
-#: TrackPanel.cpp:6423
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "Установить диапазон"
 
-#: TrackPanel.cpp:6470
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
 msgstr "Изменить название дорожки на:"
 
-#: TrackPanel.cpp:6471
+#: TrackPanel.cpp:6473
 msgid "Track Name"
 msgstr "Название дорожки"
 
-#: TrackPanel.cpp:6474
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "Название '%s' изменено на '%s'"
 
-#: TrackPanel.cpp:6477
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "Переименование"
 
-#: TrackPanel.cpp:6578
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
 msgstr "Шрифт дорожки для пометок"
 
-#: TrackPanel.cpp:6590
-#: TrackPanel.cpp:6596
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
 msgid "Face name"
 msgstr ""
 
-#: TrackPanel.cpp:6600
-#: TrackPanel.cpp:6607
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
 msgid "Face size"
 msgstr ""
 
-#: TrackPanel.cpp:7169
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Тихо"
 
-#: TrackPanel.cpp:7169
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Соло"
 
@@ -4195,8 +4097,7 @@ msgstr ""
 #: VoiceKey.cpp:376
 #: VoiceKey.cpp:517
 msgid "Selection is too small to use voice key."
-msgstr ""
-"Выделение слишком мало для \n"
+msgstr "Выделение слишком мало для \n"
 "использования голосового ключа."
 
 #: VoiceKey.cpp:843
@@ -4229,7 +4130,7 @@ msgstr "Звуковая дорожка"
 msgid "There is not enough room available to paste the selection"
 msgstr "Недостаточно места для вставки выделенного"
 
-#: WaveTrack.cpp:2043
+#: WaveTrack.cpp:2086
 msgid "There is not enough room available to expand the cut line"
 msgstr ""
 
@@ -4243,24 +4144,20 @@ msgstr "Расширения 1 до %i"
 msgid "Plugins %i to %i"
 msgstr "Расширения от %i до %i"
 
-#: commands/CommandManager.cpp:888
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:892
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Вы можете сделать это только при отключенном\n"
+msgstr "Вы можете сделать это только при отключенном\n"
 "воспроизведении/записи. Пауза не поможет."
 
 #: commands/CommandManager.cpp:894
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Сначала нужно выбрать стереодорожку\n"
+msgstr "Сначала нужно выбрать стереодорожку\n"
 "(с монофонической это не сработает)"
 
 #: commands/CommandManager.cpp:896
@@ -4268,11 +4165,9 @@ msgid "You must first select some audio for this to use."
 msgstr "Сначала придётся выделить область звука."
 
 #: commands/CommandManager.cpp:898
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Сначала придётся выделить область звука.\n"
+msgstr "Сначала придётся выделить область звука.\n"
 "Выделение дорожки иного типа не годится."
 
 #: commands/CommandManager.cpp:903
@@ -4308,8 +4203,8 @@ msgid "Amplification (dB):"
 msgstr "Усиление (Дб):"
 
 #: effects/Amplify.cpp:183
-msgid "Amplification (dB)"
-msgstr "Усиление (Дб)"
+msgid "Amplification dB"
+msgstr ""
 
 #: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
@@ -4366,11 +4261,11 @@ msgstr "Макс. пауза:"
 #: effects/AutoDuck.cpp:504
 #: effects/AutoDuck.cpp:509
 #: effects/AutoDuck.cpp:514
-#: prefs/AudioIOPrefs.cpp:168
-#: prefs/AudioIOPrefs.cpp:176
-#: prefs/AudioIOPrefs.cpp:178
-#: prefs/AudioIOPrefs.cpp:203
-#: prefs/AudioIOPrefs.cpp:205
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
 #: prefs/MidiIOPrefs.cpp:161
 #: prefs/MidiIOPrefs.cpp:163
 #: prefs/MidiIOPrefs.cpp:187
@@ -4445,10 +4340,18 @@ msgstr "Автор — Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Частота (Гц):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Повышение (Дб):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Усиление басовых частот..."
@@ -4480,12 +4383,12 @@ msgstr "Смена высоты тона без смены темпа"
 
 #: effects/ChangePitch.cpp:258
 #: effects/ChangeSpeed.cpp:336
-#: effects/ChangeTempo.cpp:173
+#: effects/ChangeTempo.cpp:176
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "Авторы — Vaughan Johnson и Dominic Mazzoni"
 
 #: effects/ChangePitch.cpp:260
-#: effects/ChangeTempo.cpp:175
+#: effects/ChangeTempo.cpp:178
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "с использованием SoundTouch (Olli Parviainen)"
 
@@ -4527,8 +4430,8 @@ msgstr ""
 
 #: effects/ChangePitch.cpp:326
 #: effects/ChangeSpeed.cpp:369
-#: effects/ChangeTempo.cpp:206
-#: effects/ChangeTempo.cpp:219
+#: effects/ChangeTempo.cpp:209
+#: effects/ChangeTempo.cpp:222
 msgid "from"
 msgstr "от"
 
@@ -4538,8 +4441,8 @@ msgstr "Из частоты в герцах"
 
 #: effects/ChangePitch.cpp:331
 #: effects/ChangeSpeed.cpp:374
-#: effects/ChangeTempo.cpp:211
-#: effects/ChangeTempo.cpp:224
+#: effects/ChangeTempo.cpp:214
+#: effects/ChangeTempo.cpp:227
 msgid "to"
 msgstr "до"
 
@@ -4549,14 +4452,14 @@ msgstr "В частоту в секундах"
 
 #: effects/ChangePitch.cpp:338
 #: effects/ChangeSpeed.cpp:347
-#: effects/ChangeTempo.cpp:184
+#: effects/ChangeTempo.cpp:187
 msgid "Percent Change:"
 msgstr "Процентное изменение:"
 
 #: effects/ChangePitch.cpp:343
 #: effects/ChangePitch.cpp:356
 #: effects/ChangeSpeed.cpp:358
-#: effects/ChangeTempo.cpp:195
+#: effects/ChangeTempo.cpp:198
 msgid "Percent Change"
 msgstr "Процентное изменение"
 
@@ -4616,35 +4519,35 @@ msgstr "Смена скорости..."
 msgid "Changing Speed"
 msgstr "Изменяется скорость"
 
-#: effects/ChangeTempo.cpp:138
+#: effects/ChangeTempo.cpp:141
 msgid "Change Tempo"
 msgstr "Смена темпа"
 
-#: effects/ChangeTempo.cpp:171
+#: effects/ChangeTempo.cpp:174
 msgid "Change Tempo without Changing Pitch"
 msgstr "Смена темпа без смены высоты тона"
 
-#: effects/ChangeTempo.cpp:203
+#: effects/ChangeTempo.cpp:206
 msgid "Beats per minute:"
 msgstr "Долей в минуту:"
 
-#: effects/ChangeTempo.cpp:207
+#: effects/ChangeTempo.cpp:210
 msgid "From beats per minute"
 msgstr "Из одного количества долей в минуту"
 
-#: effects/ChangeTempo.cpp:212
+#: effects/ChangeTempo.cpp:215
 msgid "To beats per minute"
 msgstr "В другое количество долей в минуту"
 
-#: effects/ChangeTempo.cpp:216
+#: effects/ChangeTempo.cpp:219
 msgid "Length (seconds):"
 msgstr "Длительность (с):"
 
-#: effects/ChangeTempo.cpp:220
+#: effects/ChangeTempo.cpp:223
 msgid "From length in seconds"
 msgstr "Из одной длительности в секундах"
 
-#: effects/ChangeTempo.cpp:225
+#: effects/ChangeTempo.cpp:228
 msgid "To length in seconds"
 msgstr "В другую длительность в секундах"
 
@@ -4668,10 +4571,18 @@ msgstr "Удаление щелчков и треска, автор — Craig De
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Укажите порог (ниже → чувствительнее):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Макс. ширина пика (выше → чувствительнее):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Удаление щелчков и треска..."
@@ -4770,49 +4681,318 @@ msgstr "Компрессор..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Применяется компрессия динамического диапазона..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:187
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:275
+#: effects/Contrast.cpp:296
+#: effects/Contrast.cpp:374
+#: effects/Contrast.cpp:417
+#, fuzzy
+msgid "Measured"
+msgstr "Возможности"
+
+#: effects/Contrast.cpp:319
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:323
+#, fuzzy
+msgid "Parameters"
+msgstr "&Параметры"
+
+#: effects/Contrast.cpp:330
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Начало"
+
+#: effects/Contrast.cpp:331
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Конец"
+
+#: effects/Contrast.cpp:334
+#, fuzzy
+msgid "Volume    "
+msgstr "Микс"
+
+#: effects/Contrast.cpp:337
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:350
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:368
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:376
+#: effects/Contrast.cpp:419
+#, fuzzy
+msgid "Use selection"
+msgstr "Заполнить тишиной"
+
+#: effects/Contrast.cpp:380
+#, fuzzy
+msgid "Background:"
+msgstr "Назад"
+
+#: effects/Contrast.cpp:393
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:411
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:435
+#, fuzzy
+msgid "Result"
+msgstr "Сбросить"
+
+#: effects/Contrast.cpp:439
+#, fuzzy
+msgid "Contrast Result:"
+msgstr "Результаты калибровки"
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+#: effects/Contrast.cpp:427
+msgid "Reset"
+msgstr "Сбросить"
+
+#: effects/Contrast.cpp:442
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:451
+#, fuzzy
+msgid "Information"
+msgstr "Информация о сборке"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:463
+#: effects/Contrast.cpp:469
+#: effects/Contrast.cpp:475
+#: effects/Contrast.cpp:481
+#, fuzzy
+msgid "Measure"
+msgstr "Возможности"
+
+#: effects/Contrast.cpp:266
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:272
+#: effects/Contrast.cpp:293
+#, fuzzy, c-format
+msgid "%.1f dB"
+msgstr "%.1f с"
+
+#: effects/Contrast.cpp:287
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:510
+#: effects/Contrast.cpp:511
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:515
+#: effects/Contrast.cpp:516
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:518
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:523
+#, fuzzy
+msgid "Please enter valid times."
+msgstr "Введите корректные значения."
+
+#: effects/Contrast.cpp:536
+#, fuzzy
+msgid "Export Contrast Result As:"
+msgstr "Экспортировать пометки как:"
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:578
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:580
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+#, fuzzy
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr "&Звуковой файл...\tCtrl+Shift+I"
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr "Создание тоновых сигналов (DTMF)"
 
-#: effects/DtmfGen.cpp:454
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "Автор — Salvo Ventura (2006)"
 
-#: effects/DtmfGen.cpp:458
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "Последовательность:"
 
-#: effects/DtmfGen.cpp:461
-#: effects/Noise.cpp:240
-#: effects/ToneGen.cpp:321
-#: effects/ToneGen.cpp:358
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "Амплитуда (0-1)"
 
-#: effects/DtmfGen.cpp:463
+#: effects/DtmfGen.cpp:465
 msgid "Duration:"
 msgstr "Длительность:"
 
-#: effects/DtmfGen.cpp:484
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
 msgstr "Соотношение сигнала/тишины:"
 
-#: effects/DtmfGen.cpp:494
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr "Цикл «занятости»:"
 
-#: effects/DtmfGen.cpp:496
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
 msgstr "Длительность сигнала:"
 
-#: effects/DtmfGen.cpp:497
 #: effects/DtmfGen.cpp:499
-#: effects/DtmfGen.cpp:575
-#: effects/DtmfGen.cpp:576
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
 msgstr "мс"
 
-#: effects/DtmfGen.cpp:498
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr "Длительность тишины:"
 
@@ -4841,7 +5021,7 @@ msgstr "Эхо"
 #. i18n-hint: && in here is an escape character to get a single & on
 #. * screen, so keep it as is
 #: effects/Echo.cpp:195
-#: effects/Repeat.cpp:200
+#: effects/Repeat.cpp:199
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "Авторы — Dominic Mazzoni и Vaughan Johnson"
 
@@ -4871,11 +5051,11 @@ msgstr "Предпрослушивание"
 
 #: effects/Effect.cpp:512
 msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
-msgstr ""
-"Ошибка при открытии звукового устройства.\n"
+msgstr "Ошибка при открытии звукового устройства.\n"
 "Проверьте параметры устройства и частоту сэмплирования."
 
 #: effects/Effect.h:100
+#: effects/TimeScale.cpp:52
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Применён эффект: %s"
@@ -4946,7 +5126,7 @@ msgstr "Кривая:"
 
 #: effects/Equalization.cpp:1273
 #: effects/Equalization.cpp:2512
-#: export/ExportMultiple.cpp:889
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
 msgstr "Сохранить как..."
 
@@ -4959,6 +5139,7 @@ msgid "Enter the desired name of the curve"
 msgstr "Введите желаемое название кривой"
 
 #: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
 msgid "Confirm Deletion"
 msgstr "Подтверждение удаления"
 
@@ -4988,15 +5169,15 @@ msgstr "Применяется эффект \"Плавное затухание\
 
 #: effects/FindClipping.cpp:49
 msgid "Detect clipping"
-msgstr "Определять клиппинг"
+msgstr "Определять перегрузку"
 
 #: effects/FindClipping.cpp:91
 msgid "Clipping"
-msgstr "Клиппинг"
+msgstr "Перегрузка"
 
 #: effects/FindClipping.cpp:211
 msgid "Find Clipping"
-msgstr "Поиск клиппинга"
+msgstr "Поиск перегрузки"
 
 #: effects/FindClipping.cpp:222
 msgid "by Leland Lucius"
@@ -5016,11 +5197,11 @@ msgstr "Значение исходного и конечного порогов
 
 #: effects/FindClipping.h:37
 msgid "Find Clipping..."
-msgstr "Найти клиппинг..."
+msgstr "Найти перегрузки..."
 
 #: effects/FindClipping.h:54
 msgid "Detecting clipping"
-msgstr "Идёт поиск клиппинга"
+msgstr "Выполняется поиск перегрузки"
 
 #: effects/Invert.h:27
 msgid "Invert"
@@ -5059,7 +5240,7 @@ msgid "Heaviest"
 msgstr "Самая большая"
 
 #: effects/Leveller.cpp:212
-#: effects/TruncSilence.cpp:332
+#: effects/TruncSilence.cpp:331
 msgid "by Lynn Allan"
 msgstr "Автор — Lynn Allan"
 
@@ -5087,158 +5268,158 @@ msgstr "Выравниватель..."
 msgid "Applying Leveller..."
 msgstr "Применяется эффект выравнивания"
 
-#: effects/LoadEffects.cpp:99
+#: effects/LoadEffects.cpp:105
 msgid "Generator"
 msgstr "Генераторы"
 
-#: effects/LoadEffects.cpp:101
+#: effects/LoadEffects.cpp:107
 msgid "Instrument"
 msgstr "Инструменты"
 
-#: effects/LoadEffects.cpp:103
+#: effects/LoadEffects.cpp:109
 msgid "Oscillator"
 msgstr "Осцилляторы"
 
-#: effects/LoadEffects.cpp:105
+#: effects/LoadEffects.cpp:111
 msgid "Utility"
 msgstr "Вспомогательные"
 
-#: effects/LoadEffects.cpp:107
+#: effects/LoadEffects.cpp:113
 msgid "Converter"
 msgstr ""
 
-#: effects/LoadEffects.cpp:109
+#: effects/LoadEffects.cpp:115
 msgid "Analyser"
-msgstr "Анализаторы"
+msgstr "Анализ"
 
-#: effects/LoadEffects.cpp:111
+#: effects/LoadEffects.cpp:117
 #: toolbars/MixerToolBar.cpp:60
 msgid "Mixer"
 msgstr "Микшеры"
 
-#: effects/LoadEffects.cpp:113
+#: effects/LoadEffects.cpp:119
 msgid "Simulator"
 msgstr "Имитация"
 
-#: effects/LoadEffects.cpp:115
+#: effects/LoadEffects.cpp:121
 msgid "Delay"
 msgstr "Задержка"
 
-#: effects/LoadEffects.cpp:117
+#: effects/LoadEffects.cpp:123
 msgid "Modulator"
-msgstr "Модуляторы"
+msgstr "Модуляция"
 
-#: effects/LoadEffects.cpp:119
+#: effects/LoadEffects.cpp:125
 msgid "Reverb"
-msgstr "Ревербераторы"
+msgstr "Реверберация"
 
-#: effects/LoadEffects.cpp:121
+#: effects/LoadEffects.cpp:127
 #: effects/Phaser.cpp:208
 msgid "Phaser"
 msgstr "Фейзеры"
 
-#: effects/LoadEffects.cpp:123
+#: effects/LoadEffects.cpp:129
 msgid "Flanger"
 msgstr "Флэнжеры"
 
-#: effects/LoadEffects.cpp:125
+#: effects/LoadEffects.cpp:131
 msgid "Chorus"
 msgstr "Хорус"
 
-#: effects/LoadEffects.cpp:127
+#: effects/LoadEffects.cpp:133
 msgid "Filter"
-msgstr "Фильтрация"
+msgstr "Фильтры"
 
-#: effects/LoadEffects.cpp:129
+#: effects/LoadEffects.cpp:135
 msgid "Lowpass"
 msgstr "Фильтры низких частот"
 
-#: effects/LoadEffects.cpp:131
+#: effects/LoadEffects.cpp:137
 msgid "Bandpass"
 msgstr "Полосно-пропускающие фильтры"
 
-#: effects/LoadEffects.cpp:133
+#: effects/LoadEffects.cpp:139
 msgid "Highpass"
 msgstr "Фильтры верхних частот"
 
-#: effects/LoadEffects.cpp:135
+#: effects/LoadEffects.cpp:141
 msgid "Comb"
 msgstr "Гребенчатые фильтры"
 
-#: effects/LoadEffects.cpp:137
+#: effects/LoadEffects.cpp:143
 msgid "Allpass"
 msgstr ""
 
-#: effects/LoadEffects.cpp:139
+#: effects/LoadEffects.cpp:145
 msgid "Equaliser"
 msgstr "Эквалайзеры"
 
-#: effects/LoadEffects.cpp:141
+#: effects/LoadEffects.cpp:147
 msgid "Parametric"
 msgstr "Параметрический"
 
-#: effects/LoadEffects.cpp:143
+#: effects/LoadEffects.cpp:149
 msgid "Multiband"
 msgstr "Многополосный"
 
-#: effects/LoadEffects.cpp:145
+#: effects/LoadEffects.cpp:151
 msgid "Spectral Processor"
 msgstr "Обработка спектра"
 
-#: effects/LoadEffects.cpp:147
+#: effects/LoadEffects.cpp:153
 msgid "Pitch Shifter"
 msgstr ""
 
-#: effects/LoadEffects.cpp:149
+#: effects/LoadEffects.cpp:155
 msgid "Amplifier"
-msgstr "Усилитель"
+msgstr "Усилители"
 
-#: effects/LoadEffects.cpp:151
+#: effects/LoadEffects.cpp:157
 msgid "Distortion"
-msgstr "Искажения"
+msgstr "Искажение"
 
-#: effects/LoadEffects.cpp:153
+#: effects/LoadEffects.cpp:159
 msgid "Waveshaper"
 msgstr "Форма волны"
 
-#: effects/LoadEffects.cpp:155
+#: effects/LoadEffects.cpp:161
 msgid "Dynamics Processor"
 msgstr "Обработка динамики"
 
-#: effects/LoadEffects.cpp:157
+#: effects/LoadEffects.cpp:163
 msgid "Compressor"
 msgstr "Компрессоры"
 
-#: effects/LoadEffects.cpp:159
+#: effects/LoadEffects.cpp:165
 msgid "Expander"
 msgstr "Экспандеры"
 
-#: effects/LoadEffects.cpp:161
+#: effects/LoadEffects.cpp:167
 msgid "Limiter"
 msgstr "Ограничители"
 
-#: effects/LoadEffects.cpp:163
+#: effects/LoadEffects.cpp:169
 msgid "Gate"
 msgstr ""
 
-#: effects/LoadEffects.cpp:196
-#: effects/NoiseRemoval.cpp:723
+#: effects/LoadEffects.cpp:202
+#: effects/NoiseRemoval.cpp:725
 msgid "Noise Removal"
 msgstr "Удалить шум"
 
-#: effects/LoadEffects.cpp:198
+#: effects/LoadEffects.cpp:204
 msgid "Pitch and Tempo"
 msgstr "Высота тона и темп"
 
-#: effects/LoadEffects.cpp:200
+#: effects/LoadEffects.cpp:206
 msgid "Timeline Changer"
 msgstr "Смена временной шкалы"
 
-#: effects/LoadEffects.cpp:202
+#: effects/LoadEffects.cpp:208
 msgid "Time"
 msgstr "Время"
 
-#: effects/LoadEffects.cpp:204
+#: effects/LoadEffects.cpp:210
 msgid "Onsets"
 msgstr ""
 
@@ -5258,7 +5439,7 @@ msgstr "Коричневый"
 msgid "Noise Generator"
 msgstr "Генератор шума"
 
-#: effects/Noise.cpp:239
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr "Тип шума"
 
@@ -5277,62 +5458,68 @@ msgstr "Создаётся шум"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Не удалось открыть файл:\n"
+msgstr "Не удалось открыть файл:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Попытка удалить шум без расчитанной модели шума\n"
 
-#: effects/NoiseRemoval.cpp:812
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "Этап 1"
 
-#: effects/NoiseRemoval.cpp:813
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+#: effects/NoiseRemoval.cpp:815
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Выделите несколько секунд только шума, так чтобы программа знала, что\n"
+msgstr "Выделите несколько секунд только шума, так чтобы программа знала, что\n"
 "отфильтровать, а затем щёлкните мышкой по кнопке «Создать модель шума»:"
 
-#: effects/NoiseRemoval.cpp:814
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "Этап 2"
 
-#: effects/NoiseRemoval.cpp:815
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+#: effects/NoiseRemoval.cpp:817
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Выделите ту часть дорожки, к которой хотите применить фильтр, укажите,\n"
+msgstr "Выделите ту часть дорожки, к которой хотите применить фильтр, укажите,\n"
 "сколько шума отфильтровать, а затем щёлкните мышкой по кнопке «ОК»\n"
 
-#: effects/NoiseRemoval.cpp:820
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Удаление шума, автор — Dominic Mazzoni"
 
-#: effects/NoiseRemoval.cpp:828
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
 msgstr "Создать модель шума"
 
-#: effects/NoiseRemoval.cpp:839
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
 msgstr "Удаление шума (Дб):"
 
-#: effects/NoiseRemoval.cpp:847
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:849
 #, fuzzy
 msgid "Frequency smoothing (Hz):"
 msgstr "Частота (Гц):"
 
-#: effects/NoiseRemoval.cpp:855
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr "Атака/затухание (с):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Удаление шума..."
@@ -5378,10 +5565,6 @@ msgstr "Нормализация"
 msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr "Убрать все смещения с оси и выровнять по отметке 0.0"
 
-#: effects/Normalize.cpp:356
-msgid "Normalize maximum amplitude to"
-msgstr "Нормализовать максимальную амплитуду до"
-
 #: effects/Normalize.cpp:357
 msgid "Normalize maximum amplitude to:"
 msgstr "Подогнать максимальную амплитуду под:"
@@ -5390,6 +5573,10 @@ msgstr "Подогнать максимальную амплитуду под:"
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "Нормализовать..."
@@ -5465,18 +5652,15 @@ msgid "Applying Phaser"
 msgstr "Применяется эффект «Фейзер»"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Эффект восстановления предназначен для восстановления коротких участков испорченного звука (до 128 сэмплов).\n"
+msgstr "Эффект восстановления предназначен для восстановления коротких участков испорченного звука (до 128 сэмплов).\n"
 "\n"
 "Приблизьте отображения до максимума и выберите очень короткий отрезок звуковых данных."
 
 #: effects/Repair.cpp:105
-msgid ""
-"Repair works by using audio data outside the selection region.\n"
+msgid "Repair works by using audio data outside the selection region.\n"
 "\n"
 "Please select a region that has audio touching at least one side of it.\n"
 "\n"
@@ -5497,25 +5681,25 @@ msgid "Tracks are too long to repeat the selection."
 msgstr "Дорожки слишком длинны для повтора выделения."
 
 #: effects/Repeat.cpp:77
-#: effects/Repeat.cpp:187
+#: effects/Repeat.cpp:186
 msgid "Repeat"
 msgstr "Повтор..."
 
-#: effects/Repeat.cpp:212
+#: effects/Repeat.cpp:211
 msgid "Number of times to repeat:"
 msgstr "Количество повторов: "
 
-#: effects/Repeat.cpp:221
+#: effects/Repeat.cpp:220
 msgid "New selection length: hh:mm:ss"
 msgstr ""
 
-#: effects/Repeat.cpp:253
+#: effects/Repeat.cpp:252
 msgid "New selection length: "
 msgstr "Новая продолжительность выделения: "
 
 #. i18n-hint: Name of time display format that shows time in hours, minutes
 #. * and seconds
-#: effects/Repeat.cpp:262
+#: effects/Repeat.cpp:261
 #: widgets/TimeTextCtrl.cpp:270
 msgid "hh:mm:ss"
 msgstr "чч:мм:сс"
@@ -5530,11 +5714,11 @@ msgstr "Создаются повторы"
 
 #: effects/Reverse.h:30
 msgid "Reverse"
-msgstr "Разворот"
+msgstr "Реверс"
 
 #: effects/Reverse.h:44
 msgid "Reversing"
-msgstr "Применяется разворот"
+msgstr "Выполняется реверс"
 
 #: effects/Silence.cpp:32
 msgid "Silence Generator"
@@ -5566,8 +5750,7 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr ""
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
 msgstr ""
 
@@ -5591,13 +5774,62 @@ msgstr "С&терео в моно"
 msgid "Applying Stereo to Mono"
 msgstr ""
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+#, fuzzy
+msgid "Initial Tempo Change (%):"
+msgstr "Поддержка смены темпа и высоты тона"
+
+#: effects/TimeScale.cpp:191
+#, fuzzy
+msgid "Final Tempo Change (%):"
+msgstr "Поддержка смены темпа и высоты тона"
+
+#: effects/TimeScale.cpp:202
+#, fuzzy
+msgid "Initial Tempo Change (%)"
+msgstr "Поддержка смены темпа и высоты тона"
+
+#: effects/TimeScale.cpp:211
+#, fuzzy
+msgid "Final Tempo Change (%)"
+msgstr "Поддержка смены темпа и высоты тона"
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+#, fuzzy
+msgid "Changing Tempo/Pitch"
+msgstr "Изменяется высота тона"
+
 #: effects/ToneGen.cpp:61
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
 #: effects/ToneGen.cpp:69
-#: widgets/Meter.cpp:379
+#: widgets/Meter.cpp:416
 msgid "Linear"
 msgstr "Линейный"
 
@@ -5629,29 +5861,32 @@ msgstr "Зубцевидная"
 msgid "Square, no alias"
 msgstr ""
 
-#: effects/ToneGen.cpp:320
-#: effects/ToneGen.cpp:356
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
 msgstr "Частота (Гц)"
 
-#: effects/ToneGen.cpp:347
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "Волна:"
 
-#: effects/ToneGen.cpp:354
-#: toolbars/ControlToolBar.cpp:186
-msgid "Start"
-msgstr "Начало"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:355
-#: toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:156
-#: toolbars/SelectionBar.cpp:159
-#: toolbars/SelectionBar.cpp:262
-msgid "End"
-msgstr "Конец"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
 
-#: effects/ToneGen.cpp:364
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
 msgid "Interpolation:"
 msgstr "Интерполяция:"
 
@@ -5676,27 +5911,27 @@ msgid "All tracks must have the same sample rate"
 msgstr "У всех дорожек должна быть одинаковая частота сэмплирования"
 
 #: effects/TruncSilence.cpp:113
-#: effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr "Вырезание тишины"
 
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr "Макс. длительность тишины:"
 
-#: effects/TruncSilence.cpp:349
-#: prefs/AudioIOPrefs.cpp:192
-#: prefs/AudioIOPrefs.cpp:195
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
 #: prefs/MidiIOPrefs.cpp:174
 #: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "мс"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr "Порог тишины:"
 
-#: effects/TruncSilence.cpp:375
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr ""
 
@@ -5759,13 +5994,13 @@ msgstr "Применяется эффект \"WahWah\""
 
 #: effects/audiounits/AudioUnitEffect.cpp:138
 #: effects/ladspa/LadspaEffect.cpp:176
-#: effects/lv2/LV2Effect.cpp:164
+#: effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "Применяется эффект: %s"
 
 #: effects/ladspa/LadspaEffect.cpp:196
-#: effects/lv2/LV2Effect.cpp:184
+#: effects/lv2/LV2Effect.cpp:211
 msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr ""
 
@@ -5777,20 +6012,20 @@ msgid "None"
 msgstr "Нет"
 
 #: effects/ladspa/LadspaEffect.cpp:582
-#: effects/lv2/LV2Effect.cpp:571
+#: effects/lv2/LV2Effect.cpp:798
 #: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "Автор: "
 
 #: effects/ladspa/LadspaEffect.cpp:615
-#: effects/lv2/LV2Effect.cpp:599
+#: effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "Параметры эффекта"
 
 #: effects/ladspa/LadspaEffect.cpp:710
 #: effects/ladspa/LadspaEffect.cpp:713
-#: effects/lv2/LV2Effect.cpp:714
-#: effects/lv2/LV2Effect.cpp:717
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
 msgstr "Длительность (с)"
 
@@ -5824,8 +6059,7 @@ msgstr "Введите Nyquist-команду:"
 
 #: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
-msgstr ""
-"Извините, но эффект невозможно применить к стереодорожкам\n"
+msgstr "Извините, но эффект невозможно применить к стереодорожкам\n"
 "с несовпадающими индивидуальными дорожками"
 
 #: effects/nyquist/Nyquist.cpp:445
@@ -5879,72 +6113,71 @@ msgstr "Параметры расширения"
 msgid "Program"
 msgstr "Программа"
 
-#: export/Export.cpp:459
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
 msgstr ""
-"Не выбрано ни одной дорожки! Используйте команду «Выделить всё» (Ctrl+A)\n"
-"Нажмите «Экспортировать...» для экспорта всех дорожек."
 
-#: export/Export.cpp:514
-msgid "Export File"
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:522
+msgid "Export File"
+msgstr ""
+
+#: export/Export.cpp:530
 msgid "&Options..."
 msgstr "П&араметры..."
 
-#: export/Export.cpp:563
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
 msgstr "Вы уверены, что хотите сохранить файл как \""
 
-#: export/Export.cpp:579
+#: export/Export.cpp:591
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
 msgstr ""
 
-#: export/Export.cpp:600
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "Файл с именем «%s» уже существует. Заменить его?"
 
-#: export/Export.cpp:698
+#: export/Export.cpp:710
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "В экспортируемом файле дорожки будут сведены в два стереоканала"
 
-#: export/Export.cpp:703
+#: export/Export.cpp:715
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
 msgstr "В экспортируемом файле дорожки будут сведены в один моноканал"
 
-#: export/Export.cpp:713
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr "Расширенные параметры сведения"
 
-#: export/Export.cpp:917
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
 msgstr "Каналов: %2d"
 
-#: export/Export.cpp:1033
+#: export/Export.cpp:1046
 msgid " - Left"
 msgstr " — Слева"
 
-#: export/Export.cpp:1034
+#: export/Export.cpp:1047
 msgid " - Right"
 msgstr " — Справа"
 
-#: export/Export.cpp:1059
+#: export/Export.cpp:1072
 msgid "Mixer Panel"
 msgstr ""
 
-#: export/Export.cpp:1065
-#: export/Export.cpp:1112
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "Каналы выхода: %2d"
@@ -5975,7 +6208,7 @@ msgid "(external program)"
 msgstr "Передать внешней программе"
 
 #: export/ExportCL.cpp:253
-#: export/ExportPCM.cpp:423
+#: export/ExportPCM.cpp:457
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "Невозможно экспортировать данные в %s"
@@ -5992,507 +6225,556 @@ msgstr "Весь проект экспортируется через консо
 msgid "Command Output"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:2610
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
 #, c-format
 msgid "Exporting selected audio as %s"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:2611
+#: export/ExportFFmpeg.cpp:639
 #, c-format
 msgid "Exporting entire file as %s"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:2673
+#: export/ExportFFmpeg.cpp:702
 #: export/ExportMP3.cpp:1920
 msgid "Invalid sample rate"
 msgstr "Некорректная частота сэмплирования"
 
-#: export/ExportFFmpeg.cpp:2686
+#: export/ExportFFmpeg.cpp:715
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the current output\n"
+msgid "The project sample rate (%d) is not supported by the current output\n"
 "file format.  "
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:2689
+#: export/ExportFFmpeg.cpp:718
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the current output file format.  "
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:2692
+#: export/ExportFFmpeg.cpp:721
 #: export/ExportMP3.cpp:1939
 msgid "You may resample to one of the rates below."
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:2720
+#: export/ExportFFmpeg.cpp:749
 #: export/ExportMP3.cpp:1962
 msgid "Sample Rates"
 msgstr "Частоты сэмплирования"
 
-#: export/ExportFFmpeg.cpp:436
+#: export/ExportFFmpegDialogs.cpp:93
 msgid "Specify AC3 Options"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:457
+#: export/ExportFFmpegDialogs.cpp:117
 msgid "AC3 Export Setup"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:461
-#: export/ExportFFmpeg.cpp:713
-#: export/ExportFFmpeg.cpp:802
-#: export/ExportFFmpeg.cpp:890
-#: export/ExportFFmpeg.cpp:1310
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
 #: export/ExportMP2.cpp:133
 msgid "Bit Rate:"
 msgstr "Скорость потока:"
 
-#: export/ExportFFmpeg.cpp:613
+#: export/ExportFFmpegDialogs.cpp:162
 msgid "Specify AAC Options"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:626
+#: export/ExportFFmpegDialogs.cpp:178
 msgid "AAC Export Setup"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:688
+#: export/ExportFFmpegDialogs.cpp:217
 msgid "Specify AMR-NB Options"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:709
+#: export/ExportFFmpegDialogs.cpp:241
 msgid "AMR-NB Export Setup"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:777
+#: export/ExportFFmpegDialogs.cpp:286
 msgid "Specify AMR-WB Options"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:798
+#: export/ExportFFmpegDialogs.cpp:310
 msgid "AMR-WB Export Setup"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:865
+#: export/ExportFFmpegDialogs.cpp:357
 msgid "Specify WMA Options"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:886
+#: export/ExportFFmpegDialogs.cpp:381
 msgid "WMA Export Setup"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:494
+#: export/ExportFFmpegDialogs.cpp:509
 #, c-format
 msgid "Overwrite preset '%s'?"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:495
+#: export/ExportFFmpegDialogs.cpp:510
 msgid "Confirm Overwrite"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1162
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
 msgid "Specify Other Options"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1272
+#: export/ExportFFmpegDialogs.cpp:897
 msgid "Preset:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1273
+#: export/ExportFFmpegDialogs.cpp:898
 msgid "Load Preset"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1274
+#: export/ExportFFmpegDialogs.cpp:899
 msgid "Save Preset"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1275
+#: export/ExportFFmpegDialogs.cpp:900
 msgid "Delete Preset"
 msgstr "Удалить предустановку"
 
-#: export/ExportFFmpegDialogs.cpp:883
+#: export/ExportFFmpegDialogs.cpp:901
 msgid "Import Presets"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:884
+#: export/ExportFFmpegDialogs.cpp:902
 msgid "Export Presets"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1280
+#: export/ExportFFmpegDialogs.cpp:907
 msgid "Format:"
 msgstr "Формат:"
 
-#: export/ExportFFmpeg.cpp:1282
+#: export/ExportFFmpegDialogs.cpp:909
 msgid "Codec:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1286
+#: export/ExportFFmpegDialogs.cpp:913
 msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1289
+#: export/ExportFFmpegDialogs.cpp:916
 msgid "Format selector:"
 msgstr "Выбор формата:"
 
-#: export/ExportFFmpeg.cpp:1290
+#: export/ExportFFmpegDialogs.cpp:917
 msgid "Codec selector:"
 msgstr "Выбор кодека:"
 
-#: export/ExportFFmpeg.cpp:1292
+#: export/ExportFFmpegDialogs.cpp:919
 msgid "Show All Formats"
 msgstr "Показать все форматы"
 
-#: export/ExportFFmpeg.cpp:1293
+#: export/ExportFFmpegDialogs.cpp:920
 msgid "Show All Codecs"
 msgstr "Показать все кодеки"
 
-#: export/ExportFFmpeg.cpp:1304
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
 #: prefs/GUIPrefs.cpp:166
 msgid "Language:"
 msgstr "Язык:"
 
-#: export/ExportFFmpeg.cpp:1305
-msgid ""
-"ISO 639 3-letter language code\n"
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
 "Optional\n"
 "empty - automatic"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1307
+#: export/ExportFFmpegDialogs.cpp:934
 msgid "Tag:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1308
-msgid ""
-"Codec tag (FOURCC)\n"
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
 "Optional\n"
 "empty - automatic"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1311
-msgid ""
-"Bit Rate (bits/second) - influences the resulting file size and quality\n"
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
 "Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
 "0 - automatic\n"
 "Recommended - 192000"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1313
+#: export/ExportFFmpegDialogs.cpp:940
 #: export/ExportOGG.cpp:86
 msgid "Quality:"
 msgstr "Качество:"
 
-#: export/ExportFFmpeg.cpp:1314
-msgid ""
-"Overral quality, used differently by different codecs\n"
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
 "Required for vorbis\n"
 "0 - automatic\n"
 "-1 - off (use bitrate instead)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:550
-#: export/ExportFFmpeg.cpp:1316
+#: export/ExportFFmpegDialogs.cpp:943
 msgid "Sample Rate:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1317
-msgid ""
-"Sample rate (Hz)\n"
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
 "0 - don't change sample rate"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1319
+#: export/ExportFFmpegDialogs.cpp:946
 msgid "Cutoff Bandwidth:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1320
-msgid ""
-"Audio cutoff bandwidth (Hz)\n"
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
 "Optional\n"
 "0 - automatic\n"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1325
+#: export/ExportFFmpegDialogs.cpp:949
 msgid "Profile:"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:933
-msgid ""
-"AAC Profile\n"
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
 "Low Complexity -default\n"
 "Most players won't play anything other than LC"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1335
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
 msgid "Compression Level:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1336
-msgid ""
-"Compression level\n"
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
 "Required for FLAC\n"
 "-1 - automatic\n"
 "min - 0 (fast encoding, large output file)\n"
 "max - 10 (slow encoding, small output file)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1338
+#: export/ExportFFmpegDialogs.cpp:968
 msgid "Frame Size:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1339
-msgid ""
-"Frame size\n"
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
 "Optional\n"
 "0 - default\n"
 "min - 16\n"
 "max - 65535"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1341
+#: export/ExportFFmpegDialogs.cpp:971
 msgid "LPC coefficients precision"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1342
-msgid ""
-"LPC coefficients precision\n"
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
 "Optional\n"
 "0 - default\n"
 "min - 1\n"
 "max - 15"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1344
+#: export/ExportFFmpegDialogs.cpp:974
 msgid "Minimal prediction order"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1345
-msgid ""
-"Minimal prediction order\n"
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
 "Optional\n"
 "-1 - default\n"
 "min - 0\n"
 "max - 32 (with LPC) or 4 (without LPC)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1347
+#: export/ExportFFmpegDialogs.cpp:977
 msgid "Maximal prediction order"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1348
-msgid ""
-"Maximal prediction order\n"
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
 "Optional\n"
 "-1 - default\n"
 "min - 0\n"
 "max - 32 (with LPC) or 4 (without LPC)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1350
+#: export/ExportFFmpegDialogs.cpp:980
 msgid "Prediction Order Method:"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:964
-msgid ""
-"Prediction Order Method\n"
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
 "Estimate - fastest, lower compression\n"
 "Log search - slowest, best compression\n"
 "Full search - default"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1353
+#: export/ExportFFmpegDialogs.cpp:984
 msgid "Minimal partition order"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1354
-msgid ""
-"Minimal partition order\n"
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
 "Optional\n"
 "-1 - default\n"
 "min - 0\n"
 "max - 8"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1356
+#: export/ExportFFmpegDialogs.cpp:987
 msgid "Maximal partition order"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1357
-msgid ""
-"Maximal partition order\n"
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
 "Optional\n"
 "-1 - default\n"
 "min - 0\n"
 "max - 8"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1370
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
 msgid "Mux Rate:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1371
-msgid ""
-"Maximum bit rate of the multiplexed stream\n"
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
 "Optional\n"
 "0 - default"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1373
+#: export/ExportFFmpegDialogs.cpp:1004
 msgid "Packet Size:"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1374
-msgid ""
-"Packet size\n"
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
 "Optional\n"
 "0 - default"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:1201
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
 #, c-format
 msgid "Delete preset '%s'?"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:1220
+#: export/ExportFFmpegDialogs.cpp:1238
 msgid "You can't save a preset without name"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:1259
+#: export/ExportFFmpegDialogs.cpp:1277
 msgid "Select xml file with presets to import"
 msgstr ""
 
-#: export/ExportFFmpegDialogs.cpp:1274
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML-файлы (*.xml)|*.txt|Все файлы (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
 msgid "Select xml file to export presets into"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:112
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
 msgid "M4A (AAC) Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:113
+#: export/ExportFFmpegDialogs.h:54
 msgid "AC3 Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:116
+#: export/ExportFFmpegDialogs.h:55
 msgid "AMR (narrow band) Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:117
+#: export/ExportFFmpegDialogs.h:56
 msgid "AMR (wide band) Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:118
+#: export/ExportFFmpegDialogs.h:57
 msgid "WMA (version 2) Files (FFmpeg)"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:119
+#: export/ExportFFmpegDialogs.h:58
 msgid "Custom FFmpeg Export"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:587
+#: export/ExportFFmpegDialogs.h:373
 msgid "LTP"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:587
+#: export/ExportFFmpegDialogs.h:373
 msgid "Low Complexity"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:587
+#: export/ExportFFmpegDialogs.h:373
 msgid "Main profile"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1049
+#: export/ExportFFmpegDialogs.h:676
 msgid "2-level"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1049
+#: export/ExportFFmpegDialogs.h:676
 msgid "4-level"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1049
+#: export/ExportFFmpegDialogs.h:676
 msgid "8-level"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1049
+#: export/ExportFFmpegDialogs.h:676
 msgid "Estimate"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1049
+#: export/ExportFFmpegDialogs.h:676
 msgid "Full search"
 msgstr ""
 
-#: export/ExportFFmpeg.cpp:1049
+#: export/ExportFFmpegDialogs.h:676
 msgid "Log search"
 msgstr ""
 
-#: export/ExportFLAC.cpp:68
+#: export/ExportFLAC.cpp:67
 msgid "Specify FLAC Options"
 msgstr "Параметры FLAC"
 
-#: export/ExportFLAC.cpp:82
+#: export/ExportFLAC.cpp:81
 msgid "0 (fastest)"
 msgstr "0 (быстрее всего)"
 
-#: export/ExportFLAC.cpp:83
+#: export/ExportFLAC.cpp:82
 msgid "1"
 msgstr "1"
 
-#: export/ExportFLAC.cpp:84
+#: export/ExportFLAC.cpp:83
 msgid "2"
 msgstr "2"
 
-#: export/ExportFLAC.cpp:85
+#: export/ExportFLAC.cpp:84
 msgid "3"
 msgstr "3"
 
-#: export/ExportFLAC.cpp:86
+#: export/ExportFLAC.cpp:85
 msgid "4"
 msgstr "4"
 
-#: export/ExportFLAC.cpp:87
+#: export/ExportFLAC.cpp:86
 msgid "5"
 msgstr "5"
 
-#: export/ExportFLAC.cpp:88
+#: export/ExportFLAC.cpp:87
 msgid "6"
 msgstr "6"
 
-#: export/ExportFLAC.cpp:89
+#: export/ExportFLAC.cpp:88
 msgid "7"
 msgstr "7"
 
-#: export/ExportFLAC.cpp:90
+#: export/ExportFLAC.cpp:89
 msgid "8 (best)"
 msgstr "8 (лучше всего)"
 
-#: export/ExportFLAC.cpp:93
+#: export/ExportFLAC.cpp:92
 msgid "16 bit"
 msgstr "16 бит"
 
-#: export/ExportFLAC.cpp:94
+#: export/ExportFLAC.cpp:93
 msgid "24 bit"
 msgstr "24 бита"
 
-#: export/ExportFLAC.cpp:98
+#: export/ExportFLAC.cpp:97
 msgid "FLAC Export Setup"
 msgstr "Параметры экспорта во FLAC"
 
-#: export/ExportFLAC.cpp:102
+#: export/ExportFLAC.cpp:101
 msgid "Level:"
 msgstr "Уровень сжатия:"
 
-#: export/ExportFLAC.cpp:104
+#: export/ExportFLAC.cpp:103
 msgid "Bit depth:"
 msgstr "Разрядность:"
 
-#: export/ExportFLAC.cpp:210
+#: export/ExportFLAC.cpp:209
 msgid "FLAC Files"
 msgstr "Файлы FLAC"
 
-#: export/ExportFLAC.cpp:313
+#: export/ExportFLAC.cpp:312
 msgid "Exporting the selected audio as FLAC"
 msgstr "Выделенное экспортируется в файл FLAC"
 
-#: export/ExportFLAC.cpp:314
+#: export/ExportFLAC.cpp:313
 msgid "Exporting the entire project as FLAC"
 msgstr "Весь проект экспортируется в файл FLAC"
 
@@ -6628,6 +6910,12 @@ msgstr "Audacity требуется файл %s для записи файлов
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Чтобы скачать LAME, щелкните тут -->"
 
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
 msgstr "Только lame_enc.dll|lame_enc.dll| Динамически слинкованные библиотеки (*.dll|*.dll Все файлы (*.*)|*"
@@ -6693,37 +6981,33 @@ msgstr ""
 
 #: export/ExportMP3.cpp:1933
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr ""
 
 #: export/ExportMP3.cpp:1936
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:2110
-msgid "MP3 exporting plugin not found"
-msgstr "Расширение для экспорта в MP3 не найдено"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
-#: export/ExportMultiple.cpp:95
-#: export/ExportMultiple.cpp:422
-#: export/ExportMultiple.cpp:661
-#: export/ExportMultiple.cpp:828
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "Экспорт в несколько файлов"
 
-#: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+#: export/ExportMultiple.cpp:166
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Если в вашем проекте больше одной звуковой дорожки,\n"
+msgstr "Если в вашем проекте больше одной звуковой дорожки,\n"
 "вы можете экспортировать каждую их них в отдельный\n"
 "файл, а при наличии дорожки для пометок —\n"
 "экспортировать по новому файлу для каждой пометки.\n"
@@ -6732,121 +7016,119 @@ msgstr ""
 "для пометок, так что вызванная вами функция работать\n"
 "не будет."
 
-#: export/ExportMultiple.cpp:165
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
 msgstr "Невозможно экспортировать раздельные файлы"
 
-#: export/ExportMultiple.cpp:230
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "Формат экспорта:"
 
-#: export/ExportMultiple.cpp:235
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
 msgstr "Параметры..."
 
-#: export/ExportMultiple.cpp:239
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "Каталог для экспорта:"
 
-#: export/ExportMultiple.cpp:243
+#: export/ExportMultiple.cpp:245
 #: prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Выберите..."
 
-#: export/ExportMultiple.cpp:244
+#: export/ExportMultiple.cpp:246
 msgid "Create"
 msgstr "Создать"
 
-#: export/ExportMultiple.cpp:251
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "Разделение файлов по принципу:"
 
-#: export/ExportMultiple.cpp:260
 #: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
 msgid "Labels"
 msgstr "Пометки"
 
-#: export/ExportMultiple.cpp:267
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
 msgstr "Включая звук перед первой пометкой"
 
-#: export/ExportMultiple.cpp:273
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "Имя первого файла:"
 
-#: export/ExportMultiple.cpp:278
+#: export/ExportMultiple.cpp:280
 msgid "First file name"
 msgstr "Имя первого файла"
 
-#: export/ExportMultiple.cpp:286
 #: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
 msgid "Tracks"
 msgstr "Дорожки"
 
-#: export/ExportMultiple.cpp:295
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
 msgstr "Именование файлов:"
 
-#: export/ExportMultiple.cpp:304
 #: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
 msgstr "Используется пометка/ Название дорожки"
 
-#: export/ExportMultiple.cpp:312
 #: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
 msgstr "Последовательное нумерование"
 
-#: export/ExportMultiple.cpp:320
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "Префикс имени файла:"
 
-#: export/ExportMultiple.cpp:325
+#: export/ExportMultiple.cpp:327
 msgid "File name prefix"
 msgstr "Префикс имени файла"
 
-#: export/ExportMultiple.cpp:339
+#: export/ExportMultiple.cpp:341
 msgid "Overwrite existing files"
 msgstr "Перезаписать существующие файлы"
 
-#: export/ExportMultiple.cpp:420
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr ""
 
-#: export/ExportMultiple.cpp:429
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
 msgstr "Выберите каталог для экспортируемых файлов"
 
-#: export/ExportMultiple.cpp:533
+#: export/ExportMultiple.cpp:539
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
 msgstr ""
 
-#: export/ExportMultiple.cpp:631
-#: export/ExportMultiple.cpp:766
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
 msgid "Edit metadata"
 msgstr ""
 
-#: export/ExportMultiple.cpp:658
-#: export/ExportMultiple.cpp:825
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
 msgstr "Успешно экспортировано файлов: %d."
 
-#: export/ExportMultiple.cpp:659
-#: export/ExportMultiple.cpp:826
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "После экспорта %d файла(-ов) что-то пошло не так."
 
-#: export/ExportMultiple.cpp:888
+#: export/ExportMultiple.cpp:881
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
 msgstr ""
 
@@ -6870,208 +7152,214 @@ msgstr "Выделенное экспортируется в файл Ogg Vorbis
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Весь проект экспортируется в файл Ogg Vorbis"
 
-#: export/ExportPCM.cpp:112
+#: export/ExportPCM.cpp:116
 msgid "Specify Uncompressed Options"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
+#: export/ExportPCM.cpp:185
 msgid "Uncompressed Export Setup"
 msgstr "Параметры экспорта без сжатия"
 
-#: export/ExportPCM.cpp:183
+#: export/ExportPCM.cpp:191
 msgid "Header:"
 msgstr "Заголовок:"
 
-#: export/ExportPCM.cpp:187
+#: export/ExportPCM.cpp:195
 #: import/ImportRaw.cpp:366
 msgid "Encoding:"
 msgstr "Кодирование:"
 
-#: export/ExportPCM.cpp:192
+#: export/ExportPCM.cpp:200
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Возможны не все комбинации заголовков и кодировок.)"
 
-#: export/ExportPCM.cpp:343
-msgid "WAV (Microsoft) signed 16 bit PCM"
-msgstr ""
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr "Прочие несжатые файлы"
 
-#: export/ExportPCM.cpp:352
+#: export/ExportPCM.cpp:361
 msgid "AIFF (Apple) signed 16 bit PCM"
 msgstr ""
 
-#: export/ExportPCM.cpp:359
-msgid "Other uncompressed files"
-msgstr "Прочие несжатые файлы"
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
 
-#: export/ExportPCM.cpp:384
+#: export/ExportPCM.cpp:387
 msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
-#: export/ExportPCM.cpp:417
+#: export/ExportPCM.cpp:449
 msgid "Cannot export audio in this format."
 msgstr "Невозможно экспортировать данные в этот формат."
 
-#: export/ExportPCM.cpp:457
+#: export/ExportPCM.cpp:491
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr ""
 
-#: export/ExportPCM.cpp:459
+#: export/ExportPCM.cpp:493
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr ""
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:491
+#: export/ExportPCM.cpp:531
 #, c-format
 msgid "Error (file may not have been written): %s"
 msgstr "Ошибка (возможно, файл не записан): %hs"
 
-#: import/Import.cpp:297
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156
 #: import/ImportMP3.cpp:47
 msgid "MP3 files"
 msgstr "MP3"
 
-#: import/Import.cpp:149
-#: import/Import.cpp:308
+#: import/Import.cpp:175
 msgid "Select stream(s) to import"
 msgstr ""
 
-#: import/Import.cpp:207
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Эта версия Audacity была скомпилирована без поддержки %s."
 
 #: import/Import.cpp:240
 #, c-format
-msgid ""
-"\"%s\" \n"
+msgid "\"%s\" \n"
 "is a MIDI file, not an audio file. \n"
 "Audacity cannot open this type of file for playing, but you can\n"
 "edit it by clicking File > Import > MIDI."
 msgstr ""
 
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:220
+#: import/Import.cpp:250
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:226
+#: import/Import.cpp:256
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
 
-#: import/Import.cpp:231
+#: import/Import.cpp:261
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:236
+#: import/Import.cpp:266
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:241
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
 "These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:246
+#: import/Import.cpp:276
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:260
+#: import/Import.cpp:282
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
 msgstr ""
 
-#: import/Import.cpp:266
+#: import/Import.cpp:288
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:272
+#: import/Import.cpp:294
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:278
+#: import/Import.cpp:300
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:284
+#: import/Import.cpp:306
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
 #: import/Import.cpp:312
 #, c-format
-msgid ""
-"\"%s\" is a video file. \n"
+msgid "\"%s\" is a video file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
 
 #: import/Import.cpp:317
 #, c-format
-msgid ""
-"Audacity did not recognize the type of the file '%s'.\n"
+msgid "Audacity did not recognize the type of the file '%s'.\n"
 "If it is uncompressed, try importing it using \"Import Raw\"."
-msgstr ""
-"Программа не распознала формат файла\n"
+msgstr "Программа не распознала формат файла\n"
 "'%s'.\n"
 "Если он несжатый, попробуйте импортировать\n"
 "как беззаголовочный."
 
 #: import/Import.cpp:322
 #, c-format
-msgid ""
-"Audacity recognized the type of the file '%s',\n"
+msgid "Audacity recognized the type of the file '%s',\n"
 "but was unable to import it."
-msgstr ""
-"Программа распознала формат файла,\n"
+msgstr "Программа распознала формат файла,\n"
 "'%s',\n"
 "но не поддерживает его."
 
@@ -7079,12 +7367,12 @@ msgstr ""
 msgid "FFmpeg-compatible files"
 msgstr "Файлы, поддерживаемые FFmpeg"
 
-#: import/ImportFFmpeg.cpp:355
+#: import/ImportFFmpeg.cpp:431
 #, c-format
-msgid "Index[%02x] Codec[%S], Language[%S], Duration[%d]"
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
 
-#: import/ImportFLAC.cpp:45
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "Файлы FLAC"
 
@@ -7158,15 +7446,10 @@ msgstr "Ошибочный заголовок потока Vorbis"
 msgid "Internal logic fault"
 msgstr "Внутренняя логическая ошибка"
 
-#: import/ImportPCM.cpp:52
+#: import/ImportPCM.cpp:54
 msgid "WAV, AIFF, and other uncompressed types"
 msgstr "WAV, AIFF и другие типы несжатых данных"
 
-#: import/ImportPCM.cpp:424
-#, c-format
-msgid "Importing %s File..."
-msgstr "Импортируется файл %s..."
-
 #: import/ImportPlugin.h:142
 #: import/ImportRaw.cpp:203
 #, c-format
@@ -7242,7 +7525,7 @@ msgstr "Сколько импортировать:"
 msgid "Sample rate:"
 msgstr "Частота сэмплирования:"
 
-#: ondemand/ODComputeSummaryTask.h:55
+#: ondemand/ODComputeSummaryTask.h:47
 msgid "Import complete. Calculating waveform"
 msgstr "Импорт завершен. Вычисляется волновая форма сигнала"
 
@@ -7250,7 +7533,7 @@ msgstr "Импорт завершен. Вычисляется волновая 
 msgid "Decoding Waveform"
 msgstr "Выполняется декодирование волновой формы"
 
-#: ondemand/ODWaveTrackTaskQueue.cpp:323
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
 #, c-format
 msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
@@ -7308,7 +7591,7 @@ msgstr "Каналов"
 #: prefs/AudioIOPrefs.cpp:147
 #: prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
-msgstr "Сквозное воспроизведение"
+msgstr "Мониторинг записи"
 
 #: prefs/AudioIOPrefs.cpp:149
 msgid "Overdub: &Play other tracks while recording new one"
@@ -7316,73 +7599,69 @@ msgstr "&Наложение: воспроизводить другие доро
 
 #: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
-msgstr "&Аппаратное: воспроизводить новые дорожки при их записи"
+msgstr "&Аппаратный: воспроизводить новые дорожки при их записи"
 
 #: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
-msgstr "&Программное: воспроизводить новые дорожки при их записи"
+msgstr "&Программный: воспроизводить новые дорожки при их записи"
 
 #: prefs/AudioIOPrefs.cpp:157
 msgid "&Software Playthrough: Play new track while recording or monitoring"
-msgstr "&Программное сквозное воспроизведение: воспроизводить записываемую/отслеживаемую дорожку"
+msgstr "&Программный мониторинг записи: воспроизводить записываемую/отслеживаемую дорожку"
 
 #: prefs/AudioIOPrefs.cpp:160
 msgid "(uncheck when recording \"stereo mix\")"
 msgstr "(не использовать при записи стереомикса)"
 
-#: prefs/AudioIOPrefs.cpp:164
+#: prefs/AudioIOPrefs.cpp:168
 #: prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr "Предпрослушивание эффектов"
 
-#: prefs/AudioIOPrefs.cpp:167
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
 msgstr "Длительность прослушивания:"
 
-#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:176
 #: prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr "Прослушивание результата вырезания"
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
 msgstr "Перед вырезаемой областью:"
 
-#: prefs/AudioIOPrefs.cpp:177
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
 msgstr "После вырезаемой области:"
 
-#: prefs/AudioIOPrefs.cpp:185
+#: prefs/AudioIOPrefs.cpp:189
 #: prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr "Задержка"
 
-#: prefs/AudioIOPrefs.cpp:191
-msgid ""
-"Audio to buffer:\n"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Звук в буфере:\n"
+msgstr "Звук в буфере:\n"
 "(выше значение — больше задержка)"
 
-#: prefs/AudioIOPrefs.cpp:194
-msgid ""
-"Latency correction:\n"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Коррекция задержки:\n"
+msgstr "Коррекция задержки:\n"
 "(отрицательная = в обратную сторону)"
 
-#: prefs/AudioIOPrefs.cpp:199
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr "Прокрутка при воспроизведении"
 
-#: prefs/AudioIOPrefs.cpp:202
+#: prefs/AudioIOPrefs.cpp:206
 #: prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr "Короткая прокрутка:"
 
-#: prefs/AudioIOPrefs.cpp:204
+#: prefs/AudioIOPrefs.cpp:208
 #: prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr "Долгая прокрутка"
@@ -7408,7 +7687,7 @@ msgstr "Ре&жим CleanSpeech (специализированный интер
 
 #: prefs/DirectoriesPrefs.cpp:55
 #: prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:265
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Каталоги"
 
@@ -7446,8 +7725,7 @@ msgstr "Кэширование данных"
 
 #: prefs/DirectoriesPrefs.cpp:112
 msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
-msgstr ""
-"Использовать ОЗУ для воспроизведения и записи\n"
+msgstr "Использовать ОЗУ для воспроизведения и записи\n"
 "(лучше для старых компьютеров, но опасно при работе с длительными записями)"
 
 #: prefs/DirectoriesPrefs.cpp:121
@@ -7470,8 +7748,7 @@ msgstr "У вас нет прав на запись в каталог %s"
 
 #: prefs/DirectoriesPrefs.cpp:199
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
-msgstr ""
-"Изменения касательно каталога для хранения временных файлов \n"
+msgstr "Изменения касательно каталога для хранения временных файлов \n"
 "не возымеют эффекта, пока программа Audacity не будет перезагружена."
 
 #: prefs/FileFormatPrefs.cpp:53
@@ -7491,10 +7768,9 @@ msgstr "Версия библиотеки для поддержки MP3:"
 msgid "MP3 Library:"
 msgstr "Библиотека для поддержки MP3:"
 
-#: prefs/FileFormatPrefs.cpp:96
-#: prefs/FileFormatPrefs.cpp:120
-msgid "&Find Library"
-msgstr "&Найти библиотеку"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:98
 msgid "LAME MP3 Library:"
@@ -7700,6 +7976,14 @@ msgstr "Кнопка «Соло»:"
 msgid "Keyboard"
 msgstr "Клавиатура"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Горячие клавиши"
@@ -7733,22 +8017,16 @@ msgstr "Ошибка при сохранении клавиатурных ком
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Выберите XML-файл, содержащий горячие клавиши Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:202
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML-файлы (*.xml)|*.txt|Все файлы (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
 msgstr "Ошибка при загрузке клавиатурных комбинаций"
 
 #: prefs/KeyConfigPrefs.cpp:243
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Клавиатурная комбинация '%s' уже назначена для:\n"
+msgstr "Клавиатурная комбинация '%s' уже назначена для:\n"
 "\n"
 "'%s'"
 
@@ -7757,7 +8035,6 @@ msgstr ""
 msgid "Undo"
 msgstr "Отменить"
 
-#: prefs/AudioIOPrefs.cpp:149
 #: prefs/MidiIOPrefs.cpp:146
 msgid "&Play other tracks while recording new one"
 msgstr "&Воспроизводить существующие дорожки при записи новой"
@@ -8056,18 +8333,16 @@ msgstr "Частота сэмплирования по умолчанию:"
 
 #: prefs/QualityPrefs.cpp:127
 msgid "Default Sample Format:"
-msgstr "Размер сэмпла по умолчанию:"
+msgstr "Разрядность по умолчанию:"
 
 #: prefs/QualityPrefs.cpp:136
 msgid "Real-time sample rate converter:"
-msgstr ""
-"Преобразование частоты сэмплирования \n"
+msgstr "Преобразование частоты сэмплирования \n"
 "в режиме реального времени:"
 
 #: prefs/QualityPrefs.cpp:139
 msgid "High-quality sample rate converter:"
-msgstr ""
-"Высококачественное преобразование \n"
+msgstr "Высококачественное преобразование \n"
 "частоты сэмплирования:"
 
 #: prefs/QualityPrefs.cpp:142
@@ -8167,11 +8442,11 @@ msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:161
 msgid "&Find Notes"
-msgstr ""
+msgstr "&Найти ноты"
 
 #: prefs/SpectrumPrefs.cpp:162
 msgid "&Quantize Notes"
-msgstr ""
+msgstr "&Квантовать ноты"
 
 #: prefs/SpectrumPrefs.cpp:165
 msgid "Minimum Amplitude (dB):"
@@ -8246,8 +8521,7 @@ msgid "Info"
 msgstr "Информация"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -8263,32 +8537,25 @@ msgid ""
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
 msgstr ""
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:83
-msgid "Control"
-msgstr ""
-
 #: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Приостановить"
@@ -8321,16 +8588,16 @@ msgstr ""
 msgid "Clean Speech"
 msgstr "Почистить запись голоса"
 
-#: toolbars/ControlToolBar.cpp:537
-#: toolbars/ControlToolBar.cpp:866
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr "Ошибка при открытии звукового устройства. "
 
-#: toolbars/ControlToolBar.cpp:703
+#: toolbars/ControlToolBar.cpp:706
 msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:704
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "Запись не разрешена"
 
@@ -8421,6 +8688,7 @@ msgid "Slider Output"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
 msgid "Input Volume"
 msgstr "Вход"
 
@@ -8692,14 +8960,14 @@ msgstr "Кнопка"
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #: widgets/ASlider.cpp:612
-#: widgets/Meter.cpp:212
+#: widgets/Meter.cpp:248
 msgid "L"
 msgstr "Л"
 
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #: widgets/ASlider.cpp:615
-#: widgets/Meter.cpp:214
+#: widgets/Meter.cpp:250
 msgid "R"
 msgstr "П"
 
@@ -8758,55 +9026,53 @@ msgstr "Ряд %d"
 msgid "Empty"
 msgstr "Пусто"
 
-#: widgets/Meter.cpp:359
+#: widgets/Meter.cpp:396
 msgid "Enable Meter"
 msgstr "Включить индикацию"
 
-#: widgets/Meter.cpp:361
+#: widgets/Meter.cpp:398
 msgid "Disable Meter"
 msgstr "Отключить индикацию"
 
-#: widgets/Meter.cpp:364
+#: widgets/Meter.cpp:401
 msgid "Stop Monitoring"
 msgstr "Отключить мониторинг"
 
-#: widgets/Meter.cpp:366
+#: widgets/Meter.cpp:403
 msgid "Start Monitoring"
 msgstr "Включить мониторинг"
 
-#: widgets/Meter.cpp:370
+#: widgets/Meter.cpp:407
 msgid "Horizontal Stereo"
 msgstr "Горизонтальная ориентация"
 
-#: widgets/Meter.cpp:371
+#: widgets/Meter.cpp:408
 msgid "Vertical Stereo"
 msgstr "Вертикальная ориентация"
 
-#: widgets/Meter.cpp:388
+#: widgets/Meter.cpp:425
 msgid "Preferences..."
 msgstr "Параметры..."
 
-#: widgets/Meter.cpp:845
+#: widgets/Meter.cpp:876
 msgid "Mix Volume"
 msgstr "Микс"
 
-#: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+#: widgets/Meter.cpp:1145
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Здесь указывается, как часто должен обновляться\n"
+msgstr "Здесь указывается, как часто должен обновляться\n"
 "индикатор. Если у вас достаточно медленный\n"
 "компьютер, укажите частоту поменьше (30 в секунду\n"
 "или меньше), чтобы качество звука не страдало."
 
-#: widgets/Meter.cpp:1079
+#: widgets/Meter.cpp:1146
 msgid "Meter refresh rate per second [1-100]: "
 msgstr "Частота обновления индикатора в секундах [1-100]: "
 
-#: widgets/Meter.cpp:1080
+#: widgets/Meter.cpp:1147
 msgid "Meter Preferences"
 msgstr "Параметры индикатора"
 
@@ -8818,15 +9084,15 @@ msgstr " Выберите действие "
 msgid "Please select an action"
 msgstr "Выберите действие"
 
-#: widgets/ProgressDialog.cpp:96
+#: widgets/ProgressDialog.cpp:97
 msgid "Elapsed Time:"
 msgstr "Потрачено времени:"
 
-#: widgets/ProgressDialog.cpp:116
+#: widgets/ProgressDialog.cpp:117
 msgid "Remaining Time:"
 msgstr "Осталось:"
 
-#: widgets/ProgressDialog.cpp:133
+#: widgets/ProgressDialog.cpp:134
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -8867,6 +9133,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 дней 024 ч 060 м 060 с"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -9053,7 +9334,7 @@ msgstr "Не удалось открыть файл: \"%s\""
 #: xml/XMLFileReader.cpp:63
 #, c-format
 msgid "Error: %hs at line %lu"
-msgstr ""
+msgstr "Ошибка: %hs в строке %lu"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/sk.po b/locale/sk.po
index 0a39be9..911ba52 100644
--- a/locale/sk.po
+++ b/locale/sk.po
@@ -21,36 +21,24 @@ msgstr "Project-Id-Version: Audacity\n"
 msgid "&About Audacity..."
 msgstr "O programe &Audacity..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Povolené"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Dátum zostavenia programu (build):"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity je voľne použiteľný program napísaný skupinou dobrovoľníkov z celého sveta. Ich spolupráca prebieha vďaka SourceForge.net, online službe, ktorá poskytuje zadarmo nástroje pre vývoj projektov s otvoreným zdrojovým kódom. Audacity možno používať s Windows 98 a novšími, Mac OS X, Linuxom a ostatnými Unix-like operačnými systémami. Staršie verzie Audacity možno používať na Mac OS 9."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Toto je betaverzia programu. Môže obsahovať chyby a nedokončené vlastnosti. Naša práca závisí na spätnej väzbe, ktorú nám poskytnete. Takže prosím navštívte našu webovú stránku, nahláste nám chyby a napíšte žiadosti o vlastnosti, ktoré by mali byť v budúcich verziách."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Toto je stabilné, dokončené vydanie Audacity. Pokiaľ však nájdete chybu, alebo máte pripomienku, spojte sa prosím s nami. Zlepšovanie Audacity závisí na spätnej väzbe od užívateľov. Pre viac informácií navštívte našu domovskú stránku."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #  i18n-hint: The translation of "translator_credits" will appear
 #  in the credits in the About Audacity window.  Use this to add
@@ -62,13 +50,9 @@ msgstr "Toto je stabilné, dokončené vydanie Audacity. Pokiaľ však nájdete
 msgid "translator_credits"
 msgstr "Slovenský preklad: Jozef Kundlák ml."
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Slobodný editor digitálneho zvuku"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Informácia"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -104,28 +88,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Zvláštne poďakovanie:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Povolené"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Dátum zostavenia programu (build):"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-#: ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463
-msgid "Close"
-msgstr "Zavrieť"
-
 #: ../src/AudacityApp.cpp:304
 #: ../src/Project.cpp:1770
 #, c-format
@@ -332,12 +406,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -373,8 +448,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -422,6 +497,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -470,10 +549,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -691,16 +778,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Premenovaný súbor: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Mením blok%s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -829,6 +916,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Obdĺžnikový"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "Kde je %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Frekvenčná analýza"
@@ -855,8 +1029,8 @@ msgstr "Vylepšená autokorelácia"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -870,8 +1044,8 @@ msgstr "Veľkosť"
 msgid " window"
 msgstr " okno"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -882,14 +1056,25 @@ msgstr "Lineárna frekvence"
 msgid "Log frequency"
 msgstr "Log frekvencie"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+#: ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463
+msgid "Close"
+msgstr "Zavrieť"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
@@ -945,7 +1130,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Oneskorenie (sekundy)\tFrekvencia (Hz)\tÚroveň"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -961,15 +1146,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -980,40 +1181,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1209,6 +1434,10 @@ msgstr "&Uložiť projekt\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Uložiť projekt &ako..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1217,6 +1446,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1245,10 +1478,26 @@ msgstr "Exportovať &popisy (Labels)..."
 msgid "Export &Multiple..."
 msgstr "Exportovať &viac súborov..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1310,9 +1559,9 @@ msgstr "&Zmazať\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Ticho\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1326,22 +1575,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1385,12 +1632,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1401,66 +1648,67 @@ msgstr "VÅ¡&etko\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "Nastaviť začiatok na kurzor"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Kurzor na koniec stopy"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Nájsť priesečníky s nulou\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "Presunúť kurzor..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "na začiatok výberu"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "na koniec výberu"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "na začiatok stopy"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "na koniec stopy"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Uloženie výberu"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Obnovenie výberu"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1479,10 +1727,14 @@ msgstr "Zapnúť polohovanie k mriežke"
 msgid "Turn Grid Snap Off"
 msgstr "Vypnúť polohovanie k mriežke"
 
-#: ../src/Menus.cpp:327
-#: ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "N&astavenia...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1520,60 +1772,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&História"
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:578
+msgid "!Simplified View"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: ../src/Menus.cpp:569
+msgid "Skip to Start\tHome"
+msgstr "Preskočiť na začiatok\tHome"
+
+#: ../src/Menus.cpp:570
+msgid "Skip to End\tEnd"
+msgstr "Preskočiť na koniec\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1589,12 +1903,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Časová stopa"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1609,6 +1919,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "&Odstrániť stopu(y)"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Zarovnať na n&ulu"
@@ -1625,29 +1943,40 @@ msgstr "Zarovnať na &začiatok výberu"
 msgid "Align with Selection &End"
 msgstr "Zarovnať na koniec &výberu"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Zarovnať koniec na kurzor"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Zarovnať koniec na začiatok výberu"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Zarovnať koniec na koniec výberu"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Zarovnať stopy navzájom "
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Zarovnať stopy..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1660,22 +1989,26 @@ msgstr "Vložiť popisku k výberu\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Vložiť popis na pozíciu prehrávania\tCtrl+B"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&Generovať"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Efe&kty"
@@ -1710,6 +2043,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1722,12 +2059,12 @@ msgstr "Spustiť benchma&rk..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:549
@@ -1762,9 +2099,9 @@ msgstr "Ďalší nástroj\tD"
 msgid "Previous Tool\tA"
 msgstr "Predchádzajúci nástroj\tA"
 
-#: ../src/Menus.cpp:559
-msgid "Play/Stop\tSpacebar"
-msgstr "Prehrať/Zastaviť\tMedzerník"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:560
 msgid "Stop\tS"
@@ -1778,12 +2115,12 @@ msgstr "Zastaviť (Pause)\tP"
 msgid "Record\tR"
 msgstr "Nahrávat\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:564
@@ -1798,22 +2135,14 @@ msgstr "Prehrať do výberu\tB"
 msgid "Play Looped\tL"
 msgstr "Prehrať v slučke\tL"
 
-#: ../src/Menus.cpp:567
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Hrať v slučke \tShift+Medzerník"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:569
-msgid "Skip to Start\tHome"
-msgstr "Preskočiť na začiatok\tHome"
-
-#: ../src/Menus.cpp:570
-msgid "Skip to End\tEnd"
-msgstr "Preskočiť na koniec\tEnd"
-
 #: ../src/Menus.cpp:572
 msgid "Selection to Start\tShift+Home"
 msgstr "Rozšírenie výberu na začiatok\tShift+Home"
@@ -1870,8 +2199,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:585
@@ -1970,14 +2299,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "Posledné &súbory..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:620
 #, c-format
@@ -2034,6 +2368,23 @@ msgstr "Opakovať %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Žiadne popisové stopy na export."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1636
 msgid "Nothing to undo"
 msgstr "Žiadna obnoviteľná akcia"
@@ -2074,6 +2425,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Vložené zo schránky"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2242,9 +2597,9 @@ msgstr "Importovať popisy (Labels)..."
 msgid "Select a MIDI file..."
 msgstr "Zvoliť MIDI súbor..."
 
-#: ../src/Menus.cpp:2676
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Všetky súbory (*.*)|*.*|MIDI súbory (*.mid)|*.mid|Allegro súbory (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2694
 #, c-format
@@ -2263,14 +2618,6 @@ msgstr "Zvoľte nejaký nekomprimovaný audio súbor..."
 msgid "All files (*)|*"
 msgstr "Všetky súbory (*)|*"
 
-#: ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-#: ../src/import/ImportPCM.cpp:403
-#: ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408
-msgid "Import"
-msgstr "Import"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2302,6 +2649,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2892
 msgid "Aligned with zero"
 msgstr "Zarovnané na nulu"
@@ -2338,6 +2689,14 @@ msgstr "Zarovnané"
 msgid "Align"
 msgstr "Zarovnať"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2977
 msgid "Created new audio track"
 msgstr "Nová audio stopa vytvorená"
@@ -2401,14 +2760,14 @@ msgstr "&Odstrániť stopu(y)"
 msgid "Removed audio track(s)"
 msgstr "Odstránené audio stopy"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2475,14 +2834,13 @@ msgstr "Nahratý zvuk"
 msgid "Save changes before closing?"
 msgstr "Uložiť zmeny pred uzavretím?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2502,6 +2860,25 @@ msgstr "Zvoľte jeden alebo viac zvukových súborov..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821
 #: ../src/Project.cpp:1829
 msgid "Error opening file"
@@ -2559,42 +2936,34 @@ msgstr "Súbor bol uložený Audacity %s.\n"
 msgid "Can't open project file"
 msgstr "Nie je možné otvoriť súbor projektu"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Nie je možné uložiť projekt. Je možné, že do %s sa nedá zapisovať,\n"
-"alebo je plný disk."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148
 #: ../src/Project.cpp:2160
@@ -2606,23 +2975,19 @@ msgstr "Chyba pri ukladaní projektu"
 msgid "Saved %s"
 msgstr "Uložené %s"
 
-#  i18n-hint: This refers to files that are opened directly
-#  without looking at the file header.  Same as "Import Raw"
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Neformátované dáta"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importované '%s'"
 
+#: ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+#: ../src/import/ImportPCM.cpp:403
+#: ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408
+msgid "Import"
+msgstr "Import"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Chyba importu"
@@ -2635,17 +3000,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Súbory projektov Audacity (.aup) Vám umožňujú uložiť všetko s čím pracujete presne tak\n"
-"ako to vyzerá na obrazovke, ale väčšina ostatných programov tieto súbory načítať nevie..\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Pokiaľ chcete uložiť súbor, ktorý bude čitateľný i v ostatných programoch, zvoľte jeden\n"
-"z exportných príkazov."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2688,6 +3059,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Nedostatok miesta na disku"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2771,43 +3152,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2847,8 +3197,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Komentáre"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2867,12 +3217,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2914,100 +3264,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maximálna dĺžka atribútu '%s' je %d znakov. Dáta boli skrátené."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Titul:"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Interpret:"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Album:"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3072,8 +3341,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3116,6 +3428,10 @@ msgstr "Krivka"
 msgid "Waveform (dB)"
 msgstr "Krivka (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Výška tónu (EAC)"
@@ -3249,13 +3565,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Časový posun"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Nemáte dostatočné zväcšenie. Priblížte, až uvidíte jednotlivé vzorky."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3342,6 +3658,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3399,15 +3723,6 @@ msgstr "Zmena rýchlosti"
 msgid "Format Change"
 msgstr "Zmena formátu"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Vložte rýchlosť v Hz (vzoriek za sekundu) v rozmedzí 1 a 100000:"
-
-#: ../src/AStatus.cpp:362
-#: ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Chybná rýchlosť."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr "Zmeniť dolný limit rýchlosti  (%) na:"
@@ -3542,8 +3857,8 @@ msgstr "Moduly 1 - %i"
 msgid "Plugins %i to %i"
 msgstr "Moduly %i - %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3565,8 +3880,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3587,14 +3902,19 @@ msgstr "Použitý efekt: %s %.1f dB"
 msgid "Amplify"
 msgstr "Zosilniť"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Zosilnenie od Dominica Mazzoniho"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Zosilnenie (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Nová špičková amplitúda (dB):"
@@ -3603,6 +3923,10 @@ msgstr "Nová špičková amplitúda (dB):"
 msgid "Allow clipping"
 msgstr "Povoliť clipping"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Zosilniť..."
@@ -3726,10 +4050,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Frekvencia (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Zdôraznenie (boost) (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3771,9 +4103,50 @@ msgstr "od Vaughana Johnsona && Dominica Mazzoniho"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "pomocou SoundTouch od Olli Parviainen"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Výška: od"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Poltóny:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284
 #: ../src/effects/ChangePitch.cpp:330
@@ -3783,13 +4156,9 @@ msgstr "Výška: od"
 msgid "to"
 msgstr "na"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Poltóny:"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frekvencia (Hz): z"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353
 #: ../src/effects/ChangeSpeed.cpp:305
@@ -3797,6 +4166,11 @@ msgstr "Frekvencia (Hz): z"
 msgid "Percent Change:"
 msgstr "Percento zmeny:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Zmeniť výšku..."
@@ -3815,6 +4189,11 @@ msgstr "Použitý efekt: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Zmeniť rýchlosť"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "nemá význam"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Zmena rýchlosti, ovplyvňujúca tempo a výšku"
@@ -3823,14 +4202,17 @@ msgstr "Zmena rýchlosti, ovplyvňujúca tempo a výšku"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "pomocou SampleRate od Erika de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "nemá význam"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Štandardný vinyl RPM: od"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3848,13 +4230,29 @@ msgstr "Zmeniť tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Zmeniť tempo bez zmeny ladenia"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Úderov za minútu (BPM):     Od"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Dĺžka (sekundy):     od"
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3864,8 +4262,8 @@ msgstr "Zmeniť tempo..."
 msgid "Changing Tempo"
 msgstr "Mením tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3876,10 +4274,18 @@ msgstr "Odstránenie šumu a praskania od Craiga DeForesta"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Odstránenie praskania..."
@@ -3892,49 +4298,84 @@ msgstr "Odstraňujem praskot a šum..."
 msgid "Dynamic Range Compressor"
 msgstr "Kompresor dynamického rozsahu"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Kompresor dynamického rozsahu od Dominica Mazzoniho"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Pomer:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Dĺžka nábehu:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Po kompresii normalizovať na 0 dB"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Prah: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Pomer: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Pomer: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Čas nábehu: %.1f sekúnd"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3945,6 +4386,247 @@ msgstr "Kompresor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Aplikujem kompresiu dynamického rozsahu..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Informácia"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3961,8 +4643,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Amplitúda (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4191,16 +4873,12 @@ msgstr "Invertovať"
 msgid "Inverting"
 msgstr "Invertujem"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4212,31 +4890,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4247,6 +4929,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Fázer (Phaser)"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Odstránenie šumu"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4263,10 +5097,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4294,10 +5124,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Odstránenie šumu"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Krok 1"
@@ -4328,14 +5154,26 @@ msgstr "Získať profil šumu"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Odstránenie šumu..."
@@ -4370,22 +5208,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Normalizovať"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Odstrániť akýkoľvek DC posun (vycentrovať na 0 vertikálne)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Normalizovať..."
@@ -4399,44 +5237,56 @@ msgstr "Normalizujem..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Použitý efekt: %s %d krokov, %.0f%% wet, frekvencia = %.1f Hz, štartovacia fáza = %.0f deg, hĺbka = %d, sp. väzba = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Fázer (Phaser)"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Fázer od Nasca Octavian Paul"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "Krokov:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "DRY"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "WET"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497
 #: ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO frekvencia (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO Štartovacia fáza (deg.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Hĺbka:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Spätná väzba (feedback) (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Fázer (Phaser)..."
@@ -4451,6 +5301,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4469,28 +5327,23 @@ msgstr "Stopy sú príliš dlhé pre opakovanie výberu."
 msgid "Repeat"
 msgstr "Opakovať"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Opakovanie od Dominica Mazzoniho && Vaughana Johnsona"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Počet opakovaní:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241
 #: ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Nová dĺžka výberu:"
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minút, %d sekúnd"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekúnd"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4554,8 +5407,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4563,6 +5464,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "Lineárny"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4592,22 +5501,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Krivka:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4634,10 +5549,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4683,10 +5594,6 @@ msgstr "Použitý efekt: %s frekvencia = %.1f Hz, štartovacia fáza = %.0f deg,
 msgid "Wahwah"
 msgstr "Kvákadlo (Wahwah)"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Kvákadlo (Wahwah) od Nasca Octavian Paul"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Hĺbka (%):"
@@ -4695,10 +5602,18 @@ msgstr "Hĺbka (%):"
 msgid "Resonance:"
 msgstr "Rezonancia:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Offset kvákacej (wah) frekvencie (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Kvákadlo (Wahwah)..."
@@ -4735,6 +5650,18 @@ msgstr "Nastavenie efektu"
 msgid "Length (seconds)"
 msgstr "Dĺžka (sekundy)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Aplikujem Nyquist efekt..."
@@ -4800,9 +5727,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4856,6 +5786,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4891,10 +5825,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "Nie je možné exportovať audio do %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Exportujem zvolené audio pomocou enkóderu s príkazovým riadkom"
@@ -4907,6 +5837,477 @@ msgstr "Exportujem celý projekt pomocou enkóderu s príkazovým riadkom"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Dátový tok (Bit Rate):"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Jazyk:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4979,10 +6380,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4991,10 +6388,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Dátový tok (Bit Rate):"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -5003,10 +6396,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345
 #: ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
@@ -5032,44 +6421,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5080,20 +6437,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5124,6 +6477,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Kvalita"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5149,33 +6506,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Kde je %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5185,8 +6524,9 @@ msgstr "Len lame_enc.dll|lame_enc.dll|Dynamicky linkované knižnice (*.dll)|*.d
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Len libmp3lame.so|libmp3lame.so|Súbory primárne zdieľaných objektov (*.so)|*.so|Rozšírené knižnice (*.so*)|*.so*|Všetky súbory (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5205,10 +6545,6 @@ msgstr "Toto nie je správna alebo podporovaná knižnica pre kódovanie do MP3.
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Editovať ID3 tagy MP3 súboru"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5244,10 +6580,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5260,18 +6592,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "Zásuvný modul pre export do MP3 nebol nájdený"
-
 #: ../src/export/ExportMultiple.cpp:367
 #: ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
@@ -5329,6 +6653,10 @@ msgstr "Pred prvý popis vložiť zvukový záznam"
 msgid "First file name:"
 msgstr "Prvé meno súboru:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Stopy"
@@ -5350,15 +6678,14 @@ msgstr "Postupné číslovanie"
 msgid "File name prefix:"
 msgstr "Predpona mena súboru:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Prepísať existujúce súbory"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5368,10 +6695,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Zvoľte umiestnenie pre exportované súbory"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5379,6 +6702,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5389,6 +6716,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5397,10 +6730,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5413,22 +6742,14 @@ msgstr "Exportujem zvolené audio ako Ogg Vorbis"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Exportujem celý projekt ako Ogg Vorbis"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5444,8 +6765,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Nie všetky kombinácie hlavičiek\n"
 "a kódovania sú možné.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5469,8 +6802,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Chyba (súbor možno nebol zapísaný): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5478,6 +6839,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Táto verzia Audacity nebola kompilovaná s podporou %s."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5508,9 +6877,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5523,19 +6893,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity nerozpoznal typ tohoto souboru.\n"
-"Pokiaľ nie je skomprimovaný, skúste ho importovať s použitím \"Importovať Raw\""
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5576,16 +6998,17 @@ msgstr "MIDI stopy nemôžu byť posunuté zvlášť, len zvukové súbory."
 msgid "Invalid track offset in LOF file."
 msgstr "Chybná pozícia stopy v LOF súbore."
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Chyba pri načítaní (parsovaní) Allegro súboru."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Chyba pri načítaní (parsovaní) MIDI súboru."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5612,15 +7035,23 @@ msgstr "Chybná hlavička dátového toku Vorbis"
 msgid "Internal logic fault"
 msgstr "Vnútorná logická chyba"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importujem %s súbor..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Importovať Raw data"
@@ -5664,6 +7095,14 @@ msgstr "2 kanály (Stereo)"
 msgid "%d Channels"
 msgstr "%d kanálov"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Počiatočný posun:"
@@ -5676,8 +7115,17 @@ msgstr "Rozsah k načítaniu:"
 msgid "Sample rate:"
 msgstr "Rýchlosť vzorkovania:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5721,10 +7169,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Počas nahrávania novej stopy prehrávať ostatné stopy."
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5734,8 +7181,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5762,12 +7213,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5795,21 +7248,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88
 #: ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
@@ -5848,7 +7289,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5873,23 +7314,65 @@ msgstr "Do adresára %s nie je možné zapisovať"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Zmena dočasného adresára sa prejaví až po reštarte Audacity."
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Vytvoriť kópiu súboru pred úpravou (bezpečnejšie)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "Verzia MP3 knižnice:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Čítať priamo z pôvodného súboru (rýchlejšie)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5919,53 +7402,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "Verzia MP3 knižnice:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Rozhranie (Interface)"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Nájsť knižnicu"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Rozhranie (Interface)"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5980,6 +7458,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5988,24 +7470,24 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Jazyk:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
@@ -6016,6 +7498,10 @@ msgstr "-36 dB (plytký rozsah pre editáciu vysokých frekvencií)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM rozsah 8 bitových vzoriek)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM rozsah 16 bitových vzoriek)"
@@ -6028,10 +7514,34 @@ msgstr "-120 dB (približná hranica ľudského sluchu)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM rozsah 24 bitových vzoriek)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Klávesnica"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6064,10 +7574,6 @@ msgstr "Chyba pri ukladaní klávesových skratiek"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Zvoľte XML súbor obsahujúcí klávesové skratky pre Audacity..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Chyba pri načítaní klávesových skratiek"
@@ -6083,6 +7589,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Späť"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Počas nahrávania novej stopy prehrávať ostatné stopy."
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Myš"
@@ -6307,10 +7850,6 @@ msgstr "Zväčšiť alebo zmenšiť"
 msgid "Audacity Preferences"
 msgstr "Nastavenia Audacity"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Kvalita"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Obdĺžnikový"
@@ -6377,12 +7916,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6401,6 +7940,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - východzie"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - najužšie pásmo"
@@ -6409,6 +7952,10 @@ msgstr "4096 - najužšie pásmo"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6425,6 +7972,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "Maximálna frekvencia (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Maximálna frekvencia musí byť celé číslo"
@@ -6441,6 +8008,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6513,10 +8088,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Pozastaviť (Pause)"
@@ -6525,9 +8096,9 @@ msgstr "Pozastaviť (Pause)"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Prehrať (shift pre prehranie v slučke)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6541,6 +8112,10 @@ msgstr "Preskočiť na začiatok"
 msgid "Skip to End"
 msgstr "Preskočiť na koniec"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6573,6 +8148,10 @@ msgstr "Odstrániť všetko mimo výberu"
 msgid "Silence selection"
 msgstr "Nahradiť výber tichom"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Zväčšiť"
@@ -6629,24 +8208,20 @@ msgstr "Ukazovateľ úrovne výstupu"
 msgid "Input level meter - click to monitor input"
 msgstr "Ukazovateľ úrovne vstupu - kliknite, pokiaľ chcete monitorovať vstup."
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Výstupná hlasitosť"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Vstupná hlasitosť"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6665,6 +8240,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6924,6 +8504,22 @@ msgstr "Pravý"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6970,14 +8566,14 @@ msgstr "Horizontálne stereo"
 msgid "Vertical Stereo"
 msgstr "Vertikálne Stereo"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "Lineárny"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6997,6 +8593,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -7005,10 +8617,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -7021,6 +8629,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7134,11 +8757,10 @@ msgstr "Nezobrazovať znovu toto varovanie"
 msgid "Could not open file: \"%s\""
 msgstr "Nie je možné otvoriť súbor: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Chyba: %s na riacku %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/sl.po b/locale/sl.po
index 3930a1e..7675c2e 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -3,12 +3,11 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity 1.4\n"
+msgstr "Project-Id-Version: Audacity 1.4\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-04-02 22:53+0100\n"
-"PO-Revision-Date: 2008-04-13 12:17+0100\n"
-"Last-Translator: Martin Srebotnjak <miles at filmsi.net>\n"
+"POT-Creation-Date: 2008-11-09 20:10+0000\n"
+"PO-Revision-Date: 2008-11-18 16:55+0100\n"
+"Last-Translator: Martin Srebotnjak  <milrs at filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles at filmsi.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +17,27 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: AboutDialog.cpp:142
-#: AudacityApp.cpp:749
-#: Menus.cpp:745
+#: AboutDialog.cpp:143
+#: AudacityApp.cpp:807
+#: Menus.cpp:955
 msgid "&About Audacity..."
 msgstr "&O programu Audacity ..."
 
-#: AboutDialog.cpp:156
+#: AboutDialog.cpp:157
 msgid "OK... Audacious!"
 msgstr "Audaciozno!"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "Audacity je prosto dostopna aplikacija, ki jo je spisala skupina prostovoljnih programerjev po celem svetu. Koordinacija poteka pod okriljem SourceForge.net, spletne storitve s prostimi orodji za odprtokodne projekte. Na voljo je za okolja Windows 98 ali novejša, MacOS X, Linux ter druge Unixu podobne sisteme. Starejše različice Audacity so na voljo tudi za Mac OS 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr "Audacity je prosto dostopen in brezplačen program, ki ga je razvila skupina prostovoljnih<a href=\"http://audacity.sourceforge.net/community/developers\">razvijalcev</a> s celega sveta. Hvaležni smo <a href=\"http://sourceforge.net\">SourceForge.net</a>, ki gosti naš projekt. Na voljo je za okolja Windows 98 ali novejša, MacOS X, Linux ter druge Unixu podobne sisteme. Starejše različice Audacity so na voljo tudi za Mac OS 9."
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "To je beta različica aplikacije. Lahko vsebuje napake in nedokončane sposobnosti. Zanašamo se na vaš odziv, obiščite našo spletno stran in nam sporočite morebitne napake in svoje želje za razvoj."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "To je beta različica programa. Lahko vsebuje napake in nedokončane odlike. Zanašamo se na vaš odziv, obiščite našo spletno stran in nam sporočite morebitne napake in svoje želje za razvoj na naslov <b>feedback at audacityteam.org</b> (v ang.). Če potrebujete pomoč pri delu z Audacity, obiščite naš <a href=\"http://audacityteam.org/forum/\">forum (v ang.)</a>."
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "To je stabilna, zaključena izdaja programa Audacity. Če opazite hrošča ali imate predloge, nas prosimo obvestite. Razvoj in izboljšave programa Audacity so odvisne od odziva uporabnikov. Za več informacij obiščite našo spletno stran."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr "To je stabilna, zaključena izdaja programa Audacity. Če opazite hrošča ali imate predloge, nam, prosimo, pišite na naslov <b>feedback at audacityteam.org</b>. Za več informacij o rabi Audacity obiščite naš  <a href=\"http://audacityteam.org/forum/\">forum</a>."
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -49,11 +48,11 @@ msgstr "To je stabilna, zaključena izdaja programa Audacity. Če opazite hroš
 #: AboutDialog.cpp:192
 #: AboutDialog.cpp:194
 msgid "translator_credits"
-msgstr "Slovenski prevod: "
+msgstr "Slovenski prevod: Martin Srebotnjak"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Brezplačen urejevalnik digitalnega zvoka"
+msgid "A Free Digital Audio Editor<br>"
+msgstr "Brezplačen urejevalnik digitalnega zvoka<br>"
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -89,262 +88,254 @@ msgstr "Audacity temelji na kodi naslednjih projektov:"
 msgid "Special thanks:"
 msgstr "Posebna zahvala:"
 
-#: AboutDialog.cpp:254
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr "Program <b>Audacity&reg;</b> je avtorsko delo &copy; 1999-2008 ekipe Audacity. <br>Ime <b>Audacity&reg;</b> je registrirana blagovna znamka Dominica Mazzonija."
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
 msgstr "Audacity"
 
 #. i18n-hint: Information about when audacity was compiled
-#: AboutDialog.cpp:299
-#: AboutDialog.cpp:312
-#: AboutDialog.cpp:468
+#: AboutDialog.cpp:304
+#: AboutDialog.cpp:317
+#: AboutDialog.cpp:473
 msgid "Build Information"
 msgstr "Informacije o gradnji"
 
-#: AboutDialog.cpp:305
+#: AboutDialog.cpp:310
 #: effects/AvcCompressor.cpp:674
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: AboutDialog.cpp:306
+#: AboutDialog.cpp:311
 msgid "Disabled"
 msgstr "Onemogočeno"
 
-#: AboutDialog.cpp:316
+#: AboutDialog.cpp:321
 msgid "File Format Support"
 msgstr "Podpora vrstam datotek"
 
 #. i18n-hint: This is what the library (libmad) does - imports MP3 files
-#: AboutDialog.cpp:326
-#: AboutDialog.cpp:328
+#: AboutDialog.cpp:331
+#: AboutDialog.cpp:333
 msgid "MP3 Importing"
 msgstr "Uvažanje MP3"
 
-#: AboutDialog.cpp:335
-#: AboutDialog.cpp:338
+#: AboutDialog.cpp:340
+#: AboutDialog.cpp:343
 msgid "Ogg Vorbis Import and Export"
 msgstr "Uvoz in izvoz Ogg Vorbis"
 
-#: AboutDialog.cpp:342
-#: AboutDialog.cpp:345
+#: AboutDialog.cpp:347
+#: AboutDialog.cpp:350
 msgid "ID3 tag support"
 msgstr "Podpora značkam ID3"
 
-#: AboutDialog.cpp:352
-#: AboutDialog.cpp:355
+#: AboutDialog.cpp:357
+#: AboutDialog.cpp:360
 msgid "FLAC import and export"
 msgstr "Uvoz in izvoz FLAC"
 
-#: AboutDialog.cpp:360
-#: AboutDialog.cpp:363
+#: AboutDialog.cpp:365
+#: AboutDialog.cpp:368
 msgid "MP2 export"
 msgstr "Izvoz MP2"
 
-#: AboutDialog.cpp:368
-#: AboutDialog.cpp:371
+#: AboutDialog.cpp:373
+#: AboutDialog.cpp:376
 msgid "Import via QuickTime"
 msgstr "Uvoz QuickTime"
 
 #. i18n-hint: Libraries that are essential to audacity
-#: AboutDialog.cpp:378
+#: AboutDialog.cpp:383
 msgid "Core Libraries"
 msgstr "Temeljne knjižnice"
 
-#: AboutDialog.cpp:384
-#: AboutDialog.cpp:387
-#: AboutDialog.cpp:390
+#: AboutDialog.cpp:389
 #: AboutDialog.cpp:392
+#: AboutDialog.cpp:395
+#: AboutDialog.cpp:397
 msgid "Sample rate conversion"
 msgstr "Pretvorba frekvence vzorčenja"
 
-#: AboutDialog.cpp:397
-#: AboutDialog.cpp:400
+#: AboutDialog.cpp:402
+#: AboutDialog.cpp:405
 msgid "Audio playback and recording"
 msgstr "Predvajanje in snemanje zvoka"
 
-#: AboutDialog.cpp:413
+#: AboutDialog.cpp:418
 msgid "Features"
 msgstr "Odlike"
 
-#: AboutDialog.cpp:417
-#: AboutDialog.cpp:420
+#: AboutDialog.cpp:422
 #: AboutDialog.cpp:425
-#: AboutDialog.cpp:428
+#: AboutDialog.cpp:430
 #: AboutDialog.cpp:433
-#: AboutDialog.cpp:436
+#: AboutDialog.cpp:438
 #: AboutDialog.cpp:441
-#: AboutDialog.cpp:444
+#: AboutDialog.cpp:446
+#: AboutDialog.cpp:449
 msgid "Plug-in support"
 msgstr "Podpora za vtičnike"
 
-#: AboutDialog.cpp:449
-#: AboutDialog.cpp:452
+#: AboutDialog.cpp:454
+#: AboutDialog.cpp:457
 msgid "Sound card mixer support"
 msgstr "Podpora za mešalne zvočne vmesnike"
 
-#: AboutDialog.cpp:457
-#: AboutDialog.cpp:460
+#: AboutDialog.cpp:462
+#: AboutDialog.cpp:465
 msgid "Pitch and Tempo Change support"
 msgstr "Podpora spremembi višine tona in tempa"
 
-#: AboutDialog.cpp:472
+#: AboutDialog.cpp:477
 msgid "Program build date: "
 msgstr "Datum izdelave programa: "
 
-#: AboutDialog.cpp:475
-#: AboutDialog.cpp:477
+#: AboutDialog.cpp:480
+#: AboutDialog.cpp:482
 msgid "Build type:"
 msgstr "Vrsta gradnje:"
 
-#: AboutDialog.cpp:475
+#: AboutDialog.cpp:480
 msgid "Debug build"
 msgstr "Izdaja za razhroščevanje"
 
-#: AboutDialog.cpp:477
+#: AboutDialog.cpp:482
 msgid "Release build"
 msgstr "Uradna izdaja"
 
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
-#: AboutDialog.cpp:482
+#: AboutDialog.cpp:487
 msgid "Installation Prefix: "
 msgstr "Namestitvena predpona poti: "
 
-#: AboutDialog.cpp:486
+#: AboutDialog.cpp:491
 msgid "Settings folder: "
 msgstr "Mapa z nastavitvami:"
 
-#: AboutDialog.cpp:501
+#: AboutDialog.cpp:506
 msgid "GPL License"
 msgstr "Licenca GPL"
 
-#: AudacityApp.cpp:468
-#: Project.cpp:1750
+#: AudacityApp.cpp:507
+#: Project.cpp:1844
 #, c-format
 msgid "%s is already open in another window."
 msgstr "Projekt %s je že odprt v drugem oknu."
 
-#: AudacityApp.cpp:470
-#: Project.cpp:1752
-#: Project.cpp:1857
-#: Project.cpp:2001
-#: Project.cpp:2103
+#: AudacityApp.cpp:509
+#: Project.cpp:1846
+#: Project.cpp:1951
+#: Project.cpp:2095
+#: Project.cpp:2232
 msgid "Error opening project"
 msgstr "Napaka pri odpiranju projekta"
 
-#: AudacityApp.cpp:502
+#: AudacityApp.cpp:541
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s ne obstaja in je ni mogoče odpreti.\n"
+msgstr "%s ne obstaja in je ni mogoče odpreti.\n"
 "\n"
 "Odstranjeno s seznama zgodovine."
 
-#: AudacityApp.cpp:581
+#: AudacityApp.cpp:643
 msgid "Master Gain Control"
 msgstr "Glavni nadzor krepitve"
 
-#: AudacityApp.cpp:582
+#: AudacityApp.cpp:644
 msgid "Input Meter"
 msgstr "Vhodno merilo"
 
-#: AudacityApp.cpp:583
+#: AudacityApp.cpp:645
 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+,
-#: AudacityApp.cpp:751
-#: Menus.cpp:478
+#: AudacityApp.cpp:809
 msgid "&Preferences...\tCtrl+,"
 msgstr "&Nastavitve ...\tCtrl+,"
 
-#: AudacityApp.cpp:833
-#: AudacityApp.cpp:910
+#: AudacityApp.cpp:901
+#: AudacityApp.cpp:978
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "Uporaba velikosti gruče %ld\n"
 
-#: AudacityApp.cpp:855
-#: AudacityApp.cpp:925
+#: AudacityApp.cpp:923
+#: AudacityApp.cpp:993
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Neznan ukaz v opravilni vrstici: %s\n"
 
-#: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+#: AudacityApp.cpp:1127
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity ni našel prostora za začasne datoteke.\n"
+msgstr "Audacity ni našel prostora za začasne datoteke.\n"
 "Prosimo, da vnesete primerno pot do mape v dialogu nastavitev."
 
-#: AudacityApp.cpp:1050
+#: AudacityApp.cpp:1133
 msgid "Audacity is now going to exit. Please launch Audacity again to use the new temporary directory."
 msgstr "Audacity se zapira. Prosimo, znova zaženite Audacity, da boste lahko uporabljali novo začasno mapo."
 
-#: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+#: AudacityApp.cpp:1165
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Poganjanje dveh kopij Audacity hkrati lahko povzroči\n"
+msgstr "Poganjanje dveh kopij Audacity hkrati lahko povzroči\n"
 "izgubo podatkov ali sesuje vaš sistem.\n"
 "\n"
 
-#: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+#: AudacityApp.cpp:1172
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity ne more zakleniti mape začasnih datotek.\n"
+msgstr "Audacity ne more zakleniti mape začasnih datotek.\n"
 "To mapo morda uporablja drugi Audacity.\n"
 
-#: AudacityApp.cpp:1091
+#: AudacityApp.cpp:1174
 msgid "Do you still want to start Audacity?"
 msgstr "Želite vseeno zagnati Audacity?"
 
-#: AudacityApp.cpp:1093
+#: AudacityApp.cpp:1176
 msgid "Error locking temporary folder"
 msgstr "Napaka pri zaklepanju začasne mape"
 
-#: AudacityApp.cpp:1131
+#: AudacityApp.cpp:1214
 msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Sistem je zaznal, da Audacity že teče.\n"
 
-#: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+#: AudacityApp.cpp:1216
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Uporabite ukaza Nov ali Odpri v trenutno zagnanem procesu Audacity,\n"
+msgstr "Uporabite ukaza Nov ali Odpri v trenutno zagnanem procesu Audacity,\n"
 "da odprete več projektov hkrati.\n"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1217
 msgid "Audacity is already running"
 msgstr "Audacity je že zagnan."
 
-#: AudacityApp.cpp:1151
+#: AudacityApp.cpp:1234
 msgid "Command-line options supported:"
 msgstr "Podprte možnosti ukazne vrstice:"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1154
+#: AudacityApp.cpp:1237
 msgid "\t-help (this message)"
 msgstr "\t-help (to sporočilo)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1156
+#: AudacityApp.cpp:1239
 msgid "\t-version (display Audacity version)"
 msgstr "\t-version (prikaži različico Audacity)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1160
+#: AudacityApp.cpp:1243
 msgid "\t-test (run self diagnostics)"
 msgstr "\t-test (zaženi samodiagnostiko)"
 
@@ -352,61 +343,55 @@ msgstr "\t-test (zaženi samodiagnostiko)"
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1165
+#: AudacityApp.cpp:1248
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (nastavite največjo velikost diskovnega bloka v bajtih)"
 
-#: AudacityApp.cpp:1166
+#: AudacityApp.cpp:1249
 msgid "In addition, specify the name of an audio file or Audacity project to open it."
 msgstr "Dodatno navedite ime ime zvočne datoteke ali projekta Audacity, ki ga želite odpreti."
 
-#: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+#: AudacityApp.cpp:1529
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Projektne datoteke Audacity (.AUP) trenutno \n"
+msgstr "Projektne datoteke Audacity (.AUP) trenutno \n"
 "niso povezane z Audacity.\n"
 "\n"
 "Jih želite povezati, tako da jih boste odpirali z dvojnim klikom?"
 
-#: AudacityApp.cpp:1444
+#: AudacityApp.cpp:1530
 msgid "Audacity Project Files"
 msgstr "Projektne datoteke Audacity"
 
-#: AudioIO.cpp:241
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
 msgstr "Nobene zvočne naprave ni mogoče najti.\n"
 
-#: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+#: AudioIO.cpp:255
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Ne boste mogli predvajati ali snemati zvoka.\n"
+msgstr "Ne boste mogli predvajati ali snemati zvoka.\n"
 "\n"
 
-#: AudioIO.cpp:245
+#: AudioIO.cpp:258
 msgid "Error: "
 msgstr "Napaka:"
 
-#: AudioIO.cpp:248
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
 msgstr "Napaka pri inicializaciji zvoka"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr "Težava z latenco"
 
-#: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+#: AudioIO.cpp:1375
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"Nastavitev latence je povzročila, da je posneti zvok skrit pred vrednostjo nič.\n"
+msgstr "Nastavitev latence je povzročila, da je posneti zvok skrit pred vrednostjo nič.\n"
 "Audacity je posnetek vrnil nazaj na vrednost nič.\n"
 "Morda boste morali uporabiti orodje Časovni zamik (<---> ali F5), da povlečete sled na pravo mesto."
 
@@ -415,11 +400,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Samodejna obnovitev po sesutju"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Zadnjič, ko ste uporabljali Audacity, nekateri projekti niso bili pravilno shranjeni.\n"
+msgstr "Zadnjič, ko ste uporabljali Audacity, nekateri projekti niso bili pravilno shranjeni.\n"
 "Na srečo lahko naslednje projekte obnovite samodejno:"
 
 #: AutoRecovery.cpp:75
@@ -427,7 +410,7 @@ msgid "Recoverable projects"
 msgstr "Obnovljivi projekti"
 
 #: AutoRecovery.cpp:78
-#: Tags.cpp:2032
+#: Tags.cpp:2041
 msgid "Name"
 msgstr "Ime"
 
@@ -448,11 +431,9 @@ msgid "Recover Projects"
 msgstr "Obnovi projekte"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Ste prepričani, da ne želite obnoviti nobenega projekta?\n"
+msgstr "Ste prepričani, da ne želite obnoviti nobenega projekta?\n"
 "Kasneje jih ne boste več mogli obnoviti."
 
 #: AutoRecovery.cpp:128
@@ -466,96 +447,96 @@ msgstr "Datotek v mapi samodejnega shranjevanja ni mogoče oštevilčiti"
 
 #: AutoRecovery.cpp:147
 #: AutoRecovery.cpp:184
-#: Menus.cpp:2575
-#: Menus.cpp:4514
-#: Project.cpp:1960
-#: Project.cpp:3332
-#: Project.cpp:3411
-#: WaveTrack.cpp:556
-#: WaveTrack.cpp:575
-#: WaveTrack.cpp:1689
-#: effects/Effect.cpp:436
-#: export/ExportMP2.cpp:230
+#: Menus.cpp:3053
+#: Menus.cpp:3065
+#: Menus.cpp:5182
+#: Project.cpp:2054
+#: Project.cpp:3615
+#: Project.cpp:3694
+#: TrackPanel.cpp:6385
+#: WaveTrack.cpp:598
+#: WaveTrack.cpp:617
+#: WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077
+#: WaveTrack.cpp:2087
+#: effects/Effect.cpp:513
+#: export/ExportMP2.cpp:233
 #: prefs/DirectoriesPrefs.cpp:189
-#: prefs/KeyConfigPrefs.cpp:245
-#: toolbars/ControlToolBar.cpp:532
-#: toolbars/ControlToolBar.cpp:846
+#: prefs/KeyConfigPrefs.cpp:247
+#: toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "Napaka"
 
-#: BatchCommandDialog.cpp:56
-#: BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57
+#: BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr "Izberite ukaz"
 
-#: BatchCommandDialog.cpp:80
+#: BatchCommandDialog.cpp:82
 #: BatchProcessDialog.cpp:454
 #: prefs/KeyConfigPrefs.cpp:142
 msgid "&Command"
 msgstr "&Ukaz"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr "&Uredi parametre"
 
-#: BatchCommandDialog.cpp:89
+#: BatchCommandDialog.cpp:91
 #: BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr "&Parametri"
 
-#: BatchCommandDialog.cpp:94
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr "&Izberi ukaz"
 
-#: BatchCommands.cpp:477
+#: BatchCommands.cpp:456
 msgid "Stereo to Mono Effect not found"
 msgstr "Učinka Stereo v mono ni mogoče najti"
 
-#: BatchCommands.cpp:497
+#: BatchCommands.cpp:476
 msgid "Ogg Vorbis support is not included in this build of Audacity"
 msgstr "V tej različici Audacity podpora Ogg Vorbis še ne deluje."
 
-#: BatchCommands.cpp:509
+#: BatchCommands.cpp:488
 msgid "FLAC support is not included in this build of Audacity"
 msgstr "V to različico Audacity podpora FLAC še ni vključena."
 
-#: BatchCommands.cpp:513
+#: BatchCommands.cpp:492
 #, c-format
 msgid "Command %s not implemented yet"
 msgstr "Ukaz %s Å¡e ni implementiran"
 
-#: BatchCommands.cpp:529
+#: BatchCommands.cpp:508
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Parametre učinka %s ni mogoče nastaviti\n"
+msgstr "Parametre učinka %s ni mogoče nastaviti\n"
 " na %s."
 
-#: BatchCommands.cpp:583
+#: BatchCommands.cpp:561
 #, c-format
 msgid "Your batch command of %s was not recognised."
 msgstr "Vaš paketni ukaz za %s ni bil prepoznan."
 
-#: BatchCommands.cpp:674
+#: BatchCommands.cpp:652
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Uporabi %s s parametri\n"
+msgstr "Uporabi %s s parametri\n"
 "\n"
 "%s"
 
-#: BatchCommands.cpp:675
-#: BatchCommands.cpp:680
+#: BatchCommands.cpp:653
+#: BatchCommands.cpp:658
 msgid "Test Mode"
 msgstr "Preizkusni način"
 
-#: BatchCommands.cpp:679
+#: BatchCommands.cpp:657
 #, c-format
 msgid "Apply %s"
 msgstr "Uporabi %s"
@@ -566,6 +547,10 @@ msgstr "Uporabi %s"
 msgid "Apply Chain"
 msgstr "Uporabi verigo"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "Paketna obdelava PočistiGovor"
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Izberi verigo"
@@ -584,17 +569,16 @@ msgstr "Uporabi na &datotekah ..."
 
 #: BatchProcessDialog.cpp:108
 #: BatchProcessDialog.cpp:247
-#: Tags.cpp:2071
-#: Tags.cpp:2075
-#: Tags.cpp:2375
-#: Tags.cpp:2379
+#: Tags.cpp:2080
+#: Tags.cpp:2084
+#: Tags.cpp:2384
+#: Tags.cpp:2388
 #: UploadDialog.cpp:180
 #: effects/AvcCompressor.cpp:732
 #: effects/ChangeLength.cpp:183
 #: effects/SpikeCleaner.cpp:188
-#: effects/VST/VSTEffect.cpp:446
-#: effects/audiounits/AudioUnitEffect.cpp:882
-#: effects/vamp/VampEffect.cpp:411
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
 msgstr "Pre&kliči"
 
@@ -612,10 +596,18 @@ msgstr "Uporaba '%s' na trenutnem projektu"
 msgid "Please save and close the current project first."
 msgstr "Prosimo, najprej shranite in zaprite trenutni projekt."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "Izberite vokalne datoteke za paketno obdelavo PočistiGovor ..."
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Izberite datoteke za paketno obdelavo ..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr "Vokalne datoteke (*.wav;*.mp3)|*.wav;*.mp3|Datoteke WAV (*.wav)|*.wav|Datoteke MP3 (*.mp3)|*.mp3"
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Vse datoteke (*.*)|*.*|Datoteka WAV (*.wav)|*.wav|Datoteke AIFF (*.aif)|*.aif|Datoteke AU (*.au)|*.au|Datoteke MP3 (*.mp3)|*.mp3|Datoteke Ogg Vorbis (*.ogg)|*.ogg|Datoteke FLAC (*.flac)|*.flac"
@@ -639,18 +631,18 @@ msgid "&Chains"
 msgstr "&Verige"
 
 #: BatchProcessDialog.cpp:435
-#: Tags.cpp:815
-#: Tags.cpp:1455
-#: Tags.cpp:2055
+#: Tags.cpp:826
+#: Tags.cpp:1465
+#: Tags.cpp:2064
 msgid "&Add"
 msgstr "&Dodaj"
 
 #: BatchProcessDialog.cpp:436
-#: LabelDialog.cpp:126
-#: Tags.cpp:816
-#: Tags.cpp:1456
-#: Tags.cpp:2056
-#: TrackPanel.cpp:4201
+#: LabelDialog.cpp:128
+#: Tags.cpp:827
+#: Tags.cpp:1466
+#: Tags.cpp:2065
+#: TrackPanel.cpp:4176
 msgid "&Remove"
 msgstr "&Odstrani"
 
@@ -726,275 +718,259 @@ msgstr "Odstranjevanje odvisnosti"
 msgid "Copying audio data into project..."
 msgstr "Kopiranje zvočnih podatkov v projekt ..."
 
-#: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+#: Dependencies.cpp:223
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Vaš projekt je trenutno odvisen od prisotnosti drugih datotek.\n"
+msgstr "Vaš projekt je trenutno odvisen od prisotnosti drugih datotek.\n"
 "Želite kopirati zvok naslednjih datotek v svoj projekt, da ga naredite samozadostnega?\n"
 "Zahteva več prostora na disku, vendar je varneje."
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
 msgstr "Projekt je odvisen od drugih zvočnih datotek"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
 msgstr "Odvisnosti projekta"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
 msgstr "Zvočna datoteka"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
 msgstr "Prostor na disku"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
 msgstr "Kopiraj izbrane zvoke v projekt"
 
-#: Dependencies.cpp:304
-#: Dependencies.cpp:410
+#: Dependencies.cpp:308
+#: Dependencies.cpp:414
 msgid "Cancel Save"
 msgstr "Prekliči shranjevanje"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
 msgstr "Ne kopiraj nobenega zvoka"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
 msgstr "Kopiraj ves zvok v projekt (varneje)"
 
-#: Dependencies.cpp:317
-#: Dependencies.cpp:322
+#: Dependencies.cpp:321
+#: Dependencies.cpp:326
 msgid "Ask me"
 msgstr "Vprašaj me"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
 msgstr "Vedno kopiraj vse zvoke (najbolj varno)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
 msgstr "Nikoli ne kopiraj zvokov"
 
-#: Dependencies.cpp:321
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
 msgstr "Vsakokrat, ko je projekt odvisen od drugih datotek:"
 
-#: Dependencies.cpp:409
+#: Dependencies.cpp:413
 msgid "If you proceed, your project will not be saved to disk. Is this what you want?"
 msgstr "Če nadaljujete, vaš projekt ne bo shranjen na disk. Res to želite storiti?"
 
-#: Dependencies.cpp:449
+#: Dependencies.cpp:453
 msgid "Your project is self-contained; it does not depend on any external audio files."
 msgstr "Vaš projekt samozadosten; ni odvisen od nobene zunanje zvočne datoteke."
 
-#: Dependencies.cpp:450
+#: Dependencies.cpp:454
 msgid "Dependency check"
 msgstr "Preverjanje odvisnosti"
 
-#: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+#: DirManager.cpp:137
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Opozorilo: zmanjkuje prostora na tem disku.\n"
+msgstr "Opozorilo: zmanjkuje prostora na tem disku.\n"
 "Prosimo, da izberete drugo začasno mapo v oknu Nastavitve."
 
-#: DirManager.cpp:221
-#: DirManager.cpp:251
-#: DirManager.cpp:332
+#: DirManager.cpp:223
+#: DirManager.cpp:254
+#: DirManager.cpp:337
 msgid "Progress"
 msgstr "Potek"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
 msgstr "Čiščenje začasnih datotek"
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "Shranjevanje projektnih datotek"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
 msgstr "Čiščenje map medpomnilnika"
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Preveritev projekta je našla osirotelo blokovno datoteko %s! \n"
+msgstr "Preveritev projekta je našla osirotelo blokovno datoteko %s! \n"
 "Predlagamo shranitev in ponovno odprtje projekta, da izvedete popolno preveritev projekta.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:985
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-stari%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr "Preizkusne datoteke ni mogoče odpreti/ustvariti"
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr "'%s' ni mogoče odstraniti"
 
-#: DirManager.cpp:1007
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "Preimenovana datoteka: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Spreminjanje bloka %s\n"
-
-#: DirManager.cpp:1051
+#: DirManager.cpp:1160
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "'%s' ni mogoče preimenovati v '%s'"
 
-#: DirManager.cpp:1115
-#: DirManager.cpp:1403
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
+#: DirManager.cpp:1224
+#: DirManager.cpp:1515
 msgid "Inspecting project file data..."
 msgstr "Pregledovanje podatkov projektne datoteke ..."
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1240
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr "Osirotela bločna datoteka: (%s)"
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1265
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr "Manjkajoča psevdo-datoteka: (%s)"
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1285
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr "Manjkajoča datoteka s povzetkom: (%s.auf)"
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1305
 #, c-format
 msgid "Missing data file: (%s.au)"
 msgstr "Manjkajoča podatkovna datoteka: (%s.au)"
 
-#: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+#: DirManager.cpp:1319
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"Preveritev projekta je pokazala na nekonsistentnost pri naloženih podatkih projekta;\n"
+msgstr "Preveritev projekta je pokazala na nekonsistentnost pri naloženih podatkih projekta;\n"
 "kliknite 'Podrobnosti' za popoln seznam napak ali 'V redu' za nadaljevanje k več možnostim."
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1331
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Preveritev projekta je našla %d osirotelih blokovnih datotek. Te datoteke\n"
+msgstr "Preveritev projekta je našla %d osirotelih blokovnih datotek. Te datoteke\n"
 "niso v rabi in so najbrž ostale od sesutja ali kakšnega drugega hrošča.\n"
 "Najbolje bi jih bilo izbrisati, da se izognete težavam v prihodnje."
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1336
 msgid "Delete orphaned files [safe and recommended]"
 msgstr "Izbriši osirotele datoteke [varno in priporočeno]"
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1337
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "Nadaljuj brez brisanja; tiho delaj z dodatnimi datotekami"
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1338
 msgid "Close project immediately with no changes"
 msgstr "Nemudoma zapri projekt brez sprememb"
 
-#: DirManager.cpp:1228
-#: DirManager.cpp:1263
-#: DirManager.cpp:1309
-#: DirManager.cpp:1351
-#: export/Export.cpp:490
-#: export/Export.cpp:507
-#: export/Export.cpp:526
+#: DirManager.cpp:1340
+#: DirManager.cpp:1375
+#: DirManager.cpp:1421
+#: DirManager.cpp:1463
+#: export/Export.cpp:576
+#: export/Export.cpp:597
+#: export/Export.cpp:616
 #: widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1366
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Preveritev projekta je zaznala, da %d nadomestnih vhodnih datotek\n"
+msgstr "Preveritev projekta je zaznala, da %d nadomestnih vhodnih datotek\n"
 "('psevdo-datoteke') manjkajo.  Audacity na noben način ne more\n"
 "teh datotek samodejno obnoviti; izberete lahko, da se manjkajoče\n"
 "datoteke za vedno zapolnijo s tišino, začasno zapolnijo\n"
 "s tišino le za to sejo ali zaprete projekt zdaj in poskusite\n"
 "ročno obnoviti manjkajoče datoteke."
 
-#: DirManager.cpp:1259
+#: DirManager.cpp:1371
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr "Zamenjaj manjkajoče podatke s tišino [vedno ob shranjevanju]"
 
-#: DirManager.cpp:1260
-#: DirManager.cpp:1348
+#: DirManager.cpp:1372
+#: DirManager.cpp:1460
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr "Začasno zamenjaj manjkajoče podatke s tišino [samo za to sejo]"
 
-#: DirManager.cpp:1261
-#: DirManager.cpp:1307
-#: DirManager.cpp:1349
+#: DirManager.cpp:1373
+#: DirManager.cpp:1419
+#: DirManager.cpp:1461
 msgid "Close project immediately with no further changes"
 msgstr "Takoj zapri projekt brez nadaljnjih sprememb"
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1412
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Preveritev projekta je zaznala %d manjkajočih datotek povzetkov (.auf).\n"
+msgstr "Preveritev projekta je zaznala %d manjkajočih datotek povzetkov (.auf).\n"
 "Audacity lahko v celoti regenerira te datoteke povzetkov iz\n"
 "izvornih zvočnih podatkov projekta."
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1417
 msgid "Regenerate summary files [safe and recommended]"
 msgstr "Ponovno ustvari datoteke povzetka [varno in priporočeno]"
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1418
 msgid "Fill in silence for missing display data [this session only]"
 msgstr "Zapolni s tišino manjkajoče podatke za prikaz [samo za to sejo]"
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1454
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Preveritev projekta je zaznala, da manjka %d zvočnih podatkovnih blokov (.au), \n"
+msgstr "Preveritev projekta je zaznala, da manjka %d zvočnih podatkovnih blokov (.au), \n"
 "najverjetneje zaradi hroščev, sesutja sistema ali izbrisa po nesreči.\n"
 "Audacity na noben način ne more obnoviti izgubljenih podatkov\n"
 "samodejno; izberete lahko trajno zapolnitev manjkajočih podatkov\n"
@@ -1002,27 +978,27 @@ msgstr ""
 "zaprete projekt zdaj in poskusite obnoviti manjkajoče\n"
 "podatke ročno."
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1459
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr "Zamenjaj manjkajoče podatke s tišino [vedno odslej]"
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1487
 msgid "Cleaning up unused directories in project data..."
 msgstr "Čiščenje neuporabljenih map v podatkih projekta ..."
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1558
 msgid "Caching audio"
 msgstr "Medpomnjenje zvoka"
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1559
 msgid "Caching audio into memory..."
 msgstr "Shranjevanje zvoka v spomin ..."
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1592
 msgid "Saving recorded audio"
 msgstr "Shranjevanje posnetega zvoka"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1593
 msgid "Saving recorded audio to disk..."
 msgstr "Shranjevanje posnetega zvoka na disk ..."
 
@@ -1030,146 +1006,251 @@ msgstr "Shranjevanje posnetega zvoka na disk ..."
 msgid "Rectangular"
 msgstr "Pravokotno"
 
-#: FreqWindow.cpp:104
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr "Knjižnice FFmpeg ni mogoče najti"
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr "Najdi FFmpeg"
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Audacity potrebuje datoteko %s za uvoz in izvoz zvoka prek FFmpeg."
+
+#: FFmpeg.cpp:196
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Mesto %s:"
+
+#: FFmpeg.cpp:205
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Če želite poiskati %s, kliknite sem -->"
+
+#: FFmpeg.cpp:211
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Prebrskaj ..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Če želite brezplačno kopijo FFmpeg, kliknite sem -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:235
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Kje je %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr "FFmpeg ni mogoče najti"
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Samo avformat.dll|*avformat*.dll|Dinamično povezane knjižnice (*.dll)|*.dll|Vse datoteke (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:295
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "Analiza frekvence"
 
-#: FreqWindow.cpp:140
-#: TrackPanel.cpp:563
+#: FreqWindow.cpp:139
+#: TrackPanel.cpp:556
+#: prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "Spekter"
 
-#: FreqWindow.cpp:141
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "Standardna samodejna korelacija"
 
-#: FreqWindow.cpp:142
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "Samodejna korelacija Cuberoot"
 
-#: FreqWindow.cpp:143
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "Razširjena samodejna korelacija"
 
 #. i18n-hint: This is a technical term, derived from the word
 #. "spectrum".  Do not translate it unless you are sure you
 #. know the correct technical word in your language.
-#: FreqWindow.cpp:147
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
 #: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "Algoritem:"
+#: FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "Algoritem"
 
-#: FreqWindow.cpp:168
+#: FreqWindow.cpp:169
+#: FreqWindow.cpp:173
 #: HistoryWindow.cpp:79
 msgid "Size"
 msgstr "Velikost"
 
 #. i18n-hint: This refers to a "window function", used in the
 #. Frequency analyze dialog box.
-#: FreqWindow.cpp:181
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr " okno"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Funkcija:"
+#: FreqWindow.cpp:187
+#: FreqWindow.cpp:191
+msgid "Function"
+msgstr "Funkcija"
 
-#: FreqWindow.cpp:192
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "Linearna frekvenca"
 
-#: FreqWindow.cpp:193
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "Frekvenca zapisovanja"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Os:"
+#: FreqWindow.cpp:201
+#: FreqWindow.cpp:205
+msgid "Axis"
+msgstr "Os"
 
-#: FreqWindow.cpp:206
-#: LabelDialog.cpp:128
-#: Menus.cpp:204
-#: Menus.cpp:233
+#: FreqWindow.cpp:212
+#: LabelDialog.cpp:130
+#: Menus.cpp:241
+#: Menus.cpp:276
 msgid "&Export..."
 msgstr "&Izvozi ..."
 
-#: FreqWindow.cpp:209
-#: widgets/ErrorDialog.cpp:159
+#: FreqWindow.cpp:213
+#: export/ExportCL.cpp:325
+#: export/ExportMultiple.cpp:347
+msgid "Export"
+msgstr "Izvozi"
+
+#: FreqWindow.cpp:216
+#: FreqWindow.cpp:217
+#: widgets/ErrorDialog.cpp:161
 msgid "Close"
 msgstr "Zapri"
 
-#: FreqWindow.cpp:272
-#: FreqWindow.cpp:402
+#: FreqWindow.cpp:280
+#: FreqWindow.cpp:410
 #: effects/AutoDuck.cpp:489
 #: effects/AutoDuck.cpp:523
-#: effects/AutoDuck.cpp:791
+#: effects/AutoDuck.cpp:792
 #: effects/Compressor.cpp:352
 #: effects/Compressor.cpp:360
-#: effects/Equalization.cpp:1109
-#: effects/Equalization.cpp:1111
-#: effects/Equalization.cpp:1119
-#: effects/Equalization.cpp:1185
-#: effects/Equalization.cpp:1394
-#: effects/Equalization.cpp:1405
-#: effects/Normalize.cpp:365
-#: widgets/Meter.cpp:367
+#: effects/Equalization.cpp:1123
+#: effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133
+#: effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408
+#: effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:367
+#: widgets/Meter.cpp:417
 msgid "dB"
 msgstr "dB"
 
 #. i18n-hint: This is the abbreviation for "Hertz", or
 #. cycles per second.
-#: FreqWindow.cpp:287
-#: FreqWindow.cpp:442
-#: effects/Equalization.cpp:1150
-#: effects/Equalization.cpp:1181
-#: import/ImportRaw.cpp:416
+#: FreqWindow.cpp:295
+#: FreqWindow.cpp:450
+#: effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195
+#: import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Hz"
 
-#: FreqWindow.cpp:386
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
 msgstr "Oznaka je premajhna."
 
-#: FreqWindow.cpp:450
-#: effects/AutoDuck.cpp:793
+#: FreqWindow.cpp:458
+#: effects/AutoDuck.cpp:794
 msgid "s"
 msgstr "s"
 
-#: FreqWindow.cpp:779
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr "Kazalka: %d Hz (%s) = %d dB    Vrh: %d Hz (%s) = %.1f dB"
 
-#: FreqWindow.cpp:788
+#: FreqWindow.cpp:796
 #, c-format
 msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
 msgstr "Kazalka: %.4f s (%d Hz) (%s) = %f,    Vrh: %.4f s (%d Hz) (%s) = %.3f"
 
-#: FreqWindow.cpp:1061
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "spekter.txt"
 
-#: FreqWindow.cpp:1063
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "Izvozi grafične podatke kot:"
 
-#: FreqWindow.cpp:1079
-#: LabelDialog.cpp:599
-#: Menus.cpp:2207
-#: Project.cpp:2430
-#: Project.cpp:3384
-#: prefs/KeyConfigPrefs.cpp:180
+#: FreqWindow.cpp:1087
+#: LabelDialog.cpp:603
+#: Menus.cpp:2555
+#: Project.cpp:2604
+#: Project.cpp:3667
+#: prefs/KeyConfigPrefs.cpp:182
 msgid "Couldn't write to file: "
 msgstr "Napaka pri zapisovanju v datoteko: "
 
-#: FreqWindow.cpp:1084
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
 msgstr "Frekvenca (Hz)\tNivo (dB)"
 
-#: FreqWindow.cpp:1090
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Zaostajanje (sekund)\tFrekvenca (Hz)\tStopnja"
 
@@ -1242,9 +1323,8 @@ msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, t
 msgstr "Vedno se lahko vrnete k tem napotkom z izbiro menija <i>Pomoč</i>, nato <i>Pokaži sporočilo dobrodošlice</i>. Za bolj podrobne napotke si lahko preberete polno pomoč, če kliknete meni <i>Pomoč</i>, nato <i>Kazalo</i> ali prenesete naš <a href=\"http://audacity.sourceforge.net/help/documentation\">priročnik</a> v zapisu PDF.</p>"
 
 #: HelpText.cpp:172
-#, fuzzy
 msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
-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>"
+msgstr "<p><b>Odpiranje zvočnih datotek:</b> datoteke lahko povlečete v okno trenutnega projekta ali pa kliknite <i>Datoteka &gt; Uvozi &gt; Zvok</i>. Datoteke lahko odprete v okno novega projekta z <i>Datoteka &gt; Odpri</i>. Glavne vrste datotek, ki jih predvaja Audacity: <b>AIFF, AU, FLAC, M4A</b> (samo na Macih), <b>MP2/MP3, OGG Vorbis</b> in <b>WAV</b>. Če je vaša datoteka v kakšnem drugem zapisu, [[wma-proprietary|kliknite sem]]. <b>Če želite uvoziti zvočni CD:</b> izvozite v WAV ali AIFF z uporabo iTunes, Windows Media Player 11 ali podobno. Oglejte si naš spletni vodnik: [[wiki:How to import CDs|Kako uvozimo CD]].</p><p> <p><b>Predvajanje zvoka:</b>Za začetek predvajanja zvoka pritisnite zeleni gumb Predvajaj. Za ustavitev predvajanja pritisnite modri gumb Prekini, znova ga pritisnite za nadaljevanje. Za konec predvajanja pritisnite rumeni gumb Ustavi. Uporabite lahko tudi preslednico - za predvajanje ali njegovo ustavitev. Ko po ustavitvi 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:194
 msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
@@ -1263,9 +1343,8 @@ msgid "<p>The input level must be set correctly. If the level is too low, there
 msgstr ""
 
 #: HelpText.cpp:292
-#, fuzzy
 msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
-msgstr "Montaža: Audacity je sposoben montažni program, zato si boste lahko z veseljem ogledali, kaj zmore narediti z vašo uvoženo datoteko ali posnetkom.  Glavne ukaze, ki jih boste uporabljali, najdete v meniju <b>Uredi</b> (kot so izreži, kopiraj in prilepi) in pod menijem <b>Učinek</b> (tam lahko okrepite base, spremenite ton ali tempo, pa tudi odstranite šum). <br><br>Audacity uveljavi montažne in urejevalne posege na področja zvočnih sledi. Izberete lahko določeno področje zvoka, da kliknete v sled in povlečete osenčeno področje z miško. Če ne izberete nobenega zvoka posebej, Audacity izbere vse, kar je na zaslonu.<br><br>Dve pomembni opozorili pri urejanju:<br><br>(1) Če še vedno predvajate ali snemate, uporabite rumeni gumb Ustavi, saj ne morete urejati ali izvažati premikajoče se sledi! <br><br>(2) Včasih so nekatere menijske izbire ali gumbi osiveli ali pa imajo napis \"Onemogočeno\" -  to je običajno. Primer: ker ni mogoče urejati zvoka med njegovim predvajanjem ali snemanjem, so ukazi osiveli, dokler ne pritisnete gumba Ustavi. Ukazi so včasih nedosegljivi zaradi drugih razlogov - tako npr. ne morete zaganjati učinkov, dokler imate zvok na zaslonu, prav tako ne morete prilepiti zvoka, dokler ga niste izrezali ali skopirali v odložišče aplikacije Audacity. <br><br>"
+msgstr "<p>Glavne ukaze, ki jih boste uporabljali pri montaži, najdete v meniju <i>Uredi</i> (kot so izreži, kopiraj in prilepi) in pod menijem <i>Učinek</i> (tam lahko okrepite base, spremenite ton ali tempo, pa tudi odstranite šum).</p><p>Audacity uveljavi montažne in urejevalne posege na izbranih območjih zvočnih sledi. Določeno območje zvoka izberete tako, da kliknete v sled in povlečete osenčeno področje z miško. Če ne izberete nobenega zvoka posebej, Audacity izbere vse, kar je v oknu projekta.</p><p>Ker ni mogoče urejati zvoka med njegovim predvajanjem ali snemanjem, so ukazi menijev Uredi in Učinek osiveli, dokler ne pritisnete gumba Ustavi. Ukazi so včasih nedosegljivi zaradi drugih razlogov - tako npr. ne morete zaganjati učinkov, dokler imate zvok na zaslonu, prav tako ne morete prilepiti zvoka, dokler ga niste izrezali ali skopirali v odložišče aplikacije Audacity. </p><br><br>"
 
 #: HelpText.cpp:311
 msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
@@ -1284,8 +1363,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr ""
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Kot kaže, na računalniku nimate datotek pomoči. <a href=\"http://audacity.sourceforge.net/help/documentation\">Prenesete si</a> lahko datoteke pomoči in do njih dostopate iz Audacity s klikom <i>Pomoč</i> in nato <i>Kazalo</i> ali pa kliknite <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">sem</a>, da si preberete spletno pomoč."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr "<p>Pomoč za Audacity Beta trenutno še ni dokončana. Za zdaj je na voljo delovna različica priročnika <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">prek spleta (ang.)</a>. Sicer lahko kliknete <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">sem</a> in prenesla se bo spletna stran s celim priročnikom v angleščini, ki si ga lahko ogledate v tem oknu."
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1307,19 +1386,18 @@ msgstr "&Ravni razveljavitve na voljo"
 msgid "Levels To Discard"
 msgstr "Ravni za opustitev"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "&Opusti"
 
-#: HistoryWindow.cpp:111
-#: Tags.cpp:2072
-#: Tags.cpp:2074
-#: Tags.cpp:2376
-#: Tags.cpp:2378
+#: HistoryWindow.cpp:112
+#: Tags.cpp:2081
+#: Tags.cpp:2083
+#: Tags.cpp:2385
+#: Tags.cpp:2387
 #: effects/ChangeLength.cpp:186
 #: effects/SpikeCleaner.cpp:191
-#: effects/vamp/VampEffect.cpp:414
-#: export/ExportCL.cpp:398
+#: export/ExportCL.cpp:399
 msgid "&OK"
 msgstr "V &redu"
 
@@ -1328,7 +1406,7 @@ msgid "Unable to determine"
 msgstr "Nemogoče določiti"
 
 #: Internat.cpp:195
-#: import/ImportRaw.cpp:392
+#: import/ImportRaw.cpp:385
 msgid "bytes"
 msgstr "bajtov"
 
@@ -1344,1506 +1422,1610 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: LabelDialog.cpp:52
+#: LabelDialog.cpp:54
 msgid "Track"
 msgstr "Sled"
 
-#: LabelDialog.cpp:53
-#: Menus.cpp:4057
-#: Menus.cpp:4085
+#: LabelDialog.cpp:55
+#: Menus.cpp:4677
+#: Menus.cpp:4712
 msgid "Label"
-msgstr "Naslov"
+msgstr "Oznaka"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56
+#: TimerRecordDialog.cpp:279
 msgid "Start Time"
 msgstr "Začetni čas"
 
-#: LabelDialog.cpp:55
+#: LabelDialog.cpp:57
+#: TimerRecordDialog.cpp:298
 msgid "End Time"
 msgstr "Končni čas"
 
-#: LabelDialog.cpp:98
-#: Menus.cpp:627
+#: LabelDialog.cpp:100
+#: Menus.cpp:713
 msgid "&Edit Labels"
 msgstr "&Uredi oznake"
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
 msgstr "Pritisnite F2 ali dvokliknite za urejanje vsebine celic."
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr "Vstavi p&o"
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr "Vstavi p&red"
 
-#: LabelDialog.cpp:127
-#: Menus.cpp:194
+#: LabelDialog.cpp:129
 msgid "&Import..."
 msgstr "&Uvozi ..."
 
-#: LabelDialog.cpp:155
+#: LabelDialog.cpp:157
 msgid "New..."
 msgstr "Nov ..."
 
-#: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+#: LabelDialog.cpp:354
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Pustili ste prazna imena oznak.  Te bodo\n"
+msgstr "Pustili ste prazna imena oznak.  Te bodo\n"
 "preskočene pri ponaselitvi sledi z oznakami.\n"
 "\n"
 "Se želite vrniti in vnesti imena?"
 
-#: LabelDialog.cpp:353
+#: LabelDialog.cpp:355
 msgid "Confirm"
 msgstr "Potrdi"
 
-#: LabelDialog.cpp:514
-#: Menus.cpp:3555
+#: LabelDialog.cpp:516
+#: Menus.cpp:4101
 msgid "Select a text file containing labels..."
-msgstr "Izberite datoteko z naslovi ..."
+msgstr "Izberite datoteko z oznakami ..."
 
-#: LabelDialog.cpp:518
-#: Menus.cpp:3559
+#: LabelDialog.cpp:520
+#: Menus.cpp:4105
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Datoteke z besedilom (*.txt)|*.txt|Vse datoteke (*.*)|*.*"
 
-#: LabelDialog.cpp:532
-#: Menus.cpp:3571
-#: Project.cpp:1820
-#: Project.cpp:1828
-#: import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534
+#: Menus.cpp:4117
+#: Project.cpp:1914
+#: Project.cpp:1922
 msgid "Could not open file: "
 msgstr "Napaka pri odpiranju datoteke: "
 
-#: LabelDialog.cpp:558
+#: LabelDialog.cpp:560
 msgid "No labels to export."
-msgstr "Ni naslovov za izvoz."
+msgstr "Ni oznak za izvoz."
 
-#: LabelDialog.cpp:564
-#: Menus.cpp:2172
+#: LabelDialog.cpp:566
+#: Menus.cpp:2518
 msgid "Export Labels As:"
-msgstr "Izvozi naslove kot:"
+msgstr "Izvozi oznake kot:"
 
-#: LabelDialog.cpp:566
-#: Menus.cpp:2170
+#: LabelDialog.cpp:568
+#: Menus.cpp:2516
 msgid "labels.txt"
-msgstr "naslovi.txt"
+msgstr "oznake.txt"
 
-#: LabelDialog.cpp:699
+#: LabelDialog.cpp:703
 msgid "New Label Track"
-msgstr "Nova sled z naslovi"
+msgstr "Nova sled z oznakami"
 
-#: LabelDialog.cpp:700
+#: LabelDialog.cpp:704
 msgid "Enter track name"
 msgstr "Vnesite ime sledi"
 
-#: LabelDialog.cpp:701
+#: LabelDialog.cpp:705
 #: LabelDialog.h:52
 #: LabelTrack.cpp:89
-#: Menus.cpp:555
+#: Menus.cpp:632
 msgid "&Label Track"
-msgstr "&Sled z naslovi"
+msgstr "&Sled z oznakami"
 
 #: LangChoice.cpp:57
 msgid "Audacity First Run"
 msgstr "Prvi zagon Audacity"
 
-#: LangChoice.cpp:84
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
 msgstr "Izberite jezik programa Audacity:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Datoteka projekta 1.0 je shranjena v novem zapisu.\n"
+msgstr "Datoteka projekta 1.0 je shranjena v novem zapisu.\n"
 "Stara datoteka je shranjena pod imenom '%s'"
 
 #: Legacy.cpp:357
 msgid "Opening Audacity Project"
 msgstr "Odpiranje projekta Audacity"
 
-#: Menus.cpp:162
+#: Menus.cpp:194
 msgid "&File"
 msgstr "&Datoteka"
 
-#: Menus.cpp:164
+#: Menus.cpp:196
 msgid "&New\tCtrl+N"
 msgstr "&Nova\tCtrl+N"
 
-#: Menus.cpp:166
+#: Menus.cpp:198
 msgid "&Open...\tCtrl+O"
 msgstr "&Odpri ...\tCtrl+O"
 
-#: Menus.cpp:171
+#: Menus.cpp:203
 msgid "&Close\tCtrl+W"
 msgstr "&Zapri\tCtrl+W"
 
-#: Menus.cpp:174
+#: Menus.cpp:206
 msgid "&Save Project\tCtrl+S"
 msgstr "&Shrani projekt\tCtrl+S"
 
-#: Menus.cpp:178
-#: Project.cpp:2679
+#: Menus.cpp:210
+#: Project.cpp:2896
 msgid "Save Project &As..."
 msgstr "Shrani projekt &kot ..."
 
-#: Menus.cpp:181
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr "Shrani stisnjeno kopijo projekta ..."
+
+#: Menus.cpp:216
 msgid "Chec&k Dependencies..."
 msgstr "Preveri &odvisnosti ..."
 
-#: Menus.cpp:187
+#: Menus.cpp:222
 msgid "Open Me&tadata Editor..."
 msgstr "Odpri urejevalnik me&tapodatkov ..."
 
-#: Menus.cpp:196
+#: Menus.cpp:229
+#: import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Uvozi"
+
+#: Menus.cpp:231
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Zvok ...\tCtrl+Shift+I"
 
-#: Menus.cpp:197
+#: Menus.cpp:232
 msgid "&Labels..."
 msgstr "&Oznake ..."
 
-#: Menus.cpp:198
+#: Menus.cpp:234
 msgid "&MIDI..."
 msgstr "&MIDI ..."
 
-#: Menus.cpp:199
+#: Menus.cpp:236
 msgid "&Raw Data..."
 msgstr "&Surovi podatki ..."
 
-#: Menus.cpp:210
-#: Menus.cpp:239
+#: Menus.cpp:247
+#: Menus.cpp:282
 msgid "Expo&rt Selection..."
 msgstr "Izvozi iz&bor ..."
 
-#: Menus.cpp:217
+#: Menus.cpp:254
 msgid "Export &Labels..."
-msgstr "Izvozi &naslove ..."
+msgstr "Izvozi &oznake ..."
 
-#: Menus.cpp:218
+#: Menus.cpp:255
 msgid "Export &Multiple..."
 msgstr "Izvozi &več datotek ..."
 
-#: Menus.cpp:247
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr "Izvozi MIDI ..."
+
+#: Menus.cpp:290
 msgid "CleanSpeech C&hain..."
 msgstr "Veri&ga PočistiGovor ..."
 
-#: Menus.cpp:248
-#: Menus.cpp:262
+#: Menus.cpp:291
+#: Menus.cpp:305
 msgid "Edit C&hains..."
 msgstr "Uredi &verige ..."
 
-#: Menus.cpp:249
+#: Menus.cpp:292
 msgid "Export CleanSpeech &Presets..."
 msgstr "Izvozi &prednastavitve PočistiGovor ..."
 
-#: Menus.cpp:250
+#: Menus.cpp:293
 msgid "I&mport CleanSpeech Presets..."
 msgstr "Uvozi pred&nastavitve PočistiGovor ..."
 
-#: Menus.cpp:260
+#: Menus.cpp:303
 msgid "Appl&y Chain..."
 msgstr "&Uporabi verigo ..."
 
-#: Menus.cpp:267
+#: Menus.cpp:310
 msgid "&Upload File..."
 msgstr "Prenesi datoteko &na strežnik ..."
 
-#: Menus.cpp:273
+#: Menus.cpp:316
 msgid "Pa&ge Setup..."
 msgstr "&Priprava strani ..."
 
-#: Menus.cpp:274
+#: Menus.cpp:317
 msgid "&Print..."
 msgstr "&Natisni ..."
 
-#: Menus.cpp:287
+#: Menus.cpp:330
 msgid "E&xit\tCtrl+Q"
 msgstr "&Zapri\tCtrl+Q"
 
-#: Menus.cpp:295
+#: Menus.cpp:338
 #: toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "&Uredi"
 
-#: Menus.cpp:299
+#: Menus.cpp:342
 msgid "&Undo\tCtrl+Z"
 msgstr "&Razveljavi\tCtrl+Z"
 
-#: Menus.cpp:307
-#: prefs/KeyConfigPrefs.cpp:369
+#: Menus.cpp:350
+#: prefs/KeyConfigPrefs.cpp:371
 #: toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "&Ponovi"
 
-#: Menus.cpp:320
+#: Menus.cpp:363
 msgid "Cu&t\tCtrl+X"
 msgstr "I&zreži\tCtrl+X"
 
-#: Menus.cpp:324
+#: Menus.cpp:367
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr "&Razdvoji z rezom\tCtrl+Alt+X"
 
-#: Menus.cpp:325
+#: Menus.cpp:368
 msgid "&Copy\tCtrl+C"
 msgstr "&Kopiraj\tCtrl+C"
 
-#: Menus.cpp:329
+#: Menus.cpp:372
 msgid "&Paste\tCtrl+V"
 msgstr "&Prilepi\tCtrl+V"
 
-#: Menus.cpp:333
+#: Menus.cpp:376
 msgid "Tri&m\tCtrl+T"
 msgstr "Pore&ži\tCtrl+T"
 
-#: Menus.cpp:335
+#: Menus.cpp:378
 msgid "&Delete\tCtrl+K"
 msgstr "&Izbriši\tCtrl+K"
 
-#: Menus.cpp:336
+#: Menus.cpp:379
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Razdvoji z &brisanjem\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&Tišina\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr "&Utišaj zvok\tCtrl+L"
 
-#: Menus.cpp:339
+#: Menus.cpp:382
 msgid "Sp&lit\tCtrl+I"
 msgstr "Raz&dvoji\tCtrl+I"
 
-#: Menus.cpp:344
+#: Menus.cpp:387
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "Razdvoji v n&ovo\tCtrl+Alt+I"
 
-#: Menus.cpp:349
+#: Menus.cpp:392
 msgid "&Join\tCtrl+J"
 msgstr "&Združi\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "&Razdruži\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "Razdr&uži pri tišinah\tCtrl+Alt+J"
 
-#: Menus.cpp:352
+#: Menus.cpp:394
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Po&dvoji\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&Stereo v mono"
+#: Menus.cpp:400
+#: Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr "Stere&o sled v mono"
 
-#: Menus.cpp:365
-msgid "Labeled Re&gions..."
-msgstr "&Odseki z oznakami ..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr "&Označena območja"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:367
+#: Menus.cpp:409
 msgid "&Cut\tAlt+X"
 msgstr "I&zreži\tAlt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:372
+#: Menus.cpp:414
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "&Razdvoji in izreži\tShift+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:377
+#: Menus.cpp:419
 msgid "Co&py\tShift+Alt+C"
 msgstr "Ko&piraj\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:383
+#: Menus.cpp:425
 msgid "&Delete\tAlt+K"
 msgstr "&Izbriši\tAlt+D"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:388
+#: Menus.cpp:430
 msgid "Sp&lit Delete\tShift+Alt+K"
 msgstr "Razdvo&ji z brisanjem\tShift+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:393
+#: Menus.cpp:435
 msgid "Sile&nce\tAlt+L"
 msgstr "Ti&Å¡ina\tALT+L"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:399
+#: Menus.cpp:441
 msgid "Spli&t\tAlt+I"
 msgstr "&Razdeli\tAlt+T"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:404
+#: Menus.cpp:446
 msgid "&Join\tAlt+J"
 msgstr "Z&druži\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Razdr&uži\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr "Razdr&uži pri tišinah\tShift+Alt+J"
 
-#: Menus.cpp:415
-msgid "&Select..."
-msgstr "&Izberi ..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr "Iz&beri"
 
-#: Menus.cpp:416
+#: Menus.cpp:457
 msgid "&All\tCtrl+A"
 msgstr "&Vse\tCtrl+A"
 
-#: Menus.cpp:417
+#: Menus.cpp:458
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Brez\tCtrl+Shift+A"
 
-#: Menus.cpp:421
-msgid "Left at Playback Position\t["
-msgstr "Levo od mesta predvajanja\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
+msgstr "&Levo od mesta predvajanja\t["
 
-#: Menus.cpp:422
-msgid "Right at Playback Position\t]"
-msgstr "Desno od mesta predvajanja\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
+msgstr "&Desno od mesta predvajanja\t]"
 
-#: Menus.cpp:426
-msgid "Start to Cursor"
-msgstr "Od začetka do kazalke"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr "Od &začetka sledi do kazalke\tShift+J"
 
-#: Menus.cpp:427
-msgid "Cursor to End"
-msgstr "Kazalko na konec"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr "Od &kazalke do konca sledi\tShift+K"
 
-#: Menus.cpp:433
+#: Menus.cpp:474
 msgid "Find &Zero Crossings\tZ"
 msgstr "Najdi &ničelne prehode\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Pre&makni kazalko ..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr "Pre&makni kazalko"
 
-#: Menus.cpp:437
-msgid "to Selection Start"
-msgstr "na začetek izbora"
+#: Menus.cpp:478
+msgid "to Selection Star&t"
+msgstr "na za&četek izbora"
 
-#: Menus.cpp:438
-msgid "to Selection End"
-msgstr "na konec izbora"
+#: Menus.cpp:479
+msgid "to Selection En&d"
+msgstr "na kone&c izbora"
 
-#: Menus.cpp:442
-msgid "to Track Start"
-msgstr "na začetek sledi"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr "na &začetek sledi\tJ"
 
-#: Menus.cpp:443
-msgid "to Track End"
-msgstr "na konec sledi"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr "na &konec sledi\tK"
 
-#: Menus.cpp:450
-msgid "Selection Save"
-msgstr "Shrani izbrano"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr "Shra&ni območje"
 
-#: Menus.cpp:451
-msgid "Selection Restore"
-msgstr "Obnovi izbrano"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr "O&bnovi območje"
 
-#: Menus.cpp:462
-msgid "Play &Region..."
-msgstr "Predvajaj &področje ..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr "Pre&dvajaj območje"
 
-#: Menus.cpp:463
-msgid "Lock"
-msgstr "Zakleni"
+#: Menus.cpp:504
+msgid "&Lock"
+msgstr "&Zakleni"
 
-#: Menus.cpp:464
-msgid "Unlock"
-msgstr "Odkleni"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr "&Odkleni"
 
-#: Menus.cpp:470
+#: Menus.cpp:511
 msgid "Turn Snap-To On"
 msgstr "Vključi skoči-na"
 
-#: Menus.cpp:471
+#: Menus.cpp:512
 msgid "Turn Snap-To Off"
 msgstr "Izključi skoči-na"
 
-#: Menus.cpp:472
+#: Menus.cpp:513
 msgid "Turn Grid Snap On"
 msgstr "Vključi vpenjanje v mrežo"
 
-#: Menus.cpp:473
+#: Menus.cpp:514
 msgid "Turn Grid Snap Off"
 msgstr "Izključi vpenjanje v mrežo"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Nastavitve ...\tCtrl+N"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "&Nastavitve ...\tCtrl+,"
 
-#: Menus.cpp:492
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr "&Nastavitve ...\tCtrl+P"
+
+#: Menus.cpp:533
 msgid "&View"
 msgstr "&Pogled"
 
-#: Menus.cpp:494
+#: Menus.cpp:535
 msgid "Zoom &In\tCtrl+1"
 msgstr "Pove&čaj\tCtrl+1"
 
-#: Menus.cpp:497
+#: Menus.cpp:538
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "&Navadna velikost\tCtrl+2"
 
-#: Menus.cpp:498
+#: Menus.cpp:539
 msgid "Zoom &Out\tCtrl+3"
 msgstr "Pomanj&Å¡aj\tCtrl+3"
 
-#: Menus.cpp:501
+#: Menus.cpp:542
 msgid "&Fit in Window\tCtrl+F"
 msgstr "Prilag&odi oknu\tCtrl+G"
 
-#: Menus.cpp:502
+#: Menus.cpp:543
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "Prilagodi &navpično\tCtrl+Shift+F"
 
-#: Menus.cpp:503
+#: Menus.cpp:544
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "&Povečaj na izbor\tCtrl+E"
 
-#: Menus.cpp:506
+#: Menus.cpp:547
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr "&Zloži vse sledi\tCtrl+Shift+C"
 
-#: Menus.cpp:507
+#: Menus.cpp:548
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "&Razpostri vse sledi\tCtrl+Shift+X"
 
-#: Menus.cpp:510
-msgid "Show Clipping"
-msgstr "Pokaži rezanje"
+#: Menus.cpp:551
+msgid "&Show Clipping"
+msgstr "&Pokaži rezanje"
 
-#: Menus.cpp:519
+#: Menus.cpp:560
 msgid "&History..."
 msgstr "&Zgodovina ..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&Orodne vrstice ..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr "&Orodne vrstice"
 
-#: Menus.cpp:526
-msgid "Control Toolbar"
-msgstr "Vrstica krmiljenja"
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr "Vrstica &krmiljenja"
 
-#: Menus.cpp:527
-msgid "Device Toolbar"
-msgstr "Vrstica naprave"
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr "Vrstica &naprave"
 
-#: Menus.cpp:528
-msgid "Edit Toolbar"
-msgstr "Vrstica urejevanja"
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr "Vrstica &urejanja"
 
-#: Menus.cpp:529
-msgid "Meter Toolbar"
-msgstr "Vrstica merjenja"
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr "Vrstica &merjenja"
 
-#: Menus.cpp:530
-msgid "Mixer Toolbar"
-msgstr "Vrstica mešanja"
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr "Vrstica me&Å¡anja"
 
-#: Menus.cpp:531
-msgid "Selection Toolbar"
-msgstr "Vrstica izbire"
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr "Vrstica &izbire"
 
-#: Menus.cpp:532
-msgid "Tools Toolbar"
-msgstr "Vrstica z orodji"
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr "Vrstica z &orodji"
 
-#: Menus.cpp:533
-msgid "Transcription Toolbar"
-msgstr "Vrstica prepisa"
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr "Vrstica &prepisa"
 
-#: Menus.cpp:535
-msgid "Reset Toolbars"
-msgstr "Ponastavi orodne vrstice"
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr "&Ponastavi orodne vrstice"
 
-#: Menus.cpp:537
+#: Menus.cpp:578
 msgid "!Simplified View"
 msgstr "!Poenostavljen pogled"
 
-#: Menus.cpp:545
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr "&Upravljanje"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr "Pre&kini\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:595
+#: Menus.cpp:1010
+msgid "Skip to Start\tHome"
+msgstr "Skoči na začetek\tHome"
+
+#: Menus.cpp:597
+#: Menus.cpp:1011
+msgid "Skip to End\tEnd"
+msgstr "Skoči na konec\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr "&Snemaj\tR"
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr "&ÄŒasovno snemanje ... "
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr "Snemaj kot dodatek\tShift+R"
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr "Prekrivaj (vključeno/izključeno)"
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr "Programsko predvajanje skozi (vključeno/izključeno)"
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr "Z zvokom aktivirano snemanje (vključeno/izključeno)"
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr "Raven zvoka za aktivacijo ..."
+
+#: Menus.cpp:622
 msgid "&Tracks"
 msgstr "&Sledi"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Dodaj &novo ..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr "Dodaj &novo"
 
-#: Menus.cpp:553
+#: Menus.cpp:630
 msgid "&Audio Track\tCtrl+Shift+N"
 msgstr "&Zvočna sled\tCtrl+Shift+N"
 
-#: Menus.cpp:554
+#: Menus.cpp:631
 msgid "&Stereo Track"
 msgstr "&Stereo sled"
 
-#: Menus.cpp:556
+#: Menus.cpp:633
 #: TimeTrack.cpp:44
 msgid "&Time Track"
 msgstr "&ÄŒasovna sled"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&ÄŒasovno snemanje ..."
-
-#: Menus.cpp:568
+#: Menus.cpp:643
 msgid "Mi&x and Render"
 msgstr "Z&mešaj in izdelaj"
 
-#: Menus.cpp:572
+#: Menus.cpp:647
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr "Zmešaj in izdelaj v novo sled\tCtrl+Shift+M"
 
-#: Menus.cpp:576
+#: Menus.cpp:651
 msgid "&Resample..."
 msgstr "&Prevzorči ..."
 
-#: Menus.cpp:586
+#: Menus.cpp:661
 msgid "Remo&ve Tracks"
 msgstr "O&dstrani sledi:"
 
-#: Menus.cpp:592
+#: Menus.cpp:667
 msgid "&Mute All Tracks\tCtrl+U"
 msgstr "&Utišaj vse sledi\tCtrl+U"
 
-#: Menus.cpp:593
+#: Menus.cpp:668
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
 msgstr "&Odtišaj vse sledi\tCtrl+Shift+U"
 
-#: Menus.cpp:597
+#: Menus.cpp:672
 msgid "Align with &Zero"
 msgstr "&Združi z ničlo"
 
-#: Menus.cpp:598
+#: Menus.cpp:673
 msgid "Align with &Cursor"
 msgstr "Poravnaj s &kazalko"
 
-#: Menus.cpp:599
+#: Menus.cpp:674
 msgid "Align with Selection &Start"
 msgstr "Poravnaj z &začetkom izbora"
 
-#: Menus.cpp:600
+#: Menus.cpp:675
 msgid "Align with Selection &End"
 msgstr "Poravnaj s &koncem izbora"
 
-#: Menus.cpp:601
-msgid "Align End with Cursor"
-msgstr "Poravnaj konec s kazalko"
+#: Menus.cpp:676
+msgid "Align End with Cu&rsor"
+msgstr "Poravnaj konec s kaza&lko"
 
-#: Menus.cpp:602
-msgid "Align End with Selection Start"
-msgstr "Poravnaj konec z začetkom izbora"
+#: Menus.cpp:677
+msgid "Align End with Selection Star&t"
+msgstr "Poravnaj konec z zače&tkom izbora"
 
-#: Menus.cpp:603
-msgid "Align End with Selection End"
-msgstr "Poravnaj konec s koncem izbora"
+#: Menus.cpp:678
+msgid "Align End with Selection En&d"
+msgstr "Poravnaj konec s ko&ncem izbora"
 
-#: Menus.cpp:604
-msgid "Align Tracks Together"
-msgstr "Združi posnetke"
+#: Menus.cpp:679
+msgid "Align Tracks To&gether"
+msgstr "Poravnaj &sledi skupaj"
+
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr "&Poravnaj sledi"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Poravnaj sledi ..."
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr "Poravnaj in premakni &kazalko"
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Poravnaj in premakni &kazalko ..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr "Sinhroniziraj MIDI z zvokom"
 
-#: Menus.cpp:623
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr "Poveži zvočne sledi in sledi oznak"
+
+#: Menus.cpp:709
 msgid "Add &Label At Selection\tCtrl+B"
-msgstr "Dodaj &naslov izboru\tCtrl+B"
+msgstr "Dodaj &oznako izboru\tCtrl+B"
 
-#: Menus.cpp:624
+#: Menus.cpp:710
 msgid "Add Label At &Playback Position\tCtrl+M"
-msgstr "Dodaj naslov na mestu &predvajanja\tCtrl+M"
+msgstr "Dodaj oznako na mestu &predvajanja\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "&Razvrsti sledi po ..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr "&Razvrsti sledi"
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Začetni čas"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr "po &začetnem času"
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Ime"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr "po &imenu"
 
-#: Menus.cpp:643
+#: Menus.cpp:730
 msgid "&Generate"
 msgstr "&Tvori"
 
-#: Menus.cpp:666
+#: Menus.cpp:776
+#: Menus.cpp:860
+#: Menus.cpp:922
+msgid "Unsorted"
+msgstr "Nerazvrščeno"
+
+#: Menus.cpp:795
 msgid "Effe&ct"
 msgstr "U&činek"
 
-#: Menus.cpp:670
+#: Menus.cpp:799
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "Ponovi zadnji učinek\tCtrl+R"
 
-#: Menus.cpp:702
+#: Menus.cpp:877
 msgid "&Analyze"
 msgstr "&Analiziraj"
 
-#: Menus.cpp:704
+#: Menus.cpp:879
 msgid "Plot Spectrum..."
 msgstr "Izriši spekter ..."
 
-#: Menus.cpp:737
-#: Menus.cpp:740
+#: Menus.cpp:947
+#: Menus.cpp:950
 msgid "&Help"
 msgstr "&Pomoč"
 
-#: Menus.cpp:743
+#: Menus.cpp:953
 msgid "&About Audacity CleanSpeech..."
 msgstr "&O Audacity PočistiGovor ..."
 
-#: Menus.cpp:747
+#: Menus.cpp:957
 msgid "&Show Welcome Message..."
 msgstr "&Pokaži sporočilo dobrodošlice ..."
 
-#: Menus.cpp:748
+#: Menus.cpp:958
 msgid "&Index..."
 msgstr "&Kazalo ..."
 
-#: Menus.cpp:756
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr "Pokaži &dnevnik ..."
+
+#: Menus.cpp:967
 msgid "&Screenshot Tools..."
 msgstr "&Zajem slike namizja ..."
 
-#: Menus.cpp:759
+#: Menus.cpp:970
 msgid "&Run Benchmark..."
 msgstr "&Poženi preizkus hitrosti ..."
 
-#: Menus.cpp:761
+#: Menus.cpp:972
 msgid "&Audio Device Info..."
 msgstr "Podatki o zvo&čni napravi ..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Kroži nazaj prek sidrišča, pogleda sledi in izbirne vrstice\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Kroži naprej prek sidrišča, pogleda sledi in izbirne vrstice\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
-#: Menus.cpp:774
+#: Menus.cpp:985
 msgid "Selection Tool\tF1"
 msgstr "Orodje za izbiranje\tF1"
 
-#: Menus.cpp:775
+#: Menus.cpp:986
 msgid "Envelope Tool\tF2"
 msgstr "Orodje za ovojnico\tF2"
 
-#: Menus.cpp:776
+#: Menus.cpp:987
 msgid "Draw Tool\tF3"
 msgstr "Orodje za risanje\tF3"
 
-#: Menus.cpp:777
+#: Menus.cpp:988
 msgid "Zoom Tool\tF4"
 msgstr "Orodje za povečavo\tF4"
 
-#: Menus.cpp:778
+#: Menus.cpp:989
 msgid "Time Shift Tool\tF5"
 msgstr "Orodje za časovni zamik\tF5"
 
-#: Menus.cpp:779
+#: Menus.cpp:990
 msgid "Multi Tool\tF6"
 msgstr "Večorodni način\tF6"
 
-#: Menus.cpp:781
+#: Menus.cpp:992
 msgid "Next Tool\tD"
 msgstr "Naslednje orodje\tD"
 
-#: Menus.cpp:782
+#: Menus.cpp:993
 msgid "Previous Tool\tA"
 msgstr "Predhodno orodje\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Predvajaj/ustavi\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
-#: Menus.cpp:785
+#: Menus.cpp:996
 msgid "Stop\tS"
 msgstr "Ustavi\tS"
 
-#: Menus.cpp:786
+#: Menus.cpp:997
 msgid "Pause\tP"
 msgstr "Prekinitev\tP"
 
-#: Menus.cpp:787
+#: Menus.cpp:998
 msgid "Record\tR"
 msgstr "Posnemi\tR"
 
-#: Menus.cpp:788
+#: Menus.cpp:999
 msgid "Record Append\tShift+R"
 msgstr "Posnemi kot dodatek\tShift+R"
 
-#: Menus.cpp:790
+#: Menus.cpp:1001
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "Predvajaj/ustavi in nastavi kazalko\tShift+A"
 
-#: Menus.cpp:793
+#: Menus.cpp:1004
 msgid "Play One Second\t1"
 msgstr "Predvajaj eno sekundo\t1"
 
-#: Menus.cpp:794
+#: Menus.cpp:1005
 msgid "Play To Selection\tB"
 msgstr "Predvajaj do izbora\tB"
 
-#: Menus.cpp:795
+#: Menus.cpp:1006
 msgid "Play Looped\tL"
 msgstr "Predvajaj v zanki\tZ"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Predvajaj v zanki\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
-#: Menus.cpp:797
+#: Menus.cpp:1008
 msgid "Play Cut Preview\tC"
 msgstr "Predvajaj predposlušanje reza\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Skoci na začetek\tDomov"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Skoči na konec\tKonec"
-
-#: Menus.cpp:802
+#: Menus.cpp:1013
 msgid "Selection to Start\tShift+Home"
 msgstr "Izberi do začetka\tShift+Home"
 
-#: Menus.cpp:803
+#: Menus.cpp:1014
 msgid "Selection to End\tShift+End"
 msgstr "Izberi do konca\tShift+End"
 
-#: Menus.cpp:805
+#: Menus.cpp:1016
 msgid "DeleteKey\tBackspace"
 msgstr "Tipka Delete\tBackspace"
 
-#: Menus.cpp:810
+#: Menus.cpp:1021
 msgid "DeleteKey2\tDelete"
 msgstr "Tipka Delete2\tDelete"
 
-#: Menus.cpp:816
+#: Menus.cpp:1027
 msgid "Seek left short period during playback\tLeft"
 msgstr "Poišči levo kratko periodo med predvajanjem\tLevo"
 
-#: Menus.cpp:817
+#: Menus.cpp:1028
 msgid "Seek right short period during playback\tRight"
 msgstr "Poišči desno kratko periodo med predvajanjem\tDesno"
 
-#: Menus.cpp:818
+#: Menus.cpp:1029
 msgid "Seek left long period during playback\tShift+Left"
 msgstr "Poišči levo dolgo periodo med predvajanjem\tShift+levo"
 
-#: Menus.cpp:819
+#: Menus.cpp:1030
 msgid "Seek right long period during playback\tShift+Right"
 msgstr "Poišči desno dolgo periodo med predvajanjem\tShift+desno"
 
-#: Menus.cpp:823
+#: Menus.cpp:1034
 msgid "Move Focus to Previous Track\tUp"
 msgstr "Premakni pozornost na prejšnjo sled\tUp"
 
-#: Menus.cpp:824
+#: Menus.cpp:1035
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
 msgstr "Premakni pozornost na prejšnjo in spremeni izbor\tShift+Up"
 
-#: Menus.cpp:825
+#: Menus.cpp:1036
 msgid "Move Focus to Next Track\tDown"
 msgstr "Premakni pozornost na naslednjo sled\tDown"
 
-#: Menus.cpp:826
+#: Menus.cpp:1037
 msgid "Move Focus to Next and Change Selection\tShift+Down"
 msgstr "Premakni pozornost na naslednjo in spremeni izbor\tShift+Down"
 
-#: Menus.cpp:827
+#: Menus.cpp:1038
 msgid "Toggle Focused Track\tReturn"
 msgstr "Vključi/izključi pozornost sledi\tReturn"
 
-#: Menus.cpp:828
+#: Menus.cpp:1039
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Vključi/izključi pozornost sledi\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Vključi/izključi pozornost sledi\tCtrl+preslednica"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
-#: Menus.cpp:831
+#: Menus.cpp:1042
 msgid "Cursor Left\tLeft"
 msgstr "Leva kazalka\tLevo"
 
-#: Menus.cpp:832
+#: Menus.cpp:1043
 msgid "Cursor Right\tRight"
 msgstr "Desna kazalka\tDesno"
 
-#: Menus.cpp:833
+#: Menus.cpp:1044
 msgid "Cursor Short Jump Left\t,"
 msgstr "Kratek skok kazalke levo\t,"
 
-#: Menus.cpp:834
+#: Menus.cpp:1045
 msgid "Cursor Short Jump Right\t."
 msgstr "Kratek skok kazalke desno\t."
 
-#: Menus.cpp:835
+#: Menus.cpp:1046
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr "Dolg skok kazalke levo\tShift+,"
 
-#: Menus.cpp:836
+#: Menus.cpp:1047
 msgid "Cursor Long Jump Right\tShift+."
 msgstr "Dolg skok kazalke desno\tShift+."
 
-#: Menus.cpp:838
+#: Menus.cpp:1049
 msgid "Selection Extend Left\tShift+Left"
 msgstr "Razpostri izbor na levo\tShift+levo"
 
-#: Menus.cpp:839
+#: Menus.cpp:1050
 msgid "Selection Extend Right\tShift+Right"
 msgstr "Razpostri izbor na desno\tShift+desno"
 
-#: Menus.cpp:841
+#: Menus.cpp:1052
 msgid "Set (or Extend) Left Selection"
 msgstr "Nastavi (ali razpostri) levo mejo izbora"
 
-#: Menus.cpp:842
+#: Menus.cpp:1053
 msgid "Set (or Extend) Right Selection"
 msgstr "Nastavi (ali razpostri) desno mejo izbora"
 
-#: Menus.cpp:844
+#: Menus.cpp:1055
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "Pomanjšaj izbor z leve\tCtrl+Shift+desno"
 
-#: Menus.cpp:845
+#: Menus.cpp:1056
 msgid "Selection Contract Right\tCtrl+Shift+Left"
 msgstr "Pomanjšaj izbor z desne\tCtrl+Shift+levo"
 
-#: Menus.cpp:847
+#: Menus.cpp:1058
 msgid "Change pan on focused track\tShift+P"
 msgstr "Spremeni zasuk na sledi s pozornostjo\tShift+P"
 
-#: Menus.cpp:848
+#: Menus.cpp:1059
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr "Zasukaj levo na sledi s pozornostjo\tAlt+Shift+levo"
 
-#: Menus.cpp:849
+#: Menus.cpp:1060
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr "Zasukaj desno na sledi s pozornostjo\tAlt+Shift+desno"
 
-#: Menus.cpp:850
+#: Menus.cpp:1061
 msgid "Change gain on focused track\tShift+G"
 msgstr "Spremeni ojačitev na sledi s pozornostjo\tShift+G"
 
-#: Menus.cpp:851
+#: Menus.cpp:1062
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr "Povečaj ojačitev na sledi s pozornostjo\tAlt+Shift+Up"
 
-#: Menus.cpp:852
+#: Menus.cpp:1063
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr "Zmanjšaj ojačitev na sledi s pozornostjo\tAlt+Shift+Down"
 
-#: Menus.cpp:853
+#: Menus.cpp:1064
 msgid "Open menu on focused track\tShift+M"
 msgstr "Odpri meni na sledi s pozornostjo\tShift+M"
 
-#: Menus.cpp:854
+#: Menus.cpp:1065
 msgid "Mute/Unmute focused track\tShift+U"
 msgstr "Utišaj/Odtišaj sled s pozornostjo\tShift+U"
 
-#: Menus.cpp:855
+#: Menus.cpp:1066
 msgid "Solo/Unsolo focused track\tShift+S"
 msgstr "Soliraj/Odsoliraj sled s pozornostjo\tShift+S"
 
-#: Menus.cpp:856
+#: Menus.cpp:1067
 msgid "Close focused track\tShift+C"
 msgstr "Zapri sled s pozornostjo\tShift+C"
 
-#: Menus.cpp:858
+#: Menus.cpp:1069
 msgid "Snap To On"
 msgstr "Vključi Skoči-na"
 
-#: Menus.cpp:859
+#: Menus.cpp:1070
 msgid "Snap To Off"
 msgstr "Izključi Skoči-na"
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:873
+#: Menus.cpp:1157
 msgid "Open Recent"
 msgstr "Odpri nedavne"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Zadnje &datoteke ..."
+#: Menus.cpp:1160
+msgid "Recent &Files"
+msgstr "Zadnje &datoteke"
 
-#: Menus.cpp:925
+#: Menus.cpp:1209
 #, c-format
 msgid "&Undo %s"
 msgstr "Razveljavi %s"
 
-#: Menus.cpp:951
+#: Menus.cpp:1235
 msgid "Can't Undo"
 msgstr "Ni mogoče razveljaviti"
 
-#: Menus.cpp:960
+#: Menus.cpp:1244
 #, c-format
 msgid "&Redo %s"
 msgstr "P&onovi %s"
 
-#: Menus.cpp:966
+#: Menus.cpp:1250
 msgid "Can't Redo"
 msgstr "Ni mogoče ponoviti"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1856
 msgid "Sort By Time"
 msgstr "Razvrsti po času"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1856
 msgid "Tracks sorted by time"
 msgstr "Sledi, razvrščene po času"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1882
 msgid "Sort By Name"
 msgstr "Razvrsti po imenu"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1882
 msgid "Tracks sorted by name"
 msgstr "Sledi, razvrščene po imenu"
 
-#: Menus.cpp:1705
+#: Menus.cpp:2033
 msgid "Set Left Selection Bound"
 msgstr "Nastavi levo mejo izbora"
 
-#: Menus.cpp:1739
+#: Menus.cpp:2068
 msgid "Set Right Selection Bound"
 msgstr "Nastavi desno mejo izbora"
 
-#: Menus.cpp:2006
+#: Menus.cpp:2337
 msgid "You must select a track first."
 msgstr "Prosimo, da najprej izberete sled."
 
-#: Menus.cpp:2035
+#: Menus.cpp:2369
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "Ponovi %s\tCtrl+R"
 
-#: Menus.cpp:2166
+#: Menus.cpp:2512
 msgid "There are no label tracks to export."
-msgstr "Posnetki z naslovi za izvoz ne obstajajo."
+msgstr "Sledi z oznakami za izvoz ne obstajajo."
+
+#: Menus.cpp:2607
+msgid "Export MIDI As:"
+msgstr "Izvozi MIDI kot:"
 
-#: Menus.cpp:2271
+#: Menus.cpp:2611
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "Datoteke MIDI (*.mid)|*.mid|Datoteke Allegro (*.gro)|*.gro"
+
+#: Menus.cpp:2643
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr "Izbrali ste ime datoteke z nerazpoznano končnico datoteke.\n"
+"Želite nadaljevati?"
+
+#: Menus.cpp:2644
+msgid "Export MIDI"
+msgstr "Izvozi MIDI"
+
+#: Menus.cpp:2702
 msgid "Nothing to undo"
 msgstr "Razveljavitev ni izvedljiva"
 
-#: Menus.cpp:2291
+#: Menus.cpp:2722
 msgid "Nothing to redo"
 msgstr "Ponovitev ni izvedljiva"
 
-#: Menus.cpp:2366
-#: TrackPanel.cpp:605
+#: Menus.cpp:2809
+#: TrackPanel.cpp:596
 #: toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Izreži"
 
-#: Menus.cpp:2366
+#: Menus.cpp:2809
 msgid "Cut to the clipboard"
 msgstr "Izreži v odložišce"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2849
 msgid "Split Cut"
 msgstr "Razdvoji in izreži"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2849
 msgid "Split-cut to the clipboard"
 msgstr "Razdvoji in izreži v odložišče"
 
-#: Menus.cpp:2469
-#: Menus.cpp:2540
-#: Menus.cpp:2634
-#: TrackPanel.cpp:607
+#: Menus.cpp:2914
+#: Menus.cpp:2986
+#: Menus.cpp:3178
+#: TrackPanel.cpp:598
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Prilepi"
 
-#: Menus.cpp:2469
+#: Menus.cpp:2914
 msgid "Pasted text from the clipboard"
 msgstr "Prilepljeno besedilo z odložišča"
 
-#: Menus.cpp:2540
-#: Menus.cpp:2634
+#: Menus.cpp:2986
+#: Menus.cpp:3178
 msgid "Pasted from the clipboard"
 msgstr "Prilepljeno iz odložišča"
 
-#: Menus.cpp:2574
+#: Menus.cpp:3052
+msgid "Pasting one type of track into another is not allowed."
+msgstr "Kopiranje ene vrste sledi v drugo ni dovoljeno."
+
+#: Menus.cpp:3064
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Kopiranje stereo zvoka v mono sled ni dovoljeno."
 
-#: Menus.cpp:2670
+#: Menus.cpp:3214
 #: toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "Poreži"
 
-#: Menus.cpp:2670
+#: Menus.cpp:3214
 msgid "Trim file to selection"
 msgstr "Poreži datoteko na izbor"
 
-#: Menus.cpp:2699
+#: Menus.cpp:3243
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
 msgstr "Razdvojeno z brisanjem %.2f sekund pri t=%.2f"
 
-#: Menus.cpp:2702
+#: Menus.cpp:3246
 msgid "Split Delete"
 msgstr "Razdvoji z brisanjem"
 
-#: Menus.cpp:2723
+#: Menus.cpp:3267
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr "Razdruženih %.2f sekund pri t=%.2f"
 
-#: Menus.cpp:2726
+#: Menus.cpp:3270
 msgid "Disjoin"
 msgstr "Razdruži"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3291
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr "Združenih %.2f sekund pri t=%.2f"
 
-#: Menus.cpp:2750
+#: Menus.cpp:3294
 msgid "Join"
 msgstr "Združi"
 
-#: Menus.cpp:2769
+#: Menus.cpp:3313
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "Stišani izbrani posnetki za %.2f sekund pri %.2f"
 
-#: Menus.cpp:2771
+#: Menus.cpp:3315
 #: toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Tišina"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3349
 msgid "Duplicate"
 msgstr "Podvoji"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3349
 msgid "Duplicated"
 msgstr "Podvojeno"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3368
 msgid "Cut Labels"
 msgstr "Izreži označeno"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3368
 msgid "Cut labeled regions to the clipboard"
 msgstr "Izreži označena območja v odložišče"
 
-#: Menus.cpp:2838
+#: Menus.cpp:3382
 msgid "SplitCut labeled regions to the clipboard"
 msgstr "Razvoji z izrezovanjem označena področja na odložišče"
 
-#: Menus.cpp:2839
+#: Menus.cpp:3383
 msgid "Split Cut Labels"
 msgstr "Oznake razdvojenega z izrezom"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3397
 msgid "Copied labeled regions to the clipboard"
 msgstr "Skopirana označena področja v odložišče"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3397
 msgid "Copy Labels"
 msgstr "Kopiraj oznake"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3409
 msgid "Delete Labels"
 msgstr "Izbriši oznake"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3409
 msgid "Deleted labeled regions"
 msgstr "Izbrisana označena področja"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3421
 msgid "Split Delete Labels"
 msgstr "Razdvoji z brisanjem označeno"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3421
 msgid "Split Deleted labeled regions"
 msgstr "Razdvoji z brisanjem označena področja"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3433
 msgid "Silence Labels"
 msgstr "Oznake utišanega"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3433
 msgid "Silenced labeled regions"
 msgstr "Označena področja utišanja"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3445
 msgid "Split Labels"
 msgstr "Oznake razdvojenega"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3445
 msgid "Split labeled regions"
 msgstr "Označena področja razdvojitve"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3457
 msgid "Join Labels"
 msgstr "Oznake združenega"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3457
 msgid "Joined labeled regions"
 msgstr "Označena področja združevanja"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3469
 msgid "Disjoin Labels"
 msgstr "Oznake razdruženega"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3469
 msgid "Disjoined labeled regions"
 msgstr "Označena področja razdruževanja"
 
-#: Menus.cpp:2947
-#: TrackPanel.cpp:6121
+#: Menus.cpp:3491
+#: TrackPanel.cpp:6134
 msgid "Split"
 msgstr "Razdvoji"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3585
 msgid "Split New"
 msgstr "Razdvoji v novo"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3585
 msgid "Split to new track"
 msgstr "Razdvoji v novo sled"
 
-#: Menus.cpp:3124
+#: Menus.cpp:3668
 msgid "Split at labels"
-msgstr "Razdvoji po naslovih"
+msgstr "Razdvoji po oznakah"
 
-#: Menus.cpp:3425
+#: Menus.cpp:3969
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
 msgstr "Za risanje spektra morajo imeti vse izbrane sledi enako mero vzorčenja."
 
-#: Menus.cpp:3451
+#: Menus.cpp:3995
 #, c-format
 msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
 msgstr "Izbranega je preveč zvoka. Analiziranih bo le prvih %.1f sekund zvoka."
 
-#: Menus.cpp:3584
+#: Menus.cpp:4130
 #, c-format
 msgid "Imported labels from '%s'"
-msgstr "Uvoženi naslovi iz '%s'"
+msgstr "Uvožene oznake iz '%s'"
 
-#: Menus.cpp:3585
+#: Menus.cpp:4131
 msgid "Import Labels"
-msgstr "Uvozi naslove"
+msgstr "Uvozi oznake"
 
-#: Menus.cpp:3595
+#: Menus.cpp:4142
 msgid "Select a MIDI file..."
 msgstr "Izberite datoteko MIDI ..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Vse datoteke (*.*)|*.*|MIDI datoteke (*.mid)|*.mid|Allegro datoteke (*.gro)|*.gro"
+#: Menus.cpp:4146
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr "Datoteke MIDI in Allegro (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|Datoteke MIDI (*.mid)|*.mid|Datoteke Allegro (*.gro)|*.gro|Vse datoteke (*.*)|*.*"
 
-#: Menus.cpp:3615
+#: Menus.cpp:4162
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "Uvožen MIDI iz '%s'"
 
-#: Menus.cpp:3617
+#: Menus.cpp:4163
 msgid "Import MIDI"
 msgstr "Uvozi MIDI"
 
-#: Menus.cpp:3630
+#: Menus.cpp:4177
 msgid "Select any uncompressed audio file..."
 msgstr "Izberite katero koli nestisnjeno zvočno datoteko ..."
 
-#: Menus.cpp:3634
+#: Menus.cpp:4181
 msgid "All files (*)|*"
 msgstr "Vse datoteke (*)|*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2576
-#: Project.cpp:2601
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Uvozi"
-
-#: Menus.cpp:3668
+#: Menus.cpp:4205
 msgid "Edit the metadata tags"
 msgstr "Uredi metapodatkovne oznake"
 
-#: Menus.cpp:3669
-#: export/Export.cpp:298
+#: Menus.cpp:4206
+#: export/Export.cpp:353
 msgid "Edit Metadata"
 msgstr "Uredi metapodatke"
 
-#: Menus.cpp:3669
+#: Menus.cpp:4206
 msgid "Edit Metadata tags"
 msgstr "Uredi metazaznamke"
 
-#: Menus.cpp:3725
+#: Menus.cpp:4262
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr "Ves zvok je bil izdelan v sledi '%s'"
 
-#: Menus.cpp:3726
+#: Menus.cpp:4263
 msgid "Render"
 msgstr "Izdelaj"
 
-#: Menus.cpp:3731
+#: Menus.cpp:4268
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
 msgstr "V novo stereo sled je bilo zmešanih in izdelanih %d sledi"
 
-#: Menus.cpp:3734
+#: Menus.cpp:4271
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "V novo mono sled je bilo zmešanih in izdelanih %d sledi"
 
-#: Menus.cpp:3736
-#: Mix.cpp:120
+#: Menus.cpp:4273
+#: Mix.cpp:121
 msgid "&Mix and Render"
 msgstr "&Zmešaj in izdelaj"
 
-#: Menus.cpp:3866
+#: Menus.cpp:4403
 msgid "Aligned with zero"
 msgstr "Združeni z ničlo"
 
-#: Menus.cpp:3870
+#: Menus.cpp:4407
 msgid "Aligned cursor"
 msgstr "Poravnana kazalka"
 
-#: Menus.cpp:3874
+#: Menus.cpp:4411
 msgid "Aligned with selection start"
 msgstr "Poravnano z začetkom izbora"
 
-#: Menus.cpp:3878
+#: Menus.cpp:4415
 msgid "Aligned with selection end"
 msgstr "Poravnano s koncem izbora"
 
-#: Menus.cpp:3882
+#: Menus.cpp:4419
 msgid "Aligned end with cursor"
 msgstr "Konec poravnan s kazalko"
 
-#: Menus.cpp:3886
+#: Menus.cpp:4423
 msgid "Aligned end with selection start"
 msgstr "Konec poravnan z začetkom izbora"
 
-#: Menus.cpp:3890
+#: Menus.cpp:4427
 msgid "Aligned end with selection end"
 msgstr "Konec poravnan s koncem izbora"
 
-#: Menus.cpp:3894
+#: Menus.cpp:4431
 msgid "Aligned"
 msgstr "Poravnano"
 
-#: Menus.cpp:3927
+#: Menus.cpp:4464
 msgid "Align"
 msgstr "Poravnaj"
 
-#: Menus.cpp:3950
+#: Menus.cpp:4549
+msgid "Sync MIDI with Audio"
+msgstr "Sinhroniziraj MIDI z zvokom"
+
+#: Menus.cpp:4553
+msgid "Alignment completed."
+msgstr "Poravnava dokončana."
+
+#: Menus.cpp:4564
 msgid "Created new audio track"
 msgstr "Ustvarjen nov posnetek"
 
-#: Menus.cpp:3950
-#: Menus.cpp:3973
-#: Menus.cpp:3988
-#: Menus.cpp:4008
+#: Menus.cpp:4564
+#: Menus.cpp:4587
+#: Menus.cpp:4602
+#: Menus.cpp:4622
 msgid "New Track"
 msgstr "Nova sled"
 
-#: Menus.cpp:3973
+#: Menus.cpp:4587
 msgid "Created new stereo audio track"
 msgstr "Ustvarjena nova stereo zvočna sled"
 
-#: Menus.cpp:3988
+#: Menus.cpp:4602
 msgid "Created new label track"
-msgstr "Ustvarjena nova datoteka z naslovi"
+msgstr "Ustvarjena nova datoteka z oznakami"
 
-#: Menus.cpp:3997
+#: Menus.cpp:4611
 msgid "The version of Audacity you are using does not support multiple time tracks."
 msgstr "Različica programa Audacity, ki jo uporabljate, ne podpira več časovnih sledi."
 
-#: Menus.cpp:4008
+#: Menus.cpp:4622
 msgid "Created new time track"
 msgstr "Ustvarjena nova časovna sled"
 
-#: Menus.cpp:4057
+#: Menus.cpp:4677
 msgid "Added label"
-msgstr "Naslov dodan"
+msgstr "Oznaka dodana"
 
-#: Menus.cpp:4085
+#: Menus.cpp:4712
 msgid "Edited labels"
 msgstr "Urejene oznake"
 
-#: Menus.cpp:4112
+#: Menus.cpp:4739
 msgid "Save CleanSpeech Preset File As:"
 msgstr "Shrani datoteko prednastavitev PočistiGovor kot:"
 
-#: Menus.cpp:4116
+#: Menus.cpp:4743
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr "Prednastavitve PočistiGovor (*.csp)|*.csp"
 
-#: Menus.cpp:4123
-#: export/Export.cpp:515
+#: Menus.cpp:4750
+#: export/Export.cpp:605
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "Oprostite, poti do datotek ne smejo presegati 256 znakov."
 
-#: Menus.cpp:4169
+#: Menus.cpp:4796
 msgid "Problem encountered exporting presets."
 msgstr "Nastopila je težava pri izvozu prednastavitev."
 
-#: Menus.cpp:4170
-#: export/Export.cpp:408
+#: Menus.cpp:4797
+#: export/Export.cpp:468
 msgid "Unable to export"
 msgstr "Ni mogoče izvoziti"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4981
 msgid "Remove Track"
 msgstr "Odstrani sled"
 
-#: Menus.cpp:4354
+#: Menus.cpp:4981
 msgid "Removed audio track(s)"
 msgstr "Odstrani zvočni(e) posnetek(e)"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Nova frekvenco vzorčenja (Hz):"
-
-#: Menus.cpp:4508
-#: Menus.cpp:4527
-#: export/ExportMP3.cpp:1926
+#: Menus.cpp:5138
+#: Menus.cpp:5193
+#: export/ExportFFmpeg.cpp:710
+#: export/ExportMP3.cpp:1928
 msgid "Resample"
 msgstr "Prevzorči"
 
-#: Menus.cpp:4514
+#: Menus.cpp:5158
+#: TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr "Nova frekvenco vzorčenja (Hz):"
+
+#: Menus.cpp:5182
+#: TrackPanel.cpp:6385
 msgid "The entered value is invalid"
 msgstr "Vnesena vrednost ni veljavna"
 
-#: Menus.cpp:4525
+#: Menus.cpp:5191
 #, c-format
 msgid "Resampling track %d"
 msgstr "Prevzorčenje sledi %d"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5200
 msgid "Resample Track"
 msgstr "Prevzorči sled"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5200
 msgid "Resampled audio track(s)"
 msgstr "Prevzorčene zvočne sledi"
 
-#: Mix.cpp:94
-#: Mix.cpp:101
+#: Mix.cpp:95
+#: Mix.cpp:102
 msgid "Mix"
 msgstr "Zmešaj"
 
-#: Mix.cpp:121
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
 msgstr "Mešanje in izdelava sledi"
 
-#: NoteTrack.cpp:36
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "Notiraj sled"
 
-#: Printing.cpp:198
+#: Printing.cpp:192
 msgid "There was a problem printing."
 msgstr "Pri tiskanju je prišlo do težav."
 
-#: Printing.cpp:199
+#: Printing.cpp:193
 msgid "Print"
 msgstr "Natisni"
 
-#: Project.cpp:635
+#: Project.cpp:673
 msgid "Main Mix"
 msgstr "Glavni zmešani zvok"
 
-#: Project.cpp:760
+#: Project.cpp:797
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Dobrodošli v Audacity različice %s"
 
-#: Project.cpp:911
+#: Project.cpp:957
 msgid "(Recovered)"
 msgstr "(obnovljeno)"
 
-#: Project.cpp:1471
-#: TrackPanel.cpp:804
-#: toolbars/ControlToolBar.cpp:191
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
+#: toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Posnemi"
 
-#: Project.cpp:1471
-#: TrackPanel.cpp:804
+#: Project.cpp:1546
+#: TrackPanel.cpp:796
 msgid "Recorded Audio"
 msgstr "Posneti zvok"
 
-#: Project.cpp:1489
+#: Project.cpp:1564
 msgid "Save changes before closing?"
 msgstr "Želite shraniti spremembe pred izhodom?"
 
-#: Project.cpp:1492
-msgid ""
-"\n"
+#: Project.cpp:1567
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "Shranjen projekt bo brez sledi!!\n"
 "\n"
 "Za shranjevanje predhodno odprtih sledi:\n"
 "kliknite Prekliči, Uredi > Razveljavi, dokler niso\n"
 "odprte vse sledi, nato Datoteka > Shrani projekt."
 
-#: Project.cpp:1495
+#: Project.cpp:1570
 msgid "Save changes?"
 msgstr "Želite shraniti spremembe?"
 
-#: Project.cpp:1683
+#: Project.cpp:1772
 msgid "All files|*.*|All supported files|"
 msgstr "Vse datoteke|*.*|Vse podprte datoteke|"
 
-#: Project.cpp:1708
+#: Project.cpp:1802
 msgid "Select one or more audio files..."
 msgstr "Izberite eno ali več zvočnih datotek ..."
 
-#: Project.cpp:1735
+#: Project.cpp:1829
 msgid "Audacity projects|*.aup|"
 msgstr "Projekti Audacity|*.aup"
 
-#: Project.cpp:1788
-#: Project.cpp:2175
+#: Project.cpp:1882
+#: Project.cpp:2304
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Datoteko ste shranili z veliko starejšo različico\n"
+msgstr "Datoteko ste shranili z veliko starejšo različico\n"
 "Audacity %s. Zapis se je medtem spremenil.\n"
 "\n"
 "Audacity jo bo od odprtju najverjetneje poškodoval,\n"
@@ -2851,213 +3033,239 @@ msgstr ""
 "\n"
 "Želite kljub temu zdaj odpreti to datoteko?"
 
-#: Project.cpp:1789
+#: Project.cpp:1883
 msgid "1.0 or earlier"
 msgstr "1.0 ali starejši"
 
-#: Project.cpp:1795
-#: Project.cpp:2187
+#: Project.cpp:1889
+#: Project.cpp:2316
 msgid "Opening old project file"
 msgstr "Odpiranje datoteko starega projekta"
 
-#: Project.cpp:1821
-#: Project.cpp:1829
+#: Project.cpp:1915
+#: Project.cpp:1923
 msgid "Error opening file"
 msgstr "Napaka pri odpiranju datoteke."
 
-#: Project.cpp:1835
+#: Project.cpp:1929
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Datoteka je morda neveljavna ali okvarjena: \n"
+msgstr "Datoteka je morda neveljavna ali okvarjena: \n"
 "%s"
 
-#: Project.cpp:1836
+#: Project.cpp:1930
 msgid "Error opening file or project"
 msgstr "Napaka pri odpiranju datoteke ali projekta"
 
-#: Project.cpp:1856
+#: Project.cpp:1950
 msgid "Audacity was unable to convert an Audacity 1.0 project to the new project format."
 msgstr "Audacity ne zmore pretvoriti projekta Audacity 1.0 v nov zapis projekta."
 
-#: Project.cpp:1959
+#: Project.cpp:2053
 msgid "Could not remove old auto save file"
 msgstr "Stare datoteke samodejnega shranjevanja ni mogoče odstraniti"
 
-#: Project.cpp:1961
+#: Project.cpp:2055
 msgid "Project was recovered"
 msgstr "Projekt je bil obnovljen"
 
-#: Project.cpp:1961
+#: Project.cpp:2055
 msgid "Recover"
 msgstr "Obnovi"
 
-#: Project.cpp:1990
+#: Project.cpp:2084
 msgid "Project checker repaired file"
 msgstr "Preverjalnik projekta je datoteko popravil"
 
-#: Project.cpp:1990
+#: Project.cpp:2084
 #: effects/Repair.h:29
 msgid "Repair"
 msgstr "Popravi"
 
-#: Project.cpp:2101
+#: Project.cpp:2230
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "Mape s projektnimi podatki ni mogoče najti: \"%s\""
 
-#: Project.cpp:2144
+#: Project.cpp:2273
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"To datoteko ste shranili z Audacity %s.\n"
+msgstr "To datoteko ste shranili z Audacity %s.\n"
 "Uporabljate Audacity %s - da bi lahko odprli to datoteko,\n"
 "morate nadgraditi program na novejšo različice."
 
-#: Project.cpp:2148
+#: Project.cpp:2277
 msgid "Can't open project file"
 msgstr "Ni mogoče odpreti datoteke projekta"
 
-#: Project.cpp:2182
+#: Project.cpp:2311
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Datoteko je shranil Audacity %s.\n"
+msgstr "Datoteko je shranil Audacity %s.\n"
 "Datoteko lahko odprete s to različico Audacity, če pa jo shranite s to različico, je več ne boste mogli odpreti s starejšo različico.\n"
 "\n"
 "Želite kljub temu zdaj odpreti to datoteko?"
 
-#: Project.cpp:2415
-#, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
-"Napaka pri shranjevanju projekta.  Mogoče v %s ni možno pisati,\n"
-"ali pa je disk poln."
 
-#: Project.cpp:2417
-#: Project.cpp:2431
+#: Project.cpp:2588
+#, c-format
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr "Napaka pri shranjevanju projekta. Morda v %s\n"
+"ni mogoče pisati ali pa je disk poln."
+
+#: Project.cpp:2590
+#: Project.cpp:2605
 msgid "Error saving project"
 msgstr "Napaka pri shranjevanju projekta"
 
-#: Project.cpp:2493
+#: Project.cpp:2680
 #, c-format
 msgid "Saved %s"
 msgstr "Shranjeno %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2509
-msgid "Raw"
-msgstr "Surovo"
-
-#: Project.cpp:2514
-#, c-format
-msgid "Importing %s..."
-msgstr "Uvažanje datoteke %s ..."
-
-#: Project.cpp:2575
+#: Project.cpp:2806
 #, c-format
 msgid "Imported '%s'"
 msgstr "Uvoženo '%s'"
 
-#: Project.cpp:2628
-#: Project.cpp:2636
+#: Project.cpp:2807
+#: import/ImportPCM.cpp:483
+#: import/ImportPCM.cpp:527
+msgid "Import"
+msgstr "Uvozi"
+
+#: Project.cpp:2840
+#: Project.cpp:2848
 msgid "Error importing"
 msgstr "Napaka pri uvozu"
 
-#: Project.cpp:2670
+#: Project.cpp:2882
 msgid "Save Speech As:"
 msgstr "Shrani govor kot:"
 
-#: Project.cpp:2672
+#: Project.cpp:2884
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Zvočna datoteka Windows PCM (*.wav)|*.wav"
 
-#: Project.cpp:2678
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2891
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr ""
-"Projektne datoteke Audacity (.aup) shranijo vse, kar v programu počnete, tako,\n"
-"kot to vidite na zaslonu, a večina drugih programov ne zna odpreti projektnih datotek Audacity.\n"
+msgstr "Stisnjene projektne datoteke Audacity (.aup) shranijo vaše delo v manjše, stisnjene datoteke (.ogg).\n"
+"Stisnjene projektne datoteke so dober način pošiljanja projektov prek spleta, ker so veliko manjše.\n"
+"Odpiranje stisnjenega projekta vzame več časa kot običajno, saj uvozi vsako stisnjeno sled.\n"
 "\n"
+"Večina drugih programov ne zna odpreti projektnih datotek Audacity.\n"
 "Če želite shraniti datoteko, ki jo lahko odprejo drugi programi, izberite enega od\n"
 "ukazov za izvoz."
 
-#: Project.cpp:2681
+#: Project.cpp:2894
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr "Shranjujete projektno datoteko Audacity (.aup).\n"
+"\n"
+"Shranjevanje projekta ustvari datoteko, ki jo zna odpreti le Audacity.\n"
+"\n"
+"Če želite shraniti zvočno datoteko za kak drug program, uporabite enega od ukazov \"Datoteka > Izvozi\".\n"
+
+#: Project.cpp:2898
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Projekti Audacity (*.aup)|*.aup"
 
-#: Project.cpp:2725
+#: Project.cpp:2952
 msgid "Created new project"
 msgstr "Ustvarjen nov projekt"
 
-#: Project.cpp:2845
+#: Project.cpp:3111
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Izbrisanih %.2f sekund v t=%.2f"
 
-#: Project.cpp:2848
-#: effects/Equalization.cpp:1262
-#: effects/Equalization.cpp:2593
+#: Project.cpp:3114
+#: effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Izbriši"
 
-#: Project.cpp:3041
+#: Project.cpp:3308
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr "Preostali prostor na disku zadostuje za snemanje %d ur in %d minut."
 
-#: Project.cpp:3044
+#: Project.cpp:3311
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr "Preostali prostor na disku zadostuje za snemanje 1 ure in %d minut."
 
-#: Project.cpp:3047
+#: Project.cpp:3314
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr "Preostali prostor na disku zadostuje za snemanje %d minut."
 
-#: Project.cpp:3050
+#: Project.cpp:3317
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr "Preostali prostor na disku zadostuje za snemanje %d sekund."
 
-#: Project.cpp:3053
+#: Project.cpp:3320
 msgid "Out of disk space"
 msgstr "Prostora na disku je premalo"
 
-#: Project.cpp:3331
+#: Project.cpp:3333
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr "Uvozi dokončani. Poteka %d izračunov signalnih oblik na zahtevo. V celoti dokončano %2.0f%%."
+
+#: Project.cpp:3336
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr "Uvoz dokončan. Poteka izračun signalne oblike na zahtevo. Dokončano %2.0f%%."
+
+#: Project.cpp:3614
 msgid "Could not remove old autosave file: "
 msgstr "Stare datoteke samodejnega shranjevanja ni mogoče odstraniti: "
 
-#: Project.cpp:3372
+#: Project.cpp:3655
 msgid "New Project"
 msgstr "Nov projekt"
 
-#: Project.cpp:3385
+#: Project.cpp:3668
 msgid "Error writing autosave file"
 msgstr "Napaka pri zapisovanju samodejno shranjene datoteke"
 
-#: Project.cpp:3410
+#: Project.cpp:3693
 msgid "Could not create autosave file: "
 msgstr "Datoteke samodejnega shranjevanja ni mogoče ustvariti: "
 
-#: Project.cpp:3436
+#: Project.cpp:3719
 #, c-format
 msgid "Actual Rate: %d"
 msgstr "Dejanska frekvenca: %d"
@@ -3111,65 +3319,29 @@ msgstr "Shranjeno "
 msgid "Error trying to save file: "
 msgstr "Napaka pri shranjevanju datoteke: "
 
-#: Sequence.cpp:732
-#: Sequence.cpp:742
-#: Sequence.cpp:749
+#: Sequence.cpp:804
+#: Sequence.cpp:814
+#: Sequence.cpp:821
 msgid "Gap detected in project file\n"
 msgstr "V projektni datoteki je opažena luknja/razmik\n"
 
-#: ShuttleGui.cpp:1852
-#: effects/Effect.cpp:342
-#: effects/audiounits/AudioUnitEffect.cpp:872
+#: ShuttleGui.cpp:1972
+#: effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
 msgstr "Pre&dogled"
 
-#: ShuttleGui.cpp:1859
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "&Razhrošči"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "ÄŒasovno snemanje Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Začetek snemanja"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "Z zvokom aktivirano snemanje Audacity"
 
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Konec snemanja"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Trajanje"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Napredek Pametnega snemanja Audacity"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Datum in čas pričetka"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Datum in čas zaključka"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Čakajoč na začetek snemanja ob: %s.\n"
-
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Pametno snemanje Audacity - Čakanje na začetek"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "Raven aktivacije (dB):"
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3179,793 +3351,741 @@ msgstr "&Dobrodošli v Audacity!"
 msgid "Don't show this again at start up"
 msgstr "Tega ob zagonu ne prikaži več"
 
-#: Tags.cpp:629
+#: Tags.cpp:640
 msgid "Artist Name"
 msgstr "Ime izvajalca"
 
-#: Tags.cpp:630
+#: Tags.cpp:641
 msgid "Track Title"
 msgstr "Naslov sledi"
 
-#: Tags.cpp:631
+#: Tags.cpp:642
 msgid "Album Title"
 msgstr "Naslov albuma"
 
-#: Tags.cpp:632
+#: Tags.cpp:643
 msgid "Track Number"
 msgstr "Å tevilka sledi"
 
-#: Tags.cpp:633
-#: Tags.cpp:2138
+#: Tags.cpp:644
+#: Tags.cpp:2147
 msgid "Year"
 msgstr "Leto"
 
-#: Tags.cpp:634
+#: Tags.cpp:645
 msgid "Genre"
 msgstr "Zvrst"
 
-#: Tags.cpp:635
-#: Tags.cpp:2148
+#: Tags.cpp:646
+#: Tags.cpp:2157
 #: prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Komentarji"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Pritisnite F2 ali dvokliknite za urejanje."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
-#: Tags.cpp:802
+#: Tags.cpp:813
 msgid "Tag Name"
 msgstr "Ime značke"
 
-#: Tags.cpp:803
+#: Tags.cpp:814
 msgid "Tag Value"
 msgstr "Vrednost značke"
 
-#: Tags.cpp:818
-#: Tags.cpp:1476
+#: Tags.cpp:829
+#: Tags.cpp:1486
 #: prefs/KeyConfigPrefs.cpp:116
 msgid "&Clear"
 msgstr "Po&čisti"
 
-#: Tags.cpp:824
+#: Tags.cpp:835
 msgid "Genres"
 msgstr "Zvrsti"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Uredi"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "Ponastavi"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
-#: Tags.cpp:834
-#: Tags.cpp:1460
-#: Tags.cpp:1988
+#: Tags.cpp:845
+#: Tags.cpp:1470
+#: Tags.cpp:1997
 msgid "Template"
 msgstr "Predloga"
 
-#: Tags.cpp:838
-#: Tags.cpp:1464
-#: Tags.cpp:1992
+#: Tags.cpp:849
+#: Tags.cpp:1474
+#: Tags.cpp:2001
 #: prefs/KeyConfigPrefs.cpp:126
 msgid "&Load..."
 msgstr "&Naloži ..."
 
-#: Tags.cpp:839
-#: Tags.cpp:1465
-#: Tags.cpp:1993
+#: Tags.cpp:850
+#: Tags.cpp:1475
+#: Tags.cpp:2002
 #: prefs/KeyConfigPrefs.cpp:125
 msgid "&Save..."
 msgstr "&Shrani ..."
 
-#: Tags.cpp:841
-#: Tags.cpp:1467
-#: Tags.cpp:1995
+#: Tags.cpp:852
+#: Tags.cpp:1477
+#: Tags.cpp:2004
 msgid "S&et Default"
 msgstr "N&astavi privzeto"
 
-#: Tags.cpp:991
-#: Tags.cpp:1630
-#: Tags.cpp:2359
+#: Tags.cpp:1002
+#: Tags.cpp:1640
+#: Tags.cpp:2368
 msgid "Edit Genres"
 msgstr "Uredi zvrsti"
 
-#: Tags.cpp:1024
-#: Tags.cpp:1036
-#: Tags.cpp:1052
-#: Tags.cpp:1065
-#: Tags.cpp:1668
-#: Tags.cpp:1680
-#: Tags.cpp:1696
-#: Tags.cpp:1709
-#: Tags.cpp:2402
-#: Tags.cpp:2414
-#: Tags.cpp:2430
-#: Tags.cpp:2443
+#: Tags.cpp:1035
+#: Tags.cpp:1047
+#: Tags.cpp:1062
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1690
+#: Tags.cpp:1705
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2423
+#: Tags.cpp:2438
+#: Tags.cpp:2451
 msgid "Reset Genres"
 msgstr "Ponastavi zvrsti"
 
-#: Tags.cpp:1024
-#: Tags.cpp:1065
-#: Tags.cpp:1668
-#: Tags.cpp:1709
-#: Tags.cpp:2402
-#: Tags.cpp:2443
+#: Tags.cpp:1035
+#: Tags.cpp:1075
+#: Tags.cpp:1678
+#: Tags.cpp:1718
+#: Tags.cpp:2411
+#: Tags.cpp:2451
 msgid "Unable to save genre file."
 msgstr "Datoteke zvrsti ni mogoče shraniti."
 
-#: Tags.cpp:1035
-#: Tags.cpp:1679
-#: Tags.cpp:2413
+#: Tags.cpp:1046
+#: Tags.cpp:1689
+#: Tags.cpp:2422
 msgid "Are you sure you want to reset the genre list to defaults?"
 msgstr "Ste prepričani, da želite datoteko zvrsti ponastaviti na privzeto?"
 
-#: Tags.cpp:1052
-#: Tags.cpp:1696
-#: Tags.cpp:2430
+#: Tags.cpp:1062
+#: Tags.cpp:1705
+#: Tags.cpp:2438
 msgid "Unable to open genre file."
 msgstr "Datoteke zvrsti ni mogoče odpreti."
 
-#: Tags.cpp:1087
-#: Tags.cpp:1141
-#: Tags.cpp:1742
-#: Tags.cpp:1778
-#: Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "Shrani metapodatke kot:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
+#: Tags.cpp:1122
+#: Tags.cpp:1772
+#: Tags.cpp:2494
 msgid "Error loading metadata"
 msgstr "Napaka pri nalaganju metapodatkov"
 
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Naslov:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Izvajalec:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Skladatelj:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Avtor besedila:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Komentarji:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Kodirnik:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Pravice:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Å tevilka sledi:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Leto:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Zvrst:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Ni zvrsti"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Ponastavi na privzeto"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Osnovno"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Napredno"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Vrednost"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "Po&čisti"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Največja dolžina atributa '%s' je %d znakov. Podatki so bili okrajšani."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Naslov"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Izvajalec"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album"
+#: Tags.cpp:1097
+#: Tags.cpp:1151
+#: Tags.cpp:1751
+#: Tags.cpp:1787
+#: Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr "Shrani metapodatke kot:"
 
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Z Audacity ni mogoče pisati v datoteko:\n"
+msgstr "Z Audacity ni mogoče pisati v datoteko:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Z Audacity ni mogoče odpreti datoteke\n"
+msgstr "Z Audacity ni mogoče odpreti datoteke\n"
 "  %s\n"
 "za pisanje."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Z Audacity ni mogoče zapisati slik v datoteko:\n"
+msgstr "Z Audacity ni mogoče zapisati slik v datoteko:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Z Audacity ni mogoče najti datoteke:\n"
+msgstr "Z Audacity ni mogoče najti datoteke:\n"
 "  %s.\n"
 "Tema ni bila naložena."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Z Audacity ni mogoče naložiti datoteke:\n"
+msgstr "Z Audacity ni mogoče naložiti datoteke:\n"
 "  %s.\n"
 "Morda gre za nepravilen zapis png?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Z Audacity ni bilo mogoče prebrati privzete teme.\n"
+msgstr "Z Audacity ni bilo mogoče prebrati privzete teme.\n"
 "Prosim, sporočite težavo."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Nobene od pričakovanih datotek komponent teme\n"
+msgstr "Nobene od pričakovanih datotek komponent teme\n"
 " ni bilo mogoče najti v:\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Mape ni mogoče ustvariti:\n"
+msgstr "Mape ni mogoče ustvariti:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Ni mogoče shraniti datoteke:\n"
+msgstr "Ni mogoče shraniti datoteke:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Vse potrebne datoteke v:\n"
+msgstr "Vse potrebne datoteke v:\n"
 "  %s\n"
 "so bile že prisotne."
 
-#: TrackPanel.cpp:464
-#: TrackPanel.cpp:465
+#: TimeDialog.cpp:53
+#: TimerRecordDialog.cpp:227
+#: TimerRecordDialog.cpp:305
+#: TimerRecordDialog.cpp:309
+#: effects/Noise.cpp:243
+#: effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:366
+msgid "Duration"
+msgstr "Trajanje"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "ÄŒasovno snemanje Audacity"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr "Začetek snemanja"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr "Konec snemanja"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr "Napredek ÄŒasovnega snemanja Audacity"
+
+#: TimerRecordDialog.cpp:267
+msgid "Start Date and Time"
+msgstr "Datum in čas pričetka"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr "Začetni datum"
+
+#: TimerRecordDialog.cpp:286
+msgid "End Date and Time"
+msgstr "Datum in čas zaključka"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr "Končni datum"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Čakajoč na začetek snemanja ob: %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Časovno snemanje Audacity - Čakanje na začetek"
+
+#: TrackPanel.cpp:457
+#: TrackPanel.cpp:458
 msgid "Track Panel"
 msgstr "Podokno sledi"
 
-#: TrackPanel.cpp:548
-#: export/ExportPCM.cpp:133
+#: TrackPanel.cpp:541
 #: prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Drugo ..."
 
-#: TrackPanel.cpp:556
+#: TrackPanel.cpp:549
+#: TrackPanel.cpp:571
 #: TrackPanel.cpp:580
-#: TrackPanel.cpp:589
-#: TrackPanel.cpp:597
+#: TrackPanel.cpp:588
+#: TrackPanel.cpp:5793
 msgid "Name..."
 msgstr "Ime ..."
 
-#: TrackPanel.cpp:558
-#: TrackPanel.cpp:582
-#: TrackPanel.cpp:593
-#: TrackPanel.cpp:599
+#: TrackPanel.cpp:551
+#: TrackPanel.cpp:573
+#: TrackPanel.cpp:584
+#: TrackPanel.cpp:590
+#: TrackPanel.cpp:5797
 msgid "Move Track Up"
 msgstr "Premakni sled navzgor"
 
-#: TrackPanel.cpp:559
-#: TrackPanel.cpp:583
-#: TrackPanel.cpp:594
-#: TrackPanel.cpp:600
+#: TrackPanel.cpp:552
+#: TrackPanel.cpp:574
+#: TrackPanel.cpp:585
+#: TrackPanel.cpp:591
+#: TrackPanel.cpp:5798
 msgid "Move Track Down"
 msgstr "Premakni sled navzdol"
 
-#: TrackPanel.cpp:561
-#: effects/ToneGen.cpp:325
+#: TrackPanel.cpp:554
+#: effects/ToneGen.cpp:319
+#: prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Signalna oblika"
 
-#: TrackPanel.cpp:562
+#: TrackPanel.cpp:555
+#: prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "Signalna oblika (dB)"
 
-#: TrackPanel.cpp:565
+#: TrackPanel.cpp:557
+#: prefs/GUIPrefs.cpp:157
 msgid "Spectrum log(f)"
-msgstr "Spektralni logaritem(f)"
+msgstr "Spektralni logaritem (f)"
 
-#: TrackPanel.cpp:567
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:558
+#: prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
 msgstr "Višina tona (EAC)"
 
-#: TrackPanel.cpp:569
-#: TrackPanel.cpp:6091
+#: TrackPanel.cpp:560
+#: TrackPanel.cpp:6096
 msgid "Mono"
 msgstr "Mono"
 
-#: TrackPanel.cpp:570
-#: TrackPanel.cpp:6090
+#: TrackPanel.cpp:561
+#: TrackPanel.cpp:6095
 msgid "Left Channel"
 msgstr "Levi kanal"
 
-#: TrackPanel.cpp:571
-#: TrackPanel.cpp:6090
+#: TrackPanel.cpp:562
+#: TrackPanel.cpp:6095
 msgid "Right Channel"
 msgstr "Desni kanal"
 
-#: TrackPanel.cpp:572
+#: TrackPanel.cpp:563
 msgid "Make Stereo Track"
 msgstr "Naredi stereo sled"
 
-#: TrackPanel.cpp:573
+#: TrackPanel.cpp:564
 msgid "Split Stereo Track"
 msgstr "Razdvoji stereo sled"
 
-#: TrackPanel.cpp:575
+#: TrackPanel.cpp:566
 msgid "Set Sample Format"
 msgstr "Nastavi obliko vzorcev"
 
-#: TrackPanel.cpp:577
-#: TrackPanel.cpp:6320
+#: TrackPanel.cpp:568
+#: TrackPanel.cpp:6341
 msgid "Set Rate"
 msgstr "Nastavi frekvenco"
 
-#: TrackPanel.cpp:585
+#: TrackPanel.cpp:576
 msgid "Up Octave"
 msgstr "Zvišaj za oktavo"
 
-#: TrackPanel.cpp:586
+#: TrackPanel.cpp:577
 msgid "Down Octave"
 msgstr "Znižaj za oktavo"
 
-#: TrackPanel.cpp:591
+#: TrackPanel.cpp:582
+#: TrackPanel.cpp:5795
 msgid "Font..."
 msgstr "Pisava ..."
 
-#: TrackPanel.cpp:602
+#: TrackPanel.cpp:593
 msgid "Set Range..."
 msgstr "Nastavi področje ..."
 
-#: TrackPanel.cpp:606
+#: TrackPanel.cpp:597
 #: toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: TrackPanel.cpp:1272
+#: TrackPanel.cpp:1258
 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:1277
+#: TrackPanel.cpp:1263
 msgid "Drag the label vertically to change the order of the tracks."
-msgstr "Povlecite naslov vertikalno, da boste spremenili vrstni red posnetkov."
+msgstr "Povlecite oznako navpično, da boste spremenili vrstni red posnetkov."
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1283
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr "Kliknite in povlecite, da izboljšate relativno velikost stereo posnetkov."
 
-#: TrackPanel.cpp:1300
+#: TrackPanel.cpp:1286
 msgid "Click and drag to resize the track."
 msgstr "Kliknite in povlecite, da bi spremenili velikost posnetka."
 
-#: TrackPanel.cpp:1331
+#: TrackPanel.cpp:1317
 msgid "Drag one or more label boundaries"
 msgstr "Povlecite eno ali več mej oznak"
 
-#: TrackPanel.cpp:1332
+#: TrackPanel.cpp:1318
 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:1348
+#: TrackPanel.cpp:1334
 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:1351
+#: TrackPanel.cpp:1337
 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:1371
+#: TrackPanel.cpp:1383
 msgid "Click and drag to move left selection boundary."
 msgstr "Kliknite in povlecite, da bi premaknili levi okvir izbora."
 
-#: TrackPanel.cpp:1376
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move right selection boundary."
 msgstr "Kliknite in povlecite, da bi premaknili desni okvir izbora."
 
-#: TrackPanel.cpp:1702
-#: TrackPanel.cpp:3993
-#: TrackPanel.cpp:4025
-#: TrackPanel.cpp:4280
-#: TrackPanel.cpp:6432
-#: TrackPanel.cpp:6452
+#: TrackPanel.cpp:1730
+#: TrackPanel.cpp:3959
+#: TrackPanel.cpp:3991
+#: TrackPanel.cpp:4255
+#: TrackPanel.cpp:6490
+#: TrackPanel.cpp:6510
 msgid "Modified Label"
-msgstr "Spremenjen naslov"
-
-#: TrackPanel.cpp:1703
-#: TrackPanel.cpp:3994
-#: TrackPanel.cpp:4026
-#: TrackPanel.cpp:4281
-#: TrackPanel.cpp:6433
-#: TrackPanel.cpp:6453
+msgstr "Spremenjena oznaka"
+
+#: TrackPanel.cpp:1731
+#: TrackPanel.cpp:3960
+#: TrackPanel.cpp:3992
+#: TrackPanel.cpp:4256
+#: TrackPanel.cpp:6491
+#: TrackPanel.cpp:6511
 msgid "Label Edit"
-msgstr "Uredi naslov"
+msgstr "Uredi oznako"
 
-#: TrackPanel.cpp:1930
+#: TrackPanel.cpp:1971
 msgid "Adjusted envelope."
 msgstr "Optimirana kuverta."
 
-#: TrackPanel.cpp:1931
+#: TrackPanel.cpp:1972
 #: prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Ovojnica"
 
-#: TrackPanel.cpp:2082
+#: TrackPanel.cpp:2123
 msgid "Moved clip to another track"
 msgstr "Posnetek premaknjen na drugo sled"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "left"
 msgstr "levo"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2127
 msgid "right"
 msgstr "desno"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2088
+#: TrackPanel.cpp:2129
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr "ÄŒasovno %s zamaknjene sledi/posnetki %.02f sekund"
 
-#: TrackPanel.cpp:2092
+#: TrackPanel.cpp:2133
 #: prefs/MousePrefs.cpp:111
 #: prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "ÄŒasovni zamik"
 
-#: TrackPanel.cpp:2953
+#: TrackPanel.cpp:2916
 msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr "Če želite uporabiti risanje, izberite 'Signalna oblika' v spustnem meniju sledi."
 
-#: TrackPanel.cpp:2970
+#: TrackPanel.cpp:2933
 msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr "Za uporabo risanja povečajte pogled, dokler ne vidite posameznih vzorcev."
 
-#: TrackPanel.cpp:3241
+#: TrackPanel.cpp:3205
 msgid "Moved Sample"
 msgstr "Premaknjeni vzorec"
 
-#: TrackPanel.cpp:3242
+#: TrackPanel.cpp:3206
 msgid "Sample Edit"
 msgstr "Urejanje vzorcev"
 
-#: TrackPanel.cpp:3341
+#: TrackPanel.cpp:3305
 #, c-format
 msgid "Removed track '%s.'"
 msgstr "Odstranjen posnetek '%s.'"
 
-#: TrackPanel.cpp:3343
+#: TrackPanel.cpp:3307
 msgid "Track Remove"
 msgstr "Odstrani sled"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved gain slider"
 msgstr "Premaknjeni drsnik ojačitve"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3448
 msgid "Moved pan slider"
 msgstr "Premaknjeni drsnik zasuka"
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3485
-#: TrackPanel.cpp:5726
-#: TrackPanel.cpp:7149
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5703
+#: TrackPanel.cpp:7244
 msgid "Gain"
 msgstr "Okrepitev"
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3485
-#: TrackPanel.cpp:5664
-#: TrackPanel.cpp:7156
+#: TrackPanel.cpp:3449
+#: TrackPanel.cpp:5641
+#: TrackPanel.cpp:7251
 msgid "Pan"
 msgstr "Zasuk"
 
-#: TrackPanel.cpp:3610
-#: TrackPanel.cpp:6385
-#: effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3576
+#: TrackPanel.cpp:6441
 msgid "up"
 msgstr "navzgor"
 
-#: TrackPanel.cpp:3614
-#: TrackPanel.cpp:6386
-#: effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3580
+#: TrackPanel.cpp:6442
 msgid "down"
 msgstr "navzdol"
 
-#: TrackPanel.cpp:3621
-#: TrackPanel.cpp:6381
+#: TrackPanel.cpp:3587
+#: TrackPanel.cpp:6437
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "Premaknjeno '%s' %s"
 
-#: TrackPanel.cpp:3624
-#: TrackPanel.cpp:6387
+#: TrackPanel.cpp:3590
+#: TrackPanel.cpp:6443
 msgid "Move Track"
 msgstr "Premakni sled"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expand"
 msgstr "Razpostri"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4155
 msgid "Expanded Cut Line"
 msgstr "Črta reza razširjena"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merge"
 msgstr "Spoji"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4164
 msgid "Merged Clips"
 msgstr "Spojeni posnetki"
 
-#: TrackPanel.cpp:4201
+#: TrackPanel.cpp:4176
 msgid "Removed Cut Line"
 msgstr "ÄŒrta reza odstranjena"
 
-#: TrackPanel.cpp:5664
+#: TrackPanel.cpp:5641
 msgid "Adjusted Pan"
 msgstr "Prilagojeni zasuk"
 
-#: TrackPanel.cpp:5726
+#: TrackPanel.cpp:5703
 msgid "Adjusted gain"
 msgstr "Prilagojena ojačitev"
 
-#: TrackPanel.cpp:5918
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr "Združi s sledjo signalne oblike"
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr "Počistite vse združitve v skupine"
+
+#: TrackPanel.cpp:5923
 msgid "Can't delete track with active audio"
 msgstr "Sledi z aktivnim zvokom ni mogoče izbrisati"
 
-#: TrackPanel.cpp:6071
+#: TrackPanel.cpp:6076
 msgid "Stereo, "
 msgstr "Stereo, "
 
-#: TrackPanel.cpp:6074
+#: TrackPanel.cpp:6079
 msgid "Mono, "
 msgstr "Mono, "
 
-#: TrackPanel.cpp:6076
+#: TrackPanel.cpp:6081
 msgid "Left, "
 msgstr "Levo, "
 
-#: TrackPanel.cpp:6078
+#: TrackPanel.cpp:6083
 msgid "Right, "
 msgstr "Desno, "
 
-#: TrackPanel.cpp:6100
-#: TrackPanel.cpp:6225
+#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6251
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "Spremenjeno: '%s' v %s"
 
-#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6110
 msgid "Channel"
 msgstr "Kanal"
 
-#: TrackPanel.cpp:6118
+#: TrackPanel.cpp:6131
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "Razdvoji stereo sled '%s'"
 
-#: TrackPanel.cpp:6139
+#: TrackPanel.cpp:6169
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "Stereo posnetek '%s' narejen."
 
-#: TrackPanel.cpp:6142
+#: TrackPanel.cpp:6172
 msgid "Make Stereo"
 msgstr "Naredi stereo"
 
-#: TrackPanel.cpp:6189
+#: TrackPanel.cpp:6215
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "Spremenjeno: '%s' v %d Hz"
 
-#: TrackPanel.cpp:6191
+#: TrackPanel.cpp:6217
 msgid "Rate Change"
 msgstr "Sprememba mere"
 
-#: TrackPanel.cpp:6229
+#: TrackPanel.cpp:6255
 msgid "Format Change"
 msgstr "Sprememba formata:"
 
-#: TrackPanel.cpp:6319
-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:6329
-msgid "Invalid rate."
-msgstr "Nepravilna frekvenca."
-
-#: TrackPanel.cpp:6349
+#: TrackPanel.cpp:6405
 msgid "Change lower speed limit (%) to:"
 msgstr "Spremeni spodnjo mejo hitrosti (%) na:"
 
-#: TrackPanel.cpp:6350
-#: TrackPanel.cpp:6351
+#: TrackPanel.cpp:6406
+#: TrackPanel.cpp:6407
 msgid "Lower speed limit"
 msgstr "Spodnja meja hitrosti"
 
-#: TrackPanel.cpp:6356
+#: TrackPanel.cpp:6412
 msgid "Change upper speed limit (%) to:"
 msgstr "Spremeni zgornjo mejo hitrosti (%) na:"
 
-#: TrackPanel.cpp:6357
-#: TrackPanel.cpp:6358
+#: TrackPanel.cpp:6413
+#: TrackPanel.cpp:6414
 msgid "Upper speed limit"
 msgstr "Zgornja meja hitrosti"
 
-#: TrackPanel.cpp:6366
+#: TrackPanel.cpp:6422
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Nastavi območje na '%d' - '%d'"
 
-#: TrackPanel.cpp:6369
+#: TrackPanel.cpp:6425
 msgid "Set Range"
 msgstr "Nastavi področje"
 
-#: TrackPanel.cpp:6414
+#: TrackPanel.cpp:6472
 msgid "Change track name to:"
-msgstr "Spremeni naslov posnetka v:"
+msgstr "Spremeni naslov sledi v:"
 
-#: TrackPanel.cpp:6415
+#: TrackPanel.cpp:6473
 msgid "Track Name"
 msgstr "Ime sledi"
 
-#: TrackPanel.cpp:6418
+#: TrackPanel.cpp:6476
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "Preimenovano '%s' v '%s'"
 
-#: TrackPanel.cpp:6421
+#: TrackPanel.cpp:6479
 msgid "Name Change"
 msgstr "Sprememba imena"
 
-#: TrackPanel.cpp:6487
+#: TrackPanel.cpp:6580
 msgid "Label Track Font"
-msgstr "Pisava naslova sledi"
+msgstr "Pisava oznake sledi"
 
-#: TrackPanel.cpp:6499
+#: TrackPanel.cpp:6592
+#: TrackPanel.cpp:6598
 msgid "Face name"
 msgstr "Ime pisave"
 
-#: TrackPanel.cpp:6508
+#: TrackPanel.cpp:6602
+#: TrackPanel.cpp:6609
 msgid "Face size"
 msgstr "Velikost pisave"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Mute"
 msgstr "Utišaj"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7171
 msgid "Solo"
 msgstr "Solo"
 
-#: TrackPanelAx.cpp:265
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
 msgstr "Pogled sledi"
 
-#: TrackPanelAx.cpp:273
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
 msgstr "Dosegljiva sled je asinhrona"
 
-#: TrackPanelAx.cpp:281
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
 msgstr "Sled %d"
 
-#: TrackPanelAx.cpp:287
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr " Utišanje vključeno"
 
-#: TrackPanelAx.cpp:292
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
 msgstr " Solo vključeno"
 
-#: TrackPanelAx.cpp:296
+#: TrackPanelAx.cpp:304
 msgid " Select On"
 msgstr " Izbrano"
 
@@ -3995,71 +4115,68 @@ msgstr "Spremembe predznaka    -- sr.vred: %1.4f  st.dev.: (%1.4f)\n"
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr "Spremembe smeri    -- sr.vred.: %1.4f  st.dev.: (%1.4f)\n"
 
-#: WaveTrack.cpp:85
+#: WaveTrack.cpp:88
 msgid "Audio Track"
 msgstr "Zvočna sled"
 
-#: WaveTrack.cpp:555
-#: WaveTrack.cpp:574
+#: WaveTrack.cpp:597
+#: WaveTrack.cpp:616
+#: WaveTrack.cpp:1057
+#: WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
 msgstr "Ni dovolj prostora, da bi prilepili izbor"
 
-#: WaveTrack.cpp:1688
+#: WaveTrack.cpp:2086
 msgid "There is not enough room available to expand the cut line"
 msgstr "Ni dovolj prostora, da bi razpostrli črto reza"
 
-#: commands/CommandManager.cpp:448
+#: commands/CommandManager.cpp:555
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "Vtičniki 1 do %i"
 
-#: commands/CommandManager.cpp:462
+#: commands/CommandManager.cpp:569
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "Vtičniki %i do %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Iz neznanega razloga to ni dovoljeno.  Ste prej izbrali kak zvok?"
 
-#: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+#: commands/CommandManager.cpp:892
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"To lahko izvedete le, ko sta predvajanje in snemanje\n"
+msgstr "To lahko izvedete le, ko sta predvajanje in snemanje\n"
 " ustavljena.  [Premor oz. prekinitev ne zadostuje.]"
 
-#: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+#: commands/CommandManager.cpp:894
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Za to morate najprej izbrati kak stereo-zvok.\n"
+msgstr "Za to morate najprej izbrati kak stereo-zvok.\n"
 " [Tega ne morete uporabiti za mono posnetke.]"
 
-#: commands/CommandManager.cpp:785
+#: commands/CommandManager.cpp:896
 msgid "You must first select some audio for this to use."
 msgstr "Prosimo, da najprej izberete kak zvočni posnetek."
 
-#: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+#: commands/CommandManager.cpp:898
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Za to morate najprej izbrati kak zvok.\n"
+msgstr "Za to morate najprej izbrati kak zvok.\n"
 " [Izbiranje drugih vrst sledi ne bo delovalo.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Sporočilo"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr "Onemogočeno"
 
-#: commands/CommandManager.cpp:972
+#: commands/CommandManager.cpp:1083
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
 msgstr "Naloženih %d bližnjic\n"
 
-#: commands/CommandManager.cpp:974
+#: commands/CommandManager.cpp:1085
 msgid "Loading keyboard shortcuts"
 msgstr "Nalaganje bližnjic"
 
@@ -4068,37 +4185,43 @@ msgstr "Nalaganje bližnjic"
 msgid "Applied effect: %s %.1f dB"
 msgstr "Dodan učinek: %s %1f dB"
 
-#: effects/Amplify.cpp:87
+#: effects/Amplify.cpp:139
 msgid "Amplify"
 msgstr "Ojačaj"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Ojačevalec od Dominica Mazzonija"
+#: effects/Amplify.cpp:155
+#: effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "avtorja Dominica Mazzonija"
 
-#: effects/Amplify.cpp:159
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "Ojačitev (dB):"
 
-#: effects/Amplify.cpp:179
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "Nova vrhnja amplituda (dB):"
 
-#: effects/Amplify.cpp:191
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
 msgstr "Dovoli rezanje"
 
-#: effects/Amplify.cpp:237
-#: effects/Amplify.cpp:287
-#: effects/Amplify.cpp:353
+#: effects/Amplify.cpp:222
+#: effects/Amplify.cpp:279
+#: effects/Amplify.cpp:323
 msgid "-Infinity"
 msgstr "-neskončnost"
 
-#: effects/Amplify.h:46
+#: effects/Amplify.h:37
 msgid "Amplify..."
 msgstr "Ojačaj ..."
 
-#: effects/Amplify.h:54
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "Ojačanje poteka"
 
@@ -4135,11 +4258,18 @@ msgstr "Največji premor:"
 #: effects/AutoDuck.cpp:504
 #: effects/AutoDuck.cpp:509
 #: effects/AutoDuck.cpp:514
-#: prefs/AudioIOPrefs.cpp:166
-#: prefs/AudioIOPrefs.cpp:174
-#: prefs/AudioIOPrefs.cpp:176
-#: prefs/AudioIOPrefs.cpp:201
-#: prefs/AudioIOPrefs.cpp:203
+#: effects/Contrast.cpp:263
+#: effects/Contrast.cpp:286
+#: prefs/AudioIOPrefs.cpp:172
+#: prefs/AudioIOPrefs.cpp:180
+#: prefs/AudioIOPrefs.cpp:182
+#: prefs/AudioIOPrefs.cpp:207
+#: prefs/AudioIOPrefs.cpp:209
+#: prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163
+#: prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:197
 #: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
 msgstr "sekund"
@@ -4161,7 +4291,7 @@ msgid "Inner fade up length:"
 msgstr "Dolžina notranjega naraščanja:"
 
 #: effects/AutoDuck.cpp:521
-#: effects/Compressor.cpp:484
+#: effects/Compressor.cpp:494
 msgid "Threshold:"
 msgstr "Prag:"
 
@@ -4169,25 +4299,23 @@ msgstr "Prag:"
 msgid "Please enter valid values."
 msgstr "Prosim, vnesite veljavne vrednosti."
 
-#: effects/AutoDuck.cpp:704
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
 msgstr "Predposlušanje ni na voljo"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr "Samodejno spusti ..."
 
-#: effects/AutoDuck.h:107
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr "Procesiranje samodejnega spuščanja ..."
 
 #: effects/AvcCompressor.cpp:738
-#: effects/VST/VSTEffect.cpp:448
-#: effects/audiounits/AudioUnitEffect.cpp:877
-#: effects/nyquist/Nyquist.cpp:1042
-#: widgets/ErrorDialog.cpp:79
-#: widgets/ErrorDialog.cpp:105
-#: widgets/Warning.cpp:67
+#: effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882
+#: effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "V redu"
 
@@ -4201,22 +4329,33 @@ msgid "Bass Boost"
 msgstr "Ojačitev nizkih tonov"
 
 #: effects/BassBoost.cpp:182
+#: effects/Phaser.cpp:219
+#: effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr "avtorja Nasce Octaviana Paula"
 
 #: effects/BassBoost.cpp:196
+#: effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
 msgstr "Frekvenca (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Ojačitev (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Ojačitev nizkih tonov ..."
 
-#: effects/BassBoost.h:43
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
 msgstr "Ojačitev nizkih frekvenc"
 
@@ -4233,260 +4372,619 @@ msgstr "Spreminjanje dolžine ..."
 msgid "Applied effect: %s %.2f semitones"
 msgstr "Dodan učinek: %s %.2f poltone"
 
-#: effects/ChangePitch.cpp:118
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
 msgstr "Spremeni višino tona"
 
-#: effects/ChangePitch.cpp:247
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
 msgstr "Spremeni višino tona brez spremembe tempa"
 
-#. i18n-hint: && in here is an escape character to get a single & on
-#. * screen, so keep it as is
-#: effects/ChangePitch.cpp:254
-#: effects/ChangeSpeed.cpp:313
-#: effects/ChangeTempo.cpp:180
+#: effects/ChangePitch.cpp:258
+#: effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:173
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "avtorja Vauhgan Johnson in Dominic Mazzoni"
 
-#: effects/ChangePitch.cpp:259
-#: effects/ChangeTempo.cpp:185
+#: effects/ChangePitch.cpp:260
+#: effects/ChangeTempo.cpp:175
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "uporabljen SoundTouch Ollija Parvianena"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Višina tona:   od"
-
-#: effects/ChangePitch.cpp:291
-#: effects/ChangePitch.cpp:337
-#: effects/ChangeSpeed.cpp:377
-#: effects/ChangeTempo.cpp:239
-#: effects/ChangeTempo.cpp:270
-msgid "to"
-msgstr "do"
+msgid "Pitch:"
+msgstr "Višina tona:"
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr "Od:"
 
-#: effects/ChangePitch.cpp:306
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr "Od višine tona"
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr "navzgor"
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr "navzdol"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr "Do:"
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr "V višino tona"
+
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
 msgstr "Poltoni:"
 
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frekvenca (Hz): od"
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr "Poltoni v polkorakih"
+
+#: effects/ChangePitch.cpp:326
+#: effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:206
+#: effects/ChangeTempo.cpp:219
+msgid "from"
+msgstr "od"
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr "Od frekvence (v Hz)"
+
+#: effects/ChangePitch.cpp:331
+#: effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:211
+#: effects/ChangeTempo.cpp:224
+msgid "to"
+msgstr "do"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr "Do frekvence (v sekundah)"
 
-#: effects/ChangePitch.cpp:360
-#: effects/ChangeSpeed.cpp:331
-#: effects/ChangeTempo.cpp:198
+#: effects/ChangePitch.cpp:338
+#: effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:184
 msgid "Percent Change:"
 msgstr "Sprememba v odstotkih"
 
+#: effects/ChangePitch.cpp:343
+#: effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358
+#: effects/ChangeTempo.cpp:195
+msgid "Percent Change"
+msgstr "Sprememba v odstotkih"
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Spremeni višino tona ..."
 
-#: effects/ChangePitch.h:39
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
 msgstr "Spreminjanje višine tona"
 
-#: effects/ChangeSpeed.cpp:53
+#: effects/ChangeSpeed.cpp:54
 #: effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "Dodan učinek: %s %1f%%"
 
-#: effects/ChangeSpeed.cpp:60
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
 msgstr "Spremeni hitrost"
 
-#: effects/ChangeSpeed.cpp:308
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
+msgid "n/a"
+msgstr "ni na voljo"
+
+#: effects/ChangeSpeed.cpp:334
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Spremeni hitrost z vplivom na tempo in višino tona"
 
-#: effects/ChangeSpeed.cpp:318
+#: effects/ChangeSpeed.cpp:338
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "uporabljen SampleRate Erika de Castro Lopoja"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "ni na voljo"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr "Standardni vinilni RPM:"
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standardni vinilni RPM:   od"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr "Iz RPM"
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr "V RPM"
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
 msgstr "Spremeni hitrost ..."
 
-#: effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
 msgstr "Spreminjanje hitrosti"
 
-#: effects/ChangeTempo.cpp:74
+#: effects/ChangeTempo.cpp:138
 msgid "Change Tempo"
 msgstr "Spremeni tempo"
 
-#: effects/ChangeTempo.cpp:175
+#: effects/ChangeTempo.cpp:171
 msgid "Change Tempo without Changing Pitch"
 msgstr "Spremeni temppo brez spremembe višine tona"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Udarcev na minuto (BPM):   od"
+#: effects/ChangeTempo.cpp:203
+msgid "Beats per minute:"
+msgstr "Udarcev na minuto (BPM):"
+
+#: effects/ChangeTempo.cpp:207
+msgid "From beats per minute"
+msgstr "Od udarcev na minuto"
+
+#: effects/ChangeTempo.cpp:212
+msgid "To beats per minute"
+msgstr "Do udarcev na minuto"
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Dožina (v sekundah): od"
+#: effects/ChangeTempo.cpp:216
+msgid "Length (seconds):"
+msgstr "Dolžina (v sekundah):"
+
+#: effects/ChangeTempo.cpp:220
+msgid "From length in seconds"
+msgstr "Od dolžine (v sekundah)"
+
+#: effects/ChangeTempo.cpp:225
+msgid "To length in seconds"
+msgstr "Do dolžine (v sekundah)"
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
 msgstr "Spremeni tempo ..."
 
-#: effects/ChangeTempo.h:43
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
 msgstr "Spreminjanje tempa"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr "Odstranitev presketa"
 
-#: effects/ClickRemoval.cpp:336
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Odstranitev presketa avtorja Craiga DeForesta"
 
-#: effects/ClickRemoval.cpp:350
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Izberite prag (nižji pomeni večjo občutljivost):"
 
-#: effects/ClickRemoval.cpp:362
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
+#: effects/ClickRemoval.cpp:353
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Največja širina konice (večja pomeni večjo občutljivost):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Odstranitev presketa ..."
 
-#: effects/ClickRemoval.h:50
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
 msgstr "Odstranjevanje presketa ..."
 
-#: effects/Compressor.cpp:74
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "Stiskalnik obsega dinamike"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Kompresor dinamičnega obsega Dominica Mazzonija"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr "Prag"
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
 msgstr "Razmerje:"
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "Razmerje"
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
 msgstr "Napadalni čas:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
-msgstr "ÄŒas upadanja: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr "Napadalni čas"
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr "ÄŒas upadanja:"
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr "ÄŒas upadanja"
 
-#: effects/Compressor.cpp:516
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "Po stiskanju normaliziraj na 0dB"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
-msgstr "Prag: %d dB"
+msgid "Threshold %d dB"
+msgstr "Prag %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Razmerje: %.0f:1"
+msgid "%3d dB"
+msgstr "%3d dB"
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Razmerje: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr "Razmerje %.0f proti 1"
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
-msgstr "Trajanje napada: %.1f s"
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr "Razmerje %.1f proti 1"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Decay Time: %.1f secs"
-msgstr "ÄŒas upadanja: %.1f s"
+msgid "%.1f:1"
+msgstr "%.1f:1"
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
+msgstr "Trajanje napada %.1f s"
+
+#: effects/Compressor.cpp:576
+#: effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr "%.1f s"
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr "ÄŒas upadanja %.1f s"
 
 #: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "Stiskalnik ..."
 
-#: effects/Compressor.h:44
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
 msgstr "Uporaba stiskanja obsega dinamike ..."
 
-#: effects/DtmfGen.cpp:48
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr "Živijo.\n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193
+#: effects/Contrast.cpp:204
+#: effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr "Izmerjeno"
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr "Analizator kontrasta"
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr "Parametri"
+
+#: effects/Contrast.cpp:242
+#: effects/ToneGen.cpp:355
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Začetek"
+
+#: effects/Contrast.cpp:243
+#: effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159
+#: toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Konec"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr "Ospredje:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr "Ozadje:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr "Rezultat"
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr "Rezultat kontrasta:"
+
+#: Tags.cpp:840
+#: Tags.cpp:1990
+msgid "Reset"
+msgstr "Ponastavi"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr "Razlika:"
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr "Informacije"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "Nadzor"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328
+#: effects/Contrast.cpp:336
+#: effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr "Izmeri"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191
+#: effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f dB"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr "WCAG2 je prešel"
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr "WCAG2 ni uspel"
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr "Merjenje ospredja"
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr "Merjenje ozadja"
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr "Ustvari ton DTMF"
 
-#: effects/DtmfGen.cpp:439
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "avtor Salvo Ventura (2006)"
 
-#: effects/DtmfGen.cpp:443
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "Zaporedje DTMF:"
 
-#: effects/DtmfGen.cpp:446
-#: effects/Noise.cpp:255
-#: effects/ToneGen.cpp:328
-#: effects/ToneGen.cpp:365
+#: effects/DtmfGen.cpp:463
+#: effects/Noise.cpp:242
+#: effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:359
 msgid "Amplitude (0-1)"
 msgstr "Amplituda (0-1)"
 
-#: effects/DtmfGen.cpp:448
+#: effects/DtmfGen.cpp:465
 msgid "Duration:"
 msgstr "Trajanje:"
 
-#: effects/DtmfGen.cpp:469
+#: effects/DtmfGen.cpp:486
 msgid "Tone/silence ratio:"
 msgstr "Razmerje ton/tišina:"
 
-#: effects/DtmfGen.cpp:479
+#: effects/DtmfGen.cpp:496
 msgid "Duty cycle:"
 msgstr "Cikel delovanja:"
 
-#: effects/DtmfGen.cpp:481
+#: effects/DtmfGen.cpp:498
 msgid "Tone duration:"
 msgstr "Trajanje tona:"
 
-#: effects/DtmfGen.cpp:482
-#: effects/DtmfGen.cpp:484
-#: effects/DtmfGen.cpp:560
-#: effects/DtmfGen.cpp:561
+#: effects/DtmfGen.cpp:499
+#: effects/DtmfGen.cpp:501
+#: effects/DtmfGen.cpp:577
+#: effects/DtmfGen.cpp:578
 msgid "ms"
 msgstr "ms"
 
-#: effects/DtmfGen.cpp:483
+#: effects/DtmfGen.cpp:500
 msgid "Silence duration:"
 msgstr "Trajanje tišine:"
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
 msgstr "Toni DTMF ..."
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
 msgstr "Uporabljen učinek: Ustvari tone DTMF, %.6lf sekund"
 
-#: effects/DtmfGen.h:53
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
 msgstr "Ustvarjanje tonov DTMF"
 
@@ -4502,6 +5000,7 @@ msgstr "Odmev"
 #. i18n-hint: && in here is an escape character to get a single & on
 #. * screen, so keep it as is
 #: effects/Echo.cpp:195
+#: effects/Repeat.cpp:200
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "avtorja Dominic Mazzoni in Vaughan Johnson"
 
@@ -4517,23 +5016,23 @@ msgstr "Faktor krnitve: "
 msgid "Echo..."
 msgstr "Odmev ..."
 
-#: effects/Echo.h:42
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "Izvajanje odmeva"
 
-#: effects/Effect.cpp:390
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
 msgstr "Priprava predposlušanja"
 
-#: effects/Effect.cpp:419
+#: effects/Effect.cpp:497
 msgid "Previewing"
 msgstr "Predposlušanje"
 
-#: effects/Effect.cpp:435
+#: effects/Effect.cpp:512
 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."
 
-#: effects/Effect.h:107
+#: effects/Effect.h:100
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Dodan učinek: %s"
@@ -4550,80 +5049,81 @@ msgstr "kosinusni"
 msgid "Cubic"
 msgstr "kubični"
 
-#: effects/Equalization.cpp:362
-#: effects/Equalization.cpp:412
+#: effects/Equalization.cpp:367
+#: effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "Izenačevanje"
 
-#: effects/Equalization.cpp:980
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
 msgstr "Napaka pri nalaganju krivulje izenačevalnika (EQ)"
 
-#: effects/Equalization.cpp:1019
+#: effects/Equalization.cpp:1033
 msgid "custom"
 msgstr "Po meri"
 
 #. i18n-hint: && in here is an escape character to get a single &
 #. * on screen, so keep it as is
-#: effects/Equalization.cpp:1087
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr "Izenačevanje, avtorja Martyn Shaw in Mitch Golden"
 
-#: effects/Equalization.cpp:1108
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr "Največji dB"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr "Najmanjši dB"
 
-#: effects/Equalization.cpp:1183
+#: effects/Equalization.cpp:1197
 msgid "kHz"
 msgstr "kHz"
 
-#: effects/Equalization.cpp:1200
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
 msgstr "Nariši krivulje"
 
-#: effects/Equalization.cpp:1205
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
 msgstr "Grafični izenačevalnik"
 
-#: effects/Equalization.cpp:1219
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
 msgstr "Linearna lestvica frekvenc"
 
-#: effects/Equalization.cpp:1228
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
 msgstr "Dolžina filtra:"
 
-#: effects/Equalization.cpp:1249
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
 msgstr "Izberite krivuljo:"
 
-#: effects/Equalization.cpp:1259
-#: effects/Equalization.cpp:2498
-#: export/ExportMultiple.cpp:826
+#: effects/Equalization.cpp:1273
+#: effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:882
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: effects/Equalization.cpp:1265
+#: effects/Equalization.cpp:1279
 msgid "Flat"
 msgstr "raven"
 
-#: effects/Equalization.cpp:2497
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
 msgstr "Vnesite želeno ime krivulje"
 
-#: effects/Equalization.cpp:2597
+#: effects/Equalization.cpp:2611
+#: export/ExportFFmpegDialogs.cpp:1220
 msgid "Confirm Deletion"
 msgstr "Potrditev brisanja"
 
-#: effects/Equalization.h:87
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "Izenačevanje ..."
 
-#: effects/Equalization.h:95
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "Izvajanje izenačevanja"
 
@@ -4631,15 +5131,15 @@ msgstr "Izvajanje izenačevanja"
 msgid "Fade In"
 msgstr "Zvišuj glasnost"
 
-#: effects/Fade.h:32
+#: effects/Fade.h:38
 msgid "Fading In"
 msgstr "Višanje glasnosti"
 
-#: effects/Fade.h:48
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "Znižuj glasnost"
 
-#: effects/Fade.h:56
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "Nižanje glasnosti"
 
@@ -4675,7 +5175,7 @@ msgstr "Začetek in konec morata biti večja od 0."
 msgid "Find Clipping..."
 msgstr "Najdi porezano ..."
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr "Razpoznavanje porezanosti"
 
@@ -4683,67 +5183,222 @@ msgstr "Razpoznavanje porezanosti"
 msgid "Invert"
 msgstr "Obrni"
 
-#: effects/Invert.h:35
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "Obračanje"
 
-#: effects/Leveller.cpp:52
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "Uravnalnik"
+
+#: effects/Leveller.cpp:203
 msgid "None-Skip"
 msgstr "Brez-preskoči"
 
-#: effects/Leveller.cpp:53
+#: effects/Leveller.cpp:204
 msgid "Light"
 msgstr "lažje"
 
-#: effects/Leveller.cpp:54
+#: effects/Leveller.cpp:205
 msgid "Moderate"
 msgstr "zmerno"
 
-#: effects/Leveller.cpp:55
+#: effects/Leveller.cpp:206
 msgid "Heavy"
 msgstr "močneje"
 
-#: effects/Leveller.cpp:56
+#: effects/Leveller.cpp:207
 msgid "Heavier"
 msgstr "najmočneje"
 
-#: effects/Leveller.cpp:57
+#: effects/Leveller.cpp:208
 msgid "Heaviest"
 msgstr "močno"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Uravnalnik"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Izravnalnik avtorja Lynna Allana"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Izenači tihe in glasne odseke"
+#: effects/Leveller.cpp:212
+#: effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "avtorja Lynna Allana"
 
-#: effects/Leveller.cpp:226
-#: effects/Leveller.cpp:231
+#: effects/Leveller.cpp:222
 msgid "Degree of Leveling"
 msgstr "Stopnja izravnavanja"
 
-#: effects/Leveller.cpp:242
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr "Stopnja izravnavanja:"
+
+#: effects/Leveller.cpp:234
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Prag Å¡uma (brnenje/Å¡umenje/zvok prostora, okolice)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
-msgstr "Prag za Å¡um: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
+msgstr "Prag za Å¡um:"
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
 msgstr "Izravnalnik ..."
 
-#: effects/Leveller.h:36
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
 msgstr "Uporaba izravnalnika ..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr "Generator"
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr "Instrument"
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr "Oscilator"
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr "Pripomoček"
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr "Pretvornik"
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr "Analizator"
+
+#: effects/LoadEffects.cpp:114
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mešalec"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr "Simulator"
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr "Zamik"
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr "Modulator"
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr "Odmev"
+
+#: effects/LoadEffects.cpp:124
+#: effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Faznik"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr "Prirobnik"
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr "Zbor"
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr "Filter"
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr "Nizko prepustni"
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr "Pasovno prepustni"
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr "Visoko prepustni"
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr "Glavnik"
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr "Vse prepustni"
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr "Izravnalnik"
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr "Parametričen"
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr "Večpasovni"
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr "Spektralni procesor"
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr "Pomikalnik višine tona"
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr "Ojačevalec"
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr "Popačenje"
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr "Oblikovalec signalne krivulje"
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr "Procesor dinamike"
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr "Stiskalnik"
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr "Razteznik"
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr "Omejevalnik"
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr "Vrata"
+
+#: effects/LoadEffects.cpp:199
+#: effects/NoiseRemoval.cpp:725
+msgid "Noise Removal"
+msgstr "Odstranjevanje Å¡uma"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr "Višina tona in tempo"
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr "Menjalnik časovnice"
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr "ÄŒas"
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr "Napadi"
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "belo"
@@ -4760,7 +5415,7 @@ msgstr "rjavo"
 msgid "Noise Generator"
 msgstr "Ustvari Å¡um"
 
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr "Vrsta Å¡uma"
 
@@ -4768,85 +5423,87 @@ msgstr "Vrsta Å¡uma"
 msgid "Noise..."
 msgstr "Å um ..."
 
-#: effects/Noise.h:49
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
 msgstr "Uporabljen učinek: Ustvari šum, %.6lf sekund"
 
-#: effects/Noise.h:53
+#: effects/Noise.h:59
 msgid "Generating Noise"
 msgstr "Ustvarjanje Å¡uma"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Datoteke ni mogoče odpreti:\n"
+msgstr "Datoteke ni mogoče odpreti:\n"
 " %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Poskus odstranjevanja Å¡uma brez profila Å¡uma.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Odstranjevanje Å¡uma"
-
-#: effects/NoiseRemoval.cpp:813
+#: effects/NoiseRemoval.cpp:814
 msgid "Step 1"
 msgstr "1. korak"
 
-#: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+#: effects/NoiseRemoval.cpp:815
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Izberite nekaj sekund zgolj Å¡uma, da Audacity ve, kaj naj odstrani,\n"
+msgstr "Izberite nekaj sekund zgolj Å¡uma, da Audacity ve, kaj naj odstrani,\n"
 "nato kliknite Dobi profil Å¡uma:"
 
-#: effects/NoiseRemoval.cpp:815
+#: effects/NoiseRemoval.cpp:816
 msgid "Step 2"
 msgstr "2. korak"
 
-#: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+#: effects/NoiseRemoval.cpp:817
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Izberite ves zvok, ki ga želite prefiltrirati, izberite koliko šuma želite\n"
+msgstr "Izberite ves zvok, ki ga želite prefiltrirati, izberite koliko šuma želite\n"
 "odstraniti in nato kliknite 'V redu', da odstranite Å¡um.\n"
 
-#: effects/NoiseRemoval.cpp:821
+#: effects/NoiseRemoval.cpp:822
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Odstranjevanje Å¡uma Dominica Mazzonija"
 
-#: effects/NoiseRemoval.cpp:829
+#: effects/NoiseRemoval.cpp:830
 msgid "Get Noise Profile"
 msgstr "Dobi profil Å¡uma"
 
-#: effects/NoiseRemoval.cpp:840
+#: effects/NoiseRemoval.cpp:841
 msgid "Noise reduction (dB):"
 msgstr "Odstranjevanje Å¡uma (dB):"
 
-#: effects/NoiseRemoval.cpp:848
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:849
 msgid "Frequency smoothing (Hz):"
 msgstr "Glajenje frekvenc (Hz):"
 
-#: effects/NoiseRemoval.cpp:856
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:857
 msgid "Attack/decay time (secs):"
 msgstr "ÄŒas napada/upada (v sekundah):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Odstranjevanje Å¡uma ..."
 
-#: effects/NoiseRemoval.h:44
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "Ustvarjanje profila Å¡uma"
 
-#: effects/NoiseRemoval.h:46
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "Odstranjevanje Å¡uma"
 
@@ -4874,31 +5531,32 @@ msgstr "velja"
 msgid ", maximum amplitude = %.1f dB"
 msgstr ", največja amplituda = %.1f dB"
 
-#: effects/Normalize.cpp:113
+#: effects/Normalize.cpp:327
 msgid "Normalize"
 msgstr "Normaliziraj"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normaliziraj avtorja Dominica Mazzonija"
+#: effects/Normalize.cpp:351
+#: effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr "Odstrani vsakršen odmik DC (sredina na 0,0 navpično)"
 
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Odstrani vsakršen odmik DC (sredina na 0 navpično)"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr "Normaliziraj največjo amplitudo na:"
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Normaliziraj največjo amplitudo na"
-
-#: effects/Normalize.cpp:361
+#: effects/Normalize.cpp:362
 msgid "-"
 msgstr "-"
 
-#: effects/Normalize.h:32
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
+#: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "Normaliziraj ..."
 
-#: effects/Normalize.h:41
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "Normalizacija poteka ..."
 
@@ -4907,110 +5565,129 @@ msgstr "Normalizacija poteka ..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Uporabljen učinek: %s %d stopenj, %.0f%% moker, frekvenca = %.1f Hz, začetna faza = %.0f stopinj, globina = %d, odziv = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Faznik"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Faznik Nasca Octaviana Paula"
-
-#: effects/Phaser.cpp:222
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "Stopnje:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "SUHO"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr "Stopnje"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr "Suho/vlažno:"
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "VLAŽNO"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr "Suho vlažno"
 
-#: effects/Phaser.cpp:264
+#: effects/Phaser.cpp:236
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Frekvenca LFO (Hz):"
 
-#: effects/Phaser.cpp:280
-#: effects/Wahwah.cpp:237
+#: effects/Phaser.cpp:239
+#: effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr "Frekvenca LFO v Hz"
+
+#: effects/Phaser.cpp:241
+#: effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
 msgstr "Začetna faza LFO (stop.):"
 
-#: effects/Phaser.cpp:296
+#: effects/Phaser.cpp:244
+#: effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr "Začetna faza LFO v stopinjah"
+
+#: effects/Phaser.cpp:246
 msgid "Depth:"
 msgstr "Globina:"
 
-#: effects/Phaser.cpp:312
+#: effects/Phaser.cpp:249
+#: effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr "Globina v odstotkih"
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
 msgstr "Odboj (%):"
 
-#: effects/Phaser.h:38
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr "Odziv v odstotkih"
+
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "Faznik ..."
 
-#: effects/Phaser.h:46
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "Dodajanje Faznika"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Učinek Popravi je namenjen za uporabo na zelo kratkih odsekih okvarjenega zvoka (do 128 vzorcev).\n"
+msgstr "Učinek Popravi je namenjen za uporabo na zelo kratkih odsekih okvarjenega zvoka (do 128 vzorcev).\n"
 "\n"
 "Povečajte izbor in izberite majhen delček sekunde za popravilo."
 
-#: effects/Repair.h:37
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr "Popravljanje deluje z uporabo zvočnih podatkov zunaj izbranega območja.\n"
+"\n"
+"Prosimo, izberite območje, katerega se vsaj na enem robu dotika zvok.\n"
+"\n"
+"Več ko je okrožajočih zvokov, boljši bo rezultat."
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
 msgstr "Popravljanje okvarjenega zvoka"
 
-#: effects/Repeat.cpp:49
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
 msgstr "Ponovljeno %d-krat"
 
-#: effects/Repeat.cpp:75
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
 msgstr "Sledi so predolge za ponovitev izbora."
 
-#: effects/Repeat.cpp:76
-#: effects/Repeat.cpp:80
+#: effects/Repeat.cpp:77
+#: effects/Repeat.cpp:187
 msgid "Repeat"
 msgstr "Ponovi"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Ponavljalec, Dominic Mazzoni &&  Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+msgid "Number of times to repeat:"
 msgstr "Å tevilo ponovitev:"
 
-#: effects/Repeat.cpp:207
-#: effects/Repeat.cpp:237
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr "Nova dolžina izbora: uu:mm:ss"
+
+#: effects/Repeat.cpp:253
 msgid "New selection length: "
 msgstr "Nova dolžina izbora:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minut, %d sekund"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:262
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "uu:mm:ss"
 
-#: effects/Repeat.h:32
+#: effects/Repeat.h:33
 msgid "Repeat..."
 msgstr "Ponovi ..."
 
-#: effects/Repeat.h:40
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
 msgstr "Izvajanje ponavljanja"
 
@@ -5018,7 +5695,7 @@ msgstr "Izvajanje ponavljanja"
 msgid "Reverse"
 msgstr "Vzvratno"
 
-#: effects/Reverse.h:38
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "Izpeljujem vzvratno"
 
@@ -5030,11 +5707,11 @@ msgstr "Ustvari tišino"
 msgid "Silence..."
 msgstr "Tišina ..."
 
-#: effects/Silence.h:42
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "Ustvarjanje tišine"
 
-#: effects/Silence.h:47
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Uporabljen učinek: tvori tišino, %.6lf sekund"
@@ -5052,11 +5729,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "ÄŒistilec konic avtorja Lynna Allana"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Največje trajanje konice (v milisekundah): \n"
+msgstr "Največje trajanje konice (v milisekundah): \n"
 "(99999 ali več pomeni izključeno)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5071,70 +5746,122 @@ msgstr "ÄŒistilec konic ..."
 msgid "Applying Spike Cleaner..."
 msgstr "Izvajanje ÄŒistilca konic ..."
 
-#: effects/StereoToMono.h:32
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Stereo v mono"
+
+#: effects/StereoToMono.h:38
 msgid "Applying Stereo to Mono"
 msgstr "Izvajanje pretvorbe sterea v mono"
 
-#: effects/ToneGen.cpp:66
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
+#: effects/ToneGen.cpp:61
 #, 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:75
-#: widgets/Meter.cpp:366
+#: effects/ToneGen.cpp:69
+#: widgets/Meter.cpp:416
 msgid "Linear"
 msgstr "Linearno"
 
-#: effects/ToneGen.cpp:76
+#: effects/ToneGen.cpp:70
 msgid "Logarithmic"
 msgstr "Logaritemsko"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
 msgstr "Ustvari pisk"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "Ustvari ton"
 
-#: effects/ToneGen.cpp:79
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "Sinusni"
 
-#: effects/ToneGen.cpp:80
+#: effects/ToneGen.cpp:73
 msgid "Square"
 msgstr "Kvadratni"
 
-#: effects/ToneGen.cpp:81
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
 msgstr "Zobati"
 
-#: effects/ToneGen.cpp:82
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
 msgstr "Kvadratni, brez aliasa"
 
-#: effects/ToneGen.cpp:327
-#: effects/ToneGen.cpp:363
+#: effects/ToneGen.cpp:321
+#: effects/ToneGen.cpp:357
 msgid "Frequency (Hz)"
 msgstr "Frekvenca (Hz)"
 
-#: effects/ToneGen.cpp:354
+#: effects/ToneGen.cpp:348
 msgid "Waveform:"
 msgstr "Signalna oblika:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Začetek"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Konec"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
-#: effects/ToneGen.cpp:372
+#: effects/ToneGen.cpp:365
 msgid "Interpolation:"
 msgstr "Interpolacija:"
 
@@ -5146,11 +5873,11 @@ msgstr "Pisk ..."
 msgid "Tone..."
 msgstr "Ton ..."
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
 msgstr "Ustvarjanje piska"
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "Ustvarjanje tona"
 
@@ -5159,29 +5886,27 @@ msgid "All tracks must have the same sample rate"
 msgstr "Vse sledi morajo imeti enako mero vzorčenja."
 
 #: effects/TruncSilence.cpp:113
-#: effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr "Poreži tišino"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "avtorja Lynna Allana"
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr "Največje trajanje tišine:"
 
-#: effects/TruncSilence.cpp:349
-#: prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:193
+#: effects/TruncSilence.cpp:348
+#: prefs/AudioIOPrefs.cpp:196
+#: prefs/AudioIOPrefs.cpp:199
+#: prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "milisekund"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr "Prag tišine:"
 
-#: effects/TruncSilence.cpp:376
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr "   Trajanje mora obsegati najmanj 1 milisekundo."
 
@@ -5189,19 +5914,19 @@ msgstr "   Trajanje mora obsegati najmanj 1 milisekundo."
 msgid "Truncate Silence..."
 msgstr "Poreži tišino ..."
 
-#: effects/TruncSilence.h:36
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr "Izrezovanje tišin ..."
 
-#: effects/VST/VSTEffect.cpp:165
+#: effects/VST/VSTEffect.cpp:172
 msgid "Sorry, VST Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr "Oprostite, učinki VST se ne morejo izvesti na stereo posnetkih, kjer se posamezni kanali ne skladajo."
 
-#: effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
 msgstr "Zamenjave ni mogoče izvesti"
 
-#: effects/VST/VSTEffect.cpp:403
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "Parametri vtičnika VST:"
 
@@ -5210,120 +5935,146 @@ msgstr "Parametri vtičnika VST:"
 msgid "Applied effect: %s frequency = %.1f Hz, start phase = %.0f deg, depth = %.0f%%, resonance = %.1f, frequency offset = %.0f%%"
 msgstr "Uporabljen učinek: frekvenca %s = %.1f Hz, začetna faza = %.0f stopinj, globina = %.0f%%, resonanca = %.1f, odmik frekvence = %.0f%%"
 
-#: effects/Wahwah.cpp:72
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "Wah-wah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wah-wah Nasca Octaviana Paula"
-
-#: effects/Wahwah.cpp:253
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
 msgstr "Globina (%):"
 
-#: effects/Wahwah.cpp:269
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "Resonanca:"
 
-#: effects/Wahwah.cpp:285
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr "Resonanca"
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
 msgstr "Razlika v frekvenci wah (%):"
 
-#: effects/Wahwah.h:34
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr "Razlika v frekvenci wah v odstotkih"
+
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "Wah-wah ..."
 
-#: effects/Wahwah.h:42
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "Dodajanje Wah-wah"
 
-#: effects/audiounits/AudioUnitEffect.cpp:133
-#: effects/ladspa/LadspaEffect.cpp:169
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176
+#: effects/lv2/LV2Effect.cpp:191
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "Izvajanje učinka: %s"
 
-#: effects/ladspa/LadspaEffect.cpp:189
+#: effects/ladspa/LadspaEffect.cpp:196
+#: effects/lv2/LV2Effect.cpp:211
 msgid "Sorry, Plug-in Effects cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr "Oprostite, učinki vstavkov se ne morejo izvesti na stereo posnetkih, kjer se posamezni kanali ne skladajo."
 
-#: effects/ladspa/LadspaEffect.cpp:573
-#: effects/ladspa/LadspaEffect.cpp:581
+#: effects/ladspa/LadspaEffect.cpp:580
+#: effects/ladspa/LadspaEffect.cpp:588
 #: prefs/GUIPrefs.cpp:51
 #: prefs/QualityPrefs.cpp:72
 msgid "None"
 msgstr "Prazno"
 
-#: effects/ladspa/LadspaEffect.cpp:575
-#: effects/vamp/VampEffect.cpp:384
+#: effects/ladspa/LadspaEffect.cpp:582
+#: effects/lv2/LV2Effect.cpp:798
+#: effects/vamp/VampEffect.cpp:395
 msgid "Author: "
 msgstr "Avtor: "
 
-#: effects/ladspa/LadspaEffect.cpp:608
+#: effects/ladspa/LadspaEffect.cpp:615
+#: effects/lv2/LV2Effect.cpp:823
 msgid "Effect Settings"
 msgstr "Nastavitve učinka"
 
-#: effects/ladspa/LadspaEffect.cpp:699
+#: effects/ladspa/LadspaEffect.cpp:710
+#: effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:834
+#: effects/lv2/LV2Effect.cpp:837
 msgid "Length (seconds)"
 msgstr "Dolžina (v sekundah)"
 
-#: effects/nyquist/Nyquist.cpp:252
+#: effects/lv2/LV2Effect.cpp:849
+#: effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr "Dolžina not (v sekundah)"
+
+#: effects/lv2/LV2Effect.cpp:860
+#: effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr "Hitrost not"
+
+#: effects/lv2/LV2Effect.cpp:871
+#: effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr "Ključ"
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "Dodajanje učinka Nyquist ..."
 
-#: effects/nyquist/Nyquist.cpp:259
-#: effects/nyquist/Nyquist.cpp:321
+#: effects/nyquist/Nyquist.cpp:264
+#: effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Pozornik Nyquist ..."
 
-#: effects/nyquist/Nyquist.cpp:322
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
 msgstr "Vnesi ukaz Nyquist:"
 
-#: effects/nyquist/Nyquist.cpp:412
+#: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
 msgstr "Oprostite, učinka ni mogoče izvesti na stereo sledeh, kjer se posamezne sledi ne skladajo."
 
-#: effects/nyquist/Nyquist.cpp:440
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Nyquist"
 
-#: effects/nyquist/Nyquist.cpp:441
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
 msgstr "Izhod Nyquista:"
 
-#: effects/nyquist/Nyquist.cpp:598
-#: effects/nyquist/Nyquist.cpp:609
+#: effects/nyquist/Nyquist.cpp:603
+#: effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
 msgstr "Nyquist je vrnil vrednost:"
 
-#: effects/nyquist/Nyquist.cpp:651
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
 msgstr "Nyquist ne vrne zvoka.\n"
 
-#: effects/nyquist/Nyquist.cpp:662
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist je vrnil preveč zvočnih kanalov.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:86
 #, c-format
 msgid "Extracting features: %s"
 msgstr "Možnosti izločanja: %s"
 
-#: effects/vamp/VampEffect.cpp:106
+#: effects/vamp/VampEffect.cpp:117
 msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
 msgstr "Oprostite, vstavkov Vamp ni mogoče izvesti na stereo posnetkih, kjer se posamezna kanala ne skladata."
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:131
 msgid "Sorry, failed to load Vamp Plug-in."
 msgstr "Oprostite, vtičnika Vamp ni bilo mogoče naložiti."
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:239
 msgid "Sorry, Vamp Plug-in failed to initialize."
 msgstr "Oprostite, vtičnik Vamp se ni uspel inicializirati."
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:387
 msgid " - Vamp audio analysis plugin"
 msgstr " - vtičnik za zvočno analizo Vamp"
 
@@ -5331,77 +6082,80 @@ msgstr " - vtičnik za zvočno analizo Vamp"
 msgid "Plugin Settings"
 msgstr "Nastavitve vtičnika"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:442
+#: effects/vamp/VampEffect.cpp:448
 msgid "Program"
 msgstr "Program"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Nobena sled ni izbrana! Uporabite Ctrl-A (Izberi vse)\n"
-"Izberite Izvozi ..., da izvozite vse sledi."
 
-#: export/Export.cpp:451
+#: export/Export.cpp:522
 msgid "Export File"
 msgstr "Izvozi datoteko"
 
-#: export/Export.cpp:459
+#: export/Export.cpp:530
 msgid "&Options..."
 msgstr "&Možnosti ..."
 
-#: export/Export.cpp:485
+#: export/Export.cpp:571
 msgid "Are you sure you want to save the file as \""
 msgstr "Ste prepričani, da želite datoteko shraniti kot \""
 
-#: export/Export.cpp:501
+#: export/Export.cpp:591
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Datoteko %s boste shranili pod imenom \"%s\".\n"
+msgstr "Datoteko %s boste shranili pod imenom \"%s\".\n"
 "\n"
 "Običajno imajo te datoteke končnico \".%s\" in nekatere aplikacije ne odpirajo datotek z nestandardnimi končnicami.\n"
 "\n"
 "Ste prepričani, da želite shraniti datoteko pod tem imenom?"
 
-#: export/Export.cpp:522
+#: export/Export.cpp:612
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "Datoteka \"%s\" že obstaja.  Jo želite zamenjati?"
 
-#: export/Export.cpp:604
+#: export/Export.cpp:710
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "Vaši posnetki bodo zmešani v dva stereo kanala v izvozno datoteko."
 
-#: export/Export.cpp:609
+#: export/Export.cpp:715
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
 msgstr "Vaši posnetki bodo zmešani v en sam mono kanal v izvozno datoteko."
 
-#: export/Export.cpp:619
+#: export/Export.cpp:726
 msgid "Advanced Mixing Options"
 msgstr "Napredne možnosti mešanja"
 
-#: export/Export.cpp:821
+#: export/Export.cpp:930
 #, c-format
 msgid "Channel: %2d"
 msgstr "Kanal: %2d"
 
-#: export/Export.cpp:945
+#: export/Export.cpp:1046
 msgid " - Left"
 msgstr " - levi"
 
-#: export/Export.cpp:946
+#: export/Export.cpp:1047
 msgid " - Right"
 msgstr " - desni"
 
-#: export/Export.cpp:976
-#: export/Export.cpp:1021
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr "Podokno mešalca"
+
+#: export/Export.cpp:1078
+#: export/Export.cpp:1125
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "Izhodna kanala: %2d"
@@ -5427,101 +6181,630 @@ msgstr "Pokaži izhod"
 msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
 msgstr "Podatki bodo podani v cevovod na standardni vhod. \"%f\" bo zamenjan z izbranim imenom izhodne datoteke."
 
-#: export/ExportCL.cpp:220
+#: export/ExportCL.cpp:222
 msgid "(external program)"
 msgstr "(zunanji program)"
 
-#: export/ExportCL.cpp:250
-#: export/ExportPCM.cpp:367
+#: export/ExportCL.cpp:253
+#: export/ExportPCM.cpp:457
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "Ne morem izvoziti posnetka v %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Izvozi"
-
-#: export/ExportCL.cpp:324
+#: export/ExportCL.cpp:327
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Izvažanje označenega z uporabo kodirnika ukazne vrstice"
 
-#: export/ExportCL.cpp:325
+#: export/ExportCL.cpp:328
 msgid "Exporting the entire project using command-line encoder"
 msgstr "Izvažanje celotnega projekta z uporabo kodirnika ukazne vrstice"
 
-#: export/ExportCL.cpp:389
+#: export/ExportCL.cpp:390
 msgid "Command Output"
 msgstr "Izhod ukaza"
 
-#: export/ExportFLAC.cpp:68
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr "Izvažanje izbranega zvoka kot %s"
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr "Izvažanje celotne datoteke kot %s"
+
+#: export/ExportFFmpeg.cpp:702
+#: export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr "Neveljavna mera vzorčenja"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr "Mere vzorčenja projekta (%d) trenutni izhodni zapis\n"
+"ne podpira.  "
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr "Kombinacije mer vzorčenja projekta (%d) in bitnega vzorčenja (%d kb/s)\n"
+"trenutni izhodni zapis ne podpira.  "
+
+#: export/ExportFFmpeg.cpp:721
+#: export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr "Prevzorčite lahko na eno od spodnjih vrednosti."
+
+#: export/ExportFFmpeg.cpp:749
+#: export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr "Mere vzorčenja"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "Določite možnosti AC3"
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr "Namestitev izvoza AC3"
+
+#: export/ExportFFmpegDialogs.cpp:121
+#: export/ExportFFmpegDialogs.cpp:245
+#: export/ExportFFmpegDialogs.cpp:314
+#: export/ExportFFmpegDialogs.cpp:385
+#: export/ExportFFmpegDialogs.cpp:937
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bitna hitrost:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr "Določite možnosti AAC"
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr "Namestitev izvoza AAC"
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr "Določite možnosti AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr "Namestitev izvoza AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr "Določite možnosti AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr "Namestitev izvoza AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr "Določite možnosti WMA"
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr "Namestitev izvoza WMA"
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "Želite prepisati prednastavitev '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr "Potrditev prepisa"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr "Določite druge možnosti"
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr "Prednastavitev:"
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr "Naloži prednastavitev"
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr "Shrani prednastavitev"
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr "Izbriši prednastavitev"
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr "Uvozi prednastavitve"
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr "Izvozi prednastavitve"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Format:"
+msgstr "Zapis:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr "Kodek:"
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr "Vsi zapisi in kodeki niso med seboj kompatibilni. Nekatere kombinacije parametrov (kot sta bitno vzorčenje in mera vzorčenja) sploh niso kompatibilne z nekaterimi kodeki."
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr "Izbirnik zapisa:"
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr "Izbirnik kodeka:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr "Pokaži vse vrste datotek"
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr "Pokaži vse kodeke"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:931
+#: prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Jezik:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr "3-črkovna koda jezika ISO 639\n"
+"neobvezno\n"
+"prazno - samodejno"
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr "Značka:"
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr "Značka kodeka (FOURCC)\n"
+"neobvezno\n"
+"prazno - samodejno"
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr "Bitno vzorčenje (bitov/sekundo) - vpliva na velikost in kakovost končne datoteke\n"
+"Nekateri kodeki uporabljajo le določene vrednosti (128k, 192k, 256k itn.).\n"
+"0 - samodejno\n"
+"Priporočeno - 192000"
+
+#: export/ExportFFmpegDialogs.cpp:940
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kakovost:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr "Splošna kakovost, ki jo različni kodeki uporabljajo različno\n"
+"obvezno za vorbis\n"
+"0 - samodejno\n"
+"-1 - izključeno (namesto tega uporabi bitno hitrost)"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr "Mera vzorčenja:"
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr "Mera vzorčenja (Hz)\n"
+"0 - ne spreminjaj mere vzorčenja"
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr "Pasovna Å¡irina porezave:"
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr "Pasovna širina zvočne porezave (Hz)\n"
+"neobvezno\n"
+"0 - samodejna\n"
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr "Profil:"
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr "Profil AAC\n"
+"Nizka kompleksnost (LC) - privzeto\n"
+"Večina predvajalnikov ne bo predvajala ničesar drugega kot LC."
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr "Raven stiskanja:"
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr "Raven stiskanja\n"
+"obvezno za FLAC\n"
+"-1 - samodejno\n"
+"najmanjše - 0 (hitro kodiranje, velika izhodna datoteka)\n"
+"največje - 10 (počasno kodiranje, majhna izhodna datoteka)"
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr "Velikost sličice:"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr "Velikost sličice\n"
+"neobvezno\n"
+"0 - privzeta\n"
+"najmanjša - 16\n"
+"največja - 65535"
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr "Natančnost koeficientov LPC"
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr "Natančnost koeficientov LPC\n"
+"neobvezno\n"
+"0 - privzeto\n"
+"najmanj - 1\n"
+"največ - 15"
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr "Najrajše zaporedje napovedi"
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr "Najkrajše zaporedje napovedi\n"
+"neobvezno\n"
+"-1 - privzeto\n"
+"najkrajše - 0\n"
+"najdaljše - 32 (z LPC) ali 4 (brez LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr "Najdaljše zaporedje napovedi"
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr "Najdaljše zaporedje napovedi\n"
+"neobvezno\n"
+"-1 - privzeto\n"
+"najkrajše - 0\n"
+"najdaljše - 32 (z LPC) ali 4 (brez LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr "Metoda zaporedja napovedi:"
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr "Metoda zaporedja napovedi\n"
+"Ocenjeno - najhitrejše, slabše stiskanje\n"
+"Logaritemsko iskanje - najpočasnejše, najboljše stiskanje\n"
+"Polno iskanje - privzeto"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr "Najkrajše zaporedje razdelitve"
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr "Najkrajše zaporedje razdelitve\n"
+"neobvezno\n"
+"-1 - privzeto\n"
+"najkrajše - 0\n"
+"najdaljše - 8"
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr "Najdaljše zaporedje razdelitve"
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr "Najdaljše zaporedje razdelitve\n"
+"neobvezno\n"
+"-1 - privzeto\n"
+"najkrajše - 0\n"
+"najdaljše - 8"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr "Mera multipleksiranja:"
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr "Največje bitno vzorčenje multipleksiranega toka\n"
+"neobvezno\n"
+"0 - privzeto"
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr "Velikost paketa:"
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr "Velikost paketa\n"
+"neobvezno\n"
+"0 - privzeta"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr "Želite izbrisati prednastavitev '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr "Prednastavitve brez imena ne morete shraniti"
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr "Izberite datoteko XML s prednastavitvami, ki jo želite uvoziti"
+
+#: prefs/KeyConfigPrefs.cpp:202
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Datoteke XML (*.xml)|*.xml|Vse datoteke (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr "Izberite datoteko XML za izvoz prednastavitev."
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "Datoteke M4A (AAC) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "Datoteke AC3 (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr "Datoteke AMR (ozkopasovne) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr "Datoteke AMR (Å¡irokopasovne) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "Datoteke WMA (razl. 2) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "Izvoz FFmpeg po meri"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr "Nizka kompleksnost"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr "Glavni profil"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr "2-ravenski"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr "4-ravenski"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr "8-ravenski"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr "Oceni"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr "Polno iskanje"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr "Iskanje po dnevniku"
+
+#: export/ExportFLAC.cpp:67
 msgid "Specify FLAC Options"
 msgstr "Določite možnosti FLAC"
 
-#: export/ExportFLAC.cpp:82
+#: export/ExportFLAC.cpp:81
 msgid "0 (fastest)"
 msgstr "0 (najhitrejše)"
 
-#: export/ExportFLAC.cpp:83
+#: export/ExportFLAC.cpp:82
 msgid "1"
 msgstr "1"
 
-#: export/ExportFLAC.cpp:84
+#: export/ExportFLAC.cpp:83
 msgid "2"
 msgstr "2"
 
-#: export/ExportFLAC.cpp:85
+#: export/ExportFLAC.cpp:84
 msgid "3"
 msgstr "3"
 
-#: export/ExportFLAC.cpp:86
+#: export/ExportFLAC.cpp:85
 msgid "4"
 msgstr "4"
 
-#: export/ExportFLAC.cpp:87
+#: export/ExportFLAC.cpp:86
 msgid "5"
 msgstr "5"
 
-#: export/ExportFLAC.cpp:88
+#: export/ExportFLAC.cpp:87
 msgid "6"
 msgstr "6"
 
-#: export/ExportFLAC.cpp:89
+#: export/ExportFLAC.cpp:88
 msgid "7"
 msgstr "7"
 
-#: export/ExportFLAC.cpp:90
+#: export/ExportFLAC.cpp:89
 msgid "8 (best)"
 msgstr "8 (najboljše)"
 
-#: export/ExportFLAC.cpp:93
+#: export/ExportFLAC.cpp:92
 msgid "16 bit"
 msgstr "16-bitno"
 
-#: export/ExportFLAC.cpp:94
+#: export/ExportFLAC.cpp:93
 msgid "24 bit"
 msgstr "24-bitno"
 
-#: export/ExportFLAC.cpp:98
+#: export/ExportFLAC.cpp:97
 msgid "FLAC Export Setup"
 msgstr "Namestitev izvoza FLAC"
 
-#: export/ExportFLAC.cpp:102
+#: export/ExportFLAC.cpp:101
 msgid "Level:"
 msgstr "Raven:"
 
-#: export/ExportFLAC.cpp:104
+#: export/ExportFLAC.cpp:103
 msgid "Bit depth:"
 msgstr "Bitna globina:"
 
-#: export/ExportFLAC.cpp:208
+#: export/ExportFLAC.cpp:209
 msgid "FLAC Files"
 msgstr "Datoteke FLAC"
 
-#: export/ExportFLAC.cpp:310
+#: export/ExportFLAC.cpp:312
 msgid "Exporting the selected audio as FLAC"
 msgstr "Izvažanje izbranega zvoka kot FLAC"
 
-#: export/ExportFLAC.cpp:311
+#: export/ExportFLAC.cpp:313
 msgid "Exporting the entire project as FLAC"
 msgstr "Izvažanje celotnega projekta kot FLAC"
 
@@ -5533,30 +6816,26 @@ msgstr "Določite možnosti MP2"
 msgid "MP2 Export Setup"
 msgstr "Namestitev izvoza MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Bitna hitrost:"
-
-#: export/ExportMP2.cpp:200
+#: export/ExportMP2.cpp:202
 msgid "MP2 Files"
 msgstr "Datoteke MP2"
 
-#: export/ExportMP2.cpp:229
+#: export/ExportMP2.cpp:232
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "Izvoz v MP2 ni mogoče pri tej frekvenci vzorčenja in bitni hitrosti"
 
-#: export/ExportMP2.cpp:240
-#: export/ExportMP3.cpp:1768
-#: export/ExportOGG.cpp:183
+#: export/ExportMP2.cpp:243
+#: export/ExportMP3.cpp:1771
+#: export/ExportOGG.cpp:186
 msgid "Unable to open target file for writing"
 msgstr "Datoteke za zapisovanje ni mogoče odpreti"
 
-#: export/ExportMP2.cpp:271
+#: export/ExportMP2.cpp:274
 #, c-format
 msgid "Exporting selected audio at %d kbps"
 msgstr "Izvažanje izbranega zvoka pri %d kb/s"
 
-#: export/ExportMP2.cpp:272
+#: export/ExportMP2.cpp:275
 #, c-format
 msgid "Exporting entire file at %d kbps"
 msgstr "Izvažanje celotne datoteke pri %d kb/s"
@@ -5657,35 +6936,15 @@ msgstr "Najdi Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity potrebuje datoteko %s za ustvarjanje datotek MP3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Mesto %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Če želite poiskati %s, kliknite sem -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Prebrskaj ..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Če želite brezplačno kopijo Lame, kliknite sem -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Prenesi ..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Kje je %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5699,221 +6958,208 @@ msgstr "Le libmp3lame.dylib|libmp3lame.dylib|Dinamične knjižnice (*.dylib)|*.d
 msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Samo libmp3lame.so.0|libmp3lame.so.0|Prvotne skupne razredne datoteke (*.so)|*.so|Razširjene knjižnice (*.so*)|*.so*|Vse datoteke (*)|*"
 
-#: export/ExportMP3.cpp:1650
+#: export/ExportMP3.cpp:1652
 msgid "MP3 Files"
 msgstr "Datoteke MP3"
 
-#: export/ExportMP3.cpp:1673
+#: export/ExportMP3.cpp:1676
 msgid "Could not open MP3 encoding library!"
 msgstr "Napaka pri odpiranju knjižnice za MP3 kodiranje!"
 
-#: export/ExportMP3.cpp:1680
+#: export/ExportMP3.cpp:1683
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "Neveljavna ali nepodprta knjižnica za MP3 kodiranje!"
 
-#: export/ExportMP3.cpp:1757
+#: export/ExportMP3.cpp:1760
 msgid "Unable to initialize MP3 stream"
 msgstr "Toka MP3 ni mogoče inicializirati"
 
-#: export/ExportMP3.cpp:1799
+#: export/ExportMP3.cpp:1802
 #, c-format
 msgid "Exporting selected audio with %s preset"
 msgstr "Izvažanje izbranega zvoka s prednastavitvijo %s"
 
-#: export/ExportMP3.cpp:1800
+#: export/ExportMP3.cpp:1803
 #, c-format
 msgid "Exporting entire file with %s preset"
 msgstr "Izvažanje celotne datoteke s prednastavitvijo %s"
 
-#: export/ExportMP3.cpp:1805
+#: export/ExportMP3.cpp:1808
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
 msgstr "Izvažanje izbranega zvoka pri kakovosti VBR %s"
 
-#: export/ExportMP3.cpp:1806
+#: export/ExportMP3.cpp:1809
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
 msgstr "Izvažanje celotne datoteke pri kakovosti VBR %s"
 
-#: export/ExportMP3.cpp:1811
+#: export/ExportMP3.cpp:1814
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
 msgstr "Izvažanje izbranega zvoka pri %d Kb/s"
 
-#: export/ExportMP3.cpp:1812
+#: export/ExportMP3.cpp:1815
 #, c-format
 msgid "Exporting entire file at %d Kbps"
 msgstr "Izvažanje celotne datoteke pri %d Kb/s"
 
-#: export/ExportMP3.cpp:1845
+#: export/ExportMP3.cpp:1849
 #, c-format
 msgid "Error %d returned from MP3 encoder"
 msgstr "Kodirnik MP3 je vrnil napako %d"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Neveljavna mera vzorčenja"
-
-#: export/ExportMP3.cpp:1931
+#: export/ExportMP3.cpp:1933
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr "Mere vzorčenja projekta (%d) zapis MP3 ne podpira."
 
-#: export/ExportMP3.cpp:1934
+#: export/ExportMP3.cpp:1936
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"Kombinacije mer vzorčenja projekta (%d) in bitnega vzorčenja (%d kb/s)\n"
+msgstr "Kombinacije mer vzorčenja projekta (%d) in bitnega vzorčenja (%d kb/s)\n"
 "zapis MP3 ne podpira.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Prevzorčite lahko na eno od spodnjih vrednosti."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Mere vzorčenja"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Dodatek za izvoz MP3 datotek manjka"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
-#: export/ExportMultiple.cpp:95
-#: export/ExportMultiple.cpp:374
-#: export/ExportMultiple.cpp:598
-#: export/ExportMultiple.cpp:765
+#: export/ExportMultiple.cpp:96
+#: export/ExportMultiple.cpp:426
+#: export/ExportMultiple.cpp:667
+#: export/ExportMultiple.cpp:834
 msgid "Export Multiple"
 msgstr "Izvoz večih"
 
-#: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+#: export/ExportMultiple.cpp:166
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Če imate več kot eno zvočno sled, lahko izvozite vsako sled kot ločeno datoteko,\n"
-"ali pa če imate poimenovano sled, lahko izvozite novo datoteko za vsak naslov.\n"
+msgstr "Če imate več kot eno zvočno sled, lahko izvozite vsako sled kot ločeno datoteko,\n"
+"ali pa če imate sled z oznakami, lahko izvozite novo datoteko za vsako oznako.\n"
 "\n"
-"Ta projekt nima več sledi niti poimenovane sledi, zato ne morete izvoziti več datotek naenkrat."
+"Ta projekt nima več sledi niti sledi z oznakami, zato ne morete izvoziti več datotek naenkrat."
 
-#: export/ExportMultiple.cpp:165
+#: export/ExportMultiple.cpp:167
 msgid "Can't export multiple files"
 msgstr "Ni mogoče izvoziti več datotek."
 
-#: export/ExportMultiple.cpp:200
+#: export/ExportMultiple.cpp:232
 msgid "Export format:"
 msgstr "Oblika zapisa za izvoz:"
 
-#: export/ExportMultiple.cpp:207
+#: export/ExportMultiple.cpp:237
 msgid "Options..."
 msgstr "Možnosti ..."
 
-#: export/ExportMultiple.cpp:210
+#: export/ExportMultiple.cpp:241
 msgid "Export location:"
 msgstr "Mesto za izvoz:"
 
-#: export/ExportMultiple.cpp:216
+#: export/ExportMultiple.cpp:245
 #: prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: export/ExportMultiple.cpp:217
+#: export/ExportMultiple.cpp:246
 msgid "Create"
 msgstr "Ustvari"
 
-#: export/ExportMultiple.cpp:224
+#: export/ExportMultiple.cpp:253
 msgid "Split files based on:"
 msgstr "Razdeli datoteke glede na:"
 
-#: export/ExportMultiple.cpp:234
+#: export/ExportMultiple.cpp:262
+#: export/ExportMultiple.cpp:264
 msgid "Labels"
-msgstr "Naslovi"
+msgstr "Oznake"
 
-#: export/ExportMultiple.cpp:239
+#: export/ExportMultiple.cpp:269
 msgid "Include audio before first label"
-msgstr "Vključi zvok pred prvim naslovom"
+msgstr "Vključi zvok pred prvo oznako"
 
-#: export/ExportMultiple.cpp:245
+#: export/ExportMultiple.cpp:275
 msgid "First file name:"
 msgstr "Ime prve datoteke:"
 
-#: export/ExportMultiple.cpp:258
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr "Ime prve datoteke"
+
+#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:290
 msgid "Tracks"
 msgstr "Sledi"
 
-#: export/ExportMultiple.cpp:265
+#: export/ExportMultiple.cpp:297
 msgid "Name files:"
-msgstr "Poimenujte datoteke:"
+msgstr "Poimenuj datoteke:"
 
-#: export/ExportMultiple.cpp:275
+#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:308
 msgid "Using Label/Track Name"
-msgstr "Uporaba naslova/imena sledi"
+msgstr "Z uporabo oznake/imena sledi"
 
-#: export/ExportMultiple.cpp:282
+#: export/ExportMultiple.cpp:314
+#: export/ExportMultiple.cpp:316
 msgid "Numbering consecutively"
 msgstr "Zaporedno številčenje"
 
-#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:322
 msgid "File name prefix:"
 msgstr "Predpona imena datoteke:"
 
-#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr "Predpona imena datoteke"
+
+#: export/ExportMultiple.cpp:341
 msgid "Overwrite existing files"
 msgstr "Prepiši obstoječe datoteke"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "I&zvozi"
-
-#: export/ExportMultiple.cpp:372
+#: export/ExportMultiple.cpp:424
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr "\"%s\" je bila uspešno ustvarjena."
 
-#: export/ExportMultiple.cpp:381
+#: export/ExportMultiple.cpp:433
 msgid "Choose a location to save the exported files"
 msgstr "Izberite lokacijo, kjer bodo shranjene izvožene datoteke."
 
-#: export/ExportMultiple.cpp:470
+#: export/ExportMultiple.cpp:539
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" ne obstaja.\n"
+msgstr "\"%s\" ne obstaja.\n"
 "\n"
 "Jo želite ustvariti?"
 
-#: export/ExportMultiple.cpp:568
-#: export/ExportMultiple.cpp:703
+#: export/ExportMultiple.cpp:637
+#: export/ExportMultiple.cpp:772
 msgid "Edit metadata"
 msgstr "Uredi metapodatke"
 
-#: export/ExportMultiple.cpp:595
-#: export/ExportMultiple.cpp:762
+#: export/ExportMultiple.cpp:664
+#: export/ExportMultiple.cpp:831
 #, c-format
 msgid "Successfully exported %d file(s)."
 msgstr "Uspešno izvoženih %d datotek."
 
-#: export/ExportMultiple.cpp:596
-#: export/ExportMultiple.cpp:763
+#: export/ExportMultiple.cpp:665
+#: export/ExportMultiple.cpp:832
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Po izvozu %d datotek(e) je Å¡lo nekaj narobe."
 
-#: export/ExportMultiple.cpp:825
+#: export/ExportMultiple.cpp:881
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"Oznaka %s ni veljavno ime za datoteko. Ne smete uporabiti:   %s\n"
+msgstr "Oznaka %s ni veljavno ime za datoteko. Ne smete uporabiti:   %s\n"
 "Uporabite ..."
 
 #: export/ExportOGG.cpp:64
@@ -5924,486 +7170,559 @@ msgstr "Določite možnosti Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Nastavitve izvoza Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Kakovost:"
-
-#: export/ExportOGG.cpp:155
+#: export/ExportOGG.cpp:157
 msgid "Ogg Vorbis Files"
 msgstr "Datoteke Ogg Vorbis"
 
-#: export/ExportOGG.cpp:254
+#: export/ExportOGG.cpp:257
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "Izvažanje izbora v Ogg Vorbis"
 
-#: export/ExportOGG.cpp:255
+#: export/ExportOGG.cpp:258
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Izvažanje celotnega projekta v Ogg Vorbis"
 
-#: export/ExportPCM.cpp:115
+#: export/ExportPCM.cpp:116
 msgid "Specify Uncompressed Options"
 msgstr "Določite možnosti za nestisnjene"
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:185
 msgid "Uncompressed Export Setup"
 msgstr "Nastavitve nestisnjenega izvoza"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Zapis:"
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:191
 msgid "Header:"
 msgstr "Glava:"
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:195
+#: import/ImportRaw.cpp:366
 msgid "Encoding:"
 msgstr "Kodiranje: "
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:200
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Vse kombinacije glav in kodiranja niso možne.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF in druge nestisnjene vrste"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr "Druge nestisnjene datoteke"
 
 #: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr "AIFF (Apple), podpisano, 16-bitni PCM"
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr "WAV (Microsoft), podpisano, 16-bitni PCM"
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr "GSM 6.10 WAV (mobilno)"
+
+#: export/ExportPCM.cpp:449
 msgid "Cannot export audio in this format."
 msgstr "Ne morem izvoziti posnetka v tem zapisu."
 
-#: export/ExportPCM.cpp:401
+#: export/ExportPCM.cpp:491
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr "Izvažanje izbranega zvoka kot %s"
 
-#: export/ExportPCM.cpp:403
+#: export/ExportPCM.cpp:493
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr "Izvažanje celotnega projekta kot %s"
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:437
+#: export/ExportPCM.cpp:531
 #, c-format
 msgid "Error (file may not have been written): %s"
 msgstr "Napaka (datoteka morda ni bila zapisana): %s"
 
-#: import/Import.cpp:155
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/Import.cpp:156
+#: import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "Datoteke MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr "Izberite toke za uvoz"
+
+#: import/Import.cpp:227
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "V tej različici Audacity podpora za %s ni prevedena."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr "\"%s\" \n"
+"je datoteka MIDI in ne zvočna datoteka. \n"
+"Audacity te vrste datotek ne more odpreti za predvajanje ali urejanje,\n"
+"lahko pa jo prikaže, če kliknete Datoteka > Uvozi > MIDI."
+
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:168
+#: import/Import.cpp:250
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je datoteka (sled) glasbenega CD.\n"
+msgstr "\"%s\" je datoteka (sled) glasbenega CD.\n"
 "Te vrste datotek Audacity neposredno ne odpira.\n"
 "Poskusite jo sneti v zvočni zapis, ki ga\n"
 "Audacity lahko odpre, kot sta npr. WAV ali AIFF."
 
-#: import/Import.cpp:174
+#: import/Import.cpp:256
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\" je datoteka seznama predvajanja datotek.\n"
+msgstr "\"%s\" je datoteka seznama predvajanja datotek.\n"
 "Audacity te datoteke ne more odpreti, ker vsebuje le povezave na druge datoteke.\n"
 "Morda jo lahko odprete v urejevalniku besedila in nato prenesete navedene dejanske zvočne datoteke."
 
-#: import/Import.cpp:179
+#: import/Import.cpp:261
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvočna datoteka Windows Media Audio. \n"
+msgstr "\"%s\" je zvočna datoteka Windows Media Audio. \n"
 "Audacity te vrste datotek ne more odpreti zaradi patentnih omejitev.\n"
 "Pretvoriti jo morate v podprti zvočni zapis, kot sta WAV in AIFF."
 
-#: import/Import.cpp:184
+#: import/Import.cpp:266
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je datoteka Advanced Audio Coding. \n"
+msgstr "\"%s\" je datoteka Advanced Audio Coding. \n"
 "Audacity ne more odpreti te vrste datotek.\n"
 "Pretvoriti jo morate v podprto vrsto zvočnih datotek, kot sta WAV in AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" je šifrirana zvočna datoteka, ponavadi iz spletne trgovine z glasbo. \n"
+msgstr "\"%s\" je šifrirana zvočna datoteka. \n"
+"Te so značilne za spletne trgovine z glasbo. \n"
 "Audacity ne more odpreti te vrste datotek zaradi Å¡ifriranja.\n"
 "Poskusite datoteko posneti v Audacity ali jo zapeči na zvočni CD,\n"
-"sled CD prenesti v podprto vrsto zvočne datoteke, kot sta WAV in AIFF."
+"sled CD pa nato prenesti v podprto vrsto zvočnih datotek, kot sta WAV in AIFF."
 
-#: import/Import.cpp:194
+#: import/Import.cpp:276
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je medijska datoteka RealPlayer. \n"
+msgstr "\"%s\" je medijska datoteka RealPlayer. \n"
 "Audacity ne more odpreti tega licenčnega zapisa.\n"
 "Najprej ga morate pretvoriti v enega od podprtih zvočnih zapisov, kot sta WAV in AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" je datoteka MIDI in ne zvočna datoteka. \n"
-"Audacity te vrste datotek ne more odpreti za predvajanje ali urejanje,\n"
-"lahko pa jo prikaže, če kliknete Datoteka > Uvozi > MIDI."
-
-#: import/Import.cpp:206
+#: import/Import.cpp:282
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" je datoteka z opombami in ne zvočna datoteka. \n"
+msgstr "\"%s\" je datoteka z opombami in ne zvočna datoteka. \n"
 "Audacity ne more odpreti te vrste datotek.\n"
 "Pretvoriti jo morate v podprto vrsto zvočnih datotek, kot sta WAV in AIFF \n"
 "in jo nato uvozite, ali pa jo posnamite z Audacity."
 
-#: import/Import.cpp:212
+#: import/Import.cpp:288
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvočna datoteka Musepack. \n"
+msgstr "\"%s\" je zvočna datoteka Musepack. \n"
 "Audacity te vrste datotek ne more odpreti.\n"
 "ÄŒe menite, da je to datoteka mp3, jo preimenujte in dodajte\n"
 "končnico \".mp3\" ter ponovno poskusite uvoziti. Sicer jo morate pretvoriti\n"
 "v podprti zvočni zapis, kot sta WAV in AIFF."
 
-#: import/Import.cpp:218
+#: import/Import.cpp:294
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvočna datoteka Wavpack. \n"
+msgstr "\"%s\" je zvočna datoteka Wavpack. \n"
 "Audacity ne more odpreti te vrste datotek.\n"
 "Pretvoriti jo morate v podprto vrsto zvočnih datotek, kot sta WAV in AIFF."
 
-#: import/Import.cpp:224
+#: import/Import.cpp:300
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvočna datoteka Dolby Digital. \n"
+msgstr "\"%s\" je zvočna datoteka Dolby Digital. \n"
 "Audacity ne more odpreti te vrste datotek.\n"
 "Pretvoriti jo morate v podprto vrsto zvočnih datotek, kot sta WAV in AIFF."
 
-#: import/Import.cpp:230
+#: import/Import.cpp:306
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" je zvočna datoteka Ogg Speex. \n"
+msgstr "\"%s\" je zvočna datoteka Ogg Speex. \n"
 "Audacity ne more odpreti te vrste datotek.\n"
 "Pretvoriti jo morate v podprto vrsto zvočnih datotek, kot sta WAV in AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
-msgstr ""
-"Audacity je moral uganiti vrsto datoteke.\n"
-"Zvoki bodo morda napačni.\n"
-"\n"
-"ÄŒe se je to zgodilo, poskusite preimenovati\n"
-"datoteko, da bo imela ustrezno končnico."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr "\"%s\" je video datoteka. \n"
+"Audacity trenutno ne more odpreti te vrste datotek.\n"
+"Zvok morate izvoziti v podprto vrsto zvočnih datotek, kot sta WAV in AIFF."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr "Vrsta datoteke '%s' je Audacity neznana.\n"
+"ÄŒe ni stisnjena, jo poskusite uvoziti z \"Uvozi surove podatke\"."
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr "Vrsta datoteke '%s' je Audacity znana,\n"
+"vendar je ni bilo mogoče uvoziti."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "Z FFmpeg kompatibilne datoteke"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Ta vrsta datoteke je neznana.\n"
-"ÄŒe ni stisnjena, jo poskusite uvoziti z \"Uvozi surovo\"."
 
-#: import/ImportFLAC.cpp:35
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "Datoteke FLAC"
 
-#: import/ImportLOF.cpp:92
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
 msgstr "Seznam datotek v osnovnem zapisu besedila"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:318
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
 msgstr "Napaka LibSampleRate: %s"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:320
-#: import/ImportLOF.cpp:341
-#: import/ImportLOF.cpp:415
-#: import/ImportLOF.cpp:435
+#: import/ImportLOF.cpp:316
+#: import/ImportLOF.cpp:337
+#: import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
 msgstr "Napaka LOF"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:339
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
 msgstr "Nepravilna dolžina v datoteki LOF."
 
-#: import/ImportLOF.cpp:414
+#: import/ImportLOF.cpp:417
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
 msgstr "MIDI sledi ne morete zamakniti posamično, le zvočne datoteke."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:434
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
 msgstr "Neveljaven zamik sledi v datoteki LOF."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Napaka pri branju datoteke Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": ime datoteke je prekratko."
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Napaka pri branju datoteke MIDI."
+#: import/ImportMIDI.cpp:31
+#: import/ImportMIDI.cpp:39
+#: import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "Napaka pri odpiranju datoteke "
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Datoteke MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": nepravilna vrsta datoteke."
 
-#: import/ImportOGG.cpp:36
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
 msgstr "Datoteke Ogg Vorbis"
 
-#: import/ImportOGG.cpp:142
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
 msgstr "Napaka pri branju"
 
-#: import/ImportOGG.cpp:145
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "Neveljavna datoteka Ogg Vorbis"
 
-#: import/ImportOGG.cpp:148
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
 msgstr "Neskladnost različice Vorbis"
 
-#: import/ImportOGG.cpp:151
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
-msgstr "Nepravilna glava Vorbis bitstream"
+msgstr "Nepravilna glava bitnega toka Vorbis"
 
-#: import/ImportOGG.cpp:154
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
 msgstr "Notranja logična napaka"
 
-#: import/ImportPCM.cpp:396
+#: import/ImportPCM.cpp:54
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF in druge nestisnjene vrste"
+
+#: import/ImportPlugin.h:142
+#: import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Uvoz datoteke %s ..."
+msgid "Importing %s"
+msgstr "Uvažanje datoteke %s"
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Datoteke QuickTime"
 
-#: import/ImportRaw.cpp:278
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr "Uvozi surove podatke"
+
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Uvozi surove podatke"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:337
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "Brez endianstva"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:340
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "little-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:343
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "veliki-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:346
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "Privzeto endianstvo"
 
-#: import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
 msgstr "1 kanal (Mono)"
 
-#: import/ImportRaw.cpp:371
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
 msgstr "2 kanala (Stereo)"
 
-#: import/ImportRaw.cpp:373
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
 msgstr "%d kanalov"
 
-#: import/ImportRaw.cpp:386
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr "Zaporedje bajtov:"
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "Kanali:"
+
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
 msgstr "Začetni odmik:"
 
-#: import/ImportRaw.cpp:397
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
 msgstr "Količina za uvoz:"
 
-#: import/ImportRaw.cpp:408
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
 msgstr "Mera vzorčenja:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Uvozi"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr "Uvoz dokončan. Izračun signalne oblike"
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr "Dekodiranje signalne oblike"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr "%s dokončano %2.0f%%.  Kliknite, če želite spremeniti žariščno točko opravila."
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44
+#: prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "Zvočni V/I"
 
-#: prefs/AudioIOPrefs.cpp:100
+#: prefs/AudioIOPrefs.cpp:102
+#: prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (mono)"
 
-#: prefs/AudioIOPrefs.cpp:101
+#: prefs/AudioIOPrefs.cpp:103
+#: prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (stereo)"
 
-#: prefs/AudioIOPrefs.cpp:115
+#: prefs/AudioIOPrefs.cpp:117
+#: prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "Predvajanje"
 
-#: prefs/AudioIOPrefs.cpp:119
-#: prefs/AudioIOPrefs.cpp:137
+#: prefs/AudioIOPrefs.cpp:121
+#: prefs/AudioIOPrefs.cpp:139
+#: prefs/MidiIOPrefs.cpp:118
+#: prefs/MidiIOPrefs.cpp:136
 #: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
 msgstr "Naprava"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:124
+#: prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
 msgstr "Uporablja:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:125
+#: prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
 msgstr "Portaudio razl"
 
-#: prefs/AudioIOPrefs.cpp:133
+#: prefs/AudioIOPrefs.cpp:135
+#: prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "Snemanje"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:141
+#: prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
 msgstr "Kanali"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:147
+#: prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr "Predvajaj skozi"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Predvajaj &druge posnetke med snemanjem novega"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "Prekrivaj: Predvajaj &druge posnetke med snemanjem novega"
 
-#: prefs/AudioIOPrefs.cpp:150
+#: prefs/AudioIOPrefs.cpp:152
 msgid "&Hardware Playthrough: Play new track while recording it"
 msgstr "&Strojno predvajanje skozi: Predvajaj nov posnetek med njegovim snemanjem"
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:154
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "&Programsko predvajanje skozi: Predvajaj nov posnetek med njegovim snemanjem"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "&Programsko predvajanje skozi: Predvajaj nov posnetek med njegovim snemanjem (izključite pri \"stereo mešanju\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "&Programsko predvajanje skozi: Predvajaj nov posnetek med njegovim snemanjem ali preverjanjem"
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr "(ne označite, če snemate \"stereo miks\")"
 
-#: prefs/AudioIOPrefs.cpp:162
+#: prefs/AudioIOPrefs.cpp:168
+#: prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr "Predposlušanje učinkov"
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:171
 msgid "Length of preview:"
 msgstr "Dolžina predposlušanja:"
 
-#: prefs/AudioIOPrefs.cpp:170
+#: prefs/AudioIOPrefs.cpp:176
+#: prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr "Predposlušanje izrezanega"
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:179
 msgid "Preview before cut region:"
 msgstr "Predposlušaj pred izrezanim območjem:"
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:181
 msgid "Preview after cut region:"
 msgstr "Predposlušaj po izrezanem območju:"
 
-#: prefs/AudioIOPrefs.cpp:183
+#: prefs/AudioIOPrefs.cpp:189
+#: prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr "Latenca"
 
-#: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Zvok v medpomnilnik\n"
+msgstr "Zvok v medpomnilnik\n"
 "(večje = več latence)"
 
-#: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Popravek latence:\n"
+msgstr "Popravek latence:\n"
 "(negativno = nazaj)"
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:203
 msgid "Seek Time when playing"
 msgstr "Poišči čas med predvajanjem"
 
-#: prefs/AudioIOPrefs.cpp:200
+#: prefs/AudioIOPrefs.cpp:206
+#: prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr "Krajše obdobje:"
 
-#: prefs/AudioIOPrefs.cpp:202
+#: prefs/AudioIOPrefs.cpp:208
+#: prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr "Daljše obdobje:"
 
@@ -6418,18 +7737,17 @@ msgid "Behaviors"
 msgstr "Vedenja"
 
 #: prefs/BatchPrefs.cpp:80
-#: prefs/GUIPrefs.cpp:129
 msgid "&Don't apply effects in batch mode"
 msgstr "&Ne uporabi učinkov v paketnem načinu"
 
 #: prefs/BatchPrefs.cpp:83
 #: prefs/GUIPrefs.cpp:132
 msgid "Cl&eanSpeech Mode (Customized GUI)"
-msgstr "Način Clean&Speech (prilagojen vmesnik)"
+msgstr "Način Po&čistiGovor (prilagojen vmesnik)"
 
 #: prefs/DirectoriesPrefs.cpp:55
 #: prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:279
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Mape"
 
@@ -6466,8 +7784,8 @@ msgid "Audio cache"
 msgstr "Zvočni medpomnilnik"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Obdrži posnete podatke v pomnilniku do zaključka snemanja"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr "Predvajaj in/ali snemaj z rabo pomnilnika RAM (uporabno pri počasnih pogonih, vendar lahko povzroči sesutje pri dolgih datotekah ali posnetkih)"
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6491,84 +7809,98 @@ msgstr "V mapi %s zapisovanje ni dovoljeno"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Spremembe v začasni mapi ne bodo delovale do naslednjega zagona Audacityja."
 
-#: prefs/FileFormatPrefs.cpp:48
-#: prefs/FileFormatPrefs.cpp:49
+#: prefs/FileFormatPrefs.cpp:53
+#: prefs/FileFormatPrefs.cpp:54
 msgid "Import / Export"
 msgstr "Uvozi / Izvozi"
 
-#: prefs/FileFormatPrefs.cpp:77
+#: prefs/FileFormatPrefs.cpp:84
 msgid "MP3 Export Library"
 msgstr "Knjižnica za izvoz MP3"
 
-#: prefs/FileFormatPrefs.cpp:80
+#: prefs/FileFormatPrefs.cpp:87
 msgid "MP3 Library Version:"
-msgstr "MP3 verzija knjižnice:"
+msgstr "Različica knjižnice MP3:"
 
-#: prefs/FileFormatPrefs.cpp:86
+#: prefs/FileFormatPrefs.cpp:93
 msgid "MP3 Library:"
 msgstr "Knjižnica MP3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Najdi knjižnico"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:91
+#: prefs/FileFormatPrefs.cpp:98
 msgid "LAME MP3 Library:"
 msgstr "Knjižnica LAME MP3:"
 
-#: prefs/FileFormatPrefs.cpp:94
+#: prefs/FileFormatPrefs.cpp:101
+#: prefs/FileFormatPrefs.cpp:125
 msgid "&Download"
 msgstr "&Prenesi"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "Opomba: Možnosti kakovosti izvoza lahko izberete s klikom gumba Možnosti v pogovornem oknu Izvozi."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "Knjižnica za uvoz/izvoz FFmpeg"
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "Različica knjižnice FFmpeg:"
+
+#: prefs/FileFormatPrefs.cpp:118
+#: prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "Knjižnica FFmpeg:"
 
-#: prefs/FileFormatPrefs.cpp:100
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Opomba: Možnosti kakovosti izvoza lahko izberete s klikom gumba Možnosti v pogovornem oknu Izvozi.\n"
+
+#: prefs/FileFormatPrefs.cpp:137
 msgid "When importing audio files"
 msgstr "Pri uvozu zvočnih datotek"
 
-#: prefs/FileFormatPrefs.cpp:103
+#: prefs/FileFormatPrefs.cpp:140
 msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr "&Naredi kopijo nestisnjenih zvočnih datotek pred urejanjem (varneje)"
 
-#: prefs/FileFormatPrefs.cpp:104
+#: prefs/FileFormatPrefs.cpp:141
 msgid "&Read uncompressed audio files directly from the original (faster)"
 msgstr "&Beri nestisnjene zvočne datoteke neposredno iz izvirnika (hitreje)"
 
-#: prefs/FileFormatPrefs.cpp:106
+#: prefs/FileFormatPrefs.cpp:143
 msgid "&Normalize all tracks in project"
 msgstr "&Normaliziraj vse sledi projekta"
 
-#: prefs/FileFormatPrefs.cpp:111
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
 msgstr "Pri shranjevanju projekta, ki je odvisen od drugih zvočnih datotek"
 
-#: prefs/FileFormatPrefs.cpp:114
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
 msgstr "Vedno &kopiraj vse zvoke v projekt (najvarneje)"
 
-#: prefs/FileFormatPrefs.cpp:115
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
 msgstr "&Ne kopiraj nobenega zvoka"
 
-#: prefs/FileFormatPrefs.cpp:116
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
 msgstr "Vprašaj &uporabnika"
 
-#: prefs/FileFormatPrefs.cpp:120
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
 msgstr "Pri izvozu sledi v zvočno datoteko"
 
-#: prefs/FileFormatPrefs.cpp:123
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
 msgstr "Vedno &mešaj vse sledi na stereo ali mono kanal(a)."
 
-#: prefs/FileFormatPrefs.cpp:124
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr "&Uporabi mešanje po meri (npr. za izvoz večkanalne datoteke 5.1)"
 
-#: prefs/FileFormatPrefs.cpp:126
+#: prefs/FileFormatPrefs.cpp:163
 msgid "S&how Metadata Editor prior to export step"
 msgstr "Poka&ži urejevalnik metapodatkov pred korakom izvoza"
 
@@ -6594,23 +7926,23 @@ msgid "&Update display while playing"
 msgstr "&Posodobi zaslon med predvajanjem"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
-msgstr "Zaprtje zadnjega okna povsem zapre Audacity"
+msgid "Cl&osing last window quits Audacity"
+msgstr "Za&prtje zadnjega okna povsem zapre Audacity"
 
 #: prefs/GUIPrefs.cpp:98
 msgid "Enable &dragging of left and right selection edges"
 msgstr "Omogoči &vleko levega in desnega roba izbora"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&Ergonomski razpored gumbov zvočnega V/I"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr "Er&gonomski razpored gumbov zvočnega V/I"
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Samodejno &umeri sledi na navpično povečavo"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "\"Premakni pozornost po sledeh\" &ciklično kroži po sledeh"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6638,20 +7970,24 @@ msgid "Show warnings about &temp files"
 msgstr "Pokaži opozorila o &začasnih datotekah"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr "&Vprašaj za shranjevanje, tudi če je projekt prazen"
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
-msgstr "Pokaži pozdravno sporočilo ob zagonu programa"
+msgid "Show &Welcome Message at program start up"
+msgstr "Poka&ži pozdravno sporočilo ob zagonu programa"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Načini"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr "Ne &uporabi učinkov v paketnem načinu"
+
 #: prefs/GUIPrefs.cpp:138
-msgid "Display range minimum for 'Waveform (dB)' view"
-msgstr "Prikaži najmanjši obseg, potreben za pogled 'Oblika signala (dB)'"
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr "Prikaži najmanjši obseg: merilniki in 'Oblika signala (dB)'"
 
 #: prefs/GUIPrefs.cpp:141
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6662,54 +7998,34 @@ msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (obseg PCM za 8-bitno vzorčenje)"
 
 #: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr "-60 dB (obseg PCM za 10-bitno vzorčenje)"
+
+#: prefs/GUIPrefs.cpp:144
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (obseg PCM za 16-bitno vzorčenje)"
 
-#: prefs/GUIPrefs.cpp:144
+#: prefs/GUIPrefs.cpp:145
 msgid "-120 dB (approximate limit of human hearing)"
 msgstr "-120 dB (približna meja človeškega sluha)"
 
-#: prefs/GUIPrefs.cpp:145
+#: prefs/GUIPrefs.cpp:146
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (meja PCM za 24-bitno vzorčenje)"
 
-#: prefs/GUIPrefs.cpp:150
+#: prefs/GUIPrefs.cpp:151
 msgid "Default View Mode"
 msgstr "Privzeta vrsta pogleda"
 
-#: prefs/GUIPrefs.cpp:153
-msgid "WaveformDisplay"
-msgstr "PrikažiOblikoSignala"
-
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDBDisplay"
-msgstr "PrikažiOblikoSignalaDB"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "SpectrumDisplay"
-msgstr "PrikažiSpekter"
-
-#: prefs/GUIPrefs.cpp:157
-msgid "SpectrumLogDisplay"
-msgstr "PrikažiLogSpekter"
-
-#: prefs/GUIPrefs.cpp:159
-msgid "PitchDisplay"
-msgstr "PrikažiVišinoTona"
-
-#: prefs/GUIPrefs.cpp:165
+#: prefs/GUIPrefs.cpp:164
 msgid "Other interface choices"
 msgstr "Druge izbire vmesnika"
 
 #: prefs/GUIPrefs.cpp:167
-msgid "Language:"
-msgstr "Jezik:"
-
-#: prefs/GUIPrefs.cpp:168
 msgid "Help:"
 msgstr "Pomoč:"
 
-#: prefs/GUIPrefs.cpp:169
+#: prefs/GUIPrefs.cpp:168
 msgid "Solo Button:"
 msgstr "Gumb Solo:"
 
@@ -6718,6 +8034,14 @@ msgstr "Gumb Solo:"
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Tipke za bližnjice"
@@ -6743,38 +8067,68 @@ msgstr "Kombinacija tipk"
 msgid "Export Keyboard Shortcuts As:"
 msgstr "Izvozi bližnjice kot:"
 
-#: prefs/KeyConfigPrefs.cpp:181
+#: prefs/KeyConfigPrefs.cpp:183
 msgid "Error saving keyboard shortcuts"
 msgstr "Napaka pri shranjevanju bližnjic"
 
-#: prefs/KeyConfigPrefs.cpp:196
+#: prefs/KeyConfigPrefs.cpp:198
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Izberite datoteko XML z bližnjicami Audacity ..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Datoteke XML (*.xml)|*.xml|Vse datoteke (*.*)|*.*"
-
-#: prefs/KeyConfigPrefs.cpp:213
+#: prefs/KeyConfigPrefs.cpp:215
 msgid "Error loading keyboard shortcuts"
 msgstr "Napaka pri nalaganju bližnjic"
 
-#: prefs/KeyConfigPrefs.cpp:241
+#: prefs/KeyConfigPrefs.cpp:243
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Tipka za bližnjico '%s' je že dodeljena k:\n"
+msgstr "Tipka za bližnjico '%s' je že dodeljena k:\n"
 "\n"
 "'%s'"
 
-#: prefs/KeyConfigPrefs.cpp:367
+#: prefs/KeyConfigPrefs.cpp:369
 #: toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "Razveljavi"
 
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "Predvajaj &druge posnetke med snemanjem novega"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "&Strojno predvajanje skozi (predvajaj nov posnetek med njegovim snemanjem)"
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "&Programsko predvajanje skozi (predvajaj nov posnetek med njegovim snemanjem)"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr "Predvajaj pred izrezanim območjem:"
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr "Predvajaj po izrezanem območju:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "Zvok v medpomnilnik:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "Popravek latence:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr "Poišči čas"
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr "Predvajaj pri predposlušanju:"
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7011,7 +8365,7 @@ msgstr "Ctrl-rotacija koleščka"
 msgid "Zoom in or out"
 msgstr "Povečaj ali pomanjšaj"
 
-#: prefs/PrefsDialog.cpp:89
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
 msgstr "Nastavitve Audacity"
 
@@ -7075,24 +8429,24 @@ msgstr "V realnem času:"
 msgid "High-quality:"
 msgstr "Visokokakovostno:"
 
-#: prefs/SmartRecordPrefs.cpp:54
-#: prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37
+#: prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
 msgstr "Pametno snemanje"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Začasno ustavi snemanje ob tišini"
+#: prefs/SmartRecordPrefs.cpp:64
+#: prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr "Z zvokom aktivirano snemanje"
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Raven tišine (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr "Raven zvoka za aktivacijo (dB):"
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
-msgstr "Spektogrami"
+msgstr "Spektrogrami"
 
 #: prefs/SpectrumPrefs.cpp:91
 msgid "FFT Size"
@@ -7223,8 +8577,7 @@ msgid "Info"
 msgstr "Podatki"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7237,8 +8590,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"Teme so v eksperimentalni fazi.\n"
+msgstr "Teme so v eksperimentalni fazi.\n"
 "\n"
 "Da jih preizkusite, kliknite \"Shrani medpomnilnik tem\",\n"
 "nato poiščite in spremenite slike in barve v \n"
@@ -7253,80 +8605,74 @@ msgstr ""
 "prikazuje tudi druge ikone.]\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Audacity je preveden z dodatnim gumbom, \n"
+msgstr "Audacity je preveden z dodatnim gumbom, \n"
 "'Output Sourcery'.  S tem boste shranili C-različico \n"
 "slikovnega medpomnilnika, ki ga ni mogoče privzeto prevesti.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Če je vključen 'Naloži medpomnilnik tem ob zagonu', bo \n"
+msgstr "Če je vključen 'Naloži medpomnilnik tem ob zagonu', bo \n"
 "medpomnilnik tem naložen, ko zaženete program.\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Shranjevanje in nalaganje posamezne datoteke teme \n"
+msgstr "Shranjevanje in nalaganje posamezne datoteke teme \n"
 "uporablja ločeno datoteko za vsako sliko, a je sicer \n"
 "zamišljeno na enak način.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Nadzor"
-
-#: toolbars/ControlToolBar.cpp:174
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Prekinitev"
 
-#: toolbars/ControlToolBar.cpp:177
+#: toolbars/ControlToolBar.cpp:178
 msgid "Play"
 msgstr "Predvajaj"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
 msgstr "Predvajaj (Shift za predvajanje v zanki)"
 
-#: toolbars/ControlToolBar.cpp:182
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "Ustavi"
 
-#: toolbars/ControlToolBar.cpp:185
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
-msgstr "Skoci na začetek"
+msgstr "Skoči na začetek"
 
-#: toolbars/ControlToolBar.cpp:188
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
 msgstr "Skoči na konec"
 
-#: toolbars/ControlToolBar.cpp:194
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "Snemaj (Shift za Snemaj kot dodatek)"
+
+#: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Počisti govor"
 
-#: toolbars/ControlToolBar.cpp:530
-#: toolbars/ControlToolBar.cpp:844
+#: toolbars/ControlToolBar.cpp:540
+#: toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr "Napaka pri odpiranju zvočne naprave."
 
-#: toolbars/ControlToolBar.cpp:696
+#: toolbars/ControlToolBar.cpp:706
 msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
 msgstr "Snemanje v načinu PočistiGovor ni možno, če je sled (ali pa več kot en projekt) že odprta."
 
-#: toolbars/ControlToolBar.cpp:697
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "Snemanje ni dovoljeno"
 
@@ -7349,30 +8695,34 @@ msgid "Silence selection"
 msgstr "Izbor tišine"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr "Poveži sledi"
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
 msgstr "Povečaj"
 
-#: toolbars/EditToolBar.cpp:152
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "Pomanjšaj"
 
-#: toolbars/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
 msgstr "Preklop povečave"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr "Umeri izbor"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "Prilagodi označeno oknu"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr "Umeri projekt"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
 msgstr "Prilagodi celoten projekt v okno"
 
@@ -7404,76 +8754,74 @@ msgstr "Merilnik nivoja izhoda"
 msgid "Input level meter - click to monitor input"
 msgstr "Merilnik vhodne ravni - kliknite za nadzor vhoda"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mešalec"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Jakost izhoda"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
-msgstr "Drsnik-Izhod"
+msgid "Slider Output"
+msgstr "Drsnik izhoda"
 
 #: toolbars/MixerToolBar.cpp:101
+#: widgets/Meter.cpp:874
 msgid "Input Volume"
 msgstr "Vhodna jakost"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
-msgstr "Drsnik-Vhod"
+msgid "Slider Input"
+msgstr "Drsnik vhoda"
 
 #: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
 msgstr "Vhodni vir"
 
-#: toolbars/SelectionBar.cpp:80
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr "Izbor"
 
-#: toolbars/SelectionBar.cpp:128
-#: toolbars/SelectionBar.cpp:185
+#: toolbars/SelectionBar.cpp:135
+#: toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
 msgstr "Frekvenca projekta (Hz):"
 
-#: toolbars/SelectionBar.cpp:142
-#: toolbars/SelectionBar.cpp:247
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
 msgstr "Začetek izbora:"
 
-#: toolbars/SelectionBar.cpp:155
-#: toolbars/SelectionBar.cpp:253
+#: toolbars/SelectionBar.cpp:163
+#: toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
 msgid "Length"
 msgstr "Dolžina"
 
-#: toolbars/SelectionBar.cpp:165
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
 msgstr "skrito"
 
-#: toolbars/SelectionBar.cpp:175
-#: toolbars/SelectionBar.cpp:264
+#: toolbars/SelectionBar.cpp:184
+#: toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
 msgstr "Položaj zvoka:"
 
-#: toolbars/SelectionBar.cpp:225
-#: toolbars/SelectionBar.cpp:230
+#: toolbars/SelectionBar.cpp:236
+#: toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr "Skoči na ..."
 
-#: toolbars/SelectionBar.cpp:252
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
 msgstr "Izbor"
 
-#: toolbars/SelectionBar.cpp:317
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
 msgstr "Dolžina izbora"
 
-#: toolbars/SelectionBar.cpp:325
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
 msgstr "Konec izbora"
 
-#: toolbars/ToolBar.cpp:97
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr "Orodna vrstica Audacity - %s"
@@ -7672,46 +9020,45 @@ msgstr "Spremembe smeri (visoki prag)"
 msgid "Key type"
 msgstr "Vrsta tipke"
 
-#: widgets/AButton.cpp:302
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr " (onemogočeno)"
 
-#: widgets/AButton.cpp:452
+#: widgets/AButton.cpp:461
 msgid "Press"
 msgstr "Pritisnite"
 
-#: widgets/AButton.cpp:531
+#: widgets/AButton.cpp:540
 msgid "Button"
 msgstr "Gumb"
 
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: widgets/ASlider.cpp:604
-#: widgets/Meter.cpp:211
+#: widgets/ASlider.cpp:612
+#: widgets/Meter.cpp:248
 msgid "L"
 msgstr "L"
 
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: widgets/ASlider.cpp:607
-#: widgets/Meter.cpp:213
+#: widgets/ASlider.cpp:615
+#: widgets/Meter.cpp:250
 msgid "R"
 msgstr "D"
 
-#: widgets/ASlider.cpp:670
+#: widgets/ASlider.cpp:678
 msgid "Center"
 msgstr "Sredinski"
 
-#: widgets/ASlider.cpp:674
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "Levo"
 
-#: widgets/ASlider.cpp:677
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "Desno"
 
-#: widgets/ErrorDialog.cpp:78
-#: widgets/ErrorDialog.cpp:102
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
 msgstr "Pomoč"
 
@@ -7731,7 +9078,7 @@ msgstr "Naprej"
 msgid "Backwards"
 msgstr "Nazaj"
 
-#: widgets/ErrorDialog.cpp:249
+#: widgets/ErrorDialog.cpp:255
 msgid "Help on the Internet"
 msgstr "Pomoč na spletu"
 
@@ -7754,51 +9101,53 @@ msgstr "Vrstica %d"
 msgid "Empty"
 msgstr "Prazno"
 
-#: widgets/Meter.cpp:346
+#: widgets/Meter.cpp:396
 msgid "Enable Meter"
 msgstr "Vključi merilnik"
 
-#: widgets/Meter.cpp:348
+#: widgets/Meter.cpp:398
 msgid "Disable Meter"
 msgstr "Izključi merilnik"
 
-#: widgets/Meter.cpp:351
+#: widgets/Meter.cpp:401
 msgid "Stop Monitoring"
 msgstr "Ustavi opazovanje"
 
-#: widgets/Meter.cpp:353
+#: widgets/Meter.cpp:403
 msgid "Start Monitoring"
 msgstr "Zaženi opazovanje"
 
-#: widgets/Meter.cpp:357
+#: widgets/Meter.cpp:407
 msgid "Horizontal Stereo"
 msgstr "Vodoravni stereo"
 
-#: widgets/Meter.cpp:358
+#: widgets/Meter.cpp:408
 msgid "Vertical Stereo"
 msgstr "Navpični stereo"
 
-#: widgets/Meter.cpp:375
+#: widgets/Meter.cpp:425
 msgid "Preferences..."
 msgstr "Nastavitve ..."
 
-#: widgets/Meter.cpp:1065
-msgid ""
-"This determines how often the meter is refreshed.\n"
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr "Jakost mešanega"
+
+#: widgets/Meter.cpp:1145
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"S tem določite, kako pogosto je osvežen merilnik.\n"
+msgstr "S tem določite, kako pogosto je osvežen merilnik.\n"
 "Če imate počasnejši računalnik, je bolje izbrati\n"
 "manjšo frekvenco osveževanja (30 na sekundo ali manj),\n"
 "tako da kakovost zvoka ni ogrožena zaradi prikaza merilnika."
 
-#: widgets/Meter.cpp:1066
+#: widgets/Meter.cpp:1146
 msgid "Meter refresh rate per second [1-100]: "
 msgstr "Hitrost osveževanja merilnika na sekundo [1-100]: "
 
-#: widgets/Meter.cpp:1067
+#: widgets/Meter.cpp:1147
 msgid "Meter Preferences"
 msgstr "Nastavitve merilnika"
 
@@ -7806,8 +9155,24 @@ msgstr "Nastavitve merilnika"
 msgid " Please select an action "
 msgstr " Prosimo, izberite dejanje"
 
-#: widgets/Ruler.cpp:1463
-#: widgets/Ruler.cpp:1464
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "Prosimo, izberite dejanje"
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr "Pretekli čas:"
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr "Preostali čas:"
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: widgets/Ruler.cpp:1445
+#: widgets/Ruler.cpp:1446
 msgid "Vertical Ruler"
 msgstr "Navpično ravnilo"
 
@@ -7818,12 +9183,6 @@ msgstr "Navpično ravnilo"
 msgid "01000,01000 seconds"
 msgstr "sekunde 01000,01000"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "uu:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7849,6 +9208,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dni 024 u 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8034,91 +9408,11 @@ msgstr "Napaka pri odpiranju datoteke: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Napaka: %s v %d. vrstici"
+msgid "Error: %hs at line %lu"
+msgstr "Napaka: %hs v %lu. vrstici"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
 msgstr "Napaka pri odpiranju datoteke: \"%s\""
 
-#~ msgid ""
-#~ "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?"
-#~ msgstr ""
-#~ "Odločili ste se, da ne boste obnovili nobenega projekta. Teh projektov "
-#~ "kasneje ne boste mogli obnovi, če si premislite. Resnično želite "
-#~ "nadaljevati brez obnovitve?"
-#~ msgid "Really not recover projects?"
-#~ msgstr "Resnično ne želite obnoviti projektov?"
-#~ msgid "Export and Saving"
-#~ msgstr "Izvoz in shranjevanje"
-#~ msgid ""
-#~ "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]].<br><br>"
-#~ msgstr ""
-#~ "Če želite zapeči svoje delo na zvočni CD za navadne predvajalnike CD, "
-#~ "morate posnetek najprej [[export|izvoziti kot WAV ali AIFF]], nato pa to "
-#~ "datoteko zapecite na CD s programom za peko CD-jev, kot je iTunes - za "
-#~ "več pomoči si oglejte [[wiki:How to burn CDs|Kako pečemo CD-je]].<br><br>"
-#~ msgid "Specify Time"
-#~ msgstr "Določite čas"
-#~ msgid "Draw currently only works with linear-view waveforms."
-#~ msgstr ""
-#~ "Risanje trenutno deluje le z linearno prikazanimi signalnimi oblikami."
-#~ msgid "DTMF duration:"
-#~ msgstr "Trajanje DTMF:"
-#~ msgid "Noise duration"
-#~ msgstr "Trajanje Å¡uma"
-#~ msgid "Edit the metadata for the FLAC file"
-#~ msgstr "Uredi metapodatke za datoteko FLAC"
-#~ msgid "Edit the ID3 tags for the MP2 file"
-#~ msgstr "Spremeni oznake ID3 za datoteko MP2"
-#~ msgid "0, 220-260 kbps (Best Quality)"
-#~ msgstr "0, 220-260 k/ps (najboljša kakovost)"
-#~ msgid "1, 200-250 kbps"
-#~ msgstr "1, 200-250 kb/s"
-#~ msgid "2, 170-210 kbps"
-#~ msgstr "2, 170-210 kb/s"
-#~ msgid "3, 155-195 kbps"
-#~ msgstr "3, 155-195 kb/s"
-#~ msgid "4, 145-185 kbps"
-#~ msgstr "4, 145-185 kb/s"
-#~ msgid "5, 110-150 kbps"
-#~ msgstr "5, 110-150 kb/s"
-#~ msgid "6, 95-135 kbps"
-#~ msgstr "6, 95-135 kb/s"
-#~ msgid "7, 80-120 kbps"
-#~ msgstr "7, 80-120 kb/s"
-#~ msgid "8, 65-105 kbps"
-#~ msgstr "8, 65-105 kb/s"
-#~ msgid "Insane, 320 kbps"
-#~ msgstr "noro, 320 kb/s"
-#~ msgid "Extreme, 220-260 kbps"
-#~ msgstr "izjemno, 220-260 kb/s"
-#~ msgid "Standard, 170-210 kbps"
-#~ msgstr "navadno, 170-210 kb/s"
-#~ msgid "Medium, 145-185 kbps"
-#~ msgstr "srednje, 145-185 kb/s"
-#~ msgid "Edit the ID3 tags for the MP3 file"
-#~ msgstr "Spremeni ID3 zapis v tej MP3 datoteki"
-#~ msgid "Edit the metadata"
-#~ msgstr "Uredi metapodatke"
-#~ msgid "Edit the metadata for the OGG file"
-#~ msgstr "Uredi metapodatke za datoteko OGG"
-#~ msgid "Specify PCM Options"
-#~ msgstr "Določite možnosti PCM"
-#~ msgid "Edit the metadata for the uncompressed file"
-#~ msgstr "Uredi metapodatke za nestisnjeno datoteko"
-#~ msgid "Audio Files"
-#~ msgstr "Zvočne datoteke"
-#~ msgid "&Download Free Copy of LAME"
-#~ msgstr "&Prenesi brezplačno kopijo LAME"
-#~ msgid "Language"
-#~ msgstr "Jezik"
-#~ msgid "Minimum of dB mode display range"
-#~ msgstr "Najmanjši dB način prikazanega območja"
-
diff --git a/locale/smartmsgmerge.py b/locale/smartmsgmerge.py
index 6d51f50..b82dc14 100755
--- a/locale/smartmsgmerge.py
+++ b/locale/smartmsgmerge.py
@@ -24,7 +24,7 @@
 import sys, os
 
 if len(sys.argv) != 4:
-  print "Usage: %s def.po ref.pot out.po"
+  print "Usage: %s def.po ref.pot out.po" % sys.argv[0]
   sys.exit()
 
 def_filename = sys.argv[1]
diff --git a/locale/sv.po b/locale/sv.po
index 2fa33ab..972d940 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1,6 +1,5 @@
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity 1.3.4\n"
+msgstr "Project-Id-Version: Audacity 1.3.4\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: 2008-07-01 18:29+0100\n"
 "Last-Translator: Lars musselasse Carlsson <musselasse at hotmail.com>\n"
@@ -23,16 +22,16 @@ msgid "OK... Audacious!"
 msgstr "OK"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "Audacity är ett fritt program (freeware), skrivet av frivilliga utvecklare från hela världen. Samarbetet möjliggörs tack vare SourceForge.net, en onlinetjänst som erbjuder fri programvara liksom utrymme på Internet för mjukvaroprojekt i open-source. Audacity finns för Windows 98 och nyare operativsystem, Mac OS X, Linux och andra Unix-liknande operativsystem. Äldre versioner av Audacity finns för MAC OS9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Detta är en betaversion av programmet. Den kan innehålla buggar och funktioner som inte är färdiga. Vi behöver din feedback, så vi är tacksamma om du besöker vår hemsida och lämnar uppgifter om ev. buggar och saknade funktioner."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Detta är en stabil, fullständig version av Audacity. Skulle du råka hitta en bugg i programmet eller har förslag på förbättringar, var vänlig kontakta oss. Vi är beroende av feedback från er användare. För mer information besök vår hemsida."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: AboutDialog.cpp:192
@@ -41,8 +40,8 @@ msgid "translator_credits"
 msgstr "Lars \"musselasse\" Carlsson för översättning till svenska"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "En digital ljudeditor (freeware)"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -78,6 +77,10 @@ msgstr "Audacity är baserad på kod från följande projekt:"
 msgid "Special thanks:"
 msgstr "Speciellt tack till:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -221,12 +224,10 @@ msgstr "Fel när projektet öppnades"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s existerar inte och kan inte öppnas.\n"
+msgstr "%s existerar inte och kan inte öppnas.\n"
 "\n"
 "Den har raderats från historia-listan."
 
@@ -261,11 +262,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "Okänd command line option: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity kunde inte hitta plats att spara temporära filer. \n"
+msgstr "Audacity kunde inte hitta plats att spara temporära filer. \n"
 "Var vänlig och skriv in lämplig plats i Inställningar"
 
 #: AudacityApp.cpp:1050
@@ -273,21 +272,17 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr " Audacity kommer nu att avslutas. Var vänlig och starta om Audacity för att använda den nya temporära katalogen."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Om du kör två versioner av Audacity samtidigt, kan detta\n"
+msgstr "Om du kör två versioner av Audacity samtidigt, kan detta\n"
 "orsaka systemkrasch och att data går förlorat\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity kunde inte stänga mappen med temporära filer.\n"
+msgstr "Audacity kunde inte stänga mappen med temporära filer.\n"
 "Denna mapp används eventuellt av en annan version av Audacity.\n"
 
 #: AudacityApp.cpp:1091
@@ -303,11 +298,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Systemet har upptäckt att en annan version av Audacity körs\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Använd kommandon Nytt eller Öppna i pågående Audacity\n"
+msgstr "Använd kommandon Nytt eller Öppna i pågående Audacity\n"
 "process för att öppna flera projekt samtidigt.\n"
 
 #: AudacityApp.cpp:1134
@@ -343,13 +336,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr "Dessutom, namnge ljudfilen eller Audacity-projektet för att öppna adet."
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Audacity projektfiler (.aup) låter dig spara allt som du arbetat med exakt som det\n"
+msgstr "Audacity projektfiler (.aup) låter dig spara allt som du arbetat med exakt som det\n"
 "ser ut på skärmen, men de flesta av andra program kan inte öppna Audacity projektfiler.\n"
 "\n"
 "Om du vill spara en fil som skall kunna öppnas med andra program, välj en av\n"
@@ -364,11 +355,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Kan inte hitta några ljudenheter\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Du kommer inte att kunna spela upp eller spela in ljud.\n"
+msgstr "Du kommer inte att kunna spela upp eller spela in ljud.\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -384,12 +373,10 @@ msgid "Latency problem"
 msgstr "Latency problem"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"Inställningarna för latency har orsakat att det inspelade ljudet är gömt\n"
+msgstr "Inställningarna för latency har orsakat att det inspelade ljudet är gömt\n"
 "innan noll. Audacity har flyttat början på ljudet till noll.\n"
 "Du kanske måste använda Time Shift-verktyget (<---> eller F5) för att dra det till rätt plats. "
 
@@ -398,11 +385,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Automatiskt återskapande vid krasch"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Några projekt blev inte sparade rätt förra gången Audacity kördes.\n"
+msgstr "Några projekt blev inte sparade rätt förra gången Audacity kördes.\n"
 "Lyckligtvis kan följande projekt återskapas automatiskt."
 
 #: AutoRecovery.cpp:75
@@ -431,11 +416,9 @@ msgid "Recover Projects"
 msgstr "Ã…terskapade projekt"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Är du säker på att du inte vill återkspa några projekt?\n"
+msgstr "Är du säker på att du inte vill återkspa några projekt?\n"
 "De kan inte återskapas senare."
 
 #: AutoRecovery.cpp:128
@@ -510,11 +493,9 @@ msgstr "Kommandot %s är inte implementerat än"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Kunde inte ställa in parametrar kring effekt %s\n"
+msgstr "Kunde inte ställa in parametrar kring effekt %s\n"
 "till %s."
 
 #: BatchCommands.cpp:583
@@ -524,12 +505,10 @@ msgstr "Ditt konverteringskommando för %s kändes inte igen."
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Lägg till %s med parameter(s)\n"
+msgstr "Lägg till %s med parameter(s)\n"
 "\n"
 "%s"
 
@@ -549,6 +528,10 @@ msgstr "Lägg till %s"
 msgid "Apply Chain"
 msgstr "Lägg till kedja"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Välj kedja"
@@ -595,10 +578,18 @@ msgstr "Lägger till '%s' till nuvarande projekt"
 msgid "Please save and close the current project first."
 msgstr "Spara och stäng nuvarande projekt först."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Välj fil(er) för konvertering..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Alla filer (*.*)|*.*|WAV filer (*.wav)|*.wav|AIFF filer (*.aif)|*.aif|AU filer (*.au)|*.au|MP3 filer (*.mp3)|*.mp3|Ogg Vorbis filer (*.ogg)|*.ogg|FLAC filer (*.flac)*.flac"
@@ -710,12 +701,10 @@ msgid "Copying audio data into project..."
 msgstr "Kopiera ljuddata till projekt..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Ditt nuvarande projekt är beroende av andra filer.\n"
+msgstr "Ditt nuvarande projekt är beroende av andra filer.\n"
 "Ska du kopiera ljud från följande filer till ditt projekt för att göra det självständigt?\n"
 "Detta sätt behöver mer lagringsutrymme men är säkrare."
 
@@ -782,11 +771,9 @@ msgid "Dependency check"
 msgstr "Kontrollera tillbehör"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Varning: För lite utrymme kvar i denna katalog.\n"
+msgstr "Varning: För lite utrymme kvar i denna katalog.\n"
 " Välj annat utrymme för de temporära filerna i Inställningar."
 
 #: DirManager.cpp:221
@@ -809,11 +796,9 @@ msgstr "Rensar temporära filer"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity hittade en ursprunglig blockfil  %s! \n"
+msgstr "Audacity hittade en ursprunglig blockfil  %s! \n"
 "Vänligen överväg att spara och starta om projektet för att göra en komplett projektkontroll.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
@@ -836,16 +821,16 @@ msgstr "Kan ej radera '%s'"
 msgid "Renamed file: %s\n"
 msgstr "Namnändrad fil: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Ändrar block %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Kan ej namnändra '%s' till '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -872,21 +857,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "Saknar data fil: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgstr "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgstr "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
 
@@ -915,15 +896,13 @@ msgstr "Varning"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Project check detected %d input file[s] being used in place\n"
+msgstr "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
@@ -947,12 +926,10 @@ msgstr "Stäng omedelbart projekt utan ytterligare ändringar"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgstr "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
 
@@ -966,16 +943,14 @@ msgstr "Fyll i tystnad som ersättning för saknad data [endast denna session]"
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgstr "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
@@ -1011,6 +986,93 @@ msgstr "Sparar ljudinspelning till hårddisken..."
 msgid "Rectangular"
 msgstr "Fyrkant"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Plats för %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "För att hitta %s, klicka här -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Välj..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Var hittar man %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Frekvens analys"
@@ -1037,8 +1099,9 @@ msgstr "Enhanced Autocorrelation"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Algorithm:"
 
 #: FreqWindow.cpp:168
@@ -1051,9 +1114,9 @@ msgstr "Storlek"
 msgid " window"
 msgstr " fönstring"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Funktioner:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1063,9 +1126,9 @@ msgstr "Linjär frekvens"
 msgid "Log frequency"
 msgstr "Log frekvens"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Axel:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1074,6 +1137,10 @@ msgstr "Axel:"
 msgid "&Export..."
 msgstr "&Exportera..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Exportera"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1259,8 +1326,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr "<p>För att bränna ditt arbete på en ljud-CD för externa CD-spelare, [[export|export]] det som WAV eller AIFF. Den exporterade filen ska vara i stereo, 44100 Hz (ställs in  i \"Samplingfrekvens\"-knapp nere till vänster) och 16 bitar (ställs in i \"Inställningar\" under fliken Filformat). Detta är grundinställningen i Audacity, så i regel ska du inte behöva ändra dessa värden innan du exporterar. <p>Bränn den exporterade ljudfilen till en \"ljud-CD\" och inte till en \"data-CD\" - med ett brännarprogram som iTunes eller Windows Media Player. För ytterligare hjälp, gå till [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Det verkar som om du inte har Audacity hjälpfiler på din dator. Du kan <a href=\"http://audacity.sourceforge.net/help/documentation\">ladda ner</a> hjälpfilerna och sedan nå dem via Audacity genom att klicka <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">här</a> för att läsa hela manualen online."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1364,13 +1431,11 @@ msgid "New..."
 msgstr "Nytt..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Du har kvar etiketter utan namn.Dessa kommer inte att\n"
+msgstr "Du har kvar etiketter utan namn.Dessa kommer inte att\n"
 "användas när etikettspår skapas.\n"
 "\n"
 "Vill du gå tillbaka och ge dem namn?"
@@ -1436,11 +1501,9 @@ msgstr "Ändra till rätt språk för Audacity:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Konverterade ett projekt i version 1.0 till det nya formatet.\n"
+msgstr "Konverterade ett projekt i version 1.0 till det nya formatet.\n"
 "Den gamla filen sparades som '%s'"
 
 #: Legacy.cpp:357
@@ -1472,6 +1535,10 @@ msgstr "&Spara projekt\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Spara projekt &som..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "Kon&trollera tillbehör..."
@@ -1480,6 +1547,10 @@ msgstr "Kon&trollera tillbehör..."
 msgid "Open Me&tadata Editor..."
 msgstr "Öppna Me&tadata editor..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Importera"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Ljud...\tCtrl+Shift+I"
@@ -1509,6 +1580,10 @@ msgstr "Exportera &etiketter..."
 msgid "Export &Multiple..."
 msgstr "Exportera &till flera ljudfiler..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "Clean Speech k&edja..."
@@ -1589,9 +1664,9 @@ msgstr "&Radera\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Delning r&adera\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "&Tystnad\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1605,23 +1680,21 @@ msgstr "Dela ny&tt\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&Sammanfoga ett spår\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Ta& isär\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Duplic&era\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "&Stereo till mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Om&råden med etiketter..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1664,13 +1737,13 @@ msgid "&Join\tAlt+J"
 msgstr "&Sammanfoga\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Ta &isär\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Markera&..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1700,9 +1773,9 @@ msgstr "Från markör till &slutet\tShift+K"
 msgid "Find &Zero Crossings\tZ"
 msgstr "Sök &nollgräns\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Fly&tta markör..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1728,9 +1801,9 @@ msgstr "Ma&rkering spara"
 msgid "Regio&n Restore"
 msgstr "Marke&ring återställ"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Spe&la område..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1756,9 +1829,14 @@ msgstr "Fäst mot rutnät på"
 msgid "Turn Grid Snap Off"
 msgstr "Fäst mot rutnät av"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Inställningar...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1804,9 +1882,9 @@ msgstr "&Visa klippning"
 msgid "&History..."
 msgstr "&Historia..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&Paneler..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1848,13 +1926,71 @@ msgstr "&Återställ paneler"
 msgid "!Simplified View"
 msgstr "!Förenklad visning"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Gå till början\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "GÃ¥ till slut\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "&Spår"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Lägg till &nytt..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1869,10 +2005,6 @@ msgstr "&Stereospår"
 msgid "&Time Track"
 msgstr "&Tidspår"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&Inspelning med timer..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "Mi&xa och förändra"
@@ -1929,13 +2061,21 @@ msgstr "Placera slut vid markeringens slu&t"
 msgid "Align Tracks To&gether"
 msgstr "Placera spår till&sammans"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Placera spår..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Pla&cera och flytta markör..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1945,22 +2085,26 @@ msgstr "Lägg &till etikett vid markering\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Lägg till etikett vid &markörens position vid uppspelning\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "S&ortera spåren efter..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Starttid"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Namn"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "&Skapa"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "Effe&kt"
@@ -1994,6 +2138,10 @@ msgstr "&Visa välkomstmeddelande"
 msgid "&Index..."
 msgstr "&Index..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Skärmdump verktyg..."
@@ -2006,13 +2154,13 @@ msgstr "&Kör hastighetstest..."
 msgid "&Audio Device Info..."
 msgstr "&Ljudenhet Info..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "VÄxla bakåt via dockning, visa spår och markeringspanel\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "VÄxla framåt via dockning, visa spår och markeringspanel\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2046,9 +2194,9 @@ msgstr "Nästa verktyg\tD"
 msgid "Previous Tool\tA"
 msgstr "Föregående verktyg\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Spela/Stopp\tMellanslag"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2082,22 +2230,14 @@ msgstr "Spela till markering\tB"
 msgid "Play Looped\tL"
 msgstr "Spela loop\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Spela Loop\tShift+Mellanslag"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "Spela Klipp förhandsgranska\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Gå till början\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "GÃ¥ till slut\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "Markering till början\tShift+Home"
@@ -2154,9 +2294,9 @@ msgstr "Växla aktuellt spår\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Växla aktuellt spår\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Växla aktuellt spår\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2254,15 +2394,19 @@ msgstr "Fäst mot På"
 msgid "Snap To Off"
 msgstr "Fäst mot Av"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Öppna tidigare"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Senaste &filer..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2319,6 +2463,23 @@ msgstr "Repetera %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Det finns inga etikettspår att exportera."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "Det finns inget att ångra"
@@ -2362,6 +2523,10 @@ msgstr "Klistrade in text från urklipp"
 msgid "Pasted from the clipboard"
 msgstr "Klistrade in från urklipp"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Att kopiera stereoljud till monospår är inte tillåtet."
@@ -2531,9 +2696,9 @@ msgstr "Importera etiketter"
 msgid "Select a MIDI file..."
 msgstr "Välj MIDI fil..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Alla filer (*.*)|*.*|MIDI filer (*.mid)|*.mid|Allegro filer (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2552,14 +2717,6 @@ msgstr "Välj någon okomprimerad ljudfil..."
 msgid "All files (*)|*"
 msgstr "Alla filer (*.*)|*.*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Importera"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Redigera metadata taggar"
@@ -2633,6 +2790,14 @@ msgstr "Placerad"
 msgid "Align"
 msgstr "Placera"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "Skapat nytt ljudspår"
@@ -2699,15 +2864,15 @@ msgid "Removed audio track(s)"
 msgstr "Raderade ljudspår"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Ny samplingsfrekvens (Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Ã…tersampla"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Ny samplingsfrekvens (Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "Det inskrivna värdet är felaktigt"
@@ -2775,15 +2940,13 @@ msgid "Save changes before closing?"
 msgstr "Spara ändringar innan programmet avslutas?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Sparat projekt kommer att vara tomt!!\n"
 "\n"
@@ -2810,16 +2973,14 @@ msgstr "Audacity projekt|*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Denna fil blev sparad av Audacity %s, en mycket\n"
+msgstr "Denna fil blev sparad av Audacity %s, en mycket\n"
 "äldre version av Audacity.  Formatet har ändrats.\n"
 "\n"
 "Audacity kan förstöra filen genom att öppna den\n"
@@ -2844,11 +3005,9 @@ msgstr "Fel när filen öppnades"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Fil är kanske skadad: \n"
+msgstr "Fil är kanske skadad: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -2887,12 +3046,10 @@ msgstr "Det gick inte att hitta projektets datafolder: \"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Denna fil är sparad i Audacity %s.\n"
+msgstr "Denna fil är sparad i Audacity %s.\n"
 "Du använder Audacity %s - du behöver uppgrader till\n"
 "en nyare version för att kunna öppna denna fil."
 
@@ -2902,25 +3059,35 @@ msgstr "Det går inte att öppna projektfil"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Denna fil blev sparad av Audacity %s.\n"
+msgstr "Denna fil blev sparad av Audacity %s.\n"
 "Du kan öppna denna fil med denna version av Audacity, men om du sparar den med denna version kan du inte längre öppna den i äldre versioner.\n"
 " \n"
 "Vill du öppna filen nu?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Kan att spara projektet. %s är kanske inte skrivbar,\n"
-"eller det finns för lite utrymme att spara på."
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2932,21 +3099,19 @@ msgstr "Fel när projekt skulle sparas"
 msgid "Saved %s"
 msgstr "Sparat %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "RÃ¥data"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Importerar %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "Importerat '%s'"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Importera"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -2960,19 +3125,23 @@ msgstr "Spara Speech som:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM ljudfill (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Audacity projektfiler (.aup) låter dig spara allt som du arbetat med exakt som det\n"
-"ser ut på skärmen, men de flesta av andra program kan inte öppna Audacity projektfiler.\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
 "\n"
-"Om du vill spara en fil som skall kunna öppnas med andra program, välj en av\n"
-"Exportfunktionerna."
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3017,6 +3186,16 @@ msgstr "Hårddiskutrymme som återstår för inspelning %d sekunder."
 msgid "Out of disk space"
 msgstr "Slut på hårddiskutrymme"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "Kunde inte radera gammal autosparad fil:"
@@ -3103,48 +3282,13 @@ msgstr "För&handsvisa"
 msgid "&Debug"
 msgstr "&Debug"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity Timerinspelning"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Inspelning start"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Inspelning slut"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Varaktighet"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity Smart Record Progress"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Start datum och tid"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Slut datum och tid"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Väntar på att börja spela in vid %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity Smart Record - väntar på start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3185,10 +3329,9 @@ msgstr "Genre"
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Tryck F2 eller dubbelklicka för att redigera."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3208,16 +3351,13 @@ msgstr "&Rensa"
 msgid "Genres"
 msgstr "Genrer"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Redigera"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "Återställ"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3287,6 +3427,16 @@ msgstr "Är du säker på att du vill återställa genrelistan till grundinstäl
 msgid "Unable to open genre file."
 msgstr "Det gick inte att öppna genrefil."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "Fel vid laddande av metadata"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3296,206 +3446,138 @@ msgstr "Det gick inte att öppna genrefil."
 msgid "Save Metadata As:"
 msgstr "Spara metadata som:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "Fel vid laddande av metadata"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Titel:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Artist:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Kompositör:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Textförfattare:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Kommentarer:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Kodat av:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Spår nummer:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Ã…r:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Genre:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Ingen genre"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Återställ till grundinställning"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Basic"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Värde"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "Rens&a"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Maxlängd på namnet '%s' är %d bokstäver. Data blev stympat."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Titel"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Artist"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity kunde inte skriva till fil:\n"
+msgstr "Audacity kunde inte skriva till fil:\n"
 "  %s."
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Det gick inte att öppna önskad fil:\n"
+msgstr "Det gick inte att öppna önskad fil:\n"
 "  %s\n"
 " för att spara."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity kunde inte skriva image till fil:\n"
+msgstr "Audacity kunde inte skriva image till fil:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity kunde inte hitta fil:\n"
+msgstr "Audacity kunde inte hitta fil:\n"
 "  %s.\n"
 "Tema gick inte att öppna."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity kunde inte ladda fil:\n"
+msgstr "Audacity kunde inte ladda fil:\n"
 "  %s.\n"
 "Kanske dåligt png format?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity kunde inte läsa defaulttemat.\n"
+msgstr "Audacity kunde inte läsa defaulttemat.\n"
 "Var vänlig och rapportera problemet."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Ingen av de förväntade temafilerna\n"
+msgstr "Ingen av de förväntade temafilerna\n"
 "kunde hittas.\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Kunde inte skapa mapp:\n"
+msgstr "Kunde inte skapa mapp:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity kunde inte spara fil:\n"
+msgstr "Audacity kunde inte spara fil:\n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Alla nödvändiga filer i:\n"
+msgstr "Alla nödvändiga filer i:\n"
 "  %s\n"
 "finns redan."
 
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Varaktighet"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity Timerinspelning"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Inspelning start"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Inspelning slut"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Start datum och tid"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Slut datum och tid"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Väntar på att börja spela in vid %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
 msgid "Track Panel"
@@ -3790,6 +3872,14 @@ msgstr "Inställd panorering"
 msgid "Adjusted gain"
 msgstr "Inställd signal"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "Kan inte radera spår med aktivt ljud"
@@ -3847,14 +3937,6 @@ msgstr "Frekvens ändra"
 msgid "Format Change"
 msgstr "Ändra format"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Skriv in en samplingsfrekvens i Hz (per sekund) mellan 1 och 100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Felaktig frekvens."
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "Ändra lägsta nivån på hastighet (%) till:"
@@ -3993,24 +4075,21 @@ msgstr "Plugins 1 till %i"
 msgid "Plugins %i to %i"
 msgstr "Plugins %i till %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Kan inte användas av någon anledning. Pröva att välja något ljud först?"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Du kan bara göra detta när uppspelning och inspelning\n"
+msgstr "Du kan bara göra detta när uppspelning och inspelning\n"
 "är stoppad. (Pausa är inte passande)."
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Du måste först välja något stereoljud för att\n"
+msgstr "Du måste först välja något stereoljud för att\n"
 "använda denna funktion. (Du kan inte använda detta med mono)."
 
 #: commands/CommandManager.cpp:785
@@ -4018,16 +4097,14 @@ msgid "You must first select some audio for this to use."
 msgstr "Var vänlig välj lite ljud först för att använda detta."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Du måste först välja något ljud för att\n"
+msgstr "Du måste först välja något ljud för att\n"
 " använda denna funktion. (Välja andra typer av spår fungerar inte)."
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Meddelande"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4047,14 +4124,19 @@ msgstr "Använd effekt: %s %.1f dB"
 msgid "Amplify"
 msgstr "Förstärkning"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Förstärkning av Dominic Mazzoni"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Förstärkning (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Ny peak amplitud (dB):"
@@ -4183,10 +4265,18 @@ msgstr "av Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Frekvens (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Boost (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Bas Boost..."
@@ -4229,8 +4319,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "använder SoundTouch, by Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Tonhöjd:   från"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Halvtoner (halva tonsteg):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4240,13 +4371,9 @@ msgstr "Tonhöjd:   från"
 msgid "to"
 msgstr "till"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Halvtoner (halva tonsteg):"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Frekvens (Hz):   från"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4254,6 +4381,11 @@ msgstr "Frekvens (Hz):   från"
 msgid "Percent Change:"
 msgstr "Procent ändring:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Ändra tonhöjd..."
@@ -4272,6 +4404,11 @@ msgstr "Använd effekt: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Ändra hastighet"
 
+#. i18n-hint: n/a is an English
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "oviktigt"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Ändra hastighet, som påverkar både tempo och tonhöjd"
@@ -4280,14 +4417,17 @@ msgstr "Ändra hastighet, som påverkar både tempo och tonhöjd"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "använder Samplingsfrekvens, av Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "oviktigt"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standard Vinyl RPM:   från"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4305,13 +4445,29 @@ msgstr "Ändra tempo"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Ändra tempo utan att ändra tonhöjd"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Taktslag i minuten (BPM):   från"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Längd (sekunder):   från"
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4321,8 +4477,9 @@ msgstr "Ändra tempo..."
 msgid "Changing Tempo"
 msgstr "Ändrar tempo"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Ta bort klick"
 
 #: effects/ClickRemoval.cpp:336
@@ -4333,10 +4490,18 @@ msgstr "Ta bort klick och pops av Craig De Forest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Välj tröskelvärde (lägre är mer känsligt)"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Max spik bredd (högre är mer känsligt)"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Ta bort klick..."
@@ -4349,49 +4514,86 @@ msgstr "Raderar klick och pops"
 msgid "Dynamic Range Compressor"
 msgstr "Dynamic Range Compressor"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dynamic Range Compressor av Dominic Mazzoni"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Förhållande:"
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
+
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Attack tid: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Decay Time: "
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Normalisera till 0dB efter komprimering"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Tröskel: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Förhållande: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Förhållande: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Attack tid: %.1f secs"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Decay Time: %.1f secs"
 
 #: effects/Compressor.h:36
@@ -4402,6 +4604,251 @@ msgstr "Kompressor..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "lägger till Dynamic Range Compression..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Start"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Slut"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "Återställ"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Kontroll"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "DTMF Tongenerator"
@@ -4656,6 +5103,10 @@ msgstr "Invertera"
 msgid "Inverting"
 msgstr "Inverterar"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Utjämnare"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Inget-hoppa över"
@@ -4680,29 +5131,26 @@ msgstr "Kraftigare"
 msgid "Heaviest"
 msgstr "Kraftigast"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Utjämnare"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Leveller av Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Utjämna mjuka och starka partier"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "av Lynn Allan"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Grad av utjämning"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Brusgräns  (Hiss/Hum/Atmosfärsljud)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Tröskel för brus:"
 
 #: effects/Leveller.h:28
@@ -4713,6 +5161,158 @@ msgstr "Leveller..."
 msgid "Applying Leveller..."
 msgstr "Lägger till "
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Mixer"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Phaser"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Brusreducering"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Vitt"
@@ -4748,31 +5348,23 @@ msgstr "Skapar brus"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Det gick inte att öppna fil:\n"
+msgstr "Det gick inte att öppna fil:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Försökt köra brusreducering utan brusprofil.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Brusreducering"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "Steg 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Välj några sekunder brus så Audacity vet vad som skall filtreras bort,\n"
+msgstr "Välj några sekunder brus så Audacity vet vad som skall filtreras bort,\n"
 " klicka sedan på Ladda brusprofil:"
 
 #: effects/NoiseRemoval.cpp:815
@@ -4780,11 +5372,9 @@ msgid "Step 2"
 msgstr "Steg 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Välj allt ljud som du vill filtrera, välj hur mycket brus du vill\n"
+msgstr "Välj allt ljud som du vill filtrera, välj hur mycket brus du vill\n"
 " filtrera bort, klicka sedan på 'OK' för att radera brus.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4799,14 +5389,26 @@ msgstr "Ladda brusprofil"
 msgid "Noise reduction (dB):"
 msgstr "Brusreducering (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Släta ut frekvenser (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Attack/decay tid (sek):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Brusreducering..."
@@ -4845,22 +5447,22 @@ msgstr ", maximal amplitude = %.1f dB"
 msgid "Normalize"
 msgstr "Normalisera"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Normalisera av Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Radera ändrad DC startposition (centrera på 0 vertikalt)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Normalisera maxamplitud till"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Normalisera..."
@@ -4874,44 +5476,56 @@ msgstr "Normaliserar..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Tillämpad effekt: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Phaser"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Phaser av Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Steg:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "TORR"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "VÃ…T"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO frekvens (Hz)LFO frekvens (Hz)"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO start läge (grad.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Djup:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Feedback (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Phaser..."
@@ -4921,15 +5535,21 @@ msgid "Applying Phaser"
 msgstr "Lägger till Phaser"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Reparationseffekten är gjord för att användas på en mycket kort del av skadat ljud (upp till 128 samples).\n"
+msgstr "Reparationseffekten är gjord för att användas på en mycket kort del av skadat ljud (upp till 128 samples).\n"
 "\n"
 "Zooma in och välj en liten bråkdel av en sekund för att reparera."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Reparerar skadat ljud"
@@ -4948,29 +5568,24 @@ msgstr "Spår är för långa för att kunna repetera markeringen."
 msgid "Repeat"
 msgstr "Repetera"
 
-#. i18n-hint: && in here is an escape character to get
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Repeat av Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Antal gånger att upprepas:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Ny markeringslängd:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d minuter, %d sekunder"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekunder"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5018,11 +5633,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "SpikeCleaner av Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Max tid för Spike (millisekunder): \n"
+msgstr "Max tid för Spike (millisekunder): \n"
 "(99999 eller större är Av)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5037,10 +5650,60 @@ msgstr "Spike Cleaner..."
 msgid "Applying Spike Cleaner..."
 msgstr "Kör Spike Cleaner..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Stereo till mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Lägg stereo till mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5088,17 +5751,21 @@ msgstr "Frekvens (Hz)"
 msgid "Waveform:"
 msgstr "VÃ¥gform:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Slut"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5129,10 +5796,6 @@ msgstr "Alla spår måste ha samma samplingsfrekvens"
 msgid "Truncate Silence"
 msgstr "Skapa tystnad"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "av Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Max tystnad varaktighet:"
@@ -5180,10 +5843,6 @@ msgstr "Använd effekt: %s frekvens = %.1f Hz, start phase = %.0f deg, djup = %.
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah av Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Djup: (%):"
@@ -5192,10 +5851,18 @@ msgstr "Djup: (%):"
 msgid "Resonance:"
 msgstr "Resonans:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah Frequency Offset (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5234,6 +5901,18 @@ msgstr "Effekt inställningar"
 msgid "Length (seconds)"
 msgstr "Längd (sekunder)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Lägger till Nyquist effekt"
@@ -5301,13 +5980,13 @@ msgstr "Plugin inställningar"
 msgid "Program"
 msgstr "Program"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Inga spår är valda! Använd Ctrl-A (Välj allt)\n"
-"Välj Exportera... för att exportera alla spår."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5323,14 +6002,12 @@ msgstr "Är du säker på att du vill spara filen som \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Du vill spara en %s fil med namnet \"%s\".\n"
+msgstr "Du vill spara en %s fil med namnet \"%s\".\n"
 "\n"
 "Vanligtvis har dessa extensionen \"%s\", och vissa program kommer inte att kunna öppna filerna om du väljer andra extensioner.\n"
 "\n"
@@ -5366,6 +6043,10 @@ msgstr "- Vänster"
 msgid " - Right"
 msgstr "- Höger"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5403,10 +6084,6 @@ msgstr "(externt program)"
 msgid "Cannot export audio to %s"
 msgstr "Kan ej exportera ljud till %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Exportera"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Exporterar det valda ljudet med hjälp av command-line encoder"
@@ -5419,6 +6096,477 @@ msgstr "Exporter hela projektet med hjälp av command-line encoder"
 msgid "Command Output"
 msgstr "Kommando output"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Felaktig samplingsfrekvens"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Du kan återsampla till någon av frekvenserna nedan."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Samplingsfrekvenser"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Bit Rate:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Format:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Språk:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Kvalité:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML filer (*.xml)|*.xml|Alla filer (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Bestäm FLAC Inställningar"
@@ -5499,10 +6647,6 @@ msgstr "Bestäm MP2 Inställningar"
 msgid "MP2 Export Setup"
 msgstr "MP2 Export inställningar"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Bit Rate:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "MP2 filer"
@@ -5623,33 +6767,15 @@ msgstr "Lokalisera Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity behöver filen %s för att skapa MP3-filer."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Plats för %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "För att hitta %s, klicka här -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Välj..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "För att få en gratis kopia av Lame, klicka här -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Ladda ner..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Var hittar man %s?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5714,39 +6840,23 @@ msgstr "Exportera hela filen vid %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "Fel %d rapporterades från MP3 encoder"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Felaktig samplingsfrekvens"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"Projektets samplingsfrekvens (%d) supportas inte av MP3\n"
+msgstr "Projektets samplingsfrekvens (%d) supportas inte av MP3\n"
 "filformat"
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"Kombinationen av projektets samplingsfrekvens (%d) och bit rate (%d kbps)\n"
+msgstr "Kombinationen av projektets samplingsfrekvens (%d) och bit rate (%d kbps)\n"
 "är inte supportad av MP3 filformat.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Du kan återsampla till någon av frekvenserna nedan."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Samplingsfrekvenser"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "MP3 exportplugin hittades inte"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
@@ -5756,13 +6866,11 @@ msgid "Export Multiple"
 msgstr "Multipel export"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Om du har mer än ett ljudspår, kan du exportera varje spår som en separat fil,\n"
+msgstr "Om du har mer än ett ljudspår, kan du exportera varje spår som en separat fil,\n"
 "eller om du har ett etikettspår, så kan du exportera en ny fil för varje etikett.\n"
 "\n"
 "Detta projekt innehåller inga multipla spår eller ett etikettspår, så du kan inte exportera flera filer samtidigt."
@@ -5808,6 +6916,10 @@ msgstr "Inkludera ljud före första etiketten"
 msgid "First file name:"
 msgstr "Första filnamn:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Spår"
@@ -5828,14 +6940,14 @@ msgstr "Numrering i följd"
 msgid "File name prefix:"
 msgstr "Filnamn prefix:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Skriv över befintliga filer"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "E&xportera"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5847,12 +6959,10 @@ msgstr "Välj en plats att spara exporterade filer"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" finns inte.\n"
+msgstr "\"%s\" finns inte.\n"
 "\n"
 "Vill du skapa det?"
 
@@ -5875,11 +6985,9 @@ msgstr "NÃ¥got blev fel efter export av %d fil(er)"
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"Etiketten %s är inte ett fungerande filnamn. Du kan inte använda något av:    %s\n"
+msgstr "Etiketten %s är inte ett fungerande filnamn. Du kan inte använda något av:    %s\n"
 "Välj..."
 
 #: export/ExportOGG.cpp:64
@@ -5890,10 +6998,6 @@ msgstr "Bestäm Ogg Vorbis Inställningar"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg Vorbis exportera inställningar"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Kvalité:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis-filer"
@@ -5914,10 +7018,6 @@ msgstr "Bestäm okomprimerat val"
 msgid "Uncompressed Export Setup"
 msgstr "Okomprimerat exportformat"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Format:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Huvud:"
@@ -5930,10 +7030,21 @@ msgstr "Omkodning:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Inte alla kombinationer av huvuden och kodningar är inte möjliga.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, och andra okomprimerade format"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -5955,116 +7066,131 @@ msgstr "Exportera hela projektet som %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Fel (filen kanske inte blev rätt gjord): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "MP3 filer"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Denna version av audacity var inte kompilerad med %s support."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en Audio CD-fil. \n"
+msgstr "\"%s\" är en Audio CD-fil. \n"
 "Audacity kan inte öppna denna typ av fil. \n"
 "Försök rippa filen till ett ursprungligt ljudformat \n"
 "som Audacity kan importera som WAV eller AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\" är en spellista.\n"
+msgstr "\"%s\" är en spellista.\n"
 "Audacity kan inte öppna denna fil eftersom den bara innehåller länkar till andra filer.\n"
 "Du kanske kan öppna filen i en texteditor och ladda ner de aktuella ljudfilerna."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" is a Windows Media Audio fil (.wma). \n"
+msgstr "\"%s\" is a Windows Media Audio fil (.wma). \n"
 "Audacity kan inte öppna denna filtyp p g a patentrestriktioner.\n"
 "Du behöver konvertera filen till en supportat ljudformat som WAV eller AIFF."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en avancerad ljudkodningsfil. \n"
+msgstr "\"%s\" är en avancerad ljudkodningsfil. \n"
 "Audacity kan inte öppna denna typ av fil. \n"
 "Du behöver konvertera den till ett ljudformat som WAV eller AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en krypterad ljudfil, typisk från en musikshop på nätet. \n"
+msgstr "\"%s\" är en krypterad ljudfil, typisk från en musikshop på nätet. \n"
 "Audacity kan inte öppna denna fil på grund av krypteringen.\n"
 "Pröva att spela in filen i Audacity, eller bränn den på en audio-CD för\n"
 "att sedan extrahera (rippa) CD-spåret till ett supportat ljudformat som WAV eller AIFF."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en RealPlayer mediafil. \n"
+msgstr "\"%s\" är en RealPlayer mediafil. \n"
 "Audadcity kan inte öppna detta licensierade format.\n"
 "Du måste konvertera det till ett supportat ljudformat, som WAV eller AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" is a MIDI-fil, inte en ljudfil. \n"
-"Audacity kan inte öppna denna filtyp för uppspel och redigering, men\n"
-"du kan visa den genom att välja Arkiv > Importera > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" är en textbaserad fil, inte en ljudfil. \n"
+msgstr "\"%s\" är en textbaserad fil, inte en ljudfil. \n"
 "Audacity kan inte öppna denna typ av fil. \n"
 "Du behöver konvertera den till ett ljudformat som WAV eller AIFF och \n"
 "sedan importera den, eller spela in den i Audacity."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" is a Musepack audio fil. \n"
+msgstr "\"%s\" is a Musepack audio fil. \n"
 "Audacity kan inte öppna denna filtyp. \n"
 "Om du tror att det kan vara en mp3-fil, byt namn så det slutar på \".mp3\"\n"
 "och pröva att importera det igen. Annars får du konvertera filen \n"
@@ -6072,58 +7198,58 @@ msgstr ""
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en Wavpack audio fil. \n"
+msgstr "\"%s\" är en Wavpack audio fil. \n"
 "Audacity kan inte öppna denna typ av fil. \n"
 "Du behöver konvertera den till ett ljudformat som WAV eller AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en Dolby Digital audio fil. \n"
+msgstr "\"%s\" är en Dolby Digital audio fil. \n"
 "Audacity kan inte öppna denna typ av fil. \n"
 "Du behöver konvertera den till ett ljudformat som WAV eller AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" är en Ogg Speex audio fil. \n"
+msgstr "\"%s\" är en Ogg Speex audio fil. \n"
 "Audacity kan inte öppna denna typ av fil. \n"
 "Du behöver konvertera den till ett ljudformat som WAV eller AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity försökte gissa vilket ljudformat filen innehöll.\n"
-"Ljudet kanske inte är rätt.\n"
-"\n"
-"Om ljudet är felaktigt, pröva att namnge filen\n"
-"så att den har rätt extension innan du öppnar den."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity känner inte igen denna typ avfil.\n"
-"Om det är okomprimerad, pröva att använda \"Importera Rådata\""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6160,17 +7286,18 @@ msgstr "MIDI-kanalerna kan inte visas var för sig. Det går bara med ljudfiler.
 msgid "Invalid track offset in LOF file."
 msgstr "Spåret har fel startposition i LOF fil."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Fel vid analys av allegro-fil."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Fel vid analys av MIDI-fil"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "MP3 filer"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6196,15 +7323,24 @@ msgstr "Invalid Vorbis bitstream huvud"
 msgid "Internal logic fault"
 msgstr "Intert logiskt fel"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, och andra okomprimerade format"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Importerar %s fil..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime-filer"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Importera rådata"
@@ -6242,6 +7378,14 @@ msgstr "2 Kanaler (Stereo)"
 msgid "%d Channels"
 msgstr "%d Kanaler"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Startposition:"
@@ -6254,9 +7398,18 @@ msgstr "Mängd att importera:"
 msgid "Sample rate:"
 msgstr "Samplingsfrekvens:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Importera"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6301,9 +7454,9 @@ msgstr "Kanaler"
 msgid "Playthrough"
 msgstr "Spela upp"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Spela upp flera spår samtidigt med inspelning av ett nytt"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6313,9 +7466,13 @@ msgstr "&Hårdvarumässigt spela upp: Spela upp nytt spår samtidigt som man spe
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "&Mjukvarumässigt spela upp: Spela upp nytt spår samtidigt som man spelar in det"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "&Mjukvarumässigt spela upp: Spela upp nytt spår samtidigt som man spelar in det) (bocka av vid inspelning \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6342,19 +7499,15 @@ msgid "Latency"
 msgstr "Latency"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Ljud till buffert:\n"
+msgstr "Ljud till buffert:\n"
 "/högre= mer latency)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Latency korrigering:\n"
+msgstr "Latency korrigering:\n"
 "(negativt värde = bakåt)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6428,8 +7581,8 @@ msgid "Audio cache"
 msgstr "Ljud cache"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Behåll inspelat data i minne tills inspelning har stoppats"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6470,9 +7623,9 @@ msgstr "MP3 bibliotek version:"
 msgid "MP3 Library:"
 msgstr "MP3 bibliotek:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Sök bibliotek"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6482,9 +7635,22 @@ msgstr "LAME MP3 bibliotek:"
 msgid "&Download"
 msgstr "&Ladda ner"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "Obs! Val av ljudkvalité vid export kan väljas genom att klicka på knappen för Inställningar i Exportera-dialogrutan."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Obs! Val av ljudkvalité vid export kan väljas genom att klicka på knappen för Inställningar i Exportera-dialogrutan.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6556,7 +7722,8 @@ msgid "&Update display while playing"
 msgstr "&Uppdatera display medan ljud spelas upp"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Stänger sista fönstret innan Audacity avslutas"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6564,15 +7731,16 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "Drar i &markeringens vänstra och högra kant"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&Ändra ordningen på Audio In/Ut knappar ergonomiskt"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Spår anpassade &vertikalt inzoomade"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "\"Flytta spår fokus\" &växla upprepande genom spåren"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6600,17 +7768,22 @@ msgid "Show warnings about &temp files"
 msgstr "Visa varningar om &temporära filer"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&Visa prompt för att spara, även om projekt är tomt"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Visa välkomstmeddelande vid programstart"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Modes"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "VIsa minimiområde: meter och 'Vågform (dB)'"
@@ -6643,34 +7816,10 @@ msgstr "-145 dB (PCM range of 24 bit samples)"
 msgid "Default View Mode"
 msgstr "Standard Visaläge"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "VÃ¥gformDisplay"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "VÃ¥gformDBDisplay"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "SpektrumDisplay"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "SpektrumLogDisplay"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "TonhöjdDisplay"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Andra val av gränssnitt"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Språk:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Hjälp:"
@@ -6684,6 +7833,14 @@ msgstr "Solo knapp:"
 msgid "Keyboard"
 msgstr "Tangentbord"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Kortkommandon"
@@ -6717,22 +7874,16 @@ msgstr "Fel när kortkommandon skulle sparas"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Välj en XML-fil som innehåller Audacity kortkommandon..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML filer (*.xml)|*.xml|Alla filer (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Fel när kortkommandon importerades"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Kortkommandot '%s' är redan kopplat till:\n"
+msgstr "Kortkommandot '%s' är redan kopplat till:\n"
 "\n"
 "'%s'"
 
@@ -6741,6 +7892,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Ã…ngra"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&Spela upp flera spår samtidigt med inspelning av ett nytt"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7046,14 +8233,13 @@ msgstr "Hög kvalite:"
 msgid "Smart Recording"
 msgstr "Smart Inspelning"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Paus Inspelning med tystnad"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Tystnad nivå (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7188,8 +8374,7 @@ msgid "Info"
 msgstr "Info"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7202,8 +8387,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"Tema är en experimentell specialité.\n"
+msgstr "Tema är en experimentell specialité.\n"
 "\n"
 "För att testa, klicka på \"Spara tema cache\" och\n"
 "leta reda på och modifiera bilder och färger i\n"
@@ -7218,43 +8402,33 @@ msgstr ""
 "bildfilen visar andra ikoner också.)\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Du har kompilerat Audacity med en extra knapp. \n"
+msgstr "Du har kompilerat Audacity med en extra knapp. \n"
 "'Output Sourcery'. En C version av image cache\n"
 "sparas som kan bli kompilerad som default.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Om 'Öppna Tema cache vid uppstart' är förbockad, \n"
+msgstr "Om 'Öppna Tema cache vid uppstart' är förbockad, \n"
 "Tema cache kommer att laddas när programmet \n"
 "startas.\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Vid spara och ladda indivuella temafiler används \n"
+msgstr "Vid spara och ladda indivuella temafiler används \n"
 "en separat fil för varje bild, men bygger ändå på \n"
 "samma idé.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Kontroll"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Paus"
@@ -7263,9 +8437,9 @@ msgstr "Paus"
 msgid "Play"
 msgstr "Spela"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Spela (Shift för loop)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7279,6 +8453,10 @@ msgstr "Gå till början"
 msgid "Skip to End"
 msgstr "GÃ¥ till slut"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "Clean Speech"
@@ -7315,6 +8493,10 @@ msgid "Silence selection"
 msgstr "Tystnad markering"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Zoom in"
 
@@ -7370,16 +8552,13 @@ msgstr "Output nivåmätare"
 msgid "Input level meter - click to monitor input"
 msgstr "Input nivåmätare - klicka för att se input"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Mixer"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Output volym"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "Dragreglage-Output"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7387,7 +8566,8 @@ msgid "Input Volume"
 msgstr "Input volym"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "Dragreglage-Input"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7746,14 +8926,16 @@ msgstr "Stereo vertikalt"
 msgid "Preferences..."
 msgstr "&Inställningar..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Detta beror på hur ofta som mätaren uppdateras.\n"
+msgstr "Detta beror på hur ofta som mätaren uppdateras.\n"
 "Om du har en långsammare PC vill du kanske välja\n"
 "att mätaren inte uppdateras så ofta, så att\n"
 "ljudkvalitén inte blir lidande."
@@ -7770,6 +8952,22 @@ msgstr "Mätare inställningar"
 msgid " Please select an action "
 msgstr "Välj en aktion"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7780,11 +8978,6 @@ msgstr "Vertikal linjal"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 seconds"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #: widgets/TimeTextCtrl.cpp:276
 msgid "0100 h 060 m 060 s"
@@ -7801,6 +8994,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 dagar 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
 msgstr "hh:mm:ss + millisekunder"
@@ -7939,8 +9147,8 @@ msgstr "Det gick inte att öppna fil: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Fel: %hs på rad %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/tg.po b/locale/tg.po
index 1a00594..b02ac6f 100644
--- a/locale/tg.po
+++ b/locale/tg.po
@@ -5,8 +5,7 @@
 # Youth Opportunities NGO
 # Khujand Computer Technologies, Inc
 msgid ""
-msgstr ""
-"Project-Id-Version: tg\n"
+msgstr "Project-Id-Version: tg\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: 2007-08-30 07:25-0400\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities at tajikngo.org>\n"
@@ -25,34 +24,21 @@ msgstr ""
 msgid "&About Audacity..."
 msgstr "&Дар бораи Audacity..."
 
-#: AboutDialog.cpp:148
-#: effects/AvcCompressor.cpp:674
-msgid "Enabled"
-msgstr "Фаъол шуд"
-
-#: AboutDialog.cpp:149
-msgid "Disabled"
-msgstr "Хомӯш карда шуд"
-
-#: AboutDialog.cpp:205
-msgid "Program build date: "
-msgstr "Санаи эҷоди барнома: "
-
-#: AboutDialog.cpp:210
-msgid "Settings folder: "
-msgstr "Танзимоти пӯша: "
+#: AboutDialog.cpp:157
+msgid "OK... Audacious!"
+msgstr ""
 
-#: AboutDialog.cpp:215
-msgid "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."
-msgstr "Audacity- ин барномаи озодест, ки аз ҷониби барномасозони тараққи кунандаи тамоми дунё сохта шудааст. Ҳамоҳангии ин лоиҳа бо ёрии  SourceForge.net сохта шудааст, ки афзорҳои озодро барои лоиҳаҳои нармафзор бо рамзи озод, таъмин менамояд. Audacity барои системҳои оператсионии Windows 98 ва навтаринҳо, Mac OS X, Linux, ва системҳои оператсионӣ ба монанди Unix дастрас аст.Версияҳои кӯҳнаи Audacity танҳо барои Mac OS 9 дастрас аст."
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
-#: AboutDialog.cpp:219
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Ин версияи таҷрибавии барнома аст.  Барнома метавонад функсияҳои амалиношуда ва хатоҳоро дар бар гирад.  Муваффақияти лоиҳаи мо ба Шумо вобаста аст. Лутфан, веб сайти моро аз назар гузаронда, хатогиҳои барномаро ба мо ирсол намоед."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:222
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Ин барномаи қавӣ ва пурраи Audacity мебошад. Агар Шумо ягон хато ёбед ё ин, ки пешниҳоде дошта бошед, бо мо дар тамос шавед. Муваффақияти лоиҳаи мо ба истифодабаранда, барои беҳтар намудани  Audacity, вобаста аст. Барои гирифтани маълумоти зарурӣ веб сайти моро аз назар гузаронед."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -63,17 +49,11 @@ msgstr "Ин барномаи қавӣ ва пурраи Audacity мебошад
 #: AboutDialog.cpp:232
 #: AboutDialog.cpp:234
 msgid "translator_credits"
-msgstr ""
-"Роҷер Ковакс, Виктор Ибрагимов, Акмал Саломов, Акбар Ватаншоев, Зарина Муродова, Сӯҳроб Рашидов, Абдураҳмон Холов. "
-"Почтаи электронӣ: youth_opportunities at tajikngo.org"
+msgstr "Роҷер Ковакс, Виктор Ибрагимов, Акмал Саломов, Акбар Ватаншоев, Зарина Муродова, Сӯҳроб Рашидов, Абдураҳмон Холов. Почтаи электронӣ: youth_opportunities at tajikngo.org"
 
-#: AboutDialog.cpp:247
-msgid "A Free Digital Audio Editor"
-msgstr "Таҳриргари озоди аудиои рақамӣ"
-
-#: AboutDialog.cpp:251
-msgid "Information"
-msgstr "Иттилоот"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:253
 msgid "Credits"
@@ -109,12 +89,117 @@ msgstr "Audacity аз чунин лоиҳаҳо иборат аст:"
 msgid "Special thanks:"
 msgstr "Ташаккури махсус:"
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:313
-msgid "Audacious!"
-msgstr "Саломат бошед!"
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
+#: AboutDialog.cpp:258
+msgid "Audacity"
+msgstr ""
+
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: AboutDialog.cpp:148
+#: effects/AvcCompressor.cpp:674
+msgid "Enabled"
+msgstr "Фаъол шуд"
+
+#: AboutDialog.cpp:149
+msgid "Disabled"
+msgstr "Хомӯш карда шуд"
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:205
+msgid "Program build date: "
+msgstr "Санаи эҷоди барнома: "
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:210
+msgid "Settings folder: "
+msgstr "Танзимоти пӯша: "
+
+#: AboutDialog.cpp:506
+msgid "GPL License"
+msgstr ""
 
 #: AudacityApp.cpp:418
 #: Project.cpp:1654
@@ -132,12 +217,10 @@ msgstr "Лоиҳаро кушода натавонист"
 
 #: AudacityApp.cpp:452
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s мавҷуд нест ва кушода намешавад.\n"
+msgstr "%s мавҷуд нест ва кушода намешавад.\n"
 "\n"
 "Файл аз рӯйхати кушодашудаи пешина нест карда шудааст."
 
@@ -160,10 +243,6 @@ msgstr "Индикатори баромад"
 msgid "&Preferences...\tCtrl+,"
 msgstr "&Параметрҳо...\tCtrl+,"
 
-#: AudacityApp.cpp:743
-msgid "Command-line options supported:\n"
-msgstr "Дастгирии аргументҳои сатри фармошӣ:\n"
-
 #: AudacityApp.cpp:759
 #: AudacityApp.cpp:844
 #, c-format
@@ -176,34 +255,10 @@ msgstr "Истифодаи блоки андозааш %ld\n"
 msgid "Unknown command line option: %s\n"
 msgstr "Қисмати номаълуми сатри фармоишӣ: %s\n"
 
-#. i18n-hint: '-help', '-test' and
-#. '-blocksize' need to stay in English.
-#: AudacityApp.cpp:828
-msgid ""
-"Command-line options supported:\n"
-"  -help (this message)\n"
-"  -test (run self diagnostics)\n"
-"  -blocksize ### (set max disk block size in bytes)\n"
-"\n"
-"In addition, specify the name of an audio file or Audacity project\n"
-"to open it.\n"
-"\n"
-msgstr ""
-"Қисматҳои дасгиршаванда дар сатри фармоишӣ:\n"
-"  -help (дар равзана ин маълумотро пешниҳод менамояд)\n"
-"  -test (боркунии худташхис)\n"
-"  -blocksize ### (андозаҳои ақалии қисматҳои дискиро бо байтҳо насб мекунад)\n"
-"\n"
-"Илова бар ин номи файл ё ин ки лоиҳаро дар Audacity нишон диҳед\n"
-"ки он ҳангоми боркунии барнома кушода мешавад.\n"
-"\n"
-
 #: AudacityApp.cpp:978
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity наметавонад каталогро барои ба таври муваққатӣ нигоҳ доштани файлҳо ёбад.\n"
+msgstr "Audacity наметавонад каталогро барои ба таври муваққатӣ нигоҳ доштани файлҳо ёбад.\n"
 "Каталоги мувофиқро дар равзанаи муколамавии барнома нишон диҳед."
 
 #: AudacityApp.cpp:984
@@ -211,21 +266,17 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr "Audacity барои баромадан омода аст.  Барнома барои истифодаи файлҳои муваққатии каталоги нав такроран бор карда шавад."
 
 #: AudacityApp.cpp:1016
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Ҳамзамон кӯшиши боркунии ду нусхаи Audacity\n"
+msgstr "Ҳамзамон кӯшиши боркунии ду нусхаи Audacity\n"
 "метавонад маълумотро нобуд созад ё системаро аз кор барорад.\n"
 "\n"
 
 #: AudacityApp.cpp:1023
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity наметавонад каталогро бо файлҳои муваққатӣ боз дорад.\n"
+msgstr "Audacity наметавонад каталогро бо файлҳои муваққатӣ боз дорад.\n"
 "Имконияти истифодаи ин каталог бо нусхаи дигари Audacity мавҷуд аст.\n"
 
 #: AudacityApp.cpp:1025
@@ -241,8 +292,7 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Систем нусхаи дигари Audacity- ро бозхонд.\n"
 
 #: AudacityApp.cpp:1067
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
 msgstr "Фармонҳои «Сохтан» ё «Кушодан»-ро барои кор бо якчанд лоиҳа дар ин нусхаи Audacity истифода баред.\n"
 
@@ -250,14 +300,46 @@ msgstr "Фармонҳои «Сохтан» ё «Кушодан»-ро баро
 msgid "Audacity is already running"
 msgstr "Audacity аллакай бор шудааст"
 
+#: AudacityApp.cpp:1234
+msgid "Command-line options supported:"
+msgstr ""
+
+#. i18n-hint: '-help' is the option and needs to stay in
+#. * English. This displays a list of available options
+#: AudacityApp.cpp:1237
+msgid "\t-help (this message)"
+msgstr ""
+
+#. i18n-hint '-version' needs to stay in English.
+#: AudacityApp.cpp:1239
+msgid "\t-version (display Audacity version)"
+msgstr ""
+
+#. i18n-hint '-test' is the option and needs to stay in
+#. * English. This runs a set of automatic tests on audacity
+#. * itself
+#: AudacityApp.cpp:1243
+msgid "\t-test (run self diagnostics)"
+msgstr ""
+
+#. i18n-hint '-blocksize' is the option and needs to stay in
+#. * English. 'nnn' is any integer number. This controls the
+#. * size pieces that audacity uses when writing files to the
+#. * disk
+#: AudacityApp.cpp:1248
+msgid "\t-blocksize nnn (set max disk block size in bytes)"
+msgstr ""
+
+#: AudacityApp.cpp:1249
+msgid "In addition, specify the name of an audio file or Audacity project to open it."
+msgstr ""
+
 #: AudacityApp.cpp:1347
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Файлҳои лоиҳаи Audacity (.AUP) бо Audacity\n"
+msgstr "Файлҳои лоиҳаи Audacity (.AUP) бо Audacity\n"
 "ҳамробит нестанд. \n"
 "\n"
 "Онҳоро якҷоя намоед, оё онҳо бо пахши дукаратаи муш кушода шуда  метавонанд?"
@@ -271,11 +353,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "Дастгоҳҳои садогӣ ёфт нашуданд.\n"
 
 #: AudioIO.cpp:216
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"Шумо садоро наметавонед сабт кунед ё ин ки боз хонед.\n"
+msgstr "Шумо садоро наметавонед сабт кунед ё ин ки боз хонед.\n"
 "\n"
 
 #: AudioIO.cpp:219
@@ -286,16 +366,24 @@ msgstr "Хато: "
 msgid "Error Initializing Audio"
 msgstr "Хато дар вақти омодасозии овоз "
 
+#: AudioIO.cpp:1375
+msgid "Latency problem"
+msgstr ""
+
+#: AudioIO.cpp:1375
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
+"Audacity has brought it back to start at zero.\n"
+"You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
+msgstr ""
+
 #: AutoRecovery.cpp:40
 msgid "Automatic Crash Recovery"
 msgstr "Ба таври автоматӣ барқарорсозӣ баъди садама"
 
 #: AutoRecovery.cpp:59
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Қаблан баъзе лоиҳаҳо таҳрир ва нигоҳ дошта нашуда буданд \n"
+msgstr "Қаблан баъзе лоиҳаҳо таҳрир ва нигоҳ дошта нашуда буданд \n"
 "бо Audacity кор мекарданд. Хушбахтона, баъзеи онҳоро барқарор сохтан мумкин аст:"
 
 #: AutoRecovery.cpp:61
@@ -308,29 +396,30 @@ msgstr "Ном"
 
 #: AutoRecovery.cpp:70
 msgid "Recovering a project will not change any files on disk before you save it."
-msgstr ""
-"Дар вақти барқарорсозии лоиҳа ягон файл дар диск тағир намеёбанд, \n"
+msgstr "Дар вақти барқарорсозии лоиҳа ягон файл дар диск тағир намеёбанд, \n"
 "то вақти нигоҳдории лоиҳа."
 
 #: AutoRecovery.cpp:74
 msgid "Quit Audacity"
 msgstr "Баромад аз Audacity"
 
-#: AutoRecovery.cpp:75
-msgid "Don't recover"
-msgstr "Барқарор насозед"
+#: AutoRecovery.cpp:89
+msgid "Do Not Recover"
+msgstr ""
 
-#: AutoRecovery.cpp:76
-msgid "Recover projects"
+#: AutoRecovery.cpp:90
+#, fuzzy
+msgid "Recover Projects"
 msgstr "Лоиҳаҳоро барқарор созед"
 
-#: AutoRecovery.cpp:113
-msgid "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?"
-msgstr "Шумо барқарор насохтани лоиҳаҳоро интихоб намудед. Агар Шумо дар оянда фикратонро дигар кунед, аллакай дер мешавад. Шумо ба интихоби худ боварӣ доред?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
+msgstr ""
 
-#: AutoRecovery.cpp:114
-msgid "Question"
-msgstr "Пурсиш"
+#: AutoRecovery.cpp:128
+msgid "Confirm?"
+msgstr ""
 
 #: AutoRecovery.cpp:132
 #: AutoRecovery.cpp:169
@@ -381,8 +470,9 @@ msgstr "&Параметрҳо"
 msgid "C&hoose command"
 msgstr "И&нтихоби фармон"
 
-#: BatchCommands.cpp:472
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+#, fuzzy
+msgid "Stereo to Mono Effect not found"
 msgstr "Таъсири Стерео ба Моно ёфт нашуд"
 
 #: BatchCommands.cpp:490
@@ -400,11 +490,9 @@ msgstr "Фармони %s то ҳол истифода нашудааст"
 
 #: BatchCommands.cpp:521
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Параметҳои %s\n"
+msgstr "Параметҳои %s\n"
 " ба %s таъин карда наметавонад."
 
 #: BatchCommands.cpp:575
@@ -414,12 +502,10 @@ msgstr "Дастаи фармони %s Шумо бозшиносӣ нашуда
 
 #: BatchCommands.cpp:666
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Истифодаи %s бо параметр(ҳо)и\n"
+msgstr "Истифодаи %s бо параметр(ҳо)и\n"
 "\n"
 "%s"
 
@@ -439,6 +525,10 @@ msgstr "Истифодаи %s"
 msgid "Apply Chain"
 msgstr "Истифодаи занҷир"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Интихоби занҷир"
@@ -522,10 +612,18 @@ msgstr "Истифодаи '%s' ба лоиҳаи ҷорӣ"
 msgid "Please save and close the current project first."
 msgstr "Лутфан, дар аввал ин лоиҳаро нигоҳ дошта сипас онро пӯшонед."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Интихоби файл(ҳо) барои раванди дастаӣ..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Ҳамаи файлҳо (*.*)|*.*|Файлҳои WAV (*.wav)|*.wav|Файлҳои AIFF (*.aif)|*.aif|Файлҳои AU (*.au)|*.au|Файлҳои MP3 (*.mp3)|*.mp3|Файлҳои Ogg Vorbis (*.ogg)|*.ogg|Файлҳои FLAC (*.flac)|*.flac"
@@ -631,12 +729,10 @@ msgid "Copying audio data into project..."
 msgstr "Файлҳои савтӣ дар лоиҳа нусхабардорӣ шуда..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Лоиҳаи Шумо ба файлҳои беруние, ки дар система мавҷуданд вобаста аст.\n"
+msgstr "Лоиҳаи Шумо ба файлҳои беруние, ки дар система мавҷуданд вобаста аст.\n"
 "Шумо мехоҳед, додаҳоро ба лоиҳа ҷой диҳед, то ки лоиҳа худмаҳдуд шавад?\n"
 "Ин холат ҷойи зиёди холиро дар диск талаб мекунад, вале аз нобудшавии маълумот эмин медорад."
 
@@ -665,32 +761,27 @@ msgstr "Нусхабардории интихоби аудиоӣ дар лоиҳ
 msgid "Cancel Save"
 msgstr "Бекорсозии сабт"
 
-#: Dependencies.cpp:305
-msgid "Skip"
-msgstr "Гузариш"
-
-#: Dependencies.cpp:308
-#: FreqWindow.cpp:209
-msgid "Close"
-msgstr "Пӯшидан(бастан)"
+#: Dependencies.cpp:310
+msgid "Do Not Copy Any Audio"
+msgstr ""
 
-#: Dependencies.cpp:311
-msgid "Copy All Audio Into Project (safer)"
-msgstr "Нусхаи тамоми аудиҳо ба лоиҳа"
+#: Dependencies.cpp:312
+msgid "Copy All Audio into Project (Safer)"
+msgstr ""
 
 #: Dependencies.cpp:320
 #: Dependencies.cpp:325
 msgid "Ask me"
 msgstr "Маро пурсед"
 
-#: Dependencies.cpp:321
-#: prefs/FileFormatPrefs.cpp:88
-msgid "Always &copy all audio (safest)"
+#: Dependencies.cpp:322
+#, fuzzy
+msgid "Always copy all audio (safest)"
 msgstr "Нус&хабардории ҳамаи файлҳо дар ҳама ҳолат (бехатар)"
 
-#: Dependencies.cpp:322
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Never copy any audio"
+#: Dependencies.cpp:323
+#, fuzzy
+msgid "Never copy any audio"
 msgstr "&Аудио дар ягон ҳолат нусхабардорӣ нашавад"
 
 #: Dependencies.cpp:324
@@ -710,11 +801,9 @@ msgid "Dependency check"
 msgstr "Санҷиши вобаста"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Огохӣ: дар диск ҷои холӣ хеле кам аст.\n"
+msgstr "Огохӣ: дар диск ҷои холӣ хеле кам аст.\n"
 "Дар муколамаи мувофиқаткунӣ рӯйхати дигарро барои файлҳои муваққатӣ интихоб кунед."
 
 #: DirManager.cpp:221
@@ -737,11 +826,9 @@ msgstr "Раванди тозакунии феҳрист бо кеш"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity қисмати файли харобгаштаи %s ёфт! \n"
+msgstr "Audacity қисмати файли харобгаштаи %s ёфт! \n"
 "Лутфан, сабт ва аз нав боркунии лоиҳаро барои иҷрои тафтиши пурра дар назар гиред.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
@@ -766,16 +853,16 @@ msgstr "'%s' тоза намешавад"
 msgid "Renamed file: %s\n"
 msgstr "Тағйири номи файл: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Ивазшавии қисмати %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Тағйири номи '%s' ба '%s' номумкин аст"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -802,19 +889,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "Норасоии додаҳои файл: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr "Тафтиши лоиҳа дар вақти санҷиши додаҳои лоиҳаи боршуда носозгориро ёфт;\n 'Тафсилот' -ро барои варақаи пурраи хатоҳо ё 'OK' -ро барои гирифтани интихоби зиёд пахш кунед."
+msgstr "Тафтиши лоиҳа дар вақти санҷиши додаҳои лоиҳаи боршуда носозгориро ёфт;\n"
+" 'Тафсилот' -ро барои варақаи пурраи хатоҳо ё 'OK' -ро барои гирифтани интихоби зиёд пахш кунед."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Тафтиши лоиҳа қисмати файл(ҳо)и харобгаштаи %d ёфт. Ин файлҳо\n"
+msgstr "Тафтиши лоиҳа қисмати файл(ҳо)и харобгаштаи %d ёфт. Ин файлҳо\n"
 "истифода нашудаанд ва шояд дар ягон хато ё ин ки вайроншавӣ партофта шудаанд.\n"
 "Онҳо бояд тоза карда шаванд то ки дар диск ҷой надошта бошанд."
 
@@ -843,17 +928,17 @@ msgstr "Огоҳӣ"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Тафтиши лоиҳа боз ёфт, ки файл(ҳо)и вуруди %d -е, ки дар айни ҳол\n истифода мешаванд (файлҳои тахаллус) вуҷуд надоранд.\n"
-"Audacity наметавонад ин файлҳои дар бар гирифташударо барқарор\n созад; Шумо метавонед бесадо пуррасозии доимии файлҳои партофташударо танҳо дар ин қисмат пур намоед, ё лоиҳаро дар айни ҳол пӯшонед\n "
-"ва барқарорсозии файлҳои гумшударо дастӣ кӯшиш намоед."
+msgstr "Тафтиши лоиҳа боз ёфт, ки файл(ҳо)и вуруди %d -е, ки дар айни ҳол\n"
+" истифода мешаванд (файлҳои тахаллус) вуҷуд надоранд.\n"
+"Audacity наметавонад ин файлҳои дар бар гирифташударо барқарор\n"
+" созад; Шумо метавонед бесадо пуррасозии доимии файлҳои партофташударо танҳо дар ин қисмат пур намоед, ё лоиҳаро дар айни ҳол пӯшонед\n"
+" ва барқарорсозии файлҳои гумшударо дастӣ кӯшиш намоед."
 
 #: DirManager.cpp:1259
 msgid "Replace missing data with silence [permanent upon save]"
@@ -872,12 +957,10 @@ msgstr "Лоиҳаро бе иловаи тағиротҳо, фавран пӯш
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Лоиҳа боз ёфт, ки %d файл[ҳо] -и ҷамъбастӣ партофта шудаанд(.auf).\n"
+msgstr "Лоиҳа боз ёфт, ки %d файл[ҳо] -и ҷамъбастӣ партофта шудаанд(.auf).\n"
 "Audacity метавонад ба пуррагӣ ин файлҳои ҷамбастиро дар шакли асли лоиҳа, барқарор созад."
 
 # айлҳ#: DirManager.cpp:1305
@@ -890,16 +973,14 @@ msgstr "Барои додаҳои намоишии гумшуда аз рӯи х
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Лоиҳа %d додаҳои аудиоии файл[ҳо]-ро бозёфт(.au), \n"
+msgstr "Лоиҳа %d додаҳои аудиоии файл[ҳо]-ро бозёфт(.au), \n"
 "шояд хатое вуҷуд дорад, ки ба харобии систем ё қисман тозашавии он оварда расонад.\n"
 "Audacity наметавонад додаҳои гумшударо\n"
 "ба таври автоматӣ барқарор созад; Шумо метавонед бесадо пуррасозии доимии файлҳои партофташударо\n"
@@ -935,6 +1016,95 @@ msgstr "Нигоҳдории сабти аудиои ба диски..."
 msgid "Rectangular"
 msgstr "Устувор"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:958
+#, c-format
+msgid "Location of %s:"
+msgstr "Мавқеъи %s:"
+
+#: export/ExportMP3.cpp:967
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Барои ёфтани %s --> пахш кунед"
+
+#: export/ExportMP3.cpp:973
+msgid "Browse..."
+msgstr "Баррасии..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:1011
+#, c-format
+msgid "Where is %s?"
+msgstr "%s дар куҷо ҷойгир аст?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Таҳлили басомадӣ"
@@ -963,8 +1133,9 @@ msgstr "Ҳамбастагии васеъшуда"
 msgid "Cepstrum"
 msgstr "Сепструм(муайянкунии хатогӣ)"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Алгоритм:"
 
 #: FreqWindow.cpp:168
@@ -978,9 +1149,9 @@ msgstr "Андоза"
 msgid " window"
 msgstr " равзана"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Функсия:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -990,9 +1161,9 @@ msgstr "Басомади хаттӣ"
 msgid "Log frequency"
 msgstr "Басомади сабти воқеъӣ"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Тир:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:130
@@ -1001,6 +1172,17 @@ msgstr "Тир:"
 msgid "&Export..."
 msgstr "&Содирот..."
 
+#: export/ExportCL.cpp:188
+#: export/ExportOGG.cpp:121
+#: export/ExportPCM.cpp:114
+msgid "Export"
+msgstr "Содирот"
+
+#: Dependencies.cpp:308
+#: FreqWindow.cpp:209
+msgid "Close"
+msgstr "Пӯшидан(бастан)"
+
 #: FreqWindow.cpp:272
 #: FreqWindow.cpp:395
 #: effects/AutoDuck.cpp:487
@@ -1073,6 +1255,118 @@ msgstr "Басомади (Ҳертз)\tСатҳ (дБ)"
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Таъхири (сонияҳо)\tБасомад (Ҳертз)\tСатҳ"
 
+#: HelpText.cpp:85
+msgid "To [[welcome|Welcome screen]]"
+msgstr ""
+
+#: HelpText.cpp:92
+msgid "Welcome!"
+msgstr ""
+
+#: HelpText.cpp:97
+msgid "Playing Audio"
+msgstr ""
+
+#: HelpText.cpp:101
+msgid "Recording Audio"
+msgstr ""
+
+#: HelpText.cpp:105
+msgid "Recording - Choosing the Input Device"
+msgstr ""
+
+#: HelpText.cpp:109
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
+msgstr ""
+
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
+msgstr ""
+
+#: HelpText.cpp:133
+msgid "Burn to CD"
+msgstr ""
+
+#: HelpText.cpp:137
+msgid "No Local Help"
+msgstr ""
+
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
+msgstr ""
+
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
+msgstr ""
+
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
+msgstr ""
+
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
+
 #: HistoryWindow.cpp:53
 msgid "Undo History"
 msgstr "Барҳамдиҳии амалиёт аз рӯи таърих"
@@ -1171,8 +1465,9 @@ msgstr "Роҳча"
 msgid "Label"
 msgstr "Нишона"
 
-#: LabelDialog.cpp:54
-msgid "&Start Time"
+#: LabelDialog.cpp:56 TimerRecordDialog.cpp:279
+#, fuzzy
+msgid "Start Time"
 msgstr "&Вақти оғоз"
 
 #: LabelDialog.cpp:55
@@ -1206,13 +1501,11 @@ msgid "New..."
 msgstr "Нав..."
 
 #: LabelDialog.cpp:349
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Шумо порчаи сатҳи номҳоро партофтед.  Дар вақти\n"
+msgstr "Шумо порчаи сатҳи номҳоро партофтед.  Дар вақти\n"
 "ҷамъкунии сатҳи роҳча онҳо нест мешаванд.\n"
 "\n"
 "Оё Шумо мехоҳед баргашта, номҳоро таҳия созед?"
@@ -1276,42 +1569,17 @@ msgstr "Аввал Audacity Бакордарорӣ"
 msgid "Choose Language for Audacity to use:"
 msgstr "Барои истифодабарии Audacity Забонро интихоб кунед:"
 
-#: LangChoice.cpp:103
-#: effects/AvcCompressor.cpp:738
-#: effects/TruncSilence.cpp:281
-#: effects/VST/VSTEffect.cpp:453
-#: effects/audiounits/AudioUnitEffect.cpp:877
-#: effects/nyquist/Nyquist.cpp:993
-#: effects/nyquist/Nyquist.cpp:1059
-#: widgets/Warning.cpp:67
-msgid "OK"
-msgstr "ОК"
-
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Файли лоиҳаи 1.0-ро ба қолаби нав табдил диҳед.\n"
+msgstr "Файли лоиҳаи 1.0-ро ба қолаби нав табдил диҳед.\n"
 "Файли пешина бо номи '%s' сабт шуда буд"
 
 #: Legacy.cpp:357
 msgid "Opening Audacity Project"
 msgstr "Кушодани Лоиҳаи Audacity"
 
-#. i18n-hint: here, %s is the name of a toolbar, e.g. "Control Toolbar"
-#: Menus.cpp:170
-#, c-format
-msgid "Show %s"
-msgstr "Намоиши %s"
-
-#. i18n-hint: here, %s is the name of a toolbar, e.g. "Control Toolbar"
-#: Menus.cpp:176
-#, c-format
-msgid "Hide %s"
-msgstr "Пинҳон %s"
-
 #: Menus.cpp:199
 msgid "&File"
 msgstr "&Файл"
@@ -1337,13 +1605,21 @@ msgstr "&Сабти Лоиҳа\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Сабти Лоиҳа &Ҳамчун..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:224
 msgid "Chec&k Dependencies..."
 msgstr "Санҷи&ши Вобастагиҳои..."
 
-#: Menus.cpp:228
-msgid "Open Me&tadata Editor"
-msgstr "Маро Кушо&таҳриргари фавқдодаҳо"
+#: Menus.cpp:222
+msgid "Open Me&tadata Editor..."
+msgstr ""
+
+#: Menus.cpp:229 import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr ""
 
 #: Menus.cpp:237
 msgid "&Audio...\tCtrl+Shift+I"
@@ -1374,11 +1650,27 @@ msgstr "Содирот &Нишонаҳо..."
 msgid "Export &Multiple..."
 msgstr "Содирот &Бисёркарата..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:289
 #: Menus.cpp:303
 msgid "Edit C&hains..."
 msgstr "Таҳрири З&анҷираҳо..."
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:301
 msgid "Appl&y Chain..."
 msgstr "Татб&иқи Занҷира..."
@@ -1443,9 +1735,9 @@ msgstr "&Нест кардан\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Поракунӣ Т&озакунӣ\tCtrl+Alt+K"
 
-#: Menus.cpp:385
-msgid "&Silence\tCtrl+L"
-msgstr "&Пурракунӣ аз рӯи хомушӣ\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:387
 msgid "Sp&lit\tCtrl+I"
@@ -1459,23 +1751,21 @@ msgstr "Поракунии На&в\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&Муттаҳидсозӣ\tCtrl+J"
 
-#: Menus.cpp:398
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Ҷудо&созӣ\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:400
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Нусхабард&орӣ\tCtrl+D"
 
-#: Menus.cpp:406
-#: Menus.cpp:610
-#: effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
-msgstr "&Стерео Ба Моно"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:413
-msgid "Labeled Re&gions..."
-msgstr "Маҳалҳои Ни&шонадор..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:415
@@ -1518,13 +1808,13 @@ msgid "&Join\tAlt+J"
 msgstr "&Муттаҳид\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:457
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Ҷудос&озӣ\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:463
-msgid "&Select..."
-msgstr "&Интихоби..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:464
 msgid "&All\tCtrl+A"
@@ -1534,81 +1824,69 @@ msgstr "&Ҳама\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Ягонто\tCtrl+Shift+A"
 
-#: Menus.cpp:469
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
 msgstr "Аз мавқеъи чапи хониш\t["
 
-#: Menus.cpp:470
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
 msgstr "Аз мавқеъи рости хониш\t["
 
-#: Menus.cpp:474
-msgid "Start to Cursor"
-msgstr "Ибтидо бо курсор"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: Menus.cpp:475
-msgid "Cursor to End"
-msgstr "Интиҳо бо курсор"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:481
 msgid "Find &Zero Crossings\tZ"
 msgstr "Ёфтани &Нуқтаҳлии наздиктарин\tZ"
 
-#: Menus.cpp:483
-msgid "Mo&ve Cursor..."
-msgstr "Ҷойгузо&рии Курсор..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: Menus.cpp:485
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "Ибтидо ба интихоб"
 
-#: Menus.cpp:486
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "Интиҳо ба интихоб"
 
-#: Menus.cpp:490
-msgid "to Track Start"
-msgstr "Ибтидо ба роҳча"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
+
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
 #: Menus.cpp:491
-msgid "to Track End"
-msgstr "Интиҳо ба роҳча"
+msgid "Re&gion Save"
+msgstr ""
 
-#: Menus.cpp:498
-msgid "Selection Save"
-msgstr "Интихоби сабт"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:499
-msgid "Selection Restore"
-msgstr "Интихоби барқароршуда"
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:504
-msgid "S&nap-To..."
-msgstr "Т&асвир-Ба..."
-
-#. i18n-hint: Set snap-to mode on or off
-#: Menus.cpp:507
-msgid "On"
-msgstr "Фаъол"
-
-#. i18n-hint: Set snap-to mode on or off
-#: Menus.cpp:509
-#: effects/ClickRemoval.cpp:376
-#: effects/ClickRemoval.cpp:405
-msgid "Off"
-msgstr "Хомӯш кардан"
-
-#: Menus.cpp:515
-msgid "Play &Region..."
-msgstr "Маҳали &Хониш..."
-
-#: Menus.cpp:516
-msgid "Lock"
-msgstr "Бастан"
+msgid "&Lock"
+msgstr ""
 
-#: Menus.cpp:517
-msgid "Unlock"
-msgstr "Кушодан"
+#: Menus.cpp:505
+msgid "&Unlock"
+msgstr ""
 
 #: Menus.cpp:523
 msgid "Turn Snap-To On"
@@ -1626,9 +1904,14 @@ msgstr "Пайвастани Баста Дар Тур"
 msgid "Turn Grid Snap Off"
 msgstr "Хомӯш кардани Баста Дар Тур"
 
-#: Menus.cpp:535
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Бартариҳои Audacity...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:545
 msgid "&View"
@@ -1666,73 +1949,131 @@ msgstr "&Печонидани Ҳамаи Роҳчаҳо\tCtrl+Shift+C"
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "К&ушодани Ҳамаи Роҳчаҳо\tCtrl+Shift+X"
 
+#: Menus.cpp:551
+msgid "&Show Clipping"
+msgstr ""
+
 #: Menus.cpp:568
 msgid "&History..."
 msgstr "&Таърих..."
 
-#: Menus.cpp:570
-msgid "&Experimental Display..."
-msgstr "&Намоиши таҷрибавӣ..."
-
-#: Menus.cpp:573
-msgid "&Toolbars..."
-msgstr "&Лавҳаи асбобҳои..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
-#: Menus.cpp:574
-#: Menus.cpp:1151
-#: Menus.cpp:1152
-msgid "Control Toolbar"
+#: Menus.cpp:567
+#, fuzzy
+msgid "&Control Toolbar"
 msgstr "Лавҳаи асбобҳои идоракунӣ"
 
-#: Menus.cpp:575
-#: Menus.cpp:1155
-#: Menus.cpp:1156
-msgid "Device Toolbar"
+#: Menus.cpp:568
+#, fuzzy
+msgid "&Device Toolbar"
 msgstr "Лавҳаи таҷҳизот"
 
-#: Menus.cpp:576
-#: Menus.cpp:1159
-#: Menus.cpp:1160
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+#, fuzzy
+msgid "&Edit Toolbar"
 msgstr "Лавҳаи таҳрирӣ"
 
-#: Menus.cpp:577
-#: Menus.cpp:1163
-#: Menus.cpp:1164
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+#, fuzzy
+msgid "&Meter Toolbar"
 msgstr "Лавҳаи чароғакҳо"
 
-#: Menus.cpp:578
-#: Menus.cpp:1167
-#: Menus.cpp:1168
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+#, fuzzy
+msgid "Mi&xer Toolbar"
 msgstr "Лавҳаи омезишӣ"
 
-#: Menus.cpp:579
-#: Menus.cpp:1171
-#: Menus.cpp:1172
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+#, fuzzy
+msgid "&Selection Toolbar"
 msgstr "Лавҳаи интихобӣ"
 
-#: Menus.cpp:580
-#: Menus.cpp:1175
-#: Menus.cpp:1176
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+#, fuzzy
+msgid "T&ools Toolbar"
 msgstr "Лавҳаи хадамотӣ"
 
-#: Menus.cpp:581
-#: Menus.cpp:1179
-#: Menus.cpp:1180
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+#, fuzzy
+msgid "Transcri&ption Toolbar"
 msgstr "Лавҳаи Рӯйнависӣ"
 
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:827
+msgid "Skip to Start\tHome"
+msgstr "Гузариш ба Ибтидо\tHome"
+
+#: Menus.cpp:828
+msgid "Skip to End\tEnd"
+msgstr "Гузариш ба Интиҳо\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:591
 msgid "&Tracks"
 msgstr "&Роҳчаҳо"
 
-#: Menus.cpp:598
-msgid "Add &New..."
-msgstr "Иловакунии &Нав..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:599
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1747,15 +2088,13 @@ msgstr "&Стерео Роҳча"
 msgid "&Time Track"
 msgstr "&Роҳчаи Вақт"
 
-#: Menus.cpp:605
-msgid "&Timer Record"
-msgstr "&Сабт аз рӯи ченкунандаи Вақт"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
+msgstr ""
 
-#: Menus.cpp:614
-#: Menus.cpp:3698
-#: Mix.cpp:119
-msgid "&Mix and Render"
-msgstr "&Омезиш ва Пешниҳодкунӣ"
+#: Menus.cpp:647
+msgid "Mix and Render to New Track\tCtrl+Shift+M"
+msgstr ""
 
 #: Menus.cpp:618
 msgid "&Resample..."
@@ -1765,6 +2104,14 @@ msgstr "&Бознамунагузорӣ..."
 msgid "Remo&ve Tracks"
 msgstr "Ҷойивазку&нии Роҳчаҳо"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: Menus.cpp:635
 msgid "Align with &Zero"
 msgstr "Марказонидан бо &Сифр"
@@ -1781,29 +2128,41 @@ msgstr "Марказонидан бо интихоби &Ибтидо"
 msgid "Align with Selection &End"
 msgstr "Марказонидан бо интихоби &Интиҳо"
 
-#: Menus.cpp:639
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Марказонидани Интиҳо бо Курсор"
 
-#: Menus.cpp:640
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Марказонидани Интиҳо бо Интихоби Ибтидо"
 
-#: Menus.cpp:641
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Марказонидани Интиҳо бо Интихоби Интиҳо"
 
-#: Menus.cpp:642
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Марказонидани Якҷояи Роҳчаҳо"
 
-#: Menus.cpp:644
-msgid "&Align Tracks..."
-msgstr "&Марказонидани Роҳчаҳои..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
+
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
 
-#: Menus.cpp:653
-msgid "Ali&gn And Move Cursor..."
-msgstr "Мар&казонидан Ва Ҷийдигаркунии Курсор..."
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:661
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1813,22 +2172,26 @@ msgstr "Иловаи &Нишона Дар Интихоб\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Иловаи Нишона Дар &Мавқеъи Хониш\tCtrl+M"
 
-#: Menus.cpp:668
-msgid "S&ort tracks by..."
-msgstr "Ба&тартибории роҳчаҳо аз рӯи..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:669
-msgid "&Start time"
-msgstr "&Ибтидои вақт"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:671
-msgid "&Name"
-msgstr "&Ном"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:681
 msgid "&Generate"
 msgstr "&Тавлид кардан"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:704
 msgid "Effe&ct"
 msgstr "Нати&ҷа"
@@ -1841,8 +2204,9 @@ msgstr "Такрори натиҷаи ниҳои\tCtrl+R"
 msgid "&Analyze"
 msgstr "&Таҳлил"
 
-#: Menus.cpp:742
-msgid "&Plot Spectrum..."
+#: Menus.cpp:879
+#, fuzzy
+msgid "Plot Spectrum..."
 msgstr "&Кашидани тасвири Спектрум..."
 
 #: Menus.cpp:775
@@ -1854,17 +2218,37 @@ msgstr "&Мадад"
 msgid "&About Audacity CleanSpeech..."
 msgstr "&Нутқи Тозаи Audacity..."
 
+#: Menus.cpp:957
+msgid "&Show Welcome Message..."
+msgstr ""
+
+#: Menus.cpp:958
+msgid "&Index..."
+msgstr ""
+
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
+#: Menus.cpp:967
+msgid "&Screenshot Tools..."
+msgstr ""
+
 #: Menus.cpp:791
 msgid "&Run Benchmark..."
 msgstr "&Боркунии Озмоишии..."
 
-#: Menus.cpp:800
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Даври гузаштаи ба воситаи ҳавза, Намуди Роҳча ва Интихоби Сутун\tCtrl+Shift+F6"
+#: Menus.cpp:972
+msgid "&Audio Device Info..."
+msgstr ""
 
-#: Menus.cpp:801
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Даври оянда ба воситаи ҳавза, Намуди Роҳча ва Интихоби Сутун\tCtrl+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
+
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:804
 msgid "Selection Tool\tF1"
@@ -1898,9 +2282,9 @@ msgstr "Афзори Навбатӣ\tD"
 msgid "Previous Tool\tA"
 msgstr "Афзори Пешина\tA"
 
-#: Menus.cpp:814
-msgid "Play/Stop\tSpacebar"
-msgstr "Хониш/Боздорӣ\tФазосутун"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:815
 msgid "Stop\tS"
@@ -1914,9 +2298,13 @@ msgstr "Таваққуф\tP"
 msgid "Record\tR"
 msgstr "Сабт\tR"
 
-#: Menus.cpp:819
-msgid "Stop and Select\tShift+A"
-msgstr "Боздорӣ ва Интихоб\tShift+A"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
+msgstr ""
+
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
+msgstr ""
 
 #: Menus.cpp:821
 msgid "Play One Second\t1"
@@ -1930,22 +2318,14 @@ msgstr "Хониш Ба Интихоб\tB"
 msgid "Play Looped\tL"
 msgstr "Хониш давравӣ\tL"
 
-#: Menus.cpp:824
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Хониши давравӣ\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:825
 msgid "Play Cut Preview\tC"
 msgstr "Хониши Ташхиси натиҷавии Буриш\tC"
 
-#: Menus.cpp:827
-msgid "Skip to Start\tHome"
-msgstr "Гузариш ба Ибтидо\tHome"
-
-#: Menus.cpp:828
-msgid "Skip to End\tEnd"
-msgstr "Гузариш ба Интиҳо\tEnd"
-
 #: Menus.cpp:830
 msgid "Selection to Start\tShift+Home"
 msgstr "Интихоб ба Ибтидо\tShift+Home"
@@ -2002,9 +2382,9 @@ msgstr "Банизомдарории Роҳчаи Дупоя\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Банизомдарории Роҳчаи Дупоя\tNUMPAD_ENTER"
 
-#: Menus.cpp:857
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Банизомдарории Роҳчаи Дупоя\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:859
 msgid "Cursor Left\tLeft"
@@ -2014,6 +2394,22 @@ msgstr "Курсори Чап\tLeft"
 msgid "Cursor Right\tRight"
 msgstr "Курсори Рост\tRight"
 
+#: Menus.cpp:1044
+msgid "Cursor Short Jump Left\t,"
+msgstr ""
+
+#: Menus.cpp:1045
+msgid "Cursor Short Jump Right\t."
+msgstr ""
+
+#: Menus.cpp:1046
+msgid "Cursor Long Jump Left\tShift+,"
+msgstr ""
+
+#: Menus.cpp:1047
+msgid "Cursor Long Jump Right\tShift+."
+msgstr ""
+
 #: Menus.cpp:861
 msgid "Selection Extend Left\tShift+Left"
 msgstr "Интихоби Густурдаи Чап\tShift+Left"
@@ -2022,6 +2418,14 @@ msgstr "Интихоби Густурдаи Чап\tShift+Left"
 msgid "Selection Extend Right\tShift+Right"
 msgstr "Интихоби Густурдаи Рост\tShift+Right"
 
+#: Menus.cpp:1052
+msgid "Set (or Extend) Left Selection"
+msgstr ""
+
+#: Menus.cpp:1053
+msgid "Set (or Extend) Right Selection"
+msgstr ""
+
 #: Menus.cpp:864
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "Интихоби Санади Чап\tCtrl+Shift+Right"
@@ -2070,15 +2474,27 @@ msgstr "Пайвастан /Хомӯшкунии соло барои роҳча
 msgid "Close focused track\tShift+C"
 msgstr "Пӯшидани роҳчаи фаъол\tShift+C"
 
+#: Menus.cpp:1069
+msgid "Snap To On"
+msgstr ""
+
+#: Menus.cpp:1070
+msgid "Snap To Off"
+msgstr ""
+
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:890
 msgid "Open Recent"
 msgstr "Кушодани файлҳои Қаблӣ"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:893
-msgid "Recent &Files..."
-msgstr "Файлҳои &Қаблӣ..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:940
 #, c-format
@@ -2135,6 +2551,23 @@ msgstr "Такрор %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Нишонагузории роҳчаҳо иҷро намешаванд."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2224
 msgid "Nothing to undo"
 msgstr "Барҳамдиҳӣ ҷой надорад"
@@ -2178,6 +2611,10 @@ msgstr "Гузориши матн аз буфери табадулот"
 msgid "Pasted from the clipboard"
 msgstr "Гузориш аз буфери табадулот"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2550
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Нусхабардории стерео ба аудио иҷозат дода намешавад."
@@ -2334,11 +2771,6 @@ msgstr "Барои сохтани спектрум, ҳамаи роҳчаҳои
 msgid "Too much audio was selected.  Only the first %.1f seconds of audio will be analyzed."
 msgstr "Аудио барзиёд интихоб шуд.  Танҳо %.1f сонияҳои аввали аудио ташхис мешаванд."
 
-#: Menus.cpp:3489
-#: Project.cpp:1626
-msgid "Select one or more audio files..."
-msgstr "Интихоби як ё якчанд файлҳои аудиои..."
-
 #: Menus.cpp:3551
 #, c-format
 msgid "Imported labels from '%s'"
@@ -2352,9 +2784,9 @@ msgstr "Воридоти Нишонаҳо"
 msgid "Select a MIDI file..."
 msgstr "Интихоби MIDI файл..."
 
-#: Menus.cpp:3566
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Ҳамаи файлҳо (*.*)|*.*|Файлҳои MIDI (*.mid)|*.mid|Файлҳои Allegro (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3582
 #, c-format
@@ -2373,26 +2805,17 @@ msgstr "Интихоби файлҳои аудиоии ғайрифишурда
 msgid "All files (*)|*"
 msgstr "Ҳамаи файлҳо (*)|*"
 
-#: Menus.cpp:3616
-#: Project.cpp:2419
-#: Project.cpp:2444
-#: import/ImportPCM.cpp:405
-#: import/ImportPCM.cpp:449
-#: import/ImportRaw.cpp:446
-msgid "Import"
-msgstr "Воридот"
-
-#: Menus.cpp:3635
-msgid "Edit ID3 Tags (for MP3 exporting)"
-msgstr "Таҳрири Теғаҳои ID3 (барои воридоти MP3)"
+#: Menus.cpp:4206
+msgid "Edit the metadata tags"
+msgstr ""
 
-#: Menus.cpp:3636
-msgid "Edit ID3 Tags"
-msgstr "Таҳрири Теғаи ID3"
+#: Menus.cpp:4207 export/Export.cpp:353
+msgid "Edit Metadata"
+msgstr ""
 
-#: Menus.cpp:3636
-msgid "Edit ID3 tags"
-msgstr "Таҳрир теғаҳои ID3"
+#: Menus.cpp:4207
+msgid "Edit Metadata tags"
+msgstr ""
 
 #: Menus.cpp:3687
 #, c-format
@@ -2413,6 +2836,12 @@ msgstr "%d роҳчаҳо дар як стерео роҳчаи нав пешн
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "%dроҳчаҳо дар як моно роҳчаи нав пешниҳодшуд ва омехта шуданд"
 
+#: Menus.cpp:614
+#: Menus.cpp:3698
+#: Mix.cpp:119
+msgid "&Mix and Render"
+msgstr "&Омезиш ва Пешниҳодкунӣ"
+
 #: Menus.cpp:3815
 msgid "Aligned with zero"
 msgstr "Ҷобаҷогузори бо сифр"
@@ -2449,6 +2878,14 @@ msgstr "Ҷобаҷогузошта"
 msgid "Align"
 msgstr "Ҷобаҷогузорӣ"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3899
 msgid "Created new audio track"
 msgstr "Созиши роҳчаи нави аудиоии нав"
@@ -2515,14 +2952,14 @@ msgid "Removed audio track(s)"
 msgstr "Роҳча(ҳо)и аудиоии ҷобаҷогузошташуда"
 
 #: Menus.cpp:4380
-msgid "Enter new samplerate:"
-msgstr "Воридкунии намунагири нав:"
-
-#: Menus.cpp:4380
 #: Menus.cpp:4399
 msgid "Resample"
 msgstr "Бознамунагирӣ"
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4386
 msgid "The entered value is invalid"
 msgstr "Ифодаи воридшуда нодуруст аст"
@@ -2589,13 +3026,50 @@ msgstr "Аудиои Сабтшуда"
 msgid "Save changes before closing?"
 msgstr "Тағиротҳо пеш аз пӯшидан сабт шаванд?"
 
+#: Project.cpp:1570
+msgid "\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
+msgstr ""
+
 #: Project.cpp:1457
 msgid "Save changes?"
 msgstr "Тағиротҳо сабт шаванд?"
 
-#: Project.cpp:1629
-msgid "Music files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
-msgstr "Файлҳои мусиқӣ (*.wav;*.mp3)|*.wav;*.mp3|WAV файлҳо (*.wav)|*.wav|MP3 файлҳо (*.mp3)|*.mp3"
+#: Project.cpp:1775
+msgid "All files|*.*|All supported files|"
+msgstr ""
+
+#: Menus.cpp:3489
+#: Project.cpp:1626
+msgid "Select one or more audio files..."
+msgstr "Интихоби як ё якчанд файлҳои аудиои..."
+
+#: Project.cpp:1832
+msgid "Audacity projects|*.aup|"
+msgstr ""
+
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:2035
+msgid "Opening old project file"
+msgstr "Кушодашавии лоиҳаи куҳнаи файл"
 
 #: Project.cpp:1704
 #: Project.cpp:1712
@@ -2604,11 +3078,9 @@ msgstr "Хатои кушодашавии файл"
 
 #: Project.cpp:1718
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Файл нодуруст ё вайрон аст: \n"
+msgstr "Файл нодуруст ё вайрон аст: \n"
 "%s"
 
 #: Project.cpp:1719
@@ -2647,12 +3119,10 @@ msgstr "Лоиҳаи додаи пӯша ёфт нашуд: \"%s\""
 
 #: Project.cpp:2019
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Ин файл дар вақти истифодаи Audacity сабт шуд %s.\n"
+msgstr "Ин файл дар вақти истифодаи Audacity сабт шуд %s.\n"
 "Шумо бо Audacity кор мекунед%s - ба Шумо лозим меояд, ки барои кушодани ин файл \n"
 "тариқаи навини онро насб намоед."
 
@@ -2660,34 +3130,34 @@ msgstr ""
 msgid "Can't open project file"
 msgstr "Лоиҳаи файлро кушода наметавонад"
 
-#: Project.cpp:2031
+#: Project.cpp:2314
 #, c-format
-msgid ""
-"This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to open this file right now anyway?"
+"Open this file now?"
 msgstr ""
-"Ин файл бо ёрии Audacity%s сабт шуд ва шакли он \n "
-"иваз гардид. Ин тариқаи Audacity "
-"кӯшиши кушодани\n файлро надорад, шояд дар ин маврид хатоҳо ба амал оянд/  Шумо бояд аввал ба кори лоиҳа баргардед ва онро сабт намоед.\n"
-".\n"
-"Шумо ин файлро дар айни ҳол кушодан мехоҳед?"
 
-#: Project.cpp:2035
-msgid "Opening old project file"
-msgstr "Кушодашавии лоиҳаи куҳнаи файл"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
 
-#: Project.cpp:2258
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Лоиҳа сабт нашуд. Шояд%s ин сабтнашаванда аст,\n"
-"ё диск ҷойи холӣ надорад."
 
 #: Project.cpp:2260
 #: Project.cpp:2274
@@ -2699,23 +3169,20 @@ msgstr "Хатои сабти лоиҳа"
 msgid "Saved %s"
 msgstr "Сабт шуд %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2352
-msgid "Raw"
-msgstr "Носуфта"
-
-#: Project.cpp:2357
-#: import/ImportPCM.cpp:361
-#, c-format
-msgid "Importing %s File..."
-msgstr "Вориди %s Файли..."
-
 #: Project.cpp:2418
 #, c-format
 msgid "Imported '%s'"
 msgstr "Вориди '%s'"
 
+#: Menus.cpp:3616
+#: Project.cpp:2419
+#: Project.cpp:2444
+#: import/ImportPCM.cpp:405
+#: import/ImportPCM.cpp:449
+#: import/ImportRaw.cpp:446
+msgid "Import"
+msgstr "Воридот"
+
 #: Project.cpp:2458
 msgid "Error importing"
 msgstr "Воридшавии хато"
@@ -2728,19 +3195,23 @@ msgstr "Сабти Нутқ Ҳамчун:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Файли аудиоии Windows PCM (*.wav)|*.wav"
 
-#: Project.cpp:2507
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Файлҳои лоиҳаи Audacity (.aup) ҳамаи маводи коркардаи Шуморо ба тариқаи аслиаш сабт мекунад\n"
-"аммо дигар барномаҳо файлҳои лоиҳаи Audacity-ро кушода наметавонанд.\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Вақте Шумо сабти мехоҳед файлеро ки ба воситаи дигар барномаҳо кушода шавад,  кунед яке аз барномаҳои берунаро интихоб намоед\n"
-"Содироти фармонҳо."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2510
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2785,6 +3256,16 @@ msgstr "Фазои диск барои сабт %d дақиқа дорад."
 msgid "Out of disk space"
 msgstr "Фазои озод дар диск"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3161
 msgid "Could not remove old autosave file: "
 msgstr "Файлҳои қаблии худсабтшударо ҷойгузорӣ карда нашуд: "
@@ -2801,15 +3282,12 @@ msgstr "Хато дар ҳолати худсабтшавии файл"
 msgid "Could not create autosave file: "
 msgstr "Созиши файли худсабт номумкин аст: "
 
-#: Project.cpp:3247
+#: Project.cpp:3722
 #, c-format
-msgid "Actual Rate %d"
+#, fuzzy
+msgid "Actual Rate: %d"
 msgstr "Зудии Ҷойдошта %d"
 
-#: Project.cpp:3364
-msgid "All files (*.*)|*.*|Audacity projects (*.aup)|*.aup|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|MP2/MPEG files (*.mp2;*.mpa;*.mpg;*.mpeg)|*.mp2;*.mpa;*.mpg;*.mpeg|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac|List of Files (*.lof)|*.lof"
-msgstr "Ҳамаи файлҳо (*.*)|*.*|Лоиҳахои Audacity (*.aup)|*.aup|WAV файлҳо(*.wav)|*.wav|AIFFфайлҳо (*.aif)|*.aif|AU файлҳо (*.au)|*.au|MP3 файлҳо (*.mp3)|*.mp3|MP2/MPEG файлҳо (*.mp2;*.mpa;*.mpg;*.mpeg)|*.mp2;*.mpa;*.mpg;*.mpeg|Ogg Vorbis файлҳо (*.ogg)|*.ogg|FLAC файлҳо (*.flac)|*.flac|Варақаи дохилкунии Файлҳо (*.lof)|*.lof"
-
 #: Resample.cpp:42
 msgid "Libresample by Dominic Mazzoni and Julius Smith"
 msgstr "Намунагузорӣ бо ёрии Доминик Мазони ва Хулиус Смис"
@@ -2851,120 +3329,107 @@ msgstr "24-бит ПСМ"
 msgid "32-bit float"
 msgstr "32-бит float"
 
+#: Screenshot.cpp:384
+msgid "Saved "
+msgstr ""
+
+#: Screenshot.cpp:387
+msgid "Error trying to save file: "
+msgstr ""
+
 #: Sequence.cpp:732
 #: Sequence.cpp:742
 #: Sequence.cpp:749
 msgid "Gap detected in project file\n"
 msgstr "Фосила дар лоиҳаи файл бозёфт шуд\n"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Сабти Замонсанҷи Audacity"
+#: effects/Effect.cpp:255
+#: effects/Effect.cpp:382
+#: effects/Phaser.cpp:595
+#: effects/Wahwah.cpp:582
+#: effects/audiounits/AudioUnitEffect.cpp:872
+msgid "Pre&view"
+msgstr "Пеш&намоиш"
 
-#: SmartRecordDialog.cpp:212
-msgid "Recording start: "
-msgstr "Ибтидои сабтшавӣ: "
+#: effects/nyquist/Nyquist.cpp:826
+#: effects/nyquist/Nyquist.cpp:990
+msgid "&Debug"
+msgstr "&Ислоҳи хато"
 
-#: SmartRecordDialog.cpp:213
-msgid ""
-"\n"
-"\n"
-"Recording end:   "
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
-"\n"
-"\n"
-"Анҷоми сабтшавӣ:   "
-
-#: SmartRecordDialog.cpp:214
-msgid "          Duration: "
-msgstr "          Давомнокӣ: "
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr "Ҷараёни Сабти Қавии Audacity "
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr "Оғози Сана ва Вақт "
 
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr "Анҷоми Сана ва Вақт"
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr "Давомнокӣ"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
-#: SmartRecordDialog.cpp:361
-msgid "Waiting to start recording at "
-msgstr "Интизоршавии сабт дар "
+#: SplashDialog.cpp:60
+msgid "&Welcome to Audacity!"
+msgstr ""
 
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Сабти Зудӣ Audacity -Оғозро Интизор Аст"
+#: SplashDialog.cpp:112
+msgid "Don't show this again at start up"
+msgstr ""
 
-#: Tags.cpp:701
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Давомнокии максималии атрибути'%s' ба %d баробар аст. Дода хароб аст."
+#: Tags.cpp:640
+msgid "Artist Name"
+msgstr ""
 
-#: Tags.cpp:707
-#: Tags.cpp:917
-msgid "Title"
-msgstr "Сарлавҳа"
+#: Tags.cpp:641
+msgid "Track Title"
+msgstr ""
 
-#: Tags.cpp:717
-#: Tags.cpp:927
-msgid "Artist"
-msgstr "Иҷрокунанда"
+#: Tags.cpp:642
+msgid "Album Title"
+msgstr ""
 
-#: Tags.cpp:727
-#: Tags.cpp:937
-msgid "Album"
-msgstr "Албом"
+#: Tags.cpp:953
+msgid "Track Number"
+msgstr "Рақами роҳча"
 
 #: Tags.cpp:737
 #: Tags.cpp:963
 msgid "Year"
 msgstr "Сол"
 
+#: Tags.cpp:979
+msgid "Genre"
+msgstr "Услуб"
+
 #: Tags.cpp:747
 #: Tags.cpp:996
 #: prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Шарҳ"
 
-#: Tags.cpp:903
-msgid "ID3v1 (more compatible)"
-msgstr "ID3v1 (бештар мутобиқ)"
-
-#: Tags.cpp:904
-msgid "ID3v2 (more flexible)"
-msgstr "ID3v2 (бештар суфта)"
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
-#: Tags.cpp:906
-msgid "Format"
-msgstr "Формат"
+#: Tags.cpp:813
+msgid "Tag Name"
+msgstr ""
 
-#: Tags.cpp:953
-msgid "Track Number"
-msgstr "Рақами роҳча"
+#: Tags.cpp:814
+msgid "Tag Value"
+msgstr ""
 
-#: Tags.cpp:979
-msgid "Genre"
-msgstr "Услуб"
+#: prefs/KeyConfigPrefs.cpp:116
+msgid "&Clear"
+msgstr "&Тоза кардан"
 
-#: Tags.cpp:1048
-msgid "&Fewer"
-msgstr "&Камтар"
+#: Tags.cpp:835
+msgid "Genres"
+msgstr ""
 
-#: Tags.cpp:1053
-msgid "&More"
-msgstr "&Зиёд"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:1060
-msgid "&Done"
-msgstr "&Омода"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:1070
 msgid "Template"
@@ -2980,113 +3445,173 @@ msgstr "&Боргирии..."
 msgid "&Save..."
 msgstr "&Захира кардан..."
 
-#: Tags.cpp:1085
-msgid "S&et default"
+#: Tags.cpp:852 Tags.cpp:1477 Tags.cpp:2004
+#, fuzzy
+msgid "S&et Default"
 msgstr "Н&асб аз рӯи хомушӣ"
 
+#: Tags.cpp:1002 Tags.cpp:1640 Tags.cpp:2368
+msgid "Edit Genres"
+msgstr ""
+
+#: Tags.cpp:1035 Tags.cpp:1047 Tags.cpp:1062 Tags.cpp:1075 Tags.cpp:1678
+#: Tags.cpp:1690 Tags.cpp:1705 Tags.cpp:1718 Tags.cpp:2411 Tags.cpp:2423
+#: Tags.cpp:2438 Tags.cpp:2451
+msgid "Reset Genres"
+msgstr ""
+
+#: Tags.cpp:1035 Tags.cpp:1075 Tags.cpp:1678 Tags.cpp:1718 Tags.cpp:2411
+#: Tags.cpp:2451
+msgid "Unable to save genre file."
+msgstr ""
+
+#: Tags.cpp:1046 Tags.cpp:1689 Tags.cpp:2422
+msgid "Are you sure you want to reset the genre list to defaults?"
+msgstr ""
+
+#: Tags.cpp:1062 Tags.cpp:1705 Tags.cpp:2438
+msgid "Unable to open genre file."
+msgstr ""
+
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1122 Tags.cpp:1772 Tags.cpp:2494
+msgid "Error loading metadata"
+msgstr ""
+
+#: Tags.cpp:1097 Tags.cpp:1151 Tags.cpp:1751 Tags.cpp:1787 Tags.cpp:2473
+#: Tags.cpp:2509
+msgid "Save Metadata As:"
+msgstr ""
+
 #: Theme.cpp:628
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity натавонист файлро сабт кунад:\n"
+msgstr "Audacity натавонист файлро сабт кунад:\n"
 "  %s."
 
 #: Theme.cpp:646
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity натавонист файлро кушояд:\n"
+msgstr "Audacity натавонист файлро кушояд:\n"
 "  %s\n"
 "барои сабт."
 
 #: Theme.cpp:654
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity натавонист тасвирро дар файл сабт кунад:\n"
+msgstr "Audacity натавонист тасвирро дар файл сабт кунад:\n"
 "  %s."
 
 #: Theme.cpp:789
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity файлро наёфт:\n"
+msgstr "Audacity файлро наёфт:\n"
 "  %s.\n"
 "Мавзӯъ бор карда нашуд."
 
 #: Theme.cpp:797
 #: Theme.cpp:885
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity файли боршударо наёфт:\n"
+msgstr "Audacity файли боршударо наёфт:\n"
 "  %s.\n"
 "Шояд тариқаи пнг нодуруст аст?"
 
 #: Theme.cpp:813
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity мавзуъро аз рӯи хомушӣ хонда натавонист.\n"
+msgstr "Audacity мавзуъро аз рӯи хомушӣ хонда натавонист.\n"
 "Лутфан, камбудии масъаларо баррасӣ намоед."
 
 #: Theme.cpp:907
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Ягон мавзӯи интизоршудаи қисмати файлҳо\n"
+msgstr "Ягон мавзӯи интизоршудаи қисмати файлҳо\n"
 " ёфт нашуданд:\n"
 "  %s."
 
 #: Theme.cpp:931
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"каталогро эҷод карда натавонист:\n"
+msgstr "каталогро эҷод карда натавонист:\n"
 "  %s"
 
 #: Theme.cpp:952
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Audacity файлро захира карда натавонист:\n"
+msgstr "Audacity файлро захира карда натавонист:\n"
 "  %s"
 
 #: Theme.cpp:964
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Ҳамаи файлҳои дархостшуда :\n"
+msgstr "Ҳамаи файлҳои дархостшуда :\n"
 "  %s\n"
 "аллакай мавҷуданд."
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
-msgstr "Муайянкунии вақт"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr "Давомнокӣ"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Сабти Замонсанҷи Audacity"
+
+#: TimerRecordDialog.cpp:224
+msgid "Recording start"
+msgstr ""
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr "Оғози Сана ва Вақт "
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr "Анҷоми Сана ва Вақт"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:381
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
 
 #: TrackPanel.cpp:452
 #: TrackPanel.cpp:453
@@ -3129,6 +3654,10 @@ msgstr "Мавҷшакл"
 msgid "Waveform (dB)"
 msgstr "Мавҷшакл (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: TrackPanel.cpp:512
 msgid "Pitch (EAC)"
 msgstr "Баландии садо (EAC)"
@@ -3280,13 +3809,13 @@ msgstr "Вақти роҳчаҳо/клип %s %.02f сония ҷойгардо
 msgid "Time-Shift"
 msgstr "Вақт-Ҷойгардонӣ"
 
-#: TrackPanel.cpp:2700
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "Кашидани кори ҷорӣ бо ҷадвали мавҷшакл."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: TrackPanel.cpp:2717
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Шумо тасвирро ба миқдори лозимӣ калон накардед.Ин амалиётро то намунаҳои индивудуалӣ шудан калон намоед."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: TrackPanel.cpp:2988
 msgid "Moved Sample"
@@ -3358,6 +3887,14 @@ msgstr "Васеъкунӣ"
 msgid "Expanded Cut Line"
 msgstr "Васеъшавии Хати Буриш"
 
+#: TrackPanel.cpp:4164
+msgid "Merge"
+msgstr ""
+
+#: TrackPanel.cpp:4164
+msgid "Merged Clips"
+msgstr ""
+
 #: TrackPanel.cpp:3937
 msgid "Removed Cut Line"
 msgstr "Хати Буриш Ҷой иваз шудааст"
@@ -3370,6 +3907,14 @@ msgstr "Панорамаи муратабшуда"
 msgid "Adjusted gain"
 msgstr "Шиддати муратабшуда"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5432
 msgid "Can't delete track with active audio"
 msgstr "Роҳчаро бо аудиои фаъол тоза карда наметавонад"
@@ -3427,14 +3972,6 @@ msgstr "Ивази Басомад"
 msgid "Format Change"
 msgstr "Ивази Шакл"
 
-#: TrackPanel.cpp:5822
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Вориди намунаи басомад дар Hz (дар сония) байни 1 ва 100000:"
-
-#: TrackPanel.cpp:5832
-msgid "Invalid rate."
-msgstr "Басомади нодуруст."
-
 #: TrackPanel.cpp:5852
 msgid "Change lower speed limit (%) to:"
 msgstr "Ивазшавии сарҳади поёнии суръат(%) ба:"
@@ -3479,14 +4016,18 @@ msgstr "Ивази Номи '%s' ба '%s'"
 msgid "Name Change"
 msgstr "Тағйири Ном"
 
-#: TrackPanel.cpp:5986
-msgid "Choose a font for Label Tracks"
-msgstr "Интихоби қалам(шрифт) барои нишонаи роҳчаҳо"
-
 #: TrackPanel.cpp:5987
 msgid "Label Track Font"
 msgstr "Нишонаи Қалам(шрифт)и Роҳча"
 
+#: TrackPanel.cpp:6592 TrackPanel.cpp:6598
+msgid "Face name"
+msgstr ""
+
+#: TrackPanel.cpp:6602 TrackPanel.cpp:6609
+msgid "Face size"
+msgstr ""
+
 #: TrackPanel.cpp:6427
 msgid "Mute"
 msgstr "Бесадо"
@@ -3569,6 +4110,33 @@ msgstr "Дастаҳои иттисоли 1 ба %i"
 msgid "Plugins %i to %i"
 msgstr "Дастаҳои иттисоли %i ба %i"
 
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr ""
+
+#: commands/CommandManager.cpp:892
+msgid "You can only do this when playing and recording are\n"
+" stopped.  [Pausing is not sufficient.]"
+msgstr ""
+
+#: commands/CommandManager.cpp:894
+msgid "You must first select some stereo audio for this\n"
+" to use.  [You can't use this with mono.]"
+msgstr ""
+
+#: commands/CommandManager.cpp:896
+msgid "You must first select some audio for this to use."
+msgstr ""
+
+#: commands/CommandManager.cpp:898
+msgid "You must first select some audio for this\n"
+" to use. [Selecting other kinds of track won't work.]"
+msgstr ""
+
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
+
 #: commands/CommandManager.cpp:854
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
@@ -3587,14 +4155,19 @@ msgstr "Натиҷаи корфармуда: %s %.1f dB"
 msgid "Amplify"
 msgstr "Тақвият додан"
 
-#: effects/Amplify.cpp:153
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Тақвиятдиҳӣ бо ёрии Доминик Мазони"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:160
 msgid "Amplification (dB):"
 msgstr "Тақвиятдиҳӣ (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:180
 msgid "New Peak Amplitude (dB):"
 msgstr "Доманаи Нави Қулла (dB):"
@@ -3603,6 +4176,10 @@ msgstr "Доманаи Нави Қулла (dB):"
 msgid "Allow clipping"
 msgstr "Иҷозати буриш"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "Тақвиятдиҳии..."
@@ -3689,14 +4266,25 @@ msgstr "Даки худкор..."
 msgid "Processing Auto Duck..."
 msgstr "Пардозиши Auto Duck..."
 
+#: LangChoice.cpp:103
+#: effects/AvcCompressor.cpp:738
+#: effects/TruncSilence.cpp:281
+#: effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:877
+#: effects/nyquist/Nyquist.cpp:993
+#: effects/nyquist/Nyquist.cpp:1059
+#: widgets/Warning.cpp:67
+msgid "OK"
+msgstr "ОК"
+
 #: effects/BassBoost.cpp:52
 #, c-format
 msgid "Applied effect: %s frequency = %.0f Hz, boost = %.0f dB"
 msgstr "Кор фармудани натиҷа: %s басомад = %.0f Hz, баландкунӣ = %.0f dB"
 
 #: effects/BassBoost.cpp:169
-msgid "BassBoost"
-msgstr "Садои баланд"
+msgid "Bass Boost"
+msgstr ""
 
 #: effects/BassBoost.cpp:182
 msgid "by Nasca Octavian Paul"
@@ -3706,10 +4294,18 @@ msgstr "бо ёрии Наска Октавиан Паул"
 msgid "Frequency (Hz):"
 msgstr "Басомади (Ҳз):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Баландкунӣ (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Садои баланди..."
@@ -3750,9 +4346,50 @@ msgstr "бо ёрии Вахан Ҷонсон ва Доминик Мазони"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "истифодаи SoundTouch, бо ёрии Оли Парваинин"
 
-#: effects/ChangePitch.cpp:266
-msgid "Pitch:   from"
-msgstr "Баландкун:   аз"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:303
+msgid "Semitones (half-steps):"
+msgstr "Нимоҳангҳо (ним-қадамҳо):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:288
 #: effects/ChangePitch.cpp:334
@@ -3762,13 +4399,9 @@ msgstr "Баландкун:   аз"
 msgid "to"
 msgstr "ба"
 
-#: effects/ChangePitch.cpp:303
-msgid "Semitones (half-steps):"
-msgstr "Нимоҳангҳо (ним-қадамҳо):"
-
-#: effects/ChangePitch.cpp:322
-msgid "Frequency (Hz):   from"
-msgstr "Басомади (Ҳз):   аз"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:357
 #: effects/ChangeSpeed.cpp:323
@@ -3776,6 +4409,11 @@ msgstr "Басомади (Ҳз):   аз"
 msgid "Percent Change:"
 msgstr "Ивази Фоиз:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Ивази баландкунӣ..."
@@ -3794,6 +4432,14 @@ msgstr "Натиҷаи корфармудашуда: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Ивазшавии суръат"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:356
+msgid "n/a"
+msgstr "д/н"
+
 #: effects/ChangeSpeed.cpp:300
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Ивазшавии суръат ба зарба ва баландкунӣ таъсир мерасонад"
@@ -3802,17 +4448,17 @@ msgstr "Ивазшавии суръат ба зарба ва баландкун
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "истифодаи SampleRate, бо ёрии Эрик де Кастро Лопо"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:356
-msgid "n/a"
-msgstr "д/н"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:359
-msgid "Standard Vinyl RPM:   from"
-msgstr "Низоми Vinyl RPM:   аз"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -3830,13 +4476,29 @@ msgstr "Ивазшавии зарба"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Ивазшавии зарба бе ивази баландкунӣ"
 
-#: effects/ChangeTempo.cpp:226
-msgid "Beats per Minute (BPM):   from"
-msgstr "Тапиш дар ҳар дақиқа (BPM):   аз"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:256
-msgid "Length (seconds):   from"
-msgstr "Дарозӣ(сонияҳо):   аз"
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -3846,49 +4508,29 @@ msgstr "Ивазшавии зарбаи..."
 msgid "Changing Tempo"
 msgstr "Ивазшавии зарба"
 
-#: effects/ClickRemoval.cpp:104
-msgid "Click and Pop Removal"
-msgstr "Пахш ва ҷойгузории мусиқӣ"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
+msgstr ""
 
 #: effects/ClickRemoval.cpp:359
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Пахш ва ҷойгузории мусиқӣ бо ёрии Крег DeForest"
 
-#: effects/ClickRemoval.cpp:365
-msgid "Settings"
-msgstr "Танзимот"
-
-#: effects/ClickRemoval.cpp:368
-msgid ""
-"\n"
-"Select threshold (lower is more sensitive)"
+#: effects/ClickRemoval.cpp:341
+msgid "Select threshold (lower is more sensitive):"
 msgstr ""
-"\n"
-"Интихоби остона (бештар поёни боэътимод)"
 
-#: effects/ClickRemoval.cpp:379
-#: effects/ClickRemoval.cpp:408
-msgid "Medium"
-msgstr "Муҳит"
-
-#: effects/ClickRemoval.cpp:382
-#: effects/ClickRemoval.cpp:411
-msgid "Max"
-msgstr "Баландтарин"
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
 
-#: effects/ClickRemoval.cpp:389
-msgid ""
-"\n"
-"\n"
-"Max spike width (higher is more sensitive)"
+#: effects/ClickRemoval.cpp:353
+msgid "Max spike width (higher is more sensitive):"
 msgstr ""
-"\n"
-"\n"
-"Васеъшавии дандонадор бештар (арзишаш бештар аст)"
 
-#: effects/ClickRemoval.cpp:422
-msgid "&Remove clicks"
-msgstr "&Ҷобаҷогузорӣ ҳангоми пахш"
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
 
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
@@ -3902,42 +4544,86 @@ msgstr "Ҷойивазсозии пахшҳо ва мусиқаҳо..."
 msgid "Dynamic Range Compressor"
 msgstr "Фишордиҳандаи соҳаи пӯё"
 
-#: effects/Compressor.cpp:468
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Фишордиҳандаи соҳаи пӯё(динамик) бо ёрии Доминик Мазони"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:486
-msgid "Ratio: "
-msgstr "Нисбат: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:493
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Ҳамлаи вақт"
 
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:504
 msgid "Normalize to 0dB after compressing"
 msgstr "Ханҷорсозӣ(нормалӣ) ба 0dB баъди фишордиҳӣ"
 
-#: effects/Compressor.cpp:559
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Остона: %d dB"
 
-#: effects/Compressor.cpp:562
+#: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Нисбат: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:564
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Нисбат: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Ҳамлаи вақт: %.1f сон-ҳо"
 
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+msgid "Decay Time %.1f secs"
+msgstr ""
+
 #: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "Фишордиҳандаи..."
@@ -3946,6 +4632,250 @@ msgstr "Фишордиҳандаи..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Корфармоии фишордиҳандаи соҳаи пӯёи..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:324
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Ибтидо"
+
+#: effects/ToneGen.cpp:325
+#: toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:130
+#: toolbars/SelectionBar.cpp:228
+msgid "End"
+msgstr "Интиҳо"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:840 Tags.cpp:1990
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: AboutDialog.cpp:251
+msgid "Information"
+msgstr "Иттилоот"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Идоракунӣ"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr "Муваллиди оҳанги DTMF"
@@ -3958,9 +4888,14 @@ msgstr "бо ёрии Салво Вентура (2006)"
 msgid "DTMF sequence:"
 msgstr "басомади DTMF:"
 
-#: effects/DtmfGen.cpp:393
-msgid "DTMF duration:"
-msgstr "Давомнокии DTMF:"
+#: effects/ToneGen.cpp:295
+#: effects/ToneGen.cpp:328
+msgid "Amplitude (0-1)"
+msgstr "Доманаи (0-1)"
+
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
+msgstr ""
 
 #: effects/DtmfGen.cpp:411
 msgid "Tone/silence ratio:"
@@ -3985,8 +4920,9 @@ msgstr "мс"
 msgid "Silence duration:"
 msgstr "Давомнокии хомӯшӣ:"
 
-#: effects/DtmfGen.h:41
-msgid "&DTMF Tones..."
+#: effects/DtmfGen.h:39
+#, fuzzy
+msgid "DTMF Tones..."
 msgstr "Оҳангҳои &DTMF..."
 
 #: effects/DtmfGen.h:49
@@ -4027,14 +4963,6 @@ msgstr "Инъикоси садои..."
 msgid "Performing Echo"
 msgstr "Иҷроиши инъикоси садо"
 
-#: effects/Effect.cpp:255
-#: effects/Effect.cpp:382
-#: effects/Phaser.cpp:595
-#: effects/Wahwah.cpp:582
-#: effects/audiounits/AudioUnitEffect.cpp:872
-msgid "Pre&view"
-msgstr "Пеш&намоиш"
-
 #: effects/Effect.cpp:303
 msgid "Preparing preview"
 msgstr "Омодасозии пешнамоиш"
@@ -4052,6 +4980,18 @@ msgstr "Хато ҳангоми кушодани афзори савтӣ. Лут
 msgid "Applied effect: %s"
 msgstr "Натиҷаи корбурдашуда: %s"
 
+#: effects/Equalization.cpp:1171
+msgid "B-spline"
+msgstr "Б-сплайн"
+
+#: effects/Equalization.cpp:1171
+msgid "Cosine"
+msgstr "Косинус"
+
+#: effects/Equalization.cpp:1171
+msgid "Cubic"
+msgstr "Куб"
+
 #: effects/Equalization.cpp:332
 #: effects/Equalization.cpp:367
 msgid "Equalization"
@@ -4061,8 +5001,9 @@ msgstr "Баробарсозӣ"
 msgid "Error loading EQ curve"
 msgstr "Хато ҳангоми боркунии EQ"
 
-#: effects/Equalization.cpp:956
-msgid "Custom"
+#: effects/Equalization.cpp:1033
+#, fuzzy
+msgid "custom"
 msgstr "Танзим"
 
 #: effects/Equalization.cpp:1023
@@ -4077,19 +5018,6 @@ msgstr "Макс dB"
 msgid "Min dB"
 msgstr "Миним dB"
 
-#: effects/Equalization.cpp:1100
-msgid "Select curve:"
-msgstr "Интихоби тавсиф (хати каҷ):"
-
-#: effects/Equalization.cpp:1110
-#: effects/Equalization.cpp:2322
-msgid "Save As..."
-msgstr "Сабт ҳамчун..."
-
-#: effects/Equalization.cpp:1116
-msgid "Flat"
-msgstr "Рӯйхат"
-
 #: effects/Equalization.cpp:1145
 msgid "kHz"
 msgstr "kҲертз"
@@ -4102,18 +5030,6 @@ msgstr "Кашидани тавсирҳо"
 msgid "Graphic EQ"
 msgstr "Графики EQ"
 
-#: effects/Equalization.cpp:1171
-msgid "B-spline"
-msgstr "Б-сплайн"
-
-#: effects/Equalization.cpp:1171
-msgid "Cosine"
-msgstr "Косинус"
-
-#: effects/Equalization.cpp:1171
-msgid "Cubic"
-msgstr "Куб"
-
 #: effects/Equalization.cpp:1183
 msgid "Linear frequency scale"
 msgstr "Масофаи хатии басомад"
@@ -4122,6 +5038,19 @@ msgstr "Масофаи хатии басомад"
 msgid "Length of filter:"
 msgstr "Дарозии полуна:"
 
+#: effects/Equalization.cpp:1100
+msgid "Select curve:"
+msgstr "Интихоби тавсиф (хати каҷ):"
+
+#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:2322
+msgid "Save As..."
+msgstr "Сабт ҳамчун..."
+
+#: effects/Equalization.cpp:1116
+msgid "Flat"
+msgstr "Рӯйхат"
+
 #: effects/Equalization.cpp:2321
 msgid "Enter the desired name of the curve"
 msgstr "Вориди номи хосташудаи тавсир"
@@ -4154,6 +5083,42 @@ msgstr "Харобшавии мӯътадил"
 msgid "Fading Out"
 msgstr "Харобшавандагии мӯътадил"
 
+#: effects/FindClipping.cpp:49
+msgid "Detect clipping"
+msgstr ""
+
+#: effects/FindClipping.cpp:91
+msgid "Clipping"
+msgstr ""
+
+#: effects/FindClipping.cpp:211
+msgid "Find Clipping"
+msgstr ""
+
+#: effects/FindClipping.cpp:222
+msgid "by Leland Lucius"
+msgstr ""
+
+#: effects/FindClipping.cpp:234
+msgid "Start threshold (samples):"
+msgstr ""
+
+#: effects/FindClipping.cpp:238
+msgid "Stop threshold (samples):"
+msgstr ""
+
+#: effects/FindClipping.cpp:250
+msgid "Start and stop must be greater than 0."
+msgstr ""
+
+#: effects/FindClipping.h:37
+msgid "Find Clipping..."
+msgstr ""
+
+#: effects/FindClipping.h:54
+msgid "Detecting clipping"
+msgstr ""
+
 #: effects/Invert.h:27
 msgid "Invert"
 msgstr "Табдилдиҳӣ"
@@ -4162,17 +5127,13 @@ msgstr "Табдилдиҳӣ"
 msgid "Inverting"
 msgstr "Табдилдиҳӣ"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr "Душвортар"
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
-msgstr "Душвортарин"
+#: effects/Leveller.cpp:129
+msgid "Leveller"
+msgstr "Баробаркунанда"
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
-msgstr "Вазнин"
+msgid "None-Skip"
+msgstr "Ҳеҷ чиз партофта нашавад"
 
 #: effects/Leveller.cpp:47
 msgid "Light"
@@ -4183,32 +5144,37 @@ msgid "Moderate"
 msgstr "Муназзам"
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
-msgstr "Ҳеҷ чиз партофта нашавад"
+msgid "Heavy"
+msgstr "Вазнин"
 
-#: effects/Leveller.cpp:129
-msgid "Leveller"
-msgstr "Баробаркунанда"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
+msgstr "Душвортар"
 
-#: effects/Leveller.cpp:213
-msgid "Leveller by Lynn Allan"
-msgstr "Баробаркунанда бо ёрии Лин Аллан"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
+msgstr "Душвортарин"
 
-#: effects/Leveller.cpp:216
-msgid "Equalize soft and loud sections"
-msgstr "Баробаркунии қисматҳои паст ва баланд"
+#: effects/Leveller.cpp:212 effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr ""
 
 #: effects/Leveller.cpp:219
 #: effects/Leveller.cpp:224
 msgid "Degree of Leveling"
 msgstr "Дараҷаи баробаркунӣ"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:235
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Хаши остона(фасас, хаши форам)"
 
 #: effects/Leveller.cpp:238
-msgid "Threshold for Noise: "
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Остона барои хаш: "
 
 #: effects/Leveller.h:28
@@ -4219,6 +5185,158 @@ msgstr "Баробаркунанда..."
 msgid "Applying Leveller..."
 msgstr "Ба кор бурдани дараҷакунанда..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr "Омезишкунанда"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:78
+msgid "Phaser"
+msgstr "Марҳиласоз"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:675
+msgid "Noise Removal"
+msgstr "Ҷудосозии Хаш"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Сафед"
@@ -4235,21 +5353,14 @@ msgstr "Қаҳвагӣ"
 msgid "Noise Generator"
 msgstr "Муваллиди хаш"
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr "Давомнокии хаш"
-
-#: effects/Noise.cpp:239
-msgid "Amplitude"
-msgstr "Домана"
-
-#: effects/Noise.cpp:240
-msgid "Noise type:"
+#: effects/Noise.cpp:241
+#, fuzzy
+msgid "Noise type"
 msgstr "Навъи хаш:"
 
 #: effects/Noise.h:41
-msgid "&Noise..."
-msgstr "&Хаш..."
+msgid "Noise..."
+msgstr ""
 
 #: effects/Noise.h:49
 #, c-format
@@ -4260,28 +5371,26 @@ msgstr "Натиҷаи коркардашуда: тавлиди хаш, %.6lf с
 msgid "Generating Noise"
 msgstr "Муваллиди хаш"
 
-#: effects/NoiseRemoval.cpp:235
-msgid ""
-"Attempt to run Noise Removal without a noise profile\n"
-"."
+#: effects/NoiseRemoval.cpp:192
+#, c-format
+msgid "Could not open file:\n"
+"  %s"
 msgstr ""
-"Кӯшиш барои сабти ҳаракти хаш бе хосияти он\n"
-"."
 
-#: effects/NoiseRemoval.cpp:675
-msgid "Noise Removal"
-msgstr "Ҷудосозии Хаш"
+#: effects/NoiseRemoval.cpp:277
+#, fuzzy
+msgid "Attempt to run Noise Removal without a noise profile.\n"
+msgstr "Кӯшиш барои сабти ҳаракти хаш бе хосияти он\n"
+".\n"
 
 #: effects/NoiseRemoval.cpp:764
 msgid "Step 1"
 msgstr "Қадами 1"
 
 #: effects/NoiseRemoval.cpp:765
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Якчанд сония барои полоиши хаш ҷудо кунед, то ки Audacity дарк кунад, ки кадом амалиётро ичро карда истодааст,\n"
+msgstr "Якчанд сония барои полоиши хаш ҷудо кунед, то ки Audacity дарк кунад, ки кадом амалиётро ичро карда истодааст,\n"
 "баъдан ба воситаи мушак тугмаи \"Сохтани шакли хаш\"-ро пахш намоед:"
 
 #: effects/NoiseRemoval.cpp:766
@@ -4289,11 +5398,9 @@ msgid "Step 2"
 msgstr "Қадами 2"
 
 #: effects/NoiseRemoval.cpp:767
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Ҳамаи аудиоҳои полоишшавандаро ҷудо кунед,миқдори зарурии хашҳоро интихоб кунед\n"
+msgstr "Ҳамаи аудиоҳои полоишшавандаро ҷудо кунед,миқдори зарурии хашҳоро интихоб кунед\n"
 "ва баъдан -ро пахш кунед.\n"
 
 #: effects/NoiseRemoval.cpp:772
@@ -4308,14 +5415,26 @@ msgstr "Навъи хашро созед"
 msgid "Noise reduction (dB):"
 msgstr "Табдили хаш (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr "Суфтагии басомад (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr "Ҳуҷум/вақти хомушшавӣ (сон-ҳо):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Нест кардани хаш..."
@@ -4328,26 +5447,48 @@ msgstr "Сохтани навъи хаш"
 msgid "Removing Noise"
 msgstr "Тозашавии хаш"
 
+#. i18n-hint: First %s is the effect name, 2nd and 3rd are either true or
+#. * false (translated below) if those options were selected
+#: effects/Normalize.cpp:70
+#, c-format
+msgid "Applied effect: %s remove dc offset = %s, normalize amplitude = %s"
+msgstr ""
+
+#: effects/Normalize.cpp:74 effects/Normalize.cpp:75
+msgid "false"
+msgstr ""
+
+#. i18n-hint: true here means that the option was
+#. * selected. Opposite false if not selected
+#: effects/Normalize.cpp:74 effects/Normalize.cpp:75
+msgid "true"
+msgstr ""
+
+#: effects/Normalize.cpp:77
+#, c-format
+msgid ", maximum amplitude = %.1f dB"
+msgstr ""
+
 #: effects/Normalize.cpp:94
 msgid "Normalize"
 msgstr "Муққаррарӣ"
 
-#: effects/Normalize.cpp:316
-msgid "Normalize by Dominic Mazzoni\n"
-msgstr "Муқарароти Доминик Мазони\n"
-
-#: effects/Normalize.cpp:323
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Ҳамаи барҳамдиҳӣ аз кунҷ нест карда шавад(марказ аз нуқтаи сифр дар амудӣ)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
-msgstr "Муқарароти ҳади аксари домана ба"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Батартибдарорӣ..."
@@ -4361,44 +5502,56 @@ msgstr "Батартибдарорӣ..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Натиҷаи корбурдашуда: %s %d марҳилаҳо, %.0f%% wet, басомад= %.1f Hz, ибтидои марҳила = %.0f deg, амиқӣ= %d, feedback = %.0f%%"
 
-#: effects/Phaser.cpp:78
-msgid "Phaser"
-msgstr "Марҳиласоз"
-
-#: effects/Phaser.cpp:477
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Марҳиласоз бо ёрии Наска Октавиан Пол"
-
 #: effects/Phaser.cpp:484
 msgid "Stages:"
 msgstr "Марҳилаҳо:"
 
-#: effects/Phaser.cpp:505
-msgid "DRY"
-msgstr "ХУШКӢ"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
 
-#: effects/Phaser.cpp:512
-msgid "WET"
-msgstr "ХОМ"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:526
 #: effects/Wahwah.cpp:497
 msgid "LFO Frequency (Hz):"
 msgstr "Басомади LFO (Ҳертз):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:542
 #: effects/Wahwah.cpp:513
 msgid "LFO Start Phase (deg.):"
 msgstr "Ибтидои марҳилаи LFO (дараҷа):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:558
 msgid "Depth:"
 msgstr "Амиқӣ:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:574
 msgid "Feedback (%):"
 msgstr "Бозгашт (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Марҳиласози..."
@@ -4408,15 +5561,21 @@ msgid "Applying Phaser"
 msgstr "Корбари марҳиласоз"
 
 #: effects/Repair.cpp:94
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Натиҷаи таъмир дар қисматҳои кӯтоҳи вайроншавии аудиоӣ истифода бурда мешавад (то 128 намуна).\n"
+msgstr "Натиҷаи таъмир дар қисматҳои кӯтоҳи вайроншавии аудиоӣ истифода бурда мешавад (то 128 намуна).\n"
 "\n"
 "Намудро наздик созед ва пораи хурдтарини додаҳои савтиро интихоб кунед."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Таъмири аудиоҳои вайроншуда"
@@ -4435,28 +5594,23 @@ msgstr "Барои ҷудокунӣ роҳчаҳо хеле дарозанд."
 msgid "Repeat"
 msgstr "Такрор"
 
-#: effects/Repeat.cpp:245
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Такрор бо ёрии Доминик Мазони ва Вохан Ҷонсон"
-
-#: effects/Repeat.cpp:252
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Миқдори вақтҳои такроршаванда: "
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:264
 #: effects/Repeat.cpp:302
 msgid "New selection length: "
 msgstr "Интихоби нави дарозӣ: "
 
-#: effects/Repeat.cpp:304
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d дақиқа, %d сония"
-
-#: effects/Repeat.cpp:307
-#, c-format
-msgid "%d seconds"
-msgstr "%d сония"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr "сс:дд:сс"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -4479,7 +5633,8 @@ msgid "Silence Generator"
 msgstr "Муваллиди хомӯшӣ"
 
 #: effects/Silence.h:34
-msgid "&Silence..."
+#, fuzzy
+msgid "Silence..."
 msgstr "&Хомӯшӣ..."
 
 #: effects/Silence.h:42
@@ -4492,7 +5647,8 @@ msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Корбарандаи натиҷа: Муваллиди хомӯшӣ, %.6lf сонияҳо"
 
 #: effects/SimplePairedTwoTrack.h:120
-msgid "Sorry, This effect cannot be performed on stereo tracks where the individual channels of the track do not match."
+#, fuzzy
+msgid "Sorry, this effect cannot be performed on stereo tracks where the individual channels of the track do not match."
 msgstr "Бубахшед, ин амал дар роҳчаҳои стереоӣ иҷро шуда наметавонад зеро дар он ҷо шабакаи индивидуалии роҳча мутобиқат намекунад."
 
 #: effects/SpikeCleaner.cpp:69
@@ -4504,11 +5660,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Баробаркунандаи дандонадор бо ёрии Лин Алан"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Давомнокии баробаркунандаи бешина (миллисония): \n"
+msgstr "Давомнокии баробаркунандаи бешина (миллисония): \n"
 "(99999 ё зиёдтар)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -4524,15 +5678,73 @@ msgstr "Баробаркунандаи дандонадор..."
 msgid "Applying Spike Cleaner..."
 msgstr "Корбурди баробаркунандаи дандонадор..."
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "&Стерео Ба Моно"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
 msgstr "Корбарии стерео ба моно"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:59
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr "Корбурди натиҷавӣ: Тавлиди мавҷи %s ба басомади %s = %.2f Ҳертз, домана= %.2f, %.6lf сонияҳо"
 
+#: widgets/Meter.cpp:356
+msgid "Linear"
+msgstr "Хатӣ"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr "Муваллиди набз"
@@ -4561,45 +5773,37 @@ msgstr "Росткунҷаи бетахаллус"
 msgid "Frequency (Hz)"
 msgstr "Басомад (Ҳз)"
 
-#: effects/ToneGen.cpp:295
-#: effects/ToneGen.cpp:328
-msgid "Amplitude (0-1)"
-msgstr "Доманаи (0-1)"
-
-#: effects/ToneGen.cpp:296
-#: effects/ToneGen.cpp:334
-#: toolbars/SelectionBar.cpp:136
-#: toolbars/SelectionBar.cpp:227
-msgid "Length"
-msgstr "Дарозӣ"
-
 #: effects/ToneGen.cpp:317
 msgid "Waveform:"
 msgstr "Мавҷшакл:"
 
-#: effects/ToneGen.cpp:324
-#: toolbars/ControlToolBar.cpp:186
-msgid "Start"
-msgstr "Ибтидо"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:325
-#: toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:130
-#: toolbars/SelectionBar.cpp:228
-msgid "End"
-msgstr "Интиҳо"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
 
-#: effects/ToneGen.cpp:326
-msgid "Frequency / Hz"
-msgstr "Басомади / Ҳз"
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
 
-#: effects/ToneGen.h:39
-msgid "&Chirp..."
-msgstr "&Набз..."
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
-#: effects/ToneGen.h:39
-msgid "&Tone..."
-msgstr "&Оҳанг..."
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr ""
+
+#: effects/ToneGen.h:40
+msgid "Chirp..."
+msgstr ""
+
+#: effects/ToneGen.h:40
+msgid "Tone..."
+msgstr ""
 
 #: effects/ToneGen.h:47
 msgid "Generating Chirp"
@@ -4609,27 +5813,36 @@ msgstr "Муваллиди набз"
 msgid "Generating Tone"
 msgstr "Муваллиди оҳанг"
 
-#: effects/TruncSilence.cpp:64
-msgid "Sorry. Truncate Silence only valid with mono track"
-msgstr "Бубахшед, аммо бурриши ҷойҳои хомӯши танҳо бо роҳчаҳои моноӣ иро мешавад"
+#: effects/TruncSilence.cpp:113
+msgid "All tracks must have the same sample rate"
+msgstr ""
+
+#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:321
+msgid "Truncate Silence"
+msgstr ""
+
+#: effects/TruncSilence.cpp:345
+msgid "Max silence duration:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:178
+msgid "milliseconds"
+msgstr "миллисония"
+
+#: effects/TruncSilence.cpp:350
+msgid "Threshold for silence:"
+msgstr ""
+
+#: effects/TruncSilence.cpp:374
+msgid "   Duration must be at least 1 millisecond"
+msgstr ""
 
 #: effects/TruncSilence.cpp:84
 #: effects/TruncSilence.h:29
 msgid "Truncate Silence..."
 msgstr "Бурриши қисматҳои хомӯш..."
 
-#: effects/TruncSilence.cpp:251
-msgid "Truncate Silence by Lynn Allan"
-msgstr "Бурриши қисматҳои хомӯш бо ёрии Лин Алан"
-
-#: effects/TruncSilence.cpp:256
-msgid ""
-"Max Silent Duration (milliseconds): \n"
-"(99999 or greater is off)"
-msgstr ""
-"Давомнокии бешинаи хомӯшӣ (миллисония): \n"
-"(99999 ё бештары)"
-
 #: effects/TruncSilence.h:37
 msgid "Truncating Silence..."
 msgstr "Буридашавии қисматҳои хомӯшӣ..."
@@ -4655,10 +5868,6 @@ msgstr "Натиҷаи корбурдашуда: %s басомади = %.1f Ҳз
 msgid "Wahwah"
 msgstr "Вах-Вах"
 
-#: effects/Wahwah.cpp:490
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah бо ёрии Наска Октавиан Пол"
-
 #: effects/Wahwah.cpp:529
 msgid "Depth (%):"
 msgstr "Амиқӣ (%):"
@@ -4667,10 +5876,18 @@ msgstr "Амиқӣ (%):"
 msgid "Resonance:"
 msgstr "Зарбазанӣ:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:561
 msgid "Wah Frequency Offset (%):"
 msgstr "Омезиши басомади Wah (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Вах-Вах..."
@@ -4707,6 +5924,18 @@ msgstr "Танзимоти натиҷаҳо"
 msgid "Length (seconds)"
 msgstr "Давомнокӣ (сония)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:253
 msgid "Applying Nyquist Effect..."
 msgstr "Корбарии натиҷаи Nyquist..."
@@ -4745,42 +5974,42 @@ msgstr "Nyquist аудиоро барнагардонид.\n"
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Nyquist шабакаҳои барзиёди аудиоиро баргардонид.\n"
 
-#: effects/nyquist/Nyquist.cpp:826
-#: effects/nyquist/Nyquist.cpp:990
-msgid "&Debug"
-msgstr "&Ислоҳи хато"
+#: effects/vamp/VampEffect.cpp:86
+#, c-format
+msgid "Extracting features: %s"
+msgstr ""
 
-#: export/Export.cpp:242
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF ва дигар намунаҳои фишурданашуда"
+#: effects/vamp/VampEffect.cpp:117
+msgid "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."
+msgstr ""
 
-#: export/Export.cpp:245
-msgid "MP3 Files"
-msgstr "Файлҳои MP3"
+#: effects/vamp/VampEffect.cpp:131
+msgid "Sorry, failed to load Vamp Plug-in."
+msgstr ""
 
-#: export/Export.cpp:249
-msgid "OGG Files"
-msgstr "Файлҳои OGG"
+#: effects/vamp/VampEffect.cpp:239
+msgid "Sorry, Vamp Plug-in failed to initialize."
+msgstr ""
 
-#: export/Export.cpp:254
-msgid "FLAC Files"
-msgstr "Файлҳои FLAC"
+#: effects/vamp/VampEffect.cpp:387
+msgid " - Vamp audio analysis plugin"
+msgstr ""
 
-#: export/Export.cpp:259
-msgid "MP2 Files"
-msgstr "Файлҳои MP2"
+#: effects/vamp/VampEffect.cpp:423
+msgid "Plugin Settings"
+msgstr ""
 
-#: export/Export.cpp:264
-msgid "(external program)"
-msgstr "(барномаи берунӣ)"
+#: effects/vamp/VampEffect.cpp:442 effects/vamp/VampEffect.cpp:448
+msgid "Program"
+msgstr ""
 
-#: export/Export.cpp:370
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Роҳчае, интихою нашудааст! Ctrl-A (Select All) истифода баред\n"
-"Фармони берунсзиро барои берун кардани ҳамаи роҳчаҳо интихоб кунед."
 
 #: export/Export.cpp:414
 msgid "Export File"
@@ -4796,14 +6025,12 @@ msgstr "Шумо файлро бо аломати \" сабт кардан ме
 
 #: export/Export.cpp:469
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Шумо %s-и файлро бо номи \"%s\" сабт кардан мехоҳед.\n"
+msgstr "Шумо %s-и файлро бо номи \"%s\" сабт кардан мехоҳед.\n"
 "\n"
 "Одатан ин файлҳо дар \".%s\" ба охир мерасанд ва баъзе барномаҳо файлҳоро бо пасвандҳои ғайритартибӣ намекушоянд.\n"
 "\n"
@@ -4839,24 +6066,47 @@ msgstr " - Чап"
 msgid " - Right"
 msgstr " - Рост"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:939
 #: export/Export.cpp:993
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "Шабакаҳои бурунӣ: %2d"
 
+#: export/ExportCL.cpp:55
+msgid "Specify Command Line Encoder"
+msgstr ""
+
+#: export/ExportCL.cpp:303
+msgid "Command Line Export Setup"
+msgstr "Воридсозии насби хатҳои фармоишӣ"
+
+#: export/ExportCL.cpp:308
+msgid "Command:"
+msgstr "Фармон:"
+
+#: export/ExportCL.cpp:313
+msgid "Show output"
+msgstr "Намоиши бурунӣ"
+
+#: export/ExportCL.cpp:87
+#, c-format
+msgid "Data will be piped to standard in. \"%f\" will be replaced with output filename selected."
+msgstr ""
+
+#: export/Export.cpp:264
+msgid "(external program)"
+msgstr "(барномаи берунӣ)"
+
 #: export/ExportCL.cpp:116
 #: export/ExportPCM.cpp:90
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "Аудиоро дар %s ворид карда наметавонад"
 
-#: export/ExportCL.cpp:188
-#: export/ExportOGG.cpp:121
-#: export/ExportPCM.cpp:114
-msgid "Export"
-msgstr "Содирот"
-
 #: export/ExportCL.cpp:190
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Вориди аудиоҳои интихобшуда бо истифодаи хатҳои фармоишии рамздор"
@@ -4869,34 +6119,476 @@ msgstr "Вориди тамоми лоиҳа бо истифодаи хатҳо
 msgid "Command Output"
 msgstr "Бурунсозии фармонҳо"
 
-#: export/ExportCL.cpp:289
-msgid "Specify Command Line Options"
-msgstr "Муайян кардани қисматҳои хатҳои фармоишӣ"
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
 
-#: export/ExportCL.cpp:303
-msgid "Command Line Export Setup"
-msgstr "Воридсозии насби хатҳои фармоишӣ"
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
 
-#: export/ExportCL.cpp:308
-msgid "Command:"
-msgstr "Фармон:"
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
 
-#: export/ExportCL.cpp:313
-msgid "Show output"
-msgstr "Намоиши бурунӣ"
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
 
-#: export/ExportCL.cpp:320
+#: export/ExportFFmpeg.cpp:702 export/ExportMP3.cpp:1920
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
 #, c-format
-msgid "Include \"%f\" where the output filename should be substituted."
-msgstr "Вуруди \"%f\" дар ҷои ивазшавии номи файл."
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
 
-#: export/ExportFLAC.cpp:134
-msgid "Exporting the selected audio as FLAC"
-msgstr "Вуруди аудиоҳои интихобшуда ба монанди FLAC"
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
 
-#: export/ExportFLAC.cpp:135
-msgid "Exporting the entire project as FLAC"
-msgstr "Вуруди лоиҳаи пурра ба монанди FLAC"
+#: export/ExportFFmpeg.cpp:721 export/ExportMP3.cpp:1939
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:749 export/ExportMP3.cpp:1962
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:225
+msgid "Bit Rate:"
+msgstr "Суръати бит:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:246
+msgid "Format:"
+msgstr "Қолаб:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:105
+msgid "Language:"
+msgstr "Забон:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:227
+msgid "Quality:"
+msgstr "Сифат:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Файлҳои XML (*.xml)|*.xml|Ҳамаи файлҳо (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
 
 #: export/ExportFLAC.cpp:180
 msgid "Specify FLAC Options"
@@ -4958,15 +6650,34 @@ msgstr "Сатҳ:"
 msgid "Bit depth:"
 msgstr "Амиқии бит:"
 
+#: export/Export.cpp:254
+msgid "FLAC Files"
+msgstr "Файлҳои FLAC"
+
+#: export/ExportFLAC.cpp:134
+msgid "Exporting the selected audio as FLAC"
+msgstr "Вуруди аудиоҳои интихобшуда ба монанди FLAC"
+
+#: export/ExportFLAC.cpp:135
+msgid "Exporting the entire project as FLAC"
+msgstr "Вуруди лоиҳаи пурра ба монанди FLAC"
+
+#: export/ExportMP2.cpp:201
+msgid "Specify MP2 Options"
+msgstr "Муайянкунии қисматҳои MP2"
+
+#: export/ExportMP2.cpp:221
+msgid "MP2 Export Setup"
+msgstr "Насби вуруди  MP2"
+
+#: export/Export.cpp:259
+msgid "MP2 Files"
+msgstr "Файлҳои MP2"
+
 #: export/ExportMP2.cpp:82
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "MP2 бо андозаи ин намуна ва андозаи бит вуруд карда намешавад"
 
-#: export/ExportMP2.cpp:94
-#: export/ExportMP3.cpp:1260
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "Таҳрири теғаҳои ID3 барои файли MP3"
-
 #: export/ExportMP2.cpp:102
 #: export/ExportMP3.cpp:1249
 #: export/ExportOGG.cpp:53
@@ -4985,121 +6696,17 @@ msgstr "Вуруди аудиоҳои интихобшуда дар %d kbps"
 msgid "Exporting entire file at %d kbps"
 msgstr "Вуруди тамоми файл дар %d kbps"
 
-#: export/ExportMP2.cpp:201
-msgid "Specify MP2 Options"
-msgstr "Муайянкунии қисматҳои MP2"
-
-#: export/ExportMP2.cpp:221
-msgid "MP2 Export Setup"
-msgstr "Насби вуруди  MP2"
-
-#: export/ExportMP2.cpp:225
-msgid "Bit Rate:"
-msgstr "Суръати бит:"
-
-#: export/ExportMP3.cpp:141
-msgid "16 kbps"
-msgstr "16 кб/с"
-
-#: export/ExportMP3.cpp:142
-msgid "24 kbps"
-msgstr "24 кб/с"
-
-#: export/ExportMP3.cpp:143
-msgid "32 kbps"
-msgstr "32 кб/с"
-
-#: export/ExportMP3.cpp:144
-msgid "40 kbps"
-msgstr "40 кб/с"
-
-#: export/ExportMP3.cpp:145
-msgid "48 kbps"
-msgstr "48 кб/с"
-
-#: export/ExportMP3.cpp:146
-msgid "56 kbps"
-msgstr "56 кб/с"
-
-#: export/ExportMP3.cpp:147
-msgid "64 kbps"
-msgstr "64 кб/с"
-
-#: export/ExportMP3.cpp:148
-msgid "80 kbps"
-msgstr "80 кб/с"
-
-#: export/ExportMP3.cpp:149
-msgid "96 kbps"
-msgstr "96 кб/с"
-
-#: export/ExportMP3.cpp:150
-msgid "112 kbps"
-msgstr "112 кб/с"
-
-#: export/ExportMP3.cpp:151
-msgid "128 kbps"
-msgstr "128 кб/с"
-
-#: export/ExportMP3.cpp:152
-msgid "160 kbps"
-msgstr "160 кб/с"
-
-#: export/ExportMP3.cpp:153
-msgid "192 kbps"
-msgstr "Ñ‹192 kbps"
-
-#: export/ExportMP3.cpp:154
-msgid "224 kbps"
-msgstr "224 кб/с"
-
-#: export/ExportMP3.cpp:155
-msgid "256 kbps"
-msgstr "Ñ‹Ñ‹256 kbps"
-
-#: export/ExportMP3.cpp:156
-msgid "320 kbps"
-msgstr "320 кб/с"
-
-#: export/ExportMP3.cpp:161
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr "0, 220-260 kbps (Сифати беҳтарин)"
-
-#: export/ExportMP3.cpp:162
-msgid "1, 200-250 kbps"
-msgstr "1, 200-250 кб/с"
-
-#: export/ExportMP3.cpp:163
-msgid "2, 170-210 kbps"
-msgstr "2, 170-210 кб/с"
-
-#: export/ExportMP3.cpp:164
-msgid "3, 155-195 kbps"
-msgstr "3, 155-195 кб/с"
-
-#: export/ExportMP3.cpp:165
-msgid "4, 145-185 kbps"
-msgstr "4, 145-185 кб/с"
-
-#: export/ExportMP3.cpp:166
-msgid "5, 110-150 kbps"
-msgstr "5, 110-150 кб/с"
-
-#: export/ExportMP3.cpp:167
-msgid "6, 95-135 kbps"
-msgstr "6, 95-135 кб/с"
-
-#: export/ExportMP3.cpp:168
-msgid "7, 80-120 kbps"
-msgstr "7, 80-120 кб/с"
+#: export/ExportMP3.cpp:221 export/ExportMP3.cpp:239 export/ExportMP3.cpp:253
+msgid "kbps"
+msgstr ""
 
-#: export/ExportMP3.cpp:169
-msgid "8, 65-105 kbps"
-msgstr "8, 65-105 кб/с"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
+msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "9, 45-85 kbps (Smaller files)"
-msgstr "9, 45-85 kbps (файлҳои хурдтар)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
+msgstr ""
 
 #: export/ExportMP3.cpp:175
 msgid "Fast"
@@ -5109,90 +6716,18 @@ msgstr "Босуръат"
 msgid "Standard"
 msgstr "Танзимшуда"
 
-#: export/ExportMP3.cpp:181
-msgid "Insane, 320 kbps"
-msgstr "Ғайриқобили 320 kbps"
-
-#: export/ExportMP3.cpp:182
-msgid "Extreme, 220-260 kbps"
-msgstr "Ниҳоии 220-260 kbps"
-
-#: export/ExportMP3.cpp:183
-msgid "Standard, 170-210 kbps"
-msgstr "Намуна 170-210 kbps"
-
-#: export/ExportMP3.cpp:184
-msgid "Medium, 145-185 kbps"
-msgstr "Муҳит 145-185 kbps"
-
-#: export/ExportMP3.cpp:527
-msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
-msgstr "Танҳо lame_enc.dll|lame_enc.dll|Феҳристи пӯёии пайваст(*.dll)|*.dll|Ҳамаи файлҳо (*.*)|*"
-
-#: export/ExportMP3.cpp:870
-msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
-msgstr "Танҳо libmp3lame.dylib|libmp3lame.dylib|Феҳристи пӯёӣ (*.dylib)|*.dylib|Ҳамаи файлҳо (*)|*"
-
-#: export/ExportMP3.cpp:887
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
-msgstr "Танҳо libmp3lame.so|libmp3lame.so|Феҳристҳои ибтидоии пӯёии боршаванда (*.so)|*.so|Феҳристҳои васеъшуда (*.so*)|*.so*|Ҳамаи файлҳо(*)|*"
-
-#: export/ExportMP3.cpp:932
-msgid "Locate Lame"
-msgstr "Хатои ҷойшуда"
-
-#: export/ExportMP3.cpp:952
-#, c-format
-msgid "Audacity needs the file %s to create MP3s."
-msgstr "Файли %s ба Audacity барои сохтани MP3-ҳо лозим аст."
-
-#: export/ExportMP3.cpp:958
-#, c-format
-msgid "Location of %s:"
-msgstr "Мавқеъи %s:"
-
-#: export/ExportMP3.cpp:967
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Барои ёфтани %s --> пахш кунед"
-
-#: export/ExportMP3.cpp:973
-msgid "Browse..."
-msgstr "Баррасии..."
-
-#: export/ExportMP3.cpp:974
-msgid "To get a free copy of Lame, click here -->"
-msgstr "Барои нусхабардории хато -->-ро пахш кунед "
-
-#: export/ExportMP3.cpp:975
-msgid "Download..."
-msgstr "Азнавборкунӣ..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:1011
-#, c-format
-msgid "Where is %s?"
-msgstr "%s дар куҷо ҷойгир аст?"
-
-#: export/ExportMP3.cpp:1233
-msgid "Could not open MP3 encoding library!"
-msgstr "Феҳристи рамзгузошташудаи MP3-ро кушода натавонист!"
-
-#: export/ExportMP3.cpp:1240
-msgid "Not a valid or supported MP3 encoding library!"
-msgstr "Феҳристи рамзгузошташудаи MP3 корношоям ё дастгиринашаванда асты!"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
+msgstr ""
 
-#: export/ExportMP3.cpp:1342
-#, c-format
-msgid "Exporting selected audio at quality %d"
-msgstr "Вуруди аудиои ҷудокардашуда дар сифати %d"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
+msgstr ""
 
-#: export/ExportMP3.cpp:1343
-#, c-format
-msgid "Exporting entire file at quality %d"
-msgstr "Вуруди тамоми файл дар сифати %d"
+#: effects/ClickRemoval.cpp:379
+#: effects/ClickRemoval.cpp:408
+msgid "Medium"
+msgstr "Муҳит"
 
 #: export/ExportMP3.cpp:1417
 msgid "Specify MP3 Options"
@@ -5223,6 +6758,11 @@ msgstr "Миёна"
 msgid "Constant"
 msgstr "Доимӣ"
 
+#: prefs/QualityPrefs.cpp:42
+#: prefs/QualityPrefs.cpp:43
+msgid "Quality"
+msgstr "Сифат"
+
 #: export/ExportMP3.cpp:1491
 msgid "Variable Speed:"
 msgstr "Суръати тағирёбанда:"
@@ -5239,6 +6779,105 @@ msgstr "Стереои муттаҳидшуда"
 msgid "Stereo"
 msgstr "Стерео"
 
+#: export/ExportMP3.cpp:932
+msgid "Locate Lame"
+msgstr "Хатои ҷойшуда"
+
+#: export/ExportMP3.cpp:952
+#, c-format
+msgid "Audacity needs the file %s to create MP3s."
+msgstr "Файли %s ба Audacity барои сохтани MP3-ҳо лозим аст."
+
+#: export/ExportMP3.cpp:974
+msgid "To get a free copy of Lame, click here -->"
+msgstr "Барои нусхабардории хато -->-ро пахш кунед "
+
+#: export/ExportMP3.cpp:1070
+#, c-format
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+
+#: export/ExportMP3.cpp:527
+msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr "Танҳо lame_enc.dll|lame_enc.dll|Феҳристи пӯёии пайваст(*.dll)|*.dll|Ҳамаи файлҳо (*.*)|*"
+
+#: export/ExportMP3.cpp:870
+msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Танҳо libmp3lame.dylib|libmp3lame.dylib|Феҳристи пӯёӣ (*.dylib)|*.dylib|Ҳамаи файлҳо (*)|*"
+
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr "Танҳо libmp3lame.so|libmp3lame.so|Феҳристҳои ибтидоии пӯёии боршаванда (*.so)|*.so|Феҳристҳои васеъшуда (*.so*)|*.so*|Ҳамаи файлҳо(*)|*"
+
+#: export/Export.cpp:245
+msgid "MP3 Files"
+msgstr "Файлҳои MP3"
+
+#: export/ExportMP3.cpp:1233
+msgid "Could not open MP3 encoding library!"
+msgstr "Феҳристи рамзгузошташудаи MP3-ро кушода натавонист!"
+
+#: export/ExportMP3.cpp:1240
+msgid "Not a valid or supported MP3 encoding library!"
+msgstr "Феҳристи рамзгузошташудаи MP3 корношоям ё дастгиринашаванда асты!"
+
+#: export/ExportMP3.cpp:1760
+msgid "Unable to initialize MP3 stream"
+msgstr ""
+
+#: export/ExportMP3.cpp:1802
+#, c-format
+msgid "Exporting selected audio with %s preset"
+msgstr ""
+
+#: export/ExportMP3.cpp:1803
+#, c-format
+msgid "Exporting entire file with %s preset"
+msgstr ""
+
+#: export/ExportMP3.cpp:1808
+#, c-format
+msgid "Exporting selected audio with VBR quality %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1809
+#, c-format
+msgid "Exporting entire file with VBR quality %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1814
+#, c-format
+msgid "Exporting selected audio at %d Kbps"
+msgstr ""
+
+#: export/ExportMP3.cpp:1815
+#, c-format
+msgid "Exporting entire file at %d Kbps"
+msgstr ""
+
+#: export/ExportMP3.cpp:1849
+#, c-format
+msgid "Error %d returned from MP3 encoder"
+msgstr ""
+
+#: export/ExportMP3.cpp:1933
+#, c-format
+msgid "The project sample rate (%d) is not supported by the MP3\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1936
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the MP3 file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
+
 #: export/ExportMultiple.cpp:88
 #: export/ExportMultiple.cpp:371
 #: export/ExportMultiple.cpp:620
@@ -5247,13 +6886,12 @@ msgid "Export Multiple"
 msgstr "Вуруди бисёркарата"
 
 #: export/ExportMultiple.cpp:153
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Агар дар лоиҳаи Шумо якчанд роҳчаи садогӣ бошад, пас Шумо\n метавонад ҳар яки онро ба файли ҷудогона вуруд созед,\n"
+msgstr "Агар дар лоиҳаи Шумо якчанд роҳчаи садогӣ бошад, пас Шумо\n"
+" метавонад ҳар яки онро ба файли ҷудогона вуруд созед,\n"
 "ё агар Шумо роҳчаи нишонадор дошта бошед, дар ин ҳолат метавонед\n"
 "файли навро барои ҳар як нишона вуруд созед.\n"
 "\n"
@@ -5301,6 +6939,10 @@ msgstr "Ҷокунии аудио пеш аз нишонаи якумы"
 msgid "First file name:"
 msgstr "Номи файли якум:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:246
 msgid "Tracks"
 msgstr "Роҳчаҳо"
@@ -5321,15 +6963,14 @@ msgstr "Рақамгузории пайдарҳам"
 msgid "File name prefix:"
 msgstr "Пешванди номи файл:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:295
 msgid "Overwrite existing files"
 msgstr "Бознависии файлҳои мавҷуда"
 
-#: export/ExportMultiple.cpp:303
-#: export/ExportMultiple.cpp:305
-msgid "E&xport"
-msgstr "Со&дирот"
-
 #: export/ExportMultiple.cpp:369
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5339,21 +6980,19 @@ msgstr "\"%s\" бомуваффақият сохта шуд."
 msgid "Choose a location to save the exported files"
 msgstr "Барои вурудсозии файлҳо мавқеи онҳро интихоб кунед"
 
-#: export/ExportMultiple.cpp:449
-msgid "Edit the ID3 tags for all MP3 files"
-msgstr "Таҳрири теғаҳои ID3 барои ҳамаи файлҳои MP3"
-
 #: export/ExportMultiple.cpp:491
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" вуҷуд надорад.\n"
+msgstr "\"%s\" вуҷуд надорад.\n"
 "\n"
 "Шумо онро сохтан мехоҳад?"
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:617
 #: export/ExportMultiple.cpp:725
 #, c-format
@@ -5366,6 +7005,24 @@ msgstr "%d файл(ҳо) .бомуваффақият вуруд шуд."
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Баъди вуруди %d файл(ҳо) хато содир шуд."
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
+#: export/ExportOGG.cpp:64
+msgid "Specify Ogg Vorbis Options"
+msgstr ""
+
+#: export/ExportOGG.cpp:81
+msgid "Ogg Vorbis Export Setup"
+msgstr ""
+
+#: export/ExportOGG.cpp:157
+msgid "Ogg Vorbis Files"
+msgstr ""
+
 #: export/ExportOGG.cpp:123
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "Вуруди аудиоҳои ҷудошуда ба монанди Ог Ворбис"
@@ -5374,134 +7031,223 @@ msgstr "Вуруди аудиоҳои ҷудошуда ба монанди Ог
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Вуруди тамоми лоиҳа ба монанди Ог Ворбис"
 
-#: export/ExportOGG.cpp:206
-msgid "Specify OGG Options"
-msgstr "Муайяншавии қисматҳои OGG"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
+msgstr ""
+
+#: export/ExportPCM.cpp:240
+msgid "Uncompressed Export Setup"
+msgstr "Насби вурудии фишурданашуда"
 
-#: export/ExportOGG.cpp:222
-msgid "OGG Export Setup"
-msgstr "Насби вуруди OGG"
+#: export/ExportPCM.cpp:250
+msgid "Header:"
+msgstr "Сарлавҳа:"
 
-#: export/ExportOGG.cpp:227
-msgid "Quality:"
-msgstr "Сифат:"
+#: export/ExportPCM.cpp:254
+msgid "Encoding:"
+msgstr "Рамзгузорӣ:"
+
+#: export/ExportPCM.cpp:259
+msgid "(Not all combinations of headers and encodings are possible.)"
+msgstr "(На ҳамаи таркиби сарлавҳаҳо ва рамзгузориҳо мумкин аст.)"
+
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:84
 msgid "Cannot export audio in this format."
 msgstr "Аудиро дар ин шакл вуруд карда наметавонад."
 
-#: export/ExportPCM.cpp:116
+#: export/ExportPCM.cpp:491
 #, c-format
-msgid "Exporting the selected audio as a %s file"
-msgstr "Вуруди аудиҳои интихобшуда ба монанди файли %s"
+msgid "Exporting the selected audio as %s"
+msgstr ""
 
-#: export/ExportPCM.cpp:118
+#: export/ExportPCM.cpp:493
 #, c-format
-msgid "Exporting the entire project as a %s file"
-msgstr "Вуруди тамоми лоиҳа ба монанди файли %s"
+msgid "Exporting the entire project as %s"
+msgstr ""
 
-#: export/ExportPCM.cpp:151
+#. i18n-hint: %s will be the error message from libsndfile
+#: export/ExportPCM.cpp:531
 #, c-format
-msgid "Error (file may not have been written): %hs"
+#, fuzzy
+msgid "Error (file may not have been written): %s"
 msgstr "Хато (файл сабт намешавад): %hs"
 
-#: export/ExportPCM.cpp:184
-msgid "Specify WAV Options"
-msgstr "Муайянкунии қисматҳои WAV"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
 
-#: export/ExportPCM.cpp:240
-msgid "Uncompressed Export Setup"
-msgstr "Насби вурудии фишурданашуда"
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
 
-#: export/ExportPCM.cpp:246
-msgid "Format:"
-msgstr "Қолаб:"
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
 
-#: export/ExportPCM.cpp:250
-msgid "Header:"
-msgstr "Сарлавҳа:"
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
 
-#: export/ExportPCM.cpp:254
-msgid "Encoding:"
-msgstr "Рамзгузорӣ:"
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
 
-#: export/ExportPCM.cpp:259
-msgid "(Not all combinations of headers and encodings are possible.)"
-msgstr "(На ҳамаи таркиби сарлавҳаҳо ва рамзгузориҳо мумкин аст.)"
+#: import/Import.cpp:156 import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
 
 #: import/Import.cpp:177
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Тариқаи Audacity бо дастгирии %s ҳамгардонӣ нашуда буд."
 
-#: import/Import.cpp:190
-msgid ""
-" is an audio CD file. \n"
-"Audacity does not open this type of file.\n"
-"Try ripping it to a native audio format that Audacity can import."
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
 msgstr ""
-" файли аудио CD. \n"
-"Audacity чунин файлро намекушояд.\n"
-"Онро ба усули рақамӣ дар файли дастгиришавандаи қолаби барномаиы Audacity бароред."
 
-#: import/Import.cpp:197
-msgid ""
-" is a playlist file.\n"
-"Audacity cannot open this file because it only contains links to other files.\n"
+#. i18n-hint: %s will be the filename
+#: import/Import.cpp:250
+#, c-format
+msgid "\"%s\" is an audio CD track. \n"
+"Audacity cannot open audio CDs directly. \n"
+"Extract (rip) the CD tracks to an audio format that \n"
+"Audacity can import, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:256
+#, c-format
+msgid "\"%s\" is a playlist file. \n"
+"Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
 msgstr ""
-" файли бозигар аст.\n"
-"Audacity наметавонад ин файлро кушояд, зеро он танҳо ба дигар файлҳо муроҷиат мекунад.\n"
-"Шумо онро метавонед дар таҳриргари матнӣ кушоед ва файлҳои одии аудиоиро аз нав бор кунед."
 
-#: import/Import.cpp:203
-msgid ""
-" is a Windows Media Audio file. \n"
-"Audacity cannot open this type of file to due to patent restrictions.\n"
-"You need to convert it to a supported audio format."
+#: import/Import.cpp:261
+#, c-format
+msgid "\"%s\" is a Windows Media Audio file. \n"
+"Audacity cannot open this type of file due to patent restrictions. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
-" аудио файли Windows Media. \n"
-"Audacity чунин навъи файли маҳдудро кушода наметавонад.\n"
-"Шумо бояд ин файлро дар қолаби дастгиришудаи аудиоӣ нависед."
 
-#: import/Import.cpp:209
-msgid ""
-" is an Advanced Audio Coding file. \n"
-"Audacity cannot open this type of file.\n"
-"You need to convert it to a supported audio format."
+#: import/Import.cpp:266
+#, c-format
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
-" файли аудиоии пешбурди рамзгузошташуда аст. \n"
-"Audacity чунин навъи файлро кушода наметавонад.\n"
-"Шумо бояд ин файлро дар қолаби дастгиришудаи аудиоӣ нависед."
 
-#: import/Import.cpp:215
-msgid ""
-" is an encrypted audio file, typically from an online music store. \n"
-"Audacity cannot open this type of file due to the encryption.\n"
-"You need to convert it to a supported, unencrypted audio format."
+#: import/Import.cpp:271
+#, c-format
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
+"Audacity cannot open this type of file due to the encryption. \n"
+"Try recording the file into Audacity, or burn it to audio CD then \n"
+"extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
-" файли рамзгузоштаи садоӣ ба ҳисоб меравад. \n"
-"Audacity одатан чунин навъи файлро кушода наметавонад.\n"
-"Ба Шумо зарур аст, ки аввал онро ба файли дастгиришавандаи қолаби рамзнагузошташуда табдил диҳед."
 
-#: import/Import.cpp:221
-msgid ""
-" is a RealPlayer media file. \n"
-"Audacity cannot open this proprietary format.\n"
-"You need to convert it to a supported audio format."
+#: import/Import.cpp:276
+#, c-format
+msgid "\"%s\" is a RealPlayer media file. \n"
+"Audacity cannot open this proprietary format. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
-" ин файли RealPlayer аст. \n"
-"Audacity чунин хусусияти қолабро кушода наметавонад.\n"
-"Ба Шумо зарур аст, ки онро аввал ба файли\n"
-"дастгиришавандаи қолаби барнома табдил диҳед."
 
-#: import/Import.cpp:226
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
+
+#: import/ImportFLAC.cpp:43
+msgid "FLAC files"
 msgstr ""
-"Audacity чунин навъи файлро нашинохт.\n"
-"Агар ин файли фишурданашуда бошад, \"пас онро ҳамчун Raw файл вуруд намоед\" "
 
 #: import/ImportLOF.cpp:172
 #: import/ImportLOF.cpp:222
@@ -5535,13 +7281,22 @@ msgstr "MIDI роҳчаҳо ба таври муққарарӣ ҷудо наме
 msgid "Invalid track offset in LOF file."
 msgstr "Роҳчаи хароби ҷудошуда дар файли LOF."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Хато ҳангоми таҷзияи файли Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Хатои таҷзияи файли MIDI."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
+
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
+
+#: import/ImportOGG.cpp:44
+msgid "Ogg Vorbis files"
+msgstr ""
 
 #: import/ImportOGG.cpp:138
 msgid "Media read error"
@@ -5563,6 +7318,23 @@ msgstr "Сарлавҳаи хатои ҷараёни Vorbis"
 msgid "Internal logic fault"
 msgstr "Хатои мантиқии дохилӣ"
 
+#: export/Export.cpp:242
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF ва дигар намунаҳои фишурданашуда"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
+#, c-format
+msgid "Importing %s"
+msgstr ""
+
+#: import/ImportQT.cpp:21
+msgid "QuickTime files"
+msgstr ""
+
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:277
 msgid "Import Raw Data"
 msgstr "Вуруди додаи Raw"
@@ -5604,6 +7376,14 @@ msgstr "2 Шабака (Стерео)"
 msgid "%d Channels"
 msgstr "%d Шабакаҳо"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Шурӯъи омехта:"
@@ -5616,6 +7396,19 @@ msgstr "Миқдори вуруд:"
 msgid "Sample rate:"
 msgstr "Суръати намуна:"
 
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
+
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
 msgid "Audio I/O"
@@ -5659,50 +7452,63 @@ msgstr "Шабакаҳо"
 msgid "Playthrough"
 msgstr "Иҷрогари убурӣ"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Хониши роҳчаҳои дигар ҳангоми сабти роҳчаи нав"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:150
-msgid "&Hardware Playthrough (Play new track while recording it)"
-msgstr "&Иҷрогари убурии сахтафзор (хониши роҳчаи нав ҳангоми сабти он)"
+#: prefs/AudioIOPrefs.cpp:152
+msgid "&Hardware Playthrough: Play new track while recording it"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:153
-msgid "&Software Playthrough (Play new track while recording it)"
-msgstr "&Иҷрогари убурии нармафзор (хониши роҳчаи нав ҳангоми сабтшавии он)"
+#: prefs/AudioIOPrefs.cpp:154
+msgid "&Software Playthrough: Play new track while recording it"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:194
+msgid "Effects Preview"
+msgstr "Пешнамоиши натиҷаҳо"
+
+#: prefs/AudioIOPrefs.cpp:171
+msgid "Length of preview:"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:158
 msgid "Cut Preview"
 msgstr "Буриши пешнамоиш"
 
-#: prefs/AudioIOPrefs.cpp:161
-msgid "Play before cut region:"
-msgstr "Хониш пеш аз буриши маҳал:"
+#: prefs/AudioIOPrefs.cpp:179
+msgid "Preview before cut region:"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:163
-msgid "Play after cut region:"
-msgstr "Хониш баъд аз буриши маҳал:"
+#: prefs/AudioIOPrefs.cpp:181
+msgid "Preview after cut region:"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:168
 msgid "Latency"
 msgstr "Таваққуф"
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
-msgstr "Аудио ба миёнгир:"
-
-#: prefs/AudioIOPrefs.cpp:175
-#: prefs/AudioIOPrefs.cpp:178
-msgid "milliseconds"
-msgstr "миллисония"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
-msgstr "Тавақкуфи ислоҳкунӣ:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
+msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:184
-msgid "Seek Time"
-msgstr "Ҷустуҷӯи вақт"
+#: prefs/AudioIOPrefs.cpp:203
+msgid "Seek Time when playing"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:187
 msgid "Short period:"
@@ -5712,14 +7518,6 @@ msgstr "Марҳилаи кӯтоҳ:"
 msgid "Long period:"
 msgstr "Марҳилаи дароз:"
 
-#: prefs/AudioIOPrefs.cpp:194
-msgid "Effects Preview"
-msgstr "Пешнамоиши натиҷаҳо"
-
-#: prefs/AudioIOPrefs.cpp:197
-msgid "Play when previewing:"
-msgstr "Хониш ҳангоми пешнамоиш:"
-
 #: prefs/BatchPrefs.cpp:53
 #: prefs/BatchPrefs.cpp:54
 msgid "Batch"
@@ -5730,31 +7528,14 @@ msgstr "Баста"
 msgid "Behaviors"
 msgstr "Рафтор"
 
-#: prefs/BatchPrefs.cpp:77
-msgid "&Batch debug mode"
-msgstr "&Реҷаи ҳолати баста"
-
-#: prefs/BatchPrefs.cpp:79
-msgid "&Normalize on load"
-msgstr "&Муайянкунӣ дар боркунӣ"
-
-#: prefs/BatchPrefs.cpp:81
-msgid "&Prompt to save, even if empty"
-msgstr "&Пурсиш барои сабт ҳатто дар ҳолати ҳолигӣ"
+#: prefs/BatchPrefs.cpp:80
+msgid "&Don't apply effects in batch mode"
+msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "Ҳолати Cl&eanSpeech (махсусгардонидашуда GUI)"
 
-#: prefs/BatchPrefs.cpp:87
-#: prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr "Намоиш / Пинҳон"
-
-#: prefs/BatchPrefs.cpp:89
-msgid "S&how MP3-ID3 Dialog"
-msgstr "На&моиши муколамаи MP3-ID3"
-
 #: prefs/DirectoriesPrefs.cpp:55
 #: prefs/DirectoriesPrefs.cpp:56
 #: prefs/PrefsDialog.cpp:276
@@ -5782,8 +7563,8 @@ msgid "Auto save a copy of the project in a separate folder"
 msgstr "Худсабткунии нусхаи лоиҳа дар пӯшаи алоҳида"
 
 #: prefs/DirectoriesPrefs.cpp:104
-msgid "Auto save every:"
-msgstr "Худсабтшавӣ дар ҳама ҳолат:"
+msgid "Auto save interval:"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:105
 msgid "minutes"
@@ -5794,8 +7575,8 @@ msgid "Audio cache"
 msgstr "Аудиокэш"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Always hold all audio data in memory"
-msgstr "Нигоҳдории доимии ҳамаи аудиоҳо дар хотира"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -5819,104 +7600,156 @@ msgstr "Рӯйхати %s навишта намешавад"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Тағиротҳо ба рӯйхати муваққатӣ то аз навборкунии Audacity натиҷагирӣ намешаванд"
 
-#: prefs/FileFormatPrefs.cpp:47
-#: prefs/FileFormatPrefs.cpp:48
-msgid "File Formats"
-msgstr "Қолабҳои файл"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files into Audacity"
-msgstr "Ҳангоми вуруди файлҳои фишурданашудаи аудиоӣ дар Audacity"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:79
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "&Созиш ва нусхабардории файл пеш аз таҳриркун (бехатар) "
+#: prefs/FileFormatPrefs.cpp:104
+msgid "MP3 Library Version:"
+msgstr "Тариқаи феҳристи MP3:"
 
-#: prefs/FileFormatPrefs.cpp:80
-msgid "&Read directly from the original file (faster)"
-msgstr "&Хониши зуд аз файли аслӣ (босуръат)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:84
 msgid "When saving a project that depends on other audio files"
 msgstr "Сабти лоиҳа вобаста ба дигар файлҳо"
 
+#: prefs/FileFormatPrefs.cpp:151
+msgid "Always &copy all audio into project (safest)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:152
+msgid "&Do not copy any audio"
+msgstr ""
+
 #: prefs/FileFormatPrefs.cpp:87
 msgid "&Ask user"
 msgstr "&Пурсиш аз истифодабарандаы"
 
-#: prefs/FileFormatPrefs.cpp:93
-msgid "When exporting tracks"
-msgstr "Ҳангоми вуруди роҳчаҳо"
+#: prefs/FileFormatPrefs.cpp:157
+msgid "When exporting tracks to an audio file"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:96
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
 msgstr "&Омехтакунии доимии ҳамаи роҳчаҳо ба шабакаҳои Stereo ё Mono."
 
-#: prefs/FileFormatPrefs.cpp:97
-msgid "&Use Advanced Mixing Options"
-msgstr "&Истифодаи қисматҳои омехтаи пешрафта"
-
-#: prefs/FileFormatPrefs.cpp:104
-msgid "MP3 Library Version:"
-msgstr "Тариқаи феҳристи MP3:"
-
-#: prefs/FileFormatPrefs.cpp:110
-msgid "&Find Library"
-msgstr "&Ёфтани феҳрист"
-
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download free copy of LAME"
-msgstr "&Боркунии нусхаи бепули LAME"
+#: prefs/FileFormatPrefs.cpp:161
+msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:123
-msgid "MP3 exporting plugin not found"
-msgstr "Вуруди васеъшуда дар MP3 ёфт нашуд"
+#: prefs/FileFormatPrefs.cpp:163
+msgid "S&how Metadata Editor prior to export step"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:33
 #: prefs/GUIPrefs.cpp:34
 msgid "Interface"
 msgstr "Робита"
 
-#: prefs/GUIPrefs.cpp:72
-msgid "&Autoscroll while playing"
-msgstr "&Худчархиш ҳангоми иҷро"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Al&ways allow pausing"
-msgstr "Иҷо&зати доимии тавақкуф"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:76
-msgid "&Update spectrogram while playing"
-msgstr "&Азнавкунии спектрограма ҳангоми иҷро"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:78
-msgid "&Quit Audacity upon closing last window"
-msgstr "&Баромад аз Audacity ҳангоми пӯшидани равзанаи охирин"
+#: prefs/GUIPrefs.cpp:94
+msgid "&Update display while playing"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:80
-msgid "&Dragging of left and right selection edges"
-msgstr "&Кашидани интихоби кунҷҳои чап ва рост"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "&Танзими идораи эргономии аудио I/O тугмаҳо"
+#: prefs/GUIPrefs.cpp:98
+msgid "Enable &dragging of left and right selection edges"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:84
-msgid "Tracks &fit vertically zoomed"
-msgstr "Роҳчаҳо &дарҳол ба таври амудӣ калон мешаванд"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:86
-msgid "&Circular track keyboard navigation"
-msgstr "&Ҷойкунии давравӣ байни роҳчаҳо"
+#: prefs/GUIPrefs.cpp:102
+msgid "Automatically &fit tracks vertically zoomed"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
-msgstr "&Рақами роҳчаи ҳозира бо мақсади дастёбӣ"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
 msgid "Editing a &clip can move other clips"
 msgstr "Ҳангоми &таҳрири қисматҳо метавонем дигар қисматҳоро кӯчонем"
 
+#: prefs/GUIPrefs.cpp:108
+msgid "&Select all audio in project, if none selected"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:110
+msgid "&Beep on completion of longer activities"
+msgstr ""
+
+#: prefs/BatchPrefs.cpp:87
+#: prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr "Намоиш / Пинҳон"
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr "Хатҳоро бурида &наметавонад"
@@ -5925,17 +7758,25 @@ msgstr "Хатҳоро бурида &наметавонад"
 msgid "Show warnings about &temp files"
 msgstr "Намоиши огоҳӣ оиди &файлҳои муваққатӣ"
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
-msgstr "Забон"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:105
-msgid "Language:"
-msgstr "Забон:"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
+msgstr ""
 
-#: prefs/GUIPrefs.cpp:108
-msgid "Minimum of dB mode display range"
-msgstr "Инъикоси хурдтарин барои ҳолати dB"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:111
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5945,6 +7786,10 @@ msgstr "-36 dB (барои таҳрири баланди доманадор му
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (соҳаи PCM аз намунаҳаи 8 бита)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:113
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (соҳаи PCM аз намунаҳои 16 бита)"
@@ -5957,11 +7802,35 @@ msgstr "-120 dB (ҳудуди шунавоӣ)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (соҳаи PCM намунаҳои 24 бита)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:64
 #: prefs/KeyConfigPrefs.cpp:65
 msgid "Keyboard"
 msgstr "Саҳвакалид"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Тугмаҳои фаъол"
@@ -5970,10 +7839,6 @@ msgstr "Тугмаҳои фаъол"
 msgid "S&et"
 msgstr "На&сб"
 
-#: prefs/KeyConfigPrefs.cpp:116
-msgid "&Clear"
-msgstr "&Тоза кардан"
-
 #: prefs/KeyConfigPrefs.cpp:120
 msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
 msgstr "Эзоҳ: Cmd+Q барои хомӯш намудан истифода бурда мешаванд. Дигар калидҳо истифоданашавандаанд."
@@ -5999,22 +7864,16 @@ msgstr "Хатои ҳангоми сабти таркиббандии саҳфа
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Интихоби файли XML, ки дорои тугмаҳои фаъоли саҳфакалиди Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Файлҳои XML (*.xml)|*.xml|Ҳамаи файлҳо (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Хато ҳангоми сабти таркиббандии саҳфакалид"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Таркиббандии саҳфакалид аллакай барои  '%s' таъин шудааст:\n"
+msgstr "Таркиббандии саҳфакалид аллакай барои  '%s' таъин шудааст:\n"
 "\n"
 "'%s'"
 
@@ -6023,6 +7882,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Барҳамдиҳӣ"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&Хониши роҳчаҳои дигар ҳангоми сабти роҳчаи нав"
+
+#: prefs/AudioIOPrefs.cpp:150
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "&Иҷрогари убурии сахтафзор (хониши роҳчаи нав ҳангоми сабти он)"
+
+#: prefs/AudioIOPrefs.cpp:153
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "&Иҷрогари убурии нармафзор (хониши роҳчаи нав ҳангоми сабтшавии он)"
+
+#: prefs/AudioIOPrefs.cpp:161
+msgid "Play before cut region:"
+msgstr "Хониш пеш аз буриши маҳал:"
+
+#: prefs/AudioIOPrefs.cpp:163
+msgid "Play after cut region:"
+msgstr "Хониш баъд аз буриши маҳал:"
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr "Аудио ба миёнгир:"
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr "Тавақкуфи ислоҳкунӣ:"
+
+#: prefs/AudioIOPrefs.cpp:184
+msgid "Seek Time"
+msgstr "Ҷустуҷӯи вақт"
+
+#: prefs/AudioIOPrefs.cpp:197
+msgid "Play when previewing:"
+msgstr "Хониш ҳангоми пешнамоиш:"
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -6084,6 +7979,22 @@ msgstr "Васеъкунии соҳаи интихоб"
 msgid "Shift-Left-Click"
 msgstr "Shift-Left-Пахшкунӣ"
 
+#: prefs/MousePrefs.cpp:101
+msgid "Left-Double-Click"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:101
+msgid "Select Clip or Entire Track"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:102
+msgid "Ctrl-Left-Click"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:102
+msgid "Set Selection Point and Play"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:102
 #: prefs/MousePrefs.cpp:103
 #: prefs/MousePrefs.cpp:104
@@ -6124,6 +8035,22 @@ msgstr "Кашиши рост"
 msgid "same as left-drag"
 msgstr "ҳамон як кашиши чап"
 
+#: prefs/MousePrefs.cpp:108
+msgid "Shift-Drag"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:108
+msgid "Zoom out on a Range"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:109
+msgid "Middle-Click"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:109
+msgid "Zoom default"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:107
 msgid "Time shift clip or move up/down between tracks"
 msgstr "Вақти таконхурӣ ё ҷунбиш ба боло/поён байни роҳчаҳо"
@@ -6206,6 +8133,14 @@ msgstr "Чархиш ба боло ё поён"
 msgid "Wheel-Rotate"
 msgstr "Чархиши чарх"
 
+#: prefs/MousePrefs.cpp:128
+msgid "Scroll left or right"
+msgstr ""
+
+#: prefs/MousePrefs.cpp:128
+msgid "Shift-Wheel-Rotate"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:124
 msgid "Ctrl-Wheel-Rotate"
 msgstr "Ctrl-гардиш ба воситаи чарх"
@@ -6218,11 +8153,6 @@ msgstr "Калонкунии намуд"
 msgid "Audacity Preferences"
 msgstr "Қисматҳои Audacity"
 
-#: prefs/QualityPrefs.cpp:42
-#: prefs/QualityPrefs.cpp:43
-msgid "Quality"
-msgstr "Сифат"
-
 #: prefs/QualityPrefs.cpp:73
 msgid "Rectangle"
 msgstr "Росткунҷа"
@@ -6283,6 +8213,18 @@ msgstr "Дар айни замон:"
 msgid "High-quality:"
 msgstr "Сифати баланд:"
 
+#: prefs/SmartRecordPrefs.cpp:37 prefs/SmartRecordPrefs.cpp:38
+msgid "Smart Recording"
+msgstr ""
+
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
+
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:36
 #: prefs/SpectrumPrefs.cpp:37
 msgid "Spectrograms"
@@ -6300,6 +8242,10 @@ msgstr "8 - бештар паҳнохат"
 msgid "256 - default"
 msgstr "256 - аз рӯи хомушӣ"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:84
 msgid "4096 - most narrowband"
 msgstr "4096 - бештар камхат"
@@ -6308,6 +8254,10 @@ msgstr "4096 - бештар камхат"
 msgid "Window type:"
 msgstr "Намуди равзана:"
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr "Намуд"
@@ -6324,6 +8274,26 @@ msgstr "Басомади камтарин (Ҳз):"
 msgid "Maximum Frequency (Hz):"
 msgstr "Басомади бештарин (Ҳз):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:134
 msgid "The maximum frequency must be an integer"
 msgstr "Имконияти бештари басомад бояд бузургии тағирёбанда бошад"
@@ -6340,6 +8310,14 @@ msgstr "Имконияти камтари басомад бояд бузурги
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr "Имконияти камтари басомад бояд 0 Hz бошад"
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61
 #: prefs/ThemePrefs.cpp:62
 msgid "Theme"
@@ -6378,8 +8356,7 @@ msgid "Info"
 msgstr "Иттилоот"
 
 #: prefs/ThemePrefs.cpp:126
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -6392,57 +8369,49 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"Масъалагузорӣ хусусияти санҷишӣ дорад.\n"
+msgstr "Масъалагузорӣ хусусияти санҷишӣ дорад.\n"
 "\n"
-"Барои фаъолсозии он \"Сабти мавзӯъи Кэш\"-ро пахш кунед,\n баъдан \n тасвирҳо ва рангҳоро ёбед ва тағир диҳед \n"
+"Барои фаъолсозии он \"Сабти мавзӯъи Кэш\"-ро пахш кунед,\n"
+" баъдан \n"
+" тасвирҳо ва рангҳоро ёбед ва тағир диҳед \n"
 "Тасвири кэшии Vxx.png таҳриргари тасвирро ба монанди \n"
 "Gimp истифода мебаранд.\n"
 "\n"
-"Барои боркунӣ ва ивази тасвирҳо \"Боркунии мавзӯъи кэш\" -ро пахш кунед\n "
-"ва рангҳо ба Audacity бармегарданд.\n"
+"Барои боркунӣ ва ивази тасвирҳо \"Боркунии мавзӯъи кэш\" -ро пахш кунед\n"
+" ва рангҳо ба Audacity бармегарданд.\n"
 "\n"
 "[Танҳо рангҳо ва сутуни абзор дар роҳчаи мавҷдор фаъоланд\n"
-"ҳато агар тасвири файл \n дигар расмҳоро нишон диҳад.]\n"
+"ҳато агар тасвири файл \n"
+" дигар расмҳоро нишон диҳад.]\n"
 
 #: prefs/ThemePrefs.cpp:131
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Шумо Audacity-ро бо тугмаи дохилӣ ҳамгардонӣ намудед, \n"
+msgstr "Шумо Audacity-ро бо тугмаи дохилӣ ҳамгардонӣ намудед, \n"
 "'Output Sourcery'.  Ин тариқаи C-и тасвирро\n"
 "ки аз рӯи хомӯшӣ ҳамгардонӣ мешавад, сабт мекунад.\n"
 
 #: prefs/ThemePrefs.cpp:136
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Агар боркунии мавзӯъи кэш дар насб санҷида шудааст, баъдан\n"
-"мавзӯъи кэш ҳангоми ибтидои кори барнома аз нав\n "
-"бор мешавад\n"
+msgstr "Агар боркунии мавзӯъи кэш дар насб санҷида шудааст, баъдан\n"
+"мавзӯъи кэш ҳангоми ибтидои кори барнома аз нав\n"
+" бор мешавад\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Сабт ва боркунии мавзӯъҳои интихобшуда \n"
+msgstr "Сабт ва боркунии мавзӯъҳои интихобшуда \n"
 "файли алоҳидаро барои ҳар як намуд истифода мебаранд, аммо аз дигар тараф\n"
 "ҳадаф ҳамон аст.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Идоракунӣ"
-
 #: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Таваққуф"
@@ -6452,8 +8421,8 @@ msgid "Play"
 msgstr "Иҷро"
 
 #: toolbars/ControlToolBar.cpp:178
-msgid "Play (Shift for loop-play)"
-msgstr "Иҷро (Shift барои даври хониш)"
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
@@ -6467,6 +8436,10 @@ msgstr "Гузариш ба ибтидо"
 msgid "Skip to End"
 msgstr "Гузариш ба интиҳо"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Тозакунии нутқ"
@@ -6476,13 +8449,9 @@ msgstr "Тозакунии нутқ"
 msgid "Error while opening sound device. "
 msgstr "Хато ҳангоми кушодани афзори садо. "
 
-#: toolbars/ControlToolBar.cpp:687
-msgid ""
-"CleanSpeech only allows recording mono tracks.\n"
-"Recording is not possible when more than one window is open."
+#: toolbars/ControlToolBar.cpp:706
+msgid "Recording in CleanSpeech mode is not possible when a track, or more than one project, is already open."
 msgstr ""
-"CleanSpeech танҳо ба сабти монороҳчаҳо иҷозат медиҳад.\n"
-"Вақте ки аз як равзана зиёд кушода аст сабт иҷро намешавад."
 
 #: toolbars/ControlToolBar.cpp:688
 msgid "Recording not permitted"
@@ -6507,6 +8476,10 @@ msgid "Silence selection"
 msgstr "Интихоб аз рӯи хомӯшӣ"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Калонкунӣ"
 
@@ -6562,24 +8535,22 @@ msgstr "Масрафсанҷи сатҳи баромад"
 msgid "Input level meter - click to monitor input"
 msgstr "масрафсанҷи сатҳи вуруд - пахш ба вуруди намоишгар"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr "Омезишкунанда"
-
 #: toolbars/MixerToolBar.cpp:91
 msgid "Output Volume"
 msgstr "Дараҷаи хориҷ"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+#, fuzzy
+msgid "Slider Output"
 msgstr "Берунсозии намоишӣ"
 
 #: toolbars/MixerToolBar.cpp:102
 msgid "Input Volume"
 msgstr "Дараҷаи ворид"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+#, fuzzy
+msgid "Slider Input"
 msgstr "Воридкунии намоиш"
 
 #: toolbars/MixerToolBar.cpp:117
@@ -6600,6 +8571,13 @@ msgstr "Суръати лоиҳа (Hz):"
 msgid "Selection Start:"
 msgstr "Ибтидои интихоб:"
 
+#: effects/ToneGen.cpp:296
+#: effects/ToneGen.cpp:334
+#: toolbars/SelectionBar.cpp:136
+#: toolbars/SelectionBar.cpp:227
+msgid "Length"
+msgstr "Дарозӣ"
+
 #: toolbars/SelectionBar.cpp:146
 msgid "hidden"
 msgstr "пинҳон"
@@ -6609,6 +8587,10 @@ msgstr "пинҳон"
 msgid "Audio Position:"
 msgstr "Мавқеи аудио:"
 
+#: toolbars/SelectionBar.cpp:236 toolbars/SelectionBar.cpp:241
+msgid "Snap To"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:226
 msgid "Selection "
 msgstr "Интихобкунӣ"
@@ -6858,6 +8840,30 @@ msgstr "Чап"
 msgid "Right"
 msgstr "Рост"
 
+#: widgets/ErrorDialog.cpp:98
+msgid "Help"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:255
+msgid "Help on the Internet"
+msgstr ""
+
 #: widgets/Grabber.cpp:61
 msgid "Grabber"
 msgstr "Контакткунанда"
@@ -6901,24 +8907,22 @@ msgstr "Стереои уфуқӣ"
 msgid "Vertical Stereo"
 msgstr "Стереои амудӣ"
 
-#: widgets/Meter.cpp:356
-msgid "Linear"
-msgstr "Хатӣ"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr "Қисматҳо..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Ин азнавсозии масрафсанҷро таъин мекунад.\n"
-"Агар Шумо PC-и суст дошта бошед, метавонед \n "
-"азнавсозии андозаи поёниро интихоб намоедe (30 дар сония ё камтар), бинобарин\n"
+msgstr "Ин азнавсозии масрафсанҷро таъин мекунад.\n"
+"Агар Шумо PC-и суст дошта бошед, метавонед \n"
+" азнавсозии андозаи поёниро интихоб намоедe (30 дар сония ё камтар), бинобарин\n"
 "сифати аудио ба иҷрои масрафсанҷ таъсир намерасонад."
 
 #: widgets/Meter.cpp:1038
@@ -6933,6 +8937,22 @@ msgstr "Қисматҳои масрафсанҷ"
 msgid " Please select an action "
 msgstr " Лутфан, амалиётро интихоб намоед "
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110
 #: widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
@@ -6942,10 +8962,6 @@ msgstr "Идоракунандаи амудӣ"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 сония"
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr "сс:дд:сс"
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr "0100 с 060 д 060 с"
@@ -6958,6 +8974,21 @@ msgstr "рр:сс:дд:сс"
 msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 рӯз 024 с 060 д 060 с"
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr "сс:дд:сс + миллисония"
@@ -7071,12 +9102,13 @@ msgstr "Ин огоҳиро дигар нишон надиҳед"
 msgid "Could not open file: \"%s\""
 msgstr "Файлро \"%s\"-ро кушода натавонист"
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Хато: %hs дар хати %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
-#: xml/XMLFileReader.cpp:80
-msgid "Unable to open project file."
-msgstr "Лоиҳаи файлро кушода натавонист."
+#: xml/XMLFileReader.cpp:79
+#, c-format
+msgid "Could not load file: \"%s\""
+msgstr ""
 
diff --git a/locale/tr.po b/locale/tr.po
index 3f8e6de..a9adc49 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -19,36 +19,24 @@ msgstr "Project-Id-Version: audacity\n"
 msgid "&About Audacity..."
 msgstr "&Audacity Hakkında..."
 
-#: ../src/effects/AvcCompressor.cpp:652
-msgid "Enabled"
-msgstr "Etkin"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: AboutDialog.cpp:204
-#, fuzzy
-msgid "Program build date: "
-msgstr "Program inÅŸa tarihi:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: AboutDialog.cpp:214
-#, fuzzy
-msgid "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."
-msgstr "Audacity dünyadaki gönüllü geliştiricilerin bir takım olarak yazdığı özgür bir programdır.  Koordinasyon SourceForge.Net sayesinde meydana gelir, SourceForge.Net açık-kaynak yazılım projelerine serbest araçlar sağlayan bir çevrimiçi servistir.. Audacity Windows 98 ve daha yeni, Mac OS X, Linux ve diğer Unix-benzeri işletim sistemleri için mevcuttur.  Audacity'nin eski sürümleri Mac OS 9 için mevcuttur."
-
-#: ../src/AboutDialog.cpp:108
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Bu programın deneme sürümüdür.  Bazı hatalar ve bitirilmemiş özellikler içerebilir.  Sizin geri dönüşümlerinize bağlıyız, bu yüzden lütfen internet sitemizi ziyaret edin ve özellik önerileriniz ve hata raporlarınızı bize gönderin."
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: AboutDialog.cpp:221
-#, fuzzy
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Bu kararlıdır, Audacity'nin tamamlanmış önsürümüdür.  Ancak, eğer bir hata bulursanız ya da bir öneriniz varsa, lütfen bizimle temasa geçin.  Audacity'i geliştirmeye devam etmek için kullanıcılardan gelen geri dönüşüme bağlıyız.  Daha fazla bilgi için, internet sitemizi ziyaret edin."
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -60,13 +48,9 @@ msgstr "Bu kararlıdır, Audacity'nin tamamlanmış önsürümüdür.  Ancak, e
 msgid "translator_credits"
 msgstr "çevirici_emeği geçenler"
 
-#: ../src/AboutDialog.cpp:141
-msgid "A Free Digital Audio Editor"
-msgstr "Bir Özgür Sayısal Ses Düzenleyicisi"
-
-#: ../src/AboutDialog.cpp:150
-msgid "Information"
-msgstr "Bilgi"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:154
 msgid "Credits"
@@ -102,26 +86,118 @@ msgstr ""
 msgid "Special thanks:"
 msgstr "Özel teşekkürler:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:652
+msgid "Enabled"
+msgstr "Etkin"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: AboutDialog.cpp:204
+#, fuzzy
+msgid "Program build date: "
+msgstr "Program inÅŸa tarihi:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223 ../src/effects/ClickRemoval.cpp:371
-#: ../src/effects/NoiseRemoval.cpp:463 ../src/FreqWindow.cpp:123
-msgid "Close"
-msgstr "Kapat"
-
 #: ../src/AudacityApp.cpp:304 ../src/Project.cpp:1770
 #, c-format
 msgid "%s is already open in another window."
@@ -320,12 +396,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -359,8 +436,8 @@ msgstr ""
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:366
@@ -408,6 +485,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -456,10 +537,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr ""
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:205
 msgid "Select file(s) for batch processing..."
 msgstr ""
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:208
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr ""
@@ -676,16 +765,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "Dosya yeniden adlandırıldı: %s\n"
 
-#: ../src/DirManager.cpp:660
-#, c-format
-msgid "Changing block %s\n"
-msgstr "%s öbeği değişiyor\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115 DirManager.cpp:1403
 msgid "Inspecting project file data..."
 msgstr ""
@@ -814,6 +903,95 @@ msgstr ""
 msgid "Rectangular"
 msgstr "Dikdörtgenel"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "%s nerede?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "Frekans Analizi"
@@ -841,8 +1019,8 @@ msgstr "Gelişmiş Özilinti"
 msgid "Cepstrum"
 msgstr "Kepstrum"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:58
@@ -855,8 +1033,8 @@ msgstr "Boyut"
 msgid " window"
 msgstr "pencere"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -867,14 +1045,23 @@ msgstr "DoÄŸrusal frekans"
 msgid "Log frequency"
 msgstr "Frekans günlüğü"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223 ../src/effects/ClickRemoval.cpp:371
+#: ../src/effects/NoiseRemoval.cpp:463 ../src/FreqWindow.cpp:123
+msgid "Close"
+msgstr "Kapat"
+
 #: ../src/effects/Compressor.cpp:385 ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:293
 msgid "dB"
@@ -926,7 +1113,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Gecikme (saniye)\tFrekans (Hz)\tSeviye"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -942,15 +1129,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -961,40 +1164,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1188,6 +1415,10 @@ msgstr "Projeyi &Kaydet\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Projeyi Farklı K&aydet:"
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1196,6 +1427,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1224,10 +1459,26 @@ msgstr "Etiket&leri Aktar..."
 msgid "Export &Multiple..."
 msgstr "Çoklu A&ktar..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1289,9 +1540,9 @@ msgstr "&Sil\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr ""
 
-#: ../src/Menus.cpp:261
-msgid "&Silence\tCtrl+L"
-msgstr "&Sessizlik\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1305,22 +1556,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr ""
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
 msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1364,12 +1613,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:269
@@ -1380,66 +1629,67 @@ msgstr "&Tüm\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: Menus.cpp:513
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+msgid "&Left at Playback Position\t["
 msgstr ""
 
-#: Menus.cpp:514
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+msgid "&Right at Playback Position\t]"
 msgstr ""
 
-#: ../src/Menus.cpp:272
-msgid "Start to Cursor"
-msgstr "İmleçte Başlat"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:273
-msgid "Cursor to End"
-msgstr "Sonlanacak İmleç"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "Sıfır Kesmelerini Bul\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "İmleci Taşı..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:292
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "Seçimi Başlatmak için"
 
-#: ../src/Menus.cpp:293
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "Seçimi Sonlandırmak için"
 
-#: ../src/Menus.cpp:288
-msgid "to Track Start"
-msgstr "İz Başlatmak için"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:289
-msgid "to Track End"
-msgstr "İzi Sonlandırmak için"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:280
-msgid "Selection Save"
-msgstr "Seçim Kaydı"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:281
-msgid "Selection Restore"
-msgstr "Seçimi Geri Yükle"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:311
@@ -1458,9 +1708,14 @@ msgstr ""
 msgid "Turn Grid Snap Off"
 msgstr ""
 
-#: ../src/Menus.cpp:327 ../src/Menus.cpp:333
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Tercihler...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:345
 msgid "&View"
@@ -1498,60 +1753,122 @@ msgstr ""
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr ""
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:364
 msgid "&History..."
 msgstr "&Geçmiş..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
+
+#: Menus.cpp:567
+msgid "&Control Toolbar"
+msgstr ""
+
+#: Menus.cpp:568
+msgid "&Device Toolbar"
+msgstr ""
+
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
+msgstr ""
+
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
+msgstr ""
+
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
+msgstr ""
+
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
+msgstr ""
+
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
+msgstr ""
+
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:593
+msgid "&Pause\tP"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:566
+msgid "Skip to Start\tHome"
+msgstr "Başlamayı Atla\tHome"
+
+#: ../src/Menus.cpp:567
+msgid "Skip to End\tEnd"
+msgstr "Sonlamayı Atla\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1567,12 +1884,8 @@ msgstr ""
 msgid "&Time Track"
 msgstr "Zaman Ä°zi"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
-msgstr ""
-
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-msgid "&Mix and Render"
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
 #: Menus.cpp:564
@@ -1587,6 +1900,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "İ&zleri Kaldır"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:405
 msgid "Align with &Zero"
 msgstr "Sıfıra &Yasla"
@@ -1603,29 +1924,40 @@ msgstr "Seçim Başlangıcı ile Ya&sla"
 msgid "Align with Selection &End"
 msgstr "S&eçim Sonu ile Yasla"
 
-#: ../src/Menus.cpp:409
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "Ok ile Sona Yasla"
 
-#: ../src/Menus.cpp:410
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "Seçim Başlangıcı ile Sona Yasla"
 
-#: ../src/Menus.cpp:411
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "Seçim Sonu ile Sona Yasla"
 
-#: ../src/Menus.cpp:412
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "Ä°zleri Birlikte Yasla"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "Ä°zleri Yasla..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1638,22 +1970,26 @@ msgstr "Seçimde Etiket Ekle\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Yeniden Çalma Konumunda Etiket Ekle\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:441
 msgid "&Generate"
 msgstr "&OluÅŸtur"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:464
 msgid "Effe&ct"
 msgstr "Et&ki"
@@ -1687,6 +2023,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1699,12 +2039,12 @@ msgstr "Denektaşı'nı Çalıştı&r..."
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:546
@@ -1739,9 +2079,9 @@ msgstr "Sonraki Araç\tD"
 msgid "Previous Tool\tA"
 msgstr "Önceki Araç\tA"
 
-#: ../src/Menus.cpp:556
-msgid "Play/Stop\tSpacebar"
-msgstr "Çal/Dur\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:557
 msgid "Stop\tS"
@@ -1755,12 +2095,12 @@ msgstr "Duraklat\tP"
 msgid "Record\tR"
 msgstr "Kayıt\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:561
@@ -1775,22 +2115,14 @@ msgstr "Seçimde Oynat\tB"
 msgid "Play Looped\tL"
 msgstr ""
 
-#: ../src/Menus.cpp:564
-msgid "Play Looped\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
 msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:566
-msgid "Skip to Start\tHome"
-msgstr "Başlamayı Atla\tHome"
-
-#: ../src/Menus.cpp:567
-msgid "Skip to End\tEnd"
-msgstr "Sonlamayı Atla\tEnd"
-
 #: ../src/Menus.cpp:569
 msgid "Selection to Start\tShift+Home"
 msgstr "Başlangıçtaki Seçim\tShift+Home"
@@ -1847,8 +2179,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:582
@@ -1947,14 +2279,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:939
 msgid "Open Recent"
 msgstr ""
 
-#: ../src/Menus.cpp:154
-msgid "Recent &Files..."
-msgstr "&Son Dosyalar..."
+#. i18n-hint: This is the name of the menu item on Windows and Linux
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:617
 #, c-format
@@ -2011,6 +2348,23 @@ msgstr "%s Tekrarla\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Aktarılacak etiket izleri yok."
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1633
 msgid "Nothing to undo"
 msgstr "Geri alınacak hiçbirşey yok"
@@ -2047,6 +2401,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "Panodan yapıştır"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2213,9 +2571,9 @@ msgstr "Etiketleri Al"
 msgid "Select a MIDI file..."
 msgstr "Bir MIDI dosyası seçin..."
 
-#: ../src/Menus.cpp:2673
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Tüm dosyalar (*.*)|*.*|MIDI dosyaları (*.mid)|*.mid|Allegro dosyaları (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:2691
 #, c-format
@@ -2234,12 +2592,6 @@ msgstr "Herhangi açılmamış ses dosyası seçin..."
 msgid "All files (*)|*"
 msgstr "Tüm dosyalar (*)|*"
 
-#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
-#: ../src/import/ImportRaw.cpp:408 ../src/Project.cpp:2236
-#: ../src/Project.cpp:2283
-msgid "Import"
-msgstr "Al"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2271,6 +2623,10 @@ msgstr ""
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr ""
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+msgid "&Mix and Render"
+msgstr ""
+
 #: ../src/Menus.cpp:2889
 msgid "Aligned with zero"
 msgstr "Sıfıra hizalı"
@@ -2307,6 +2663,14 @@ msgstr "Hizalı"
 msgid "Align"
 msgstr "Hizala"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:2974
 msgid "Created new audio track"
 msgstr "Yeni ses izi oluÅŸturuldu"
@@ -2368,14 +2732,14 @@ msgstr "İzi Kaldır"
 msgid "Removed audio track(s)"
 msgstr "Ses izi(leri) kaldırıldı"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2439,14 +2803,13 @@ msgstr "Kayıtlı Ses"
 msgid "Save changes before closing?"
 msgstr "Kapatmadan önce değişiklikler kaydedilsin mi?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1717
@@ -2465,6 +2828,25 @@ msgstr "Bir ya da daha fazla ses dosyası seçin..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: Project.cpp:1902
+msgid "Opening old project file"
+msgstr ""
+
 #: ../src/Project.cpp:1821 ../src/Project.cpp:1829
 msgid "Error opening file"
 msgstr "Dosya açılıyorken hata"
@@ -2521,42 +2903,34 @@ msgstr "Bu dosya %s Audacity kullanarak kaydedilmiÅŸ.\n"
 msgid "Can't open project file"
 msgstr "Proje dosyası açılamadı"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"Save anyway?"
 msgstr ""
 
-#: Project.cpp:1902
-msgid "Opening old project file"
+#: Project.cpp:2538
+msgid "Warning empty project"
 msgstr ""
 
-#: Project.cpp:2124
+#: Project.cpp:2591
 #, c-format
-#, fuzzy
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "Proje kaydedilemedi.  Belki %s yazılabilir değil,\n"
-"ya da disk dolu."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2148 ../src/Project.cpp:2160
 msgid "Error saving project"
@@ -2567,22 +2941,17 @@ msgstr "Projeyi kaydediyorken hata"
 msgid "Saved %s"
 msgstr "%s kaydedildi"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: ../src/Project.cpp:2228
-msgid "Raw"
-msgstr "Ham"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2282
 #, c-format
 msgid "Imported '%s'"
 msgstr "Alındı '%s'"
 
+#: ../src/import/ImportPCM.cpp:403 ../src/import/ImportPCM.cpp:488
+#: ../src/import/ImportRaw.cpp:408 ../src/Project.cpp:2236
+#: ../src/Project.cpp:2283
+msgid "Import"
+msgstr "Al"
+
 #: ../src/Project.cpp:2340
 msgid "Error importing"
 msgstr "Aktarma hatası"
@@ -2595,17 +2964,23 @@ msgstr ""
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr ""
 
-#: ../src/Project.cpp:2368
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity proje dosyaları (.aup) ekranda gördüğünüz gibi tam olarak\n"
-" üzerinde çalıştığınız herşeyi kaydetmenize izin verir, fakat pekçok diğer programlar Audacity proje dosyalarını açamaz.\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Diğer programlar yoluyla açabildiğiniz bir dosyayı kaydetmek istediğiniz\n"
-" zaman, Aktarma komutlarının birini seçin."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2378
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2648,6 +3023,16 @@ msgstr ""
 msgid "Out of disk space"
 msgstr "Disk boşluğunun dışında"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2730,43 +3115,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
-msgstr ""
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2806,8 +3160,8 @@ msgstr ""
 msgid "Comments"
 msgstr "Yorumlar"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2826,12 +3180,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2873,100 +3227,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:429
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "'%s' niteliğinin en büyük uzunluğu %d karakterdir. Veri budanmış."
-
-#: ../src/Tags.cpp:435
-msgid "Title"
-msgstr "Başlık"
-
-#: ../src/Tags.cpp:445
-msgid "Artist"
-msgstr "Sanatçı"
-
-#: ../src/Tags.cpp:455
-msgid "Album"
-msgstr "Albüm"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3031,8 +3304,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3067,6 +3383,10 @@ msgstr "Dalga biçimi"
 msgid "Waveform (dB)"
 msgstr "Dalga biçimi (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:838
 msgid "Pitch (EAC)"
 msgstr "Sıklık (EAC)"
@@ -3197,13 +3517,13 @@ msgstr ""
 msgid "Time-Shift"
 msgstr "Zaman-Ötelemesi"
 
-#: TrackPanel.cpp:2696
-msgid "Draw currently only works with linear-view waveforms."
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr ""
 
-#: ../src/TrackPanel.cpp:2378
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "Yeterince odaklanmadınız. Özgün örnekleri görene kadar yakınlaşın."
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2637
 msgid "Moved Sample"
@@ -3285,6 +3605,14 @@ msgstr ""
 msgid "Adjusted gain"
 msgstr ""
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3341,14 +3669,6 @@ msgstr "Oran DeÄŸiÅŸtir"
 msgid "Format Change"
 msgstr "Biçem Değiştir"
 
-#: ../src/TrackPanel.cpp:4320
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "1 ve 100000 arasında (her saniye) Hz'de bir örnek oran girin:"
-
-#: ../src/AStatus.cpp:362 ../src/TrackPanel.cpp:4331
-msgid "Invalid rate."
-msgstr "Geçersiz oran."
-
 #: ../src/TrackPanel.cpp:4351
 msgid "Change lower speed limit (%) to:"
 msgstr ""
@@ -3481,8 +3801,8 @@ msgstr "%i deki Eklentiler 1"
 msgid "Plugins %i to %i"
 msgstr "%i deki %i Eklentileri"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3504,8 +3824,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:640
@@ -3526,14 +3846,19 @@ msgstr "Uygulanmış etki: %s %.1f dB"
 msgid "Amplify"
 msgstr "Ses Yükselt"
 
-#: ../src/effects/Amplify.cpp:125
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Dominic Mazzoni tarafından Yükseltildi"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:132
 msgid "Amplification (dB):"
 msgstr "Sesi Yükseltme (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:152
 msgid "New Peak Amplitude (dB):"
 msgstr "Yeni Tepe GenliÄŸi (dB):"
@@ -3542,6 +3867,10 @@ msgstr "Yeni Tepe GenliÄŸi (dB):"
 msgid "Allow clipping"
 msgstr "Kırpmaya izin ver"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:47
 msgid "Amplify..."
 msgstr "Yükselt..."
@@ -3654,10 +3983,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "Frekans (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:302
 msgid "Boost (dB):"
 msgstr "Yükselt (dB)"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 #, fuzzy
 msgid "BassBoost..."
@@ -3697,9 +4034,50 @@ msgstr "Vaughan Johnson ve Dominic Mazzoni tarafından"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "Olli Parviainen tarafından, Ses Dokunuşu"
 
-#: ../src/effects/ChangePitch.cpp:262
-msgid "Pitch:   from"
-msgstr "Sıklık:   den"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:299
+msgid "Semitones (half-steps):"
+msgstr "Yarımtonlar (yarım-adımlar):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:284 ../src/effects/ChangePitch.cpp:330
 #: ../src/effects/ChangeSpeed.cpp:351 ../src/effects/ChangeTempo.cpp:223
@@ -3707,19 +4085,20 @@ msgstr "Sıklık:   den"
 msgid "to"
 msgstr "-e"
 
-#: ../src/effects/ChangePitch.cpp:299
-msgid "Semitones (half-steps):"
-msgstr "Yarımtonlar (yarım-adımlar):"
-
-#: ../src/effects/ChangePitch.cpp:318
-msgid "Frequency (Hz):   from"
-msgstr "Frekans (Hz):   den"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:353 ../src/effects/ChangeSpeed.cpp:305
 #: ../src/effects/ChangeTempo.cpp:182
 msgid "Percent Change:"
 msgstr "Yüzde Değiştir:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Sıklığı Değiştir..."
@@ -3737,6 +4116,14 @@ msgstr "Uygulanmış etki: %s %1.f%%"
 msgid "Change Speed"
 msgstr "Hızı Değiştir"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: ../src/effects/ChangeSpeed.cpp:338
+msgid "n/a"
+msgstr "n/a"
+
 #: ../src/effects/ChangeSpeed.cpp:282
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Her iki etkileyici ve Tempo ve Sıklığı, Hızı Değiştir"
@@ -3745,17 +4132,17 @@ msgstr "Her iki etkileyici ve Tempo ve Sıklığı, Hızı Değiştir"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "Erik de Castro Lopo tarafından, ÖrnekOran"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: ../src/effects/ChangeSpeed.cpp:338
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:341
-msgid "Standard Vinyl RPM:   from"
-msgstr "Standart Vinly RPM'si:   den"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:37
 msgid "Change Speed..."
@@ -3773,13 +4160,29 @@ msgstr "Tempoyu DeÄŸiÅŸtir"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Sıklığı Değiştirmeksizin Tempoyu Değiştir"
 
-#: ../src/effects/ChangeTempo.cpp:211
-msgid "Beats per Minute (BPM):   from"
-msgstr "Her Dakikadaki Vuru (BPM):   den"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:241
-msgid "Length (seconds):   from"
-msgstr "Uzunluk (saniye):   den"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:40
 msgid "Change Tempo..."
@@ -3789,8 +4192,8 @@ msgstr "Tempoyu DeÄŸiÅŸtir..."
 msgid "Changing Tempo"
 msgstr "Tempoyu DeÄŸiÅŸtirme"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:317
@@ -3801,10 +4204,18 @@ msgstr ""
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Kaldırmayı Tıkla..."
@@ -3817,49 +4228,84 @@ msgstr "Tıklamalar ve açılmalar kaldırılıyor..."
 msgid "Dynamic Range Compressor"
 msgstr "Dinamik Aralık Sıkıştırıcısı"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Dominik Mazzoni tarafında Dinamik Aralık Sıkıştırıcısı"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "Oran: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Hamle Zamanı: "
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "Sıkıştırmadan sonra 0dB'a düzgele"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "EÅŸik: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Oran: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Oran: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Hamle Zamanı: %.1f san."
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3870,6 +4316,247 @@ msgstr "Sıkıştırıcı..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Dinamik Aralık Sıkıştırması Uygulanıyor..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
+#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
+msgid "End"
+msgstr ""
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:150
+msgid "Information"
+msgstr "Bilgi"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr ""
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3886,8 +4573,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "Genlik (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4114,16 +4801,12 @@ msgstr "Dönüştür"
 msgid "Inverting"
 msgstr "Evriliyor"
 
-#: effects/Leveller.cpp:47
-msgid "Heavier"
-msgstr ""
-
-#: effects/Leveller.cpp:47
-msgid "Heaviest"
+#: BatchCommands.cpp:237 effects/Leveller.cpp:129
+msgid "Leveller"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
@@ -4135,31 +4818,35 @@ msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heavy"
 msgstr ""
 
-#: BatchCommands.cpp:237 effects/Leveller.cpp:129
-msgid "Leveller"
+#: effects/Leveller.cpp:47
+msgid "Heavier"
 msgstr ""
 
-#: effects/Leveller.cpp:214
-msgid "Leveller by Lynn Allan"
+#: effects/Leveller.cpp:47
+msgid "Heaviest"
 msgstr ""
 
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: effects/Leveller.cpp:220 effects/Leveller.cpp:233
 msgid "Degree of Leveling"
 msgstr ""
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:244
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr ""
 
-#: effects/Leveller.cpp:255
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+msgid "Threshold for Noise:"
 msgstr ""
 
 #: effects/Leveller.h:28
@@ -4170,6 +4857,158 @@ msgstr ""
 msgid "Applying Leveller..."
 msgstr ""
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:58
+msgid "Mixer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:59
+msgid "Phaser"
+msgstr "Fazlayıcı"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/effects/NoiseRemoval.cpp:69
+msgid "Noise Removal"
+msgstr "Gürültü Kaldırma"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4186,10 +5025,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4217,10 +5052,6 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr ""
 
-#: ../src/effects/NoiseRemoval.cpp:69
-msgid "Noise Removal"
-msgstr "Gürültü Kaldırma"
-
 #: ../src/effects/NoiseRemoval.cpp:410
 msgid "Step 1"
 msgstr "Adım 1"
@@ -4251,14 +5082,26 @@ msgstr "Gürültü Profili Al"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:38
 msgid "Noise Removal..."
 msgstr "Gürültü Kaldırma..."
@@ -4293,22 +5136,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "Düzgele"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:239
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Herhangi DC ofseti kaldır (0 düşey olarak merkezi)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:34
 msgid "Normalize..."
 msgstr "Düzgele..."
@@ -4322,42 +5165,54 @@ msgstr "Düzgeleniyor..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Uygulanmış etki: %s %d evreleri, %.0f%% ıslak, frekans = %.1f Hz, başlangıç fazı = %.0f derecesi, derinlik = %d, geribildirim = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:59
-msgid "Phaser"
-msgstr "Fazlayıcı"
-
-#: ../src/effects/Phaser.cpp:448
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Nasca Octavian Paul tarafından Fazlayıcı"
-
 #: ../src/effects/Phaser.cpp:455
 msgid "Stages:"
 msgstr "AÅŸamalar:"
 
-#: ../src/effects/Phaser.cpp:476
-msgid "DRY"
-msgstr "KURU"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:483
-msgid "WET"
-msgstr "ISLAK"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:497 ../src/effects/Wahwah.cpp:468
 msgid "LFO Frequency (Hz):"
 msgstr "LFO Frekansı (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:513 ../src/effects/Wahwah.cpp:484
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO Başlangıç Fazı (der.):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 msgid "Depth:"
 msgstr "Derinlik:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Feedback (%):"
 msgstr "Geri Besleme (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:41
 msgid "Phaser..."
 msgstr "Fazlayıcı..."
@@ -4372,6 +5227,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4389,27 +5252,22 @@ msgstr "İzler seçimi tekrarlamak için çok uzun."
 msgid "Repeat"
 msgstr "Tekrarla"
 
-#: ../src/effects/Repeat.cpp:222
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Dominic Mazzoni ve Vaughan Johnson tarafından tekrarlama"
-
-#: ../src/effects/Repeat.cpp:229
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Tekrarlanacak kerelerin sayısı"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:241 ../src/effects/Repeat.cpp:280
 msgid "New selection length: "
 msgstr "Yeni seçim uzunluğu: "
 
-#: ../src/effects/Repeat.cpp:282
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d dakika, %d saniye"
-
-#: ../src/effects/Repeat.cpp:285
-#, c-format
-msgid "%d seconds"
-msgstr "%d saniye"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:34
 msgid "Repeat..."
@@ -4474,8 +5332,56 @@ msgstr ""
 msgid "Applying Spike Cleaner..."
 msgstr ""
 
-#: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr ""
+
+#: effects/StereoToMono.h:38
+msgid "Applying Stereo to Mono"
+msgstr ""
+
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
 msgstr ""
 
 #: effects/ToneGen.cpp:59
@@ -4483,6 +5389,14 @@ msgstr ""
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:292
+msgid "Linear"
+msgstr "DoÄŸrusal"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4511,22 +5425,28 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:263
 msgid "Waveform:"
 msgstr "Dalga biçimi:"
 
-#: effects/ToneGen.cpp:328 toolbars/ControlToolBar.cpp:186
-msgid "Start"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:329 toolbars/ControlToolBar.cpp:189
-#: toolbars/SelectionBar.cpp:129 toolbars/SelectionBar.cpp:226
-msgid "End"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
 msgstr ""
 
 #: effects/ToneGen.h:39
@@ -4553,10 +5473,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4602,10 +5518,6 @@ msgstr "Uygulanmış etki: %s frekansı = %.1f Hz, başlangıç fazı = %.0f der
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: ../src/effects/Wahwah.cpp:461
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Nasca Octavian Paul tarafından Wahwah"
-
 #: ../src/effects/Wahwah.cpp:500
 msgid "Depth (%):"
 msgstr "Derinlik (%):"
@@ -4614,10 +5526,18 @@ msgstr "Derinlik (%):"
 msgid "Resonance:"
 msgstr "Çınlama:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:532
 msgid "Wah Frequency Offset (%):"
 msgstr "Wah Frekans Ofseti (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:39
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -4653,6 +5573,18 @@ msgstr "Etki Ayarları"
 msgid "Length (seconds)"
 msgstr "Uzunluk (saniye)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:217
 msgid "Applying Nyquist Effect..."
 msgstr "Nyquist Efekti Uygulanıyor..."
@@ -4718,9 +5650,12 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: export/Export.cpp:135
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
 
 #: export/Export.cpp:445
@@ -4774,6 +5709,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4809,10 +5748,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "%s de ses aktarılamadı"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Komut-satırı kodlayıcısı kullanarak seçili sesi aktarma"
@@ -4825,6 +5760,477 @@ msgstr "Komut-satırı kodlayıcısı kullanarak tüm projeyi aktarma"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "Bit Oranı:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:134
+msgid "Language:"
+msgstr "Dil:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:192
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML dosyaları (*.xml)|*.xml|Tüm dosyalar (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -4897,10 +6303,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -4909,10 +6311,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "Bit Oranı:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -4921,10 +6319,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1345 ../src/export/ExportOGG.cpp:53
 msgid "Unable to open target file for writing"
 msgstr "Yazma için hedef dosya açılamadı"
@@ -4949,44 +6343,12 @@ msgstr ""
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -4997,20 +6359,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5041,6 +6399,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:85
+msgid "Quality"
+msgstr "Kalite"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5066,35 +6428,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "%s nerede?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1116
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5104,8 +6446,9 @@ msgstr "Sadece lame_enc.dll|lame_enc.dll|Dinamik Olarak Bağlanmış Kütüphane
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:255
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "Sadece libmp3lame.so|libmp3lame.so|Birincil Paylaşımlı Nesne dosyaları (*.so)|*.so| Genişletilmiş Kütüphaneler (*.so*)|*.so*|Tüm Dosyalar (*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5124,10 +6467,6 @@ msgstr "Geçersiz ya da desteklenmeyen MP3 kodlama kütüphanesi!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1354
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "MP3 dosyası için ID3 etiketlerini düzenle"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5163,10 +6502,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5179,18 +6514,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "MP3 aktarma eklentisi bulunamadı"
-
 #: ../src/export/ExportMultiple.cpp:367 ../src/export/ExportMultiple.cpp:474
 #: ../src/export/ExportMultiple.cpp:562
 msgid "Export Multiple"
@@ -5245,6 +6572,10 @@ msgstr "İlk etiketten önce ses ekle"
 msgid "First file name:"
 msgstr "İlk dosya adı:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:636
 msgid "Tracks"
 msgstr "Ä°zler"
@@ -5265,15 +6596,14 @@ msgstr "Birbirini izleyerek numaralama"
 msgid "File name prefix:"
 msgstr "Dosya adı öneki:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:677
 msgid "Overwrite existing files"
 msgstr "Mevcut dosyanın üzerine yaz"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5283,10 +6613,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "Aktarılan dosyaları kaydetmek için bir konum seç"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5294,6 +6620,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5304,6 +6634,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5312,10 +6648,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5328,22 +6660,14 @@ msgstr "Ogg Vorbis olarak seçili sesi aktarma"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Ogg Vorbis olarak tüm projeyi aktarma"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5359,8 +6683,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Başlıkların tüm bileşimleri değil\n"
 "ve kodlamalar mümkündür.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5384,8 +6720,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "Hata (dosya yazılmamış olabilir): %s"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:159
@@ -5393,6 +6757,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Audacity'nin bu sürümü %s desteği ile derlenmemiş."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5423,9 +6795,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5438,19 +6811,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
 msgstr ""
 
-#: ../src/import/Import.cpp:170
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity bu dosya türünü tanıyamadı.\n"
-"Eğer sıkıştırılmadıysa, \"Ham Al\" kullanarak onu almayı tekrar deneyin."
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5486,16 +6911,17 @@ msgstr "MIDI izleri bireysel olarak ofset olmayabilir, belki sadece ses dosyalar
 msgid "Invalid track offset in LOF file."
 msgstr "LOF dosyası içinde geçersiz iz ofseti"
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Allegro dosyasını ayrıştırıyorken hata."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "MIDI dosyasını ayrıştırıyorken hata."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5522,15 +6948,23 @@ msgstr "Geçersiz Vorbis bitstream başlığı"
 msgid "Internal logic fault"
 msgstr "Dahili mantık kusuru"
 
-#: ../src/Project.cpp:2233
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "%s Dosyası Alınıyor..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:256
 msgid "Import Raw Data"
 msgstr "Ham Veri Al"
@@ -5572,6 +7006,14 @@ msgstr "2 Kanal (Çiftli)"
 msgid "%d Channels"
 msgstr "%d Kanalları"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:348
 msgid "Start offset:"
 msgstr "Ofseti baÅŸlat:"
@@ -5584,8 +7026,17 @@ msgstr "Alınacak miktar:"
 msgid "Sample rate:"
 msgstr "Örnek oran:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:84
@@ -5629,10 +7080,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "Yeni biri kaydediliyorken diğer izleri çal"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5642,8 +7092,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5670,12 +7124,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5703,21 +7159,9 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr ""
 
-#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
-msgid "Show / Hide"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:88 ../src/prefs/PrefsDialog.cpp:216
 msgid "Directories"
 msgstr "Dizinler"
@@ -5755,7 +7199,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:135
@@ -5780,23 +7224,65 @@ msgstr "%s dizini yazılabilir değil"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "Geçici dizine değiştirme Audacity yeniden başlayana kadar etkin olmayacak"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "Düzenlemeden önce dosyanın bir kopyasını yapın (daha güvenli)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "MP3 Kütüphane Sürümü:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "Asıl dosyadan direk olarak oku (daha hızlı)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5826,53 +7312,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "MP3 Kütüphane Sürümü:"
+#: ../src/prefs/PrefsDialog.cpp:89
+msgid "Interface"
+msgstr "Arayüz"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "Kütüphaneyi Bul"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:89
-msgid "Interface"
-msgstr "Arayüz"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "&Ergonomic order of audio I/O buttons"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -5887,6 +7368,10 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: prefs/BatchPrefs.cpp:87 prefs/GUIPrefs.cpp:94
+msgid "Show / Hide"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:96
 msgid "Enable cut &lines"
 msgstr ""
@@ -5895,25 +7380,25 @@ msgstr ""
 msgid "Show warnings about &temp files"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:103
-msgid "Language"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:134
-msgid "Language:"
-msgstr "Dil:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:145
-msgid "Minimum of dB mode display range"
-msgstr "dB nin en küçük ekran aralık kipi"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:150
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -5923,6 +7408,10 @@ msgstr "-36 dB (yüksek-genlik düzenlemesi için yüzeysel mesafe)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (8 bit örneklerin PCM mesafesi)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:164
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (16 bit örneklerin PCM mesafesi)"
@@ -5935,10 +7424,34 @@ msgstr "-120 dB (insan sesinin yaklaşık sınırı)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (24 bit örneklerin PCM mesafesi)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "Klavye"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -5971,10 +7484,6 @@ msgstr "Klavye kısayollarını kaydediyorken hata"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Audacity klavye kısayolları içeren bir XML dosya seçin..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:192
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML dosyaları (*.xml)|*.xml|Tüm dosyalar (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:206
 msgid "Error loading keyboard shortcuts"
 msgstr "Klavye kısayolarını yüklüyorken hata"
@@ -5990,6 +7499,43 @@ msgstr ""
 msgid "Undo"
 msgstr "Geri Al"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "Yeni biri kaydediliyorken diğer izleri çal"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "Fare"
@@ -6203,10 +7749,6 @@ msgstr "YaklaÅŸ ya da uzaklaÅŸ"
 msgid "Audacity Preferences"
 msgstr "Audacity Tercihleri"
 
-#: ../src/prefs/PrefsDialog.cpp:85
-msgid "Quality"
-msgstr "Kalite"
-
 #: ../src/prefs/QualityPrefs.cpp:161
 msgid "Rectangle"
 msgstr "Dikdörtgen"
@@ -6271,12 +7813,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:87
@@ -6295,6 +7837,10 @@ msgstr ""
 msgid "256 - default"
 msgstr "256 - öntanımlı"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "4096 - most narrowband"
 msgstr "4096 - en çok darbantlı"
@@ -6303,6 +7849,10 @@ msgstr "4096 - en çok darbantlı"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: prefs/SpectrumPrefs.cpp:96
 msgid "Display"
 msgstr ""
@@ -6319,6 +7869,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "En Büyük Frekans (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:148
 msgid "The maximum frequency must be an integer"
 msgstr "Azami frekans bir tamsayı olmalı."
@@ -6335,6 +7905,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6407,10 +7985,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr ""
-
 #: ../src/ControlToolBar.cpp:470
 msgid "Pause"
 msgstr "Duraklat"
@@ -6419,9 +7993,9 @@ msgstr "Duraklat"
 msgid "Play"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:468
-msgid "Play (Shift for loop-play)"
-msgstr "Oynat (Döngü-oynatımı için Shift)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:471
 msgid "Stop"
@@ -6435,6 +8009,10 @@ msgstr "Başlamayı Atla"
 msgid "Skip to End"
 msgstr "Sonlamayı Atla"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr ""
@@ -6467,6 +8045,10 @@ msgstr "Dış Seçimi Kırp"
 msgid "Silence selection"
 msgstr "Sessizlik seçimi"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:164
 msgid "Zoom In"
 msgstr "Yakınlaş"
@@ -6523,24 +8105,20 @@ msgstr "Çıkış seviye ölçer"
 msgid "Input level meter - click to monitor input"
 msgstr "Seviye ölçer girişi - ekran girişine tıkla"
 
-#: toolbars/MixerToolBar.cpp:58
-msgid "Mixer"
-msgstr ""
-
 #: ../src/MixerToolBar.cpp:135
 msgid "Output Volume"
 msgstr "Çıkış Sesi"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:138
 msgid "Input Volume"
 msgstr "Ses GiriÅŸi"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6559,6 +8137,11 @@ msgstr ""
 msgid "Selection Start:"
 msgstr ""
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6816,6 +8399,22 @@ msgstr "SaÄŸ"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -6862,14 +8461,14 @@ msgstr "Yatay Ä°kili"
 msgid "Vertical Stereo"
 msgstr "Dikey Çiftli"
 
-#: ../src/widgets/Meter.cpp:292
-msgid "Linear"
-msgstr "DoÄŸrusal"
-
 #: widgets/Meter.cpp:365
 msgid "Preferences..."
 msgstr ""
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1037
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -6889,6 +8488,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -6897,10 +8512,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -6913,6 +8524,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: widgets/TimeTextCtrl.cpp:203
 msgid "hh:mm:ss + milliseconds"
 msgstr ""
@@ -7026,11 +8652,10 @@ msgstr "Bu uyarıyı tekrar gösterme"
 msgid "Could not open file: \"%s\""
 msgstr "Dosya açılamadı: \"%s\""
 
-#: xml/XMLFileReader.cpp:64
+#: xml/XMLFileReader.cpp:63
 #, c-format
-#, fuzzy
-msgid "Error: %hs at line %d"
-msgstr "Hata: %s %d satırında"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/uk.po b/locale/uk.po
index 340e792..b24ea72 100644
--- a/locale/uk.po
+++ b/locale/uk.po
@@ -1,16 +1,16 @@
-# translation of uk2.po to Ukrainian
+# translation of uk.po to Ukrainian
 # Ukrainian translation to audacity
 # Copyright (C) 2004 Free SOftware Foundation
 # This file is distributed under the same license as the audacity package.
 #
 # Maxim Dziumanenko <dziumanenko at gmail.com>, 2004-2008.
-# Yuri Chornoivan <yurchor at ukr.net>, 2007, 2008.
+# Yuri Chornoivan <yurchor at ukr.net>, 2007, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: uk2\n"
+"Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-04-28 22:24+0100\n"
-"PO-Revision-Date: 2008-05-01 09:29+0300\n"
+"POT-Creation-Date: 2009-01-20 20:43+0000\n"
+"PO-Revision-Date: 2009-01-21 22:17+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
 "Language-Team: Ukrainian <translation at linux.org.ua>\n"
 "MIME-Version: 1.0\n"
@@ -19,50 +19,50 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: AboutDialog.cpp:142 AudacityApp.cpp:749 Menus.cpp:745
+#: AboutDialog.cpp:143 AudacityApp.cpp:790 Menus.cpp:957
 msgid "&About Audacity..."
 msgstr "&Про Audacity..."
 
-#: AboutDialog.cpp:156
+#: AboutDialog.cpp:157
 msgid "OK... Audacious!"
 msgstr "Гаразд... Круто!"
 
 #: AboutDialog.cpp:175
 msgid ""
-"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."
-msgstr ""
-"Audacity - вільна програма, написана групою програмістів з усього світу, "
-"скоординованих завдяки SourceForge.net − службі, для програмних проектів з "
-"відкритим кодом. Audacity доступна на платформах Windows 98 та новіше, Mac "
+"Audacity is a free program written by a team of volunteer <a href=\"http://"
+"audacity.sourceforge.net/community/developers\">developers</a> around the "
+"world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge."
+"net</a> for our project hosting. Audacity is available for Windows 98 and "
+"later, Mac OS X, Linux and other Unix-like operating systems. Older versions "
+"of Audacity are available for Mac OS 9."
+msgstr ""
+"Audacity — вільна програма, написана групою <a href=\"http://"
+"audacity.sourceforge.net/community/developers\">розробників</a> з усього світу. За надання проекту майданчика для розвитку ми маємо бути вдячні <a href=\"http://sourceforge.net\">SourceForge."
+"net</a>. Audacity доступна на платформах Windows 98 та новіше, Mac "
 "OS X, Linux, та інших Unix-системах. Більш ранні версії доступні на "
 "платформі Mac OS 9."
 
 #: AboutDialog.cpp:179
 msgid ""
-"This is a beta version of the program.  It may contain bugs and unfinished "
-"features.  We depend on your feedback, so please visit our website and give "
-"us your bug reports and feature requests."
+"This is a Beta version of the program. It may contain bugs and unfinished "
+"features. We depend on your feedback: please send bug reports and feature "
+"requests to <b>feedback at audacityteam.org</b>. For help using Audacity, "
+"please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
 "Це - тестова версія програми. Вона може містити помилки та нереалізовану "
 "функціональність. Продуктивність нашої роботи залежить від ваших відгуків, "
-"тому відвідайте наш сайт та залиште повідомлення про усі знайдені помилки та "
-"запити на реалізацію функціональності."
+"тому вам слід надсилати ваші повідомлення про усі знайдені помилки та "
+"запити на реалізацію функціональності за адресою <b>feedback at audacityteam.org</b>. Підтримку у користуванні Audacity можна знайти на нашому <a href=\"http://audacityteam.org/forum/\">форумі</a>."
 
 #: AboutDialog.cpp:182
 msgid ""
-"This is a stable, completed release of Audacity. However, if you find a bug "
-"or have a suggestion, please contact us. We depend on feedback from users in "
-"order to continue to improve Audacity. For more information, visit our "
-"website."
+"This is a stable, completed release of the program. However, if you find a "
+"bug or have a suggestion for us, please write to <b>feedback at audacityteam."
+"org</b>. For help using Audacity, please visit our <a href=\"http://"
+"audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"Це - стабільна, завершена версія Audacity. Проте, зверніться до нас, якщо ви "
-"знайдете помилку або маєте пропозицію. Нам потрібен зворотній зв'язок з "
-"користувачами для продовження вдосконалення Audacity. Щоб дізнатися більше, "
-"відвідайте нашу веб-сторінку."
+"Це - стабільна, завершена версія Audacity. Проте, якщо ви "
+"знайдете помилку або маєте пропозицію надішліть ваше повідомлення за адресою <b>feedback at audacityteam.org</b>. Підтримку у користуванні Audacity можна знайти на нашому <a href=\"http://audacityteam.org/forum/\">форумі</a>."
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -78,8 +78,8 @@ msgstr ""
 "Юрій Чорноіван <yurchor at ukr.net>"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Вільний цифровий редактор звукових файлів"
+msgid "A Free Digital Audio Editor<br>"
+msgstr "Вільний редактор цифрового звуку<br>"
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -115,124 +115,133 @@ msgstr "Audacity використовує код наступних проект
 msgid "Special thanks:"
 msgstr "Особливі подяки:"
 
-#: AboutDialog.cpp:254
+#: AboutDialog.cpp:250
+msgid ""
+"<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. "
+"<br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic "
+"Mazzoni."
+msgstr ""
+"Авторські права на програму <b>Audacity&reg;</b> належать &copy; 1999-2008 Команді Audacity. "
+"<br>Назва продукту <b>Audacity&reg;</b> є зареєстрованою торговельною маркою Домініка Маццоні (Dominic Mazzoni)."
+
+#: AboutDialog.cpp:258
 msgid "Audacity"
 msgstr "Audacity"
 
 #. i18n-hint: Information about when audacity was compiled
-#: AboutDialog.cpp:299 AboutDialog.cpp:312 AboutDialog.cpp:468
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
 msgid "Build Information"
 msgstr "Інформація про випуск"
 
-#: AboutDialog.cpp:305 effects/AvcCompressor.cpp:674
+#: AboutDialog.cpp:310 effects/AvcCompressor.cpp:674
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: AboutDialog.cpp:306
+#: AboutDialog.cpp:311
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: AboutDialog.cpp:316
+#: AboutDialog.cpp:321
 msgid "File Format Support"
 msgstr "Підтримка форматів файлів"
 
 #. i18n-hint: This is what the library (libmad) does - imports MP3 files
-#: AboutDialog.cpp:326 AboutDialog.cpp:328
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
 msgid "MP3 Importing"
 msgstr "Імпортування MP3"
 
-#: AboutDialog.cpp:335 AboutDialog.cpp:338
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
 msgid "Ogg Vorbis Import and Export"
 msgstr "Імпорт та експорт файлів Ogg Vorbis"
 
-#: AboutDialog.cpp:342 AboutDialog.cpp:345
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
 msgid "ID3 tag support"
 msgstr "Підтримка міток ID3"
 
-#: AboutDialog.cpp:352 AboutDialog.cpp:355
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
 msgid "FLAC import and export"
 msgstr "Імпорт та експорт файлів FLAC"
 
-#: AboutDialog.cpp:360 AboutDialog.cpp:363
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
 msgid "MP2 export"
 msgstr "Експорт MP2"
 
-#: AboutDialog.cpp:368 AboutDialog.cpp:371
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
 msgid "Import via QuickTime"
 msgstr "Імпорт за допомогою QuickTime"
 
 #. i18n-hint: Libraries that are essential to audacity
-#: AboutDialog.cpp:378
+#: AboutDialog.cpp:383
 msgid "Core Libraries"
 msgstr "Головні бібліотеки"
 
-#: AboutDialog.cpp:384 AboutDialog.cpp:387 AboutDialog.cpp:390
-#: AboutDialog.cpp:392
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
 msgid "Sample rate conversion"
 msgstr "Зміна частоти дискретизації"
 
-#: AboutDialog.cpp:397 AboutDialog.cpp:400
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
 msgid "Audio playback and recording"
 msgstr "Відтворення аудіо та запис"
 
-#: AboutDialog.cpp:413
+#: AboutDialog.cpp:418
 msgid "Features"
 msgstr "Можливості"
 
-#: AboutDialog.cpp:417 AboutDialog.cpp:420 AboutDialog.cpp:425
-#: AboutDialog.cpp:428 AboutDialog.cpp:433 AboutDialog.cpp:436
-#: AboutDialog.cpp:441 AboutDialog.cpp:444
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
 msgid "Plug-in support"
 msgstr "Підтримка додатків"
 
-#: AboutDialog.cpp:449 AboutDialog.cpp:452
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
 msgid "Sound card mixer support"
 msgstr "Підтримка мікшування звуковою картою"
 
-#: AboutDialog.cpp:457 AboutDialog.cpp:460
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
 msgid "Pitch and Tempo Change support"
 msgstr "Підтримка зміни кроку і темпу"
 
-#: AboutDialog.cpp:472
+#: AboutDialog.cpp:477
 msgid "Program build date: "
 msgstr "Дата компіляції програми: "
 
-#: AboutDialog.cpp:475 AboutDialog.cpp:477
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
 msgid "Build type:"
 msgstr "Тип випуску:"
 
-#: AboutDialog.cpp:475
+#: AboutDialog.cpp:480
 msgid "Debug build"
 msgstr "Випуск для перевірки"
 
-#: AboutDialog.cpp:477
+#: AboutDialog.cpp:482
 msgid "Release build"
 msgstr "Остаточна версія"
 
 #. i18n-hint: The directory audacity is installed into (on *nix systems)
-#: AboutDialog.cpp:482
+#: AboutDialog.cpp:487
 msgid "Installation Prefix: "
 msgstr "Шлях встановлення: "
 
-#: AboutDialog.cpp:486
+#: AboutDialog.cpp:491
 msgid "Settings folder: "
 msgstr "Тека з параметрами: "
 
-#: AboutDialog.cpp:501
+#: AboutDialog.cpp:506
 msgid "GPL License"
 msgstr "Ліцензія GPL"
 
-#: AudacityApp.cpp:468 Project.cpp:1761
+#: AudacityApp.cpp:495 Project.cpp:1890
 #, c-format
 msgid "%s is already open in another window."
 msgstr "%s вже відкрито у іншому вікні."
 
-#: AudacityApp.cpp:470 Project.cpp:1763 Project.cpp:1868 Project.cpp:2012
-#: Project.cpp:2114
+#: AudacityApp.cpp:497 Project.cpp:1892 Project.cpp:1997 Project.cpp:2141
+#: Project.cpp:2278
 msgid "Error opening project"
-msgstr "Помилка при відкриванні файлу проекту"
+msgstr "Помилка під час відкриття файла проекту"
 
-#: AudacityApp.cpp:502
+#: AudacityApp.cpp:529
 #, c-format
 msgid ""
 "%s does not exist and could not be opened.\n"
@@ -243,35 +252,34 @@ msgstr ""
 "\n"
 "Його вилучено зі списку історії."
 
-#: AudacityApp.cpp:581
+#: AudacityApp.cpp:631
 msgid "Master Gain Control"
 msgstr "Загальний регулятор гучності"
 
-#: AudacityApp.cpp:582
+#: AudacityApp.cpp:632
 msgid "Input Meter"
 msgstr "Індикатор рівня на вході"
 
-#: AudacityApp.cpp:583
+#: AudacityApp.cpp:633
 msgid "Output Meter"
 msgstr "Індикатор рівня на виході"
 
 #. i18n-hint: Mac OS X shortcut should be Ctrl+,
-#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
-#: AudacityApp.cpp:751 Menus.cpp:478
+#: AudacityApp.cpp:792
 msgid "&Preferences...\tCtrl+,"
 msgstr "&Параметри...\tCtrl+,"
 
-#: AudacityApp.cpp:833 AudacityApp.cpp:910
+#: AudacityApp.cpp:875 AudacityApp.cpp:952
 #, c-format
 msgid "Using block size of %ld\n"
 msgstr "Використовуються блоки розміром %ld\n"
 
-#: AudacityApp.cpp:855 AudacityApp.cpp:925
+#: AudacityApp.cpp:897 AudacityApp.cpp:967
 #, c-format
 msgid "Unknown command line option: %s\n"
 msgstr "Невідомий параметр командного рядка: %s\n"
 
-#: AudacityApp.cpp:1044
+#: AudacityApp.cpp:1101
 msgid ""
 "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
@@ -279,7 +287,7 @@ msgstr ""
 "Програмі не вдається знайти каталог для зберігання тимчасових файлів.\n"
 "Вкажіть відповідний каталог у діалоговому вікні уподобань."
 
-#: AudacityApp.cpp:1050
+#: AudacityApp.cpp:1107
 msgid ""
 "Audacity is now going to exit. Please launch Audacity again to use the new "
 "temporary directory."
@@ -287,7 +295,7 @@ msgstr ""
 "Audacity готується до завершення. Повторно завантажте програму для "
 "використання нової теки тимчасових файлів."
 
-#: AudacityApp.cpp:1082
+#: AudacityApp.cpp:1139
 msgid ""
 "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
@@ -297,7 +305,7 @@ msgstr ""
 "до втрати даних або краху системи.\n"
 "\n"
 
-#: AudacityApp.cpp:1089
+#: AudacityApp.cpp:1146
 msgid ""
 "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
@@ -305,19 +313,19 @@ msgstr ""
 "Audacity не може заблокувати теку з тимчасовими файлами.\n"
 "Можливо цю теку вже використовує інша копія Audacity.\n"
 
-#: AudacityApp.cpp:1091
+#: AudacityApp.cpp:1148
 msgid "Do you still want to start Audacity?"
 msgstr "Досі бажаєте запустити Audacity?"
 
-#: AudacityApp.cpp:1093
+#: AudacityApp.cpp:1150
 msgid "Error locking temporary folder"
 msgstr "Помилка при блокуванні теки тимчасових фалів"
 
-#: AudacityApp.cpp:1131
+#: AudacityApp.cpp:1188
 msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Система визначила, що вже запущено іншу копію Audacity.\n"
 
-#: AudacityApp.cpp:1133
+#: AudacityApp.cpp:1190
 msgid ""
 "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
@@ -326,29 +334,29 @@ msgstr ""
 "команди \"Створити\" або \"Відкрити\" у копії\n"
 "Audacity, що зараз виконується.\n"
 
-#: AudacityApp.cpp:1134
+#: AudacityApp.cpp:1191
 msgid "Audacity is already running"
 msgstr "Audacity вже запущено"
 
-#: AudacityApp.cpp:1151
+#: AudacityApp.cpp:1208
 msgid "Command-line options supported:"
 msgstr "Параметри командного рядка, що підтримуються:"
 
 #. i18n-hint: '-help' is the option and needs to stay in
 #. * English. This displays a list of available options
-#: AudacityApp.cpp:1154
+#: AudacityApp.cpp:1211
 msgid "\t-help (this message)"
 msgstr "\t-help (це повідомлення)"
 
 #. i18n-hint '-version' needs to stay in English.
-#: AudacityApp.cpp:1156
+#: AudacityApp.cpp:1213
 msgid "\t-version (display Audacity version)"
 msgstr "\t-version (показує версію Audacity)"
 
 #. i18n-hint '-test' is the option and needs to stay in
 #. * English. This runs a set of automatic tests on audacity
 #. * itself
-#: AudacityApp.cpp:1160
+#: AudacityApp.cpp:1217
 msgid "\t-test (run self diagnostics)"
 msgstr "\t-test (запуск самодіагностики)"
 
@@ -356,11 +364,11 @@ msgstr "\t-test (запуск самодіагностики)"
 #. * English. 'nnn' is any integer number. This controls the
 #. * size pieces that audacity uses when writing files to the
 #. * disk
-#: AudacityApp.cpp:1165
+#: AudacityApp.cpp:1222
 msgid "\t-blocksize nnn (set max disk block size in bytes)"
 msgstr "\t-blocksize nnn (встановити максимальний розмір блоку диску у байтах)"
 
-#: AudacityApp.cpp:1166
+#: AudacityApp.cpp:1223
 msgid ""
 "In addition, specify the name of an audio file or Audacity project to open "
 "it."
@@ -368,7 +376,7 @@ msgstr ""
 "Окрім того, вкажіть назву аудіо-файла або проекту Audacity, який слід "
 "відкрити"
 
-#: AudacityApp.cpp:1443
+#: AudacityApp.cpp:1500
 msgid ""
 "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
@@ -380,15 +388,15 @@ msgstr ""
 "\n"
 "Пов'язати їх, щоб вони відкривались подвійним клацанням?"
 
-#: AudacityApp.cpp:1444
+#: AudacityApp.cpp:1501
 msgid "Audacity Project Files"
 msgstr "Файли проектів Audacity"
 
-#: AudioIO.cpp:241
+#: AudioIO.cpp:254
 msgid "Could not find any audio devices.\n"
 msgstr "Неможливо знайти жодного звукового пристрою.\n"
 
-#: AudioIO.cpp:242
+#: AudioIO.cpp:255
 msgid ""
 "You will not be able to play or record audio.\n"
 "\n"
@@ -396,19 +404,19 @@ msgstr ""
 "Ви не зможете відтворювати та записувати звук.\n"
 "\n"
 
-#: AudioIO.cpp:245
+#: AudioIO.cpp:258
 msgid "Error: "
 msgstr "Помилка: "
 
-#: AudioIO.cpp:248
+#: AudioIO.cpp:261
 msgid "Error Initializing Audio"
 msgstr "Помилка при ініціалізації звуку"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid "Latency problem"
 msgstr "Проблема із затримкою"
 
-#: AudioIO.cpp:1208
+#: AudioIO.cpp:1375
 msgid ""
 "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
@@ -437,7 +445,7 @@ msgstr ""
 msgid "Recoverable projects"
 msgstr "Придатні до відновлення проекти"
 
-#: AutoRecovery.cpp:78 Tags.cpp:2032
+#: AutoRecovery.cpp:78
 msgid "Name"
 msgstr "Назва"
 
@@ -475,55 +483,57 @@ msgstr "Підтверджуєте?"
 msgid "Could not enumerate files in auto save directory"
 msgstr "Неможливо скласти список файлів у теці автозбереження"
 
-#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2575 Menus.cpp:4514
-#: Project.cpp:1971 Project.cpp:3343 Project.cpp:3422 WaveTrack.cpp:556
-#: WaveTrack.cpp:575 WaveTrack.cpp:1689 effects/Effect.cpp:436
-#: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
-#: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
-#: toolbars/ControlToolBar.cpp:846
+#: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:3095 Menus.cpp:3107
+#: Menus.cpp:5232 Project.cpp:2100 Project.cpp:3662 Project.cpp:3741
+#: TrackPanel.cpp:6424 WaveTrack.cpp:598 WaveTrack.cpp:617 WaveTrack.cpp:1058
+#: WaveTrack.cpp:1077 WaveTrack.cpp:2087 effects/Contrast.cpp:127
+#: effects/Contrast.cpp:137 effects/Effect.cpp:513 export/ExportFFmpeg.cpp:614
+#: export/ExportMP2.cpp:231 prefs/DirectoriesPrefs.cpp:189
+#: prefs/KeyConfigPrefs.cpp:260 toolbars/ControlToolBar.cpp:542
+#: toolbars/ControlToolBar.cpp:871
 msgid "Error"
 msgstr "Помилка"
 
-#: BatchCommandDialog.cpp:56 BatchCommandDialog.cpp:60
-#: BatchCommandDialog.cpp:61
+#: BatchCommandDialog.cpp:57 BatchCommandDialog.cpp:62
+#: BatchCommandDialog.cpp:63
 msgid "Select Command"
 msgstr "Вибір команди"
 
-#: BatchCommandDialog.cpp:80 BatchProcessDialog.cpp:454
-#: prefs/KeyConfigPrefs.cpp:142
+#: BatchCommandDialog.cpp:82 BatchProcessDialog.cpp:454
+#: prefs/KeyConfigPrefs.cpp:158
 msgid "&Command"
 msgstr "&Команда"
 
-#: BatchCommandDialog.cpp:82
+#: BatchCommandDialog.cpp:84
 msgid "&Edit Parameters"
 msgstr "&Редагувати параметри"
 
-#: BatchCommandDialog.cpp:89 BatchProcessDialog.cpp:455
+#: BatchCommandDialog.cpp:91 BatchProcessDialog.cpp:455
 msgid "&Parameters"
 msgstr "&Параметри"
 
-#: BatchCommandDialog.cpp:94
+#: BatchCommandDialog.cpp:96
 msgid "C&hoose command"
 msgstr "&Обрати команду"
 
-#: BatchCommands.cpp:477
+#: BatchCommands.cpp:456
 msgid "Stereo to Mono Effect not found"
 msgstr "Ефект перетворення стерео у моно не знайдено"
 
-#: BatchCommands.cpp:497
+#: BatchCommands.cpp:476
 msgid "Ogg Vorbis support is not included in this build of Audacity"
 msgstr "Підтримку Ogg Vorbis не увімкнено у цій збірці Audacity"
 
-#: BatchCommands.cpp:509
+#: BatchCommands.cpp:488
 msgid "FLAC support is not included in this build of Audacity"
 msgstr "Під час збирання цієї версії Audacity підтримку FLAC не було увімкнено"
 
-#: BatchCommands.cpp:513
+#: BatchCommands.cpp:492
 #, c-format
 msgid "Command %s not implemented yet"
 msgstr "Команда %s ще не реалізована"
 
-#: BatchCommands.cpp:529
+#: BatchCommands.cpp:508
 #, c-format
 msgid ""
 "Could not set parameters of effect %s\n"
@@ -532,12 +542,12 @@ msgstr ""
 "Неможливо встановити параметри ефекту %s\n"
 " у значення %s."
 
-#: BatchCommands.cpp:583
+#: BatchCommands.cpp:561
 #, c-format
 msgid "Your batch command of %s was not recognised."
 msgstr "Вашу пакетну команду %s не було розпізнано."
 
-#: BatchCommands.cpp:674
+#: BatchCommands.cpp:652
 #, c-format
 msgid ""
 "Apply %s with parameter(s)\n"
@@ -548,11 +558,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: BatchCommands.cpp:675 BatchCommands.cpp:680
+#: BatchCommands.cpp:653 BatchCommands.cpp:658
 msgid "Test Mode"
 msgstr "Тестовий режим"
 
-#: BatchCommands.cpp:679
+#: BatchCommands.cpp:657
 #, c-format
 msgid "Apply %s"
 msgstr "Застосувати %s"
@@ -562,6 +572,10 @@ msgstr "Застосувати %s"
 msgid "Apply Chain"
 msgstr "Застосувати ланцюжок"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr "Пакетна обробка CleanSpeech"
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Обрати ланцюжок"
@@ -578,11 +592,10 @@ msgstr "Застосувати до поточного &проекту"
 msgid "Apply to &Files..."
 msgstr "Застосувати до &файлів..."
 
-#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 Tags.cpp:2071
-#: Tags.cpp:2075 Tags.cpp:2375 Tags.cpp:2379 UploadDialog.cpp:180
+#: BatchProcessDialog.cpp:108 BatchProcessDialog.cpp:247 UploadDialog.cpp:180
 #: effects/AvcCompressor.cpp:732 effects/ChangeLength.cpp:183
-#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:446
-#: effects/audiounits/AudioUnitEffect.cpp:882 effects/vamp/VampEffect.cpp:411
+#: effects/SpikeCleaner.cpp:188 effects/VST/VSTEffect.cpp:453
+#: effects/audiounits/AudioUnitEffect.cpp:887
 msgid "&Cancel"
 msgstr "&Скасувати"
 
@@ -599,10 +612,20 @@ msgstr "Застосування '%s' до поточного проекту"
 msgid "Please save and close the current project first."
 msgstr "Спочатку збережіть та закрийте поточний проект."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr "Оберіть голосові файли для пакетного ланцюжка CleanSpeech..."
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Оберіть файл(и) для пакетної обробки..."
 
+#: BatchProcessDialog.cpp:209
+msgid ""
+"Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*."
+"mp3)|*.mp3"
+msgstr "Звукові файли (*.wav;*.mp3)|*.wav;*.mp3|Файли WAV (*.wav)|*.wav|Файли MP3 (*.mp3)|*.mp3"
+
 #: BatchProcessDialog.cpp:210
 msgid ""
 "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU "
@@ -630,12 +653,12 @@ msgstr "Редагувати ланцюжки"
 msgid "&Chains"
 msgstr "&Ланцюги"
 
-#: BatchProcessDialog.cpp:435 Tags.cpp:815 Tags.cpp:1455 Tags.cpp:2055
+#: BatchProcessDialog.cpp:435 Tags.cpp:813
 msgid "&Add"
 msgstr "&Додати"
 
-#: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:816 Tags.cpp:1456
-#: Tags.cpp:2056 TrackPanel.cpp:4201
+#: BatchProcessDialog.cpp:436 LabelDialog.cpp:128 Tags.cpp:814
+#: TrackPanel.cpp:4181
 msgid "&Remove"
 msgstr "&Вилучити"
 
@@ -711,7 +734,7 @@ msgstr "Вилучення залежностей"
 msgid "Copying audio data into project..."
 msgstr "Копіювання аудіо-даних до проекту..."
 
-#: Dependencies.cpp:219
+#: Dependencies.cpp:223
 msgid ""
 "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-"
@@ -723,71 +746,71 @@ msgstr ""
 "самодостатності?\n"
 "Це потребуватиме більшого простору на диску, але буде безпечнішим."
 
-#: Dependencies.cpp:266
+#: Dependencies.cpp:270
 msgid "Project depends on other audio files"
 msgstr "Проект залежить від інших аудіо-файлів"
 
-#: Dependencies.cpp:287
+#: Dependencies.cpp:291
 msgid "Project Dependencies"
 msgstr "Залежності проекту"
 
-#: Dependencies.cpp:290
+#: Dependencies.cpp:294
 msgid "Audio file"
 msgstr "Аудіо-файл"
 
-#: Dependencies.cpp:292
+#: Dependencies.cpp:296
 msgid "Disk space"
 msgstr "Простір на диску"
 
-#: Dependencies.cpp:297
+#: Dependencies.cpp:301
 msgid "Copy Selected Audio Into Project"
 msgstr "Копіювати виділену область аудіо до проекту"
 
-#: Dependencies.cpp:304 Dependencies.cpp:410
+#: Dependencies.cpp:308 Dependencies.cpp:414
 msgid "Cancel Save"
 msgstr "Скасувати збереження"
 
-#: Dependencies.cpp:306
+#: Dependencies.cpp:310
 msgid "Do Not Copy Any Audio"
 msgstr "Не копіювати ніякого аудіо"
 
-#: Dependencies.cpp:308
+#: Dependencies.cpp:312
 msgid "Copy All Audio into Project (Safer)"
 msgstr "Копіювати все аудіо у проект (Безпечніше)"
 
-#: Dependencies.cpp:317 Dependencies.cpp:322
+#: Dependencies.cpp:321 Dependencies.cpp:326
 msgid "Ask me"
 msgstr "Перепитувати"
 
-#: Dependencies.cpp:318
+#: Dependencies.cpp:322
 msgid "Always copy all audio (safest)"
 msgstr "Завжди копіювати всі звукові дані (найбезпечніше)"
 
-#: Dependencies.cpp:319
+#: Dependencies.cpp:323
 msgid "Never copy any audio"
 msgstr "Ніколи не копіювати ніяких звукових даних"
 
-#: Dependencies.cpp:321
+#: Dependencies.cpp:325
 msgid "Whenever a project depends on other files:"
 msgstr "Чи залежить проект від інших файлів:"
 
-#: Dependencies.cpp:409
+#: Dependencies.cpp:413
 msgid ""
 "If you proceed, your project will not be saved to disk. Is this what you "
 "want?"
 msgstr "Якщо продовжити, проект не буде збережено на диск. Ви цього хочете?"
 
-#: Dependencies.cpp:449
+#: Dependencies.cpp:453
 msgid ""
 "Your project is self-contained; it does not depend on any external audio "
 "files."
 msgstr "Ваш проект є самодостатнім і не залежить від зовнішніх звукових файлів."
 
-#: Dependencies.cpp:450
+#: Dependencies.cpp:454
 msgid "Dependency check"
 msgstr "Перевірка залежності"
 
-#: DirManager.cpp:136
+#: DirManager.cpp:137
 msgid ""
 "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
@@ -795,23 +818,23 @@ msgstr ""
 "Попередження: на даному розділі лишилось замало вільного простору. Виберіть\n"
 "іншу теку для тимчасових файлів у діалозі налаштовування програми."
 
-#: DirManager.cpp:221 DirManager.cpp:251 DirManager.cpp:332
+#: DirManager.cpp:223 DirManager.cpp:254 DirManager.cpp:337
 msgid "Progress"
 msgstr "Поступ"
 
-#: DirManager.cpp:285
+#: DirManager.cpp:288
 msgid "Cleaning up temporary files"
 msgstr "Вилучення тимчасових файлів"
 
-#: DirManager.cpp:333
+#: DirManager.cpp:338
 msgid "Saving project data files"
 msgstr "Збереження файлів даних проекту"
 
-#: DirManager.cpp:406
+#: DirManager.cpp:410
 msgid "Cleaning up cache directories"
 msgstr "Очищення тек кешування"
 
-#: DirManager.cpp:493
+#: DirManager.cpp:505
 #, c-format
 msgid ""
 "Audacity found an orphaned blockfile %s! \n"
@@ -825,60 +848,60 @@ msgstr ""
 #. i18n-hint: This is the pattern for filenames that are created
 #. when a file needs to be backed up to a different name.  For
 #. example, mysong would become mysong-old1, mysong-old2, etc.
-#: DirManager.cpp:985
+#: DirManager.cpp:1094
 #, c-format
 msgid "%s-old%d"
 msgstr "%s-old%d"
 
-#: DirManager.cpp:993
+#: DirManager.cpp:1102
 msgid "Unable to open/create test file"
 msgstr "Неможливо відкрити або створити тестовий файл"
 
-#: DirManager.cpp:1002
+#: DirManager.cpp:1111
 #, c-format
 msgid "Unable to remove '%s'"
 msgstr "Неможливо вилучити '%s'"
 
-#: DirManager.cpp:1007
+#: DirManager.cpp:1116
 #, c-format
 msgid "Renamed file: %s\n"
 msgstr "Перейменовано файл: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Змінюється блок %s\n"
-
-#: DirManager.cpp:1051
+#: DirManager.cpp:1166
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Неможливо перейменувати '%s' на '%s'"
 
-#: DirManager.cpp:1115 DirManager.cpp:1403
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr "Блок %s змінено за новою назвою\n"
+
+#: DirManager.cpp:1249 DirManager.cpp:1540
 msgid "Inspecting project file data..."
-msgstr "Вивчення даних файлу проекту..."
+msgstr "Вивчення даних файла проекту..."
 
-#: DirManager.cpp:1128
+#: DirManager.cpp:1265
 #, c-format
 msgid "Orphaned blockfile: (%s)"
 msgstr "Незв'язаний блок-файл: (%s)"
 
-#: DirManager.cpp:1153
+#: DirManager.cpp:1290
 #, c-format
 msgid "Missing alias file: (%s)"
 msgstr "Відсутній файл скорочень: (%s)"
 
-#: DirManager.cpp:1173
+#: DirManager.cpp:1310
 #, c-format
 msgid "Missing summary file: (%s.auf)"
 msgstr "Відсутній файл резюме: (%s.auf)"
 
-#: DirManager.cpp:1193
+#: DirManager.cpp:1330
 #, c-format
 msgid "Missing data file: (%s.au)"
 msgstr "Відсутній файл даних: (%s.au)"
 
-#: DirManager.cpp:1207
+#: DirManager.cpp:1344
 msgid ""
 "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more "
@@ -888,7 +911,7 @@ msgstr ""
 "проекту; натисніть кнопку 'Докладніше', щоб побачити повний список помилок,\n"
 "або 'Гаразд', щоб ознайомитися зі шляхами їх виправлення."
 
-#: DirManager.cpp:1219
+#: DirManager.cpp:1356
 #, c-format
 msgid ""
 "Project check found %d orphaned blockfile[s]. These files are\n"
@@ -899,25 +922,25 @@ msgstr ""
 "не використовуються і ймовірно залишилися після краху або іншої помилки.\n"
 "Їх слід вилучити, щоб уникнути засмічення диска."
 
-#: DirManager.cpp:1224
+#: DirManager.cpp:1361
 msgid "Delete orphaned files [safe and recommended]"
 msgstr "Вилучити незв'язані файли [безпечно і рекомендовано]"
 
-#: DirManager.cpp:1225
+#: DirManager.cpp:1362
 msgid "Continue without deleting; silently work around the extra files"
 msgstr "Продовжити без вилучення, мовчки ігнорувати зайві файли"
 
-#: DirManager.cpp:1226
+#: DirManager.cpp:1363
 msgid "Close project immediately with no changes"
 msgstr "Закрити проект негайно без змін"
 
-#: DirManager.cpp:1228 DirManager.cpp:1263 DirManager.cpp:1309
-#: DirManager.cpp:1351 export/Export.cpp:490 export/Export.cpp:507
-#: export/Export.cpp:526 widgets/Warning.cpp:55
+#: DirManager.cpp:1365 DirManager.cpp:1400 DirManager.cpp:1446
+#: DirManager.cpp:1488 export/Export.cpp:582 export/Export.cpp:603
+#: export/Export.cpp:622 widgets/Warning.cpp:55
 msgid "Warning"
 msgstr "Попередження"
 
-#: DirManager.cpp:1254
+#: DirManager.cpp:1391
 #, c-format
 msgid ""
 "Project check detected %d input file[s] being used in place\n"
@@ -934,19 +957,19 @@ msgstr ""
 "їх тишею лише на поточний сеанс, або закрити проект зараз\n"
 "та спробувати відновити відсутні файли вручну."
 
-#: DirManager.cpp:1259
+#: DirManager.cpp:1396
 msgid "Replace missing data with silence [permanent upon save]"
 msgstr "Замінити відсутні дані тишею [незворотне після збереження]"
 
-#: DirManager.cpp:1260 DirManager.cpp:1348
+#: DirManager.cpp:1397 DirManager.cpp:1485
 msgid "Temporarily replace missing data with silence [this session only]"
 msgstr "Тимчасово замінити відсутні дані тишею [тільки для цього сеансу]"
 
-#: DirManager.cpp:1261 DirManager.cpp:1307 DirManager.cpp:1349
+#: DirManager.cpp:1398 DirManager.cpp:1444 DirManager.cpp:1486
 msgid "Close project immediately with no further changes"
 msgstr "Закрити проект негайно без подальших змін"
 
-#: DirManager.cpp:1300
+#: DirManager.cpp:1437
 #, c-format
 msgid ""
 "Project check detected %d missing summary file[s] (.auf).\n"
@@ -957,15 +980,15 @@ msgstr ""
 "Audacity може повністю перегенерувати файли зведення з \n"
 "аудіо даних у проекті."
 
-#: DirManager.cpp:1305
+#: DirManager.cpp:1442
 msgid "Regenerate summary files [safe and recommended]"
 msgstr "Перегенерувати файли зведення [безпечно та рекомендовано]"
 
-#: DirManager.cpp:1306
+#: DirManager.cpp:1443
 msgid "Fill in silence for missing display data [this session only]"
 msgstr "Заповнити тишею відсутні дані відображення [тільки у поточному сеансі]"
 
-#: DirManager.cpp:1342
+#: DirManager.cpp:1479
 #, c-format
 msgid ""
 "Project check detected %d missing audio data blockfile[s] (.au), \n"
@@ -984,27 +1007,27 @@ msgstr ""
 "або закрити проект зараз і спробувати відновити\n"
 "відсутні дані вручну."
 
-#: DirManager.cpp:1347
+#: DirManager.cpp:1484
 msgid "Replace missing data with silence [permanent immediately]"
 msgstr "Замінити відсутні дані тишею [негайне і незворотне]"
 
-#: DirManager.cpp:1375
+#: DirManager.cpp:1512
 msgid "Cleaning up unused directories in project data..."
 msgstr "Очищення тек, що не використовуються, у даних проекту..."
 
-#: DirManager.cpp:1448
+#: DirManager.cpp:1583
 msgid "Caching audio"
 msgstr "Кешування аудіо"
 
-#: DirManager.cpp:1449
+#: DirManager.cpp:1584
 msgid "Caching audio into memory..."
 msgstr "Кешування звукової інформації у пам'ять..."
 
-#: DirManager.cpp:1486
+#: DirManager.cpp:1617
 msgid "Saving recorded audio"
 msgstr "Збереження записаного звуку"
 
-#: DirManager.cpp:1487
+#: DirManager.cpp:1618
 msgid "Saving recorded audio to disk..."
 msgstr "Збереження записаного звуку на диск..."
 
@@ -1012,124 +1035,234 @@ msgstr "Збереження записаного звуку на диск..."
 msgid "Rectangular"
 msgstr "Rectangular"
 
-#: FreqWindow.cpp:104
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr "Програму зібрано без підтримки FFmpeg"
+
+#: FFmpeg.cpp:101
+msgid ""
+"FFmpeg was configured in Preferences and successfully loaded "
+"before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+"FFmpeg було налаштовано у «Уподобаннях», бібліотека успішно завантажувалася раніше,                       \n"
+"але цього разу Audacity не вдалося завантажити її під час запуску.                       \n"
+"\n"
+"Можливо, вам слід повернутися до сторінки «Уподобання > Імпорт/Експорт» і повторно налаштувати параметри бібліотеки."
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr "Спроба запуску FFmpeg була невдалою"
+
+#: FFmpeg.cpp:112
+msgid "FFmpeg library not found"
+msgstr "Бібліотеки FFmpeg не знайдено"
+
+#: FFmpeg.cpp:172
+msgid "Locate FFmpeg"
+msgstr "Вказати адресу FFmpeg"
+
+#: FFmpeg.cpp:192
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr "Audacity потребує файла %s для імпортування та експортування звукових даних за допомогою FFmpeg."
+
+#: FFmpeg.cpp:198 export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Розташування %s:"
+
+#: FFmpeg.cpp:207 export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Щоб знайти %s, клацніть тут —>"
+
+#: FFmpeg.cpp:213 export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Огляд..."
+
+#: FFmpeg.cpp:214
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr "Щоб отримати вільну копію FFmpeg, натисніть тут -->"
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr "Звантажити"
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: FFmpeg.cpp:237 export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "Де знаходиться %s?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr "Спроба знайти сумісну версію бібліотеки FFmpeg була невдалою"
+
+#: FFmpeg.h:87
+msgid "FFmpeg not found"
+msgstr "FFmpeg не знайдено"
+
+#: FFmpeg.h:101
+msgid ""
+"Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences-"
+">Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+"Програма Audacity зробила спробу використати бібліотеки FFmpeg для імпорту звукового файла,\n"
+"але бібліотеки не було знайдено.\n"
+"Якщо ви бажаєте скористатися можливістю імпорту за допомогою FFmpeg, будь ласка, відкрийте сторінку «Уподобань»->«Імпорт/Експорт»\n"
+"і повідомте Audacity, де слід шукати бібліотеки."
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr "Більше не показувати це попередження"
+
+#: FFmpeg.h:242
+msgid ""
+"Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
+"All Files (*.*)|*"
+msgstr "Лише avformat.dll|*avformat*.dll|Динамічно з’єднані бібліотеки (*.dll)|*.dll|Всі файли (*.*)|*"
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr "Динамічні бібліотеки (*.dylib)|*.dylib|Всі файли (*)|*"
+
+#: FFmpeg.h:295
+msgid ""
+"Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*."
+"so*|All Files (*)|*"
+msgstr "Лише libavformat.so|libavformat.so*|Динамічно з’єднані бібліотеки (*.so*)|*.so*|Всі файли (*)|*"
+
+#: FreqWindow.cpp:103
 msgid "Frequency Analysis"
 msgstr "Частотний аналіз"
 
-#: FreqWindow.cpp:140 TrackPanel.cpp:563
+#: FreqWindow.cpp:139 TrackPanel.cpp:553 prefs/GUIPrefs.cpp:156
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: FreqWindow.cpp:141
+#: FreqWindow.cpp:140
 msgid "Standard Autocorrelation"
 msgstr "Стандартна автокореляція"
 
-#: FreqWindow.cpp:142
+#: FreqWindow.cpp:141
 msgid "Cuberoot Autocorrelation"
 msgstr "Середньоквадратична кореляція"
 
-#: FreqWindow.cpp:143
+#: FreqWindow.cpp:142
 msgid "Enhanced Autocorrelation"
 msgstr "Розширена автокореляція"
 
 #. i18n-hint: This is a technical term, derived from the word
 #. "spectrum".  Do not translate it unless you are sure you
 #. know the correct technical word in your language.
-#: FreqWindow.cpp:147
+#: FreqWindow.cpp:146
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
-msgstr "Алгоритм:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
+msgstr "Алгоритм"
 
-#: FreqWindow.cpp:168 HistoryWindow.cpp:79
+#: FreqWindow.cpp:169 FreqWindow.cpp:173 HistoryWindow.cpp:79
 msgid "Size"
 msgstr "Розмір"
 
 #. i18n-hint: This refers to a "window function", used in the
 #. Frequency analyze dialog box.
-#: FreqWindow.cpp:181
+#: FreqWindow.cpp:183
 msgid " window"
 msgstr " вікно"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Функція:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr "Функція"
 
-#: FreqWindow.cpp:192
+#: FreqWindow.cpp:196
 msgid "Linear frequency"
 msgstr "Лінійна частота"
 
-#: FreqWindow.cpp:193
+#: FreqWindow.cpp:197
 msgid "Log frequency"
 msgstr "Частота запису журналу"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Вісь:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr "Вісь"
 
-#: FreqWindow.cpp:206 LabelDialog.cpp:128 Menus.cpp:204 Menus.cpp:233
+#: FreqWindow.cpp:212 LabelDialog.cpp:130 Menus.cpp:242 Menus.cpp:277
 msgid "&Export..."
 msgstr "&Експорт..."
 
-#: FreqWindow.cpp:209 widgets/ErrorDialog.cpp:159
+#: FreqWindow.cpp:213 effects/Contrast.cpp:437 export/ExportCL.cpp:323
+#: export/ExportMultiple.cpp:344
+msgid "Export"
+msgstr "Експорт"
+
+#: FreqWindow.cpp:216 FreqWindow.cpp:217 widgets/ErrorDialog.cpp:161
 msgid "Close"
 msgstr "Закрити"
 
-#: FreqWindow.cpp:272 FreqWindow.cpp:402 effects/AutoDuck.cpp:489
-#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:791
+#: FreqWindow.cpp:280 FreqWindow.cpp:410 effects/AutoDuck.cpp:489
+#: effects/AutoDuck.cpp:523 effects/AutoDuck.cpp:792
 #: effects/Compressor.cpp:352 effects/Compressor.cpp:360
-#: effects/Equalization.cpp:1109 effects/Equalization.cpp:1111
-#: effects/Equalization.cpp:1119 effects/Equalization.cpp:1185
-#: effects/Equalization.cpp:1394 effects/Equalization.cpp:1405
-#: effects/Normalize.cpp:365 widgets/Meter.cpp:380
+#: effects/Equalization.cpp:1123 effects/Equalization.cpp:1125
+#: effects/Equalization.cpp:1133 effects/Equalization.cpp:1199
+#: effects/Equalization.cpp:1408 effects/Equalization.cpp:1419
+#: effects/Normalize.cpp:368 widgets/Meter.cpp:413
 msgid "dB"
 msgstr "дБ"
 
 #. i18n-hint: This is the abbreviation for "Hertz", or
 #. cycles per second.
-#: FreqWindow.cpp:287 FreqWindow.cpp:442 effects/Equalization.cpp:1150
-#: effects/Equalization.cpp:1181 import/ImportRaw.cpp:416
+#: FreqWindow.cpp:295 FreqWindow.cpp:450 effects/Equalization.cpp:1164
+#: effects/Equalization.cpp:1195 import/ImportRaw.cpp:399
 msgid "Hz"
 msgstr "Гц"
 
-#: FreqWindow.cpp:386
+#: FreqWindow.cpp:394
 msgid "Not enough data selected."
 msgstr "Вибрано недостатньо даних."
 
-#: FreqWindow.cpp:450 effects/AutoDuck.cpp:793
+#: FreqWindow.cpp:458 effects/AutoDuck.cpp:794
 msgid "s"
 msgstr "с"
 
-#: FreqWindow.cpp:779
+#: FreqWindow.cpp:787
 #, c-format
 msgid "Cursor: %d Hz (%s) = %d dB    Peak: %d Hz (%s) = %.1f dB"
 msgstr "Курсор: %d Гц (%s) = %d дБ    Пік: %d Гц (%s) = %.1f дБ"
 
-#: FreqWindow.cpp:788
+#: FreqWindow.cpp:796
 #, c-format
 msgid "Cursor: %.4f sec (%d Hz) (%s) = %f,    Peak: %.4f sec (%d Hz) (%s) = %.3f"
 msgstr "Курсор: %.4f сек (%d Гц) (%s) = %f,    Пік: %.4f сек (%d Гц) (%s) = %.3f"
 
-#: FreqWindow.cpp:1061
+#: FreqWindow.cpp:1069
 msgid "spectrum.txt"
 msgstr "spectrum.txt"
 
-#: FreqWindow.cpp:1063
+#: FreqWindow.cpp:1071
 msgid "Export Spectral Data As:"
 msgstr "Експортувати результати спектрального аналізу у файл:"
 
-#: FreqWindow.cpp:1079 LabelDialog.cpp:599 Menus.cpp:2207 Project.cpp:2441
-#: Project.cpp:3395 prefs/KeyConfigPrefs.cpp:180
+#: FreqWindow.cpp:1087 LabelDialog.cpp:603 Menus.cpp:2567 Project.cpp:2663
+#: Project.cpp:3714 effects/Contrast.cpp:567 prefs/KeyConfigPrefs.cpp:195
 msgid "Couldn't write to file: "
 msgstr "Не вдається записати у файл:"
 
-#: FreqWindow.cpp:1084
+#: FreqWindow.cpp:1092
 msgid "Frequency (Hz)\tLevel (dB)"
 msgstr "Частота (Гц)\tРівень (дБ)"
 
-#: FreqWindow.cpp:1090
+#: FreqWindow.cpp:1098
 msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "Відставання (сек)\tЧастота (Гц)\tРівень"
 
@@ -1566,18 +1699,15 @@ msgstr ""
 
 #: HelpText.cpp:403
 msgid ""
-"<p>You don't appear to have Audacity help files on your machine. Either <a "
-"href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the "
-"help files and then access them again from Audacity by clicking <i>Help</i> "
-"then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/"
-"index.php?title=Main_Page\">here</a> to read the full Manual online."
+"<p>Help for Audacity Beta is currently unfinished. For now, a draft manual "
+"is available <a href=\"http://www.audacityteam.org/manual/index.php?"
+"title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www."
+"audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</"
+"a> to download a single-page version of the manual which can be viewed in "
+"this window."
 msgstr ""
-"<p>Здається на Вашому комп'ютері не встановлено файлів довідки з Audacity. "
-"Ви можете <a href=\"http://audacity.sourceforge.net/help/documentation"
-"\">завантажити</a> файли довідки, а потім отримати до них доступ з Audacity "
-"з меню <i>Довідка</i> і пункту <i>Покажчик</i>, або просто клацнути <a href="
-"\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">тут</a>, "
-"щоб почитати довідку у Інтернеті."
+"<p>Створення довідки до Audacity Beta ще не завершено. Чернетку підручника можна знайти у <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">мережі</a>. Крім того, ви можете натиснути <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">тут</"
+"a>, щоб звантажити односторінкову версію підручника, яку можна буде переглянути за допомогою цього вікна."
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1599,13 +1729,12 @@ msgstr "Кількість рівнів &запису дій"
 msgid "Levels To Discard"
 msgstr "Рівнів для відкидання"
 
-#: HistoryWindow.cpp:102
+#: HistoryWindow.cpp:103
 msgid "&Discard"
 msgstr "&Відкинути"
 
-#: HistoryWindow.cpp:111 Tags.cpp:2072 Tags.cpp:2074 Tags.cpp:2376
-#: Tags.cpp:2378 effects/ChangeLength.cpp:186 effects/SpikeCleaner.cpp:191
-#: effects/vamp/VampEffect.cpp:414 export/ExportCL.cpp:398
+#: HistoryWindow.cpp:112 effects/ChangeLength.cpp:186
+#: effects/SpikeCleaner.cpp:191 export/ExportCL.cpp:397
 msgid "&OK"
 msgstr "&Гаразд"
 
@@ -1613,7 +1742,7 @@ msgstr "&Гаразд"
 msgid "Unable to determine"
 msgstr "Не вдається визначити"
 
-#: Internat.cpp:195 import/ImportRaw.cpp:392
+#: Internat.cpp:195 import/ImportRaw.cpp:385
 msgid "bytes"
 msgstr "байтів"
 
@@ -1629,47 +1758,47 @@ msgstr "МБ"
 msgid "GB"
 msgstr "ГБ"
 
-#: LabelDialog.cpp:52
+#: LabelDialog.cpp:54
 msgid "Track"
 msgstr "Доріжка"
 
-#: LabelDialog.cpp:53 Menus.cpp:4057 Menus.cpp:4085
+#: LabelDialog.cpp:55 Menus.cpp:4727 Menus.cpp:4762
 msgid "Label"
 msgstr "Позначка"
 
-#: LabelDialog.cpp:54
+#: LabelDialog.cpp:56 TimerRecordDialog.cpp:329
 msgid "Start Time"
 msgstr "Час початку"
 
-#: LabelDialog.cpp:55
+#: LabelDialog.cpp:57 TimerRecordDialog.cpp:348
 msgid "End Time"
 msgstr "Час закінчення"
 
-#: LabelDialog.cpp:98 Menus.cpp:627
+#: LabelDialog.cpp:100 Menus.cpp:715
 msgid "&Edit Labels"
 msgstr "Р&едагувати позначки"
 
-#: LabelDialog.cpp:113
+#: LabelDialog.cpp:115
 msgid "Press F2 or double click to edit cell contents."
 msgstr "Натисніть F2 або двічі клацніть, щоб відредагувати вміст комірки."
 
-#: LabelDialog.cpp:124
+#: LabelDialog.cpp:126
 msgid "Insert &After"
 msgstr "Вставити &після"
 
-#: LabelDialog.cpp:125
+#: LabelDialog.cpp:127
 msgid "Insert &Before"
 msgstr "Вставити &до"
 
-#: LabelDialog.cpp:127 Menus.cpp:194
+#: LabelDialog.cpp:129
 msgid "&Import..."
 msgstr "&Імпорт..."
 
-#: LabelDialog.cpp:155
+#: LabelDialog.cpp:157
 msgid "New..."
 msgstr "Створити..."
 
-#: LabelDialog.cpp:352
+#: LabelDialog.cpp:354
 msgid ""
 "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
@@ -1681,44 +1810,43 @@ msgstr ""
 "\n"
 "Бажаєте повернутися та визначити назви?"
 
-#: LabelDialog.cpp:353
+#: LabelDialog.cpp:355
 msgid "Confirm"
 msgstr "Підтвердити"
 
-#: LabelDialog.cpp:514 Menus.cpp:3555
+#: LabelDialog.cpp:516 Menus.cpp:4151
 msgid "Select a text file containing labels..."
 msgstr "Виберіть тестовий файл, що містить позначки..."
 
-#: LabelDialog.cpp:518 Menus.cpp:3559
+#: LabelDialog.cpp:520 Menus.cpp:4155
 msgid "Text files (*.txt)|*.txt|All files (*.*)|*.*"
 msgstr "Текстові файли (*.txt)|*.txt|Усі файли (*.*)|*.*"
 
-#: LabelDialog.cpp:532 Menus.cpp:3571 Project.cpp:1831 Project.cpp:1839
-#: import/ImportMIDI.cpp:31
+#: LabelDialog.cpp:534 Menus.cpp:4167 Project.cpp:1960 Project.cpp:1968
 msgid "Could not open file: "
 msgstr "Не вдається відкрити файл:"
 
-#: LabelDialog.cpp:558
+#: LabelDialog.cpp:560
 msgid "No labels to export."
 msgstr "Відсутні позначок для експорту."
 
-#: LabelDialog.cpp:564 Menus.cpp:2172
+#: LabelDialog.cpp:566 Menus.cpp:2530
 msgid "Export Labels As:"
 msgstr "Експортувати позначки як:"
 
-#: LabelDialog.cpp:566 Menus.cpp:2170
+#: LabelDialog.cpp:568 Menus.cpp:2528
 msgid "labels.txt"
 msgstr "labels.txt"
 
-#: LabelDialog.cpp:699
+#: LabelDialog.cpp:703
 msgid "New Label Track"
 msgstr "Нова доріжка позначок"
 
-#: LabelDialog.cpp:700
+#: LabelDialog.cpp:704
 msgid "Enter track name"
 msgstr "Введіть назву доріжки"
 
-#: LabelDialog.cpp:701 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:555
+#: LabelDialog.cpp:705 LabelDialog.h:52 LabelTrack.cpp:89 Menus.cpp:634
 msgid "&Label Track"
 msgstr "Доріжка для &позначок"
 
@@ -1726,7 +1854,7 @@ msgstr "Доріжка для &позначок"
 msgid "Audacity First Run"
 msgstr "Перший запуск Audacity"
 
-#: LangChoice.cpp:84
+#: LangChoice.cpp:89
 msgid "Choose Language for Audacity to use:"
 msgstr "Виберіть мову інтерфейсу для Audacity:"
 
@@ -1743,1058 +1871,1163 @@ msgstr ""
 msgid "Opening Audacity Project"
 msgstr "Відкривається проект Audacity"
 
-#: Menus.cpp:162
+#: Menus.cpp:195
 msgid "&File"
 msgstr "&Файл"
 
-#: Menus.cpp:164
+#: Menus.cpp:197
 msgid "&New\tCtrl+N"
 msgstr "&Створити\tCtrl+N"
 
-#: Menus.cpp:166
+#: Menus.cpp:199
 msgid "&Open...\tCtrl+O"
 msgstr "&Відкрити...\tCtrl+O"
 
-#: Menus.cpp:171
+#: Menus.cpp:204
 msgid "&Close\tCtrl+W"
 msgstr "&Закрити\tCtrl+W"
 
-#: Menus.cpp:174
+#: Menus.cpp:207
 msgid "&Save Project\tCtrl+S"
 msgstr "З&берегти проект\tCtrl+S"
 
-#: Menus.cpp:178 Project.cpp:2690
+#: Menus.cpp:211 Project.cpp:2943
 msgid "Save Project &As..."
 msgstr "Зберегти проект &як..."
 
-#: Menus.cpp:181
+#: Menus.cpp:213
+msgid "Save Compressed Copy of Project..."
+msgstr "Зберегти стиснуту копію проекту..."
+
+#: Menus.cpp:217
 msgid "Chec&k Dependencies..."
 msgstr "Перевір&ити залежності..."
 
-#: Menus.cpp:187
+#: Menus.cpp:223
 msgid "Open Me&tadata Editor..."
 msgstr "Відкрити редактор &метаданих..."
 
-#: Menus.cpp:196
+#: Menus.cpp:230 import/ImportRaw.cpp:411
+msgid "&Import"
+msgstr "&Імпорт"
+
+#: Menus.cpp:232
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "&Аудіо...\tCtrl+Shift+I"
 
-#: Menus.cpp:197
+#: Menus.cpp:233
 msgid "&Labels..."
 msgstr "&Позначки..."
 
-#: Menus.cpp:198
+#: Menus.cpp:235
 msgid "&MIDI..."
 msgstr "&MIDI..."
 
-#: Menus.cpp:199
+#: Menus.cpp:237
 msgid "&Raw Data..."
 msgstr "Звуковий файл &без заголовку (Raw)..."
 
-#: Menus.cpp:210 Menus.cpp:239
+#: Menus.cpp:248 Menus.cpp:283
 msgid "Expo&rt Selection..."
 msgstr "Експо&рт виділеної області..."
 
-#: Menus.cpp:217
+#: Menus.cpp:255
 msgid "Export &Labels..."
 msgstr "Експортувати &позначки..."
 
-#: Menus.cpp:218
+#: Menus.cpp:256
 msgid "Export &Multiple..."
 msgstr "Експортувати у &декілька файлів..."
 
-#: Menus.cpp:247
+#: Menus.cpp:258
+msgid "Export MIDI..."
+msgstr "Експортувати до MIDI..."
+
+#: Menus.cpp:291
 msgid "CleanSpeech C&hain..."
 msgstr "Лан&цюжок CleanSpeech..."
 
-#: Menus.cpp:248 Menus.cpp:262
+#: Menus.cpp:292 Menus.cpp:306
 msgid "Edit C&hains..."
 msgstr "Редагувати лан&цюжки..."
 
-#: Menus.cpp:249
+#: Menus.cpp:293
 msgid "Export CleanSpeech &Presets..."
 msgstr "Експортувати &шаблони CleanSpeech..."
 
-#: Menus.cpp:250
+#: Menus.cpp:294
 msgid "I&mport CleanSpeech Presets..."
 msgstr "І&мпортувати шаблони CleanSpeech..."
 
-#: Menus.cpp:260
+#: Menus.cpp:304
 msgid "Appl&y Chain..."
 msgstr "Застос&увати ланцюжок..."
 
-#: Menus.cpp:267
+#: Menus.cpp:311
 msgid "&Upload File..."
 msgstr "Відванта&жити файл на FTP-сервер..."
 
-#: Menus.cpp:273
+#: Menus.cpp:317
 msgid "Pa&ge Setup..."
 msgstr "Пара&метри сторінки..."
 
-#: Menus.cpp:274
+#: Menus.cpp:318
 msgid "&Print..."
 msgstr "Д&рукувати..."
 
-#: Menus.cpp:287
+#: Menus.cpp:331
 msgid "E&xit\tCtrl+Q"
 msgstr "Ви&йти\tCtrl+Q"
 
-#: Menus.cpp:295 toolbars/EditToolBar.cpp:76
+#: Menus.cpp:339 toolbars/EditToolBar.cpp:76
 msgid "&Edit"
 msgstr "&Правка"
 
-#: Menus.cpp:299
+#: Menus.cpp:343
 msgid "&Undo\tCtrl+Z"
 msgstr "В&ернути\tCtrl+Z"
 
-#: Menus.cpp:307 prefs/KeyConfigPrefs.cpp:369 toolbars/EditToolBar.cpp:146
+#: Menus.cpp:351 prefs/KeyConfigPrefs.cpp:384 toolbars/EditToolBar.cpp:146
 msgid "&Redo"
 msgstr "Повт&орити"
 
-#: Menus.cpp:320
+#: Menus.cpp:364
 msgid "Cu&t\tCtrl+X"
 msgstr "&Вирізати\tCtrl+X"
 
-#: Menus.cpp:324
+#: Menus.cpp:368
 msgid "Spl&it Cut\tCtrl+Alt+X"
 msgstr "Вирізати без з'&єднання\tCtrl+Alt+X"
 
-#: Menus.cpp:325
+#: Menus.cpp:369
 msgid "&Copy\tCtrl+C"
 msgstr "&Копіювати\tCtrl+C"
 
-#: Menus.cpp:329
+#: Menus.cpp:373
 msgid "&Paste\tCtrl+V"
 msgstr "Вст&авити\tCtrl+V"
 
-#: Menus.cpp:333
+#: Menus.cpp:377
 msgid "Tri&m\tCtrl+T"
 msgstr "Обр&ізати\tCtrl+T"
 
-#: Menus.cpp:335
+#: Menus.cpp:379
 msgid "&Delete\tCtrl+K"
 msgstr "В&илучити\tCtrl+K"
 
-#: Menus.cpp:336
+#: Menus.cpp:380
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Вилучити без з'є&днання\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
+#: Menus.cpp:381
+msgid "Silence Audi&o\tCtrl+L"
 msgstr "Заповнити &тишею\tCtrl+L"
 
-#: Menus.cpp:339
+#: Menus.cpp:383
 msgid "Sp&lit\tCtrl+I"
 msgstr "Розді&лити\tCtrl+I"
 
-#: Menus.cpp:344
+#: Menus.cpp:388
 msgid "Split Ne&w\tCtrl+Alt+I"
 msgstr "Розділити зі створенням &нового\tCtrl+Alt+I"
 
-#: Menus.cpp:349
+#: Menus.cpp:393
 msgid "&Join\tCtrl+J"
 msgstr "&З'єднати\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "&Роз'єднати\tCtrl+Alt+J"
+#: Menus.cpp:394
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr "Р&оз'єднати за тишею\tShift+Alt+J"
 
-#: Menus.cpp:352
+#: Menus.cpp:395
 msgid "Duplic&ate\tCtrl+D"
 msgstr "Ду&блювати\tCtrl+D"
 
-#: Menus.cpp:358 Menus.cpp:564 effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
+#: Menus.cpp:401 Menus.cpp:641
+msgid "Stereo Trac&k to Mono"
 msgstr "&Стерео на моно"
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Обла&сті з позначками..."
+#: Menus.cpp:408
+msgid "La&beled Regions"
+msgstr "Обла&сті з позначками"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:367
+#: Menus.cpp:410
 msgid "&Cut\tAlt+X"
 msgstr "&Вирізати\tAlt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:372
+#: Menus.cpp:415
 msgid "&Split Cut\tShift+Alt+X"
 msgstr "Ви&різати без з'єданння\tShift+Alt+X"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:377
+#: Menus.cpp:420
 msgid "Co&py\tShift+Alt+C"
 msgstr "&Копіювати\tShift+Alt+C"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:383
+#: Menus.cpp:426
 msgid "&Delete\tAlt+K"
 msgstr "В&илучити\tAlt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:388
+#: Menus.cpp:431
 msgid "Sp&lit Delete\tShift+Alt+K"
 msgstr "Ви&лучити без з'єднання\tShift+Alt+K"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:393
+#: Menus.cpp:436
 msgid "Sile&nce\tAlt+L"
 msgstr "Ти&ша\tAlt+L"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:399
+#: Menus.cpp:442
 msgid "Spli&t\tAlt+I"
 msgstr "Розді&лити\tAlt+I"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:404
+#: Menus.cpp:447
 msgid "&Join\tAlt+J"
 msgstr "З'&єднати\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Р&оз'єднати\tShift+Alt+J"
+#: Menus.cpp:452
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr "Р&оз'єднати за тишею\tShift+Alt+J"
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "Виді&лити..."
+#: Menus.cpp:457
+msgid "&Select"
+msgstr "&Вибрати"
 
-#: Menus.cpp:416
+#: Menus.cpp:458
 msgid "&All\tCtrl+A"
 msgstr "&Все\tCtrl+A"
 
-#: Menus.cpp:417
+#: Menus.cpp:459
 msgid "&None\tCtrl+Shift+A"
 msgstr "&Нічого\tCtrl+Shift+A"
 
-#: Menus.cpp:421
+#: Menus.cpp:463
 msgid "&Left at Playback Position\t["
 msgstr "&Ліворуч від поточної позиції\t["
 
-#: Menus.cpp:422
+#: Menus.cpp:464
 msgid "&Right at Playback Position\t]"
 msgstr "&Праворуч від поточної позиції\t]"
 
-#: Menus.cpp:426
+#: Menus.cpp:468
 msgid "Track &Start to Cursor\tShift+J"
 msgstr "Від п&очатку до курсора\tShift+J"
 
-#: Menus.cpp:427
+#: Menus.cpp:469
 msgid "Cursor to Track &End\tShift+K"
 msgstr "Від курсора до &кінця\tShift+K"
 
-#: Menus.cpp:433
+#: Menus.cpp:475
 msgid "Find &Zero Crossings\tZ"
 msgstr "Знайти &нульові точки\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "Пере&містити курсор..."
+#: Menus.cpp:478
+msgid "Mo&ve Cursor"
+msgstr "Пере&містити курсор"
 
-#: Menus.cpp:437
+#: Menus.cpp:480
 msgid "to Selection Star&t"
 msgstr "До початку вид&іленого"
 
-#: Menus.cpp:438
+#: Menus.cpp:481
 msgid "to Selection En&d"
 msgstr "до кінця виділен&ого"
 
-#: Menus.cpp:442
+#: Menus.cpp:485
 msgid "to Track &Start\tJ"
 msgstr "до &початку доріжки\tJ"
 
-#: Menus.cpp:443
+#: Menus.cpp:486
 msgid "to Track &End\tK"
 msgstr "до &кінця доріжки\tK"
 
-#: Menus.cpp:450
+#: Menus.cpp:493
 msgid "Re&gion Save"
 msgstr "Запам'ятати виді&лене"
 
-#: Menus.cpp:451
+#: Menus.cpp:494
 msgid "Regio&n Restore"
 msgstr "Відновленн&я виділеного"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Відтвор&ити область..."
+#: Menus.cpp:505
+msgid "Pla&y Region"
+msgstr "Відтвор&ити область"
 
-#: Menus.cpp:463
+#: Menus.cpp:506
 msgid "&Lock"
 msgstr "&Заблокувати"
 
-#: Menus.cpp:464
+#: Menus.cpp:507
 msgid "&Unlock"
 msgstr "&Розблокувати"
 
-#: Menus.cpp:470
+#: Menus.cpp:513
 msgid "Turn Snap-To On"
 msgstr "Увімкнути прив'язку"
 
-#: Menus.cpp:471
+#: Menus.cpp:514
 msgid "Turn Snap-To Off"
 msgstr "Вимкнути прив'язку"
 
-#: Menus.cpp:472
+#: Menus.cpp:515
 msgid "Turn Grid Snap On"
 msgstr "Включити прив'язку за сіткою"
 
-#: Menus.cpp:473
+#: Menus.cpp:516
 msgid "Turn Grid Snap Off"
 msgstr "Увімкнути прив'язку за сіткою"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:521
+msgid "Pre&ferences...\tCtrl+,"
+msgstr "&Параметри...\tCtrl+,"
+
+#: Menus.cpp:525
+msgid "Pre&ferences...\tCtrl+P"
 msgstr "&Уподобання...\tCtrl+P"
 
-#: Menus.cpp:492
+#: Menus.cpp:535
 msgid "&View"
 msgstr "&Вигляд"
 
-#: Menus.cpp:494
+#: Menus.cpp:537
 msgid "Zoom &In\tCtrl+1"
 msgstr "З&більшити\tCtrl+1"
 
-#: Menus.cpp:497
+#: Menus.cpp:540
 msgid "Zoom &Normal\tCtrl+2"
 msgstr "Зви&чайний розмір\tCtrl+2"
 
-#: Menus.cpp:498
+#: Menus.cpp:541
 msgid "Zoom &Out\tCtrl+3"
 msgstr "З&меншити\tCtrl+3"
 
-#: Menus.cpp:501
+#: Menus.cpp:544
 msgid "&Fit in Window\tCtrl+F"
 msgstr "Піді&гнати до розміру вікна\tCtrl+F"
 
-#: Menus.cpp:502
+#: Menus.cpp:545
 msgid "Fit &Vertically\tCtrl+Shift+F"
 msgstr "Розмістити по &вертикалі\tCtrl+Shift+F"
 
-#: Menus.cpp:503
+#: Menus.cpp:546
 msgid "&Zoom to Selection\tCtrl+E"
 msgstr "Мас&штабувати до виділеного\tCtrl+E"
 
-#: Menus.cpp:506
+#: Menus.cpp:549
 msgid "&Collapse All Tracks\tCtrl+Shift+C"
 msgstr "&Згорнути всі доріжки\tCtrl+Shift+C"
 
-#: Menus.cpp:507
+#: Menus.cpp:550
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "Роз&горнути всі доріжки\tCtrl+Shift+X"
 
-#: Menus.cpp:510
+#: Menus.cpp:553
 msgid "&Show Clipping"
 msgstr "Показати з&різання"
 
-#: Menus.cpp:519
+#: Menus.cpp:562
 msgid "&History..."
 msgstr "&Історія змін..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&Панелі..."
+#: Menus.cpp:568
+msgid "&Toolbars"
+msgstr "П&енали"
 
-#: Menus.cpp:526
+#: Menus.cpp:569
 msgid "&Control Toolbar"
 msgstr "Панель &керування"
 
-#: Menus.cpp:527
+#: Menus.cpp:570
 msgid "&Device Toolbar"
 msgstr "Панель пристро&їв"
 
-#: Menus.cpp:528
+#: Menus.cpp:571
 msgid "&Edit Toolbar"
 msgstr "Панель &редагування"
 
-#: Menus.cpp:529
+#: Menus.cpp:572
 msgid "&Meter Toolbar"
 msgstr "Панель &індикаторів"
 
-#: Menus.cpp:530
+#: Menus.cpp:573
 msgid "Mi&xer Toolbar"
 msgstr "Панель мік&шера"
 
-#: Menus.cpp:531
+#: Menus.cpp:574
 msgid "&Selection Toolbar"
 msgstr "Панель &вибору"
 
-#: Menus.cpp:532
+#: Menus.cpp:575
 msgid "T&ools Toolbar"
 msgstr "Панель інстр&ументів"
 
-#: Menus.cpp:533
+#: Menus.cpp:576
 msgid "Transcri&ption Toolbar"
 msgstr "Панель перез&апису"
 
-#: Menus.cpp:535
+#: Menus.cpp:578
 msgid "&Reset Toolbars"
 msgstr "Від&новити початкові панелі"
 
-#: Menus.cpp:537
+#: Menus.cpp:580
 msgid "!Simplified View"
 msgstr "!Спрощений вигляд"
 
-#: Menus.cpp:545
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:589
+msgid "T&ransport"
+msgstr "П&еренесення"
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr "Відтворити\tПробіл"
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr "Ві&дтворити у циклі\tShift+Пробіл"
+
+#: Menus.cpp:595
+msgid "&Pause\tP"
+msgstr "П&ризупинити\tP"
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr "З&упинити\tПробіл"
+
+#: Menus.cpp:597 Menus.cpp:1012
+msgid "Skip to Start\tHome"
+msgstr "Перейти на початок доріжки\tHome"
+
+#: Menus.cpp:599 Menus.cpp:1013
+msgid "Skip to End\tEnd"
+msgstr "Перейти на кінець доріжки\tEnd"
+
+#: Menus.cpp:602
+msgid "&Record\tR"
+msgstr "&Запис\tR"
+
+#: Menus.cpp:604
+msgid "&Timer Record...\tShift+T"
+msgstr "Запис за &таймером...\tShift+T"
+
+#: Menus.cpp:606
+msgid "Append Record\tShift+R"
+msgstr "Долучення запису\tShift+R"
+
+#: Menus.cpp:609
+msgid "Overdub (on/off)"
+msgstr "Накладення (увімкн./вимкн.)"
+
+#: Menus.cpp:611
+msgid "Software Playthrough (on/off)"
+msgstr "Програмне відтворення (увімкн./вимкн.)"
+
+#: Menus.cpp:614
+msgid "Sound Activated Recording (on/off)"
+msgstr "Запис з активацією звуком (увімкн./вимкн.)"
+
+#: Menus.cpp:616
+msgid "Sound Activation Level..."
+msgstr "Рівень активізації звуку..."
+
+#: Menus.cpp:624
 msgid "&Tracks"
 msgstr "Д&оріжки"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Додати &нову..."
+#: Menus.cpp:631
+msgid "Add &New"
+msgstr "Додати &нову"
 
-#: Menus.cpp:553
+#: Menus.cpp:632
 msgid "&Audio Track\tCtrl+Shift+N"
 msgstr "&Аудіо доріжку\tCtrl+Shift+N"
 
-#: Menus.cpp:554
+#: Menus.cpp:633
 msgid "&Stereo Track"
 msgstr "&Стерео доріжку"
 
-#: Menus.cpp:556 TimeTrack.cpp:44
+#: Menus.cpp:635 TimeTrack.cpp:44
 msgid "&Time Track"
 msgstr "Доріжку &часу"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&Таймер запису..."
-
-#: Menus.cpp:568
+#: Menus.cpp:645
 msgid "Mi&x and Render"
 msgstr "Змі&кшувати і відобразити"
 
-#: Menus.cpp:572
+#: Menus.cpp:649
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr "Мікшувати і відобразити як нову доріжку\tCtrl+Shift+M"
 
-#: Menus.cpp:576
+#: Menus.cpp:653
 msgid "&Resample..."
 msgstr "&Змінити частоту..."
 
-#: Menus.cpp:586
+#: Menus.cpp:663
 msgid "Remo&ve Tracks"
 msgstr "В&илучити доріжки"
 
-#: Menus.cpp:592
+#: Menus.cpp:669
 msgid "&Mute All Tracks\tCtrl+U"
 msgstr "&Вимкнути звук на всіх доріжках\tCtrl+U"
 
-#: Menus.cpp:593
+#: Menus.cpp:670
 msgid "&UnMute All Tracks\tCtrl+Shift+U"
 msgstr "&Увімкнути звук на всіх доріжках\tCtrl+Shift+U"
 
-#: Menus.cpp:597
+#: Menus.cpp:674
 msgid "Align with &Zero"
 msgstr "Вирівняти за &нулем"
 
-#: Menus.cpp:598
+#: Menus.cpp:675
 msgid "Align with &Cursor"
 msgstr "Вирівняти за &курсором"
 
-#: Menus.cpp:599
+#: Menus.cpp:676
 msgid "Align with Selection &Start"
 msgstr "Вирівняти за &початком виділеного"
 
-#: Menus.cpp:600
+#: Menus.cpp:677
 msgid "Align with Selection &End"
 msgstr "Вирівняти за кінцем &виділеного"
 
-#: Menus.cpp:601
+#: Menus.cpp:678
 msgid "Align End with Cu&rsor"
 msgstr "Встановити закінчення на к&урсор"
 
-#: Menus.cpp:602
+#: Menus.cpp:679
 msgid "Align End with Selection Star&t"
 msgstr "Встановити кінець на по&чаток виділеного"
 
-#: Menus.cpp:603
+#: Menus.cpp:680
 msgid "Align End with Selection En&d"
 msgstr "Встановити закінчення на кінець виді&леного"
 
-#: Menus.cpp:604
+#: Menus.cpp:681
 msgid "Align Tracks To&gether"
 msgstr "Вирівняти дорі&жки"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "Ви&рівняти доріжки..."
+#: Menus.cpp:683
+msgid "&Align Tracks"
+msgstr "Ви&рівняти доріжки"
+
+#: Menus.cpp:692
+msgid "Ali&gn and Move Cursor"
+msgstr "Вир&івняти та перемістити курсор"
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Вир&івняти та перемістити курсор..."
+#: Menus.cpp:699
+msgid "Synchronize MIDI with Audio"
+msgstr "Синхронізувати MIDI зі звуком"
 
-#: Menus.cpp:623
+#: Menus.cpp:708
+msgid "Link Audio and Label Tracks"
+msgstr "З’єднати звук і позначити доріжки"
+
+#: Menus.cpp:711
 msgid "Add &Label At Selection\tCtrl+B"
 msgstr "Додати &позначку до виділеної області\tCtrl+B"
 
-#: Menus.cpp:624
+#: Menus.cpp:712
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Додати позначку на позицію &відтворення\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "Вп&орядкувати доріжки за..."
+#: Menus.cpp:718
+msgid "S&ort tracks"
+msgstr "Вп&орядкувати доріжки"
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Початком відліку"
+#: Menus.cpp:719
+msgid "by &Start time"
+msgstr "за &початком відліку"
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Назвою"
+#: Menus.cpp:721
+msgid "by &Name"
+msgstr "за &назвою"
 
-#: Menus.cpp:643
+#: Menus.cpp:732
 msgid "&Generate"
 msgstr "&Створення"
 
-#: Menus.cpp:666
+#: Menus.cpp:778 Menus.cpp:862 Menus.cpp:924
+msgid "Unsorted"
+msgstr "Без певного порядку"
+
+#: Menus.cpp:797
 msgid "Effe&ct"
 msgstr "&Ефекти"
 
-#: Menus.cpp:670
+#: Menus.cpp:801
 msgid "Repeat Last Effect\tCtrl+R"
 msgstr "Повторити останній ефект\tCtrl+R"
 
-#: Menus.cpp:702
+#: Menus.cpp:879
 msgid "&Analyze"
 msgstr "&Аналіз"
 
-#: Menus.cpp:704
+#: Menus.cpp:881
 msgid "Plot Spectrum..."
 msgstr "Побудувати графік спектру..."
 
-#: Menus.cpp:737 Menus.cpp:740
+#: Menus.cpp:949 Menus.cpp:952
 msgid "&Help"
 msgstr "&Довідка"
 
-#: Menus.cpp:743
+#: Menus.cpp:955
 msgid "&About Audacity CleanSpeech..."
 msgstr "&Про програму Audacity CleanSpeech..."
 
-#: Menus.cpp:747
+#: Menus.cpp:959
 msgid "&Show Welcome Message..."
 msgstr "По&казати вітальне повідомлення..."
 
-#: Menus.cpp:748
+#: Menus.cpp:960
 msgid "&Index..."
 msgstr "&Покажчик..."
 
-#: Menus.cpp:756
+#: Menus.cpp:961
+msgid "Show &Log..."
+msgstr "Показати &журнал..."
+
+#: Menus.cpp:969
 msgid "&Screenshot Tools..."
 msgstr "Інструменти для &Знімків екрану..."
 
-#: Menus.cpp:759
+#: Menus.cpp:972
 msgid "&Run Benchmark..."
 msgstr "&Тестування швидкодії..."
 
-#: Menus.cpp:761
+#: Menus.cpp:974
 msgid "&Audio Device Info..."
 msgstr "Інформація про &аудіо пристрій..."
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
-"Циклічний перехід між доком, переглядом доріжки та панеллю вибору\tCtrl+Shift"
+"Циклічний перехід між панелями інструментів та панеллю перегляду\tCtrl+Shift"
 "+F6"
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr ""
-"Циклічний перехід вперед між доком, переглядом доріжки та панеллю вибору"
-"\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr "Циклічний перехід вперед між доком, переглядом доріжки\tCtrl+F6"
 
-#: Menus.cpp:774
+#: Menus.cpp:987
 msgid "Selection Tool\tF1"
 msgstr "Виділення\tF1"
 
-#: Menus.cpp:775
+#: Menus.cpp:988
 msgid "Envelope Tool\tF2"
 msgstr "Зміна обвідної\tF2"
 
-#: Menus.cpp:776
+#: Menus.cpp:989
 msgid "Draw Tool\tF3"
 msgstr "Зміна обвідної\tF3"
 
-#: Menus.cpp:777
+#: Menus.cpp:990
 msgid "Zoom Tool\tF4"
 msgstr "Масштабування\tF4"
 
-#: Menus.cpp:778
+#: Menus.cpp:991
 msgid "Time Shift Tool\tF5"
 msgstr "Зсув у часі\tF5"
 
-#: Menus.cpp:779
+#: Menus.cpp:992
 msgid "Multi Tool\tF6"
 msgstr "Універсальний інструмент\tF6"
 
-#: Menus.cpp:781
+#: Menus.cpp:994
 msgid "Next Tool\tD"
 msgstr "Наступний інструмент\tD"
 
-#: Menus.cpp:782
+#: Menus.cpp:995
 msgid "Previous Tool\tA"
 msgstr "Попередній інструмент\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
 msgstr "Відтворити/Зупинити\tПробіл"
 
-#: Menus.cpp:785
+#: Menus.cpp:998
 msgid "Stop\tS"
 msgstr "Зупинити\tS"
 
-#: Menus.cpp:786
+#: Menus.cpp:999
 msgid "Pause\tP"
 msgstr "Призупинити\tP"
 
-#: Menus.cpp:787
+#: Menus.cpp:1000
 msgid "Record\tR"
 msgstr "Записати\tR"
 
-#: Menus.cpp:788
+#: Menus.cpp:1001
 msgid "Record Append\tShift+R"
 msgstr "Долучення запису\tShift+R"
 
-#: Menus.cpp:790
+#: Menus.cpp:1003
 msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr "Пуск/Стоп і встановлення курсора\tShift+A"
 
-#: Menus.cpp:793
+#: Menus.cpp:1006
 msgid "Play One Second\t1"
 msgstr "Відтворити 1 секунду\t1"
 
-#: Menus.cpp:794
+#: Menus.cpp:1007
 msgid "Play To Selection\tB"
 msgstr "Відтворити виділене\tB"
 
-#: Menus.cpp:795
+#: Menus.cpp:1008
 msgid "Play Looped\tL"
 msgstr "Відтворювати у циклі\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
 msgstr "Відтворити у циклі\tShift+Пробіл"
 
-#: Menus.cpp:797
+#: Menus.cpp:1010
 msgid "Play Cut Preview\tC"
 msgstr "Прослуховування вирізаного\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Перейти на початок доріжки\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Перейти на кінець доріжки\tEnd"
-
-#: Menus.cpp:802
+#: Menus.cpp:1015
 msgid "Selection to Start\tShift+Home"
 msgstr "Виділити до початку доріжки\tShift+Home"
 
-#: Menus.cpp:803
+#: Menus.cpp:1016
 msgid "Selection to End\tShift+End"
 msgstr "Виділити від курсора до кінця\tShift+End"
 
-#: Menus.cpp:805
+#: Menus.cpp:1018
 msgid "DeleteKey\tBackspace"
 msgstr "Клавіша вилучення\tBackspace"
 
-#: Menus.cpp:810
+#: Menus.cpp:1023
 msgid "DeleteKey2\tDelete"
 msgstr "Друга клавіша вилучення\tDelete"
 
-#: Menus.cpp:816
+#: Menus.cpp:1029
 msgid "Seek left short period during playback\tLeft"
 msgstr "Під час програвання переходити на короткий відрізок ліворуч\tЛіворуч"
 
-#: Menus.cpp:817
+#: Menus.cpp:1030
 msgid "Seek right short period during playback\tRight"
 msgstr "Під час програвання переходити на короткий відрізок праворуч\tПраворуч"
 
-#: Menus.cpp:818
+#: Menus.cpp:1031
 msgid "Seek left long period during playback\tShift+Left"
 msgstr "Під час програвання переходити на довгий відрізок ліворуч\tShift+Ліворуч"
 
-#: Menus.cpp:819
+#: Menus.cpp:1032
 msgid "Seek right long period during playback\tShift+Right"
 msgstr "Під час програвання переходити на довгий відрізок праворуч \tShift+Праворуч"
 
-#: Menus.cpp:823
+#: Menus.cpp:1036
 msgid "Move Focus to Previous Track\tUp"
 msgstr "Перемістити фокус на попередню доріжку\tДогори"
 
-#: Menus.cpp:824
+#: Menus.cpp:1037
 msgid "Move Focus to Previous and Change Selection\tShift+Up"
 msgstr "Перемістити фокус на попередню та змінити виділене\tShift+Догори"
 
-#: Menus.cpp:825
+#: Menus.cpp:1038
 msgid "Move Focus to Next Track\tDown"
 msgstr "Перемістити фокус на наступну доріжку\tДонизу"
 
-#: Menus.cpp:826
+#: Menus.cpp:1039
 msgid "Move Focus to Next and Change Selection\tShift+Down"
 msgstr "Перемістити фокус на наступну та змінити виділення\tShift+Донизу"
 
-#: Menus.cpp:827
+#: Menus.cpp:1040
 msgid "Toggle Focused Track\tReturn"
 msgstr "Перемкнути доріжку з фокусом\tReturn"
 
-#: Menus.cpp:828
+#: Menus.cpp:1041
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Перемкнути фокус на доріжку\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Перемкнути фокус на доріжку\tCtrl+Пробіл"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr "Перемкнути фокус доріжки\tCtrl+Пробіл"
 
-#: Menus.cpp:831
+#: Menus.cpp:1044
 msgid "Cursor Left\tLeft"
 msgstr "Курсор ліворуч\tЛіворуч"
 
-#: Menus.cpp:832
+#: Menus.cpp:1045
 msgid "Cursor Right\tRight"
 msgstr "Курсор праворуч\tПраворуч"
 
-#: Menus.cpp:833
+#: Menus.cpp:1046
 msgid "Cursor Short Jump Left\t,"
 msgstr "Короткий стрибок курсора ліворуч\t,"
 
-#: Menus.cpp:834
+#: Menus.cpp:1047
 msgid "Cursor Short Jump Right\t."
 msgstr "Короткий стрибок курсора праворуч\t."
 
-#: Menus.cpp:835
+#: Menus.cpp:1048
 msgid "Cursor Long Jump Left\tShift+,"
 msgstr "Довгий стрибок курсора ліворуч\tShift+,"
 
-#: Menus.cpp:836
+#: Menus.cpp:1049
 msgid "Cursor Long Jump Right\tShift+."
 msgstr "Довгий стрибок курсора праворуч\tShift+."
 
-#: Menus.cpp:838
+#: Menus.cpp:1051
 msgid "Selection Extend Left\tShift+Left"
 msgstr "Розтягнути виділення ліворуч\tShift+Стрілка ліворуч"
 
-#: Menus.cpp:839
+#: Menus.cpp:1052
 msgid "Selection Extend Right\tShift+Right"
 msgstr "Розтягнути виділення праворуч\tShift+Стрілка праворуч"
 
-#: Menus.cpp:841
+#: Menus.cpp:1054
 msgid "Set (or Extend) Left Selection"
 msgstr "Встановити (або Поширити) праве виділення"
 
-#: Menus.cpp:842
+#: Menus.cpp:1055
 msgid "Set (or Extend) Right Selection"
 msgstr "Встановити (або Поширити) праву мітку виділення"
 
-#: Menus.cpp:844
+#: Menus.cpp:1057
 msgid "Selection Contract Left\tCtrl+Shift+Right"
 msgstr "Стягнути виділення ліворуч\tCtrl+Shift+Праворуч"
 
-#: Menus.cpp:845
+#: Menus.cpp:1058
 msgid "Selection Contract Right\tCtrl+Shift+Left"
 msgstr "Стягнути виділення праворуч\tCtrl+Shift+Ліворуч"
 
-#: Menus.cpp:847
+#: Menus.cpp:1060
 msgid "Change pan on focused track\tShift+P"
 msgstr "Змінити перегляд на доріжці у фокусі\tShift+P"
 
-#: Menus.cpp:848
+#: Menus.cpp:1061
 msgid "Pan left on focused track\tAlt+Shift+Left"
 msgstr "Панорама ліворуч на доріжці у фокусі\tAlt+Shift+Ліворуч"
 
-#: Menus.cpp:849
+#: Menus.cpp:1062
 msgid "Pan right on focused track\tAlt+Shift+Right"
 msgstr "Панорама праворуч на доріжці у фокусі\tAlt+Shift+Праворуч"
 
-#: Menus.cpp:850
+#: Menus.cpp:1063
 msgid "Change gain on focused track\tShift+G"
 msgstr "Змінити підсилення для активної доріжки\tShift+G"
 
-#: Menus.cpp:851
+#: Menus.cpp:1064
 msgid "Increase gain on focused track\tAlt+Shift+Up"
 msgstr "Збільшити підсилення для активної доріжки\tAlt+Shift+Догори"
 
-#: Menus.cpp:852
+#: Menus.cpp:1065
 msgid "Decrease gain on focused track\tAlt+Shift+Down"
 msgstr "Зменшити підсилення для активної доріжки\tAlt+Shift+Донизу"
 
-#: Menus.cpp:853
+#: Menus.cpp:1066
 msgid "Open menu on focused track\tShift+M"
 msgstr "Відкрити меню для поточної доріжки\tShift+M"
 
-#: Menus.cpp:854
+#: Menus.cpp:1067
 msgid "Mute/Unmute focused track\tShift+U"
 msgstr "Заглушити/озвучити поточну доріжку\tShift+U"
 
-#: Menus.cpp:855
+#: Menus.cpp:1068
 msgid "Solo/Unsolo focused track\tShift+S"
 msgstr "Увімкнути або вимкнути соло для активної доріжки\tShift+S"
 
-#: Menus.cpp:856
+#: Menus.cpp:1069
 msgid "Close focused track\tShift+C"
 msgstr "Закрити активну доріжку\tShift+C"
 
-#: Menus.cpp:858
+#: Menus.cpp:1071
 msgid "Snap To On"
 msgstr "Прив'язку увімкнено"
 
-#: Menus.cpp:859
+#: Menus.cpp:1072
 msgid "Snap To Off"
 msgstr "Прив'язку вимкнено"
 
+#: Menus.cpp:1073
+msgid "Full screen on/off\tF11"
+msgstr "Увімкнути/Вимкнути повноекранний режим\tF11"
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
-#: Menus.cpp:873
+#: Menus.cpp:1155
 msgid "Open Recent"
 msgstr "Відкрити недавні"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Недавні &файли..."
+#: Menus.cpp:1158
+msgid "Recent &Files"
+msgstr "Недавні &файли"
 
-#: Menus.cpp:925
+#: Menus.cpp:1207
 #, c-format
 msgid "&Undo %s"
 msgstr "В&ернути \"%s\""
 
-#: Menus.cpp:951
+#: Menus.cpp:1233
 msgid "Can't Undo"
 msgstr "Неможливо вернути"
 
-#: Menus.cpp:960
+#: Menus.cpp:1242
 #, c-format
 msgid "&Redo %s"
 msgstr "Повт&орити \"%s\""
 
-#: Menus.cpp:966
+#: Menus.cpp:1248
 msgid "Can't Redo"
 msgstr "Неможливо повторити"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1863
 msgid "Sort By Time"
 msgstr "Впорядкувати за часом"
 
-#: Menus.cpp:1528
+#: Menus.cpp:1863
 msgid "Tracks sorted by time"
 msgstr "Доріжки впорядковані за часом"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1889
 msgid "Sort By Name"
 msgstr "Впорядкувати за назвою"
 
-#: Menus.cpp:1554
+#: Menus.cpp:1889
 msgid "Tracks sorted by name"
 msgstr "Доріжки впорядковані за назвою"
 
-#: Menus.cpp:1705
+#: Menus.cpp:2040
 msgid "Set Left Selection Bound"
 msgstr "Встановити лівий обмежувач виділеної області"
 
-#: Menus.cpp:1739
+#: Menus.cpp:2076
 msgid "Set Right Selection Bound"
 msgstr "Встановити праву точку обмеження виділеного"
 
-#: Menus.cpp:2006
+#: Menus.cpp:2346
 msgid "You must select a track first."
 msgstr "Спочатку виділіть доріжку."
 
-#: Menus.cpp:2035
+#: Menus.cpp:2381
 #, c-format
 msgid "Repeat %s\tCtrl+R"
 msgstr "Повторити %s\tCtrl+R"
 
-#: Menus.cpp:2166
+#: Menus.cpp:2524
 msgid "There are no label tracks to export."
 msgstr "Немає доріжок з позначками для експорту."
 
-#: Menus.cpp:2271
+#: Menus.cpp:2619
+msgid "Export MIDI As:"
+msgstr "Експортувати MIDI як:"
+
+#: Menus.cpp:2623
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr "Файл MIDI (*.mid)|*.mid|Файл Allegro (*.gro)|*.gro"
+
+#: Menus.cpp:2655
+msgid ""
+"You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+"Ви обрали назву файла з незрозумілим програмі суфіксом.\n"
+"Бажаєте продовжити?"
+
+#: Menus.cpp:2656
+msgid "Export MIDI"
+msgstr "Експортувати до MIDI"
+
+#: Menus.cpp:2726
 msgid "Nothing to undo"
 msgstr "Немає що скасувати"
 
-#: Menus.cpp:2291
+#: Menus.cpp:2746
 msgid "Nothing to redo"
 msgstr "Немає що повторити"
 
-#: Menus.cpp:2366 TrackPanel.cpp:605 toolbars/EditToolBar.cpp:133
+#: Menus.cpp:2851 TrackPanel.cpp:593 toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Вирізати"
 
-#: Menus.cpp:2366
+#: Menus.cpp:2851
 msgid "Cut to the clipboard"
 msgstr "Вирізати у буфер"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2891
 msgid "Split Cut"
 msgstr "Вирізати без з'єднання"
 
-#: Menus.cpp:2404
+#: Menus.cpp:2891
 msgid "Split-cut to the clipboard"
 msgstr "Вирізати без склеювання у буфер"
 
-#: Menus.cpp:2469 Menus.cpp:2540 Menus.cpp:2634 TrackPanel.cpp:607
+#: Menus.cpp:2956 Menus.cpp:3028 Menus.cpp:3220 TrackPanel.cpp:595
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Вставити"
 
-#: Menus.cpp:2469
+#: Menus.cpp:2956
 msgid "Pasted text from the clipboard"
 msgstr "Текст вставлений з буферу обміну"
 
-#: Menus.cpp:2540 Menus.cpp:2634
+#: Menus.cpp:3028 Menus.cpp:3220
 msgid "Pasted from the clipboard"
 msgstr "Вставка з буферу"
 
-#: Menus.cpp:2574
+#: Menus.cpp:3094
+msgid "Pasting one type of track into another is not allowed."
+msgstr "Вставка фрагментів доріжок одного типу до доріжок іншого є неприпустимою."
+
+#: Menus.cpp:3106
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Копіювання стерео-звуку у моно-доріжку неприпустиме."
 
-#: Menus.cpp:2670 toolbars/EditToolBar.cpp:139
+#: Menus.cpp:3256 toolbars/EditToolBar.cpp:139
 msgid "Trim"
 msgstr "Обрізати"
 
-#: Menus.cpp:2670
+#: Menus.cpp:3256
 msgid "Trim file to selection"
 msgstr "Залишити у файлі лише виділене"
 
-#: Menus.cpp:2699
+#: Menus.cpp:3285
 #, c-format
 msgid "Split-deleted %.2f seconds at t=%.2f"
 msgstr "Вилучено розділенням %.2f секунд починаючи з t=%.2f"
 
-#: Menus.cpp:2702
+#: Menus.cpp:3288
 msgid "Split Delete"
 msgstr "Розділити вилученням"
 
-#: Menus.cpp:2723
+#: Menus.cpp:3309
 #, c-format
 msgid "Disjoined %.2f seconds at t=%.2f"
 msgstr "Роз'єднано %.2f секунд з часу t=%.2f"
 
-#: Menus.cpp:2726
+#: Menus.cpp:3312
 msgid "Disjoin"
 msgstr "Роз'єднати"
 
-#: Menus.cpp:2747
+#: Menus.cpp:3333
 #, c-format
 msgid "Joined %.2f seconds at t=%.2f"
 msgstr "З'єднано %.2f секунд з часу t=%.2f"
 
-#: Menus.cpp:2750
+#: Menus.cpp:3336
 msgid "Join"
 msgstr "З'єднати"
 
-#: Menus.cpp:2769
+#: Menus.cpp:3355
 #, c-format
 msgid "Silenced selected tracks for %.2f seconds at %.2f"
 msgstr "У виділені доріжки записано %.2f секунд тиші з %.2f"
 
-#: Menus.cpp:2771 toolbars/EditToolBar.cpp:141
+#: Menus.cpp:3357 toolbars/EditToolBar.cpp:141
 msgid "Silence"
 msgstr "Створити тишу"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3391
 msgid "Duplicate"
 msgstr "Дублювати"
 
-#: Menus.cpp:2805
+#: Menus.cpp:3391
 msgid "Duplicated"
 msgstr "Продубльовано"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3410
 msgid "Cut Labels"
 msgstr "Вирізати позначки"
 
-#: Menus.cpp:2824
+#: Menus.cpp:3410
 msgid "Cut labeled regions to the clipboard"
 msgstr "Вирізати позначені області до буферу"
 
-#: Menus.cpp:2838
+#: Menus.cpp:3424
 msgid "SplitCut labeled regions to the clipboard"
 msgstr "Вирізати без склеювання позначені області у буфер"
 
-#: Menus.cpp:2839
+#: Menus.cpp:3425
 msgid "Split Cut Labels"
 msgstr "Розділити вирізанням за позначками"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3439
 msgid "Copied labeled regions to the clipboard"
 msgstr "Копіювання позначених областей у буфер"
 
-#: Menus.cpp:2853
+#: Menus.cpp:3439
 msgid "Copy Labels"
 msgstr "Копіювати позначки"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3451
 msgid "Delete Labels"
 msgstr "Вилучити позначки"
 
-#: Menus.cpp:2865
+#: Menus.cpp:3451
 msgid "Deleted labeled regions"
 msgstr "Вилучені позначені області"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3463
 msgid "Split Delete Labels"
 msgstr "Розділити визначенням за позначками"
 
-#: Menus.cpp:2877
+#: Menus.cpp:3463
 msgid "Split Deleted labeled regions"
 msgstr "Вилучені розділенням позначені області"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3475
 msgid "Silence Labels"
 msgstr "Заповнити тишею позначені області"
 
-#: Menus.cpp:2889
+#: Menus.cpp:3475
 msgid "Silenced labeled regions"
 msgstr "Заповнені тишею позначені області"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3487
 msgid "Split Labels"
 msgstr "Розділити за позначками"
 
-#: Menus.cpp:2901
+#: Menus.cpp:3487
 msgid "Split labeled regions"
 msgstr "Відокремити позначені області"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3499
 msgid "Join Labels"
 msgstr "З'єднати позначки"
 
-#: Menus.cpp:2913
+#: Menus.cpp:3499
 msgid "Joined labeled regions"
 msgstr "З'єднати позначені області"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3511
 msgid "Disjoin Labels"
 msgstr "Роз'єднати позначки"
 
-#: Menus.cpp:2925
+#: Menus.cpp:3511
 msgid "Disjoined labeled regions"
 msgstr "Від'єднані позначені області"
 
-#: Menus.cpp:2947 TrackPanel.cpp:6121
+#: Menus.cpp:3533 TrackPanel.cpp:6173
 msgid "Split"
 msgstr "Розділити"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3627
 msgid "Split New"
 msgstr "Відокремити у нову доріжку"
 
-#: Menus.cpp:3041
+#: Menus.cpp:3627
 msgid "Split to new track"
 msgstr "Відокремити у нову доріжку"
 
-#: Menus.cpp:3124
+#: Menus.cpp:3710
 msgid "Split at labels"
 msgstr "Розділити за позначками"
 
-#: Menus.cpp:3425
+#: Menus.cpp:4011
 msgid "To plot the spectrum, all selected tracks must be the same sample rate."
 msgstr "Для побудови спектрограми, усі вибрані доріжки повинні мати однакову частоту."
 
-#: Menus.cpp:3451
+#: Menus.cpp:4037
 #, c-format
 msgid ""
 "Too much audio was selected.  Only the first %.1f seconds of audio will be "
@@ -2803,251 +3036,257 @@ msgstr ""
 "Виділено надто велику звукову ділянку. Будуть проаналізовані лише перші %.1f "
 "секунд звуку."
 
-#: Menus.cpp:3584
+#: Menus.cpp:4180
 #, c-format
 msgid "Imported labels from '%s'"
-msgstr "Імпортовано позначки з файлу '%s'"
+msgstr "Імпортовано позначки з файла '%s'"
 
-#: Menus.cpp:3585
+#: Menus.cpp:4181
 msgid "Import Labels"
 msgstr "Імпорт позначок"
 
-#: Menus.cpp:3595
+#: Menus.cpp:4192
 msgid "Select a MIDI file..."
 msgstr "Вибрати MIDI-файл..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
+#: Menus.cpp:4196
+msgid ""
+"MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*."
+"mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
 msgstr ""
-"Усі файли (*.*)|*.*|Файли MIDI (*.mid)|*.mid|Файли формату Allegro (*.gro)|*."
-"gro"
+"Файли MIDI і Allegro (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|Файли MIDI (*."
+"mid;*.midi)|*.mid;*.midi|Файл Allegro (*.gro)|*.gro|Всі файли (*.*)|*.*"
 
-#: Menus.cpp:3615
+#: Menus.cpp:4212
 #, c-format
 msgid "Imported MIDI from '%s'"
 msgstr "Імпортовано MIDI-файл з '%s'"
 
-#: Menus.cpp:3617
+#: Menus.cpp:4213
 msgid "Import MIDI"
-msgstr "Імпорт MIDI-файлу"
+msgstr "Імпорт MIDI-файла"
 
-#: Menus.cpp:3630
+#: Menus.cpp:4227
 msgid "Select any uncompressed audio file..."
 msgstr "Виберіть будь-який нестиснений звуковий файл..."
 
-#: Menus.cpp:3634
+#: Menus.cpp:4231
 msgid "All files (*)|*"
 msgstr "Усі файли (*)|*"
 
-#: Menus.cpp:3649 Project.cpp:2587 Project.cpp:2612 import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Імпорт"
-
-#: Menus.cpp:3668
+#: Menus.cpp:4255
 msgid "Edit the metadata tags"
 msgstr "Редагувати мітки метаданих"
 
-#: Menus.cpp:3669 export/Export.cpp:298
+#: Menus.cpp:4256 export/Export.cpp:349
 msgid "Edit Metadata"
 msgstr "Редагувати метадані"
 
-#: Menus.cpp:3669
+#: Menus.cpp:4256
 msgid "Edit Metadata tags"
 msgstr "Редагувати мітки метаданих"
 
-#: Menus.cpp:3725
+#: Menus.cpp:4312
 #, c-format
 msgid "Rendered all audio in track '%s'"
 msgstr "Відображено всю аудіо-інформацію у доріжці '%s'"
 
-#: Menus.cpp:3726
+#: Menus.cpp:4313
 msgid "Render"
 msgstr "Відобразити"
 
-#: Menus.cpp:3731
+#: Menus.cpp:4318
 #, c-format
 msgid "Mixed and rendered %d tracks into one new stereo track"
 msgstr "Змікшовано та перетворено %d доріжок у одну нову стерео доріжку"
 
-#: Menus.cpp:3734
+#: Menus.cpp:4321
 #, c-format
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "Змікшовано та перетворено %d доріжок у одну моно доріжку"
 
-#: Menus.cpp:3736 Mix.cpp:120
+#: Menus.cpp:4323 Mix.cpp:121
 msgid "&Mix and Render"
 msgstr "&Мікшувати і перетворити"
 
-#: Menus.cpp:3866
+#: Menus.cpp:4453
 msgid "Aligned with zero"
 msgstr "Вирівняно до нуля"
 
-#: Menus.cpp:3870
+#: Menus.cpp:4457
 msgid "Aligned cursor"
 msgstr "Вирівняно до курсора"
 
-#: Menus.cpp:3874
+#: Menus.cpp:4461
 msgid "Aligned with selection start"
 msgstr "Вирівняти до початку виділеної ділянки"
 
-#: Menus.cpp:3878
+#: Menus.cpp:4465
 msgid "Aligned with selection end"
 msgstr "Вирівняти до кінця виділеної ділянки"
 
-#: Menus.cpp:3882
+#: Menus.cpp:4469
 msgid "Aligned end with cursor"
 msgstr "Встановлено закінчення на позицію курсора"
 
-#: Menus.cpp:3886
+#: Menus.cpp:4473
 msgid "Aligned end with selection start"
 msgstr "Вирівняно закінчення до початку виділеної ділянки"
 
-#: Menus.cpp:3890
+#: Menus.cpp:4477
 msgid "Aligned end with selection end"
 msgstr "Встановлено закінчення на кінець виділеної ділянки"
 
-#: Menus.cpp:3894
+#: Menus.cpp:4481
 msgid "Aligned"
 msgstr "Доріжки вирівняні"
 
-#: Menus.cpp:3927
+#: Menus.cpp:4514
 msgid "Align"
 msgstr "Вирівняти"
 
-#: Menus.cpp:3950
+#: Menus.cpp:4599
+msgid "Sync MIDI with Audio"
+msgstr "Синхронізувати MIDI зі звуком"
+
+#: Menus.cpp:4603
+msgid "Alignment completed."
+msgstr "Вирівнювання завершено."
+
+#: Menus.cpp:4614
 msgid "Created new audio track"
 msgstr "Створено нову звукову доріжку"
 
-#: Menus.cpp:3950 Menus.cpp:3973 Menus.cpp:3988 Menus.cpp:4008
+#: Menus.cpp:4614 Menus.cpp:4637 Menus.cpp:4652 Menus.cpp:4672
 msgid "New Track"
 msgstr "Нова доріжка"
 
-#: Menus.cpp:3973
+#: Menus.cpp:4637
 msgid "Created new stereo audio track"
 msgstr "Створено нову стерео-доріжку"
 
-#: Menus.cpp:3988
+#: Menus.cpp:4652
 msgid "Created new label track"
 msgstr "Створено нову доріжку для позначок"
 
-#: Menus.cpp:3997
+#: Menus.cpp:4661
 msgid "The version of Audacity you are using does not support multiple time tracks."
 msgstr ""
 "Запущена версія Audacity не може використовувати декілька доріжок у одному "
 "проекті."
 
-#: Menus.cpp:4008
+#: Menus.cpp:4672
 msgid "Created new time track"
 msgstr "Створено нову доріжку часу"
 
-#: Menus.cpp:4057
+#: Menus.cpp:4727
 msgid "Added label"
 msgstr "Позначка додана"
 
-#: Menus.cpp:4085
+#: Menus.cpp:4762
 msgid "Edited labels"
 msgstr "Змінені позначки"
 
-#: Menus.cpp:4112
+#: Menus.cpp:4789
 msgid "Save CleanSpeech Preset File As:"
 msgstr "Зберегти файл шаблону CleanSpeech як:"
 
-#: Menus.cpp:4116
+#: Menus.cpp:4793
 msgid "CleanSpeech Presets (*.csp)|*.csp"
 msgstr "Шаблони CleanSpeech (*.csp)|*.csp"
 
-#: Menus.cpp:4123 export/Export.cpp:515
+#: Menus.cpp:4800 export/Export.cpp:611
 msgid "Sorry, pathnames longer than 256 characters not supported."
 msgstr "Шляхи, що містять більш ніж 256 символів, не підтримуються."
 
-#: Menus.cpp:4169
+#: Menus.cpp:4846
 msgid "Problem encountered exporting presets."
 msgstr "Помилка при експорті шаблонів."
 
-#: Menus.cpp:4170 export/Export.cpp:408
+#: Menus.cpp:4847 export/Export.cpp:473
 msgid "Unable to export"
 msgstr "Неможливо експортувати"
 
-#: Menus.cpp:4354
+#: Menus.cpp:5031
 msgid "Remove Track"
 msgstr "Вилучити доріжку"
 
-#: Menus.cpp:4354
+#: Menus.cpp:5031
 msgid "Removed audio track(s)"
 msgstr "Доріжку(и) вилучено"
 
-#: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Нова частота дискретизації (Гц):"
-
-#: Menus.cpp:4508 Menus.cpp:4527 export/ExportMP3.cpp:1926
+#: Menus.cpp:5188 Menus.cpp:5243 export/ExportFFmpeg.cpp:715
+#: export/ExportMP3.cpp:1780
 msgid "Resample"
 msgstr "Змінити частоту"
 
-#: Menus.cpp:4514
+#: Menus.cpp:5208 TrackPanel.cpp:6400
+msgid "New sample rate (Hz):"
+msgstr "Нова частота дискретизації (Гц):"
+
+#: Menus.cpp:5232 TrackPanel.cpp:6424
 msgid "The entered value is invalid"
 msgstr "Введене значення є некоректним"
 
-#: Menus.cpp:4525
+#: Menus.cpp:5241
 #, c-format
 msgid "Resampling track %d"
 msgstr "Зміна частоти доріжки %d"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5250
 msgid "Resample Track"
 msgstr "Змінити частоту дискретизації"
 
-#: Menus.cpp:4536
+#: Menus.cpp:5250
 msgid "Resampled audio track(s)"
 msgstr "Звукові доріжки зі зміненою частотою"
 
-#: Mix.cpp:94 Mix.cpp:101
+#: Mix.cpp:95 Mix.cpp:102
 msgid "Mix"
 msgstr "Мікшер"
 
-#: Mix.cpp:121
+#: Mix.cpp:122
 msgid "Mixing and rendering tracks"
 msgstr "Мікшування та зведення доріжок"
 
-#: NoteTrack.cpp:36
+#: NoteTrack.cpp:43
 msgid "Note Track"
 msgstr "Доріжка приміток"
 
-#: Printing.cpp:198
+#: Printing.cpp:192
 msgid "There was a problem printing."
 msgstr "Виникла проблема при друкуванні."
 
-#: Printing.cpp:199
+#: Printing.cpp:193
 msgid "Print"
 msgstr "Друк"
 
-#: Project.cpp:636
+#: Project.cpp:710
 msgid "Main Mix"
 msgstr "Головний мікшер"
 
-#: Project.cpp:761
+#: Project.cpp:834
 #, c-format
 msgid "Welcome to Audacity version %s"
 msgstr "Ласкаво просимо до Audacity версії %s"
 
-#: Project.cpp:922
+#: Project.cpp:994
 msgid "(Recovered)"
 msgstr "(Відновлено)"
 
-#: Project.cpp:1482 TrackPanel.cpp:804 toolbars/ControlToolBar.cpp:191
+#: Project.cpp:1583 TrackPanel.cpp:793 toolbars/ControlToolBar.cpp:192
 msgid "Record"
 msgstr "Записати"
 
-#: Project.cpp:1482 TrackPanel.cpp:804
+#: Project.cpp:1583 TrackPanel.cpp:793
 msgid "Recorded Audio"
 msgstr "Записано звук"
 
-#: Project.cpp:1500
+#: Project.cpp:1601
 msgid "Save changes before closing?"
 msgstr "Зберегти зміни перед закриттям?"
 
-#: Project.cpp:1503
+#: Project.cpp:1604
 msgid ""
 "\n"
 "If saved, the project will have no tracks.\n"
@@ -3064,23 +3303,23 @@ msgstr ""
 "доки всі доріжки не буде відкрито, а потім виберіть\n"
 "Файл > Зберегти проект."
 
-#: Project.cpp:1506
+#: Project.cpp:1607
 msgid "Save changes?"
 msgstr "Зберегти зміни?"
 
-#: Project.cpp:1694
+#: Project.cpp:1812
 msgid "All files|*.*|All supported files|"
 msgstr "Всі файли|*.*|Всі файли, що підтримуються|"
 
-#: Project.cpp:1719
+#: Project.cpp:1842
 msgid "Select one or more audio files..."
 msgstr "Виберіть один чи більше звукових файлів..."
 
-#: Project.cpp:1746
+#: Project.cpp:1869
 msgid "Audacity projects|*.aup|"
 msgstr "Проекти Audacity|*.aup|"
 
-#: Project.cpp:1799 Project.cpp:2186
+#: Project.cpp:1928 Project.cpp:2350
 #, c-format
 msgid ""
 "This file was saved by Audacity %s, a much\n"
@@ -3100,19 +3339,19 @@ msgstr ""
 "Все одно бажаєте відкрити цей файл\n"
 "зараз же?"
 
-#: Project.cpp:1800
+#: Project.cpp:1929
 msgid "1.0 or earlier"
 msgstr "1.0 або ранішою"
 
-#: Project.cpp:1806 Project.cpp:2198
+#: Project.cpp:1935 Project.cpp:2362
 msgid "Opening old project file"
 msgstr "Відкриття старого файла проекту"
 
-#: Project.cpp:1832 Project.cpp:1840
+#: Project.cpp:1961 Project.cpp:1969
 msgid "Error opening file"
-msgstr "Помилка при відкриванні файлу"
+msgstr "Помилка під час відкриття файла"
 
-#: Project.cpp:1846
+#: Project.cpp:1975
 #, c-format
 msgid ""
 "File may be invalid or corrupted: \n"
@@ -3121,11 +3360,11 @@ msgstr ""
 "Можливо файл є некоректним або пошкодженим: \n"
 "%s"
 
-#: Project.cpp:1847
+#: Project.cpp:1976
 msgid "Error opening file or project"
 msgstr "Помилка під час відкриття файла або проекту"
 
-#: Project.cpp:1867
+#: Project.cpp:1996
 msgid ""
 "Audacity was unable to convert an Audacity 1.0 project to the new project "
 "format."
@@ -3133,32 +3372,32 @@ msgstr ""
 "Audacity не вдається перетворити проект формату Audacity 1.0 у проект нового "
 "формату."
 
-#: Project.cpp:1970
+#: Project.cpp:2099
 msgid "Could not remove old auto save file"
 msgstr "Неможливо вилучити старий файл автозбереження"
 
-#: Project.cpp:1972
+#: Project.cpp:2101
 msgid "Project was recovered"
 msgstr "Проект було відновлено"
 
-#: Project.cpp:1972
+#: Project.cpp:2101
 msgid "Recover"
 msgstr "Відновити"
 
-#: Project.cpp:2001
+#: Project.cpp:2130
 msgid "Project checker repaired file"
 msgstr "Файл відновлений при перевірці проекту"
 
-#: Project.cpp:2001 effects/Repair.h:29
+#: Project.cpp:2130 effects/Repair.h:29
 msgid "Repair"
 msgstr "Відновити"
 
-#: Project.cpp:2112
+#: Project.cpp:2276
 #, c-format
 msgid "Couldn't find the project data folder: \"%s\""
 msgstr "Не вдається знайти теку з даними проекту: \"%s\""
 
-#: Project.cpp:2155
+#: Project.cpp:2319
 #, c-format
 msgid ""
 "This file was saved using Audacity %s.\n"
@@ -3169,11 +3408,11 @@ msgstr ""
 "Ви використовуєте Audacity версії %s. Щоб відкрити цей файл\n"
 "слід оновити  версію програми."
 
-#: Project.cpp:2159
+#: Project.cpp:2323
 msgid "Can't open project file"
 msgstr "Не вдається відкрити файл проекту"
 
-#: Project.cpp:2193
+#: Project.cpp:2357
 #, c-format
 msgid ""
 "This file was saved by Audacity %s.\n"
@@ -3189,129 +3428,182 @@ msgstr ""
 "\n"
 "Відкрити цей файл?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid ""
+"Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+"Тепер ваш проект порожній.\n"
+"Якщо проект зберегти, у ньому не буде доріжок.\n"
+"\n"
+"Щоб зберегти всі попередньо відкрити доріжки:\n"
+"Скасуйте операцію, скористайтеся пунктом меню Правка > Вернути, аж\n"
+"доки всі доріжки не буде відкрито, а потім виберіть\n"
+"Файл > Зберегти проект.\n"
+"\n"
+"Все одно зберегти?"
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr "Попередження про порожній проект"
+
+#: Project.cpp:2647
 #, c-format
 msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+"Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
 "Не вдається зберегти проект. Можливо, відсутні права запису на %s,\n"
-"або не вистачає вільного простору диску."
+"або не вистачає вільного простору на диску."
 
-#: Project.cpp:2428 Project.cpp:2442
+#: Project.cpp:2649 Project.cpp:2664
 msgid "Error saving project"
-msgstr "Помилка при збереженні файлу проекту"
+msgstr "Помилка під час спроби збереження файла проекту"
 
-#: Project.cpp:2504
+#: Project.cpp:2732
 #, c-format
 msgid "Saved %s"
 msgstr "Збережено %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Необроблені дані"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Імпорт %s..."
-
-#: Project.cpp:2586
+#: Project.cpp:2853
 #, c-format
 msgid "Imported '%s'"
 msgstr "Імпортовано файл '%s'"
 
-#: Project.cpp:2639 Project.cpp:2647
+#: Project.cpp:2854
+msgid "Import"
+msgstr "Імпорт"
+
+#: Project.cpp:2887 Project.cpp:2895
 msgid "Error importing"
 msgstr "Помилка при імпортуванні"
 
-#: Project.cpp:2681
+#: Project.cpp:2929
 msgid "Save Speech As:"
 msgstr "Зберегти промову як:"
 
-#: Project.cpp:2683
+#: Project.cpp:2931
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Файл звуку Windows PCM (*.wav)|*.wav"
 
-#: Project.cpp:2689
+#: Project.cpp:2938
 msgid ""
-"Audacity project files (.aup) let you save everything you're working on "
-"exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project "
-"files.\n"
+"Audacity compressed project files (.aup) save your work in a smaller, "
+"compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, "
+"because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each "
+"compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select "
 "one of the\n"
 "Export commands."
 msgstr ""
-"У файлах проектів Audacity (.aup) ви можете зберегти робочий проект так,\n"
-"як він виглядає на екрані, проте більшість інших програм не здатні\n"
-"відкривати файли проектів Audacity.\n"
+"За допомогою проектів Audacity (.aup) ви можете зберегти звук у менших, стиснутих у форматі (.ogg) файлах.\n"
+"Стиснути файли проектів придатні для поширення ваших проектів мережею через свій менший розмір.\n"
+"Процес відкриття стиснутого проекту триватиме довше ніж звичайно, оскільки імпортуватиметься кожна зі стиснутих доріжок.\n"
 "\n"
+"Більшість інших програм не здатні відкривати файли проектів Audacity.\n"
 "Якщо ви бажаєте зберегти результат роботи у файл, який підтримується іншими\n"
-"програмами, використовуйте команду \"Експортувати\"."
+"програмами, використовуйте команду \"Експорт\"."
+
+#: Project.cpp:2941
+msgid ""
+"You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
+"\n"
+"To save an audio file for other programs, use one of the \"File > Export\" "
+"commands.\n"
+msgstr ""
+"Ви маєте намір зберегти файл проекту Audacity (.aup).\n"
+"\n"
+"Після зберігання проекту буде створено файл, який може бути завантажено лише у програмі Audacity.\n"
+"\n"
+"Для того, щоб створити звуковий файл, який можна буде використовувати у інших програмах, скористайтеся пунктом меню «Файл > Експорт».\n"
 
-#: Project.cpp:2692
+#: Project.cpp:2945
 msgid "Audacity projects (*.aup)|*.aup"
 msgstr "Проекти Audacity (*.aup)|*.aup"
 
-#: Project.cpp:2736
+#: Project.cpp:2999
 msgid "Created new project"
 msgstr "Створено новий проект"
 
-#: Project.cpp:2856
+#: Project.cpp:3158
 #, c-format
 msgid "Deleted %.2f seconds at t=%.2f"
 msgstr "Вилучено %.2f секунд починаючи з t=%.2f"
 
-#: Project.cpp:2859 effects/Equalization.cpp:1262
-#: effects/Equalization.cpp:2593
+#: Project.cpp:3161 effects/Equalization.cpp:1276
+#: effects/Equalization.cpp:2607
 msgid "Delete"
 msgstr "Вилучити"
 
-#: Project.cpp:3052
+#: Project.cpp:3355
 #, c-format
 msgid "Disk space remains for recording %d hours and %d minutes."
 msgstr "Простір диску, що залишився для запису, %d годин та %d хвилин."
 
-#: Project.cpp:3055
+#: Project.cpp:3358
 #, c-format
 msgid "Disk space remains for recording 1 hour and %d minutes."
 msgstr "Простір диску, що залишився для запису, 1 година та %d хвилин."
 
-#: Project.cpp:3058
+#: Project.cpp:3361
 #, c-format
 msgid "Disk space remains for recording %d minutes."
 msgstr "Простір диску, що залишився для запису, %d хвилин."
 
-#: Project.cpp:3061
+#: Project.cpp:3364
 #, c-format
 msgid "Disk space remains for recording %d seconds."
 msgstr "Простір диску, що залишився для запису, %d секунд."
 
-#: Project.cpp:3064
+#: Project.cpp:3367
 msgid "Out of disk space"
 msgstr "Скінчився вільний простір на диску"
 
-#: Project.cpp:3342
+#: Project.cpp:3380
+#, c-format
+msgid ""
+"Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f"
+"%% complete."
+msgstr ""
+"Імпортування завершено. Виконується %d поточних обчислень форми хвилі. Виконано %2.0f"
+"%%."
+
+#: Project.cpp:3383
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+"Імпортування завершено. Виконується поточне обчислення форми хвилі. Виконано %2.0f"
+"%%."
+
+#: Project.cpp:3661
 msgid "Could not remove old autosave file: "
 msgstr "Неможливо вилучити старий файл автозбереження: "
 
-#: Project.cpp:3383
+#: Project.cpp:3702
 msgid "New Project"
 msgstr "Створити проект"
 
-#: Project.cpp:3396
+#: Project.cpp:3715
 msgid "Error writing autosave file"
 msgstr "Помилка під час запису файла автозбереження"
 
-#: Project.cpp:3421
+#: Project.cpp:3740
 msgid "Could not create autosave file: "
 msgstr "Неможливо створити файл автозбереження: "
 
-#: Project.cpp:3447
+#: Project.cpp:3766
 #, c-format
 msgid "Actual Rate: %d"
 msgstr "Фактична частота %d"
@@ -3364,58 +3656,26 @@ msgstr "Збережено "
 msgid "Error trying to save file: "
 msgstr "Помилка під час збереження файла: "
 
-#: Sequence.cpp:732 Sequence.cpp:742 Sequence.cpp:749
+#: Sequence.cpp:804 Sequence.cpp:814 Sequence.cpp:821
 msgid "Gap detected in project file\n"
 msgstr "У файлі проекту виявлено прогалину\n"
 
-#: ShuttleGui.cpp:1852 effects/Effect.cpp:342
-#: effects/audiounits/AudioUnitEffect.cpp:872
+#: ShuttleGui.cpp:1972 effects/Effect.cpp:417
+#: effects/audiounits/AudioUnitEffect.cpp:877
 msgid "Pre&view"
 msgstr "&Прослухати"
 
-#: ShuttleGui.cpp:1859
+#: ShuttleGui.cpp:1979
 msgid "&Debug"
 msgstr "&Налагодження"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Таймер запису Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Початок запису"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Кінець запису"
-
-#: SmartRecordDialog.cpp:226 SmartRecordDialog.cpp:307 TimeDialog.cpp:53
-#: effects/Noise.cpp:235 effects/ToneGen.cpp:329 effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Тривалість"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Поступ розумного запису Audacity"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Дата та час початку"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr "Запис, що активізується звуком"
 
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Дата і час кінця"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Очікування на початок запису о %s.\n"
-
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Запис Audacity - Очікування початку"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr "Рівень активації (дБ):"
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3425,194 +3685,109 @@ msgstr "&Ласкаво просимо до Audacity!"
 msgid "Don't show this again at start up"
 msgstr "Не показувати цього знову під час запуску"
 
-#: Tags.cpp:629
+#: Tags.cpp:628
 msgid "Artist Name"
 msgstr "Ім'я виконавця"
 
-#: Tags.cpp:630
+#: Tags.cpp:629
 msgid "Track Title"
 msgstr "Назва доріжки"
 
-#: Tags.cpp:631
+#: Tags.cpp:630
 msgid "Album Title"
 msgstr "Назва альбому"
 
-#: Tags.cpp:632
+#: Tags.cpp:631
 msgid "Track Number"
 msgstr "Номер доріжки"
 
-#: Tags.cpp:633 Tags.cpp:2138
+#: Tags.cpp:632
 msgid "Year"
 msgstr "Рік"
 
-#: Tags.cpp:634
+#: Tags.cpp:633
 msgid "Genre"
 msgstr "Жанр"
 
-#: Tags.cpp:635 Tags.cpp:2148 prefs/MousePrefs.cpp:96
+#: Tags.cpp:634 prefs/MousePrefs.cpp:96
 msgid "Comments"
 msgstr "Коментарі"
 
-#: Tags.cpp:778 Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Щоб редагувати, натисніть F2 або двічі клацніть мишею"
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr "Скористайтеся клавішами зі стрілочками (або клавішею Enter після завершення редагування), щоб здійснювати навігацію полями."
 
-#: Tags.cpp:802
+#: Tags.cpp:800
 msgid "Tag Name"
 msgstr "Поле"
 
-#: Tags.cpp:803
+#: Tags.cpp:801
 msgid "Tag Value"
 msgstr "Значення"
 
-#: Tags.cpp:818 Tags.cpp:1476 prefs/KeyConfigPrefs.cpp:116
+#: Tags.cpp:816 prefs/KeyConfigPrefs.cpp:130
 msgid "&Clear"
 msgstr "&Очистити"
 
-#: Tags.cpp:824
+#: Tags.cpp:822
 msgid "Genres"
 msgstr "Жанри"
 
-#: Tags.cpp:828 Tags.cpp:1439 Tags.cpp:1980
-msgid "Edit"
-msgstr "Редагувати"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr "&Змінити..."
 
-#: Tags.cpp:829 Tags.cpp:1981
-msgid "Reset"
-msgstr "Відновити"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr "С&кинути..."
 
-#: Tags.cpp:834 Tags.cpp:1460 Tags.cpp:1988
+#: Tags.cpp:832
 msgid "Template"
 msgstr "Шаблон"
 
-#: Tags.cpp:838 Tags.cpp:1464 Tags.cpp:1992 prefs/KeyConfigPrefs.cpp:126
+#: Tags.cpp:836 prefs/KeyConfigPrefs.cpp:142
 msgid "&Load..."
 msgstr "&Завантажити..."
 
-#: Tags.cpp:839 Tags.cpp:1465 Tags.cpp:1993 prefs/KeyConfigPrefs.cpp:125
+#: Tags.cpp:837 prefs/KeyConfigPrefs.cpp:141
 msgid "&Save..."
 msgstr "З&берегти..."
 
-#: Tags.cpp:841 Tags.cpp:1467 Tags.cpp:1995
+#: Tags.cpp:839
 msgid "S&et Default"
 msgstr "Зробити &типовими"
 
-#: Tags.cpp:991 Tags.cpp:1630 Tags.cpp:2359
+#: Tags.cpp:989
 msgid "Edit Genres"
 msgstr "Редагувати жанри"
 
-#: Tags.cpp:1024 Tags.cpp:1036 Tags.cpp:1052 Tags.cpp:1065 Tags.cpp:1668
-#: Tags.cpp:1680 Tags.cpp:1696 Tags.cpp:1709 Tags.cpp:2402 Tags.cpp:2414
-#: Tags.cpp:2430 Tags.cpp:2443
+#: Tags.cpp:1022 Tags.cpp:1034 Tags.cpp:1049 Tags.cpp:1062
 msgid "Reset Genres"
 msgstr "Відновити жанри"
 
-#: Tags.cpp:1024 Tags.cpp:1065 Tags.cpp:1668 Tags.cpp:1709 Tags.cpp:2402
-#: Tags.cpp:2443
+#: Tags.cpp:1022 Tags.cpp:1062
 msgid "Unable to save genre file."
 msgstr "Неможливо зберегти файл зі списком жанрів."
 
-#: Tags.cpp:1035 Tags.cpp:1679 Tags.cpp:2413
+#: Tags.cpp:1033
 msgid "Are you sure you want to reset the genre list to defaults?"
 msgstr "Ви справді бажаєте відновити список жанрів до типового?"
 
-#: Tags.cpp:1052 Tags.cpp:1696 Tags.cpp:2430
+#: Tags.cpp:1049
 msgid "Unable to open genre file."
 msgstr "Неможливо відкрити файл зі списком жанрів."
 
-#: Tags.cpp:1087 Tags.cpp:1141 Tags.cpp:1742 Tags.cpp:1778 Tags.cpp:2465
-#: Tags.cpp:2501
-msgid "Save Metadata As:"
-msgstr "Зберегти метадані як:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr "Завантажити метадані як:"
 
-#: Tags.cpp:1112 Tags.cpp:1763 Tags.cpp:2486
+#: Tags.cpp:1109
 msgid "Error loading metadata"
 msgstr "Помилка під час завантаження метаданих"
 
-#: Tags.cpp:1409 Tags.cpp:1968
-msgid "Title:"
-msgstr "Назва:"
-
-#: Tags.cpp:1410 Tags.cpp:1969
-msgid "Artist:"
-msgstr "Виконавець:"
-
-#: Tags.cpp:1411 Tags.cpp:1970
-msgid "Album:"
-msgstr "Альбом:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Композитор:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Автор слів:"
-
-#: Tags.cpp:1414 Tags.cpp:1973
-msgid "Comments:"
-msgstr "Коментарі:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Закодовано за допомогою:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Право копіювання:"
-
-#: Tags.cpp:1424 Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Номер доріжки:"
-
-#: Tags.cpp:1428 Tags.cpp:1972
-msgid "Year:"
-msgstr "Рік:"
-
-#: Tags.cpp:1432 Tags.cpp:1974
-msgid "Genre:"
-msgstr "Жанр:"
-
-#: Tags.cpp:1490 Tags.cpp:2089
-msgid "No Genres"
-msgstr "Не вказано"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Відновити до типового"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Основне"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Докладно"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Значення"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "О&чистити"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Максимальна довжина атрибуту '%s' складає %d символів. Дані було обрізано."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Заголовок"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Виконавець"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Альбом"
+#: Tags.cpp:1138
+msgid "Save Metadata As:"
+msgstr "Зберегти метадані як:"
 
 #: Theme.cpp:638
 #, c-format
@@ -3713,91 +3888,145 @@ msgstr ""
 "  %s\n"
 "вже були присутні."
 
-#: TrackPanel.cpp:464 TrackPanel.cpp:465
+#: TimeDialog.cpp:53 TimeDialog.cpp:64 TimerRecordDialog.cpp:228
+#: TimerRecordDialog.cpp:355 TimerRecordDialog.cpp:359 effects/DtmfGen.cpp:481
+#: effects/Noise.cpp:243 effects/Noise.cpp:259 effects/ToneGen.cpp:323
+#: effects/ToneGen.cpp:335 effects/ToneGen.cpp:367 effects/ToneGen.cpp:379
+msgid "Duration"
+msgstr "Тривалість"
+
+#: TimerRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Таймер запису Audacity"
+
+#: TimerRecordDialog.cpp:225
+msgid "Recording start"
+msgstr "Початок запису"
+
+#: TimerRecordDialog.cpp:226
+msgid "Recording end"
+msgstr "Кінець запису"
+
+#: TimerRecordDialog.cpp:231
+msgid "Audacity Timer Record Progress"
+msgstr "Поступ запису за таймером Audacity"
+
+#: TimerRecordDialog.cpp:317
+msgid "Start Date and Time"
+msgstr "Дата та час початку"
+
+#: TimerRecordDialog.cpp:324
+msgid "Start Date"
+msgstr "Дата початку"
+
+#: TimerRecordDialog.cpp:336
+msgid "End Date and Time"
+msgstr "Дата і час кінця"
+
+#: TimerRecordDialog.cpp:344
+msgid "End Date"
+msgstr "Дата закінчення"
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: TimerRecordDialog.cpp:431
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Очікування на початок запису о %s.\n"
+
+#: TimerRecordDialog.cpp:432
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr "Запис за таймером Audacity — Очікування початку"
+
+#: TrackPanel.cpp:454 TrackPanel.cpp:455
 msgid "Track Panel"
 msgstr "Панель доріжки"
 
-#: TrackPanel.cpp:548 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
+#: TrackPanel.cpp:538 prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Інша..."
 
-#: TrackPanel.cpp:556 TrackPanel.cpp:580 TrackPanel.cpp:589 TrackPanel.cpp:597
+#: TrackPanel.cpp:546 TrackPanel.cpp:568 TrackPanel.cpp:577 TrackPanel.cpp:585
+#: TrackPanel.cpp:5790
 msgid "Name..."
 msgstr "Назва..."
 
-#: TrackPanel.cpp:558 TrackPanel.cpp:582 TrackPanel.cpp:593 TrackPanel.cpp:599
+#: TrackPanel.cpp:548 TrackPanel.cpp:570 TrackPanel.cpp:581 TrackPanel.cpp:587
+#: TrackPanel.cpp:5794
 msgid "Move Track Up"
 msgstr "Перемістити доріжку вгору"
 
-#: TrackPanel.cpp:559 TrackPanel.cpp:583 TrackPanel.cpp:594 TrackPanel.cpp:600
+#: TrackPanel.cpp:549 TrackPanel.cpp:571 TrackPanel.cpp:582 TrackPanel.cpp:588
+#: TrackPanel.cpp:5795
 msgid "Move Track Down"
 msgstr "Перемістити доріжку вниз"
 
-#: TrackPanel.cpp:561 effects/ToneGen.cpp:325
+#: TrackPanel.cpp:551 effects/ToneGen.cpp:319 prefs/GUIPrefs.cpp:154
 msgid "Waveform"
 msgstr "Хвиля"
 
-#: TrackPanel.cpp:562
+#: TrackPanel.cpp:552 prefs/GUIPrefs.cpp:155
 msgid "Waveform (dB)"
 msgstr "Хвиля (дБ)"
 
-#: TrackPanel.cpp:565
+#: TrackPanel.cpp:554 prefs/GUIPrefs.cpp:157
 msgid "Spectrum log(f)"
 msgstr "Спектр ln(f)"
 
-#: TrackPanel.cpp:567
+#. i18n-hint: short form of 'logarithm'
+#: TrackPanel.cpp:555 prefs/GUIPrefs.cpp:158
 msgid "Pitch (EAC)"
 msgstr "Висота тону (EAC)"
 
-#: TrackPanel.cpp:569 TrackPanel.cpp:6091
+#: TrackPanel.cpp:557 TrackPanel.cpp:6135
 msgid "Mono"
 msgstr "Моно"
 
-#: TrackPanel.cpp:570 TrackPanel.cpp:6090
+#: TrackPanel.cpp:558 TrackPanel.cpp:6134
 msgid "Left Channel"
 msgstr "Лівий канал"
 
-#: TrackPanel.cpp:571 TrackPanel.cpp:6090
+#: TrackPanel.cpp:559 TrackPanel.cpp:6134
 msgid "Right Channel"
 msgstr "Правий канал"
 
-#: TrackPanel.cpp:572
+#: TrackPanel.cpp:560
 msgid "Make Stereo Track"
 msgstr "Зробити доріжку стереофонічною"
 
-#: TrackPanel.cpp:573
+#: TrackPanel.cpp:561
 msgid "Split Stereo Track"
 msgstr "Розділити стерео-доріжку"
 
-#: TrackPanel.cpp:575
+#: TrackPanel.cpp:563
 msgid "Set Sample Format"
 msgstr "Встановити формат семплу"
 
-#: TrackPanel.cpp:577 TrackPanel.cpp:6320
+#: TrackPanel.cpp:565 TrackPanel.cpp:6380
 msgid "Set Rate"
 msgstr "Встановити частоту дискретизації"
 
-#: TrackPanel.cpp:585
+#: TrackPanel.cpp:573
 msgid "Up Octave"
 msgstr "Октавою вище"
 
-#: TrackPanel.cpp:586
+#: TrackPanel.cpp:574
 msgid "Down Octave"
 msgstr "Октавою нижче"
 
-#: TrackPanel.cpp:591
+#: TrackPanel.cpp:579 TrackPanel.cpp:5792
 msgid "Font..."
 msgstr "Шрифт..."
 
-#: TrackPanel.cpp:602
+#: TrackPanel.cpp:590
 msgid "Set Range..."
 msgstr "Встановити діапазон..."
 
-#: TrackPanel.cpp:606 toolbars/EditToolBar.cpp:135
+#: TrackPanel.cpp:594 toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Копіювати"
 
-#: TrackPanel.cpp:1272
+#: TrackPanel.cpp:1263
 msgid ""
 "Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
 "particular zoom region."
@@ -3806,329 +4035,329 @@ msgstr ""
 "віддалення, перетягування з натиснутою кнопкою - для виділення області "
 "масштабування."
 
-#: TrackPanel.cpp:1277
+#: TrackPanel.cpp:1268
 msgid "Drag the label vertically to change the order of the tracks."
 msgstr "Щоб змінити порядок представлення доріжок, перетягніть цю доріжку вгору/вниз."
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1288
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr ""
 "Клацніть та перетягніть позначку для коригування відносного розміру стерео-"
 "доріжок."
 
-#: TrackPanel.cpp:1300
+#: TrackPanel.cpp:1291
 msgid "Click and drag to resize the track."
 msgstr "Клацніть та перетягніть для зміни розміру доріжки."
 
-#: TrackPanel.cpp:1331
+#: TrackPanel.cpp:1322
 msgid "Drag one or more label boundaries"
 msgstr "Перетягнути одну чи більше меж позначок"
 
-#: TrackPanel.cpp:1332
+#: TrackPanel.cpp:1323
 msgid "Drag label boundary"
 msgstr "Перетягнути межу позначки"
 
 #. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1348
+#: TrackPanel.cpp:1339
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr ""
 "Універсальний інструмент: натисніть Cmd-, для налаштовування миші та "
 "клавіатури"
 
 #. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1351
+#: TrackPanel.cpp:1342
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr ""
 "Універсальний інструмент: натисніть Ctrl-P, для налаштовування миші та "
 "клавіатури"
 
-#: TrackPanel.cpp:1371
+#: TrackPanel.cpp:1388
 msgid "Click and drag to move left selection boundary."
 msgstr "Клацніть та перетягніть для переміщення лівої межі виділеної ділянки."
 
-#: TrackPanel.cpp:1376
+#: TrackPanel.cpp:1393
 msgid "Click and drag to move right selection boundary."
 msgstr "Клацніть та перетягніть для переміщення правої межі виділеної ділянки."
 
-#: TrackPanel.cpp:1702 TrackPanel.cpp:3993 TrackPanel.cpp:4025
-#: TrackPanel.cpp:4280 TrackPanel.cpp:6432 TrackPanel.cpp:6452
+#: TrackPanel.cpp:1735 TrackPanel.cpp:3964 TrackPanel.cpp:3996
+#: TrackPanel.cpp:4260 TrackPanel.cpp:6529 TrackPanel.cpp:6549
 msgid "Modified Label"
 msgstr "Позначка змінена"
 
-#: TrackPanel.cpp:1703 TrackPanel.cpp:3994 TrackPanel.cpp:4026
-#: TrackPanel.cpp:4281 TrackPanel.cpp:6433 TrackPanel.cpp:6453
+#: TrackPanel.cpp:1736 TrackPanel.cpp:3965 TrackPanel.cpp:3997
+#: TrackPanel.cpp:4261 TrackPanel.cpp:6530 TrackPanel.cpp:6550
 msgid "Label Edit"
 msgstr "Правка позначки"
 
-#: TrackPanel.cpp:1930
+#: TrackPanel.cpp:1976
 msgid "Adjusted envelope."
 msgstr "Обвідна скорегована."
 
-#: TrackPanel.cpp:1931 prefs/MousePrefs.cpp:115
+#: TrackPanel.cpp:1977 prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Обвідна"
 
-#: TrackPanel.cpp:2082
+#: TrackPanel.cpp:2128
 msgid "Moved clip to another track"
 msgstr "Область переміщено до іншої доріжки"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2132
 msgid "left"
 msgstr "лівий"
 
-#: TrackPanel.cpp:2086
+#: TrackPanel.cpp:2132
 msgid "right"
 msgstr "правий"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2088
+#: TrackPanel.cpp:2134
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr "Доріжку/область зміщено на %s %.02f секунд"
 
-#: TrackPanel.cpp:2092 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
+#: TrackPanel.cpp:2138 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "Зсув у часі"
 
-#: TrackPanel.cpp:2953
+#: TrackPanel.cpp:2921
 msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
 msgstr "Щоб використати Малювання, виберіть \"Форму хвилі\" у спадному меню доріжки."
 
-#: TrackPanel.cpp:2970
+#: TrackPanel.cpp:2938
 msgid "To use Draw, zoom in further until you can see the individual samples."
 msgstr ""
 "Щоб використати Малювання, збільшуйте частину доріжки, аж доки не побачите "
 "окремі фрагменти."
 
-#: TrackPanel.cpp:3241
+#: TrackPanel.cpp:3210
 msgid "Moved Sample"
 msgstr "Семпл переміщено"
 
-#: TrackPanel.cpp:3242
+#: TrackPanel.cpp:3211
 msgid "Sample Edit"
 msgstr "Правка семплу"
 
-#: TrackPanel.cpp:3341
+#: TrackPanel.cpp:3310
 #, c-format
 msgid "Removed track '%s.'"
 msgstr "Вилучено доріжку '%s.'"
 
-#: TrackPanel.cpp:3343
+#: TrackPanel.cpp:3312
 msgid "Track Remove"
 msgstr "Вилучити доріжку"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3453
 msgid "Moved gain slider"
 msgstr "Регулятор рівня переміщено"
 
-#: TrackPanel.cpp:3484
+#: TrackPanel.cpp:3453
 msgid "Moved pan slider"
 msgstr "Регулятор панорами переміщено"
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5726 TrackPanel.cpp:7149
+#: TrackPanel.cpp:3454 TrackPanel.cpp:5700 TrackPanel.cpp:7253
 msgid "Gain"
 msgstr "Гучність"
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3485 TrackPanel.cpp:5664 TrackPanel.cpp:7156
+#: TrackPanel.cpp:3454 TrackPanel.cpp:5638 TrackPanel.cpp:7260
 msgid "Pan"
 msgstr "Панорама"
 
-#: TrackPanel.cpp:3610 TrackPanel.cpp:6385 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3581 TrackPanel.cpp:6480
 msgid "up"
 msgstr "вгору"
 
-#: TrackPanel.cpp:3614 TrackPanel.cpp:6386 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3585 TrackPanel.cpp:6481
 msgid "down"
 msgstr "вниз"
 
-#: TrackPanel.cpp:3621 TrackPanel.cpp:6381
+#: TrackPanel.cpp:3592 TrackPanel.cpp:6476
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "Переміщено '%s' %s"
 
-#: TrackPanel.cpp:3624 TrackPanel.cpp:6387
+#: TrackPanel.cpp:3595 TrackPanel.cpp:6482
 msgid "Move Track"
 msgstr "Перемістити доріжку"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4160
 msgid "Expand"
 msgstr "Розгорнути"
 
-#: TrackPanel.cpp:4180
+#: TrackPanel.cpp:4160
 msgid "Expanded Cut Line"
 msgstr "Розширена лінія розрізу"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4169
 msgid "Merge"
 msgstr "Об'єднати"
 
-#: TrackPanel.cpp:4189
+#: TrackPanel.cpp:4169
 msgid "Merged Clips"
 msgstr "Об'єднані фрагменти"
 
-#: TrackPanel.cpp:4201
+#: TrackPanel.cpp:4181
 msgid "Removed Cut Line"
 msgstr "Вилучено лінію розрізу"
 
-#: TrackPanel.cpp:5664
+#: TrackPanel.cpp:5638
 msgid "Adjusted Pan"
 msgstr "Панорамування скореговано"
 
-#: TrackPanel.cpp:5726
+#: TrackPanel.cpp:5700
 msgid "Adjusted gain"
 msgstr "Підсилення скореговано"
 
-#: TrackPanel.cpp:5918
+#: TrackPanel.cpp:5796
+msgid "Group with Wave Track"
+msgstr "Згрупувати з доріжкою Wave"
+
+#: TrackPanel.cpp:5797
+msgid "Clear any grouping"
+msgstr "Вилучити будь-яке групування"
+
+#: TrackPanel.cpp:5962
 msgid "Can't delete track with active audio"
 msgstr "Неможливо вилучити доріжку з активним аудіо"
 
-#: TrackPanel.cpp:6071
+#: TrackPanel.cpp:6115
 msgid "Stereo, "
 msgstr "Стерео, "
 
-#: TrackPanel.cpp:6074
+#: TrackPanel.cpp:6118
 msgid "Mono, "
 msgstr "Моно, "
 
-#: TrackPanel.cpp:6076
+#: TrackPanel.cpp:6120
 msgid "Left, "
 msgstr "Лівий, "
 
-#: TrackPanel.cpp:6078
+#: TrackPanel.cpp:6122
 msgid "Right, "
 msgstr "Правий, "
 
-#: TrackPanel.cpp:6100 TrackPanel.cpp:6225
+#: TrackPanel.cpp:6144 TrackPanel.cpp:6290
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "'%s' змінено на %s"
 
-#: TrackPanel.cpp:6105
+#: TrackPanel.cpp:6149
 msgid "Channel"
 msgstr "Канал"
 
-#: TrackPanel.cpp:6118
+#: TrackPanel.cpp:6170
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "Розділити стерео-доріжку '%s'"
 
-#: TrackPanel.cpp:6139
+#: TrackPanel.cpp:6208
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "Зробити '%s' стерео-доріжку"
 
-#: TrackPanel.cpp:6142
+#: TrackPanel.cpp:6211
 msgid "Make Stereo"
 msgstr "Зробити стереофонічною"
 
-#: TrackPanel.cpp:6189
+#: TrackPanel.cpp:6254
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "'%s' змінено на %d Гц"
 
-#: TrackPanel.cpp:6191
+#: TrackPanel.cpp:6256
 msgid "Rate Change"
 msgstr "Змінити частоту"
 
-#: TrackPanel.cpp:6229
+#: TrackPanel.cpp:6294
 msgid "Format Change"
 msgstr "Зміна формату"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Введіть частоту у Гц (за секунду) від 1 до 100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Неправильна частота."
-
-#: TrackPanel.cpp:6349
+#: TrackPanel.cpp:6444
 msgid "Change lower speed limit (%) to:"
 msgstr "Змінити нижню межу швидкості (%) на:"
 
-#: TrackPanel.cpp:6350 TrackPanel.cpp:6351
+#: TrackPanel.cpp:6445 TrackPanel.cpp:6446
 msgid "Lower speed limit"
 msgstr "Межа зниження швидкості"
 
-#: TrackPanel.cpp:6356
+#: TrackPanel.cpp:6451
 msgid "Change upper speed limit (%) to:"
 msgstr "Змінити верхню межу швидкості (%) на:"
 
-#: TrackPanel.cpp:6357 TrackPanel.cpp:6358
+#: TrackPanel.cpp:6452 TrackPanel.cpp:6453
 msgid "Upper speed limit"
 msgstr "Верхня межа швидкості"
 
-#: TrackPanel.cpp:6366
+#: TrackPanel.cpp:6461
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Встановити межу як '%d' - '%d'"
 
-#: TrackPanel.cpp:6369
+#: TrackPanel.cpp:6464
 msgid "Set Range"
 msgstr "Встановити діапазон"
 
-#: TrackPanel.cpp:6414
+#: TrackPanel.cpp:6511
 msgid "Change track name to:"
 msgstr "Змінити назву доріжки на:"
 
-#: TrackPanel.cpp:6415
+#: TrackPanel.cpp:6512
 msgid "Track Name"
 msgstr "Назва доріжки"
 
-#: TrackPanel.cpp:6418
+#: TrackPanel.cpp:6515
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "Назву змінено з '%s' на '%s'"
 
-#: TrackPanel.cpp:6421
+#: TrackPanel.cpp:6518
 msgid "Name Change"
 msgstr "Зміна назви"
 
-#: TrackPanel.cpp:6487
+#: TrackPanel.cpp:6619
 msgid "Label Track Font"
 msgstr "Шрифт доріжки для позначок"
 
-#: TrackPanel.cpp:6499
+#: TrackPanel.cpp:6631 TrackPanel.cpp:6637
 msgid "Face name"
 msgstr "Назва шрифту"
 
-#: TrackPanel.cpp:6508
+#: TrackPanel.cpp:6641 TrackPanel.cpp:6648
 msgid "Face size"
 msgstr "Розмір шрифту"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7180
 msgid "Mute"
 msgstr "Тиша"
 
-#: TrackPanel.cpp:7076
+#: TrackPanel.cpp:7180
 msgid "Solo"
 msgstr "Соло"
 
-#: TrackPanelAx.cpp:265
+#: TrackPanelAx.cpp:273
 msgid "TrackView"
 msgstr "ПереглядДоріжки"
 
-#: TrackPanelAx.cpp:273
+#: TrackPanelAx.cpp:281
 msgid "Track Accessible out of sync"
 msgstr "Доріжка доступна поза sync"
 
-#: TrackPanelAx.cpp:281
+#: TrackPanelAx.cpp:289
 #, c-format
 msgid "Track %d"
 msgstr "Доріжка %d"
 
-#: TrackPanelAx.cpp:287
+#: TrackPanelAx.cpp:295
 msgid " Mute On"
 msgstr "Тихо"
 
-#: TrackPanelAx.cpp:292
+#: TrackPanelAx.cpp:300
 msgid " Solo On"
 msgstr " Соло увімкнено"
 
-#: TrackPanelAx.cpp:296
+#: TrackPanelAx.cpp:304
 msgid " Select On"
 msgstr " Вибір увімкнено"
 
@@ -4155,33 +4384,33 @@ msgstr "Змін знаку        — в середньому: %1.4f  пд: (%1
 msgid "Direction Changes  -- mean: %1.4f  sd: (%1.4f)\n"
 msgstr "Змін напрямку  — в середньому: %1.4f  пд: (%1.4f)\n"
 
-#: WaveTrack.cpp:85
+#: WaveTrack.cpp:88
 msgid "Audio Track"
 msgstr "Доріжка"
 
-#: WaveTrack.cpp:555 WaveTrack.cpp:574
+#: WaveTrack.cpp:597 WaveTrack.cpp:616 WaveTrack.cpp:1057 WaveTrack.cpp:1076
 msgid "There is not enough room available to paste the selection"
 msgstr "Не вистачає місця для вставки виділеного фрагменту"
 
-#: WaveTrack.cpp:1688
+#: WaveTrack.cpp:2086
 msgid "There is not enough room available to expand the cut line"
 msgstr "Недостатньо простору для поширення лінії вирізання"
 
-#: commands/CommandManager.cpp:448
+#: commands/CommandManager.cpp:518
 #, c-format
 msgid "Plugins 1 to %i"
 msgstr "Модулі від 1 до %i"
 
-#: commands/CommandManager.cpp:462
+#: commands/CommandManager.cpp:532
 #, c-format
 msgid "Plugins %i to %i"
 msgstr "Модулі від %i до %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
-msgstr "З якоїсь причини заборонено.  Спробуйте спочатку виділити області звуку?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
+msgstr "З певної причини заборонено. Може спочатку спробуєте виділити область зі звуком?"
 
-#: commands/CommandManager.cpp:781
+#: commands/CommandManager.cpp:861
 msgid ""
 "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
@@ -4189,7 +4418,7 @@ msgstr ""
 "Ви можете виконувати це лише коли відтворення і запис\n"
 " зупинено.  [Призупинення недостатньо.]"
 
-#: commands/CommandManager.cpp:783
+#: commands/CommandManager.cpp:863
 msgid ""
 "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
@@ -4197,11 +4426,11 @@ msgstr ""
 "Спочатку слід виділити область стерео-звуку.  [Цю дію не можна "
 "використовувати для моно.]"
 
-#: commands/CommandManager.cpp:785
+#: commands/CommandManager.cpp:865
 msgid "You must first select some audio for this to use."
 msgstr "Спочатку слід виділити область звуку."
 
-#: commands/CommandManager.cpp:787
+#: commands/CommandManager.cpp:867
 msgid ""
 "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
@@ -4209,16 +4438,16 @@ msgstr ""
 "Спочатку треба виділити область звуку.\n"
 "[Вибір інших типів доріжки не підійде.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Повідомлення"
+#: commands/CommandManager.cpp:872
+msgid "Disallowed"
+msgstr "Заборонено"
 
-#: commands/CommandManager.cpp:972
+#: commands/CommandManager.cpp:1054
 #, c-format
 msgid "Loaded %d keyboard shortcuts\n"
 msgstr "Завантажено %d комбінацій клавіш\n"
 
-#: commands/CommandManager.cpp:974
+#: commands/CommandManager.cpp:1056
 msgid "Loading keyboard shortcuts"
 msgstr "Завантажуються комбінації клавіш"
 
@@ -4227,35 +4456,40 @@ msgstr "Завантажуються комбінації клавіш"
 msgid "Applied effect: %s %.1f dB"
 msgstr "Застосовано ефект: %s %.1f дБ"
 
-#: effects/Amplify.cpp:87
+#: effects/Amplify.cpp:139
 msgid "Amplify"
 msgstr "Підсилення сигналу"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Підсилення сигналу - Домінік Маццоні"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr "Домінік Маццоні"
 
-#: effects/Amplify.cpp:159
+#: effects/Amplify.cpp:168
 msgid "Amplification (dB):"
 msgstr "Підсилення (дБ):"
 
-#: effects/Amplify.cpp:179
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr "Підсилення (дБ)"
+
+#: effects/Amplify.cpp:190
 msgid "New Peak Amplitude (dB):"
 msgstr "Нова пікова амплітуда (дБ):"
 
-#: effects/Amplify.cpp:191
+#: effects/Amplify.cpp:200
 msgid "Allow clipping"
 msgstr "Дозволити зрізання"
 
-#: effects/Amplify.cpp:237 effects/Amplify.cpp:287 effects/Amplify.cpp:353
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
 msgid "-Infinity"
 msgstr "-Нескінченність"
 
-#: effects/Amplify.h:46
+#: effects/Amplify.h:37
 msgid "Amplify..."
 msgstr "Підсилення сигналу..."
 
-#: effects/Amplify.h:54
+#: effects/Amplify.h:51
 msgid "Amplifying"
 msgstr "Триває підсилення сигналу"
 
@@ -4295,9 +4529,12 @@ msgstr "Максимальна пауза:"
 #. i18n-hint: Name of time display format that shows time in seconds
 #: effects/AutoDuck.cpp:494 effects/AutoDuck.cpp:499 effects/AutoDuck.cpp:504
 #: effects/AutoDuck.cpp:509 effects/AutoDuck.cpp:514
-#: prefs/AudioIOPrefs.cpp:166 prefs/AudioIOPrefs.cpp:174
-#: prefs/AudioIOPrefs.cpp:176 prefs/AudioIOPrefs.cpp:201
-#: prefs/AudioIOPrefs.cpp:203 widgets/TimeTextCtrl.cpp:263
+#: prefs/AudioIOPrefs.cpp:173 prefs/AudioIOPrefs.cpp:181
+#: prefs/AudioIOPrefs.cpp:183 prefs/AudioIOPrefs.cpp:208
+#: prefs/AudioIOPrefs.cpp:210 prefs/MidiIOPrefs.cpp:161
+#: prefs/MidiIOPrefs.cpp:163 prefs/MidiIOPrefs.cpp:187
+#: prefs/MidiIOPrefs.cpp:189 prefs/MidiIOPrefs.cpp:197
+#: widgets/TimeTextCtrl.cpp:263
 msgid "seconds"
 msgstr "секунд"
 
@@ -4317,7 +4554,7 @@ msgstr "Внутрішня довжина згасання:"
 msgid "Inner fade up length:"
 msgstr "Внутрішня довжина наростання:"
 
-#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:484
+#: effects/AutoDuck.cpp:521 effects/Compressor.cpp:494
 msgid "Threshold:"
 msgstr "Поріг:"
 
@@ -4325,22 +4562,21 @@ msgstr "Поріг:"
 msgid "Please enter valid values."
 msgstr "Введіть коректні значення."
 
-#: effects/AutoDuck.cpp:704
+#: effects/AutoDuck.cpp:705
 msgid "Preview not available"
 msgstr "Попереднє прослуховування недоступне"
 
-#: effects/AutoDuck.h:97
+#: effects/AutoDuck.h:98
 msgid "Auto Duck..."
 msgstr "Приглушення музики..."
 
-#: effects/AutoDuck.h:107
+#: effects/AutoDuck.h:115
 msgid "Processing Auto Duck..."
 msgstr "Приглушення музики..."
 
-#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:448
-#: effects/audiounits/AudioUnitEffect.cpp:877 effects/nyquist/Nyquist.cpp:1042
-#: widgets/ErrorDialog.cpp:79 widgets/ErrorDialog.cpp:105
-#: widgets/Warning.cpp:67
+#: effects/AvcCompressor.cpp:738 effects/VST/VSTEffect.cpp:455
+#: effects/audiounits/AudioUnitEffect.cpp:882 effects/nyquist/Nyquist.cpp:1053
+#: widgets/ErrorDialog.cpp:101
 msgid "OK"
 msgstr "Гаразд"
 
@@ -4353,23 +4589,31 @@ msgstr "Застосовано ефект : %s частота = %.0f Гц, пі
 msgid "Bass Boost"
 msgstr "Підсилення басів"
 
-#: effects/BassBoost.cpp:182
+#: effects/BassBoost.cpp:182 effects/Phaser.cpp:219 effects/Wahwah.cpp:214
 msgid "by Nasca Octavian Paul"
 msgstr "Автор - Nasca Octavian Paul"
 
-#: effects/BassBoost.cpp:196
+#: effects/BassBoost.cpp:196 effects/ChangePitch.cpp:322
 msgid "Frequency (Hz):"
 msgstr "Частота (Гц):"
 
-#: effects/BassBoost.cpp:208
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr "Частота (Гц)"
+
+#: effects/BassBoost.cpp:209
 msgid "Boost (dB):"
 msgstr "Підвищення (дБ):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr "Підвищення (дБ)"
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Підсилення низьких частот..."
 
-#: effects/BassBoost.h:43
+#: effects/BassBoost.h:49
 msgid "Boosting Bass Frequencies"
 msgstr "Підвищення низьких частот"
 
@@ -4386,250 +4630,603 @@ msgstr "Зміна тривалості..."
 msgid "Applied effect: %s %.2f semitones"
 msgstr "Застосовано ефект: %s %.2f півтонів"
 
-#: effects/ChangePitch.cpp:118
+#: effects/ChangePitch.cpp:198
 msgid "Change Pitch"
 msgstr "Зміна висоти тону"
 
-#: effects/ChangePitch.cpp:247
+#: effects/ChangePitch.cpp:256
 msgid "Change Pitch without Changing Tempo"
 msgstr "Змінити висоту тону не змінюючи темп"
 
-#. i18n-hint: && in here is an escape character to get a single & on
-#. * screen, so keep it as is
-#: effects/ChangePitch.cpp:254 effects/ChangeSpeed.cpp:313
-#: effects/ChangeTempo.cpp:180
+#: effects/ChangePitch.cpp:258 effects/ChangeSpeed.cpp:336
+#: effects/ChangeTempo.cpp:176
 msgid "by Vaughan Johnson && Dominic Mazzoni"
 msgstr "Автори — Vaughan Johnson та Dominic Mazzoni"
 
-#: effects/ChangePitch.cpp:259 effects/ChangeTempo.cpp:185
+#: effects/ChangePitch.cpp:260 effects/ChangeTempo.cpp:178
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "з використанням SoundTouch, автор Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Висота тону:    від"
+msgid "Pitch:"
+msgstr "Тональність:"
 
-#: effects/ChangePitch.cpp:291 effects/ChangePitch.cpp:337
-#: effects/ChangeSpeed.cpp:377 effects/ChangeTempo.cpp:239
-#: effects/ChangeTempo.cpp:270
-msgid "to"
-msgstr "до"
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr "Від:"
 
-#: effects/ChangePitch.cpp:306
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr "Від висоти тону"
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr "Вгору"
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr "Вниз"
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr "До:"
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr "До висоти тону"
+
+#: effects/ChangePitch.cpp:311
 msgid "Semitones (half-steps):"
 msgstr "Півтонів (half-steps):"
 
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Частота (Гц):   від"
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr "Півтонів (у півкроках)"
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr "з"
 
-#: effects/ChangePitch.cpp:360 effects/ChangeSpeed.cpp:331
-#: effects/ChangeTempo.cpp:198
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr "З частоти у Герцах"
+
+#: effects/ChangePitch.cpp:331 effects/ChangeSpeed.cpp:374
+#: effects/ChangeTempo.cpp:214 effects/ChangeTempo.cpp:227
+msgid "to"
+msgstr "до"
+
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr "До частоти у Герцах"
+
+#: effects/ChangePitch.cpp:338 effects/ChangeSpeed.cpp:347
+#: effects/ChangeTempo.cpp:187
 msgid "Percent Change:"
 msgstr "Відсоток змін:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr "Зміна у відсотках"
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Зміна висоти тону..."
 
-#: effects/ChangePitch.h:39
+#: effects/ChangePitch.h:46
 msgid "Changing Pitch"
 msgstr "Змінюється висота тону"
 
-#: effects/ChangeSpeed.cpp:53 effects/ChangeTempo.cpp:55
+#: effects/ChangeSpeed.cpp:54 effects/ChangeTempo.cpp:55
 #, c-format
 msgid "Applied effect: %s %.1f%%"
 msgstr "Застосовано ефект: %s %.1f%%"
 
-#: effects/ChangeSpeed.cpp:60
+#: effects/ChangeSpeed.cpp:298
 msgid "Change Speed"
 msgstr "Зміна швидкості"
 
-#: effects/ChangeSpeed.cpp:308
+#. i18n-hint: n/a is an English abbreviation meaning "not applicable"
+#. (in other words, unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:329
+msgid "n/a"
+msgstr "не вказано"
+
+#: effects/ChangeSpeed.cpp:334
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Змінити швидкість, впливаючи на темп та висоту тону"
 
-#: effects/ChangeSpeed.cpp:318
+#: effects/ChangeSpeed.cpp:338
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "з використанням бібліотеки SampleRate, автор Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "не вказано"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr "Стандартне значення об/хв. платівки:"
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Стандартне значення об/хв. платівки:   від"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr "З об./хв."
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr "До об./хв."
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
 msgstr "Зміна швидкості..."
 
-#: effects/ChangeSpeed.h:40
+#: effects/ChangeSpeed.h:46
 msgid "Changing Speed"
 msgstr "Змінюється швидкість"
 
-#: effects/ChangeTempo.cpp:74
+#: effects/ChangeTempo.cpp:141
 msgid "Change Tempo"
 msgstr "Зміна темпу"
 
-#: effects/ChangeTempo.cpp:175
+#: effects/ChangeTempo.cpp:174
 msgid "Change Tempo without Changing Pitch"
 msgstr "Зміна темпу, не змінюючи висоту тону"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Ударів за хвилину (BPM): від"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr "Тактів на хвилину (BPM):"
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr "За тактами на хвилину"
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Тривалість (секунд):   від"
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr "До тактів на хвилину"
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr "Тривалість (секунд):"
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr "Від позначки (секунд)"
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr "До позначки (секунд)"
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
 msgstr "Зміна темпу..."
 
-#: effects/ChangeTempo.h:43
+#: effects/ChangeTempo.h:49
 msgid "Changing Tempo"
 msgstr "Змінюється темп"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr "Вилучення клацання"
 
-#: effects/ClickRemoval.cpp:336
+#: effects/ClickRemoval.cpp:327
 msgid "Click and Pop Removal by Craig DeForest"
 msgstr "Вилучення клацання та тріску, автор Craig DeForest"
 
-#: effects/ClickRemoval.cpp:350
+#: effects/ClickRemoval.cpp:341
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Оберіть поріг (нижче значення більш чутливе):"
 
-#: effects/ClickRemoval.cpp:362
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr "Обрати порогове значення"
+
+#: effects/ClickRemoval.cpp:354
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Макс. ширина піку (вище значення більш чутливе):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr "Максимальна ширина піка"
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Вилучення клацання..."
 
-#: effects/ClickRemoval.h:50
+#: effects/ClickRemoval.h:56
 msgid "Removing clicks and pops..."
 msgstr "Вилучається тріск та клацання..."
 
-#: effects/Compressor.cpp:74
+#: effects/Compressor.cpp:461
 msgid "Dynamic Range Compressor"
 msgstr "Компресор динамічного діапазону"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Компресор динамічного діапазону - Домінік Маццоні"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr "Порогове значення"
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Коефіцієнт: "
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr "Коефіцієнт:"
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr "Коефіцієнт"
+
+#: effects/Compressor.cpp:510
+msgid "Attack Time:"
 msgstr "Час наростання:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
-msgstr "Час згасання: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr "Час наростання"
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr "Час спадання:"
 
-#: effects/Compressor.cpp:516
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr "Час спадання"
+
+#: effects/Compressor.cpp:530
 msgid "Normalize to 0dB after compressing"
 msgstr "Нормалізувати до 0dB після стискання"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+msgid "Threshold %d dB"
 msgstr "Поріг: %d дБ"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
+msgid "%3d dB"
+msgstr "%3d дБ"
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
 msgstr "Коефіцієнт: %.0f:1"
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr "%.0f:1"
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.1f:1"
+msgid "Ratio %.1f to 1"
 msgstr "Коефіцієнт: %.1f:1"
 
-#: effects/Compressor.cpp:568
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.1f:1"
+msgstr "%.1f:1"
+
+#: effects/Compressor.cpp:575
+#, c-format
+msgid "Attack Time %.1f secs"
 msgstr "Час наростання: %.1f секунд"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr "%.1f секунд"
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr "Час згасання: %.1f секунд"
 
 #: effects/Compressor.h:36
 msgid "Compressor..."
 msgstr "Компресор..."
 
-#: effects/Compressor.h:44
+#: effects/Compressor.h:50
 msgid "Applying Dynamic Range Compression..."
 msgstr "Застосовується компресія динамічного діапазону..."
 
-#: effects/DtmfGen.cpp:48
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr "Передній план для інструменту контрасту"
+
+#: effects/Contrast.cpp:79
+msgid ""
+"Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+"Обрано ділянку переднього плану.\n"
+"Тепер вам слід обрати тло і скористатися комбінацією клавіш Ctrl+Shift+T або пунктом меню знову."
+
+#: effects/Contrast.cpp:127
+msgid ""
+"Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+"Час початку розташовано після часу завершення!\n"
+"Будь ласка, перегляньте вибрані значення."
+
+#: effects/Contrast.cpp:137
+msgid ""
+"Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+"Обрано некоректні значення часу!\n"
+"Будь ласка, виправте їх."
+
+#: effects/Contrast.cpp:190
+msgid "Hello.\n"
+msgstr "Привіт.\n"
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr "Аналізатор звукового контрасту WCAG2"
+
+#: effects/Contrast.cpp:277 effects/Contrast.cpp:288 effects/Contrast.cpp:371
+#: effects/Contrast.cpp:415
+msgid "Measured"
+msgstr "Виміряний"
+
+#: effects/Contrast.cpp:318
+msgid "Contrast Analyzer"
+msgstr "Аналізатор контрасту"
+
+#: effects/Contrast.cpp:321
+msgid "Parameters"
+msgstr "Параметри"
+
+#: effects/Contrast.cpp:328 effects/ToneGen.cpp:356
+#: toolbars/ControlToolBar.cpp:186
+msgid "Start"
+msgstr "Початок"
+
+#: effects/Contrast.cpp:329 effects/ToneGen.cpp:357
+#: toolbars/ControlToolBar.cpp:189 toolbars/SelectionBar.cpp:156
+#: toolbars/SelectionBar.cpp:159 toolbars/SelectionBar.cpp:262
+msgid "End"
+msgstr "Кінець"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr "Гучність   "
+
+#: effects/Contrast.cpp:335
+msgid "Foreground:"
+msgstr "Передній план:"
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr "Час початку переднього плану"
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr "Час завершення переднього плану"
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr "Використати вибране"
+
+#: effects/Contrast.cpp:378
+msgid "Background:"
+msgstr "Тло:"
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr "Час початку тла"
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr "Час завершення тла"
+
+#: effects/Contrast.cpp:426
+msgid "Result"
+msgstr "Результат"
+
+#: effects/Contrast.cpp:430
+msgid "Contrast Result:"
+msgstr "Результат контрасту:"
+
+#: effects/Contrast.cpp:433
+msgid "Reset"
+msgstr "Відновити"
+
+#: effects/Contrast.cpp:434
+msgid "Difference:"
+msgstr "Різниця:"
+
+#: effects/Contrast.cpp:445
+msgid "Information"
+msgstr "Інформація"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr "Для вимірювання відносної різниці у гучності між двома ділянками звукової доріжки."
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr "Довідка щодо аналізатора контрасту звуку WCAG2"
+
+#: effects/Contrast.cpp:452 toolbars/ControlToolBar.cpp:83
+msgid "Control"
+msgstr "Контроль"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr "Зауваження: натискання кнопки «Гаразд» скидає значення часу."
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr "Закрити, але зберегти час"
+
+#: effects/Contrast.cpp:466 effects/Contrast.cpp:472 effects/Contrast.cpp:478
+#: effects/Contrast.cpp:484
+msgid "Measure"
+msgstr "Виміряти"
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr "Немає переднього плану для вимірювання"
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr "Виміряний рівень переднього плану"
+
+#: effects/Contrast.cpp:517 effects/Contrast.cpp:527
+#, c-format
+msgid "%.1f dB"
+msgstr "%.1f дБ"
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr "Немає тла для вимірювання"
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr "Виміряний рівень тла"
+
+#: effects/Contrast.cpp:532
+msgid "WCAG2 Pass"
+msgstr "WCAG2 пройдено"
+
+#: effects/Contrast.cpp:534
+msgid "WCAG2 Fail"
+msgstr "Помилка WCAG2"
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr "Поточна різниця"
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr "%.1f дБ середньоквадратичного"
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr "Будь ласка, введіть коректні значення."
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr "Експортувати результати контрасту як:"
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr "Критерій успіху 1.4.7 результатів контрасту WCAG 2.0"
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr "Назва файла = %s."
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr "Передній план"
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr "Час початку = %2d годин, %2d хвилин, %.2f секунд."
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr "Час завершення = %2d годин, %2d хвилин, %.2f секунд."
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr "Середньоквадратичне = %.1f дБ."
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr "Середньоквадратичне =  дБ."
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr "Тло"
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr "Результати"
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr "Різниця = %.1f Середньоквадратичне дБ."
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr "Критерій успіху 1.4.7 WCAG 2.0: пройдено"
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr "Критерій успіху 1.4.7 WCAG 2.0: помилка"
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr "Дані зібрано"
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr "Контраст...\tCtrl+Shift+T"
+
+#: effects/Contrast.h:52
+msgid "Measuring background"
+msgstr "Вимірювання тла"
+
+#: effects/Contrast.h:54
+msgid "Measuring foreground"
+msgstr "Вимірювання переднього плану"
+
+#: effects/DtmfGen.cpp:56
 msgid "DTMF Tone Generator"
 msgstr "Генератор тонових сигналів (DTMF)"
 
-#: effects/DtmfGen.cpp:439
+#: effects/DtmfGen.cpp:456
 msgid "by Salvo Ventura (2006)"
 msgstr "Автор - Salvo Ventura (2006)"
 
-#: effects/DtmfGen.cpp:443
+#: effects/DtmfGen.cpp:460
 msgid "DTMF sequence:"
 msgstr "Тонова послідовність:"
 
-#: effects/DtmfGen.cpp:446 effects/Noise.cpp:255 effects/ToneGen.cpp:328
-#: effects/ToneGen.cpp:365
+#: effects/DtmfGen.cpp:463 effects/Noise.cpp:242 effects/ToneGen.cpp:322
+#: effects/ToneGen.cpp:360
 msgid "Amplitude (0-1)"
 msgstr "Амплітуда (0-1)"
 
-#: effects/DtmfGen.cpp:448
+#: effects/DtmfGen.cpp:465
 msgid "Duration:"
 msgstr "Тривалість:"
 
-#: effects/DtmfGen.cpp:469
+#: effects/DtmfGen.cpp:487
 msgid "Tone/silence ratio:"
 msgstr "Відношення сигнал/тиша:"
 
-#: effects/DtmfGen.cpp:479
+#: effects/DtmfGen.cpp:497
 msgid "Duty cycle:"
 msgstr "Робочий цикл:"
 
-#: effects/DtmfGen.cpp:481
+#: effects/DtmfGen.cpp:499
 msgid "Tone duration:"
 msgstr "Тривалість тону:"
 
-#: effects/DtmfGen.cpp:482 effects/DtmfGen.cpp:484 effects/DtmfGen.cpp:560
-#: effects/DtmfGen.cpp:561
+#: effects/DtmfGen.cpp:500 effects/DtmfGen.cpp:502 effects/DtmfGen.cpp:578
+#: effects/DtmfGen.cpp:579
 msgid "ms"
 msgstr "мс"
 
-#: effects/DtmfGen.cpp:483
+#: effects/DtmfGen.cpp:501
 msgid "Silence duration:"
 msgstr "Тривалість тиші:"
 
-#: effects/DtmfGen.h:41
+#: effects/DtmfGen.h:39
 msgid "DTMF Tones..."
 msgstr "Тонові сигнали телефону..."
 
-#: effects/DtmfGen.h:49
+#: effects/DtmfGen.h:53
 #, c-format
 msgid "Applied effect: Generate DTMF tones, %.6lf seconds"
 msgstr "Застосований ефект: Створити тонові сигнали телефону, %.6lf секунд"
 
-#: effects/DtmfGen.h:53
+#: effects/DtmfGen.h:57
 msgid "Generating DTMF tones"
 msgstr "Створюються тонові сигнали телефону"
 
@@ -4644,7 +5241,7 @@ msgstr "Відлуння"
 
 #. i18n-hint: && in here is an escape character to get a single & on
 #. * screen, so keep it as is
-#: effects/Echo.cpp:195
+#: effects/Echo.cpp:195 effects/Repeat.cpp:199
 msgid "by Dominic Mazzoni && Vaughan Johnson"
 msgstr "Автори — Dominic Mazzoni та Vaughan Johnson"
 
@@ -4660,19 +5257,19 @@ msgstr "Коефіцієнт спадання:"
 msgid "Echo..."
 msgstr "Відлуння..."
 
-#: effects/Echo.h:42
+#: effects/Echo.h:48
 msgid "Performing Echo"
 msgstr "Застосовується ефект \"Відлуння\""
 
-#: effects/Effect.cpp:390
+#: effects/Effect.cpp:467
 msgid "Preparing preview"
 msgstr "Підготовка прослуховування"
 
-#: effects/Effect.cpp:419
+#: effects/Effect.cpp:497
 msgid "Previewing"
 msgstr "Прослуховування"
 
-#: effects/Effect.cpp:435
+#: effects/Effect.cpp:512
 msgid ""
 "Error while opening sound device. Please check the output device settings "
 "and the project sample rate."
@@ -4680,7 +5277,7 @@ msgstr ""
 "Помилка при відкриванні звукового пристрою. Перевірте параметри пристрою "
 "виводу та частоту дискретизації проекту."
 
-#: effects/Effect.h:107
+#: effects/Effect.h:100 effects/TimeScale.cpp:52
 #, c-format
 msgid "Applied effect: %s"
 msgstr "Застосовано ефект: %s"
@@ -4697,78 +5294,78 @@ msgstr "Синусоїда"
 msgid "Cubic"
 msgstr "Кубічний"
 
-#: effects/Equalization.cpp:362 effects/Equalization.cpp:412
+#: effects/Equalization.cpp:367 effects/Equalization.cpp:416
 msgid "Equalization"
 msgstr "Еквалайзер"
 
-#: effects/Equalization.cpp:980
+#: effects/Equalization.cpp:994
 msgid "Error loading EQ curve"
 msgstr "Помилка під час завантаження кривої EQ"
 
-#: effects/Equalization.cpp:1019
+#: effects/Equalization.cpp:1033
 msgid "custom"
 msgstr "інша"
 
 #. i18n-hint: && in here is an escape character to get a single &
 #. * on screen, so keep it as is
-#: effects/Equalization.cpp:1087
+#: effects/Equalization.cpp:1101
 msgid "Equalization, by Martyn Shaw && Mitch Golden"
 msgstr "Еквалайзер, від Martyn Shaw та Mitch Golden"
 
-#: effects/Equalization.cpp:1108
+#: effects/Equalization.cpp:1122
 msgid "Max dB"
 msgstr "Макс дБ"
 
-#: effects/Equalization.cpp:1110
+#: effects/Equalization.cpp:1124
 msgid "Min dB"
 msgstr "Мін дБ"
 
-#: effects/Equalization.cpp:1183
+#: effects/Equalization.cpp:1197
 msgid "kHz"
 msgstr "КГц"
 
-#: effects/Equalization.cpp:1200
+#: effects/Equalization.cpp:1214
 msgid "Draw curves"
 msgstr "Малювати криві"
 
-#: effects/Equalization.cpp:1205
+#: effects/Equalization.cpp:1219
 msgid "Graphic EQ"
 msgstr "Графічний EQ"
 
-#: effects/Equalization.cpp:1219
+#: effects/Equalization.cpp:1233
 msgid "Linear frequency scale"
 msgstr "Лінійна шкала частот"
 
-#: effects/Equalization.cpp:1228
+#: effects/Equalization.cpp:1242
 msgid "Length of filter:"
 msgstr "Тривалість фільтра:"
 
-#: effects/Equalization.cpp:1249
+#: effects/Equalization.cpp:1263
 msgid "Select curve:"
 msgstr "Обрати криву:"
 
-#: effects/Equalization.cpp:1259 effects/Equalization.cpp:2498
-#: export/ExportMultiple.cpp:826
+#: effects/Equalization.cpp:1273 effects/Equalization.cpp:2512
+#: export/ExportMultiple.cpp:899
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: effects/Equalization.cpp:1265
+#: effects/Equalization.cpp:1279
 msgid "Flat"
 msgstr "Все до нуля"
 
-#: effects/Equalization.cpp:2497
+#: effects/Equalization.cpp:2511
 msgid "Enter the desired name of the curve"
 msgstr "Введіть бажану назву кривої"
 
-#: effects/Equalization.cpp:2597
+#: effects/Equalization.cpp:2611 export/ExportFFmpegDialogs.cpp:1212
 msgid "Confirm Deletion"
 msgstr "Підтвердити вилучення"
 
-#: effects/Equalization.h:87
+#: effects/Equalization.h:84
 msgid "Equalization..."
 msgstr "Еквалайзер..."
 
-#: effects/Equalization.h:95
+#: effects/Equalization.h:98
 msgid "Performing Equalization"
 msgstr "Застосовується ефект \"Еквалайзер\""
 
@@ -4776,15 +5373,15 @@ msgstr "Застосовується ефект \"Еквалайзер\""
 msgid "Fade In"
 msgstr "Повільне наростання"
 
-#: effects/Fade.h:32
+#: effects/Fade.h:38
 msgid "Fading In"
 msgstr "Застосовується \"Повільне наростання\""
 
-#: effects/Fade.h:48
+#: effects/Fade.h:54
 msgid "Fade Out"
 msgstr "Повільне згасання"
 
-#: effects/Fade.h:56
+#: effects/Fade.h:68
 msgid "Fading Out"
 msgstr "Застосовується \"Повільне загасання\""
 
@@ -4820,7 +5417,7 @@ msgstr "Початок та кінець мають бути більшими з
 msgid "Find Clipping..."
 msgstr "Знайти зрізання..."
 
-#: effects/FindClipping.h:47
+#: effects/FindClipping.h:54
 msgid "Detecting clipping"
 msgstr "Виявлення зрізання"
 
@@ -4828,66 +5425,218 @@ msgstr "Виявлення зрізання"
 msgid "Invert"
 msgstr "Інвертування"
 
-#: effects/Invert.h:35
+#: effects/Invert.h:41
 msgid "Inverting"
 msgstr "Триває інвертування"
 
-#: effects/Leveller.cpp:52
+#: effects/Leveller.cpp:192
+msgid "Leveller"
+msgstr "Вирівнювач"
+
+#: effects/Leveller.cpp:205
 msgid "None-Skip"
 msgstr "Без-втрат"
 
-#: effects/Leveller.cpp:53
+#: effects/Leveller.cpp:206
 msgid "Light"
 msgstr "Слабка"
 
-#: effects/Leveller.cpp:54
+#: effects/Leveller.cpp:207
 msgid "Moderate"
 msgstr "Помірна"
 
-#: effects/Leveller.cpp:55
+#: effects/Leveller.cpp:208
 msgid "Heavy"
 msgstr "Сильна"
 
-#: effects/Leveller.cpp:56
+#: effects/Leveller.cpp:209
 msgid "Heavier"
 msgstr "Більше"
 
-#: effects/Leveller.cpp:57
+#: effects/Leveller.cpp:210
 msgid "Heaviest"
 msgstr "Найбільша"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Вирівнювач"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Вирівнювання, автор Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Вирівнювання тихих та голосних секцій"
+#: effects/Leveller.cpp:214 effects/TruncSilence.cpp:331
+msgid "by Lynn Allan"
+msgstr "від Lynn Allan"
 
-#: effects/Leveller.cpp:226 effects/Leveller.cpp:231
+#: effects/Leveller.cpp:224
 msgid "Degree of Leveling"
 msgstr "Ступінь вирівнювання"
 
-#: effects/Leveller.cpp:242
+#: effects/Leveller.cpp:228
+msgid "Degree of Leveling:"
+msgstr "Ступінь вирівнювання:"
+
+#: effects/Leveller.cpp:236
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Поріг шуму (Шипіння/Гудіння/Навколишній шум)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
-msgstr "Поріг для шуму: "
+#: effects/Leveller.cpp:240
+msgid "Threshold for Noise:"
+msgstr "Поріг шуму:"
 
 #: effects/Leveller.h:28
 msgid "Leveller..."
 msgstr "Вирівнювання..."
 
-#: effects/Leveller.h:36
+#: effects/Leveller.h:42
 msgid "Applying Leveller..."
 msgstr "Застосовується ефект вирівнювання..."
 
+#: effects/LoadEffects.cpp:103
+msgid "Generator"
+msgstr "Генератор"
+
+#: effects/LoadEffects.cpp:105
+msgid "Instrument"
+msgstr "Інструмент"
+
+#: effects/LoadEffects.cpp:107
+msgid "Oscillator"
+msgstr "Осцилятор"
+
+#: effects/LoadEffects.cpp:109
+msgid "Utility"
+msgstr "Інструмент"
+
+#: effects/LoadEffects.cpp:111
+msgid "Converter"
+msgstr "Перетворювач"
+
+#: effects/LoadEffects.cpp:113
+msgid "Analyser"
+msgstr "Аналізатор"
+
+#: effects/LoadEffects.cpp:115 toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Мікшер"
+
+#: effects/LoadEffects.cpp:117
+msgid "Simulator"
+msgstr "Імітатор"
+
+#: effects/LoadEffects.cpp:119
+msgid "Delay"
+msgstr "Затримка"
+
+#: effects/LoadEffects.cpp:121
+msgid "Modulator"
+msgstr "Модулятор"
+
+#: effects/LoadEffects.cpp:123
+msgid "Reverb"
+msgstr "Відлуння"
+
+#: effects/LoadEffects.cpp:125 effects/Phaser.cpp:208
+msgid "Phaser"
+msgstr "Фазер"
+
+#: effects/LoadEffects.cpp:127
+msgid "Flanger"
+msgstr "Фленджер"
+
+#: effects/LoadEffects.cpp:129
+msgid "Chorus"
+msgstr "Хор"
+
+#: effects/LoadEffects.cpp:131
+msgid "Filter"
+msgstr "Фільтр"
+
+#: effects/LoadEffects.cpp:133
+msgid "Lowpass"
+msgstr "Низькочастотний фільтр"
+
+#: effects/LoadEffects.cpp:135
+msgid "Bandpass"
+msgstr "Смуговий фільтр"
+
+#: effects/LoadEffects.cpp:137
+msgid "Highpass"
+msgstr "Високочастотний фільтр"
+
+#: effects/LoadEffects.cpp:139
+msgid "Comb"
+msgstr "Гребінка"
+
+#: effects/LoadEffects.cpp:141
+msgid "Allpass"
+msgstr "Фазовий фільтр"
+
+#: effects/LoadEffects.cpp:143
+msgid "Equaliser"
+msgstr "Еквалайзер"
+
+#: effects/LoadEffects.cpp:145
+msgid "Parametric"
+msgstr "Параметричний"
+
+#: effects/LoadEffects.cpp:147
+msgid "Multiband"
+msgstr "Багатосмуговий"
+
+#: effects/LoadEffects.cpp:149
+msgid "Spectral Processor"
+msgstr "Обробка спектру"
+
+#: effects/LoadEffects.cpp:151
+msgid "Pitch Shifter"
+msgstr "Інструмент зсуву тону"
+
+#: effects/LoadEffects.cpp:153
+msgid "Amplifier"
+msgstr "Підсилювач"
+
+#: effects/LoadEffects.cpp:155
+msgid "Distortion"
+msgstr "Викривлення"
+
+#: effects/LoadEffects.cpp:157
+msgid "Waveshaper"
+msgstr "Формування хвилі"
+
+#: effects/LoadEffects.cpp:159
+msgid "Dynamics Processor"
+msgstr "Обробник динамічного діапазону"
+
+#: effects/LoadEffects.cpp:161
+msgid "Compressor"
+msgstr "Компресор"
+
+#: effects/LoadEffects.cpp:163
+msgid "Expander"
+msgstr "Пошируювач"
+
+#: effects/LoadEffects.cpp:165
+msgid "Limiter"
+msgstr "Обмежувач"
+
+#: effects/LoadEffects.cpp:167
+msgid "Gate"
+msgstr "Прохід"
+
+#: effects/LoadEffects.cpp:200 effects/NoiseRemoval.cpp:729
+msgid "Noise Removal"
+msgstr "Вилучення шуму"
+
+#: effects/LoadEffects.cpp:202
+msgid "Pitch and Tempo"
+msgstr "Зміна тону і темпу"
+
+#: effects/LoadEffects.cpp:204
+msgid "Timeline Changer"
+msgstr "Зміна часової шкали"
+
+#: effects/LoadEffects.cpp:206
+msgid "Time"
+msgstr "Час"
+
+#: effects/LoadEffects.cpp:208
+msgid "Onsets"
+msgstr "Початки"
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Білий"
@@ -4904,7 +5653,7 @@ msgstr "Коричневий"
 msgid "Noise Generator"
 msgstr "Генератор шумів"
 
-#: effects/Noise.cpp:256
+#: effects/Noise.cpp:241
 msgid "Noise type"
 msgstr "Тип шуму"
 
@@ -4912,12 +5661,12 @@ msgstr "Тип шуму"
 msgid "Noise..."
 msgstr "Шум..."
 
-#: effects/Noise.h:49
+#: effects/Noise.h:55
 #, c-format
 msgid "Applied effect: Generate Noise, %.6lf seconds"
 msgstr "Застосований ефект: Генерувати шум, %.6lf секунд"
 
-#: effects/Noise.h:53
+#: effects/Noise.h:59
 msgid "Generating Noise"
 msgstr "Генерування шуму"
 
@@ -4934,15 +5683,11 @@ msgstr ""
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Спроба запустити \"Вилучення шуму\" без профілю шуму.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Вилучення шуму"
-
-#: effects/NoiseRemoval.cpp:813
+#: effects/NoiseRemoval.cpp:818
 msgid "Step 1"
 msgstr "Крок 1"
 
-#: effects/NoiseRemoval.cpp:814
+#: effects/NoiseRemoval.cpp:819
 msgid ""
 "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
@@ -4950,11 +5695,11 @@ msgstr ""
 "Оберіть декілька секунд чистого шуму, щоб Audacity знала що фільтрувати,\n"
 "а потім натисніть кнопку Отримати профіль шуму:"
 
-#: effects/NoiseRemoval.cpp:815
+#: effects/NoiseRemoval.cpp:820
 msgid "Step 2"
 msgstr "Крок 2"
 
-#: effects/NoiseRemoval.cpp:816
+#: effects/NoiseRemoval.cpp:821
 msgid ""
 "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
@@ -4962,35 +5707,47 @@ msgstr ""
 "Виділіть частину доріжки, до якої слід застосувати фільтр, оберіть ступінь\n"
 "фільтрації шуму, а потім натисніть 'Гаразд' щоб вилучити шум.\n"
 
-#: effects/NoiseRemoval.cpp:821
+#: effects/NoiseRemoval.cpp:826
 msgid "Noise Removal by Dominic Mazzoni"
 msgstr "Вилучення шуму — Домінік Маццоні"
 
-#: effects/NoiseRemoval.cpp:829
+#: effects/NoiseRemoval.cpp:834
 msgid "Get Noise Profile"
 msgstr "Створити модель шуму"
 
-#: effects/NoiseRemoval.cpp:840
+#: effects/NoiseRemoval.cpp:845
 msgid "Noise reduction (dB):"
 msgstr "Зменшення шуму (dB):"
 
-#: effects/NoiseRemoval.cpp:848
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr "Зменшення шуму"
+
+#: effects/NoiseRemoval.cpp:854
 msgid "Frequency smoothing (Hz):"
 msgstr "Згладжування частоти (Гц):"
 
-#: effects/NoiseRemoval.cpp:856
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr "Згладжування частоти"
+
+#: effects/NoiseRemoval.cpp:863
 msgid "Attack/decay time (secs):"
 msgstr "Час зростання/спадання (секунд):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr "Час зростання/спадання"
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Вилучення шуму..."
 
-#: effects/NoiseRemoval.h:44
+#: effects/NoiseRemoval.h:50
 msgid "Creating Noise Profile"
 msgstr "Створюється модель шуму"
 
-#: effects/NoiseRemoval.h:46
+#: effects/NoiseRemoval.h:52
 msgid "Removing Noise"
 msgstr "Вилучається шум"
 
@@ -5016,31 +5773,31 @@ msgstr "так"
 msgid ", maximum amplitude = %.1f dB"
 msgstr ", максимальна амплітуда = %.1f дБ"
 
-#: effects/Normalize.cpp:113
+#: effects/Normalize.cpp:327
 msgid "Normalize"
 msgstr "Нормалізація"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Нормалізація – автор Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
+#: effects/Normalize.cpp:351
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr "Вилучити будь-яке відхилення від осі (центр у 0 по вертикалі)"
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Нормалізувати максимальну амплітуду до"
+#: effects/Normalize.cpp:354
+msgid "Normalize maximum amplitude to:"
+msgstr "Нормалізувати максимальну амплітуду до:"
 
-#: effects/Normalize.cpp:361
+#: effects/Normalize.cpp:362
 msgid "-"
 msgstr "-"
 
-#: effects/Normalize.h:32
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr "Максимальна амплітуда (дБ)"
+
+#: effects/Normalize.h:33
 msgid "Normalize..."
 msgstr "Нормалізація..."
 
-#: effects/Normalize.h:41
+#: effects/Normalize.h:49
 msgid "Normalizing..."
 msgstr "Нормалізація..."
 
@@ -5053,47 +5810,59 @@ msgstr ""
 "Застосовано ефект: %s %d етапів, %.0f%% оброблено, частота = %.1f Гц, "
 "початкова фаза = %.0f град, глибина = %d, зворотний зв'язок = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Фазер"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Фазер - Наска Октавіан Пол"
-
-#: effects/Phaser.cpp:222
+#: effects/Phaser.cpp:226
 msgid "Stages:"
 msgstr "Етапи:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "До обробки"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr "Етапи"
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr "Холодний/Теплий:"
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "Після обробки"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr "Холодний-Теплий"
 
-#: effects/Phaser.cpp:264 effects/Wahwah.cpp:221
+#: effects/Phaser.cpp:236 effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Частота LFO (Гц):"
 
-#: effects/Phaser.cpp:280 effects/Wahwah.cpp:237
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr "Частота LFO (Гц)"
+
+#: effects/Phaser.cpp:241 effects/Wahwah.cpp:226
 msgid "LFO Start Phase (deg.):"
 msgstr "Початкова фаза LFO (град.):"
 
-#: effects/Phaser.cpp:296
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr "Початкова фаза LFO (град.)"
+
+#: effects/Phaser.cpp:246
 msgid "Depth:"
 msgstr "Глибина:"
 
-#: effects/Phaser.cpp:312
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr "Глибина у відсотках"
+
+#: effects/Phaser.cpp:251
 msgid "Feedback (%):"
 msgstr "Зворотний зв'язок (%):"
 
-#: effects/Phaser.h:38
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr "Зворотній зв’язок у відсотках"
+
+#: effects/Phaser.h:45
 msgid "Phaser..."
 msgstr "Фазер..."
 
-#: effects/Phaser.h:46
+#: effects/Phaser.h:59
 msgid "Applying Phaser"
 msgstr "Застосовується ефект \"Фазер\""
 
@@ -5109,52 +5878,60 @@ msgstr ""
 "\n"
 "Збільшіть масштаб та оберіть частинку запису для відновлення."
 
-#: effects/Repair.h:37
+#: effects/Repair.cpp:105
+msgid ""
+"Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+"Відновлює записи на основі звукових даних поза вибраною ділянкою.\n"
+"\n"
+"Будь ласка, виберіть ділянку пошкоджених звукових даних: позначте принаймні одну з їх меж.\n"
+"\n"
+"Чим більше буде непошкоджених даних, тим кращим буде результат відновлення."
+
+#: effects/Repair.h:43
 msgid "Repairing damaged audio"
 msgstr "Відновлення пошкодженого аудіо"
 
-#: effects/Repeat.cpp:49
+#: effects/Repeat.cpp:50
 #, c-format
 msgid "Repeated %d times"
 msgstr "Створено %d повторів"
 
-#: effects/Repeat.cpp:75
+#: effects/Repeat.cpp:76
 msgid "Tracks are too long to repeat the selection."
 msgstr "Доріжки надто довгі для повторення виділення."
 
-#: effects/Repeat.cpp:76 effects/Repeat.cpp:80
+#: effects/Repeat.cpp:77 effects/Repeat.cpp:186
 msgid "Repeat"
 msgstr "Повтор..."
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Повтор - Dominic Mazzoni та Vaughan Johnson"
+#: effects/Repeat.cpp:211
+msgid "Number of times to repeat:"
+msgstr "Кількість повторів:"
 
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
-msgstr "Кількість повторів: "
+#: effects/Repeat.cpp:220
+msgid "New selection length: hh:mm:ss"
+msgstr "Нова тривалість виділення: гг:хх:сс"
 
-#: effects/Repeat.cpp:207 effects/Repeat.cpp:237
+#: effects/Repeat.cpp:252
 msgid "New selection length: "
 msgstr "Нова тривалість виділення:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d хвилин, %d секунд"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d секунд"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: effects/Repeat.cpp:261 widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "гг:хх:сс"
 
-#: effects/Repeat.h:32
+#: effects/Repeat.h:33
 msgid "Repeat..."
 msgstr "Повтор..."
 
-#: effects/Repeat.h:40
+#: effects/Repeat.h:47
 msgid "Performing Repeat"
 msgstr "Створюються повтори"
 
@@ -5162,7 +5939,7 @@ msgstr "Створюються повтори"
 msgid "Reverse"
 msgstr "Реверс"
 
-#: effects/Reverse.h:38
+#: effects/Reverse.h:44
 msgid "Reversing"
 msgstr "Застосовується реверс"
 
@@ -5174,11 +5951,11 @@ msgstr "Генератор тиші"
 msgid "Silence..."
 msgstr "Тиша..."
 
-#: effects/Silence.h:42
+#: effects/Silence.h:48
 msgid "Generating Silence"
 msgstr "Створення тиші"
 
-#: effects/Silence.h:47
+#: effects/Silence.h:53
 #, c-format
 msgid "Applied effect: Generate Silence, %.6lf seconds"
 msgstr "Застосовано ефект: Створення тиші, %.6lf секунд"
@@ -5219,11 +5996,59 @@ msgstr "Вилучення піків..."
 msgid "Applying Spike Cleaner..."
 msgstr "Застосування ефекту \"Вилучення піків...\""
 
-#: effects/StereoToMono.h:32
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "&Стерео на моно"
+
+#: effects/StereoToMono.h:38
 msgid "Applying Stereo to Mono"
 msgstr "Застосування ефекту \"Стерео у Моно\""
 
-#: effects/ToneGen.cpp:66
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr "Часова шкала"
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr "Зсув часової шкали/тону"
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr "на основі SBSMS, автор — Clayton Otey"
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr "Початкова зміна темпу (%):"
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr "Остаточна зміна темпу (%):"
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr "Початкова зміна темпу (%)"
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr "Остаточна зміна темпу (%)"
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr "Початковий зсув тону (у півтонах) [від -12 до 12]:"
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr "Остаточний зсув тону (у півтонах) [від -12 до 12]:"
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr "Зсув часової шкали/тону..."
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr "Змінюється темпу/тону"
+
+#: effects/ToneGen.cpp:61
 #, c-format
 msgid ""
 "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
@@ -5232,56 +6057,63 @@ msgstr ""
 "Застосовано ефект: Генерувати %s хвилю %s, частоти = %.2f Гц, амплітуди = "
 "%.2f, %.6lf секунд"
 
-#: effects/ToneGen.cpp:75 widgets/Meter.cpp:379
+#: effects/ToneGen.cpp:69 widgets/Meter.cpp:412
 msgid "Linear"
 msgstr "Лінійна"
 
-#: effects/ToneGen.cpp:76
+#: effects/ToneGen.cpp:70
 msgid "Logarithmic"
 msgstr "Логарифмічна"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Chirp Generator"
 msgstr "Генератор щебетання"
 
-#: effects/ToneGen.cpp:78
+#: effects/ToneGen.cpp:71
 msgid "Tone Generator"
 msgstr "Генератор тону"
 
-#: effects/ToneGen.cpp:79
+#: effects/ToneGen.cpp:72
 msgid "Sine"
 msgstr "Синусоїдна"
 
-#: effects/ToneGen.cpp:80
+#: effects/ToneGen.cpp:73
 msgid "Square"
 msgstr "Квадратична"
 
-#: effects/ToneGen.cpp:81
+#: effects/ToneGen.cpp:74
 msgid "Sawtooth"
 msgstr "Зубцеподібна"
 
-#: effects/ToneGen.cpp:82
+#: effects/ToneGen.cpp:75
 msgid "Square, no alias"
 msgstr "Квадратична, без переходів"
 
-#: effects/ToneGen.cpp:327 effects/ToneGen.cpp:363
+#: effects/ToneGen.cpp:321 effects/ToneGen.cpp:358
 msgid "Frequency (Hz)"
 msgstr "Частота (Гц)"
 
-#: effects/ToneGen.cpp:354
+#: effects/ToneGen.cpp:349
 msgid "Waveform:"
 msgstr "Хвиля:"
 
-#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Початок"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr "Початок діапазону (Гц)"
 
-#: effects/ToneGen.cpp:362 toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Кінець"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr "Кінець діапазону (Гц)"
 
-#: effects/ToneGen.cpp:372
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr "Початок діапазону амплітуди"
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr "Кінець діапазону амплітуди"
+
+#: effects/ToneGen.cpp:366
 msgid "Interpolation:"
 msgstr "Інтерполяція:"
 
@@ -5293,11 +6125,11 @@ msgstr "Щебетання..."
 msgid "Tone..."
 msgstr "Хвиля..."
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Chirp"
 msgstr "Створення щебетання"
 
-#: effects/ToneGen.h:48
+#: effects/ToneGen.h:54
 msgid "Generating Tone"
 msgstr "Створення хвилі"
 
@@ -5305,28 +6137,25 @@ msgstr "Створення хвилі"
 msgid "All tracks must have the same sample rate"
 msgstr "Всі доріжки повинні мати однакову частоту дискретизації"
 
-#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:322
+#: effects/TruncSilence.cpp:113 effects/TruncSilence.cpp:321
 msgid "Truncate Silence"
 msgstr "Обрізати тишу"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "від Lynn Allan"
-
-#: effects/TruncSilence.cpp:346
+#: effects/TruncSilence.cpp:345
 msgid "Max silence duration:"
 msgstr "Макс. тривалість тиші:"
 
-#: effects/TruncSilence.cpp:349 prefs/AudioIOPrefs.cpp:190
-#: prefs/AudioIOPrefs.cpp:193
+#: effects/TruncSilence.cpp:348 prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:200 prefs/MidiIOPrefs.cpp:174
+#: prefs/MidiIOPrefs.cpp:177
 msgid "milliseconds"
 msgstr "мілісекунд"
 
-#: effects/TruncSilence.cpp:351
+#: effects/TruncSilence.cpp:350
 msgid "Threshold for silence:"
 msgstr "Поріг для тиші:"
 
-#: effects/TruncSilence.cpp:376
+#: effects/TruncSilence.cpp:374
 msgid "   Duration must be at least 1 millisecond"
 msgstr "   Тривалість має бути більшою за 1 мілісекунду"
 
@@ -5334,11 +6163,11 @@ msgstr "   Тривалість має бути більшою за 1 міліс
 msgid "Truncate Silence..."
 msgstr "Обрізання тихих ділянок..."
 
-#: effects/TruncSilence.h:36
+#: effects/TruncSilence.h:42
 msgid "Truncating Silence..."
 msgstr "Обрізання тиші..."
 
-#: effects/VST/VSTEffect.cpp:165
+#: effects/VST/VSTEffect.cpp:172
 msgid ""
 "Sorry, VST Effects cannot be performed on stereo tracks where the individual "
 "channels of the track do not match."
@@ -5346,11 +6175,11 @@ msgstr ""
 "VST-ефекти не можуть застосовуватись до стерео-доріжок з невідповідними "
 "індивідуальними каналами."
 
-#: effects/VST/VSTEffect.cpp:180
+#: effects/VST/VSTEffect.cpp:187
 msgid "Can't process replacing"
 msgstr "Не можна виконати заміну"
 
-#: effects/VST/VSTEffect.cpp:403
+#: effects/VST/VSTEffect.cpp:410
 msgid "VST Plug-in parameters:"
 msgstr "Параметри додатка VST:"
 
@@ -5363,41 +6192,45 @@ msgstr ""
 "Застосовано ефект: %s частота = %.1f Гц, початкова фаза = %.0f град, глибина "
 "= %.0f%%, резонанс = %.1f, зсув частоти = %.0f%%"
 
-#: effects/Wahwah.cpp:72
+#: effects/Wahwah.cpp:203
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah від Nasca Octavian Paul"
-
-#: effects/Wahwah.cpp:253
+#: effects/Wahwah.cpp:231
 msgid "Depth (%):"
 msgstr "Глибина (%):"
 
-#: effects/Wahwah.cpp:269
+#: effects/Wahwah.cpp:236
 msgid "Resonance:"
 msgstr "Резонанс:"
 
-#: effects/Wahwah.cpp:285
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr "Резонанс"
+
+#: effects/Wahwah.cpp:241
 msgid "Wah Frequency Offset (%):"
 msgstr "Зсув частоти Wah (%):"
 
-#: effects/Wahwah.h:34
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr "Зсув частоти Wah (%)"
+
+#: effects/Wahwah.h:41
 msgid "Wahwah..."
 msgstr "Wahwah..."
 
-#: effects/Wahwah.h:42
+#: effects/Wahwah.h:55
 msgid "Applying Wahwah"
 msgstr "Застосовується ефект \"Wahwah\""
 
-#: effects/audiounits/AudioUnitEffect.cpp:133
-#: effects/ladspa/LadspaEffect.cpp:169
+#: effects/audiounits/AudioUnitEffect.cpp:138
+#: effects/ladspa/LadspaEffect.cpp:176 effects/lv2/LV2Effect.cpp:192
 #, c-format
 msgid "Performing Effect: %s"
 msgstr "Застосовується ефект: %s"
 
-#: effects/ladspa/LadspaEffect.cpp:189
+#: effects/ladspa/LadspaEffect.cpp:196 effects/lv2/LV2Effect.cpp:212
 msgid ""
 "Sorry, Plug-in Effects cannot be performed on stereo tracks where the "
 "individual channels of the track do not match."
@@ -5405,67 +6238,81 @@ msgstr ""
 "Цей модуль не можна виконувати на стерео доріжках, на яких окремі канали "
 "доріжки не відповідають одна одній."
 
-#: effects/ladspa/LadspaEffect.cpp:573 effects/ladspa/LadspaEffect.cpp:581
+#: effects/ladspa/LadspaEffect.cpp:580 effects/ladspa/LadspaEffect.cpp:588
 #: prefs/GUIPrefs.cpp:51 prefs/QualityPrefs.cpp:72
 msgid "None"
 msgstr "Немає"
 
-#: effects/ladspa/LadspaEffect.cpp:575 effects/vamp/VampEffect.cpp:384
+#: effects/ladspa/LadspaEffect.cpp:582 effects/lv2/LV2Effect.cpp:799
+#: effects/vamp/VampEffect.cpp:397
 msgid "Author: "
 msgstr "Автор: "
 
-#: effects/ladspa/LadspaEffect.cpp:608
+#: effects/ladspa/LadspaEffect.cpp:615 effects/lv2/LV2Effect.cpp:824
 msgid "Effect Settings"
 msgstr "Параметри ефекту"
 
-#: effects/ladspa/LadspaEffect.cpp:699
+#: effects/ladspa/LadspaEffect.cpp:710 effects/ladspa/LadspaEffect.cpp:713
+#: effects/lv2/LV2Effect.cpp:835 effects/lv2/LV2Effect.cpp:838
 msgid "Length (seconds)"
 msgstr "Тривалість (секунд)"
 
-#: effects/nyquist/Nyquist.cpp:252
+#: effects/lv2/LV2Effect.cpp:850 effects/lv2/LV2Effect.cpp:853
+msgid "Note length (seconds)"
+msgstr "Тривалість ноти (секунд)"
+
+#: effects/lv2/LV2Effect.cpp:861 effects/lv2/LV2Effect.cpp:864
+msgid "Note velocity"
+msgstr "Нотна швидкість"
+
+#: effects/lv2/LV2Effect.cpp:872 effects/lv2/LV2Effect.cpp:875
+msgid "Note key"
+msgstr "Нотний ключ"
+
+#: effects/nyquist/Nyquist.cpp:257
 msgid "Applying Nyquist Effect..."
 msgstr "Застосовується ефект Найквіста..."
 
-#: effects/nyquist/Nyquist.cpp:259 effects/nyquist/Nyquist.cpp:321
+#: effects/nyquist/Nyquist.cpp:264 effects/nyquist/Nyquist.cpp:326
 msgid "Nyquist Prompt..."
 msgstr "Запит Найквіста..."
 
-#: effects/nyquist/Nyquist.cpp:322
+#: effects/nyquist/Nyquist.cpp:327
 msgid "Enter Nyquist Command: "
 msgstr "Введіть Найквіст-команду:"
 
-#: effects/nyquist/Nyquist.cpp:412
+#: effects/nyquist/Nyquist.cpp:417
 msgid "Sorry, cannot apply effect on stereo tracks where the tracks don't match."
 msgstr ""
 "Ефект неможливо застосувати до стерео-доріжок з невідповідними "
 "індивідуальним каналами."
 
-#: effects/nyquist/Nyquist.cpp:440
+#: effects/nyquist/Nyquist.cpp:445
 msgid "Nyquist"
 msgstr "Найквіст"
 
-#: effects/nyquist/Nyquist.cpp:441
+#: effects/nyquist/Nyquist.cpp:446
 msgid "Nyquist Output: "
 msgstr "Вивід Найквіста: "
 
-#: effects/nyquist/Nyquist.cpp:598 effects/nyquist/Nyquist.cpp:609
+#: effects/nyquist/Nyquist.cpp:603 effects/nyquist/Nyquist.cpp:614
 msgid "Nyquist returned the value:"
 msgstr "Nyquist повернув значення:"
 
-#: effects/nyquist/Nyquist.cpp:651
+#: effects/nyquist/Nyquist.cpp:656
 msgid "Nyquist did not return audio.\n"
 msgstr "Модуль Найквіста не повернув звукові дані.\n"
 
-#: effects/nyquist/Nyquist.cpp:662
+#: effects/nyquist/Nyquist.cpp:667
 msgid "Nyquist returned too many audio channels.\n"
 msgstr "Модуль Найквіста повернув занадто багато звукових каналів.\n"
 
-#: effects/vamp/VampEffect.cpp:75
+#: effects/vamp/VampEffect.cpp:80
 #, c-format
 msgid "Extracting features: %s"
 msgstr "Отримання параметрів: %s"
 
-#: effects/vamp/VampEffect.cpp:106
+#: effects/vamp/VampEffect.cpp:111
 msgid ""
 "Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual "
 "channels of the track do not match."
@@ -5473,47 +6320,47 @@ msgstr ""
 "Вибачте, додатки Vamp неможливо виконувати на стерео-доріжках, де окремі "
 "канали доріжки відрізняються один від одного."
 
-#: effects/vamp/VampEffect.cpp:120
+#: effects/vamp/VampEffect.cpp:125
 msgid "Sorry, failed to load Vamp Plug-in."
 msgstr "Вибачте, не вдалося завантажити додаток Vamp."
 
-#: effects/vamp/VampEffect.cpp:228
+#: effects/vamp/VampEffect.cpp:233
 msgid "Sorry, Vamp Plug-in failed to initialize."
 msgstr "Вибачте, не вдалося запустити додаток Vamp."
 
-#: effects/vamp/VampEffect.cpp:376
+#: effects/vamp/VampEffect.cpp:389
 msgid " - Vamp audio analysis plugin"
 msgstr " - Додаток аудіо-аналізу Vamp"
 
-#: effects/vamp/VampEffect.cpp:423
+#: effects/vamp/VampEffect.cpp:425
 msgid "Plugin Settings"
 msgstr "Параметри додатка"
 
-#: effects/vamp/VampEffect.cpp:446
+#: effects/vamp/VampEffect.cpp:444 effects/vamp/VampEffect.cpp:450
 msgid "Program"
 msgstr "Програма"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr ""
-"Не обрано жодної доріжки! Використайте Ctrl-A (Виділити всі)\n"
-"Оберіть Експорт... щоб експортувати всі доріжки."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr "Весь виділений звук заглушено."
 
-#: export/Export.cpp:451
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr "Весь звук замінено тишею."
+
+#: export/Export.cpp:527
 msgid "Export File"
 msgstr "Експорт файла"
 
-#: export/Export.cpp:459
+#: export/Export.cpp:536
 msgid "&Options..."
 msgstr "&Параметри..."
 
-#: export/Export.cpp:485
+#: export/Export.cpp:577
 msgid "Are you sure you want to save the file as \""
 msgstr "Ви дійсно бажаєте зберегти файл як \""
 
-#: export/Export.cpp:501
+#: export/Export.cpp:597
 #, c-format
 msgid ""
 "You are about to save a %s file with the name \"%s\".\n"
@@ -5530,37 +6377,41 @@ msgstr ""
 "\n"
 "Ви справді бажаєте зберегти файл з цією назвою?"
 
-#: export/Export.cpp:522
+#: export/Export.cpp:618
 #, c-format
 msgid "A file named \"%s\" already exists.  Replace?"
 msgstr "Файл названий \"%s\" вже існує.  Замінити?"
 
-#: export/Export.cpp:604
+#: export/Export.cpp:720
 msgid "Your tracks will be mixed down to two stereo channels in the exported file."
 msgstr "У експортованому файлі доріжки будуть зведені у два стереоканали."
 
-#: export/Export.cpp:609
+#: export/Export.cpp:725
 msgid "Your tracks will be mixed down to a single mono channel in the exported file."
 msgstr "У експортованому файлі доріжки будуть зведені у один моноканал."
 
-#: export/Export.cpp:619
+#: export/Export.cpp:736
 msgid "Advanced Mixing Options"
 msgstr "Додаткові параметри мікшування"
 
-#: export/Export.cpp:821
+#: export/Export.cpp:940
 #, c-format
 msgid "Channel: %2d"
 msgstr "Канал: %2d"
 
-#: export/Export.cpp:945
+#: export/Export.cpp:1056
 msgid " - Left"
 msgstr " - Ліворуч"
 
-#: export/Export.cpp:946
+#: export/Export.cpp:1057
 msgid " - Right"
 msgstr " - Праворуч"
 
-#: export/Export.cpp:976 export/Export.cpp:1021
+#: export/Export.cpp:1082
+msgid "Mixer Panel"
+msgstr "Панель мікшера"
+
+#: export/Export.cpp:1088 export/Export.cpp:1135
 #, c-format
 msgid "Output Channels: %2d"
 msgstr "Вихідні канали: %2d"
@@ -5569,19 +6420,19 @@ msgstr "Вихідні канали: %2d"
 msgid "Specify Command Line Encoder"
 msgstr "Визначте кодувальник, що працює з командного рядка"
 
-#: export/ExportCL.cpp:70
+#: export/ExportCL.cpp:68
 msgid "Command Line Export Setup"
 msgstr "Налаштування командного рядку експорту"
 
-#: export/ExportCL.cpp:75
+#: export/ExportCL.cpp:73
 msgid "Command:"
 msgstr "Команда:"
 
-#: export/ExportCL.cpp:80
+#: export/ExportCL.cpp:78
 msgid "Show output"
 msgstr "Показати вивід"
 
-#: export/ExportCL.cpp:87
+#: export/ExportCL.cpp:85
 #, c-format
 msgid ""
 "Data will be piped to standard in. \"%f\" will be replaced with output "
@@ -5594,88 +6445,658 @@ msgstr ""
 msgid "(external program)"
 msgstr "(зовнішня програма)"
 
-#: export/ExportCL.cpp:250 export/ExportPCM.cpp:367
+#: export/ExportCL.cpp:251 export/ExportPCM.cpp:484
 #, c-format
 msgid "Cannot export audio to %s"
 msgstr "Не вдається експортувати дані у %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Експорт"
-
-#: export/ExportCL.cpp:324
+#: export/ExportCL.cpp:325
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Виділене експортується через консольний кодувальник"
 
-#: export/ExportCL.cpp:325
+#: export/ExportCL.cpp:326
 msgid "Exporting the entire project using command-line encoder"
 msgstr "Весь проект експортується через консольний кодувальник"
 
-#: export/ExportCL.cpp:389
+#: export/ExportCL.cpp:388
 msgid "Command Output"
 msgstr "Виведення команди"
 
-#: export/ExportFLAC.cpp:68
+#: export/ExportFFmpeg.cpp:59
+msgid ""
+"Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+"Для продовження виконання дій потрібна належно налаштована бібліотека FFmpeg.\n"
+"Ви можете налаштувати цю бібліотеку за допомогою сторінки Уподобання->Імпорт/Експорт."
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid ""
+"FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+"FFmpeg не вдалося знайти звукового кодека 0x%x.\n"
+"Ймовірно, бібліотеку було зібрано без підтримки цього кодека."
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid ""
+"Attempted to export %d channels, but max. channels for selected output "
+"format is %d"
+msgstr "Спроба експорту з %d каналами, але максимальною кількістю каналів для обраного формату виводу є %d"
+
+#: export/ExportFFmpeg.cpp:643
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr "Експорт обраних звукових даних як %s"
+
+#: export/ExportFFmpeg.cpp:644
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr "Експорт всього файла як %s"
+
+#: export/ExportFFmpeg.cpp:707 export/ExportMP3.cpp:1772
+msgid "Invalid sample rate"
+msgstr "Некоректна частота дискретизації"
+
+#: export/ExportFFmpeg.cpp:720
+#, c-format
+msgid ""
+"The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+"Частота дискретизації проекту (%d) не підтримується поточним форматом\n"
+"файла виводу даних.  "
+
+#: export/ExportFFmpeg.cpp:723
+#, c-format
+msgid ""
+"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+"Набір частоти дискретизації проекту (%d) та швидкості (%d кб/с)\n"
+"не підтримується поточним форматом файла виводу.  "
+
+#: export/ExportFFmpeg.cpp:726 export/ExportMP3.cpp:1791
+msgid "You may resample to one of the rates below."
+msgstr "Ви можете змінити частоту на одну з наведених нижче."
+
+#: export/ExportFFmpeg.cpp:754 export/ExportMP3.cpp:1814
+msgid "Sample Rates"
+msgstr "Частоти дискретизації"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr "Вказати параметри AC3"
+
+#: export/ExportFFmpegDialogs.cpp:112
+msgid "AC3 Export Setup"
+msgstr "Налаштування експорту до AC3"
+
+#: export/ExportFFmpegDialogs.cpp:116 export/ExportFFmpegDialogs.cpp:234
+#: export/ExportFFmpegDialogs.cpp:298 export/ExportFFmpegDialogs.cpp:364
+#: export/ExportFFmpegDialogs.cpp:924 export/ExportMP2.cpp:131
+msgid "Bit Rate:"
+msgstr "Частота бітів:"
+
+#: export/ExportFFmpegDialogs.cpp:157
+msgid "Specify AAC Options"
+msgstr "Вказати параметри AAC"
+
+#: export/ExportFFmpegDialogs.cpp:168
+msgid "AAC Export Setup"
+msgstr "Налаштування експорту до AAC"
+
+#: export/ExportFFmpegDialogs.cpp:211
+msgid "Specify AMR-NB Options"
+msgstr "Вказати параметри AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:230
+msgid "AMR-NB Export Setup"
+msgstr "Налаштування експорту до AMR-NB"
+
+#: export/ExportFFmpegDialogs.cpp:275
+msgid "Specify AMR-WB Options"
+msgstr "Вказати параметри AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:294
+msgid "AMR-WB Export Setup"
+msgstr "Налаштування експорту до AMR-WB"
+
+#: export/ExportFFmpegDialogs.cpp:341
+msgid "Specify WMA Options"
+msgstr "Вказати параметри WMA"
+
+#: export/ExportFFmpegDialogs.cpp:360
+msgid "WMA Export Setup"
+msgstr "Налаштування експорту до WMA"
+
+#: export/ExportFFmpegDialogs.cpp:488
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr "Перезаписати шаблон '%s'?"
+
+#: export/ExportFFmpegDialogs.cpp:489
+msgid "Confirm Overwrite"
+msgstr "Підтвердити перезапис"
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr "Будь ласка, оберіть формат, перш ніж зберігати профіль"
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr "Будь ласка, оберіть кодек, перш ніж зберігати профіль"
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr "Шаблона «%s» не існує."
+
+#: export/ExportFFmpegDialogs.cpp:795
+msgid "Specify Other Options"
+msgstr "Вказати інші параметри"
+
+#: export/ExportFFmpegDialogs.cpp:884
+msgid "Preset:"
+msgstr "Шаблон:"
+
+#: export/ExportFFmpegDialogs.cpp:885
+msgid "Load Preset"
+msgstr "Завантажити шаблон"
+
+#: export/ExportFFmpegDialogs.cpp:886
+msgid "Save Preset"
+msgstr "Зберегти шаблон"
+
+#: export/ExportFFmpegDialogs.cpp:887
+msgid "Delete Preset"
+msgstr "Вилучити шаблон"
+
+#: export/ExportFFmpegDialogs.cpp:888
+msgid "Import Presets"
+msgstr "Імпортувати шаблони"
+
+#: export/ExportFFmpegDialogs.cpp:889
+msgid "Export Presets"
+msgstr "Експортувати шаблони"
+
+#: export/ExportFFmpegDialogs.cpp:894
+msgid "Format:"
+msgstr "Формат:"
+
+#: export/ExportFFmpegDialogs.cpp:896
+msgid "Codec:"
+msgstr "Кодек:"
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid ""
+"Not all formats and codecs are compatible. Some parameters (such as bitrate "
+"and samplerate) combinations are not compatible with some codecs too."
+msgstr "Не всі формати і кодеки є сумісними. Певні комбінації параметрів (зокрема бітової частоти і частоти вибірки) також несумісні з деякими кодеками."
+
+#: export/ExportFFmpegDialogs.cpp:903
+msgid "Format selector:"
+msgstr "Вибір формату:"
+
+#: export/ExportFFmpegDialogs.cpp:904
+msgid "Codec selector:"
+msgstr "Вибір кодека:"
+
+#: export/ExportFFmpegDialogs.cpp:906
+msgid "Show All Formats"
+msgstr "Показувати всі формати"
+
+#: export/ExportFFmpegDialogs.cpp:907
+msgid "Show All Codecs"
+msgstr "Показувати всі кодеки"
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr "Параметри"
+
+#: export/ExportFFmpegDialogs.cpp:918 prefs/GUIPrefs.cpp:166
+msgid "Language:"
+msgstr "Мова:"
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid ""
+"ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+"Трилітерний код мови за ISO 639\n"
+"Необов’язковий\n"
+"за порожнього значення — автоматично"
+
+#: export/ExportFFmpegDialogs.cpp:921
+msgid "Tag:"
+msgstr "Мітка:"
+
+#: export/ExportFFmpegDialogs.cpp:922
+msgid ""
+"Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+"Мітка кодека (FOURCC)\n"
+"Необов’язкова\n"
+"за порожнього значення — автоматично"
+
+#: export/ExportFFmpegDialogs.cpp:925
+msgid ""
+"Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+"Бітова швидкість (бітів/секунду) — впливає на розмір отриманого файла і якість\n"
+"За деяких кодеків можна використовувати лише певні значення (128k, 192k, 256k тощо)\n"
+"0 — автоматично\n"
+"Рекомендоване значення — 192000"
+
+#: export/ExportFFmpegDialogs.cpp:927 export/ExportOGG.cpp:84
+msgid "Quality:"
+msgstr "Якість:"
+
+#: export/ExportFFmpegDialogs.cpp:928
+msgid ""
+"Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+"Якість, використовується у різних кодеках по-різному\n"
+"Потрібна для vorbis\n"
+"0 — автоматично\n"
+"-1 — вимкнути (використовувати бітову швидкість)"
+
+#: export/ExportFFmpegDialogs.cpp:930
+msgid "Sample Rate:"
+msgstr "Частота дискретизації:"
+
+#: export/ExportFFmpegDialogs.cpp:931
+msgid ""
+"Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+"Частота вибірки (Гц)\n"
+"0 — не змінювати частоту вибірки"
+
+#: export/ExportFFmpegDialogs.cpp:933
+msgid "Cutoff Bandwidth:"
+msgstr "Ширина смуги:"
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid ""
+"Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+"Ширина смуги пропускання звуку (Гц)\n"
+"Необов’язкова\n"
+"0 — автоматично\n"
+
+#: export/ExportFFmpegDialogs.cpp:936
+msgid "Profile:"
+msgstr "Профіль:"
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid ""
+"AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+"Профіль AAC\n"
+"Низька складність — типовий\n"
+"Більшість програвачів потребують саме такого параметра"
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr "Використовувати буфер бітів"
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr "Використовувати змінну довжину блоку"
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr "Параметри FLAC"
+
+#: export/ExportFFmpegDialogs.cpp:952
+msgid "Compression Level:"
+msgstr "Рівень стискання:"
+
+#: export/ExportFFmpegDialogs.cpp:953
+msgid ""
+"Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+"Рівень стискання\n"
+"Потрібен для FLAC\n"
+"-1 — автоматично\n"
+"min — 0 (швидке кодування, великі вихідні файли)\n"
+"max — 10 (повільне кодування, малі вихідні файли)"
+
+#: export/ExportFFmpegDialogs.cpp:955
+msgid "Frame Size:"
+msgstr "Розмір фрейма:"
+
+#: export/ExportFFmpegDialogs.cpp:956
+msgid ""
+"Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+"Розмір фрейма\n"
+"Необов’язковий\n"
+"0 — типовий\n"
+"min — 16\n"
+"max — 65535"
+
+#: export/ExportFFmpegDialogs.cpp:958
+msgid "LPC coefficients precision"
+msgstr "Точність коефіцієнтів LPC"
+
+#: export/ExportFFmpegDialogs.cpp:959
+msgid ""
+"LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+"Точність коефіцієнтів LPC\n"
+"Необов’язкова\n"
+"0 — типова\n"
+"min — 1\n"
+"max — 15"
+
+#: export/ExportFFmpegDialogs.cpp:961
+msgid "Minimal prediction order"
+msgstr "Мінімальний порядок передбачення"
+
+#: export/ExportFFmpegDialogs.cpp:962
+msgid ""
+"Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+"Мінімальний порядок передбачення\n"
+"Необов’язковий\n"
+"-1 — типовий\n"
+"min — 0\n"
+"max — 32 (з LPC) або 4 (без LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:964
+msgid "Maximal prediction order"
+msgstr "Максимальний порядок передбачення"
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid ""
+"Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+"Максимальний порядок передбачення\n"
+"Необов’язковий\n"
+"-1 — типовий\n"
+"min — 0\n"
+"max — 32 (з LPC) або 4 (без LPC)"
+
+#: export/ExportFFmpegDialogs.cpp:967
+msgid "Prediction Order Method:"
+msgstr "Метод передбачення порядку:"
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid ""
+"Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+"Метод передбачення порядку\n"
+"Оцінити — найшвидший, низький рівень стискання\n"
+"Пошук у журналі — найповільніший, найкраще стискання\n"
+"Повний пошук — типовий"
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "Minimal partition order"
+msgstr "Мінімальний порядок поділу"
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid ""
+"Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+"Мінімальний порядок поділу\n"
+"Необов’язковий\n"
+"-1 — типовий\n"
+"min — 0\n"
+"max — 8"
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Maximal partition order"
+msgstr "Максимальний порядок поділу"
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid ""
+"Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+"Максимальний порядок поділу\n"
+"Необов’язковий\n"
+"-1 — типовий\n"
+"min — 0\n"
+"max — 8"
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr "Використовувати LPC"
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr "Параметри контейнера MPEG"
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Mux Rate:"
+msgstr "Максимальна швидкість:"
+
+#: export/ExportFFmpegDialogs.cpp:989
+msgid ""
+"Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+"Максимальна бітова швидкість для багатоканального потоку\n"
+"Необов’язкова\n"
+"0 — типова"
+
+#: export/ExportFFmpegDialogs.cpp:991
+msgid "Packet Size:"
+msgstr "Розмір пакета:"
+
+#: export/ExportFFmpegDialogs.cpp:992
+msgid ""
+"Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+"Розмір пакета\n"
+"Необов’язковий\n"
+"0 — типовий"
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr "Ви не можете вилучати шаблон без назви"
+
+#: export/ExportFFmpegDialogs.cpp:1211
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr "Вилучити шаблон «%s»?"
+
+#: export/ExportFFmpegDialogs.cpp:1230
+msgid "You can't save a preset without name"
+msgstr "Ви не можете зберігати шаблон без назви"
+
+#: export/ExportFFmpegDialogs.cpp:1270
+msgid "Select xml file with presets to import"
+msgstr "Оберіть файл xml з шаблонами для імпортування"
+
+#: export/ExportFFmpegDialogs.cpp:1273 export/ExportFFmpegDialogs.cpp:1293
+#: prefs/KeyConfigPrefs.cpp:215
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML файли (*.xml)|*.xml|Усі файли (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1290
+msgid "Select xml file to export presets into"
+msgstr "Оберіть файл xml для експортування до нього шаблонів"
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr "Не вдалося визначити формат"
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr "Не вдалося знайти кодек"
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr "Файли M4A (AAC) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr "Файли AC3 (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr "Файли AMR (вузькосмугові) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr "Файли AMR (широкосмугові) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr "Файли WMA (версії 2) (FFmpeg)"
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr "Нетиповий експорт до FFmpeg"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr "LTP"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr "Низька складність"
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr "Основний профіль"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr "2-рівневий"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr "4-рівневий"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr "8-рівневий"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr "Оцінити"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr "Повний пошук"
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr "Пошук за журналом"
+
+#: export/ExportFLAC.cpp:67
 msgid "Specify FLAC Options"
 msgstr "Визначення параметрів FLAC"
 
-#: export/ExportFLAC.cpp:82
+#: export/ExportFLAC.cpp:79
 msgid "0 (fastest)"
 msgstr "0 (найшвидший)"
 
-#: export/ExportFLAC.cpp:83
+#: export/ExportFLAC.cpp:80
 msgid "1"
 msgstr "1"
 
-#: export/ExportFLAC.cpp:84
+#: export/ExportFLAC.cpp:81
 msgid "2"
 msgstr "2"
 
-#: export/ExportFLAC.cpp:85
+#: export/ExportFLAC.cpp:82
 msgid "3"
 msgstr "3"
 
-#: export/ExportFLAC.cpp:86
+#: export/ExportFLAC.cpp:83
 msgid "4"
 msgstr "4"
 
-#: export/ExportFLAC.cpp:87
+#: export/ExportFLAC.cpp:84
 msgid "5"
 msgstr "5"
 
-#: export/ExportFLAC.cpp:88
+#: export/ExportFLAC.cpp:85
 msgid "6"
 msgstr "6"
 
-#: export/ExportFLAC.cpp:89
+#: export/ExportFLAC.cpp:86
 msgid "7"
 msgstr "7"
 
-#: export/ExportFLAC.cpp:90
+#: export/ExportFLAC.cpp:87
 msgid "8 (best)"
 msgstr "8 (найкращий)"
 
-#: export/ExportFLAC.cpp:93
+#: export/ExportFLAC.cpp:90
 msgid "16 bit"
 msgstr "16 біт"
 
-#: export/ExportFLAC.cpp:94
+#: export/ExportFLAC.cpp:91
 msgid "24 bit"
 msgstr "24 біт"
 
-#: export/ExportFLAC.cpp:98
+#: export/ExportFLAC.cpp:95
 msgid "FLAC Export Setup"
 msgstr "Налаштування експорту до FLAC"
 
-#: export/ExportFLAC.cpp:102
+#: export/ExportFLAC.cpp:99
 msgid "Level:"
 msgstr "Рівень:"
 
-#: export/ExportFLAC.cpp:104
+#: export/ExportFLAC.cpp:101
 msgid "Bit depth:"
 msgstr "Бітова глибина:"
 
-#: export/ExportFLAC.cpp:208
+#: export/ExportFLAC.cpp:207
 msgid "FLAC Files"
 msgstr "Файли FLAC"
 
@@ -5691,70 +7112,66 @@ msgstr "Експорт всього проекту до FLAC"
 msgid "Specify MP2 Options"
 msgstr "Визначення параметрів MP2"
 
-#: export/ExportMP2.cpp:129
+#: export/ExportMP2.cpp:127
 msgid "MP2 Export Setup"
 msgstr "Налаштування експорту до MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Частота бітів:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Файли MP2"
 
-#: export/ExportMP2.cpp:229
+#: export/ExportMP2.cpp:230
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr "Неможливо експортувати MP2 з цією частотою дискретизації та бітовою частотою"
 
-#: export/ExportMP2.cpp:240 export/ExportMP3.cpp:1768 export/ExportOGG.cpp:183
+#: export/ExportMP2.cpp:241 export/ExportMP3.cpp:1618 export/ExportOGG.cpp:184
 msgid "Unable to open target file for writing"
 msgstr "Не вдається відкрити кінцевий файл для запису"
 
-#: export/ExportMP2.cpp:271
+#: export/ExportMP2.cpp:272
 #, c-format
 msgid "Exporting selected audio at %d kbps"
 msgstr "Експорт виділеного аудіо на %d кб/с"
 
-#: export/ExportMP2.cpp:272
+#: export/ExportMP2.cpp:273
 #, c-format
 msgid "Exporting entire file at %d kbps"
 msgstr "Експорт всього файла на %d кб/с"
 
-#: export/ExportMP3.cpp:221 export/ExportMP3.cpp:239 export/ExportMP3.cpp:253
+#: export/ExportMP3.cpp:223 export/ExportMP3.cpp:241 export/ExportMP3.cpp:255
 msgid "kbps"
 msgstr "кб/с"
 
-#: export/ExportMP3.cpp:240
+#: export/ExportMP3.cpp:242
 msgid "(Best Quality)"
 msgstr "(Найякісніше)"
 
-#: export/ExportMP3.cpp:241
+#: export/ExportMP3.cpp:243
 msgid "(Smaller files)"
 msgstr "(Найстисліше)"
 
-#: export/ExportMP3.cpp:243
+#: export/ExportMP3.cpp:245
 msgid "Fast"
 msgstr "Швидка"
 
-#: export/ExportMP3.cpp:244 export/ExportMP3.cpp:250 prefs/GUIPrefs.cpp:41
+#: export/ExportMP3.cpp:246 export/ExportMP3.cpp:252 prefs/GUIPrefs.cpp:41
 #: prefs/GUIPrefs.cpp:49
 msgid "Standard"
 msgstr "Стандартна"
 
-#: export/ExportMP3.cpp:248
+#: export/ExportMP3.cpp:250
 msgid "Insane"
 msgstr "Божевільна"
 
-#: export/ExportMP3.cpp:249
+#: export/ExportMP3.cpp:251
 msgid "Extreme"
 msgstr "Екстремальна"
 
-#: export/ExportMP3.cpp:251
+#: export/ExportMP3.cpp:253
 msgid "Medium"
 msgstr "Середня"
 
-#: export/ExportMP3.cpp:303
+#: export/ExportMP3.cpp:305
 msgid "Specify MP3 Options"
 msgstr "Визначити параметри MP3"
 
@@ -5812,37 +7229,21 @@ msgstr "Знайти Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity потребує файла %s для створення MP3."
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Розташування %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Щоб знайти %s, клацніть тут —>"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Огляд..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Щоб дістати вільну копію Lame, клацніть тут —>"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Звантаження..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "Де знаходиться %s?"
+msgid ""
+"You are linking to lame_enc.dll v%d.%d. This version is not compatible with "
+"Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
+"Було здійснено спробу з’єднатися з бібліотекою lame_enc.dll v%d.%d. Ця версія бібліотеки не є сумісною з Audacity %d.%d.%d.\n"
+"Будь ласка, звантажте найостаннішу версію бібліотеки LAME MP3."
 
-#: export/ExportMP3.cpp:1094
+#: export/ExportMP3.cpp:1327
 msgid ""
 "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|"
 "All Files (*.*)|*"
@@ -5850,7 +7251,7 @@ msgstr ""
 "Лише lame_enc.dll|lame_enc.dll|Динамічні бібліотеки (*.dll)|*.dll|Усі файли "
 "(*.*)|*"
 
-#: export/ExportMP3.cpp:1550
+#: export/ExportMP3.cpp:1345
 msgid ""
 "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|"
 "All Files (*)|*"
@@ -5858,7 +7259,7 @@ msgstr ""
 "Тільки libmp3lame.dylib|libmp3lame.dylib|Динамічні бібліотеки (*.dylib)|*."
 "dylib|Всі файли (*)|*"
 
-#: export/ExportMP3.cpp:1567
+#: export/ExportMP3.cpp:1363
 msgid ""
 "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
 "Extended Libraries (*.so*)|*.so*|All Files (*)|*"
@@ -5866,62 +7267,58 @@ msgstr ""
 "Лише libmp3lame.so|libmp3lame.so|Первинні спільні бібліотеки (*.so)|*.so|"
 "Розширені бібліотеки (*.so*)|*.so*|Усі файли (*)|*"
 
-#: export/ExportMP3.cpp:1650
+#: export/ExportMP3.cpp:1499
 msgid "MP3 Files"
 msgstr "Файли MP3"
 
-#: export/ExportMP3.cpp:1673
+#: export/ExportMP3.cpp:1523
 msgid "Could not open MP3 encoding library!"
 msgstr "Не вдається відкрити бібліотеку для експорту у MP3!"
 
-#: export/ExportMP3.cpp:1680
+#: export/ExportMP3.cpp:1530
 msgid "Not a valid or supported MP3 encoding library!"
 msgstr "Неправильна, або непідтримувана бібліотека стиснення MP3!"
 
-#: export/ExportMP3.cpp:1757
+#: export/ExportMP3.cpp:1607
 msgid "Unable to initialize MP3 stream"
 msgstr "Не вдалося започаткувати потік MP3"
 
-#: export/ExportMP3.cpp:1799
+#: export/ExportMP3.cpp:1650
 #, c-format
 msgid "Exporting selected audio with %s preset"
 msgstr "Експорт виділеного аудіо за шаблоном %s"
 
-#: export/ExportMP3.cpp:1800
+#: export/ExportMP3.cpp:1651
 #, c-format
 msgid "Exporting entire file with %s preset"
 msgstr "Експорт цілого файла за шаблоном %s"
 
-#: export/ExportMP3.cpp:1805
+#: export/ExportMP3.cpp:1656
 #, c-format
 msgid "Exporting selected audio with VBR quality %s"
 msgstr "Експорт виділеного аудіо з якістю VBR %s"
 
-#: export/ExportMP3.cpp:1806
+#: export/ExportMP3.cpp:1657
 #, c-format
 msgid "Exporting entire file with VBR quality %s"
 msgstr "Експорт цілого файла з якістю VBR %s"
 
-#: export/ExportMP3.cpp:1811
+#: export/ExportMP3.cpp:1662
 #, c-format
 msgid "Exporting selected audio at %d Kbps"
 msgstr "Експорт виділеного аудіо на швидкості %d кБ/с"
 
-#: export/ExportMP3.cpp:1812
+#: export/ExportMP3.cpp:1663
 #, c-format
 msgid "Exporting entire file at %d Kbps"
 msgstr "Експорт цілого файла на швидкості %d кБ/с"
 
-#: export/ExportMP3.cpp:1845
+#: export/ExportMP3.cpp:1697
 #, c-format
 msgid "Error %d returned from MP3 encoder"
 msgstr "Модуль кодування MP3 повернув помилку %d"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Некоректна частота дискретизації"
-
-#: export/ExportMP3.cpp:1931
+#: export/ExportMP3.cpp:1785
 #, c-format
 msgid ""
 "The project sample rate (%d) is not supported by the MP3\n"
@@ -5930,7 +7327,7 @@ msgstr ""
 "Частота дискретизації проекту (%d) не підтримується форматом\n"
 "файлів MP3.  "
 
-#: export/ExportMP3.cpp:1934
+#: export/ExportMP3.cpp:1788
 #, c-format
 msgid ""
 "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
@@ -5939,24 +7336,16 @@ msgstr ""
 "Набір частоти дискретизації проекту (%d) та швидкості (%d кб/с)\n"
 "не підтримується форматом файлів MP3.  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Ви можете змінити частоту на одну з наведених нижче."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Частоти дискретизації"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Не знайдено модуль експорту у MP3"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr "Не знайдено бібліотеку експорту до MP3"
 
-#: export/ExportMultiple.cpp:95 export/ExportMultiple.cpp:374
-#: export/ExportMultiple.cpp:598 export/ExportMultiple.cpp:765
+#: export/ExportMultiple.cpp:93 export/ExportMultiple.cpp:424
+#: export/ExportMultiple.cpp:670 export/ExportMultiple.cpp:847
 msgid "Export Multiple"
-msgstr "Експорту у декілька файлів"
+msgstr "Експорт у декілька файлів"
 
-#: export/ExportMultiple.cpp:164
+#: export/ExportMultiple.cpp:163
 msgid ""
 "If you have more than one Audio Track, you can export each track as a "
 "separate file,\n"
@@ -5967,90 +7356,94 @@ msgid ""
 msgstr ""
 "Якщо у вашому проекті більш ніж одна доріжка, ви можете експортувати кожну з "
 "них у окремий файл,\n"
-"або, за наявності доріжки для позначок, - експортувати по новому файлу для "
+"або, за наявності доріжки для позначок, — експортувати по новому файлу для "
 "кожної позначки.\n"
 "\n"
 "Проект не містить ані кількох доріжок, ані доріжки для позначок, тому що "
 "функція, що ви викликали, працювати не буде."
 
-#: export/ExportMultiple.cpp:165
+#: export/ExportMultiple.cpp:164
 msgid "Can't export multiple files"
 msgstr "Не можна експортувати декілька файлів"
 
-#: export/ExportMultiple.cpp:200
+#: export/ExportMultiple.cpp:229
 msgid "Export format:"
 msgstr "Формат експорту:"
 
-#: export/ExportMultiple.cpp:207
+#: export/ExportMultiple.cpp:234
 msgid "Options..."
 msgstr "Параметри..."
 
-#: export/ExportMultiple.cpp:210
+#: export/ExportMultiple.cpp:238
 msgid "Export location:"
 msgstr "Каталог для експорту:"
 
-#: export/ExportMultiple.cpp:216 prefs/DirectoriesPrefs.cpp:92
+#: export/ExportMultiple.cpp:242 prefs/DirectoriesPrefs.cpp:92
 msgid "Choose..."
 msgstr "Вибрати..."
 
-#: export/ExportMultiple.cpp:217
+#: export/ExportMultiple.cpp:243
 msgid "Create"
 msgstr "Створити"
 
-#: export/ExportMultiple.cpp:224
+#: export/ExportMultiple.cpp:250
 msgid "Split files based on:"
 msgstr "Розділити файли за принципом:"
 
-#: export/ExportMultiple.cpp:234
+#: export/ExportMultiple.cpp:259 export/ExportMultiple.cpp:261
 msgid "Labels"
 msgstr "Позначки"
 
-#: export/ExportMultiple.cpp:239
+#: export/ExportMultiple.cpp:266
 msgid "Include audio before first label"
 msgstr "Включати звук перед першою позначкою"
 
-#: export/ExportMultiple.cpp:245
+#: export/ExportMultiple.cpp:272
 msgid "First file name:"
-msgstr "Назва першого файлу:"
+msgstr "Назва першого файла:"
+
+#: export/ExportMultiple.cpp:277
+msgid "First file name"
+msgstr "Назва першого файла"
 
-#: export/ExportMultiple.cpp:258
+#: export/ExportMultiple.cpp:285 export/ExportMultiple.cpp:287
 msgid "Tracks"
 msgstr "Доріжки"
 
-#: export/ExportMultiple.cpp:265
+#: export/ExportMultiple.cpp:294
 msgid "Name files:"
 msgstr "Назви файлів:"
 
-#: export/ExportMultiple.cpp:275
+#: export/ExportMultiple.cpp:303 export/ExportMultiple.cpp:305
 msgid "Using Label/Track Name"
 msgstr "Використовується позначка/назва доріжки"
 
-#: export/ExportMultiple.cpp:282
+#: export/ExportMultiple.cpp:311 export/ExportMultiple.cpp:313
 msgid "Numbering consecutively"
 msgstr "Послідовна нумерація"
 
-#: export/ExportMultiple.cpp:288
+#: export/ExportMultiple.cpp:319
 msgid "File name prefix:"
-msgstr "Префікс назви файлу:"
+msgstr "Префікс назви файла:"
 
-#: export/ExportMultiple.cpp:306
+#: export/ExportMultiple.cpp:324
+msgid "File name prefix"
+msgstr "Префікс назви файла"
+
+#: export/ExportMultiple.cpp:338
 msgid "Overwrite existing files"
 msgstr "Перезаписати існуючі файли"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "Е&кспорт"
-
-#: export/ExportMultiple.cpp:372
+#: export/ExportMultiple.cpp:422
 #, c-format
 msgid "\"%s\" successfully created."
 msgstr "\"%s\" успішно створено."
 
-#: export/ExportMultiple.cpp:381
+#: export/ExportMultiple.cpp:431
 msgid "Choose a location to save the exported files"
 msgstr "Виберіть каталог для експортування файлів"
 
-#: export/ExportMultiple.cpp:470
+#: export/ExportMultiple.cpp:538
 #, c-format
 msgid ""
 "\"%s\" doesn't exist.\n"
@@ -6061,21 +7454,21 @@ msgstr ""
 "\n"
 "Створити?"
 
-#: export/ExportMultiple.cpp:568 export/ExportMultiple.cpp:703
+#: export/ExportMultiple.cpp:640 export/ExportMultiple.cpp:785
 msgid "Edit metadata"
 msgstr "Змінити метадані"
 
-#: export/ExportMultiple.cpp:595 export/ExportMultiple.cpp:762
+#: export/ExportMultiple.cpp:667 export/ExportMultiple.cpp:844
 #, c-format
 msgid "Successfully exported %d file(s)."
 msgstr "Успішно експортовано %d файл(ів)."
 
-#: export/ExportMultiple.cpp:596 export/ExportMultiple.cpp:763
+#: export/ExportMultiple.cpp:668 export/ExportMultiple.cpp:845
 #, c-format
 msgid "Something went wrong after exporting %d file(s)."
 msgstr "Після експорту %d файла(ів) щось пішло не так."
 
-#: export/ExportMultiple.cpp:825
+#: export/ExportMultiple.cpp:898
 #, c-format
 msgid ""
 "Label %s is not a legal file name. You cannot use any of:   %s\n"
@@ -6088,81 +7481,132 @@ msgstr ""
 msgid "Specify Ogg Vorbis Options"
 msgstr "Визначте параметри Ogg Vorbis"
 
-#: export/ExportOGG.cpp:81
+#: export/ExportOGG.cpp:79
 msgid "Ogg Vorbis Export Setup"
 msgstr "Налаштування експорту до Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Якість:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Файли Ogg Vorbis"
 
-#: export/ExportOGG.cpp:254
+#: export/ExportOGG.cpp:255
 msgid "Exporting the selected audio as Ogg Vorbis"
 msgstr "Виділене експортується у файл Ogg Vorbis"
 
-#: export/ExportOGG.cpp:255
+#: export/ExportOGG.cpp:256
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "Весь проект експортується у файл Ogg Vorbis"
 
-#: export/ExportPCM.cpp:115
+#: export/ExportPCM.cpp:119
 msgid "Specify Uncompressed Options"
 msgstr "Визначити параметри нестисненого"
 
-#: export/ExportPCM.cpp:171
+#: export/ExportPCM.cpp:189
 msgid "Uncompressed Export Setup"
 msgstr "Налаштування експорту без стискання"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Формат:"
-
-#: export/ExportPCM.cpp:181
+#: export/ExportPCM.cpp:195
 msgid "Header:"
 msgstr "Заголовок:"
 
-#: export/ExportPCM.cpp:185
+#: export/ExportPCM.cpp:199 import/ImportRaw.cpp:366
 msgid "Encoding:"
 msgstr "Кодування:"
 
-#: export/ExportPCM.cpp:190
+#: export/ExportPCM.cpp:204
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Не усі комбінації заголовків та кодувань є припустимими.)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, та інші типи без стискання"
+#: export/ExportPCM.cpp:359
+msgid "Other uncompressed files"
+msgstr "Інші нестиснуті файли"
+
+#: export/ExportPCM.cpp:377
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr "AIFF (Apple) 16-бітовий зі знаком PCM"
 
-#: export/ExportPCM.cpp:361
+#: export/ExportPCM.cpp:388
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr "WAV (Microsoft) 16-бітовий зі знаком PCM"
+
+#: export/ExportPCM.cpp:399
+msgid "GSM 6.10 WAV (mobile)"
+msgstr "GSM 6.10 WAV (мобільний)"
+
+#: export/ExportPCM.cpp:476
 msgid "Cannot export audio in this format."
 msgstr "Не вдається експортувати дані у цьому форматі."
 
-#: export/ExportPCM.cpp:401
+#: export/ExportPCM.cpp:518
 #, c-format
 msgid "Exporting the selected audio as %s"
 msgstr "Експортування виділеного аудіо як %s"
 
-#: export/ExportPCM.cpp:403
+#: export/ExportPCM.cpp:520
 #, c-format
 msgid "Exporting the entire project as %s"
 msgstr "Експортування всього проекту як %s"
 
 #. i18n-hint: %s will be the error message from libsndfile
-#: export/ExportPCM.cpp:437
+#: export/ExportPCM.cpp:556
 #, c-format
 msgid "Error (file may not have been written): %s"
 msgstr "Помилка (можливо, файл не записано): %s"
 
-#: import/Import.cpp:155
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr "Для цього формату параметри не доступні.\n"
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid ""
+"If you need more control over the export format please use the 'Other "
+"uncompressed files' format."
+msgstr "Якщо у вас виникла потреба у керуванні цим форматом експорту, будь ласка, скористайтеся форматом «Інші нестиснуті файли»."
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr "Ваш файл буде експортовано як 16-бітовий AIFF (Apple/SGI).\n"
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr "Ваш файл буде експортовано як 16-бітовий WAV (Microsoft).\n"
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr "Ваш файл буде експортовано як GSM 6.10 WAV.\n"
+
+#: import/Import.cpp:157 import/ImportMP3.cpp:47
+msgid "MP3 files"
+msgstr "Файли MP3"
+
+#: import/Import.cpp:176
+msgid "Select stream(s) to import"
+msgstr "Оберіть потоки для імпорту"
+
+#: import/Import.cpp:229
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Ця версія Audacity була зібрана без підтримки %s."
 
+#: import/Import.cpp:242
+#, c-format
+msgid ""
+"\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+"\"%s\" \n"
+"є нотним файлом MIDI, а не файлом аудіо. \n"
+"Audacity не може відкривати цей тип файлів для відтворення, але ви "
+"можете редагувати їх, якщо виберете пункт меню Файл > Імпорт > MIDI."
+
 #. i18n-hint: %s will be the filename
-#: import/Import.cpp:168
+#: import/Import.cpp:252
 #, c-format
 msgid ""
 "\"%s\" is an audio CD track. \n"
@@ -6175,7 +7619,7 @@ msgstr ""
 "Експортуйте (виріжте) доріжки CD у імпортований \n"
 "Audacity формат, на зразок WAV або AIFF."
 
-#: import/Import.cpp:174
+#: import/Import.cpp:258
 #, c-format
 msgid ""
 "\"%s\" is a playlist file. \n"
@@ -6190,7 +7634,7 @@ msgstr ""
 "Ви можете відкрити його у текстовому редакторі та завантажити справжні "
 "звукові файли."
 
-#: import/Import.cpp:179
+#: import/Import.cpp:263
 #, c-format
 msgid ""
 "\"%s\" is a Windows Media Audio file. \n"
@@ -6202,7 +7646,7 @@ msgstr ""
 "слід перетворити цей файл на файл підтримуваного аудіо-формату, такого як "
 "WAV або AIFF."
 
-#: import/Import.cpp:184
+#: import/Import.cpp:268
 #, c-format
 msgid ""
 "\"%s\" is an Advanced Audio Coding file. \n"
@@ -6214,21 +7658,22 @@ msgstr ""
 "слід перетворити цей файл на файл підтримуваного аудіо-формату на зразок WAV "
 "або AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:273
 #, c-format
 msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music "
-"store. \n"
+"\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
 msgstr ""
-"\"%s\" є шифрованим аудіо-файлом. Такі зазвичай продають у магазинах. \n"
+"\"%s\" є шифрованим аудіо-файлом. \n"
+"Такі зазвичай продають у магазинах. \n"
 "Audacity не може відкривати цей тип файлів через шифрування. \n"
 "Спробуйте записати файл у Audacity, або записати його на CD, а потім \n"
 "копіювати доріжку CD у підтримуваний аудіо-формат, на зразок WAV або AIFF."
 
-#: import/Import.cpp:194
+#: import/Import.cpp:278
 #, c-format
 msgid ""
 "\"%s\" is a RealPlayer media file. \n"
@@ -6240,19 +7685,7 @@ msgstr ""
 "слід перетворити цей файл у файл підтримуваного аудіо-формату, такого як WAV "
 "або AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" є нотним файлом MIDI, а не файлом аудіо. \n"
-"Audacity не може відкривати цей тип файлів для відтворення або зміни, але ви "
-"можете \n"
-"переглянути його, якщо виберете пункт меню Файл > Імпорт > MIDI."
-
-#: import/Import.cpp:206
+#: import/Import.cpp:284
 #, c-format
 msgid ""
 "\"%s\" is a notes-based file, not an audio file. \n"
@@ -6265,7 +7698,7 @@ msgstr ""
 "Спробуйте перетворити його на файл аудіо, на зразок WAV або AIFF, а потім \n"
 "імпортувати, або записати за допомогою Audacity."
 
-#: import/Import.cpp:212
+#: import/Import.cpp:290
 #, c-format
 msgid ""
 "\"%s\" is a Musepack audio file. \n"
@@ -6283,7 +7716,7 @@ msgstr ""
 "перетворити цей файл на файл формату, \n"
 "що підтримується, на зразок WAV або AIFF."
 
-#: import/Import.cpp:218
+#: import/Import.cpp:296
 #, c-format
 msgid ""
 "\"%s\" is a Wavpack audio file. \n"
@@ -6295,7 +7728,7 @@ msgstr ""
 "Вам слід спочатку перетворити цей файл на файл формату, що підтримується, на "
 "зразок WAV або AIFF."
 
-#: import/Import.cpp:224
+#: import/Import.cpp:302
 #, c-format
 msgid ""
 "\"%s\" is a Dolby Digital audio file. \n"
@@ -6307,7 +7740,7 @@ msgstr ""
 "Вам слід спочатку перетворити цей файл на файл формату, що підтримується, на "
 "зразок WAV або AIFF."
 
-#: import/Import.cpp:230
+#: import/Import.cpp:308
 #, c-format
 msgid ""
 "\"%s\" is an Ogg Speex audio file. \n"
@@ -6319,253 +7752,297 @@ msgstr ""
 "Вам слід спочатку перетворити цей файл на файл формату, що підтримується, на "
 "зразок WAV або AIFF."
 
-#: import/Import.cpp:253
+#: import/Import.cpp:314
+#, c-format
 msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+"\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity мала б вгадати тип файла.\n"
-"Можливо, звуковий файл не відповідає\n"
-"своєму розширенню.\n"
-"\n"
-"Якщо це так, спробуйте перейменувати файл,\n"
-"щоб він мав вірне розширення, перш ніж відкривати."
+"\"%s\" є файлом відео. \n"
+"Audacity на даний момент не може відкривати цей тип файлів. \n"
+"Вам слід спочатку видобути звукові дані до файла у форматі, що підтримується, на "
+"зразок WAV або AIFF."
 
-#: import/Import.cpp:269
+#: import/Import.cpp:319
+#, c-format
 msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+"Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
 msgstr ""
-"Програмі не вдається розпізнати тип цього файлу.\n"
+"Програмі не вдається розпізнати тип файла «%s».\n"
 "Якщо цей файл не є стисненим, спробуйте імпортувати його як файл "
 "необроблених даних."
 
-#: import/ImportFLAC.cpp:35
+#: import/Import.cpp:324
+#, c-format
+msgid ""
+"Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+"Програмі вдалося визначити тип файла «%s»,\n"
+"але програмі не вдалося його імпортувати."
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr "Сумісні з FFmpeg файли"
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr "Індекс[%02x] Кодек[%S], Мова[%S], Бітова швидкість[%S], К-ть каналів[%d], Тривалість[%d]"
+
+#: import/ImportFLAC.cpp:43
 msgid "FLAC files"
 msgstr "Файли FLAC"
 
-#: import/ImportLOF.cpp:92
+#: import/ImportLOF.cpp:95
 msgid "List of Files in basic text format"
 msgstr "Перелік файлів у звичайному текстовому форматі"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:318
+#: import/ImportLOF.cpp:314
 msgid "Invalid window offset in LOF file."
 msgstr "Неправильний зсув вікон у LOF-файлі."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:320 import/ImportLOF.cpp:341 import/ImportLOF.cpp:415
-#: import/ImportLOF.cpp:435
+#: import/ImportLOF.cpp:316 import/ImportLOF.cpp:337 import/ImportLOF.cpp:418
+#: import/ImportLOF.cpp:439
 msgid "LOF Error"
 msgstr "Помилка LOF"
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:339
+#: import/ImportLOF.cpp:335
 msgid "Invalid duration in LOF file."
 msgstr "Неправильна тривалість LOF-файлі."
 
-#: import/ImportLOF.cpp:414
+#: import/ImportLOF.cpp:417
 msgid "MIDI tracks cannot be offset individually, only audio files can be."
 msgstr ""
 "Для MIDI-доріжок окремий відступ неможливий, таке можна робити лише з "
 "звуковими файлами."
 
 #. i18n-hint: You do not need to translate "LOF"
-#: import/ImportLOF.cpp:434
+#: import/ImportLOF.cpp:438
 msgid "Invalid track offset in LOF file."
 msgstr "Неправильний зсув доріжок у LOF-файлі."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Помилка при розборі файлу у форматі Allegro."
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ": назва файла закоротка."
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Помилка при розборі MIDI файлу."
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr "Не вдалося відкрити файл"
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Файли MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ": неправильний тип файла."
 
-#: import/ImportOGG.cpp:36
+#: import/ImportOGG.cpp:44
 msgid "Ogg Vorbis files"
 msgstr "Файли Ogg Vorbis"
 
-#: import/ImportOGG.cpp:142
+#: import/ImportOGG.cpp:184
 msgid "Media read error"
 msgstr "Помилка читання носія"
 
-#: import/ImportOGG.cpp:145
+#: import/ImportOGG.cpp:187
 msgid "Not an Ogg Vorbis file"
 msgstr "Не є Ogg Vorbis файлом"
 
-#: import/ImportOGG.cpp:148
+#: import/ImportOGG.cpp:190
 msgid "Vorbis version mismatch"
 msgstr "Невідповідність версії Vorbis"
 
-#: import/ImportOGG.cpp:151
+#: import/ImportOGG.cpp:193
 msgid "Invalid Vorbis bitstream header"
 msgstr "Помилковий заголовок потоку Vorbis"
 
-#: import/ImportOGG.cpp:154
+#: import/ImportOGG.cpp:196
 msgid "Internal logic fault"
 msgstr "Внутрішня логічна помилка"
 
-#: import/ImportPCM.cpp:396
+#: import/ImportPCM.cpp:66
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, та інші типи без стискання"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Імпортується файл %s..."
+msgid "Importing %s"
+msgstr "Імпортування %s"
 
-#: import/ImportQT.cpp:21
+#: import/ImportQT.cpp:18
 msgid "QuickTime files"
 msgstr "Файли QuickTime"
 
-#: import/ImportRaw.cpp:278
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr "Імпортувати як файл необроблених даних"
+
+#: import/ImportRaw.cpp:282
 msgid "Import Raw Data"
 msgstr "Імпорту raw-файлі"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:337
+#: import/ImportRaw.cpp:327
 msgid "No endianness"
 msgstr "Без урахування порядку байтів"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:340
+#: import/ImportRaw.cpp:330
 msgid "Little-endian"
 msgstr "Little-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate this if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:343
+#: import/ImportRaw.cpp:333
 msgid "Big-endian"
 msgstr "Big-endian"
 
 #. i18n-hint: Refers to byte-order.  Don't translate "endianness" if you don't
 #. know the correct technical word.
-#: import/ImportRaw.cpp:346
+#: import/ImportRaw.cpp:336
 msgid "Default endianness"
 msgstr "Типовий порядок байтів"
 
-#: import/ImportRaw.cpp:370
+#: import/ImportRaw.cpp:355
 msgid "1 Channel (Mono)"
 msgstr "1 канал (моно)"
 
-#: import/ImportRaw.cpp:371
+#: import/ImportRaw.cpp:356
 msgid "2 Channels (Stereo)"
 msgstr "2 канали (стерео)"
 
-#: import/ImportRaw.cpp:373
+#: import/ImportRaw.cpp:358
 #, c-format
 msgid "%d Channels"
 msgstr "%d каналів"
 
-#: import/ImportRaw.cpp:386
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr "Порядок байтів:"
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr "Канали:"
+
+#: import/ImportRaw.cpp:382
 msgid "Start offset:"
 msgstr "Початковий зсув:"
 
-#: import/ImportRaw.cpp:397
+#: import/ImportRaw.cpp:388
 msgid "Amount to import:"
 msgstr "Величина яку імпортувати:"
 
-#: import/ImportRaw.cpp:408
+#: import/ImportRaw.cpp:394
 msgid "Sample rate:"
 msgstr "Частота дискретизації:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Імпорт"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr "Імпорт завершено. Обчислення форми хвилі"
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr "Декодування форми хвилі"
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr "%s %2.0f%% завершено. Натисніть, щоб змінити фокус задачі."
 
 #: prefs/AudioIOPrefs.cpp:41 prefs/AudioIOPrefs.cpp:42
+#: prefs/MidiIOPrefs.cpp:44 prefs/MidiIOPrefs.cpp:45
 msgid "Audio I/O"
 msgstr "Ввід/вивід звуку"
 
-#: prefs/AudioIOPrefs.cpp:100
+#: prefs/AudioIOPrefs.cpp:103 prefs/MidiIOPrefs.cpp:99
 msgid "1 (Mono)"
 msgstr "1 (моно)"
 
-#: prefs/AudioIOPrefs.cpp:101
+#: prefs/AudioIOPrefs.cpp:104 prefs/MidiIOPrefs.cpp:100
 msgid "2 (Stereo)"
 msgstr "2 (стерео)"
 
-#: prefs/AudioIOPrefs.cpp:115
+#: prefs/AudioIOPrefs.cpp:118 prefs/MidiIOPrefs.cpp:114
 msgid "Playback"
 msgstr "Відтворення"
 
-#: prefs/AudioIOPrefs.cpp:119 prefs/AudioIOPrefs.cpp:137
+#: prefs/AudioIOPrefs.cpp:122 prefs/AudioIOPrefs.cpp:140
+#: prefs/MidiIOPrefs.cpp:118 prefs/MidiIOPrefs.cpp:136
 #: toolbars/DeviceToolBar.cpp:57
 msgid "Device"
 msgstr "Пристрій"
 
-#: prefs/AudioIOPrefs.cpp:122
+#: prefs/AudioIOPrefs.cpp:125 prefs/MidiIOPrefs.cpp:121
 msgid "Using:"
 msgstr "Використовується:"
 
-#: prefs/AudioIOPrefs.cpp:123
+#: prefs/AudioIOPrefs.cpp:126 prefs/MidiIOPrefs.cpp:122
 msgid "Portaudio v"
 msgstr "Portaudio v"
 
-#: prefs/AudioIOPrefs.cpp:133
+#: prefs/AudioIOPrefs.cpp:136 prefs/MidiIOPrefs.cpp:132
 msgid "Recording"
 msgstr "Запис"
 
-#: prefs/AudioIOPrefs.cpp:139
+#: prefs/AudioIOPrefs.cpp:142 prefs/MidiIOPrefs.cpp:138
 msgid "Channels"
 msgstr "Канали"
 
-#: prefs/AudioIOPrefs.cpp:145
+#: prefs/AudioIOPrefs.cpp:148 prefs/MidiIOPrefs.cpp:144
 msgid "Playthrough"
 msgstr "Наскрізний канал"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "Від&творювати інші доріжки при записі нової"
-
 #: prefs/AudioIOPrefs.cpp:150
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr "Перекриття: Від&творювати інші доріжки при записі нової"
+
+#: prefs/AudioIOPrefs.cpp:153
 msgid "&Hardware Playthrough: Play new track while recording it"
 msgstr "&Апаратне програвання: Відтворювати нову доріжку, програючи її"
 
-#: prefs/AudioIOPrefs.cpp:152
+#: prefs/AudioIOPrefs.cpp:155
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "&Програмне програвання: Відтворювати нову доріжку, записуючи її"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid ""
-"&Software Playthrough: Play new track while recording it (uncheck when "
-"recording \"stereo mix\")"
-msgstr ""
-"&Програмне програвання: Відтворювати нову доріжку, записуючи її (зніміть "
-"позначку, якщо записується з \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:158
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr "&Програмне програвання: Відтворювати нову доріжку, записуючи її"
+
+#: prefs/AudioIOPrefs.cpp:161
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr "(зніміть позначку для запису «змішаного стерео»)"
 
-#: prefs/AudioIOPrefs.cpp:162
+#: prefs/AudioIOPrefs.cpp:169 prefs/MidiIOPrefs.cpp:193
 msgid "Effects Preview"
 msgstr "Прослуховування ефекту"
 
-#: prefs/AudioIOPrefs.cpp:165
+#: prefs/AudioIOPrefs.cpp:172
 msgid "Length of preview:"
 msgstr "Тривалість прослуховування:"
 
-#: prefs/AudioIOPrefs.cpp:170
+#: prefs/AudioIOPrefs.cpp:177 prefs/MidiIOPrefs.cpp:157
 msgid "Cut Preview"
 msgstr "Прослуховування результату вирізання"
 
-#: prefs/AudioIOPrefs.cpp:173
+#: prefs/AudioIOPrefs.cpp:180
 msgid "Preview before cut region:"
 msgstr "Прослуховування перед вирізанням області:"
 
-#: prefs/AudioIOPrefs.cpp:175
+#: prefs/AudioIOPrefs.cpp:182
 msgid "Preview after cut region:"
 msgstr "Прослуховування після вирізання області:"
 
-#: prefs/AudioIOPrefs.cpp:183
+#: prefs/AudioIOPrefs.cpp:190 prefs/MidiIOPrefs.cpp:167
 msgid "Latency"
 msgstr "Затримка"
 
-#: prefs/AudioIOPrefs.cpp:189
+#: prefs/AudioIOPrefs.cpp:196
 msgid ""
 "Audio to buffer:\n"
 "(higher = more latency)"
@@ -6573,7 +8050,7 @@ msgstr ""
 "Аудіо до буфера:\n"
 "(вище значення = вища латентність)"
 
-#: prefs/AudioIOPrefs.cpp:192
+#: prefs/AudioIOPrefs.cpp:199
 msgid ""
 "Latency correction:\n"
 "(negative = backwards)"
@@ -6581,15 +8058,15 @@ msgstr ""
 "Коригування на латентність:\n"
 "(від'ємне = назад)"
 
-#: prefs/AudioIOPrefs.cpp:197
+#: prefs/AudioIOPrefs.cpp:204
 msgid "Seek Time when playing"
 msgstr "Час позиціювання під час відтворення"
 
-#: prefs/AudioIOPrefs.cpp:200
+#: prefs/AudioIOPrefs.cpp:207 prefs/MidiIOPrefs.cpp:186
 msgid "Short period:"
 msgstr "Короткий проміжок:"
 
-#: prefs/AudioIOPrefs.cpp:202
+#: prefs/AudioIOPrefs.cpp:209 prefs/MidiIOPrefs.cpp:188
 msgid "Long period:"
 msgstr "Довгий проміжок:"
 
@@ -6601,7 +8078,7 @@ msgstr "Пакет"
 msgid "Behaviors"
 msgstr "Поведінка"
 
-#: prefs/BatchPrefs.cpp:80 prefs/GUIPrefs.cpp:129
+#: prefs/BatchPrefs.cpp:80
 msgid "&Don't apply effects in batch mode"
 msgstr "&Не застосовувати ефекти у пакетному режимі"
 
@@ -6610,7 +8087,7 @@ msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "Режим Cl&eanSpeech (Змінений GUI)"
 
 #: prefs/DirectoriesPrefs.cpp:55 prefs/DirectoriesPrefs.cpp:56
-#: prefs/PrefsDialog.cpp:279
+#: prefs/PrefsDialog.cpp:267
 msgid "Directories"
 msgstr "Каталоги"
 
@@ -6647,8 +8124,10 @@ msgid "Audio cache"
 msgstr "Кеш аудіо"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Тримати записані дані у пам'яті до зупинки запису"
+msgid ""
+"Play and/or record using RAM (useful for slow drives, but could crash with "
+"long files or recordings)"
+msgstr "Відтворювати і/або записувати звук за допомогою RAM (корисно за використання повільних дисків, але може призвести до аварійного завершення роботи, якщо запис буде задовгим)"
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6676,89 +8155,99 @@ msgstr ""
 "Зміни каталогу для зберігання тимчасових файлів не наберуть сили, доки "
 "програму Audacity не буде перезавантажено."
 
-#: prefs/FileFormatPrefs.cpp:48 prefs/FileFormatPrefs.cpp:49
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
 msgid "Import / Export"
 msgstr "Імпорт / Експорт"
 
-#: prefs/FileFormatPrefs.cpp:77
+#: prefs/FileFormatPrefs.cpp:84
 msgid "MP3 Export Library"
 msgstr "Бібліотека експорту MP3"
 
-#: prefs/FileFormatPrefs.cpp:80
+#: prefs/FileFormatPrefs.cpp:87
 msgid "MP3 Library Version:"
 msgstr "Версія бібліотеки MP3:"
 
-#: prefs/FileFormatPrefs.cpp:86
+#: prefs/FileFormatPrefs.cpp:93
 msgid "MP3 Library:"
 msgstr "Бібліотека MP3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Знайти бібліотеку"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr "В&казати..."
 
-#: prefs/FileFormatPrefs.cpp:91
+#: prefs/FileFormatPrefs.cpp:98
 msgid "LAME MP3 Library:"
 msgstr "Бібліотека LAME MP3:"
 
-#: prefs/FileFormatPrefs.cpp:94
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
 msgid "&Download"
 msgstr "&Завантажити"
 
-#: prefs/FileFormatPrefs.cpp:99
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr "Бібліотека імпорту/експорту FFmpeg"
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr "Версія бібліотеки FFmpeg:"
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr "Бібліотека FFmpeg:"
+
+#: prefs/FileFormatPrefs.cpp:136
 msgid ""
 "Note: Export quality options can be chosen by clicking the Options button in "
-"the Export dialog."
-msgstr ""
-"Зауваження: параметри якості експорту можна обрати натиснувши кнопку "
-"\"Параметри\" у діалозі експорту."
+"the Export dialog.\n"
+msgstr "Зауваження: параметри якості експорту можна обрати після натискання кнопки «Параметри» у діалозі експорту.\n"
 
-#: prefs/FileFormatPrefs.cpp:100
+#: prefs/FileFormatPrefs.cpp:137
 msgid "When importing audio files"
 msgstr "Під час імпорту аудіо файлів"
 
-#: prefs/FileFormatPrefs.cpp:103
+#: prefs/FileFormatPrefs.cpp:140
 msgid "&Make a copy of uncompressed audio files before editing (safer)"
 msgstr "&Зробити копію нестиснутих файлів аудіо перш ніж почати їх зміну (безпечніше)"
 
-#: prefs/FileFormatPrefs.cpp:104
+#: prefs/FileFormatPrefs.cpp:141
 msgid "&Read uncompressed audio files directly from the original (faster)"
 msgstr "&Читати нестиснуті файли аудіо напряму з оригіналу (швидше)"
 
-#: prefs/FileFormatPrefs.cpp:106
+#: prefs/FileFormatPrefs.cpp:143
 msgid "&Normalize all tracks in project"
 msgstr "&Нормалізувати всі доріжки проекту"
 
-#: prefs/FileFormatPrefs.cpp:111
+#: prefs/FileFormatPrefs.cpp:148
 msgid "When saving a project that depends on other audio files"
 msgstr "Збереження проекту, що залежить від інших аудіо-файлів"
 
-#: prefs/FileFormatPrefs.cpp:114
+#: prefs/FileFormatPrefs.cpp:151
 msgid "Always &copy all audio into project (safest)"
 msgstr "Завжди &копіювати все аудіо до проекту (найбезпечніше)"
 
-#: prefs/FileFormatPrefs.cpp:115
+#: prefs/FileFormatPrefs.cpp:152
 msgid "&Do not copy any audio"
 msgstr "&Не копіювати жодного аудіо"
 
-#: prefs/FileFormatPrefs.cpp:116
+#: prefs/FileFormatPrefs.cpp:153
 msgid "&Ask user"
 msgstr "&Питати користувача"
 
-#: prefs/FileFormatPrefs.cpp:120
+#: prefs/FileFormatPrefs.cpp:157
 msgid "When exporting tracks to an audio file"
 msgstr "Коли експортуються доріжки до аудіо-файла"
 
-#: prefs/FileFormatPrefs.cpp:123
+#: prefs/FileFormatPrefs.cpp:160
 msgid "A&lways mix all tracks down to Stereo or Mono channel(s)."
 msgstr "Зав&жди мікшувати всі доріжки до стерео або моно каналів."
 
-#: prefs/FileFormatPrefs.cpp:124
+#: prefs/FileFormatPrefs.cpp:161
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 "&Використовувати особливе мікшування (наприклад для експорту 5.1-канального "
 "файла)"
 
-#: prefs/FileFormatPrefs.cpp:126
+#: prefs/FileFormatPrefs.cpp:163
 msgid "S&how Metadata Editor prior to export step"
 msgstr "По&казувати редактор метаданих перед кроком експорту"
 
@@ -6783,15 +8272,15 @@ msgid "&Update display while playing"
 msgstr "&Оновлювати відображення під час відтворення"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
-msgstr "Закриття останнього вікна завершує Audacity"
+msgid "Cl&osing last window quits Audacity"
+msgstr "За&криття останнього вікна завершує Audacity"
 
 #: prefs/GUIPrefs.cpp:98
 msgid "Enable &dragging of left and right selection edges"
 msgstr "Дозволити &перетягування лівої і правої границь вибору"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
+msgid "Er&gonomic order of audio I/O buttons"
 msgstr "&Ергономічний порядок кнопок аудіо введення/виведення"
 
 #: prefs/GUIPrefs.cpp:102
@@ -6799,8 +8288,8 @@ msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Автоматично &робити доріжки вертикально масштабованими"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr "\"Перемістити фокус доріжки\" &циклічно повторюється між доріжками"
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
+msgstr "«Перемістити фокус доріжки» &циклічно повторюється між доріжками"
 
 #: prefs/GUIPrefs.cpp:106
 msgid "Editing a &clip can move other clips"
@@ -6827,17 +8316,21 @@ msgid "Show warnings about &temp files"
 msgstr "Показати попередження про &тимчасові файли"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr "&Показувати запит на збереження, навіть якщо проект порожній"
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
-msgstr "Показувати повідомлення з привітанням під час запуску"
+msgid "Show &Welcome Message at program start up"
+msgstr "Пока&зувати повідомлення з привітанням під час запуску"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Режими"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr "&Не застосовувати ефекти у пакетному режимі"
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Показувати мінімум діапазону: індикатори і \"Форма хвилі (у дБ)\""
@@ -6870,39 +8363,15 @@ msgstr "-145 дБ (діапазон ІКМ при 24 бітах)"
 msgid "Default View Mode"
 msgstr "Режим типового перегляду"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "Показ форми хвилі"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "Показ бази даних форм хвилі"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "Показ спектру"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "Показ логарифмічного спектру"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "Показ кроків"
-
-#: prefs/GUIPrefs.cpp:166
+#: prefs/GUIPrefs.cpp:164
 msgid "Other interface choices"
 msgstr "Інший вибір зовнішнього вигляду"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Мова:"
-
-#: prefs/GUIPrefs.cpp:169
+#: prefs/GUIPrefs.cpp:167
 msgid "Help:"
 msgstr "Довідка:"
 
-#: prefs/GUIPrefs.cpp:170
+#: prefs/GUIPrefs.cpp:168
 msgid "Solo Button:"
 msgstr "Кнопка \"Соло\":"
 
@@ -6910,49 +8379,53 @@ msgstr "Кнопка \"Соло\":"
 msgid "Keyboard"
 msgstr "Клавіатура"
 
-#: prefs/KeyConfigPrefs.cpp:95
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr "Зараз ви не можете налаштувати клавіатурні скорочення."
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr "Відкрийте новий проект, щоб мати змогу змінити клавіатурні скорочення."
+
+#: prefs/KeyConfigPrefs.cpp:109
 msgid "Key Bindings"
 msgstr "Прив'язка до клавіш"
 
-#: prefs/KeyConfigPrefs.cpp:115
+#: prefs/KeyConfigPrefs.cpp:129
 msgid "S&et"
 msgstr "В&становити"
 
-#: prefs/KeyConfigPrefs.cpp:120
+#: prefs/KeyConfigPrefs.cpp:135
 msgid "Note: Pressing Cmd+Q will quit. All other keys are valid."
 msgstr ""
 "Примітка: натиснення комбінації клавіш Cmd+Q призведе до завершення. Усі "
 "інші комбінації є дійсними."
 
-#: prefs/KeyConfigPrefs.cpp:124 prefs/ThemePrefs.cpp:105
+#: prefs/KeyConfigPrefs.cpp:140 prefs/ThemePrefs.cpp:105
 msgid "&Defaults"
 msgstr "&Типові"
 
-#: prefs/KeyConfigPrefs.cpp:143
+#: prefs/KeyConfigPrefs.cpp:159
 msgid "Key Combination"
 msgstr "Комбінація клавіш"
 
-#: prefs/KeyConfigPrefs.cpp:163
+#: prefs/KeyConfigPrefs.cpp:176
 msgid "Export Keyboard Shortcuts As:"
 msgstr "Експортувати комбінації клавіш як:"
 
-#: prefs/KeyConfigPrefs.cpp:181
+#: prefs/KeyConfigPrefs.cpp:196
 msgid "Error saving keyboard shortcuts"
 msgstr "Помилка при збереженні комбінацій клавіш"
 
-#: prefs/KeyConfigPrefs.cpp:196
+#: prefs/KeyConfigPrefs.cpp:211
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Виберіть XML-файл, що містить комбінації клавіш Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML файли (*.xml)|*.xml|Усі файли (*.*)|*.*"
-
-#: prefs/KeyConfigPrefs.cpp:213
+#: prefs/KeyConfigPrefs.cpp:228
 msgid "Error loading keyboard shortcuts"
 msgstr "Помилка при завантаженні комбінацій клавіш"
 
-#: prefs/KeyConfigPrefs.cpp:241
+#: prefs/KeyConfigPrefs.cpp:256
 #, c-format
 msgid ""
 "The keyboard shortcut '%s' is already assigned to:\n"
@@ -6963,10 +8436,46 @@ msgstr ""
 "\n"
 "'%s'"
 
-#: prefs/KeyConfigPrefs.cpp:367 toolbars/EditToolBar.cpp:144
+#: prefs/KeyConfigPrefs.cpp:382 toolbars/EditToolBar.cpp:144
 msgid "Undo"
 msgstr "Вернути"
 
+#: prefs/MidiIOPrefs.cpp:146
+msgid "&Play other tracks while recording new one"
+msgstr "Від&творювати інші доріжки при записі нової"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr "&Апаратне відтворення (Відтворювати нову доріжку під час запису)"
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr "&Програмне програвання (Відтворювати нову доріжку під час запису)"
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr "Відтворення перед вирізанням області:"
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr "Відтворення після вирізання області:"
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr "Буфер звуку:"
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr "Коригування на латентність:"
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr "Крок за часом"
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr "Відтворення під час перегляду:"
+
 #: prefs/MousePrefs.cpp:55 prefs/MousePrefs.cpp:56
 msgid "Mouse"
 msgstr "Миша"
@@ -7173,7 +8682,7 @@ msgstr "Ctrl-Прокручування-коліщатка"
 msgid "Zoom in or out"
 msgstr "Масштабувати вигляд"
 
-#: prefs/PrefsDialog.cpp:89
+#: prefs/PrefsDialog.cpp:94
 msgid "Audacity Preferences"
 msgstr "Уподобання Audacity"
 
@@ -7237,17 +8746,17 @@ msgstr "У реальному часу:"
 msgid "High-quality:"
 msgstr "Висока якість:"
 
-#: prefs/SmartRecordPrefs.cpp:54 prefs/SmartRecordPrefs.cpp:55
+#: prefs/SmartRecordPrefs.cpp:37 prefs/SmartRecordPrefs.cpp:38
 msgid "Smart Recording"
 msgstr "Розширений запис"
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Зупиняти запис під час тиші"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr "Запис з активацією звуком"
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Рівень тиші (дБ)"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr "Рівень звуку для активування (дБ):"
 
 #: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
@@ -7443,43 +8952,43 @@ msgstr ""
 "але інакше ту ж ідею.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Контроль"
-
-#: toolbars/ControlToolBar.cpp:174
+#: toolbars/ControlToolBar.cpp:175
 msgid "Pause"
 msgstr "Призупинити"
 
-#: toolbars/ControlToolBar.cpp:177
+#: toolbars/ControlToolBar.cpp:178
 msgid "Play"
 msgstr "Грати"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Відтворити (з Shift - у циклі)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr "Відтворити (з Shift — у циклі)"
 
-#: toolbars/ControlToolBar.cpp:182
+#: toolbars/ControlToolBar.cpp:183
 msgid "Stop"
 msgstr "Зупинити"
 
-#: toolbars/ControlToolBar.cpp:185
+#: toolbars/ControlToolBar.cpp:186
 msgid "Skip to Start"
 msgstr "Перейти на початок доріжки"
 
-#: toolbars/ControlToolBar.cpp:188
+#: toolbars/ControlToolBar.cpp:189
 msgid "Skip to End"
 msgstr "Перейти на кінець доріжки"
 
-#: toolbars/ControlToolBar.cpp:194
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr "Запис (Shift для додавання запису)"
+
+#: toolbars/ControlToolBar.cpp:195
 msgid "Clean Speech"
 msgstr "Clean Speech"
 
-#: toolbars/ControlToolBar.cpp:530 toolbars/ControlToolBar.cpp:844
+#: toolbars/ControlToolBar.cpp:540 toolbars/ControlToolBar.cpp:869
 msgid "Error while opening sound device. "
 msgstr "Помилка під час відкриття звукового пристрою. "
 
-#: toolbars/ControlToolBar.cpp:696
+#: toolbars/ControlToolBar.cpp:706
 msgid ""
 "Recording in CleanSpeech mode is not possible when a track, or more than one "
 "project, is already open."
@@ -7487,7 +8996,7 @@ msgstr ""
 "Запис у режимі CleanSpeech неможливий, коли вже відкрито доріжку або більше "
 "за один проект."
 
-#: toolbars/ControlToolBar.cpp:697
+#: toolbars/ControlToolBar.cpp:707
 msgid "Recording not permitted"
 msgstr "Запис не дозволено"
 
@@ -7508,30 +9017,34 @@ msgid "Silence selection"
 msgstr "Заповнити тишею"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr "З’єднати доріжки"
+
+#: toolbars/EditToolBar.cpp:155
 msgid "Zoom In"
 msgstr "Збільшити"
 
-#: toolbars/EditToolBar.cpp:152
+#: toolbars/EditToolBar.cpp:157
 msgid "Zoom Out"
 msgstr "Зменшити"
 
-#: toolbars/EditToolBar.cpp:156
+#: toolbars/EditToolBar.cpp:161
 msgid "Zoom Toggle"
 msgstr "Тип масштабування"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit Selection"
 msgstr "Розмістити виділену область"
 
-#: toolbars/EditToolBar.cpp:160
+#: toolbars/EditToolBar.cpp:165
 msgid "Fit selection in window"
 msgstr "Розмістити виділене у вікні"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit Project"
 msgstr "Розмістити проект"
 
-#: toolbars/EditToolBar.cpp:162
+#: toolbars/EditToolBar.cpp:167
 msgid "Fit project in window"
 msgstr "Розмістити проект у вікні"
 
@@ -7563,71 +9076,68 @@ msgstr "Індикатор рівня на виході"
 msgid "Input level meter - click to monitor input"
 msgstr "Індикатор рівня входу. Клацніть, щоб запустити контроль входу."
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Мікшер"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Рівень на виході"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
-msgstr "Повзунок-виводу"
+msgid "Slider Output"
+msgstr "Повзунок виводу"
 
-#: toolbars/MixerToolBar.cpp:101
+#: toolbars/MixerToolBar.cpp:101 widgets/Meter.cpp:870
 msgid "Input Volume"
 msgstr "Рівень на вході"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
-msgstr "Повзунок-виводу"
+msgid "Slider Input"
+msgstr "Повзунок вводу"
 
 #: toolbars/MixerToolBar.cpp:134
 msgid "Input Source"
 msgstr "Вхідне джерело"
 
-#: toolbars/SelectionBar.cpp:80
+#: toolbars/SelectionBar.cpp:86
 msgid "Selection"
 msgstr "Виділена область"
 
-#: toolbars/SelectionBar.cpp:128 toolbars/SelectionBar.cpp:185
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:194
 msgid "Project Rate (Hz):"
 msgstr "Частота проекту (Гц):"
 
-#: toolbars/SelectionBar.cpp:142 toolbars/SelectionBar.cpp:247
+#: toolbars/SelectionBar.cpp:149 toolbars/SelectionBar.cpp:255
 msgid "Selection Start:"
 msgstr "Початок виділеної області:"
 
-#: toolbars/SelectionBar.cpp:155 toolbars/SelectionBar.cpp:253
+#: toolbars/SelectionBar.cpp:163 toolbars/SelectionBar.cpp:164
+#: toolbars/SelectionBar.cpp:261
 msgid "Length"
 msgstr "Довжина"
 
-#: toolbars/SelectionBar.cpp:165
+#: toolbars/SelectionBar.cpp:174
 msgid "hidden"
 msgstr "заховано"
 
-#: toolbars/SelectionBar.cpp:175 toolbars/SelectionBar.cpp:264
+#: toolbars/SelectionBar.cpp:184 toolbars/SelectionBar.cpp:272
 msgid "Audio Position:"
 msgstr "Позиція у аудіо:"
 
-#: toolbars/SelectionBar.cpp:225 toolbars/SelectionBar.cpp:230
+#: toolbars/SelectionBar.cpp:236 toolbars/SelectionBar.cpp:241
 msgid "Snap To"
 msgstr "Прив'язка"
 
-#: toolbars/SelectionBar.cpp:252
+#: toolbars/SelectionBar.cpp:260
 msgid "Selection "
 msgstr "Виділена область"
 
-#: toolbars/SelectionBar.cpp:317
+#: toolbars/SelectionBar.cpp:325
 msgid "Selection Length"
 msgstr "Тривалість виділеної області"
 
-#: toolbars/SelectionBar.cpp:325
+#: toolbars/SelectionBar.cpp:333
 msgid "Selection End"
 msgstr "Кінець виділеної області"
 
-#: toolbars/ToolBar.cpp:97
+#: toolbars/ToolBar.cpp:98
 #, c-format
 msgid "Audacity %s ToolBar"
 msgstr "Панель інструментів Audacity %s"
@@ -7674,11 +9184,11 @@ msgstr "Інструменти"
 msgid "Selection Tool"
 msgstr "Виділення"
 
-#: toolbars/ToolsToolBar.cpp:148
+#: toolbars/ToolsToolBar.cpp:148 toolbars/ToolsToolBar.cpp:183
 msgid "Envelope Tool"
 msgstr "Зміна обвідної"
 
-#: toolbars/ToolsToolBar.cpp:149 toolbars/ToolsToolBar.cpp:183
+#: toolbars/ToolsToolBar.cpp:149
 msgid "Time Shift Tool"
 msgstr "Зсув у часі"
 
@@ -7822,43 +9332,43 @@ msgstr "Зміни напрямку (верхній поріг)"
 msgid "Key type"
 msgstr "Тип ключа"
 
-#: widgets/AButton.cpp:302
+#: widgets/AButton.cpp:303
 msgid " (disabled)"
 msgstr " (вимкнено)"
 
-#: widgets/AButton.cpp:452
+#: widgets/AButton.cpp:461
 msgid "Press"
 msgstr "Натисніть"
 
-#: widgets/AButton.cpp:531
+#: widgets/AButton.cpp:540
 msgid "Button"
 msgstr "Кнопка"
 
 #. i18n-hint: One-letter abbreviation for Left, in VU Meter
 #. i18n-hint: One-letter abbreviation for Left, in the Pan slider
-#: widgets/ASlider.cpp:604 widgets/Meter.cpp:212
+#: widgets/ASlider.cpp:612 widgets/Meter.cpp:248
 msgid "L"
 msgstr "Л"
 
 #. i18n-hint: One-letter abbreviation for Right, in VU Meter
 #. i18n-hint: One-letter abbreviation for Right, in the Pan slider
-#: widgets/ASlider.cpp:607 widgets/Meter.cpp:214
+#: widgets/ASlider.cpp:615 widgets/Meter.cpp:250
 msgid "R"
 msgstr "П"
 
-#: widgets/ASlider.cpp:670
+#: widgets/ASlider.cpp:678
 msgid "Center"
 msgstr "Центр"
 
-#: widgets/ASlider.cpp:674
+#: widgets/ASlider.cpp:682
 msgid "Left"
 msgstr "Ліворуч"
 
-#: widgets/ASlider.cpp:677
+#: widgets/ASlider.cpp:685
 msgid "Right"
 msgstr "Праворуч"
 
-#: widgets/ErrorDialog.cpp:78 widgets/ErrorDialog.cpp:102
+#: widgets/ErrorDialog.cpp:98
 msgid "Help"
 msgstr "Довідка"
 
@@ -7878,7 +9388,7 @@ msgstr "Вперед"
 msgid "Backwards"
 msgstr "Назад"
 
-#: widgets/ErrorDialog.cpp:249
+#: widgets/ErrorDialog.cpp:255
 msgid "Help on the Internet"
 msgstr "Довідка у Інтернеті"
 
@@ -7886,49 +9396,53 @@ msgstr "Довідка у Інтернеті"
 msgid "Grabber"
 msgstr "Захоплення"
 
-#: widgets/Grid.cpp:643
+#: widgets/Grid.cpp:708
 #, c-format
 msgid "%d rows, %d columns"
 msgstr "%d рядків, %d стовпчиків"
 
-#: widgets/Grid.cpp:649 widgets/Grid.cpp:776
+#: widgets/Grid.cpp:714 widgets/Grid.cpp:841
 #, c-format
 msgid "Row %d"
 msgstr "Рядок %d"
 
-#: widgets/Grid.cpp:791
+#: widgets/Grid.cpp:856
 msgid "Empty"
 msgstr "Порожній"
 
-#: widgets/Meter.cpp:359
+#: widgets/Meter.cpp:392
 msgid "Enable Meter"
 msgstr "Увімкнути індикацію"
 
-#: widgets/Meter.cpp:361
+#: widgets/Meter.cpp:394
 msgid "Disable Meter"
 msgstr "Вимкнути індикацію"
 
-#: widgets/Meter.cpp:364
+#: widgets/Meter.cpp:397
 msgid "Stop Monitoring"
 msgstr "Припинити спостереження"
 
-#: widgets/Meter.cpp:366
+#: widgets/Meter.cpp:399
 msgid "Start Monitoring"
 msgstr "Почати спостереження"
 
-#: widgets/Meter.cpp:370
+#: widgets/Meter.cpp:403
 msgid "Horizontal Stereo"
 msgstr "Горизонтально стерео"
 
-#: widgets/Meter.cpp:371
+#: widgets/Meter.cpp:404
 msgid "Vertical Stereo"
 msgstr "Вертикально стерео"
 
-#: widgets/Meter.cpp:388
+#: widgets/Meter.cpp:421
 msgid "Preferences..."
 msgstr "Уподобання..."
 
-#: widgets/Meter.cpp:1078
+#: widgets/Meter.cpp:872
+msgid "Mix Volume"
+msgstr "Гучність на вході"
+
+#: widgets/Meter.cpp:1141
 msgid ""
 "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7940,11 +9454,11 @@ msgstr ""
 "обрати нижчу частоту оновлення (30 за секунду \n"
 "чи нижчу), так щоб це не вплинуло на якість звуку."
 
-#: widgets/Meter.cpp:1079
+#: widgets/Meter.cpp:1142
 msgid "Meter refresh rate per second [1-100]: "
 msgstr "Частота оновлення індикатора (разів на секунду) [1-100]: "
 
-#: widgets/Meter.cpp:1080
+#: widgets/Meter.cpp:1143
 msgid "Meter Preferences"
 msgstr "Параметри індикатора"
 
@@ -7952,7 +9466,23 @@ msgstr "Параметри індикатора"
 msgid " Please select an action "
 msgstr " Виберіть дію "
 
-#: widgets/Ruler.cpp:1478 widgets/Ruler.cpp:1479
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr "Будь ласка, оберіть дію"
+
+#: widgets/ProgressDialog.cpp:1058
+msgid "Elapsed Time:"
+msgstr "Час, що пройшов:"
+
+#: widgets/ProgressDialog.cpp:1078
+msgid "Remaining Time:"
+msgstr "Час, що залишився:"
+
+#: widgets/ProgressDialog.cpp:1095
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: widgets/Ruler.cpp:1316 widgets/Ruler.cpp:1317
 msgid "Vertical Ruler"
 msgstr "Вертикальний індикатор"
 
@@ -7963,12 +9493,6 @@ msgstr "Вертикальний індикатор"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 секунд"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "гг:хх:сс"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7994,8 +9518,23 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 днів 024 г 060 хв 060 с"
 
 #. i18n-hint: Name of time display format that shows time in hours,
-#. * minutes, seconds and milliseconds (1/1000 second)
+#. * minutes, seconds and hundreths of a second (1/100 second)
 #: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr "гг:хх:сс + соті"
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr "0100 г 060 хв 060.0100 с"
+
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and milliseconds (1/1000 second)
+#: widgets/TimeTextCtrl.cpp:297
 msgid "hh:mm:ss + milliseconds"
 msgstr "гг:хх:сс + мілісекунд"
 
@@ -8004,13 +9543,13 @@ msgstr "гг:хх:сс + мілісекунд"
 #. * abbreviation for minutes and 's' to the abbreviation for seconds (the
 #. * milliseconds are shown as decimal seconds) . Don't change the numbers
 #. * unless there aren't 60 minutes in an hour in your locale
-#: widgets/TimeTextCtrl.cpp:294
+#: widgets/TimeTextCtrl.cpp:303
 msgid "0100 h 060 m 060.01000 s"
 msgstr "0100 г 060 хв 060.01000 с"
 
 #. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and samples (at the current project sample rate)
-#: widgets/TimeTextCtrl.cpp:297
+#: widgets/TimeTextCtrl.cpp:306
 msgid "hh:mm:ss + samples"
 msgstr "гг:хх:сс + фрагменти"
 
@@ -8019,13 +9558,13 @@ msgstr "гг:хх:сс + фрагменти"
 #. * abbreviation for minutes, 's' to the abbreviation for seconds and
 #. * translate samples . Don't change the numbers
 #. * unless there aren't 60 seconds in a minute in your locale
-#: widgets/TimeTextCtrl.cpp:303
+#: widgets/TimeTextCtrl.cpp:312
 msgid "0100 h 060 m 060 s+.# samples"
 msgstr "0100 г 060 хв 060 с+.# фрагменти"
 
 #. i18n-hint: Name of time display format that shows time in samples (at the
 #. * current project sample rate)
-#: widgets/TimeTextCtrl.cpp:306
+#: widgets/TimeTextCtrl.cpp:315
 msgid "samples"
 msgstr "фрагменти"
 
@@ -8033,13 +9572,13 @@ msgstr "фрагменти"
 #. * Change the ',' to the 1000s separator for your locale, and translate
 #. * samples. If 1000s aren't a base multiple for your number system, then you
 #. * can change the numbers to an appropriate one, and put a 0 on the front
-#: widgets/TimeTextCtrl.cpp:311
+#: widgets/TimeTextCtrl.cpp:320
 msgid "01000,01000,01000 samples|#"
 msgstr "01000,01000,01000 фрагменти|#"
 
 #. i18n-hint: Name of time display format that shows time in hours, minutes,
 #. * seconds and frames at 24 frames per second (commonly used for films)
-#: widgets/TimeTextCtrl.cpp:314
+#: widgets/TimeTextCtrl.cpp:323
 msgid "hh:mm:ss + film frames (24 fps)"
 msgstr "гг:хх:сс + кадрів плівки (24 кд/с)"
 
@@ -8048,26 +9587,26 @@ msgstr "гг:хх:сс + кадрів плівки (24 кд/с)"
 #. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
 #. * for seconds and translate 'frames' . Don't change the numbers
 #. * unless there aren't 60 seconds in a minute in your locale
-#: widgets/TimeTextCtrl.cpp:320
+#: widgets/TimeTextCtrl.cpp:329
 msgid "0100 h 060 m 060 s+.24 frames"
 msgstr "0100 г 060 хв 060 с+.24 кадрів"
 
 #. i18n-hint: Name of time display format that shows time in frames (lots of
 #. * frames) at 24 frames per second (commonly used for films)
-#: widgets/TimeTextCtrl.cpp:323
+#: widgets/TimeTextCtrl.cpp:332
 msgid "film frames (24 fps)"
 msgstr "кадри плівки (24 кдр/с)"
 
 #. i18n-hint: Format string for displaying time in frames at 24 frames per
 #. * second. Translate 'frames' and leave the rest alone
-#: widgets/TimeTextCtrl.cpp:326
+#: widgets/TimeTextCtrl.cpp:335
 msgid "01000,01000 frames|24"
 msgstr "01000,01000 кадрів|24"
 
 #. i18n-hint: Name of time display format that shows time in hours, minutes,
 #. * seconds and frames at NTSC TV drop-frame rate (used for American /
 #. * Japananese TV, and very odd)
-#: widgets/TimeTextCtrl.cpp:330
+#: widgets/TimeTextCtrl.cpp:339
 msgid "hh:mm:ss + NTSC drop frames"
 msgstr "гг:хх:сс + NTSC викинуті кадри"
 
@@ -8075,14 +9614,14 @@ msgstr "гг:хх:сс + NTSC викинуті кадри"
 #. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
 #. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
 #. * for seconds and translate 'frames'. Leave the |N alone, it's important!
-#: widgets/TimeTextCtrl.cpp:335
+#: widgets/TimeTextCtrl.cpp:344
 msgid "0100 h 060 m 060 s+.30 frames|N"
 msgstr "0100 г 060 хв 060 с+.30 кадрів|N"
 
 #. i18n-hint: Name of time display format that shows time in hours, minutes,
 #. * seconds and frames at NTSC TV non-drop-frame rate (used for American /
 #. * Japananese TV, and doesn't quite match wall time
-#: widgets/TimeTextCtrl.cpp:339
+#: widgets/TimeTextCtrl.cpp:348
 msgid "hh:mm:ss + NTSC non-drop frames"
 msgstr "гг:хх:сс + NTSC non-drop кадрів"
 
@@ -8091,26 +9630,26 @@ msgstr "гг:хх:сс + NTSC non-drop кадрів"
 #. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
 #. * for seconds and translate 'frames'. Leave the | .999000999 alone,
 #. * the whole things really is slightly off-speed!
-#: widgets/TimeTextCtrl.cpp:345
+#: widgets/TimeTextCtrl.cpp:354
 msgid "0100 h 060 m 060 s+.030 frames| .999000999"
 msgstr "0100 г 060 хв 060 с+.030 кадри| .999000999"
 
 #. i18n-hint: Name of time display format that shows time in frames at NTSC
 #. * TV frame rate (used for American / Japananese TV
-#: widgets/TimeTextCtrl.cpp:348
+#: widgets/TimeTextCtrl.cpp:357
 msgid "NTSC frames"
 msgstr "NTSC кадри"
 
 #. i18n-hint: Format string for displaying time in frames with NTSC frames.
 #. * Translate 'frames' and leave the rest alone. That really is the frame
 #. * rate!
-#: widgets/TimeTextCtrl.cpp:352
+#: widgets/TimeTextCtrl.cpp:361
 msgid "01000,01000 frames|29.97002997"
 msgstr "01000,01000 кадри|29.97002997"
 
 #. i18n-hint: Name of time display format that shows time in hours, minutes,
 #. * seconds and frames at PAL TV frame rate (used for European TV)
-#: widgets/TimeTextCtrl.cpp:355
+#: widgets/TimeTextCtrl.cpp:364
 msgid "hh:mm:ss + PAL frames (25 fps)"
 msgstr "гг:хх:сс + PAL кадри (25 кд/с)"
 
@@ -8118,25 +9657,25 @@ msgstr "гг:хх:сс + PAL кадри (25 кд/с)"
 #. * and frames with PAL TV frames. Change the 'h' to the abbreviation
 #. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
 #. * for seconds and translate 'frames'. Nice simple time code!
-#: widgets/TimeTextCtrl.cpp:360
+#: widgets/TimeTextCtrl.cpp:369
 msgid "0100 h 060 m 060 s+.25 frames"
 msgstr "0100 г 060 хв 060 с+.25 кадри"
 
 #. i18n-hint: Name of time display format that shows time in frames at PAL
 #. * TV frame rate (used for European TV
-#: widgets/TimeTextCtrl.cpp:363
+#: widgets/TimeTextCtrl.cpp:372
 msgid "PAL frames (25 fps)"
 msgstr "PAL кадри (25 кд/с)"
 
 #. i18n-hint: Format string for displaying time in frames with NTSC frames.
 #. * Translate 'frames' and leave the rest alone.
-#: widgets/TimeTextCtrl.cpp:366
+#: widgets/TimeTextCtrl.cpp:375
 msgid "01000,01000 frames|25"
 msgstr "01000,01000 кадри|25"
 
 #. i18n-hint: Name of time display format that shows time in hours, minutes,
 #. * seconds and frames at CD Audio frame rate (75 frames per second)
-#: widgets/TimeTextCtrl.cpp:369
+#: widgets/TimeTextCtrl.cpp:378
 msgid "hh:mm:ss + CDDA frames (75 fps)"
 msgstr "hh:mm:ss + CDDA кадри (75 кд/с)"
 
@@ -8144,27 +9683,27 @@ msgstr "hh:mm:ss + CDDA кадри (75 кд/с)"
 #. * and frames with CD Audio frames. Change the 'h' to the abbreviation
 #. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
 #. * for seconds and translate 'frames'.
-#: widgets/TimeTextCtrl.cpp:374
+#: widgets/TimeTextCtrl.cpp:383
 msgid "0100 h 060 m 060 s+.75 frames"
 msgstr "0100 г 060 хв 060 с+.75 кадри"
 
 #. i18n-hint: Name of time display format that shows time in frames at CD
 #. * Audio frame rate (75 frames per second)
-#: widgets/TimeTextCtrl.cpp:377
+#: widgets/TimeTextCtrl.cpp:386
 msgid "CDDA frames (75 fps)"
 msgstr "CDDA кадри (75 кд/с)"
 
 #. i18n-hint: Format string for displaying time in frames with CD Audio
 #. * frames. Translate 'frames' and leave the rest alone
-#: widgets/TimeTextCtrl.cpp:380
+#: widgets/TimeTextCtrl.cpp:389
 msgid "01000,01000 frames|75"
 msgstr "01000,01000 кадри|75"
 
-#: widgets/TimeTextCtrl.cpp:451
+#: widgets/TimeTextCtrl.cpp:461
 msgid "Use right mouse button or context key to change format"
 msgstr "Використовуйте праву кнопку миші або контекстну клавішу для зміни формату"
 
-#: widgets/TimeTextCtrl.cpp:1485
+#: widgets/TimeTextCtrl.cpp:1495
 msgid "Time Control"
 msgstr "Контроль часу"
 
@@ -8179,8 +9718,8 @@ msgstr "Не вдається відкрити файл: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Помилка: %hs у рядку %d"
+msgid "Error: %hs at line %lu"
+msgstr "Помилка: %hs у рядку %lu"
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/vi.po b/locale/vi.po
index c97e9be..ec4a759 100644
--- a/locale/vi.po
+++ b/locale/vi.po
@@ -1,6 +1,5 @@
 msgid ""
-msgstr ""
-"Project-Id-Version: Audacity\n"
+msgstr "Project-Id-Version: Audacity\n"
 "Report-Msgid-Bugs-To: audacity-translation at lists.sourceforge.net\n"
 "POT-Creation-Date: 2008-04-28 22:24+0100\n"
 "PO-Revision-Date: 2008-06-26 15:07+0700\n"
@@ -24,16 +23,16 @@ msgid "OK... Audacious!"
 msgstr "OK... Audacious!"
 
 #: AboutDialog.cpp:175
-msgid "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."
-msgstr "Audacity là một chương trình miễn phí do một nhóm nhà phát triển tiên phong ở khắp nơi trên thế giới viết. Nhóm phát triển cám ơn Sourceforge.net đã cung cấp các công cụ để phát triển những dự án mã nguồn mở, và tạo điều kiện để các thành viên làm việc cùng nhau. Audacity chạy trên Windows 98 trở lên, Mac OS X, Linux và các hệ thống Unix khác. Các phiên bản cũ hơn của Audacity hoạt động tốt trên nền Mac OS 9."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
+msgstr ""
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "Đây là phiên bản thử nghiệm của chương trình, do đó không tránh khỏi những lỗi thiếu sót trong một số tính năng. Chúng tôi rất mong người dùng truy cập vào trang web của mình để gửi lại thông báo lỗi cũng như các yêu cầu về tính năng để chương trình hoàn thiện hơn trong các phiên bản sau."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "Đây là một phiên bản Audacious ổn định, được chính thức phát hành. Nếu bạn tìm thấy lỗi hoặc có gợi ý gì, xin hãy liên lạc với chúng tôi. Chúng tôi rất mong người dùng truy cập vào trang web của mình để gửi lại thông báo lỗi cũng như các yêu cầu về tính năng để chương trình hoàn thiện hơn trong các phiên bản sau."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -47,8 +46,8 @@ msgid "translator_credits"
 msgstr "Vietnamese translation by Nguyễn Đình Trung"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "Chương Trình Xử Lý Âm Thanh Số Miễn Phí"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -84,6 +83,10 @@ msgstr "Audacity dựa trên mã nguồn của những dự án sau:"
 msgid "Special thanks:"
 msgstr "Rất cám ơn:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -228,12 +231,10 @@ msgstr "Lỗi khi mở dự án"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"Không thể mở %s do nó không tồn tại.\n"
+msgstr "Không thể mở %s do nó không tồn tại.\n"
 "\n"
 "Nó đã bị loại khỏi bản ghi các dự án gần đây."
 
@@ -269,11 +270,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "Không biết tuỳ chọn của dòng lệnh: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity không tìm được nơi nào để chứa các tập tin tạm thời.\n"
+msgstr "Audacity không tìm được nơi nào để chứa các tập tin tạm thời.\n"
 "Xin hãy vào hộp thoại Tuỳ thích và chọn thư mục chứa các tập tin tạm thời."
 
 #: AudacityApp.cpp:1050
@@ -281,21 +280,17 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr "Đang thoát Audacity. Thư mục tạm thời mới sẽ được dùng trong lần chạy kế tiếp."
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"Chạy 2 tiến trình Audacity cùng lúc có thể gây ra \n"
+msgstr "Chạy 2 tiến trình Audacity cùng lúc có thể gây ra \n"
 "mất dữ liệu hay làm hỏng hệ thống của bạn.\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity không thể sử dụng thư mục tạm thời,\n"
+msgstr "Audacity không thể sử dụng thư mục tạm thời,\n"
 "có lẽ do bạn chạy 2 bản Audacity một lúc.\n"
 
 #: AudacityApp.cpp:1091
@@ -311,11 +306,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "Hệ thống phát hiện ra một bản Audacity khác đang chạy.\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"Dùng lệnh Mới hoặc Mở trên bản Audacity đang chạy \n"
+msgstr "Dùng lệnh Mới hoặc Mở trên bản Audacity đang chạy \n"
 "để mở nhiều dự án cùng lúc.\n"
 
 #: AudacityApp.cpp:1134
@@ -357,13 +350,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr "Chỉ định tên của một tập tin âm thanh hoặc dự án của Audacity để mở nó."
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Các tập tin đuôi của Audacity (.AUP) chưa được gắn kết với Audacity.\n"
+msgstr "Các tập tin đuôi của Audacity (.AUP) chưa được gắn kết với Audacity.\n"
 "\n"
 "Gắn kết chúng lại để mở tập tin .AUP bằng Audacity?"
 
@@ -376,8 +367,7 @@ msgid "Could not find any audio devices.\n"
 msgstr "Không tìm thấy thiết bị âm thanh nào.\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
 msgstr "Bạn không thể phát hoặc ghi âm.\n"
 
@@ -394,12 +384,10 @@ msgid "Latency problem"
 msgstr "Lỗi do trễ thời gian"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"Thiết lập độ trễ đã làm cho âm thanh ghi được bị dịch về phía trước mốc thời gian 0.\n"
+msgstr "Thiết lập độ trễ đã làm cho âm thanh ghi được bị dịch về phía trước mốc thời gian 0.\n"
 "Audacity đã đưa nó về mốc thời gian bắt đầu.\n"
 "Bạn phải dùng công cụ Di chuyển Thời gian (<---> hoặc F5) để lôi track âm thanh đến đúng vị trí mình cần."
 
@@ -408,11 +396,9 @@ msgid "Automatic Crash Recovery"
 msgstr "Tự động khôi phục lỗi"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"Một số dự án đã không được lưu vào đĩa cứng theo cách thông thường ở lần chạy trước. \n"
+msgstr "Một số dự án đã không được lưu vào đĩa cứng theo cách thông thường ở lần chạy trước. \n"
 "Tuy nhiên, một số dự án dưới đây có thể được phục hồi:"
 
 #: AutoRecovery.cpp:75
@@ -441,11 +427,9 @@ msgid "Recover Projects"
 msgstr "Phục hồi dự án"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"Có chắc là bạn không phục hồi dự án không?\n"
+msgstr "Có chắc là bạn không phục hồi dự án không?\n"
 " Sẽ không thể phục hồi lại nữa đâu."
 
 #: AutoRecovery.cpp:128
@@ -520,11 +504,9 @@ msgstr "Lệnh %s chưa được phát triển"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"Không đặt được các tham số của hiệu ứng %s\n"
+msgstr "Không đặt được các tham số của hiệu ứng %s\n"
 "cho %s"
 
 #: BatchCommands.cpp:583
@@ -534,12 +516,10 @@ msgstr "Không hiểu được lệnh gộp bạn tạo cho %s"
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"Áp dụng %s với (các) tham số \n"
+msgstr "Áp dụng %s với (các) tham số \n"
 "\n"
 "%s"
 
@@ -559,6 +539,10 @@ msgstr "Áp dụng %s"
 msgid "Apply Chain"
 msgstr "Áp dụng quy trình"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "&Chọn quy trình"
@@ -605,10 +589,18 @@ msgstr "Áp dung '%s' cho dự án hiện hành"
 msgid "Please save and close the current project first."
 msgstr "Xin hãy lưu và đóng dự án hiện hành trước."
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "Chọn các tập tin cần xử lý gộp..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "Mọi tập tin (*.*)|*.*|tập tin WAV (*.wav)|*.wav|tập tin AIFF  (*.aif)|*.aif|tập tin AU (*.au)|*.au|tập tin MP3 (*.mp3)|*.mp3|tập tin Ogg Vorbis (*.ogg)|*.ogg|tập tin FLAC (*.flac)|*.flac"
@@ -720,12 +712,10 @@ msgid "Copying audio data into project..."
 msgstr "Đang chép dữ liệu âm thanh vào dự án..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"Dự án của bạn hiện đang phụ thuộc vào sự tồn tại của những tập tin khác từ bên ngoài.\n"
+msgstr "Dự án của bạn hiện đang phụ thuộc vào sự tồn tại của những tập tin khác từ bên ngoài.\n"
 "Bạn có muốn chép lại các tập tin âm thanh vào trong dự án để xoá bỏ sự phụ thuộc không?\n"
 "Việc này sẽ lấy thêm dung lượng đĩa cứng, nhưng dự án của bạn sẽ \"an toàn\" hơn."
 
@@ -792,11 +782,9 @@ msgid "Dependency check"
 msgstr "Kiểm tra sự phụ thuộc"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
-msgstr ""
-"Cảnh báo: còn rất ít chỗ trống trên đĩa cứng.\n"
+msgstr "Cảnh báo: còn rất ít chỗ trống trên đĩa cứng.\n"
 "Hãy chọn một thư mục tạm thời khác trong phần Tuỳ chọn"
 
 #: DirManager.cpp:221
@@ -819,11 +807,9 @@ msgstr "Xoá thư mục đệm"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity tìm thấy một tập tin dư thừa %s!\n"
+msgstr "Audacity tìm thấy một tập tin dư thừa %s!\n"
 "Hãy lưu và nap lai dự án để kiểm tra tổng thế.\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
@@ -848,16 +834,16 @@ msgstr "Không thể xoá bỏ '%s'"
 msgid "Renamed file: %s\n"
 msgstr "Tập tin đã đổi tên: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "Đang thay đổi khối %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "Không thể đổi tên '%s' thành '%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -884,21 +870,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "Thiếu tập tin dữ liệu: (%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"Quá trình kiểm tra dự án tìm thấy lỗi mâu thuẫn trong các dữ liệu được nạp vào;\n"
+msgstr "Quá trình kiểm tra dự án tìm thấy lỗi mâu thuẫn trong các dữ liệu được nạp vào;\n"
 "nhấn nút 'Chi tiết' để xem thông báo lỗi, hoặc nhấn 'OK' để tiếp tục chọn lựa khác."
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"Quá trình kiểm tra dự án tìm ra %d dữ liệu thừa. Những dữ liệu này\n"
+msgstr "Quá trình kiểm tra dự án tìm ra %d dữ liệu thừa. Những dữ liệu này\n"
 "không được dùng tới, có lẽ do sự cố dừng chương trình bất ngờ ở lần chạy trước hoặc do lỗi khi chạy chương trình.\n"
 "Nên xoá bỏ chúng để giải phóng đĩa cứng."
 
@@ -927,15 +909,13 @@ msgstr "Cảnh báo"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"Quá trình kiểm tra dự án thấy thiếu %d tập tin đầu vào đã được dùng làm ('alias files').\n"
+msgstr "Quá trình kiểm tra dự án thấy thiếu %d tập tin đầu vào đã được dùng làm ('alias files').\n"
 "Audacity không thể tự động phục hồi những tập tin này. Bạn có thể chọn giữa\n"
 "chính thức điền khoảng lặng vào phần tập tin bị thiếu,\n"
 " tạm thời điền khoảng lặng vào (chỉ trong phiên làm việc này),\n"
@@ -958,12 +938,10 @@ msgstr "Lập tức đóng dự án lại và giữ nguyên hiện trạng"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"Quá trình kiểm tra dự án thấy thiếu %d tập tin tổng hợp (.auf).\n"
+msgstr "Quá trình kiểm tra dự án thấy thiếu %d tập tin tổng hợp (.auf).\n"
 "Audacity có thể phục hồi đầy đủ các tập tin thiếu từ\n"
 "dữ liệu ban đầu có trong dự án."
 
@@ -977,16 +955,14 @@ msgstr "Dùng khoảng lặng để thay thế dữ liệu bị mất [chỉ phi
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"Quá trình kiểm tra dự án thấy thiếu %d tập tin âm thanh (.au). \n"
+msgstr "Quá trình kiểm tra dự án thấy thiếu %d tập tin âm thanh (.au). \n"
 "Nguyên nhân có thể do lỗi chương trình, lỗi dừng chương trình bất ngờ hoặc do bạn lỡ tay xoá.\n"
 "Audacity không thể tự động phục hồi các dữ liệu đã mất\n"
 "Bạn có thể chọn để chính thức điền khoảng lặng vào phần dữ liệu bị mất,\n"
@@ -1021,6 +997,95 @@ msgstr "Đang lưu dữ liệu âm thanh ghi âm được vào đĩa cứng..."
 msgid "Rectangular"
 msgstr "Chữ nhật"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "Vị trí của %s:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "Để tìm %s, nhấn vào đây -->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "Duyệt..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "%s ở đâu thế?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "Bộ phân tích tần số"
@@ -1049,8 +1114,9 @@ msgstr "Tự tương quan tăng"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "Thuật toán:"
 
 #: FreqWindow.cpp:168
@@ -1064,9 +1130,9 @@ msgstr "Kích thước"
 msgid " window"
 msgstr "cửa sổ"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "Hàm:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1076,9 +1142,9 @@ msgstr "Tần số tuyến tính"
 msgid "Log frequency"
 msgstr "Tần số logarit"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "Trục:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1087,6 +1153,10 @@ msgstr "Trục:"
 msgid "&Export..."
 msgstr "&Xuất..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "Xuất"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1273,8 +1343,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr "<p>Để ghi đĩa dự án ra đĩa CD, trước hết, bạn hãy [[export|xuất]] dự án ra định dạng WAV hoặc AIFF. Tập tin xuất ra nên để ở chế độ stereo tần số 44100 Hz (thiết lập ghi trên nút \"Tần số của dự án\" nằm ở góc dưới bên trái) và mã hoá 16 bit (nhấn nút \"Tuỳ chọn\" trong hộp thoại xuất tập tin). Đây là các thiết lập mặc định của Audacity, nên thường thì bạn không cần chỉnh lại chúng khi xuất tập tin. <p>Ghi tập tin xuất ra vào một đĩa \"audio CD\" - không ghi vào đĩa \"data CD\" hoặc \"MP3 CD\" - bằng chương trình ghi đĩa như iTunes hay Windows Media Player. Xin xem thêm trang wiki [[wiki:How_to_burn_CDs|Cách ghi đĩa CDs]]. </p><p>"
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>Không có tập tin trợ giúp của Audacity trên máy bạn. Bạn có thể <a href=\"http://audacity.sourceforge.net/help/documentation\">tải về máy</a> các tập tin trợ giúp rồi truy cập vào từ Audacity và thử lại, hoặc nhấn vào <a href=\"*URL*\">đây</a> để xem trợ giúp trực tuyến."
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1378,13 +1448,11 @@ msgid "New..."
 msgstr "Má»›i..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"Bạn đã bỏ trống tên nhãn. Dải âm thanh này sẽ \n"
+msgstr "Bạn đã bỏ trống tên nhãn. Dải âm thanh này sẽ \n"
 "bị bỏ qua khi phục hồi Nhãn dải âm.\n"
 "\n"
 "Bạn có muốn quay lại và đặt tên cho nhãn không?"
@@ -1450,11 +1518,9 @@ msgstr "Chọn ngôn ngữ sẽ dùng:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"Đã chuyển tập tin dự án phiên bản 1.0 sang định dạng mới.\n"
+msgstr "Đã chuyển tập tin dự án phiên bản 1.0 sang định dạng mới.\n"
 "Tập tin cũ đã được lưu thành '%s'"
 
 #: Legacy.cpp:357
@@ -1486,6 +1552,10 @@ msgstr "&Lưu Dự án\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "Lưu &như dự án mới..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "&Kiểm tra phụ thuộc..."
@@ -1494,6 +1564,10 @@ msgstr "&Kiểm tra phụ thuộc..."
 msgid "Open Me&tadata Editor..."
 msgstr "Soạn thảo &dữ liệu đặc tả..."
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "&Nhập"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "Âm t&hanh...\tCtrl+Shift+I"
@@ -1523,6 +1597,10 @@ msgstr "Xuất &nhãn..."
 msgid "Export &Multiple..."
 msgstr "Xuất ra &nhiều tập tin"
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "Quy trình CleanSpeec&h..."
@@ -1603,9 +1681,9 @@ msgstr "&Xoá\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "Chia &và Xoá\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "Chèn khoảng &lặng\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1619,23 +1697,21 @@ msgstr "Chia và tạo &mới\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "&Ghép nối\tCtrl+j"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "Bỏ ghé&p nối\tCtrl+Alt+j"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "N&hân đôi\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "Stereo sang &Mono"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "Vùng &có nhãn..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1678,13 +1754,13 @@ msgid "&Join\tAlt+J"
 msgstr "&Ghép nối\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "Bỏ ghé&p nối\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "&Chọn..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1714,9 +1790,9 @@ msgstr "Con &trỏ đến hết"
 msgid "Find &Zero Crossings\tZ"
 msgstr "Tìm điểm biên độ bằng &không\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "&Di chuyển con trỏ..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1742,9 +1818,9 @@ msgstr "&Lưu vùng"
 msgid "Regio&n Restore"
 msgstr "Phụ&c hồi vùng"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "Phát &vùng..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1770,9 +1846,14 @@ msgstr "Bật chế độ dính vào toạ độ"
 msgid "Turn Grid Snap Off"
 msgstr "Tắt chế độ dính vào toạ độ"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "&Tuỳ chỉnh...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1818,9 +1899,9 @@ msgstr "Hiện &ghim tín hiệu"
 msgid "&History..."
 msgstr "Đã &làm..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "&Thanh công cụ..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1863,13 +1944,71 @@ msgstr "Thiết &lập lại"
 msgid "!Simplified View"
 msgstr "Đơn giản"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "Nhảy về đầu\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "Chuyển về cuối\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "&Dải âm"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "Thêm &mới..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1884,10 +2023,6 @@ msgstr "Dải &stereo"
 msgid "&Time Track"
 msgstr "Dải &thời gian"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "&Ghi âm định thời..."
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "Trộn và &Diễn tả"
@@ -1944,13 +2079,21 @@ msgstr "Xếp đuôi về &cuối vùng chọn"
 msgid "Align Tracks To&gether"
 msgstr "Xếp các dải âm &cùng nhau"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "&Xếp dải âm..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "Xế&p và di chuyển con trỏ..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1960,22 +2103,26 @@ msgstr "Thêm &Nhãn cho vùng chọn\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "Thêm nhãn từ vị trí &phát lại\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "&Sắp xếp dải âm theo..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "&Thời gian bắt đầu"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "&Tên"
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "Tạo â&m"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "&Hiệu ứng"
@@ -2009,6 +2156,10 @@ msgstr "&Xin chào..."
 msgid "&Index..."
 msgstr "Chỉ &mục..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "&Công cụ chụp ảnh màn hình..."
@@ -2021,13 +2172,13 @@ msgstr "&Kiểm thử..."
 msgid "&Audio Device Info..."
 msgstr "&Thông tin phần cứng"
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "Di chuyển ngược giữa Bảng neo, Đồ thị âm thanh và Thanh vùng chọn\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "Di chuyển xuôi giữa Bảng neo, Đồ thị Âm thanh và Thanh Vùng chọn\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2061,9 +2212,9 @@ msgstr "Công cụ kế\tD"
 msgid "Previous Tool\tA"
 msgstr "Công cụ trước\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "Phát/Dừng\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2097,22 +2248,14 @@ msgstr "Phát đến vùng chọn\tB"
 msgid "Play Looped\tL"
 msgstr "Phát nhiều lần\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "Phát nhiều lần\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "Phát Cắt Xem trước\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "Nhảy về đầu\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "Chuyển về cuối\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "Chọn về đầu\tShift+Home"
@@ -2169,9 +2312,9 @@ msgstr "Chọn/thôi chọn dải\tReturn"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "Chọn/thôi chọn dải\tNUMPAD_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "Chọn/thôi chọn dải\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2269,15 +2412,19 @@ msgstr "Bật chế độ dính"
 msgid "Snap To Off"
 msgstr "Tắt chế độ dính"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "Mở gần đây"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "Mở &gần đây..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2334,6 +2481,23 @@ msgstr "Lặp lại %s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "Không có nhãn dải âm nào để xuất"
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "Không thể huỷ bước"
@@ -2377,6 +2541,10 @@ msgstr "Đã dán văn bản từ bảng kẹp tạm"
 msgid "Pasted from the clipboard"
 msgstr "Đã dán từ bảng kẹp tạm"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "Không thể chép âm thanh stereo sang dải mono."
@@ -2546,9 +2714,9 @@ msgstr "Nhập nhãn"
 msgid "Select a MIDI file..."
 msgstr "Chọn một tập tin MIDI..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "Tất cả (*.*)|*.*|Tập tin MIDI (*.mid)|*.mid|Tập tin Allegro(*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2567,14 +2735,6 @@ msgstr "Chọn tập tin âm thanh không nén..."
 msgid "All files (*)|*"
 msgstr "Tất cả (*)|*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "Nhập"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "Sửa các thẻ dữ liệu đặc tả"
@@ -2648,6 +2808,14 @@ msgstr "Đã xếp"
 msgid "Align"
 msgstr "Xếp"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "Tạo dải âm mới"
@@ -2714,15 +2882,15 @@ msgid "Removed audio track(s)"
 msgstr "Đã xoá bỏ dải âm"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "Tốc độ lấy mẫu mới (Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "Đổi tốc độ lấy mẫu"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "Tốc độ lấy mẫu mới (Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "Giá trị bạn nhập không hợp lệ"
@@ -2790,15 +2958,13 @@ msgid "Save changes before closing?"
 msgstr "Có lưu các thay đổi trước khi đóng không?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "Dự án được lưu sẽ được xoá sạch!!\n"
 "\n"
 "Để lưu lại các dải âm đã được mở trước kia\n"
@@ -2824,16 +2990,14 @@ msgstr "Dự án Audacity|*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"Audacity %s đã lưu tập tin này.\n"
+msgstr "Audacity %s đã lưu tập tin này.\n"
 "Đây là một phiên bản rất cũ. Định dạng Audacity dùng\n"
 "đã thay đổi rất nhiều. \n"
 "Rất có thể trong quá trình mở,\n"
@@ -2858,11 +3022,9 @@ msgstr "Lỗi khi mở tập tin"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"Tập tin không hợp lệ hoặc bị hỏng: \n"
+msgstr "Tập tin không hợp lệ hoặc bị hỏng: \n"
 "%s"
 
 #: Project.cpp:1847
@@ -2901,12 +3063,10 @@ msgstr "Không tìm thấy thư mục dữ liệu của dự án: \"%s\""
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"Audacity %s đã lưu tập tin này.\n"
+msgstr "Audacity %s đã lưu tập tin này.\n"
 "Bạn đang dùng Audacity %s - bạn cần nâng cấp lên\n"
 "phiên bản mới để mở nó."
 
@@ -2916,24 +3076,34 @@ msgstr "Không mở được tập tin dự án"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"Audacity %s đã lưu tập tin này.\n"
+msgstr "Audacity %s đã lưu tập tin này.\n"
 "Phiên bản Audacity này có thể mở nó, nhưng nếu bạn lưu lại dự án bằng phiên bản này, bạn không thể mở tập tin bằng phiên bản trước được nữa.\n"
 "Bạn có muốn mở tập tin này không?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"Không thể lưu dự án. Có lẽ %s không được ghi,\n"
-"hoặc đĩa đã đầy."
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2945,22 +3115,19 @@ msgstr "Có lỗi khi lưu dự án"
 msgid "Saved %s"
 msgstr "Đã lưu %s"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Thô"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "Đang nhập %s..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "Đã nhập '%s'"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "Nhập"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -2974,19 +3141,23 @@ msgstr "Lưu Speech thành:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Tập tin PCM của Windows (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Tập tin dự án Audacity (.aup) cho phép bạn lưu tất cả dữ liệu bạn đang xử lý một cách chính xác\n"
-"như trên màn hình, nhưng hầu hết các chương trình khác lại không thể mở tập tin loại này.\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"Khi bạn muốn lưu một tập tin để mở bằng một chương trình khác, hãy chọn lệnh\n"
-"Export."
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3031,6 +3202,16 @@ msgstr "Dung lượng trống trên đĩa còn đủ để thu %d giây."
 msgid "Out of disk space"
 msgstr "Hết dung lượng đĩa trống"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "Không thể xoá tập tin lưu tự động đã cũ:"
@@ -3117,49 +3298,13 @@ msgstr "Xe&m trÆ°á»›c"
 msgid "&Debug"
 msgstr "&Sá»­a lá»—i"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Bộ thu âm định thời của Audacity"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "Bắt đầu thu âm"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "Kết thúc thu âm"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "Độ dài"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Quá trình ghi âm thông minh của Audacity"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "Ngày giờ bắt đầu"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "Ngày giờ kết thúc"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "Đang chờ để bắt đầu ghi âm tại %s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Trình thu âm thông minh của Audacity - Đang chờ bắt đầu"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3200,10 +3345,9 @@ msgstr "Thể loại"
 msgid "Comments"
 msgstr "Ghi chú"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "Nhấn F2 hoặc click đúp để chỉnh sửa."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3223,16 +3367,13 @@ msgstr "&Xoá"
 msgid "Genres"
 msgstr "Thể loại"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "Chỉnh sửa"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "Thiết lập lại"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3302,6 +3443,16 @@ msgstr "Bạn có chắc là sẽ thiết lập lại danh sách thể loại v
 msgid "Unable to open genre file."
 msgstr "Không mở được tập tin thể loại."
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "Lỗi nạp dữ liệu đặc tả"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3311,206 +3462,139 @@ msgstr "Không mở được tập tin thể loại."
 msgid "Save Metadata As:"
 msgstr "Lưu Dữ liệu đặc tả thành:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "Lỗi nạp dữ liệu đặc tả"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "Tiêu đề:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "Nghệ sĩ:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "Album:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "Soạn nhạc:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "Soạn lời:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "Chú thích:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "Mã hoá bởi:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "Bản quyền:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "Thứ tự trên album:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "Năm:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "Thể loại:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "Không có thể loại"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "Đặt lại thành mặc định"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "Cơ bản"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "Nâng cao"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "Giá trị"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "X&oá"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "Độ dài tối đa của thuộc tính '%s' là %d ký tự. Dữ liệu đã được cắt ngắn."
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "Tiêu đề"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "Nghệ sĩ"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "Album"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity không ghi được tập tin:\n"
+msgstr "Audacity không ghi được tập tin:\n"
 "  %s/"
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"Audacity không mở được tập tin:\n"
+msgstr "Audacity không mở được tập tin:\n"
 "  %s\n"
 "để ghi."
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity không thể ghi ảnh minh hoạ vào tập tin:\n"
+msgstr "Audacity không thể ghi ảnh minh hoạ vào tập tin:\n"
 "  %s."
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity không tìm thấy tập tin:\n"
+msgstr "Audacity không tìm thấy tập tin:\n"
 "  %s.\n"
 "Chưa nạp sắc thái giao diện."
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity không thể nạp tập tin:\n"
+msgstr "Audacity không thể nạp tập tin:\n"
 "  %s.\n"
 "Có lẽ do lỗi định dạng png?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity không hiển thị được sắc thái giao diện mặc định.\n"
+msgstr "Audacity không hiển thị được sắc thái giao diện mặc định.\n"
 "Xin hãy thông báo lại lỗi này."
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
-msgstr ""
-"Không tìm thấy các tập tin cấu thành\n"
+msgstr "Không tìm thấy các tập tin cấu thành\n"
 "sắc thái giao diện trong:\n"
 "  %s."
 
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"Không tạo được thư muc:\n"
+msgstr "Không tạo được thư muc:\n"
 "  %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"Không lưu được tập tin: \n"
+msgstr "Không lưu được tập tin: \n"
 "  %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"Tất cả các tập tin cần thiết:\n"
+msgstr "Tất cả các tập tin cần thiết:\n"
 "  %s\n"
 "đều đang hiện hữu."
 
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "Độ dài"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Bộ thu âm định thời của Audacity"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "Bắt đầu thu âm"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "Kết thúc thu âm"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "Ngày giờ bắt đầu"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "Ngày giờ kết thúc"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "Đang chờ để bắt đầu ghi âm tại %s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
 msgid "Track Panel"
@@ -3805,6 +3889,14 @@ msgstr "Đã điều chỉnh cân bằng trái/phải"
 msgid "Adjusted gain"
 msgstr "Đã điều chỉnh độ khuếch đại"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "Không thể xoá dải âm đang hoạt động"
@@ -3862,14 +3954,6 @@ msgstr "Thay đổi tốc độ lấy mẫu"
 msgid "Format Change"
 msgstr "Thay đổi định dạng"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "Nhập vào tần số lấy mẫu (Hz) từ 1 đến 100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "Tốc độ này không hợp lệ"
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "Chuyển tốc độ giới hạn dưới (%) thành:"
@@ -4008,24 +4092,21 @@ msgstr "Trình bổ sung 1 đến %i"
 msgid "Plugins %i to %i"
 msgstr "Trình bổ sung %i đến %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "Không cho phép vì một lý do nào đó. Có chọn âm thanh trước không?"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"Bạn chỉ có thể thực thi việc này khi không phát hay thu\n"
+msgstr "Bạn chỉ có thể thực thi việc này khi không phát hay thu\n"
 "[Vẫn làm được nếu Tạm dừng]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
-msgstr ""
-"Bạn phải chọn âm thanh stereo trước khi thực thi lệnh này\n"
+msgstr "Bạn phải chọn âm thanh stereo trước khi thực thi lệnh này\n"
 "[Không được dùng âm thanh mono]"
 
 #: commands/CommandManager.cpp:785
@@ -4033,16 +4114,14 @@ msgid "You must first select some audio for this to use."
 msgstr "Bạn phải chọn âm thanh để thực thi lệnh này."
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
-msgstr ""
-"Bạn phải chọn âm thanh để thực thi lệnh này.\n"
+msgstr "Bạn phải chọn âm thanh để thực thi lệnh này.\n"
 " [Không chọn các loại dải âm khác.]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "Thông báo"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4062,14 +4141,19 @@ msgstr "Đã áp dụng hiệu ứng: %s %.1f dB"
 msgid "Amplify"
 msgstr "Khuếch đại"
 
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "Hiệu ứng Khuếch đại do Dominic Mazzoni viết"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "Độ khuếch đại (dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "Đỉnh khuếch đại mới (dB):"
@@ -4199,10 +4283,18 @@ msgstr "viết bởi Nasca Octavian Paul"
 msgid "Frequency (Hz):"
 msgstr "Tần số (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "Độ khuếch đại (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "Tăng âm Trầm..."
@@ -4246,8 +4338,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "dùng SoundTouch, viết bởi Olli Parviainen"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "Độ cao:   từ"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "Ná»­a cung:"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4257,13 +4390,9 @@ msgstr "Độ cao:   từ"
 msgid "to"
 msgstr "đến"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "Ná»­a cung:"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "Tần số (Hz):   từ"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4271,6 +4400,11 @@ msgstr "Tần số (Hz):   từ"
 msgid "Percent Change:"
 msgstr "Phần trăm thay đổi:"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "Thay đổi độ cao..."
@@ -4289,6 +4423,14 @@ msgstr "Đã áp dụng hiệu ứng: %s %.1f%%"
 msgid "Change Speed"
 msgstr "Thay đổi tốc độ"
 
+#. i18n-hint: n/a is an English
+#. abbreviation meaning "not
+#. applicable" (in other words,
+#. unimportant, not relevant).
+#: effects/ChangeSpeed.cpp:364
+msgid "n/a"
+msgstr "n/a"
+
 #: effects/ChangeSpeed.cpp:308
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "Thay đổi tốc độ là thay đổi cả nhịp điệu và độ cao của âm"
@@ -4297,17 +4439,17 @@ msgstr "Thay đổi tốc độ là thay đổi cả nhịp điệu và độ ca
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "dùng tốc độ lấy mẫu, viết bởi Erik de Castro Lopo"
 
-#. i18n-hint: n/a is an English
-#. abbreviation meaning "not
-#. applicable" (in other words,
-#. unimportant, not relevant).
-#: effects/ChangeSpeed.cpp:364
-msgid "n/a"
-msgstr "n/a"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "Tốc độ đĩa Vinyl chuẩn:    từ"
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4325,13 +4467,29 @@ msgstr "Thay đổi nhịp điệu"
 msgid "Change Tempo without Changing Pitch"
 msgstr "Thay đổi nhịp điệu mà không đổi độ cao"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "Số nhịp một phút (BPM):    từ"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "Độ dài (giây):    từ"
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4341,8 +4499,9 @@ msgstr "Thay đổi nhịp điệu..."
 msgid "Changing Tempo"
 msgstr "Đang thay đổi nhịp điệu"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "Xoá 'click'"
 
 #: effects/ClickRemoval.cpp:336
@@ -4353,10 +4512,18 @@ msgstr "Xoá tiếng 'click' và 'bốp' viết bởi Craig DeForest"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "Chọn ngưỡng (càng bé càng nhạy):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "Độ rộng tối đa của đinh nhọn (càng to càng nhạy):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "Xoá 'Click'..."
@@ -4369,49 +4536,86 @@ msgstr "Đang xoá nhiễu 'click' và 'bụp'..."
 msgid "Dynamic Range Compressor"
 msgstr "Bộ nén dải động"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "Bộ nén dải động do Dominic Mazzoni viết"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "Tỉ lệ:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "Thời gian nén:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "Thời gian suy hao:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "Chuẩn hoá về 0dB sau khi nén"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "Ngưỡng: %d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "Tỉ lệ: %.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "Tỉ lệ: %.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "Thời gian nén: %.1f giây"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
+#, c-format
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "Thời gian suy tàn: %.1f giây"
 
 #: effects/Compressor.h:36
@@ -4422,6 +4626,251 @@ msgstr "Bộ nén tiếng..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "Đang áp dụng bộ nén dải động"
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "Bắt đầu"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "Kết thúc"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "Thiết lập lại"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "Điều khiển"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "Bộ phát tone DTMF"
@@ -4678,6 +5127,10 @@ msgstr "Đảo"
 msgid "Inverting"
 msgstr "Đang đảo"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "Cân bằng âm lượng"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "Không có gì-bỏ qua"
@@ -4702,29 +5155,26 @@ msgstr "Nặng hơn"
 msgid "Heaviest"
 msgstr "Nặng nhất"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "Cân bằng âm lượng"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "Cân bằng âm lượng, viết bởi Lynn Allan"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "Cân bằng các vùng tiếng nhỏ và to"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "viết bởi Lynn Allan"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "Mức độ cân bằng"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "Ngưỡng của tín hiệu nhiễu (Xì/Ùm/Nhiễu ngoài)"
 
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "Ngưỡng của tín hiệu nhiễu:"
 
 #: effects/Leveller.h:28
@@ -4735,6 +5185,158 @@ msgstr "Cân bằng âm lượng..."
 msgid "Applying Leveller..."
 msgstr "Đang cân bằng âm lượng..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "Bá»™ trá»™n"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "Dịch pha"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "Xoá nhiễu"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "Trắng"
@@ -4770,31 +5372,23 @@ msgstr "Đang tạo nhiễu"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"Không mở được tập tin:\n"
+msgstr "Không mở được tập tin:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "Cố gắng Xoá nhiễu mà không phân tích nhiễu.\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "Xoá nhiễu"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "BÆ°á»›c 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"Chọn vùng có nhiễu để phân tích,\n"
+msgstr "Chọn vùng có nhiễu để phân tích,\n"
 "Bấm nút 'Phân tích nhiễu' sau khi chọn:"
 
 #: effects/NoiseRemoval.cpp:815
@@ -4802,11 +5396,9 @@ msgid "Step 2"
 msgstr "BÆ°á»›c 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"Chọn tất cả các vùng bạn cần xoá nhiễu, chọn hệ số lọc nhiễu, sau đó\n"
+msgstr "Chọn tất cả các vùng bạn cần xoá nhiễu, chọn hệ số lọc nhiễu, sau đó\n"
 "nhấn 'OK' để bắt đầu xoá nhiễu.\n"
 
 #: effects/NoiseRemoval.cpp:821
@@ -4821,14 +5413,26 @@ msgstr "Phân tích nhiễu"
 msgid "Noise reduction (dB):"
 msgstr "Giảm biên độ nhiễu (dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "Làm mượt dải tần (Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "Thời gian tác động/suy hao (giây):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "Xoá nhiễu..."
@@ -4869,22 +5473,22 @@ msgstr ", biên độ lớn nhất = %.1f dB"
 msgid "Normalize"
 msgstr "Chuẩn hoá"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "Chuẩn hoá, viết bởi Dominic Mazzoni"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "Xoá thành phần 1 chiều (căn về 0 theo chiều dọc)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "Chuẩn hoá biên độ lớn nhất về"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "Chuẩn hoá..."
@@ -4898,44 +5502,56 @@ msgstr "Đang chuẩn hoá..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "Đã áp dụng hiệu ứng: %s %d tầng, %.0f%% làm ướt tiếng, tần số = %.1f Hz, pha ban đầu = %.0f độ, độ sâu = %d, hồi tiếp = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "Dịch pha"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "Dịch pha, viết bởi Nasca Octavian Paul"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "Số tầng:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "KHÔ"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "ƯỚT"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "Bộ dao động tần thấp (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "Pha ban đầu của dao động (độ):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "Độ sâu:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "Hồi tiếp (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "Dịch pha..."
@@ -4945,15 +5561,21 @@ msgid "Applying Phaser"
 msgstr "Đang dịch pha"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"Hiệu ứng Sửa chữa chỉ áp dụng cho một vùng âm thanh bị hỏng rất ngắn (tối đa 128 mẫu).\n"
+msgstr "Hiệu ứng Sửa chữa chỉ áp dụng cho một vùng âm thanh bị hỏng rất ngắn (tối đa 128 mẫu).\n"
 "\n"
 "Phóng to và chọn khung thời gian cần sửa chữa."
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "Đang sửa chữa âm thanh bị hỏng"
@@ -4972,30 +5594,25 @@ msgstr "Dải âm quá dài nên không thể lặp lại vùng chọn."
 msgid "Repeat"
 msgstr "Lặp lại"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "Lặp lại, viết bởi Dominic Mazzoni && Vaughan Johnson"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "Số lần lặp lại:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "Độ dài vùng chọn mới:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d phút, %d giây"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d giây"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5043,11 +5660,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "Xoá đỉnh nhọn, viết bởi Lynn Allan"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"Độ dài tối đa của đỉnh nhọn (mili giây): \n"
+msgstr "Độ dài tối đa của đỉnh nhọn (mili giây): \n"
 "(99999 hoặc lớn hơn là tắt)"
 
 #: effects/SpikeCleaner.cpp:178
@@ -5062,10 +5677,60 @@ msgstr "Xoá đỉnh nhọn..."
 msgid "Applying Spike Cleaner..."
 msgstr "Đang xoá đỉnh nhọn..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "Stereo sang &Mono"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "Chuyển Stereo thành Mono"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5113,17 +5778,21 @@ msgstr "Tần số (Hz)"
 msgid "Waveform:"
 msgstr "Dạng sóng:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "Bắt đầu"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "Kết thúc"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5154,10 +5823,6 @@ msgstr "Tất cả các dải âm phải có cùng tốc độ lấy mẫu"
 msgid "Truncate Silence"
 msgstr "Cắt bỏ khoảng lặng"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "viết bởi Lynn Allan"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "Độ dài tối đa của khoảng lặng:"
@@ -5205,10 +5870,6 @@ msgstr "Đã áp dụng hiệu ứng: %s tần số = %.1f Hz, pha ban đầu =
 msgid "Wahwah"
 msgstr "Wahwah"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "Wahwah, được viết bởi Nasca Octavian Paul"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "Độ sâu (%):"
@@ -5217,10 +5878,18 @@ msgstr "Độ sâu (%):"
 msgid "Resonance:"
 msgstr "Cộng hưởng:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "Độ di tần của Wah (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "Wahwah..."
@@ -5259,6 +5928,18 @@ msgstr "Thiết lập hiệu ứng"
 msgid "Length (seconds)"
 msgstr "Độ dài (giây)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "Đang áp dụng hiệu ứng Nyquist..."
@@ -5326,13 +6007,13 @@ msgstr "Thiết lập phần bổ sung"
 msgid "Program"
 msgstr "Chương trình"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"Chưa chọn dải âm! Nhấn Ctrl+A (Chọn tất cả)\n"
-"Chọn Xuất... để xuất tất cả các dải âm."
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5348,14 +6029,12 @@ msgstr "Bạn chắc chắn mình muốn lưu tập tin thành \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"Bạn chuẩn bị lưu tập tin %s với tên \"%s\".\n"
+msgstr "Bạn chuẩn bị lưu tập tin %s với tên \"%s\".\n"
 "\n"
 "Thông thường tập tin kiểu này kết thúc với \".%s\" và một số chương trình sẽ không mở được chúng nếu bạn dùng đuôi khác.\n"
 "\n"
@@ -5391,6 +6070,10 @@ msgstr " - Trái"
 msgid " - Right"
 msgstr " - Phải"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5428,10 +6111,6 @@ msgstr "(chương trình bên ngoài)"
 msgid "Cannot export audio to %s"
 msgstr "Không thể xuất âm thanh ra %s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "Xuất"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "Xuất âm thanh đã chọn dùng bộ mã hoá bằng dòng lệnh"
@@ -5444,6 +6123,477 @@ msgstr "Xuất toàn bộ dự án dùng bộ mã hoá bằng dòng lệnh"
 msgid "Command Output"
 msgstr "Đầu ra của lệnh"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "Tốc độ lấy mẫu không hợp lệ"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "Bạn có thể đổi tốc độ lấy mẫu sang các giá trị dưới đây."
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "Tốc độ lấy mẫu"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "Tốc độ bit:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "Định dạng:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "Ngôn ngữ:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "Chất lượng:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "Tập tin XML (*.xml)|*.xml|Mọi tập tin (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "Chỉ định tuỳ chọn FLAC"
@@ -5524,10 +6674,6 @@ msgstr "Chỉ định tuỳ chọn MP2"
 msgid "MP2 Export Setup"
 msgstr "Thiết lập việc xuất MP2"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "Tốc độ bit:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "Tập tin MP2"
@@ -5648,35 +6794,15 @@ msgstr "Định vị Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity yêu cầu tập tin %s để tạo MP3"
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "Vị trí của %s:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "Để tìm %s, nhấn vào đây -->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "Duyệt..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "Để lấy một bản sao miễn phí của Lame, nhấn vào đây -->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "Tải về..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "%s ở đâu thế?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5741,39 +6867,23 @@ msgstr "Đang xuất toàn bộ tập tin ở tốc độ %d Kbps"
 msgid "Error %d returned from MP3 encoder"
 msgstr "Gặp %d lỗi khi mã hoá MP3"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "Tốc độ lấy mẫu không hợp lệ"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
-msgstr ""
-"định dạng MP3 không hỗ trợ\n"
+msgstr "định dạng MP3 không hỗ trợ\n"
 "Tốc độ lấy mẫu của dự án (%d). "
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
-msgstr ""
-"Định dạng MP3 không hỗ trợ\n"
+msgstr "Định dạng MP3 không hỗ trợ\n"
 "Tốc độ lấy mẫu (%d) và tốc độ bit (%d kbps) của dự án."
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "Bạn có thể đổi tốc độ lấy mẫu sang các giá trị dưới đây."
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "Tốc độ lấy mẫu"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "Không tìm thấy Phần bổ sung xuất dạng MP3"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
@@ -5783,13 +6893,11 @@ msgid "Export Multiple"
 msgstr "Xuất ra nhiều tập tin"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"Nếu bạn có nhiều hơn một dải âm thanh, bạn có thể xuẩt riêng từng dải thành các tập tin độc lập,\n"
+msgstr "Nếu bạn có nhiều hơn một dải âm thanh, bạn có thể xuẩt riêng từng dải thành các tập tin độc lập,\n"
 "hoặc nếu bạn có những dải âm có nhãn, bạn có thể xuất từng nhãn ra các tập tin riêng.\n"
 "Dự án này không chứa nhiều dải âm hoặc nhiều Nhãn, nên bạn không thể xuất chúng nhiều tập tin."
 
@@ -5834,6 +6942,10 @@ msgstr "Tính cả âm thanh trước nhãn đầu tiên"
 msgid "First file name:"
 msgstr "Tên tập tin đầu tiên:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "Các Dải âm"
@@ -5854,14 +6966,14 @@ msgstr "Đánh số tuần tự"
 msgid "File name prefix:"
 msgstr "Tiền tố của tên tập tin:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "Ghi đè lên tập tin có sẵn"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "&Xuất..."
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5873,12 +6985,10 @@ msgstr "Chọn một nơi để lưu các tập tin xuất đã xuất"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"Không tồn tại \"%s\".\n"
+msgstr "Không tồn tại \"%s\".\n"
 "\n"
 "Bạn có muốn tạo nó không?"
 
@@ -5901,11 +7011,9 @@ msgstr "Gặp lỗi sau khi xuất %d tập tin."
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"Nhãn %s không phù hợp để làm tên tập tin. Bạn không thể dùng:   %s\n"
+msgstr "Nhãn %s không phù hợp để làm tên tập tin. Bạn không thể dùng:   %s\n"
 "Dùng..."
 
 #: export/ExportOGG.cpp:64
@@ -5916,10 +7024,6 @@ msgstr "Tuỳ chọn cho định dạng Ogg Vorbis"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Thiết lập việc xuất định dạng Ogg Vorbis"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "Chất lượng:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Tập tin Ogg Vorbis"
@@ -5940,10 +7044,6 @@ msgstr "Thiết lập tuỳ chọn không nén"
 msgid "Uncompressed Export Setup"
 msgstr "Thiết lập việc xuất định dạng không nén"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "Định dạng:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "Phần đầu:"
@@ -5956,10 +7056,21 @@ msgstr "Mã hoá:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(Không phải mọi phần đầu đều có thể mã hoá.)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV, AIFF, và các định dạng không nén khác"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -5981,116 +7092,131 @@ msgstr "Đang xuất toàn bộ dự án ra %s"
 msgid "Error (file may not have been written): %s"
 msgstr "Lỗi (có thể chưa ghi tập tin): %s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "Tập tin MP3"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "Phiên bản Audacity này không hỗ trợ %s khi biên dịch."
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một bài hát trong CD âm thanh.\n"
+msgstr "\"%s\" là một bài hát trong CD âm thanh.\n"
 "Audacity không thể trực tiếp mở nó.\n"
 "Bạn phải Chiết xuất (rip) nó thành một định dạng\n"
 "Audacity có thể mở, như WAV hay AIFF."
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\" là một danh sách bài hát.\n"
+msgstr "\"%s\" là một danh sách bài hát.\n"
 "Audacity không thể mở nó vì nó chỉ chứa liên kết tới các tập tin khác.\n"
 "Bạn có thể mở nó trong một bộ soạn thảo văn bản và tải các tập tin trong đó về."
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin Windows Media Audio.\n"
+msgstr "\"%s\" là một tập tin Windows Media Audio.\n"
 "Audacity không thể mở định dạng này vì lỗi vi phạm bản quyền.\n"
 "Bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ, như WAV hay AIFF."
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin Advanced Audio Coding.\n"
+msgstr "\"%s\" là một tập tin Advanced Audio Coding.\n"
 "Audacity không thể mở loại tập tin này.\n"
 "Bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ, như WAV hay AIFF."
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin âm thanh được mã hoá, thường được mua trên mạng.\n"
+msgstr "\"%s\" là một tập tin âm thanh được mã hoá, thường được mua trên mạng.\n"
 "Audacity không mở được dạng tập tin này vì tính bảo mật của nó.\n"
 "Bạn phải dùng Audacity thu âm lại nó, hoặc ghi ra CD rồi\n"
 "chiết xuất ra định dạng WAV hay AIFF."
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin RealPlayer.\n"
+msgstr "\"%s\" là một tập tin RealPlayer.\n"
 "Audacity không mở được loại tập tin này.\n"
 "Bạn phải tự mình chuyển nó về định dạng được Audacity hỗ trợ, như WAV hay AIFF."
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\" là một tập tin MIDI.\n"
-"Audacity không thể mở hoặc sửa trực tiếp định dạng này, nhưng bạn có thể\n"
-"xem nó bằng cách chọn Tập tin > Nhập > MIDI."
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\" là một tập tin âm thanh dạng nốt nhạc.\n"
+msgstr "\"%s\" là một tập tin âm thanh dạng nốt nhạc.\n"
 "Audacity không thể mở loại tập tin này.\n"
 "Bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ,\n"
 "như WAV hay AIFF, hoặc ghi âm nó trực tiếp trên Audacity."
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin Musepack.\n"
+msgstr "\"%s\" là một tập tin Musepack.\n"
 "Audacity không thể mở định dạng này.\n"
 "Nếu bạn nghĩ đây là tập tin mp3, hãy đổi đuôi nó thành \".mp3\"\n"
 "và thử nhập lại xem sao. Nếu không, bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ\n"
@@ -6098,58 +7224,58 @@ msgstr ""
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin Wavpack.\n"
+msgstr "\"%s\" là một tập tin Wavpack.\n"
 "Audacity không thể mở loại tập tin này.\n"
 "Bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ, như WAV hay AIFF."
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin Dolby Digital.\n"
+msgstr "\"%s\" là một tập tin Dolby Digital.\n"
 "Audacity không thể mở loại tập tin này.\n"
 "Bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ, như WAV hay AIFF."
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\" là một tập tin Ogg Speex.\n"
+msgstr "\"%s\" là một tập tin Ogg Speex.\n"
 "Audacity không thể mở loại tập tin này.\n"
 "Bạn phải tự mình chuyển nó về 1 định dạng Audacity hỗ trợ, như WAV hay AIFF."
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity vừa tự nhận dạng loại tập tin bạn chọn.\n"
-"Âm thanh mở ra có thể không đúng.\n"
-"\n"
-"Nếu âm thanh bị hỏng, hãy thử đặt lại tên cho tập tin\n"
-"để phần đuôi đúng với định dạng của nó trước khi mở."
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity không nhận dạng được loại tập tin này.\n"
-"Nếu nó là loại không nén, hãy cố thử nhập nó vào bằng lệnh \"Nhập dữ liệu thô\""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6186,17 +7312,18 @@ msgstr "Chỉ có thể offset riêng các tập tin âm thanh, không thể là
 msgid "Invalid track offset in LOF file."
 msgstr "Tập tin LOF chứa offset dải không hợp lệ."
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "Lỗi phân tích tập tin Allegro"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "Lỗi phân tích tập tin MIDI"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "Tập tin MP3"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6222,15 +7349,24 @@ msgstr "Dòng bit Vorbis có Phần đầu không hợp lệ"
 msgid "Internal logic fault"
 msgstr "Lỗi Logic bên trong"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV, AIFF, và các định dạng không nén khác"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "Đang nhập %s Tập tin..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "Tập tin QuickTime"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "Nhập dữ liệu thô"
@@ -6272,6 +7408,14 @@ msgstr "Lập thể (Stereo)"
 msgid "%d Channels"
 msgstr "%d kênh"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "Offset bắt đầu:"
@@ -6284,9 +7428,18 @@ msgstr "Số lượng cần nhập:"
 msgid "Sample rate:"
 msgstr "Tốc độ lấy mẫu:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "&Nhập"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6331,9 +7484,9 @@ msgstr "Kênh"
 msgid "Playthrough"
 msgstr "Phát qua"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "&Phát các dải khác khi đang thu dải mới"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6343,9 +7496,13 @@ msgstr "P&hát qua phần cứng: Vừa phát vừa thu dải mới"
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "Phá&t qua phần mềm: Vừa phát vừa thu dải mới"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "Phá&t qua phần mềm: Vừa phát vừa thu dải mới (bỏ chọn khi thu \"trộn stereo\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6372,19 +7529,15 @@ msgid "Latency"
 msgstr "Độ trễ"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"Bộ đệm âm thanh:\n"
+msgstr "Bộ đệm âm thanh:\n"
 "(lớn = nhiều trễ)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"Sá»­a trá»…:\n"
+msgstr "Sá»­a trá»…:\n"
 "(nhỏ hơn không = quay lui)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6458,8 +7611,8 @@ msgid "Audio cache"
 msgstr "Bộ đệm âm thanh"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "Để dư liệu thu được trong bộ nhớ tới khi thu xong"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6500,9 +7653,9 @@ msgstr "Thư viện MP3 phiên bản:"
 msgid "MP3 Library:"
 msgstr "Thư viện MP3:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "&Tìm thư viện"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6512,9 +7665,22 @@ msgstr "Thư viện LAME MP3:"
 msgid "&Download"
 msgstr "&Tải về"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "Lưu ý: Chọn chất lượng xuất bằng cách nhấn Tuỳ chọn trong hộp thoại Xuất."
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "Lưu ý: Chọn chất lượng xuất bằng cách nhấn Tuỳ chọn trong hộp thoại Xuất.\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6587,7 +7753,8 @@ msgid "&Update display while playing"
 msgstr "Cập nhật giao diện &khi đang phát"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "Thoát khỏi Audacity khi không còn cửa sổ nào khác."
 
 #: prefs/GUIPrefs.cpp:98
@@ -6595,15 +7762,16 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "Cho phép &rê cạnh trái và phải của vùng chọn"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Tối ưu thứ tự của nút &vào/ra âm thanh"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "Tự động thu phóng chiều cao của dải cho phù hợp"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "Chọn dải âm làm việc theo kiểu \"xoay\" lặp đi lặp lại"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6631,17 +7799,22 @@ msgid "Show warnings about &temp files"
 msgstr "Hiện cảnh báo cho tập tin &tạm"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "&Hỏi có lưu không ngay cả khi dự án không có gì"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "Hiện thông điệp Xin chào khi chạy chương trình"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "Chế độ"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "Biểu diễn "
@@ -6674,35 +7847,10 @@ msgstr "-145 dB (PCM dùng 24 bit lấy mẫu)"
 msgid "Default View Mode"
 msgstr "Chế độ biểu diễn mặc định"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "Dạng sóng"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "Dạng sóng Db"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "Phổ"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "Phổ Loga"
-
-#: prefs/GUIPrefs.cpp:160
-#, fuzzy
-msgid "PitchDisplay"
-msgstr "Cao Ä‘á»™"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "Các giao diện khác"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "Ngôn ngữ:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "Trợ giúp:"
@@ -6716,6 +7864,14 @@ msgstr "Nút Solo:"
 msgid "Keyboard"
 msgstr "Bàn phím"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "Gán phím tắt"
@@ -6749,22 +7905,16 @@ msgstr "Gặp lỗi khi lưu phím tắt"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "Chọn một tập tin XML chứa các phím tắt cho Audacity..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "Tập tin XML (*.xml)|*.xml|Mọi tập tin (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "Lỗi nạp các phím tắt từ tập tin XML"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"Phím tắt '%s' đã được gán cho:\n"
+msgstr "Phím tắt '%s' đã được gán cho:\n"
 "\n"
 "'%s'"
 
@@ -6773,6 +7923,42 @@ msgstr ""
 msgid "Undo"
 msgstr "Huỷ bỏ"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "&Phát các dải khác khi đang thu dải mới"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7078,14 +8264,13 @@ msgstr "Chất lượng cao:"
 msgid "Smart Recording"
 msgstr "Ghi âm thông minh"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "Tạm dừng ghi âm khi im lặng"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "Mức im lặng (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7223,8 +8408,7 @@ msgid "Info"
 msgstr "Thông tin"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7237,8 +8421,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"Thay đổi sắc thái giao diện là một tính năng thử nghiệm.\n"
+msgstr "Thay đổi sắc thái giao diện là một tính năng thử nghiệm.\n"
 "\n"
 "Bạn hãy nhấn \"Lưu bộ đệm sắc thái giao diện\" rồi \n"
 "tìm và sửa các ảnh và màu sắc trong \n"
@@ -7253,44 +8436,34 @@ msgstr ""
 "mặc dù các ảnh trong bộ đệm có cả các biểu tượng khác.]\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
-msgstr ""
-"Bạn đã biên dịch Audacity với tuỳ chọn thêm nút\n"
+msgstr "Bạn đã biên dịch Audacity với tuỳ chọn thêm nút\n"
 "'Output Sourcery'. Nút này sẽ lưu một phiên bản C của \n"
 "bộ đệm ảnh, có thể được biên dịch làm mặc định.\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"Nếu nút 'Nạp bộ đệm sắc thái giao diện khi khởi động' được chọn,\n"
+msgstr "Nếu nút 'Nạp bộ đệm sắc thái giao diện khi khởi động' được chọn,\n"
 "Bộ đệm Sắc thái giao diện sẽ được tự động nạp\n"
 "khi chương trình\n"
 "khởi động.\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"Lưu và nạp các tập tin sắc thái giao diện đơn lẻ dùng\n"
+msgstr "Lưu và nạp các tập tin sắc thái giao diện đơn lẻ dùng\n"
 "một tập tin đơn lẻ để lưu mỗi ảnh, nhưng có cùng\n"
 "ý tưởng.\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "Điều khiển"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "Tạm ngừng"
@@ -7299,9 +8472,9 @@ msgstr "Tạm ngừng"
 msgid "Play"
 msgstr "Phát"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "Phát (giữ Shift để lặp đi lặp lại)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7315,6 +8488,10 @@ msgstr "Chuyển về đầu"
 msgid "Skip to End"
 msgstr "Chuyển về cuối"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "Clean Speech"
@@ -7351,6 +8528,10 @@ msgid "Silence selection"
 msgstr "Thay vùng chọn bằng khoảng lặng"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "Phóng to"
 
@@ -7406,16 +8587,13 @@ msgstr "Đo mức đầu ra"
 msgid "Input level meter - click to monitor input"
 msgstr "Đo mức đầu vào - bấm chuột để đo mức đầu vào"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "Bá»™ trá»™n"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "Âm lượng đầu ra"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "Thanh trượt đầu ra"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7423,7 +8601,8 @@ msgid "Input Volume"
 msgstr "Âm lượng đầu vào"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "Thanh trượt đầu vào"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7786,14 +8965,16 @@ msgstr "Stereo dọc"
 msgid "Preferences..."
 msgstr "Tuỳ thích..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"Thiết lập tần số quét bộ đo.\n"
+msgstr "Thiết lập tần số quét bộ đo.\n"
 "Nếu máy tính của bạn khá chậm, bạn cần chọn \n"
 "một tần số quét nhỏ (30 lần một giây hoặc nhỏ hơn), để \n"
 "việc hiển thj bộ đo không làm ảnh hưởng tới chất lượng âm thanh."
@@ -7810,6 +8991,22 @@ msgstr "Tuỳ chỉnh bộ đo"
 msgid " Please select an action "
 msgstr "Xin hãy chọn một hành động cần thực thi"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7822,12 +9019,6 @@ msgstr "Thước kẻ đặt dọc"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 giây"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7853,6 +9044,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 ngày 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8038,242 +9244,11 @@ msgstr "Không thể mở tập tin: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "Lỗi: %hs ở dòng %d"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
 msgstr "Không thể nạp tập tin: \"%s\""
 
-#~ msgid ""
-#~ "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?"
-#~ msgstr ""
-#~ "Bạn muốn bỏ qua việc phục hồi các dự án? Sau này nếu đổi ý, bạn sẽ không "
-#~ "thể phục hồi các dự án này. Hãy cân nhắc kỹ."
-#~ msgid "Really not recover projects?"
-#~ msgstr "Thực sự không phục hồi các dự án?"
-#~ msgid "Export and Saving"
-#~ msgstr "Đang xuất và lưu"
-#~ 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>"
-#~ msgstr ""
-#~ "<b>Để bắt đầu ghi âm, bạn nhấn nút Thu màu đỏ</b>. Tuy nhiên, bạn cần "
-#~ "kiểm tra 3 thiết lập quan trọng trước khi thu âm:<br><br>(1) <b>Thiết bị "
-#~ "thu âm</b>, được thiết lập bên trong thẻ Âm thanh Vào/Ra trong phần Tuỳ "
-#~ "chỉnh. Audacity dùng thiết bị hiện hành trên hệ thống làm thiết bị ghi âm "
-#~ "mặc định, thường là thiết bị tích hợp trong máy, nên bạn thường không cần "
-#~ "điều chỉnh gì thêm. Nhưng nếu bạn dùng một thiết bị USB hoặc Firewire bên "
-#~ "ngoài, như một bàn chỉnh USB, hãy chắc chắn rằng bạn đã thiết lập đúng "
-#~ "thiết bị để ghi âm. <br><br>(2) <b>Nguồn dữ liệu đầu vào</b> cho thiết bị "
-#~ "của bạn, vd như microphone hoặc đường line-in. <ul><li><b>Trên Windows</"
-#~ "b> bạn có thể chọn đầu vào trên thanh công cụ <b>Mixer Toolbar</b> <i> "
-#~ "Trên Vista là phần Recording Device ở mục Audio I/O</i></li><li><b>Trên "
-#~ "Mac</b> bạn vào phần Apple Audio-MIDI Setup.</li></ul><i>Lưu ý: nhiều "
-#~ "thiết bị USB hoặc Firewire không cung cấp lựa chọn đầu vào, bạn có thể bỏ "
-#~ "qua bước này - xin hay xem tài liệu kèm theo của thiết bị.<br><br>(3)"
-#~ "<b>Âm lượng đầu vào</b>. Trước khi tiến hành ghi âm, bạn phải kiểm tra âm "
-#~ "lượng thu được phải không quá nhỏ hoặc quá lớn. Bạn có thể đọc phần "
-#~ "[[wiki:Recording levels|Hướng dẫn bằng hình ảnh]] hoặc làm theo các bước "
-#~ "sau: <ol><li>Bật<b> đồng hồ đo âm lượng</b> bằng cách nhắp đúp chuột vào "
-#~ "bên phải Đồng hồ đo âm lượng, hoặc nhắp phải lên nó và chọn \"Bắt đầu đo"
-#~ "\". Nếu bạn không thấy đồng hồ này, hãy chọn Xem > Thanh công cụ và đánh "
-#~ "dấu \"Thanh công cụ đo\". <li>Nhấn nút Thu, và điều chỉnh thanh trượt âm "
-#~ "lượng đầu vào trên thanh công cụ Trộn (bên cạnh biểu tượng microphone), "
-#~ "để các thanh chỉ thị đạt đến mức đỏ (nhưng không chạm) giới hạn thang đo. "
-#~ "Nếu bạn không nghe thấy âm thanh, hãy vào phần Âm thanh Vào/Ra trong phần "
-#~ "Tuỳ chỉnh và chọn \"Phát lại bằng phần mềm\".</ol><br><br>Nếu chương "
-#~ "trình vẫn chưa làm việc tốt, bạn có thể xem thêm phần Các câu hỏi thường "
-#~ "gặp về Thu âm ở phần <b>Your First Recording</b> trong tài liệu hướng "
-#~ "dẫn, hoặc tham khảo Wiki [[wiki:Recording Tips|Mẹo thu âm]], đặc biệt là "
-#~ "[[wiki:Troubleshooting Recordings|Xử lý lỗi trong thu âm]].<br><br>"
-#~ msgid ""
-#~ "Exporting and Saving have different purposes.You \"save\" an Audacity "
-#~ "project file when you want to return to your work in Audacity later.This "
-#~ "means you don't then have to re-import or re-record audio, or redo "
-#~ "editing you have done so far.When you want to listen to your work in "
-#~ "other computer programs you \"export\" it as an audio file such as a WAV, "
-#~ "AIFF or MP3. If burning to an audio CD for standalone CD players, you "
-#~ "must export as WAV or AIFF.<br><br>To save an Audacity project, use "
-#~ "<b>File > Save Project</b>. This will save an <b>.aup</b> Project file, "
-#~ "plus a <b>_data</b> folder containing the actual audio. Make sure you "
-#~ "don't rename or move either of these, because Audacity needs to refer to "
-#~ "both.Only use File > Save Project As... when you either need to save an "
-#~ "empty Project, or if you want to save an existing Project to a <i> new</"
-#~ "i> name. When you want to re-open a saved Project, simply click File > "
-#~ "Open and open the .aup file. <br><br>When you want to export your work to "
-#~ "an audio file, use <b>File > Export</b> and choose your desired format in "
-#~ "the \"Save as type\" dropdown.Click the Options button for advanced "
-#~ "choices, such as the bit rate to use for MP3 export.There are two other "
-#~ "Export commands under the File menu.\"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]]. <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]]. There is "
-#~ "also some help on how to [[burncd|burn to a CD]].<br><br>"
-#~ msgstr ""
-#~ "2 lệnh Xuất và Lưu có chức năng không giống nhau. Bạn \"lưu\" một dự án "
-#~ "Audacity khi chưa hoàn thành nó. Bạn không cần nhập lại hoặc thu lại các "
-#~ "dải âm thanh, hoặc làm lại các công việc đã làm trước đó. Khi bạn muốn "
-#~ "nghe lại thành quả của mình trên một ứng dụng khác, bạn phải \"xuất\" dự "
-#~ "án Audacity ra một đĩa CD hoặc một tập tin dạng WAV hay AIFF.<br><br>Để "
-#~ "lưu dự án, bạn chọn <b>Tập tin > Lưu dự án</b> và chọn tên tập tin có "
-#~ "đuôi <b>.aup</b>, một thư mục <b>_data</b> chứa các dải âm thanh trong dự "
-#~ "án. Bạn không được di chuyển hoặc xoá 2 thành phần này khi chưa hoàn tất "
-#~ "dự án của mình. Khi muốn mở lại một dự án chưa, bạn chọn <b>Tập tin > Mở</"
-#~ "b> và chọn tập tin .aup đã lưu.<br><br>Khi muốn xuất thành quả của mình "
-#~ "thành một tập tin âm thanh, bạn dùng lệnh <b>Tập tin > Xuất </b> và chọn "
-#~ "định dạng mình mong muốn trong danh sách thả xuống \"Lưu dạng\". Nhấn nút "
-#~ "Tuỳ chọn để thiết lập thông số nâng cao, như tốc độ bit của định dạng "
-#~ "MP3. Có 2 lệnh Xuất khác dưới trình đơn Tập tin. \"Xuất vùng chọn\" chỉ "
-#~ "xuất riêng vùng được bạn chọn. \"Xuất nhiều...\" xuất dự án thành nhiều "
-#~ "tập tin. Bạn có thể xuất từng dải âm trong dự án thành các tập tin riêng "
-#~ "biệt. Nếu bạn xuất các dải âm ra một đĩa than hoặc băng từ, hãy đọc "
-#~ "[[wiki:Splitting recordings into separate tracks|đặt nhãn trong Xuất "
-#~ "nhiều tập tin]].<br><br>Trước khi bạn có thể xuất ra dạng <b>MP3</b>, bạn "
-#~ "cần phải có bộ mã hoá LAME MP3 trong máy. Đọc [[wiki:Lame_Installation|"
-#~ "Cài đặt LAME]] để biết thêm chi tiết. Ngoài ra còn có một số trợ giúp và "
-#~ "hướng dẫn từng bước để [[burncd|Ghi đĩa CD]].<br><br>"
-#~ msgid ""
-#~ "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> "
-#~ "<p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten "
-#~ "(SHN)</b>, or most other proprietary formats, because of licensing and "
-#~ "patent restrictions. Audacity also cannot import any kind of Digital "
-#~ "Rights Management (DRM) protected file, including most purchased online "
-#~ "such as from iTunes or Napster.If you are on a Mac, you can import "
-#~ "<b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not "
-#~ "DRM protected, but you cannot export to these formats.</p> <p>Some open "
-#~ "formats are not yet supported by Audacity, including <b>Ogg Speex</b> and "
-#~ "<b>Musepack</b>.We hope to support these formats in future versions of "
-#~ "Audacity.</p> <p>If you cannot import your file into Audacity, you can as "
-#~ "a workround convert it to WAV or AIFF.As long as it's not a DRM-protected "
-#~ "file, you could do this with iTunes or with <a href=\"http://www."
-#~ "erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-"
-#~ "protected file, you can burn it to an audio CD in the application that is "
-#~ "licensed to play it, then extract (rip) the CD track to WAV or AIFF.You "
-#~ "can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or "
-#~ "<a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows."
-#~ "Or you can play the file on your computer and record it - see <a href="
-#~ "\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
-#~ msgstr ""
-#~ "<h2>Audacity có thể nhập các tập tin WMA, AAC hay RealAudio không?</"
-#~ "h2><p>Audacity không thể xuất hay nhập các định dạng <b>WMA, RealAudio, "
-#~ "Shorten(SHN)</b> hay những định dạng có sở hữu khác vì lý do giấy phép và "
-#~ "hạn chế đặc quyền. Audacity cũng không thể nhập bất kỳ loại tập tin được "
-#~ "bảo vệ bởi Digital Rights Management (DRM), bao gồm các tập tin được mua "
-#~ "trực tuyến từ iTunes hay Napster. Nếu bạn dùng Mac, bạn có thể nhập định "
-#~ "dạng <b>AAC</b> (vd như <b>M4A</b>) miễn là chúng không được bảo vệ bằng "
-#~ "DRM, nhưng bạn sẽ không thể xuất dự án ra định dạng này.</p><p>Có một số "
-#~ "định dạng chuẩn chưa được hỗ trợ, như <b>Ogg Speex</b> và <b>Musepack</"
-#~ "b>. Hi vọng phiên bản sau của Audacity sẽ hỗ trợ các định dạng này.</"
-#~ "p><p>Nếu bạn không thể nhập các tập tin của mình vào Audacity, bạn có thể "
-#~ "tìm cách chuyển dạng của chúng sang WAV hoặc AIFF. Bạn có thể thông qua "
-#~ "<a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player "
-#~ "của iTunes để làm điều này, miễn là các tập tin đó không bị DRM bảo vệ. "
-#~ "Nếu đó là một tập tin DRM bảo vệ, bạn có thể ghi nó ra một đĩa CD âm "
-#~ "thanh rồi chiết xuất (rip) lại thành định dạng WAV hặc AIFF bằng iTunes, "
-#~ "Windows Media Player 11 hay <a href=\"http://cdexos.sourceforge.net/?"
-#~ "q=download\">CDex</a>. Hoặc bạn có thể chạy tập tin trên máy và ghi âm "
-#~ "lại nó - xem <a href=\"http://audacity.sourceforge.net/help/faq?"
-#~ "s=recording&amp;i=streaming\">."
-#~ msgid ""
-#~ "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]].<br><br>"
-#~ msgstr ""
-#~ "Nếu bạn muốn ghi thành quả của mình ra đĩa CD âm thanh để chơi trên máy "
-#~ "nghe nhạc, bạn cần phải [[export|xuất ra định dạng WAV hay AIFF]] trước, "
-#~ "sau đó ghi các tập tin đó vào CD. Xem trợ giúp chi tiết tại [[wiki:How to "
-#~ "burn CDs|Ghi CD như thế nào]].<br><br> "
-#~ msgid "Specify Time"
-#~ msgstr "Chỉ định thời gian"
-#~ msgid "Draw currently only works with linear-view waveforms."
-#~ msgstr "Vẽ dạng sóng tuyến tính chỉ cho công việc hiện tại"
-#~ msgid "DTMF duration:"
-#~ msgstr "Độ dài của DTMF:"
-#~ msgid "Noise duration"
-#~ msgstr "Độ dài của nhiễu"
-#~ msgid "Edit the metadata for the FLAC file"
-#~ msgstr "Sửa dữ liệu đặc tả của tập tin FLAC"
-#~ msgid "Edit the ID3 tags for the MP2 file"
-#~ msgstr "Sửa thẻ ID3 cho tập tin MP2"
-#~ msgid "0, 220-260 kbps (Best Quality)"
-#~ msgstr "0, 220-260 kbps (Chất lượng tốt nhất)"
-#~ msgid "1, 200-250 kbps"
-#~ msgstr "1, 200-250 kbps"
-#~ msgid "2, 170-210 kbps"
-#~ msgstr "2, 170-210 kbps"
-#~ msgid "3, 155-195 kbps"
-#~ msgstr "3, 155-195 kbps"
-#~ msgid "4, 145-185 kbps"
-#~ msgstr "4, 145-185 kbps"
-#~ msgid "5, 110-150 kbps"
-#~ msgstr "5, 110-150 kbps"
-#~ msgid "6, 95-135 kbps"
-#~ msgstr "6, 95-135 kbps"
-#~ msgid "7, 80-120 kbps"
-#~ msgstr "7, 80-120 kbps"
-#~ msgid "8, 65-105 kbps"
-#~ msgstr "8, 65-105 kbps"
-#~ msgid "Insane, 320 kbps"
-#~ msgstr "Trên cả tuyệt, 320 kbps"
-#~ msgid "Extreme, 220-260 kbps"
-#~ msgstr "Tuyệt, 220-260 kbps"
-#~ msgid "Standard, 170-210 kbps"
-#~ msgstr "Chuẩn, 170-210 kbps"
-#~ msgid "Medium, 145-185 kbps"
-#~ msgstr "Trung bình, 145-185 kbps"
-#~ msgid "Edit the ID3 tags for the MP3 file"
-#~ msgstr "Chỉnh sửa thẻ ID3 của tập tin MP3"
-#~ msgid "Edit the metadata"
-#~ msgstr "Chỉnh sửa dữ liệu đặc tả"
-#~ msgid "Edit the metadata for the OGG file"
-#~ msgstr "Chỉnh sửa dữ liệu đặc tả cho tập tin OGG"
-#~ msgid "Specify PCM Options"
-#~ msgstr "Tuỳ chọn  cho định dạng PCM"
-#~ msgid "Edit the metadata for the uncompressed file"
-#~ msgstr "Chỉnh sửa dữ liệu đặc tả cho tập tin không nén"
-#~ msgid "Audio Files"
-#~ msgstr "Tập tin âm thanh"
-#~ msgid "&Download Free Copy of LAME"
-#~ msgstr "Tải về bản &sao miễn phí của LAME"
-#~ msgid "Language"
-#~ msgstr "Ngôn ngữ"
-#~ msgid "Minimum of dB mode display range"
-#~ msgstr "Hiển thị chế độ dB nhỏ nhất"
-
diff --git a/locale/zh.po b/locale/zh.po
index a6c1dd5..7091836 100644
--- a/locale/zh.po
+++ b/locale/zh.po
@@ -13,35 +13,24 @@ msgstr "Project-Id-Version: Simplified Chinese Translation Project for Audacity\
 msgid "&About Audacity..."
 msgstr "关于Audacity(&A)..."
 
-#: ../src/effects/AvcCompressor.cpp:659
-msgid "Enabled"
-msgstr "启用"
-
-#: AboutDialog.cpp:148
-msgid "Disabled"
+#. i18n-hint: Rather than a literal translation, consider adding the
+#. appropriate suffix or prefix to create a word meaning 'something which
+#. has Audacity'
+#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
+msgid "OK... Audacious!"
 msgstr ""
 
-#: ../src/AboutDialog.cpp:151
-msgid "Program build date: "
-msgstr "程序编译日期:"
-
-#: AboutDialog.cpp:209
-msgid "Settings folder: "
+#: AboutDialog.cpp:175
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
 
-#: ../src/AboutDialog.cpp:156
-msgid "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."
-msgstr "Audacity是由各地志愿开发者组成的团队制作的一款免费软件。感谢SourceForge.net的适时推出,它的在线服务为开发源码(open-source)项目提供了免费的平台。Audacity支持Windows98和其后的Windows系统,Mac OS X,Linux以及其它的Unix操作系统。Audacity的早期版本可以在MAC OS 9上运行。"
-
-#: ../src/AboutDialog.cpp:160
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
-msgstr "这是测试版(beta)。可能包含代码错误及未完成的功能。我们需\n"
-"要您的反馈,请访问我们的网站填写错误报告,或者您也可以填\n"
-"写功能申请,以便将您所希望的新功能告诉我们。"
+#: AboutDialog.cpp:179
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
-#: ../src/AboutDialog.cpp:163
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
-msgstr "此Audacity是一个稳定的完整版。如果您发现错误或有什么建议,请和我们联系。我们需要来自用户的反馈,以改进Audacity软件。详情请访问我们的网站。"
+#: AboutDialog.cpp:182
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
+msgstr ""
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #: ../src/AboutDialog.cpp:173
@@ -50,14 +39,9 @@ msgid "translator_credits"
 msgstr "Simplified Chinese translation by Liu Xiao Xi (liouxiao at hotmail.com).\n"
 "中文简体翻译: 刘晓曦"
 
-#: ../src/AboutDialog.cpp:186
-msgid "A Free Digital Audio Editor"
-msgstr "一个免费的数字音频编辑器"
-
-#: ../src/AboutDialog.cpp:190
-#: ../src/effects/ChangeLength.cpp:120
-msgid "Information"
-msgstr "信息"
+#: AboutDialog.cpp:207
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: ../src/AboutDialog.cpp:192
 msgid "Credits"
@@ -93,26 +77,117 @@ msgstr "Audacity是基于以下项目的代码:"
 msgid "Special thanks:"
 msgstr "特别感谢:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:320
 msgid "Audacity"
 msgstr ""
 
-#. i18n-hint: Rather than a literal translation, consider adding the
-#. appropriate suffix or prefix to create a word meaning 'something which
-#. has Audacity'
-#: AboutDialog.cpp:340 AboutDialog.cpp:371 SplashDialog.cpp:111
-msgid "OK... Audacious!"
+#. i18n-hint: Information about when audacity was compiled
+#: AboutDialog.cpp:304 AboutDialog.cpp:317 AboutDialog.cpp:473
+msgid "Build Information"
+msgstr ""
+
+#: ../src/effects/AvcCompressor.cpp:659
+msgid "Enabled"
+msgstr "启用"
+
+#: AboutDialog.cpp:148
+msgid "Disabled"
+msgstr ""
+
+#: AboutDialog.cpp:321
+msgid "File Format Support"
+msgstr ""
+
+#. i18n-hint: This is what the library (libmad) does - imports MP3 files
+#: AboutDialog.cpp:331 AboutDialog.cpp:333
+msgid "MP3 Importing"
+msgstr ""
+
+#: AboutDialog.cpp:340 AboutDialog.cpp:343
+msgid "Ogg Vorbis Import and Export"
+msgstr ""
+
+#: AboutDialog.cpp:347 AboutDialog.cpp:350
+msgid "ID3 tag support"
+msgstr ""
+
+#: AboutDialog.cpp:357 AboutDialog.cpp:360
+msgid "FLAC import and export"
+msgstr ""
+
+#: AboutDialog.cpp:365 AboutDialog.cpp:368
+msgid "MP2 export"
+msgstr ""
+
+#: AboutDialog.cpp:373 AboutDialog.cpp:376
+msgid "Import via QuickTime"
+msgstr ""
+
+#. i18n-hint: Libraries that are essential to audacity
+#: AboutDialog.cpp:383
+msgid "Core Libraries"
+msgstr ""
+
+#: AboutDialog.cpp:389 AboutDialog.cpp:392 AboutDialog.cpp:395
+#: AboutDialog.cpp:397
+msgid "Sample rate conversion"
+msgstr ""
+
+#: AboutDialog.cpp:402 AboutDialog.cpp:405
+msgid "Audio playback and recording"
+msgstr ""
+
+#: AboutDialog.cpp:418
+msgid "Features"
+msgstr ""
+
+#: AboutDialog.cpp:422 AboutDialog.cpp:425 AboutDialog.cpp:430
+#: AboutDialog.cpp:433 AboutDialog.cpp:438 AboutDialog.cpp:441
+#: AboutDialog.cpp:446 AboutDialog.cpp:449
+msgid "Plug-in support"
+msgstr ""
+
+#: AboutDialog.cpp:454 AboutDialog.cpp:457
+msgid "Sound card mixer support"
+msgstr ""
+
+#: AboutDialog.cpp:462 AboutDialog.cpp:465
+msgid "Pitch and Tempo Change support"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:151
+msgid "Program build date: "
+msgstr "程序编译日期:"
+
+#: AboutDialog.cpp:480 AboutDialog.cpp:482
+msgid "Build type:"
+msgstr ""
+
+#: AboutDialog.cpp:480
+msgid "Debug build"
+msgstr ""
+
+#: AboutDialog.cpp:482
+msgid "Release build"
+msgstr ""
+
+#. i18n-hint: The directory audacity is installed into (on *nix systems)
+#: AboutDialog.cpp:487
+msgid "Installation Prefix: "
+msgstr ""
+
+#: AboutDialog.cpp:209
+msgid "Settings folder: "
 msgstr ""
 
 #: AboutDialog.cpp:388
 msgid "GPL License"
 msgstr ""
 
-#: ../src/Benchmark.cpp:223
-#: ../src/FreqWindow.cpp:123
-msgid "Close"
-msgstr "关闭"
-
 #: ../src/AudacityApp.cpp:279
 #: ../src/Project.cpp:1891
 #, c-format
@@ -318,12 +393,13 @@ msgstr ""
 msgid "Recover Projects"
 msgstr ""
 
-#: AutoRecovery.cpp:113
-msgid "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?"
+#: AutoRecovery.cpp:127
+msgid "Are you sure you don't want to recover any projects?\n"
+"They can't be recovered later."
 msgstr ""
 
 #: AutoRecovery.cpp:128
-msgid "Really not recover projects?"
+msgid "Confirm?"
 msgstr ""
 
 #: AutoRecovery.cpp:132 AutoRecovery.cpp:169
@@ -362,8 +438,8 @@ msgstr "参数"
 msgid "C&hoose command"
 msgstr ""
 
-#: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+#: BatchCommands.cpp:456
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: ../src/export/Export.cpp:375
@@ -411,6 +487,10 @@ msgstr ""
 msgid "Apply Chain"
 msgstr ""
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:92
 msgid "&Select chain"
 msgstr ""
@@ -459,10 +539,18 @@ msgstr ""
 msgid "Please save and close the current project first."
 msgstr "请先保存并关闭当前的工程。"
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: ../src/Menus.cpp:3710
 msgid "Select file(s) for batch processing..."
 msgstr "选择文件进行批处理..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: ../src/Menus.cpp:3713
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "全部文件(*.*)|*.*|WAV文件(*.wav)|*.wav|AIFF文件(*.aif)|*.aif|AU文件(*.au)|*.au|MP3文件(*.mp3)|*.mp3|Ogg Vorbis文件(*.ogg)|*.ogg|FLAC文件(*.flac)|*.flac"
@@ -681,16 +769,16 @@ msgstr ""
 msgid "Renamed file: %s\n"
 msgstr "更名文件: %s\n"
 
-#: ../src/DirManager.cpp:1000
-#, c-format
-msgid "Changing block %s\n"
-msgstr "改变块 %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: ../src/DirManager.cpp:1089
 msgid "Inspecting project file data..."
 msgstr "正在检查工程文件数据..."
@@ -841,6 +929,93 @@ msgstr ""
 msgid "Rectangular"
 msgstr "矩形"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:507
+#, c-format
+msgid "Location of %s:"
+msgstr ""
+
+#: export/ExportMP3.cpp:516
+#, c-format
+msgid "To find %s, click here -->"
+msgstr ""
+
+#: export/ExportMP3.cpp:522
+msgid "Browse..."
+msgstr ""
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#: ../src/export/ExportMP3.cpp:113
+#, c-format
+msgid "Where is %s?"
+msgstr "%s 在哪里?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: ../src/FreqWindow.cpp:68
 msgid "Frequency Analysis"
 msgstr "频率分析"
@@ -867,8 +1042,8 @@ msgstr "増强的自动相关(Enhanced Autocorrelation)"
 msgid "Cepstrum"
 msgstr "倒频谱"
 
-#: FreqWindow.cpp:148
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+msgid "Algorithm"
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:59
@@ -880,8 +1055,8 @@ msgstr "大小"
 msgid " window"
 msgstr "窗口"
 
-#: FreqWindow.cpp:182
-msgid "Function:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
 msgstr ""
 
 #: ../src/FreqWindow.cpp:177
@@ -892,14 +1067,23 @@ msgstr "线性频率"
 msgid "Log frequency"
 msgstr "对数频率"
 
-#: FreqWindow.cpp:194
-msgid "Axis:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
 msgstr ""
 
 #: FreqWindow.cpp:204 LabelDialog.cpp:128
 msgid "&Export..."
 msgstr ""
 
+#: HelpText.cpp:77 export/ExportCL.cpp:320
+msgid "Export"
+msgstr ""
+
+#: ../src/Benchmark.cpp:223
+#: ../src/FreqWindow.cpp:123
+msgid "Close"
+msgstr "关闭"
+
 #: ../src/effects/Compressor.cpp:385
 #: ../src/effects/Compressor.cpp:393
 #: ../src/widgets/Meter.cpp:344
@@ -953,7 +1137,7 @@ msgid "Lag (seconds)\tFrequency (Hz)\tLevel"
 msgstr "延迟 (秒)\t频率 (Hz)\t水平"
 
 #: HelpText.cpp:85
-msgid "Back to [[welcome|Welcome]] page."
+msgid "To [[welcome|Welcome screen]]"
 msgstr ""
 
 #: HelpText.cpp:60
@@ -969,15 +1153,31 @@ msgid "Recording Audio"
 msgstr ""
 
 #: HelpText.cpp:105
-msgid "Editing and Greyed out Menus"
+msgid "Recording - Choosing the Input Device"
 msgstr ""
 
 #: HelpText.cpp:109
-msgid "Export and Saving"
+msgid "Recording - Choosing the Input Source"
+msgstr ""
+
+#: HelpText.cpp:113
+msgid "Recording - Setting the Input Level"
+msgstr ""
+
+#: HelpText.cpp:117
+msgid "Editing and greyed out Menus"
+msgstr ""
+
+#: HelpText.cpp:121
+msgid "Exporting an Audio File"
+msgstr ""
+
+#: HelpText.cpp:125
+msgid "Saving an Audacity Project"
 msgstr ""
 
-#: HelpText.cpp:81
-msgid "Supported Formats"
+#: HelpText.cpp:129
+msgid "Unsupported Formats"
 msgstr ""
 
 #: HelpText.cpp:85
@@ -988,40 +1188,64 @@ msgstr ""
 msgid "No Local Help"
 msgstr ""
 
-#: HelpText.cpp:132
-msgid "<p>Welcome to Audacity "
+#: HelpText.cpp:148
+msgid "</p><center><h3>Getting Started</h3></center><br>"
+msgstr ""
+
+#: HelpText.cpp:150
+msgid "Welcome to Audacity "
+msgstr ""
+
+#: HelpText.cpp:151
+msgid "Learn how to: <ul><li>[[play|play]] an existing audio file <li>[[record|record]] your voice, LP or tape <li>[[edit|edit]] sounds <li>[[save|save or open an Audacity project]] <li>[[export|export]] to an MP3 or other audio file, or [[burncd|burn to a CD]]  </ul></p><p>"
+msgstr ""
+
+#: HelpText.cpp:159
+msgid "This screen can be viewed at any time by clicking the <i>Help</i> menu, then <i>Show Welcome Message</i>. For a detailed guide to all the Audacity menus and controls, click  <i>Help</i> menu then <i>Index</i>, or download our <a href=\"http://audacity.sourceforge.net/help/documentation/manual_1.4.pdf\">full Manual</a> in PDF format.</p>"
+msgstr ""
+
+#: HelpText.cpp:172
+msgid "<p><b>Opening audio files:</b> Either drag the files into the current project window, or click <i>File &gt; Import &gt; Audio</i>. Files can be opened into a new project window with <i>File &gt; Open</i>. The main formats Audacity plays are <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis</b> and <b>WAV</b>. Click [[wma-proprietary|here]] if your file is in some other format. <b>To import a CD:</b> extract it to WAV or AIFF using iTunes, Windows Media Player 11 or similar. See our online guide: [[wiki:How_to_import_CDs|importing CDs]].</p><p> <p><b>Playing audio:</b> Press the green Play button to start playback. Press the blue Pause button once to pause playback, and again to resume. To stop, press the yellow Stop button. Spacebar can be used to either play or stop. After stopping, playback resumes from its last starting point. To change the starting point, click in the track at your desired starting point. The <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons can be used to skip to the start or end of the track respectively. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:194
+msgid "<p><b>To record:</b> Set the recording device and input source, adjust the input level, then press the red Record button.</b></p><p> 1) [[inputdevice|Set Recording Device]] either in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>. Audio I/O Preferences lets you choose stereo recording if required.<br> 2) [[inputsource|Set input source]] for that device (for example, microphone or line-in) in the dropdown selector of the <i>Mixer Toolbar</i>, or (on some systems) at Recording Device in the <i>Audio I/O tab of Preferences</i> or in <i>Device Toolbar</i>.<br> 3) [[inputlevel|Adjust input level]] using the right-hand slider on the <i>Mixer Toolbar</i>. Correct adjustment of level before recording is essential to avoid noise or distortion. </p><p> More help at: \"Recording\" <a href=\"http://audacity.sourceforge.net/help/faq\">FAQs</a>, our Tutorial <a href=\"http://www.audacityteam.org/manual/index.php?title=Tutorial_-_Your_First_Recording\"> Your First Recording</a> in the <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">Manual</a>, and our Wiki [[wiki:Recording_Tips|Recording Tips]] and [[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] pages. </p><br><br>"
+msgstr ""
+
+#: HelpText.cpp:221
+msgid "<p>The input device is the actual physical sound device you are recording from. This is chosen at \"Recording Device\" in the <i>Audio I/O tab of Preferences</i>, On Windows and Linux, Preferences are at the bottom of the <i>Edit</i> Menu. On a Mac, they in the <i>Audacity</i> Menu. You can also conveniently select Recording Device in the <i>Device Toolbar</i>, which can be enabled at <i>View &gt; Toolbars...</i>. </p><p> By default, Audacity uses the device currently being used by the system, (usually your inbuilt sound device), so it is often not necessary to change the input device. On Windows, this current system device can be selected as \"Microsoft Sound Mapper\". If you are recording from an external USB or Firewire device such as a USB turntable, select it explicitly by name as recording device after conecting it. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: 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>How to [[record|record]] a new sound file.<li>How to [[edit|edit]] sound and [[export|export]] to a sound file like MP3.</ul><br><br>Those links will help if you find a problem such as a [[grey|menu option greyed out]] or that Audacity [[norecord|isn't recording properly]] or that you can't [[burncd|burn to a CD]]. 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."
+#: HelpText.cpp:244
+msgid "<p>Select the input source (such as microphone or line-in) for your [[inputdevice|recording device]]:<br> - <b>On Windows (except Vista)</b> and <b>Linux</b>, in the dropdown selector on the right of the <i>Mixer Toolbar</i>.<br> - <b>On Windows Vista</b> and <b>Mac</b>, at Recording Device on the <i>Audio I/O tab of Preferences</i>, or in <i>Device Toolbar</i>. The source will be shown as part of the parent device (for example, <i>High Def Audio Card: Microphone</i>). If necessary, Mac users can choose the input source at Apple Audio MIDI Setup. <br><i><b>Note:</b> many USB or Firewire recording devices don't have a choice of inputs, so this step is not necessary. If in doubt, see the documentation for your device. </i></p><p> <b>Tip:</b> To <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&i=streaming\">record audio playing on the computer</a>, Windows and Linux users can choose the \"Stereo Mix\", \"Wave Out\", \"Sum\" or comparable input source. </p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:158
-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>"
+#: HelpText.cpp:267
+msgid "<p>The input level must be set correctly. If the level is too low, there will be background noise. If the level is too high, there will be distortion in the loud parts. </p><p>To set the level, either see this [[wiki:Recording_levels|illustrated online guide]] or follow these steps: <ol><li>Turn on <b>monitoring</b>. Double-click the right-hand of the two <i>VU Meters</i> (or right-click over it) and click \"Start Monitoring\". If the meters are not visible, click <i>View &gt; Toolbars</i> and check \"Meter Toolbar\". </li><li>Adjust the input slider on the <i>Mixer Toolbar</i> (by the microphone symbol), so that the red bars in the meter come close to <b>but do not touch</b> the right edge of the scale. If you can't hear the monitored audio, go to the <i>Audio I/O tab of Preferences</i> and check \"Software Playthrough\". </li></ol></p><p> Back to [[record|Recording Audio]] <br></p>"
 msgstr ""
 
-#: HelpText.cpp:181
-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>"
+#: HelpText.cpp:292
+msgid "<p>The main commands for editing audio are under the <i>Edit</i> menu (such as cut, copy and paste) and the <i>Effect</i> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). </p><p> Audacity applies edits to selected areas of the audio track. To select a particular area, click in the track and drag the shaded area with the mouse. If no audio is selected, Audacity selects all the audio in the project window.</p><p> When playing or recording, the Edit and Effect menus will appear greyed out, because a moving track can't be edited. Commands can sometimes be unavailable for other reasons too. For example, you can't run effects until you have audio on the screen, and you can't paste audio until you've cut or copied it to Audacity's clipboard. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:223
-msgid "Editing: Audacity is a powerful editor, so you'll want to see what it can do with your imported file or recording.  The main commands you will use are under the <b>Edit</b> menu (such as cut, copy and paste) and under the <b>Effect</b> menu (you can do things like boost the bass, change pitch or tempo, or remove noise). <br><br>Audacity applies edits to areas of the audio track. You can select a particular area of audio by clicking in the track and dragging the shaded area with your mouse. If you don't select any audio, Audacity will select all that you have on the screen.<br><br>Two important points when editing:<br><br>(1) If you're still playing or recording, use the yellow Stop button, because you can't edit or export a moving track! <br><br>(2) On occasion, some of the menus or buttons are greyed out or say \"Disabled\" -  this is normal. For example, because you can't edit audio while playing or recording, we grey out or disable commands until you press Stop. Commands can sometimes be unavailable for other reasons - for example you can't run effects until you have audio on the screen, and you obviously can't paste audio until you've cut or copied it to Audacity's clipboard. <br><br>"
+#: HelpText.cpp:311
+msgid "<p>To return later to your unfinished work in Audacity with all tracks and edits as you left them, save an Audacity project. To play your current work in other media programs or send it to others, [[export|export]] an audio file such as WAV or MP3. </p><p> <i>File &gt; Save Project</i> saves an <b>.aup</b> project file and  a <b>_data</b> folder containing the actual audio. To re-open a saved project, click <i>File &gt; Open</i> and open the .aup file. If you save and exit more than once, an .aup.bak backup file is created, but the .aup file should always be opened if present. When your final exported file is exactly as you want, delete the project files and _data folder to save disc space. </p><p><i>File &gt; Save Project As...</i> is for saving an empty project. It also lets you save an existing Project to a <b> new</b> name. This is the only safe way to rename a project. The .aup file and _data folder should not be moved or renamed manually. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:254
-msgid "Exporting and Saving have different purposes.You \"save\" an Audacity project file when you want to return to your work in Audacity later.This means you don't then have to re-import or re-record audio, or redo editing you have done so far.When you want to listen to your work in other computer programs you \"export\" it as an audio file such as a WAV, AIFF or MP3. When burning to CD, you export as WAV or AIFF.<br><br>To save an Audacity project, use <b>File > Save Project</b>. This will save an <b>.aup</b> Project file, plus a <b>_data</b> folder containing the actual audio. Make sure you don't rename or move either of these, because Audacity needs to refer to both.Only use File > Save Project As... when you either need to save an empty Project, or if you want to save an existing Project to a <i> new</i> name. When you want to re-open a saved Project, simply click File > Open and open the .aup file. <br><br>When you want to export your work to an audio file, use <b>File > Export</b> and choose your desired format in the \"Save as type\" dropdown.Click the Options button for advanced choices, such as the bit rate to use for MP3 export.There are two other Export commands under the File menu.\"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]]. <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]]. There is also some help on how to [[burncd|burn to a CD]].<br><br>"
+#: HelpText.cpp:335
+msgid "To hear your work in other media programs, export it to an audio file such as WAV or MP3 (some formats are [[wma-proprietary|unsupported]]). [[save|Saving an Audacity project]] creates a project file (and linked _data folder) containing all your edited tracks, so you can return to your work later. However, other programs can't read Audacity projects. </p><p> To export, click <i>File &gt; Export</i> then choose the file format you want to export to in the \"Save as type\" dropdown. To [[burncd|burn a CD]] for standalone CD players, choose WAV or AIFF. To export as MP3, the [[wiki:Lame_Installation|Lame Encoder]] must be installed. </p><p> <i>File &gt; Export Selection</i> exports only a selected area of audio. <i>Use File &gt; Export Multiple</i> to export multiple files at the same time, either one for each audio track, or one for each labeled area in a single track. <i>Tracks &gt; Add Label At Selection</i> lets you [[wiki:Splitting_recordings_into_separate_tracks|split the tracks]] from an album for multiple export as separate files. </p><br><br>"
 msgstr ""
 
-#: HelpText.cpp:289
-msgid "<h2>Can Audacity import file formats like WMA, AAC, RealAudio  etc.?</h2> <p>Audacity cannot import or export files in <b>WMA, RealAudio, Shorten (SHN)</b>, ormost other proprietary formats, because of licensing and patent restrictions. Audacity also cannot import any kind of Digital Rights Management (DRM) protected file, including most purchased online such as from iTunes or Napster.If you are on a Mac, you can import <b>AAC</b>  encoded files (such as <b>M4A</b>) as long as they are not DRM protected, but you cannot export to these formats.</p> <p>Some open formats are not yet supported by Audacity, including <b>Ogg Speex</b> and <b>Musepack</b>.We hope to support these formats in future versions of Audacity.</p> <p>If you cannot import your file into Audacity, you can as a workround convert it to WAV or AIFF.As long as it's not a DRM-protected file, you could do this with iTunes or with <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> player.If it's a DRM-protected file, you can burn it to an audio CD in the application that is licensed to play it, then extract (rip) the CD track to WAV or AIFF.You can use iTunes to extract to WAV or AIFF, plus Windows Media Player 11 or <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> on Windows.Or you can play the file on your computer and record it - see <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">."
+#: HelpText.cpp:359
+msgid "<p>Audacity <b>cannot</b> [[play|play]] or [[export|export]] files in <b>WMA, RealAudio, Shorten (SHN)</b> or most other proprietary formats, due to licensing and patent restrictions.  On a Mac computer, unprotected <b>AAC</b> formats such as <b>M4A</b> can be imported. Some open formats are not yet supported, including <b>Ogg Speex</b> and <b>Musepack</b>. Files protected by any kind of Digital Rights Management (DRM), including most purchased online such as from iTunes or Napster, <b>cannot</b> be imported.</p><p> If you can't import your file into Audacity, then if it is not DRM-protected, use iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a> to convert it to WAV or AIFF. If it is protected, burn it to an audio CD in the program licensed to play it, then extract the CD track to WAV or AIFF using ITunes or (on Windows) <a href=\"http://cdexos.sourceforge.net/?q=download\">CDex</a> or Windows Media Player 11. You could also <a href=\"http://audacity.sourceforge.net/help/faq?s=recording&amp;i=streaming\">record</a> the CD to your computer. <i>To export to an unsupported format, export to WAV or AIFF and convert it to the desired format in iTunes or <a href=\"http://www.erightsoft.com/SUPER.html#Dnload\">SUPER</a>. </i></p><p>"
 msgstr ""
 
-#: HelpText.cpp:316
-msgid "If you want to burn your work to an audio CD, 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]].<br><br>"
+#: HelpText.cpp:383
+msgid "<p>To burn your work to an audio CD for standalone CD players, first [[export|export]] it as WAV or AIFF. The exported file should be stereo, 44100 Hz (set in the \"Project Rate\" button bottom left) and 16 bit (set in the \"Options\" button in the file export dialog). These are Audacity's default settings, so normally you will not need to change these before exporting. <p>Burn the exported file to an \"audio CD\" - not a \"data CD\" or \"MP3 CD\" - with a CD burning program like iTunes or Windows Media Player. For more help, see [[wiki:How_to_burn_CDs|How to burn CDs]] online. </p><p>"
 msgstr ""
 
-#: HelpText.cpp:331
-msgid "<p>You don't appear to have Audacity help files on your machine. You can <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them from Audacity as you have just attempted, or you can click <a href=\"*URL*\">here</a> to read the help online."
+#: HelpText.cpp:403
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
 msgstr ""
 
 #: ../src/HistoryWindow.cpp:44
@@ -1221,6 +1445,10 @@ msgstr "保存工程(&S)\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "工程另存为...(&A)"
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:223
 msgid "Chec&k Dependencies..."
 msgstr ""
@@ -1229,6 +1457,10 @@ msgstr ""
 msgid "Open Me&tadata Editor..."
 msgstr ""
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr ""
+
 #: Menus.cpp:236
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr ""
@@ -1257,10 +1489,26 @@ msgstr "导出标签... (&L)"
 msgid "Export &Multiple..."
 msgstr "导出多个文件... (&M)"
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
+#: Menus.cpp:290
+msgid "CleanSpeech C&hain..."
+msgstr ""
+
 #: Menus.cpp:340 Menus.cpp:354
 msgid "Edit C&hains..."
 msgstr ""
 
+#: Menus.cpp:292
+msgid "Export CleanSpeech &Presets..."
+msgstr ""
+
+#: Menus.cpp:293
+msgid "I&mport CleanSpeech Presets..."
+msgstr ""
+
 #: Menus.cpp:352
 msgid "Appl&y Chain..."
 msgstr ""
@@ -1324,9 +1572,9 @@ msgstr "删除(&D)\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "分割删除\tCtrl+Alt+K"
 
-#: ../src/Menus.cpp:303
-msgid "&Silence\tCtrl+L"
-msgstr "静音(&S)\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:432
 msgid "Sp&lit\tCtrl+I"
@@ -1340,23 +1588,20 @@ msgstr ""
 msgid "&Join\tCtrl+J"
 msgstr "联结(&J)\tCtrl+J"
 
-#: Menus.cpp:443
-msgid "Disj&oin\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
 msgstr ""
 
 #: Menus.cpp:445
 msgid "Duplic&ate\tCtrl+D"
 msgstr ""
 
-#. i18n-hint: Effect name translations must agree with those used elsewhere, or batch won't find them
-#: BatchCommands.cpp:232 BatchCommands.cpp:466 BatchCommands.cpp:468
-#: Menus.cpp:451 Menus.cpp:654 effects/StereoToMono.h:23
-#, fuzzy
-msgid "&Stereo To Mono"
-msgstr "立体声至单声道"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:458
-msgid "Labeled Re&gions..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
@@ -1400,12 +1645,12 @@ msgid "&Join\tAlt+J"
 msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:502
-msgid "Disj&oin\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
 msgstr ""
 
-#: Menus.cpp:413
-msgid "&Select..."
+#: Menus.cpp:456
+msgid "&Select"
 msgstr ""
 
 #: ../src/Menus.cpp:328
@@ -1416,66 +1661,69 @@ msgstr "全部(&A)\tCtrl+A"
 msgid "&None\tCtrl+Shift+A"
 msgstr ""
 
-#: ../src/Menus.cpp:332
-msgid "Left at Playback Position\t["
+#: Menus.cpp:462
+#, fuzzy
+msgid "&Left at Playback Position\t["
 msgstr "在重放位置左端\t["
 
-#: ../src/Menus.cpp:333
-msgid "Right at Playback Position\t]"
+#: Menus.cpp:463
+#, fuzzy
+msgid "&Right at Playback Position\t]"
 msgstr "在重放位置右端\t]"
 
-#: ../src/Menus.cpp:337
-msgid "Start to Cursor"
-msgstr "从游标处开始"
+#: Menus.cpp:467
+msgid "Track &Start to Cursor\tShift+J"
+msgstr ""
 
-#: ../src/Menus.cpp:338
-msgid "Cursor to End"
-msgstr "游标移至最后"
+#: Menus.cpp:468
+msgid "Cursor to Track &End\tShift+K"
+msgstr ""
 
 #: Menus.cpp:525
 #, fuzzy
 msgid "Find &Zero Crossings\tZ"
 msgstr "寻找过零点\tZ"
 
-#: Menus.cpp:527
-#, fuzzy
-msgid "Mo&ve Cursor..."
-msgstr "移动游标..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
-#: ../src/Menus.cpp:348
-msgid "to Selection Start"
+#: Menus.cpp:478
+#, fuzzy
+msgid "to Selection Star&t"
 msgstr "到选段的起始点"
 
-#: ../src/Menus.cpp:349
-msgid "to Selection End"
+#: Menus.cpp:479
+#, fuzzy
+msgid "to Selection En&d"
 msgstr "到选段的结束点"
 
-#: ../src/Menus.cpp:353
-msgid "to Track Start"
-msgstr "到音轨起始点"
+#: Menus.cpp:483
+msgid "to Track &Start\tJ"
+msgstr ""
 
-#: ../src/Menus.cpp:354
-msgid "to Track End"
-msgstr "到音轨结束点"
+#: Menus.cpp:484
+msgid "to Track &End\tK"
+msgstr ""
 
-#: ../src/Menus.cpp:361
-msgid "Selection Save"
-msgstr "保存选段"
+#: Menus.cpp:491
+msgid "Re&gion Save"
+msgstr ""
 
-#: ../src/Menus.cpp:362
-msgid "Selection Restore"
-msgstr "恢复选段"
+#: Menus.cpp:492
+msgid "Regio&n Restore"
+msgstr ""
 
-#: Menus.cpp:559
-msgid "Play &Region..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
 msgstr ""
 
-#: Menus.cpp:560
-msgid "Lock"
+#: Menus.cpp:504
+msgid "&Lock"
 msgstr ""
 
-#: Menus.cpp:561
-msgid "Unlock"
+#: Menus.cpp:505
+msgid "&Unlock"
 msgstr ""
 
 #: ../src/Menus.cpp:379
@@ -1494,9 +1742,14 @@ msgstr "打开网格吸附功能"
 msgid "Turn Grid Snap Off"
 msgstr "关闭网格吸附功能"
 
-#: ../src/Menus.cpp:391
-msgid "&Preferences...\tCtrl+P"
-msgstr "参数设定... (&P)\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: ../src/Menus.cpp:401
 msgid "&View"
@@ -1534,60 +1787,122 @@ msgstr "叠起所有轨道 (&C)\tCtrl+Shift+C"
 msgid "E&xpand All Tracks\tCtrl+Shift+X"
 msgstr "展开所有轨道 (&x)\tCtrl+Shift+X"
 
-#: Menus.cpp:502
-msgid "Show Clipping"
+#: Menus.cpp:551
+msgid "&Show Clipping"
 msgstr ""
 
 #: ../src/Menus.cpp:424
 msgid "&History..."
 msgstr "历史记录(&H)..."
 
-#: Menus.cpp:617
-msgid "&Toolbars..."
+#: Menus.cpp:566
+msgid "&Toolbars"
 msgstr ""
 
-#: Menus.cpp:618 Menus.cpp:1203 Menus.cpp:1204
-msgid "Control Toolbar"
+#: Menus.cpp:567
+msgid "&Control Toolbar"
 msgstr ""
 
-#: Menus.cpp:619 Menus.cpp:1207 Menus.cpp:1208
-msgid "Device Toolbar"
+#: Menus.cpp:568
+msgid "&Device Toolbar"
 msgstr ""
 
-#: Menus.cpp:620 Menus.cpp:1211 Menus.cpp:1212
-msgid "Edit Toolbar"
+#: Menus.cpp:569
+msgid "&Edit Toolbar"
 msgstr ""
 
-#: Menus.cpp:621 Menus.cpp:1215 Menus.cpp:1216
-msgid "Meter Toolbar"
+#: Menus.cpp:570
+msgid "&Meter Toolbar"
 msgstr ""
 
-#: Menus.cpp:622 Menus.cpp:1219 Menus.cpp:1220
-msgid "Mixer Toolbar"
+#: Menus.cpp:571
+msgid "Mi&xer Toolbar"
 msgstr ""
 
-#: Menus.cpp:623 Menus.cpp:1223 Menus.cpp:1224
-msgid "Selection Toolbar"
+#: Menus.cpp:572
+msgid "&Selection Toolbar"
 msgstr ""
 
-#: Menus.cpp:624 Menus.cpp:1227 Menus.cpp:1228
-msgid "Tools Toolbar"
+#: Menus.cpp:573
+msgid "T&ools Toolbar"
 msgstr ""
 
-#: Menus.cpp:625 Menus.cpp:1231 Menus.cpp:1232
-msgid "Transcription Toolbar"
+#: Menus.cpp:574
+msgid "Transcri&ption Toolbar"
+msgstr ""
+
+#: Menus.cpp:576
+msgid "&Reset Toolbars"
+msgstr ""
+
+#: Menus.cpp:578
+msgid "!Simplified View"
+msgstr ""
+
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: ../src/Menus.cpp:645
+msgid "Skip to Start\tHome"
+msgstr "跳至开始位置\tHome"
+
+#: ../src/Menus.cpp:646
+msgid "Skip to End\tEnd"
+msgstr "跳至结束位置\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
 msgstr ""
 
-#: Menus.cpp:527
-msgid "Reset Toolbars"
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
 msgstr ""
 
 #: Menus.cpp:635
 msgid "&Tracks"
 msgstr ""
 
-#: Menus.cpp:642
-msgid "Add &New..."
+#: Menus.cpp:629
+msgid "Add &New"
 msgstr ""
 
 #: Menus.cpp:643
@@ -1603,15 +1918,10 @@ msgstr ""
 msgid "&Time Track"
 msgstr "时间轨"
 
-#: Menus.cpp:551
-msgid "&Timer Record..."
+#: Menus.cpp:643
+msgid "Mi&x and Render"
 msgstr ""
 
-#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
-#, fuzzy
-msgid "&Mix and Render"
-msgstr "混音并渲染"
-
 #: Menus.cpp:564
 msgid "Mix and Render to New Track\tCtrl+Shift+M"
 msgstr ""
@@ -1624,6 +1934,14 @@ msgstr ""
 msgid "Remo&ve Tracks"
 msgstr "删除轨道(&v)"
 
+#: Menus.cpp:667
+msgid "&Mute All Tracks\tCtrl+U"
+msgstr ""
+
+#: Menus.cpp:668
+msgid "&UnMute All Tracks\tCtrl+Shift+U"
+msgstr ""
+
 #: ../src/Menus.cpp:468
 msgid "Align with &Zero"
 msgstr "和零座标对齐(&Z)"
@@ -1640,29 +1958,40 @@ msgstr "和选段的头部对齐(&S)"
 msgid "Align with Selection &End"
 msgstr "和选段的尾部对齐(&E)"
 
-#: ../src/Menus.cpp:472
-msgid "Align End with Cursor"
+#: Menus.cpp:676
+#, fuzzy
+msgid "Align End with Cu&rsor"
 msgstr "结束点和游标对齐"
 
-#: ../src/Menus.cpp:473
-msgid "Align End with Selection Start"
+#: Menus.cpp:677
+#, fuzzy
+msgid "Align End with Selection Star&t"
 msgstr "结束点和选段的头部对齐"
 
-#: ../src/Menus.cpp:474
-msgid "Align End with Selection End"
+#: Menus.cpp:678
+#, fuzzy
+msgid "Align End with Selection En&d"
 msgstr "结束点和选段的尾部对齐"
 
-#: ../src/Menus.cpp:475
-msgid "Align Tracks Together"
+#: Menus.cpp:679
+#, fuzzy
+msgid "Align Tracks To&gether"
 msgstr "将音轨对齐在一起"
 
-#: Menus.cpp:688
-#, fuzzy
-msgid "&Align Tracks..."
-msgstr "对齐音轨..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
 #: Menus.cpp:697
-msgid "Ali&gn And Move Cursor..."
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
 msgstr ""
 
 #: Menus.cpp:705
@@ -1675,22 +2004,26 @@ msgstr "给音频选段加上标题\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "在重放位置加上标题\tCtrl+M"
 
-#: Menus.cpp:712
-msgid "S&ort tracks by..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
 msgstr ""
 
-#: Menus.cpp:713
-msgid "&Start time"
+#: Menus.cpp:717
+msgid "by &Start time"
 msgstr ""
 
-#: Menus.cpp:715
-msgid "&Name"
+#: Menus.cpp:719
+msgid "by &Name"
 msgstr ""
 
 #: ../src/Menus.cpp:504
 msgid "&Generate"
 msgstr "制作(&G)"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: ../src/Menus.cpp:527
 msgid "Effe&ct"
 msgstr "效果(&c)"
@@ -1725,6 +2058,10 @@ msgstr ""
 msgid "&Index..."
 msgstr ""
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:744
 msgid "&Screenshot Tools..."
 msgstr ""
@@ -1737,12 +2074,12 @@ msgstr "性能评测...(&R)"
 msgid "&Audio Device Info..."
 msgstr ""
 
-#: Menus.cpp:848
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
 msgstr ""
 
-#: Menus.cpp:849
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
 msgstr ""
 
 #: ../src/Menus.cpp:625
@@ -1777,9 +2114,9 @@ msgstr "\"下一个(Next)\"工具\tD"
 msgid "Previous Tool\tA"
 msgstr "\"上一个(Previous)\"工具\tA"
 
-#: ../src/Menus.cpp:635
-msgid "Play/Stop\tSpacebar"
-msgstr "播放/停止\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: ../src/Menus.cpp:636
 msgid "Stop\tS"
@@ -1793,12 +2130,12 @@ msgstr "停止\tP"
 msgid "Record\tR"
 msgstr "录音\tR"
 
-#: Menus.cpp:777
-msgid "Play/Stop and Select\tShift+Return"
+#: Menus.cpp:999
+msgid "Record Append\tShift+R"
 msgstr ""
 
-#: Menus.cpp:867
-msgid "Stop and Select\tShift+A"
+#: Menus.cpp:1001
+msgid "Play/Stop and Set Cursor\tShift+A"
 msgstr ""
 
 #: ../src/Menus.cpp:640
@@ -1813,22 +2150,14 @@ msgstr "播放至选段\tB"
 msgid "Play Looped\tL"
 msgstr "循环播放\tL"
 
-#: ../src/Menus.cpp:643
-msgid "Play Looped\tShift+Spacebar"
-msgstr "循环播放\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:873
 msgid "Play Cut Preview\tC"
 msgstr ""
 
-#: ../src/Menus.cpp:645
-msgid "Skip to Start\tHome"
-msgstr "跳至开始位置\tHome"
-
-#: ../src/Menus.cpp:646
-msgid "Skip to End\tEnd"
-msgstr "跳至结束位置\tEnd"
-
 #: ../src/Menus.cpp:648
 msgid "Selection to Start\tShift+Home"
 msgstr "选择至起点\tShift+Home"
@@ -1885,8 +2214,8 @@ msgstr ""
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr ""
 
-#: Menus.cpp:905
-msgid "Toggle Focused Track\tCtrl+Spacebar"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
 msgstr ""
 
 #: ../src/Menus.cpp:664
@@ -1985,15 +2314,19 @@ msgstr ""
 msgid "Snap To Off"
 msgstr ""
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: ../src/Menus.cpp:695
 msgid "Open Recent"
 msgstr "打开最近访问的文件"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: ../src/Menus.cpp:698
-msgid "Recent &Files..."
-msgstr "最近的文件(&F)..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: ../src/Menus.cpp:763
 #, c-format
@@ -2050,6 +2383,23 @@ msgstr "重复%s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "没有标签轨,无法导出。"
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: ../src/Menus.cpp:1922
 msgid "Nothing to undo"
 msgstr "没有可取消的操作"
@@ -2092,6 +2442,10 @@ msgstr ""
 msgid "Pasted from the clipboard"
 msgstr "从剪贴板粘贴"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2628
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr ""
@@ -2261,9 +2615,9 @@ msgstr "导入标签"
 msgid "Select a MIDI file..."
 msgstr "选择MIDI文件..."
 
-#: ../src/Menus.cpp:3052
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "全部文件(*.*)|*.*|MIDI文件(*.mid)|*.mid|Allegro文件(*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: ../src/Menus.cpp:3068
 #, c-format
@@ -2282,14 +2636,6 @@ msgstr "选择任一非压缩音频文件..."
 msgid "All files (*)|*"
 msgstr "全部文件(*)|*"
 
-#: ../src/Project.cpp:2429
-#: ../src/Project.cpp:2476
-#: ../src/import/ImportPCM.cpp:410
-#: ../src/import/ImportPCM.cpp:495
-#: ../src/import/ImportRaw.cpp:436
-msgid "Import"
-msgstr "导入"
-
 #: Menus.cpp:3630
 msgid "Edit the metadata tags"
 msgstr ""
@@ -2322,6 +2668,11 @@ msgstr "已经将 %d 轨道混音并渲染至一个新的立体声音轨"
 msgid "Mixed and rendered %d tracks into one new mono track"
 msgstr "已经将 %d 轨道混音并渲染至一个新的单声道音轨"
 
+#: Menus.cpp:658 Menus.cpp:3760 Mix.cpp:119
+#, fuzzy
+msgid "&Mix and Render"
+msgstr "混音并渲染"
+
 #: ../src/Menus.cpp:3298
 msgid "Aligned with zero"
 msgstr "已与零座标对齐"
@@ -2358,6 +2709,14 @@ msgstr "已对齐"
 msgid "Align"
 msgstr "对齐"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: ../src/Menus.cpp:3383
 msgid "Created new audio track"
 msgstr "新建音轨"
@@ -2424,14 +2783,14 @@ msgstr "删除轨道"
 msgid "Removed audio track(s)"
 msgstr "删除音轨"
 
-#: Menus.cpp:4480
-msgid "Enter new samplerate:"
-msgstr ""
-
 #: Menus.cpp:4480 Menus.cpp:4499
 msgid "Resample"
 msgstr ""
 
+#: Menus.cpp:5159 TrackPanel.cpp:6361
+msgid "New sample rate (Hz):"
+msgstr ""
+
 #: Menus.cpp:4486
 msgid "The entered value is invalid"
 msgstr ""
@@ -2501,14 +2860,13 @@ msgstr "录制的音频"
 msgid "Save changes before closing?"
 msgstr "在关闭之前保存修改?"
 
-#: Project.cpp:1493
+#: Project.cpp:1570
 msgid "\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"Saved project will be empty!!\n"
-"\n"
-"To save the tracks that were previously\n"
-"open, click Cancel, Edit > Undo until all your\n"
-"tracks are open, then File > Save Project."
+"To save any previously open tracks:\n"
+"Cancel, Edit > Undo until all tracks\n"
+"are open, then File > Save Project."
 msgstr ""
 
 #: ../src/Project.cpp:1837
@@ -2528,6 +2886,25 @@ msgstr "选择一个或多个音频文件..."
 msgid "Audacity projects|*.aup|"
 msgstr ""
 
+#: Project.cpp:1885 Project.cpp:2307
+#, c-format
+msgid "This file was saved by Audacity %s, a much\n"
+"older version.  The format has changed.\n"
+"\n"
+"Audacity could corrupt the file in opening\n"
+"it, so you must back it up first.\n"
+"\n"
+"Open this file now?"
+msgstr ""
+
+#: Project.cpp:1886
+msgid "1.0 or earlier"
+msgstr ""
+
+#: ../src/Project.cpp:2149
+msgid "Opening old project file"
+msgstr "打开工程文件"
+
 #: ../src/Project.cpp:1941
 #: ../src/Project.cpp:1949
 msgid "Error opening file"
@@ -2586,41 +2963,34 @@ msgstr "此文件使用Audacity %s保存。\n"
 msgid "Can't open project file"
 msgstr "不能打开工程文件"
 
-#: Project.cpp:2131
+#: Project.cpp:2314
 #, c-format
-msgid "This file was saved by Audacity %s, a much\n"
-"older version of Audacity.  The format has changed.\n"
-"Audacity will probably destroy the file in trying\n"
-"to open it.  You must back up your project\n"
-"first, to be safe.\n"
+msgid "This file was saved by Audacity %s.\n"
+"You 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"
 "\n"
-"Would you like to try to open this file\n"
-"right now anyway?"
+"Open this file now?"
 msgstr ""
 
-#: Project.cpp:2138
-#, c-format
-msgid "This file was saved by Audacity %s and the format\n"
-"has changed.  This version of Audacity can try to\n"
-"open it, but there may be problems.  You should back up\n"
-"your project first, to be safe.\n"
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
 "\n"
-"After you save the file with this version of Audacity,\n"
-"you will not be able to open the file in the older\n"
-"version anymore.  Would you like to open\n"
-"this file right now anyway?"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
 msgstr ""
 
-#: ../src/Project.cpp:2149
-msgid "Opening old project file"
-msgstr "打开工程文件"
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
 
-#: ../src/Project.cpp:2324
+#: Project.cpp:2591
 #, c-format
-msgid "Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
-msgstr "不能保存工程。可能%s不可写,\n"
-"或者磁盘已满。"
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
+msgstr ""
 
 #: ../src/Project.cpp:2326
 #: ../src/Project.cpp:2338
@@ -2632,21 +3002,19 @@ msgstr "保存Audacity工程出错"
 msgid "Saved %s"
 msgstr "%s已存"
 
-#. i18n-hint: This refers to files that are opened directly
-#: ../src/Project.cpp:2421
-msgid "Raw"
-msgstr "原始(Raw)"
-
-#: Project.cpp:2463
-#, c-format
-msgid "Importing %s..."
-msgstr ""
-
 #: ../src/Project.cpp:2475
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s'已导入"
 
+#: ../src/Project.cpp:2429
+#: ../src/Project.cpp:2476
+#: ../src/import/ImportPCM.cpp:410
+#: ../src/import/ImportPCM.cpp:495
+#: ../src/import/ImportRaw.cpp:436
+msgid "Import"
+msgstr "导入"
+
 #: ../src/Project.cpp:2517
 msgid "Error importing"
 msgstr "文件导入错误"
@@ -2660,17 +3028,23 @@ msgstr "话音另存为:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM音频文件(*.wav)|*.wav"
 
-#: ../src/Project.cpp:2564
-msgid "Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
-msgstr "Audacity工程文件(.AUP)能保存您的所有工作,\n"
-"但大多数的其它软件无法打开Audacity工程文件。\n"
+msgstr ""
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"当您需要保存为其它软件能打开的文件时,请选择\n"
-"'导出'(Export)命令。"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: ../src/Project.cpp:2567
 msgid "Audacity projects (*.aup)|*.aup"
@@ -2715,6 +3089,16 @@ msgstr "磁盘空间还够记录 %d 秒钟。"
 msgid "Out of disk space"
 msgstr "磁盘空间不足"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3027
 msgid "Could not remove old autosave file: "
 msgstr ""
@@ -2798,43 +3182,12 @@ msgstr ""
 msgid "&Debug"
 msgstr ""
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr ""
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr ""
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr ""
-
-#: SmartRecordDialog.cpp:285
-msgid "Duration"
-msgstr ""
-
-#: SmartRecordDialog.cpp:217
-msgid "Audacity Smart Record Progress"
-msgstr ""
-
-#: SmartRecordDialog.cpp:251
-msgid "Start Date and Time"
-msgstr ""
-
-#: SmartRecordDialog.cpp:268
-msgid "End Date and Time"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
 msgstr ""
 
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:380
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr ""
-
-#: SmartRecordDialog.cpp:362
-msgid "Audacity Smart Record - Waiting for Start"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
 msgstr ""
 
 #: SplashDialog.cpp:58
@@ -2875,8 +3228,8 @@ msgstr ""
 msgid "Comments"
 msgstr "注释"
 
-#: Tags.cpp:745 Tags.cpp:1985
-msgid "Press F2 or double click to edit."
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
 msgstr ""
 
 #: Tags.cpp:769
@@ -2895,12 +3248,12 @@ msgstr ""
 msgid "Genres"
 msgstr ""
 
-#: Tags.cpp:795 Tags.cpp:1406 Tags.cpp:1947
-msgid "Edit"
+#: Tags.cpp:826
+msgid "E&dit..."
 msgstr ""
 
-#: Tags.cpp:796 Tags.cpp:1948
-msgid "Reset"
+#: Tags.cpp:827
+msgid "Rese&t..."
 msgstr ""
 
 #: Tags.cpp:1070
@@ -2942,100 +3295,19 @@ msgstr ""
 msgid "Unable to open genre file."
 msgstr ""
 
-#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
-#: Tags.cpp:2468
-msgid "Save Metadata As:"
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
 msgstr ""
 
 #: Tags.cpp:1079 Tags.cpp:1730 Tags.cpp:2453
 msgid "Error loading metadata"
 msgstr ""
 
-#: Tags.cpp:1376 Tags.cpp:1935
-msgid "Title:"
-msgstr ""
-
-#: Tags.cpp:1377 Tags.cpp:1936
-msgid "Artist:"
-msgstr ""
-
-#: Tags.cpp:1378 Tags.cpp:1937
-msgid "Album:"
-msgstr ""
-
-#: Tags.cpp:1379
-msgid "Composer:"
-msgstr ""
-
-#: Tags.cpp:1380
-msgid "Lyricist:"
-msgstr ""
-
-#: Tags.cpp:1381 Tags.cpp:1940
-msgid "Comments:"
-msgstr ""
-
-#: Tags.cpp:1383
-msgid "Encoded By:"
-msgstr ""
-
-#: Tags.cpp:1387
-msgid "Copyright:"
-msgstr ""
-
-#: Tags.cpp:1391 Tags.cpp:1938
-msgid "Track Number:"
-msgstr ""
-
-#: Tags.cpp:1395 Tags.cpp:1939
-msgid "Year:"
-msgstr ""
-
-#: Tags.cpp:1399 Tags.cpp:1941
-msgid "Genre:"
-msgstr ""
-
-#: Tags.cpp:1457 Tags.cpp:2056
-msgid "No Genres"
-msgstr ""
-
-#: Tags.cpp:1610
-msgid "Reset to Defaults"
-msgstr ""
-
-#: Tags.cpp:1923
-msgid "Basic"
-msgstr ""
-
-#: Tags.cpp:1975
-msgid "Advanced"
-msgstr ""
-
-#: Tags.cpp:2000
-msgid "Value"
-msgstr ""
-
-#: Tags.cpp:2036
-msgid "Clea&r"
+#: Tags.cpp:1054 Tags.cpp:1108 Tags.cpp:1709 Tags.cpp:1745 Tags.cpp:2432
+#: Tags.cpp:2468
+msgid "Save Metadata As:"
 msgstr ""
 
-#: ../src/Tags.cpp:448
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "属性 '%s' 的最大长度是 %d 个字符。数据被截短了。"
-
-#: ../src/Tags.cpp:454
-msgid "Title"
-msgstr "标题"
-
-#: ../src/Tags.cpp:464
-msgid "Artist"
-msgstr "艺术家"
-
-#: ../src/Tags.cpp:474
-msgid "Album"
-msgstr "曲目"
-
 #: Theme.cpp:629
 #, c-format
 msgid "Audacity could not write file:\n"
@@ -3100,8 +3372,51 @@ msgid "All required files in:\n"
 "were already present."
 msgstr ""
 
-#: TimeDialog.cpp:53
-msgid "Specify Time"
+#: SmartRecordDialog.cpp:285
+msgid "Duration"
+msgstr ""
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr ""
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr ""
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr ""
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:251
+msgid "Start Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:268
+msgid "End Date and Time"
+msgstr ""
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:380
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr ""
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
 msgstr ""
 
 #: TrackPanel.cpp:452 TrackPanel.cpp:453
@@ -3143,6 +3458,10 @@ msgstr "波形"
 msgid "Waveform (dB)"
 msgstr "波形 (dB)"
 
+#: TrackPanel.cpp:557 prefs/GUIPrefs.cpp:157
+msgid "Spectrum log(f)"
+msgstr ""
+
 #: ../src/TrackPanel.cpp:393
 msgid "Pitch (EAC)"
 msgstr "音高 (EAC)"
@@ -3279,13 +3598,13 @@ msgstr "时间移动轨道/剪辑 %s %.02f 秒"
 msgid "Time-Shift"
 msgstr "时间-移动(Time-Shift)"
 
-#: ../src/TrackPanel.cpp:2289
-msgid "Draw currently only works with linear-view waveforms."
-msgstr "画图目前仅针对线性视图的波形有效。"
+#: TrackPanel.cpp:2916
+msgid "To use Draw, choose 'Waveform' in the Track Drop-down Menu."
+msgstr ""
 
-#: ../src/TrackPanel.cpp:2301
-msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
-msgstr "未足够放大。请放大到您能看清楚单个采样点。"
+#: TrackPanel.cpp:2933
+msgid "To use Draw, zoom in further until you can see the individual samples."
+msgstr ""
 
 #: ../src/TrackPanel.cpp:2565
 msgid "Moved Sample"
@@ -3373,6 +3692,14 @@ msgstr "调整过的左右平衡"
 msgid "Adjusted gain"
 msgstr "调整过的音量"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5428
 msgid "Can't delete track with active audio"
 msgstr ""
@@ -3430,14 +3757,6 @@ msgstr "改变采样率"
 msgid "Format Change"
 msgstr "格式变更"
 
-#: ../src/TrackPanel.cpp:5058
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "输入采样频率(Hz,每秒的采样数),范围在1至100000:"
-
-#: ../src/TrackPanel.cpp:5068
-msgid "Invalid rate."
-msgstr "无效的采样率。"
-
 #: ../src/TrackPanel.cpp:5088
 msgid "Change lower speed limit (%) to:"
 msgstr "最低速率限制(%)变为:"
@@ -3576,8 +3895,8 @@ msgstr "插件1 至 %i"
 msgid "Plugins %i to %i"
 msgstr "插件%i 至 %i"
 
-#: commands/CommandManager.cpp:720
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr ""
 
 #: commands/CommandManager.cpp:724
@@ -3599,8 +3918,8 @@ msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr ""
 
-#: commands/CommandManager.cpp:735
-msgid "Message"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
 msgstr ""
 
 #: ../src/commands/CommandManager.cpp:680
@@ -3621,14 +3940,19 @@ msgstr "应用效果: %s %.1f dB"
 msgid "Amplify"
 msgstr "放大"
 
-#: ../src/effects/Amplify.cpp:141
-msgid "Amplify by Dominic Mazzoni"
-msgstr "放大(Dominic Mazzoni提供)"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: ../src/effects/Amplify.cpp:148
 msgid "Amplification (dB):"
 msgstr "幅度放大(dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: ../src/effects/Amplify.cpp:168
 msgid "New Peak Amplitude (dB):"
 msgstr "新建峰值振幅 (dB):"
@@ -3637,6 +3961,10 @@ msgstr "新建峰值振幅 (dB):"
 msgid "Allow clipping"
 msgstr "允许剪辑"
 
+#: effects/Amplify.cpp:222 effects/Amplify.cpp:279 effects/Amplify.cpp:323
+msgid "-Infinity"
+msgstr ""
+
 #: ../src/effects/Amplify.h:46
 msgid "Amplify..."
 msgstr "放大..."
@@ -3763,10 +4091,18 @@ msgstr ""
 msgid "Frequency (Hz):"
 msgstr "频率 (Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: ../src/effects/BassBoost.cpp:314
 msgid "Boost (dB):"
 msgstr "増幅 (dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: ../src/effects/BassBoost.h:42
 msgid "BassBoost..."
 msgstr "低音增强..."
@@ -3807,9 +4143,50 @@ msgstr "Vaughan Johnson和Dominic Mazzoni提供"
 msgid "using SoundTouch, by Olli Parviainen"
 msgstr "使用SoundTouch(Olli Parviainen提供)"
 
-#: ../src/effects/ChangePitch.cpp:268
-msgid "Pitch:   from"
-msgstr "音高: 从"
+#: effects/ChangePitch.cpp:269
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: ../src/effects/ChangePitch.cpp:305
+msgid "Semitones (half-steps):"
+msgstr "半音程(半阶):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: ../src/effects/ChangePitch.cpp:290
 #: ../src/effects/ChangePitch.cpp:336
@@ -3819,13 +4196,9 @@ msgstr "音高: 从"
 msgid "to"
 msgstr "到"
 
-#: ../src/effects/ChangePitch.cpp:305
-msgid "Semitones (half-steps):"
-msgstr "半音程(半阶):"
-
-#: ../src/effects/ChangePitch.cpp:324
-msgid "Frequency (Hz):   from"
-msgstr "频率 (Hz): 从"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeLength.cpp:157
 #: ../src/effects/ChangePitch.cpp:359
@@ -3834,6 +4207,11 @@ msgstr "频率 (Hz): 从"
 msgid "Percent Change:"
 msgstr "改变百分比(%):"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: ../src/effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "改变音高..."
@@ -3852,6 +4230,11 @@ msgstr "应用效果: %s %.1f%%"
 msgid "Change Speed"
 msgstr "改变速率"
 
+#. i18n-hint: n/a is an English
+#: ../src/effects/ChangeSpeed.cpp:345
+msgid "n/a"
+msgstr "N/A"
+
 #: ../src/effects/ChangeSpeed.cpp:289
 msgid "Change Speed, affecting both Tempo and Pitch"
 msgstr "改变速率(同时影响节拍和音高)"
@@ -3860,14 +4243,17 @@ msgstr "改变速率(同时影响节拍和音高)"
 msgid "using SampleRate, by Erik de Castro Lopo"
 msgstr "使用SampleRate(Erik de Castro Lopo提供)"
 
-#. i18n-hint: n/a is an English
-#: ../src/effects/ChangeSpeed.cpp:345
-msgid "n/a"
-msgstr "N/A"
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
 
-#: ../src/effects/ChangeSpeed.cpp:348
-msgid "Standard Vinyl RPM:   from"
-msgstr "标准唱片转速(RPM, 转/分钟):  从"
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: ../src/effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -3885,13 +4271,29 @@ msgstr "改变节拍"
 msgid "Change Tempo without Changing Pitch"
 msgstr "保持音高不变,改变节拍"
 
-#: ../src/effects/ChangeTempo.cpp:219
-msgid "Beats per Minute (BPM):   from"
-msgstr "每分钟的拍数(BPM):  从"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: ../src/effects/ChangeTempo.cpp:249
-msgid "Length (seconds):   from"
-msgstr "长度 (秒):  从"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: ../src/effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -3901,8 +4303,8 @@ msgstr "改变节拍..."
 msgid "Changing Tempo"
 msgstr "改变节拍"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+msgid "Click Removal"
 msgstr ""
 
 #: ../src/effects/ClickRemoval.cpp:349
@@ -3913,10 +4315,18 @@ msgstr "嘀哒声及噼啪声消除(Craig DeForest提供)"
 msgid "Select threshold (lower is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr ""
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: ../src/effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "消除嘀哒声..."
@@ -3929,49 +4339,84 @@ msgstr "消除嘀哒声和噼啪声..."
 msgid "Dynamic Range Compressor"
 msgstr "动态范围压缩器"
 
-#: ../src/effects/Compressor.cpp:433
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "动态范围压缩器(Dominic Mazzoni提供)"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:451
-msgid "Ratio: "
-msgstr "比率:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:458
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "上升时间:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+msgid "Decay Time:"
+msgstr ""
+
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
 msgstr ""
 
 #: ../src/effects/Compressor.cpp:469
 msgid "Normalize to 0dB after compressing"
 msgstr "压缩后归一化至0dB"
 
-#: ../src/effects/Compressor.cpp:525
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "阈值: %d dB"
 
-#: ../src/effects/Compressor.cpp:528
+#: effects/Compressor.cpp:564
+#, c-format
+msgid "%3d dB"
+msgstr ""
+
+#: effects/Compressor.cpp:567
+#, c-format
+msgid "Ratio %.0f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:568
+#, c-format
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "比率: %.0f:1"
+msgid "Ratio %.1f to 1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:530
+#: effects/Compressor.cpp:572
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "比率: %.1f:1"
+msgid "%.1f:1"
+msgstr ""
 
-#: ../src/effects/Compressor.cpp:532
+#: effects/Compressor.cpp:575
 #, c-format
-msgid "Attack Time: %.1f secs"
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "上升时间: %.1f 秒"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+msgid "Decay Time %.1f secs"
 msgstr ""
 
 #: ../src/effects/Compressor.h:36
@@ -3982,6 +4427,247 @@ msgstr "压缩..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "正在使用动态范围压缩..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: ../src/ControlToolBar.cpp:515
+msgid "Start"
+msgstr "开始"
+
+#: ../src/ControlToolBar.cpp:521
+msgid "End"
+msgstr "结束"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:796 Tags.cpp:1948
+msgid "Reset"
+msgstr ""
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: ../src/AboutDialog.cpp:190
+#: ../src/effects/ChangeLength.cpp:120
+msgid "Information"
+msgstr "信息"
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: ../src/ControlToolBar.cpp:149
+msgid "Control"
+msgstr "控制"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:47
 msgid "DTMF Tone Generator"
 msgstr ""
@@ -3998,8 +4684,8 @@ msgstr ""
 msgid "Amplitude (0-1)"
 msgstr "振幅 (0-1)"
 
-#: effects/DtmfGen.cpp:389
-msgid "DTMF duration:"
+#: effects/DtmfGen.cpp:465
+msgid "Duration:"
 msgstr ""
 
 #: effects/DtmfGen.cpp:407
@@ -4228,54 +4914,54 @@ msgstr "上下反转"
 msgid "Inverting"
 msgstr "上下反转"
 
+#: ../src/BatchCommands.cpp:103
+#: ../src/effects/Leveller.cpp:114
+msgid "Leveller"
+msgstr "幅度拉平器"
+
 #: effects/Leveller.cpp:47
-msgid "Heavier"
+msgid "None-Skip"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heaviest"
+msgid "Light"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Heavy"
+msgid "Moderate"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Light"
+msgid "Heavy"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "Moderate"
+msgid "Heavier"
 msgstr ""
 
 #: effects/Leveller.cpp:47
-msgid "None-Skip"
+msgid "Heaviest"
 msgstr ""
 
-#: ../src/BatchCommands.cpp:103
-#: ../src/effects/Leveller.cpp:114
-msgid "Leveller"
-msgstr "幅度拉平器"
-
-#: ../src/effects/Leveller.cpp:199
-msgid "Leveller by Lynn Allan"
-msgstr "幅度拉平(Lynn Allan提供)"
-
-#: effects/Leveller.cpp:217
-msgid "Equalize soft and loud sections"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
 msgstr ""
 
 #: ../src/effects/Leveller.cpp:205
 msgid "Degree of Leveling"
 msgstr "幅度拉平度"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: ../src/effects/Leveller.cpp:223
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "噪声阈值('嘶嘶'/'嗡嗡'/环境背景噪声)"
 
-#: effects/Leveller.cpp:255
+#: effects/Leveller.cpp:238
 #, fuzzy
-msgid "Threshold for Noise: "
+msgid "Threshold for Noise:"
 msgstr "噪声阈值:"
 
 #: ../src/effects/Leveller.h:28
@@ -4286,6 +4972,159 @@ msgstr "幅度拉平..."
 msgid "Applying Leveller..."
 msgstr "正在应用幅度拉平..."
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: ../src/MixerToolBar.cpp:102
+msgid "Mixer"
+msgstr "混音器"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: ../src/effects/Phaser.cpp:65
+msgid "Phaser"
+msgstr "移相器"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: ../src/BatchCommands.cpp:101
+#: ../src/effects/NoiseRemoval.cpp:148
+msgid "Noise Removal"
+msgstr "噪声消除"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr ""
@@ -4302,10 +5141,6 @@ msgstr ""
 msgid "Noise Generator"
 msgstr ""
 
-#: effects/Noise.cpp:222
-msgid "Noise duration"
-msgstr ""
-
 #: effects/Noise.cpp:256
 msgid "Noise type"
 msgstr ""
@@ -4335,11 +5170,6 @@ msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "试图在没有噪声特征的情况下执行噪声消除\n"
 ".\n"
 
-#: ../src/BatchCommands.cpp:101
-#: ../src/effects/NoiseRemoval.cpp:148
-msgid "Noise Removal"
-msgstr "噪声消除"
-
 #: ../src/effects/NoiseRemoval.cpp:539
 msgid "Step 1"
 msgstr "步骤1"
@@ -4370,14 +5200,26 @@ msgstr "取得噪声特征"
 msgid "Noise reduction (dB):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:799
 msgid "Frequency smoothing (Hz):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:807
 msgid "Attack/decay time (secs):"
 msgstr ""
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: ../src/effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "噪声消除..."
@@ -4415,22 +5257,22 @@ msgstr ""
 msgid "Normalize"
 msgstr "归一化"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
 msgstr ""
 
-#: ../src/effects/Normalize.cpp:297
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "消除直流偏移(垂直以0为中心)"
-
-#: effects/Normalize.cpp:328
-msgid "Normalize maximum amplitude to"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
 msgstr ""
 
 #: effects/Normalize.cpp:336
 msgid "-"
 msgstr ""
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: ../src/effects/Normalize.h:31
 msgid "Normalize..."
 msgstr "归一化..."
@@ -4444,44 +5286,56 @@ msgstr "归一化..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "应用效果: %s %d 阶段, %.0f%% 湿(wet), 频率 = %.1f Hz, 起始相位 = %.0f 度, 深度 = %d, 反馈 = %.0f%%"
 
-#: ../src/effects/Phaser.cpp:65
-msgid "Phaser"
-msgstr "移相器"
-
-#: ../src/effects/Phaser.cpp:464
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "移相器(Nasca Octavian Paul提供)"
-
 #: ../src/effects/Phaser.cpp:471
 msgid "Stages:"
 msgstr "阶段:"
 
-#: ../src/effects/Phaser.cpp:492
-msgid "DRY"
-msgstr "å¹²(DRY)"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
+
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
 
-#: ../src/effects/Phaser.cpp:499
-msgid "WET"
-msgstr "湿(WET)"
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: ../src/effects/Phaser.cpp:513
 #: ../src/effects/Wahwah.cpp:483
 msgid "LFO Frequency (Hz):"
 msgstr "LFO 频率 (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:529
 #: ../src/effects/Wahwah.cpp:499
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO 开始相位 (角度):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:545
 msgid "Depth:"
 msgstr "深度:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.cpp:561
 msgid "Feedback (%):"
 msgstr "反馈 (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: ../src/effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "移相器..."
@@ -4496,6 +5350,14 @@ msgid "The Repair effect is intended to be used on very short sections of damage
 "Zoom in and select a tiny fraction of a second to repair."
 msgstr ""
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:33
 msgid "Repairing damaged audio"
 msgstr ""
@@ -4514,28 +5376,23 @@ msgstr "轨道太长,无法重复选段。"
 msgid "Repeat"
 msgstr "重复"
 
-#: ../src/effects/Repeat.cpp:233
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "重复(Dominic Mazzoni和Vaughan Johnson提供)"
-
-#: ../src/effects/Repeat.cpp:240
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "重复次数:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: ../src/effects/Repeat.cpp:252
 #: ../src/effects/Repeat.cpp:291
 msgid "New selection length: "
 msgstr "新的选段长度:"
 
-#: ../src/effects/Repeat.cpp:293
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d 分, %d 秒"
-
-#: ../src/effects/Repeat.cpp:296
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
+#: widgets/TimeTextCtrl.cpp:199
+msgid "hh:mm:ss"
+msgstr ""
 
 #: ../src/effects/Repeat.h:32
 msgid "Repeat..."
@@ -4602,15 +5459,73 @@ msgstr "峰刺清除..."
 msgid "Applying Spike Cleaner..."
 msgstr "正在进行峰刺清除..."
 
-#: ../src/effects/StereoToMono.h:27
-msgid "Applying Stereo To Mono"
+#: effects/StereoToMono.h:23
+#, fuzzy
+msgid "&Stereo to Mono"
+msgstr "立体声至单声道"
+
+#: effects/StereoToMono.h:38
+#, fuzzy
+msgid "Applying Stereo to Mono"
 msgstr "正在将立体声转换为单声道"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:59
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr ""
 
+#: ../src/widgets/Meter.cpp:343
+msgid "Linear"
+msgstr "线性"
+
+#: effects/ToneGen.cpp:70
+msgid "Logarithmic"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 msgid "Chirp Generator"
 msgstr ""
@@ -4639,22 +5554,29 @@ msgstr ""
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
-#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
-msgid "Length"
-msgstr ""
-
 #: ../src/effects/ToneGen.cpp:276
 msgid "Waveform:"
 msgstr "波形:"
 
-#: ../src/ControlToolBar.cpp:515
-msgid "Start"
-msgstr "开始"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: ../src/ControlToolBar.cpp:521
-msgid "End"
-msgstr "结束"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
+
+#: effects/ToneGen.cpp:365
+msgid "Interpolation:"
+msgstr ""
 
 #: effects/ToneGen.h:39
 msgid "Chirp..."
@@ -4680,10 +5602,6 @@ msgstr ""
 msgid "Truncate Silence"
 msgstr ""
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr ""
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr ""
@@ -4729,10 +5647,6 @@ msgstr "应用效果: %s 频率 = %.1f Hz, 开始相位 = %.0f 度, 深度 = %.0
 msgid "Wahwah"
 msgstr "呜咿(Wahwah)"
 
-#: ../src/effects/Wahwah.cpp:476
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "\"呜咿\"声(Wahwah)发生器(Nasca Octavian Paul提供)"
-
 #: ../src/effects/Wahwah.cpp:515
 msgid "Depth (%):"
 msgstr "深度 (%):"
@@ -4741,10 +5655,18 @@ msgstr "深度 (%):"
 msgid "Resonance:"
 msgstr "共鸣:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: ../src/effects/Wahwah.cpp:547
 msgid "Wah Frequency Offset (%):"
 msgstr "\"呜咿\"声(Wah)频率偏移 (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: ../src/effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "\"呜咿\"声(Wahwah)..."
@@ -4783,6 +5705,18 @@ msgstr "效果设定"
 msgid "Length (seconds)"
 msgstr "长度 (秒)"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: ../src/effects/nyquist/Nyquist.cpp:215
 msgid "Applying Nyquist Effect..."
 msgstr "正在应用奈奎斯特(Nyquist)效果..."
@@ -4848,11 +5782,13 @@ msgstr ""
 msgid "Program"
 msgstr ""
 
-#: ../src/export/Export.cpp:123
-msgid "No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
-msgstr "没有选定轨道!按Ctrl-A全部选定\n"
-"选择\"导出...\"以导出全部轨道。"
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
+msgstr ""
 
 #: export/Export.cpp:445
 msgid "Export File"
@@ -4905,6 +5841,10 @@ msgstr ""
 msgid " - Right"
 msgstr ""
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:775 export/Export.cpp:829
 #, c-format
 msgid "Output Channels: %2d"
@@ -4940,10 +5880,6 @@ msgstr ""
 msgid "Cannot export audio to %s"
 msgstr "无法将音频导出至 %s"
 
-#: HelpText.cpp:77 export/ExportCL.cpp:320
-msgid "Export"
-msgstr ""
-
 #: ../src/export/ExportCL.cpp:144
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "用命令行方式的编码器导出选定的音频"
@@ -4956,6 +5892,477 @@ msgstr "用命令行方式的编码器导出全部的音频"
 msgid "Command Output"
 msgstr ""
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1863
+msgid "Invalid sample rate"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1882
+msgid "You may resample to one of the rates below."
+msgstr ""
+
+#: export/ExportMP3.cpp:1905
+msgid "Sample Rates"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: ../src/prefs/FileFormatPrefs.cpp:197
+msgid "Bit Rate:"
+msgstr "比特率:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: ../src/prefs/GUIPrefs.cpp:98
+msgid "Language:"
+msgstr "语言:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: ../src/prefs/KeyConfigPrefs.cpp:194
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML文件 (*.xml)|*.xml|全部文件 (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr ""
@@ -5028,10 +6435,6 @@ msgstr ""
 msgid "Exporting the entire project as FLAC"
 msgstr ""
 
-#: export/ExportFLAC.cpp:372
-msgid "Edit the metadata for the FLAC file"
-msgstr ""
-
 #: export/ExportMP2.cpp:108
 msgid "Specify MP2 Options"
 msgstr ""
@@ -5040,10 +6443,6 @@ msgstr ""
 msgid "MP2 Export Setup"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:197
-msgid "Bit Rate:"
-msgstr "比特率:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr ""
@@ -5052,10 +6451,6 @@ msgstr ""
 msgid "Cannot export MP2 with this sample rate and bit rate"
 msgstr ""
 
-#: export/ExportMP2.cpp:237
-msgid "Edit the ID3 tags for the MP2 file"
-msgstr ""
-
 #: ../src/export/ExportMP3.cpp:1339
 #: ../src/export/ExportOGG.cpp:55
 msgid "Unable to open target file for writing"
@@ -5081,44 +6476,12 @@ msgstr "以 %d kbps 导出全部的音频"
 msgid "kbps"
 msgstr ""
 
-#: export/ExportMP3.cpp:164
-msgid "0, 220-260 kbps (Best Quality)"
-msgstr ""
-
-#: export/ExportMP3.cpp:165
-msgid "1, 200-250 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:166
-msgid "2, 170-210 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:167
-msgid "3, 155-195 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:168
-msgid "4, 145-185 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:169
-msgid "5, 110-150 kbps"
+#: export/ExportMP3.cpp:240
+msgid "(Best Quality)"
 msgstr ""
 
-#: export/ExportMP3.cpp:170
-msgid "6, 95-135 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:171
-msgid "7, 80-120 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:172
-msgid "8, 65-105 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:173
-msgid "9, 45-85 kbps (Smaller files)"
+#: export/ExportMP3.cpp:241
+msgid "(Smaller files)"
 msgstr ""
 
 #: export/ExportMP3.cpp:178
@@ -5129,20 +6492,16 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: export/ExportMP3.cpp:184
-msgid "Insane, 320 kbps"
+#: export/ExportMP3.cpp:248
+msgid "Insane"
 msgstr ""
 
-#: export/ExportMP3.cpp:185
-msgid "Extreme, 220-260 kbps"
-msgstr ""
-
-#: export/ExportMP3.cpp:186
-msgid "Standard, 170-210 kbps"
+#: export/ExportMP3.cpp:249
+msgid "Extreme"
 msgstr ""
 
-#: export/ExportMP3.cpp:187
-msgid "Medium, 145-185 kbps"
+#: export/ExportMP3.cpp:251
+msgid "Medium"
 msgstr ""
 
 #: export/ExportMP3.cpp:249
@@ -5173,6 +6532,10 @@ msgstr ""
 msgid "Constant"
 msgstr ""
 
+#: ../src/prefs/PrefsDialog.cpp:84
+msgid "Quality"
+msgstr "音质"
+
 #: export/ExportMP3.cpp:324
 msgid "Variable Speed:"
 msgstr ""
@@ -5198,33 +6561,15 @@ msgstr ""
 msgid "Audacity needs the file %s to create MP3s."
 msgstr ""
 
-#: export/ExportMP3.cpp:507
-#, c-format
-msgid "Location of %s:"
-msgstr ""
-
-#: export/ExportMP3.cpp:516
-#, c-format
-msgid "To find %s, click here -->"
-msgstr ""
-
-#: export/ExportMP3.cpp:522
-msgid "Browse..."
-msgstr ""
-
 #: export/ExportMP3.cpp:523
 msgid "To get a free copy of Lame, click here -->"
 msgstr ""
 
-#: export/ExportMP3.cpp:524
-msgid "Download..."
-msgstr ""
-
-#. i18n-hint: It's asking for the location of a file, for
-#: ../src/export/ExportMP3.cpp:113
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "%s 在哪里?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: ../src/export/ExportMP3.cpp:1114
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5234,8 +6579,9 @@ msgstr "仅限lame_enc.dll|lame_enc.dll|动态链接库(*.dll)|*.dll|全部文
 msgid "Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:253
-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+#: export/ExportMP3.cpp:1567
+#, fuzzy
+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
 msgstr "仅限libmp3lame.so|libmp3lame.so|主要的共享目标文件(*.so)|*.so|扩展库(*.so*)|*.so*|全部文件(*)|*"
 
 #: export/ExportMP3.cpp:1592
@@ -5254,10 +6600,6 @@ msgstr "不是有效的或支持的MP3编码库!"
 msgid "Unable to initialize MP3 stream"
 msgstr ""
 
-#: ../src/export/ExportMP3.cpp:1350
-msgid "Edit the ID3 tags for the MP3 file"
-msgstr "编辑MP3文件的ID3标记"
-
 #: export/ExportMP3.cpp:1744
 #, c-format
 msgid "Exporting selected audio with %s preset"
@@ -5293,10 +6635,6 @@ msgstr ""
 msgid "Error %d returned from MP3 encoder"
 msgstr ""
 
-#: export/ExportMP3.cpp:1863
-msgid "Invalid sample rate"
-msgstr ""
-
 #: export/ExportMP3.cpp:1876
 #, c-format
 msgid "The project sample rate (%d) is not supported by the MP3\n"
@@ -5309,18 +6647,10 @@ msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr ""
 
-#: export/ExportMP3.cpp:1882
-msgid "You may resample to one of the rates below."
-msgstr ""
-
-#: export/ExportMP3.cpp:1905
-msgid "Sample Rates"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:261
-msgid "MP3 exporting plugin not found"
-msgstr "找不到MP3导出插件"
-
 #: ../src/export/ExportMultiple.cpp:464
 #: ../src/export/ExportMultiple.cpp:573
 #: ../src/export/ExportMultiple.cpp:656
@@ -5378,6 +6708,10 @@ msgstr "包含在第一个标签之前的音频"
 msgid "First file name:"
 msgstr "第一个文件名:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:755
 msgid "Tracks"
 msgstr "轨道"
@@ -5398,15 +6732,14 @@ msgstr "连续编号"
 msgid "File name prefix:"
 msgstr "文件名前缀:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: ../src/export/ExportMultiple.cpp:796
 msgid "Overwrite existing files"
 msgstr "覆盖现有的文件"
 
-#: export/ExportCL.cpp:113 export/ExportMultiple.cpp:847
-#: export/ExportOGG.cpp:123 export/ExportPCM.cpp:103
-msgid "E&xport"
-msgstr ""
-
 #: export/ExportMultiple.cpp:360
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5416,10 +6749,6 @@ msgstr ""
 msgid "Choose a location to save the exported files"
 msgstr "选择保存导出文件的位置"
 
-#: export/ExportMultiple.cpp:438
-msgid "Edit the metadata"
-msgstr ""
-
 #: export/ExportMultiple.cpp:480
 #, c-format
 msgid "\"%s\" doesn't exist.\n"
@@ -5427,6 +6756,10 @@ msgid "\"%s\" doesn't exist.\n"
 "Would you like to create it?"
 msgstr ""
 
+#: export/ExportMultiple.cpp:637 export/ExportMultiple.cpp:772
+msgid "Edit metadata"
+msgstr ""
+
 #: export/ExportMultiple.cpp:590
 #, c-format
 msgid "Successfully exported %d file(s)."
@@ -5437,6 +6770,12 @@ msgstr ""
 msgid "Something went wrong after exporting %d file(s)."
 msgstr ""
 
+#: export/ExportMultiple.cpp:881
+#, c-format
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
+"Use..."
+msgstr ""
+
 #: export/ExportOGG.cpp:64
 msgid "Specify Ogg Vorbis Options"
 msgstr ""
@@ -5445,10 +6784,6 @@ msgstr ""
 msgid "Ogg Vorbis Export Setup"
 msgstr ""
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr ""
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr ""
@@ -5461,22 +6796,14 @@ msgstr "将选定的音频导出为Ogg Vorbis文件"
 msgid "Exporting the entire project as Ogg Vorbis"
 msgstr "将全部的音频导出为Ogg Vorbis文件"
 
-#: export/ExportOGG.cpp:347
-msgid "Edit the metadata for the OGG file"
-msgstr ""
-
-#: export/ExportPCM.cpp:115
-msgid "Specify PCM Options"
+#: export/ExportPCM.cpp:116
+msgid "Specify Uncompressed Options"
 msgstr ""
 
 #: export/ExportPCM.cpp:171
 msgid "Uncompressed Export Setup"
 msgstr ""
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr ""
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr ""
@@ -5492,8 +6819,20 @@ msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(并非所有的头与编码的\n"
 "组合是可能成立的。)"
 
-#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
 msgstr ""
 
 #: ../src/export/ExportPCM.cpp:73
@@ -5517,8 +6856,36 @@ msgstr ""
 msgid "Error (file may not have been written): %s"
 msgstr "错误 (文件可能未被写入): %hs"
 
-#: export/ExportPCM.cpp:462
-msgid "Edit the metadata for the uncompressed file"
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:78
+msgid "MP3 files"
+msgstr ""
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
 msgstr ""
 
 #: ../src/import/Import.cpp:165
@@ -5526,6 +6893,14 @@ msgstr ""
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "此版本的Audacity在编译时没有附带针对%s的支持。"
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:167
 #, c-format
@@ -5556,9 +6931,10 @@ msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:188
+#: import/Import.cpp:271
 #, c-format
-msgid "\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
@@ -5571,19 +6947,71 @@ msgid "\"%s\" is a RealPlayer media file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
 msgstr ""
 
-#: import/Import.cpp:221
-msgid "Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:282
+#, c-format
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
+"Audacity cannot open this type of file. \n"
+"Try converting it to an audio file such as WAV or AIFF and \n"
+"then import it, or record it into Audacity."
+msgstr ""
+
+#: import/Import.cpp:288
+#, c-format
+msgid "\"%s\" is a Musepack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
+"and try importing it again. Otherwise you need to convert it to a supported audio \n"
+"format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:294
+#, c-format
+msgid "\"%s\" is a Wavpack audio file. \n"
+"Audacity cannot open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:300
+#, c-format
+msgid "\"%s\" is a Dolby Digital audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:306
+#, c-format
+msgid "\"%s\" is an Ogg Speex audio file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to convert it to a supported audio format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
+msgstr ""
+
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
 msgstr ""
 
-#: ../src/import/Import.cpp:174
-msgid "Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
-msgstr "Audacity无法识别该文件的类型。\n"
-"如果它未被压缩,请尝试用\"导入Raw\"将其导入。"
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
+msgstr ""
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -5621,16 +7049,17 @@ msgstr "MIDI轨道不能单独偏移,只有音频文件才可以。"
 msgid "Invalid track offset in LOF file."
 msgstr "LOF 文件中的轨道偏移无效。"
 
-#: ../src/import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "解析Allegro文件出错"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: ../src/import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "解析MIDI文件出错"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:78
-msgid "MP3 files"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
 msgstr ""
 
 #: import/ImportOGG.cpp:35
@@ -5657,15 +7086,23 @@ msgstr "无效的Vorbis 比特流头部"
 msgid "Internal logic fault"
 msgstr "内部处理错误"
 
-#: ../src/Project.cpp:2426
+#: export/ExportPCM.cpp:320 import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr ""
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "导入'%s'文件..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr ""
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:267
 msgid "Import Raw Data"
 msgstr "导入原始(Raw)数据"
@@ -5703,6 +7140,14 @@ msgstr "2声道(立体声)"
 msgid "%d Channels"
 msgstr "%d 声道"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: ../src/import/ImportRaw.cpp:376
 msgid "Start offset:"
 msgstr "起始偏移:"
@@ -5715,8 +7160,17 @@ msgstr "总计要导入:"
 msgid "Sample rate:"
 msgstr "采样率:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:83
@@ -5760,10 +7214,9 @@ msgstr ""
 msgid "Playthrough"
 msgstr "回放"
 
-#: prefs/AudioIOPrefs.cpp:147
-#, fuzzy
-msgid "&Play other tracks while recording new one"
-msgstr "在录制新轨时播放其它的轨道"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -5773,8 +7226,12 @@ msgstr ""
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:194
@@ -5801,12 +7258,14 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:174
-msgid "Audio to buffer:"
+#: prefs/AudioIOPrefs.cpp:195
+msgid "Audio to buffer:\n"
+"(higher = more latency)"
 msgstr ""
 
-#: prefs/AudioIOPrefs.cpp:177
-msgid "Latency correction:"
+#: prefs/AudioIOPrefs.cpp:198
+msgid "Latency correction:\n"
+"(negative = backwards)"
 msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -5835,23 +7294,10 @@ msgid "&Don't apply effects in batch mode"
 msgstr ""
 
 #: prefs/BatchPrefs.cpp:83
-msgid "&When importing audio, normalize all tracks in project"
-msgstr ""
-
-#: prefs/BatchPrefs.cpp:83
 #, fuzzy
 msgid "Cl&eanSpeech Mode (Customized GUI)"
 msgstr "'清晰话音'模式 (定制GUI)"
 
-#: ../src/prefs/BatchPrefs.cpp:69
-#: ../src/prefs/GUIPrefs.cpp:37
-msgid "Show / Hide"
-msgstr "显示 / 隐藏"
-
-#: prefs/BatchPrefs.cpp:91
-msgid "S&how Metadata Editor prior to export step"
-msgstr ""
-
 #: ../src/prefs/PrefsDialog.cpp:87
 #: ../src/prefs/PrefsDialog.cpp:210
 msgid "Directories"
@@ -5890,7 +7336,7 @@ msgid "Audio cache"
 msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
 msgstr ""
 
 #: ../src/prefs/DirectoriesPrefs.cpp:136
@@ -5915,23 +7361,65 @@ msgstr "目录%s不可写"
 msgid "Changes to temporary directory will not take effect until Audacity is restarted"
 msgstr "改变临时目录在重启Audacity之后才有效。"
 
-#: prefs/FileFormatPrefs.cpp:47 prefs/FileFormatPrefs.cpp:48
-msgid "Audio Files"
+#: prefs/FileFormatPrefs.cpp:53 prefs/FileFormatPrefs.cpp:54
+msgid "Import / Export"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:76
-msgid "When importing uncompressed audio files"
+#: prefs/FileFormatPrefs.cpp:84
+msgid "MP3 Export Library"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:127
-#, fuzzy
-msgid "&Make a copy of the file before editing (safer)"
-msgstr "在编辑前生成文件备份(更安全)"
+#: ../src/prefs/FileFormatPrefs.cpp:180
+msgid "MP3 Library Version:"
+msgstr "MP3库的版本:"
 
-#: prefs/FileFormatPrefs.cpp:128
-#, fuzzy
-msgid "&Read directly from the original file (faster)"
-msgstr "从原始文件中直接读入(快速)"
+#: prefs/FileFormatPrefs.cpp:93
+msgid "MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:98
+msgid "LAME MP3 Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:101 prefs/FileFormatPrefs.cpp:125
+msgid "&Download"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:137
+msgid "When importing audio files"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:140
+msgid "&Make a copy of uncompressed audio files before editing (safer)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:141
+msgid "&Read uncompressed audio files directly from the original (faster)"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:143
+msgid "&Normalize all tracks in project"
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:132
 msgid "When saving a project that depends on other audio files"
@@ -5961,54 +7449,48 @@ msgstr ""
 msgid "&Use custom mix (for example to export a 5.1 multichannel file)"
 msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:101
-msgid "MP3 Export Library Location"
+#: prefs/BatchPrefs.cpp:91
+msgid "S&how Metadata Editor prior to export step"
 msgstr ""
 
-#: ../src/prefs/FileFormatPrefs.cpp:180
-msgid "MP3 Library Version:"
-msgstr "MP3库的版本:"
+#: ../src/prefs/PrefsDialog.cpp:88
+msgid "Interface"
+msgstr "界面"
 
-#: prefs/FileFormatPrefs.cpp:185
-#, fuzzy
-msgid "&Find Library"
-msgstr "检索库"
+#: prefs/GUIPrefs.cpp:42
+msgid "In Browser"
+msgstr ""
 
-#: prefs/FileFormatPrefs.cpp:112
-msgid "&Download Free Copy of LAME"
+#: prefs/GUIPrefs.cpp:43
+msgid "From Internet"
 msgstr ""
 
-#: ../src/prefs/PrefsDialog.cpp:88
-msgid "Interface"
-msgstr "界面"
+#: prefs/GUIPrefs.cpp:50
+msgid "Simple"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:72
 msgid "&Update display while playing"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:74
-msgid "Any Close/Exit command completely &quits Audacity"
+#: prefs/GUIPrefs.cpp:96
+msgid "Cl&osing last window quits Audacity"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:76
 msgid "Enable &dragging of left and right selection edges"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-#, fuzzy
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "Audio I/O按钮的人体工程学顺序(ergonomic order)"
+#: prefs/GUIPrefs.cpp:100
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:80
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:82
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
-msgstr ""
-
-#: prefs/GUIPrefs.cpp:88
-msgid "&Present track number to accessibility aid"
+#: prefs/GUIPrefs.cpp:104
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr ""
 
 #: prefs/GUIPrefs.cpp:90
@@ -6023,6 +7505,11 @@ msgstr ""
 msgid "&Beep on completion of longer activities"
 msgstr ""
 
+#: ../src/prefs/BatchPrefs.cpp:69
+#: ../src/prefs/GUIPrefs.cpp:37
+msgid "Show / Hide"
+msgstr "显示 / 隐藏"
+
 #: prefs/GUIPrefs.cpp:96
 #, fuzzy
 msgid "Enable cut &lines"
@@ -6033,25 +7520,25 @@ msgstr "开启'剪切线'"
 msgid "Show warnings about &temp files"
 msgstr "显示关于临时文件的警告信息"
 
-#: prefs/GUIPrefs.cpp:100
-msgid "&Show prompt to save, even if project is empty"
+#: prefs/GUIPrefs.cpp:120
+msgid "Show prompt to sa&ve, even if project is empty"
 msgstr ""
 
-#: prefs/GUIPrefs.cpp:102
-msgid "Show Welcome Message at program start up"
+#: prefs/GUIPrefs.cpp:122
+msgid "Show &Welcome Message at program start up"
 msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:100
-msgid "Language"
-msgstr "语言"
+#: prefs/GUIPrefs.cpp:126
+msgid "Modes"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:98
-msgid "Language:"
-msgstr "语言:"
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
 
-#: ../src/prefs/GUIPrefs.cpp:110
-msgid "Minimum of dB mode display range"
-msgstr "最小 dB 模式显示范围"
+#: prefs/GUIPrefs.cpp:138
+msgid "Display range minimum: meters and 'Waveform (dB)'"
+msgstr ""
 
 #: ../src/prefs/GUIPrefs.cpp:383
 msgid "-36 dB (shallow range for high-amplitude editing)"
@@ -6061,6 +7548,10 @@ msgstr "-36 dB (小范围,适用于大振幅编辑)"
 msgid "-48 dB (PCM range of 8 bit samples)"
 msgstr "-48 dB (PCM  8 bit 采样范围)"
 
+#: prefs/GUIPrefs.cpp:143
+msgid "-60 dB (PCM range of 10 bit samples)"
+msgstr ""
+
 #: ../src/prefs/GUIPrefs.cpp:387
 msgid "-96 dB (PCM range of 16 bit samples)"
 msgstr "-96 dB (PCM 16 bit 采样范围)"
@@ -6073,10 +7564,34 @@ msgstr "-120dB (接近人类听力的极限)"
 msgid "-145 dB (PCM range of 24 bit samples)"
 msgstr "-145 dB (PCM 24 bit 采样范围)"
 
+#: prefs/GUIPrefs.cpp:151
+msgid "Default View Mode"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:164
+msgid "Other interface choices"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:167
+msgid "Help:"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Solo Button:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:90
 msgid "Keyboard"
 msgstr "键盘"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:93
 msgid "Key Bindings"
 msgstr ""
@@ -6109,10 +7624,6 @@ msgstr "保存按键快捷方式出错"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "选择包含Audacity快捷键定义的XML文件..."
 
-#: ../src/prefs/KeyConfigPrefs.cpp:194
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML文件 (*.xml)|*.xml|全部文件 (*.*)|*.*"
-
 #: ../src/prefs/KeyConfigPrefs.cpp:207
 msgid "Error loading keyboard shortcuts"
 msgstr "读取按键快捷方式错误"
@@ -6128,6 +7639,43 @@ msgstr ""
 msgid "Undo"
 msgstr "撤销"
 
+#: prefs/AudioIOPrefs.cpp:147
+#, fuzzy
+msgid "&Play other tracks while recording new one"
+msgstr "在录制新轨时播放其它的轨道"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:174
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:177
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: ../src/prefs/PrefsDialog.cpp:91
 msgid "Mouse"
 msgstr "é¼ æ ‡"
@@ -6358,10 +7906,6 @@ msgstr "放大或缩小"
 msgid "Audacity Preferences"
 msgstr "Audacity参数选择"
 
-#: ../src/prefs/PrefsDialog.cpp:84
-msgid "Quality"
-msgstr "音质"
-
 #: ../src/prefs/QualityPrefs.cpp:168
 msgid "Rectangle"
 msgstr "矩形"
@@ -6426,12 +7970,12 @@ msgstr ""
 msgid "Smart Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:81 prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
 msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
 msgstr ""
 
 #: ../src/prefs/PrefsDialog.cpp:86
@@ -6450,6 +7994,10 @@ msgstr "8 - 最宽带"
 msgid "256 - default"
 msgstr "256 - 缺省"
 
+#: prefs/SpectrumPrefs.cpp:107
+msgid "32768 - most narrowband"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:48
 msgid "4096 - most narrowband"
 msgstr "4096 - 最窄带"
@@ -6458,6 +8006,10 @@ msgstr "4096 - 最窄带"
 msgid "Window type:"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:125
+msgid "FFT Skip Points"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:99
 msgid "Display"
 msgstr "显示"
@@ -6474,6 +8026,26 @@ msgstr ""
 msgid "Maximum Frequency (Hz):"
 msgstr "最高频率 (Hz):"
 
+#: prefs/SpectrumPrefs.cpp:158
+msgid "&Y-Grid"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:161
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:162
+msgid "&Quantize Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:165
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
 #: ../src/prefs/SpectrumPrefs.cpp:158
 msgid "The maximum frequency must be an integer"
 msgstr "最大频率值必须是整数"
@@ -6490,6 +8062,14 @@ msgstr ""
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:220
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:226 prefs/SpectrumPrefs.cpp:230
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:61 prefs/ThemePrefs.cpp:62
 msgid "Theme"
 msgstr ""
@@ -6562,10 +8142,6 @@ msgid "Saving and loading individual theme files uses a \n"
 "\n"
 msgstr ""
 
-#: ../src/ControlToolBar.cpp:149
-msgid "Control"
-msgstr "控制"
-
 #: ../src/ControlToolBar.cpp:519
 #: ../src/ControlToolBar.cpp:528
 msgid "Pause"
@@ -6575,9 +8151,9 @@ msgstr "暂停"
 msgid "Play"
 msgstr "播放"
 
-#: ../src/ControlToolBar.cpp:525
-msgid "Play (Shift for loop-play)"
-msgstr "播放 (Shift键循环播放)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: ../src/ControlToolBar.cpp:520
 #: ../src/ControlToolBar.cpp:529
@@ -6592,6 +8168,10 @@ msgstr "跳至开始位置"
 msgid "Skip to End"
 msgstr "跳至结束位置"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: ../src/ControlToolBar.cpp:517
 #: ../src/ControlToolBar.cpp:527
 msgid "Clean Speech"
@@ -6625,6 +8205,10 @@ msgstr "修剪非选段部分"
 msgid "Silence selection"
 msgstr "静音选段"
 
+#: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
 #: ../src/EditToolBar.cpp:162
 msgid "Zoom In"
 msgstr "放大"
@@ -6681,24 +8265,20 @@ msgstr "输出音量指示"
 msgid "Input level meter - click to monitor input"
 msgstr "输入音量指示 - 点击监视输入"
 
-#: ../src/MixerToolBar.cpp:102
-msgid "Mixer"
-msgstr "混音器"
-
 #: ../src/MixerToolBar.cpp:136
 msgid "Output Volume"
 msgstr "输出音量"
 
-#: toolbars/MixerToolBar.cpp:93
-msgid "Slider-Output"
+#: toolbars/MixerToolBar.cpp:92
+msgid "Slider Output"
 msgstr ""
 
 #: ../src/MixerToolBar.cpp:139
 msgid "Input Volume"
 msgstr "输入音量"
 
-#: toolbars/MixerToolBar.cpp:104
-msgid "Slider-Input"
+#: toolbars/MixerToolBar.cpp:103
+msgid "Slider Input"
 msgstr ""
 
 #: toolbars/MixerToolBar.cpp:119
@@ -6717,6 +8297,11 @@ msgstr "工程采样率 (Hz):"
 msgid "Selection Start:"
 msgstr "选段的起点:"
 
+#: effects/ToneGen.cpp:300 effects/ToneGen.cpp:338
+#: toolbars/SelectionBar.cpp:135 toolbars/SelectionBar.cpp:225
+msgid "Length"
+msgstr ""
+
 #: toolbars/SelectionBar.cpp:145
 msgid "hidden"
 msgstr ""
@@ -6985,6 +8570,22 @@ msgstr "右"
 msgid "Help"
 msgstr ""
 
+#: widgets/ErrorDialog.cpp:137
+msgid "<"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:138
+msgid ">"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:142
+msgid "Forwards"
+msgstr ""
+
+#: widgets/ErrorDialog.cpp:143
+msgid "Backwards"
+msgstr ""
+
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
 msgstr ""
@@ -7031,14 +8632,14 @@ msgstr "水平立体声"
 msgid "Vertical Stereo"
 msgstr "垂直立体声"
 
-#: ../src/widgets/Meter.cpp:343
-msgid "Linear"
-msgstr "线性"
-
 #: ../src/widgets/Meter.cpp:352
 msgid "Preferences..."
 msgstr "参数设定..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: ../src/widgets/Meter.cpp:1043
 msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
@@ -7061,6 +8662,22 @@ msgstr ""
 msgid " Please select an action "
 msgstr ""
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1110 widgets/Ruler.cpp:1111
 msgid "Vertical Ruler"
 msgstr ""
@@ -7069,10 +8686,6 @@ msgstr ""
 msgid "01000,01000 seconds"
 msgstr ""
 
-#: widgets/TimeTextCtrl.cpp:199
-msgid "hh:mm:ss"
-msgstr ""
-
 #: widgets/TimeTextCtrl.cpp:200
 msgid "0100 h 060 m 060 s"
 msgstr ""
@@ -7085,6 +8698,21 @@ msgstr ""
 msgid "0100 days 024 h 060 m 060 s"
 msgstr ""
 
+#. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
 #: ../src/widgets/TimeTextCtrl.cpp:153
 msgid "hh:mm:ss + milliseconds"
 msgstr "时:分:秒 + 毫秒"
@@ -7198,10 +8826,10 @@ msgstr "下次不再显示此警告"
 msgid "Could not open file: \"%s\""
 msgstr "无法打开文件: \"%s\""
 
-#: ../src/xml/XMLFileReader.cpp:59
+#: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "错误: %hs (%d 行)"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/locale/zh_TW.po b/locale/zh_TW.po
index fabc067..4384622 100644
--- a/locale/zh_TW.po
+++ b/locale/zh_TW.po
@@ -1,7 +1,6 @@
 # Copyright (C) 2002,2003, 2004 Free Software Foundation, Inc.
 msgid ""
-msgstr ""
-"Project-Id-Version: zh-TW\n"
+msgstr "Project-Id-Version: zh-TW\n"
 "POT-Creation-Date: 2004-08-10 20:54-0700\n"
 "PO-Revision-Date: 2008-05-03 23:20+0800\n"
 "Last-Translator: Kene Lin <kenelin at gmail.com>\n"
@@ -24,33 +23,16 @@ msgid "OK... Audacious!"
 msgstr "確定…嗆聲!"
 
 #: AboutDialog.cpp:175
-msgid "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."
+msgid "Audacity is a free program written by a team of volunteer <a href=\"http://audacity.sourceforge.net/community/developers\">developers</a> around the world. We are grateful to <a href=\"http://sourceforge.net\">SourceForge.net</a> for our project hosting. Audacity is available for Windows 98 and later, Mac OS X, Linux and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9."
 msgstr ""
-"Audacity是一個由世界各地志願開發團隊合力撰寫的自由程式。\n"
-"在此要感謝一個把這些資源集中的自由軟體協同開發的網站,\n"
-"SourceForge.net 所提供的線上服務。Audacity 可以在Windows 98\n"
-" 及更新的Windows作業系統, Mac OS X, Linux, 和其他類似Unix的\n"
-"作業系統上使用。Mac OS 9上可以安裝較舊版本的Audacity。"
 
 #: AboutDialog.cpp:179
-msgid "This is a beta version of the program.  It may contain bugs and unfinished features.  We depend on your feedback, so please visit our website and give us your bug reports and feature requests."
+msgid "This is a Beta version of the program. It may contain bugs and unfinished features. We depend on your feedback: please send bug reports and feature requests to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"這是測試版(beta)。可能包含原始碼錯誤及未完成的功能。我們需\n"
-"要您的回饋,請瀏覽我們的網站填寫錯誤報告,或者您也可以填\n"
-"寫功能申請,以便將您所希望的新功能告訴我們。\n"
-"\n"
-"對於正體中文有問題的話,請回報給\n"
-"http://rt.openfoundry.org/Foundry/Project/index.html?Queue=210"
 
 #: AboutDialog.cpp:182
-msgid "This is a stable, completed release of Audacity. However, if you find a bug or have a suggestion, please contact us. We depend on feedback from users in order to continue to improve Audacity. For more information, visit our website."
+msgid "This is a stable, completed release of the program. However, if you find a bug or have a suggestion for us, please write to <b>feedback at audacityteam.org</b>. For help using Audacity, please visit our <a href=\"http://audacityteam.org/forum/\">Forum</a>."
 msgstr ""
-"此Audacity是一個穩定的完整版。如果您發現錯誤或有什麼建\n"
-"議,請與我們聯繫。我們需要來自使用者的回饋,以改進Audacity\n"
-"軟體。詳情請瀏覽我們的網站。\n"
-"\n"
-"對於正體中文有問題的話,請回報給\n"
-"http://rt.openfoundry.org/Foundry/Project/index.html?Queue=210"
 
 #. i18n-hint: The translation of "translator_credits" will appear
 #. in the credits in the About Audacity window.  Use this to add
@@ -64,8 +46,8 @@ msgid "translator_credits"
 msgstr "Chinese(Traditional) translation by Chido, Milo"
 
 #: AboutDialog.cpp:207
-msgid "A Free Digital Audio Editor"
-msgstr "一個自由的數位成音工程軟體"
+msgid "A Free Digital Audio Editor<br>"
+msgstr ""
 
 #: AboutDialog.cpp:211
 msgid "Credits"
@@ -101,6 +83,10 @@ msgstr "Audacity是基於以下專案的程式碼開發的:"
 msgid "Special thanks:"
 msgstr "特別感謝:"
 
+#: AboutDialog.cpp:250
+msgid "<b>Audacity&reg;</b> software is copyright &copy; 1999-2008 Audacity Team. <br>The name <b>Audacity&reg;</b> is a registered trademark of Dominic Mazzoni."
+msgstr ""
+
 #: AboutDialog.cpp:254
 msgid "Audacity"
 msgstr "Audacity"
@@ -244,12 +230,10 @@ msgstr "開啟專案錯誤"
 
 #: AudacityApp.cpp:502
 #, c-format
-msgid ""
-"%s does not exist and could not be opened.\n"
+msgid "%s does not exist and could not be opened.\n"
 "\n"
 "It has been removed from the history list."
-msgstr ""
-"%s不存在,或者無法開啟。\n"
+msgstr "%s不存在,或者無法開啟。\n"
 "\n"
 "它將從工作記錄中移除。"
 
@@ -285,11 +269,9 @@ msgid "Unknown command line option: %s\n"
 msgstr "不支援的命令列選項: %s\n"
 
 #: AudacityApp.cpp:1044
-msgid ""
-"Audacity could not find a place to store temporary files.\n"
+msgid "Audacity could not find a place to store temporary files.\n"
 "Please enter an appropriate directory in the preferences dialog."
-msgstr ""
-"Audacity無法儲存暫存檔案。\n"
+msgstr "Audacity無法儲存暫存檔案。\n"
 "請至偏好設定輸入適當目錄。"
 
 #: AudacityApp.cpp:1050
@@ -297,20 +279,16 @@ msgid "Audacity is now going to exit. Please launch Audacity again to use the ne
 msgstr "Audacity即將關閉。請重新啟動Audacity使用新的暫存目錄。"
 
 #: AudacityApp.cpp:1082
-msgid ""
-"Running two copies of Audacity simultaneously may cause\n"
+msgid "Running two copies of Audacity simultaneously may cause\n"
 "data loss or cause your system to crash.\n"
 "\n"
-msgstr ""
-"同時開啟兩個Audacity程式可能會導致資料損毀或當機。\n"
+msgstr "同時開啟兩個Audacity程式可能會導致資料損毀或當機。\n"
 "\n"
 
 #: AudacityApp.cpp:1089
-msgid ""
-"Audacity was not able to lock the temporary files directory.\n"
+msgid "Audacity was not able to lock the temporary files directory.\n"
 "This folder may be in use by another copy of Audacity.\n"
-msgstr ""
-"Audacity無法鎖定暫存檔目錄。\n"
+msgstr "Audacity無法鎖定暫存檔目錄。\n"
 "此目錄可能被另一個正在執行的Audacity使用。\n"
 
 #: AudacityApp.cpp:1091
@@ -326,11 +304,9 @@ msgid "The system has detected that another copy of Audacity is running.\n"
 msgstr "系統偵測出目前有另一個Audacity正在執行。\n"
 
 #: AudacityApp.cpp:1133
-msgid ""
-"Use the New or Open commands in the currently running Audacity\n"
+msgid "Use the New or Open commands in the currently running Audacity\n"
 "process to open multiple projects simultaneously.\n"
-msgstr ""
-"在目前執行的Audacity裡用\"開新檔案\"或\"開啟\"命令\n"
+msgstr "在目前執行的Audacity裡用\"開新檔案\"或\"開啟\"命令\n"
 "可以同時開啟多個檔案。\n"
 
 #: AudacityApp.cpp:1134
@@ -372,13 +348,11 @@ msgid "In addition, specify the name of an audio file or Audacity project to ope
 msgstr "此外,指定一個欲開啟的音訊檔案或工程檔案名稱。"
 
 #: AudacityApp.cpp:1443
-msgid ""
-"Audacity project (.AUP) files are not currently \n"
+msgid "Audacity project (.AUP) files are not currently \n"
 "associated with Audacity. \n"
 "\n"
 "Associate them, so they open on double-click?"
-msgstr ""
-"Audacity成音工程(.AUP)檔案目前沒有關聯到Audacity程式。\n"
+msgstr "Audacity成音工程(.AUP)檔案目前沒有關聯到Audacity程式。\n"
 "關聯後可以雙擊AUP檔案時,用Audacity開啟。\n"
 "\n"
 "要進行關聯嗎?"
@@ -392,11 +366,9 @@ msgid "Could not find any audio devices.\n"
 msgstr "找不到任何音訊裝置。\n"
 
 #: AudioIO.cpp:242
-msgid ""
-"You will not be able to play or record audio.\n"
+msgid "You will not be able to play or record audio.\n"
 "\n"
-msgstr ""
-"無法播放/錄製音訊。\n"
+msgstr "無法播放/錄製音訊。\n"
 "\n"
 
 #: AudioIO.cpp:245
@@ -412,12 +384,10 @@ msgid "Latency problem"
 msgstr "延遲問題"
 
 #: AudioIO.cpp:1208
-msgid ""
-"Latency setting has caused the recorded audio to be hidden before zero.\n"
+msgid "Latency setting has caused the recorded audio to be hidden before zero.\n"
 "Audacity has brought it back to start at zero.\n"
 "You may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."
-msgstr ""
-"延遲設定導致錄音不會從零時間開始。\n"
+msgstr "延遲設定導致錄音不會從零時間開始。\n"
 "Audacity會將錄音時間歸零。\n"
 "你也可以使用時間位移工具 (<--->或F5) 來拖曳音軌的時間至正確的位置。"
 
@@ -426,11 +396,9 @@ msgid "Automatic Crash Recovery"
 msgstr "當機自動回復"
 
 #: AutoRecovery.cpp:73
-msgid ""
-"Some projects were not saved properly the last time Audacity was run.\n"
+msgid "Some projects were not saved properly the last time Audacity was run.\n"
 "Fortunately, the following projects can automatically be recovered:"
-msgstr ""
-"上一次執行Audacity時有部份工程沒有適當的儲存。\n"
+msgstr "上一次執行Audacity時有部份工程沒有適當的儲存。\n"
 "此次工程可以自動回復上次未適當儲存的部份:"
 
 #: AutoRecovery.cpp:75
@@ -459,11 +427,9 @@ msgid "Recover Projects"
 msgstr "回復工程"
 
 #: AutoRecovery.cpp:127
-msgid ""
-"Are you sure you don't want to recover any projects?\n"
+msgid "Are you sure you don't want to recover any projects?\n"
 "They can't be recovered later."
-msgstr ""
-"你確定不要復原此工程?\n"
+msgstr "你確定不要復原此工程?\n"
 "之後就無法再復原了。"
 
 #: AutoRecovery.cpp:128
@@ -538,11 +504,9 @@ msgstr "%s命令尚未完成"
 
 #: BatchCommands.cpp:529
 #, c-format
-msgid ""
-"Could not set parameters of effect %s\n"
+msgid "Could not set parameters of effect %s\n"
 " to %s."
-msgstr ""
-"無法將效果參數%s\n"
+msgstr "無法將效果參數%s\n"
 "設定至%s。"
 
 #: BatchCommands.cpp:583
@@ -552,12 +516,10 @@ msgstr "%s批次命令無法辨識。"
 
 #: BatchCommands.cpp:674
 #, c-format
-msgid ""
-"Apply %s with parameter(s)\n"
+msgid "Apply %s with parameter(s)\n"
 "\n"
 "%s"
-msgstr ""
-"以參數套用至%s\n"
+msgstr "以參數套用至%s\n"
 "\n"
 "%s"
 
@@ -577,6 +539,10 @@ msgstr "套用 %s"
 msgid "Apply Chain"
 msgstr "套用連鎖指令中"
 
+#: BatchProcessDialog.cpp:67
+msgid "CleanSpeech Batch Processing"
+msgstr ""
+
 #: BatchProcessDialog.cpp:94
 msgid "&Select chain"
 msgstr "選取連鎖指令(&S)"
@@ -623,10 +589,18 @@ msgstr "套用'%s'至目前工程"
 msgid "Please save and close the current project first."
 msgstr "請先將目前的工程儲存並關閉。"
 
+#: BatchProcessDialog.cpp:206
+msgid "Select vocal file(s) for batch CleanSpeech Chain..."
+msgstr ""
+
 #: BatchProcessDialog.cpp:207
 msgid "Select file(s) for batch processing..."
 msgstr "選擇要批次處理的檔案..."
 
+#: BatchProcessDialog.cpp:209
+msgid "Vocal files (*.wav;*.mp3)|*.wav;*.mp3|WAV files (*.wav)|*.wav|MP3 files (*.mp3)|*.mp3"
+msgstr ""
+
 #: BatchProcessDialog.cpp:210
 msgid "All files (*.*)|*.*|WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif|AU files (*.au)|*.au|MP3 files (*.mp3)|*.mp3|Ogg Vorbis files (*.ogg)|*.ogg|FLAC files (*.flac)|*.flac"
 msgstr "所有檔案(*.*)|*.*|WAV檔案(*.wav)|*.wav|AIFF檔案*.aif)|*.aif|AU檔案(*.au)|*.au|MP3檔案(*.mp3)|*.mp3|Ogg Vorbis檔案(*.ogg)|*.ogg|FLAC檔案*.flac)|*.flac"
@@ -739,12 +713,10 @@ msgid "Copying audio data into project..."
 msgstr "複製音訊資料至工程中..."
 
 #: Dependencies.cpp:219
-msgid ""
-"Your project currently depends on the presence of other files.\n"
+msgid "Your project currently depends on the presence of other files.\n"
 "Copy audio from the following files into your project to make it self-contained?\n"
 "This will need more disc space but is safer."
-msgstr ""
-"您的工程相依於外部音訊檔案。\n"
+msgstr "您的工程相依於外部音訊檔案。\n"
 "將外部音訊檔案複製進此工程可以讓工程具有獨立性。\n"
 "這會增加檔案大小,但更安全。"
 
@@ -811,8 +783,7 @@ msgid "Dependency check"
 msgstr "相依性檢查"
 
 #: DirManager.cpp:136
-msgid ""
-"Warning: there is very little free disk space left on this volume.\n"
+msgid "Warning: there is very little free disk space left on this volume.\n"
 "Please select another temporary directory in your preferences."
 msgstr "警告:磁碟剩餘空間不足。請於偏好設定中設定其他暫存目錄。"
 
@@ -836,11 +807,9 @@ msgstr "清除快取資料夾"
 
 #: DirManager.cpp:493
 #, c-format
-msgid ""
-"Audacity found an orphaned blockfile %s! \n"
+msgid "Audacity found an orphaned blockfile %s! \n"
 "Please consider saving and reloading the project to perform a complete project check.\n"
-msgstr ""
-"Audacity發現孤兒區塊檔案%s!\n"
+msgstr "Audacity發現孤兒區塊檔案%s!\n"
 "請將它儲存,並重新開啟此工程,如此便能重新確認工程的完整性。\n"
 
 #. i18n-hint: This is the pattern for filenames that are created
@@ -865,16 +834,16 @@ msgstr "無法移除'%s'"
 msgid "Renamed file: %s\n"
 msgstr "已更名檔案: %s\n"
 
-#: DirManager.cpp:1023
-#, c-format
-msgid "Changing block %s\n"
-msgstr "變更區塊 %s\n"
-
 #: DirManager.cpp:1051
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "將'%s'更名為'%s'"
 
+#: DirManager.cpp:1183
+#, c-format
+msgid "Changed block %s to new alias name\n"
+msgstr ""
+
 #: DirManager.cpp:1115
 #: DirManager.cpp:1403
 msgid "Inspecting project file data..."
@@ -901,21 +870,17 @@ msgid "Missing data file: (%s.au)"
 msgstr "找不到資料檔案:(%s.au)"
 
 #: DirManager.cpp:1207
-msgid ""
-"Project check found inconsistencies inspecting the loaded project data;\n"
+msgid "Project check found inconsistencies inspecting the loaded project data;\n"
 "click 'Details' for a complete list of errors, or 'OK' to proceed to more options."
-msgstr ""
-"在檢查載入工程檔案時發現不一致;\n"
+msgstr "在檢查載入工程檔案時發現不一致;\n"
 "點'細節'查看錯誤訊息,點'OK'繼續更多選項。"
 
 #: DirManager.cpp:1219
 #, c-format
-msgid ""
-"Project check found %d orphaned blockfile[s]. These files are\n"
+msgid "Project check found %d orphaned blockfile[s]. These files are\n"
 "unused and probably left over from a crash or some other bug.\n"
 "They should be deleted to avoid disk contention."
-msgstr ""
-"工程檢查發現%d孤兒區塊檔案。這些檔案是\n"
+msgstr "工程檢查發現%d孤兒區塊檔案。這些檔案是\n"
 "沒有在使用的,可能是當機或其他瑕疵造成的。\n"
 "這些檔案應該要刪除。"
 
@@ -944,15 +909,13 @@ msgstr "警告"
 
 #: DirManager.cpp:1254
 #, c-format
-msgid ""
-"Project check detected %d input file[s] being used in place\n"
+msgid "Project check detected %d input file[s] being used in place\n"
 "('alias files') are now missing.  There is no way for Audacity\n"
 "to recover these files automatically; you may choose to\n"
 "permanently fill in silence for the missing files, temporarily\n"
 "fill in silence for this session only, or close the project now\n"
 "and try to restore the missing files by hand."
-msgstr ""
-"工程檢查發現遺失('alias files')使用的%d輸入檔案。\n"
+msgstr "工程檢查發現遺失('alias files')使用的%d輸入檔案。\n"
 "Audacity無法自動回復這些檔案。\n"
 "您可以永久用靜音填補遺失的檔案、\n"
 "或只在此程序暫時用靜音填補遺失的檔案、\n"
@@ -975,12 +938,10 @@ msgstr "立即關閉程式"
 
 #: DirManager.cpp:1300
 #, c-format
-msgid ""
-"Project check detected %d missing summary file[s] (.auf).\n"
+msgid "Project check detected %d missing summary file[s] (.auf).\n"
 "Audacity can fully regenerate these summary files from the\n"
 "original audio data in the project."
-msgstr ""
-"工程檢查發現遺失%d summary檔案(.auf)。\n"
+msgstr "工程檢查發現遺失%d summary檔案(.auf)。\n"
 "Audacity可以從原始音訊資料完全回復這些summary檔案。"
 
 #: DirManager.cpp:1305
@@ -993,16 +954,14 @@ msgstr "用靜音填滿遺失的檔案[僅此工程]"
 
 #: DirManager.cpp:1342
 #, c-format
-msgid ""
-"Project check detected %d missing audio data blockfile[s] (.au), \n"
+msgid "Project check detected %d missing audio data blockfile[s] (.au), \n"
 "probably due to a bug, system crash or accidental deletion.\n"
 "There is no way for Audacity to recover this lost data\n"
 "automatically; you may choose to permanently fill in silence\n"
 "for the missing data, temporarily fill in silence for this\n"
 "session only, or close the project now and try to restore the\n"
 "missing data by hand."
-msgstr ""
-"工程檢查發現遺失%d音訊資料區塊檔案(.au),\n"
+msgstr "工程檢查發現遺失%d音訊資料區塊檔案(.au),\n"
 "可能是因為瑕疵、當機、意外刪除等原因造成。\n"
 "Audacity無法回復這些遺失的資料;\n"
 "您可以永久用靜音填補遺失的檔案、\n"
@@ -1037,6 +996,95 @@ msgstr "儲存錄製的音訊至磁碟..."
 msgid "Rectangular"
 msgstr "矩形"
 
+#: FFmpeg.cpp:36
+msgid "FFmpeg support not compiled in"
+msgstr ""
+
+#: FFmpeg.cpp:101
+msgid "FFmpeg was configured in Preferences and successfully loaded before,                       \n"
+"but this time Audacity failed to load it at startup.                       \n"
+"\n"
+"You may want to go back to Preferences > Import/Export and re-configure it."
+msgstr ""
+
+#: FFmpeg.cpp:104
+msgid "FFmpeg startup failed"
+msgstr ""
+
+#: FFmpeg.cpp:115
+msgid "FFmpeg library not found"
+msgstr ""
+
+#: FFmpeg.cpp:170
+msgid "Locate FFmpeg"
+msgstr ""
+
+#: FFmpeg.cpp:190
+#, c-format
+msgid "Audacity needs the file %s to import and export audio via FFmpeg."
+msgstr ""
+
+#: export/ExportMP3.cpp:562
+#, c-format
+msgid "Location of %s:"
+msgstr "%s路徑:"
+
+#: export/ExportMP3.cpp:571
+#, c-format
+msgid "To find %s, click here -->"
+msgstr "點這裡尋找%s-->"
+
+#: export/ExportMP3.cpp:577
+msgid "Browse..."
+msgstr "瀏覽..."
+
+#: FFmpeg.cpp:212
+msgid "To get a free copy of FFmpeg, click here -->"
+msgstr ""
+
+#: FFmpeg.cpp:215 export/ExportMP3.cpp:579
+msgid "Download"
+msgstr ""
+
+#. i18n-hint: It's asking for the location of a file, for
+#. example, "Where is lame_enc.dll?" - you could translate
+#. "Where would I find the file %s" instead if you want.
+#: export/ExportMP3.cpp:601
+#, c-format
+msgid "Where is %s?"
+msgstr "%s在哪裡?"
+
+#: FFmpeg.cpp:407
+msgid "Failed to find compatible FFmpeg libraries"
+msgstr ""
+
+#: FFmpeg.h:95
+msgid "FFmpeg not found"
+msgstr ""
+
+#: FFmpeg.h:101
+msgid "Audacity attempted to use FFmpeg libraries to import an audio file,\n"
+"but libraries were not found.\n"
+"If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n"
+"and tell Audacity where to look for the libraries."
+msgstr ""
+
+#: FFmpeg.h:109
+msgid "Do not show this warning again"
+msgstr ""
+
+#: FFmpeg.h:251
+msgid "Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+msgstr ""
+
+#: FFmpeg.h:268
+msgid "Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"
+msgstr ""
+
+#: FFmpeg.h:266
+msgid "Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*"
+msgstr ""
+
 #: FreqWindow.cpp:104
 msgid "Frequency Analysis"
 msgstr "頻率分析"
@@ -1065,8 +1113,9 @@ msgstr "增強自相關"
 msgid "Cepstrum"
 msgstr "Cepstrum"
 
-#: FreqWindow.cpp:150
-msgid "Algorithm:"
+#: FreqWindow.cpp:150 FreqWindow.cpp:154
+#, fuzzy
+msgid "Algorithm"
 msgstr "演算法:"
 
 #: FreqWindow.cpp:168
@@ -1080,9 +1129,9 @@ msgstr "大小"
 msgid " window"
 msgstr " window"
 
-#: FreqWindow.cpp:184
-msgid "Function:"
-msgstr "函數:"
+#: FreqWindow.cpp:187 FreqWindow.cpp:191
+msgid "Function"
+msgstr ""
 
 #: FreqWindow.cpp:192
 msgid "Linear frequency"
@@ -1092,9 +1141,9 @@ msgstr "線性頻率"
 msgid "Log frequency"
 msgstr "對數頻率"
 
-#: FreqWindow.cpp:196
-msgid "Axis:"
-msgstr "座標軸:"
+#: FreqWindow.cpp:201 FreqWindow.cpp:205
+msgid "Axis"
+msgstr ""
 
 #: FreqWindow.cpp:206
 #: LabelDialog.cpp:128
@@ -1103,6 +1152,10 @@ msgstr "座標軸:"
 msgid "&Export..."
 msgstr "匯出(&E)..."
 
+#: export/ExportCL.cpp:322
+msgid "Export"
+msgstr "匯出"
+
 #: FreqWindow.cpp:209
 #: widgets/ErrorDialog.cpp:159
 msgid "Close"
@@ -1293,8 +1346,8 @@ msgid "<p>To burn your work to an audio CD for standalone CD players, first [[ex
 msgstr ""
 
 #: HelpText.cpp:403
-msgid "<p>You don't appear to have Audacity help files on your machine. Either <a href=\"http://audacity.sourceforge.net/help/documentation\">download</a> the help files and then access them again from Audacity by clicking <i>Help</i> then <i>Index</i>, or click <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">here</a> to read the full Manual online."
-msgstr "<p>你的電腦上顯然沒有Audacity說明檔案。你可以上網<a href=\"http://audacity.sourceforge.net/help/documentation\">下載</a>說明檔案然後從Audacity中使用它,如同你正要嘗試的動作,或者你可以<a href=\"*URL*\">點這裡</a>在線上閱讀說明文件。"
+msgid "<p>Help for Audacity Beta is currently unfinished. For now, a draft manual is available <a href=\"http://www.audacityteam.org/manual/index.php?title=Main_Page\">online</a>. Alternatively, click <a href=\"http://www.audacityteam.org/manual/index.php?title=Temporary_HTML_Manual_Export\">here</a> to download a single-page version of the manual which can be viewed in this window."
+msgstr ""
 
 #: HistoryWindow.cpp:53
 msgid "Undo History"
@@ -1398,13 +1451,11 @@ msgid "New..."
 msgstr "新增..."
 
 #: LabelDialog.cpp:352
-msgid ""
-"You have left blank label names.  These will be\n"
+msgid "You have left blank label names.  These will be\n"
 "skipped when repopulating the Label Tracks.\n"
 "\n"
 "Would you like to go back and provide names?"
-msgstr ""
-"您讓標籤名稱空白。這會\n"
+msgstr "您讓標籤名稱空白。這會\n"
 "跳過。\n"
 "\n"
 "您要回復上一個動作來提供名稱嗎?"
@@ -1470,11 +1521,9 @@ msgstr "選擇Audacity使用的語言:"
 
 #: Legacy.cpp:356
 #, c-format
-msgid ""
-"Converted a 1.0 project file to the new format.\n"
+msgid "Converted a 1.0 project file to the new format.\n"
 "The old file has been saved as '%s'"
-msgstr ""
-"將Audacity 1.0成音工程檔案格式的轉換成新格式。\n"
+msgstr "將Audacity 1.0成音工程檔案格式的轉換成新格式。\n"
 "原檔案另存新檔為'%s'。"
 
 #: Legacy.cpp:357
@@ -1506,6 +1555,10 @@ msgstr "儲存成音工程(&S)\tCtrl+S"
 msgid "Save Project &As..."
 msgstr "另存成音工程為(&A)..."
 
+#: Menus.cpp:212
+msgid "Save Compressed Copy of Project..."
+msgstr ""
+
 #: Menus.cpp:181
 msgid "Chec&k Dependencies..."
 msgstr "檢查相依性(&K)..."
@@ -1514,6 +1567,10 @@ msgstr "檢查相依性(&K)..."
 msgid "Open Me&tadata Editor..."
 msgstr "開啟標頭檔編輯器…"
 
+#: import/ImportRaw.cpp:447
+msgid "&Import"
+msgstr "匯入(&I)"
+
 #: Menus.cpp:196
 msgid "&Audio...\tCtrl+Shift+I"
 msgstr "聲音檔案(&I)...\tCtrl+Shift+I"
@@ -1543,6 +1600,10 @@ msgstr "匯出標籤(&L)..."
 msgid "Export &Multiple..."
 msgstr "匯出多個檔案(&M)..."
 
+#: Menus.cpp:257
+msgid "Export MIDI..."
+msgstr ""
+
 #: Menus.cpp:247
 msgid "CleanSpeech C&hain..."
 msgstr "清除人聲連鎖指令(&H)…"
@@ -1623,9 +1684,9 @@ msgstr "刪除(&D)\tCtrl+K"
 msgid "Split D&elete\tCtrl+Alt+K"
 msgstr "選取範圍變為空白並刪除(&E)\tCtrl+Alt+K"
 
-#: Menus.cpp:337
-msgid "&Silence\tCtrl+L"
-msgstr "靜音(&S)\tCtrl+L"
+#: Menus.cpp:380
+msgid "Silence Audi&o\tCtrl+L"
+msgstr ""
 
 #: Menus.cpp:339
 msgid "Sp&lit\tCtrl+I"
@@ -1639,23 +1700,21 @@ msgstr "分離新的(&W)\tCtrl+Alt+I"
 msgid "&Join\tCtrl+J"
 msgstr "將空白範圍變為靜音(&J)\tCtrl+J"
 
-#: Menus.cpp:350
-msgid "Disj&oin\tCtrl+Alt+J"
-msgstr "靜音範圍變為空白(&O)\tCtrl+Alt+J"
+#: Menus.cpp:393
+msgid "Detac&h at Silences\tCtrl+Alt+J"
+msgstr ""
 
 #: Menus.cpp:352
 msgid "Duplic&ate\tCtrl+D"
 msgstr "複製全部並貼上(&A)\tCtrl+D"
 
-#: Menus.cpp:358
-#: Menus.cpp:564
-#: effects/StereoToMono.h:23
-msgid "&Stereo to Mono"
-msgstr "立體聲至單聲道(&S)"
+#: Menus.cpp:400 Menus.cpp:639
+msgid "Stereo Trac&k to Mono"
+msgstr ""
 
-#: Menus.cpp:365
-msgid "La&beled Regions..."
-msgstr "標籤區域(&B)..."
+#: Menus.cpp:407
+msgid "La&beled Regions"
+msgstr ""
 
 #. i18n-hint: Labeled Regions submenu
 #: Menus.cpp:367
@@ -1698,13 +1757,13 @@ msgid "&Join\tAlt+J"
 msgstr "將空白範圍變為靜音(&J)\tAlt+J"
 
 #. i18n-hint: Labeled Regions submenu
-#: Menus.cpp:409
-msgid "Disj&oin\tShift+Alt+J"
-msgstr "靜音範圍變為空白(&O)\tShift+Alt+J"
+#: Menus.cpp:451
+msgid "Detac&h at Silences\tShift+Alt+J"
+msgstr ""
 
-#: Menus.cpp:415
-msgid "Select&..."
-msgstr "選取..."
+#: Menus.cpp:456
+msgid "&Select"
+msgstr ""
 
 #: Menus.cpp:416
 msgid "&All\tCtrl+A"
@@ -1734,9 +1793,9 @@ msgstr "從游標位置至結束點(&E)\tShift+J"
 msgid "Find &Zero Crossings\tZ"
 msgstr "尋找零交點(&Z)\tZ"
 
-#: Menus.cpp:435
-msgid "Mo&ve Cursor..."
-msgstr "移動游標(&V)..."
+#: Menus.cpp:476
+msgid "Mo&ve Cursor"
+msgstr ""
 
 #: Menus.cpp:437
 msgid "to Selection Star&t"
@@ -1762,9 +1821,9 @@ msgstr "儲存選取範圍(&G)"
 msgid "Regio&n Restore"
 msgstr "恢復選取範圍(&N)"
 
-#: Menus.cpp:462
-msgid "Pla&y Region..."
-msgstr "播放區域(&Y)..."
+#: Menus.cpp:503
+msgid "Pla&y Region"
+msgstr ""
 
 #: Menus.cpp:463
 msgid "&Lock"
@@ -1790,9 +1849,14 @@ msgstr "開啟格線滑扣功能"
 msgid "Turn Grid Snap Off"
 msgstr "關閉格線滑扣功能"
 
-#: Menus.cpp:482
-msgid "&Preferences...\tCtrl+P"
-msgstr "偏好設定(&P)...\tCtrl+P"
+#. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#: Menus.cpp:519
+msgid "Pre&ferences...\tCtrl+,"
+msgstr ""
+
+#: Menus.cpp:523
+msgid "Pre&ferences...\tCtrl+P"
+msgstr ""
 
 #: Menus.cpp:492
 msgid "&View"
@@ -1838,9 +1902,9 @@ msgstr "顯示剪輯(&S)"
 msgid "&History..."
 msgstr "工作記錄(&H)..."
 
-#: Menus.cpp:525
-msgid "&Toolbars..."
-msgstr "工具列(&T)..."
+#: Menus.cpp:566
+msgid "&Toolbars"
+msgstr ""
 
 #: Menus.cpp:526
 msgid "&Control Toolbar"
@@ -1883,13 +1947,71 @@ msgstr "重設工具列(&R)"
 msgid "!Simplified View"
 msgstr "!簡易檢視"
 
+#. i18n-hint: 'Transport' is the name given to the set of controls that
+#. play, record, pause etc.
+#: Menus.cpp:587
+msgid "T&ransport"
+msgstr ""
+
+#: Menus.cpp:591
+msgid "Play\tSpace"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Loop Play\tShift+Space"
+msgstr ""
+
+#: Menus.cpp:593
+msgid "&Pause\tP"
+msgstr ""
+
+#: Menus.cpp:596
+msgid "&Stop\tSpace"
+msgstr ""
+
+#: Menus.cpp:799
+msgid "Skip to Start\tHome"
+msgstr "跳至起始點\tHome"
+
+#: Menus.cpp:800
+msgid "Skip to End\tEnd"
+msgstr "跳至結束點\tEnd"
+
+#: Menus.cpp:600
+msgid "&Record\tR"
+msgstr ""
+
+#: Menus.cpp:602
+msgid "&Timer Record...\tShift+T"
+msgstr ""
+
+#: Menus.cpp:604
+msgid "Append Record\tShift+R"
+msgstr ""
+
+#: Menus.cpp:607
+msgid "Overdub (on/off)"
+msgstr ""
+
+#: Menus.cpp:609
+msgid "Software Playthrough (on/off)"
+msgstr ""
+
+#: Menus.cpp:612
+msgid "Sound Activated Recording (on/off)"
+msgstr ""
+
+#: Menus.cpp:614
+msgid "Sound Activation Level..."
+msgstr ""
+
 #: Menus.cpp:545
 msgid "&Tracks"
 msgstr "軌道(&T)"
 
-#: Menus.cpp:552
-msgid "Add &New..."
-msgstr "加入新的(&N)..."
+#: Menus.cpp:629
+msgid "Add &New"
+msgstr ""
 
 #: Menus.cpp:553
 msgid "&Audio Track\tCtrl+Shift+N"
@@ -1904,10 +2026,6 @@ msgstr "立體聲音軌(&S)"
 msgid "&Time Track"
 msgstr "時間軌(&T)"
 
-#: Menus.cpp:559
-msgid "&Timer Record..."
-msgstr "預約錄音(&T)…"
-
 #: Menus.cpp:568
 msgid "Mi&x and Render"
 msgstr "混音且執行(&X)"
@@ -1964,13 +2082,21 @@ msgstr "結束點與選取範圍尾端對齊(&D)"
 msgid "Align Tracks To&gether"
 msgstr "對齊音軌(&G)"
 
-#: Menus.cpp:606
-msgid "&Align Tracks..."
-msgstr "對齊音軌(&A)..."
+#: Menus.cpp:681
+msgid "&Align Tracks"
+msgstr ""
+
+#: Menus.cpp:690
+msgid "Ali&gn and Move Cursor"
+msgstr ""
 
-#: Menus.cpp:615
-msgid "Ali&gn And Move Cursor..."
-msgstr "對齊並移動游標(&G)..."
+#: Menus.cpp:697
+msgid "Synchronize MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:706
+msgid "Link Audio and Label Tracks"
+msgstr ""
 
 #: Menus.cpp:623
 msgid "Add &Label At Selection\tCtrl+B"
@@ -1980,22 +2106,26 @@ msgstr "在選取範圍加上標籤(&L)\tCtrl+B"
 msgid "Add Label At &Playback Position\tCtrl+M"
 msgstr "在播放點加上標籤(&P)\tCtrl+M"
 
-#: Menus.cpp:630
-msgid "S&ort tracks by..."
-msgstr "軌道排序(&O)..."
+#: Menus.cpp:716
+msgid "S&ort tracks"
+msgstr ""
 
-#: Menus.cpp:631
-msgid "&Start time"
-msgstr "依開始時間(&S)"
+#: Menus.cpp:717
+msgid "by &Start time"
+msgstr ""
 
-#: Menus.cpp:633
-msgid "&Name"
-msgstr "依軌道名稱(&N)..."
+#: Menus.cpp:719
+msgid "by &Name"
+msgstr ""
 
 #: Menus.cpp:643
 msgid "&Generate"
 msgstr "產生(&G)"
 
+#: Menus.cpp:776 Menus.cpp:860 Menus.cpp:922
+msgid "Unsorted"
+msgstr ""
+
 #: Menus.cpp:666
 msgid "Effe&ct"
 msgstr "效果(&C)"
@@ -2029,6 +2159,10 @@ msgstr "顯示歡迎訊息(&S)…"
 msgid "&Index..."
 msgstr "索引(&I)..."
 
+#: Menus.cpp:959
+msgid "Show &Log..."
+msgstr ""
+
 #: Menus.cpp:756
 msgid "&Screenshot Tools..."
 msgstr "擷取螢幕畫面工具(&S)…"
@@ -2041,13 +2175,13 @@ msgstr "執行Benchmark(&R)..."
 msgid "&Audio Device Info..."
 msgstr "音訊裝置資訊(&A)…"
 
-#: Menus.cpp:770
-msgid "Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"
-msgstr "停駐、檢視音軌、選取範圍列往後循環\tCtrl+Shift+F6"
+#: Menus.cpp:983
+msgid "Cycle backward through toolbars and Track View\tCtrl+Shift+F6"
+msgstr ""
 
-#: Menus.cpp:771
-msgid "Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"
-msgstr "停駐、檢視音軌、選取範圍列往前循環\tCtrl+F6"
+#: Menus.cpp:984
+msgid "Cycle forward through toolbars and Track View\tCtrl+F6"
+msgstr ""
 
 #: Menus.cpp:774
 msgid "Selection Tool\tF1"
@@ -2081,9 +2215,9 @@ msgstr "\"下一個(Next)\"工具\tD"
 msgid "Previous Tool\tA"
 msgstr "上一個工具\tA"
 
-#: Menus.cpp:784
-msgid "Play/Stop\tSpacebar"
-msgstr "播放/停止\tSpacebar"
+#: Menus.cpp:997
+msgid "Play/Stop\tSpace"
+msgstr ""
 
 #: Menus.cpp:785
 msgid "Stop\tS"
@@ -2117,22 +2251,14 @@ msgstr "播放至選取選圍\tB"
 msgid "Play Looped\tL"
 msgstr "循環播放\tL"
 
-#: Menus.cpp:796
-msgid "Play Looped\tShift+Spacebar"
-msgstr "循環播放\tShift+Spacebar"
+#: Menus.cpp:1009
+msgid "Play Looped\tShift+Space"
+msgstr ""
 
 #: Menus.cpp:797
 msgid "Play Cut Preview\tC"
 msgstr "播放剪輯試聽\tC"
 
-#: Menus.cpp:799
-msgid "Skip to Start\tHome"
-msgstr "跳至起始點\tHome"
-
-#: Menus.cpp:800
-msgid "Skip to End\tEnd"
-msgstr "跳至結束點\tEnd"
-
 #: Menus.cpp:802
 msgid "Selection to Start\tShift+Home"
 msgstr "移至起始點\tShift+Home"
@@ -2189,9 +2315,9 @@ msgstr "觸發聚焦音軌\tENTER"
 msgid "Toggle Focused Track\tNUMPAD_ENTER"
 msgstr "觸發聚焦音軌\t數字盤_ENTER"
 
-#: Menus.cpp:829
-msgid "Toggle Focused Track\tCtrl+Spacebar"
-msgstr "觸發聚焦音軌\tCtrl+空白鍵"
+#: Menus.cpp:1042
+msgid "Toggle Focused Track\tCtrl+Space"
+msgstr ""
 
 #: Menus.cpp:831
 msgid "Cursor Left\tLeft"
@@ -2289,15 +2415,19 @@ msgstr "開啟滑扣功能"
 msgid "Snap To Off"
 msgstr "關閉滑扣功能"
 
+#: Menus.cpp:1071
+msgid "Full screen on/off\tF11"
+msgstr ""
+
 #. i18n-hint: This is the name of the menu item on Mac OS X only
 #: Menus.cpp:873
 msgid "Open Recent"
 msgstr "開啟最近使用的檔案"
 
 #. i18n-hint: This is the name of the menu item on Windows and Linux
-#: Menus.cpp:876
-msgid "Recent &Files..."
-msgstr "最近使用的檔案(&F)..."
+#: Menus.cpp:1161
+msgid "Recent &Files"
+msgstr ""
 
 #: Menus.cpp:925
 #, c-format
@@ -2354,6 +2484,23 @@ msgstr "重複%s\tCtrl+R"
 msgid "There are no label tracks to export."
 msgstr "沒有標籤音軌,無法匯出。"
 
+#: Menus.cpp:2608
+msgid "Export MIDI As:"
+msgstr ""
+
+#: Menus.cpp:2612
+msgid "MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"
+msgstr ""
+
+#: Menus.cpp:2644
+msgid "You have selected a filename with an unrecognized file extension.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: Menus.cpp:2645
+msgid "Export MIDI"
+msgstr ""
+
 #: Menus.cpp:2271
 msgid "Nothing to undo"
 msgstr "沒有可復原的操作"
@@ -2397,6 +2544,10 @@ msgstr "從剪貼簿貼上文字"
 msgid "Pasted from the clipboard"
 msgstr "從剪貼簿貼上"
 
+#: Menus.cpp:3053
+msgid "Pasting one type of track into another is not allowed."
+msgstr ""
+
 #: Menus.cpp:2574
 msgid "Copying stereo audio into a mono track is not allowed."
 msgstr "不允許將立體聲音訊複製至單聲道音軌。"
@@ -2566,9 +2717,9 @@ msgstr "匯入標籤"
 msgid "Select a MIDI file..."
 msgstr "選擇MIDI檔案..."
 
-#: Menus.cpp:3599
-msgid "All files (*.*)|*.*|MIDI files (*.mid)|*.mid|Allegro files (*.gro)|*.gro"
-msgstr "所有檔案(*.*)|*.*|MIDI檔案(*.mid)|*.mid|Allegro檔案 (*.gro)|*.gro"
+#: Menus.cpp:4147
+msgid "MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files (*.*)|*.*"
+msgstr ""
 
 #: Menus.cpp:3615
 #, c-format
@@ -2587,14 +2738,6 @@ msgstr "選取任何非壓縮聲音檔案..."
 msgid "All files (*)|*"
 msgstr "所有檔案(*)|*"
 
-#: Menus.cpp:3649
-#: Project.cpp:2587
-#: Project.cpp:2612
-#: import/ImportPCM.cpp:440
-#: import/ImportPCM.cpp:484
-msgid "Import"
-msgstr "匯入"
-
 #: Menus.cpp:3668
 msgid "Edit the metadata tags"
 msgstr "編輯標頭檔標籤"
@@ -2668,6 +2811,14 @@ msgstr "已對齊"
 msgid "Align"
 msgstr "對齊"
 
+#: Menus.cpp:4550
+msgid "Sync MIDI with Audio"
+msgstr ""
+
+#: Menus.cpp:4554
+msgid "Alignment completed."
+msgstr ""
+
 #: Menus.cpp:3950
 msgid "Created new audio track"
 msgstr "已新建音軌"
@@ -2734,15 +2885,15 @@ msgid "Removed audio track(s)"
 msgstr "移除音訊音軌"
 
 #: Menus.cpp:4508
-msgid "New sample rate (Hz):"
-msgstr "新的取樣頻率(Hz):"
-
-#: Menus.cpp:4508
 #: Menus.cpp:4527
 #: export/ExportMP3.cpp:1926
 msgid "Resample"
 msgstr "重取樣"
 
+#: Menus.cpp:4508
+msgid "New sample rate (Hz):"
+msgstr "新的取樣頻率(Hz):"
+
 #: Menus.cpp:4514
 msgid "The entered value is invalid"
 msgstr "輸入數值無效"
@@ -2810,15 +2961,13 @@ msgid "Save changes before closing?"
 msgstr "在關閉前儲存變更?"
 
 #: Project.cpp:1503
-msgid ""
-"\n"
+msgid "\n"
 "If saved, the project will have no tracks.\n"
 "\n"
 "To save any previously open tracks:\n"
 "Cancel, Edit > Undo until all tracks\n"
 "are open, then File > Save Project."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "若要儲存,則工程內沒有音軌。\n"
 "\n"
@@ -2845,16 +2994,14 @@ msgstr "Audacity成音工程檔案 |*.aup|"
 #: Project.cpp:1799
 #: Project.cpp:2186
 #, c-format
-msgid ""
-"This file was saved by Audacity %s, a much\n"
+msgid "This file was saved by Audacity %s, a much\n"
 "older version.  The format has changed.\n"
 "\n"
 "Audacity could corrupt the file in opening\n"
 "it, so you must back it up first.\n"
 "\n"
 "Open this file now?"
-msgstr ""
-"此檔案格式是由非常舊版Audacity %s儲存的,而此格式\n"
+msgstr "此檔案格式是由非常舊版Audacity %s儲存的,而此格式\n"
 "已改變。\n"
 "目前版本的Audacity可能在嘗試開啟此檔案時損毀此檔案。\n"
 "為了安全起見,請先備份此工程檔案。\n"
@@ -2877,11 +3024,9 @@ msgstr "開啟檔案錯誤"
 
 #: Project.cpp:1846
 #, c-format
-msgid ""
-"File may be invalid or corrupted: \n"
+msgid "File may be invalid or corrupted: \n"
 "%s"
-msgstr ""
-"檔案無效或中斷:\n"
+msgstr "檔案無效或中斷:\n"
 "%s"
 
 #: Project.cpp:1847
@@ -2920,12 +3065,10 @@ msgstr "找不到成音工程資料目錄:\"%s"
 
 #: Project.cpp:2155
 #, c-format
-msgid ""
-"This file was saved using Audacity %s.\n"
+msgid "This file was saved using Audacity %s.\n"
 "You are using Audacity %s - you need to upgrade to\n"
 "a newer version to open this file."
-msgstr ""
-"這個檔案是由Audacity %s 儲存的。\n"
+msgstr "這個檔案是由Audacity %s 儲存的。\n"
 "您現在使用的是Audacity %s - 您需要更新的版本\n"
 "來開啟這個檔案。"
 
@@ -2935,27 +3078,37 @@ msgstr "無法開啟成音工程檔案。"
 
 #: Project.cpp:2193
 #, c-format
-msgid ""
-"This file was saved by Audacity %s.\n"
+msgid "This file was saved by Audacity %s.\n"
 "You 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"
 "\n"
 "Open this file now?"
-msgstr ""
-"此檔案格式是由舊版Audacity %s儲存的。\n"
+msgstr "此檔案格式是由舊版Audacity %s儲存的。\n"
 "\n"
 "你可以開啟此檔案,但若您使用目前版本的Audacity儲存檔案後,\n"
 "您將無法使用舊版的Audacity來開啟。\n"
 "\n"
 "您要立刻開啟此檔案嗎?"
 
-#: Project.cpp:2426
+#: Project.cpp:2537
+msgid "Your project is now empty.\n"
+"If saved, the project will have no tracks.\n"
+"\n"
+"To save any previously open tracks:\n"
+"Click 'No', Edit > Undo until all tracks\n"
+"are open, then File > Save Project.\n"
+"\n"
+"Save anyway?"
+msgstr ""
+
+#: Project.cpp:2538
+msgid "Warning empty project"
+msgstr ""
+
+#: Project.cpp:2591
 #, c-format
-msgid ""
-"Could not save project. Perhaps %s is not writeable,\n"
-"or the disk is full."
+msgid "Could not save project. Perhaps %s \n"
+"is not writeable or the disk is full."
 msgstr ""
-"無法儲存成音工程。您沒有%s的寫入權限,\n"
-"或磁碟已滿。"
 
 #: Project.cpp:2428
 #: Project.cpp:2442
@@ -2967,22 +3120,19 @@ msgstr "儲存成音工程錯誤"
 msgid "Saved %s"
 msgstr "%s已儲存"
 
-#. i18n-hint: This refers to files that are opened directly
-#. without looking at the file header.  Same as "Import Raw"
-#: Project.cpp:2520
-msgid "Raw"
-msgstr "Raw"
-
-#: Project.cpp:2525
-#, c-format
-msgid "Importing %s..."
-msgstr "匯入%s中..."
-
 #: Project.cpp:2586
 #, c-format
 msgid "Imported '%s'"
 msgstr "'%s'已匯入"
 
+#: Menus.cpp:3649
+#: Project.cpp:2587
+#: Project.cpp:2612
+#: import/ImportPCM.cpp:440
+#: import/ImportPCM.cpp:484
+msgid "Import"
+msgstr "匯入"
+
 #: Project.cpp:2639
 #: Project.cpp:2647
 msgid "Error importing"
@@ -2996,19 +3146,23 @@ msgstr "另存人聲為:"
 msgid "Windows PCM Audio file (*.wav)|*.wav"
 msgstr "Windows PCM Audio file (*.wav)|*.wav"
 
-#: Project.cpp:2689
-msgid ""
-"Audacity project files (.aup) let you save everything you're working on exactly as it\n"
-"appears on the screen, but most other programs can't open Audacity project files.\n"
+#: Project.cpp:2894
+msgid "Audacity compressed project files (.aup) save your work in a smaller, compressed (.ogg) format. \n"
+"Compressed project files are a good way to transmit your project online, because they are much smaller. \n"
+"To open a compressed project takes longer than usual, as it imports each compressed track. \n"
 "\n"
+"Most other programs can't open Audacity project files.\n"
 "When you want to save a file that can be opened by other programs, select one of the\n"
 "Export commands."
 msgstr ""
-"Audacity成音工程檔案(.AUP)能儲存您的所有工作,\n"
-"但大多數的其它軟體無法開啟Audacity成音工程檔案。\n"
+
+#: Project.cpp:2897
+msgid "You are saving an Audacity project file (.aup).\n"
+"\n"
+"Saving a project creates a file that only Audacity can open.\n"
 "\n"
-"當您需要儲存為其它軟體能開啟的檔案時,請選擇\n"
-"匯出'(Export)命令。"
+"To save an audio file for other programs, use one of the \"File > Export\" commands.\n"
+msgstr ""
 
 #: Project.cpp:2692
 msgid "Audacity projects (*.aup)|*.aup"
@@ -3053,6 +3207,16 @@ msgstr "磁碟空間還可以錄製%d秒鐘。"
 msgid "Out of disk space"
 msgstr "磁碟空間已滿"
 
+#: Project.cpp:3336
+#, c-format
+msgid "Import(s) complete. Running %d on-demand waveform calculations. Overall %2.0f%% complete."
+msgstr ""
+
+#: Project.cpp:3339
+#, c-format
+msgid "Import complete. Running an on-demand waveform calculation. %2.0f%% complete."
+msgstr ""
+
 #: Project.cpp:3342
 msgid "Could not remove old autosave file: "
 msgstr "無法移除先前自動儲存檔案:"
@@ -3139,49 +3303,13 @@ msgstr "試聽(&V)"
 msgid "&Debug"
 msgstr "除錯(&D)"
 
-#: SmartRecordDialog.cpp:68
-msgid "Audacity Timer Record"
-msgstr "Audacity預約錄音"
-
-#: SmartRecordDialog.cpp:223
-msgid "Recording start"
-msgstr "錄音開始"
-
-#: SmartRecordDialog.cpp:224
-msgid "Recording end"
-msgstr "錄音結束"
-
-#: SmartRecordDialog.cpp:226
-#: SmartRecordDialog.cpp:307
-#: TimeDialog.cpp:53
-#: effects/Noise.cpp:235
-#: effects/ToneGen.cpp:329
-#: effects/ToneGen.cpp:374
-msgid "Duration"
-msgstr "持續期間"
-
-#: SmartRecordDialog.cpp:229
-msgid "Audacity Smart Record Progress"
-msgstr "Audacity智慧錄音處理"
-
-#: SmartRecordDialog.cpp:273
-msgid "Start Date and Time"
-msgstr "開始日期及時間"
-
-#: SmartRecordDialog.cpp:290
-msgid "End Date and Time"
-msgstr "結束日期及時間"
-
-#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
-#. * but hopefully translated by wxwidgets will be inserted into this
-#: SmartRecordDialog.cpp:383
-#, c-format
-msgid "Waiting to start recording at %s.\n"
-msgstr "等待開始錄音,開始於%s.\n"
+#: SoundActivatedRecord.cpp:36
+msgid "Sound Activated Record"
+msgstr ""
 
-#: SmartRecordDialog.cpp:384
-msgid "Audacity Smart Record - Waiting for Start"
-msgstr "Audacity智慧錄音 - 等待開始"
+#: SoundActivatedRecord.cpp:58
+msgid "Activation level (dB):"
+msgstr ""
 
 #: SplashDialog.cpp:60
 msgid "&Welcome to Audacity!"
@@ -3222,10 +3350,9 @@ msgstr "樣式"
 msgid "Comments"
 msgstr "註解"
 
-#: Tags.cpp:778
-#: Tags.cpp:2018
-msgid "Press F2 or double click to edit."
-msgstr "按F2或雙擊來編輯。"
+#: Tags.cpp:777
+msgid "Use arrow keys (or RETURN key after editing) to navigate fields."
+msgstr ""
 
 #: Tags.cpp:802
 msgid "Tag Name"
@@ -3245,16 +3372,13 @@ msgstr "清除(&C)"
 msgid "Genres"
 msgstr "樣式"
 
-#: Tags.cpp:828
-#: Tags.cpp:1439
-#: Tags.cpp:1980
-msgid "Edit"
-msgstr "編輯"
+#: Tags.cpp:826
+msgid "E&dit..."
+msgstr ""
 
-#: Tags.cpp:829
-#: Tags.cpp:1981
-msgid "Reset"
-msgstr "重置"
+#: Tags.cpp:827
+msgid "Rese&t..."
+msgstr ""
 
 #: Tags.cpp:834
 #: Tags.cpp:1460
@@ -3324,6 +3448,16 @@ msgstr "您確認要將樣式清單回復為預設值?"
 msgid "Unable to open genre file."
 msgstr "無法開啟樣式檔案。"
 
+#: Tags.cpp:1084
+msgid "Load Metadata As:"
+msgstr ""
+
+#: Tags.cpp:1112
+#: Tags.cpp:1763
+#: Tags.cpp:2486
+msgid "Error loading metadata"
+msgstr "載入標頭檔錯誤"
+
 #: Tags.cpp:1087
 #: Tags.cpp:1141
 #: Tags.cpp:1742
@@ -3333,169 +3467,57 @@ msgstr "無法開啟樣式檔案。"
 msgid "Save Metadata As:"
 msgstr "另存標頭檔為:"
 
-#: Tags.cpp:1112
-#: Tags.cpp:1763
-#: Tags.cpp:2486
-msgid "Error loading metadata"
-msgstr "載入標頭檔錯誤"
-
-#: Tags.cpp:1409
-#: Tags.cpp:1968
-msgid "Title:"
-msgstr "標題:"
-
-#: Tags.cpp:1410
-#: Tags.cpp:1969
-msgid "Artist:"
-msgstr "演出者:"
-
-#: Tags.cpp:1411
-#: Tags.cpp:1970
-msgid "Album:"
-msgstr "專輯:"
-
-#: Tags.cpp:1412
-msgid "Composer:"
-msgstr "作曲:"
-
-#: Tags.cpp:1413
-msgid "Lyricist:"
-msgstr "作詞:"
-
-#: Tags.cpp:1414
-#: Tags.cpp:1973
-msgid "Comments:"
-msgstr "註解:"
-
-#: Tags.cpp:1416
-msgid "Encoded By:"
-msgstr "編碼:"
-
-#: Tags.cpp:1420
-msgid "Copyright:"
-msgstr "版權:"
-
-#: Tags.cpp:1424
-#: Tags.cpp:1971
-msgid "Track Number:"
-msgstr "音軌編號:"
-
-#: Tags.cpp:1428
-#: Tags.cpp:1972
-msgid "Year:"
-msgstr "年份:"
-
-#: Tags.cpp:1432
-#: Tags.cpp:1974
-msgid "Genre:"
-msgstr "樣式:"
-
-#: Tags.cpp:1490
-#: Tags.cpp:2089
-msgid "No Genres"
-msgstr "無樣式"
-
-#: Tags.cpp:1643
-msgid "Reset to Defaults"
-msgstr "回到預設值"
-
-#: Tags.cpp:1956
-msgid "Basic"
-msgstr "基本"
-
-#: Tags.cpp:2008
-msgid "Advanced"
-msgstr "進階"
-
-#: Tags.cpp:2033
-msgid "Value"
-msgstr "值"
-
-#: Tags.cpp:2069
-msgid "Clea&r"
-msgstr "清除(&R)"
-
-#: Tags.cpp:2102
-#, c-format
-msgid "Maximum length of attribute '%s' is %d characters. Data was truncated."
-msgstr "屬性 '%s' 的最大長度是 %d 個字元。數據被截短了。"
-
-#: Tags.cpp:2108
-msgid "Title"
-msgstr "標題"
-
-#: Tags.cpp:2118
-msgid "Artist"
-msgstr "演出者"
-
-#: Tags.cpp:2128
-msgid "Album"
-msgstr "專輯"
-
 #: Theme.cpp:638
 #, c-format
-msgid ""
-"Audacity could not write file:\n"
+msgid "Audacity could not write file:\n"
 "  %s."
-msgstr ""
-"Audacity無法寫入檔案:\n"
+msgstr "Audacity無法寫入檔案:\n"
 "  %s。"
 
 #: Theme.cpp:656
 #, c-format
-msgid ""
-"Audacity could not open file:\n"
+msgid "Audacity could not open file:\n"
 "  %s\n"
 "for writing."
-msgstr ""
-"無法開啟\n"
+msgstr "無法開啟\n"
 "%s\n"
 "目標檔案寫入。"
 
 #: Theme.cpp:664
 #, c-format
-msgid ""
-"Audacity could not write images to file:\n"
+msgid "Audacity could not write images to file:\n"
 "  %s."
-msgstr ""
-"Audacity無法將images寫入檔案:\n"
+msgstr "Audacity無法將images寫入檔案:\n"
 "  %s。"
 
 #: Theme.cpp:799
 #, c-format
-msgid ""
-"Audacity could not find file:\n"
+msgid "Audacity could not find file:\n"
 "  %s.\n"
 "Theme not loaded."
-msgstr ""
-"Audacity無法找到檔案:\n"
+msgstr "Audacity無法找到檔案:\n"
 "  %s.\n"
 "沒有載入佈景。"
 
 #: Theme.cpp:807
 #: Theme.cpp:896
 #, c-format
-msgid ""
-"Audacity could not load file:\n"
+msgid "Audacity could not load file:\n"
 "  %s.\n"
 "Bad png format perhaps?"
-msgstr ""
-"Audacity無法找到檔案:\n"
+msgstr "Audacity無法找到檔案:\n"
 "  %s.\n"
 "PNG檔案可能已經損毀?"
 
 #: Theme.cpp:823
-msgid ""
-"Audacity could not read its default theme.\n"
+msgid "Audacity could not read its default theme.\n"
 "Please report the problem."
-msgstr ""
-"Audacity無法讀取預設佈景。\n"
+msgstr "Audacity無法讀取預設佈景。\n"
 "請回報給我們這個問題。"
 
 #: Theme.cpp:918
 #, c-format
-msgid ""
-"None of the expected theme component files\n"
+msgid "None of the expected theme component files\n"
 " were found in:\n"
 "  %s."
 msgstr "在%s找不到想要的佈景。"
@@ -3503,32 +3525,78 @@ msgstr "在%s找不到想要的佈景。"
 #: Theme.cpp:942
 #: effects/NoiseRemoval.cpp:173
 #, c-format
-msgid ""
-"Could not create directory:\n"
+msgid "Could not create directory:\n"
 "  %s"
-msgstr ""
-"無法建立資料夾:\n"
+msgstr "無法建立資料夾:\n"
 " %s"
 
 #: Theme.cpp:963
 #, c-format
-msgid ""
-"Audacity could not save file:\n"
+msgid "Audacity could not save file:\n"
 "  %s"
-msgstr ""
-"無法儲存檔案:\n"
+msgstr "無法儲存檔案:\n"
 " %s"
 
 #: Theme.cpp:975
 #, c-format
-msgid ""
-"All required files in:\n"
+msgid "All required files in:\n"
 "  %s\n"
 "were already present."
-msgstr ""
-"在%s所需的檔案\n"
+msgstr "在%s所需的檔案\n"
 "已經準備好了。"
 
+#: SmartRecordDialog.cpp:226
+#: SmartRecordDialog.cpp:307
+#: TimeDialog.cpp:53
+#: effects/Noise.cpp:235
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:374
+msgid "Duration"
+msgstr "持續期間"
+
+#: SmartRecordDialog.cpp:68
+msgid "Audacity Timer Record"
+msgstr "Audacity預約錄音"
+
+#: SmartRecordDialog.cpp:223
+msgid "Recording start"
+msgstr "錄音開始"
+
+#: SmartRecordDialog.cpp:224
+msgid "Recording end"
+msgstr "錄音結束"
+
+#: TimerRecordDialog.cpp:230
+msgid "Audacity Timer Record Progress"
+msgstr ""
+
+#: SmartRecordDialog.cpp:273
+msgid "Start Date and Time"
+msgstr "開始日期及時間"
+
+#: TimerRecordDialog.cpp:274
+msgid "Start Date"
+msgstr ""
+
+#: SmartRecordDialog.cpp:290
+msgid "End Date and Time"
+msgstr "結束日期及時間"
+
+#: TimerRecordDialog.cpp:294
+msgid "End Date"
+msgstr ""
+
+#. i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
+#. * but hopefully translated by wxwidgets will be inserted into this
+#: SmartRecordDialog.cpp:383
+#, c-format
+msgid "Waiting to start recording at %s.\n"
+msgstr "等待開始錄音,開始於%s.\n"
+
+#: TimerRecordDialog.cpp:382
+msgid "Audacity Timer Record - Waiting for Start"
+msgstr ""
+
 #: TrackPanel.cpp:464
 #: TrackPanel.cpp:465
 msgid "Track Panel"
@@ -3823,6 +3891,14 @@ msgstr "已調整篩選"
 msgid "Adjusted gain"
 msgstr "已調整增益"
 
+#: TrackPanel.cpp:5799
+msgid "Group with Wave Track"
+msgstr ""
+
+#: TrackPanel.cpp:5800
+msgid "Clear any grouping"
+msgstr ""
+
 #: TrackPanel.cpp:5918
 msgid "Can't delete track with active audio"
 msgstr "無法刪除正在使用的音訊"
@@ -3880,14 +3956,6 @@ msgstr "速率變更"
 msgid "Format Change"
 msgstr "變更格式"
 
-#: TrackPanel.cpp:6319
-msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
-msgstr "輸入取樣頻率(Hz,每秒的取樣數),範圍介於1至100000:"
-
-#: TrackPanel.cpp:6329
-msgid "Invalid rate."
-msgstr "無效速率。"
-
 #: TrackPanel.cpp:6349
 msgid "Change lower speed limit (%) to:"
 msgstr "變更最低速率限制(%)為:"
@@ -4028,21 +4096,19 @@ msgstr "外掛程式1 至 %i"
 msgid "Plugins %i to %i"
 msgstr "外掛程式%i 至 %i"
 
-#: commands/CommandManager.cpp:777
-msgid "Disallowed for some reason.  Try selecting some Audio first?"
+#: commands/CommandManager.cpp:857
+#, fuzzy
+msgid "Disallowed for some reason.  Try selecting some audio first?"
 msgstr "因為某些原因停用。請嘗試選擇其他的音訊?"
 
 #: commands/CommandManager.cpp:781
-msgid ""
-"You can only do this when playing and recording are\n"
+msgid "You can only do this when playing and recording are\n"
 " stopped.  [Pausing is not sufficient.]"
-msgstr ""
-"你只能在停止播放及停止錄音後才能執行此動作。\n"
+msgstr "你只能在停止播放及停止錄音後才能執行此動作。\n"
 "[暫停是不夠的。]"
 
 #: commands/CommandManager.cpp:783
-msgid ""
-"You must first select some stereo audio for this\n"
+msgid "You must first select some stereo audio for this\n"
 " to use.  [You can't use this with mono.]"
 msgstr "在使用前必須先選擇一個立體聲音軌。[選擇單聲道音軌是無效的。]"
 
@@ -4051,14 +4117,13 @@ msgid "You must first select some audio for this to use."
 msgstr "必須先選取音訊。"
 
 #: commands/CommandManager.cpp:787
-msgid ""
-"You must first select some audio for this\n"
+msgid "You must first select some audio for this\n"
 " to use. [Selecting other kinds of track won't work.]"
 msgstr "在使用前必須先選擇一些音訊音軌。[選擇其他種軌道是無效的。]"
 
-#: commands/CommandManager.cpp:792
-msgid "Message"
-msgstr "訊息"
+#: commands/CommandManager.cpp:903
+msgid "Disallowed"
+msgstr ""
 
 #: commands/CommandManager.cpp:972
 #, c-format
@@ -4078,15 +4143,19 @@ msgstr "已套用效果: %s %.1f dB"
 msgid "Amplify"
 msgstr "增幅"
 
-# Dominic Mazzoni 是 Audacity 發展工程的主導人之一
-#: effects/Amplify.cpp:152
-msgid "Amplify by Dominic Mazzoni"
-msgstr "增幅(Dominic Mazzoni提供)"
+#: effects/Amplify.cpp:155 effects/Compressor.cpp:476
+#: effects/Normalize.cpp:337
+msgid "by Dominic Mazzoni"
+msgstr ""
 
 #: effects/Amplify.cpp:159
 msgid "Amplification (dB):"
 msgstr "增幅(dB):"
 
+#: effects/Amplify.cpp:183
+msgid "Amplification dB"
+msgstr ""
+
 #: effects/Amplify.cpp:179
 msgid "New Peak Amplitude (dB):"
 msgstr "新增峰值振幅 (dB):"
@@ -4217,10 +4286,18 @@ msgstr "(Nasca Octavian Paul提供)"
 msgid "Frequency (Hz):"
 msgstr "頻率(Hz):"
 
+#: effects/BassBoost.cpp:205
+msgid "Frequency Hertz"
+msgstr ""
+
 #: effects/BassBoost.cpp:208
 msgid "Boost (dB):"
 msgstr "增強(dB):"
 
+#: effects/BassBoost.cpp:218
+msgid "Boost dB"
+msgstr ""
+
 #: effects/BassBoost.h:35
 msgid "BassBoost..."
 msgstr "低音增強..."
@@ -4264,8 +4341,49 @@ msgid "using SoundTouch, by Olli Parviainen"
 msgstr "使用SoundTouch(Olli Parviainen提供)"
 
 #: effects/ChangePitch.cpp:269
-msgid "Pitch:   from"
-msgstr "音高:從"
+msgid "Pitch:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:274
+msgid "From:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:275
+msgid "From Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:286
+msgid "Up"
+msgstr ""
+
+#: effects/ChangePitch.cpp:289
+msgid "Down"
+msgstr ""
+
+#: effects/ChangePitch.cpp:299
+msgid "To:"
+msgstr ""
+
+#: effects/ChangePitch.cpp:300
+msgid "To Pitch"
+msgstr ""
+
+#: effects/ChangePitch.cpp:306
+msgid "Semitones (half-steps):"
+msgstr "半音程(半音階):"
+
+#: effects/ChangePitch.cpp:316
+msgid "Semitones in half-steps"
+msgstr ""
+
+#: effects/ChangePitch.cpp:326 effects/ChangeSpeed.cpp:369
+#: effects/ChangeTempo.cpp:209 effects/ChangeTempo.cpp:222
+msgid "from"
+msgstr ""
+
+#: effects/ChangePitch.cpp:327
+msgid "From frequency in hertz"
+msgstr ""
 
 #: effects/ChangePitch.cpp:291
 #: effects/ChangePitch.cpp:337
@@ -4275,13 +4393,9 @@ msgstr "音高:從"
 msgid "to"
 msgstr "至"
 
-#: effects/ChangePitch.cpp:306
-msgid "Semitones (half-steps):"
-msgstr "半音程(半音階):"
-
-#: effects/ChangePitch.cpp:325
-msgid "Frequency (Hz):   from"
-msgstr "頻率(Hz):從"
+#: effects/ChangePitch.cpp:332
+msgid "To frequency in seconds"
+msgstr ""
 
 #: effects/ChangePitch.cpp:360
 #: effects/ChangeSpeed.cpp:331
@@ -4289,6 +4403,11 @@ msgstr "頻率(Hz):從"
 msgid "Percent Change:"
 msgstr "改變百分比(%):"
 
+#: effects/ChangePitch.cpp:343 effects/ChangePitch.cpp:356
+#: effects/ChangeSpeed.cpp:358 effects/ChangeTempo.cpp:198
+msgid "Percent Change"
+msgstr ""
+
 #: effects/ChangePitch.h:31
 msgid "Change Pitch..."
 msgstr "變更音高..."
@@ -4307,14 +4426,6 @@ msgstr "已套用效果: %s %.1f%%"
 msgid "Change Speed"
 msgstr "變更速度"
 
-#: effects/ChangeSpeed.cpp:308
-msgid "Change Speed, affecting both Tempo and Pitch"
-msgstr "變更速度(同時影響節拍和音高)"
-
-#: effects/ChangeSpeed.cpp:318
-msgid "using SampleRate, by Erik de Castro Lopo"
-msgstr "使用SampleRate(Erik de Castro Lopo提供)"
-
 #  i18n-hint: n/a is an English
 #  abbreviation meaning "not
 #  applicable" (in other words,
@@ -4327,9 +4438,25 @@ msgstr "使用SampleRate(Erik de Castro Lopo提供)"
 msgid "n/a"
 msgstr "N/A"
 
-#: effects/ChangeSpeed.cpp:367
-msgid "Standard Vinyl RPM:   from"
-msgstr "標準黑膠唱片RPM:從"
+#: effects/ChangeSpeed.cpp:308
+msgid "Change Speed, affecting both Tempo and Pitch"
+msgstr "變更速度(同時影響節拍和音高)"
+
+#: effects/ChangeSpeed.cpp:318
+msgid "using SampleRate, by Erik de Castro Lopo"
+msgstr "使用SampleRate(Erik de Castro Lopo提供)"
+
+#: effects/ChangeSpeed.cpp:366
+msgid "Standard Vinyl RPM:"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:370
+msgid "From RPM"
+msgstr ""
+
+#: effects/ChangeSpeed.cpp:375
+msgid "To RPM"
+msgstr ""
 
 #: effects/ChangeSpeed.h:32
 msgid "Change Speed..."
@@ -4347,13 +4474,29 @@ msgstr "變更節拍"
 msgid "Change Tempo without Changing Pitch"
 msgstr "變更節拍維持音高不變"
 
-#: effects/ChangeTempo.cpp:227
-msgid "Beats per Minute (BPM):   from"
-msgstr "每分鐘的拍數(BPM):從"
+#: effects/ChangeTempo.cpp:206
+msgid "Beats per minute:"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:210
+msgid "From beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:215
+msgid "To beats per minute"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:219
+msgid "Length (seconds):"
+msgstr ""
+
+#: effects/ChangeTempo.cpp:223
+msgid "From length in seconds"
+msgstr ""
 
-#: effects/ChangeTempo.cpp:257
-msgid "Length (seconds):   from"
-msgstr "長度 (秒):從"
+#: effects/ChangeTempo.cpp:228
+msgid "To length in seconds"
+msgstr ""
 
 #: effects/ChangeTempo.h:35
 msgid "Change Tempo..."
@@ -4363,8 +4506,9 @@ msgstr "變更節拍..."
 msgid "Changing Tempo"
 msgstr "變更節拍中"
 
-#: effects/ClickRemoval.cpp:323
-msgid "ClickRemoval"
+#: effects/ClickRemoval.cpp:314
+#, fuzzy
+msgid "Click Removal"
 msgstr "移除嘀噠聲"
 
 #: effects/ClickRemoval.cpp:336
@@ -4375,10 +4519,18 @@ msgstr "移除嘀噠聲由Craig DeForest提供"
 msgid "Select threshold (lower is more sensitive):"
 msgstr "選擇臨界值(越低則越靈敏):"
 
+#: effects/ClickRemoval.cpp:350
+msgid "Select threshold"
+msgstr ""
+
 #: effects/ClickRemoval.cpp:362
 msgid "Max spike width (higher is more sensitive):"
 msgstr "最大峰值寬度(越寬則越靈敏):"
 
+#: effects/ClickRemoval.cpp:363
+msgid "Max spike width"
+msgstr ""
+
 #: effects/ClickRemoval.h:42
 msgid "Click Removal..."
 msgstr "移除嘀噠聲..."
@@ -4391,49 +4543,86 @@ msgstr "移除嘀噠聲中..."
 msgid "Dynamic Range Compressor"
 msgstr "動態範圍壓縮器"
 
-#: effects/Compressor.cpp:473
-msgid "Dynamic Range Compressor by Dominic Mazzoni"
-msgstr "動態範圍壓縮器(Dominic Mazzoni提供)"
+#: effects/Compressor.cpp:498
+msgid "Threshold"
+msgstr ""
+
+#: effects/Compressor.cpp:502
+msgid "Ratio:"
+msgstr ""
 
-#: effects/Compressor.cpp:491
-msgid "Ratio: "
-msgstr "壓縮比:"
+#: effects/Compressor.cpp:506
+msgid "Ratio"
+msgstr ""
 
-#: effects/Compressor.cpp:498
-msgid "Attack Time: "
+#: effects/Compressor.cpp:510
+#, fuzzy
+msgid "Attack Time:"
 msgstr "上升時間:"
 
-#: effects/Compressor.cpp:505
-msgid "Decay Time: "
+#: effects/Compressor.cpp:514
+msgid "Attack Time"
+msgstr ""
+
+#: effects/Compressor.cpp:518
+#, fuzzy
+msgid "Decay Time:"
 msgstr "衰減時間:"
 
+#: effects/Compressor.cpp:522
+msgid "Decay Time"
+msgstr ""
+
 #: effects/Compressor.cpp:516
 msgid "Normalize to 0dB after compressing"
 msgstr "壓縮後套用增益"
 
-#: effects/Compressor.cpp:561
+#: effects/Compressor.cpp:563
 #, c-format
-msgid "Threshold: %d dB"
+#, fuzzy
+msgid "Threshold %d dB"
 msgstr "臨界值:%d dB"
 
 #: effects/Compressor.cpp:564
 #, c-format
-msgid "Ratio: %.0f:1"
-msgstr "壓縮比:%.0f:1"
+msgid "%3d dB"
+msgstr ""
 
-#: effects/Compressor.cpp:566
+#: effects/Compressor.cpp:567
 #, c-format
-msgid "Ratio: %.1f:1"
-msgstr "壓縮比:%.1f:1"
+msgid "Ratio %.0f to 1"
+msgstr ""
 
 #: effects/Compressor.cpp:568
 #, c-format
-msgid "Attack Time: %.1f secs"
+msgid "%.0f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:571
+#, c-format
+msgid "Ratio %.1f to 1"
+msgstr ""
+
+#: effects/Compressor.cpp:572
+#, c-format
+msgid "%.1f:1"
+msgstr ""
+
+#: effects/Compressor.cpp:575
+#, c-format
+#, fuzzy
+msgid "Attack Time %.1f secs"
 msgstr "上升時間: %.1f 秒"
 
-#: effects/Compressor.cpp:570
+#: effects/Compressor.cpp:576 effects/Compressor.cpp:579
+#, c-format
+msgid "%.1f secs"
+msgstr ""
+
+#: effects/Compressor.cpp:578
 #, c-format
-msgid "Decay Time: %.1f secs"
+#, fuzzy
+msgid "Decay Time %.1f secs"
 msgstr "衰減時間:%.1f秒"
 
 #: effects/Compressor.h:36
@@ -4444,6 +4633,251 @@ msgstr "壓縮..."
 msgid "Applying Dynamic Range Compression..."
 msgstr "套用動態範圍壓縮中..."
 
+#: effects/Contrast.cpp:79
+msgid "Contrast Tool Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:79
+msgid "Foreground times selected.\n"
+"Now select background and use Ctrl+Shift+T or menu again."
+msgstr ""
+
+#: effects/Contrast.cpp:127
+msgid "Start time after after end time!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:137
+msgid "Times are not reasonable!\n"
+"Please enter reasonable times."
+msgstr ""
+
+#: effects/Contrast.cpp:120
+msgid "Hello.\n"
+msgstr ""
+
+#: effects/Contrast.cpp:245
+msgid "WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:193 effects/Contrast.cpp:204 effects/Contrast.cpp:266
+#: effects/Contrast.cpp:289
+msgid "Measured"
+msgstr ""
+
+#: effects/Contrast.cpp:231
+msgid "Contrast Analyzer"
+msgstr ""
+
+#: effects/Contrast.cpp:235
+msgid "Parameters"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+#: toolbars/ControlToolBar.cpp:185
+msgid "Start"
+msgstr "開始"
+
+#: effects/ToneGen.cpp:362
+#: toolbars/ControlToolBar.cpp:188
+#: toolbars/SelectionBar.cpp:149
+#: toolbars/SelectionBar.cpp:254
+msgid "End"
+msgstr "結束時間"
+
+#: effects/Contrast.cpp:332
+msgid "Volume    "
+msgstr ""
+
+#: effects/Contrast.cpp:248
+msgid "Foreground:"
+msgstr ""
+
+#: effects/Contrast.cpp:347
+msgid "Foreground start time"
+msgstr ""
+
+#: effects/Contrast.cpp:365
+msgid "Foreground end time"
+msgstr ""
+
+#: effects/Contrast.cpp:373 effects/Contrast.cpp:417
+msgid "Use selection"
+msgstr ""
+
+#: effects/Contrast.cpp:271
+msgid "Background:"
+msgstr ""
+
+#: effects/Contrast.cpp:391
+msgid "Background start time"
+msgstr ""
+
+#: effects/Contrast.cpp:409
+msgid "Background end time"
+msgstr ""
+
+#: effects/Contrast.cpp:298
+msgid "Result"
+msgstr ""
+
+#: effects/Contrast.cpp:302
+msgid "Contrast Result:"
+msgstr ""
+
+#: Tags.cpp:829
+#: Tags.cpp:1981
+msgid "Reset"
+msgstr "重置"
+
+#: effects/Contrast.cpp:304
+msgid "Difference:"
+msgstr ""
+
+#: effects/Contrast.cpp:313
+msgid "Information"
+msgstr ""
+
+#: effects/Contrast.cpp:447
+msgid "For measuring rms volume differences between two selections of audio."
+msgstr ""
+
+#: effects/Contrast.cpp:448
+msgid "Help for WCAG2 Audio Contrast Analyzer"
+msgstr ""
+
+#: toolbars/ControlToolBar.cpp:82
+msgid "Control"
+msgstr "控制"
+
+#: effects/Contrast.cpp:454
+msgid "Note: The 'OK' button resets time values."
+msgstr ""
+
+#: effects/Contrast.cpp:455
+msgid "Close but keep times"
+msgstr ""
+
+#: effects/Contrast.cpp:328 effects/Contrast.cpp:336 effects/Contrast.cpp:344
+#: effects/Contrast.cpp:352
+msgid "Measure"
+msgstr ""
+
+#: effects/Contrast.cpp:511
+msgid "No foreground to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:516
+msgid "Measured foreground level"
+msgstr ""
+
+#: effects/Contrast.cpp:191 effects/Contrast.cpp:202
+#, c-format
+msgid "%.1f dB"
+msgstr ""
+
+#: effects/Contrast.cpp:521
+msgid "No background to measure"
+msgstr ""
+
+#: effects/Contrast.cpp:526
+msgid "Measured background level"
+msgstr ""
+
+#: effects/Contrast.cpp:358
+msgid "WCAG2 Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:360
+msgid "WCAG2 Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:535
+msgid "Current difference"
+msgstr ""
+
+#: effects/Contrast.cpp:536
+#, c-format
+msgid "%.1f dB Average rms"
+msgstr ""
+
+#: effects/Contrast.cpp:541
+msgid "Please enter valid times."
+msgstr ""
+
+#: effects/Contrast.cpp:551
+msgid "Export Contrast Result As:"
+msgstr ""
+
+#: effects/Contrast.cpp:572
+msgid "WCAG 2.0 Success Criteria 1.4.7 Contrast Results"
+msgstr ""
+
+#: effects/Contrast.cpp:574
+#, c-format
+msgid "Filename = %s."
+msgstr ""
+
+#: effects/Contrast.cpp:576
+msgid "Foreground"
+msgstr ""
+
+#: effects/Contrast.cpp:581 effects/Contrast.cpp:598
+#, c-format
+msgid "Time started = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:586 effects/Contrast.cpp:603
+#, c-format
+msgid "Time ended = %2d hour(s), %2d minute(s), %.2f seconds."
+msgstr ""
+
+#: effects/Contrast.cpp:588 effects/Contrast.cpp:605
+#, c-format
+msgid "Average rms = %.1f dB."
+msgstr ""
+
+#: effects/Contrast.cpp:590 effects/Contrast.cpp:607
+msgid "Average rms =  dB."
+msgstr ""
+
+#: effects/Contrast.cpp:593
+msgid "Background"
+msgstr ""
+
+#: effects/Contrast.cpp:609
+msgid "Results"
+msgstr ""
+
+#: effects/Contrast.cpp:611
+#, c-format
+msgid "Difference = %.1f Average rms dB."
+msgstr ""
+
+#: effects/Contrast.cpp:613
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Pass"
+msgstr ""
+
+#: effects/Contrast.cpp:615
+msgid "Success Criteria 1.4.7 of WCAG 2.0: Fail"
+msgstr ""
+
+#: effects/Contrast.cpp:618
+msgid "Data gathered"
+msgstr ""
+
+#: effects/Contrast.h:33
+msgid "Contrast...\tCtrl+Shift+T"
+msgstr ""
+
+#: effects/Contrast.h:51
+msgid "Measuring background"
+msgstr ""
+
+#: effects/Contrast.h:53
+msgid "Measuring foreground"
+msgstr ""
+
 #: effects/DtmfGen.cpp:48
 msgid "DTMF Tone Generator"
 msgstr "DTMF產生器"
@@ -4702,6 +5136,10 @@ msgstr "波形上下反轉"
 msgid "Inverting"
 msgstr "波形上下反轉中"
 
+#: effects/Leveller.cpp:136
+msgid "Leveller"
+msgstr "校平儀"
+
 #: effects/Leveller.cpp:52
 msgid "None-Skip"
 msgstr "無略過"
@@ -4726,31 +5164,26 @@ msgstr "較重"
 msgid "Heaviest"
 msgstr "最重度"
 
-#: effects/Leveller.cpp:136
-msgid "Leveller"
-msgstr "校平儀"
-
-#: effects/Leveller.cpp:220
-msgid "Leveller by Lynn Allan"
-msgstr "校平儀(由Lynn Allan提供)"
-
-#: effects/Leveller.cpp:223
-msgid "Equalize soft and loud sections"
-msgstr "等化輕柔與響亮片段"
+#: effects/TruncSilence.cpp:332
+msgid "by Lynn Allan"
+msgstr "由Lynn Allan提供"
 
 #: effects/Leveller.cpp:226
 #: effects/Leveller.cpp:231
 msgid "Degree of Leveling"
 msgstr "水平度數"
 
+#: effects/Leveller.cpp:226
+msgid "Degree of Leveling:"
+msgstr ""
+
 #: effects/Leveller.cpp:242
 msgid "Noise Threshold (Hiss/Hum/Ambient Noise)"
 msgstr "雜音門檻(Hiss/Hum/Ambient Noise)"
 
-# 壓縮動作的起始點,指的是輸入音量的值。
-# THRESHOLD是用來決定開始壓縮動作的音量 ,一但超過此起始點,壓縮動作就會開始。
-#: effects/Leveller.cpp:245
-msgid "Threshold for Noise: "
+#: effects/Leveller.cpp:238
+#, fuzzy
+msgid "Threshold for Noise:"
 msgstr "雜音臨界值:"
 
 #: effects/Leveller.h:28
@@ -4761,6 +5194,158 @@ msgstr "校平儀..."
 msgid "Applying Leveller..."
 msgstr "套用校平儀中"
 
+#: effects/LoadEffects.cpp:102
+msgid "Generator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:104
+msgid "Instrument"
+msgstr ""
+
+#: effects/LoadEffects.cpp:106
+msgid "Oscillator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:108
+msgid "Utility"
+msgstr ""
+
+#: effects/LoadEffects.cpp:110
+msgid "Converter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:112
+msgid "Analyser"
+msgstr ""
+
+#: toolbars/MixerToolBar.cpp:60
+msgid "Mixer"
+msgstr "混音工具"
+
+#: effects/LoadEffects.cpp:116
+msgid "Simulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:118
+msgid "Delay"
+msgstr ""
+
+#: effects/LoadEffects.cpp:120
+msgid "Modulator"
+msgstr ""
+
+#: effects/LoadEffects.cpp:122
+msgid "Reverb"
+msgstr ""
+
+#: effects/Phaser.cpp:77
+msgid "Phaser"
+msgstr "移相器"
+
+#: effects/LoadEffects.cpp:126
+msgid "Flanger"
+msgstr ""
+
+#: effects/LoadEffects.cpp:128
+msgid "Chorus"
+msgstr ""
+
+#: effects/LoadEffects.cpp:130
+msgid "Filter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:132
+msgid "Lowpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:134
+msgid "Bandpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:136
+msgid "Highpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:138
+msgid "Comb"
+msgstr ""
+
+#: effects/LoadEffects.cpp:140
+msgid "Allpass"
+msgstr ""
+
+#: effects/LoadEffects.cpp:142
+msgid "Equaliser"
+msgstr ""
+
+#: effects/LoadEffects.cpp:144
+msgid "Parametric"
+msgstr ""
+
+#: effects/LoadEffects.cpp:146
+msgid "Multiband"
+msgstr ""
+
+#: effects/LoadEffects.cpp:148
+msgid "Spectral Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:150
+msgid "Pitch Shifter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:152
+msgid "Amplifier"
+msgstr ""
+
+#: effects/LoadEffects.cpp:154
+msgid "Distortion"
+msgstr ""
+
+#: effects/LoadEffects.cpp:156
+msgid "Waveshaper"
+msgstr ""
+
+#: effects/LoadEffects.cpp:158
+msgid "Dynamics Processor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:160
+msgid "Compressor"
+msgstr ""
+
+#: effects/LoadEffects.cpp:162
+msgid "Expander"
+msgstr ""
+
+#: effects/LoadEffects.cpp:164
+msgid "Limiter"
+msgstr ""
+
+#: effects/LoadEffects.cpp:166
+msgid "Gate"
+msgstr ""
+
+#: effects/NoiseRemoval.cpp:723
+msgid "Noise Removal"
+msgstr "去雜音"
+
+#: effects/LoadEffects.cpp:201
+msgid "Pitch and Tempo"
+msgstr ""
+
+#: effects/LoadEffects.cpp:203
+msgid "Timeline Changer"
+msgstr ""
+
+#: effects/LoadEffects.cpp:205
+msgid "Time"
+msgstr ""
+
+#: effects/LoadEffects.cpp:207
+msgid "Onsets"
+msgstr ""
+
 #: effects/Noise.cpp:37
 msgid "White"
 msgstr "White"
@@ -4796,31 +5381,23 @@ msgstr "產生雜音"
 
 #: effects/NoiseRemoval.cpp:192
 #, c-format
-msgid ""
-"Could not open file:\n"
+msgid "Could not open file:\n"
 "  %s"
-msgstr ""
-"無法開啟檔案:\n"
+msgstr "無法開啟檔案:\n"
 "  %s"
 
 #: effects/NoiseRemoval.cpp:277
 msgid "Attempt to run Noise Removal without a noise profile.\n"
 msgstr "嘗試在無雜音特徵下執行去雜音。\n"
 
-#: effects/NoiseRemoval.cpp:723
-msgid "Noise Removal"
-msgstr "去雜音"
-
 #: effects/NoiseRemoval.cpp:813
 msgid "Step 1"
 msgstr "步驟 1"
 
 #: effects/NoiseRemoval.cpp:814
-msgid ""
-"Select a few seconds of just noise so Audacity knows what to filter out,\n"
+msgid "Select a few seconds of just noise so Audacity knows what to filter out,\n"
 "then click Get Noise Profile:"
-msgstr ""
-"請選擇一段幾秒鐘長的雜音,\n"
+msgstr "請選擇一段幾秒鐘長的雜音,\n"
 "\"以便讓Audacity判斷濾除雜音的特徵,\n"
 "\"然後點擊\"取得雜音特徵\":"
 
@@ -4829,11 +5406,9 @@ msgid "Step 2"
 msgstr "步驟 2"
 
 #: effects/NoiseRemoval.cpp:816
-msgid ""
-"Select all of the audio you want filtered, choose how much noise you want\n"
+msgid "Select all of the audio you want filtered, choose how much noise you want\n"
 "filtered out, and then click 'OK' to remove noise.\n"
-msgstr ""
-"將需要過濾的聲音全部選定,\n"
+msgstr "將需要過濾的聲音全部選定,\n"
 "再選擇雜音濾除的程度,\n"
 "然後點擊\"OK\"消除雜音。\n"
 
@@ -4849,14 +5424,26 @@ msgstr "取得雜音特徵"
 msgid "Noise reduction (dB):"
 msgstr "雜音抑制(dB):"
 
+#: effects/NoiseRemoval.cpp:850
+msgid "Noise reduction"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:848
 msgid "Frequency smoothing (Hz):"
 msgstr "平滑頻率(Hz):"
 
+#: effects/NoiseRemoval.cpp:859
+msgid "Frequency smoothing"
+msgstr ""
+
 #: effects/NoiseRemoval.cpp:856
 msgid "Attack/decay time (secs):"
 msgstr "加強/衰減時間(秒):"
 
+#: effects/NoiseRemoval.cpp:868
+msgid "Attach/decay time"
+msgstr ""
+
 #: effects/NoiseRemoval.h:35
 msgid "Noise Removal..."
 msgstr "去雜音..."
@@ -4897,22 +5484,22 @@ msgstr ",最大振幅 = %.1f dB"
 msgid "Normalize"
 msgstr "單位化"
 
-#: effects/Normalize.cpp:341
-msgid "Normalize by Dominic Mazzoni"
-msgstr "單位化(Dominic Mazzoni提供)"
-
-#: effects/Normalize.cpp:348
-msgid "Remove any DC offset (center on 0 vertically)"
-msgstr "移除任何直流偏移(垂直中心為0)"
+#: effects/Normalize.cpp:351 effects/Normalize.cpp:352
+msgid "Remove any DC offset (center on 0.0 vertically)"
+msgstr ""
 
-#: effects/Normalize.cpp:353
-msgid "Normalize maximum amplitude to"
-msgstr "單位化使最大振幅至"
+#: effects/Normalize.cpp:357
+msgid "Normalize maximum amplitude to:"
+msgstr ""
 
 #: effects/Normalize.cpp:361
 msgid "-"
 msgstr "-"
 
+#: effects/Normalize.cpp:367
+msgid "Maximum amplitude dB"
+msgstr ""
+
 #: effects/Normalize.h:32
 msgid "Normalize..."
 msgstr "單位化..."
@@ -4926,44 +5513,56 @@ msgstr "單位化處理中..."
 msgid "Applied effect: %s %d stages, %.0f%% wet, frequency = %.1f Hz, start phase = %.0f deg, depth = %d, feedback = %.0f%%"
 msgstr "已套用效果: %s %d 階段, %.0f%% 濕[wet],頻率 = %.1f Hz,起始相位 = %.0f度,深度 = %d,回饋 = %.0f%%"
 
-#: effects/Phaser.cpp:77
-msgid "Phaser"
-msgstr "移相器"
-
-#: effects/Phaser.cpp:215
-msgid "Phaser by Nasca Octavian Paul"
-msgstr "移相器(Nasca Octavian Paul提供)"
-
 #: effects/Phaser.cpp:222
 msgid "Stages:"
 msgstr "階段:"
 
-#: effects/Phaser.cpp:243
-msgid "DRY"
-msgstr "ä¹¾[DRY]"
+#: effects/Phaser.cpp:229
+msgid "Stages"
+msgstr ""
 
-#: effects/Phaser.cpp:250
-msgid "WET"
-msgstr "æ¿•[WET]"
+#: effects/Phaser.cpp:231
+msgid "Dry/Wet:"
+msgstr ""
+
+#: effects/Phaser.cpp:234
+msgid "Dry Wet"
+msgstr ""
 
 #: effects/Phaser.cpp:264
 #: effects/Wahwah.cpp:221
 msgid "LFO Frequency (Hz):"
 msgstr "LFO 頻率 (Hz):"
 
+#: effects/Phaser.cpp:239 effects/Wahwah.cpp:224
+msgid "LFO frequency in hertz"
+msgstr ""
+
 #: effects/Phaser.cpp:280
 #: effects/Wahwah.cpp:237
 msgid "LFO Start Phase (deg.):"
 msgstr "LFO 起始相位 (角度):"
 
+#: effects/Phaser.cpp:244 effects/Wahwah.cpp:229
+msgid "LFO start phase in degrees"
+msgstr ""
+
 #: effects/Phaser.cpp:296
 msgid "Depth:"
 msgstr "深度:"
 
+#: effects/Phaser.cpp:249 effects/Wahwah.cpp:234
+msgid "Depth in percent"
+msgstr ""
+
 #: effects/Phaser.cpp:312
 msgid "Feedback (%):"
 msgstr "回饋 (%):"
 
+#: effects/Phaser.cpp:254
+msgid "Feedback in percent"
+msgstr ""
+
 #: effects/Phaser.h:38
 msgid "Phaser..."
 msgstr "移相器..."
@@ -4973,15 +5572,21 @@ msgid "Applying Phaser"
 msgstr "套用移相器中"
 
 #: effects/Repair.cpp:99
-msgid ""
-"The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
+msgid "The Repair effect is intended to be used on very short sections of damaged audio (up to 128 samples).\n"
 "\n"
 "Zoom in and select a tiny fraction of a second to repair."
-msgstr ""
-"修復效果提供小片段損毀音訊的修復(最多128個取樣點)。\n"
+msgstr "修復效果提供小片段損毀音訊的修復(最多128個取樣點)。\n"
 "\n"
 "放大音訊然後選取一小片段來修復。"
 
+#: effects/Repair.cpp:105
+msgid "Repair works by using audio data outside the selection region.\n"
+"\n"
+"Please select a region that has audio touching at least one side of it.\n"
+"\n"
+"The more surrounding audio, the better it performs."
+msgstr ""
+
 #: effects/Repair.h:37
 msgid "Repairing damaged audio"
 msgstr "修復損毀音訊中"
@@ -5000,30 +5605,25 @@ msgstr "音軌太長,無法重複選取範圍。"
 msgid "Repeat"
 msgstr "重複"
 
-#. i18n-hint: && in here is an escape character to get
-#. * a single & on screen, so keep it as is
-#: effects/Repeat.cpp:188
-msgid "Repeat by Dominic Mazzoni && Vaughan Johnson"
-msgstr "重複(Dominic Mazzoni && Vaughan Johnson提供)"
-
-#: effects/Repeat.cpp:195
-msgid "Number of times to repeat: "
+#: effects/Repeat.cpp:212
+#, fuzzy
+msgid "Number of times to repeat:"
 msgstr "重複次數:"
 
+#: effects/Repeat.cpp:221
+msgid "New selection length: hh:mm:ss"
+msgstr ""
+
 #: effects/Repeat.cpp:207
 #: effects/Repeat.cpp:237
 msgid "New selection length: "
 msgstr "新的選取長度:"
 
-#: effects/Repeat.cpp:239
-#, c-format
-msgid "%d minutes, %d seconds"
-msgstr "%d 分, %d 秒"
-
-#: effects/Repeat.cpp:242
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
+#. i18n-hint: Name of time display format that shows time in hours, minutes
+#. * and seconds
+#: widgets/TimeTextCtrl.cpp:270
+msgid "hh:mm:ss"
+msgstr "hh:mm:ss"
 
 #: effects/Repeat.h:32
 msgid "Repeat..."
@@ -5071,11 +5671,9 @@ msgid "SpikeCleaner by Lynn Allan"
 msgstr "突刺清除器(由Lynn Allan提供)"
 
 #: effects/SpikeCleaner.cpp:165
-msgid ""
-"Max Spike Duration (milliseconds): \n"
+msgid "Max Spike Duration (milliseconds): \n"
 "(99999 or greater is off)"
-msgstr ""
-"最大峰值持續期間(毫秒):\n"
+msgstr "最大峰值持續期間(毫秒):\n"
 "(最大99999)"
 
 # 壓縮動作的起始點,指的是輸入音量的值。
@@ -5092,10 +5690,60 @@ msgstr "突刺清除器..."
 msgid "Applying Spike Cleaner..."
 msgstr "套用突刺清除器中..."
 
+#: Menus.cpp:358
+#: Menus.cpp:564
+#: effects/StereoToMono.h:23
+msgid "&Stereo to Mono"
+msgstr "立體聲至單聲道(&S)"
+
 #: effects/StereoToMono.h:32
 msgid "Applying Stereo to Mono"
 msgstr "套用立體聲至單聲道"
 
+#: effects/TimeScale.cpp:140
+msgid "Time Scale"
+msgstr ""
+
+#: effects/TimeScale.cpp:176
+msgid "Sliding Time Scale/Pitch Shift"
+msgstr ""
+
+#: effects/TimeScale.cpp:178
+msgid "using SBSMS, by Clayton Otey"
+msgstr ""
+
+#: effects/TimeScale.cpp:187
+msgid "Initial Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:191
+msgid "Final Tempo Change (%):"
+msgstr ""
+
+#: effects/TimeScale.cpp:202
+msgid "Initial Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:211
+msgid "Final Tempo Change (%)"
+msgstr ""
+
+#: effects/TimeScale.cpp:219
+msgid "Initial Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.cpp:223
+msgid "Final Pitch Shift (semitones) [-12 to 12]:"
+msgstr ""
+
+#: effects/TimeScale.h:33
+msgid "Sliding Time Scale/Pitch Shift..."
+msgstr ""
+
+#: effects/TimeScale.h:47
+msgid "Changing Tempo/Pitch"
+msgstr ""
+
 #: effects/ToneGen.cpp:66
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
@@ -5143,17 +5791,21 @@ msgstr "頻率(Hz)"
 msgid "Waveform:"
 msgstr "波形:"
 
-#: effects/ToneGen.cpp:361
-#: toolbars/ControlToolBar.cpp:185
-msgid "Start"
-msgstr "開始"
+#: effects/ToneGen.cpp:358
+msgid "Frequency Hertz Start"
+msgstr ""
 
-#: effects/ToneGen.cpp:362
-#: toolbars/ControlToolBar.cpp:188
-#: toolbars/SelectionBar.cpp:149
-#: toolbars/SelectionBar.cpp:254
-msgid "End"
-msgstr "結束時間"
+#: effects/ToneGen.cpp:359
+msgid "Frequency Hertz End"
+msgstr ""
+
+#: effects/ToneGen.cpp:360
+msgid "Amplitude Start"
+msgstr ""
+
+#: effects/ToneGen.cpp:361
+msgid "Amplitude End"
+msgstr ""
 
 #: effects/ToneGen.cpp:372
 msgid "Interpolation:"
@@ -5184,10 +5836,6 @@ msgstr "所有選定的音軌必須具有相同的取樣頻率"
 msgid "Truncate Silence"
 msgstr "剪裁靜音"
 
-#: effects/TruncSilence.cpp:332
-msgid "by Lynn Allan"
-msgstr "由Lynn Allan提供"
-
 #: effects/TruncSilence.cpp:346
 msgid "Max silence duration:"
 msgstr "靜音最大持續期間:"
@@ -5237,10 +5885,6 @@ msgstr "已套用效果: %s 頻率 = %.1f Hz,起始相位 = %.0f度,深度
 msgid "Wahwah"
 msgstr "嗚咿聲"
 
-#: effects/Wahwah.cpp:214
-msgid "Wahwah by Nasca Octavian Paul"
-msgstr "嗚咿聲產生器(Nasca Octavian Paul提供)"
-
 #: effects/Wahwah.cpp:253
 msgid "Depth (%):"
 msgstr "深度 (%):"
@@ -5249,10 +5893,18 @@ msgstr "深度 (%):"
 msgid "Resonance:"
 msgstr "\t共振:"
 
+#: effects/Wahwah.cpp:239
+msgid "Resonance"
+msgstr ""
+
 #: effects/Wahwah.cpp:285
 msgid "Wah Frequency Offset (%):"
 msgstr "嗚咿聲頻率偏移 (%):"
 
+#: effects/Wahwah.cpp:244
+msgid "Wah frequency offset in percent"
+msgstr ""
+
 #: effects/Wahwah.h:34
 msgid "Wahwah..."
 msgstr "嗚咿聲..."
@@ -5291,6 +5943,18 @@ msgstr "效果器設定"
 msgid "Length (seconds)"
 msgstr "長度 (秒):"
 
+#: effects/lv2/LV2Effect.cpp:849 effects/lv2/LV2Effect.cpp:852
+msgid "Note length (seconds)"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:860 effects/lv2/LV2Effect.cpp:863
+msgid "Note velocity"
+msgstr ""
+
+#: effects/lv2/LV2Effect.cpp:871 effects/lv2/LV2Effect.cpp:874
+msgid "Note key"
+msgstr ""
+
 #: effects/nyquist/Nyquist.cpp:252
 msgid "Applying Nyquist Effect..."
 msgstr "套用Nyquist效果中..."
@@ -5358,13 +6022,13 @@ msgstr "外掛程式設定"
 msgid "Program"
 msgstr "程式"
 
-#: export/Export.cpp:407
-msgid ""
-"No tracks are selected! Use Ctrl-A (Select All)\n"
-"Choose Export... to export all tracks."
+#: export/Export.cpp:469
+msgid "All the selected audio is muted."
+msgstr ""
+
+#: export/Export.cpp:471
+msgid "All the audio is muted."
 msgstr ""
-"沒有選定音軌!用Ctrl-A (選擇全部)\n"
-"選擇\"匯出\"以匯出全部音軌。"
 
 #: export/Export.cpp:451
 msgid "Export File"
@@ -5380,14 +6044,12 @@ msgstr "您確認要將該檔案另存新檔為 \""
 
 #: export/Export.cpp:501
 #, c-format
-msgid ""
-"You are about to save a %s file with the name \"%s\".\n"
+msgid "You are about to save a %s file with the name \"%s\".\n"
 "\n"
 "Normally these files end in \".%s\", and some programs will not open files with nonstandard extensions.\n"
 "\n"
 "Are you sure you want to save the file under this name?"
-msgstr ""
-"您正要將%s檔案以\"%s\"的副檔名儲存起來。\n"
+msgstr "您正要將%s檔案以\"%s\"的副檔名儲存起來。\n"
 "\n"
 "通常,這類檔案的副檔名為\".%s\",且有些軟體無法開啟非標準副檔名的檔案。\n"
 "\n"
@@ -5423,6 +6085,10 @@ msgstr " - 左聲道"
 msgid " - Right"
 msgstr " - 右聲道"
 
+#: export/Export.cpp:1072
+msgid "Mixer Panel"
+msgstr ""
+
 #: export/Export.cpp:976
 #: export/Export.cpp:1021
 #, c-format
@@ -5460,10 +6126,6 @@ msgstr "(外部程式)"
 msgid "Cannot export audio to %s"
 msgstr "無法匯出聲音至%s"
 
-#: export/ExportCL.cpp:322
-msgid "Export"
-msgstr "匯出"
-
 #: export/ExportCL.cpp:324
 msgid "Exporting the selected audio using command-line encoder"
 msgstr "用命令列編碼器匯出選定的聲音"
@@ -5476,6 +6138,477 @@ msgstr "用命令列編碼器匯出全部成音工程"
 msgid "Command Output"
 msgstr "命令輸出"
 
+#: export/ExportFFmpeg.cpp:59
+msgid "Properly configured FFmpeg is required to proceed.\n"
+"You can configure it in Preferences->Import/Export."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:394
+#, c-format
+msgid "FFmpeg cannot find audio codec 0x%x.\n"
+"Support for this codec is probably not compiled in."
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:614
+#, c-format
+msgid "Attempted to export %d channels, but max. channels for selected output format is %d"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:638
+#, c-format
+msgid "Exporting selected audio as %s"
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:639
+#, c-format
+msgid "Exporting entire file as %s"
+msgstr ""
+
+#: export/ExportMP3.cpp:1918
+msgid "Invalid sample rate"
+msgstr "無效取樣頻率"
+
+#: export/ExportFFmpeg.cpp:715
+#, c-format
+msgid "The project sample rate (%d) is not supported by the current output\n"
+"file format.  "
+msgstr ""
+
+#: export/ExportFFmpeg.cpp:718
+#, c-format
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+"supported by the current output file format.  "
+msgstr ""
+
+#: export/ExportMP3.cpp:1937
+msgid "You may resample to one of the rates below."
+msgstr "你必須以更低的速率取樣。"
+
+#: export/ExportMP3.cpp:1960
+msgid "Sample Rates"
+msgstr "取樣頻率"
+
+#: export/ExportFFmpegDialogs.cpp:93
+msgid "Specify AC3 Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:117
+msgid "AC3 Export Setup"
+msgstr ""
+
+#: export/ExportMP2.cpp:133
+msgid "Bit Rate:"
+msgstr "位元速率:"
+
+#: export/ExportFFmpegDialogs.cpp:162
+msgid "Specify AAC Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:178
+msgid "AAC Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:217
+msgid "Specify AMR-NB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:241
+msgid "AMR-NB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:286
+msgid "Specify AMR-WB Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:310
+msgid "AMR-WB Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:357
+msgid "Specify WMA Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:381
+msgid "WMA Export Setup"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+#, c-format
+msgid "Overwrite preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:510
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:501
+msgid "Please select format before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:509
+msgid "Please select codec before saving a profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:580
+#, c-format
+msgid "Preset '%s' does not exist."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:803
+msgid "Specify Other Options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:897
+msgid "Preset:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:898
+msgid "Load Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:899
+msgid "Save Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:900
+msgid "Delete Preset"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:901
+msgid "Import Presets"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:902
+msgid "Export Presets"
+msgstr ""
+
+#: export/ExportPCM.cpp:177
+msgid "Format:"
+msgstr "格式:"
+
+#: export/ExportFFmpegDialogs.cpp:909
+msgid "Codec:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:913
+msgid "Not all formats and codecs are compatible. Some parameters (such as bitrate and samplerate) combinations are not compatible with some codecs too."
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:916
+msgid "Format selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:917
+msgid "Codec selector:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:919
+msgid "Show All Formats"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:920
+msgid "Show All Codecs"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:914
+msgid "Options"
+msgstr ""
+
+#: prefs/GUIPrefs.cpp:168
+msgid "Language:"
+msgstr "語言:"
+
+#: export/ExportFFmpegDialogs.cpp:932
+msgid "ISO 639 3-letter language code\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:934
+msgid "Tag:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:935
+msgid "Codec tag (FOURCC)\n"
+"Optional\n"
+"empty - automatic"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:938
+msgid "Bit Rate (bits/second) - influences the resulting file size and quality\n"
+"Some codecs may only accept specific values (128k, 192k, 256k etc)\n"
+"0 - automatic\n"
+"Recommended - 192000"
+msgstr ""
+
+#: export/ExportOGG.cpp:86
+msgid "Quality:"
+msgstr "品質:"
+
+#: export/ExportFFmpegDialogs.cpp:941
+msgid "Overral quality, used differently by different codecs\n"
+"Required for vorbis\n"
+"0 - automatic\n"
+"-1 - off (use bitrate instead)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Sample Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:944
+msgid "Sample rate (Hz)\n"
+"0 - don't change sample rate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:946
+msgid "Cutoff Bandwidth:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:947
+msgid "Audio cutoff bandwidth (Hz)\n"
+"Optional\n"
+"0 - automatic\n"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:949
+msgid "Profile:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:951
+msgid "AAC Profile\n"
+"Low Complexity -default\n"
+"Most players won't play anything other than LC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:940
+msgid "Use Bit Reservoir"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:943
+msgid "Use Variable Block Length"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:948
+msgid "FLAC options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:965
+msgid "Compression Level:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:966
+msgid "Compression level\n"
+"Required for FLAC\n"
+"-1 - automatic\n"
+"min - 0 (fast encoding, large output file)\n"
+"max - 10 (slow encoding, small output file)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:968
+msgid "Frame Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:969
+msgid "Frame size\n"
+"Optional\n"
+"0 - default\n"
+"min - 16\n"
+"max - 65535"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:971
+msgid "LPC coefficients precision"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:972
+msgid "LPC coefficients precision\n"
+"Optional\n"
+"0 - default\n"
+"min - 1\n"
+"max - 15"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:974
+msgid "Minimal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:975
+msgid "Minimal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Maximal prediction order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:978
+msgid "Maximal prediction order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 32 (with LPC) or 4 (without LPC)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:980
+msgid "Prediction Order Method:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:982
+msgid "Prediction Order Method\n"
+"Estimate - fastest, lower compression\n"
+"Log search - slowest, best compression\n"
+"Full search - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "Minimal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:985
+msgid "Minimal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:987
+msgid "Maximal partition order"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:988
+msgid "Maximal partition order\n"
+"Optional\n"
+"-1 - default\n"
+"min - 0\n"
+"max - 8"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:977
+msgid "Use LPC"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:984
+msgid "MPEG container options"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1001
+msgid "Mux Rate:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1002
+msgid "Maximum bit rate of the multiplexed stream\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1004
+msgid "Packet Size:"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1005
+msgid "Packet size\n"
+"Optional\n"
+"0 - default"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1207
+msgid "You can't delete a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1219
+#, c-format
+msgid "Delete preset '%s'?"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1238
+msgid "You can't save a preset without name"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1277
+msgid "Select xml file with presets to import"
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:200
+msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
+msgstr "XML檔案 (*.xml)|*.xml|全部檔案 (*.*)|*.*"
+
+#: export/ExportFFmpegDialogs.cpp:1292
+msgid "Select xml file to export presets into"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1361
+msgid "Failed to guess format"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.cpp:1403
+msgid "Failed to find the codec"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:53
+msgid "M4A (AAC) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:54
+msgid "AC3 Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:55
+msgid "AMR (narrow band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:56
+msgid "AMR (wide band) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:57
+msgid "WMA (version 2) Files (FFmpeg)"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:58
+msgid "Custom FFmpeg Export"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "LTP"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Low Complexity"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:373
+msgid "Main profile"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "2-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "4-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "8-level"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Estimate"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Full search"
+msgstr ""
+
+#: export/ExportFFmpegDialogs.h:676
+msgid "Log search"
+msgstr ""
+
 #: export/ExportFLAC.cpp:68
 msgid "Specify FLAC Options"
 msgstr "指定FLAC選項"
@@ -5556,10 +6689,6 @@ msgstr "指定MP2選項"
 msgid "MP2 Export Setup"
 msgstr "MP2匯出設定"
 
-#: export/ExportMP2.cpp:133
-msgid "Bit Rate:"
-msgstr "位元速率:"
-
 #: export/ExportMP2.cpp:200
 msgid "MP2 Files"
 msgstr "MP2檔案"
@@ -5681,35 +6810,15 @@ msgstr "定位Lame"
 msgid "Audacity needs the file %s to create MP3s."
 msgstr "Audacity需要%s檔案來建立MP3。"
 
-#: export/ExportMP3.cpp:562
-#, c-format
-msgid "Location of %s:"
-msgstr "%s路徑:"
-
-#: export/ExportMP3.cpp:571
-#, c-format
-msgid "To find %s, click here -->"
-msgstr "點這裡尋找%s-->"
-
-#: export/ExportMP3.cpp:577
-msgid "Browse..."
-msgstr "瀏覽..."
-
 #: export/ExportMP3.cpp:578
 msgid "To get a free copy of Lame, click here -->"
 msgstr "點這裡取得免費的Lame-->"
 
-#: export/ExportMP3.cpp:579
-msgid "Download..."
-msgstr "下載..."
-
-#. i18n-hint: It's asking for the location of a file, for
-#. example, "Where is lame_enc.dll?" - you could translate
-#. "Where would I find the file %s" instead if you want.
-#: export/ExportMP3.cpp:601
+#: export/ExportMP3.cpp:1070
 #, c-format
-msgid "Where is %s?"
-msgstr "%s在哪裡?"
+msgid "You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\n"
+"Please download the latest version of the LAME MP3 library."
+msgstr ""
 
 #: export/ExportMP3.cpp:1094
 msgid "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
@@ -5774,35 +6883,21 @@ msgstr "將全部檔案以%d kbps匯出"
 msgid "Error %d returned from MP3 encoder"
 msgstr "MP3編碼器回報錯誤%d"
 
-#: export/ExportMP3.cpp:1918
-msgid "Invalid sample rate"
-msgstr "無效取樣頻率"
-
 #: export/ExportMP3.cpp:1931
 #, c-format
-msgid ""
-"The project sample rate (%d) is not supported by the MP3\n"
+msgid "The project sample rate (%d) is not supported by the MP3\n"
 "file format.  "
 msgstr "此MP3檔案格式不支援目前工程取樣速率(%d)。  "
 
 #: export/ExportMP3.cpp:1934
 #, c-format
-msgid ""
-"The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
+msgid "The project sample rate (%d) and bit rate (%d kbps) combination is not\n"
 "supported by the MP3 file format.  "
 msgstr "此MP3檔案格式不支援目前工程取樣速率(%d)及位元率(%d kbps)。  "
 
-#: export/ExportMP3.cpp:1937
-msgid "You may resample to one of the rates below."
-msgstr "你必須以更低的速率取樣。"
-
-#: export/ExportMP3.cpp:1960
-msgid "Sample Rates"
-msgstr "取樣頻率"
-
-#: export/ExportMP3.cpp:2108
-msgid "MP3 exporting plugin not found"
-msgstr "找不到MP3匯出外掛模組"
+#: export/ExportMP3.cpp:1965
+msgid "MP3 export library not found"
+msgstr ""
 
 #: export/ExportMultiple.cpp:95
 #: export/ExportMultiple.cpp:374
@@ -5812,13 +6907,11 @@ msgid "Export Multiple"
 msgstr "匯出多個檔案"
 
 #: export/ExportMultiple.cpp:164
-msgid ""
-"If you have more than one Audio Track, you can export each track as a separate file,\n"
+msgid "If you have more than one Audio Track, you can export each track as a separate file,\n"
 "or if you have a Label Track, you can export a new file for each label.\n"
 "\n"
 "This project does not have multiple tracks or a Label Track, so you cannot export multiple files."
-msgstr ""
-"如果您需要匯出多個音軌,您可將每個軌道單獨匯出為一個檔案,\n"
+msgstr "如果您需要匯出多個音軌,您可將每個軌道單獨匯出為一個檔案,\n"
 "或者如果存在一個標籤軌,您可將每個標籤匯出為一個新的檔案。\n"
 "\n"
 "該檔案不包含多個音軌,或者不含標籤軌,所以無法匯出多個檔案。"
@@ -5864,6 +6957,10 @@ msgstr "包含在第一個標籤之前的聲音"
 msgid "First file name:"
 msgstr "第一個檔案名稱:"
 
+#: export/ExportMultiple.cpp:280
+msgid "First file name"
+msgstr ""
+
 #: export/ExportMultiple.cpp:258
 msgid "Tracks"
 msgstr "音軌"
@@ -5884,14 +6981,14 @@ msgstr "連續編號"
 msgid "File name prefix:"
 msgstr "檔名前置字元:"
 
+#: export/ExportMultiple.cpp:327
+msgid "File name prefix"
+msgstr ""
+
 #: export/ExportMultiple.cpp:306
 msgid "Overwrite existing files"
 msgstr "覆蓋現有的檔案"
 
-#: export/ExportMultiple.cpp:312
-msgid "E&xport"
-msgstr "匯出(&X)"
-
 #: export/ExportMultiple.cpp:372
 #, c-format
 msgid "\"%s\" successfully created."
@@ -5903,12 +7000,10 @@ msgstr "選擇儲存匯出檔案的位置"
 
 #: export/ExportMultiple.cpp:470
 #, c-format
-msgid ""
-"\"%s\" doesn't exist.\n"
+msgid "\"%s\" doesn't exist.\n"
 "\n"
 "Would you like to create it?"
-msgstr ""
-"\"%s\" 不存在。\n"
+msgstr "\"%s\" 不存在。\n"
 "\n"
 "您要建立它嗎?"
 
@@ -5931,11 +7026,9 @@ msgstr "匯出%d檔案後發生錯誤。"
 
 #: export/ExportMultiple.cpp:825
 #, c-format
-msgid ""
-"Label %s is not a legal file name. You cannot use any of:   %s\n"
+msgid "Label %s is not a legal file name. You cannot use any of:   %s\n"
 "Use..."
-msgstr ""
-"%s標籤不是可用的名稱。你不可以使用%s\n"
+msgstr "%s標籤不是可用的名稱。你不可以使用%s\n"
 "請使用…"
 
 #: export/ExportOGG.cpp:64
@@ -5946,10 +7039,6 @@ msgstr "指定Ogg Vorbis選項"
 msgid "Ogg Vorbis Export Setup"
 msgstr "Ogg Vorbis匯出設定"
 
-#: export/ExportOGG.cpp:86
-msgid "Quality:"
-msgstr "品質:"
-
 #: export/ExportOGG.cpp:155
 msgid "Ogg Vorbis Files"
 msgstr "Ogg Vorbis檔案"
@@ -5970,10 +7059,6 @@ msgstr "指定非壓縮格式選項"
 msgid "Uncompressed Export Setup"
 msgstr "非壓縮匯出設定"
 
-#: export/ExportPCM.cpp:177
-msgid "Format:"
-msgstr "格式:"
-
 #: export/ExportPCM.cpp:181
 msgid "Header:"
 msgstr "標頭:"
@@ -5986,10 +7071,21 @@ msgstr "編碼:"
 msgid "(Not all combinations of headers and encodings are possible.)"
 msgstr "(並非所有的標頭與編碼的組合可以成立。)"
 
-#: export/ExportPCM.cpp:320
-#: import/ImportPCM.cpp:47
-msgid "WAV, AIFF, and other uncompressed types"
-msgstr "WAV、AIFF及其他非壓縮格式"
+#: export/ExportPCM.cpp:369
+msgid "Other uncompressed files"
+msgstr ""
+
+#: export/ExportPCM.cpp:361
+msgid "AIFF (Apple) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:351
+msgid "WAV (Microsoft) signed 16 bit PCM"
+msgstr ""
+
+#: export/ExportPCM.cpp:387
+msgid "GSM 6.10 WAV (mobile)"
+msgstr ""
 
 #: export/ExportPCM.cpp:361
 msgid "Cannot export audio in this format."
@@ -6011,113 +7107,128 @@ msgstr "將全部成音工程匯出為%s"
 msgid "Error (file may not have been written): %s"
 msgstr "錯誤 (檔案可能尚未寫入):%s"
 
+#: export/ExportPCM.cpp:723
+msgid "There are no options for this format.\n"
+msgstr ""
+
+#. i18n-hint: This is pointing users at another possible export format in
+#. * the list. So you should translate the quoted string
+#. * 'Other uncompressed files' exactly the same as you do the same string
+#. * when it comes up on it's own.
+#: export/ExportPCM.cpp:728
+msgid "If you need more control over the export format please use the 'Other uncompressed files' format."
+msgstr ""
+
+#: export/ExportPCM.cpp:733
+msgid "Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:738
+msgid "Your file will be exported as a 16-bit WAV (Microsoft) file.\n"
+msgstr ""
+
+#: export/ExportPCM.cpp:743
+msgid "Your file will be exported as a GSM 6.10 WAV file.\n"
+msgstr ""
+
+#: import/ImportMP3.cpp:39
+msgid "MP3 files"
+msgstr "MP3檔案"
+
+#: import/Import.cpp:175
+msgid "Select stream(s) to import"
+msgstr ""
+
 #: import/Import.cpp:155
 #, c-format
 msgid "This version of Audacity was not compiled with %s support."
 msgstr "此版本的Audacity在編譯時沒有附帶針對%s的支援。"
 
+#: import/Import.cpp:240
+#, c-format
+msgid "\"%s\" \n"
+"is a MIDI file, not an audio file. \n"
+"Audacity cannot open this type of file for playing, but you can\n"
+"edit it by clicking File > Import > MIDI."
+msgstr ""
+
 #. i18n-hint: %s will be the filename
 #: import/Import.cpp:168
 #, c-format
-msgid ""
-"\"%s\" is an audio CD track. \n"
+msgid "\"%s\" is an audio CD track. \n"
 "Audacity cannot open audio CDs directly. \n"
 "Extract (rip) the CD tracks to an audio format that \n"
 "Audacity can import, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是音樂CD檔案。\n"
+msgstr "\"%s\"是音樂CD檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "請嘗試將它轉錄成Audacity能匯入的聲音格式如WAV或AIFF。"
 
 #: import/Import.cpp:174
 #, c-format
-msgid ""
-"\"%s\" is a playlist file. \n"
+msgid "\"%s\" is a playlist file. \n"
 "Audacity cannot open this file because it only contains links to other files. \n"
 "You may be able to open it in a text editor and download the actual audio files."
-msgstr ""
-"\"%s\"是播放清單檔案。\n"
+msgstr "\"%s\"是播放清單檔案。\n"
 "因為它只是一種文字檔案,與音樂檔案連結。\n"
 "您或許可以用文字編輯器將它開啟來取得音樂檔案網址並下載真正的音訊檔案。"
 
 #: import/Import.cpp:179
 #, c-format
-msgid ""
-"\"%s\" is a Windows Media Audio file. \n"
+msgid "\"%s\" is a Windows Media Audio file. \n"
 "Audacity cannot open this type of file due to patent restrictions. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是Windows多媒體檔案。\n"
+msgstr "\"%s\"是Windows多媒體檔案。\n"
 "Audacity基於專利權的問題,無法開啟此私有格式。\n"
 "您可以將它轉換成Audacity支援的檔案格式如WAV或AIFF來用Audacity開啟。"
 
 #: import/Import.cpp:184
 #, c-format
-msgid ""
-"\"%s\" is an Advanced Audio Coding file. \n"
+msgid "\"%s\" is an Advanced Audio Coding file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是 Advanced Audio Coding檔案。\n"
+msgstr "\"%s\"是 Advanced Audio Coding檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "請嘗試將它轉換成Audacity能支援的聲音格式如WAV或AIFF。"
 
-#: import/Import.cpp:189
+#: import/Import.cpp:271
 #, c-format
-msgid ""
-"\"%s\" is an encrypted audio file. These typically are from an online music store. \n"
+#, fuzzy
+msgid "\"%s\" is an encrypted audio file. \n"
+"These typically are from an online music store. \n"
 "Audacity cannot open this type of file due to the encryption. \n"
 "Try recording the file into Audacity, or burn it to audio CD then \n"
 "extract the CD track to a supported audio format such as WAV or AIFF."
-msgstr ""
-"\"%s\"是加密音訊檔案,通常來自線上音樂商店\n"
+msgstr "\"%s\"是加密音訊檔案,通常來自線上音樂商店\n"
 "Audacity基於加密的問題,無法開啟此私有格式。\n"
 "您可以將它轉換成未加密、Audacity支援的檔案格式如WAV或AIFF來用Audacity開啟。"
 
 #: import/Import.cpp:194
 #, c-format
-msgid ""
-"\"%s\" is a RealPlayer media file. \n"
+msgid "\"%s\" is a RealPlayer media file. \n"
 "Audacity cannot open this proprietary format. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是RealPlayer多媒體檔案。\n"
+msgstr "\"%s\"是RealPlayer多媒體檔案。\n"
 "Audacity無法開啟此私有格式。\n"
 "您可以將它轉換成Audacity支援的檔案格式如WAV或AIFF來用Audacity開啟。"
 
-#: import/Import.cpp:200
-#, c-format
-msgid ""
-"\"%s\" is a MIDI file, not an audio file. \n"
-"Audacity cannot open this type of file for playing or editing, but you can \n"
-"display it by clicking File > Import > MIDI."
-msgstr ""
-"\"%s\"是MIDI檔案,不是音訊檔案。\n"
-"Audacity無法開啟以及播放該類型檔案,\n"
-"不過你可以用檔案 > 匯入 > MIDI來顯示此檔案內容。"
-
 #: import/Import.cpp:206
 #, c-format
-msgid ""
-"\"%s\" is a notes-based file, not an audio file. \n"
+msgid "\"%s\" is a notes-based file, not an audio file. \n"
 "Audacity cannot open this type of file. \n"
 "Try converting it to an audio file such as WAV or AIFF and \n"
 "then import it, or record it into Audacity."
-msgstr ""
-"\"%s\"不是音訊檔案。\n"
+msgstr "\"%s\"不是音訊檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "請嘗試將它轉換成Audacity能支援的聲音格式如WAV或AIFF。"
 
 #: import/Import.cpp:212
 #, c-format
-msgid ""
-"\"%s\" is a Musepack audio file. \n"
+msgid "\"%s\" is a Musepack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "If you think it might be an mp3 file, rename it to end with \".mp3\" \n"
 "and try importing it again. Otherwise you need to convert it to a supported audio \n"
 "format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是Musepack體檔案。\n"
+msgstr "\"%s\"是Musepack體檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "如果你認為它有可能是mp3檔案,請將它的副檔名\n"
 "更改為\".mp3\"然後再重新匯入一次。\n"
@@ -6125,58 +7236,58 @@ msgstr ""
 
 #: import/Import.cpp:218
 #, c-format
-msgid ""
-"\"%s\" is a Wavpack audio file. \n"
+msgid "\"%s\" is a Wavpack audio file. \n"
 "Audacity cannot open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是Wavpack檔案。\n"
+msgstr "\"%s\"是Wavpack檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "請嘗試將它轉換成Audacity能支援的聲音格式如WAV或AIFF。"
 
 #: import/Import.cpp:224
 #, c-format
-msgid ""
-"\"%s\" is a Dolby Digital audio file. \n"
+msgid "\"%s\" is a Dolby Digital audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是Dolby Digital檔案。\n"
+msgstr "\"%s\"是Dolby Digital檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "請嘗試將它轉換成Audacity能支援的聲音格式如WAV或AIFF。"
 
 #: import/Import.cpp:230
 #, c-format
-msgid ""
-"\"%s\" is an Ogg Speex audio file. \n"
+msgid "\"%s\" is an Ogg Speex audio file. \n"
 "Audacity cannot currently open this type of file. \n"
 "You need to convert it to a supported audio format, such as WAV or AIFF."
-msgstr ""
-"\"%s\"是Ogg Speex檔案。\n"
+msgstr "\"%s\"是Ogg Speex檔案。\n"
 "Audacity無法開啟該類型檔案。\n"
 "請嘗試將它轉換成Audacity能支援的聲音格式如WAV或AIFF。"
 
-#: import/Import.cpp:253
-msgid ""
-"Audacity had to make a guess at the type of file.\n"
-"The Audio may be bogus.\n"
-"\n"
-"If the audio is bogus, try renaming the file\n"
-"so that it has the correct extension before opening it."
+#: import/Import.cpp:312
+#, c-format
+msgid "\"%s\" is a video file. \n"
+"Audacity cannot currently open this type of file. \n"
+"You need to extract the audio to a supported format, such as WAV or AIFF."
 msgstr ""
-"Audacity嘗試開啟此類型的檔案。\n"
-"此音訊檔案副檔名可能是錯誤的。\n"
-"\n"
-"如果此音訊檔案副檔名是錯誤的,請在開啟前\n"
-"更改成正確的副檔名。"
 
-#: import/Import.cpp:269
-msgid ""
-"Audacity did not recognize the type of this file.\n"
-"If it is uncompressed, try importing it using \"Import Raw\""
+#: import/Import.cpp:317
+#, c-format
+msgid "Audacity did not recognize the type of the file '%s'.\n"
+"If it is uncompressed, try importing it using \"Import Raw\"."
+msgstr ""
+
+#: import/Import.cpp:322
+#, c-format
+msgid "Audacity recognized the type of the file '%s',\n"
+"but was unable to import it."
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:34
+msgid "FFmpeg-compatible files"
+msgstr ""
+
+#: import/ImportFFmpeg.cpp:431
+#, c-format
+msgid "Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
 msgstr ""
-"Audacity無法識別該檔案的類型。\n"
-"如果它未被壓縮,請嘗試用\"原始Raw\"將其匯入。"
 
 #: import/ImportFLAC.cpp:35
 msgid "FLAC files"
@@ -6213,17 +7324,18 @@ msgstr "MIDI音軌不能單獨偏移,只有音訊檔案才可以。"
 msgid "Invalid track offset in LOF file."
 msgstr "LOF 檔案音軌偏移無效。"
 
-#: import/ImportMIDI.cpp:46
-msgid "Error parsing Allegro file."
-msgstr "分析Allegro檔案出錯。"
+#: import/ImportMIDI.cpp:31
+msgid ": Filename too short."
+msgstr ""
 
-#: import/ImportMIDI.cpp:76
-msgid "Error parsing MIDI file."
-msgstr "分析MIDI檔案出錯。"
+#: import/ImportMIDI.cpp:31 import/ImportMIDI.cpp:39 import/ImportMIDI.cpp:45
+#: import/ImportMIDI.cpp:53
+msgid "Could not open file "
+msgstr ""
 
-#: import/ImportMP3.cpp:39
-msgid "MP3 files"
-msgstr "MP3檔案"
+#: import/ImportMIDI.cpp:39
+msgid ": Incorrect filetype."
+msgstr ""
 
 #: import/ImportOGG.cpp:36
 msgid "Ogg Vorbis files"
@@ -6249,15 +7361,24 @@ msgstr "Vorbis位元流標頭無效"
 msgid "Internal logic fault"
 msgstr "內部處理錯誤"
 
-#: import/ImportPCM.cpp:396
+#: export/ExportPCM.cpp:320
+#: import/ImportPCM.cpp:47
+msgid "WAV, AIFF, and other uncompressed types"
+msgstr "WAV、AIFF及其他非壓縮格式"
+
+#: import/ImportPlugin.h:142 import/ImportRaw.cpp:203
 #, c-format
-msgid "Importing %s File..."
-msgstr "匯入%s檔案中..."
+msgid "Importing %s"
+msgstr ""
 
 #: import/ImportQT.cpp:21
 msgid "QuickTime files"
 msgstr "QuickTime檔案"
 
+#: import/ImportRaw.cpp:205
+msgid "Import Raw"
+msgstr ""
+
 #: import/ImportRaw.cpp:278
 msgid "Import Raw Data"
 msgstr "匯入Raw Data"
@@ -6300,6 +7421,14 @@ msgstr "雙聲道 (立體聲)"
 msgid "%d Channels"
 msgstr "%d 聲道"
 
+#: import/ImportRaw.cpp:369
+msgid "Byte order:"
+msgstr ""
+
+#: import/ImportRaw.cpp:372
+msgid "Channels:"
+msgstr ""
+
 #: import/ImportRaw.cpp:386
 msgid "Start offset:"
 msgstr "起始偏移:"
@@ -6312,9 +7441,18 @@ msgstr "匯入量:"
 msgid "Sample rate:"
 msgstr "取樣頻率:"
 
-#: import/ImportRaw.cpp:447
-msgid "&Import"
-msgstr "匯入(&I)"
+#: ondemand/ODComputeSummaryTask.h:47
+msgid "Import complete. Calculating waveform"
+msgstr ""
+
+#: ondemand/ODDecodeTask.h:61
+msgid "Decoding Waveform"
+msgstr ""
+
+#: ondemand/ODWaveTrackTaskQueue.cpp:327
+#, c-format
+msgid "%s %2.0f%% complete.  Click to change task focal point."
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:41
 #: prefs/AudioIOPrefs.cpp:42
@@ -6359,9 +7497,9 @@ msgstr "聲道"
 msgid "Playthrough"
 msgstr "播放"
 
-#: prefs/AudioIOPrefs.cpp:147
-msgid "&Play other tracks while recording new one"
-msgstr "在錄製新音軌時播放其它的音軌(&P)"
+#: prefs/AudioIOPrefs.cpp:149
+msgid "Overdub: &Play other tracks while recording new one"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:150
 msgid "&Hardware Playthrough: Play new track while recording it"
@@ -6371,9 +7509,13 @@ msgstr "硬體播放(&H):在錄音時播放新建的音軌"
 msgid "&Software Playthrough: Play new track while recording it"
 msgstr "軟體播放(&S):在錄音時播放新建的音軌"
 
-#: prefs/AudioIOPrefs.cpp:155
-msgid "&Software Playthrough: Play new track while recording it (uncheck when recording \"stereo mix\")"
-msgstr "軟體播放(&S):在錄音時播放新建的音軌(錄製\"stereo mix\"時不確認)"
+#: prefs/AudioIOPrefs.cpp:157
+msgid "&Software Playthrough: Play new track while recording or monitoring"
+msgstr ""
+
+#: prefs/AudioIOPrefs.cpp:160
+msgid "(uncheck when recording \"stereo mix\")"
+msgstr ""
 
 #: prefs/AudioIOPrefs.cpp:162
 msgid "Effects Preview"
@@ -6400,19 +7542,15 @@ msgid "Latency"
 msgstr "延遲"
 
 #: prefs/AudioIOPrefs.cpp:189
-msgid ""
-"Audio to buffer:\n"
+msgid "Audio to buffer:\n"
 "(higher = more latency)"
-msgstr ""
-"音訊緩衝:\n"
+msgstr "音訊緩衝:\n"
 "(越高 = 延遲越長)"
 
 #: prefs/AudioIOPrefs.cpp:192
-msgid ""
-"Latency correction:\n"
+msgid "Latency correction:\n"
 "(negative = backwards)"
-msgstr ""
-"延遲修正:\n"
+msgstr "延遲修正:\n"
 "(負值 = 往前)"
 
 #: prefs/AudioIOPrefs.cpp:197
@@ -6486,8 +7624,8 @@ msgid "Audio cache"
 msgstr "音軌快取"
 
 #: prefs/DirectoriesPrefs.cpp:112
-msgid "Hold recorded data in memory until recording is stopped"
-msgstr "在記憶體中保持錄音資料直到錄音結束"
+msgid "Play and/or record using RAM (useful for slow drives, but could crash with long files or recordings)"
+msgstr ""
 
 #: prefs/DirectoriesPrefs.cpp:121
 msgid "Choose a location to place the temporary directory"
@@ -6528,9 +7666,9 @@ msgstr "MP3程式庫版本:"
 msgid "MP3 Library:"
 msgstr "MP3程式庫:"
 
-#: prefs/FileFormatPrefs.cpp:89
-msgid "&Find Library"
-msgstr "尋找程式庫位址(&F)"
+#: prefs/FileFormatPrefs.cpp:96 prefs/FileFormatPrefs.cpp:120
+msgid "&Locate..."
+msgstr ""
 
 #: prefs/FileFormatPrefs.cpp:91
 msgid "LAME MP3 Library:"
@@ -6540,9 +7678,22 @@ msgstr "LAME MP3程式庫:"
 msgid "&Download"
 msgstr "下載(&D)"
 
-#: prefs/FileFormatPrefs.cpp:99
-msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog."
-msgstr "注意:匯出品質選項在匯出對話框的選項按鈕裡。"
+#: prefs/FileFormatPrefs.cpp:106
+msgid "FFmpeg Import/Export Library"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:109
+msgid "FFmpeg Library Version:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:118 prefs/FileFormatPrefs.cpp:122
+msgid "FFmpeg Library:"
+msgstr ""
+
+#: prefs/FileFormatPrefs.cpp:136
+#, fuzzy
+msgid "Note: Export quality options can be chosen by clicking the Options button in the Export dialog.\n"
+msgstr "注意:匯出品質選項在匯出對話框的選項按鈕裡。\n"
 
 #: prefs/FileFormatPrefs.cpp:100
 msgid "When importing audio files"
@@ -6614,7 +7765,8 @@ msgid "&Update display while playing"
 msgstr "在播放時更新顯示(&U)"
 
 #: prefs/GUIPrefs.cpp:96
-msgid "Closing last window quits Audacity"
+#, fuzzy
+msgid "Cl&osing last window quits Audacity"
 msgstr "關閉最後一個視窗時結束Audacity"
 
 #: prefs/GUIPrefs.cpp:98
@@ -6622,15 +7774,16 @@ msgid "Enable &dragging of left and right selection edges"
 msgstr "允許拖動選取範圍左右兩端(&D)"
 
 #: prefs/GUIPrefs.cpp:100
-msgid "&Ergonomic order of audio I/O buttons"
-msgstr "啟用音訊 I/O按鈕的人體工學順序(&E)"
+msgid "Er&gonomic order of audio I/O buttons"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:102
 msgid "Automatically &fit tracks vertically zoomed"
 msgstr "音軌垂直縮放至適當大小(&F)"
 
 #: prefs/GUIPrefs.cpp:104
-msgid "\"Move track focus\" &cycles repeatedly through tracks"
+#, fuzzy
+msgid "\"Move track focus\" c&ycles repeatedly through tracks"
 msgstr "\"移動聚焦音軌\"循環移動音軌(&C)"
 
 #: prefs/GUIPrefs.cpp:106
@@ -6658,17 +7811,22 @@ msgid "Show warnings about &temp files"
 msgstr "顯示關於暫存檔案的警告(&T)"
 
 #: prefs/GUIPrefs.cpp:120
-msgid "&Show prompt to save, even if project is empty"
-msgstr "提示儲存,即使是空的(&S)"
+msgid "Show prompt to sa&ve, even if project is empty"
+msgstr ""
 
 #: prefs/GUIPrefs.cpp:122
-msgid "Show Welcome Message at program start up"
+#, fuzzy
+msgid "Show &Welcome Message at program start up"
 msgstr "程式啟動時顯示歡迎訊息"
 
 #: prefs/GUIPrefs.cpp:126
 msgid "Modes"
 msgstr "模式"
 
+#: prefs/GUIPrefs.cpp:129
+msgid "Don't a&pply effects in batch mode"
+msgstr ""
+
 #: prefs/GUIPrefs.cpp:138
 msgid "Display range minimum: meters and 'Waveform (dB)'"
 msgstr "最小顯示範圍:儀表及\"波形(dB)\""
@@ -6701,34 +7859,10 @@ msgstr "-145 dB(PCM 24bit 取樣範圍)"
 msgid "Default View Mode"
 msgstr "預設檢視模式"
 
-#: prefs/GUIPrefs.cpp:154
-msgid "WaveformDisplay"
-msgstr "波形顯示"
-
-#: prefs/GUIPrefs.cpp:155
-msgid "WaveformDBDisplay"
-msgstr "波形DB顯示"
-
-#: prefs/GUIPrefs.cpp:156
-msgid "SpectrumDisplay"
-msgstr "頻譜顯示"
-
-#: prefs/GUIPrefs.cpp:158
-msgid "SpectrumLogDisplay"
-msgstr "頻譜Log顯示"
-
-#: prefs/GUIPrefs.cpp:160
-msgid "PitchDisplay"
-msgstr "音高顯示"
-
 #: prefs/GUIPrefs.cpp:166
 msgid "Other interface choices"
 msgstr "其他介面選擇"
 
-#: prefs/GUIPrefs.cpp:168
-msgid "Language:"
-msgstr "語言:"
-
 #: prefs/GUIPrefs.cpp:169
 msgid "Help:"
 msgstr "說明:"
@@ -6742,6 +7876,14 @@ msgstr "獨奏按鈕:"
 msgid "Keyboard"
 msgstr "鍵盤功能設定"
 
+#: prefs/KeyConfigPrefs.cpp:86
+msgid "Keyboard preferences currently unavailable."
+msgstr ""
+
+#: prefs/KeyConfigPrefs.cpp:87
+msgid "Open a new project to modify keyboard shortcuts."
+msgstr ""
+
 #: prefs/KeyConfigPrefs.cpp:95
 msgid "Key Bindings"
 msgstr "按鍵組合"
@@ -6775,22 +7917,16 @@ msgstr "儲存快速鍵錯誤"
 msgid "Select an XML file containing Audacity keyboard shortcuts..."
 msgstr "選取包含Audacity快速鍵定義的XML檔案..."
 
-#: prefs/KeyConfigPrefs.cpp:200
-msgid "XML files (*.xml)|*.xml|All files (*.*)|*.*"
-msgstr "XML檔案 (*.xml)|*.xml|全部檔案 (*.*)|*.*"
-
 #: prefs/KeyConfigPrefs.cpp:213
 msgid "Error loading keyboard shortcuts"
 msgstr "讀取快速鍵錯誤"
 
 #: prefs/KeyConfigPrefs.cpp:241
 #, c-format
-msgid ""
-"The keyboard shortcut '%s' is already assigned to:\n"
+msgid "The keyboard shortcut '%s' is already assigned to:\n"
 "\n"
 "'%s'"
-msgstr ""
-"快速鍵'%s'已經指定為:\n"
+msgstr "快速鍵'%s'已經指定為:\n"
 "'%s'"
 
 #: prefs/KeyConfigPrefs.cpp:367
@@ -6798,6 +7934,42 @@ msgstr ""
 msgid "Undo"
 msgstr "復原"
 
+#: prefs/AudioIOPrefs.cpp:147
+msgid "&Play other tracks while recording new one"
+msgstr "在錄製新音軌時播放其它的音軌(&P)"
+
+#: prefs/MidiIOPrefs.cpp:149
+msgid "&Hardware Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:152
+msgid "&Software Playthrough (Play new track while recording it)"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:160
+msgid "Play before cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:162
+msgid "Play after cut region:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:173
+msgid "Audio to buffer:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:176
+msgid "Latency correction:"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:183
+msgid "Seek Time"
+msgstr ""
+
+#: prefs/MidiIOPrefs.cpp:196
+msgid "Play when previewing:"
+msgstr ""
+
 #: prefs/MousePrefs.cpp:55
 #: prefs/MousePrefs.cpp:56
 msgid "Mouse"
@@ -7103,14 +8275,13 @@ msgstr "高品質:"
 msgid "Smart Recording"
 msgstr "智慧錄製"
 
-#: prefs/SmartRecordPrefs.cpp:81
-#: prefs/SmartRecordPrefs.cpp:83
-msgid "Pause Recording on Silence"
-msgstr "靜音時停止錄音"
+#: prefs/SmartRecordPrefs.cpp:64 prefs/SmartRecordPrefs.cpp:66
+msgid "Sound Activated Recording"
+msgstr ""
 
-#: prefs/SmartRecordPrefs.cpp:86
-msgid "Silence level (dB):"
-msgstr "靜音等級(dB):"
+#: prefs/SmartRecordPrefs.cpp:71
+msgid "Sound Activation Level (dB):"
+msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:41
 #: prefs/SpectrumPrefs.cpp:42
@@ -7246,8 +8417,7 @@ msgid "Info"
 msgstr "資訊"
 
 #: prefs/ThemePrefs.cpp:129
-msgid ""
-"Themability is an experimental feature.\n"
+msgid "Themability is an experimental feature.\n"
 "\n"
 "To try it out, click \"Save Theme Cache\" then\n"
 "find and modify the images and colors in \n"
@@ -7260,8 +8430,7 @@ msgid ""
 "[Only the control toolbar and the colors on the \n"
 "wavetrack are currently affected, even though the\n"
 "image file shows other icons too.]\n"
-msgstr ""
-"佈景是一個實驗性的功能。\n"
+msgstr "佈景是一個實驗性的功能。\n"
 "\n"
 "點\"儲存佈景快取\",\n"
 "然後用影像處理軟體,如GIMP,\n"
@@ -7274,40 +8443,31 @@ msgstr ""
 "若影像檔案顯示其他的工具列圖示,仍然無效。]\n"
 
 #: prefs/ThemePrefs.cpp:134
-msgid ""
-"You have compiled Audacity with an extra button, \n"
+msgid "You have compiled Audacity with an extra button, \n"
 "'Output Sourcery'.  This will save a C version of \n"
 "the image cache that can be compiled in as a default.\n"
 msgstr "您將額外的按鈕'Output Sourcery'編譯進Audacity。\n"
 
 #: prefs/ThemePrefs.cpp:139
-msgid ""
-"If 'Load Theme Cache At Startup' is checked, then \n"
+msgid "If 'Load Theme Cache At Startup' is checked, then \n"
 "the Theme Cache will be loaded when the program \n"
 "starts up.\n"
 "\n"
-msgstr ""
-"若選擇'啟動時載入佈景快取',\n"
+msgstr "若選擇'啟動時載入佈景快取',\n"
 "則每次當程式開啟時,\n"
 "都會載入佈景快取。\n"
 "\n"
 
 #: prefs/ThemePrefs.cpp:142
-msgid ""
-"Saving and loading individual theme files uses a \n"
+msgid "Saving and loading individual theme files uses a \n"
 "separate file for each image, but is otherwise the \n"
 "same idea.\n"
 "\n"
-msgstr ""
-"儲存及載入佈景檔案的影像使用\n"
+msgstr "儲存及載入佈景檔案的影像使用\n"
 "分開的檔案,\n"
 "不過是相同的主意。\n"
 "\n"
 
-#: toolbars/ControlToolBar.cpp:82
-msgid "Control"
-msgstr "控制"
-
 #: toolbars/ControlToolBar.cpp:174
 msgid "Pause"
 msgstr "暫停"
@@ -7316,9 +8476,9 @@ msgstr "暫停"
 msgid "Play"
 msgstr "播放"
 
-#: toolbars/ControlToolBar.cpp:177
-msgid "Play (Shift for loop-play)"
-msgstr "播放 (Shift for loop-play)"
+#: toolbars/ControlToolBar.cpp:178
+msgid "Play (Shift for Loop Play)"
+msgstr ""
 
 #: toolbars/ControlToolBar.cpp:182
 msgid "Stop"
@@ -7332,6 +8492,10 @@ msgstr "跳至起始點"
 msgid "Skip to End"
 msgstr "跳至結束點"
 
+#: toolbars/ControlToolBar.cpp:192
+msgid "Record (Shift for Append Record)"
+msgstr ""
+
 #: toolbars/ControlToolBar.cpp:194
 msgid "Clean Speech"
 msgstr "清除人聲"
@@ -7368,6 +8532,10 @@ msgid "Silence selection"
 msgstr "使選取範圍靜音"
 
 #: toolbars/EditToolBar.cpp:150
+msgid "Link Tracks"
+msgstr ""
+
+#: toolbars/EditToolBar.cpp:150
 msgid "Zoom In"
 msgstr "放大"
 
@@ -7423,16 +8591,13 @@ msgstr "輸出電壓計"
 msgid "Input level meter - click to monitor input"
 msgstr "輸入音量儀表 - 點擊監聽輸入"
 
-#: toolbars/MixerToolBar.cpp:60
-msgid "Mixer"
-msgstr "混音工具"
-
 #: toolbars/MixerToolBar.cpp:90
 msgid "Output Volume"
 msgstr "輸出音量"
 
 #: toolbars/MixerToolBar.cpp:92
-msgid "Slider-Output"
+#, fuzzy
+msgid "Slider Output"
 msgstr "淡出"
 
 #: toolbars/MixerToolBar.cpp:101
@@ -7440,7 +8605,8 @@ msgid "Input Volume"
 msgstr "輸入音量"
 
 #: toolbars/MixerToolBar.cpp:103
-msgid "Slider-Input"
+#, fuzzy
+msgid "Slider Input"
 msgstr "æ·¡å…¥"
 
 #: toolbars/MixerToolBar.cpp:134
@@ -7804,14 +8970,16 @@ msgstr "垂直立體聲"
 msgid "Preferences..."
 msgstr "偏好設定..."
 
+#: widgets/Meter.cpp:876
+msgid "Mix Volume"
+msgstr ""
+
 #: widgets/Meter.cpp:1078
-msgid ""
-"This determines how often the meter is refreshed.\n"
+msgid "This determines how often the meter is refreshed.\n"
 "If you have a slower PC you may want to select a\n"
 "lower refresh rate (30 per second or lower), so that\n"
 "audio qualtiy is not affected by the meter display."
-msgstr ""
-"此偏好設定決定儀定的更新頻率。\n"
+msgstr "此偏好設定決定儀定的更新頻率。\n"
 "如果您的電腦等級較低,可以設定\n"
 "較低的更新頻率 (低於30),這樣子\n"
 "電腦可以跑得比較順。"
@@ -7828,6 +8996,22 @@ msgstr "儀表工具列偏好設定"
 msgid " Please select an action "
 msgstr "請選擇一項動作"
 
+#: widgets/MultiDialog.cpp:86
+msgid "Please select an action"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:97
+msgid "Elapsed Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:117
+msgid "Remaining Time:"
+msgstr ""
+
+#: widgets/ProgressDialog.cpp:134
+msgid "Cancel"
+msgstr ""
+
 #: widgets/Ruler.cpp:1478
 #: widgets/Ruler.cpp:1479
 msgid "Vertical Ruler"
@@ -7840,12 +9024,6 @@ msgstr "垂直尺規"
 msgid "01000,01000 seconds"
 msgstr "01000,01000 seconds"
 
-#. i18n-hint: Name of time display format that shows time in hours, minutes
-#. * and seconds
-#: widgets/TimeTextCtrl.cpp:270
-msgid "hh:mm:ss"
-msgstr "hh:mm:ss"
-
 #. i18n-hint: Format string for displaying time in hours, minutes and
 #. * seconds. Change the 'h' to the abbreviation for hours, 'm' to the
 #. * abbreviation for minutes and 's' to the abbreviation for seconds. Don't
@@ -7871,6 +9049,21 @@ msgid "0100 days 024 h 060 m 060 s"
 msgstr "0100 days 024 h 060 m 060 s"
 
 #. i18n-hint: Name of time display format that shows time in hours,
+#. * minutes, seconds and hundreths of a second (1/100 second)
+#: widgets/TimeTextCtrl.cpp:288
+msgid "hh:mm:ss + hundredths"
+msgstr ""
+
+#. i18n-hint: Format string for displaying time in hours, minutes, seconds
+#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+#. * hundredths are shown as decimal seconds) . Don't change the numbers
+#. * unless there aren't 60 minutes in an hour in your locale
+#: widgets/TimeTextCtrl.cpp:294
+msgid "0100 h 060 m 060.0100 s"
+msgstr ""
+
+#. i18n-hint: Name of time display format that shows time in hours,
 #. * minutes, seconds and milliseconds (1/1000 second)
 #: widgets/TimeTextCtrl.cpp:288
 msgid "hh:mm:ss + milliseconds"
@@ -8056,8 +9249,8 @@ msgstr "無法開啟檔案: \"%s\""
 
 #: xml/XMLFileReader.cpp:63
 #, c-format
-msgid "Error: %hs at line %d"
-msgstr "錯誤:%hs (%d 行)"
+msgid "Error: %hs at line %lu"
+msgstr ""
 
 #: xml/XMLFileReader.cpp:79
 #, c-format
diff --git a/m4/audacity_checkcomp_visibility.m4 b/m4/audacity_checkcomp_visibility.m4
deleted file mode 100644
index 5f0003f..0000000
--- a/m4/audacity_checkcomp_visibility.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl Function to test whether the compiler can do hidden symbol visibility. This
-dnl test is from automake 2.62.
-
-# visibility.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([AUDACITY_CHECK_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    AC_MSG_CHECKING([for simple visibility declarations])
-    AC_CACHE_VAL(gl_cv_cc_visibility, [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -fvisibility=hidden"
-      AC_TRY_COMPILE(
-        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);],
-        [],
-        gl_cv_cc_visibility=yes,
-        gl_cv_cc_visibility=no)
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_visibility])
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST([CFLAG_VISIBILITY])
-  AC_SUBST([HAVE_VISIBILITY])
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
-])
-
diff --git a/m4/audacity_checklib_ffmpeg.m4 b/m4/audacity_checklib_ffmpeg.m4
index 249d288..d6fc2cc 100644
--- a/m4/audacity_checklib_ffmpeg.m4
+++ b/m4/audacity_checklib_ffmpeg.m4
@@ -1,5 +1,8 @@
 dnl Todo: Add Audacity / FFmpeg license
 dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_ffmpeg.m4 serial 1
 dnl Check for a copy of ffmpeg, whoose headers we will use for the importer
 AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
    AC_ARG_WITH(ffmpeg,
diff --git a/m4/audacity_checklib_libexpat.m4 b/m4/audacity_checklib_libexpat.m4
index 2a9594e..6f768c0 100644
--- a/m4/audacity_checklib_libexpat.m4
+++ b/m4/audacity_checklib_libexpat.m4
@@ -1,5 +1,9 @@
 dnl add license?
 dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libexpat.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBEXPAT], [
 
    AC_ARG_WITH(expat,
diff --git a/m4/audacity_checklib_libflac.m4 b/m4/audacity_checklib_libflac.m4
index 70649a9..b24b06c 100644
--- a/m4/audacity_checklib_libflac.m4
+++ b/m4/audacity_checklib_libflac.m4
@@ -1,5 +1,9 @@
 dnl add audacity / flac license?
 dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libflac.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
 
    if false ; then
diff --git a/m4/audacity_checklib_libid3tag.m4 b/m4/audacity_checklib_libid3tag.m4
index ae60a8a..35a4784 100644
--- a/m4/audacity_checklib_libid3tag.m4
+++ b/m4/audacity_checklib_libid3tag.m4
@@ -1,5 +1,8 @@
 dnl Add audacity / libmad licence?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libid3tag.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
 
    AC_ARG_WITH(libid3tag,
diff --git a/m4/audacity_checklib_liblrdf.m4 b/m4/audacity_checklib_liblrdf.m4
index e75cbff..d45468a 100644
--- a/m4/audacity_checklib_liblrdf.m4
+++ b/m4/audacity_checklib_liblrdf.m4
@@ -1,5 +1,9 @@
 dnl Add Audacity / LRDF license?
 dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_liblrdf.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBLRDF], [
    AC_ARG_WITH(liblrdf,
                [AS_HELP_STRING([--with-liblrdf],
diff --git a/m4/audacity_checklib_libmad.m4 b/m4/audacity_checklib_libmad.m4
index 5ed1ee3..66f3b26 100644
--- a/m4/audacity_checklib_libmad.m4
+++ b/m4/audacity_checklib_libmad.m4
@@ -1,5 +1,8 @@
 dnl Add audacity / libmad license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libmad.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
 
    if false ; then
diff --git a/m4/audacity_checklib_libnyquist.m4 b/m4/audacity_checklib_libnyquist.m4
index 10b0a3d..226f63b 100644
--- a/m4/audacity_checklib_libnyquist.m4
+++ b/m4/audacity_checklib_libnyquist.m4
@@ -1,4 +1,7 @@
 dnl add Audacity / Nyquist license?
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libnyquist.m4 serial 1
 
 dnl Check for Nyquist as a library
 AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
diff --git a/m4/audacity_checklib_libraptor.m4 b/m4/audacity_checklib_libraptor.m4
index bccba21..150b41d 100644
--- a/m4/audacity_checklib_libraptor.m4
+++ b/m4/audacity_checklib_libraptor.m4
@@ -1,5 +1,8 @@
 dnl Add Audacity / raptor license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libraptor.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBRAPTOR], [
    AC_ARG_WITH(libraptor,
                [AS_HELP_STRING([--with-libraptor],
diff --git a/m4/audacity_checklib_libresample.m4 b/m4/audacity_checklib_libresample.m4
index 60b31d8..bcb1873 100644
--- a/m4/audacity_checklib_libresample.m4
+++ b/m4/audacity_checklib_libresample.m4
@@ -1,5 +1,8 @@
 dnl Add Audacity license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libresample.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [
 
    AC_ARG_WITH(libresample,
diff --git a/m4/audacity_checklib_libsamplerate.m4 b/m4/audacity_checklib_libsamplerate.m4
index e85619c..239fe4e 100644
--- a/m4/audacity_checklib_libsamplerate.m4
+++ b/m4/audacity_checklib_libsamplerate.m4
@@ -1,5 +1,8 @@
 dnl Add Audacity / libsamplerate license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libsamplerate.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [
 
    AC_ARG_WITH(libsamplerate,
diff --git a/m4/audacity_checklib_libsbsms.m4 b/m4/audacity_checklib_libsbsms.m4
new file mode 100644
index 0000000..00acf51
--- /dev/null
+++ b/m4/audacity_checklib_libsbsms.m4
@@ -0,0 +1,60 @@
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libsbsms.m4 serial 1
+
+
+AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+   AC_ARG_WITH(sbsms,
+               [AS_HELP_STRING([--with-sbsms],
+                      [use libsbsms for pitch and tempo changing])],
+               LIBSBSMS_ARGUMENT=$withval,
+               LIBSBSMS_ARGUMENT="unspecified")
+
+   if false ; then
+      AC_DEFINE(USE_SBSMS, 1,
+                [Define if SBSMS support should be enabled])
+   fi
+
+   dnl see if sbsms is installed on the system
+
+   PKG_CHECK_MODULES(SBSMS, sbsms >= 1.6.0,
+                     sbsms_available_system="yes",
+                     sbsms_available_system="no")
+
+
+   if test "x$sbsms_available_system" = "xyes" ; then
+      LIBSBSMS_SYSTEM_AVAILABLE="yes"
+      LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS
+      LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS
+      LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS"
+      AC_MSG_NOTICE([Libsbsms libraries are available as system libraries])
+   else
+      LIBSBSMS_SYSTEM_AVAILABLE="no"
+      AC_MSG_NOTICE([Libsbsms libraries are NOT available as system libraries])
+   fi
+
+   dnl see if libsbsms is available locally
+
+   AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+                 sbsms_h_found="yes",
+                 sbsms_h_found="no")
+
+   if test "x$sbsms_h_found" = "xyes" ; then
+      LIBSBSMS_LOCAL_AVAILABLE="yes"
+      LIBSBSMS_LOCAL_LIBS="libsbsms.a"
+      LIBSBSMS_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/sbsms/include'
+      LIBSBSMS_LOCAL_CPPSYMBOLS="USE_SBSMS"
+
+	  dnl set up configuring sbsms
+      LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
+	  ac_configure_args="$ac_configure_args --disable-programs"
+	  dnl do not build programs we don't need
+
+      AC_MSG_NOTICE([libsbsms libraries are available in the local tree])
+   else
+      LIBSBSMS_LOCAL_AVAILABLE="no"
+      AC_MSG_NOTICE([libsbsms libraries are NOT available in the local tree])
+   fi
+
+])
+
diff --git a/m4/audacity_checklib_libsndfile.m4 b/m4/audacity_checklib_libsndfile.m4
index 620e250..c00dee9 100644
--- a/m4/audacity_checklib_libsndfile.m4
+++ b/m4/audacity_checklib_libsndfile.m4
@@ -1,4 +1,7 @@
 dnl Add audacity / libsndfile license?
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libsndfile.m4 serial 1
 
 AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
 
@@ -37,6 +40,10 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
       LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile"
       AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
 
+      dnl These must be visible so libvamp and sbsms can find us
+      dnl export SNDFILE_LIBS="'`pwd`/lib-src/libsndfile.a'"
+      dnl export SNDFILE_CFLAGS="'-I`pwd`/lib-src/libsndfile/src'"
+
       dnl Temporary fix for bug #248
       ac_configure_args="$ac_configure_args --disable-sqlite --disable-flac --disable-alsa"
    else
diff --git a/m4/audacity_checklib_libsoundtouch.m4 b/m4/audacity_checklib_libsoundtouch.m4
index bd636e1..f9dde55 100644
--- a/m4/audacity_checklib_libsoundtouch.m4
+++ b/m4/audacity_checklib_libsoundtouch.m4
@@ -1,5 +1,8 @@
 dnl Add Audacity / Soundtouch license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libsoundtouch.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
    AC_ARG_WITH(soundtouch,
                [AS_HELP_STRING([--with-soundtouch],
diff --git a/m4/audacity_checklib_libtwolame.m4 b/m4/audacity_checklib_libtwolame.m4
index 41db231..eda7a0a 100644
--- a/m4/audacity_checklib_libtwolame.m4
+++ b/m4/audacity_checklib_libtwolame.m4
@@ -1,5 +1,8 @@
 dnl add Audacity / Twolame license ?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libtwolame.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
    AC_ARG_WITH(libtwolame,
                [AS_HELP_STRING([--with-libtwolame],
@@ -41,10 +44,12 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
       LIBTWOLAME_LOCAL_LIBS="libtwolame.a"
       LIBTWOLAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame'
       LIBTWOLAME_LOCAL_CPPSYMBOLS="USE_LIBTWOLAME"
+	
+	  dnl request library is configured
+      LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
+	  dnl disable programs we don't need to build
+	  ac_configure_args="$ac_configure_args --disable-programs"
 
-      if test ! -f lib-src/twolame/Makefile ; then
-         LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
-      fi
       AC_MSG_NOTICE([libtwolame library is available in the local tree])
    else
       LIBTWOLAME_LOCAL_AVAILABLE="no"
diff --git a/m4/audacity_checklib_libvamp.m4 b/m4/audacity_checklib_libvamp.m4
index 8b41255..9db47e9 100644
--- a/m4/audacity_checklib_libvamp.m4
+++ b/m4/audacity_checklib_libvamp.m4
@@ -1,4 +1,7 @@
 dnl Todo: add Vamp / Audacity license?
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libvamp.m4 serial 2
 
 dnl Check for system copy of libvamp we can use for Vamp plug-in support
 AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
@@ -15,7 +18,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
 
    dnl System may include Vamp headers and library, though we prefer local ones
 
-   PKG_CHECK_MODULES(VAMP, vamp-hostsdk >= 1.1.0,
+   PKG_CHECK_MODULES(VAMP, vamp-hostsdk >= 2.0,
                      vamp_available_system="yes",
                      vamp_available_system="no")
 
@@ -34,19 +37,27 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
 
    dnl see if Vamp is available locally
 
-   AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h,
+   AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
                  vamp_h_found="yes",
                  vamp_h_found="no")
 
    if test "x$vamp_h_found" = "xyes" ; then
       LIBVAMP_LOCAL_AVAILABLE="yes"
-      LIBVAMP_LOCAL_LIBS="libvamp-hostsdk.a"
+	  dnl Add vamp to the list of things to build in lib-src
+      LIBVAMP_LOCAL_BUILD="vamp-sdk"
+	  dnl compiler and linker flags
       LIBVAMP_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libvamp'
+      LIBVAMP_LOCAL_LDFLAGS='-L$(top_builddir)/lib-src/libvamp/src -lvamp-hostsdk'
+	  dnl add some extra object files we can build
       LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
+	  dnl define a pre-processor symbol to tell other code that the vamp host
+	  dnl SDK is available
       LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP"
-      if test ! -f lib-src/libvamp/Makefile ; then
-         LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
-      fi
+	  dnl schedule the directory to be configured
+      LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
+	  ac_configure_args="$ac_configure_args --disable-programs"
+	  dnl do not build programs we don't need
+
       AC_MSG_NOTICE([Vamp libraries are available in the local tree])
    else
       LIBVAMP_LOCAL_AVAILABLE="no"
diff --git a/m4/audacity_checklib_libvorbis.m4 b/m4/audacity_checklib_libvorbis.m4
index c7618a7..09935f6 100644
--- a/m4/audacity_checklib_libvorbis.m4
+++ b/m4/audacity_checklib_libvorbis.m4
@@ -1,5 +1,9 @@
 dnl Add audacity / vorbis license?
 dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libvorbis.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
 
    if false ; then
diff --git a/m4/audacity_checklib_redland.m4 b/m4/audacity_checklib_redland.m4
index 540a617..c2d0dc3 100644
--- a/m4/audacity_checklib_redland.m4
+++ b/m4/audacity_checklib_redland.m4
@@ -1,5 +1,8 @@
 dnl add Audacity / Redland license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_redland.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_REDLAND], [
    AC_ARG_WITH(redland,
                [AS_HELP_STRING([--with-redland],
diff --git a/m4/audacity_checklib_slv2.m4 b/m4/audacity_checklib_slv2.m4
index 714f5a3..8afefef 100644
--- a/m4/audacity_checklib_slv2.m4
+++ b/m4/audacity_checklib_slv2.m4
@@ -1,5 +1,8 @@
 dnl Add Audacity / SLV2 license?
-dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_slv2.m4 serial 1
+
 AC_DEFUN([AUDACITY_CHECKLIB_SLV2], [
    AC_ARG_WITH(slv2,
                [AS_HELP_STRING([--with-slv2],
diff --git a/m4/audacity_checklib_widgetextra.m4 b/m4/audacity_checklib_widgetextra.m4
index b2c57e3..1f7fa27 100644
--- a/m4/audacity_checklib_widgetextra.m4
+++ b/m4/audacity_checklib_widgetextra.m4
@@ -1,4 +1,7 @@
 dnl Add Audacity/WX license?
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_widgetextra.m4 serial 1
 
 dnl A function to check for the correct presence of lib-widget-extra in the 
 dnl lib-src tree. Note that this is a mandatory library, and
diff --git a/m4/pkg.m4 b/m4/pkg.m4
new file mode 100644
index 0000000..a0b9cd4
--- /dev/null
+++ b/m4/pkg.m4
@@ -0,0 +1,155 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
diff --git a/m4/visibility.m4 b/m4/visibility.m4
new file mode 100644
index 0000000..2ff6330
--- /dev/null
+++ b/m4/visibility.m4
@@ -0,0 +1,52 @@
+# visibility.m4 serial 1 (gettext-0.15)
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl MacOS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    AC_MSG_CHECKING([for simple visibility declarations])
+    AC_CACHE_VAL(gl_cv_cc_visibility, [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      AC_TRY_COMPILE(
+        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);],
+        [],
+        gl_cv_cc_visibility=yes,
+        gl_cv_cc_visibility=no)
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_visibility])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index 1767997..517d95b 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -265,7 +265,6 @@
 		174F73D4098D516D009CD6E0 /* AudacityOGG.icns in Resources */ = {isa = PBXBuildFile; fileRef = 174F73CD098D516D009CD6E0 /* AudacityOGG.icns */; };
 		174F73D5098D516D009CD6E0 /* AudacityProject.icns in Resources */ = {isa = PBXBuildFile; fileRef = 174F73CE098D516D009CD6E0 /* AudacityProject.icns */; };
 		174F73D6098D516D009CD6E0 /* AudacityWAV.icns in Resources */ = {isa = PBXBuildFile; fileRef = 174F73CF098D516D009CD6E0 /* AudacityWAV.icns */; };
-		174F73D8098D51AA009CD6E0 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 174F73D7098D51AA009CD6E0 /* Info.plist */; };
 		176A1A55098B7AFB00DC73B4 /* cmdline.c in Sources */ = {isa = PBXBuildFile; fileRef = 17C8BA14098B4FD700216F16 /* cmdline.c */; };
 		176A1A56098B7AFB00DC73B4 /* intgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 17C8BA15098B4FD700216F16 /* intgen.c */; };
 		176EE9DE09A2EC1000188F3B /* caf.c in Sources */ = {isa = PBXBuildFile; fileRef = 176EE9DB09A2EC1000188F3B /* caf.c */; };
@@ -696,7 +695,6 @@
 		17CBAE43098B84E300575C58 /* xlsym.c in Sources */ = {isa = PBXBuildFile; fileRef = 17C8BF52098B654400216F16 /* xlsym.c */; };
 		17CBAE44098B84E300575C58 /* xlsys.c in Sources */ = {isa = PBXBuildFile; fileRef = 17C8BF54098B654400216F16 /* xlsys.c */; };
 		17CBAE4A098B85CD00575C58 /* libnyquist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 176A1A5B098B7B8D00DC73B4 /* libnyquist.a */; };
-		17FC86F40994637C0061DC94 /* compile.txt in Resources */ = {isa = PBXBuildFile; fileRef = 17FC86F30994637C0061DC94 /* compile.txt */; };
 		17FDBCFE098BFF4E00BCEF32 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 170731F30988D6AA008541CC /* config.h */; };
 		17FDBCFF098BFF4E00BCEF32 /* config_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 170732F20988D6AB008541CC /* config_types.h */; };
 		17FDBD00098BFF4E00BCEF32 /* ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 170732F80988D6AB008541CC /* ogg.h */; };
@@ -713,10 +711,7 @@
 		186CCE720E51F48500659159 /* ODDecodeFlacTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 186CCE6E0E51F48500659159 /* ODDecodeFlacTask.cpp */; };
 		186CCE730E51F48500659159 /* ODDecodeTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 186CCE700E51F48500659159 /* ODDecodeTask.cpp */; };
 		186CCEA40E523C8E00659159 /* Profiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 186CCEA30E523C8E00659159 /* Profiler.cpp */; };
-		280196B10D98171F00BFEECF /* Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 280196AF0D98171F00BFEECF /* Plugin.h */; };
-		280196B20D98171F00BFEECF /* PluginBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 280196B00D98171F00BFEECF /* PluginBase.h */; };
-		280196B50D98174400BFEECF /* PluginBufferingAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 280196B30D98174400BFEECF /* PluginBufferingAdapter.cpp */; };
-		280196B60D98174400BFEECF /* PluginBufferingAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 280196B40D98174400BFEECF /* PluginBufferingAdapter.h */; };
+		18D8314E0ED0F56300FD870D /* Contrast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18D8314C0ED0F56200FD870D /* Contrast.cpp */; };
 		2801A6460BF9268700648258 /* ImportQT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2801A6430BF9268700648258 /* ImportQT.cpp */; };
 		2801A6470BF9268700648258 /* ImportQTWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2801A6450BF9268700648258 /* ImportQTWrapper.cpp */; };
 		280828550A75E0D0000002EF /* LabelDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 280828530A75E0D0000002EF /* LabelDialog.cpp */; };
@@ -789,34 +784,71 @@
 		28501EA20CEECEF80029ABAA /* SplashDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501E9F0CEECEF80029ABAA /* SplashDialog.cpp */; };
 		28501EAA0CEED0670029ABAA /* LoadVamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501E970CEECE910029ABAA /* LoadVamp.cpp */; };
 		28501EAB0CEED0680029ABAA /* VampEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501E990CEECE920029ABAA /* VampEffect.cpp */; };
-		28501F0B0CEED2980029ABAA /* PluginHostAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F090CEED2980029ABAA /* PluginHostAdapter.cpp */; };
-		28501F0C0CEED2980029ABAA /* PluginHostAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F0A0CEED2980029ABAA /* PluginHostAdapter.h */; };
-		28501F170CEED2C50029ABAA /* PluginChannelAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F0F0CEED2C50029ABAA /* PluginChannelAdapter.cpp */; };
-		28501F180CEED2C50029ABAA /* PluginChannelAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F100CEED2C50029ABAA /* PluginChannelAdapter.h */; };
-		28501F190CEED2C50029ABAA /* PluginInputDomainAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F110CEED2C50029ABAA /* PluginInputDomainAdapter.cpp */; };
-		28501F1A0CEED2C50029ABAA /* PluginInputDomainAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F120CEED2C50029ABAA /* PluginInputDomainAdapter.h */; };
-		28501F1B0CEED2C50029ABAA /* PluginLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F130CEED2C50029ABAA /* PluginLoader.cpp */; };
-		28501F1C0CEED2C50029ABAA /* PluginLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F140CEED2C50029ABAA /* PluginLoader.h */; };
-		28501F1D0CEED2C50029ABAA /* PluginWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F150CEED2C50029ABAA /* PluginWrapper.cpp */; };
-		28501F1E0CEED2C50029ABAA /* PluginWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F160CEED2C50029ABAA /* PluginWrapper.h */; };
 		28501F330CEED8C70029ABAA /* libvamp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28501F060CEED1F00029ABAA /* libvamp.a */; };
-		28501F4B0CEED9560029ABAA /* PluginAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F470CEED9560029ABAA /* PluginAdapter.cpp */; };
-		28501F4C0CEED9560029ABAA /* PluginAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F480CEED9560029ABAA /* PluginAdapter.h */; };
-		28501F4D0CEED9560029ABAA /* RealTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28501F490CEED9560029ABAA /* RealTime.cpp */; };
-		28501F4E0CEED9560029ABAA /* RealTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 28501F4A0CEED9560029ABAA /* RealTime.h */; };
 		28530C4C0DF2105200555C94 /* HtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28530C480DF2105200555C94 /* HtmlWindow.cpp */; };
 		28530C4D0DF2105200555C94 /* ProgressDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28530C4A0DF2105200555C94 /* ProgressDialog.cpp */; };
 		28560C910A75E40F00A3429E /* AutoRecovery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28560C8F0A75E40F00A3429E /* AutoRecovery.cpp */; };
+		285D3CB40F09FC8F007883FC /* PluginBufferingAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CAC0F09FC8F007883FC /* PluginBufferingAdapter.cpp */; };
+		285D3CB50F09FC8F007883FC /* PluginChannelAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CAD0F09FC8F007883FC /* PluginChannelAdapter.cpp */; };
+		285D3CB60F09FC8F007883FC /* PluginHostAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CAE0F09FC8F007883FC /* PluginHostAdapter.cpp */; };
+		285D3CB70F09FC8F007883FC /* PluginInputDomainAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CAF0F09FC8F007883FC /* PluginInputDomainAdapter.cpp */; };
+		285D3CB80F09FC8F007883FC /* PluginLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CB00F09FC8F007883FC /* PluginLoader.cpp */; };
+		285D3CB90F09FC8F007883FC /* PluginSummarisingAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CB10F09FC8F007883FC /* PluginSummarisingAdapter.cpp */; };
+		285D3CBA0F09FC8F007883FC /* PluginWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CB20F09FC8F007883FC /* PluginWrapper.cpp */; };
+		285D3CBB0F09FC8F007883FC /* RealTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CB30F09FC8F007883FC /* RealTime.cpp */; };
+		285D3CBE0F09FCB2007883FC /* PluginAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CBC0F09FCB2007883FC /* PluginAdapter.cpp */; };
+		285D3CBF0F09FCB2007883FC /* RealTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285D3CBD0F09FCB2007883FC /* RealTime.cpp */; };
 		285DE1FA0BF03C7800A20DF0 /* Screenshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 285DE1F80BF03C7800A20DF0 /* Screenshot.cpp */; };
 		2860BA240E0F0D8600A13878 /* SoundActivatedRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2860BA200E0F0D8600A13878 /* SoundActivatedRecord.cpp */; };
 		2860BA250E0F0D8600A13878 /* TimerRecordDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2860BA220E0F0D8600A13878 /* TimerRecordDialog.cpp */; };
 		2860BA280E0F0DD800A13878 /* ExportFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2860BA260E0F0DD800A13878 /* ExportFFmpeg.cpp */; };
 		2862D7920E25E1D90014D9BB /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 2862D7910E25E1D90014D9BB /* config.h */; };
-		2862D7CD0E25E97B0014D9BB /* librasqal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287BD8A50E25DA5500CB4467 /* librasqal.a */; };
-		2862D7CE0E25E97D0014D9BB /* librdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287BD8AE0E25DA6500CB4467 /* librdf.a */; };
-		2862D7CF0E25E97E0014D9BB /* libslv2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287BD9AA0E25DF2800CB4467 /* libslv2.a */; };
-		2862D7D00E25E97F0014D9BB /* libraptor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287BD89C0E25DA3700CB4467 /* libraptor.a */; };
-		2862D7D20E25E9850014D9BB /* liblrdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287BD97D0E25DE6800CB4467 /* liblrdf.a */; };
+		286D31090F264BEE004E6E4A /* af.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30AD0F264BB7004E6E4A /* af.po */; };
+		286D310A0F264BEE004E6E4A /* ar.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30AE0F264BB7004E6E4A /* ar.po */; };
+		286D310B0F264BEE004E6E4A /* bg.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30AF0F264BB7004E6E4A /* bg.po */; };
+		286D310C0F264BEE004E6E4A /* bn.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B00F264BB7004E6E4A /* bn.po */; };
+		286D310D0F264BEE004E6E4A /* bs.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B10F264BB7004E6E4A /* bs.po */; };
+		286D310E0F264BEE004E6E4A /* ca.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B20F264BB7004E6E4A /* ca.po */; };
+		286D310F0F264BEE004E6E4A /* ca at valencia.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B30F264BB7004E6E4A /* ca at valencia.po */; };
+		286D31100F264BEE004E6E4A /* cs.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B40F264BB7004E6E4A /* cs.po */; };
+		286D31110F264BEE004E6E4A /* cy.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B50F264BB7004E6E4A /* cy.po */; };
+		286D31120F264BEE004E6E4A /* da.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B60F264BB7004E6E4A /* da.po */; };
+		286D31130F264BEE004E6E4A /* de.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B70F264BB7004E6E4A /* de.po */; };
+		286D31140F264BEE004E6E4A /* el.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B80F264BB7004E6E4A /* el.po */; };
+		286D31150F264BEE004E6E4A /* es.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30B90F264BB7004E6E4A /* es.po */; };
+		286D31160F264BEE004E6E4A /* eu.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30BA0F264BB7004E6E4A /* eu.po */; };
+		286D31170F264BEE004E6E4A /* fa.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30BB0F264BB7004E6E4A /* fa.po */; };
+		286D31180F264BEE004E6E4A /* fi.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30BC0F264BB7004E6E4A /* fi.po */; };
+		286D31190F264BEE004E6E4A /* fr.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30BD0F264BB7004E6E4A /* fr.po */; };
+		286D311A0F264BEE004E6E4A /* ga.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30BE0F264BB7004E6E4A /* ga.po */; };
+		286D311B0F264BEE004E6E4A /* gl.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30BF0F264BB7004E6E4A /* gl.po */; };
+		286D311C0F264BEE004E6E4A /* he.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C00F264BB7004E6E4A /* he.po */; };
+		286D311D0F264BEE004E6E4A /* hu.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C10F264BB7004E6E4A /* hu.po */; };
+		286D311E0F264BEE004E6E4A /* id.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C20F264BB7004E6E4A /* id.po */; };
+		286D311F0F264BEE004E6E4A /* it.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C30F264BB7004E6E4A /* it.po */; };
+		286D31200F264BEE004E6E4A /* ja.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C40F264BB7004E6E4A /* ja.po */; };
+		286D31210F264BEE004E6E4A /* ka.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C50F264BB7004E6E4A /* ka.po */; };
+		286D31220F264BEE004E6E4A /* km.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C60F264BB7004E6E4A /* km.po */; };
+		286D31230F264BEE004E6E4A /* ko.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C70F264BB7004E6E4A /* ko.po */; };
+		286D31240F264BEE004E6E4A /* lt.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C80F264BB7004E6E4A /* lt.po */; };
+		286D31250F264BEE004E6E4A /* mk.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30C90F264BB7004E6E4A /* mk.po */; };
+		286D31260F264BEE004E6E4A /* nb.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30CA0F264BB7004E6E4A /* nb.po */; };
+		286D31270F264BEE004E6E4A /* nl.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30CB0F264BB7004E6E4A /* nl.po */; };
+		286D31280F264BEE004E6E4A /* oc.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30CC0F264BB7004E6E4A /* oc.po */; };
+		286D31290F264BEE004E6E4A /* pl.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30CD0F264BB7004E6E4A /* pl.po */; };
+		286D312A0F264BEE004E6E4A /* pt.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30CE0F264BB7004E6E4A /* pt.po */; };
+		286D312B0F264BEE004E6E4A /* pt_BR.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30CF0F264BB7004E6E4A /* pt_BR.po */; };
+		286D312C0F264BEE004E6E4A /* ro.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D00F264BB7004E6E4A /* ro.po */; };
+		286D312D0F264BEE004E6E4A /* ru.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D10F264BB7004E6E4A /* ru.po */; };
+		286D312E0F264BEE004E6E4A /* sk.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D20F264BB7004E6E4A /* sk.po */; };
+		286D312F0F264BEE004E6E4A /* sl.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D30F264BB7004E6E4A /* sl.po */; };
+		286D31300F264BEE004E6E4A /* sv.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D40F264BB7004E6E4A /* sv.po */; };
+		286D31310F264BEE004E6E4A /* tg.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D50F264BB7004E6E4A /* tg.po */; };
+		286D31320F264BEE004E6E4A /* tr.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D60F264BB7004E6E4A /* tr.po */; };
+		286D31330F264BEE004E6E4A /* uk.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D70F264BB7004E6E4A /* uk.po */; };
+		286D31340F264BEE004E6E4A /* vi.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D80F264BB7004E6E4A /* vi.po */; };
+		286D31350F264BEE004E6E4A /* zh.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30D90F264BB7004E6E4A /* zh.po */; };
+		286D31360F264BEE004E6E4A /* zh_TW.po in Sources */ = {isa = PBXBuildFile; fileRef = 286D30DA0F264BB7004E6E4A /* zh_TW.po */; };
 		287BD8BD0E25DAF500CB4467 /* rdf_query.c in Sources */ = {isa = PBXBuildFile; fileRef = 287BD7010E25D8AE00CB4467 /* rdf_query.c */; };
 		287BD8C00E25DB2B00CB4467 /* rdf_hash_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 287BD6E60E25D8AE00CB4467 /* rdf_hash_memory.c */; };
 		287BD8C10E25DB2C00CB4467 /* rdf_concepts.h in Headers */ = {isa = PBXBuildFile; fileRef = 287BD6D80E25D8AE00CB4467 /* rdf_concepts.h */; };
@@ -1010,7 +1042,6 @@
 		288052C20DEA73F500671EA4 /* NonGuiThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 288052BC0DEA72F300671EA4 /* NonGuiThread.cpp */; };
 		288053740DEA9E4C00671EA4 /* ScripterCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 288052860DEA69C900671EA4 /* ScripterCallback.h */; };
 		2882177B0A35D8730029AF41 /* ShuttlePrefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 288217790A35D8730029AF41 /* ShuttlePrefs.cpp */; };
-		2882178C0A35D90C0029AF41 /* treebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2882178A0A35D90C0029AF41 /* treebook.cpp */; };
 		2891B2870C531D2C0044FBE3 /* FindClipping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2891B2850C531D2C0044FBE3 /* FindClipping.cpp */; };
 		2897F6F00AB3DB5A003C20C5 /* ControlToolBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2897F6DC0AB3DB5A003C20C5 /* ControlToolBar.cpp */; };
 		2897F6F10AB3DB5A003C20C5 /* EditToolBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2897F6DE0AB3DB5A003C20C5 /* EditToolBar.cpp */; };
@@ -1040,6 +1071,40 @@
 		28A96DC10E28642200F3CE01 /* mfmidi.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F3A3FF0E28289500729866 /* mfmidi.h */; };
 		28A96DC20E28642300F3CE01 /* strparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F3A4000E28289500729866 /* strparse.cpp */; };
 		28A96DC30E28642300F3CE01 /* strparse.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F3A4010E28289500729866 /* strparse.h */; };
+		28AA28CD0F267F98008AED9E /* bug.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28330F267A6E008AED9E /* bug.lsp */; };
+		28AA28CE0F267F98008AED9E /* dspprims.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28340F267A6E008AED9E /* dspprims.lsp */; };
+		28AA28CF0F267F98008AED9E /* evalenv.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28350F267A6E008AED9E /* evalenv.lsp */; };
+		28AA28D00F267F98008AED9E /* follow.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28360F267A6E008AED9E /* follow.lsp */; };
+		28AA28D10F267F98008AED9E /* init.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28370F267A6E008AED9E /* init.lsp */; };
+		28AA28D20F267F98008AED9E /* misc.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28380F267A6E008AED9E /* misc.lsp */; };
+		28AA28D30F267F98008AED9E /* nyinit.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28390F267A6E008AED9E /* nyinit.lsp */; };
+		28AA28D40F267F98008AED9E /* nyqmisc.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA283A0F267A6E008AED9E /* nyqmisc.lsp */; };
+		28AA28D50F267F98008AED9E /* nyquist.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA283B0F267A6E008AED9E /* nyquist.lsp */; };
+		28AA28D60F267F98008AED9E /* printrec.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA283C0F267A6E008AED9E /* printrec.lsp */; };
+		28AA28D70F267F98008AED9E /* profile.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA283D0F267A6E008AED9E /* profile.lsp */; };
+		28AA28D80F267F98008AED9E /* seq.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA283E0F267A6E008AED9E /* seq.lsp */; };
+		28AA28D90F267F98008AED9E /* seqfnint.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA283F0F267A6E008AED9E /* seqfnint.lsp */; };
+		28AA28DA0F267F98008AED9E /* seqmidi.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28400F267A6E008AED9E /* seqmidi.lsp */; };
+		28AA28DB0F267F98008AED9E /* sndfnint.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28410F267A6E008AED9E /* sndfnint.lsp */; };
+		28AA28DC0F267F98008AED9E /* system.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28420F267A6E008AED9E /* system.lsp */; };
+		28AA28DD0F267F98008AED9E /* test.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28430F267A6E008AED9E /* test.lsp */; };
+		28AA28DE0F267F98008AED9E /* xlinit.lsp in Copy Nyquist Files */ = {isa = PBXBuildFile; fileRef = 28AA28440F267A6E008AED9E /* xlinit.lsp */; };
+		28AA28E00F267FD2008AED9E /* analyze.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28120F267A2D008AED9E /* analyze.ny */; };
+		28AA28E10F267FD2008AED9E /* beat.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28130F267A2D008AED9E /* beat.ny */; };
+		28AA28E20F267FD2008AED9E /* clicktrack.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28140F267A2D008AED9E /* clicktrack.ny */; };
+		28AA28E30F267FD2008AED9E /* clipfix.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28150F267A2D008AED9E /* clipfix.ny */; };
+		28AA28E40F267FD2008AED9E /* crossfadein.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28160F267A2D008AED9E /* crossfadein.ny */; };
+		28AA28E50F267FD2008AED9E /* crossfadeout.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28170F267A2D008AED9E /* crossfadeout.ny */; };
+		28AA28E60F267FD2008AED9E /* delay.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28180F267A2D008AED9E /* delay.ny */; };
+		28AA28E70F267FD2008AED9E /* equalabel.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28190F267A2D008AED9E /* equalabel.ny */; };
+		28AA28E80F267FD2008AED9E /* highpass.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA281A0F267A2D008AED9E /* highpass.ny */; };
+		28AA28E90F267FD2008AED9E /* lowpass.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA281B0F267A2D008AED9E /* lowpass.ny */; };
+		28AA28EA0F267FD2008AED9E /* pluck.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA281C0F267A2D008AED9E /* pluck.ny */; };
+		28AA28EB0F267FD2008AED9E /* rissetdrum.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA281D0F267A2D008AED9E /* rissetdrum.ny */; };
+		28AA28EC0F267FD2008AED9E /* SilenceMarker.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA281E0F267A2D008AED9E /* SilenceMarker.ny */; };
+		28AA28ED0F267FD2008AED9E /* tremolo.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA281F0F267A2D008AED9E /* tremolo.ny */; };
+		28AA28EE0F267FD2008AED9E /* vocalremover.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28200F267A2D008AED9E /* vocalremover.ny */; };
+		28AA28EF0F267FD2008AED9E /* vocoder.ny in Copy Plug-in Files */ = {isa = PBXBuildFile; fileRef = 28AA28210F267A2D008AED9E /* vocoder.ny */; };
 		28B6ED8F0DE3D1B50046F0F3 /* LoadModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28B6ED8D0DE3D1B50046F0F3 /* LoadModules.cpp */; };
 		28D0255B0AFDA53B0035F843 /* alpasscv.c in Sources */ = {isa = PBXBuildFile; fileRef = 28D025570AFDA53B0035F843 /* alpasscv.c */; };
 		28D0255C0AFDA53B0035F843 /* alpasscv.h in Headers */ = {isa = PBXBuildFile; fileRef = 28D025580AFDA53B0035F843 /* alpasscv.h */; };
@@ -1133,10 +1198,54 @@
 		28FE4A080ABF4E960056F5C4 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FE4A060ABF4E960056F5C4 /* mmx_optimized.cpp */; };
 		28FE4A090ABF4E960056F5C4 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FE4A070ABF4E960056F5C4 /* sse_optimized.cpp */; };
 		28FE4A3A0ABF58360056F5C4 /* soundtouch_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28FE4A390ABF58360056F5C4 /* soundtouch_config.h */; };
+		ED2706FF0EF9C47E007D4FFD /* sbsms.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2706FE0EF9C47E007D4FFD /* sbsms.h */; };
+		ED2707240EF9C51D007D4FFD /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707020EF9C51D007D4FFD /* audio.cpp */; };
+		ED2707250EF9C51D007D4FFD /* audio.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707030EF9C51D007D4FFD /* audio.h */; };
+		ED2707260EF9C51D007D4FFD /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707040EF9C51D007D4FFD /* buffer.cpp */; };
+		ED2707270EF9C51D007D4FFD /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707050EF9C51D007D4FFD /* buffer.h */; };
+		ED2707280EF9C51D007D4FFD /* defs.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707060EF9C51D007D4FFD /* defs.h */; };
+		ED2707290EF9C51D007D4FFD /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707070EF9C51D007D4FFD /* fft.cpp */; };
+		ED27072A0EF9C51D007D4FFD /* fft.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707080EF9C51D007D4FFD /* fft.h */; };
+		ED27072B0EF9C51D007D4FFD /* grain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707090EF9C51D007D4FFD /* grain.cpp */; };
+		ED27072C0EF9C51D007D4FFD /* grain.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070A0EF9C51D007D4FFD /* grain.h */; };
+		ED27072D0EF9C51D007D4FFD /* peak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070B0EF9C51D007D4FFD /* peak.cpp */; };
+		ED27072E0EF9C51D007D4FFD /* peak.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070C0EF9C51D007D4FFD /* peak.h */; };
+		ED27072F0EF9C51D007D4FFD /* pitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070D0EF9C51D007D4FFD /* pitch.cpp */; };
+		ED2707300EF9C51D007D4FFD /* real.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070E0EF9C51D007D4FFD /* real.h */; };
+		ED2707310EF9C51D007D4FFD /* resample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070F0EF9C51D007D4FFD /* resample.cpp */; };
+		ED2707320EF9C51D007D4FFD /* sbsms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707100EF9C51D007D4FFD /* sbsms.cpp */; };
+		ED2707330EF9C51D007D4FFD /* sincCoeffs.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707110EF9C51D007D4FFD /* sincCoeffs.h */; };
+		ED2707340EF9C51D007D4FFD /* sms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707120EF9C51D007D4FFD /* sms.cpp */; };
+		ED2707350EF9C51D007D4FFD /* sms.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707130EF9C51D007D4FFD /* sms.h */; };
+		ED2707360EF9C51D007D4FFD /* subband.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707140EF9C51D007D4FFD /* subband.cpp */; };
+		ED2707370EF9C51D007D4FFD /* subband.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707150EF9C51D007D4FFD /* subband.h */; };
+		ED2707380EF9C51D007D4FFD /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707160EF9C51D007D4FFD /* track.cpp */; };
+		ED2707390EF9C51D007D4FFD /* track.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707170EF9C51D007D4FFD /* track.h */; };
+		ED27073A0EF9C51D007D4FFD /* trackpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707180EF9C51D007D4FFD /* trackpoint.cpp */; };
+		ED27073B0EF9C51D007D4FFD /* trackpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707190EF9C51D007D4FFD /* trackpoint.h */; };
+		ED27073C0EF9C51D007D4FFD /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27071A0EF9C51D007D4FFD /* utils.cpp */; };
+		ED27073D0EF9C51D007D4FFD /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27071B0EF9C51D007D4FFD /* utils.h */; };
+		ED2707460EF9C550007D4FFD /* liblibsbsms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2706F40EF9C3C6007D4FFD /* liblibsbsms.a */; };
+		ED2707500EF9C64F007D4FFD /* SBSMSEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27074B0EF9C64F007D4FFD /* SBSMSEffect.cpp */; };
+		ED2707510EF9C64F007D4FFD /* TimeScale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27074D0EF9C64F007D4FFD /* TimeScale.cpp */; };
 		ED3D7FF00DF73889000F43E3 /* EffectCategory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED3D7FEC0DF73889000F43E3 /* EffectCategory.cpp */; };
 		ED3D7FF10DF73889000F43E3 /* EffectManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED3D7FEE0DF73889000F43E3 /* EffectManager.cpp */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXBuildRule section */
+		286D31370F264C38004E6E4A /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			filePatterns = "*.po";
+			fileType = pattern.proxy;
+			isEditable = 1;
+			outputFiles = (
+				"$(TARGET_BUILD_DIR)/Languages/$(INPUT_FILE_BASE)/audacity.mo",
+			);
+			script = "OF=\"${TARGET_BUILD_DIR}/Languages/${INPUT_FILE_BASE}/audacity.mo\"\nif [ -n \"`which msgfmt`\" ]\nthen\n   msgfmt -v -o \"${OF}\" \"${INPUT_FILE_PATH}\"\nelse\n   echo \"msgfmt not available\"\n   touch \"${OF}\"\nfi";
+		};
+/* End PBXBuildRule section */
+
 /* Begin PBXContainerItemProxy section */
 		17072E930988C35B008541CC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -1257,41 +1366,6 @@
 			remoteGlobalIDString = 28501EAF0CEED1F00029ABAA;
 			remoteInfo = libvamp;
 		};
-		2862D7990E25E23B0014D9BB /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1790ABE309883346008A330A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 287BD9950E25DF2800CB4467;
-			remoteInfo = slv2;
-		};
-		2862D79B0E25E23B0014D9BB /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1790ABE309883346008A330A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 287BD9680E25DE6800CB4467;
-			remoteInfo = liblrdf;
-		};
-		287BD8B50E25DAC400CB4467 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1790ABE309883346008A330A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 287BD8A60E25DA6500CB4467;
-			remoteInfo = librdf;
-		};
-		287BD8B70E25DAC400CB4467 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1790ABE309883346008A330A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 287BD89D0E25DA5500CB4467;
-			remoteInfo = rasqal;
-		};
-		287BD8B90E25DAC400CB4467 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1790ABE309883346008A330A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 287BD8870E25DA3700CB4467;
-			remoteInfo = raptor;
-		};
 		28E237260E515E1300281398 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 1790ABE309883346008A330A /* Project object */;
@@ -1306,8 +1380,72 @@
 			remoteGlobalIDString = 28E67F510A3A160D0021D89F;
 			remoteInfo = "portaudio-v19";
 		};
+		ED2707470EF9C55A007D4FFD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1790ABE309883346008A330A /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = ED2706F30EF9C3C6007D4FFD;
+			remoteInfo = libsbsms;
+		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		28AA28CA0F267E3E008AED9E /* Copy Nyquist Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = ../nyquist;
+			dstSubfolderSpec = 1;
+			files = (
+				28AA28CD0F267F98008AED9E /* bug.lsp in Copy Nyquist Files */,
+				28AA28CE0F267F98008AED9E /* dspprims.lsp in Copy Nyquist Files */,
+				28AA28CF0F267F98008AED9E /* evalenv.lsp in Copy Nyquist Files */,
+				28AA28D00F267F98008AED9E /* follow.lsp in Copy Nyquist Files */,
+				28AA28D10F267F98008AED9E /* init.lsp in Copy Nyquist Files */,
+				28AA28D20F267F98008AED9E /* misc.lsp in Copy Nyquist Files */,
+				28AA28D30F267F98008AED9E /* nyinit.lsp in Copy Nyquist Files */,
+				28AA28D40F267F98008AED9E /* nyqmisc.lsp in Copy Nyquist Files */,
+				28AA28D50F267F98008AED9E /* nyquist.lsp in Copy Nyquist Files */,
+				28AA28D60F267F98008AED9E /* printrec.lsp in Copy Nyquist Files */,
+				28AA28D70F267F98008AED9E /* profile.lsp in Copy Nyquist Files */,
+				28AA28D80F267F98008AED9E /* seq.lsp in Copy Nyquist Files */,
+				28AA28D90F267F98008AED9E /* seqfnint.lsp in Copy Nyquist Files */,
+				28AA28DA0F267F98008AED9E /* seqmidi.lsp in Copy Nyquist Files */,
+				28AA28DB0F267F98008AED9E /* sndfnint.lsp in Copy Nyquist Files */,
+				28AA28DC0F267F98008AED9E /* system.lsp in Copy Nyquist Files */,
+				28AA28DD0F267F98008AED9E /* test.lsp in Copy Nyquist Files */,
+				28AA28DE0F267F98008AED9E /* xlinit.lsp in Copy Nyquist Files */,
+			);
+			name = "Copy Nyquist Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		28AA28F00F267FF0008AED9E /* Copy Plug-in Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "../plug-ins";
+			dstSubfolderSpec = 1;
+			files = (
+				28AA28E00F267FD2008AED9E /* analyze.ny in Copy Plug-in Files */,
+				28AA28E10F267FD2008AED9E /* beat.ny in Copy Plug-in Files */,
+				28AA28E20F267FD2008AED9E /* clicktrack.ny in Copy Plug-in Files */,
+				28AA28E30F267FD2008AED9E /* clipfix.ny in Copy Plug-in Files */,
+				28AA28E40F267FD2008AED9E /* crossfadein.ny in Copy Plug-in Files */,
+				28AA28E50F267FD2008AED9E /* crossfadeout.ny in Copy Plug-in Files */,
+				28AA28E60F267FD2008AED9E /* delay.ny in Copy Plug-in Files */,
+				28AA28E70F267FD2008AED9E /* equalabel.ny in Copy Plug-in Files */,
+				28AA28E80F267FD2008AED9E /* highpass.ny in Copy Plug-in Files */,
+				28AA28E90F267FD2008AED9E /* lowpass.ny in Copy Plug-in Files */,
+				28AA28EA0F267FD2008AED9E /* pluck.ny in Copy Plug-in Files */,
+				28AA28EB0F267FD2008AED9E /* rissetdrum.ny in Copy Plug-in Files */,
+				28AA28EC0F267FD2008AED9E /* SilenceMarker.ny in Copy Plug-in Files */,
+				28AA28ED0F267FD2008AED9E /* tremolo.ny in Copy Plug-in Files */,
+				28AA28EE0F267FD2008AED9E /* vocalremover.ny in Copy Plug-in Files */,
+				28AA28EF0F267FD2008AED9E /* vocoder.ny in Copy Plug-in Files */,
+			);
+			name = "Copy Plug-in Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		17048267098C0F5F00824C66 /* mad.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = mad.h; sourceTree = "<group>"; };
 		17072F580988D6A9008541CC /* xmlparse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmlparse.c; sourceTree = "<group>"; };
@@ -2153,10 +2291,8 @@
 		186CCE710E51F48500659159 /* ODDecodeTask.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ODDecodeTask.h; path = ondemand/ODDecodeTask.h; sourceTree = "<group>"; };
 		186CCEA20E523C8D00659159 /* Profiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Profiler.h; sourceTree = "<group>"; };
 		186CCEA30E523C8E00659159 /* Profiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Profiler.cpp; sourceTree = "<group>"; };
-		280196AF0D98171F00BFEECF /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = "libvamp/vamp-sdk/Plugin.h"; sourceTree = "<group>"; };
-		280196B00D98171F00BFEECF /* PluginBase.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginBase.h; path = "libvamp/vamp-sdk/PluginBase.h"; sourceTree = "<group>"; };
-		280196B30D98174400BFEECF /* PluginBufferingAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginBufferingAdapter.cpp; path = "libvamp/vamp-sdk/hostext/PluginBufferingAdapter.cpp"; sourceTree = "<group>"; };
-		280196B40D98174400BFEECF /* PluginBufferingAdapter.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginBufferingAdapter.h; path = "libvamp/vamp-sdk/hostext/PluginBufferingAdapter.h"; sourceTree = "<group>"; };
+		18D8314C0ED0F56200FD870D /* Contrast.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Contrast.cpp; sourceTree = "<group>"; };
+		18D8314D0ED0F56200FD870D /* Contrast.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Contrast.h; sourceTree = "<group>"; };
 		2801A6430BF9268700648258 /* ImportQT.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = ImportQT.cpp; sourceTree = "<group>"; };
 		2801A6440BF9268700648258 /* ImportQT.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ImportQT.h; sourceTree = "<group>"; };
 		2801A6450BF9268700648258 /* ImportQTWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = ImportQTWrapper.cpp; sourceTree = "<group>"; };
@@ -2261,26 +2397,22 @@
 		28501E9F0CEECEF80029ABAA /* SplashDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = SplashDialog.cpp; sourceTree = "<group>"; };
 		28501EA00CEECEF80029ABAA /* SplashDialog.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SplashDialog.h; sourceTree = "<group>"; };
 		28501F060CEED1F00029ABAA /* libvamp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvamp.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		28501F090CEED2980029ABAA /* PluginHostAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginHostAdapter.cpp; path = "libvamp/vamp-sdk/PluginHostAdapter.cpp"; sourceTree = "<group>"; };
-		28501F0A0CEED2980029ABAA /* PluginHostAdapter.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginHostAdapter.h; path = "libvamp/vamp-sdk/PluginHostAdapter.h"; sourceTree = "<group>"; };
-		28501F0F0CEED2C50029ABAA /* PluginChannelAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginChannelAdapter.cpp; path = "libvamp/vamp-sdk/hostext/PluginChannelAdapter.cpp"; sourceTree = "<group>"; };
-		28501F100CEED2C50029ABAA /* PluginChannelAdapter.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginChannelAdapter.h; path = "libvamp/vamp-sdk/hostext/PluginChannelAdapter.h"; sourceTree = "<group>"; };
-		28501F110CEED2C50029ABAA /* PluginInputDomainAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginInputDomainAdapter.cpp; path = "libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.cpp"; sourceTree = "<group>"; };
-		28501F120CEED2C50029ABAA /* PluginInputDomainAdapter.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginInputDomainAdapter.h; path = "libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.h"; sourceTree = "<group>"; };
-		28501F130CEED2C50029ABAA /* PluginLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginLoader.cpp; path = "libvamp/vamp-sdk/hostext/PluginLoader.cpp"; sourceTree = "<group>"; };
-		28501F140CEED2C50029ABAA /* PluginLoader.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginLoader.h; path = "libvamp/vamp-sdk/hostext/PluginLoader.h"; sourceTree = "<group>"; };
-		28501F150CEED2C50029ABAA /* PluginWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginWrapper.cpp; path = "libvamp/vamp-sdk/hostext/PluginWrapper.cpp"; sourceTree = "<group>"; };
-		28501F160CEED2C50029ABAA /* PluginWrapper.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginWrapper.h; path = "libvamp/vamp-sdk/hostext/PluginWrapper.h"; sourceTree = "<group>"; };
-		28501F470CEED9560029ABAA /* PluginAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginAdapter.cpp; path = "libvamp/vamp-sdk/PluginAdapter.cpp"; sourceTree = "<group>"; };
-		28501F480CEED9560029ABAA /* PluginAdapter.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = PluginAdapter.h; path = "libvamp/vamp-sdk/PluginAdapter.h"; sourceTree = "<group>"; };
-		28501F490CEED9560029ABAA /* RealTime.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = RealTime.cpp; path = "libvamp/vamp-sdk/RealTime.cpp"; sourceTree = "<group>"; };
-		28501F4A0CEED9560029ABAA /* RealTime.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = RealTime.h; path = "libvamp/vamp-sdk/RealTime.h"; sourceTree = "<group>"; };
 		28530C480DF2105200555C94 /* HtmlWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = HtmlWindow.cpp; sourceTree = "<group>"; };
 		28530C490DF2105200555C94 /* HtmlWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = HtmlWindow.h; sourceTree = "<group>"; };
 		28530C4A0DF2105200555C94 /* ProgressDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = ProgressDialog.cpp; sourceTree = "<group>"; };
 		28530C4B0DF2105200555C94 /* ProgressDialog.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ProgressDialog.h; sourceTree = "<group>"; };
 		28560C8F0A75E40F00A3429E /* AutoRecovery.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = AutoRecovery.cpp; sourceTree = "<group>"; };
 		28560C900A75E40F00A3429E /* AutoRecovery.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AutoRecovery.h; sourceTree = "<group>"; };
+		285D3CAC0F09FC8F007883FC /* PluginBufferingAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginBufferingAdapter.cpp; path = "libvamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp"; sourceTree = "<group>"; };
+		285D3CAD0F09FC8F007883FC /* PluginChannelAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginChannelAdapter.cpp; path = "libvamp/src/vamp-hostsdk/PluginChannelAdapter.cpp"; sourceTree = "<group>"; };
+		285D3CAE0F09FC8F007883FC /* PluginHostAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginHostAdapter.cpp; path = "libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp"; sourceTree = "<group>"; };
+		285D3CAF0F09FC8F007883FC /* PluginInputDomainAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginInputDomainAdapter.cpp; path = "libvamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp"; sourceTree = "<group>"; };
+		285D3CB00F09FC8F007883FC /* PluginLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginLoader.cpp; path = "libvamp/src/vamp-hostsdk/PluginLoader.cpp"; sourceTree = "<group>"; };
+		285D3CB10F09FC8F007883FC /* PluginSummarisingAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginSummarisingAdapter.cpp; path = "libvamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp"; sourceTree = "<group>"; };
+		285D3CB20F09FC8F007883FC /* PluginWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginWrapper.cpp; path = "libvamp/src/vamp-hostsdk/PluginWrapper.cpp"; sourceTree = "<group>"; };
+		285D3CB30F09FC8F007883FC /* RealTime.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = RealTime.cpp; path = "libvamp/src/vamp-hostsdk/RealTime.cpp"; sourceTree = "<group>"; };
+		285D3CBC0F09FCB2007883FC /* PluginAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = PluginAdapter.cpp; path = "libvamp/src/vamp-sdk/PluginAdapter.cpp"; sourceTree = "<group>"; };
+		285D3CBD0F09FCB2007883FC /* RealTime.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = RealTime.cpp; path = "libvamp/src/vamp-sdk/RealTime.cpp"; sourceTree = "<group>"; };
 		285DE1F80BF03C7800A20DF0 /* Screenshot.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = Screenshot.cpp; sourceTree = "<group>"; };
 		285DE1F90BF03C7800A20DF0 /* Screenshot.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = Screenshot.h; sourceTree = "<group>"; };
 		2860BA200E0F0D8600A13878 /* SoundActivatedRecord.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = SoundActivatedRecord.cpp; sourceTree = "<group>"; };
@@ -2290,6 +2422,52 @@
 		2860BA260E0F0DD800A13878 /* ExportFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = ExportFFmpeg.cpp; sourceTree = "<group>"; };
 		2860BA270E0F0DD800A13878 /* ExportFFmpeg.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ExportFFmpeg.h; sourceTree = "<group>"; };
 		2862D7910E25E1D90014D9BB /* config.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = config.h; path = slv2/config/config.h; sourceTree = "<group>"; };
+		286D30AD0F264BB7004E6E4A /* af.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = af.po; path = ../locale/af.po; sourceTree = SOURCE_ROOT; };
+		286D30AE0F264BB7004E6E4A /* ar.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ar.po; path = ../locale/ar.po; sourceTree = SOURCE_ROOT; };
+		286D30AF0F264BB7004E6E4A /* bg.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = bg.po; path = ../locale/bg.po; sourceTree = SOURCE_ROOT; };
+		286D30B00F264BB7004E6E4A /* bn.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = bn.po; path = ../locale/bn.po; sourceTree = SOURCE_ROOT; };
+		286D30B10F264BB7004E6E4A /* bs.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = bs.po; path = ../locale/bs.po; sourceTree = SOURCE_ROOT; };
+		286D30B20F264BB7004E6E4A /* ca.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ca.po; path = ../locale/ca.po; sourceTree = SOURCE_ROOT; };
+		286D30B30F264BB7004E6E4A /* ca at valencia.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = "ca at valencia.po"; path = "../locale/ca at valencia.po"; sourceTree = SOURCE_ROOT; };
+		286D30B40F264BB7004E6E4A /* cs.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = cs.po; path = ../locale/cs.po; sourceTree = SOURCE_ROOT; };
+		286D30B50F264BB7004E6E4A /* cy.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = cy.po; path = ../locale/cy.po; sourceTree = SOURCE_ROOT; };
+		286D30B60F264BB7004E6E4A /* da.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = da.po; path = ../locale/da.po; sourceTree = SOURCE_ROOT; };
+		286D30B70F264BB7004E6E4A /* de.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = de.po; path = ../locale/de.po; sourceTree = SOURCE_ROOT; };
+		286D30B80F264BB7004E6E4A /* el.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = el.po; path = ../locale/el.po; sourceTree = SOURCE_ROOT; };
+		286D30B90F264BB7004E6E4A /* es.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = es.po; path = ../locale/es.po; sourceTree = SOURCE_ROOT; };
+		286D30BA0F264BB7004E6E4A /* eu.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = eu.po; path = ../locale/eu.po; sourceTree = SOURCE_ROOT; };
+		286D30BB0F264BB7004E6E4A /* fa.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = fa.po; path = ../locale/fa.po; sourceTree = SOURCE_ROOT; };
+		286D30BC0F264BB7004E6E4A /* fi.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = fi.po; path = ../locale/fi.po; sourceTree = SOURCE_ROOT; };
+		286D30BD0F264BB7004E6E4A /* fr.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = fr.po; path = ../locale/fr.po; sourceTree = SOURCE_ROOT; };
+		286D30BE0F264BB7004E6E4A /* ga.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ga.po; path = ../locale/ga.po; sourceTree = SOURCE_ROOT; };
+		286D30BF0F264BB7004E6E4A /* gl.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = gl.po; path = ../locale/gl.po; sourceTree = SOURCE_ROOT; };
+		286D30C00F264BB7004E6E4A /* he.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = he.po; path = ../locale/he.po; sourceTree = SOURCE_ROOT; };
+		286D30C10F264BB7004E6E4A /* hu.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = hu.po; path = ../locale/hu.po; sourceTree = SOURCE_ROOT; };
+		286D30C20F264BB7004E6E4A /* id.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = id.po; path = ../locale/id.po; sourceTree = SOURCE_ROOT; };
+		286D30C30F264BB7004E6E4A /* it.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = it.po; path = ../locale/it.po; sourceTree = SOURCE_ROOT; };
+		286D30C40F264BB7004E6E4A /* ja.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ja.po; path = ../locale/ja.po; sourceTree = SOURCE_ROOT; };
+		286D30C50F264BB7004E6E4A /* ka.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ka.po; path = ../locale/ka.po; sourceTree = SOURCE_ROOT; };
+		286D30C60F264BB7004E6E4A /* km.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = km.po; path = ../locale/km.po; sourceTree = SOURCE_ROOT; };
+		286D30C70F264BB7004E6E4A /* ko.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ko.po; path = ../locale/ko.po; sourceTree = SOURCE_ROOT; };
+		286D30C80F264BB7004E6E4A /* lt.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = lt.po; path = ../locale/lt.po; sourceTree = SOURCE_ROOT; };
+		286D30C90F264BB7004E6E4A /* mk.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = mk.po; path = ../locale/mk.po; sourceTree = SOURCE_ROOT; };
+		286D30CA0F264BB7004E6E4A /* nb.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = nb.po; path = ../locale/nb.po; sourceTree = SOURCE_ROOT; };
+		286D30CB0F264BB7004E6E4A /* nl.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = nl.po; path = ../locale/nl.po; sourceTree = SOURCE_ROOT; };
+		286D30CC0F264BB7004E6E4A /* oc.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = oc.po; path = ../locale/oc.po; sourceTree = SOURCE_ROOT; };
+		286D30CD0F264BB7004E6E4A /* pl.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = pl.po; path = ../locale/pl.po; sourceTree = SOURCE_ROOT; };
+		286D30CE0F264BB7004E6E4A /* pt.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = pt.po; path = ../locale/pt.po; sourceTree = SOURCE_ROOT; };
+		286D30CF0F264BB7004E6E4A /* pt_BR.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = pt_BR.po; path = ../locale/pt_BR.po; sourceTree = SOURCE_ROOT; };
+		286D30D00F264BB7004E6E4A /* ro.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ro.po; path = ../locale/ro.po; sourceTree = SOURCE_ROOT; };
+		286D30D10F264BB7004E6E4A /* ru.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = ru.po; path = ../locale/ru.po; sourceTree = SOURCE_ROOT; };
+		286D30D20F264BB7004E6E4A /* sk.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sk.po; path = ../locale/sk.po; sourceTree = SOURCE_ROOT; };
+		286D30D30F264BB7004E6E4A /* sl.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sl.po; path = ../locale/sl.po; sourceTree = SOURCE_ROOT; };
+		286D30D40F264BB7004E6E4A /* sv.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = sv.po; path = ../locale/sv.po; sourceTree = SOURCE_ROOT; };
+		286D30D50F264BB7004E6E4A /* tg.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = tg.po; path = ../locale/tg.po; sourceTree = SOURCE_ROOT; };
+		286D30D60F264BB7004E6E4A /* tr.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = tr.po; path = ../locale/tr.po; sourceTree = SOURCE_ROOT; };
+		286D30D70F264BB7004E6E4A /* uk.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = uk.po; path = ../locale/uk.po; sourceTree = SOURCE_ROOT; };
+		286D30D80F264BB7004E6E4A /* vi.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = vi.po; path = ../locale/vi.po; sourceTree = SOURCE_ROOT; };
+		286D30D90F264BB7004E6E4A /* zh.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = zh.po; path = ../locale/zh.po; sourceTree = SOURCE_ROOT; };
+		286D30DA0F264BB7004E6E4A /* zh_TW.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = zh_TW.po; path = ../locale/zh_TW.po; sourceTree = SOURCE_ROOT; };
 		287BD6D50E25D8AE00CB4467 /* rdf_avltree.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = rdf_avltree.c; path = redland/librdf/rdf_avltree.c; sourceTree = "<group>"; };
 		287BD6D60E25D8AE00CB4467 /* rdf_avltree_internal.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = rdf_avltree_internal.h; path = redland/librdf/rdf_avltree_internal.h; sourceTree = "<group>"; };
 		287BD6D70E25D8AE00CB4467 /* rdf_concepts.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = rdf_concepts.c; path = redland/librdf/rdf_concepts.c; sourceTree = "<group>"; };
@@ -2484,8 +2662,6 @@
 		288052BC0DEA72F300671EA4 /* NonGuiThread.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; name = NonGuiThread.cpp; path = "lib-widget-extra/NonGuiThread.cpp"; sourceTree = "<group>"; };
 		288217790A35D8730029AF41 /* ShuttlePrefs.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = ShuttlePrefs.cpp; sourceTree = "<group>"; };
 		2882177A0A35D8730029AF41 /* ShuttlePrefs.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ShuttlePrefs.h; sourceTree = "<group>"; };
-		2882178A0A35D90C0029AF41 /* treebook.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = treebook.cpp; sourceTree = "<group>"; };
-		2882178B0A35D90C0029AF41 /* treebook.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = treebook.h; sourceTree = "<group>"; };
 		2891B2850C531D2C0044FBE3 /* FindClipping.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = FindClipping.cpp; sourceTree = "<group>"; };
 		2891B2860C531D2C0044FBE3 /* FindClipping.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = FindClipping.h; sourceTree = "<group>"; };
 		2897F6DC0AB3DB5A003C20C5 /* ControlToolBar.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = ControlToolBar.cpp; sourceTree = "<group>"; };
@@ -2516,6 +2692,40 @@
 		28A520520C12BE0300BF6811 /* pa_debugprint.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = pa_debugprint.h; sourceTree = "<group>"; };
 		28A520530C12BE0300BF6811 /* pa_ringbuffer.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = pa_ringbuffer.c; sourceTree = "<group>"; };
 		28A520540C12BE0300BF6811 /* pa_ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = pa_ringbuffer.h; sourceTree = "<group>"; };
+		28AA28120F267A2D008AED9E /* analyze.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = analyze.ny; path = "../plug-ins/analyze.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28130F267A2D008AED9E /* beat.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = beat.ny; path = "../plug-ins/beat.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28140F267A2D008AED9E /* clicktrack.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = clicktrack.ny; path = "../plug-ins/clicktrack.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28150F267A2D008AED9E /* clipfix.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = clipfix.ny; path = "../plug-ins/clipfix.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28160F267A2D008AED9E /* crossfadein.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = crossfadein.ny; path = "../plug-ins/crossfadein.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28170F267A2D008AED9E /* crossfadeout.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = crossfadeout.ny; path = "../plug-ins/crossfadeout.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28180F267A2D008AED9E /* delay.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = delay.ny; path = "../plug-ins/delay.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28190F267A2D008AED9E /* equalabel.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = equalabel.ny; path = "../plug-ins/equalabel.ny"; sourceTree = SOURCE_ROOT; };
+		28AA281A0F267A2D008AED9E /* highpass.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = highpass.ny; path = "../plug-ins/highpass.ny"; sourceTree = SOURCE_ROOT; };
+		28AA281B0F267A2D008AED9E /* lowpass.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = lowpass.ny; path = "../plug-ins/lowpass.ny"; sourceTree = SOURCE_ROOT; };
+		28AA281C0F267A2D008AED9E /* pluck.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = pluck.ny; path = "../plug-ins/pluck.ny"; sourceTree = SOURCE_ROOT; };
+		28AA281D0F267A2D008AED9E /* rissetdrum.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = rissetdrum.ny; path = "../plug-ins/rissetdrum.ny"; sourceTree = SOURCE_ROOT; };
+		28AA281E0F267A2D008AED9E /* SilenceMarker.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = SilenceMarker.ny; path = "../plug-ins/SilenceMarker.ny"; sourceTree = SOURCE_ROOT; };
+		28AA281F0F267A2D008AED9E /* tremolo.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = tremolo.ny; path = "../plug-ins/tremolo.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28200F267A2D008AED9E /* vocalremover.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = vocalremover.ny; path = "../plug-ins/vocalremover.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28210F267A2D008AED9E /* vocoder.ny */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = vocoder.ny; path = "../plug-ins/vocoder.ny"; sourceTree = SOURCE_ROOT; };
+		28AA28330F267A6E008AED9E /* bug.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = bug.lsp; path = ../nyquist/bug.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28340F267A6E008AED9E /* dspprims.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = dspprims.lsp; path = ../nyquist/dspprims.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28350F267A6E008AED9E /* evalenv.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = evalenv.lsp; path = ../nyquist/evalenv.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28360F267A6E008AED9E /* follow.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = follow.lsp; path = ../nyquist/follow.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28370F267A6E008AED9E /* init.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = init.lsp; path = ../nyquist/init.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28380F267A6E008AED9E /* misc.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = misc.lsp; path = ../nyquist/misc.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28390F267A6E008AED9E /* nyinit.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = nyinit.lsp; path = ../nyquist/nyinit.lsp; sourceTree = SOURCE_ROOT; };
+		28AA283A0F267A6E008AED9E /* nyqmisc.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = nyqmisc.lsp; path = ../nyquist/nyqmisc.lsp; sourceTree = SOURCE_ROOT; };
+		28AA283B0F267A6E008AED9E /* nyquist.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = nyquist.lsp; path = ../nyquist/nyquist.lsp; sourceTree = SOURCE_ROOT; };
+		28AA283C0F267A6E008AED9E /* printrec.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = printrec.lsp; path = ../nyquist/printrec.lsp; sourceTree = SOURCE_ROOT; };
+		28AA283D0F267A6E008AED9E /* profile.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = profile.lsp; path = ../nyquist/profile.lsp; sourceTree = SOURCE_ROOT; };
+		28AA283E0F267A6E008AED9E /* seq.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = seq.lsp; path = ../nyquist/seq.lsp; sourceTree = SOURCE_ROOT; };
+		28AA283F0F267A6E008AED9E /* seqfnint.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = seqfnint.lsp; path = ../nyquist/seqfnint.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28400F267A6E008AED9E /* seqmidi.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = seqmidi.lsp; path = ../nyquist/seqmidi.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28410F267A6E008AED9E /* sndfnint.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = sndfnint.lsp; path = ../nyquist/sndfnint.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28420F267A6E008AED9E /* system.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = system.lsp; path = ../nyquist/system.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28430F267A6E008AED9E /* test.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = test.lsp; path = ../nyquist/test.lsp; sourceTree = SOURCE_ROOT; };
+		28AA28440F267A6E008AED9E /* xlinit.lsp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 5; name = xlinit.lsp; path = ../nyquist/xlinit.lsp; sourceTree = SOURCE_ROOT; };
 		28B6ED8D0DE3D1B50046F0F3 /* LoadModules.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = LoadModules.cpp; sourceTree = "<group>"; };
 		28B6ED8E0DE3D1B50046F0F3 /* LoadModules.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = LoadModules.h; sourceTree = "<group>"; };
 		28D025570AFDA53B0035F843 /* alpasscv.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = alpasscv.c; sourceTree = "<group>"; };
@@ -2645,6 +2855,38 @@
 		ED05D1280E50AD5700CC4BD3 /* scorealign-glue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "scorealign-glue.h"; sourceTree = "<group>"; };
 		ED05D1290E50AD5700CC4BD3 /* scorealign.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = scorealign.cpp; sourceTree = "<group>"; };
 		ED05D12A0E50AD5700CC4BD3 /* scorealign.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = scorealign.h; sourceTree = "<group>"; };
+		ED2706F40EF9C3C6007D4FFD /* liblibsbsms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibsbsms.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED2706FE0EF9C47E007D4FFD /* sbsms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sbsms.h; sourceTree = "<group>"; };
+		ED2707020EF9C51D007D4FFD /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audio.cpp; path = sbsms/src/audio.cpp; sourceTree = "<group>"; };
+		ED2707030EF9C51D007D4FFD /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio.h; path = sbsms/src/audio.h; sourceTree = "<group>"; };
+		ED2707040EF9C51D007D4FFD /* buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = buffer.cpp; path = sbsms/src/buffer.cpp; sourceTree = "<group>"; };
+		ED2707050EF9C51D007D4FFD /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = buffer.h; path = sbsms/src/buffer.h; sourceTree = "<group>"; };
+		ED2707060EF9C51D007D4FFD /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = sbsms/src/defs.h; sourceTree = "<group>"; };
+		ED2707070EF9C51D007D4FFD /* fft.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fft.cpp; path = sbsms/src/fft.cpp; sourceTree = "<group>"; };
+		ED2707080EF9C51D007D4FFD /* fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fft.h; path = sbsms/src/fft.h; sourceTree = "<group>"; };
+		ED2707090EF9C51D007D4FFD /* grain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = grain.cpp; path = sbsms/src/grain.cpp; sourceTree = "<group>"; };
+		ED27070A0EF9C51D007D4FFD /* grain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = grain.h; path = sbsms/src/grain.h; sourceTree = "<group>"; };
+		ED27070B0EF9C51D007D4FFD /* peak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = peak.cpp; path = sbsms/src/peak.cpp; sourceTree = "<group>"; };
+		ED27070C0EF9C51D007D4FFD /* peak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = peak.h; path = sbsms/src/peak.h; sourceTree = "<group>"; };
+		ED27070D0EF9C51D007D4FFD /* pitch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pitch.cpp; path = sbsms/src/pitch.cpp; sourceTree = "<group>"; };
+		ED27070E0EF9C51D007D4FFD /* real.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = real.h; path = sbsms/src/real.h; sourceTree = "<group>"; };
+		ED27070F0EF9C51D007D4FFD /* resample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = resample.cpp; path = sbsms/src/resample.cpp; sourceTree = "<group>"; };
+		ED2707100EF9C51D007D4FFD /* sbsms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sbsms.cpp; path = sbsms/src/sbsms.cpp; sourceTree = "<group>"; };
+		ED2707110EF9C51D007D4FFD /* sincCoeffs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sincCoeffs.h; path = sbsms/src/sincCoeffs.h; sourceTree = "<group>"; };
+		ED2707120EF9C51D007D4FFD /* sms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sms.cpp; path = sbsms/src/sms.cpp; sourceTree = "<group>"; };
+		ED2707130EF9C51D007D4FFD /* sms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sms.h; path = sbsms/src/sms.h; sourceTree = "<group>"; };
+		ED2707140EF9C51D007D4FFD /* subband.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = subband.cpp; path = sbsms/src/subband.cpp; sourceTree = "<group>"; };
+		ED2707150EF9C51D007D4FFD /* subband.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = subband.h; path = sbsms/src/subband.h; sourceTree = "<group>"; };
+		ED2707160EF9C51D007D4FFD /* track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = track.cpp; path = sbsms/src/track.cpp; sourceTree = "<group>"; };
+		ED2707170EF9C51D007D4FFD /* track.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = track.h; path = sbsms/src/track.h; sourceTree = "<group>"; };
+		ED2707180EF9C51D007D4FFD /* trackpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = trackpoint.cpp; path = sbsms/src/trackpoint.cpp; sourceTree = "<group>"; };
+		ED2707190EF9C51D007D4FFD /* trackpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = trackpoint.h; path = sbsms/src/trackpoint.h; sourceTree = "<group>"; };
+		ED27071A0EF9C51D007D4FFD /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = sbsms/src/utils.cpp; sourceTree = "<group>"; };
+		ED27071B0EF9C51D007D4FFD /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utils.h; path = sbsms/src/utils.h; sourceTree = "<group>"; };
+		ED27074B0EF9C64F007D4FFD /* SBSMSEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SBSMSEffect.cpp; sourceTree = "<group>"; };
+		ED27074C0EF9C64F007D4FFD /* SBSMSEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBSMSEffect.h; sourceTree = "<group>"; };
+		ED27074D0EF9C64F007D4FFD /* TimeScale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeScale.cpp; sourceTree = "<group>"; };
+		ED27074E0EF9C64F007D4FFD /* TimeScale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeScale.h; sourceTree = "<group>"; };
 		ED3D7FEC0DF73889000F43E3 /* EffectCategory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EffectCategory.cpp; sourceTree = "<group>"; };
 		ED3D7FED0DF73889000F43E3 /* EffectCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EffectCategory.h; sourceTree = "<group>"; };
 		ED3D7FEE0DF73889000F43E3 /* EffectManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EffectManager.cpp; sourceTree = "<group>"; };
@@ -2678,12 +2920,8 @@
 				28E67FF00A3A2B190021D89F /* libportaudio.a in Frameworks */,
 				2840CFA80AEB883500F49FC3 /* libtwolame.a in Frameworks */,
 				28501F330CEED8C70029ABAA /* libvamp.a in Frameworks */,
-				2862D7D20E25E9850014D9BB /* liblrdf.a in Frameworks */,
-				2862D7CF0E25E97E0014D9BB /* libslv2.a in Frameworks */,
-				2862D7CE0E25E97D0014D9BB /* librdf.a in Frameworks */,
-				2862D7CD0E25E97B0014D9BB /* librasqal.a in Frameworks */,
-				2862D7D00E25E97F0014D9BB /* libraptor.a in Frameworks */,
 				28E2373A0E5163A200281398 /* libscorealign.a in Frameworks */,
+				ED2707460EF9C550007D4FFD /* liblibsbsms.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2719,6 +2957,7 @@
 				170737B00988D6AF008541CC /* portmixer */,
 				28F3A3EF0E28280A00729866 /* portsmf */,
 				287BD6C70E25D65B00CB4467 /* redland */,
+				ED2706FA0EF9C436007D4FFD /* sbsms */,
 				287BD9AE0E25DFBB00CB4467 /* slv2 */,
 				170737D30988D6AF008541CC /* soundtouch */,
 				2840CEC70AEB7E9D00F49FC3 /* twolame */,
@@ -3315,7 +3554,10 @@
 				1790AFB109883B6D008A330A /* Products */,
 				287179EE0DF6383000E171DF /* Xcode Settings */,
 				17072F220988D4F4008541CC /* lib-src */,
+				286D30AC0F264B58004E6E4A /* locale */,
 				178CF4FE098953FB0056CE58 /* mac */,
+				28AA28320F267A50008AED9E /* nyquist */,
+				28AA28110F267957008AED9E /* plug-ins */,
 				1790AFC409883BFD008A330A /* src */,
 			);
 			sourceTree = "<group>";
@@ -3348,6 +3590,7 @@
 				287BD8AE0E25DA6500CB4467 /* librdf.a */,
 				287BD9AA0E25DF2800CB4467 /* libslv2.a */,
 				28E237080E515D1D00281398 /* libscorealign.a */,
+				ED2706F40EF9C3C6007D4FFD /* liblibsbsms.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -3355,13 +3598,13 @@
 		1790AFC409883BFD008A330A /* src */ = {
 			isa = PBXGroup;
 			children = (
-				1841B4FD0E00AD3D00F386E9 /* ondemand */,
-				174D9025098C78AF00D5909F /* commands */,
 				1790AFDC09883BFD008A330A /* blockfile */,
+				174D9025098C78AF00D5909F /* commands */,
 				1790AFFD09883BFD008A330A /* effects */,
 				1790B06209883BFD008A330A /* export */,
 				1790B07D09883BFD008A330A /* import */,
 				1790B09209883BFD008A330A /* include */,
+				1841B4FD0E00AD3D00F386E9 /* ondemand */,
 				1790B0B509883BFD008A330A /* prefs */,
 				2897F6DB0AB3DB5A003C20C5 /* toolbars */,
 				1790B0FD09883BFD008A330A /* widgets */,
@@ -3454,6 +3697,8 @@
 				1790B0CD09883BFD008A330A /* Prefs.h */,
 				1790B0CE09883BFD008A330A /* Printing.cpp */,
 				1790B0CF09883BFD008A330A /* Printing.h */,
+				186CCEA30E523C8E00659159 /* Profiler.cpp */,
+				186CCEA20E523C8D00659159 /* Profiler.h */,
 				1790B0D009883BFD008A330A /* Project.cpp */,
 				1790B0D109883BFD008A330A /* Project.h */,
 				1790B0D209883BFD008A330A /* Resample.cpp */,
@@ -3512,8 +3757,6 @@
 				1790B0FC09883BFD008A330A /* WaveTrack.h */,
 				28FC1AF90A47762C00A188AE /* WrappedType.cpp */,
 				28FC1AFA0A47762C00A188AE /* WrappedType.h */,
-				186CCEA20E523C8D00659159 /* Profiler.h */,
-				186CCEA30E523C8E00659159 /* Profiler.cpp */,
 			);
 			name = src;
 			path = ../src;
@@ -3522,14 +3765,14 @@
 		1790AFDC09883BFD008A330A /* blockfile */ = {
 			isa = PBXGroup;
 			children = (
-				186CCE6B0E51F47400659159 /* ODDecodeBlockFile.cpp */,
-				186CCE6C0E51F47400659159 /* ODDecodeBlockFile.h */,
-				1841B50F0E00AD8D00F386E9 /* ODPCMAliasBlockFile.cpp */,
-				1841B5100E00AD8D00F386E9 /* ODPCMAliasBlockFile.h */,
 				1790AFDE09883BFD008A330A /* LegacyAliasBlockFile.cpp */,
 				1790AFDF09883BFD008A330A /* LegacyAliasBlockFile.h */,
 				1790AFE009883BFD008A330A /* LegacyBlockFile.cpp */,
 				1790AFE109883BFD008A330A /* LegacyBlockFile.h */,
+				186CCE6B0E51F47400659159 /* ODDecodeBlockFile.cpp */,
+				186CCE6C0E51F47400659159 /* ODDecodeBlockFile.h */,
+				1841B50F0E00AD8D00F386E9 /* ODPCMAliasBlockFile.cpp */,
+				1841B5100E00AD8D00F386E9 /* ODPCMAliasBlockFile.h */,
 				1790AFE209883BFD008A330A /* PCMAliasBlockFile.cpp */,
 				1790AFE309883BFD008A330A /* PCMAliasBlockFile.h */,
 				1790AFE409883BFD008A330A /* SilentBlockFile.cpp */,
@@ -3566,6 +3809,8 @@
 				1790B01309883BFD008A330A /* ClickRemoval.h */,
 				1790B01409883BFD008A330A /* Compressor.cpp */,
 				1790B01509883BFD008A330A /* Compressor.h */,
+				18D8314C0ED0F56200FD870D /* Contrast.cpp */,
+				18D8314D0ED0F56200FD870D /* Contrast.h */,
 				28D65C740B97E573000E001A /* DtmfGen.cpp */,
 				28D65C750B97E573000E001A /* DtmfGen.h */,
 				1790B01709883BFD008A330A /* Echo.cpp */,
@@ -3602,6 +3847,8 @@
 				1790B03F09883BFD008A330A /* Repeat.h */,
 				1790B04009883BFD008A330A /* Reverse.cpp */,
 				1790B04109883BFD008A330A /* Reverse.h */,
+				ED27074B0EF9C64F007D4FFD /* SBSMSEffect.cpp */,
+				ED27074C0EF9C64F007D4FFD /* SBSMSEffect.h */,
 				1790B04209883BFD008A330A /* Silence.cpp */,
 				1790B04309883BFD008A330A /* Silence.h */,
 				1790B04409883BFD008A330A /* SimpleMono.cpp */,
@@ -3614,6 +3861,8 @@
 				1790B04B09883BFD008A330A /* SpikeCleaner.h */,
 				1790B04C09883BFD008A330A /* StereoToMono.cpp */,
 				1790B04D09883BFD008A330A /* StereoToMono.h */,
+				ED27074D0EF9C64F007D4FFD /* TimeScale.cpp */,
+				ED27074E0EF9C64F007D4FFD /* TimeScale.h */,
 				1790B04E09883BFD008A330A /* ToneGen.cpp */,
 				1790B04F09883BFD008A330A /* ToneGen.h */,
 				1790B05009883BFD008A330A /* TruncSilence.cpp */,
@@ -3663,14 +3912,14 @@
 		1790B06209883BFD008A330A /* export */ = {
 			isa = PBXGroup;
 			children = (
-				28DA07370E4F5CEC003933C5 /* ExportFFmpegDialogs.h */,
-				28DA07380E4F5CEC003933C5 /* ExportFFmpegDialogs.cpp */,
 				1790B06409883BFD008A330A /* Export.cpp */,
 				1790B06509883BFD008A330A /* Export.h */,
 				1790B06609883BFD008A330A /* ExportCL.cpp */,
 				1790B06709883BFD008A330A /* ExportCL.h */,
 				2860BA260E0F0DD800A13878 /* ExportFFmpeg.cpp */,
 				2860BA270E0F0DD800A13878 /* ExportFFmpeg.h */,
+				28DA07380E4F5CEC003933C5 /* ExportFFmpegDialogs.cpp */,
+				28DA07370E4F5CEC003933C5 /* ExportFFmpegDialogs.h */,
 				28E3E6E70A7C14CA00AB1361 /* ExportFLAC.cpp */,
 				28E3E6E60A7C14CA00AB1361 /* ExportFLAC.h */,
 				2840CF840AEB83DB00F49FC3 /* ExportMP2.cpp */,
@@ -3794,8 +4043,6 @@
 				1790B10A09883BFD008A330A /* TimeTextCtrl.h */,
 				1790B10B09883BFD008A330A /* Warning.cpp */,
 				1790B10C09883BFD008A330A /* Warning.h */,
-				2882178A0A35D90C0029AF41 /* treebook.cpp */,
-				2882178B0A35D90C0029AF41 /* treebook.h */,
 			);
 			path = widgets;
 			sourceTree = "<group>";
@@ -4166,12 +4413,12 @@
 		1841B4FD0E00AD3D00F386E9 /* ondemand */ = {
 			isa = PBXGroup;
 			children = (
+				1841B5000E00AD6E00F386E9 /* ODComputeSummaryTask.cpp */,
+				1841B5010E00AD6E00F386E9 /* ODComputeSummaryTask.h */,
 				186CCE6E0E51F48500659159 /* ODDecodeFlacTask.cpp */,
 				186CCE6F0E51F48500659159 /* ODDecodeFlacTask.h */,
 				186CCE700E51F48500659159 /* ODDecodeTask.cpp */,
 				186CCE710E51F48500659159 /* ODDecodeTask.h */,
-				1841B5000E00AD6E00F386E9 /* ODComputeSummaryTask.cpp */,
-				1841B5010E00AD6E00F386E9 /* ODComputeSummaryTask.h */,
 				1841B5020E00AD6E00F386E9 /* ODManager.cpp */,
 				1841B5030E00AD6E00F386E9 /* ODManager.h */,
 				1841B5040E00AD6E00F386E9 /* ODTask.cpp */,
@@ -4327,6 +4574,7 @@
 		28501EAC0CEED0740029ABAA /* libvamp */ = {
 			isa = PBXGroup;
 			children = (
+				285D3CAB0F09FC54007883FC /* vamp-hostsdk */,
 				28501EAD0CEED1480029ABAA /* vamp-sdk */,
 			);
 			name = libvamp;
@@ -4335,34 +4583,79 @@
 		28501EAD0CEED1480029ABAA /* vamp-sdk */ = {
 			isa = PBXGroup;
 			children = (
-				28501EAE0CEED1A50029ABAA /* hostext */,
-				280196AF0D98171F00BFEECF /* Plugin.h */,
-				28501F470CEED9560029ABAA /* PluginAdapter.cpp */,
-				28501F480CEED9560029ABAA /* PluginAdapter.h */,
-				280196B00D98171F00BFEECF /* PluginBase.h */,
-				28501F090CEED2980029ABAA /* PluginHostAdapter.cpp */,
-				28501F0A0CEED2980029ABAA /* PluginHostAdapter.h */,
-				28501F490CEED9560029ABAA /* RealTime.cpp */,
-				28501F4A0CEED9560029ABAA /* RealTime.h */,
+				285D3CBC0F09FCB2007883FC /* PluginAdapter.cpp */,
+				285D3CBD0F09FCB2007883FC /* RealTime.cpp */,
 			);
 			name = "vamp-sdk";
 			sourceTree = "<group>";
 		};
-		28501EAE0CEED1A50029ABAA /* hostext */ = {
+		285D3CAB0F09FC54007883FC /* vamp-hostsdk */ = {
+			isa = PBXGroup;
+			children = (
+				285D3CAC0F09FC8F007883FC /* PluginBufferingAdapter.cpp */,
+				285D3CAD0F09FC8F007883FC /* PluginChannelAdapter.cpp */,
+				285D3CAE0F09FC8F007883FC /* PluginHostAdapter.cpp */,
+				285D3CAF0F09FC8F007883FC /* PluginInputDomainAdapter.cpp */,
+				285D3CB00F09FC8F007883FC /* PluginLoader.cpp */,
+				285D3CB10F09FC8F007883FC /* PluginSummarisingAdapter.cpp */,
+				285D3CB20F09FC8F007883FC /* PluginWrapper.cpp */,
+				285D3CB30F09FC8F007883FC /* RealTime.cpp */,
+			);
+			name = "vamp-hostsdk";
+			sourceTree = "<group>";
+		};
+		286D30AC0F264B58004E6E4A /* locale */ = {
 			isa = PBXGroup;
 			children = (
-				280196B30D98174400BFEECF /* PluginBufferingAdapter.cpp */,
-				280196B40D98174400BFEECF /* PluginBufferingAdapter.h */,
-				28501F0F0CEED2C50029ABAA /* PluginChannelAdapter.cpp */,
-				28501F100CEED2C50029ABAA /* PluginChannelAdapter.h */,
-				28501F110CEED2C50029ABAA /* PluginInputDomainAdapter.cpp */,
-				28501F120CEED2C50029ABAA /* PluginInputDomainAdapter.h */,
-				28501F130CEED2C50029ABAA /* PluginLoader.cpp */,
-				28501F140CEED2C50029ABAA /* PluginLoader.h */,
-				28501F150CEED2C50029ABAA /* PluginWrapper.cpp */,
-				28501F160CEED2C50029ABAA /* PluginWrapper.h */,
-			);
-			name = hostext;
+				286D30AD0F264BB7004E6E4A /* af.po */,
+				286D30AE0F264BB7004E6E4A /* ar.po */,
+				286D30AF0F264BB7004E6E4A /* bg.po */,
+				286D30B00F264BB7004E6E4A /* bn.po */,
+				286D30B10F264BB7004E6E4A /* bs.po */,
+				286D30B20F264BB7004E6E4A /* ca.po */,
+				286D30B30F264BB7004E6E4A /* ca at valencia.po */,
+				286D30B40F264BB7004E6E4A /* cs.po */,
+				286D30B50F264BB7004E6E4A /* cy.po */,
+				286D30B60F264BB7004E6E4A /* da.po */,
+				286D30B70F264BB7004E6E4A /* de.po */,
+				286D30B80F264BB7004E6E4A /* el.po */,
+				286D30B90F264BB7004E6E4A /* es.po */,
+				286D30BA0F264BB7004E6E4A /* eu.po */,
+				286D30BB0F264BB7004E6E4A /* fa.po */,
+				286D30BC0F264BB7004E6E4A /* fi.po */,
+				286D30BD0F264BB7004E6E4A /* fr.po */,
+				286D30BE0F264BB7004E6E4A /* ga.po */,
+				286D30BF0F264BB7004E6E4A /* gl.po */,
+				286D30C00F264BB7004E6E4A /* he.po */,
+				286D30C10F264BB7004E6E4A /* hu.po */,
+				286D30C20F264BB7004E6E4A /* id.po */,
+				286D30C30F264BB7004E6E4A /* it.po */,
+				286D30C40F264BB7004E6E4A /* ja.po */,
+				286D30C50F264BB7004E6E4A /* ka.po */,
+				286D30C60F264BB7004E6E4A /* km.po */,
+				286D30C70F264BB7004E6E4A /* ko.po */,
+				286D30C80F264BB7004E6E4A /* lt.po */,
+				286D30C90F264BB7004E6E4A /* mk.po */,
+				286D30CA0F264BB7004E6E4A /* nb.po */,
+				286D30CB0F264BB7004E6E4A /* nl.po */,
+				286D30CC0F264BB7004E6E4A /* oc.po */,
+				286D30CD0F264BB7004E6E4A /* pl.po */,
+				286D30CE0F264BB7004E6E4A /* pt.po */,
+				286D30CF0F264BB7004E6E4A /* pt_BR.po */,
+				286D30D00F264BB7004E6E4A /* ro.po */,
+				286D30D10F264BB7004E6E4A /* ru.po */,
+				286D30D20F264BB7004E6E4A /* sk.po */,
+				286D30D30F264BB7004E6E4A /* sl.po */,
+				286D30D40F264BB7004E6E4A /* sv.po */,
+				286D30D50F264BB7004E6E4A /* tg.po */,
+				286D30D60F264BB7004E6E4A /* tr.po */,
+				286D30D70F264BB7004E6E4A /* uk.po */,
+				286D30D80F264BB7004E6E4A /* vi.po */,
+				286D30D90F264BB7004E6E4A /* zh.po */,
+				286D30DA0F264BB7004E6E4A /* zh_TW.po */,
+			);
+			includeInIndex = 1;
+			name = locale;
 			sourceTree = "<group>";
 		};
 		287179EE0DF6383000E171DF /* Xcode Settings */ = {
@@ -4634,6 +4927,55 @@
 			path = toolbars;
 			sourceTree = "<group>";
 		};
+		28AA28110F267957008AED9E /* plug-ins */ = {
+			isa = PBXGroup;
+			children = (
+				28AA28120F267A2D008AED9E /* analyze.ny */,
+				28AA28130F267A2D008AED9E /* beat.ny */,
+				28AA28140F267A2D008AED9E /* clicktrack.ny */,
+				28AA28150F267A2D008AED9E /* clipfix.ny */,
+				28AA28160F267A2D008AED9E /* crossfadein.ny */,
+				28AA28170F267A2D008AED9E /* crossfadeout.ny */,
+				28AA28180F267A2D008AED9E /* delay.ny */,
+				28AA28190F267A2D008AED9E /* equalabel.ny */,
+				28AA281A0F267A2D008AED9E /* highpass.ny */,
+				28AA281B0F267A2D008AED9E /* lowpass.ny */,
+				28AA281C0F267A2D008AED9E /* pluck.ny */,
+				28AA281D0F267A2D008AED9E /* rissetdrum.ny */,
+				28AA281E0F267A2D008AED9E /* SilenceMarker.ny */,
+				28AA281F0F267A2D008AED9E /* tremolo.ny */,
+				28AA28200F267A2D008AED9E /* vocalremover.ny */,
+				28AA28210F267A2D008AED9E /* vocoder.ny */,
+			);
+			name = "plug-ins";
+			sourceTree = "<group>";
+		};
+		28AA28320F267A50008AED9E /* nyquist */ = {
+			isa = PBXGroup;
+			children = (
+				28AA28330F267A6E008AED9E /* bug.lsp */,
+				28AA28340F267A6E008AED9E /* dspprims.lsp */,
+				28AA28350F267A6E008AED9E /* evalenv.lsp */,
+				28AA28360F267A6E008AED9E /* follow.lsp */,
+				28AA28370F267A6E008AED9E /* init.lsp */,
+				28AA28380F267A6E008AED9E /* misc.lsp */,
+				28AA28390F267A6E008AED9E /* nyinit.lsp */,
+				28AA283A0F267A6E008AED9E /* nyqmisc.lsp */,
+				28AA283B0F267A6E008AED9E /* nyquist.lsp */,
+				28AA283C0F267A6E008AED9E /* printrec.lsp */,
+				28AA283D0F267A6E008AED9E /* profile.lsp */,
+				28AA283E0F267A6E008AED9E /* seq.lsp */,
+				28AA283F0F267A6E008AED9E /* seqfnint.lsp */,
+				28AA28400F267A6E008AED9E /* seqmidi.lsp */,
+				28AA28410F267A6E008AED9E /* sndfnint.lsp */,
+				28AA28420F267A6E008AED9E /* system.lsp */,
+				28AA28430F267A6E008AED9E /* test.lsp */,
+				28AA28440F267A6E008AED9E /* xlinit.lsp */,
+			);
+			includeInIndex = 1;
+			name = nyquist;
+			sourceTree = "<group>";
+		};
 		28D587C50E264CBB009C7DEA /* lv2 */ = {
 			isa = PBXGroup;
 			children = (
@@ -4803,6 +5145,57 @@
 			path = fft3;
 			sourceTree = "<group>";
 		};
+		ED2706FA0EF9C436007D4FFD /* sbsms */ = {
+			isa = PBXGroup;
+			children = (
+				ED2707000EF9C489007D4FFD /* src */,
+				ED2706FD0EF9C47E007D4FFD /* include */,
+			);
+			name = sbsms;
+			sourceTree = "<group>";
+		};
+		ED2706FD0EF9C47E007D4FFD /* include */ = {
+			isa = PBXGroup;
+			children = (
+				ED2706FE0EF9C47E007D4FFD /* sbsms.h */,
+			);
+			name = include;
+			path = sbsms/include;
+			sourceTree = "<group>";
+		};
+		ED2707000EF9C489007D4FFD /* src */ = {
+			isa = PBXGroup;
+			children = (
+				ED2707020EF9C51D007D4FFD /* audio.cpp */,
+				ED2707030EF9C51D007D4FFD /* audio.h */,
+				ED2707040EF9C51D007D4FFD /* buffer.cpp */,
+				ED2707050EF9C51D007D4FFD /* buffer.h */,
+				ED2707060EF9C51D007D4FFD /* defs.h */,
+				ED2707070EF9C51D007D4FFD /* fft.cpp */,
+				ED2707080EF9C51D007D4FFD /* fft.h */,
+				ED2707090EF9C51D007D4FFD /* grain.cpp */,
+				ED27070A0EF9C51D007D4FFD /* grain.h */,
+				ED27070B0EF9C51D007D4FFD /* peak.cpp */,
+				ED27070C0EF9C51D007D4FFD /* peak.h */,
+				ED27070D0EF9C51D007D4FFD /* pitch.cpp */,
+				ED27070E0EF9C51D007D4FFD /* real.h */,
+				ED27070F0EF9C51D007D4FFD /* resample.cpp */,
+				ED2707100EF9C51D007D4FFD /* sbsms.cpp */,
+				ED2707110EF9C51D007D4FFD /* sincCoeffs.h */,
+				ED2707120EF9C51D007D4FFD /* sms.cpp */,
+				ED2707130EF9C51D007D4FFD /* sms.h */,
+				ED2707140EF9C51D007D4FFD /* subband.cpp */,
+				ED2707150EF9C51D007D4FFD /* subband.h */,
+				ED2707160EF9C51D007D4FFD /* track.cpp */,
+				ED2707170EF9C51D007D4FFD /* track.h */,
+				ED2707180EF9C51D007D4FFD /* trackpoint.cpp */,
+				ED2707190EF9C51D007D4FFD /* trackpoint.h */,
+				ED27071A0EF9C51D007D4FFD /* utils.cpp */,
+				ED27071B0EF9C51D007D4FFD /* utils.h */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -5201,16 +5594,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				28501F0C0CEED2980029ABAA /* PluginHostAdapter.h in Headers */,
-				28501F180CEED2C50029ABAA /* PluginChannelAdapter.h in Headers */,
-				28501F1A0CEED2C50029ABAA /* PluginInputDomainAdapter.h in Headers */,
-				28501F1C0CEED2C50029ABAA /* PluginLoader.h in Headers */,
-				28501F1E0CEED2C50029ABAA /* PluginWrapper.h in Headers */,
-				28501F4C0CEED9560029ABAA /* PluginAdapter.h in Headers */,
-				28501F4E0CEED9560029ABAA /* RealTime.h in Headers */,
-				280196B10D98171F00BFEECF /* Plugin.h in Headers */,
-				280196B20D98171F00BFEECF /* PluginBase.h in Headers */,
-				280196B60D98174400BFEECF /* PluginBufferingAdapter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5385,6 +5768,27 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		ED2706F00EF9C3C6007D4FFD /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				ED2706FF0EF9C47E007D4FFD /* sbsms.h in Headers */,
+				ED2707250EF9C51D007D4FFD /* audio.h in Headers */,
+				ED2707270EF9C51D007D4FFD /* buffer.h in Headers */,
+				ED2707280EF9C51D007D4FFD /* defs.h in Headers */,
+				ED27072A0EF9C51D007D4FFD /* fft.h in Headers */,
+				ED27072C0EF9C51D007D4FFD /* grain.h in Headers */,
+				ED27072E0EF9C51D007D4FFD /* peak.h in Headers */,
+				ED2707300EF9C51D007D4FFD /* real.h in Headers */,
+				ED2707330EF9C51D007D4FFD /* sincCoeffs.h in Headers */,
+				ED2707350EF9C51D007D4FFD /* sms.h in Headers */,
+				ED2707370EF9C51D007D4FFD /* subband.h in Headers */,
+				ED2707390EF9C51D007D4FFD /* track.h in Headers */,
+				ED27073B0EF9C51D007D4FFD /* trackpoint.h in Headers */,
+				ED27073D0EF9C51D007D4FFD /* utils.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -5624,8 +6028,11 @@
 				1790AFAC09883B6D008A330A /* Resources */,
 				1790AFAD09883B6D008A330A /* Sources */,
 				1790AFAE09883B6D008A330A /* Frameworks */,
+				28AA28CA0F267E3E008AED9E /* Copy Nyquist Files */,
+				28AA28F00F267FF0008AED9E /* Copy Plug-in Files */,
 			);
 			buildRules = (
+				286D31370F264C38004E6E4A /* PBXBuildRule */,
 			);
 			dependencies = (
 				17072E940988C35B008541CC /* PBXTargetDependency */,
@@ -5644,13 +6051,9 @@
 				28E67F640A3A16AA0021D89F /* PBXTargetDependency */,
 				17C99D43098970800041B1BC /* PBXTargetDependency */,
 				17C99D53098970800041B1BC /* PBXTargetDependency */,
-				287BD8BA0E25DAC400CB4467 /* PBXTargetDependency */,
-				287BD8B80E25DAC400CB4467 /* PBXTargetDependency */,
-				287BD8B60E25DAC400CB4467 /* PBXTargetDependency */,
-				2862D79C0E25E23B0014D9BB /* PBXTargetDependency */,
-				2862D79A0E25E23B0014D9BB /* PBXTargetDependency */,
 				17C99D45098970800041B1BC /* PBXTargetDependency */,
 				2840CF800AEB822100F49FC3 /* PBXTargetDependency */,
+				ED2707480EF9C55A007D4FFD /* PBXTargetDependency */,
 			);
 			name = Audacity;
 			productName = Audacity;
@@ -5818,6 +6221,22 @@
 			productReference = 28E67F5F0A3A160D0021D89F /* libportaudio.a */;
 			productType = "com.apple.product-type.library.static";
 		};
+		ED2706F30EF9C3C6007D4FFD /* libsbsms */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = ED2706F90EF9C3E4007D4FFD /* Build configuration list for PBXNativeTarget "libsbsms" */;
+			buildPhases = (
+				ED2706F00EF9C3C6007D4FFD /* Headers */,
+				ED2706F10EF9C3C6007D4FFD /* Sources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libsbsms;
+			productName = libsbsms;
+			productReference = ED2706F40EF9C3C6007D4FFD /* liblibsbsms.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -5829,7 +6248,7 @@
 			mainGroup = 1790ABE109883346008A330A;
 			productRefGroup = 1790AFB109883B6D008A330A /* Products */;
 			projectDirPath = "";
-			projectRoot = "";
+			projectRoot = ..;
 			targets = (
 				1790AFAF09883B6D008A330A /* Audacity */,
 				17072E880988BD39008541CC /* Configure */,
@@ -5857,6 +6276,7 @@
 				287BD9680E25DE6800CB4467 /* liblrdf */,
 				287BD9950E25DF2800CB4467 /* slv2 */,
 				28E236F40E515D1D00281398 /* libscorealign */,
+				ED2706F30EF9C3C6007D4FFD /* libsbsms */,
 			);
 		};
 /* End PBXProject section */
@@ -5873,8 +6293,6 @@
 				174F73D4098D516D009CD6E0 /* AudacityOGG.icns in Resources */,
 				174F73D5098D516D009CD6E0 /* AudacityProject.icns in Resources */,
 				174F73D6098D516D009CD6E0 /* AudacityWAV.icns in Resources */,
-				174F73D8098D51AA009CD6E0 /* Info.plist in Resources */,
-				17FC86F40994637C0061DC94 /* compile.txt in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5904,7 +6322,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -z \"$WX_CONFIG\" ]\nthen\n   echo \"WX_CONFIG environment variable not set...aborting\"\n   exit 1\nfi\n\n#\n# Here we create empty xcconfig files if they do not exist.  Otherwise,\n# the build will fail.\n#\nconfigs='Debug_Shared Debug_Static Release_Shared Release_Static'\nfor config in $configs\ndo\n\t[ ! -f $TOPLEVEL/mac/$config.xcconfig ] && touch $TOPLEVEL/mac/$config.xcconfig\ndone\n\t\ncd $TOPLEVEL\nsh configure --enable-static=$CONFIG_STATIC \\\n             --enable-unicode=$CONFIG_UNICODE \\\n             --enable-debug=$CONFIG_DEBUG \\\n             --with-lib-preference=local,system \\\n             --with-wx-version=$WX_VER \\\n             $CONFIG_FLAGS || exit 1\n\n#\n# Libsndfile's endianness detection is a bit unfriendly to universal binary\n# builds, so we coerce it into working our way.\n#\nFILE=lib-src/libsndfile/src/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#undef CPU_IS_BIG_ENDIAN\n#undef CPU_IS_LITTLE_ENDIAN\n#if defined(__BIG_ENDIAN__)\n#define CPU_IS_BIG_ENDIAN 1\n#define CPU_IS_LITTLE_ENDIAN 0\n#else\n#define CPU_IS_BIG_ENDIAN 0\n#define CPU_IS_LITTLE_ENDIAN 1\n#endif\nEOF\n\n#\n# Ditto for libflac.\n#\nFILE=lib-src/libflac/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And libmad.\n#\nFILE=lib-src/libmad/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\nexit 0\n";
+			shellScript = "if [ -z \"$WX_CONFIG\" ]\nthen\n   echo \"WX_CONFIG environment variable not set...aborting\"\n   exit 1\nfi\n\n#\n# Here we create empty xcconfig files if they do not exist.  Otherwise,\n# the build will fail.\n#\nconfigs='Debug_Shared Debug_Static Release_Shared Release_Static'\nfor config in $configs\ndo\n\t[ ! -f $TOPLEVEL/mac/$config.xcconfig ] && touch $TOPLEVEL/mac/$config.xcconfig\ndone\n\t\ncd $TOPLEVEL\nsh configure --enable-static=$CONFIG_STATIC \\\n             --enable-unicode=$CONFIG_UNICODE \\\n             --enable-debug=$CONFIG_DEBUG \\\n             --with-lib-preference=local,system \\\n             --with-wx-version=$WX_VER \\\n             $CONFIG_FLAGS || exit 1\n\n#\n# Libsndfile's endianness detection is a bit unfriendly to universal binary\n# builds, so we coerce it into working our way.\n#\nFILE=lib-src/libsndfile/src/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#undef CPU_IS_BIG_ENDIAN\n#undef CPU_IS_LITTLE_ENDIAN\n#if defined(__BIG_ENDIAN__)\n#define CPU_IS_BIG_ENDIAN 1\n#define CPU_IS_LITTLE_ENDIAN 0\n#else\n#define CPU_IS_BIG_ENDIAN 0\n#define CPU_IS_LITTLE_ENDIAN 1\n#endif\nEOF\n\n#\n# Ditto for libflac.\n#\nFILE=lib-src/libflac/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And libmad.\n#\nFILE=lib-src/libmad/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# Generate the header file for preprocessing the Info.plist\n#\ngcc -E -dM src/Audacity.h | grep AUDACITY >mac/Info.plist.h\n\nexit 0\n";
 		};
 		17073FEB0988E6C9008541CC /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -6568,7 +6986,6 @@
 				28F1D81E0A2D0019005506A7 /* ExpandingToolBar.cpp in Sources */,
 				28F1D81F0A2D0019005506A7 /* ImageRoll.cpp in Sources */,
 				2882177B0A35D8730029AF41 /* ShuttlePrefs.cpp in Sources */,
-				2882178C0A35D90C0029AF41 /* treebook.cpp in Sources */,
 				28F00A930A3E2FF100A3E5F5 /* FileNames.cpp in Sources */,
 				28FC1AFB0A47762C00A188AE /* WrappedType.cpp in Sources */,
 				287F9F3D0A69748F00F025FA /* TimeDialog.cpp in Sources */,
@@ -6636,6 +7053,55 @@
 				186CCE730E51F48500659159 /* ODDecodeTask.cpp in Sources */,
 				186CCEA40E523C8E00659159 /* Profiler.cpp in Sources */,
 				28EDC8DF0E5550750034BBE7 /* LV2PortGroup.cpp in Sources */,
+				18D8314E0ED0F56300FD870D /* Contrast.cpp in Sources */,
+				ED2707500EF9C64F007D4FFD /* SBSMSEffect.cpp in Sources */,
+				ED2707510EF9C64F007D4FFD /* TimeScale.cpp in Sources */,
+				286D31090F264BEE004E6E4A /* af.po in Sources */,
+				286D310A0F264BEE004E6E4A /* ar.po in Sources */,
+				286D310B0F264BEE004E6E4A /* bg.po in Sources */,
+				286D310C0F264BEE004E6E4A /* bn.po in Sources */,
+				286D310D0F264BEE004E6E4A /* bs.po in Sources */,
+				286D310E0F264BEE004E6E4A /* ca.po in Sources */,
+				286D310F0F264BEE004E6E4A /* ca at valencia.po in Sources */,
+				286D31100F264BEE004E6E4A /* cs.po in Sources */,
+				286D31110F264BEE004E6E4A /* cy.po in Sources */,
+				286D31120F264BEE004E6E4A /* da.po in Sources */,
+				286D31130F264BEE004E6E4A /* de.po in Sources */,
+				286D31140F264BEE004E6E4A /* el.po in Sources */,
+				286D31150F264BEE004E6E4A /* es.po in Sources */,
+				286D31160F264BEE004E6E4A /* eu.po in Sources */,
+				286D31170F264BEE004E6E4A /* fa.po in Sources */,
+				286D31180F264BEE004E6E4A /* fi.po in Sources */,
+				286D31190F264BEE004E6E4A /* fr.po in Sources */,
+				286D311A0F264BEE004E6E4A /* ga.po in Sources */,
+				286D311B0F264BEE004E6E4A /* gl.po in Sources */,
+				286D311C0F264BEE004E6E4A /* he.po in Sources */,
+				286D311D0F264BEE004E6E4A /* hu.po in Sources */,
+				286D311E0F264BEE004E6E4A /* id.po in Sources */,
+				286D311F0F264BEE004E6E4A /* it.po in Sources */,
+				286D31200F264BEE004E6E4A /* ja.po in Sources */,
+				286D31210F264BEE004E6E4A /* ka.po in Sources */,
+				286D31220F264BEE004E6E4A /* km.po in Sources */,
+				286D31230F264BEE004E6E4A /* ko.po in Sources */,
+				286D31240F264BEE004E6E4A /* lt.po in Sources */,
+				286D31250F264BEE004E6E4A /* mk.po in Sources */,
+				286D31260F264BEE004E6E4A /* nb.po in Sources */,
+				286D31270F264BEE004E6E4A /* nl.po in Sources */,
+				286D31280F264BEE004E6E4A /* oc.po in Sources */,
+				286D31290F264BEE004E6E4A /* pl.po in Sources */,
+				286D312A0F264BEE004E6E4A /* pt.po in Sources */,
+				286D312B0F264BEE004E6E4A /* pt_BR.po in Sources */,
+				286D312C0F264BEE004E6E4A /* ro.po in Sources */,
+				286D312D0F264BEE004E6E4A /* ru.po in Sources */,
+				286D312E0F264BEE004E6E4A /* sk.po in Sources */,
+				286D312F0F264BEE004E6E4A /* sl.po in Sources */,
+				286D31300F264BEE004E6E4A /* sv.po in Sources */,
+				286D31310F264BEE004E6E4A /* tg.po in Sources */,
+				286D31320F264BEE004E6E4A /* tr.po in Sources */,
+				286D31330F264BEE004E6E4A /* uk.po in Sources */,
+				286D31340F264BEE004E6E4A /* vi.po in Sources */,
+				286D31350F264BEE004E6E4A /* zh.po in Sources */,
+				286D31360F264BEE004E6E4A /* zh_TW.po in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6669,14 +7135,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				28501F0B0CEED2980029ABAA /* PluginHostAdapter.cpp in Sources */,
-				28501F170CEED2C50029ABAA /* PluginChannelAdapter.cpp in Sources */,
-				28501F190CEED2C50029ABAA /* PluginInputDomainAdapter.cpp in Sources */,
-				28501F1B0CEED2C50029ABAA /* PluginLoader.cpp in Sources */,
-				28501F1D0CEED2C50029ABAA /* PluginWrapper.cpp in Sources */,
-				28501F4B0CEED9560029ABAA /* PluginAdapter.cpp in Sources */,
-				28501F4D0CEED9560029ABAA /* RealTime.cpp in Sources */,
-				280196B50D98174400BFEECF /* PluginBufferingAdapter.cpp in Sources */,
+				285D3CB40F09FC8F007883FC /* PluginBufferingAdapter.cpp in Sources */,
+				285D3CB50F09FC8F007883FC /* PluginChannelAdapter.cpp in Sources */,
+				285D3CB60F09FC8F007883FC /* PluginHostAdapter.cpp in Sources */,
+				285D3CB70F09FC8F007883FC /* PluginInputDomainAdapter.cpp in Sources */,
+				285D3CB80F09FC8F007883FC /* PluginLoader.cpp in Sources */,
+				285D3CB90F09FC8F007883FC /* PluginSummarisingAdapter.cpp in Sources */,
+				285D3CBA0F09FC8F007883FC /* PluginWrapper.cpp in Sources */,
+				285D3CBB0F09FC8F007883FC /* RealTime.cpp in Sources */,
+				285D3CBE0F09FCB2007883FC /* PluginAdapter.cpp in Sources */,
+				285D3CBF0F09FCB2007883FC /* RealTime.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6875,6 +7343,26 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		ED2706F10EF9C3C6007D4FFD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				ED2707240EF9C51D007D4FFD /* audio.cpp in Sources */,
+				ED2707260EF9C51D007D4FFD /* buffer.cpp in Sources */,
+				ED2707290EF9C51D007D4FFD /* fft.cpp in Sources */,
+				ED27072B0EF9C51D007D4FFD /* grain.cpp in Sources */,
+				ED27072D0EF9C51D007D4FFD /* peak.cpp in Sources */,
+				ED27072F0EF9C51D007D4FFD /* pitch.cpp in Sources */,
+				ED2707310EF9C51D007D4FFD /* resample.cpp in Sources */,
+				ED2707320EF9C51D007D4FFD /* sbsms.cpp in Sources */,
+				ED2707340EF9C51D007D4FFD /* sms.cpp in Sources */,
+				ED2707360EF9C51D007D4FFD /* subband.cpp in Sources */,
+				ED2707380EF9C51D007D4FFD /* track.cpp in Sources */,
+				ED27073A0EF9C51D007D4FFD /* trackpoint.cpp in Sources */,
+				ED27073C0EF9C51D007D4FFD /* utils.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -6963,31 +7451,6 @@
 			target = 28501EAF0CEED1F00029ABAA /* libvamp */;
 			targetProxy = 28501F520CEED9A80029ABAA /* PBXContainerItemProxy */;
 		};
-		2862D79A0E25E23B0014D9BB /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 287BD9950E25DF2800CB4467 /* slv2 */;
-			targetProxy = 2862D7990E25E23B0014D9BB /* PBXContainerItemProxy */;
-		};
-		2862D79C0E25E23B0014D9BB /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 287BD9680E25DE6800CB4467 /* liblrdf */;
-			targetProxy = 2862D79B0E25E23B0014D9BB /* PBXContainerItemProxy */;
-		};
-		287BD8B60E25DAC400CB4467 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 287BD8A60E25DA6500CB4467 /* librdf */;
-			targetProxy = 287BD8B50E25DAC400CB4467 /* PBXContainerItemProxy */;
-		};
-		287BD8B80E25DAC400CB4467 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 287BD89D0E25DA5500CB4467 /* rasqal */;
-			targetProxy = 287BD8B70E25DAC400CB4467 /* PBXContainerItemProxy */;
-		};
-		287BD8BA0E25DAC400CB4467 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 287BD8870E25DA3700CB4467 /* raptor */;
-			targetProxy = 287BD8B90E25DAC400CB4467 /* PBXContainerItemProxy */;
-		};
 		28E237270E515E1300281398 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 28E236F40E515D1D00281398 /* libscorealign */;
@@ -6998,6 +7461,11 @@
 			target = 28E67F510A3A160D0021D89F /* portaudio-v19 */;
 			targetProxy = 28E67F630A3A16AA0021D89F /* PBXContainerItemProxy */;
 		};
+		ED2707480EF9C55A007D4FFD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = ED2706F30EF9C3C6007D4FFD /* libsbsms */;
+			targetProxy = ED2707470EF9C55A007D4FFD /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -7163,6 +7631,11 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "BUILDING_AUDACITY=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug Static\"";
 				OTHER_CFLAGS = (
 					"$(WX_CFLAGS)",
 					"$(FFMPEG_CFLAGS)",
@@ -7216,6 +7689,9 @@
 				FFMPEG_PREFIX = /usr/local;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
+				INFOPLIST_PREFIX_HEADER = Info.plist.h;
+				INFOPLIST_PREPROCESS = YES;
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -7641,6 +8117,9 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
+				INFOPLIST_PREFIX_HEADER = Info.plist.h;
+				INFOPLIST_PREPROCESS = YES;
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -7661,6 +8140,11 @@
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = "BUILDING_AUDACITY=1";
 				INFOPLIST_FILE = Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug Static\"";
 				OTHER_CFLAGS = (
 					"$(WX_CFLAGS)",
 					"$(FFMPEG_CFLAGS)",
@@ -7969,6 +8453,9 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
+				INFOPLIST_PREFIX_HEADER = Info.plist.h;
+				INFOPLIST_PREPROCESS = YES;
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -7991,6 +8478,11 @@
 				GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h";
 				GCC_PREPROCESSOR_DEFINITIONS = "BUILDING_AUDACITY=1";
 				INFOPLIST_FILE = Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug Static\"";
 				OTHER_CFLAGS = (
 					"$(WX_CFLAGS)",
 					"$(FFMPEG_CFLAGS)",
@@ -8504,6 +8996,11 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "BUILDING_AUDACITY=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug Static\"";
 				OTHER_CFLAGS = (
 					"$(WX_CFLAGS)",
 					"$(FFMPEG_CFLAGS)",
@@ -8561,6 +9058,9 @@
 				FFMPEG_PREFIX = /usr/local;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
+				INFOPLIST_PREFIX_HEADER = Info.plist.h;
+				INFOPLIST_PREPROCESS = YES;
 				KEEP_PRIVATE_EXTERNS = YES;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -8602,6 +9102,70 @@
 			};
 			name = "Debug Static";
 		};
+		ED2706F50EF9C3C6007D4FFD /* Debug Static */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/lib;
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				PREBINDING = NO;
+				PRODUCT_NAME = libsbsms;
+			};
+			name = "Debug Static";
+		};
+		ED2706F60EF9C3C6007D4FFD /* Debug Shared */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/lib;
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				PREBINDING = NO;
+				PRODUCT_NAME = libsbsms;
+			};
+			name = "Debug Shared";
+		};
+		ED2706F70EF9C3C6007D4FFD /* Release Static */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/lib;
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				PREBINDING = NO;
+				PRODUCT_NAME = libsbsms;
+			};
+			name = "Release Static";
+		};
+		ED2706F80EF9C3C6007D4FFD /* Release Shared */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/lib;
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
+				PREBINDING = NO;
+				PRODUCT_NAME = libsbsms;
+			};
+			name = "Release Shared";
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -8902,6 +9466,17 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = "Debug Static";
 		};
+		ED2706F90EF9C3E4007D4FFD /* Build configuration list for PBXNativeTarget "libsbsms" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				ED2706F50EF9C3C6007D4FFD /* Debug Static */,
+				ED2706F60EF9C3C6007D4FFD /* Debug Shared */,
+				ED2706F70EF9C3C6007D4FFD /* Release Static */,
+				ED2706F80EF9C3C6007D4FFD /* Release Shared */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "Debug Static";
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 1790ABE309883346008A330A /* Project object */;
diff --git a/mac/Info.plist b/mac/Info.plist
index 30433c7..3fb1e0a 100644
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -227,15 +227,15 @@
 	<key>CFBundleSignature</key>
 	<string>auDy</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.6</string>
+	<string>AUDACITY_VERSION.AUDACITY_RELEASE.AUDACITY_REVISION.AUDACITY_MODLEVEL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.6</string>
+	<string>AUDACITY_VERSION.AUDACITY_RELEASE.AUDACITY_REVISION.AUDACITY_MODLEVEL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Audacity version 1.3.6</string>
+	<string>Audacity version AUDACITY_VERSION.AUDACITY_RELEASE.AUDACITY_REVISION.AUDACITY_MODLEVEL</string>
 	<key>CFBundleLongVersionString</key>
-	<string>Version 1.3.6</string>
+	<string>Version AUDACITY_VERSION.AUDACITY_RELEASE.AUDACITY_REVISION.AUDACITY_MODLEVEL</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Audacity version 1.3.6</string>
+	<string>Audacity version AUDACITY_VERSION.AUDACITY_RELEASE.AUDACITY_REVISION.AUDACITY_MODLEVEL</string>
 	<key>LSRequiresCarbon</key>
         <true/>
 	<key>CSResourcesFileMapped</key>
diff --git a/mac/wxMac-2.4.0.patch b/mac/wxMac-2.4.0.patch
deleted file mode 100644
index fb1055c..0000000
--- a/mac/wxMac-2.4.0.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-*** old/include/wx/font.h	Sun Oct 27 17:51:41 2002
---- new/include/wx/font.h	Sat Jul 26 19:17:31 2003
-***************
-*** 142,149 ****
-      wxString GetWeightString() const;
-  
-      // Unofficial API, don't use
-!     virtual void SetNoAntiAliasing( bool no = TRUE ) {  }
-!     virtual bool GetNoAntiAliasing() { return FALSE; }
-  
-      // the default encoding is used for creating all fonts with default
-      // encoding parameter
---- 142,149 ----
-      wxString GetWeightString() const;
-  
-      // Unofficial API, don't use
-!     virtual void SetNoAntiAliasing( bool no = TRUE ) { mNoAntiAliasing = no; }
-!     virtual bool GetNoAntiAliasing() { return mNoAntiAliasing; }
-  
-      // the default encoding is used for creating all fonts with default
-      // encoding parameter
-***************
-*** 155,160 ****
---- 155,162 ----
-      wxFontRefData *GetFontData() const
-          { return (wxFontRefData *)m_refData; }
-      
-+     bool mNoAntiAliasing;
-+ 
-  private:
-      // the currently default encoding: by default, it's the default system
-      // encoding, but may be changed by the application using
-*** old/include/wx/mac/cursor.h	Sat Aug 31 04:29:13 2002
---- new/include/wx/mac/cursor.h	Sat Jul 26 19:32:14 2003
-***************
-*** 30,35 ****
---- 30,37 ----
-  
-  protected:
-      WXHCURSOR m_hCursor;
-+ 
-+     bool m_disposeHandle;
-  };
-  
-  #define M_CURSORDATA ((wxCursorRefData *)m_refData)
-***************
-*** 54,59 ****
---- 56,63 ----
-    wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
-     int hotSpotX = 0, int hotSpotY = 0);
-  
-+   wxCursor( const wxImage &image );
-+ 
-    wxCursor(int cursor_type);
-    ~wxCursor();
-  
-***************
-*** 62,67 ****
---- 66,73 ----
-    inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-    inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
-    inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
-+ 
-+ 	void CreateFromImage(const wxImage & image);
-  
-  	void MacInstall() const ;
-  
-*** old/src/mac/cursor.cpp	Thu Oct 17 13:34:20 2002
---- new/src/mac/cursor.cpp	Sat Jul 26 19:32:19 2003
-***************
-*** 18,23 ****
---- 18,24 ----
-  #include "wx/app.h"
-  #include "wx/cursor.h"
-  #include "wx/icon.h"
-+ #include <wx/image.h>
-  #include "wx/mac/private.h"
-  
-  #if !USE_SHARED_LIBRARIES
-***************
-*** 50,61 ****
---- 51,67 ----
-      m_width = 32; 
-      m_height = 32;
-      m_hCursor = NULL ;
-+     m_disposeHandle = false;
-  }
-  
-  wxCursorRefData::~wxCursorRefData()
-  {
-  //	if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
-  //		::ReleaseResource( (Handle) m_hCursor ) ;
-+     if ( m_disposeHandle )
-+     {
-+         ::DisposeHandle( (Handle ) m_hCursor ) ;
-+     } 
-  }
-  
-  // Cursors
-***************
-*** 68,73 ****
---- 74,84 ----
-  {
-  }
-  
-+ wxCursor::wxCursor( const wxImage &image )
-+ {
-+     CreateFromImage( image ) ;
-+ }
-+ 
-  wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
-  {
-      m_refData = new wxCursorRefData;
-***************
-*** 211,216 ****
---- 222,294 ----
-        M_CURSORDATA->m_hCursor = MacArrowCursor;
-        break;
-  	}
-+ }
-+ 
-+ void wxCursor::CreateFromImage(const wxImage & image) 
-+ {
-+     m_refData = new wxCursorRefData;
-+ 
-+     wxImage image16 = image.Scale(16,16) ;
-+        unsigned char * rgbBits = image16.GetData();
-+  
-+     
-+     int w = image16.GetWidth()  ;
-+     int h = image16.GetHeight() ;
-+     bool bHasMask = image16.HasMask() ;
-+ 
-+        int hotSpotX = image16.GetOptionInt(wxCUR_HOTSPOT_X);
-+     int hotSpotY = image16.GetOptionInt(wxCUR_HOTSPOT_Y);
-+     if (hotSpotX < 0 || hotSpotX >= w)
-+             hotSpotX = 0;
-+     if (hotSpotY < 0 || hotSpotY >= h)
-+             hotSpotY = 0;
-+             
-+     // monochrome implementation
-+     M_CURSORDATA->m_hCursor = NewHandle( sizeof( Cursor ) ) ;
-+     M_CURSORDATA->m_disposeHandle = true ;
-+     HLock( (Handle) M_CURSORDATA->m_hCursor ) ;
-+     CursPtr cp = *(CursHandle)M_CURSORDATA->m_hCursor ;
-+     memset( cp->data , 0 , sizeof( Bits16 ) ) ;
-+     memset( cp->mask , 0 , sizeof( Bits16 ) ) ;
-+     
-+     unsigned char mr = image16.GetMaskRed() ;
-+     unsigned char mg = image16.GetMaskGreen() ;
-+     unsigned char mb = image16.GetMaskBlue() ;
-+     for ( int y = 0 ; y < h ; ++y )
-+     {
-+         short rowbits = 0 ;
-+         short maskbits = 0 ;
-+         
-+         for ( int x = 0 ; x < w ; ++x )
-+         {
-+             long pos = (y * w + x) * 3;
-+ 
-+             unsigned char r = rgbBits[pos] ;
-+             unsigned char g = rgbBits[pos+1] ;
-+             unsigned char b = rgbBits[pos+2] ;
-+             if ( bHasMask && r==mr && g==mg && b==mb )
-+             {
-+                 // masked area, does not appear anywhere
-+             }
-+             else
-+             {
-+                 if ( (int)r + (int)g + (int)b < 0x0200 )
-+                 {
-+                     rowbits |= ( 1 << (15-x) ) ;
-+                 }
-+                 maskbits |= ( 1 << (15-x) ) ;
-+             }
-+         }
-+         cp->data[y] = rowbits ;
-+         cp->mask[y] = maskbits ;
-+     }
-+     if ( !bHasMask )
-+     {
-+         memcpy( cp->mask , cp->data , sizeof( Bits16) ) ;
-+     }
-+     cp->hotSpot.h = hotSpotX ;
-+     cp->hotSpot.v = hotSpotY ;
-+     HUnlock( (Handle) M_CURSORDATA->m_hCursor ) ;
-  }
-  
-  void wxCursor::MacInstall() const 
-*** old/src/mac/dc.cpp	Sun Jan  5 12:48:06 2003
---- new/src/mac/dc.cpp	Sun Jul 27 13:42:19 2003
-***************
-*** 1316,1324 ****
-  	long xx = XLOG2DEVMAC(x);
-  	long yy = YLOG2DEVMAC(y);
-  #if TARGET_CARBON
-! 	bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
-! 	if ( m_font.GetNoAntiAliasing() )
-! 	    useDrawThemeText = false ;
-  #endif
-  	MacInstallFont() ;
-      if ( 0 )
---- 1316,1327 ----
-  	long xx = XLOG2DEVMAC(x);
-  	long yy = YLOG2DEVMAC(y);
-  #if TARGET_CARBON
-! 	//bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
-! 	//if ( m_font.GetNoAntiAliasing() )
-! 	//    useDrawThemeText = false ;
-! 
-!         // Speed up Audacity by never using Anti-Aliased text...
-!         bool useDrawThemeText = false;
-  #endif
-  	MacInstallFont() ;
-      if ( 0 )
-***************
-*** 2078,2081 ****
-  wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
-  {
-      return ((wxDC *)this)->YLOG2DEVREL(y);
-! }
-\ No newline at end of file
---- 2081,2084 ----
-  wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
-  {
-      return ((wxDC *)this)->YLOG2DEVREL(y);
-! }
-*** old/src/mac/font.cpp	Sun Nov 24 09:34:15 2002
---- new/src/mac/font.cpp	Sat Jul 26 19:18:14 2003
-***************
-*** 161,166 ****
---- 161,168 ----
-                      const wxString& faceName,
-                      wxFontEncoding encoding)
-  {
-+     mNoAntiAliasing = false;
-+ 
-      UnRef();
-      m_refData = new wxFontRefData(pointSize, family, style, weight,
-                                    underlined, faceName, encoding);
diff --git a/mac/wxMac-2.4.1.patch b/mac/wxMac-2.4.1.patch
deleted file mode 100644
index 7c0ae92..0000000
--- a/mac/wxMac-2.4.1.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-WARNING: wxMac 2.4.1 has a serious bug in wxNotebook that makes it IMPOSSIBLE
-to run Audacity successfully with this version.  Please use wxMac 2.4.0
-instead and apply the patch labeled wxMac-2.4.0.patch.
-
-See the compile.txt file in this directory for more information.
-
-*** include/wx/font.h~	Sun Oct 27 17:51:41 2002
---- include/wx/font.h	Sun Jun 29 22:03:07 2003
-***************
-*** 143,148 ****
-  
-      // Unofficial API, don't use
-!     virtual void SetNoAntiAliasing( bool no = TRUE ) {  }
-!     virtual bool GetNoAntiAliasing() { return FALSE; }
-  
-      // the default encoding is used for creating all fonts with default
---- 143,148 ----
-  
-      // Unofficial API, don't use
-!     virtual void SetNoAntiAliasing( bool no = TRUE ) { mNoAntiAliasing = no; }
-!     virtual bool GetNoAntiAliasing() { return mNoAntiAliasing; }
-  
-      // the default encoding is used for creating all fonts with default
-***************
-*** 155,158 ****
---- 155,160 ----
-      wxFontRefData *GetFontData() const
-          { return (wxFontRefData *)m_refData; }
-+ 
-+     bool mNoAntiAliasing;
-      
-  private:
-*** src/mac/font.cpp~	Sun Nov 24 09:34:15 2002
---- src/mac/font.cpp	Sun Jun 29 22:04:20 2003
-***************
-*** 162,165 ****
---- 162,167 ----
-                      wxFontEncoding encoding)
-  {
-+     mNoAntiAliasing = false;
-+ 
-      UnRef();
-      m_refData = new wxFontRefData(pointSize, family, style, weight,
-*** src/mac/corersrc.r~	Sun Jun 29 23:55:47 2003
---- src/mac/corersrc.r	Sun Jun 29 23:56:17 2003
-***************
-*** 158,162 ****
-  };
-  
-! resource 'ICN#' (129) {
-  	{	/* array: 2 elements */
-  		/* [1] */
---- 158,162 ----
-  };
-  
-! resource 'ICN#' (256) {
-  	{	/* array: 2 elements */
-  		/* [1] */
-***************
-*** 181,185 ****
-  };
-  
-! resource 'ics#' (129) {
-  	{	/* array: 2 elements */
-  		/* [1] */
---- 181,185 ----
-  };
-  
-! resource 'ics#' (256) {
-  	{	/* array: 2 elements */
-  		/* [1] */
-***************
-*** 192,196 ****
-  };
-  
-! resource 'ics4' (129) {
-  	$"0000 EC0D 6FC0 0000 00DE BDD6 666F C000"
-  	$"DEBB EE65 6666 6FC0 E2CD BEBB 6666 666E"
---- 192,196 ----
-  };
-  
-! resource 'ics4' (256) {
-  	$"0000 EC0D 6FC0 0000 00DE BDD6 666F C000"
-  	$"DEBB EE65 6666 6FC0 E2CD BEBB 6666 666E"
-***************
-*** 203,207 ****
-  };
-  
-! resource 'ics8' (129) {
-  	$"0000 00F5 81F7 017F EBF1 2BF5 0000 0000"
-  	$"0000 F888 8256 7FD2 D2D2 ECF1 F800 0000"
---- 203,207 ----
-  };
-  
-! resource 'ics8' (256) {
-  	$"0000 00F5 81F7 017F EBF1 2BF5 0000 0000"
-  	$"0000 F888 8256 7FD2 D2D2 ECF1 F800 0000"
diff --git a/mac/wxMac-2.8.9.patch b/mac/wxMac-2.8.9.patch
new file mode 100644
index 0000000..b39abfa
--- /dev/null
+++ b/mac/wxMac-2.8.9.patch
@@ -0,0 +1,422 @@
+diff -wruN wxWidgets-2.8.9-orig/include/wx/mac/carbon/sound.h wxWidgets-2.8.9/include/wx/mac/carbon/sound.h
+--- wxWidgets-2.8.9-orig/include/wx/mac/carbon/sound.h	2008-09-15 04:29:32.000000000 -0500
++++ wxWidgets-2.8.9/include/wx/mac/carbon/sound.h	2009-01-10 16:53:37.000000000 -0600
+@@ -21,13 +21,14 @@
+ {
+ public:
+   wxSound();
+-  wxSound(const wxString& fileName, bool isResource = FALSE);
++  wxSound(const wxString& fileName, bool isResource = false);
+   wxSound(int size, const wxByte* data);
+   virtual ~wxSound();
+ 
+ public:
+-  bool  Create(const wxString& fileName, bool isResource = FALSE);
+-  bool  IsOk() const { return !m_sndname.IsEmpty(); }
++  bool  Create(const wxString& fileName, bool isResource = false);
++  bool  Create(int size, const wxByte* data);
++  bool  IsOk() const { return !m_sndname.IsEmpty() || m_hSnd; }
+   static void  Stop();
+   static bool IsPlaying();
+ 
+diff -wruN wxWidgets-2.8.9-orig/src/common/menucmn.cpp wxWidgets-2.8.9/src/common/menucmn.cpp
+--- wxWidgets-2.8.9-orig/src/common/menucmn.cpp	2008-09-15 04:28:18.000000000 -0500
++++ wxWidgets-2.8.9/src/common/menucmn.cpp	2009-01-10 16:53:27.000000000 -0600
+@@ -194,7 +194,11 @@
+     {
+         if ( (label[n] == '+') || (label[n] == '-') )
+         {
++            // differentiate between a ctrl that will be translated to cmd on mac
++            // and an explicit xctrl that will not be translated and remains a ctrl
+             if ( CompareAccelString(current, wxTRANSLATE("ctrl")) )
++                accelFlags |= wxACCEL_CMD;
++            else if ( CompareAccelString(current, wxTRANSLATE("xctrl")) )
+                 accelFlags |= wxACCEL_CTRL;
+             else if ( CompareAccelString(current, wxTRANSLATE("alt")) )
+                 accelFlags |= wxACCEL_ALT;
+@@ -312,8 +316,12 @@
+     int flags = GetFlags();
+     if ( flags & wxACCEL_ALT )
+         text += _("Alt-");
+-    if ( flags & wxACCEL_CTRL )
++    if ( flags & wxACCEL_CMD )
+         text += _("Ctrl-");
++#ifdef __WXMAC__
++    if ( flags & wxACCEL_CTRL )
++        text += _("XCtrl-");
++#endif
+     if ( flags & wxACCEL_SHIFT )
+         text += _("Shift-");
+ 
+diff -wruN wxWidgets-2.8.9-orig/src/mac/carbon/sound.cpp wxWidgets-2.8.9/src/mac/carbon/sound.cpp
+--- wxWidgets-2.8.9-orig/src/mac/carbon/sound.cpp	2008-09-15 04:29:28.000000000 -0500
++++ wxWidgets-2.8.9/src/mac/carbon/sound.cpp	2009-01-10 16:53:37.000000000 -0600
+@@ -86,6 +86,7 @@
+ #endif
+ 
+ #if USE_QUICKTIME
++
+ // ------------------------------------------------------------------
+ //          wxQTTimer - Handle Asyncronous Playing
+ // ------------------------------------------------------------------
+@@ -154,65 +155,6 @@
+ 
+ };
+ 
+-
+-class wxSMTimer : public wxTimer
+-{
+-public:
+-    wxSMTimer(void* hSnd, void* pSndChannel, bool bLoop, bool* playing)
+-        : m_hSnd(hSnd), m_pSndChannel(pSndChannel), m_bLoop(bLoop), m_pbPlaying(playing)
+-    {
+-    }
+-
+-    virtual ~wxSMTimer()
+-    {
+-        if(m_pbPlaying)
+-            *m_pbPlaying = false;
+-        SndDisposeChannel((SndChannelPtr)m_pSndChannel, TRUE);
+-        Stop();
+-    }
+-
+-    void Notify()
+-    {
+-        if (m_pbPlaying && !*m_pbPlaying)
+-        {
+-            Shutdown();
+-        }
+-
+-        SCStatus stat;
+-
+-        if (SndChannelStatus((SndChannelPtr)m_pSndChannel, sizeof(SCStatus), &stat) != 0)
+-            Shutdown();
+-
+-        //if the sound isn't playing anymore, see if it's looped,
+-        //and if so play it again, otherwise close things up
+-        if (stat.scChannelBusy == FALSE)
+-        {
+-            if (m_bLoop)
+-            {
+-                if(SndPlay((SndChannelPtr)m_pSndChannel, (SndListHandle) m_hSnd, true) != noErr)
+-                    Shutdown();
+-            }
+-            else
+-                Shutdown();
+-        }
+-    }
+-
+-    void Shutdown()
+-    {
+-        delete this;
+-    }
+-
+-    void* GetChannel() {return m_pSndChannel;}
+-
+-protected:
+-    void* m_hSnd;
+-    void* m_pSndChannel;
+-    bool m_bLoop;
+-
+-public:
+-    bool* m_pbPlaying;
+-};
+-
+ // ------------------------------------------------------------------
+ //          wxSound
+ // ------------------------------------------------------------------
+@@ -265,8 +207,9 @@
+ }
+ 
+ wxSound::wxSound(int size, const wxByte* data)
+-: m_hSnd((char*)data), m_waveLength(size), m_pTimer(NULL), m_type(wxSound_MEMORY)
++: m_hSnd(NULL), m_waveLength(0), m_pTimer(NULL), m_type(wxSound_NONE)
+ {
++   Create(size, data);
+ }
+ 
+ wxSound::~wxSound()
+@@ -277,19 +220,25 @@
+ {
+     Stop();
+ 
++    m_sndname.Empty();
++
+     if (isResource)
+     {
+ #ifdef __WXMAC__
+-        m_type = wxSound_RESOURCE;
+-
+-        Str255 lpSnd ;
+-
+-        wxMacStringToPascal( fileName , lpSnd ) ;
++        CFURLRef url;
++        CFStringRef path;
+ 
+-        m_sndname = fileName;
+-        m_hSnd = (char*) GetNamedResource('snd ', (const unsigned char *) lpSnd);
+-#else
+-        return false;
++        url = CFBundleCopyResourceURL(CFBundleGetMainBundle(),
++                                      wxMacCFStringHolder(fileName,wxLocale::GetSystemEncoding()),
++                                      NULL,
++                                      NULL);
++        if (url)
++        {
++            path = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
++            CFRelease(url);
++            m_type = wxSound_FILE;
++            m_sndname = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding());
++        }
+ #endif
+     }
+     else
+@@ -298,6 +247,15 @@
+         m_sndname = fileName;
+     }
+ 
++    return !m_sndname.IsEmpty();
++}
++
++bool wxSound::Create(int size, const wxByte* data)
++{
++   m_hSnd = (char *)data;
++   m_waveLength = size;
++   m_type = wxSound_MEMORY;
++
+     return true;
+ }
+ 
+@@ -308,107 +266,70 @@
+ #if USE_QUICKTIME
+ 
+     Movie movie;
++    Handle dataRef = nil;
++    OSType dataRefType;
++    OSErr err = noErr;
++    
++    if (!wxInitQT())
++        return false;
+ 
+     switch(m_type)
+     {
+     case wxSound_MEMORY:
+         {
+-            if (!wxInitQT())
+-                return false;
+-            Handle myHandle, dataRef = nil;
+-            MovieImportComponent miComponent;
+-            Track targetTrack = nil;
+-            TimeValue addedDuration = 0;
+-            long outFlags = 0;
+-            OSErr err;
+-            ComponentResult result;
+-
+-            myHandle = NewHandleClear((Size)m_waveLength);
+-
+-            BlockMove(m_hSnd, *myHandle, m_waveLength);
+-
+-            err = PtrToHand(&myHandle, &dataRef, sizeof(Handle));
++            Handle myHandle = nil;
++            unsigned long type;
++            unsigned long atoms[5];
+ 
+             if (memcmp(&m_hSnd[8], "WAVE", 4) == 0)
+-                miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeWave);
++                type = kQTFileTypeWave;
+             else if (memcmp(&m_hSnd[8], "AIFF", 4) == 0)
+-                miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFF);
++                type = kQTFileTypeAIFF;
+             else if (memcmp(&m_hSnd[8], "AIFC", 4) == 0)
+-                miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFC);
++                type = kQTFileTypeAIFC;
+             else
+             {
+                 wxLogSysError(wxT("wxSound - Location in memory does not contain valid data"));
+                 return false;
+             }
+ 
+-            movie = NewMovie(0);
+-
+-            result = MovieImportDataRef(miComponent,                dataRef,
+-                                        HandleDataHandlerSubType,   movie,
+-                                        nil,                        &targetTrack,
+-                                        nil,                        &addedDuration,
+-                                        movieImportCreateTrack,     &outFlags);
+-
+-            if (result != noErr)
+-            {
+-                wxLogSysError(wxString::Format(wxT("Couldn't import movie data\nError:%i"), (int)result));
+-            }
+-
+-            SetMovieVolume(movie, kFullVolume);
+-            GoToBeginningOfMovie(movie);
++            atoms[0] = EndianU32_NtoB(sizeof(long) * 3);
++            atoms[1] = EndianU32_NtoB(kDataRefExtensionMacOSFileType);
++            atoms[2] = EndianU32_NtoB(type);
++            atoms[3] = EndianU32_NtoB(sizeof(long) * 2 + m_waveLength);
++            atoms[4] = EndianU32_NtoB(kDataRefExtensionInitializationData);
++
++            err = 0;
++            err |= PtrToHand(&myHandle, &dataRef, sizeof(Handle));
++            err |= PtrAndHand("\p", dataRef, 1);
++            err |= PtrAndHand(atoms, dataRef, sizeof(long) * 5);
++            err |= PtrAndHand(m_hSnd, dataRef, m_waveLength);
+ 
+-            DisposeHandle(myHandle);
++            dataRefType = HandleDataHandlerSubType;
+         }
+         break;
+-    case wxSound_RESOURCE:
+-        {
+-            SoundComponentData data;
+-            unsigned long numframes, offset;
+-
+-            ParseSndHeader((SndListHandle)m_hSnd, &data, &numframes, &offset);
+-            //m_waveLength = numFrames * data.numChannels;
+-
+-            SndChannelPtr pSndChannel;
+-            SndNewChannel(&pSndChannel, sampledSynth,
+-                initNoInterp
+-                + (data.numChannels == 1 ? initMono : initStereo), NULL);
+-
+-            if(SndPlay(pSndChannel, (SndListHandle) m_hSnd, flags & wxSOUND_ASYNC ? 1 : 0) != noErr)
+-                return false;
+-
+-            if (flags & wxSOUND_ASYNC)
++    case wxSound_FILE:
+             {
+-                lastSoundTimer = ((wxSMTimer*&)m_pTimer)
+-                    = new wxSMTimer(pSndChannel, m_hSnd, flags & wxSOUND_LOOP ? 1 : 0,
+-                                    &lastSoundIsPlaying);
+-                lastSoundIsPlaying = true;
+-
+-                ((wxTimer*)m_pTimer)->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
+-            }
+-            else
+-                SndDisposeChannel(pSndChannel, TRUE);
+-
+-            return true;
++            err = QTNewDataReferenceFromFullPathCFString(wxMacCFStringHolder(m_sndname,wxLocale::GetSystemEncoding()),
++                                                         (UInt32)kQTNativeDefaultPathStyle,
++                                                         0,
++                                                         &dataRef,
++                                                         &dataRefType);
+         }
+         break;
+-    case wxSound_FILE:
+-        {
+-            if (!wxInitQT())
++    default:
+                 return false;
+-
+-            OSErr err = noErr ;
+-
+-            Handle dataRef = NULL;
+-            OSType dataRefType;
+-
+-            err = QTNewDataReferenceFromFullPathCFString(wxMacCFStringHolder(m_sndname,wxLocale::GetSystemEncoding()),
+-                (UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType);
++    }//end switch(m_type)
+ 
+             wxASSERT(err == noErr);
+ 
+             if (NULL != dataRef || err != noErr)
+             {
+-                err = NewMovieFromDataRef( &movie, newMovieDontAskUnresolvedDataRefs , NULL, dataRef, dataRefType );
++        err = NewMovieFromDataRef(&movie,
++                                  0,
++                                  nil,
++                                  dataRef,
++                                  dataRefType);
+                 wxASSERT(err == noErr);
+                 DisposeHandle(dataRef);
+             }
+@@ -416,17 +337,13 @@
+             if (err != noErr)
+             {
+                 wxLogSysError(
+-                    wxString::Format(wxT("wxSound - Could not open file: %s\nError:%i"), m_sndname.c_str(), err )
++            wxString::Format(wxT("wxSound - Could not create movie\nError:%i"), err)
+                     );
+                 return false;
+             }
+-        }
+-        break;
+-    default:
+-        return false;
+-    }//end switch(m_type)
+ 
+-    //Start the movie!
++    SetMovieVolume(movie, kFullVolume);
++    GoToBeginningOfMovie(movie);
+     StartMovie(movie);
+ 
+     if (flags & wxSOUND_ASYNC)
+@@ -473,12 +390,8 @@
+ void* wxSound::GetHandle()
+ {
+ #if USE_QUICKTIME
+-    if(m_type == wxSound_RESOURCE)
+-        return (void*)  ((wxSMTimer*)m_pTimer)->GetChannel();
+-
+     return (void*) ((wxQTTimer*) m_pTimer)->GetMovie();
+ #endif
+     return NULL;
+ }
+-
+ #endif //wxUSE_SOUND
+diff -wruN wxWidgets-2.8.9-orig/src/mac/carbon/uma.cpp wxWidgets-2.8.9/src/mac/carbon/uma.cpp
+--- wxWidgets-2.8.9-orig/src/mac/carbon/uma.cpp	2008-09-15 04:29:29.000000000 -0500
++++ wxWidgets-2.8.9/src/mac/carbon/uma.cpp	2009-01-10 16:53:27.000000000 -0600
+@@ -187,13 +187,20 @@
+ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
+ {
+     if ( !entry )
++    {
++        SetMenuItemModifiers( menu, item , kMenuNoModifiers ); 
++        SetMenuItemKeyGlyph( menu, item , kMenuNullGlyph );        
++        SetItemCmd( menu, item , 0 ); 
+         return ;
++    }
+ 
+     UInt8 modifiers = 0 ;
+     SInt16 key = entry->GetKeyCode() ;
+     if ( key )
+     {
+-        bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL);
++        bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CMD);
++        if ( !explicitCommandKey )
++            modifiers |= kMenuNoCommandModifier ;
+ 
+         if (entry->GetFlags() & wxACCEL_ALT)
+             modifiers |= kMenuOptionModifier ;
+@@ -201,12 +208,14 @@
+         if (entry->GetFlags() & wxACCEL_SHIFT)
+             modifiers |= kMenuShiftModifier ;
+ 
++        if (entry->GetFlags() & wxACCEL_CTRL)
++            modifiers |= kMenuControlModifier ;
++
++
+         SInt16 glyph = 0 ;
+         SInt16 macKey = key ;
+         if ( key >= WXK_F1 && key <= WXK_F15 )
+         {
+-            if ( !explicitCommandKey )
+-                modifiers |= kMenuNoCommandModifier ;
+ 
+             // for some reasons this must be 0 right now
+             // everything else leads to just the first function key item
+@@ -303,11 +312,6 @@
+                     macKey = toupper( key ) ;
+                     break ;
+             }
+-
+-            // we now allow non command key shortcuts
+-            // remove in case this gives problems
+-            if ( !explicitCommandKey )
+-                modifiers |= kMenuNoCommandModifier ;
+         }
+ 
+         // 1d and 1e have special meaning to SetItemCmd, so
diff --git a/plug-ins/highpass.ny b/plug-ins/highpass.ny
index 143b069..2952a95 100644
--- a/plug-ins/highpass.ny
+++ b/plug-ins/highpass.ny
@@ -4,10 +4,10 @@
 ;categories "http://lv2plug.in/ns/lv2core#HighpassPlugin"
 ;name "High Pass Filter..."
 ;action "Performing High Pass Filter..."
-;info "by Dominic Mazzoni, modified by David R. Sky\nReleased under terms of the GNU General Public License Version 2\nAttenuates frequencies below your specified cutoff frequency.\nHigher rolloff values give a sharper attenuation of frequencies below\nthe cutoff frequency. If using a rolloff of 6 dB, a [q] value greater than\ndefault 0.7 increases resonance ['ringing'] of the cutoff frequency and\ncould result in clipping."
+;info "by Dominic Mazzoni, modified by David R. Sky\nReleased under terms of the GNU General Public License Version 2\nAttenuates frequencies below your specified cutoff frequency.\nHigher rolloff values give a sharper attenuation of frequencies below\nthe cutoff frequency. If using a rolloff of 12 dB, a [q] value greater than\ndefault 0.7 increases resonance ['ringing'] of the cutoff frequency and\ncould result in clipping."
 
-;control rolloff-choice "     Rolloff [dB per octave]" choice " 3 dB, 6 dB,12 dB,18 dB,24 dB" 0
-;control q "     Filter quality [q] for 6 dB rolloff" real "" 0.7071 .1 20
+;control rolloff-choice "     Rolloff [dB per octave]" choice "  6 dB,12 dB,24 dB,36 dB,48 dB" 0
+;control q "     Filter quality [q] for 12 dB rolloff" real "" 0.7071 .1 20
 ;control f "     Cutoff frequency [Hz]" real "" 1000 1 20000
 
 ; note that all Nyquist highpass functions 
@@ -17,32 +17,32 @@
 ; to deal with stereo selection,
 ; and dummy q arg for all but highpass2 
 
-; 3dB/octave
+; 6dB/octave
 (defun hp-s (s f q) ; dummy q arg
 (hp s f))
 
-; 6dB/octave
+; 12dB/octave
 (defun highpass2-s (s f q)
 (if (arrayp s)
 (vector (highpass2 (aref s 0) f q)
 (highpass2 (aref s 1) f q))
 (highpass2 s f q)))
 
-; 12dB/octave
+; 24dB/octave
 (defun highpass4-s (s f q) ; dummy q arg
 (if (arrayp s)
 (vector (highpass4 (aref s 0) f)
 (highpass4 (aref s 1) f))
 (highpass4 s f)))
 
-; 18dB/octave
+; 36dB/octave
 (defun highpass6-s (s f q) ; dummy q arg
 (if (arrayp s)
 (vector (highpass6 (aref s 0) f)
 (highpass6 (aref s 1) f))
 (highpass6 s f)))
 
-; 24dB/octave
+; 48dB/octave
 (defun highpass8-s (s f q) ; dummy q arg
 (if (arrayp s)
 (vector (highpass8 (aref s 0) f)
@@ -64,7 +64,7 @@
 (= (check q 0.1 20) 1))
 (strcat error-msg (format nil
 "q value ~a lies outside valid range 0.1 to 20     
-for your chosen rolloff of 6 dB per octave.
+for your chosen rolloff of 12 dB per octave.
 " q))
 error-msg))
 
diff --git a/plug-ins/lowpass.ny b/plug-ins/lowpass.ny
index 704b42c..bd57db8 100644
--- a/plug-ins/lowpass.ny
+++ b/plug-ins/lowpass.ny
@@ -4,10 +4,10 @@
 ;categories "http://lv2plug.in/ns/lv2core#LowpassPlugin"
 ;name "Low Pass Filter..."
 ;action "Performing Low Pass Filter..."
-;info "by Dominic Mazzoni, modified by David R. Sky\nReleased under terms of the GNU General Public License Version 2\nAttenuates high frequencies above your specified cutoff frequency.\nHigher rolloff values give a sharper attenuation of frequencies above\nthe cutoff frequency. If using a rolloff of 6 dB, a [q] value greater than\ndefault 0.7 increases resonance ['ringing'] of the cutoff frequency and\ncould result in clipping.""
+;info "by Dominic Mazzoni, modified by David R. Sky\nReleased under terms of the GNU General Public License Version 2\nAttenuates high frequencies above your specified cutoff frequency.\nHigher rolloff values give a sharper attenuation of frequencies above\nthe cutoff frequency. If using a rolloff of 12 dB, a [q] value greater than\ndefault 0.7 increases resonance ['ringing'] of the cutoff frequency and\ncould result in clipping.""
 
-;control rolloff-choice "     Rolloff [dB per octave]" choice " 3 dB, 6 dB,12 dB,18 dB,24 dB" 0
-;control q "     Filter quality [q] for 6 dB rolloff" real "" 0.7071 .1 20
+;control rolloff-choice "     Rolloff [dB per octave]" choice "  6 dB,12 dB,24 dB,36 dB,48 dB" 0
+;control q "     Filter quality [q] for 12 dB rolloff" real "" 0.7071 .1 20
 ;control f "     Cutoff frequency [Hz]" real "" 1000 1 20000
 
 ; note that all Nyquist lowpass functions 
@@ -17,32 +17,32 @@
 ; to deal with stereo selection,
 ; and dummy q arg for all but lowpass2 
 
-; 3dB/octave
+; 6dB/octave
 (defun lp-s (s f q) ; dummy q arg
 (lp s f))
 
-; 6dB/octave
+; 12dB/octave
 (defun lowpass2-s (s f q)
 (if (arrayp s)
 (vector (lowpass2 (aref s 0) f q)
 (lowpass2 (aref s 1) f q))
 (lowpass2 s f q)))
 
-; 12dB/octave
+; 24dB/octave
 (defun lowpass4-s (s f q) ; dummy q arg
 (if (arrayp s)
 (vector (lowpass4 (aref s 0) f)
 (lowpass4 (aref s 1) f))
 (lowpass4 s f)))
 
-; 18dB/octave
+; 36dB/octave
 (defun lowpass6-s (s f q) ; dummy q arg
 (if (arrayp s)
 (vector (lowpass6 (aref s 0) f)
 (lowpass6 (aref s 1) f))
 (lowpass6 s f)))
 
-; 24dB/octave
+; 48dB/octave
 (defun lowpass8-s (s f q) ; dummy q arg
 (if (arrayp s)
 (vector (lowpass8 (aref s 0) f)
@@ -64,7 +64,7 @@
 (= (check q 0.1 20) 1))
 (strcat error-msg (format nil
 "q value ~a lies outside valid range 0.1 to 20     
-for your chosen rolloff of 6 dB per octave.
+for your chosen rolloff of 12 dB per octave.
 " q))
 error-msg))
 
diff --git a/src/Audacity.h b/src/Audacity.h
index 4bcf9b9..9ea2268 100644
--- a/src/Audacity.h
+++ b/src/Audacity.h
@@ -20,9 +20,9 @@
 // Increment as appropriate every time you release a new version
 #define AUDACITY_VERSION   1
 #define AUDACITY_RELEASE   3
-#define AUDACITY_REVISION  6
+#define AUDACITY_REVISION  7
 #define AUDACITY_MODLEVEL  0
-#define AUDACITY_SUFFIX    wxT("") // wxT("-alpha_") __TDATE__ 
+#define AUDACITY_SUFFIX    wxT("") // wxT("-alpha_") __TDATE__
 
 #define AUDACITY_MAKESTR( x ) #x
 #define AUDACITY_QUOTE( x ) AUDACITY_MAKESTR( x )
@@ -50,8 +50,6 @@
 
 class wxWindow;
 
-extern wxWindow *gParentWindow;
-
 void QuitAudacity(bool bForce);
 void QuitAudacity();
 
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 08d1a18..1ec714e 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -61,6 +61,7 @@ It handles initialization and termination by subclassing wxApp.
 #include "Benchmark.h"
 #include "DirManager.h"
 #include "effects/LoadEffects.h"
+#include "FFmpeg.h"
 #include "FreqWindow.h"
 #include "Internat.h"
 #include "LangChoice.h"
@@ -79,6 +80,7 @@ It handles initialization and termination by subclassing wxApp.
 #include "FFT.h"
 #include "BlockFile.h"
 #include "ondemand/ODManager.h"
+#include "commands/Keyboard.h"
 //temporarilly commented out till it is added to all projects
 //#include "Profiler.h"
 
@@ -89,8 +91,6 @@ It handles initialization and termination by subclassing wxApp.
 #include "import/ImportQT.h"
 #endif
 
-#include "FFmpeg.h"
-
 #ifdef _DEBUG
     #ifdef _MSC_VER
         #undef THIS_FILE
@@ -170,6 +170,10 @@ It handles initialization and termination by subclassing wxApp.
 #     pragma comment(lib, "rasqal")
 #  endif
 
+#  if defined(USE_SBSMS)
+#     pragma comment(lib, "sbsms")
+#  endif
+
 #  if defined(USE_SOUNDTOUCH)
 #     pragma comment(lib, "soundtouch")
 #  endif
@@ -179,21 +183,7 @@ It handles initialization and termination by subclassing wxApp.
 #  endif
 
 #endif //(__WXMSW__)
-#if 0
-#if wxUSE_ACCESSIBILITY
-#if wxCHECK_VERSION(2, 8, 0)
-WXEXPORT const wxChar overrideTextCtrlNameStr[] = wxT("");
-WXEXPORT const wxChar overrideChoiceNameStr[] = wxT("");
-WXEXPORT const wxChar overrideComboBoxNameStr[] = wxT("");
-WXEXPORT const wxChar overrideSliderNameStr[] = wxT("");
-#else
-const wxChar *overrideTextCtrlNameStr = wxT("");
-const wxChar *overrideChoiceNameStr = wxT("");
-const wxChar *overrideComboBoxNameStr = wxT("");
-const wxChar *overrideSliderNameStr = wxT("");
-#endif
-#endif
-#endif
+
 ////////////////////////////////////////////////////////////
 /// Custom events
 ////////////////////////////////////////////////////////////
@@ -220,8 +210,7 @@ void wxOnAssert(const wxChar *fileName, int lineNumber, const wxChar *msg)
 }
 #endif
 
-wxFrame *gParentFrame = NULL;
-wxWindow *gParentWindow = NULL;
+static wxFrame *gParentFrame = NULL;
 
 bool gInited = false;
 bool gIsQuitting = false;
@@ -250,15 +239,6 @@ void QuitAudacity(bool bForce)
 
    gIsQuitting = true;
 
-   wxLogWindow *lw = wxGetApp().mLogger;
-   if (lw)
-   {
-      lw->EnableLogging(false);
-      lw->SetActiveTarget(NULL);
-      delete lw;
-      wxGetApp().mLogger = NULL;
-   }
-
    // Try to close each open window.  If the user hits Cancel
    // in a Save Changes dialog, don't continue.
    // BG: unless force is true
@@ -283,13 +263,21 @@ void QuitAudacity(bool bForce)
       }
    }
 
+   wxLogWindow *lw = wxGetApp().mLogger;
+   if (lw)
+   {
+      lw->EnableLogging(false);
+      lw->SetActiveTarget(NULL);
+      delete lw;
+      wxGetApp().mLogger = NULL;
+   }
+
    if (gFreqWindow)
       gFreqWindow->Destroy();
+   gFreqWindow = NULL;
 
    if (gParentFrame)
       gParentFrame->Destroy();
-
-   gFreqWindow = NULL;
    gParentFrame = NULL;
 
    CloseScreenshotTools();
@@ -301,7 +289,7 @@ void QuitAudacity(bool bForce)
    //temporarilly commented out till it is added to all projects
    //delete Profiler::Instance();
    
-      //Delete the clipboard
+   //Delete the clipboard
    AudacityProject::DeleteClipboard();
    
    //delete the static lock for audacity projects
@@ -349,7 +337,7 @@ public:
          return false;
       }
 
-      AudacityProject *project = CreateNewAudacityProject(gParentWindow);
+      AudacityProject *project = CreateNewAudacityProject();
 
       wxString cmd(data);
 
@@ -433,7 +421,7 @@ void AudacityApp::MacNewFile()
    // when no project windows are open.
  
    if (gAudacityProjects.GetCount() == 0) {
-      CreateNewAudacityProject(gParentWindow);
+      CreateNewAudacityProject();
    }
 }
 
@@ -523,7 +511,7 @@ bool AudacityApp::MRUOpen(wxString fileName) {
          // bad things can happen, including data files moving to the new
          // project directory, etc.
          if (!proj || proj->GetDirty() || !proj->GetIsEmpty()) {
-            proj = CreateNewAudacityProject(gParentWindow);
+            proj = CreateNewAudacityProject();
          }
          // This project is clean; it's never been touched.  Therefore
          // all relevant member variables are in their initial state,
@@ -632,8 +620,8 @@ void AudacityApp::InitLang( const wxString & lang )
 // main frame
 bool AudacityApp::OnInit()
 {
-
    mLogger = NULL;
+
    #if USE_QUICKTIME
    ::InitQuicktime();
    #endif
@@ -778,8 +766,6 @@ bool AudacityApp::OnInit()
       return false;
    }
 
-
-
    // More initialization
    InitCleanSpeech();
 
@@ -787,6 +773,7 @@ bool AudacityApp::OnInit()
    InitAudioIO();
 
    LoadEffects();
+
 #ifdef EXPERIMENTAL_ONDEMAND
    //The On-Demand managerr initializes the first time its singleton is accessed
 //   ODManager::Instance();
@@ -795,11 +782,7 @@ bool AudacityApp::OnInit()
 #ifdef __WXMAC__
 
    // On the Mac, users don't expect a program to quit when you close the last window.
-   // Create an offscreen frame with a menu bar.  The frame should never
-   // be visible, but when all other windows are closed, this menu bar should
-   // become visible.
-
-   gParentFrame = new wxFrame(NULL, -1, wxT("invisible"), wxPoint(5000, 5000), wxSize(100, 100), wxFRAME_NO_TASKBAR);
+   // Create a menubar that will show when all project windows are closed.
 
    wxMenu *fileMenu = new wxMenu();
    fileMenu->Append(wxID_NEW, wxT("&New\tCtrl+N"));
@@ -811,35 +794,25 @@ bool AudacityApp::OnInit()
    wxMenuBar *menuBar = new wxMenuBar();
    menuBar->Append(fileMenu, wxT("&File"));
 
-   gParentFrame->SetMenuBar(menuBar);
+   wxMenuBar::MacSetCommonMenuBar(menuBar);
 
-   gParentFrame->Hide();
+   // This invisibale frame will be the "root" of all other frames and will
+   // become the active frame when no projects are open.
+   gParentFrame = new wxFrame(NULL, -1, wxEmptyString, wxPoint(0, 0), wxSize(0, 0), 0);
 
-   SetTopWindow(gParentFrame);
 #endif //__WXMAC__
 
    SetExitOnFrameDelete(true);
 
+   AudacityProject *project = CreateNewAudacityProject();
 
-
-   AudacityProject *project = CreateNewAudacityProject(gParentWindow);
-
-
-
-   project->Show( false );
    wxWindow * pWnd = MakeHijackPanel() ;
    if( pWnd )
    {
+      project->Show( false );
       SetTopWindow(pWnd);
       pWnd->Show( true );
    }
-   else
-   {
-      SetTopWindow(project);
-      project->Show( true );
-   }
-
-
 
    delete temporarywindow;
    
@@ -860,7 +833,9 @@ bool AudacityApp::OnInit()
    mLogger->EnableLogging(true);
    mLogger->SetLogLevel(wxLOG_Max);
 
+   #ifdef USE_FFMPEG
    FFmpegStartup();
+   #endif
 
    //
    // Auto-recovery
@@ -873,7 +848,6 @@ bool AudacityApp::OnInit()
       QuitAudacity(true);
    }
 
-
    //
    // Command-line parsing, but only if we didn't recover
    //
@@ -929,7 +903,7 @@ bool AudacityApp::OnInit()
             if (!project)
             {
                // Create new window for project
-               project = CreateNewAudacityProject(gParentWindow);
+               project = CreateNewAudacityProject();
             }
             project->OpenFile(argv[option]);
             project = NULL; // don't reuse this project for other file
@@ -1006,7 +980,7 @@ bool AudacityApp::OnInit()
             if (!project)
             {
                // Create new window for project
-               project = CreateNewAudacityProject(gParentWindow);
+               project = CreateNewAudacityProject();
             }
             project->OpenFile(fileToOpen);
             project = NULL; // don't reuse this project for other file
@@ -1395,9 +1369,6 @@ int AudacityApp::OnExit()
    DeinitAudioIO();
    Internat::CleanUp();// JKC
 
-   if (mLogger)
-      delete mLogger;
-
    if (mLocale)
       delete mLocale;
    delete mChecker;
@@ -1439,7 +1410,7 @@ void AudacityApp::OnMenuNew(wxCommandEvent & event)
    // all platforms.
  
    if(gAudacityProjects.GetCount() == 0)
-      CreateNewAudacityProject(gParentWindow);
+      CreateNewAudacityProject();
    else
       event.Skip();
 }
diff --git a/src/AudacityApp.h b/src/AudacityApp.h
index d5b76e6..0b9f86c 100644
--- a/src/AudacityApp.h
+++ b/src/AudacityApp.h
@@ -30,8 +30,6 @@ void SaveWindowSize();
 void QuitAudacity(bool bForce);
 void QuitAudacity();
 
-extern wxFrame *gParentFrame;
-
 extern bool gIsQuitting;
 
 // Asynchronous open
@@ -123,16 +121,17 @@ class AudacityApp:public wxApp {
    void AssociateFileTypes(); 
 	#endif
 
-   // A list of directories that should be searched
-   // for Audacity files (plug-ins, help files, etc.).  On Unix
-   // this will include the directory Audacity was installed into,
-   // plus the current user's .audacity-files directory.  Additional
-   // directories can be specified using the AUDACITY_PATH environment
-   // variable.  On Windows or Mac OS, this will include the directory
-   // which contains the Audacity program.  
+   /** \brief A list of directories that should be searched for Audacity files
+    * (plug-ins, help files, etc.). 
+    *
+    * On Unix this will include the directory Audacity was installed into,
+    * plus the current user's .audacity-data/Plug-Ins directory.  Additional
+    * directories can be specified using the AUDACITY_PATH environment
+    * variable.  On Windows or Mac OS, this will include the directory
+    * which contains the Audacity program. */
    wxArrayString audacityPathList;
 
-   // Default temp dir
+   /** \brief Default temp directory */
    wxString defaultTempDir;
 
    // Useful functions for working with search paths
diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index 0895e3c..39e147e 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -217,6 +217,20 @@ wxString DeviceName(const PaDeviceInfo* info)
 #endif
 }
 
+bool AudioIO::ValidateDeviceNames(wxString play, wxString rec)
+{
+#if USE_PORTAUDIO_V19
+   const PaDeviceInfo *pInfo = Pa_GetDeviceInfo(AudioIO::getPlayDevIndex(play));
+   const PaDeviceInfo *rInfo = Pa_GetDeviceInfo(AudioIO::getRecordDevIndex(rec));
+
+   if (!pInfo || !rInfo || pInfo->hostApi != rInfo->hostApi) {
+      return false;
+   }
+#endif
+
+   return true;
+}
+
 AudioIO::AudioIO()
 {
    mAudioThreadShouldCallFillBuffersOnce = false;
@@ -473,7 +487,7 @@ void AudioIO::HandleDeviceChange()
       playbackParameters.suggestedLatency =
          Pa_GetDeviceInfo(playDeviceNum)->defaultLowOutputLatency;
    else
-      playbackParameters.suggestedLatency = 100; // we're just probing anyway
+      playbackParameters.suggestedLatency = DEFAULT_LATENCY_CORRECTION/1000.0; 
 
    PaStreamParameters captureParameters;
  
@@ -485,7 +499,7 @@ void AudioIO::HandleDeviceChange()
       captureParameters.suggestedLatency =
          Pa_GetDeviceInfo(recDeviceNum)->defaultLowInputLatency;
    else
-      captureParameters.suggestedLatency = 100; // we're just probing anyway
+      captureParameters.suggestedLatency = DEFAULT_LATENCY_CORRECTION/1000.0; 
 
    // try opening for record and playback
    error = Pa_OpenStream(&stream,
@@ -610,7 +624,7 @@ bool AudioIO::StartPortAudioStream(double sampleRate,
    PaStreamParameters *playbackParameters = NULL;
    PaStreamParameters *captureParameters = NULL;
    
-   double latencyDuration = 100.0;
+   double latencyDuration = DEFAULT_LATENCY_DURATION;
    gPrefs->Read(wxT("/AudioIO/LatencyDuration"), &latencyDuration);
 
    if( numPlaybackChannels > 0)
@@ -1328,7 +1342,7 @@ void AudioIO::StopStream()
          // case that we do not apply latency correction when recording the
          // first track in a project.
          //
-         double latencyCorrection = 0;
+         double latencyCorrection = DEFAULT_LATENCY_CORRECTION;
          gPrefs->Read(wxT("/AudioIO/LatencyCorrection"), &latencyCorrection);
          
          double recordingOffset =
@@ -1372,7 +1386,7 @@ void AudioIO::StopStream()
                      track->SetOffset(track->GetStartTime() + recordingOffset);
                      if(track->GetEndTime() < 0.)
                      {
-                        wxMessageDialog m(NULL, _("Latency setting has caused the recorded audio to be hidden before zero.\nAudacity has brought it back to start at zero.\nYou may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."), _("Latency problem"), wxOK);
+                        wxMessageDialog m(NULL, _("Latency Correction setting has caused the recorded audio to be hidden before zero.\nAudacity has brought it back to start at zero.\nYou may have to use the Time Shift Tool (<---> or F5) to drag the track to the right place."), _("Latency problem"), wxOK);
                         m.ShowModal();
                         track->SetOffset(0.);
                      }
@@ -1611,7 +1625,7 @@ wxArrayLong AudioIO::GetSupportedCaptureRates(int devIndex, double rate)
    }
 
 #if USE_PORTAUDIO_V19
-   double latencyDuration = 100.0;
+   double latencyDuration = DEFAULT_LATENCY_DURATION;
    long recordChannels = 1;
    gPrefs->Read(wxT("/AudioIO/LatencyDuration"), &latencyDuration);
    gPrefs->Read(wxT("/AudioIO/RecordChannels"), &recordChannels);
@@ -1722,6 +1736,9 @@ int AudioIO::GetOptimalSupportedSampleRate()
 double AudioIO::GetBestRate(bool capturing, bool playing, double sampleRate)
 {
    wxArrayLong rates;
+   if (capturing) wxLogDebug(wxT("AudioIO::GetBestRate() for capture"));
+   if (playing) wxLogDebug(wxT("AudioIO::GetBestRate() for playback"));
+   wxLogDebug(wxT("GetBestRate() suggested rate %.0lf Hz"), sampleRate);
 
    if (capturing && !playing) {
       rates = GetSupportedCaptureRates(-1, sampleRate);
@@ -1747,6 +1764,7 @@ double AudioIO::GetBestRate(bool capturing, bool playing, double sampleRate)
    long rate = (long)sampleRate;
    
    if (rates.Index(rate) != wxNOT_FOUND) {
+      wxLogDebug(wxT("GetBestRate() Returning %.0ld Hz"), rate);
       return rate;
       /* the easy case - the suggested rate (project rate) is in the list, and
        * we can just accept that and send back to the caller. This should be
@@ -1764,6 +1782,7 @@ double AudioIO::GetBestRate(bool capturing, bool playing, double sampleRate)
 
    if (rates.IsEmpty()) {
       /* we're stuck - there are no supported rates with this hardware. Error */
+      wxLogDebug(wxT("GetBestRate() Error - no supported sample rates"));
       return 0;
    }
    int i;
@@ -1771,10 +1790,12 @@ double AudioIO::GetBestRate(bool capturing, bool playing, double sampleRate)
          {
          if (rates[i] > rate) {
             // supported rate is greater than requested rate
+            wxLogDebug(wxT("GetBestRate() Returning next higher rate - %.0ld Hz"), rates[i]);
             return rates[i];
          }
          }
 
+   wxLogDebug(wxT("GetBestRate() Returning highest rate - %.0ld Hz"), rates[rates.GetCount() - 1]);
    return rates[rates.GetCount() - 1]; // the highest available rate
 }      
 
@@ -2034,151 +2055,153 @@ wxString AudioIO::GetDeviceInfo()
    }
 
 #if defined(USE_PORTMIXER)
-   int highestSampleRate = supportedSampleRates[supportedSampleRates.GetCount() - 1];
-   bool EmulateMixerInputVol = true;
-   bool EmulateMixerOutputVol = true;
-   float MixerInputVol = 1.0;
-   float MixerOutputVol = 1.0;
+   if (supportedSampleRates.GetCount() > 0)
+      {
+      int highestSampleRate = supportedSampleRates[supportedSampleRates.GetCount() - 1];
+      bool EmulateMixerInputVol = true;
+      bool EmulateMixerOutputVol = true;
+      float MixerInputVol = 1.0;
+      float MixerOutputVol = 1.0;
 
-   int error;
+      int error;
 
 #if USE_PORTAUDIO_V19
 
-   PaStream *stream;
+      PaStream *stream;
    
-   PaStreamParameters playbackParameters;
-
-   playbackParameters.device = playDeviceNum;
-   playbackParameters.sampleFormat = paFloat32;
-   playbackParameters.hostApiSpecificStreamInfo = NULL;
-   playbackParameters.channelCount = 2;
-   if (Pa_GetDeviceInfo(playDeviceNum)){
-      playbackParameters.suggestedLatency =
-         Pa_GetDeviceInfo(playDeviceNum)->defaultLowOutputLatency;
-   }
-   else{
-      playbackParameters.suggestedLatency = 100; // we're just probing anyway
-   }
+      PaStreamParameters playbackParameters;
+
+      playbackParameters.device = playDeviceNum;
+      playbackParameters.sampleFormat = paFloat32;
+      playbackParameters.hostApiSpecificStreamInfo = NULL;
+      playbackParameters.channelCount = 2;
+      if (Pa_GetDeviceInfo(playDeviceNum)){
+         playbackParameters.suggestedLatency =
+            Pa_GetDeviceInfo(playDeviceNum)->defaultLowOutputLatency;
+      }
+      else{
+         playbackParameters.suggestedLatency = DEFAULT_LATENCY_CORRECTION/1000.0; 
+      }
 
-   PaStreamParameters captureParameters;
+      PaStreamParameters captureParameters;
  
-   captureParameters.device = recDeviceNum;
-   captureParameters.sampleFormat = paFloat32;;
-   captureParameters.hostApiSpecificStreamInfo = NULL;
-   captureParameters.channelCount = 2;
-   if (Pa_GetDeviceInfo(recDeviceNum)){
-      captureParameters.suggestedLatency =
-         Pa_GetDeviceInfo(recDeviceNum)->defaultLowInputLatency;
-   }else{
-      captureParameters.suggestedLatency = 100; // we're just probing anyway
-   }
+      captureParameters.device = recDeviceNum;
+      captureParameters.sampleFormat = paFloat32;;
+      captureParameters.hostApiSpecificStreamInfo = NULL;
+      captureParameters.channelCount = 2;
+      if (Pa_GetDeviceInfo(recDeviceNum)){
+         captureParameters.suggestedLatency =
+            Pa_GetDeviceInfo(recDeviceNum)->defaultLowInputLatency;
+      }else{
+         captureParameters.suggestedLatency = DEFAULT_LATENCY_CORRECTION/1000.0; 
+      }
 
-   error = Pa_OpenStream(&stream,
+      error = Pa_OpenStream(&stream,
                          &captureParameters, &playbackParameters,
                          highestSampleRate, paFramesPerBufferUnspecified,
                          paClipOff | paDitherOff,
                          audacityAudioCallback, NULL);
 
-   if (error) {
-      error = Pa_OpenStream(&stream,
+      if (error) {
+         error = Pa_OpenStream(&stream,
                             &captureParameters, NULL,
                             highestSampleRate, paFramesPerBufferUnspecified,
                             paClipOff | paDitherOff,
                             audacityAudioCallback, NULL);
-   }
+      }
   
-#else
+#else // PA v18
 
-   PortAudioStream *stream;
+      PortAudioStream *stream;
 
-   error = Pa_OpenStream(&stream, recDeviceNum, 2, paFloat32, NULL,
+      error = Pa_OpenStream(&stream, recDeviceNum, 2, paFloat32, NULL,
                          playDeviceNum, 2, paFloat32, NULL,
                          highestSampleRate, 512, 1, paClipOff | paDitherOff,
                          audacityAudioCallback, NULL);
 
-   if (error) {
-      error = Pa_OpenStream(&stream, recDeviceNum, 2, paFloat32, NULL,
+      if (error) {
+         error = Pa_OpenStream(&stream, recDeviceNum, 2, paFloat32, NULL,
                             paNoDevice, 0, paFloat32, NULL,
                             highestSampleRate, 512, 1, paClipOff | paDitherOff,
                             audacityAudioCallback, NULL);
-   }
-
-#endif
-
-   if (error) {
-      s << wxT("Recieved ") << error << wxT(" while opening devices") << e;
-      return o.GetString();
-   }
+      }
 
-   PxMixer *PortMixer = Px_OpenMixer(stream, 0);
+#endif // PX v19/18
 
-   if (!PortMixer) {
-      s << wxT("Unable to open Portmixer") << e;
-      Pa_CloseStream(stream);
-      return o.GetString();
-   }
-
-   s << wxT("==============================") << e;
-   s << wxT("Available mixers:") << e;
-
-   cnt = Px_GetNumMixers(stream);
-   for (int i = 0; i < cnt; i++) {
-      wxString name(Px_GetMixerName(stream, i), wxConvLocal);
-      s << i << wxT(" - ") << name << e;
-   }
+      if (error) {
+         s << wxT("Recieved ") << error << wxT(" while opening devices") << e;
+         return o.GetString();
+      }
 
-   s << wxT("==============================") << e;
-   s << wxT("Available capture sources:") << e;
-   cnt = Px_GetNumInputSources(PortMixer);
-   for (int i = 0; i < cnt; i++) {
-      wxString name(Px_GetInputSourceName(PortMixer, i), wxConvLocal);
-      s << i << wxT(" - ") << name << e;
-   }
+      PxMixer *PortMixer = Px_OpenMixer(stream, 0);
 
-   s << wxT("==============================") << e;
-   s << wxT("Available playback volumes:") << e;
-   cnt = Px_GetNumOutputVolumes(PortMixer);
-   for (int i = 0; i < cnt; i++) {
-      wxString name(Px_GetOutputVolumeName(PortMixer, i), wxConvLocal);
-      s << i << wxT(" - ") << name << e;
-   }
+      if (!PortMixer) {
+         s << wxT("Unable to open Portmixer") << e;
+         Pa_CloseStream(stream);
+         return o.GetString();
+      }
 
-   // Determine mixer capabilities - it it doesn't support either
-   // input or output, we emulate them (by multiplying this value
-   // by all incoming/outgoing samples)
+      s << wxT("==============================") << e;
+      s << wxT("Available mixers:") << e;
 
-   MixerOutputVol = Px_GetPCMOutputVolume(PortMixer);
-   EmulateMixerOutputVol = false;
-   Px_SetPCMOutputVolume(PortMixer, 0.0);
-   if (Px_GetPCMOutputVolume(PortMixer) > 0.1)
-      EmulateMixerOutputVol = true;
-   Px_SetPCMOutputVolume(PortMixer, 0.2f);
-   if (Px_GetPCMOutputVolume(PortMixer) < 0.1 ||
-       Px_GetPCMOutputVolume(PortMixer) > 0.3)
-      EmulateMixerOutputVol = true;
-   Px_SetPCMOutputVolume(PortMixer, MixerOutputVol);
-
-   MixerInputVol = Px_GetInputVolume(PortMixer);
-   EmulateMixerInputVol = false;
-   Px_SetInputVolume(PortMixer, 0.0);
-   if (Px_GetInputVolume(PortMixer) > 0.1)
-      EmulateMixerInputVol = true;
-   Px_SetInputVolume(PortMixer, 0.2f);
-   if (Px_GetInputVolume(PortMixer) < 0.1 ||
-       Px_GetInputVolume(PortMixer) > 0.3)
-      EmulateMixerInputVol = true;
-   Px_SetInputVolume(PortMixer, MixerInputVol);
+      cnt = Px_GetNumMixers(stream);
+      for (int i = 0; i < cnt; i++) {
+         wxString name(Px_GetMixerName(stream, i), wxConvLocal);
+         s << i << wxT(" - ") << name << e;
+      }
 
-   Pa_CloseStream(stream);
+      s << wxT("==============================") << e;
+      s << wxT("Available capture sources:") << e;
+      cnt = Px_GetNumInputSources(PortMixer);
+      for (int i = 0; i < cnt; i++) {
+         wxString name(Px_GetInputSourceName(PortMixer, i), wxConvLocal);
+         s << i << wxT(" - ") << name << e;
+      }
 
-   s << wxT("==============================") << e;
-   s << wxT("Capture volume is ") << (EmulateMixerInputVol? wxT("emulated"): wxT("native")) << e;
-   s << wxT("Capture volume is ") << (EmulateMixerOutputVol? wxT("emulated"): wxT("native")) << e;
+      s << wxT("==============================") << e;
+      s << wxT("Available playback volumes:") << e;
+      cnt = Px_GetNumOutputVolumes(PortMixer);
+      for (int i = 0; i < cnt; i++) {
+         wxString name(Px_GetOutputVolumeName(PortMixer, i), wxConvLocal);
+         s << i << wxT(" - ") << name << e;
+      }
 
-   Px_CloseMixer(PortMixer);
+      // Determine mixer capabilities - it it doesn't support either
+      // input or output, we emulate them (by multiplying this value
+      // by all incoming/outgoing samples)
+
+      MixerOutputVol = Px_GetPCMOutputVolume(PortMixer);
+      EmulateMixerOutputVol = false;
+      Px_SetPCMOutputVolume(PortMixer, 0.0);
+      if (Px_GetPCMOutputVolume(PortMixer) > 0.1)
+         EmulateMixerOutputVol = true;
+      Px_SetPCMOutputVolume(PortMixer, 0.2f);
+      if (Px_GetPCMOutputVolume(PortMixer) < 0.1 ||
+          Px_GetPCMOutputVolume(PortMixer) > 0.3)
+         EmulateMixerOutputVol = true;
+      Px_SetPCMOutputVolume(PortMixer, MixerOutputVol);
+
+      MixerInputVol = Px_GetInputVolume(PortMixer);
+      EmulateMixerInputVol = false;
+      Px_SetInputVolume(PortMixer, 0.0);
+      if (Px_GetInputVolume(PortMixer) > 0.1)
+         EmulateMixerInputVol = true;
+      Px_SetInputVolume(PortMixer, 0.2f);
+      if (Px_GetInputVolume(PortMixer) < 0.1 ||
+          Px_GetInputVolume(PortMixer) > 0.3)
+         EmulateMixerInputVol = true;
+      Px_SetInputVolume(PortMixer, MixerInputVol);
+   
+      Pa_CloseStream(stream);
+   
+      s << wxT("==============================") << e;
+      s << wxT("Capture volume is ") << (EmulateMixerInputVol? wxT("emulated"): wxT("native")) << e;
+      s << wxT("Capture volume is ") << (EmulateMixerOutputVol? wxT("emulated"): wxT("native")) << e;
+   
+      Px_CloseMixer(PortMixer);
 
 #endif
-
+      }  //end of massive if statement if a valid sample rate has been found
    return o.GetString();
 }
 
@@ -2330,6 +2353,11 @@ void AudioIO::FillBuffers()
       //FillMidiBuffers();
 }
 
+void AudioIO::SetListener(AudioIOListener* listener)
+{
+   mListener = listener;
+}
+
 /* HCK MIDI PATCH START */
 /* REQUIRES PORTMIDI */
 //void AudioIO::FillMidiBuffers()
@@ -2702,30 +2730,23 @@ int audacityAudioCallback(void *inputBuffer, void *outputBuffer,
    unsigned int i;
    int t;
 
-   // Send data to VU meters
-
-   // It's critical that we don't update the meters while
-   // StopStream is trying to stop PortAudio, otherwise it can
-   // lead to a freeze.  We use two variables to synchronize:
-   // mUpdatingMeters tells StopStream when the callback is about
-   // to enter the code where it might update the meters, and
-   // mUpdateMeters is how the rest of the code tells the callback
-   // when it is allowed to actually do the updating.  Note that
-   // mUpdatingMeters must be set first to avoid a race condition.
-   gAudioIO->mUpdatingMeters = true;
-   if (gAudioIO->mUpdateMeters) {
-
-      if (gAudioIO->mOutputMeter && 
-          !gAudioIO->mOutputMeter->IsMeterDisabled() &&
-          outputBuffer) {
-         gAudioIO->mOutputMeter->UpdateDisplay(numPlaybackChannels,
-                                               framesPerBuffer,
-                                               (float *)outputBuffer);
-      }
-
-      if (gAudioIO->mInputMeter &&
-          !gAudioIO->mInputMeter->IsMeterDisabled() &&
-          inputBuffer) {
+   /* Send data to recording VU meter if applicable */
+
+   if (gAudioIO->mInputMeter &&
+         !gAudioIO->mInputMeter->IsMeterDisabled() &&
+         inputBuffer) {
+      // get here if meters are actually live , and being updated
+      /* It's critical that we don't update the meters while StopStream is
+       * trying to stop PortAudio, otherwise it can lead to a freeze.  We use
+       * two variables to synchronize:
+       *   mUpdatingMeters tells StopStream when the callback is about to enter
+       *     the code where it might update the meters, and
+       *   mUpdateMeters is how the rest of the code tells the callback when it
+       *     is allowed to actually do the updating.
+       * Note that mUpdatingMeters must be set first to avoid a race condition.
+       */
+      gAudioIO->mUpdatingMeters = true;
+      if (gAudioIO->mUpdateMeters) {
          if (gAudioIO->mCaptureFormat == floatSample)
             gAudioIO->mInputMeter->UpdateDisplay(numCaptureChannels,
                                                  framesPerBuffer,
@@ -2739,8 +2760,9 @@ int audacityAudioCallback(void *inputBuffer, void *outputBuffer,
                                                  tempFloats);
          }
       }
-   }
-   gAudioIO->mUpdatingMeters = false;
+      gAudioIO->mUpdatingMeters = false;
+   }  // end recording VU meter update
+
 
    // Stop recording if 'silence' is detected
    if(gAudioIO->mPauseRec && inputBuffer) {
@@ -3025,7 +3047,10 @@ int audacityAudioCallback(void *inputBuffer, void *outputBuffer,
 
       // Record the reported latency from PortAudio.
       // TODO: Don't recalculate this with every callback?
+
      #if USE_PORTAUDIO_V19
+      // 01/21/2009:  Disabled until a better solution presents itself.
+     #if 0
       // As of 06/17/2006, portaudio v19 returns inputBufferAdcTime set to
       // zero.  It is being worked on, but for now we just can't do much
       // but follow the leader.
@@ -3047,13 +3072,13 @@ int audacityAudioCallback(void *inputBuffer, void *outputBuffer,
             gAudioIO->mLastRecordingOffset = -si->inputLatency;
          }
       }
+     #endif
      #else
       if (numCaptureChannels > 0 && numPlaybackChannels > 0)
          gAudioIO->mLastRecordingOffset = (Pa_StreamTime(gAudioIO->mPortStreamV18) - outTime) / gAudioIO->mRate;
       else
          gAudioIO->mLastRecordingOffset = 0;
      #endif
-
    } // if mStreamToken > 0
    else {
       // No tracks to play, but we should clear the output, and
@@ -3075,6 +3100,28 @@ int audacityAudioCallback(void *inputBuffer, void *outputBuffer,
          }
       }
    }
+   /* Send data to playback VU meter if applicable */
+   if (gAudioIO->mOutputMeter && 
+      !gAudioIO->mOutputMeter->IsMeterDisabled() &&
+      outputBuffer) {
+      // Get here if playback meter is live 
+      /* It's critical that we don't update the meters while StopStream is
+       * trying to stop PortAudio, otherwise it can lead to a freeze.  We use
+       * two variables to synchronize:
+       *  mUpdatingMeters tells StopStream when the callback is about to enter
+       *    the code where it might update the meters, and 
+       *  mUpdateMeters is how the rest of the code tells the callback when it
+       *    is allowed to actually do the updating.
+       * Note that mUpdatingMeters must be set first to avoid a race condition.
+       */
+      gAudioIO->mUpdatingMeters = true;
+      if (gAudioIO->mUpdateMeters) {
+         gAudioIO->mOutputMeter->UpdateDisplay(numPlaybackChannels,
+                                               framesPerBuffer,
+                                               (float *)outputBuffer);
+      }
+      gAudioIO->mUpdatingMeters = false;
+   }  // end playback VU meter update
 
    return callbackReturn;
 }
diff --git a/src/AudioIO.h b/src/AudioIO.h
index 7416f23..6c46c9a 100644
--- a/src/AudioIO.h
+++ b/src/AudioIO.h
@@ -46,6 +46,7 @@ extern AudioIO *gAudioIO;
 void InitAudioIO();
 void DeinitAudioIO();
 wxString DeviceName(const PaDeviceInfo* info);
+bool ValidateDeviceNames();
 
 class AUDACITY_DLL_API AudioIOListener {
 public:
@@ -59,11 +60,17 @@ public:
 };
 
 #define MAX_MIDI_BUFFER_SIZE 5000
+
+#define DEFAULT_LATENCY_DURATION 100.0
+#define DEFAULT_LATENCY_CORRECTION -130.0
+
 class AudioIO {
 
  public:
    AudioIO();
    ~AudioIO();
+
+   void SetListener(AudioIOListener* listener);
    
    /** \brief Start up Portaudio for capture and recording as needed for
     * input monitoring and software playthrough only
@@ -245,6 +252,11 @@ class AudioIO {
     */
    wxString GetDeviceInfo();
 
+   /** \brief Ensure selected device names are valid
+    *
+    */
+   static bool ValidateDeviceNames(wxString play, wxString rec);
+
 private:
    /** \brief Return a valid sample rate that is supported by the current I/O
     * device(s).
@@ -425,6 +437,20 @@ private:
    TimeTrack *mTimeTrack;
    
 #if USE_PORTAUDIO_V19
+   /** brief The function which is called from PortAudio's callback thread
+    * context to collect and deliver audio for / from the sound device.
+    *
+    * This covers recording, playback, and doing both simultaneously. It is
+    * also invoked to do monitoring and software playthrough. Note that dealing
+    * with the two buffers needs some care to ensure that the right things
+    * happen for all possible cases.
+    * @param inputBuffer Buffer of length framesPerBuffer containing samples
+    * from the sound card, or null if not capturing audio.
+    * @param outputBuffer Uninitialised buffer of length framesPerBuffer which
+    * will be sent to the sound card after the callback, or null if not playing
+    * audio back.
+    * @param framesPerBuffer The length of the playback and recording buffers
+    */
    friend int audacityAudioCallback(
                 const void *inputBuffer, void *outputBuffer,
                 unsigned long framesPerBuffer,
diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp
index 54c3742..5751832 100644
--- a/src/AutoRecovery.cpp
+++ b/src/AutoRecovery.cpp
@@ -203,7 +203,7 @@ static bool RecoverAllProjects(AudacityProject** pproj)
       } else
       {
          // Create new project window
-         proj = CreateNewAudacityProject(gParentWindow);
+         proj = CreateNewAudacityProject();
       }
 
       // Open project. When an auto-save file has been opened successfully,
diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp
index a480cdc..7e9f113 100644
--- a/src/BatchCommandDialog.cpp
+++ b/src/BatchCommandDialog.cpp
@@ -38,7 +38,7 @@ selected command.
 #include "Project.h"
 #include "BatchCommandDialog.h"
 #include "commands/CommandManager.h"
-#include "effects/Effect.h"
+#include "effects/EffectManager.h"
 #include "BatchCommands.h"
 #include "ShuttleGui.h"
 
@@ -169,7 +169,7 @@ void BatchCommandDialog::OnItemSelected(wxListEvent &event)
    mCommand->SetValue( command );
    wxString params = BatchCommands::GetCurrentParamsFor( command );
    mParameters->SetValue( params );
-   Effect * f = BatchCommands::GetEffectFromCommandName( command );
+   Effect * f = EffectManager::Get().GetEffectByIdentifier( command );
    mEditParams->Enable( f != NULL );
 }
 
@@ -177,7 +177,7 @@ void BatchCommandDialog::OnEditParams(wxCommandEvent &event)
 {
    wxString command = mCommand->GetValue();
    wxString params  = mParameters->GetValue();
-   Effect * f = BatchCommands::GetEffectFromCommandName( command );
+   Effect * f = EffectManager::Get().GetEffectByIdentifier( command );
    if( f==NULL )
       return;
    BatchCommands::SetCurrentParametersFor( f, command, params );
diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp
index 51881af..5d70589 100644
--- a/src/BatchCommands.cpp
+++ b/src/BatchCommands.cpp
@@ -292,29 +292,9 @@ wxArrayString BatchCommands::GetAllCommands()
 }
 
 
-Effect * BatchCommands::GetEffectFromCommandName(wxString inCommand)
-{
-   unsigned int i;
-   wxString command;
-   Effect * f;
-   EffectArray * effects = EffectManager::Get().GetEffects( ALL_EFFECTS );
-   for(i=0; i<effects->GetCount(); i++) {
-      f = (*effects)[i];
-      command=f->GetEffectIdentifier();
-      if( command.IsSameAs( inCommand ))
-      {  
-         delete effects;
-         return f;
-      }
-   }
-   delete effects;
-   return NULL;
-}
-
 wxString BatchCommands::GetCurrentParamsFor(wxString command)
 {
-   Effect * f;
-   f=GetEffectFromCommandName( command );
+   Effect * f = EffectManager::Get().GetEffectByIdentifier( command );
    if( f==NULL )
       return wxT("");// effect not found.
    ShuttleCli shuttle;
@@ -328,8 +308,7 @@ wxString BatchCommands::GetCurrentParamsFor(wxString command)
 
 bool BatchCommands::PromptForParamsFor(wxString command)
 {
-   Effect * f;
-   f=GetEffectFromCommandName( command );
+   Effect * f = EffectManager::Get().GetEffectByIdentifier(command);
    if( f==NULL )
       return false;
 
@@ -470,7 +449,7 @@ bool BatchCommands::ApplySpecialCommand(int iCommand, const wxString command,con
       return WriteMp3File(filename, 56);
    } else if (command == wxT("StereoToMono")) {
       // StereoToMono is an effect masquerading as a menu item.
-      Effect * f = GetEffectFromCommandName(wxT("StereoToMono"));
+      Effect * f = EffectManager::Get().GetEffectByIdentifier(wxT("StereoToMono"));
       if (f != NULL) {
          return ApplyEffectCommand(f, command, params);
       }
@@ -572,8 +551,7 @@ bool BatchCommands::ApplyCommand(const wxString command, const wxString params)
    }
    
    // Test for an effect.
-   Effect * f;
-   f=GetEffectFromCommandName( command );
+   Effect * f = EffectManager::Get().GetEffectByIdentifier( command );
    if( f!=NULL )
       return ApplyEffectCommand( f, command, params );
 
diff --git a/src/BatchCommands.h b/src/BatchCommands.h
index ab2f614..5acbf4a 100644
--- a/src/BatchCommands.h
+++ b/src/BatchCommands.h
@@ -41,7 +41,6 @@ class BatchCommands {
    // These commands do not depend on the command list.
    wxArrayString GetNames();
    static bool PromptForParamsFor( wxString command );
-   static Effect * GetEffectFromCommandName( wxString command );
    static wxString GetCurrentParamsFor( wxString command );
    static bool SetCurrentParametersFor( Effect * f, const wxString command, const wxString params);
    static wxArrayString GetAllCommands();
diff --git a/src/BlockFile.cpp b/src/BlockFile.cpp
index a6e78fa..98de501 100644
--- a/src/BlockFile.cpp
+++ b/src/BlockFile.cpp
@@ -398,7 +398,7 @@ void BlockFile::GetMinMax(sampleCount start, sampleCount len,
          max = sample;
       if( sample < min )
          min = sample;
-      sumsq = (sample*sample);
+      sumsq += (sample*sample);
    }
 
    DeleteSamples(blockData);
diff --git a/src/BlockFile.h b/src/BlockFile.h
index f7c14d8..15f3344 100644
--- a/src/BlockFile.h
+++ b/src/BlockFile.h
@@ -130,6 +130,11 @@ class BlockFile {
    ///when the project closes, it locks the blockfiles.
    ///Override this in case it needs special treatment
    virtual void CloseLock(){Lock();}
+   
+   /// Prevents a read on other threads.  The basic blockfile runs on only one thread, so does nothing.
+   virtual void LockRead(){}
+   /// Allows reading on other threads.
+   virtual void UnlockRead(){}
 
  private:
 
diff --git a/src/DirManager.cpp b/src/DirManager.cpp
index afb9565..b3dac23 100644
--- a/src/DirManager.cpp
+++ b/src/DirManager.cpp
@@ -1129,8 +1129,11 @@ bool DirManager::EnsureSafeFilename(wxFileName fName)
 
       if (b->IsAlias() && ab->GetAliasedFile() == fName) {
          needToRename = true;
-         wxPrintf(_("Changing block %s\n"), b->GetFileName().GetFullName().c_str());
-         ab->ChangeAliasedFile(renamedFile);
+         //wxPrintf(_("Changing block %s\n"), b->GetFileName().GetFullName().c_str());
+         //ab->ChangeAliasedFile(renamedFile);
+         
+         //ODBlocks access the aliased file on another thread, so we need to pause them before this continues.
+         ab->LockRead();
       }
 
       it++;
@@ -1138,7 +1141,8 @@ bool DirManager::EnsureSafeFilename(wxFileName fName)
 
    if (needToRename) {
       if (!wxRenameFile(fName.GetFullPath(),
-                        renamedFile.GetFullPath())) {
+                        renamedFile.GetFullPath())) 
+      {
          // ACK!!! The renaming was unsuccessful!!!
          // (This shouldn't happen, since we tried creating a
          // file of this name and then deleted it just a
@@ -1151,8 +1155,10 @@ bool DirManager::EnsureSafeFilename(wxFileName fName)
             BlockFile *b = it->second;
             AliasBlockFile *ab = (AliasBlockFile*)b;
 
-            if (b->IsAlias() && ab->GetAliasedFile() == renamedFile)
-               ab->ChangeAliasedFile(fName);
+            if (b->IsAlias() && ab->GetAliasedFile() == fName)
+            {
+               ab->UnlockRead();
+            }
             it++;
          }
 
@@ -1162,6 +1168,25 @@ bool DirManager::EnsureSafeFilename(wxFileName fName)
                        renamedFile.GetFullPath().c_str());
          return false;
       }
+      else
+      {
+         //point the aliases to the new filename.
+         BlockHash::iterator it=blockFileHash.begin();
+         while(it != blockFileHash.end()) {
+            BlockFile *b = it->second;
+            AliasBlockFile *ab = (AliasBlockFile*)b;
+
+            if (b->IsAlias() && ab->GetAliasedFile() == fName)
+            {
+               ab->ChangeAliasedFile(renamedFile);
+               ab->UnlockRead();
+               wxPrintf(_("Changed block %s to new alias name\n"), b->GetFileName().GetFullName().c_str());
+               
+            }
+            it++;
+         }
+
+      }
 
       aliasList.Remove(fName.GetFullPath());
       aliasList.Add(renamedFile.GetFullPath());
diff --git a/src/Experimental.h b/src/Experimental.h
index e5a8c28..791d59c 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -68,19 +68,12 @@
 
 // Effect categorisation. Adds support for arranging effects in categories
 // and displaying those categories as submenus in the Effect menu.
-#define EFFECT_CATEGORIES
-
-// Andreas Micheler, 22 Nov.2007
-// 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.
-// MJS, 21 April 2008
-// With Waveform (dB) view, at some vertical sizes of track, there appears to be a loop
-// where the ruler gets bigger and smaller repeatedly, using up an awful lot of cycles.
-// Really needs to be fixed before this is turned on.
-// MJS, 30 June 2008
-// Fixed the loop problem, so turned this on as I think it's valid.
-#define EXPERIMENTAL_RULER_AUTOSIZE
+// This was a 2008 GSoC project that was making good progress at the half-way point
+// but then the student didn't contribute after that.  It needs a bit of work to finish it off.
+// As a minimum, if this is turned on for a release,
+// it should have an easy mechanism to disable it at run-time, such as a menu item or a pref,
+// preferrably disabled until other work is done.  Martyn 22/12/2008.
+//#define EFFECT_CATEGORIES
 
 // Andreas Micheler, 20.Nov 2007: 
 // A spectrumLogF-like view mode with notes quantization.
diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp
index 0d628c1..7662280 100644
--- a/src/FFmpeg.cpp
+++ b/src/FFmpeg.cpp
@@ -33,11 +33,7 @@ License: GPL v2.  See License.txt.
 /// but Preferences dialog requires this function nevertheless
 wxString GetFFmpegVersion(wxWindow *parent)
 {
-   return wxString(wxT("FFmpeg support not compiled in"));
-}
-
-void FFmpegStartup()
-{
+   return wxString(_("FFmpeg support not compiled in"));
 }
 
 #else
@@ -94,6 +90,7 @@ bool LoadFFmpeg(bool showerror)
    }
 }
 
+/** Called during Audacity start-up to try and load the ffmpeg libraries */
 void FFmpegStartup()
 {
    bool enabled = false;
@@ -101,10 +98,10 @@ void FFmpegStartup()
    // 'false' means that no errors should be shown whatsoever
    if (enabled && !LoadFFmpeg(false))
    {
-     wxMessageBox(wxT("FFmpeg was configured in Preferences and successfully loaded before, \
+     wxMessageBox(_("FFmpeg was configured in Preferences and successfully loaded before, \
                       \nbut this time Audacity failed to load it at startup. \
                       \n\nYou may want to go back to Preferences > Import/Export and re-configure it."),
-                  wxT("FFmpeg startup failed"));
+                  _("FFmpeg startup failed"));
    }
 }
 
@@ -140,6 +137,11 @@ void av_log_wx_callback(void* ptr, int level, const char* fmt, va_list vl)
 #if defined(__WXMSW__)
    frm.Replace(wxT("%t"),wxT("%i"),true); //TODO: on Windows vprintf won't handle %t, and probably some others. Investigate.
 #endif
+#if defined(wxUSE_UNICODE)
+   // String comes with %s format field and a value in value list is ascii char*. Thus in Unicode configurations
+   // we have to convert %s to %S.
+   frm.Replace(wxT("%s"),wxT("%S"),true);
+#endif
    printstring.Append(wxString::FormatV(frm,vl));
    wxString cpt;
    switch (level)
@@ -210,7 +212,7 @@ public:
             }
             S.Id(ID_FFMPEG_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
             S.AddVariableText(_("To get a free copy of FFmpeg, click here -->"), true);
-            S.Id(ID_FFMPEG_DLOAD).AddButton(_("Download..."), wxALIGN_RIGHT);
+            S.Id(ID_FFMPEG_DLOAD).AddButton(_("Download"), wxALIGN_RIGHT);
          }
          S.EndMultiColumn();
 
@@ -293,7 +295,6 @@ END_EVENT_TABLE()
 FFmpegLibs::FFmpegLibs()
 {
    mLibsLoaded = false;
-   mStatic = false;
    refcount = 1;
    avformat = avcodec = avutil = NULL;
    if (gPrefs) {
@@ -304,12 +305,7 @@ FFmpegLibs::FFmpegLibs()
 
 FFmpegLibs::~FFmpegLibs()
 {
-   if (avformat) delete avformat;
-   if (!mStatic)
-   {
-      if (avcodec) delete avcodec;
-      if (avutil) delete avutil;
-   }
+   FreeLibs();
 };
 
 bool FFmpegLibs::FindLibs(wxWindow *parent)
@@ -361,7 +357,6 @@ bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
    if (ValidLibsLoaded()) {
       wxLogMessage(wxT("Libraries already loaded - freeing"));
       FreeLibs();
-      mLibsLoaded = false;
    }
 
    // First try loading it from a previously located path
@@ -370,11 +365,25 @@ bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
       mLibsLoaded = InitLibs(mLibAVFormatPath,showerr);
    }
 
+   // If not successful, try loading it from default path
+   if (!mLibsLoaded && !GetLibAVFormatPath().IsEmpty()) {
+      wxFileName fn(GetLibAVFormatPath(), GetLibAVFormatName());
+      wxString path = fn.GetFullPath();
+      wxLogMessage(wxT("Trying to load from default path %s."),path.c_str());
+      mLibsLoaded = InitLibs(path,showerr);
+      if (mLibsLoaded) {
+         mLibAVFormatPath = path;
+      }
+   }
+
    // If not successful, try loading using system search paths
    if (!ValidLibsLoaded()) {
-      mLibAVFormatPath = GetLibAVFormatName();
-      wxLogMessage(wxT("Trying to load from PATH. File name is %s"),mLibAVFormatPath.c_str());
-      mLibsLoaded = InitLibs(mLibAVFormatPath,showerr);
+      wxString path = GetLibAVFormatName();
+      wxLogMessage(wxT("Trying to load from system paths. File name is %s"),path.c_str());
+      mLibsLoaded = InitLibs(path,showerr);
+      if (mLibsLoaded) {
+         mLibAVFormatPath = path;
+      }
    }
 
    // If libraries aren't loaded - nag user about that
@@ -395,7 +404,7 @@ bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
    */
    // Oh well, just give up
    if (!ValidLibsLoaded()) {
-      if (showerr) wxMessageBox(wxT("Failed to find compatible FFmpeg libraries"));
+      if (showerr) wxMessageBox(_("Failed to find compatible FFmpeg libraries"));
       return false;
    }
 
@@ -411,8 +420,9 @@ bool FFmpegLibs::ValidLibsLoaded()
 bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
 {
    // Initially we don't know where are the avcodec and avutl libs
-   wxString libpath_codec(wxT(""));
-   wxString libpath_util(wxT(""));
+   wxDynamicLibrary *codec = NULL;
+   wxDynamicLibrary *util = NULL;
+   wxFileName name(libpath_format);
 
    wxLogWindow* mLogger = wxGetApp().mLogger;
 
@@ -420,6 +430,10 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
 
    wxString syspath;
    bool pathfix = false;
+
+   FreeLibs();
+
+#if defined(__WXMSW__)
    wxLogMessage(wxT("Looking up PATH..."));
    // First take PATH environment variable (store it's content)
    if (wxGetEnv(wxT("PATH"),&syspath))
@@ -463,92 +477,54 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
    {
       wxLogMessage(wxT("PATH does not exist."));
    }
+#endif
 
    //Load libavformat
    avformat = new wxDynamicLibrary();
-   if (!avformat->IsLoaded() && !gotError)
-   {
-      wxLogMessage(wxT("Loading avformat from %s"),libpath_format.c_str());
+   wxLogMessage(wxT("Loading avformat from %s"),libpath_format.c_str());
+   if (showerr)
+      mLogger->SetActiveTarget(NULL);
+   gotError = !avformat->Load(libpath_format, wxDL_LAZY);
+   if (showerr)
+      mLogger->SetActiveTarget(mLogger);
+
+   if (!gotError) {
+      if (avformat->HasSymbol(wxT("av_free"))) {
+         util = avformat;
+      }
+      if (avformat->HasSymbol(wxT("avcodec_init"))) {
+         codec = avformat;
+      }
+   }
+
+   if (!util) {
+      name.SetFullName(GetLibAVUtilName());
+      avutil = util =  new wxDynamicLibrary();
+      wxLogMessage(wxT("Loading avutil from %s"),name.GetFullPath().c_str());
       if (showerr)
          mLogger->SetActiveTarget(NULL);
-      gotError = !avformat->Load(libpath_format, wxDL_LAZY);
+      util->Load(name.GetFullPath(), wxDL_LAZY);
       if (showerr)
          mLogger->SetActiveTarget(mLogger);
    }
 
-   //avformat loaded successfully?
-   if (!gotError)
-   {
-      wxLogMessage(wxT("avformat loaded successfully. Acquiring the list of modules."));
-      //Get the list of all loaded modules and it's length
-      wxDynamicLibraryDetailsArray loaded = avformat->ListLoaded();
-      int loadsize = loaded.size();
-      wxLogMessage(wxT("List acquired and consists of %d modules"),loadsize);
-      for (int i = 0; i < loadsize; i++)
-      {
-         _wxObjArraywxDynamicLibraryDetailsArray litem = loaded.Item(i);
-         //Get modules' path and base name
-         wxString libpath = litem.GetPath();
-         wxString libname = litem.GetName();
-         wxLogMessage(wxT("Item %d: path=%s , name=%s"),i,libpath.c_str(),libname.c_str());
-         //Match name against a pattern to find avcodec and avutil
-         ///\todo own sections for Mac and *nix
-#if defined(__WXMSW__)
-         if (libname.Matches(wxT("*avcodec*.dll*")))
-#else
-         if (libname.Matches(wxT("*avcodec*.so*")))
-#endif
-         {
-            wxLogMessage(wxT("Found avcodec: %s"),libpath.c_str());
-            libpath_codec = libpath;
-         }
-#if defined(__WXMSW__)
-         else if (libname.Matches(wxT("*avutil*.dll*")))
-#else
-         else if (libname.Matches(wxT("*avutil*.so*")))
-#endif
-         {
-            wxLogMessage(wxT("Found avutil: %s"),libpath.c_str());
-            libpath_util = libpath;
-         }
-      }
-      //avformat loaded all right. If it didn't linked two other
-      //libs to itself in process, then it's statically linked.
-      //"or" operator ensures that we won't count misnamed statically linked
-      //avformat library as a dynamic one.
-      if ((libpath_codec.CompareTo(wxT("")) == 0)
-         || (libpath_util.CompareTo(wxT("")) == 0))
-      {
-         wxLogMessage(wxT("The avformat library happened to be statically linked"));
-         mStatic = true;
-      }
-      else mStatic = false;
+   if (!codec) {
+      name.SetFullName(GetLibAVCodecName());
+      avcodec = codec = new wxDynamicLibrary();
+      wxLogMessage(wxT("Loading avcodec from %s"),name.GetFullPath().c_str());
+      if (showerr)
+         mLogger->SetActiveTarget(NULL);
+      codec->Load(name.GetFullPath(), wxDL_LAZY);
+      if (showerr)
+         mLogger->SetActiveTarget(mLogger);
    }
 
-   if (!mStatic)
-   {
-      wxLogMessage(wxT("Trying to load avcodec and avutil"));
-      //Load other two libs
-      avcodec = new wxDynamicLibrary();
-      if (!avcodec->IsLoaded() && !gotError)
-      {
-         wxLogMessage(wxT("Loading avcodec from %s"),libpath_codec.c_str());
-         if (showerr)
-            mLogger->SetActiveTarget(NULL);
-         gotError = !avcodec->Load(libpath_codec, wxDL_LAZY);
-         if (showerr)
-            mLogger->SetActiveTarget(mLogger);
-      }
-      avutil = new wxDynamicLibrary();
-      if (!avutil->IsLoaded() && !gotError)
-      {
-         wxLogMessage(wxT("Loading avutil from %s"),libpath_util.c_str());
-         if (showerr)
-            mLogger->SetActiveTarget(NULL);
-         gotError = !avutil->Load(libpath_util, wxDL_LAZY);
-         if (showerr)
-            mLogger->SetActiveTarget(mLogger);
-      }
+   if (!avformat->IsLoaded()) {
+      if (showerr)
+         mLogger->SetActiveTarget(NULL);
+      gotError = !avformat->Load(libpath_format, wxDL_LAZY);
+      if (showerr)
+         mLogger->SetActiveTarget(mLogger);
    }
 
    //Return PATH to normal
@@ -559,19 +535,12 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
       wxSetEnv(wxT("PATH"),oldpath.c_str());
    }
 
-   if ( gotError )
-   {
-      wxLogMessage(wxT("Failed to load either avcodec or avutil"));
+   if (gotError) {
+      wxLogMessage(wxT("Failed to load FFmpeg libs"));
+      FreeLibs();
       return false;
    }
 
-   if (mStatic)
-   {
-      //If it's static library, load everything from it
-      avcodec = avformat;
-      avutil = avformat;
-   }
-
    wxLogMessage(wxT("Importing symbols..."));
    INITDYN(avformat,av_register_all);
    INITDYN(avformat,av_open_input_file);
@@ -598,41 +567,41 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
    INITDYN(avformat,av_codec_get_tag);
    INITDYN(avformat,avformat_version);
 
-   INITDYN(avcodec,avcodec_init);
-   INITDYN(avcodec,avcodec_find_encoder);
-   INITDYN(avcodec,avcodec_find_encoder_by_name);
-   INITDYN(avcodec,avcodec_find_decoder);
-   INITDYN(avcodec,avcodec_find_decoder_by_name);
-   INITDYN(avcodec,avcodec_string);
-   INITDYN(avcodec,avcodec_get_context_defaults);
-   INITDYN(avcodec,avcodec_alloc_context);
-   INITDYN(avcodec,avcodec_get_frame_defaults);
-   INITDYN(avcodec,avcodec_alloc_frame);
-   INITDYN(avcodec,avcodec_open);
-   INITDYN(avcodec,avcodec_decode_audio2);
-   INITDYN(avcodec,avcodec_encode_audio);
-   INITDYN(avcodec,avcodec_close);
-   INITDYN(avcodec,avcodec_register_all);
-   INITDYN(avcodec,avcodec_flush_buffers);
-   INITDYN(avcodec,av_get_bits_per_sample);
-   INITDYN(avcodec,av_get_bits_per_sample_format);
-   INITDYN(avcodec,avcodec_version);
-   INITDYN(avcodec,av_fast_realloc);
-   INITDYN(avcodec,av_codec_next);
-
-   INITDYN(avutil,av_free);
-   INITDYN(avutil,av_log_set_callback);
-   INITDYN(avutil,av_log_default_callback);
-   INITDYN(avutil,av_fifo_init);
-   INITDYN(avutil,av_fifo_free);
-   INITDYN(avutil,av_fifo_read);
-   INITDYN(avutil,av_fifo_size);
-   INITDYN(avutil,av_fifo_generic_write);
-   INITDYN(avutil,av_fifo_realloc);
-   INITDYN(avutil,av_malloc);
-   INITDYN(avutil,av_freep);
-   INITDYN(avutil,av_rescale_q);
-   INITDYN(avutil,avutil_version);
+   INITDYN(codec,avcodec_init);
+   INITDYN(codec,avcodec_find_encoder);
+   INITDYN(codec,avcodec_find_encoder_by_name);
+   INITDYN(codec,avcodec_find_decoder);
+   INITDYN(codec,avcodec_find_decoder_by_name);
+   INITDYN(codec,avcodec_string);
+   INITDYN(codec,avcodec_get_context_defaults);
+   INITDYN(codec,avcodec_alloc_context);
+   INITDYN(codec,avcodec_get_frame_defaults);
+   INITDYN(codec,avcodec_alloc_frame);
+   INITDYN(codec,avcodec_open);
+   INITDYN(codec,avcodec_decode_audio2);
+   INITDYN(codec,avcodec_encode_audio);
+   INITDYN(codec,avcodec_close);
+   INITDYN(codec,avcodec_register_all);
+   INITDYN(codec,avcodec_flush_buffers);
+   INITDYN(codec,av_get_bits_per_sample);
+   INITDYN(codec,av_get_bits_per_sample_format);
+   INITDYN(codec,avcodec_version);
+   INITDYN(codec,av_fast_realloc);
+   INITDYN(codec,av_codec_next);
+
+   INITDYN(util,av_free);
+   INITDYN(util,av_log_set_callback);
+   INITDYN(util,av_log_default_callback);
+   INITDYN(util,av_fifo_init);
+   INITDYN(util,av_fifo_free);
+   INITDYN(util,av_fifo_read);
+   INITDYN(util,av_fifo_size);
+   INITDYN(util,av_fifo_generic_write);
+   INITDYN(util,av_fifo_realloc);
+   INITDYN(util,av_malloc);
+   INITDYN(util,av_freep);
+   INITDYN(util,av_rescale_q);
+   INITDYN(util,avutil_version);
 
    //FFmpeg initialization
    wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
@@ -669,13 +638,23 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
 
 void FFmpegLibs::FreeLibs()
 {
-   if (avformat) avformat->Unload();
-   if (!mStatic)
-   {
-      if (avcodec) avcodec->Unload();
-      if (avutil) avutil->Unload();
+   if (avformat != NULL) {
+      delete avformat;
+      avformat = NULL;
+   }
+
+   if (avcodec != NULL) {
+      delete avcodec;
+      avcodec = NULL;
    }
+
+   if (avutil != NULL) {
+      delete avutil;
+      avutil = NULL;
+   }
+
    mLibsLoaded = false;
+
    return;
 }
 
diff --git a/src/FFmpeg.h b/src/FFmpeg.h
index 0c1ee8d..9593fb2 100644
--- a/src/FFmpeg.h
+++ b/src/FFmpeg.h
@@ -19,30 +19,22 @@ Describes shared object that is used to access FFmpeg libraries.
 /* FFmpeg is written in C99. It uses many types from stdint.h. Because we are
  * compiling this using a C++ compiler we have to put it in extern "C".
  * __STDC_CONSTANT_MACROS is defined to make <stdint.h> behave like it
- * is actually being compiled with a C99 compiler. This only works if these
- * headers get to stdint.h before anyone else does, otherwise it doesn't get
- * re-processed and doesn't work properly.
+ * is actually being compiled with a C99 compiler.
+ *
  * The symptoms are that INT64_C is not a valid type, which tends to break
  * somewhere down in the implementations using this file */
+
 /* In order to be able to compile this file when ffmpeg is not available we
  * need access to the value of USE_FFMPEG, which means config*.h needs to come
  * in before this file. The suggest way to achieve this is by including
  * Audacity.h */
 
 #if defined(USE_FFMPEG)
-	extern "C" {
-	#ifdef _STDINT_H
-   /* stdint.h has already been included. That's likely to break ffmpeg headers
-	* as described above so we issue a warning */
-	#warning "stdint.h included before ffmpeg headers, this may well not compile"
-	#endif
-   #if !defined(__STDC_CONSTANT_MACROS)
-	#define __STDC_CONSTANT_MACROS
-   #endif
-	#include <libavcodec/avcodec.h>
-	#include <libavformat/avformat.h>
-	#include <libavutil/fifo.h>
-	}
+extern "C" {
+   #include <libavcodec/avcodec.h>
+   #include <libavformat/avformat.h>
+   #include <libavutil/fifo.h>
+}
 #endif
 
 #include "Audacity.h"
@@ -74,14 +66,14 @@ void av_log_wx_callback(void* ptr, int level, const char* fmt, va_list vl);
 //----------------------------------------------------------------------------
 wxString GetFFmpegVersion(wxWindow *parent);
 
+/* from here on in, this stuff only applies when ffmpeg is available */
+#if defined(USE_FFMPEG)
+
 //----------------------------------------------------------------------------
 // Attempt to load and enable/disable FFmpeg at startup
 //----------------------------------------------------------------------------
 void FFmpegStartup();
 
-/* from here on in, this stuff only applies when ffmpeg is available */
-#if defined(USE_FFMPEG)
-
 bool LoadFFmpeg(bool showerror);
 
 /// If Audacity failed to load libav*, this dialog
@@ -105,7 +97,7 @@ public:
       S.SetBorder(10);
       S.StartVerticalLay(true);
       {
-         S.AddFixedText(wxT(
+         S.AddFixedText(_(
 "Audacity attempted to use FFmpeg libraries to import an audio file,\n\
 but libraries were not found.\n\
 If you want to use the FFmpeg import feature, please go to Preferences->Import/Export\n\
@@ -114,7 +106,7 @@ and tell Audacity where to look for the libraries."
 
          int dontShowDlg = 0;
          gPrefs->Read(wxT("/FFmpeg/NotFoundDontShow"),&dontShowDlg,0);
-         mDontShow = S.AddCheckBox(wxT("Do not show this warning again"),dontShowDlg ? wxT("true") : wxT("false"));
+         mDontShow = S.AddCheckBox(_("Do not show this warning again"),dontShowDlg ? wxT("true") : wxT("false"));
 
          S.AddStandardButtons(eOkButton);
       }
@@ -166,8 +158,8 @@ public:
    AVCodec*          (*avcodec_find_encoder_by_name)  (const char *name);
    AVCodec*          (*avcodec_find_decoder)          (enum CodecID id);
    AVCodec*          (*avcodec_find_decoder_by_name)  (const char *name);
-   enum CodecID      (*av_codec_get_id)               (const struct AVCodecTag **tags, unsigned int tag);
-   unsigned int      (*av_codec_get_tag)              (const struct AVCodecTag **tags, enum CodecID id);
+   enum CodecID      (*av_codec_get_id)               (const struct AVCodecTag * const *tags, unsigned int tag);
+   unsigned int      (*av_codec_get_tag)              (const struct AVCodecTag * const *tags, enum CodecID id);
    void              (*avcodec_string)                (char *buf, int buf_size, AVCodecContext *enc, int encode);
    void              (*avcodec_get_context_defaults)  (AVCodecContext *s);
    AVCodecContext*   (*avcodec_alloc_context)         (void);
@@ -202,14 +194,14 @@ public:
    AVOutputFormat*   (*guess_format)                  (const char *short_name, const char *filename, const char *mime_type);
    int               (*av_write_trailer)              (AVFormatContext *s);
    int               (*av_interleaved_write_frame)    (AVFormatContext *s, AVPacket *pkt);
-   int               (*av_write_frame)    (AVFormatContext *s, AVPacket *pkt);
+   int               (*av_write_frame)                (AVFormatContext *s, AVPacket *pkt);
    void              (*av_init_packet)                (AVPacket *pkt);
    int               (*av_fifo_init)                  (AVFifoBuffer *f, int size);
    void              (*av_fifo_free)                  (AVFifoBuffer *f);
    int               (*av_fifo_read)                  (AVFifoBuffer *f, uint8_t *buf, int buf_size);
    int               (*av_fifo_size)                  (AVFifoBuffer *f);
    int               (*av_fifo_generic_write)         (AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-   void              (*av_fifo_realloc)                (AVFifoBuffer *f, unsigned int size);
+   void              (*av_fifo_realloc)               (AVFifoBuffer *f, unsigned int size);
    void*             (*av_malloc)                     (unsigned int size);
    void              (*av_freep)                      (void *ptr);
    int64_t           (*av_rescale_q)                  (int64_t a, AVRational bq, AVRational cq);
@@ -242,10 +234,9 @@ public:
       return wxString::Format(wxT("F(%s),C(%s),U(%s)"),mAVFormatVersion.c_str(),mAVCodecVersion.c_str(),mAVUtilVersion.c_str());
    }
 
-   /* note these values are for Windows only - Mac and Unix have their own
-   * sections elsewhere */
-   //\todo { Section for Mac and *nix }
 #if defined(__WXMSW__)
+   /* Library names and file filters for Windows only */
+
    wxString GetLibraryTypeString()
    {
       return _("Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*");
@@ -253,17 +244,62 @@ public:
 
    wxString GetLibAVFormatPath()
    {
-      return wxT("");
+      wxRegKey reg(wxT("HKEY_LOCAL_MACHINE\\Software\\FFmpeg for Audacity"));
+      wxString path;
+
+      if (reg.Exists()) {
+         reg.QueryValue(wxT("InstallPath"), path);
+      }
+
+      return path;
    }
 
    wxString GetLibAVFormatName()
    {
       return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dll"));
    }
-#else //__WXMSW__
+
+   wxString GetLibAVCodecName()
+   {
+      return (wxT("avcodec-") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dll"));
+   }
+
+   wxString GetLibAVUtilName()
+   {
+      return (wxT("avutil-") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dll"));
+   }
+#elif defined(__WXMAC__)
+   /* Library names and file filters for Mac OS only */
    wxString GetLibraryTypeString()
    {
-      return _("Only avformat.so|*avformat*.so*|Dynamically Linked Libraries (*.so)|*.so|All Files (*)|*");
+      return _("Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*");
+   }
+
+   wxString GetLibAVFormatPath()
+   {
+      return wxT("/usr/local/lib/audacity");
+   }
+
+   wxString GetLibAVFormatName()
+   {
+      return (wxT("libavformat.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dylib"));
+   }
+
+   wxString GetLibAVCodecName()
+   {
+      return (wxT("libavcodec.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dylib"));
+   }
+
+   wxString GetLibAVUtilName()
+   {
+      return (wxT("libavutil.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dylib"));
+   }
+#else
+   /* Library names and file filters for other platforms, basically Linux and
+	* other *nix platforms */
+   wxString GetLibraryTypeString()
+   {
+      return _("Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*");
    }
 
    wxString GetLibAVFormatPath()
@@ -273,9 +309,19 @@ public:
 
    wxString GetLibAVFormatName()
    {
-      return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dll"));
+      return (wxT("libavformat.so.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)));
+   }
+
+   wxString GetLibAVCodecName()
+   {
+      return (wxT("libavcodec.so.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)));
    }
-#endif //__WXMSW__
+
+   wxString GetLibAVUtilName()
+   {
+      return (wxT("libavutil.so.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)));
+   }
+#endif // (__WXMAC__) || (__WXMSW__)
 
    /// Ugly reference counting. I thought of using wxStuff for that,
    /// but decided that wx reference counting is not useful, since
@@ -297,9 +343,6 @@ private:
    wxDynamicLibrary *avcodec;
    wxDynamicLibrary *avutil;
 
-   ///! true if libavformat has internal static linkage, false otherwise
-   bool mStatic;
-
    ///! true if libraries are loaded, false otherwise
    bool mLibsLoaded;
 };
diff --git a/src/FileFormats.h b/src/FileFormats.h
index 2b45e81..0a2caf3 100644
--- a/src/FileFormats.h
+++ b/src/FileFormats.h
@@ -20,25 +20,63 @@
 // enumerating headers
 //
 
+/** @brief Get the number of container formats supported by libsndfile 
+ *
+ * Uses SFC_GET_FORMAT_MAJOR_COUNT in sf_command interface */
 int sf_num_headers();
+
+/** @brief Get the name of a container format from libsndfile 
+ *
+ * Uses SFC_GET_FORMAT_MAJOR in the sf_command() interface. Resulting C string
+ * from libsndfile is converted to a wxString 
+ * @param format The libsndfile format number for the container format required
+ */
 wxString sf_header_index_name(int format_num);
+
 unsigned int sf_header_index_to_type(int format_num);
 
 //
 // enumerating encodings
 //
-
+/** @brief Get the number of data encodings libsndfile supports (in any
+ * container or none */
 int sf_num_encodings();
+/** @brief Get the string name of the data encoding of the requested format
+ *
+ * uses SFC_GET_FORMAT_SUBTYPE */
 wxString sf_encoding_index_name(int encoding_num);
 unsigned int sf_encoding_index_to_subtype(int encoding_num);
 
 //
 // getting info about an actual SF format
 //
-
+/** @brief Get the string name of the specified container format
+ *
+ * AND format with SF_FORMAT_TYPEMASK to get only the container format and
+ * then use SFC_GET_FORMAT_INFO to get the description 
+ * @param format the libsndfile format to get the name for (only the container
+ * part is used) */
 wxString sf_header_name(int format);
+/** @brief Get an abbreviated form of the string name of the specified format
+ *
+ * Do sf_header_name() then truncate the string at the first space in the name
+ * to get just the first word of the format name.
+ * @Param format the libsndfile format to get the name for (only the container
+ * part is used) */
 wxString sf_header_shortname(int format);
+/** @brief Get the most common file extension for the given format
+ *
+ * AND the given format with SF_FORMAT_TYPEMASK to get just the container
+ * format, then retreive the most common extension using SFC_GET_FORMAT_INFO.
+ * @param format the libsndfile format to get the name for (only the container
+ * part is used) */
 wxString sf_header_extension(int format);
+/** @brief Get the string name of the specified data encoding
+ *
+ * AND format with SF_FORMAT_SUBMASK to get only the data encoding and
+ * then use SFC_GET_FORMAT_INFO to get the description 
+ * @param format the libsndfile format to get the name for (only the data
+ * encoding is used) */
 wxString sf_encoding_name(int encoding_num);
 
 //
diff --git a/src/FileIO.cpp b/src/FileIO.cpp
old mode 100755
new mode 100644
diff --git a/src/FileIO.h b/src/FileIO.h
old mode 100755
new mode 100644
diff --git a/src/FileNames.cpp b/src/FileNames.cpp
index 54c648f..3b00b59 100644
--- a/src/FileNames.cpp
+++ b/src/FileNames.cpp
@@ -87,6 +87,12 @@ wxString FileNames::DataDir()
       // executable's EXE file, the prefs are stored in there, otherwise
       // the prefs are stored in the user data dir provided by the OS.
       wxFileName exePath(PlatformCompatibility::GetExecutablePath());
+#if defined(__WXMAC__)
+      // This removes (for instance) "Audacity.app/Contents/MacOSX"
+      exePath.RemoveLastDir();
+      exePath.RemoveLastDir();
+      exePath.RemoveLastDir();
+#endif
       wxFileName portablePrefsPath(exePath.GetPath(), wxT("Portable Settings"));
       
       if (::wxDirExists(portablePrefsPath.GetFullPath()))
diff --git a/src/InterpolateAudio.h b/src/InterpolateAudio.h
index c2d2a7a..5e799cc 100644
--- a/src/InterpolateAudio.h
+++ b/src/InterpolateAudio.h
@@ -35,8 +35,8 @@
 // side (6x the number of bad samples on either side is great).  However,
 // it will work with less data, and with the bad samples on one end or
 // the other.
-void InterpolateAudio(float *buffer, int len,
-		      int firstBad, int numBad);
+void AUDACITY_DLL_API InterpolateAudio(float *buffer, int len,
+                                       int firstBad, int numBad);
 
 #endif // __AUDACITY_INTERPOLATE_AUDIO__
 
diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp
index 32cd645..8d637d4 100644
--- a/src/LabelTrack.cpp
+++ b/src/LabelTrack.cpp
@@ -961,8 +961,7 @@ bool LabelTrack::CopySelectedText()
 bool LabelTrack::PasteSelectedText(double sel0, double sel1)
 {
    if (mSelIndex == -1) {
-      //AddLabel(sel0, sel1, wxT(""));
-      return false;
+      AddLabel(sel0, sel1, wxT(""));
    }
 
    wxString text;
diff --git a/src/Languages.cpp b/src/Languages.cpp
index 0a251bc..68b82f1 100644
--- a/src/Languages.cpp
+++ b/src/Languages.cpp
@@ -101,8 +101,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
    //     charset conversion on Linux platforms
    localLanguageName[wxT("ar")] = wxT("Arabic");
    localLanguageName[wxT("bg")] = wxT("Balgarski");
+   localLanguageName[wxT("bs")] = wxT("Bosnian");
    localLanguageName[wxT("ca")] = wxT("Catalan");
-   localLanguageName[wxT("cb")] = wxT("Khmer");
    localLanguageName[wxT("cs")] = wxT("Czech");
    localLanguageName[wxT("da")] = wxT("Dansk");
    localLanguageName[wxT("de")] = wxT("Deutsch");
@@ -113,8 +113,11 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
    localLanguageName[wxT("fi")] = wxT("Suomi");
    localLanguageName[wxT("fr")] = wxT("Francais");
    localLanguageName[wxT("ga")] = wxT("Gaeilge");
+   localLanguageName[wxT("id")] = wxT("Bahasa Indonesia"); // aka Indonesian
    localLanguageName[wxT("it")] = wxT("Italiano");
    localLanguageName[wxT("ja")] = wxT("Nihongo");
+   localLanguageName[wxT("ka")] = wxT("Georgian");
+   localLanguageName[wxT("km")] = wxT("Khmer");
    localLanguageName[wxT("lo")] = wxT("Lao"); // aka Laothian
    localLanguageName[wxT("lt")] = wxT("Lietuviu");
    localLanguageName[wxT("he")] = wxT("Hebrew");
@@ -131,6 +134,7 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
    localLanguageName[wxT("sv")] = wxT("Svenska");
    localLanguageName[wxT("tr")] = wxT("Turkce");
    localLanguageName[wxT("uk")] = wxT("Ukrainska");
+   localLanguageName[wxT("ca at valencia")] = wxT("Valencian (southern Catalan)");
    localLanguageName[wxT("vi")] = wxT("Vietnamese");
    localLanguageName[wxT("zh")] = wxT("Chinese (Simplified)");
    localLanguageName[wxT("zh_TW")] = wxT("Chinese (Traditional)");
diff --git a/src/Makefile.in b/src/Makefile.in
index 07a8bf8..13440b2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-########################################
+#######################################
 #
 # Audacity Makefile
 #
@@ -38,7 +38,7 @@ override CFLAGS += @CFLAGS@
 override CXXFLAGS += @CXXFLAGS@
 
 # CPPFLAGS are for both C and C++.
-override CPPFLAGS += -fno-strict-aliasing -I$(srcdir)/include -I. -DLIBDIR=\"$(libdir)\" @CPPFLAGS@ 
+override CPPFLAGS += -fno-strict-aliasing -I$(srcdir)/include -I. -DLIBDIR=\"$(libdir)\" -D__STDC_CONSTANT_MACROS @CPPFLAGS@ 
 
 # LDFLAGS are for linking. BUILD_LDFLAGS are not valid during configure because
 # they reference libs that haven't been built yet
@@ -114,6 +114,8 @@ OBJS = \
 	effects/EffectManager.o \
 	effects/SimpleMono.o \
 	effects/SimplePairedTwoTrack.o \
+	effects/SBSMSEffect.o \
+	effects/TimeScale.o \
 	effects/SoundTouchEffect.o \
 	effects/LoadEffects.o \
 	effects/Amplify.o \
@@ -124,6 +126,7 @@ OBJS = \
 	effects/ChangeTempo.o \
 	effects/ClickRemoval.o \
 	effects/Compressor.o \
+	effects/Contrast.o \
 	effects/DtmfGen.o \
 	effects/Echo.o \
 	effects/Equalization.o \
@@ -191,7 +194,6 @@ OBJS = \
 	toolbars/ToolManager.o \
 	toolbars/ToolsToolBar.o \
 	toolbars/TranscriptionToolBar.o \
-	widgets/treebook.o \
 	widgets/AButton.o \
 	widgets/ASlider.o \
 	widgets/AttachableScrollBar.o \
@@ -264,7 +266,8 @@ $(DIRS):
 	mkdir -p ../Audacity.app/Contents/MacOS
 	mkdir -p ../Audacity.app/Contents/Resources
 	cp -f ../audacity ../Audacity.app/Contents/MacOS/Audacity
-	cp -f ../mac/Info.plist ../Audacity.app/Contents
+	gcc -E -dM Audacity.h | grep AUDACITY >Info.plist.h
+	gcc -E -P -x c -Wno-trigraphs -traditional -include Info.plist.h ../mac/Info.plist >../Audacity.app/Contents/Info.plist
 	test -f "../Audacity.app/Contents/PkgInfo" || \
 	     echo "APPLauDy" > ../Audacity.app/Contents/PkgInfo
 	cp -f ../mac/Resources/*.icns ../Audacity.app/Contents/Resources
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 9ed6a35..ead318f 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -77,6 +77,7 @@ simplifies construction of menu items.
 #include "AboutDialog.h"
 #include "Benchmark.h"
 #include "Screenshot.h"
+#include "ondemand/ODManager.h"
 
 #include "Resample.h"
 #include "BatchProcessDialog.h"
@@ -472,6 +473,7 @@ void AudacityProject::CreateMenusAndCommands()
    c->EndSubMenu();
 
    c->AddItem(wxT("ZeroCross"),      _("Find &Zero Crossings\tZ"),         FN(OnZeroCrossing));
+   c->SetCommandFlags(wxT("ZeroCross"), TracksSelectedFlag, TracksSelectedFlag);
 
    c->BeginSubMenu(_("Mo&ve Cursor"));
 
@@ -586,12 +588,12 @@ void AudacityProject::CreateMenusAndCommands()
    play, record, pause etc. */
    c->BeginMenu(_("T&ransport"));
    c->SetDefaultFlags(0, 0);
-      c->AddItem(wxT("Play"), _("Play\tSpacebar"), FN(OnPlayStop));
+      c->AddItem(wxT("Play"), _("Play\tSpace"), FN(OnPlayStop));
       c->SetCommandFlags(wxT("Play"), AudioIONotBusyFlag, AudioIONotBusyFlag);
-      c->AddItem(wxT("PlayLooped"), _("&Loop Play\tShift+Spacebar"), FN(OnPlayLooped));
+      c->AddItem(wxT("PlayLooped"), _("&Loop Play\tShift+Space"), FN(OnPlayLooped));
       c->SetCommandFlags(wxT("PlayLooped"), AudioIONotBusyFlag, AudioIONotBusyFlag);
       c->AddItem(wxT("Pause"), _("&Pause\tP"), FN(OnPause));
-      c->AddItem(wxT("Stop"), _("&Stop\tSpacebar"), FN(OnStop));
+      c->AddItem(wxT("Stop"), _("&Stop\tSpace"), FN(OnStop));
       c->AddItem(wxT("SkipStart"), _("Skip to Start\tHome"), FN(OnSkipStart));
       c->SetCommandFlags(wxT("SkipStart"), AudioIONotBusyFlag, AudioIONotBusyFlag);
       c->AddItem(wxT("SkipEnd"), _("Skip to End\tEnd"), FN(OnSkipEnd));
@@ -978,8 +980,8 @@ void AudacityProject::CreateMenusAndCommands()
    SetMenuBar(menubar);
 
    c->SetDefaultFlags(0, 0);
-   c->AddCommand(wxT("PrevFrame"),   _("Cycle backward through Dock, Track View, and Selection Bar\tCtrl+Shift+F6"), FN(PrevFrame));
-   c->AddCommand(wxT("NextFrame"),   _("Cycle forward through Dock, Track View, and Selection Bar\tCtrl+F6"), FN(NextFrame));
+   c->AddCommand(wxT("PrevFrame"),   _("Cycle backward through toolbars and Track View\tCtrl+Shift+F6"), FN(PrevFrame));
+   c->AddCommand(wxT("NextFrame"),   _("Cycle forward through toolbars and Track View\tCtrl+F6"), FN(NextFrame));
 
 //   c->SetDefaultFlags(TrackPanelHasFocus, TrackPanelHasFocus);
    c->AddCommand(wxT("SelectTool"),  _("Selection Tool\tF1"),          FN(OnSelectTool));
@@ -992,7 +994,7 @@ void AudacityProject::CreateMenusAndCommands()
    c->AddCommand(wxT("NextTool"),   _("Next Tool\tD"),                 FN(OnNextTool));
    c->AddCommand(wxT("PrevTool"),   _("Previous Tool\tA"),             FN(OnPrevTool));
 
-   c->AddCommand(wxT("Play/Stop"),   _("Play/Stop\tSpacebar"),         FN(OnPlayStop));
+   c->AddCommand(wxT("Play/Stop"),   _("Play/Stop\tSpace"),        FN(OnPlayStop));
    c->AddCommand(wxT("Stop"),        _("Stop\tS"),                     FN(OnStop));
    c->AddCommand(wxT("Pause"),       _("Pause\tP"),                    FN(OnPause));
    c->AddCommand(wxT("Record"),      _("Record\tR"),                   FN(OnRecord));
@@ -1004,7 +1006,7 @@ void AudacityProject::CreateMenusAndCommands()
    c->AddCommand(wxT("PlayOneSec"),     _("Play One Second\t1"),       FN(OnPlayOneSecond));
    c->AddCommand(wxT("PlayToSelection"),_("Play To Selection\tB"),       FN(OnPlayToSelection));
    c->AddCommand(wxT("PlayLooped"),     _("Play Looped\tL"),           FN(OnPlayLooped));
-   c->AddCommand(wxT("PlayLoopAlt"),    _("Play Looped\tShift+Spacebar"), FN(OnPlayLooped));
+   c->AddCommand(wxT("PlayLoopAlt"),    _("Play Looped\tShift+Space"), FN(OnPlayLooped));
    c->AddCommand(wxT("PlayCutPreview"), _("Play Cut Preview\tC"),      FN(OnPlayCutPreview));
 
    c->AddCommand(wxT("SkipStart"),   _("Skip to Start\tHome"),         FN(OnSkipStart));
@@ -1037,7 +1039,7 @@ void AudacityProject::CreateMenusAndCommands()
    c->AddCommand(wxT("ShiftDown"),     _("Move Focus to Next and Change Selection\tShift+Down"),   FN(OnShiftDown));
    c->AddCommand(wxT("Toggle"),        _("Toggle Focused Track\tReturn"),                    FN(OnToggle));
    c->AddCommand(wxT("Toggle1"),       _("Toggle Focused Track\tNUMPAD_ENTER"),              FN(OnToggle));
-   c->AddCommand(wxT("Toggle2"),       _("Toggle Focused Track\tCtrl+Spacebar"),             FN(OnToggle));
+   c->AddCommand(wxT("Toggle2"),       _("Toggle Focused Track\tCtrl+Space"),            FN(OnToggle));
 
    c->AddCommand(wxT("CursorLeft"),    _("Cursor Left\tLeft"),                               FN(OnCursorLeft));
    c->AddCommand(wxT("CursorRight"),   _("Cursor Right\tRight"),                             FN(OnCursorRight));
@@ -1068,6 +1070,8 @@ void AudacityProject::CreateMenusAndCommands()
 
    c->AddCommand(wxT("SnapToOn"),      _("Snap To On"),           FN(OnSnapToOn));
    c->AddCommand(wxT("SnapToOff"),     _("Snap To Off"),          FN(OnSnapToOff));
+   c->AddCommand(wxT("FullScreenOnOff"), _("Full screen on/off\tF11"),  FN(OnFullScreen));
+   c->SetCommandFlags(wxT("FullScreenOnOff"), 0, 0);
 
    mLastFlags = 0;
 
@@ -1248,6 +1252,15 @@ void AudacityProject::ModifyUndoMenus()
 
 void AudacityProject::RebuildMenuBar()
 {
+   // On OSX, we can't rebuild the menus while a modal dialog is being shown
+   // since the enabled state for menus like Quit and Preference gets out of
+   // sync with wxWidgets idea of what it should be.
+#if defined(__WXMAC__) && defined(__WXDEBUG__)
+   {
+      wxDialog *d = wxDynamicCast(wxGetTopLevelParent(FindFocus()), wxDialog);
+      wxASSERT((!d || !d->IsModal()));
+   }
+#endif
 
 // Under Windows we delete the menus, since we will soon recreate them.
 // rather oddly, the menus don't vanish as a result of doing this.
@@ -2027,6 +2040,7 @@ void AudacityProject::OnSetLeftSelection()
          TimeDialog D(this, wxID_ANY, _("Set Left Selection Bound"));
          D.SetSampleRate(mRate);
          D.SetFormatString(fmt);
+         D.SetTimeValue(mViewInfo.sel0);
          if(wxID_OK==D.ShowModal() )
             {
                //Get the value from the dialog
@@ -2062,6 +2076,7 @@ void AudacityProject::OnSetRightSelection()
          TimeDialog D(this, wxID_ANY, _("Set Right Selection Bound"));
          D.SetSampleRate(mRate);
          D.SetFormatString(fmt);
+         D.SetTimeValue(mViewInfo.sel1);
          if(wxID_OK==D.ShowModal() )
             {
                //Get the value from the dialog
@@ -2346,9 +2361,12 @@ bool AudacityProject::OnEffect(int type, Effect * f)
       //STM:
       //The following automatically re-zooms after sound was generated.
       // IMO, it was disorienting, removing to try out without re-fitting
-      //if (mTracks->GetEndTime() > prevEndTime)
-      //      OnZoomFit();
-
+      //mchinen:12/14/08 reapplying for generate effects
+      if ( f->GetEffectFlags() & INSERT_EFFECT)
+      {
+            OnZoomFit();
+          //  mTrackPanel->Refresh(false);
+      }
       RedrawProject();
       if (focus != NULL) {
          focus->SetFocus();
@@ -2439,7 +2457,7 @@ void AudacityProject::OnAnalyzePlugin(int index)
 
 void AudacityProject::OnNew()
 {
-   CreateNewAudacityProject(gParentWindow);
+   CreateNewAudacityProject();
 }
 
 void AudacityProject::OnOpen()
@@ -2674,6 +2692,18 @@ void AudacityProject::OnPreferences()
 {
    PrefsDialog dialog(this /* parent */ );
    dialog.ShowModal();
+
+   // LL:  Moved from PrefsDialog since wxWidgets on OSX can't deal with
+   //      rebuilding the menus while the PrefsDialog is still in the modal
+   //      state.
+   for (unsigned int j = 0; j < gAudacityProjects.GetCount(); j++) {
+      gAudacityProjects[j]->UpdatePrefsVariables();
+      gAudacityProjects[j]->RebuildMenuBar();
+      gAudacityProjects[j]->RebuildOtherMenus();
+      if (gAudacityProjects[j]->GetSelectionBar()) {
+         gAudacityProjects[j]->GetSelectionBar()->UpdateDisplay();
+      }
+   }
 }
 
 void AudacityProject::OnPageSetup()
@@ -2764,18 +2794,19 @@ void AudacityProject::OnCut()
    while (n) {
       if (n->GetSelected()) {
          dest = NULL;
-         if (n->GetKind() == Track::Wave && 
-             gPrefs->Read(wxT("/GUI/EnableCutLines"), (long)0))
+         switch (n->GetKind())
          {
-            ((WaveTrack*)n)->Copy(mViewInfo.sel0, mViewInfo.sel1, &dest);
 #if defined(USE_MIDI)
-         } else if (n->GetKind() == Track::Note) {
-            // Since portsmf has a built-in cut operator, we use that instead
-            n->Cut(mViewInfo.sel0, mViewInfo.sel1, &dest);
+            case Track::Note:
+               // Since portsmf has a built-in cut operator, we use that instead
+               n->Cut(mViewInfo.sel0, mViewInfo.sel1, &dest);
+            break;
 #endif
-         } else {
-            n->Copy(mViewInfo.sel0, mViewInfo.sel1, &dest);
+            default:
+               n->Copy(mViewInfo.sel0, mViewInfo.sel1, &dest);
+            break;
          }
+
          if (dest) {
             dest->SetChannel(n->GetChannel());
             dest->SetTeamed(n->GetTeamed()); // do first
@@ -2787,15 +2818,32 @@ void AudacityProject::OnCut()
       n = iter.Next();
    }
 
-#if defined(USE_MIDI)
    n = iter.First();
    while (n) {
-      if (n->GetSelected() && n->GetKind() != Track::Note)
-         //if NoteTrack, it was cut, so do not clear anything
-         n->Clear(mViewInfo.sel0, mViewInfo.sel1);
+      if (n->GetSelected()) {
+         switch (n->GetKind())
+         {
+#if defined(USE_MIDI)
+            case Track::Note:
+               //if NoteTrack, it was cut, so do not clear anything
+            break;
+#endif
+            case Track::Wave:
+               if (gPrefs->Read(wxT("/GUI/EnableCutLines"), (long)0)) {
+                  ((WaveTrack*)n)->ClearAndAddCutLine(mViewInfo.sel0,
+                                                      mViewInfo.sel1);
+                  break;
+               }
+
+               // Fall through
+
+            default:
+               n->Clear(mViewInfo.sel0, mViewInfo.sel1);
+            break;
+         }
+      }
       n = iter.Next();
    }
-#endif
 
    msClipLen = (mViewInfo.sel1 - mViewInfo.sel0);
    msClipProject = this;
@@ -3991,7 +4039,7 @@ void AudacityProject::OnPlotSpectrum()
       wxMessageBox(msg);
    }
 
-   InitFreqWindow(gParentWindow);
+   InitFreqWindow(NULL);
    gFreqWindow->Plot(len, buffer, rate);
    gFreqWindow->Show(true);
    gFreqWindow->Raise();
@@ -4075,6 +4123,10 @@ void AudacityProject::OnImport()
    }
 
    gPrefs->Write(wxT("/NewImportingSession"), true);
+   //sort selected files by OD status.  Load non OD first so user can edit asap.
+   //first sort selectedFiles.
+   selectedFiles.Sort(CompareODFileName);
+   
    for (size_t ff = 0; ff < selectedFiles.GetCount(); ff++) {
       wxString fileName = selectedFiles[ff];
 
@@ -4087,6 +4139,10 @@ void AudacityProject::OnImport()
    HandleResize(); // Adjust scrollers for new track sizes.
 }
 
+
+
+
+
 void AudacityProject::OnImportLabels()
 {
    wxString path = gPrefs->Read(wxT("/DefaultOpenPath"),::wxGetCwd());
@@ -5208,6 +5264,14 @@ void AudacityProject::OnSnapToOff()
    SetSnapTo(false);
 }
 
+void AudacityProject::OnFullScreen()
+{
+   if(wxTopLevelWindow::IsFullScreen())
+      wxTopLevelWindow::ShowFullScreen(false);
+   else
+      wxTopLevelWindow::ShowFullScreen(true);
+}
+
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
 //
diff --git a/src/Menus.h b/src/Menus.h
index 3bc57f0..24e1827 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -142,6 +142,7 @@ void OnSortName();
 
 void OnSnapToOn();
 void OnSnapToOff();
+void OnFullScreen();
 
         // File Menu
 
diff --git a/src/PitchName.cpp b/src/PitchName.cpp
index 3e6d65e..3a4064d 100644
--- a/src/PitchName.cpp
+++ b/src/PitchName.cpp
@@ -29,15 +29,15 @@
 // The offset to 57 is used to determine the register. 
 // Each register starts with C (e.g., for middle C and A440, 
 // it's register 4).
-float Freq2Pitch(float freq)
+double Freq2Pitch(double freq)
 {
-   return float (57.0 + (12.0 * (log(freq / 440.0) / log(2.0))));
+   return double (57.0 + (12.0 * (log(freq / 440.0) / log(2.0))));
 }
 
-// PitchIndex returns the [0,11] index for a float pitchNum, 
+// PitchIndex returns the [0,11] index for a double pitchNum, 
 // as per result from Freq2Pitch, corresponding to modulo 12 
 // of the integer part of (pitchNum + 0.5), so 0=C, 1=C#, etc.
-unsigned int PitchIndex(float pitchNum)
+unsigned int PitchIndex(double pitchNum)
 {
 	return ((int)(pitchNum + 0.5) % 12);
 }
@@ -49,7 +49,7 @@ wxChar * p_PitchName;
 // PitchName takes pitchNum (as per result from 
 // Freq2Pitch) and returns a standard pitch/note name [C, C#, etc.). 
 // Sharps are the default, unless, bWantFlats is true.
-wxChar * PitchName(float pitchNum, bool bWantFlats /* = false */)
+wxChar * PitchName(double pitchNum, bool bWantFlats /* = false */)
 {
    p_PitchName = gPitchName;
 
@@ -130,7 +130,8 @@ wxChar * PitchName(float pitchNum, bool bWantFlats /* = false */)
 // PitchName_Absolute does the same thing as PitchName, but appends 
 // the register number, e.g., instead of "C" it will return "C4" 
 // if the pitchNum corresonds to middle C.
-wxChar * PitchName_Absolute(float pitchNum, bool bWantFlats /* = false */)
+// Sharps are the default, unless, bWantFlats is true.
+wxChar * PitchName_Absolute(double pitchNum, bool bWantFlats /* = false */)
 {
    PitchName(pitchNum, bWantFlats); 
 
diff --git a/src/PitchName.h b/src/PitchName.h
index 5d30b17..04e3bd6 100644
--- a/src/PitchName.h
+++ b/src/PitchName.h
@@ -23,22 +23,23 @@
 // The offset to 57 is used to determine the register. 
 // Each register starts with C (e.g., for middle C and A440, 
 // it's register 4).
-float Freq2Pitch(float freq);
+double Freq2Pitch(double freq);
 
-// PitchIndex returns the [0,11] index for a float pitchNum, 
+// PitchIndex returns the [0,11] index for a double pitchNum, 
 // as per result from Freq2Pitch, corresponding to modulo 12 
 // of the integer part of (pitchNum + 0.5), so 0=C, 1=C#, etc.
-unsigned int PitchIndex(float pitchNum);
+unsigned int PitchIndex(double pitchNum);
 
 // PitchName takes pitchNum (as per result from 
 // Freq2Pitch) and returns a standard pitch/note name [C, C#, etc.). 
 // Sharps are the default, unless, bWantFlats is true.
-wxChar * PitchName(float pitchNum, bool bWantFlats = false);
+wxChar * PitchName(double pitchNum, bool bWantFlats = false);
 
 // PitchName_Absolute does the same thing as PitchName, but appends 
 // the register number, e.g., instead of "C" it will return "C4" 
 // if the pitchNum corresonds to middle C.
-wxChar * PitchName_Absolute(float pitchNum, bool bWantFlats = false);
+// Sharps are the default, unless, bWantFlats is true.
+wxChar * PitchName_Absolute(double pitchNum, bool bWantFlats = false);
 
 #endif	// __AUDACITY_PITCHNAME__
 
diff --git a/src/PlatformCompatibility.cpp b/src/PlatformCompatibility.cpp
index d6a81ad..4c58d5e 100644
--- a/src/PlatformCompatibility.cpp
+++ b/src/PlatformCompatibility.cpp
@@ -25,120 +25,30 @@
 #include <wx/stdpaths.h>
 #include <wx/app.h>
 
-#ifdef __WXMAC__
-#include <wx/mac/private.h>
-#endif
-
 #include "AudacityApp.h"
 #include "PlatformCompatibility.h"
 
 wxString PlatformCompatibility::GetLongFileName(const wxString& shortFileName)
 {
-#ifndef _WIN32
+   wxFileName fn(shortFileName);
 
-   // On other platforms than Win32, this function is only a dummy
-   return shortFileName;
+   return fn.GetLongPath();
+}
 
-#else
+wxString PlatformCompatibility::GetExecutablePath()
+{
+   static bool found = false;
+   static wxString path;
 
-   wxString stringLeft = shortFileName;
-   wxString s;
-   wxString longFileName;
-
-   while (!stringLeft.IsEmpty())
-   {
-      // Get next path component
-      int end = stringLeft.Find('\\');
-      
-      if (end == -1) {
-         s = stringLeft;
-         stringLeft.Empty();
-      } else {
-         s = stringLeft.Left(end);
-         stringLeft = stringLeft.Mid(end + 1);
-      }
-
-      // Process it unless it is empty, or the drive name
-      if (!(s.IsEmpty() || (s.Length() == 2 && s.GetChar(1) == ':')))
-      {
-         // Now resolve for _every_ path component the long file name.
-         // The standard way (only resolve components with '~' in it) is not
-         // enough, because the user may have NameNumericTail turned off.
-         wxString pathToFind = longFileName + s;
-         WIN32_FIND_DATA findData;
-         HANDLE findHandle = FindFirstFile(pathToFind.fn_str(), &findData);
-
-         if (findHandle != INVALID_HANDLE_VALUE)
-         {
-            s = findData.cFileName; // cFileName always contains long file name
-            FindClose(findHandle);
-         }
-      }
-
-      // Note that we must be careful here to prevent discarding any
-      // backslashes. It could e.g. be a network name, too!
-      longFileName += s;
-      if (end != -1)
-         longFileName += wxT("\\");
-   }
+   if (!found) {
+      wxStandardPaths std;
 
-   return longFileName;
+      path = std.GetExecutablePath();
 
-#endif
-}
+      found = true;
+   }
 
-//
-// Taken from http://wxwidgets.org/docs/technote/install.htm
-//
-wxString PlatformCompatibility::GetExecutablePath()
-{
-    static bool found = false;
-    static wxString path;
-
-    if (found)
-        return path;
-    else
-    {
-#ifdef __WXMSW__
-
-        wxChar buf[512];
-        *buf = '\0';
-        GetModuleFileName(NULL, buf, 511);
-        path = buf;
-
-#elif defined(__WXMAC__)
-
-        ProcessInfoRec processinfo;
-        ProcessSerialNumber procno ;
-        FSSpec fsSpec;
-
-        procno.highLongOfPSN = 0 ;
-        procno.lowLongOfPSN = kCurrentProcess ;
-        processinfo.processInfoLength = sizeof(ProcessInfoRec);
-        processinfo.processName = NULL;
-        processinfo.processAppSpec = &fsSpec;
-
-        GetProcessInformation( &procno , &processinfo ) ;
-        path = wxMacFSSpec2MacFilename(&fsSpec);
-#else
-        wxString argv0 = wxGetApp().argv[0];
-
-        if (wxIsAbsolutePath(argv0))
-            path = argv0;
-        else
-        {
-            wxPathList pathlist;
-            pathlist.AddEnvList(wxT("PATH"));
-            path = pathlist.FindAbsoluteValidPath(argv0);
-        }
-
-        wxFileName filename(path);
-        filename.Normalize();
-        path = filename.GetFullPath();
-#endif
-        found = true;
-        return path;
-    }
+   return path;
 }
 
 wxString PlatformCompatibility::ConvertSlashInFileName(const wxString& filePath)
diff --git a/src/Project.cpp b/src/Project.cpp
index 7ce0e5c..08eccef 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -66,6 +66,7 @@ scroll information.  It also has some status flags.
 #include <wx/ffile.h>
 #include <wx/filedlg.h>
 #include <wx/filefn.h>
+#include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/log.h>
 #include <wx/menu.h>
@@ -304,6 +305,7 @@ public:
                ((wxFileDataObject*)GetDataObject())->SetData(0, "");
                firstFileAdded = true;
             }
+
             ((wxFileDataObject*)GetDataObject())->AddFile(name);
 
             // We only want to process one flavor
@@ -313,12 +315,49 @@ public:
 
       return foundSupported;
    }
+
+   bool OnDrop(wxCoord x, wxCoord y)
+   {
+      bool foundSupported = false;
+      bool firstFileAdded = false;
+      OSErr result;
+
+      UInt16 items = 0;
+      CountDragItems((DragReference)m_currentDrag, &items);
+
+      for (UInt16 index = 1; index <= items; index++) {
+
+         DragItemRef theItem = 0;
+         GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
+
+         UInt16 flavors = 0;
+         CountDragItemFlavors((DragReference)m_currentDrag, theItem , &flavors ) ;
+
+         for (UInt16 flavor = 1 ;flavor <= flavors; flavor++) {
+
+            FlavorType theType = 0;
+            result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor, &theType);
+            if (theType != kDragPromisedFlavorFindFile && theType != kDragFlavorTypeHFS) {
+               continue;
+            }
+            return true;
+         }
+      }
+
+      return CurrentDragHasSupportedFormat();
+   }
+
 #endif
 
    bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
    {
-      for (unsigned int i = 0; i < filenames.GetCount(); i++) {
-         mProject->Import(filenames[i]);
+      //sort by OD non OD.  load Non OD first so user can start editing asap.
+      wxArrayString sortednames(filenames);
+      
+      sortednames.Sort(CompareODFileName);
+      for (unsigned int i = 0; i < sortednames.GetCount(); i++) {
+         
+         mProject->Import(sortednames[i]);
       }
       mProject->HandleResize(); // Adjust scrollers for new track sizes.
       return true;
@@ -352,28 +391,26 @@ bool ImportXMLTagHandler::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
    return true; //v result from Import?
 };
 
-AudacityProject *CreateNewAudacityProject(wxWindow * parentWindow)
+AudacityProject *CreateNewAudacityProject()
 {
    bool bMaximized;
    wxRect wndRect;
 
-#if defined(__WXMAC__)
-   if (gParentFrame->IsShown()) {
-      gParentFrame->Hide();
-   }
-#endif
-   
    GetNextWindowPlacement(&wndRect, &bMaximized);
 
    //Create and show a new project
-   AudacityProject *p = new AudacityProject(parentWindow, -1,
-                                            wxPoint(wndRect.x, wndRect.y), wxSize(wndRect.width, wndRect.height));
+   AudacityProject *p = new AudacityProject(NULL, -1,
+                                            wxPoint(wndRect.x, wndRect.y),
+                                            wxSize(wndRect.width, wndRect.height));
 
    gAudacityProjects.Add(p);
    
    if(bMaximized)
       p->Maximize(true);
 
+   //Initialise the Listener
+   gAudioIO->SetListener(p);
+
    //Set the new project as active:
    SetActiveProject(p);
 
@@ -874,9 +911,29 @@ void AudacityProject::UpdatePrefs()
    }
 }
 
-void AudacityProject::RedrawProject()
+void AudacityProject::RedrawProject(const bool bForceWaveTracks /*= false*/)
 {
    FixScrollbars();
+   if (bForceWaveTracks && mTracks)
+   {
+      TrackListIterator iter(mTracks);
+      Track* pTrack = iter.First();
+      while (pTrack) 
+      {
+         if (pTrack->GetKind() == Track::Wave)
+         {
+            WaveTrack* pWaveTrack = (WaveTrack*)pTrack;
+            WaveClipList::Node* node = pWaveTrack->GetClipIterator();
+            while (node) 
+            {
+               WaveClip *clip = node->GetData();
+               clip->MarkChanged();
+               node = node->GetNext();
+            }
+         }
+         pTrack = iter.Next();
+      }
+   }
    mTrackPanel->Refresh(false);
 }
 
@@ -1683,6 +1740,12 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
    
    if (gAudacityProjects.IsEmpty() && !gIsQuitting) {
       bool quitOnClose;
+
+      // LL:  On the Mac, we don't want the logger open after all projects
+      //      have been closed since it's menu will show instead of the
+      //      common menu.
+      wxGetApp().mLogger->Show(false);
+      
 #ifdef __WXMAC__
       bool defaultQuitOnClose = false;
 #else
@@ -1694,11 +1757,8 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
       if (quitOnClose)
          QuitAudacity();
       else {
-#ifdef __WXMAC__
-         gParentFrame->Show();
-         wxGetApp().SetTopWindow(gParentFrame);
-#else
-         CreateNewAudacityProject(gParentWindow);
+#if !defined(__WXMAC__)
+         CreateNewAudacityProject();
 #endif
       }
    }
@@ -1830,6 +1890,12 @@ void AudacityProject::OpenFiles(AudacityProject *proj)
    if (selectedFiles.GetCount() == 0) {
       return;
    }
+   
+   
+   //sort selected files by OD status.  
+   //For the open menu we load OD first so user can edit asap.
+   //first sort selectedFiles.
+   selectedFiles.Sort(CompareODFirstFileName);
 
    for (size_t ff = 0; ff < selectedFiles.GetCount(); ff++) {
       wxString fileName = selectedFiles[ff];
@@ -1861,7 +1927,7 @@ void AudacityProject::OpenFiles(AudacityProject *proj)
       // project directory, etc.
       if (!proj || proj->mDirty || !proj->mTracks->IsEmpty()) {
          // Open in a new window
-         proj = CreateNewAudacityProject(gParentWindow);
+         proj = CreateNewAudacityProject();
       }
       // This project is clean; it's never been touched.  Therefore
       // all relevant member variables are in their initial state,
@@ -2483,6 +2549,19 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
    }
    else
    {
+      TrackListIterator iter(mTracks);
+      bool bHasTracks = (iter.First() != NULL);
+      if (!bHasTracks)
+      {
+         if (mUndoManager.UnsavedChanges()) {
+            int result = wxMessageBox(_("Your project is now empty.\nIf saved, the project will have no tracks.\n\nTo save any previously open tracks:\nClick 'No', Edit > Undo until all tracks\nare open, then File > Save Project.\n\nSave anyway?"),
+                                      _("Warning empty project"),
+                                      wxYES_NO | wxICON_QUESTION, this);
+            if (result == wxNO)
+               return false;
+         }
+      }
+
       if (!fromSaveAs && mDirManager->GetProjectName() == wxT(""))
          return SaveAs();
 
@@ -2617,15 +2696,8 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
    saveFile.Close();
    
 #ifdef __WXMAC__
-   FSSpec spec;
-
-   wxMacFilename2FSSpec(mFileName, &spec);
-   FInfo finfo;
-   if (FSpGetFInfo(&spec, &finfo) == noErr) {
-      finfo.fdType = AUDACITY_PROJECT_TYPE;
-      finfo.fdCreator = AUDACITY_CREATOR;
-      FSpSetFInfo(&spec, &finfo);
-   }
+   wxFileName fn(mFileName);
+   fn.MacSetTypeAndCreator(AUDACITY_PROJECT_TYPE, AUDACITY_CREATOR);
 #endif
 
    if (!bWantSaveCompressed)
@@ -2766,10 +2838,12 @@ void AudacityProject::AddImportedTracks(wxString fileName,
       }
       mTracks->Add(newTracks[i]);
       newTracks[i]->SetSelected(true);
-      if (numTracks > 1)
+      if (numTracks > 2 || (numTracks > 1 && !newTracks[i]->GetTeamed())) {
          newTracks[i]->SetName(trackNameBase + wxString::Format(wxT(" %d" ), i + 1));
-      else
+      }
+      else {
          newTracks[i]->SetName(trackNameBase);
+      }
          
       // Check if new track contains aliased blockfiles and if yes,
       // remember this to show a warning later
@@ -2792,15 +2866,8 @@ void AudacityProject::AddImportedTracks(wxString fileName,
    // Automatically assign rate of imported file to whole project,
    // if this is the first file that is imported
    if (initiallyEmpty && newRate > 0) {
-      // msmeyer: Before changing rate, check if rate is supported
-      // by current sound card. If it is not, don't change it,
-      // otherwise playback won't work.
-      wxArrayLong rates = AudioIO::GetSupportedSampleRates(-1, -1, newRate);
-      if (rates.Index((int)newRate) != wxNOT_FOUND)
-      {
-         mRate = newRate;
-         GetSelectionBar()->SetRate(mRate);
-      }
+      mRate = newRate;
+      GetSelectionBar()->SetRate(mRate);
    }
 
    PushState(wxString::Format(_("Imported '%s'"), fileName.c_str()),
diff --git a/src/Project.h b/src/Project.h
index 671261e..1c62df2 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -71,7 +71,7 @@ class AudacityProject;
 class RecordingRecoveryHandler;
 class ODLock;
 
-AudacityProject *CreateNewAudacityProject(wxWindow * parentFrame);
+AudacityProject *CreateNewAudacityProject();
 AUDACITY_DLL_API AudacityProject *GetActiveProject();
 void RedrawAllProjects();
 void RefreshCursorForAllProjects();
@@ -229,7 +229,7 @@ class AUDACITY_DLL_API AudacityProject:  public wxFrame,
    void UpdateMenus();
    void UpdatePrefs();
    void UpdatePrefsVariables();
-   void RedrawProject();
+   void RedrawProject(const bool bForceWaveTracks = false);
    void RefreshCursor();
    void SelectNone();
    void SelectAllIfNone();
diff --git a/src/Sequence.cpp b/src/Sequence.cpp
index 5d37da9..f788fc8 100644
--- a/src/Sequence.cpp
+++ b/src/Sequence.cpp
@@ -259,6 +259,65 @@ bool Sequence::GetMinMax(sampleCount start, sampleCount len,
    return true;
 }
 
+bool Sequence::GetRMS(sampleCount start, sampleCount len,
+                         float * outRMS) const
+{
+   if (len == 0 || mBlock->Count() == 0) {
+      *outRMS = float(0.0);
+      return true;
+   }
+
+   double sumsq = 0.0;
+   sampleCount length = 0;
+
+   unsigned int block0 = FindBlock(start);
+   unsigned int block1 = FindBlock(start + len);
+
+   sampleCount s0, l0, maxl0;
+
+   // First calculate the rms of the blocks in the middle of this region;
+   // this is very fast because we have the rms of every entire block
+   // already in memory.
+   unsigned int b;
+
+   for (b = block0 + 1; b < block1; b++) {
+      float blockMin, blockMax, blockRMS;
+      mBlock->Item(b)->f->GetMinMax(&blockMin, &blockMax, &blockRMS);
+
+      sumsq += blockRMS * blockRMS * mBlock->Item(block0)->f->GetLength();
+      length += mBlock->Item(block0)->f->GetLength();
+   }
+
+   // Now we take the first and last blocks into account, noting that the
+   // selection may only partly overlap these blocks.
+   // If not, we need read some samples and summaries from disk.
+   s0 = start - mBlock->Item(block0)->start;
+   l0 = len;
+   maxl0 = mBlock->Item(block0)->start + mBlock->Item(block0)->f->GetLength() - start;
+   if (l0 > maxl0)
+      l0 = maxl0;
+
+   float partialMin, partialMax, partialRMS;
+   mBlock->Item(block0)->f->GetMinMax(s0, l0, &partialMin, &partialMax, &partialRMS);
+
+   sumsq += partialRMS * partialRMS * l0;
+   length += l0;
+
+   if (block1 > block0) {
+      s0 = 0;
+      l0 = (start + len) - mBlock->Item(block1)->start;
+
+      mBlock->Item(block1)->f->GetMinMax(s0, l0,
+                                         &partialMin, &partialMax, &partialRMS);
+      sumsq += partialRMS * partialRMS * l0;
+      length += l0;
+   }
+
+   *outRMS = sqrt(sumsq/length);
+
+   return true;
+}
+
 bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest)
 {
    *dest = 0;
diff --git a/src/Sequence.h b/src/Sequence.h
index 24d3a1b..155bcdc 100644
--- a/src/Sequence.h
+++ b/src/Sequence.h
@@ -138,6 +138,8 @@ class Sequence: public XMLTagHandler {
 
    bool GetMinMax(sampleCount start, sampleCount len,
                   float * min, float * max) const;
+   bool GetRMS(sampleCount start, sampleCount len,
+                  float * outRMS) const;
 
    //
    // Getting block size information
diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index 5b88cb2..e85b4af 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -2011,3 +2011,11 @@ void ShuttleGui::AddStandardButtons(long buttons, wxButton *extra)
 
    EndVerticalLay();
 }
+
+void ShuttleGui::AddSpace( int width, int height )
+{
+   if( mShuttleMode != eIsCreating )
+      return;
+
+   mpSizer->Add( width, height, 0);
+}
diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
index 978e0d1..4b0a14c 100644
--- a/src/ShuttleGui.h
+++ b/src/ShuttleGui.h
@@ -330,5 +330,8 @@ public:
    RulerPanel * AddRulerVertical( float low, float hi, const wxString & Units );
    AttachableScrollBar * AddAttachableScrollBar( long style = wxSB_HORIZONTAL );
    void AddStandardButtons( long buttons = eOkButton | eCancelButton, wxButton *extra = NULL );
+   void AddSpace( int width, int height );
+   void AddSpace( int size ) { AddSpace( size, size ); };
+   int GetBorder() { return miBorder; };
 };
 #endif
diff --git a/src/Tags.cpp b/src/Tags.cpp
index 88b2b7e..91526e9 100644
--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@@ -337,7 +337,7 @@ void Tags::AllowEditTrackNumber(bool editTrackNumber)
    mEditTrackNumber = editTrackNumber;
 }
 
-int Tags::GetNumGenres()
+int Tags::GetNumUserGenres()
 {
    return mGenres.GetCount();
 }
@@ -368,15 +368,26 @@ void Tags::LoadGenres()
    }
 }
 
-wxString Tags::GetGenre(int i)
+wxString Tags::GetUserGenre(int i)
 {
-   if (i >= 0 && i < GetNumGenres()) {
+   if (i >= 0 && i < GetNumUserGenres()) {
       return mGenres[i];
    }
 
    return wxT("");
 }
 
+wxString Tags::GetGenre(int i)
+{
+   int cnt = WXSIZEOF(DefaultGenres);
+
+   if (i >= 0 && i < cnt) {
+      return DefaultGenres[i];
+   }
+
+   return wxT("");
+}
+
 int Tags::GetGenre(const wxString & name)
 {
    int cnt = WXSIZEOF(DefaultGenres);
@@ -387,7 +398,7 @@ int Tags::GetGenre(const wxString & name)
       }
    }
 
-   return 0;
+   return 255;
 }
 
 bool Tags::HasTag(const wxString & name)
@@ -569,29 +580,6 @@ bool Tags::ShowEditDialog(wxWindow *parent, wxString title, bool force)
 
    return true;
 }
-
-bool Tags::ShowEditDialog1(wxWindow *parent, wxString title, bool force)
-{
-   if (force || IsEmpty()) {
-      TagsEditor1 dlg(parent, title, this, mEditTitle, mEditTrackNumber);
-
-      return dlg.ShowModal() == wxID_OK;
-   }
-
-   return true;
-}
-
-bool Tags::ShowEditDialog2(wxWindow *parent, wxString title, bool force)
-{
-   if (force || IsEmpty()) {
-      TagsEditor2 dlg(parent, title, this, mEditTitle, mEditTrackNumber);
-
-      return dlg.ShowModal() == wxID_OK;
-   }
-
-   return true;
-}
-
 //
 // ComboEditor - Wrapper to prevent unwanted background erasure
 //
@@ -786,7 +774,7 @@ void TagsEditor::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartHorizontalLay(wxALIGN_LEFT, false);
       {
-         S.AddUnits(_("Press F2 or double click to edit."));
+         S.AddUnits(_("Use arrow keys (or RETURN key after editing) to navigate fields."));
       }
       S.EndHorizontalLay();
 
@@ -809,7 +797,6 @@ void TagsEditor::PopulateOrExchange(ShuttleGui & S)
          mGrid->CreateGrid(0, 2); 
          mGrid->SetRowLabelSize(0);
          mGrid->SetDefaultCellAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
-         mGrid->SetDefaultCellBackgroundColour(*wxWHITE);
          mGrid->SetColLabelValue(0, _("Tag Name"));
          mGrid->SetColLabelValue(1, _("Tag Value"));
 
@@ -836,8 +823,8 @@ void TagsEditor::PopulateOrExchange(ShuttleGui & S)
          {
             S.StartMultiColumn(4, wxALIGN_CENTER);
             {
-               S.Id(EditID).AddButton(_("Edit"));
-               S.Id(ResetID).AddButton(_("Reset"));
+               S.Id(EditID).AddButton(_("E&dit..."));
+               S.Id(ResetID).AddButton(_("Rese&t..."));
             }
             S.EndMultiColumn();
          }
@@ -1015,9 +1002,9 @@ void TagsEditor::OnEdit(wxCommandEvent & event)
    S.AddStandardButtons();
 
    wxSortedArrayString g;
-   int cnt = mLocal.GetNumGenres();
+   int cnt = mLocal.GetNumUserGenres();
    for (int i = 0; i < cnt; i++) {
-      g.Add(mLocal.GetGenre(i));
+      g.Add(mLocal.GetUserGenre(i));
    }
 
    for (int i = 0; i < cnt; i++) {
@@ -1065,9 +1052,9 @@ void TagsEditor::OnReset(wxCommandEvent & event)
    }
 
    tf.Clear();
-   int cnt = mLocal.GetNumGenres();
+   int cnt = mLocal.GetNumUserGenres();
    for (int i = 0; i < cnt; i++) {
-      tf.AddLine(mLocal.GetGenre(i));
+      tf.AddLine(mLocal.GetUserGenre(i));
    }
 
    tf.Write();
@@ -1094,7 +1081,7 @@ void TagsEditor::OnLoad(wxCommandEvent & event)
    wxString fn;
 
    // Ask the user for the real name
-   fn = FileSelector(_("Save Metadata As:"),
+   fn = FileSelector(_("Load Metadata As:"),
                      FileNames::DataDir(),
                      wxT("Tags.xml"),
                      wxT("xml"),
@@ -1320,13 +1307,13 @@ void TagsEditor::SetEditors()
 
 void TagsEditor::PopulateGenres()
 {
-   int cnt = mLocal.GetNumGenres();
+   int cnt = mLocal.GetNumUserGenres();
    int i;
    wxString parm;
    wxSortedArrayString g;
 
    for (i = 0; i < cnt; i++) {
-      g.Add(mLocal.GetGenre(i));
+      g.Add(mLocal.GetUserGenre(i));
    }
 
    for (i = 0; i < cnt; i++) {
@@ -1336,1259 +1323,6 @@ void TagsEditor::PopulateGenres()
    mGrid->GetDefaultEditorForType(wxT("Combo"))->SetParameters(parm);
 }
 
-BEGIN_EVENT_TABLE(TagsEditor1, wxDialog)
-   EVT_BUTTON(EditID, TagsEditor1::OnEdit)
-   EVT_BUTTON(ClearID, TagsEditor1::OnClear)
-   EVT_BUTTON(LoadID, TagsEditor1::OnLoad)
-   EVT_BUTTON(SaveID, TagsEditor1::OnSave)
-   EVT_BUTTON(SaveDefaultsID, TagsEditor1::OnSaveDefaults)
-   EVT_BUTTON(AddID, TagsEditor1::OnAdd)
-   EVT_BUTTON(RemoveID, TagsEditor1::OnRemove)
-   EVT_BUTTON(wxID_CANCEL, TagsEditor1::OnCancel)
-   EVT_BUTTON(wxID_OK, TagsEditor1::OnOk)
-END_EVENT_TABLE()
-
-TagsEditor1::TagsEditor1(wxWindow * parent,
-                       wxString title,
-                       Tags * tags,
-                       bool editTitle,
-                       bool editTrack)
-:  wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
-   mTags(tags),
-   mEditTitle(editTitle),
-   mEditTrack(editTrack)
-{
-   // Make a local copy of the passed in tags
-   mLocal = *mTags;
-
-   // Make local backup copies of metadata
-   mTitle    = mLocal.GetTag(TAG_TITLE);
-   mArtist   = mLocal.GetTag(TAG_ARTIST);
-   mAlbum    = mLocal.GetTag(TAG_ALBUM);
-   mTrackNum = mLocal.GetTag(TAG_TRACK);
-   mYear     = mLocal.GetTag(TAG_YEAR);
-   mGenre    = mLocal.GetTag(TAG_GENRE);
-   mComments = mLocal.GetTag(TAG_COMMENTS);
-   mID3V2    = mLocal.GetID3V2();
-
-   Rebuild();
-}
-
-TagsEditor1::~TagsEditor1()
-{
-}
-
-void TagsEditor1::Rebuild()
-{
-   SetSizer(NULL);
-   DestroyChildren();
-   mClear = NULL;
-
-   mTransfering = true; // avoid endless update loop
-
-   // Build, size, and position the dialog
-   SetSizeHints(0, 0);
-   ShuttleGui S(this, eIsCreating);
-   PopulateOrExchange(S);
-   PopulateGenres();
-   GetSizer()->AddSpacer(5);
-   Layout();
-   Fit();
-   Center();
-   SetSizeHints(GetSize());
-
-   // Populate all the controls
-   TransferDataToWindow();
-
-   // Done building
-   mTransfering = false;
-}
-
-void TagsEditor1::PopulateOrExchange(ShuttleGui & S)
-{
-   S.StartVerticalLay();
-   {
-      S.SetStyle(wxNO_BORDER);
-      S.StartScroller(1);
-      {
-         S.StartMultiColumn(2, wxALIGN_LEFT | wxEXPAND);
-         {
-            S.SetBorder(3);
-            S.SetStretchyCol(1);
-            S.TieTextBox(_("Title:"), mTitle, 20)->Enable(mEditTitle);
-            S.TieTextBox(_("Artist:"), mArtist, 20);
-            S.TieTextBox(_("Album:"), mAlbum, 20);
-            S.TieTextBox(_("Composer:"), mComposer, 20);
-            S.TieTextBox(_("Lyricist:"), mLyricist, 20);
-            S.TieTextBox(_("Comments:"), mComments, 20);
-
-            S.AddPrompt(_("Encoded By:"));
-            S.StartHorizontalLay(wxALIGN_LEFT);
-            {
-               S.TieTextBox(wxT(""), mCopyright, 20);
-               S.TieTextBox(_("Copyright:"), mEncodedBy, 20);
-            }
-            S.EndHorizontalLay();
-
-            S.AddPrompt(_("Track Number:"));
-            S.StartHorizontalLay(wxALIGN_LEFT);
-            {
-               S.TieTextBox(wxT(""), mTrackNum, 0)->Enable(mEditTrack);
-               S.TieTextBox(_("Year:"), mYear, 0);
-            }
-            S.EndHorizontalLay();
-
-            S.AddPrompt(_("Genre:"));
-            S.StartMultiColumn(2, wxALIGN_LEFT | wxEXPAND);
-            {
-               S.SetStretchyCol(0);
-               wxArrayString dummy;
-               S.SetStyle(wxCB_SORT);
-               mGenreCombo = S.AddCombo(wxT(""), mGenre, &dummy);
-               S.Id(EditID).AddButton(_("Edit"));
-            }
-            S.EndMultiColumn();
-
-            for (int i = 0; i < (int)mCustomTags.GetCount(); i++) {
-               S.TieTextBox(mCustomTags[i], mCustomTags[i], 0);
-               S.TieTextBox(mCustomVals[i], mCustomVals[i], 0);
-            }
-            S.SetBorder(5);
-         }
-         S.EndMultiColumn();
-      }
-      S.EndScroller();
-
-      S.StartMultiColumn(2, wxALIGN_CENTER);
-      {
-         S.Id(AddID).AddButton(_("&Add"));
-         S.Id(RemoveID).AddButton(_("&Remove"));
-      }
-      S.EndMultiColumn();
-
-      S.StartStatic(_("Template"));
-      {
-         S.StartMultiColumn(4, wxALIGN_CENTER);
-         {
-            S.Id(LoadID).AddButton(_("&Load..."));
-            S.Id(SaveID).AddButton(_("&Save..."));
-            S.AddTitle(wxT(" "));
-            S.Id(SaveDefaultsID).AddButton(_("S&et Default"));
-         }
-         S.EndMultiColumn();
-      }
-      S.EndStatic();
-   }
-   S.EndVerticalLay();
-
-   if (mClear == NULL) {
-      mClear = new wxButton(this, ClearID, _("&Clear"));
-   }
-
-   S.AddStandardButtons(eOkButton | eCancelButton, mClear);
-}
-
-void TagsEditor1::PopulateGenres()
-{
-   mGenreCombo->Clear();
-   int cnt = mLocal.GetNumGenres();
-
-   // This fixes a problem on the Mac where the popup menu actually pops up,
-   // but you can't see it.
-   if (cnt == 0) {
-      mGenreCombo->Append(_("No Genres"));
-      return;
-   }
-
-   for (int i = 0; i < cnt; i++) {
-      mGenreCombo->Append(mLocal.GetGenre(i));
-   }
-}
-
-bool TagsEditor1::TransferDataFromWindow()
-{
-   ShuttleGui S(this, eIsGettingFromDialog);
-   PopulateOrExchange(S);
-
-   // These aren't handled by ShuttleGui
-   mGenre = mGenreCombo->GetValue();
-
-   // Store
-   mLocal.SetTag(TAG_TITLE, mTitle);
-   mLocal.SetTag(TAG_ARTIST, mArtist);
-   mLocal.SetTag(TAG_ALBUM, mAlbum);
-   mLocal.SetTag(TAG_TRACK, mTrackNum);
-   mLocal.SetTag(TAG_YEAR, mYear);
-   mLocal.SetTag(TAG_GENRE, mGenre);
-   mLocal.SetTag(TAG_COMMENTS, mComments);
-   mLocal.SetID3V2(mID3V2);
-#if 0
-   mLocal.Clear();
-   for (i = 0; i < cnt; i++) {
-      wxString n = mGrid->GetCellValue(i, 0);
-      wxString v = mGrid->GetCellValue(i, 1);
-
-      if (n.IsEmpty()) {
-         continue;
-      }
-
-      if (n.CmpNoCase(LABEL_ARTIST) == 0) {
-         n = TAG_ARTIST;
-      }
-      else if (n.CmpNoCase(LABEL_TITLE) == 0) {
-         n = TAG_TITLE;
-      }
-      else if (n.CmpNoCase(LABEL_ALBUM) == 0) {
-         n = TAG_ALBUM;
-      }
-      else if (n.CmpNoCase(LABEL_TRACK) == 0) {
-         n = TAG_TRACK;
-      }
-      else if (n.CmpNoCase(LABEL_YEAR) == 0) {
-         n = TAG_YEAR;
-      }
-      else if (n.CmpNoCase(LABEL_GENRE) == 0) {
-         n = TAG_GENRE;
-      }
-      else if (n.CmpNoCase(LABEL_COMMENTS) == 0) {
-         n = TAG_COMMENTS;
-      }
-
-      mLocal.SetTag(n, v);
-   }
-#endif
-   return true;
-}
-
-bool TagsEditor1::TransferDataToWindow()
-{
-   mTitle    = mLocal.GetTag(TAG_TITLE);
-   mArtist   = mLocal.GetTag(TAG_ARTIST);
-   mAlbum    = mLocal.GetTag(TAG_ALBUM);
-   mTrackNum = mLocal.GetTag(TAG_TRACK);
-   mYear     = mLocal.GetTag(TAG_YEAR);
-   mGenre    = mLocal.GetTag(TAG_GENRE);
-   mComments = mLocal.GetTag(TAG_COMMENTS);
-   mID3V2    = mLocal.GetID3V2();
-
-   ShuttleGui S(this, eIsSettingToDialog);
-   PopulateOrExchange(S);
-
-   // These aren't handled by ShuttleGui
-   mGenreCombo->SetValue(mGenre);
-
-#if 0
-   int i = 0;
-   wxString n, v;
-
-   // Disable redrawing until we're done
-   mGrid->BeginBatch();
-
-   // Delete all rows
-   if (mGrid->GetNumberRows()) {
-      mGrid->DeleteRows(0, mGrid->GetNumberRows());
-   }
-
-   // Populate the rows
-   for (bool cont = mLocal.GetFirst(n, v); cont; cont = mLocal.GetNext(n, v)) {
-      mGrid->AppendRows(1);
-
-      if (n.CmpNoCase(TAG_ARTIST) == 0) {
-         n = LABEL_ARTIST;
-      }
-      else if (n.CmpNoCase(TAG_TITLE) == 0) {
-         n = LABEL_TITLE;
-      }
-      else if (n.CmpNoCase(TAG_ALBUM) == 0) {
-         n = LABEL_ALBUM;
-      }
-      else if (n.CmpNoCase(TAG_TRACK) == 0) {
-         n = LABEL_TRACK;
-      }
-      else if (n.CmpNoCase(TAG_YEAR) == 0) {
-         n = LABEL_YEAR;
-      }
-      else if (n.CmpNoCase(TAG_COMMENTS) == 0) {
-         n = LABEL_COMMENTS;
-      }
-      else if (n.CmpNoCase(TAG_GENRE) == 0) {
-         n = LABEL_GENRE;
-
-         wxSortedArrayString g;
-         int cnt = mLocal.GetNumGenres();
-         for (int i = 0; i < cnt; i++) {
-            g.Add(mLocal.GetGenre(i));
-         }
-
-         mGrid->SetCellEditor(mGrid->GetNumberRows() - 1, 1, new ComboEditor(g, true));
-      }
-
-      mGrid->SetCellValue(i, 0, n);
-      mGrid->SetCellValue(i, 1, v);
-      i++;
-   }
-
-   // We're done, so allow the grid to redraw
-   mGrid->EndBatch();
-#endif
-   return true;
-}
-
-void TagsEditor1::OnEdit(wxCommandEvent & event)
-{
-   wxDialog dlg(this, wxID_ANY, _("Edit Genres"),
-                wxDefaultPosition, wxDefaultSize,
-                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
-
-   ShuttleGui S(&dlg, eIsCreating);
-
-   S.StartVerticalLay(true);
-   {
-      mEdit = S.AddTextWindow(wxT(""));
-   }
-   S.EndVerticalLay();
-
-   S.AddStandardButtons(eOkButton | eCancelButton,
-                        new wxButton(&dlg, ResetID, _("Reset to Defaults")));
-   dlg.Connect(ResetID,
-               wxEVT_COMMAND_BUTTON_CLICKED,
-               wxCommandEventHandler(TagsEditor1::OnReset),
-               NULL,
-               this);
-
-   wxSortedArrayString g;
-   int cnt = mLocal.GetNumGenres();
-   for (int i = 0; i < cnt; i++) {
-      g.Add(mLocal.GetGenre(i));
-   }
-
-   for (int i = 0; i < cnt; i++) {
-      mEdit->AppendText(g[i] + wxT("\n"));
-   }
-
-   dlg.Center();
-   if (dlg.ShowModal() == wxID_CANCEL) {
-      return;
-   }
-
-   wxFileName fn(FileNames::DataDir(), wxT("genres.txt"));
-   wxFile f(fn.GetFullPath(), wxFile::write);
-   if (!f.IsOpened() || !f.Write(mEdit->GetValue())) {
-      wxMessageBox(_("Unable to save genre file."), _("Reset Genres"));
-      return;
-   }
-
-   mLocal.LoadGenres();
-
-   PopulateGenres();
-}
-
-void TagsEditor1::OnReset(wxCommandEvent & event)
-{
-   int id = wxMessageBox(_("Are you sure you want to reset the genre list to defaults?"),
-                         _("Reset Genres"),
-                         wxYES_NO);
-
-   if (id == wxNO) {
-      return;
-   }
-   mLocal.LoadDefaultGenres();
-
-   wxFileName fn(FileNames::DataDir(), wxT("genres.txt"));
-   wxTextFile tf(fn.GetFullPath());
-
-   bool open = (tf.Exists() && tf.Open()) ||
-               (!tf.Exists() && tf.Create());
-
-   if (!open) {
-      wxMessageBox(_("Unable to open genre file."), _("Reset Genres"));
-      mLocal.LoadGenres();
-      return;
-   }
-
-   tf.Clear();
-   int cnt = mLocal.GetNumGenres();
-   for (int i = 0; i < cnt; i++) {
-      tf.AddLine(mLocal.GetGenre(i));
-   }
-
-   tf.Write();
-   if (!tf.Write()) {
-      wxMessageBox(_("Unable to save genre file."), _("Reset Genres"));
-      mLocal.LoadGenres();
-      return;
-   }
-
-   mLocal.LoadGenres();
-
-   PopulateGenres();
-
-   wxSortedArrayString g;
-   cnt = mLocal.GetNumGenres();
-   for (int i = 0; i < cnt; i++) {
-      g.Add(mLocal.GetGenre(i));
-   }
-
-   mEdit->SetValue(wxT(""));
-   for (int i = 0; i < cnt; i++) {
-      mEdit->AppendText(g[i] + wxT("\n"));
-   }
-}
-
-void TagsEditor1::OnClear(wxCommandEvent & event)
-{
-   mLocal.Clear();
-
-   TransferDataToWindow();
-}
-
-void TagsEditor1::OnLoad(wxCommandEvent & event)
-{
-   wxString fn;
-
-   // Ask the user for the real name
-   fn = FileSelector(_("Save Metadata As:"),
-                     FileNames::DataDir(),
-                     wxT("Tags.xml"),
-                     wxT("xml"),
-                     wxT("*.xml"),
-                     wxFD_OPEN | wxRESIZE_BORDER,
-                     this);
-
-   // User canceled...
-   if (fn.IsEmpty()) {
-      return;
-   }
-
-   // Clear current contents
-   mLocal.Clear();
-
-   // Load the metadata
-   XMLFileReader reader;
-   if (!reader.Parse(&mLocal, fn)) {
-      // Inform user of load failure
-      wxMessageBox(reader.GetErrorStr(),
-                   _("Error loading metadata"),
-                   wxOK | wxCENTRE,
-                   this);
-   }
-
-   TransferDataToWindow();
-
-   return;
-}
-
-void TagsEditor1::OnSave(wxCommandEvent & event)
-{
-   wxString fn;
-
-   // Ask the user for the real name
-   fn = FileSelector(_("Save Metadata As:"),
-                     FileNames::DataDir(),
-                     wxT("Tags.xml"),
-                     wxT("xml"),
-                     wxT("*.xml"),
-                     wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
-                     this);
-
-   // User canceled...
-   if (fn.IsEmpty()) {
-      return;
-   }
-
-   // Create/Open the file
-   XMLFileWriter writer;
-   writer.Open(fn, wxT("wb"));
-
-   // Complain if open failed
-   if (!writer.IsOpened()) {
-      // Constructor will emit message
-      return;
-   }
-
-   // Write the metadata
-   mLocal.WriteXML(writer);
-
-   // Close the file
-   writer.Close();
-
-   return;
-}
-
-void TagsEditor1::OnSaveDefaults(wxCommandEvent & event)
-{
-   TransferDataFromWindow();
-
-   gPrefs->DeleteGroup(wxT("/Tags"));
-   gPrefs->Write(wxT("/Tags/ID3V2"), mLocal.GetID3V2());
-
-   wxString n, v;
-   for (bool cont = mLocal.GetFirst(n, v); cont; cont = mLocal.GetNext(n, v)) {
-      gPrefs->Write(wxT("/Tags/") + n, v);
-   }
-}
-
-void TagsEditor1::OnAdd(wxCommandEvent & event)
-{
-   mCustomTags.Add(wxT(""));
-   mCustomVals.Add(wxT(""));
-   Rebuild();
-}
-
-void TagsEditor1::OnRemove(wxCommandEvent & event)
-{
-   int cnt = mCustomTags.GetCount();
-
-   if (cnt > 0) {
-      mCustomTags.RemoveAt(cnt - 1);
-      mCustomVals.RemoveAt(cnt - 1);
-   }
-
-   Rebuild();
-}
-
-void TagsEditor1::OnOk(wxCommandEvent & event)
-{
-   if (!Validate() || !TransferDataFromWindow()) {
-      return;
-   }
-
-   *mTags = mLocal;
-
-   wxRect r = GetRect();
-   gPrefs->Write(wxT("/TagsEditor1/x"), r.x);
-   gPrefs->Write(wxT("/TagsEditor1/y"), r.y);
-   gPrefs->Write(wxT("/TagsEditor1/width"), r.width);
-   gPrefs->Write(wxT("/TagsEditor1/height"), r.height);
-
-   EndModal(wxID_OK);
-}
-
-void TagsEditor1::OnCancel(wxCommandEvent & event)
-{
-   EndModal(wxID_CANCEL);
-}
-
-BEGIN_EVENT_TABLE(TagsEditor2, wxDialog)
-   EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, TagsEditor2::OnPage)
-   EVT_BUTTON(EditID, TagsEditor2::OnEdit)
-   EVT_BUTTON(ResetID, TagsEditor2::OnReset)
-   EVT_BUTTON(ClearID, TagsEditor2::OnClear)
-   EVT_BUTTON(LoadID, TagsEditor2::OnLoad)
-   EVT_BUTTON(SaveID, TagsEditor2::OnSave)
-   EVT_BUTTON(SaveDefaultsID, TagsEditor2::OnSaveDefaults)
-   EVT_BUTTON(AddID, TagsEditor2::OnAdd)
-   EVT_BUTTON(RemoveID, TagsEditor2::OnRemove)
-   EVT_BUTTON(wxID_CANCEL, TagsEditor2::OnCancel)
-   EVT_BUTTON(wxID_OK, TagsEditor2::OnOk)
-END_EVENT_TABLE()
-
-TagsEditor2::TagsEditor2(wxWindow * parent,
-                       wxString title,
-                       Tags * tags,
-                       bool editTitle,
-                       bool editTrack)
-:  wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
-   mTags(tags),
-   mEditTitle(editTitle),
-   mEditTrack(editTrack)
-{
-   mTransfering = true; // avoid endless update loop
-   mGrid = NULL;
-   mBasic = NULL;
-   mAdvanced = NULL;
-
-   // Make a local copy of the passed in tags
-   mLocal = *mTags;
-
-   // Make local backup copies of metadata
-   mTitle    = mLocal.GetTag(TAG_TITLE);
-   mArtist   = mLocal.GetTag(TAG_ARTIST);
-   mAlbum    = mLocal.GetTag(TAG_ALBUM);
-   mTrackNum = mLocal.GetTag(TAG_TRACK);
-   mYear     = mLocal.GetTag(TAG_YEAR);
-   mGenre    = mLocal.GetTag(TAG_GENRE);
-   mComments = mLocal.GetTag(TAG_COMMENTS);
-   mID3V2    = mLocal.GetID3V2();
-
-   // Build, size, and position the dialog
-   ShuttleGui S(this, eIsCreating);
-   PopulateOrExchange(S);
-   PopulateGenres();
-   GetSizer()->AddSpacer(5);
-   Layout();
-   Fit();
-   Center();
-   SetSizeHints(GetSize());
-
-   // Override size and position with last saved
-   wxRect r = GetRect();
-   gPrefs->Read(wxT("/TagsEditor2/x"), &r.x, r.x);
-   gPrefs->Read(wxT("/TagsEditor2/y"), &r.y, r.y);
-   gPrefs->Read(wxT("/TagsEditor2/width"), &r.width, r.width);
-   gPrefs->Read(wxT("/TagsEditor2/height"), &r.height, r.height);
-   Move(r.GetPosition());
-   SetSize(r.GetSize());
-
-   // Show the user the last page viewed
-   mNotebook->SetSelection(gPrefs->Read(wxT("/TagsEditor2/page"), 0l));
-
-   // Resize value column width based on width of columns and the vertical scrollbar
-   wxScrollBar sb(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL);
-   r = mGrid->GetClientRect();
-   r.width -= mGrid->GetColSize(0);
-   r.width -= sb.GetSize().GetWidth();
-   r.width -= 10;
-   r.width -= r.x;
-   mGrid->SetColSize(1, r.width);
-
-   // Populate all the controls
-   TransferDataToWindow();
-
-   // Done building
-   mTransfering = false;
-}
-
-TagsEditor2::~TagsEditor2()
-{
-}
-
-void TagsEditor2::PopulateOrExchange(ShuttleGui & S)
-{
-   mNotebook = S.StartNotebook();
-   {
-      /***/
-
-      if (mBasic == NULL) {
-         mBasic = S.StartNotebookPage(_("Basic"));
-         mBasic->GetSizer()->SetMinSize(wxDefaultSize);
-      }
-
-      // "Basic" notebook page
-      {
-         S.StartVerticalLay();
-         {
-            S.StartMultiColumn(2, wxALIGN_LEFT | wxEXPAND);
-            {
-               S.SetBorder(3);
-               S.SetStretchyCol(1);
-               S.TieTextBox(_("Title:"), mTitle, 32)->Enable(mEditTitle);
-               S.TieTextBox(_("Artist:"), mArtist, 32);
-               S.TieTextBox(_("Album:"), mAlbum, 32);
-               S.TieTextBox(_("Track Number:"), mTrackNum, 4)->Enable(mEditTrack);
-               S.TieTextBox(_("Year:"), mYear, 4);
-               S.TieTextBox(_("Comments:"), mComments, 32);
-               S.AddPrompt(_("Genre:"));
-               S.StartHorizontalLay();
-               {
-                  wxArrayString dummy;
-                  S.SetStyle(wxCB_SORT);
-                  mGenreCombo = S.AddCombo(wxT(""), mGenre, &dummy);
-                  S.Id(EditID).AddButton(_("Edit"));
-                  S.Id(ResetID).AddButton(_("Reset"));
-               }
-               S.EndHorizontalLay();
-               S.SetBorder(5);
-            }
-            S.EndMultiColumn();
-
-            S.StartStatic(_("Template"));
-            {
-               S.StartMultiColumn(4, wxALIGN_CENTER);
-               {
-                  S.Id(LoadID).AddButton(_("&Load..."));
-                  S.Id(SaveID).AddButton(_("&Save..."));
-                  S.AddTitle(wxT(" "));
-                  S.Id(SaveDefaultsID).AddButton(_("S&et Default"));
-               }
-               S.EndMultiColumn();
-            }
-            S.EndStatic();
-         }
-         S.EndVerticalLay();
-      }
-      S.EndNotebookPage();
-
-      /***/
-
-      if (mAdvanced == NULL) {
-         mAdvanced = S.StartNotebookPage(_("Advanced"));
-         mAdvanced->GetSizer()->SetMinSize(wxDefaultSize);
-      }
-
-      // "Advanced" notebook page
-      {
-         S.StartVerticalLay();
-         {
-            S.StartHorizontalLay(wxALIGN_LEFT, false);
-            {
-               S.AddUnits(_("Press F2 or double click to edit."));
-            }
-            S.EndHorizontalLay();
-
-            if (mGrid == NULL) {
-               mGrid = new Grid(S.GetParent(), wxID_ANY);
-
-               wxArrayString cs(WXSIZEOF(names), names);
-               mCombo = new ComboEditor(cs, true);
-
-               // Build the initial (empty) grid
-               mGrid->CreateGrid(0, 2);
-               mGrid->SetRowLabelSize(0);
-               mGrid->SetDefaultCellAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
-               mGrid->SetColLabelValue(0, _("Name"));
-               mGrid->SetColLabelValue(1, _("Value"));
-
-               wxGridCellAttr *attr = new wxGridCellAttr();
-               attr->SetEditor(mCombo);
-               attr->SetBackgroundColour(*wxWHITE);
-               mGrid->SetColAttr(0, attr);
-
-               attr = new wxGridCellAttr();
-               attr->SetBackgroundColour(*wxWHITE);
-               mGrid->SetColAttr(1, attr);
-
-               // Resize the name column and set default row height.
-               wxComboBox tc(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, cs);
-               mGrid->SetColSize(0, tc.GetSize().x);
-               mGrid->SetColMinimalWidth(0, tc.GetSize().x);
-               mGrid->SetDefaultRowSize(tc.GetSize().y);
-            }
-            S.Prop(true);
-            S.AddWindow(mGrid, wxEXPAND);
-
-            S.StartMultiColumn(2, wxALIGN_CENTER);
-            {
-               S.Id(AddID).AddButton(_("&Add"));
-               S.Id(RemoveID).AddButton(_("&Remove"));
-            }
-            S.EndMultiColumn();
-         }
-         S.EndVerticalLay();
-      }
-      S.EndNotebookPage();
-   }
-   S.EndNotebook();
-
-   S.StartMultiColumn(3, wxALIGN_LEFT | wxEXPAND);
-   {
-      S.SetStretchyCol(0);
-      S.Id(ClearID).AddButton(_("Clea&r"), wxALIGN_LEFT);
-#if defined(__WXGTK20__) || defined(__WXMAC__)
-      S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
-      S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
-#else
-      S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
-      S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
-#endif
-   }
-   S.EndMultiColumn();
-}
-
-void TagsEditor2::PopulateGenres()
-{
-   mGenreCombo->Clear();
-   int cnt = mLocal.GetNumGenres();
-
-   // This fixes a problem on the Mac where the popup menu actually pops up,
-   // but you can't see it.
-   if (cnt == 0) {
-      mGenreCombo->Append(_("No Genres"));
-      return;
-   }
-
-   for (int i = 0; i < cnt; i++) {
-      mGenreCombo->Append(mLocal.GetGenre(i));
-   }
-}
-
-bool TagsEditor2::Validate()
-{
-#if 0
-   wxString errorString =
-      _("Maximum length of attribute '%s' is %d characters. Data was truncated.");
-
-   if(!mLocal.mID3V2)
-   {
-      if(mLocal.mTitle.Length() > 30)
-      {
-         wxMessageBox(wxString::Format(errorString, _("Title"), 30));
-
-         mLocal.mTitle = mLocal.mTitle.Left(30);
-         TransferDataToWindow();
-
-         return FALSE;
-      }
-
-      if(mLocal.mArtist.Length() > 30)
-      {
-         wxMessageBox(wxString::Format(errorString, _("Artist"), 30));
-
-         mLocal.mArtist = mLocal.mArtist.Left(30);
-         TransferDataToWindow();
-
-         return FALSE;
-      }
-
-      if(mLocal.mAlbum.Length() > 30)
-      {
-         wxMessageBox(wxString::Format(errorString, _("Album"), 30));
-
-         mLocal.mAlbum = mLocal.mAlbum.Left(30);
-         TransferDataToWindow();
-
-         return FALSE;
-      }
-
-      if(mLocal.mYear.Length() > 4)
-      {
-         wxMessageBox(wxString::Format(errorString, _("Year"), 4));
-
-         mLocal.mYear = mLocal.mYear.Left(4);
-         TransferDataToWindow();
-
-         return FALSE;
-      }
-
-      if(mLocal.mComments.Length() > 30)
-      {
-         wxMessageBox(wxString::Format(errorString, _("Comments"), 30));
-
-         mLocal.mComments = mLocal.mComments.Left(30);
-         TransferDataToWindow();
-
-         return FALSE;
-      }
-   }
-#endif
-   return true;
-}
-
-bool TagsEditor2::TransferDataFromWindow()
-{
-   switch (mNotebook->GetSelection())
-   {
-      case 0:
-         return TransferDataFromBasic();
-      break;
-
-      case 1:
-         return TransferDataFromAdvanced();
-      break;
-   }
-
-   return true;
-}
-
-bool TagsEditor2::TransferDataToWindow()
-{
-   switch (mNotebook->GetSelection())
-   {
-      case 0:
-         return TransferDataToBasic();
-      break;
-
-      case 1:
-         return TransferDataToAdvanced();
-      break;
-   }
-
-   return true;
-}
-
-bool TagsEditor2::TransferDataFromBasic()
-{
-   ShuttleGui S(this, eIsGettingFromDialog);
-   PopulateOrExchange(S);
-
-   // These aren't handled by ShuttleGui
-   mGenre = mGenreCombo->GetValue();
-
-   // Store
-   mLocal.SetTag(TAG_TITLE, mTitle);
-   mLocal.SetTag(TAG_ARTIST, mArtist);
-   mLocal.SetTag(TAG_ALBUM, mAlbum);
-   mLocal.SetTag(TAG_TRACK, mTrackNum);
-   mLocal.SetTag(TAG_YEAR, mYear);
-   mLocal.SetTag(TAG_GENRE, mGenre);
-   mLocal.SetTag(TAG_COMMENTS, mComments);
-   mLocal.SetID3V2(mID3V2);
-
-   return true;
-}
-
-bool TagsEditor2::TransferDataFromAdvanced()
-{
-   int i, cnt = mGrid->GetNumberRows();
-
-   mLocal.Clear();
-   for (i = 0; i < cnt; i++) {
-      wxString n = mGrid->GetCellValue(i, 0);
-      wxString v = mGrid->GetCellValue(i, 1);
-
-      if (n.IsEmpty()) {
-         continue;
-      }
-
-      if (n.CmpNoCase(LABEL_ARTIST) == 0) {
-         n = TAG_ARTIST;
-      }
-      else if (n.CmpNoCase(LABEL_TITLE) == 0) {
-         n = TAG_TITLE;
-      }
-      else if (n.CmpNoCase(LABEL_ALBUM) == 0) {
-         n = TAG_ALBUM;
-      }
-      else if (n.CmpNoCase(LABEL_TRACK) == 0) {
-         n = TAG_TRACK;
-      }
-      else if (n.CmpNoCase(LABEL_YEAR) == 0) {
-         n = TAG_YEAR;
-      }
-      else if (n.CmpNoCase(LABEL_GENRE) == 0) {
-         n = TAG_GENRE;
-      }
-      else if (n.CmpNoCase(LABEL_COMMENTS) == 0) {
-         n = TAG_COMMENTS;
-      }
-
-      mLocal.SetTag(n, v);
-   }
-
-   return true;
-}
-
-bool TagsEditor2::TransferDataToBasic()
-{
-   mTitle    = mLocal.GetTag(TAG_TITLE);
-   mArtist   = mLocal.GetTag(TAG_ARTIST);
-   mAlbum    = mLocal.GetTag(TAG_ALBUM);
-   mTrackNum = mLocal.GetTag(TAG_TRACK);
-   mYear     = mLocal.GetTag(TAG_YEAR);
-   mGenre    = mLocal.GetTag(TAG_GENRE);
-   mComments = mLocal.GetTag(TAG_COMMENTS);
-   mID3V2    = mLocal.GetID3V2();
-
-   ShuttleGui S(this, eIsSettingToDialog);
-   PopulateOrExchange(S);
-
-   // These aren't handled by ShuttleGui
-   mGenreCombo->SetValue(mGenre);
-
-   return true;
-}
-
-bool TagsEditor2::TransferDataToAdvanced()
-{
-   int i = 0;
-   wxString n, v;
-
-   // Disable redrawing until we're done
-   mGrid->BeginBatch();
-
-   // Delete all rows
-   if (mGrid->GetNumberRows()) {
-      mGrid->DeleteRows(0, mGrid->GetNumberRows());
-   }
-
-   // Populate the rows
-   for (bool cont = mLocal.GetFirst(n, v); cont; cont = mLocal.GetNext(n, v)) {
-      mGrid->AppendRows(1);
-
-      if (n.CmpNoCase(TAG_ARTIST) == 0) {
-         n = LABEL_ARTIST;
-      }
-      else if (n.CmpNoCase(TAG_TITLE) == 0) {
-         n = LABEL_TITLE;
-      }
-      else if (n.CmpNoCase(TAG_ALBUM) == 0) {
-         n = LABEL_ALBUM;
-      }
-      else if (n.CmpNoCase(TAG_TRACK) == 0) {
-         n = LABEL_TRACK;
-      }
-      else if (n.CmpNoCase(TAG_YEAR) == 0) {
-         n = LABEL_YEAR;
-      }
-      else if (n.CmpNoCase(TAG_COMMENTS) == 0) {
-         n = LABEL_COMMENTS;
-      }
-      else if (n.CmpNoCase(TAG_GENRE) == 0) {
-         n = LABEL_GENRE;
-
-         wxSortedArrayString g;
-         int cnt = mLocal.GetNumGenres();
-         for (int i = 0; i < cnt; i++) {
-            g.Add(mLocal.GetGenre(i));
-         }
-
-         mGrid->SetCellEditor(mGrid->GetNumberRows() - 1, 1, new ComboEditor(g, true));
-      }
-
-      mGrid->SetCellValue(i, 0, n);
-      mGrid->SetCellValue(i, 1, v);
-      i++;
-   }
-
-   // We're done, so allow the grid to redraw
-   mGrid->EndBatch();
-
-   return true;
-}
-
-void TagsEditor2::OnPage(wxNotebookEvent & event)
-{
-   if (mTransfering) { // avoid endless update loop
-      return;
-   }
-
-   if (mGrid->IsCellEditControlShown()) {
-      mGrid->HideCellEditControl();
-      mGrid->SaveEditControlValue();
-   }
-
-   switch (event.GetOldSelection())
-   {
-      case 0:
-         TransferDataFromBasic();
-         TransferDataToAdvanced();
-      break;
-
-      case 1:
-         TransferDataFromAdvanced();
-         TransferDataToBasic();
-      break;
-   }
-}
-
-void TagsEditor2::OnEdit(wxCommandEvent & event)
-{
-   wxDialog dlg(this, wxID_ANY, _("Edit Genres"),
-                wxDefaultPosition, wxDefaultSize,
-                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
-   wxTextCtrl *tc;
-
-   ShuttleGui S(&dlg, eIsCreating);
-
-   S.StartVerticalLay(true);
-   {
-      tc = S.AddTextWindow(wxT(""));
-   }
-   S.EndVerticalLay();
-
-   S.StartHorizontalLay(wxALIGN_RIGHT, false);
-   {
-#if defined(__WXGTK20__) || defined(__WXMAC__)
-      S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
-      S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
-#else
-      S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
-      S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
-#endif
-   }
-   S.EndHorizontalLay();
-
-   wxSortedArrayString g;
-   int cnt = mLocal.GetNumGenres();
-   for (int i = 0; i < cnt; i++) {
-      g.Add(mLocal.GetGenre(i));
-   }
-
-   for (int i = 0; i < cnt; i++) {
-      tc->AppendText(g[i] + wxT("\n"));
-   }
-
-   dlg.Center();
-   if (dlg.ShowModal() == wxID_CANCEL) {
-      return;
-   }
-
-   wxFileName fn(FileNames::DataDir(), wxT("genres.txt"));
-   wxFile f(fn.GetFullPath(), wxFile::write);
-   if (!f.IsOpened() || !f.Write(tc->GetValue())) {
-      wxMessageBox(_("Unable to save genre file."), _("Reset Genres"));
-      return;
-   }
-
-   mLocal.LoadGenres();
-
-   PopulateGenres();
-}
-
-void TagsEditor2::OnReset(wxCommandEvent & event)
-{
-   int id = wxMessageBox(_("Are you sure you want to reset the genre list to defaults?"),
-                         _("Reset Genres"),
-                         wxYES_NO);
-
-   if (id == wxNO) {
-      return;
-   }
-   mLocal.LoadDefaultGenres();
-
-   wxFileName fn(FileNames::DataDir(), wxT("genres.txt"));
-   wxTextFile tf(fn.GetFullPath());
-
-   bool open = (tf.Exists() && tf.Open()) ||
-               (!tf.Exists() && tf.Create());
-
-   if (!open) {
-      wxMessageBox(_("Unable to open genre file."), _("Reset Genres"));
-      mLocal.LoadGenres();
-      return;
-   }
-
-   tf.Clear();
-   int cnt = mLocal.GetNumGenres();
-   for (int i = 0; i < cnt; i++) {
-      tf.AddLine(mLocal.GetGenre(i));
-   }
-
-   tf.Write();
-   if (!tf.Write()) {
-      wxMessageBox(_("Unable to save genre file."), _("Reset Genres"));
-      mLocal.LoadGenres();
-      return;
-   }
-
-   mLocal.LoadGenres();
-
-   PopulateGenres();
-}
-
-void TagsEditor2::OnClear(wxCommandEvent & event)
-{
-   mLocal.Clear();
-
-   TransferDataToWindow();
-}
-
-void TagsEditor2::OnLoad(wxCommandEvent & event)
-{
-   wxString fn;
-
-   // Ask the user for the real name
-   fn = FileSelector(_("Save Metadata As:"),
-                     FileNames::DataDir(),
-                     wxT("Tags.xml"),
-                     wxT("xml"),
-                     wxT("*.xml"),
-                     wxFD_OPEN | wxRESIZE_BORDER,
-                     this);
-
-   // User canceled...
-   if (fn.IsEmpty()) {
-      return;
-   }
-
-   // Clear current contents
-   mLocal.Clear();
-
-   // Load the metadata
-   XMLFileReader reader;
-   if (!reader.Parse(&mLocal, fn)) {
-      // Inform user of load failure
-      wxMessageBox(reader.GetErrorStr(),
-                   _("Error loading metadata"),
-                   wxOK | wxCENTRE,
-                   this);
-   }
-
-   TransferDataToWindow();
-
-   return;
-}
-
-void TagsEditor2::OnSave(wxCommandEvent & event)
-{
-   wxString fn;
-
-   // Ask the user for the real name
-   fn = FileSelector(_("Save Metadata As:"),
-                     FileNames::DataDir(),
-                     wxT("Tags.xml"),
-                     wxT("xml"),
-                     wxT("*.xml"),
-                     wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
-                     this);
-
-   // User canceled...
-   if (fn.IsEmpty()) {
-      return;
-   }
-
-   // Create/Open the file
-   XMLFileWriter writer;
-   writer.Open(fn, wxT("wb"));
-
-   // Complain if open failed
-   if (!writer.IsOpened())
-   {
-      // Constructor will emit message
-      return;
-   }
-
-   // Write the metadata
-   mLocal.WriteXML(writer);
-
-   // Close the file
-   writer.Close();
-
-   return;
-}
-
-void TagsEditor2::OnSaveDefaults(wxCommandEvent & event)
-{
-   TransferDataFromWindow();
-
-   gPrefs->DeleteGroup(wxT("/Tags"));
-   gPrefs->Write(wxT("/Tags/ID3V2"), mLocal.GetID3V2());
-
-   wxString n, v;
-   for (bool cont = mLocal.GetFirst(n, v); cont; cont = mLocal.GetNext(n, v)) {
-      gPrefs->Write(wxT("/Tags/") + n, v);
-   }
-}
-
-void TagsEditor2::OnAdd(wxCommandEvent & event)
-{
-   mGrid->AppendRows();
-}
-
-void TagsEditor2::OnRemove(wxCommandEvent & event)
-{
-   int row = mGrid->GetCursorRow();
-
-   if (row >= 0) {
-      mGrid->DeleteRows(row, 1);
-   }
-}
-
-void TagsEditor2::OnOk(wxCommandEvent & event)
-{
-   if (!Validate() || !TransferDataFromWindow()) {
-      return;
-   }
-
-   *mTags = mLocal;
-
-   wxRect r = GetRect();
-   gPrefs->Write(wxT("/TagsEditor2/x"), r.x);
-   gPrefs->Write(wxT("/TagsEditor2/y"), r.y);
-   gPrefs->Write(wxT("/TagsEditor2/width"), r.width);
-   gPrefs->Write(wxT("/TagsEditor2/height"), r.height);
-   gPrefs->Write(wxT("/TagsEditor2/page"), mNotebook->GetSelection());
-
-   EndModal(wxID_OK);
-}
-
-void TagsEditor2::OnCancel(wxCommandEvent & event)
-{
-   EndModal(wxID_CANCEL);
-}
-
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
 //
diff --git a/src/Tags.h b/src/Tags.h
index ed4671b..9e683e7 100644
--- a/src/Tags.h
+++ b/src/Tags.h
@@ -66,11 +66,9 @@ class Tags: public XMLTagHandler {
    virtual ~Tags();
 
    Tags & operator= (const Tags & src );
-   
+
    bool ShowEditDialog(wxWindow *parent, wxString title, bool force = false);
-   bool ShowEditDialog1(wxWindow *parent, wxString title, bool force = false);
-   bool ShowEditDialog2(wxWindow *parent, wxString title, bool force = false);
-   
+
    virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
    virtual XMLTagHandler *HandleXMLChild(const wxChar *tag);
    virtual void WriteXML(XMLWriter &xmlFile);
@@ -84,9 +82,11 @@ class Tags: public XMLTagHandler {
    void LoadDefaultGenres();
    void LoadGenres();
 
-   int GetNumGenres();
-   int GetGenre(const wxString & name);
+   int GetNumUserGenres();
+   wxString GetUserGenre(int value);
+
    wxString GetGenre(int value);
+   int GetGenre(const wxString & name);
 
    bool HasTag(const wxString & name);
    wxString GetTag(const wxString & name);
@@ -165,159 +165,6 @@ class TagsEditor: public wxDialog
    DECLARE_EVENT_TABLE()
 };
 
-class TagsEditor1: public wxDialog
-{
- public:
-   // constructors and destructors
-   TagsEditor1(wxWindow * parent,
-              wxString title,
-              Tags * tags,
-              bool editTitle,
-              bool editTrackNumber);
-
-   virtual ~TagsEditor1();
-
-//   virtual bool Validate();
-   virtual bool TransferDataToWindow();
-   virtual bool TransferDataFromWindow();
-
- private:
-   void Rebuild();
-   void PopulateOrExchange(ShuttleGui & S);
-
-   void PopulateGenres();
-
-   void OnEdit(wxCommandEvent & event);
-   void OnReset(wxCommandEvent & event);
-
-   void OnClear(wxCommandEvent & event);
-
-   void OnLoad(wxCommandEvent & event);
-   void OnSave(wxCommandEvent & event);
-   void OnSaveDefaults(wxCommandEvent & event);
-
-   void OnAdd(wxCommandEvent & event);
-   void OnRemove(wxCommandEvent & event);
-
-   void OnOk(wxCommandEvent & event);
-   void OnCancel(wxCommandEvent & event);
-
- private:
-   Tags *mTags;
-   bool mEditTitle;
-   bool mEditTrack;
-
-   Tags mLocal;
-
-   wxScrolledWindow *mScroller;
-
-   wxTextCtrl *mTitleText;
-   wxTextCtrl *mTrackNumText;
-   wxComboBox *mGenreCombo;
-   wxButton *mClear;
-   wxTextCtrl *mEdit;
-
-   wxString mTitle;
-   wxString mArtist;
-   wxString mAlbum;
-   wxString mTrackNum;
-   wxString mYear;
-   wxString mGenre;
-   wxString mComments;
-
-   wxString mCopyright;
-   wxString mEncodedBy;
-   wxString mComposer;
-   wxString mLyricist;
-
-   wxArrayString mCustomTags;
-   wxArrayString mCustomVals;
-
-   bool mID3V2;
-
-   bool mTransfering;
-
-   DECLARE_EVENT_TABLE()
-};
-
-class TagsEditor2: public wxDialog
-{
- public:
-   // constructors and destructors
-   TagsEditor2(wxWindow * parent,
-              wxString title,
-              Tags * tags,
-              bool editTitle,
-              bool editTrackNumber);
-
-   virtual ~TagsEditor2();
-
-   void PopulateOrExchange(ShuttleGui & S);
-
-   virtual bool Validate();
-   virtual bool TransferDataToWindow();
-   virtual bool TransferDataFromWindow();
-
- private:
-   void PopulateGenres();
-
-   bool TransferDataFromBasic();
-   bool TransferDataFromAdvanced();
-   bool TransferDataToBasic();
-   bool TransferDataToAdvanced();
-
-   void OnPage(wxNotebookEvent & event);
-
-   void OnEdit(wxCommandEvent & event);
-   void OnReset(wxCommandEvent & event);
-
-   void OnClear(wxCommandEvent & event);
-
-   void OnLoad(wxCommandEvent & event);
-   void OnSave(wxCommandEvent & event);
-   void OnSaveDefaults(wxCommandEvent & event);
-
-   void OnAdd(wxCommandEvent & event);
-   void OnRemove(wxCommandEvent & event);
-
-   void OnOk(wxCommandEvent & event);
-   void OnCancel(wxCommandEvent & event);
-
- private:
-   Tags *mTags;
-   bool mEditTitle;
-   bool mEditTrack;
-
-   Tags mLocal;
-
-   wxNotebook *mNotebook;
-   wxNotebookPage *mBasic;
-   wxNotebookPage *mAdvanced;
-   wxButton *mClear;
-
-   ChoiceEditor *mChoice;
-   wxGridCellChoiceEditor *mCombo;
-
-   wxTextCtrl *mTitleText;
-   wxTextCtrl *mTrackNumText;
-   wxComboBox *mGenreCombo;
-   Grid *mGrid;
-
-   wxString mTitle;
-   wxString mArtist;
-   wxString mAlbum;
-   wxString mTrackNum;
-   wxString mYear;
-   wxString mGenre;
-   wxString mComments;
-
-   bool mID3V2;
-
-   bool mTransfering;
-
-   DECLARE_EVENT_TABLE()
-};
-
 #endif
 
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
diff --git a/src/TimeDialog.cpp b/src/TimeDialog.cpp
index 1bb4cc6..b4edd1d 100644
--- a/src/TimeDialog.cpp
+++ b/src/TimeDialog.cpp
@@ -61,6 +61,7 @@ void TimeDialog::PopulateOrExchange(ShuttleGui &S)
                          wxDefaultPosition,
                          wxDefaultSize,
                          true);
+         mTimeCtrl->SetName(_("Duration"));
          mTimeCtrl->SetFormatString(mTimeCtrl->GetBuiltinFormat(mFormat));
          S.AddWindow(mTimeCtrl);
          mTimeCtrl->EnableMenu();
diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp
index 3564bcc..5cd3300 100644
--- a/src/TimerRecordDialog.cpp
+++ b/src/TimerRecordDialog.cpp
@@ -220,10 +220,11 @@ void TimerRecordDialog::OnOK(wxCommandEvent& event)
             wxTimeSpan remaining_TimeSpan;
             wxString strNewMsg;
          */
+
       wxString strMsg = 
          _("Recording start") + (wxString)wxT(":\t\t")
-		 + m_DateTime_Start.Format() + wxT("\n") + _("Recording end")
-       + wxT(":\t\t") + m_DateTime_End.Format() + wxT("\n")
+		 + GetDisplayDate(m_DateTime_Start) + wxT("\n") + _("Recording end")
+       + wxT(":\t\t") + GetDisplayDate(m_DateTime_End) + wxT("\n")
 		 + _("Duration") + wxT(":\t\t") + m_TimeSpan_Duration.Format(); 
 
       ProgressDialog progress(
@@ -258,6 +259,55 @@ void TimerRecordDialog::OnOK(wxCommandEvent& event)
    this->EndModal(wxID_OK);
 }
 
+wxString TimerRecordDialog::GetDisplayDate( wxDateTime & dt )
+{
+#if defined(__WXMSW__)
+   // On Windows, wxWidgets uses the system date control and it displays the
+   // date based on the Windows locale selected by the user.  But, wxDateTime
+   // using the strftime function to return the formatted date.  Since the
+   // default locale for the Windows CRT environment is "C", the dates come
+   // back in a different format.
+   //
+   // So, we make direct Windows calls to format the date like it the date
+   // control.
+   //
+   // (Most of this taken from src/msw/datectrl.cpp)
+
+   const wxDateTime::Tm tm(dt.GetTm());
+   SYSTEMTIME st;
+   wxString s;
+   int len;
+
+   st.wYear = (WXWORD)tm.year;
+   st.wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
+   st.wDay = tm.mday;
+   st.wDayOfWeek = st.wMinute = st.wSecond = st.wMilliseconds = 0;                                                                                              
+
+   len = ::GetDateFormat(LOCALE_USER_DEFAULT,
+                         DATE_SHORTDATE,
+                         &st,
+                         NULL,
+                         NULL,
+                         0);
+   if (len > 0) {
+      len = ::GetDateFormat(LOCALE_USER_DEFAULT,
+                            DATE_SHORTDATE,
+                            &st,
+                            NULL,
+                            wxStringBuffer(s, len),
+                            len);
+      if (len > 0) {
+         s += wxT(" ") + dt.FormatTime();
+         return s;
+      }
+   }
+#endif
+
+   // Use default formatting
+wxPrintf(wxT("%s\n"), dt.Format().c_str());
+   return dt.FormatDate() + wxT(" ") + dt.FormatTime();	
+}
+
 void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
 {
    S.SetBorder(5);
@@ -378,7 +428,7 @@ bool TimerRecordDialog::WaitForStart()
    wxString strMsg;
    /* i18n-hint: A time specification like "Sunday 28th October 2007 15:16:17 GMT"
 	* but hopefully translated by wxwidgets will be inserted into this */
-   strMsg.Printf(_("Waiting to start recording at %s.\n"), m_DateTime_Start.Format().c_str()); 
+   strMsg.Printf(_("Waiting to start recording at %s.\n"), GetDisplayDate(m_DateTime_Start).c_str()); 
    ProgressDialog progress(_("Audacity Timer Record - Waiting for Start"),
                            strMsg);
    wxDateTime startWait_DateTime = wxDateTime::UNow();
diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h
index 4d522ba..7291f68 100644
--- a/src/TimerRecordDialog.h
+++ b/src/TimerRecordDialog.h
@@ -43,6 +43,7 @@ private:
 
    void OnOK(wxCommandEvent& event);
 
+   wxString GetDisplayDate(wxDateTime & dt);
    void PopulateOrExchange(ShuttleGui& S);
    bool TransferDataFromWindow();
    void UpdateDuration(); // Update m_TimeSpan_Duration and ctrl based on m_DateTime_Start and m_DateTime_End.
diff --git a/src/Track.cpp b/src/Track.cpp
index 0a5da8a..3226195 100644
--- a/src/Track.cpp
+++ b/src/Track.cpp
@@ -46,9 +46,7 @@ a TrackList.
 
 Track::Track(DirManager * projDirManager) 
    : 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    vrulerSize(36,0),
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
    mDirManager(projDirManager)
 {
    mDirManager->Ref();
diff --git a/src/Track.h b/src/Track.h
index 5feb9a9..8037ae4 100644
--- a/src/Track.h
+++ b/src/Track.h
@@ -19,9 +19,7 @@
 #include "SampleFormat.h"
 #include "xml/XMLTagHandler.h"
 #include "Experimental.h"
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
 #include <wx/gdicmn.h>
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 #ifdef __WXMSW__
 #pragma warning(disable:4284)
@@ -56,9 +54,7 @@ class AUDACITY_DLL_API Track: public XMLTagHandler {
    bool       mMinimized;
 
  public:
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    wxSize vrulerSize;
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
  
    // This just returns a constant and can be overriden by subclasses
    // to specify a different height for the case that the track is minimized.
diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 12d31fd..edd319c 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -287,6 +287,11 @@ void TrackArtist::DrawTracks(TrackList * tracks,
 
 void TrackArtist::DrawVRuler(Track *t, wxDC * dc, wxRect & r)
 {
+   // Label tracks do not have a vruler
+   if (t->GetKind() == Track::Label) {
+      return;
+   }
+
    // All waves have a ruler in the info panel
    // The ruler needs a bevelled surround.
    if (t->GetKind() == Track::Wave )
@@ -534,9 +539,7 @@ void TrackArtist::DrawVRuler(Track *t, wxDC * dc, wxRect & r)
    }
    #endif // USE_MIDI
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    t->vrulerSize = vruler->mRect.GetSize();
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 // Takes a value between -1      and     +1 and returns a value between 
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index f9025f3..8233d4c 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -445,11 +445,8 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
      mTrackArtist(NULL),
      mBacking(NULL),
      mRefreshBacking(false),
-     mAutoScrolling(false)
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
-     ,
+     mAutoScrolling(false),
      vrulerSize(36,0)
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 #ifndef __WXGTK__   //Get rid if this pragma for gtk
 #pragma warning( default: 4355 )
 #endif
@@ -910,6 +907,14 @@ void TrackPanel::DoDrawIndicator(wxDC & dc)
       {
          x = GetLeftOffset() + int ( ( mLastIndicator - mViewInfo->h) * mViewInfo->zoom );
 
+         // LL:  Keep from trying to blit outsize of the source DC.  This results in a crash on
+         //      OSX due to allocating memory using negative sizes and can be caused by resizing
+         //      the project window while recording or playing.
+         int w = dc.GetSize().GetWidth();
+         if (x >= w) {
+            x = w - 1;
+         }
+
          dc.Blit( x, 0, 1, mBacking->GetHeight(), &mBackingDC, x, 0 );
       }
 
@@ -4815,9 +4820,7 @@ void TrackPanel::DrawEverythingElse(Track * t, wxDC * dc, wxRect & r,
       r.width = GetVRulerWidth();
       r.height -= (kTopInset + 2);
       mTrackArtist->DrawVRuler(t, dc, r);
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
       UpdateVRulerRect();
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
    }
 
    trackRect.y += t->GetHeight();
@@ -4882,11 +4885,7 @@ void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect rec,
    dc->SetTextForeground(theTheme.Colour( clrTrackPanelText ));
    bool bIsWave = (t->GetKind() == Track::Wave);
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    mTrackInfo.DrawBackground(dc, r, t->GetSelected(), bIsWave, labelw, vrul);
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-   mTrackInfo.DrawBackground(dc, r, t->GetSelected(), bIsWave, labelw );
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    DrawBordersAroundTrack(t, dc, r, labelw, vrul);
    DrawShadow(t, dc, r);
@@ -4953,7 +4952,6 @@ void TrackPanel::DrawOutsideOfTrack(Track * t, wxDC * dc, const wxRect r)
    }
 }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
 void TrackPanel::UpdateVRulerRect()
 {
    TrackListIterator iter(mTracks);
@@ -4975,7 +4973,6 @@ void TrackPanel::UpdateVRulerRect()
       }
    }
 }
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 /// The following function moves to the previous track
 /// selecting and unselecting depending if you are on the start of a
@@ -5828,25 +5825,40 @@ void TrackPanel::OnTrackMute(bool shiftDown, Track *t)
    }
 
    if (shiftDown) 
-      {
-         // Cosmetic...  
-         // Shift-click mutes this track and unmutes other tracks.
-         TrackListIterator iter(mTracks);
-         Track *i = iter.First();
-         while (i) {
-            if (i == t) {
+   {
+      // Cosmetic...  
+      // Shift-click mutes this track and unmutes other tracks.
+      TrackListIterator iter(mTracks);
+      Track *i = iter.First();
+      while (i) {
+         if (i == t) {
+            i->SetMute(true);
+            if(i->GetLinked()) { // also mute the linked track
+               i = iter.Next();
                i->SetMute(true);
             }
-            else {
-               i->SetMute(false);
-            }
-            i->SetSolo(false);
-            i = iter.Next();
          }
+         else {
+            i->SetMute(false);
+         }
+         i->SetSolo(false);
+         i = iter.Next();
       }
+   }
    else {
       // Normal click toggles this track.
       t->SetMute(!t->GetMute());
+      if(t->GetLinked())   // set mute the same on both, if a pair
+      {
+         bool muted = t->GetMute();
+         TrackListIterator iter(mTracks);
+         Track *i = iter.First();
+         while (i != t) {  // search for this track
+            i = iter.Next();
+         }
+         i = iter.Next();  // get the next one, since linked
+         i->SetMute(muted);   // and mute it as well
+      }
 
       if( IsSimpleSolo() )
       {
@@ -5854,17 +5866,21 @@ void TrackPanel::OnTrackMute(bool shiftDown, Track *t)
          Track *i = iter.First();
          int nPlaying=0;
 
-         // We also set a solo indicator if we have just one track playing.
+         // We also set a solo indicator if we have just one track / stereo pair playing.
          // otherwise clear solo on everything.
          while (i) {
             if( !i->GetMute())
+            {
                nPlaying += 1;
+               if(i->GetLinked())
+                  i = iter.Next();  // don't count this one as it is linked
+            }
             i = iter.Next();
          }
 
          i = iter.First();
          while (i) {
-            i->SetSolo( (nPlaying==1) && !i->GetMute() );
+            i->SetSolo( (nPlaying==1) && !i->GetMute() );   // will set both of a stereo pair
             i = iter.Next();
          }
       }
@@ -5891,6 +5907,17 @@ void TrackPanel::OnTrackSolo(bool shiftDown, Track *t)
    if ( bSoloMultiple ) 
    {
       t->SetSolo( !t->GetSolo() );
+      if(t->GetLinked())
+      {
+         bool soloed = t->GetSolo();
+         TrackListIterator iter(mTracks);
+         Track *i = iter.First();
+         while (i != t) {  // search for this track
+            i = iter.Next();
+         }
+         i = iter.Next();  // get the next one, since linked
+         i->SetSolo(soloed);   // and solo it as well
+      }
    }
    else 
    {
@@ -5900,17 +5927,29 @@ void TrackPanel::OnTrackSolo(bool shiftDown, Track *t)
       Track *i = iter.First();
       bool bWasSolo = t->GetSolo();
       while (i) {
-         i->SetSolo( (i==t) && !bWasSolo);
-         if( IsSimpleSolo() )
-            i->SetMute( (i!=t) && !bWasSolo);
+         if( i==t )
+         {
+            i->SetSolo(!bWasSolo);
+            if( IsSimpleSolo() )
+               i->SetMute(false);
+            if(t->GetLinked())
+            {
+               i = iter.Next();
+               i->SetSolo(!bWasSolo);
+               if( IsSimpleSolo() )
+                  i->SetMute(false);
+            }
+         }
+         else
+         {
+            i->SetSolo(false);
+            if( IsSimpleSolo() )
+               i->SetMute(!bWasSolo);
+         }
          i = iter.Next();
       }
-      //t->SetSolo(!t->GetSolo());
    }
-
-
    Refresh(false);
-
 }
 
 void TrackPanel::OnTrackClose()
@@ -6760,13 +6799,11 @@ wxRect TrackPanel::FindTrackRect(Track * target, bool label)
    return r;
 }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
 int TrackPanel::GetVRulerWidth() const 
 {
 //return 36;
    return vrulerSize.x;
 }
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 /// Displays the bounds of the selection in the status bar.
 void TrackPanel::DisplaySelection()
@@ -6909,12 +6946,10 @@ TrackInfo::~TrackInfo()
       delete mPans[i];
 }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
 int TrackInfo::GetTitleWidth() const 
 {
    return 100;
 }
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 void TrackInfo::GetCloseBoxRect(const wxRect r, wxRect & dest) const
 {
@@ -7001,7 +7036,6 @@ void TrackInfo::DrawBordersWithin(wxDC * dc, const wxRect r, bool bHasMuteSolo )
    dc->DrawLine(r.x, r.y + r.height - 19, GetTitleWidth(), r.y + r.height - 19);  // minimize bar
 }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
 void TrackInfo::DrawBackground(wxDC * dc, const wxRect r, bool bSelected,
    bool bHasMuteSolo, const int labelw, const int vrul)
 {
@@ -7025,31 +7059,6 @@ void TrackInfo::DrawBackground(wxDC * dc, const wxRect r, bool bSelected,
       AColor::BevelTrackInfo( *dc, true, fill );
    }
 }
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-void TrackInfo::DrawBackground(wxDC * dc, const wxRect r, bool bSelected,
-   bool bHasMuteSolo, const int labelw)
-{
-   // fill in label
-   wxRect fill = r;
-   fill.width = labelw - r.x+1;
-   AColor::MediumTrackInfo(dc, bSelected);
-   dc->DrawRectangle(fill); 
-
-   if( bHasMuteSolo )
-   {
-      fill=wxRect( r.x+1, r.y+17, fill.width - 39, 32); 
-      AColor::BevelTrackInfo( *dc, true, fill );
-
-      fill=wxRect( r.x+1, r.y+67, fill.width, r.height-87); 
-      AColor::BevelTrackInfo( *dc, true, fill );
-   }
-   else
-   {
-      fill=wxRect( r.x+1, r.y+17, fill.width - 39, r.height-37); 
-      AColor::BevelTrackInfo( *dc, true, fill );
-   }
-}
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 void TrackInfo::GetTrackControlsRect(const wxRect r, wxRect & dest) const
 {
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index aa68b2a..9df0bc6 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -86,21 +86,13 @@ public:
    TrackInfo(wxWindow * pParentIn);
    ~TrackInfo();
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    int GetTitleWidth() const;
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-   int GetTitleWidth() const { return 100; }
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 private:
    void MakeMoreSliders();
    void EnsureSufficientSliders(int index);
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    void DrawBackground(wxDC * dc, const wxRect r, bool bSelected, bool bHasMuteSolo, const int labelw, const int vrul);
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-   void DrawBackground(wxDC * dc, const wxRect r, bool bSelected, bool bHasMuteSolo, const int labelw);
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
    void DrawBordersWithin(wxDC * dc, const wxRect r, bool bHasMuteSolo );
    void DrawCloseBox(wxDC * dc, const wxRect r, bool down);
    void DrawTitleBar(wxDC * dc, const wxRect r, Track * t, bool down);
@@ -218,9 +210,7 @@ class TrackPanel:public wxPanel {
    void OnTrackSticky(wxCommandEvent & event);
 
    void HandleCursorForLastMouseEvent();
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    void UpdateVRulerRect();
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
  private:
 
@@ -366,11 +356,7 @@ class TrackPanel:public wxPanel {
 //   int GetTitleWidth() const { return 100; }
    int GetTitleOffset() const { return 0; }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    int GetVRulerWidth() const;
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-   int GetVRulerWidth() const { return 36;}
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    int GetVRulerOffset() const { return GetTitleOffset() + mTrackInfo.GetTitleWidth();}
    int GetLabelWidth() const { return mTrackInfo.GetTitleWidth() + GetVRulerWidth();}
@@ -588,9 +574,7 @@ private:
    friend class ScreenFrame;
 
  public:
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    wxSize vrulerSize;
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    DECLARE_EVENT_TABLE()
 };
diff --git a/src/UploadDialog.cpp b/src/UploadDialog.cpp
old mode 100755
new mode 100644
diff --git a/src/UploadDialog.h b/src/UploadDialog.h
old mode 100755
new mode 100644
diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp
index ad103b1..ce66504 100644
--- a/src/WaveClip.cpp
+++ b/src/WaveClip.cpp
@@ -818,6 +818,25 @@ bool WaveClip::GetMinMax(float *min, float *max,
    return mSequence->GetMinMax(s0, s1-s0, min, max);
 }
 
+bool WaveClip::GetRMS(float *rms, double t0,
+                          double t1)
+{
+   *rms = float(0.0);
+
+   if (t0 > t1)
+      return false;
+
+   if (t0 == t1)
+      return true;
+
+   sampleCount s0, s1;
+
+   TimeToSamplesClip(t0, &s0);
+   TimeToSamplesClip(t1, &s1);
+
+   return mSequence->GetRMS(s0, s1-s0, rms);
+}
+
 void WaveClip::ConvertToSampleFormat(sampleFormat format)
 {
    bool result;
diff --git a/src/WaveClip.h b/src/WaveClip.h
index 0a56236..dfc0a4f 100644
--- a/src/WaveClip.h
+++ b/src/WaveClip.h
@@ -116,7 +116,7 @@ public:
    bool CreateFromCopy(double t0, double t1, WaveClip* other);
 
    /** Getting high-level data from the for screen display and clipping
-	* calculations */
+	* calculations and Contrast */
    bool GetWaveDisplay(float *min, float *max, float *rms,int* bl, sampleCount *where,
                        int numPixels, double t0, double pixelsPerSecond, bool &isLoadingOD);
    bool GetSpectrogram(float *buffer, sampleCount *where,
@@ -124,6 +124,7 @@ public:
                        double t0, double pixelsPerSecond,
                        bool autocorrelation);
    bool GetMinMax(float *min, float *max, double t0, double t1);
+   bool GetRMS(float *rms, double t0, double t1);
 
    // Set/clear/get rectangle that this WaveClip fills on screen. This is
    // called by TrackArtist while actually drawing the tracks and clips.
diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp
index 73b1a4a..9ea1266 100644
--- a/src/WaveTrack.cpp
+++ b/src/WaveTrack.cpp
@@ -1615,6 +1615,40 @@ bool WaveTrack::GetMinMax(float *min, float *max,
    return result;
 }
 
+bool WaveTrack::GetRMS(float *rms, double t0, double t1)
+{
+   if (t0 > t1)
+      return false;
+
+   if (t0 == t1)
+      return true;
+
+   bool result = true;
+   double sumsq = 0.0;
+   sampleCount length = 0;
+
+   for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+   {
+      WaveClip* clip = it->GetData();
+
+      if (t1 >= clip->GetStartTime() && t0 <= clip->GetEndTime())
+      {
+         float cliprms;
+         if (it->GetData()->GetRMS(&cliprms, t0, t1))
+         {
+            sumsq += cliprms * cliprms * clip->GetNumSamples();
+            length += clip->GetNumSamples();
+         } else
+         {
+            result = false;
+         }
+      }
+   }
+   *rms = sqrt(sumsq/length);
+
+   return result;
+}
+
 bool WaveTrack::Get(samplePtr buffer, sampleFormat format,
                     sampleCount start, sampleCount len)
 {
diff --git a/src/WaveTrack.h b/src/WaveTrack.h
index d149e88..7d52239 100644
--- a/src/WaveTrack.h
+++ b/src/WaveTrack.h
@@ -190,6 +190,7 @@ class AUDACITY_DLL_API WaveTrack: public Track {
                          double t0, double tstep);
    bool GetMinMax(float *min, float *max,
                   double t0, double t1);
+   bool GetRMS(float *rms, double t0, double t1);
 
    //
    // MM: We now have more than one sequence and envelope per track, so
diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp
index 9e3eafa..d6c6835 100644
--- a/src/blockfile/ODPCMAliasBlockFile.cpp
+++ b/src/blockfile/ODPCMAliasBlockFile.cpp
@@ -108,7 +108,7 @@ wxLongLong ODPCMAliasBlockFile::GetSpaceUsage()
    if(IsSummaryAvailable())
    {
       wxLongLong ret;
-      mFileNameMutex.Unlock();
+      mFileNameMutex.Lock();
       wxFFile summaryFile(mFileName.GetFullPath());
       ret= summaryFile.Length();
       mFileNameMutex.Unlock();
@@ -218,6 +218,8 @@ BlockFile *ODPCMAliasBlockFile::Copy(wxFileName newFileName)
 {
    BlockFile *newBlockFile;
    
+   //mAliasedFile can change so we lock readdatamutex, which is responsible for it.
+   mReadDataMutex.Lock();
    //If the file has been written AND it has been saved, we create a PCM alias blockfile because for
    //all intents and purposes, it is the same.  
    //However, if it hasn't been saved yet, we shouldn't create one because the default behavior of the
@@ -240,6 +242,7 @@ BlockFile *ODPCMAliasBlockFile::Copy(wxFileName newFileName)
       //The client code will need to schedule this blockfile for OD summarizing if it is going to a new track.
    }
    
+   mReadDataMutex.Unlock();
    
    return newBlockFile;
 }
@@ -251,6 +254,8 @@ BlockFile *ODPCMAliasBlockFile::Copy(wxFileName newFileName)
 /// and this object reconstructed, it needs to avoid trying to open it as well as schedule itself for OD loading
 void ODPCMAliasBlockFile::SaveXML(XMLWriter &xmlFile)
 {
+   //we lock this so that mAliasedFileName doesn't change.
+   mReadDataMutex.Lock();
    if(IsSummaryAvailable())
    {
       PCMAliasBlockFile::SaveXML(xmlFile);
@@ -260,9 +265,12 @@ void ODPCMAliasBlockFile::SaveXML(XMLWriter &xmlFile)
    {
       xmlFile.StartTag(wxT("odpcmaliasblockfile"));
 
+      //unlock to prevent deadlock and resume lock after.
+      mReadDataMutex.Unlock();
       mFileNameMutex.Lock();
       xmlFile.WriteAttr(wxT("summaryfile"), mFileName.GetFullName());
       mFileNameMutex.Unlock();
+      mReadDataMutex.Lock();
       
       xmlFile.WriteAttr(wxT("aliasfile"), mAliasedFileName.GetFullPath());
       xmlFile.WriteAttr(wxT("aliasstart"), mAliasStart);
@@ -275,6 +283,8 @@ void ODPCMAliasBlockFile::SaveXML(XMLWriter &xmlFile)
 
       xmlFile.EndTag(wxT("odpcmaliasblockfile"));
    }
+   
+   mReadDataMutex.Unlock();
 }
 
 /// Constructs a ODPCMAliasBlockFile from the xml output of WriteXML.
@@ -413,6 +423,8 @@ void ODPCMAliasBlockFile::WriteSummary()
      //wxFFile summaryFile(mFileName.GetFullPath(), wxT("wb"));
    
    FILE* summaryFile=fopen(mFileNameChar, "wb");
+   
+   mFileNameMutex.Unlock();
 
    if( !summaryFile){//.IsOpened() ){
       
@@ -440,8 +452,6 @@ void ODPCMAliasBlockFile::WriteSummary()
    DeleteSamples(sampleData);
    delete [] (char *) summaryData;
    
-   mFileNameMutex.Unlock();
-   
    
     //     printf("write successful. filename: %s\n",mFileNameChar);
 
@@ -719,4 +729,15 @@ bool ODPCMAliasBlockFile::ReadSummary(void *data)
    return (read == mSummaryInfo.totalSummaryBytes);
 }
 
+/// Prevents a read on other threads.
+void ODPCMAliasBlockFile::LockRead()
+{
+   mReadDataMutex.Lock();
+}
+/// Allows reading on other threads.
+void ODPCMAliasBlockFile::UnlockRead()
+{
+   mReadDataMutex.Unlock();
+}
+
 
diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h
index 32339d2..19670d6 100644
--- a/src/blockfile/ODPCMAliasBlockFile.h
+++ b/src/blockfile/ODPCMAliasBlockFile.h
@@ -126,6 +126,10 @@ class ODPCMAliasBlockFile : public PCMAliasBlockFile
    //when the file closes, it locks the blockfiles, but it calls this so we can check if it has been saved before.
    virtual void CloseLock();
    
+   /// Prevents a read on other threads.
+   virtual void LockRead();
+   /// Allows reading on other threads.
+   virtual void UnlockRead();
   
   protected:
    virtual void WriteSummary();
diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 8a6d189..ce44ca6 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -80,8 +80,8 @@ CommandManager.  It holds the callback for one command.
 #include <wx/defs.h>
 #include <wx/hash.h>
 #include <wx/intl.h>
-#include <wx/msgdlg.h>
 #include <wx/log.h>
+#include <wx/msgdlg.h>
 #include <wx/tokenzr.h>
 
 #include "../AudacityApp.h"
@@ -358,6 +358,7 @@ void CommandManager::InsertItem(wxString name, wxString label_in,
                                 int checkmark)
 {
    wxString label = label_in;
+
    if (ItemShouldBeHidden(label))
       return;
 
@@ -424,26 +425,6 @@ void CommandManager::InsertItem(wxString name, wxString label_in,
    dummy.Printf(wxT("%s%08d"), label.c_str(), mHiddenID);
    newLabel = label;
 
-   bool shortcut = false;
-
-   if (mCommandIDHash[ID]->key.Length() > 0)
-      shortcut = true;
-   
-   // Mac OS X fixes
-  #ifdef __WXMAC__
-   if (newLabel.Length() > 0 && newLabel[0] == wxT('&'))
-      newLabel = newLabel.Right(newLabel.Length()-1);
-
-   if (shortcut == true &&
-       (mCommandIDHash[ID]->key.Length() < 5 ||
-        mCommandIDHash[ID]->key.Left(5) != wxT("Ctrl+")))
-      shortcut = false;
-  #endif
-   
-   if (shortcut) {
-      dummy = dummy + wxT("\t") + mCommandIDHash[ID]->key;
-   }
-
    if (checkmark >= 0) {
       menu->InsertCheckItem(pos, ID, dummy);
       menu->Check(ID, checkmark != 0);
@@ -463,6 +444,7 @@ void CommandManager::AddItem(wxString name, wxString label_in,
                              CommandFunctor *callback, int checkmark)
 {
    wxString label = label_in;
+
    if( ItemShouldBeHidden( label ) )
       return;
 
@@ -483,26 +465,6 @@ void CommandManager::AddItem(wxString name, wxString label_in,
    dummy.Printf(wxT("%s%08d"), label.c_str(), mHiddenID);
    newLabel = label;
 
-   bool shortcut = false;
-
-   if (mCommandIDHash[ID]->key.Length() > 0)
-      shortcut = true;
-   
-   // Mac OS X fixes
-  #ifdef __WXMAC__
-   if (newLabel.Length() > 0 && newLabel[0] == wxT('&'))
-      newLabel = newLabel.Right(newLabel.Length()-1);
-
-   if (shortcut == true &&
-       (mCommandIDHash[ID]->key.Length() < 5 ||
-        mCommandIDHash[ID]->key.Left(5) != wxT("Ctrl+")))
-      shortcut = false;
-  #endif
-   
-   if (shortcut) {
-      dummy = dummy + wxT("\t") + mCommandIDHash[ID]->key;
-   }
-
    if (checkmark >= 0) {
       CurrentMenu()->AppendCheckItem(ID, dummy);
       CurrentMenu()->Check(ID, checkmark !=0);
@@ -510,6 +472,7 @@ void CommandManager::AddItem(wxString name, wxString label_in,
    else {
       CurrentMenu()->Append(ID, dummy);
    }
+
    CurrentMenu()->SetLabel(ID, newLabel);
    mbSeparatorAllowed = true;
 }
@@ -627,26 +590,26 @@ int CommandManager::NewIdentifier(wxString name, wxString label, wxMenu *menu,
 
    mCurrentID = NextIdentifier(mCurrentID);
    tmpEntry->id = mCurrentID;
+   tmpEntry->key = KeyStringNormalize(GetKey(label));
 
-  #ifdef __WXMAC__
+#if defined(__WXMAC__)
    if (name == wxT("Preferences"))
       tmpEntry->id = wxID_PREFERENCES;
    else if (name == wxT("Exit"))
       tmpEntry->id = wxID_EXIT;
    else if (name == wxT("About"))
       tmpEntry->id = wxID_ABOUT;
-  #endif
-  
+#endif
+
+   tmpEntry->defaultKey = tmpEntry->key;
    tmpEntry->name = name;
    tmpEntry->label = label;
    tmpEntry->labelPrefix = labelPrefix;
    tmpEntry->menu = menu;
    tmpEntry->callback = callback;
    tmpEntry->multi = multi;
-   tmpEntry->index = index;
+   tmpEntry->index = index; 
    tmpEntry->count = count;
-   tmpEntry->key = GetKey(label);
-   tmpEntry->defaultKey = GetKey(label);
    tmpEntry->flags = mDefaultFlags;
    tmpEntry->mask = mDefaultMask;
    tmpEntry->enabled = true;
@@ -654,7 +617,7 @@ int CommandManager::NewIdentifier(wxString name, wxString label, wxMenu *menu,
    // Key from preferences overridse the default key given
    gPrefs->SetPath(wxT("/NewKeys"));
    if (gPrefs->HasEntry(name)) {
-      tmpEntry->key = gPrefs->Read(name, GetKey(label));
+      tmpEntry->key = KeyStringNormalize(gPrefs->Read(name, tmpEntry->key));
    }
    gPrefs->SetPath(wxT("/"));
    
@@ -794,6 +757,7 @@ void CommandManager::HandleMenuOpen(wxMenuEvent &evt)
 
    // Windows does not send a CLOSE event if you move from one 
    // top-level menu to another, so simulate it.
+#if !defined(__WXMAC__)
    if (mOpenMenu) {
       wxMenuEvent dummy;
       HandleMenuClose(dummy);
@@ -801,6 +765,7 @@ void CommandManager::HandleMenuOpen(wxMenuEvent &evt)
 
    // Remember this menu
    mOpenMenu = m;
+#endif
 
    // Turn on the accelerators
    ToggleAccels(m, true);
@@ -810,6 +775,10 @@ void CommandManager::HandleMenuOpen(wxMenuEvent &evt)
 
 void CommandManager::HandleMenuClose(wxMenuEvent &evt)
 {
+#if defined(__WXMAC__)
+   mOpenMenu = evt.GetMenu();
+#endif
+
    // This can happen when if the Windows system menu is used   
    if (mOpenMenu == NULL)
       return;
@@ -885,7 +854,7 @@ void CommandManager::TellUserWhyDisallowed( wxUint32 flagsGot, wxUint32 flagsReq
 {
    // The default string for 'reason' is a catch all.  I hope it won't ever be seen
    // and that we will get something more specific.
-   wxString reason = _("Disallowed for some reason.  Try selecting some Audio first?");
+   wxString reason = _("Disallowed for some reason.  Try selecting some audio first?");
 
    wxUint32 missingFlags = flagsRequired & (~flagsGot );
    if( missingFlags & AudioIONotBusyFlag )
@@ -956,7 +925,7 @@ bool CommandManager::HandleMenuID(int id, wxUint32 flags, wxUint32 mask)
 bool CommandManager::HandleKey(wxKeyEvent &evt, wxUint32 flags, wxUint32 mask)
 {
    wxString keyStr = KeyEventToKeyString(evt);
-	CommandListEntry *entry = mCommandKeyHash[keyStr];
+   CommandListEntry *entry = mCommandKeyHash[keyStr];
    return HandleCommandEntry( entry, flags, mask );
 }
 
@@ -1024,7 +993,7 @@ wxString CommandManager::GetPrefixedLabelFromName(wxString name)
    if (!entry)
       return wxT("");
 
-   return entry->labelPrefix + entry->label;
+   return entry->labelPrefix + wxT(" ") + entry->label;
 }
 
 wxString CommandManager::GetKeyFromName(wxString name)
@@ -1069,8 +1038,10 @@ bool CommandManager::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
       }
 
       if (mCommandNameHash[name]) {
-         mCommandNameHash[name]->key = key;
-         mXMLKeysRead++;
+         if (GetDefaultKeyFromName(name) != key) {
+            mCommandNameHash[name]->key = KeyStringNormalize(key);
+            mXMLKeysRead++;
+         }
       }
    }
 
diff --git a/src/commands/Keyboard.cpp b/src/commands/Keyboard.cpp
index 09bc9c5..b616142 100644
--- a/src/commands/Keyboard.cpp
+++ b/src/commands/Keyboard.cpp
@@ -13,36 +13,71 @@
 
 #include "Keyboard.h"
 
-wxString KeyEventToKeyString(wxKeyEvent &event)
+wxString KeyStringNormalize(const wxString & key)
+{
+#if defined(__WXMAC__)
+   wxString newkey;
+   wxString temp = key;
+   temp.Replace(wxT("XCtrl+"), wxT("Control+"));
+   temp.Replace(wxT("Ctrl+"), wxT("Command+"));
+
+   if (temp.Contains(wxT("Control+"))) {
+      newkey += wxT("XCtrl+");
+   }
+
+   if (temp.Contains(wxT("Alt+")) || temp.Contains(wxT("Option+"))) {
+      newkey += wxT("Alt+");
+   }
+
+   if (temp.Contains(wxT("Shift+"))) {
+      newkey += wxT("Shift+");
+   }
+
+   if (temp.Contains(wxT("Command+"))) {
+      newkey += wxT("Ctrl+");
+   }
+
+   return newkey + temp.AfterLast(wxT('+'));
+#else
+   return key;
+#endif
+}
+
+wxString KeyStringDisplay(const wxString & key)
+{
+   wxString newkey = KeyStringNormalize(key);
+#if defined(__WXMAC__)
+   newkey.Replace(wxT("XCtrl+"), wxT("Control+"));
+   newkey.Replace(wxT("Alt+"), wxT("Option+"));
+   newkey.Replace(wxT("Ctrl+"), wxT("Command+"));
+#endif
+
+   return newkey;
+}
+
+wxString KeyEventToKeyString(const wxKeyEvent & event)
 {
    wxString newStr = wxT("");
    
    long key = event.GetKeyCode();
-   
-   if(event.ControlDown())
+
+   if (event.ControlDown())
+#if defined(__WXMAC__)
+      newStr += wxT("XCtrl+");
+#else
       newStr += wxT("Ctrl+");
-   
-   if(event.AltDown())
+#endif
+   if (event.AltDown())
       newStr += wxT("Alt+");
    
-   if(event.ShiftDown())
+   if (event.ShiftDown())
       newStr += wxT("Shift+");
 
-   if(event.MetaDown()) {
-      #ifdef __WXMAC__
-      newStr += wxT("Cmd+");
-      #endif
-   }
+#if defined(__WXMAC__)
+   if (event.MetaDown())
+      newStr += wxT("Ctrl+");
+#endif
 
-   #if 0
-   //BG: Don't allow noncombo letters to be bound
-   if(((!event.ControlDown() && !event.AltDown() && !event.ShiftDown()) &&
-       (key >= 33 && key <= 126)) ||
-      ((!event.ControlDown() && !event.AltDown() &&
-        event.ShiftDown()) && (key >= 33 && key <= 126)))
-      return wxT("");
-   #endif
-   
    if (event.ControlDown() && key >= 1 && key <= 26)
       newStr += (wxChar)(64 + key);
    else if (key >= 33 && key <= 126)
@@ -58,7 +93,7 @@ wxString KeyEventToKeyString(wxKeyEvent &event)
          newStr += wxT("Delete");
          break;
       case WXK_SPACE:
-         newStr += wxT("Spacebar");
+         newStr += wxT("Space");
          break;
       case WXK_TAB:
          newStr += wxT("Tab");
@@ -66,14 +101,12 @@ wxString KeyEventToKeyString(wxKeyEvent &event)
       case WXK_RETURN:
          newStr += wxT("Return");
          break;
-#if !wxCHECK_VERSION(2, 7, 0)
-      case WXK_PRIOR:
+      case WXK_PAGEUP:
          newStr += wxT("PageUp");
          break;
-      case WXK_NEXT:
+      case WXK_PAGEDOWN:
          newStr += wxT("PageDown");
          break;
-#endif
       case WXK_END:
          newStr += wxT("End");
          break;
@@ -215,12 +248,6 @@ wxString KeyEventToKeyString(wxKeyEvent &event)
       case WXK_F24:
          newStr += wxT("F24");
          break;
-      case WXK_PAGEUP:
-         newStr += wxT("PageUp");
-         break;
-      case WXK_PAGEDOWN:
-         newStr += wxT("PageDown");
-         break;
       case WXK_NUMPAD_ENTER:
          newStr += wxT("NUMPAD_ENTER");
          break;
@@ -251,14 +278,6 @@ wxString KeyEventToKeyString(wxKeyEvent &event)
       case WXK_NUMPAD_DOWN:
          newStr += wxT("NUMPAD_DOWN");
          break;
-#if !wxCHECK_VERSION(2, 7, 0)
-      case WXK_NUMPAD_PRIOR:
-         newStr += wxT("NUMPAD_PAGEUP");
-         break;
-      case WXK_NUMPAD_NEXT:
-         newStr += wxT("NUMPAD_PAGEDOWN");
-         break;
-#endif
       case WXK_NUMPAD_PAGEUP:
          newStr += wxT("NUMPAD_PAGEUP");
          break;
@@ -300,7 +319,7 @@ wxString KeyEventToKeyString(wxKeyEvent &event)
       }
    }
 
-   return newStr;
+   return KeyStringNormalize(newStr);
 }
 
 
diff --git a/src/commands/Keyboard.h b/src/commands/Keyboard.h
index c7fda57..b1d153e 100644
--- a/src/commands/Keyboard.h
+++ b/src/commands/Keyboard.h
@@ -13,7 +13,9 @@
 #include <wx/event.h>
 #include <wx/string.h>
 
-wxString KeyEventToKeyString(wxKeyEvent &keyEvent);
+wxString KeyStringNormalize(const wxString & key);
+wxString KeyStringDisplay(const wxString & key);
+wxString KeyEventToKeyString(const wxKeyEvent & keyEvent);
 
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
diff --git a/src/configtemplate.h b/src/configtemplate.h
index 3fbc934..1c439f2 100644
--- a/src/configtemplate.h
+++ b/src/configtemplate.h
@@ -127,6 +127,9 @@
 /* Define if SLV2 (library for loading LV2 plugins) should be enabled */
 #undef USE_SLV2
 
+/* Define if SBSMS support should be enabled */
+#undef USE_SBSMS
+
 /* Define if SoundTouch support should be enabled */
 #undef USE_SOUNDTOUCH
 
diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp
index dcb8d07..0fbb12f 100644
--- a/src/effects/Amplify.cpp
+++ b/src/effects/Amplify.cpp
@@ -180,7 +180,7 @@ void AmplifyDialog::PopulateOrExchange(ShuttleGui & S)
                                             0,
                                             AMP_MAX,
                                             AMP_MIN);
-      mAmpS->SetName(_("Amplification (dB)"));
+      mAmpS->SetName(_("Amplification dB"));
    }
    S.EndHorizontalLay();
 
diff --git a/src/effects/BassBoost.cpp b/src/effects/BassBoost.cpp
index feeb65b..bc10c7c 100644
--- a/src/effects/BassBoost.cpp
+++ b/src/effects/BassBoost.cpp
@@ -202,6 +202,7 @@ void BassBoostDialog::PopulateOrExchange(ShuttleGui & S)
       mFreqS = S.Id(ID_FREQ_SLIDER).AddSlider(wxT(""),
                                               0,
                                               FREQ_MAX);
+      mFreqS->SetName(_("Frequency Hertz"));
       mFreqS->SetRange(FREQ_MIN, FREQ_MAX);
 
       // Boost
@@ -214,6 +215,7 @@ void BassBoostDialog::PopulateOrExchange(ShuttleGui & S)
       mBoostS = S.Id(ID_BOOST_SLIDER).AddSlider(wxT(""),
                                                 0,
                                                 BOOST_MAX);
+      mBoostS->SetName(_("Boost dB"));
       mBoostS->SetRange(BOOST_MIN, BOOST_MAX);
    }
    S.EndMultiColumn();
diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp
index 72950ef..79d8498 100644
--- a/src/effects/ChangePitch.cpp
+++ b/src/effects/ChangePitch.cpp
@@ -38,29 +38,29 @@
 
 EffectChangePitch::EffectChangePitch()
 {
-	m_FromPitchIndex = -1;		// -1 => uninitialized
-	m_bWantPitchDown = false;
-	m_ToPitchIndex = -1;			// -1 => uninitialized
+   m_FromPitchIndex = -1;		// -1 => uninitialized
+   m_bWantPitchDown = false;
+   m_ToPitchIndex = -1;			// -1 => uninitialized
 
-	m_SemitonesChange = 0.0;
+   m_SemitonesChange = 0.0;
 
    m_FromFrequency = 0.0;		// 0.0 => uninitialized
    m_ToFrequency = 0.0;			// 0.0 => uninitialized
 
-	m_PercentChange = 0.0;
+   m_PercentChange = 0.0;
 }
 
 wxString EffectChangePitch::GetEffectDescription() { 
    // Note: This is useful only after change amount has been set. 
    return wxString::Format(_("Applied effect: %s %.2f semitones"), 
                            this->GetEffectName().c_str(), 
-									m_SemitonesChange); 
+                           m_SemitonesChange); 
 } 
 
 bool EffectChangePitch::Init()
 {
    mSoundTouch = NULL;
-	return true;
+   return true;
 }
 
 // DeduceFrequencies is Dominic's extremely cool trick (Vaughan sez so!) 
@@ -102,31 +102,31 @@ void EffectChangePitch::DeduceFrequencies()
             argmax = j;
       lag = (windowSize/2 - 1) - argmax;
       m_FromFrequency = rate / lag;
-		m_ToFrequency = (m_FromFrequency * (100.0 + m_PercentChange)) / 100.0;
+      m_ToFrequency = (m_FromFrequency * (100.0 + m_PercentChange)) / 100.0;
 
-		// Now we can set the pitch control values. 
-		m_FromPitchIndex = PitchIndex(Freq2Pitch(m_FromFrequency));
-		m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
-		m_ToPitchIndex = PitchIndex(Freq2Pitch(m_ToFrequency));
+      // Now we can set the pitch control values. 
+      m_FromPitchIndex = PitchIndex(Freq2Pitch(m_FromFrequency));
+      m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
+      m_ToPitchIndex = PitchIndex(Freq2Pitch(m_ToFrequency));
    }
 }
 
 bool EffectChangePitch::PromptUser()
 {
-	this->DeduceFrequencies(); // Set frequency-related control values based on sample.
+   this->DeduceFrequencies(); // Set frequency-related control values based on sample.
 
    ChangePitchDialog dlog(this, mParent);
    dlog.m_FromPitchIndex = m_FromPitchIndex;
    dlog.m_bWantPitchDown = m_bWantPitchDown;
    dlog.m_ToPitchIndex = m_ToPitchIndex;
-	dlog.m_SemitonesChange = m_SemitonesChange;
+   dlog.m_SemitonesChange = m_SemitonesChange;
    dlog.m_FromFrequency = m_FromFrequency;
    dlog.m_ToFrequency = m_ToFrequency;
    dlog.m_PercentChange = m_PercentChange;
-	// Don't need to call TransferDataToWindow, although other 
-	//	Audacity dialogs (from which I derived this one) do it, because 
-	//	ShowModal calls stuff that eventually calls wxWindowBase::OnInitDialog, 
-	//	which calls dlog.TransferDataToWindow();
+   // Don't need to call TransferDataToWindow, although other 
+   //	Audacity dialogs (from which I derived this one) do it, because 
+   //	ShowModal calls stuff that eventually calls wxWindowBase::OnInitDialog, 
+   //	which calls dlog.TransferDataToWindow();
    dlog.CentreOnParent();
    dlog.ShowModal();
 
@@ -136,7 +136,7 @@ bool EffectChangePitch::PromptUser()
    m_FromPitchIndex = dlog.m_FromPitchIndex;
    m_bWantPitchDown = dlog.m_bWantPitchDown;
    m_ToPitchIndex = dlog.m_ToPitchIndex;
-	m_SemitonesChange = dlog.m_SemitonesChange;
+   m_SemitonesChange = dlog.m_SemitonesChange;
    m_FromFrequency = dlog.m_FromFrequency;
    m_ToFrequency = dlog.m_ToFrequency;
    m_PercentChange = dlog.m_PercentChange;
@@ -179,19 +179,19 @@ enum {
 // event table for ChangePitchDialog
 
 BEGIN_EVENT_TABLE(ChangePitchDialog, EffectDialog)
-	EVT_CHOICE(ID_CHOICE_FROMPITCH, ChangePitchDialog::OnChoice_FromPitch)
-	EVT_RADIOBUTTON(ID_RADIOBUTTON_PITCHUPDOWN, ChangePitchDialog::OnRadioButton_PitchUpDown)
-	EVT_CHOICE(ID_CHOICE_TOPITCH, ChangePitchDialog::OnChoice_ToPitch)
+   EVT_CHOICE(ID_CHOICE_FROMPITCH, ChangePitchDialog::OnChoice_FromPitch)
+   EVT_RADIOBUTTON(ID_RADIOBUTTON_PITCHUPDOWN, ChangePitchDialog::OnRadioButton_PitchUpDown)
+   EVT_CHOICE(ID_CHOICE_TOPITCH, ChangePitchDialog::OnChoice_ToPitch)
 
-	EVT_TEXT(ID_TEXT_SEMITONESCHANGE, ChangePitchDialog::OnText_SemitonesChange)
+   EVT_TEXT(ID_TEXT_SEMITONESCHANGE, ChangePitchDialog::OnText_SemitonesChange)
 
-	EVT_TEXT(ID_TEXT_FROMFREQUENCY, ChangePitchDialog::OnText_FromFrequency)
-	EVT_TEXT(ID_TEXT_TOFREQUENCY, ChangePitchDialog::OnText_ToFrequency)
+   EVT_TEXT(ID_TEXT_FROMFREQUENCY, ChangePitchDialog::OnText_FromFrequency)
+   EVT_TEXT(ID_TEXT_TOFREQUENCY, ChangePitchDialog::OnText_ToFrequency)
 
-	EVT_TEXT(ID_TEXT_PERCENTCHANGE, ChangePitchDialog::OnText_PercentChange)
-	EVT_SLIDER(ID_SLIDER_PERCENTCHANGE, ChangePitchDialog::OnSlider_PercentChange)
+   EVT_TEXT(ID_TEXT_PERCENTCHANGE, ChangePitchDialog::OnText_PercentChange)
+   EVT_SLIDER(ID_SLIDER_PERCENTCHANGE, ChangePitchDialog::OnSlider_PercentChange)
 
-	EVT_BUTTON(ID_EFFECT_PREVIEW, ChangePitchDialog::OnPreview)
+   EVT_BUTTON(ID_EFFECT_PREVIEW, ChangePitchDialog::OnPreview)
 END_EVENT_TABLE()
 
 ChangePitchDialog::ChangePitchDialog(EffectChangePitch *effect, wxWindow *parent)
@@ -200,33 +200,33 @@ ChangePitchDialog::ChangePitchDialog(EffectChangePitch *effect, wxWindow *parent
 {
    m_bLoopDetect = false;
 
-	// NULL out these control members because there are some cases where the 
-	// event table handlers get called during this method, and those handlers that 
-	// can cause trouble check for NULL.
+   // NULL out these control members because there are some cases where the 
+   // event table handlers get called during this method, and those handlers that 
+   // can cause trouble check for NULL.
    m_pChoice_FromPitch = NULL;
-	m_pRadioButton_PitchUp = NULL;
-	m_pRadioButton_PitchDown = NULL;
-	m_pChoice_ToPitch = NULL;
+   m_pRadioButton_PitchUp = NULL;
+   m_pRadioButton_PitchDown = NULL;
+   m_pChoice_ToPitch = NULL;
    
-	m_pTextCtrl_SemitonesChange = NULL;
+   m_pTextCtrl_SemitonesChange = NULL;
 
-	m_pTextCtrl_FromFrequency = NULL;
-	m_pTextCtrl_ToFrequency = NULL;
+   m_pTextCtrl_FromFrequency = NULL;
+   m_pTextCtrl_ToFrequency = NULL;
    
-	m_pTextCtrl_PercentChange = NULL;
-	m_pSlider_PercentChange = NULL;
+   m_pTextCtrl_PercentChange = NULL;
+   m_pSlider_PercentChange = NULL;
 
-	// effect parameters
-	m_FromPitchIndex = -1;		// -1 => uninitialized
-	m_bWantPitchDown = false;
-	m_ToPitchIndex = -1;			// -1 => uninitialized
+   // effect parameters
+   m_FromPitchIndex = -1;		// -1 => uninitialized
+   m_bWantPitchDown = false;
+   m_ToPitchIndex = -1;			// -1 => uninitialized
 
-	m_SemitonesChange = 0.0;
+   m_SemitonesChange = 0.0;
 
    m_FromFrequency = 0.0;		// 0.0 => uninitialized
    m_ToFrequency = 0.0;			// 0.0 => uninitialized
 
-	m_PercentChange = 0.0;
+   m_PercentChange = 0.0;
 
    Init();
 }
@@ -364,89 +364,89 @@ bool ChangePitchDialog::TransferDataToWindow()
 {
    m_bLoopDetect = true;
 
-	// from/to pitch controls
-	if (m_pChoice_FromPitch) 
-		m_pChoice_FromPitch->SetSelection(m_FromPitchIndex);
+   // from/to pitch controls
+   if (m_pChoice_FromPitch) 
+      m_pChoice_FromPitch->SetSelection(m_FromPitchIndex);
 
-	this->Update_RadioButton_PitchUpDown();
-	this->Update_Choice_ToPitch();
+   this->Update_RadioButton_PitchUpDown();
+   this->Update_Choice_ToPitch();
 
 
-	// semitones change control
-	this->Update_Text_SemitonesChange();
+   // semitones change control
+   this->Update_Text_SemitonesChange();
 
 
-	// from/to frequency controls
-	if (m_pTextCtrl_FromFrequency) {
-		wxString str;
-		if (m_FromFrequency > 0.0)
-			str.Printf(wxT("%.3f"), m_FromFrequency);
-		else
-			str = wxT("");
-		m_pTextCtrl_FromFrequency->SetValue(str);
-	}
+   // from/to frequency controls
+   if (m_pTextCtrl_FromFrequency) {
+      wxString str;
+      if (m_FromFrequency > 0.0)
+         str.Printf(wxT("%.3f"), m_FromFrequency);
+      else
+         str = wxT("");
+      m_pTextCtrl_FromFrequency->SetValue(str);
+   }
 
-	this->Update_Text_ToFrequency();
+   this->Update_Text_ToFrequency();
 
-	
-	// percent change controls
-	this->Update_Text_PercentChange();
-	this->Update_Slider_PercentChange();
+   
+   // percent change controls
+   this->Update_Text_PercentChange();
+   this->Update_Slider_PercentChange();
 
 
    m_bLoopDetect = false;
 
-	return true;
+   return true;
 }
 
 bool ChangePitchDialog::TransferDataFromWindow()
 {
    double newDouble;
-	wxString str;
+   wxString str;
 
 
-	// from/to pitch controls
-	if (m_pChoice_FromPitch) 
-		m_FromPitchIndex = m_pChoice_FromPitch->GetSelection(); 
+   // from/to pitch controls
+   if (m_pChoice_FromPitch) 
+      m_FromPitchIndex = m_pChoice_FromPitch->GetSelection(); 
 
-	if (m_pRadioButton_PitchUp)
-		m_bWantPitchDown = (m_pRadioButton_PitchUp->GetValue() == false);
+   if (m_pRadioButton_PitchUp)
+      m_bWantPitchDown = (m_pRadioButton_PitchUp->GetValue() == false);
 
-	if (m_pChoice_ToPitch) 
-		m_ToPitchIndex = m_pChoice_ToPitch->GetSelection();
+   if (m_pChoice_ToPitch) 
+      m_ToPitchIndex = m_pChoice_ToPitch->GetSelection();
 
 
-	// semitones change control
+   // semitones change control
    if (m_pTextCtrl_SemitonesChange) {
       str = m_pTextCtrl_SemitonesChange->GetValue();
       str.ToDouble(&newDouble);
-		m_SemitonesChange = newDouble;
-	}
+      m_SemitonesChange = newDouble;
+   }
 
 
-	// from/to frequency controls
+   // from/to frequency controls
    if (m_pTextCtrl_FromFrequency) {
       str = m_pTextCtrl_FromFrequency->GetValue();
       str.ToDouble(&newDouble);
-		m_FromFrequency = newDouble;
-	}
+      m_FromFrequency = newDouble;
+   }
 
    if (m_pTextCtrl_ToFrequency) {
       str = m_pTextCtrl_ToFrequency->GetValue();
       str.ToDouble(&newDouble);
-		m_ToFrequency = newDouble;
-	}
+      m_ToFrequency = newDouble;
+   }
 
 
-	// percent change controls
+   // percent change controls
    if (m_pTextCtrl_PercentChange) {
       str = m_pTextCtrl_PercentChange->GetValue();
       str.ToDouble(&newDouble);
-		m_PercentChange = newDouble;
-	}
+      m_PercentChange = newDouble;
+   }
 
-	// Ignore Slider_PercentChange because TextCtrl_PercentChange 
-	// always tracks it & is more precise (decimal points).
+   // Ignore Slider_PercentChange because TextCtrl_PercentChange 
+   // always tracks it & is more precise (decimal points).
 
 
    return true;
@@ -457,34 +457,34 @@ bool ChangePitchDialog::TransferDataFromWindow()
 
 void ChangePitchDialog::Calc_ToFrequency()
 {
-	m_ToFrequency = (m_FromFrequency * (100.0 + m_PercentChange)) / 100.0;
+   m_ToFrequency = (m_FromFrequency * (100.0 + m_PercentChange)) / 100.0;
 }
 
 void ChangePitchDialog::Calc_ToPitchIndex()
 {
-	m_ToPitchIndex = (m_FromPitchIndex + 
-							(int)(m_SemitonesChange + 
-									// Round in the right direction.
-									((m_bWantPitchDown ? -1.0 : 1.0) * 0.5))) 
-							% 12;
+   m_ToPitchIndex = (m_FromPitchIndex + 
+                     (int)(m_SemitonesChange + 
+                           // Round in the right direction.
+                           ((m_bWantPitchDown ? -1.0 : 1.0) * 0.5))) 
+                     % 12;
 }
 
 void ChangePitchDialog::Calc_SemitonesChange_fromPitches()
 {
-	int sign = m_bWantPitchDown ? -1 : 1;
-	m_SemitonesChange = sign * (((sign * (m_ToPitchIndex - m_FromPitchIndex)) + 12) % 12); 
+   int sign = m_bWantPitchDown ? -1 : 1;
+   m_SemitonesChange = sign * (((sign * (m_ToPitchIndex - m_FromPitchIndex)) + 12) % 12); 
 }
 
 void ChangePitchDialog::Calc_SemitonesChange_fromPercentChange()
 {
-	// Use m_PercentChange rather than m_FromFrequency & m_ToFrequency, because 
-	// they start out uninitialized, but m_PercentChange is always valid.
-	m_SemitonesChange = (12.0 * log((100.0 + m_PercentChange) / 100.0)) / log(2.0);
+   // Use m_PercentChange rather than m_FromFrequency & m_ToFrequency, because 
+   // they start out uninitialized, but m_PercentChange is always valid.
+   m_SemitonesChange = (12.0 * log((100.0 + m_PercentChange) / 100.0)) / log(2.0);
 }
 
 void ChangePitchDialog::Calc_PercentChange()
 {
-	m_PercentChange = 100.0 * (pow(2.0, (m_SemitonesChange / 12.0)) - 1.0);
+   m_PercentChange = 100.0 * (pow(2.0, (m_SemitonesChange / 12.0)) - 1.0);
 }
 
 
@@ -496,13 +496,13 @@ void ChangePitchDialog::OnChoice_FromPitch(wxCommandEvent & event)
       return;
 
    if (m_pChoice_FromPitch) {
-		m_FromPitchIndex = m_pChoice_FromPitch->GetSelection();
+      m_FromPitchIndex = m_pChoice_FromPitch->GetSelection();
 
-		this->Calc_ToPitchIndex();
+      this->Calc_ToPitchIndex();
 
-		m_bLoopDetect = true;
-		this->Update_Choice_ToPitch();
-		m_bLoopDetect = false;
+      m_bLoopDetect = true;
+      this->Update_Choice_ToPitch();
+      m_bLoopDetect = false;
    }
 }
 
@@ -511,20 +511,20 @@ void ChangePitchDialog::OnRadioButton_PitchUpDown(wxCommandEvent & event)
    if (m_bLoopDetect)
       return;
 
-	if (m_pRadioButton_PitchUp) {
-		m_bWantPitchDown = (m_pRadioButton_PitchUp->GetValue() == false);
+   if (m_pRadioButton_PitchUp) {
+      m_bWantPitchDown = (m_pRadioButton_PitchUp->GetValue() == false);
 
-		this->Calc_SemitonesChange_fromPitches();
-		this->Calc_PercentChange(); // Call *after* m_SemitonesChange is updated.
-		this->Calc_ToFrequency(); // Call *after* m_PercentChange is updated.
+      this->Calc_SemitonesChange_fromPitches();
+      this->Calc_PercentChange(); // Call *after* m_SemitonesChange is updated.
+      this->Calc_ToFrequency(); // Call *after* m_PercentChange is updated.
 
-		m_bLoopDetect = true;
-		this->Update_Text_SemitonesChange();
-		this->Update_Text_ToFrequency();
-		this->Update_Text_PercentChange();
-		this->Update_Slider_PercentChange();
-		m_bLoopDetect = false;
-	}
+      m_bLoopDetect = true;
+      this->Update_Text_SemitonesChange();
+      this->Update_Text_ToFrequency();
+      this->Update_Text_PercentChange();
+      this->Update_Slider_PercentChange();
+      m_bLoopDetect = false;
+   }
 }
 
 void ChangePitchDialog::OnChoice_ToPitch(wxCommandEvent & event)
@@ -533,18 +533,18 @@ void ChangePitchDialog::OnChoice_ToPitch(wxCommandEvent & event)
       return;
 
    if (m_pChoice_ToPitch) {
-		m_ToPitchIndex = m_pChoice_ToPitch->GetSelection();
-
-		this->Calc_SemitonesChange_fromPitches();
-		this->Calc_PercentChange(); // Call *after* m_SemitonesChange is updated.
-		this->Calc_ToFrequency(); // Call *after* m_PercentChange is updated.
-
-		m_bLoopDetect = true;
-		this->Update_Text_SemitonesChange();
-		this->Update_Text_ToFrequency();
-		this->Update_Text_PercentChange();
-		this->Update_Slider_PercentChange();
-		m_bLoopDetect = false;
+      m_ToPitchIndex = m_pChoice_ToPitch->GetSelection();
+
+      this->Calc_SemitonesChange_fromPitches();
+      this->Calc_PercentChange(); // Call *after* m_SemitonesChange is updated.
+      this->Calc_ToFrequency(); // Call *after* m_PercentChange is updated.
+
+      m_bLoopDetect = true;
+      this->Update_Text_SemitonesChange();
+      this->Update_Text_ToFrequency();
+      this->Update_Text_PercentChange();
+      this->Update_Slider_PercentChange();
+      m_bLoopDetect = false;
    }
 }
 
@@ -553,28 +553,28 @@ void ChangePitchDialog::OnText_SemitonesChange(wxCommandEvent & event)
    if (m_bLoopDetect)
       return;
 
-	if (m_pTextCtrl_SemitonesChange) {
-		wxString str = m_pTextCtrl_SemitonesChange->GetValue();
+   if (m_pTextCtrl_SemitonesChange) {
+      wxString str = m_pTextCtrl_SemitonesChange->GetValue();
       double newValue = 0;
       str.ToDouble(&newValue);
-		m_SemitonesChange = newValue;
-
-		this->Calc_PercentChange();
-		this->Calc_ToFrequency(); // Call *after* m_PercentChange is updated.
-		m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
-		this->Calc_ToPitchIndex(); // Call *after* m_bWantPitchDown is updated.
-
-		m_bLoopDetect = true;
-		this->Update_RadioButton_PitchUpDown();
-		if (m_pTextCtrl_SemitonesChange->IsModified())
-			// See note at implementation of Update_RadioButton_PitchUpDown.
-			m_pTextCtrl_SemitonesChange->SetFocus(); 
-		this->Update_Choice_ToPitch();
-		this->Update_Text_ToFrequency();
-		this->Update_Text_PercentChange();
-		this->Update_Slider_PercentChange();
-		m_bLoopDetect = false;
-	}
+      m_SemitonesChange = newValue;
+
+      this->Calc_PercentChange();
+      this->Calc_ToFrequency(); // Call *after* m_PercentChange is updated.
+      m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
+      this->Calc_ToPitchIndex(); // Call *after* m_bWantPitchDown is updated.
+
+      m_bLoopDetect = true;
+      this->Update_RadioButton_PitchUpDown();
+      if (m_pTextCtrl_SemitonesChange->IsModified())
+         // See note at implementation of Update_RadioButton_PitchUpDown.
+         m_pTextCtrl_SemitonesChange->SetFocus(); 
+      this->Update_Choice_ToPitch();
+      this->Update_Text_ToFrequency();
+      this->Update_Text_PercentChange();
+      this->Update_Slider_PercentChange();
+      m_bLoopDetect = false;
+   }
 }
 
 void ChangePitchDialog::OnText_FromFrequency(wxCommandEvent & event)
@@ -582,26 +582,26 @@ void ChangePitchDialog::OnText_FromFrequency(wxCommandEvent & event)
    if (m_bLoopDetect)
       return;
 
-	if (m_pTextCtrl_FromFrequency) {
-		wxString str = m_pTextCtrl_FromFrequency->GetValue();
-		double newDouble;
+   if (m_pTextCtrl_FromFrequency) {
+      wxString str = m_pTextCtrl_FromFrequency->GetValue();
+      double newDouble;
       str.ToDouble(&newDouble);
-		m_FromFrequency = newDouble;
-
-		m_FromPitchIndex = PitchIndex(Freq2Pitch(m_FromFrequency));
-		this->Calc_ToFrequency();
-		m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
-		this->Calc_ToPitchIndex(); // Call *after* m_bWantPitchDown is updated.
-
-		m_bLoopDetect = true;
-		this->Update_RadioButton_PitchUpDown();
-		if (m_pTextCtrl_FromFrequency->IsModified())
-			// See note at implementation of Update_RadioButton_PitchUpDown.
-			m_pTextCtrl_FromFrequency->SetFocus(); 
-		this->Update_Choice_ToPitch();
-		this->Update_Text_ToFrequency();
-		m_bLoopDetect = false;
-	}
+      m_FromFrequency = newDouble;
+
+      m_FromPitchIndex = PitchIndex(Freq2Pitch(m_FromFrequency));
+      this->Calc_ToFrequency();
+      m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
+      this->Calc_ToPitchIndex(); // Call *after* m_bWantPitchDown is updated.
+
+      m_bLoopDetect = true;
+      this->Update_RadioButton_PitchUpDown();
+      if (m_pTextCtrl_FromFrequency->IsModified())
+         // See note at implementation of Update_RadioButton_PitchUpDown.
+         m_pTextCtrl_FromFrequency->SetFocus(); 
+      this->Update_Choice_ToPitch();
+      this->Update_Text_ToFrequency();
+      m_bLoopDetect = false;
+   }
 }
 
 void ChangePitchDialog::OnText_ToFrequency(wxCommandEvent & event)
@@ -611,27 +611,27 @@ void ChangePitchDialog::OnText_ToFrequency(wxCommandEvent & event)
 
    if (m_pTextCtrl_ToFrequency) {
       wxString str = m_pTextCtrl_ToFrequency->GetValue();
-		double newDouble;
+      double newDouble;
       str.ToDouble(&newDouble);
-		m_ToFrequency = newDouble;
-
-		m_PercentChange = (((double)(m_ToFrequency) * 100.0) / 
-									(double)(m_FromFrequency)) - 100.0;
-
-		this->Calc_SemitonesChange_fromPercentChange();
-		this->Calc_ToPitchIndex(); // Call *after* m_SemitonesChange is updated.
-		m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
-
-		m_bLoopDetect = true;
-		this->Update_RadioButton_PitchUpDown();
-		if (m_pTextCtrl_ToFrequency->IsModified())
-			// See note at implementation of Update_RadioButton_PitchUpDown.
-			m_pTextCtrl_ToFrequency->SetFocus(); 
-		this->Update_Choice_ToPitch();
-		this->Update_Text_SemitonesChange();
-		this->Update_Text_PercentChange();
-		this->Update_Slider_PercentChange();
-		m_bLoopDetect = false;
+      m_ToFrequency = newDouble;
+
+      m_PercentChange = (((double)(m_ToFrequency) * 100.0) / 
+                           (double)(m_FromFrequency)) - 100.0;
+
+      this->Calc_SemitonesChange_fromPercentChange();
+      this->Calc_ToPitchIndex(); // Call *after* m_SemitonesChange is updated.
+      m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
+
+      m_bLoopDetect = true;
+      this->Update_RadioButton_PitchUpDown();
+      if (m_pTextCtrl_ToFrequency->IsModified())
+         // See note at implementation of Update_RadioButton_PitchUpDown.
+         m_pTextCtrl_ToFrequency->SetFocus(); 
+      this->Update_Choice_ToPitch();
+      this->Update_Text_SemitonesChange();
+      this->Update_Text_PercentChange();
+      this->Update_Slider_PercentChange();
+      m_bLoopDetect = false;
    }
 }
 
@@ -644,22 +644,22 @@ void ChangePitchDialog::OnText_PercentChange(wxCommandEvent & event)
       wxString str = m_pTextCtrl_PercentChange->GetValue();
       double newValue = 0;
       str.ToDouble(&newValue);
-		m_PercentChange = newValue;
+      m_PercentChange = newValue;
 
-		this->Calc_SemitonesChange_fromPercentChange();
-		this->Calc_ToPitchIndex(); // Call *after* m_SemitonesChange is updated.
-		this->Calc_ToFrequency();
-		m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
+      this->Calc_SemitonesChange_fromPercentChange();
+      this->Calc_ToPitchIndex(); // Call *after* m_SemitonesChange is updated.
+      this->Calc_ToFrequency();
+      m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
 
       m_bLoopDetect = true;
-		this->Update_RadioButton_PitchUpDown();
-		if (m_pTextCtrl_PercentChange->IsModified())
-			// See note at implementation of Update_RadioButton_PitchUpDown.
-			m_pTextCtrl_PercentChange->SetFocus(); 
-		this->Update_Choice_ToPitch();
-		this->Update_Text_SemitonesChange();
-		this->Update_Text_ToFrequency();
-		this->Update_Slider_PercentChange();
+      this->Update_RadioButton_PitchUpDown();
+      if (m_pTextCtrl_PercentChange->IsModified())
+         // See note at implementation of Update_RadioButton_PitchUpDown.
+         m_pTextCtrl_PercentChange->SetFocus(); 
+      this->Update_Choice_ToPitch();
+      this->Update_Text_SemitonesChange();
+      this->Update_Text_ToFrequency();
+      this->Update_Slider_PercentChange();
       m_bLoopDetect = false;
 
       //v Probably better to override wxTextValidator to disallow negative values.
@@ -673,37 +673,41 @@ void ChangePitchDialog::OnSlider_PercentChange(wxCommandEvent & event)
    if (m_bLoopDetect)
       return;
 
-	if (m_pSlider_PercentChange) {
-		m_PercentChange = (double)(m_pSlider_PercentChange->GetValue()); 
-		// Warp positive values to actually go up faster & further than negatives.
-		if (m_PercentChange > 0.0)
-			m_PercentChange = pow(m_PercentChange, PERCENTCHANGE_SLIDER_WARP);
-
-		this->Calc_SemitonesChange_fromPercentChange();
-		this->Calc_ToPitchIndex(); // Call *after* m_SemitonesChange is updated.
-		this->Calc_ToFrequency();
-		m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
-
-		m_bLoopDetect = true;
-		this->Update_RadioButton_PitchUpDown();
-		this->Update_Choice_ToPitch();
-		this->Update_Text_SemitonesChange();
-		this->Update_Text_ToFrequency();
-		this->Update_Text_PercentChange();
-	   m_bLoopDetect = false;
-	}
-}
+   if (m_pSlider_PercentChange) {
+      m_PercentChange = (double)(m_pSlider_PercentChange->GetValue()); 
+      // Warp positive values to actually go up faster & further than negatives.
+      if (m_PercentChange > 0.0)
+         m_PercentChange = pow(m_PercentChange, PERCENTCHANGE_SLIDER_WARP);
+
+      this->Calc_SemitonesChange_fromPercentChange();
+      this->Calc_ToPitchIndex(); // Call *after* m_SemitonesChange is updated.
+      this->Calc_ToFrequency();
+      m_bWantPitchDown = (m_ToFrequency < m_FromFrequency);
 
+      m_bLoopDetect = true;
+      this->Update_RadioButton_PitchUpDown();
+      this->Update_Choice_ToPitch();
+      this->Update_Text_SemitonesChange();
+      this->Update_Text_ToFrequency();
+      this->Update_Text_PercentChange();
+      m_bLoopDetect = false;
+   }
+}
 
 void ChangePitchDialog::OnPreview(wxCommandEvent &event)
 {
    TransferDataFromWindow();
 
-	// Save & restore parameters around Preview, because we didn't do OK.
-	double oldSemitonesChange = m_SemitonesChange;
-	mEffect->m_SemitonesChange = m_SemitonesChange;
-	mEffect->Preview();
-	mEffect->m_SemitonesChange = oldSemitonesChange;
+   // Save & restore parameters around Preview, because we didn't do OK.
+   double oldSemitonesChange = m_SemitonesChange;
+   if( m_PercentChange < -99.0)
+   {
+      m_PercentChange = -99.0;
+      this->Update_Text_PercentChange();
+   }
+   mEffect->m_SemitonesChange = m_SemitonesChange;
+   mEffect->Preview();
+   mEffect->m_SemitonesChange = oldSemitonesChange;
 }
 
 // helper fns
@@ -722,61 +726,62 @@ void ChangePitchDialog::OnPreview(wxCommandEvent &event)
 // need to be conditionalized on wxTextCtrl::IsModified.
 void ChangePitchDialog::Update_RadioButton_PitchUpDown() 
 {
-	if (m_pRadioButton_PitchUp) {
-		m_pRadioButton_PitchUp->SetValue(m_bWantPitchDown == true);
-		m_pRadioButton_PitchDown->SetValue(m_bWantPitchDown == false);
+   if (m_pRadioButton_PitchUp) {
+      m_pRadioButton_PitchUp->SetValue(m_bWantPitchDown == false);
+      m_pRadioButton_PitchDown->SetValue(m_bWantPitchDown == true);
    }
 }
 
 void ChangePitchDialog::Update_Choice_ToPitch() 
 {
-	if (m_pChoice_ToPitch) 
-		m_pChoice_ToPitch->SetSelection(m_ToPitchIndex);
+   if (m_pChoice_ToPitch) 
+      m_pChoice_ToPitch->SetSelection(m_ToPitchIndex);
 }
 
 
 void ChangePitchDialog::Update_Text_SemitonesChange()
 {
-	if (m_pTextCtrl_SemitonesChange) {
-		wxString str;
-		str.Printf(wxT("%.2f"), m_SemitonesChange);
-		m_pTextCtrl_SemitonesChange->SetValue(str);
-	}
+   if (m_pTextCtrl_SemitonesChange) {
+      wxString str;
+      str.Printf(wxT("%.2f"), m_SemitonesChange);
+      m_pTextCtrl_SemitonesChange->SetValue(str);
+   }
 }
 
 void ChangePitchDialog::Update_Text_ToFrequency() 
 {
-	if (m_pTextCtrl_ToFrequency) {
-		wxString str;
-		if (m_ToFrequency > 0.0)
-			str.Printf(wxT("%.3f"), m_ToFrequency);
-		else
-			str = wxT("");
-		m_pTextCtrl_ToFrequency->SetValue(str);
-	}
+   if (m_pTextCtrl_ToFrequency) {
+      wxString str;
+      if (m_ToFrequency > 0.0)
+         str.Printf(wxT("%.3f"), m_ToFrequency);
+      else
+         str = wxT("");
+      m_pTextCtrl_ToFrequency->SetValue(str);
+   }
 }
 
 
 void ChangePitchDialog::Update_Text_PercentChange()
 {
-	if (m_pTextCtrl_PercentChange) {
-		wxString str;
-		str.Printf(wxT("%.3f"), m_PercentChange);
-		m_pTextCtrl_PercentChange->SetValue(str);
-	}
+   if (m_pTextCtrl_PercentChange) {
+      wxString str;
+      str.Printf(wxT("%.3f"), m_PercentChange);
+      m_pTextCtrl_PercentChange->SetValue(str);
+      FindWindow(wxID_OK)->Enable(m_PercentChange > -100.0);
+   }
 }
 
 void ChangePitchDialog::Update_Slider_PercentChange()
 {
    if (m_pSlider_PercentChange) {
-		double unwarped = m_PercentChange;
-		if (unwarped > 0.0)
-			// Un-warp values above zero to actually go up to PERCENTCHANGE_MAX.
-			unwarped = pow(m_PercentChange, (1.0 / PERCENTCHANGE_SLIDER_WARP));
-
-		// Add 0.5 to unwarped so trunc -> round.
-		m_pSlider_PercentChange->SetValue((int)(unwarped + 0.5)); 
-	}
+      double unwarped = m_PercentChange;
+      if (unwarped > 0.0)
+         // Un-warp values above zero to actually go up to PERCENTCHANGE_MAX.
+         unwarped = pow(m_PercentChange, (1.0 / PERCENTCHANGE_SLIDER_WARP));
+
+      // Add 0.5 to unwarped so trunc -> round.
+      m_pSlider_PercentChange->SetValue((int)(unwarped + 0.5)); 
+   }
 }
 
 
diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp
index bad85a8..67a0e6d 100644
--- a/src/effects/ChangeSpeed.cpp
+++ b/src/effects/ChangeSpeed.cpp
@@ -152,7 +152,7 @@ bool EffectChangeSpeed::Process()
    }
 #endif
 
-// mT1 = mT0 + m_maxNewLength; // Update selection.
+   mT1 = mT0 + m_maxNewLength; // Update selection.
 
    return bGoodResult;
 }
@@ -494,13 +494,17 @@ void ChangeSpeedDialog::OnChoice_ToVinyl(wxCommandEvent & event)
    }
 }
 
-
 void ChangeSpeedDialog::OnPreview(wxCommandEvent &event)
 {
    TransferDataFromWindow();
 
 	// Save & restore parameters around Preview, because we didn't do OK.
 	double oldPercentChange = mEffect->m_PercentChange;
+   if( m_PercentChange < -99.0)
+   {
+      m_PercentChange = -99.0;
+      this->Update_Text_PercentChange();
+   }
    mEffect->m_PercentChange = m_PercentChange;
    mEffect->Preview();
    mEffect->m_PercentChange = oldPercentChange; 
@@ -514,6 +518,7 @@ void ChangeSpeedDialog::Update_Text_PercentChange()
 		wxString str;
 		str.Printf(wxT("%.3f"), m_PercentChange);
 		m_pTextCtrl_PercentChange->SetValue(str);
+      FindWindow(wxID_OK)->Enable(m_PercentChange > -100.0);
 	}
 }
 
diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp
index dda05e8..3fe8376 100644
--- a/src/effects/ChangeTempo.cpp
+++ b/src/effects/ChangeTempo.cpp
@@ -104,7 +104,10 @@ bool EffectChangeTempo::Process()
 {
    mSoundTouch = new SoundTouch();
    mSoundTouch->setTempoChange(m_PercentChange);
-   return this->EffectSoundTouch::Process();
+   bool success = this->EffectSoundTouch::Process();
+   if( success )
+      mT1 = mT0 + (mT1 - mT0)/(m_PercentChange/100 + 1.);
+   return success;
 }
 
 //----------------------------------------------------------------------------
@@ -422,13 +425,17 @@ void ChangeTempoDialog::OnText_ToLength(wxCommandEvent & event)
    }
 }
 
-
 void ChangeTempoDialog::OnPreview(wxCommandEvent &event)
 {
    TransferDataFromWindow();
 
 	// Save & restore parameters around Preview, because we didn't do OK.
 	double oldPercentChange = mEffect->m_PercentChange;
+   if( m_PercentChange < -99.0)
+   {
+      m_PercentChange = -99.0;
+      this->Update_Text_PercentChange();
+   }
 	mEffect->m_PercentChange = m_PercentChange;
 	mEffect->Preview();
 	mEffect->m_PercentChange = oldPercentChange;
@@ -442,6 +449,7 @@ void ChangeTempoDialog::Update_Text_PercentChange()
 		wxString str;
 		str.Printf(wxT("%.3f"), m_PercentChange);
 		m_pTextCtrl_PercentChange->SetValue(str);
+      FindWindow(wxID_OK)->Enable(m_PercentChange > -100.0);
 	}
 }
 
diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp
index 86bedcd..c2c69a6 100644
--- a/src/effects/ClickRemoval.cpp
+++ b/src/effects/ClickRemoval.cpp
@@ -347,6 +347,7 @@ void ClickRemovalDialog::PopulateOrExchange(ShuttleGui & S)
       mThreshS = S.Id(ID_THRESH_SLIDER).AddSlider(wxT(""),
                                                   0,
                                                   MAX_THRESHOLD);
+      mThreshS->SetName(_("Select threshold"));
       mThreshS->SetRange(MIN_THRESHOLD, MAX_THRESHOLD);
 
       // Click width
@@ -359,6 +360,7 @@ void ClickRemovalDialog::PopulateOrExchange(ShuttleGui & S)
       mWidthS = S.Id(ID_WIDTH_SLIDER).AddSlider(wxT(""),
                                                 0,
                                                 MAX_CLICK_WIDTH);
+      mWidthS->SetName(_("Max spike width"));
       mWidthS->SetRange(MIN_CLICK_WIDTH, MAX_CLICK_WIDTH);
    }
    S.EndMultiColumn();
diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp
new file mode 100644
index 0000000..67df082
--- /dev/null
+++ b/src/effects/Contrast.cpp
@@ -0,0 +1,675 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  Contrast.cpp
+
+*******************************************************************//**
+
+\class EffectContrast
+\brief An effect to measure the difference between two sections of audio
+
+*//****************************************************************//**
+
+\class ContrastDialog
+\brief Dialog used with EffectContrast
+
+*//*******************************************************************/
+
+#include "../Audacity.h"
+#include "../AudacityApp.h"
+
+#include "Contrast.h"
+
+#include "../Envelope.h"
+#include "../FFT.h"
+#include "../WaveTrack.h"
+#include "../Prefs.h"
+#include "../Project.h"
+#include "../FileNames.h"
+#include "../widgets/LinkingHtmlWindow.h"
+#include "FileDialog.h"
+
+#include <math.h>
+
+#if defined(__WXMSW__) && !defined(__CYGWIN__)
+#include <float.h>
+#define finite(x) _finite(x)
+#endif
+
+// all these headers may not be needed
+#include <wx/file.h>
+#include <wx/ffile.h>
+#include <wx/bitmap.h>
+#include <wx/brush.h>
+#include <wx/button.h>
+#include <wx/datetime.h>
+#include <wx/dcmemory.h>
+#include <wx/file.h>
+#include <wx/image.h>
+#include <wx/intl.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/valtext.h>
+
+#include "../PlatformCompatibility.h"
+
+EffectContrast::EffectContrast()
+{
+   bFGset = false;
+   bBGset = false;
+}
+
+EffectContrast::~EffectContrast()
+{
+   return;
+}
+
+bool EffectContrast::PromptUser()
+{
+   if( !bFGset )
+   {
+      SaveTimes(true, mT0, mT1);
+      bFGset = true;
+      if( !bBGset )
+      {
+         wxMessageDialog m(NULL, _("Foreground times selected.\nNow select background and use Ctrl+Shift+T or menu again."), _("Contrast Tool Foreground"), wxOK);
+         m.ShowModal();
+      }
+   }
+   else
+   {
+      if( !bBGset )
+      {
+         SaveTimes(false, mT0, mT1);
+         bBGset = true;
+      }
+   }
+
+   if( bFGset && bBGset )
+   {
+      ContrastDialog dlog(this, mParent);
+
+      // Copy parameters into dialog from effect
+      dlog.mForegroundStartT->SetTimeValue(mStartTimeF);
+      dlog.mForegroundEndT->SetTimeValue(mEndTimeF);
+      dlog.mBackgroundStartT->SetTimeValue(mStartTimeB);
+      dlog.mBackgroundEndT->SetTimeValue(mEndTimeB);
+
+      wxCommandEvent dummyEvt;
+      dlog.OnGetForegroundDB(dummyEvt);
+      dlog.OnGetBackgroundDB(dummyEvt);
+
+      dlog.CentreOnParent();
+      dlog.ShowModal();
+
+      // Copy parameters from dialog back into effect
+      mStartTimeF = dlog.mForegroundStartT->GetTimeValue();
+      mEndTimeF = dlog.mForegroundEndT->GetTimeValue();
+      mStartTimeB = dlog.mBackgroundStartT->GetTimeValue();
+      mEndTimeB = dlog.mBackgroundEndT->GetTimeValue();
+   }
+
+   return false;
+}
+
+float EffectContrast::GetDB()
+{
+   float rms = float(0.0);
+
+   TrackListIterator iter(mWaveTracks);
+   Track *t = iter.First();
+   if(mT0 > mT1)
+   {
+      wxMessageDialog m(NULL, _("Start time after after end time!\nPlease enter reasonable times."), _("Error"), wxOK);
+      m.ShowModal();
+      return 1234.0; // 'magic number', but the whole +ve dB range will never occur
+   }
+   if(mT0 < t->GetStartTime())
+      mT0 = t->GetStartTime();
+   if(mT1 > t->GetEndTime())
+      mT1 = t->GetEndTime();
+   if(mT0 > mT1)
+   {
+      wxMessageDialog m(NULL, _("Times are not reasonable!\nPlease enter reasonable times."), _("Error"), wxOK);
+      m.ShowModal();
+      return 1234.0;
+   }
+   if(mT0 == mT1)
+      return 1234.0;
+   while(t) {  // this isn't quite right.  What to do if more than one track selected?
+      ((WaveTrack *)t)->GetRMS(&rms, mT0, mT1);
+      t = iter.Next();
+   }
+   if(rms == 0.0)
+      return(1234.0);
+   else
+      return 20.0*log10(fabs(rms));
+}
+
+double EffectContrast::GetStartTime()
+{
+   return(mT0);
+}
+
+void EffectContrast::SetStartTime(double t)
+{
+   mT0 = t;
+}
+
+double EffectContrast::GetEndTime()
+{
+   return(mT1);
+}
+
+void EffectContrast::SetEndTime(double t)
+{
+   mT1 = t;
+}
+
+void EffectContrast::SaveTimes(bool isForeground, double start, double end)
+{
+   if(isForeground)
+   {
+      mStartTimeF = start;
+      mEndTimeF = end;
+   }
+   else
+   {
+      mStartTimeB = start;
+      mEndTimeB = end;
+   }
+   return;
+}
+
+bool EffectContrast::Process()
+{
+   wxMessageBox(_("Hello.\n"));  // you should never see this!
+   return true;
+}
+
+bool EffectContrast::CheckWhetherSkipEffect()
+{
+   return true;
+}
+
+// WDR: class implementations
+
+//----------------------------------------------------------------------------
+// ContrastDialog
+//----------------------------------------------------------------------------
+
+// WDR: event table for ContrastDialog
+
+enum {
+   ID_BUTTON_GETFOREGROUND = 10001,
+   ID_BUTTON_GETBACKGROUND,
+   ID_BUTTON_USECURRENTF,
+   ID_BUTTON_USECURRENTB,
+   ID_BUTTON_GETURL,
+   ID_BUTTON_EXPORT,
+   ID_BUTTON_RESET,
+   ID_BUTTON_CLOSE,
+   ID_FOREGROUNDSTART_T,
+   ID_FOREGROUNDEND_T,
+   ID_BACKGROUNDSTART_T,
+   ID_BACKGROUNDEND_T,
+   ID_FOREGROUNDDB_TEXT,
+   ID_BACKGROUNDDB_TEXT,
+   ID_RESULTS_TEXT,
+   ID_RESULTSDB_TEXT
+};
+
+BEGIN_EVENT_TABLE(ContrastDialog,wxDialog)
+   EVT_BUTTON(wxID_OK, ContrastDialog::OnOK)
+   EVT_BUTTON(ID_BUTTON_GETFOREGROUND, ContrastDialog::OnGetForegroundDB)
+   EVT_BUTTON(ID_BUTTON_GETBACKGROUND, ContrastDialog::OnGetBackgroundDB)
+   EVT_BUTTON(ID_BUTTON_USECURRENTF, ContrastDialog::OnUseSelectionF)
+   EVT_BUTTON(ID_BUTTON_USECURRENTB, ContrastDialog::OnUseSelectionB)
+   EVT_BUTTON(ID_BUTTON_GETURL, ContrastDialog::OnGetURL)
+   EVT_BUTTON(ID_BUTTON_EXPORT, ContrastDialog::OnExport)
+   EVT_BUTTON(ID_BUTTON_RESET, ContrastDialog::OnReset)
+   EVT_BUTTON(ID_BUTTON_CLOSE, ContrastDialog::OnCloseWithoutReset)
+   EVT_COMMAND(ID_FOREGROUNDSTART_T, wxEVT_COMMAND_TEXT_UPDATED, ContrastDialog::OnForegroundStartT)
+   EVT_COMMAND(ID_FOREGROUNDEND_T, wxEVT_COMMAND_TEXT_UPDATED, ContrastDialog::OnForegroundEndT)
+   EVT_COMMAND(ID_BACKGROUNDSTART_T, wxEVT_COMMAND_TEXT_UPDATED, ContrastDialog::OnBackgroundStartT)
+   EVT_COMMAND(ID_BACKGROUNDEND_T, wxEVT_COMMAND_TEXT_UPDATED, ContrastDialog::OnBackgroundEndT)
+END_EVENT_TABLE()
+
+/* i18n-hint: WCAG2 is the 'Web Content Accessibility Guidelines (WCAG) 2.0', see http://www.w3.org/TR/WCAG20/ */
+ContrastDialog::ContrastDialog(EffectContrast * effect, 
+                                       wxWindow *parent) :
+   EffectDialog( parent, _("WCAG2 Audio Contrast Analyzer"), ANALYZE_EFFECT)
+{
+   m_pEffect = effect;
+   
+   // NULL out the control members until the controls are created.
+   m_pButton_GetForeground = NULL;
+   m_pButton_GetBackground = NULL;
+   mForegroundStartT = NULL;
+   mForegroundEndT = NULL;
+   mBackgroundStartT = NULL;
+   mBackgroundEndT = NULL;
+
+   mT0orig = m_pEffect->GetStartTime();  // keep copy of selection times
+   mT1orig = m_pEffect->GetEndTime();
+
+   Init();
+}
+
+ContrastDialog::~ContrastDialog()
+{
+   mForegroundRMSText->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+   mBackgroundRMSText->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+   mPassFailText->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+   mDiffText->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+}
+
+void ContrastDialog::OnGetForegroundDB( wxCommandEvent &event )
+{
+   m_pEffect->SetStartTime(mForegroundStartT->GetTimeValue());
+   m_pEffect->SetEndTime(mForegroundEndT->GetTimeValue());
+   foregrounddB = m_pEffect->GetDB();
+   m_pButton_GetForeground->Enable(false);
+   m_pButton_GetForeground->SetLabel(_("Measured"));
+   m_pButton_UseCurrentF->SetFocus();
+   results();
+}
+
+void ContrastDialog::OnGetBackgroundDB( wxCommandEvent &event )
+{
+   m_pEffect->SetStartTime(mBackgroundStartT->GetTimeValue());
+   m_pEffect->SetEndTime(mBackgroundEndT->GetTimeValue());
+   backgrounddB = m_pEffect->GetDB();
+   m_pButton_GetBackground->Enable(false);
+   m_pButton_GetBackground->SetLabel(_("Measured"));
+   m_pButton_UseCurrentB->SetFocus();
+   results();
+}
+
+void ContrastDialog::OnGetURL(wxCommandEvent &event)
+{
+   wxString page = wxT("http://www.eramp.com/WCAG_2_audio_contrast_tool_help.htm");
+   ::OpenInDefaultBrowser(page);
+}
+
+void ContrastDialog::OnOK(wxCommandEvent &event)
+{
+   wxCommandEvent dummyEvt;
+   OnReset(event);
+   EndModal(0);
+}
+
+void ContrastDialog::OnCloseWithoutReset(wxCommandEvent &event)
+{
+   EndModal(0);
+}
+
+void ContrastDialog::PopulateOrExchange(ShuttleGui & S)
+{
+   wxTextValidator vld(wxFILTER_NUMERIC);
+   wxString number;
+
+   S.StartHorizontalLay(wxCENTER, false);
+   {
+      S.AddTitle(_("Contrast Analyzer"));
+   }
+   S.EndHorizontalLay();
+   S.StartStatic( _("Parameters") );
+   {
+      S.StartMultiColumn(6, wxEXPAND);
+      {
+
+         // Headings
+         S.AddFixedText(wxT(""));   // spacer
+         S.AddFixedText(_("Start"));
+         S.AddFixedText(_("End"));
+         S.AddFixedText(wxT(""));   // spacer
+         S.AddFixedText(wxT(""));   // spacer
+         S.AddFixedText(_("Volume    "));
+
+         //Foreground
+         S.AddFixedText(_("Foreground:"), false);
+         if (mForegroundStartT == NULL)
+         {
+            mForegroundStartT = new
+            TimeTextCtrl(this,
+                         ID_FOREGROUNDSTART_T,
+                         wxT(""),
+                         0.0,
+                         m_pEffect->mProjectRate,
+                         wxDefaultPosition,
+                         wxDefaultSize,
+                         true);
+            mForegroundStartT->SetName(_("Foreground start time"));
+            mForegroundStartT->SetFormatString(mForegroundStartT->GetBuiltinFormat(wxT("hh:mm:ss + hundredths")));
+            mForegroundStartT->EnableMenu(false);
+         }
+         S.AddWindow(mForegroundStartT);
+
+         if (mForegroundEndT == NULL)
+         {
+            AudacityProject *p = GetActiveProject();
+            mForegroundEndT = new
+            TimeTextCtrl(this,
+                         ID_FOREGROUNDEND_T,
+                         wxT(""),
+                         0.0,
+                         m_pEffect->mProjectRate,
+                         wxDefaultPosition,
+                         wxDefaultSize,
+                         true);
+            mForegroundEndT->SetName(_("Foreground end time"));
+            mForegroundEndT->SetFormatString(mForegroundEndT->GetBuiltinFormat(wxT("hh:mm:ss + hundredths")));
+            mForegroundEndT->EnableMenu(false);
+         }
+         S.AddWindow(mForegroundEndT);
+
+         m_pButton_GetForeground = S.Id(ID_BUTTON_GETFOREGROUND).AddButton(_("Measured"));
+         m_pButton_GetForeground->Enable(false);   // Disabled as we do the measurement as we put up the dialog
+         m_pButton_UseCurrentF = S.Id(ID_BUTTON_USECURRENTF).AddButton(_("Use selection"));
+         mForegroundRMSText=S.Id(ID_FOREGROUNDDB_TEXT).AddTextBox(wxT(""), wxT(""), 12);
+         mForegroundRMSText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+
+         //Background
+         S.AddFixedText(_("Background:"));
+         if (mBackgroundStartT == NULL)
+         {
+            AudacityProject *p = GetActiveProject();
+            mBackgroundStartT = new
+            TimeTextCtrl(this,
+                         ID_BACKGROUNDSTART_T,
+                         wxT(""),
+                         0.0,
+                         m_pEffect->mProjectRate,
+                         wxDefaultPosition,
+                         wxDefaultSize,
+                         true);
+            mBackgroundStartT->SetName(_("Background start time"));
+            mBackgroundStartT->SetFormatString(mBackgroundStartT->GetBuiltinFormat(wxT("hh:mm:ss + hundredths")));
+            mBackgroundStartT->EnableMenu(false);
+         }
+         S.AddWindow(mBackgroundStartT);
+
+         if (mBackgroundEndT == NULL)
+         {
+            AudacityProject *p = GetActiveProject();
+            mBackgroundEndT = new
+            TimeTextCtrl(this,
+                         ID_BACKGROUNDEND_T,
+                         wxT(""),
+                         0.0,
+                         m_pEffect->mProjectRate,
+                         wxDefaultPosition,
+                         wxDefaultSize,
+                         true);
+            mBackgroundEndT->SetName(_("Background end time"));
+            mBackgroundEndT->SetFormatString(mBackgroundEndT->GetBuiltinFormat(wxT("hh:mm:ss + hundredths")));
+            mBackgroundEndT->EnableMenu(false);
+         }
+         S.AddWindow(mBackgroundEndT);
+
+         m_pButton_GetBackground = S.Id(ID_BUTTON_GETBACKGROUND).AddButton(_("Measured"));
+         m_pButton_GetBackground->Enable(false);
+         m_pButton_UseCurrentB = S.Id(ID_BUTTON_USECURRENTB).AddButton(_("Use selection"));
+         mBackgroundRMSText = S.Id(ID_BACKGROUNDDB_TEXT).AddTextBox(wxT(""), wxT(""), 12);
+         mBackgroundRMSText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+      }
+      S.EndMultiColumn();
+   }
+   S.EndStatic();
+
+   //Result
+   S.StartStatic( _("Result") );
+   {
+      S.StartMultiColumn(3, wxCENTER);
+      {
+         S.AddFixedText(_("Contrast Result:"));
+         mPassFailText = S.Id(ID_RESULTS_TEXT).AddTextBox(wxT(""), wxT(""), 40);
+         mPassFailText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+         m_pButton_Reset = S.Id(ID_BUTTON_RESET).AddButton(_("Reset"));
+         S.AddFixedText(_("Difference:"));
+         mDiffText = S.Id(ID_RESULTSDB_TEXT).AddTextBox(wxT(""), wxT(""), 30);
+         mDiffText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
+         m_pButton_Export = S.Id(ID_BUTTON_EXPORT).AddButton(_("Export"));
+      }
+      S.EndMultiColumn();
+   }
+   S.EndStatic();
+   S.StartHorizontalLay(wxEXPAND);
+   {
+      //Information
+      S.StartStatic( _("Information"), 1 );
+      {
+         S.AddFixedText(_("For measuring rms volume differences between two selections of audio."));
+         m_pButton_GetURL = S.Id(ID_BUTTON_GETURL).AddButton(_("Help for WCAG2 Audio Contrast Analyzer"));
+      }
+      S.EndStatic();
+      //What happens when we close the dialog (OK button is standard and clears values)
+      S.StartStatic( _("Control"));
+      {
+         S.AddFixedText(_("Note: The 'OK' button resets time values."));
+         m_pButton_Close = S.Id(ID_BUTTON_CLOSE).AddButton(_("Close but keep times"));
+      }
+      S.EndStatic();
+   }
+   S.EndHorizontalLay();
+   Fit();
+}
+
+void ContrastDialog::OnForegroundStartT(wxCommandEvent & event)
+{
+   m_pButton_GetForeground->Enable(true);
+   m_pButton_GetForeground->SetLabel(_("Measure"));
+}
+
+void ContrastDialog::OnForegroundEndT(wxCommandEvent & event)
+{
+   m_pButton_GetForeground->Enable(true);
+   m_pButton_GetForeground->SetLabel(_("Measure"));
+}
+
+void ContrastDialog::OnBackgroundStartT(wxCommandEvent & event)
+{
+   m_pButton_GetBackground->Enable(true);
+   m_pButton_GetBackground->SetLabel(_("Measure"));
+}
+
+void ContrastDialog::OnBackgroundEndT(wxCommandEvent & event)
+{
+   m_pButton_GetBackground->Enable(true);
+   m_pButton_GetBackground->SetLabel(_("Measure"));
+}
+
+void ContrastDialog::OnUseSelectionF(wxCommandEvent & event)
+{
+   mForegroundStartT->SetTimeValue(mT0orig);
+   mForegroundEndT->SetTimeValue(mT1orig);
+
+   m_pEffect->SetStartTime(mT0orig);
+   m_pEffect->SetEndTime(mT1orig);
+   OnGetForegroundDB(event);
+}
+
+void ContrastDialog::OnUseSelectionB(wxCommandEvent & event)
+{
+   mBackgroundStartT->SetTimeValue(mT0orig);
+   mBackgroundEndT->SetTimeValue(mT1orig);
+
+   m_pEffect->SetStartTime(mT0orig);
+   m_pEffect->SetEndTime(mT1orig);
+   OnGetBackgroundDB(event);
+}
+
+void ContrastDialog::results()
+{
+   if(foregrounddB == 1234.0) // magic number, but OK for now
+   {
+      mForegroundRMSText->SetName(_("No foreground to measure"));
+      mForegroundRMSText->ChangeValue(wxString::Format(wxT(" ")));
+   }
+   else
+   {
+      mForegroundRMSText->SetName(_("Measured foreground level"));
+      mForegroundRMSText->ChangeValue(wxString::Format(_("%.1f dB"), foregrounddB));   // i18n-hint: short form of 'decibels'
+   }
+   if(backgrounddB == 1234.0)
+   {
+      mBackgroundRMSText->SetName(_("No background to measure"));
+      mBackgroundRMSText->ChangeValue(wxString::Format(wxT(" ")));
+   }
+   else
+   {
+      mBackgroundRMSText->SetName(_("Measured background level"));
+      mBackgroundRMSText->ChangeValue(wxString::Format(_("%.1f dB"), backgrounddB));
+   }
+   if( (foregrounddB != 1234.0) && (backgrounddB != 1234.0) )
+   {
+      if(foregrounddB - backgrounddB > 20)
+         mPassFailText->ChangeValue(_("WCAG2 Pass"));
+      else
+         mPassFailText->ChangeValue(_("WCAG2 Fail"));
+      mDiffText->SetName(_("Current difference"));
+      mDiffText->ChangeValue(wxString::Format(_("%.1f dB Average rms"), foregrounddB - backgrounddB));
+   }
+   else
+   {
+      mPassFailText->SetName(wxT(""));
+      mPassFailText->ChangeValue(_("Please enter valid times."));
+      mDiffText->ChangeValue(wxT(""));
+   }
+}
+
+void ContrastDialog::OnExport(wxCommandEvent & event)
+{
+   AudacityProject * project = GetActiveProject();
+   wxString fName = wxT("contrast.txt");
+
+   fName = FileSelector(_("Export Contrast Result As:"),
+                        NULL, fName, wxT("txt"), wxT("*.txt"), wxFD_SAVE | wxRESIZE_BORDER, this);
+
+   if (fName == wxT(""))
+      return;
+
+   wxTextFile f(fName);
+#ifdef __WXMAC__
+   wxFile *temp = new wxFile();
+   temp->Create(fName);
+   delete temp;
+#else
+   f.Create();
+#endif
+   f.Open();
+   if (!f.IsOpened()) {
+      wxMessageBox(_("Couldn't write to file: ") + fName);
+      return;
+   }
+
+   f.AddLine(wxT("==================================="));
+   f.AddLine(_("WCAG 2.0 Success Criteria 1.4.7 Contrast Results"));
+   f.AddLine(wxT(""));
+   f.AddLine(wxString::Format(_("Filename = %s."), project->GetFileName().c_str() ));
+   f.AddLine(wxT(""));
+   f.AddLine(_("Foreground"));
+   float t = (float)mForegroundStartT->GetTimeValue();
+   int h = (int)(t/3600);  // there must be a standard function for this!
+   int m = (int)((t - h*3600)/60);
+   float s = t - h*3600.0 - m*60.0;
+   f.AddLine(wxString::Format(_("Time started = %2d hour(s), %2d minute(s), %.2f seconds."), h, m, s ));
+   t = (float)mForegroundEndT->GetTimeValue();
+   h = (int)(t/3600);
+   m = (int)((t - h*3600)/60);
+   s = t - h*3600.0 - m*60.0;
+   f.AddLine(wxString::Format(_("Time ended = %2d hour(s), %2d minute(s), %.2f seconds."), h, m, s ));
+   if(foregrounddB != 1234.0) // see other instances of '1234.0' in here
+      f.AddLine(wxString::Format(_("Average rms = %.1f dB."), foregrounddB ));
+   else
+      f.AddLine(wxString::Format(_("Average rms =  dB.")));
+
+   f.AddLine(wxT(""));
+   f.AddLine(_("Background"));
+   t = (float)mBackgroundStartT->GetTimeValue();
+   h = (int)(t/3600);
+   m = (int)((t - h*3600)/60);
+   s = t - h*3600.0 - m*60.0;
+   f.AddLine(wxString::Format(_("Time started = %2d hour(s), %2d minute(s), %.2f seconds."), h, m, s ));
+   t = (float)mBackgroundEndT->GetTimeValue();
+   h = (int)(t/3600);
+   m = (int)((t - h*3600)/60);
+   s = t - h*3600.0 - m*60.0;
+   f.AddLine(wxString::Format(_("Time ended = %2d hour(s), %2d minute(s), %.2f seconds."), h, m, s ));
+   if(backgrounddB != 1234.0)
+      f.AddLine(wxString::Format(_("Average rms = %.1f dB."), backgrounddB ));
+   else
+      f.AddLine(wxString::Format(_("Average rms =  dB.")));
+   f.AddLine(wxT(""));
+   f.AddLine(_("Results"));
+   float diff = foregrounddB - backgrounddB;
+   f.AddLine(wxString::Format(_("Difference = %.1f Average rms dB."), diff ));
+   if( diff > 20. )
+      f.AddLine(_("Success Criteria 1.4.7 of WCAG 2.0: Pass"));
+   else
+      f.AddLine(_("Success Criteria 1.4.7 of WCAG 2.0: Fail"));
+
+   f.AddLine(wxT(""));
+   f.AddLine(_("Data gathered"));
+   wxString sNow;
+   wxDateTime now = wxDateTime::Now();
+   int year = now.GetYear();
+   wxDateTime::Month month = now.GetMonth();
+   wxString monthName = now.GetMonthName(month);
+   int dom = now.GetDay();
+   int hour = now.GetHour();
+   int minute = now.GetMinute();
+   int second = now.GetSecond();
+   sNow = wxString::Format(wxT("%d %s %02d %02dh %02dm %02ds"), 
+        dom, monthName.c_str(), year, hour, minute, second);
+   f.AddLine(sNow);
+
+   f.AddLine(wxT("==================================="));
+   f.AddLine(wxT(""));
+
+#ifdef __WXMAC__
+   f.Write(wxTextFileType_Mac);
+#else
+   f.Write();
+#endif
+   f.Close();
+}
+
+void ContrastDialog::OnReset(wxCommandEvent & event)
+{
+   m_pEffect->bFGset = false;
+   m_pEffect->bBGset = false;
+
+   mForegroundStartT->SetTimeValue(0.0);
+   mForegroundEndT->SetTimeValue(0.0);
+   mBackgroundStartT->SetTimeValue(0.0);
+   mBackgroundEndT->SetTimeValue(0.0);
+
+   wxCommandEvent dummyEvt;
+   OnGetForegroundDB(event);
+   OnGetBackgroundDB(event);
+   results();
+}
+
+void ContrastDialog::OnChar(wxKeyEvent &event)
+{
+   event.Skip(false);
+   return;
+}
+
+// Indentation settings for Vim and Emacs and unique identifier for Arch, a
+// version control system. Please do not modify past this point.
+//
+// Local Variables:
+// c-basic-offset: 3
+// indent-tabs-mode: nil
+// End:
+//
+// vim: et sts=3 sw=3
+// arch-tag: 685e0d8c-89eb-427b-8933-af606cf33c2b
+
diff --git a/src/effects/Contrast.h b/src/effects/Contrast.h
new file mode 100644
index 0000000..204eeb4
--- /dev/null
+++ b/src/effects/Contrast.h
@@ -0,0 +1,163 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  Contrast.h
+
+**********************************************************************/
+
+#ifndef __AUDACITY_EFFECT_CONTRAST__
+#define __AUDACITY_EFFECT_CONTRAST__
+
+#include "Effect.h"
+#include "../widgets/TimeTextCtrl.h"
+
+#include <wx/dialog.h>
+#include <wx/slider.h>
+
+class wxButton;
+class wxSizer;
+class wxString;
+
+class Envelope;
+class WaveTrack;
+
+class EffectContrast: public Effect {
+
+public:
+   
+   EffectContrast();
+   virtual ~EffectContrast();
+
+   virtual wxString GetEffectName() {
+      return wxString(_("Contrast...\tCtrl+Shift+T"));
+   }
+
+   virtual int GetEffectFlags() {
+      return BUILTIN_EFFECT | ANALYZE_EFFECT;
+   }
+
+   virtual std::set<wxString> GetEffectCategories() {
+      std::set<wxString> result;
+      result.insert(wxT("http://lv2plug.in/ns/lv2core#AnalyserPlugin"));
+      return result;
+   }
+
+   virtual wxString GetEffectIdentifier() {
+      return wxString(wxT("Contrast"));
+   }
+
+   virtual wxString GetEffectAction() {
+      if (mDoBackground)
+         return wxString(_("Measuring background"));
+      else
+         return wxString(_("Measuring foreground"));
+   }
+   
+   virtual bool PromptUser();
+   
+   virtual bool CheckWhetherSkipEffect();
+   virtual bool Process();
+   void SaveTimes(bool, double, double);
+   double length;
+   
+private:
+   bool      mDoBackground;
+   float GetDB();
+   double GetStartTime();
+   void SetStartTime(double);
+   double GetEndTime();
+   void SetEndTime(double);
+   double mStartTimeF;
+   double mEndTimeF;
+   bool bFGset;
+   double mStartTimeB;
+   double mEndTimeB;
+   bool bBGset;
+
+friend class ContrastDialog;
+};
+
+// WDR: class declarations
+
+//----------------------------------------------------------------------------
+// ContrastDialog
+//----------------------------------------------------------------------------
+
+// Declare window functions
+
+class ContrastDialog: public EffectDialog
+{
+public:
+   // constructors and destructors
+   ContrastDialog(EffectContrast * effect,
+                      wxWindow *parent);
+   ~ContrastDialog();
+
+   void PopulateOrExchange(ShuttleGui & S);
+
+   void OnGetForegroundDB( wxCommandEvent &event );
+   void OnGetBackgroundDB( wxCommandEvent &event );
+
+private:
+   // handlers
+   void OnGetURL(wxCommandEvent &event);
+   void OnExport(wxCommandEvent &event);
+   void OnForegroundStartT(wxCommandEvent & event);
+   void OnForegroundEndT(wxCommandEvent & event);
+   void OnBackgroundStartT(wxCommandEvent & event);
+   void OnBackgroundEndT(wxCommandEvent & event);
+   void OnUseSelectionF(wxCommandEvent & event);
+   void OnUseSelectionB(wxCommandEvent & event);
+   void results();
+   void OnOK( wxCommandEvent &event );
+   void OnReset(wxCommandEvent & event);
+   void OnCloseWithoutReset(wxCommandEvent & event);
+   void OnChar(wxKeyEvent &event);
+
+   wxTextCtrl *mForegroundRMSText;
+   wxTextCtrl *mBackgroundRMSText;
+   wxTextCtrl *mPassFailText;
+   wxTextCtrl *mDiffText;
+
+   float foregrounddB;
+   float backgrounddB;
+   double mT0orig;
+   double mT1orig;
+
+ public:
+
+   EffectContrast * m_pEffect;
+
+   wxButton * m_pButton_GetBackground;
+   wxButton * m_pButton_GetForeground;
+   wxButton * m_pButton_UseCurrentF;
+   wxButton * m_pButton_UseCurrentB;
+   wxButton * m_pButton_GetURL;
+   wxButton * m_pButton_Export;
+   wxButton * m_pButton_Reset;
+   wxButton * m_pButton_Close;
+
+   TimeTextCtrl *mForegroundStartT;
+   TimeTextCtrl *mForegroundEndT;
+   TimeTextCtrl *mBackgroundStartT;
+   TimeTextCtrl *mBackgroundEndT;
+
+private:
+   DECLARE_EVENT_TABLE()
+
+};
+
+#endif
+
+// Indentation settings for Vim and Emacs and unique identifier for Arch, a
+// version control system. Please do not modify past this point.
+//
+// Local Variables:
+// c-basic-offset: 3
+// indent-tabs-mode: nil
+// End:
+//
+// vim: et sts=3 sw=3
+// arch-tag: c42ae8d9-7625-4bf9-a719-e5d082430ed5
+
diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp
index 93d856a..f4e1fba 100644
--- a/src/effects/DtmfGen.cpp
+++ b/src/effects/DtmfGen.cpp
@@ -478,6 +478,7 @@ void DtmfDialog::PopulateOrExchange( ShuttleGui & S )
          * effect, I want it (dDuration) to be used as the duration, and with
          * "seconds" this does not always work properly. For example, it rounds
          * down to zero... */
+         mDtmfDurationT->SetName(_("Duration"));
          mDtmfDurationT->SetFormatString(mDtmfDurationT->GetBuiltinFormat(dIsSelection==true?(wxT("hh:mm:ss + samples")):(wxT("seconds"))));
          mDtmfDurationT->EnableMenu();
       }
diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp
index 6315ebd..349e9f3 100644
--- a/src/effects/Echo.cpp
+++ b/src/effects/Echo.cpp
@@ -146,8 +146,12 @@ bool EffectEcho::ProcessOne(int count, WaveTrack * track,
 
       s += block;
       
-      if (TrackProgress(count, s / (double) len))
+      if (TrackProgress(count, s / (double) len)) {
+         delete[]buffer0;
+         delete[]buffer1;
+
          return false;
+      }
    }
 
    delete[]buffer0;
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 6918c7d..d3b151b 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -132,7 +132,7 @@ bool Effect::DoEffect(wxWindow *parent, int flags,
 
 bool Effect::TotalProgress(double frac)
 {
-   return !mProgress->Update(rint(frac));
+   return !mProgress->Update(frac);
 }
 
 bool Effect::TrackProgress(int whichTrack, double frac)
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index b9d2d26..6a21c34 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -28,9 +28,6 @@ class wxWindow;
 #include "../Internat.h"
 #include "../widgets/ProgressDialog.h"
 
-class Effect;
-
-
 #define PLUGIN_EFFECT   0x0001
 #define BUILTIN_EFFECT  0x0002
 // ADVANCED_EFFECT was introduced for Lynn Allan's 'CleanSpeech'
@@ -58,7 +55,7 @@ class Effect;
 //and so can just drop the steps we don't want?
 #define SKIP_EFFECT_MILLISECOND 99999
 
-class Effect {
+class AUDACITY_DLL_API Effect {
    
  // 
  // public methods
@@ -229,6 +226,8 @@ class Effect {
 
    int GetNumWaveTracks() { return mNumTracks; }
 
+   int GetNumWaveGroups() { return mNumGroups; }
+
  //
  // protected static data
  //
@@ -277,7 +276,7 @@ class Effect {
 #define ID_EFFECT_PREVIEW ePreviewID
 
 // Base dialog for regular effect
-class EffectDialog:public wxDialog
+class AUDACITY_DLL_API EffectDialog:public wxDialog
 {
 public:
    // constructors and destructors
diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp
index 00bb1f4..2911b7b 100644
--- a/src/effects/EffectManager.cpp
+++ b/src/effects/EffectManager.cpp
@@ -33,9 +33,11 @@ EffectManager::EffectManager()
 }
 
 EffectManager::~EffectManager() {
+#ifdef EFFECT_CATEGORIES
    CategoryMap::iterator i;
    for (i = mCategories.begin(); i != mCategories.end(); ++i)
       delete i->second;
+#endif
 }
 
 void EffectManager::RegisterEffect(Effect *f, int NewFlags)
@@ -107,6 +109,17 @@ Effect *EffectManager::GetEffect(int ID)
    return NULL;
 }
 
+Effect* EffectManager::GetEffectByIdentifier(const wxString strTarget, const int kFlags /*= ALL_EFFECTS*/)
+{
+   for (unsigned int i = 0; i < mEffects.GetCount(); i++) 
+   {
+      int nFlags = mEffects[i]->GetEffectFlags();
+      if (((nFlags & kFlags) == nFlags) && strTarget.IsSameAs(mEffects[i]->GetEffectIdentifier()))
+         return mEffects[i];
+   }
+   return NULL;
+}
+
 EffectArray *EffectManager::GetEffects(int flags /* = ALL_EFFECTS */)
 {
    EffectArray *results = new EffectArray();
diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h
index e50e401..7dbd02b 100644
--- a/src/effects/EffectManager.h
+++ b/src/effects/EffectManager.h
@@ -30,10 +30,10 @@ effects.
 #include "EffectCategory.h"
 #endif
 
-WX_DEFINE_ARRAY(Effect *, EffectArray);
+WX_DEFINE_USER_EXPORTED_ARRAY(Effect *, EffectArray, class AUDACITY_DLL_API);
 
 
-class EffectManager {
+class AUDACITY_DLL_API EffectManager {
    
  public:
    
@@ -63,6 +63,8 @@ class EffectManager {
    /** Return an effect by its numerical ID. */
    Effect *GetEffect(int ID);
    
+   Effect* GetEffectByIdentifier(const wxString strTarget, const int kFlags = ALL_EFFECTS);
+
    /** Return the number of registered effects. */
    int GetNumEffects();
    
diff --git a/src/effects/Leveller.cpp b/src/effects/Leveller.cpp
index 3dd6363..17472c5 100644
--- a/src/effects/Leveller.cpp
+++ b/src/effects/Leveller.cpp
@@ -192,6 +192,8 @@ LevellerDialog::LevellerDialog(EffectLeveller *effect, wxWindow *parent)
 :  EffectDialog(parent, _("Leveller"), PROCESS_EFFECT),
    mEffect(effect)
 {
+   mLevellerNumPasses = 0;
+   mLevellerDbChoiceIndex = 0;
    Init();
 }
 
diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp
index 2cb2c66..34a25c8 100644
--- a/src/effects/LoadEffects.cpp
+++ b/src/effects/LoadEffects.cpp
@@ -21,6 +21,7 @@
 #include "ChangeSpeed.h"
 #include "ClickRemoval.h"
 #include "Compressor.h"
+#include "Contrast.h"
 #include "DtmfGen.h"
 #include "Echo.h"
 #include "Equalization.h"
@@ -36,6 +37,9 @@
 #include "Reverse.h"
 #include "Silence.h"
 #include "StereoToMono.h"
+#ifdef USE_SBSMS 
+#include "TimeScale.h"
+#endif
 #include "ToneGen.h"
 #include "TruncSilence.h"
 #include "Wahwah.h"
@@ -257,9 +261,13 @@ void LoadEffects()
    em.RegisterEffect(new EffectReverse());
    em.RegisterEffect(new EffectStereoToMono(), HIDDEN_EFFECT);// NOT in normal effects list.
    em.RegisterEffect(new EffectTruncSilence(), SIMPLE_EFFECT);
+#ifdef USE_SBSMS 
+   em.RegisterEffect(new EffectTimeScale());
+#endif
    em.RegisterEffect(new EffectWahwah());
 
    // Analyze menu
+   em.RegisterEffect(new EffectContrast(), ANALYZE_EFFECT);
    em.RegisterEffect(new EffectFindClipping(), ANALYZE_EFFECT);
 
 #ifdef USE_NYQUIST
diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp
index 23543ce..2881e01 100644
--- a/src/effects/Noise.cpp
+++ b/src/effects/Noise.cpp
@@ -256,6 +256,7 @@ void NoiseDialog::PopulateOrExchange( ShuttleGui & S )
           * the effect, I want it (nDuration) to be used as the duration, and
           * with "seconds" this does not always work properly. For example,
           * it rounds down to zero... */
+         mNoiseDurationT->SetName(_("Duration"));
          mNoiseDurationT->SetFormatString(mNoiseDurationT->GetBuiltinFormat(nIsSelection==true?(wxT("hh:mm:ss + samples")):(wxT("seconds"))));
          mNoiseDurationT->EnableMenu();
       }
diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp
index d728656..788ee9b 100644
--- a/src/effects/NoiseRemoval.cpp
+++ b/src/effects/NoiseRemoval.cpp
@@ -504,7 +504,9 @@ void EffectNoiseRemoval::FinishTrack()
 {
    // Keep flushing empty input buffers through the history
    // windows until we've output exactly as many samples as
-   // were input
+   // were input.
+   // Well, not exactly, but not more than mWindowSize/2 extra samples at the end.
+   // We'll delete them later in ProcessOne.
 
    float *empty = new float[mWindowSize / 2];
    int i;
@@ -536,7 +538,7 @@ void EffectNoiseRemoval::GetProfile()
          mNoiseThreshold[j] = min;
    }
 
-   mOutSampleCount += mWindowSize / 2;
+   mOutSampleCount += mWindowSize / 2; // what is this for?  Not used when we are getting the profile?
 }
 
 void EffectNoiseRemoval::RemoveNoise()
@@ -605,7 +607,7 @@ void EffectNoiseRemoval::RemoveNoise()
 
    // Output the first half of the overlap buffer, they're done -
    // and then shift the next half over.
-   if (mOutSampleCount >= 0) {
+   if (mOutSampleCount >= 0) {   // ...but not if it's the first half-window
       mOutputTrack->Append((samplePtr)mOutOverlapBuffer, floatSample,
                            mWindowSize / 2);
    }
@@ -667,8 +669,10 @@ bool EffectNoiseRemoval::ProcessOne(int count, WaveTrack * track,
       // Take the output track and insert it in place of the original
       // sample data
       if (bLoopSuccess) {
-         track->Clear(mT0, mT1);
-         track->Paste(mT0, mOutputTrack);
+		   track->HandleClear(mT0, mT1, false, false);
+         // Filtering effects always end up with more data than they started with.  Delete this 'tail'.
+         mOutputTrack->HandleClear(mT1 - mT0, mOutputTrack->GetEndTime(), false, false);
+         track->HandlePaste(mT0, mOutputTrack);
       }
 
       // Delete the outputTrack now that its data is inserted in place
@@ -843,6 +847,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
                                                 0);
          S.SetStyle(wxSL_HORIZONTAL);
          mGainS = S.Id(ID_GAIN_SLIDER).AddSlider(wxT(""), 0, GAIN_MAX);
+         mGainS->SetName(_("Noise reduction"));
          mGainS->SetRange(GAIN_MIN, GAIN_MAX);
          mGainS->SetSizeHints(150, -1);
 
@@ -851,6 +856,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
                                                 0);
          S.SetStyle(wxSL_HORIZONTAL);
          mFreqS = S.Id(ID_FREQ_SLIDER).AddSlider(wxT(""), 0, FREQ_MAX);
+         mFreqS->SetName(_("Frequency smoothing"));
          mFreqS->SetRange(FREQ_MIN, FREQ_MAX);
          mFreqS->SetSizeHints(150, -1);
 
@@ -859,6 +865,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
                                                 0);
          S.SetStyle(wxSL_HORIZONTAL);
          mTimeS = S.Id(ID_TIME_SLIDER).AddSlider(wxT(""), 0, TIME_MAX);
+         mTimeS->SetName(_("Attach/decay time"));
          mTimeS->SetRange(TIME_MIN, TIME_MAX);
          mTimeS->SetSizeHints(150, -1);
       }
diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp
index 90a3170..d8434d5 100644
--- a/src/effects/Normalize.cpp
+++ b/src/effects/Normalize.cpp
@@ -41,8 +41,8 @@
 #include <wx/stattext.h>
 #include <wx/textdlg.h>
 
-#define NORMALIZE_DB_MIN -240
-#define NORMALIZE_DB_MAX 240
+#define NORMALIZE_DB_MIN -145
+#define NORMALIZE_DB_MAX 60
 
 EffectNormalize::EffectNormalize()
 {
@@ -282,9 +282,9 @@ void EffectNormalize::StartProcessing()
    mMult = 1.0;
    mOffset = 0.0;
    
-   float ratio = pow(10.0,TrapDouble(-mLevel*10,
+   float ratio = pow(10.0,TrapDouble(-mLevel,
                                      NORMALIZE_DB_MIN,
-                                     NORMALIZE_DB_MAX)/200.0);
+                                     NORMALIZE_DB_MAX)/20.0);
 
    if (mDC) {
       mOffset = (float)(-mSum / mCount);
@@ -346,28 +346,31 @@ void NormalizeDialog::PopulateOrExchange(ShuttleGui & S)
 
    S.StartTwoColumn();
    {
-      mDCCheckBox = S.AddCheckBox(wxT(""),
+      S.StartVerticalLay(false);
+      {
+      mDCCheckBox = S.AddCheckBox(_("Remove any DC offset (center on 0.0 vertically)"),
                                   mDC ? wxT("true") : wxT("false"));
-      mDCCheckBox->SetName(_("Remove any DC offset (center on 0.0 vertically)"));
-      S.AddUnits(_("Remove any DC offset (center on 0.0 vertically)"));
 
-      mGainCheckBox = S.Id(ID_NORMALIZE_AMPLITUDE).AddCheckBox(wxT(""),
+      mGainCheckBox = S.Id(ID_NORMALIZE_AMPLITUDE).AddCheckBox(_("Normalize maximum amplitude to:"),
                                     mGain ? wxT("true") : wxT("false"));
-      mGainCheckBox->SetName(_("Normalize maximum amplitude to"));
-      S.AddUnits(_("Normalize maximum amplitude to:"));
 
-      S.AddPrompt(wxT(" "));
-      S.StartHorizontalLay(wxCENTER, false);
+      S.StartHorizontalLay(wxALIGN_LEFT, false);
       {
+         wxCheckBox *c = S.AddCheckBox(wxT(""), wxT("false"));
+         S.AddSpace(c->GetSize().GetWidth() + (S.GetBorder() * 2));
+         c->Hide();
          mLevelMinux = S.AddVariableText(_("-"), false,
                                          wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT);
          mLevelTextCtrl = S.AddTextBox(wxT(""),
                                        Internat::ToString(mLevel, 1),
                                        10);
+         mLevelTextCtrl->SetName(_("Maximum amplitude dB"));
          mLeveldB = S.AddVariableText(_("dB"), false,
                                       wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
       }
       S.EndHorizontalLay();
+      }
+      S.EndVerticalLay();
    }
    S.EndTwoColumn();
 }
diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp
index 9a6f11b..4d5e84a 100644
--- a/src/effects/Repeat.cpp
+++ b/src/effects/Repeat.cpp
@@ -155,8 +155,8 @@ bool EffectRepeat::Process()
 
    if (bGoodResult)
    {
-      // Change selection to just the generated bits.
-      mT0 = mT1;
+      // Select the new bits + original bit
+//      mT0 = mT1;
 	   mT1 = maxDestLen;
    }
 
@@ -171,8 +171,7 @@ bool EffectRepeat::Process()
 const static wxChar *numbers[] =
 {
    wxT("0"), wxT("1"), wxT("2"), wxT("3"), wxT("4"),
-   wxT("5"), wxT("6"), wxT("7"), wxT("8"), wxT("9"),
-   wxT("-"), wxT("+")
+   wxT("5"), wxT("6"), wxT("7"), wxT("8"), wxT("9")
 };
 
 #define ID_REPEAT_TEXT 7000
diff --git a/src/effects/SBSMSEffect.cpp b/src/effects/SBSMSEffect.cpp
new file mode 100644
index 0000000..b58f4fd
--- /dev/null
+++ b/src/effects/SBSMSEffect.cpp
@@ -0,0 +1,346 @@
+/**********************************************************************
+
+Audacity: A Digital Audio Editor
+
+SBSMSEffect.cpp
+
+Clayton Otey
+
+This abstract class contains all of the common code for an
+effect that uses SBSMS to do its processing (TimeScale)
+
+**********************************************************************/
+
+#include "../Audacity.h"
+
+#if USE_SBSMS
+
+#include <math.h>
+
+#include "SBSMSEffect.h"
+#include "../WaveTrack.h"
+#include "../Project.h"
+
+struct resampleBuf {
+   audio *buf;
+   double ratio;
+   sampleCount block;
+   sampleCount offset;
+   sampleCount end;
+   float *leftBuffer;
+   float *rightBuffer;
+   WaveTrack *leftTrack;
+   WaveTrack *rightTrack;
+};
+
+long samplesCB(audio *chdata, long numFrames, void *userData)
+{ 
+   sbsmsInfo *si = (sbsmsInfo*) userData;
+   long n_read = si->rs->read(chdata, numFrames);
+   return n_read;
+}
+
+real stretchCB(long nProcessed, void *userData)
+{
+   sbsmsInfo *si = (sbsmsInfo*) userData;
+   real t0 = (real)nProcessed/(real)si->samplesToProcess;
+   real stretch = si->stretch0 + (si->stretch1-si->stretch0)*t0;
+   return stretch;
+}
+
+real ratioCB(long nProcessed, void *userData)
+{
+   sbsmsInfo *si = (sbsmsInfo*) userData;
+   real t0 = (real)nProcessed/(real)si->samplesToProcess;
+   real stretch = si->stretch0 + (si->stretch1-si->stretch0)*t0;
+   real t1;
+   if(stretch == si->stretch0)
+      t1 = 1.0/stretch;
+   else
+      t1 = log(stretch/si->stretch0)/(stretch-si->stretch0);
+   
+   real ratio = si->ratio0 + (si->ratio1-si->ratio0)*t1*(real)nProcessed/(real)si->samplesToGenerate;
+   
+   return ratio;
+}
+
+void EffectSBSMS :: setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd, int quality, bool bPreAnalyze)
+{
+   this->rateStart = rateStart;
+   this->rateEnd = rateEnd;
+   this->pitchStart = pitchStart;
+   this->pitchEnd = pitchEnd;
+   this->quality = quality;
+   this->bPreAnalyze = bPreAnalyze;
+}
+
+bool EffectSBSMS :: bInit = FALSE;
+
+long resampleCB(void *cb_data, sbsms_resample_frame *data) 
+{
+   resampleBuf *r = (resampleBuf*) cb_data;
+   
+   long blockSize = r->leftTrack->GetBestBlockSize(r->offset);
+   
+   //Adjust the block size if it is the final block in the track
+   if (r->offset + blockSize > r->end)
+      blockSize = r->end - r->offset;
+   
+   // Get the samples from the tracks and put them in the buffers.
+   r->leftTrack->Get((samplePtr)(r->leftBuffer), floatSample, r->offset, blockSize);
+   r->rightTrack->Get((samplePtr)(r->rightBuffer), floatSample, r->offset, blockSize);
+   
+   // convert to sbsms audio format
+   for(int i=0; i<blockSize; i++) {
+      r->buf[i][0] = r->leftBuffer[i];
+      r->buf[i][1] = r->rightBuffer[i];
+   }
+   
+   r->offset += blockSize;
+   data->in = r->buf;
+   data->size = blockSize;
+   data->ratio0 = r->ratio;
+   data->ratio1 = r->ratio;
+   
+   return blockSize;
+}
+
+bool EffectSBSMS::Process()
+{
+   if(!bInit) {
+      sbsms_init(4096);
+      bInit = TRUE;
+   }
+   
+   bool bGoodResult = true;
+   
+   //Iterate over each track
+   this->CopyInputWaveTracks(); // Set up mOutputWaveTracks.
+   TrackListIterator iter(mOutputWaveTracks);
+   WaveTrack* leftTrack = (WaveTrack*)(iter.First());
+   mCurTrackNum = 0;
+
+   double len = leftTrack->GetEndTime() - leftTrack->GetStartTime();   
+   double maxDuration = 0.0;
+   
+   while (leftTrack != NULL) {
+      //Get start and end times from track
+      mCurT0 = leftTrack->GetStartTime();
+      mCurT1 = leftTrack->GetEndTime();
+      
+      //Set the current bounds to whichever left marker is
+      //greater and whichever right marker is less
+      mCurT0 = wxMax(mT0, mCurT0);
+      mCurT1 = wxMin(mT1, mCurT1);
+      
+      // Process only if the right marker is to the right of the left marker
+      if (mCurT1 > mCurT0) {
+         sampleCount start;
+         sampleCount end;
+         start = leftTrack->TimeToLongSamples(mCurT0);
+         end = leftTrack->TimeToLongSamples(mCurT1);
+         
+         WaveTrack* rightTrack = NULL;
+         if (leftTrack->GetLinked()) {
+            double t;
+            rightTrack = (WaveTrack*)(iter.Next());
+            
+            //Adjust bounds by the right tracks markers
+            t = rightTrack->GetStartTime();
+            t = wxMax(mT0, t);
+            mCurT0 = wxMin(mCurT0, t);
+            t = rightTrack->GetEndTime();
+            t = wxMin(mT1, t);
+            mCurT1 = wxMax(mCurT1, t);
+            
+            //Transform the marker timepoints to samples
+            start = leftTrack->TimeToLongSamples(mCurT0);
+            end = leftTrack->TimeToLongSamples(mCurT1);
+            
+            mCurTrackNum++; // Increment for rightTrack, too.	
+         }
+         
+         sampleCount trackEnd = leftTrack->TimeToLongSamples(leftTrack->GetEndTime());
+
+         // SBSMS has a fixed sample rate - we just convert to its sample rate and then convert back
+         float srIn = leftTrack->GetRate();
+         float srSBSMS = 44100.0;
+         
+         // the resampler needs a callback to supply its samples
+         resampleBuf rb;
+         sampleCount maxBlockSize = leftTrack->GetMaxBlockSize();
+         rb.block = maxBlockSize;
+         rb.buf = (audio*)calloc(rb.block,sizeof(audio));
+         rb.leftTrack = leftTrack;
+         rb.rightTrack = rightTrack?rightTrack:leftTrack;
+         rb.leftBuffer = (float*)calloc(maxBlockSize,sizeof(float));
+         rb.rightBuffer = (float*)calloc(maxBlockSize,sizeof(float));
+         rb.offset = start;
+         rb.end = trackEnd;
+         rb.ratio = srSBSMS/srIn;
+         Resampler *resampler = new Resampler(resampleCB, &rb);
+         
+         // Samples in selection
+         sampleCount samplesIn = end-start;
+         
+         // Samples for SBSMS to process after resampling
+         sampleCount samplesToProcess = (sampleCount) ((real)samplesIn*(srSBSMS/srIn));
+         
+         // Samples in output after resampling back
+         real stretch2;
+         if(rateStart == rateEnd)
+            stretch2 = 1.0/rateStart;
+         else
+            stretch2 = 1.0/(rateEnd-rateStart)*log(rateEnd/rateStart);
+         sampleCount samplesToGenerate = (sampleCount) ((real)samplesToProcess * stretch2);
+         sampleCount samplesOut = (sampleCount) ((real)samplesIn * stretch2);
+         double duration =  (mCurT1-mCurT0) * stretch2;
+         if(duration > maxDuration)
+            maxDuration = duration;
+         
+         sbsmsInfo si;
+         si.rs = resampler;
+         si.samplesToProcess = samplesToProcess;
+         si.samplesToGenerate = samplesToGenerate;
+         si.stretch0 = rateStart;
+         si.stretch1 = rateEnd;
+         si.ratio0 = pitchStart;
+         si.ratio1 = pitchEnd;
+         
+         sbsms *sbsmser = sbsms_create(&samplesCB,&stretchCB,&ratioCB,rightTrack?2:1,quality,bPreAnalyze,true);
+         pitcher *pitch = pitch_create(sbsmser,&si,srIn/srSBSMS);
+         
+         WaveTrack* outputLeftTrack = mFactory->NewWaveTrack(leftTrack->GetSampleFormat(),
+                                                             leftTrack->GetRate());
+         WaveTrack* outputRightTrack = rightTrack?mFactory->NewWaveTrack(rightTrack->GetSampleFormat(),
+                                                                         rightTrack->GetRate()):NULL;
+         
+         
+         sampleCount blockSize = SBSMS_FRAME_SIZE[quality];
+         audio *outBuf = (audio*)calloc(blockSize,sizeof(audio));
+         float *outputLeftBuffer = (float*)calloc(blockSize*2,sizeof(float));
+         float *outputRightBuffer = rightTrack?(float*)calloc(blockSize*2,sizeof(float)):NULL;
+         
+         long pos = 0;
+         long outputCount = -1;
+         
+         // pre analysis
+         real fracPre = 0.0f;
+         if(bPreAnalyze) {
+            fracPre = 0.05f;
+            Resampler *resamplerPre;
+            resampleBuf rbPre;
+            rbPre.block = maxBlockSize;
+            rbPre.buf = (audio*)calloc(rb.block,sizeof(audio));
+            rbPre.leftTrack = leftTrack;
+            rbPre.rightTrack = rightTrack?rightTrack:leftTrack;
+            rbPre.leftBuffer = (float*)calloc(maxBlockSize,sizeof(float));
+            rbPre.rightBuffer = (float*)calloc(maxBlockSize,sizeof(float));
+            rbPre.offset = start;
+            rbPre.end = end;
+            rbPre.ratio = srSBSMS/srIn;
+            resamplerPre = new Resampler(resampleCB, &rbPre);
+            si.rs = resamplerPre;
+            
+            long pos = 0;
+            long lastPos = 0;
+            long ret = 0;
+            while(lastPos<samplesToProcess) {
+               ret = sbsms_pre_analyze(&samplesCB,&si,sbsmser);
+               lastPos = pos;
+               pos += ret;
+               real completion = (real)lastPos/(real)samplesToProcess;
+               if (TrackProgress(0,fracPre*completion))
+                  return false;
+            }
+            sbsms_pre_analyze_complete(sbsmser);
+            free(rbPre.buf);
+            free(rbPre.leftBuffer);
+            free(rbPre.rightBuffer);
+            sbsms_reset(sbsmser);
+            si.rs = resampler;
+         }
+         
+         // process
+         while(pos<samplesOut && outputCount) {
+            long frames;
+            if(pos+blockSize>samplesOut) {
+               frames = samplesOut - pos;
+            } else {
+               frames = blockSize;
+            }
+            
+            outputCount = pitch_process(outBuf, frames, pitch);
+            for(int i = 0; i < outputCount; i++) {
+               outputLeftBuffer[i] = outBuf[i][0];
+               if(rightTrack) outputRightBuffer[i] = outBuf[i][1];
+            }
+            pos += outputCount;
+            outputLeftTrack->Append((samplePtr)outputLeftBuffer, floatSample, outputCount);
+            if(rightTrack) outputRightTrack->Append((samplePtr)outputRightBuffer, floatSample, outputCount);
+            
+            double frac = (double)pos/(double)samplesOut;
+            int nWhichTrack = mCurTrackNum;
+            if(rightTrack) {
+               nWhichTrack = 2*(mCurTrackNum/2);
+               if (frac < 0.5)
+                  frac *= 2.0; // Show twice as far for each track, because we're doing 2 at once. 
+               else {
+                  nWhichTrack++;
+                  frac -= 0.5;
+                  frac *= 2.0; // Show twice as far for each track, because we're doing 2 at once. 
+               }
+            }
+            if (TrackProgress(nWhichTrack, fracPre + (1.0-fracPre)*frac))
+               return false;
+         }
+         outputLeftTrack->Flush();
+         if(rightTrack) outputRightTrack->Flush();
+         
+         leftTrack->HandleClear(mCurT0, mCurT1, false, false);
+         leftTrack->HandlePaste(mCurT0, outputLeftTrack);
+         if(rightTrack) {
+            rightTrack->HandleClear(mCurT0, mCurT1, false, false);
+            rightTrack->HandlePaste(mCurT0, outputRightTrack);
+         }
+         
+         delete outputLeftTrack;
+         if(rightTrack) delete outputRightTrack;
+         free(outputLeftBuffer);
+         if(rightTrack) free(outputRightBuffer);
+         free(outBuf);
+         free(rb.leftBuffer);
+         free(rb.rightBuffer);
+         free(rb.buf);
+         delete resampler;
+         sbsms_destroy(sbsmser);
+         pitch_destroy(pitch);
+      }
+      
+      //Iterate to the next track
+      leftTrack = (WaveTrack*)(iter.Next());
+      mCurTrackNum++;
+   }
+   
+   this->ReplaceProcessedWaveTracks(bGoodResult); 
+   
+#ifdef EXPERIMENTAL_FULL_LINKING
+   AudacityProject *p = (AudacityProject*)mParent;
+   if( p && p->IsSticky() ){
+      leftTrack = (WaveTrack*)(iter.First());
+      double newLen = leftTrack->GetEndTime() - leftTrack->GetStartTime();
+      double timeAdded = newLen-len;
+      double sel = mCurT1-mCurT0;
+      double percent = (sel/(timeAdded+sel))*100 - 100;
+      if ( !(HandleGroupChangeSpeed(percent, mCurT0, mCurT1)) ) bGoodResult = false;
+   }
+#endif
+
+   // Update selection
+   mT0 = mCurT0;
+   mT1 = mCurT0 + maxDuration;
+   
+   return bGoodResult;
+}
+
+#endif
diff --git a/src/effects/SBSMSEffect.h b/src/effects/SBSMSEffect.h
new file mode 100644
index 0000000..6327f81
--- /dev/null
+++ b/src/effects/SBSMSEffect.h
@@ -0,0 +1,49 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  SBSMSEffect.h
+
+  ClaytonOtey
+
+  This abstract class contains all of the common code for an
+  effect that uses SBSMS to do its processing (TimeScale)
+
+**********************************************************************/
+
+#if USE_SBSMS
+
+#ifndef __AUDACITY_EFFECT_SBSMS__
+#define __AUDACITY_EFFECT_SBSMS__
+
+#include "Effect.h"
+
+// Soundtouch defines these as well, so get rid of them before including 
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+
+#include "sbsms.h"
+
+class WaveTrack;
+
+class EffectSBSMS : public Effect {
+ public:
+   static bool bInit;
+   virtual bool Process();
+   void setParameters(double rateStart, double rateEnd, double pitchStart, double pitchEnd, int quality, bool bPreAnalyze);
+
+ private:
+   double rateStart, rateEnd, pitchStart, pitchEnd;
+   int quality;
+   bool bPreAnalyze;
+   int mCurTrackNum;
+   double mCurT0;
+   double mCurT1;   
+};
+
+#endif
+
+#endif
diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp
new file mode 100644
index 0000000..ac62250
--- /dev/null
+++ b/src/effects/TimeScale.cpp
@@ -0,0 +1,463 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  TimeScale.cpp
+
+  Clayton Otey
+
+*******************************************************************//**
+                                                                       
+\class EffectTimeScale
+\brief An EffectTimeScale does high quality sliding time scaling/pitch shifting
+
+*//****************************************************************//**
+
+\class TimeScaleDialog
+\brief Dialog used with EffectTimeScale
+
+*//*******************************************************************/
+
+#include "../Audacity.h" // for USE_SBSMS
+
+#if USE_SBSMS
+
+#include "TimeScale.h"
+
+#include "../ShuttleGui.h"
+
+#include <math.h>
+
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/checkbox.h>
+#include <wx/valtext.h>
+
+//
+// EffectTimeScale
+//
+
+EffectTimeScale::EffectTimeScale()
+{
+   m_RateStart = 0;
+   m_RateEnd = 0;
+   m_HalfStepsStart = 0;
+   m_HalfStepsEnd = 0;
+   m_PreAnalyze = false;
+}
+
+wxString EffectTimeScale::GetEffectDescription() { 
+   // Note: This is useful only after change amount has been set. 
+   return wxString::Format(_("Applied effect: %s"), this->GetEffectName().c_str()); 
+} 
+
+bool EffectTimeScale::Init()
+{
+   return true;
+}
+
+bool EffectTimeScale::PromptUser()
+{
+   TimeScaleDialog dlog(this, mParent);
+   dlog.m_RateStart = m_RateStart;
+   dlog.m_RateEnd = m_RateEnd;
+   dlog.m_HalfStepsStart = m_HalfStepsStart;
+   dlog.m_HalfStepsEnd = m_HalfStepsEnd;
+   dlog.m_PreAnalyze = m_PreAnalyze;
+
+   // Don't need to call TransferDataToWindow, although other 
+   // Audacity dialogs (from which I derived this one) do it, because 
+   // ShowModal calls stuff that eventually calls wxWindowBase::OnInitDialog, 
+   // which calls dlog.TransferDataToWindow();
+   dlog.CentreOnParent();
+   dlog.ShowModal();
+
+   if (dlog.GetReturnCode() == wxID_CANCEL)
+      return false;
+   
+   m_RateStart = dlog.m_RateStart;
+   m_RateEnd = dlog.m_RateEnd;
+   m_HalfStepsStart = dlog.m_HalfStepsStart;
+   m_HalfStepsEnd = dlog.m_HalfStepsEnd;
+   m_PreAnalyze = dlog.m_PreAnalyze;
+   
+   return true;
+}
+
+bool EffectTimeScale::TransferParameters( Shuttle & shuttle )
+{
+   shuttle.TransferDouble(wxT("RateStart"),m_RateStart,0.0);
+   shuttle.TransferDouble(wxT("RateEnd"),m_RateEnd,0.0);
+   shuttle.TransferDouble(wxT("HalfStepsStart"),m_HalfStepsStart,0.0);
+   shuttle.TransferDouble(wxT("HalfStepsEnd"),m_HalfStepsEnd,0.0);
+   shuttle.TransferBool(wxT("PreAnalyze"),m_PreAnalyze,false);
+   return true;
+}
+
+bool EffectTimeScale::Process()
+{
+   double pitchStart = pow(2.0,-(m_HalfStepsStart)/12.0);
+   double pitchEnd = pow(2.0,-(m_HalfStepsEnd)/12.0);
+   double rateStart = (100.0+m_RateStart)/100.0;
+   double rateEnd = (100.0+m_RateEnd)/100.0;
+   int quality = 1;
+   this->EffectSBSMS::setParameters(rateStart,rateEnd,pitchStart,pitchEnd,quality,m_PreAnalyze);
+   return this->EffectSBSMS::Process();
+}
+
+//----------------------------------------------------------------------------
+// TimeScaleDialog
+//----------------------------------------------------------------------------
+
+#define RATE_MAX 150
+#define RATE_DEFAULT 0
+#define RATE_MIN -75
+#define HALFSTEPS_MIN -12
+#define HALFSTEPS_MAX 12
+
+#define ID_TEXT_RATE_START 10001
+#define ID_TEXT_RATE_END 10002
+#define ID_TEXT_HALFSTEPS_START 10003
+#define ID_TEXT_HALFSTEPS_END 10004
+#define ID_SLIDER_RATE_START 10007
+#define ID_SLIDER_RATE_END 10008
+#define ID_CHECKBOX_PREANALYZE 10009
+
+// event table for TimeScaleDialog
+
+BEGIN_EVENT_TABLE(TimeScaleDialog, EffectDialog)
+   EVT_TEXT(ID_TEXT_RATE_START, TimeScaleDialog::OnText_RateStart)
+   EVT_TEXT(ID_TEXT_RATE_END, TimeScaleDialog::OnText_RateEnd)
+   EVT_TEXT(ID_TEXT_HALFSTEPS_START, TimeScaleDialog::OnText_HalfStepsStart)
+   EVT_TEXT(ID_TEXT_HALFSTEPS_END, TimeScaleDialog::OnText_HalfStepsEnd)
+   EVT_SLIDER(ID_SLIDER_RATE_START, TimeScaleDialog::OnSlider_RateStart)
+   EVT_SLIDER(ID_SLIDER_RATE_END, TimeScaleDialog::OnSlider_RateEnd)
+   EVT_CHECKBOX(ID_CHECKBOX_PREANALYZE, TimeScaleDialog::OnCheckBox_PreAnalyze)
+END_EVENT_TABLE()
+
+TimeScaleDialog::TimeScaleDialog(EffectTimeScale *effect, wxWindow *parent)
+   :  EffectDialog(parent, _("Time Scale"), INSERT_EFFECT),
+      mEffect(effect)
+{
+   m_bLoopDetect = false;
+   
+   // NULL out these control members because there are some cases where the 
+   // event table handlers get called during this method, and those handlers that 
+   // can cause trouble check for NULL.
+   
+   m_pTextCtrl_RateStart = NULL;
+   m_pTextCtrl_RateEnd = NULL;
+   m_pSlider_RateStart = NULL;
+   m_pSlider_RateEnd = NULL; 
+   m_pTextCtrl_HalfStepsStart = NULL;
+   m_pTextCtrl_HalfStepsEnd = NULL;
+   m_pCheckBox_PreAnalyze = NULL;
+
+   // effect parameters
+   m_RateStart = 0;
+   m_RateEnd = 0;
+   m_HalfStepsStart = 0;
+   m_HalfStepsEnd = 0;
+   m_PreAnalyze = false;
+
+   Init();
+}
+
+void TimeScaleDialog::PopulateOrExchange(ShuttleGui & S)
+{
+
+   wxTextValidator nullvld(wxFILTER_INCLUDE_CHAR_LIST);
+   wxTextValidator numvld(wxFILTER_NUMERIC);
+
+   S.SetBorder(10);
+   S.StartHorizontalLay(wxCENTER, false);
+   {
+      S.AddTitle(_("Sliding Time Scale/Pitch Shift") +
+                 wxString(wxT("\n")) + 
+                 _("using SBSMS, by Clayton Otey"));
+   }
+   S.EndHorizontalLay();
+   S.SetBorder(5);
+   
+   // Rate Text
+   S.StartMultiColumn(2, wxCENTER);
+   {
+      m_pTextCtrl_RateStart = S.Id(ID_TEXT_RATE_START)
+         .AddTextBox(_("Initial Tempo Change (%):"), wxT(""), 12);
+      m_pTextCtrl_RateStart->SetValidator(numvld);
+      
+      m_pTextCtrl_RateEnd = S.Id(ID_TEXT_RATE_END)
+         .AddTextBox(_("Final Tempo Change (%):"), wxT(""), 12);
+      m_pTextCtrl_RateEnd->SetValidator(numvld);
+   }
+   S.EndMultiColumn();
+   
+   // Rate Slider
+   S.StartHorizontalLay(wxEXPAND);
+   {
+      S.SetStyle(wxSL_HORIZONTAL);
+      m_pSlider_RateStart = S.Id(ID_SLIDER_RATE_START)
+         .AddSlider(wxT(""), (int)RATE_DEFAULT, (int)RATE_MAX, (int)RATE_MIN);
+      m_pSlider_RateStart->SetName(_("Initial Tempo Change (%)"));
+   }
+   S.EndHorizontalLay();
+   
+   S.StartHorizontalLay(wxEXPAND);
+   {
+      S.SetStyle(wxSL_HORIZONTAL);
+      m_pSlider_RateEnd = S.Id(ID_SLIDER_RATE_END)
+         .AddSlider(wxT(""), (int)RATE_DEFAULT, (int)RATE_MAX, (int)RATE_MIN);
+      m_pSlider_RateEnd->SetName(_("Final Tempo Change (%)"));
+   }
+   S.EndHorizontalLay();
+   
+   // HalfStep Text
+   S.StartMultiColumn(2, wxCENTER);
+   {
+      m_pTextCtrl_HalfStepsStart = S.Id(ID_TEXT_HALFSTEPS_START)
+         .AddTextBox(_("Initial Pitch Shift (semitones) [-12 to 12]:"), wxT(""), 12);
+      m_pTextCtrl_HalfStepsStart->SetValidator(numvld);
+
+      m_pTextCtrl_HalfStepsEnd = S.Id(ID_TEXT_HALFSTEPS_END)
+         .AddTextBox(_("Final Pitch Shift (semitones) [-12 to 12]:"), wxT(""), 12);
+      m_pTextCtrl_HalfStepsEnd->SetValidator(numvld);
+   }
+   S.EndMultiColumn();
+      
+   S.StartHorizontalLay(wxEXPAND);
+   {
+      S.SetStyle(wxSL_HORIZONTAL);
+      m_pCheckBox_PreAnalyze = S.Id(ID_CHECKBOX_PREANALYZE)
+         .AddCheckBox(wxT("Dynamic Transient Sharpening"), wxT("Dynamic Transient Sharpening"));
+   }
+   S.EndHorizontalLay();
+   
+   return;
+}
+
+bool TimeScaleDialog::TransferDataToWindow()
+{
+   m_bLoopDetect = true;
+
+   this->Update_Text_RateStart();
+   this->Update_Slider_RateStart();
+   this->Update_Text_RateEnd();
+   this->Update_Slider_RateEnd();
+   this->Update_Text_HalfStepsStart();
+   this->Update_Text_HalfStepsEnd();
+   this->Update_CheckBox_PreAnalyze();
+
+   m_bLoopDetect = false;
+   
+   return true;
+}
+
+bool TimeScaleDialog::TransferDataFromWindow()
+{
+   wxString str;
+
+   if (m_pTextCtrl_RateStart) {
+      str = m_pTextCtrl_RateStart->GetValue();
+      double newValue = 0;
+      str.ToDouble(&newValue);
+      m_RateStart = newValue;
+   }
+
+   if (m_pTextCtrl_RateEnd) {
+      str = m_pTextCtrl_RateEnd->GetValue();
+      double newValue = 0;
+      str.ToDouble(&newValue);
+      m_RateEnd = newValue;
+   }
+
+   if (m_pTextCtrl_HalfStepsStart) {
+      str = m_pTextCtrl_HalfStepsStart->GetValue();
+      double newValue = 0;
+      str.ToDouble(&newValue);
+      m_HalfStepsStart = newValue;
+   }
+
+   if (m_pTextCtrl_HalfStepsEnd) {
+      str = m_pTextCtrl_HalfStepsEnd->GetValue();
+      double newValue = 0;
+      str.ToDouble(&newValue);
+      m_HalfStepsEnd = newValue;
+   }
+
+   if(m_pCheckBox_PreAnalyze) {
+      m_PreAnalyze = m_pCheckBox_PreAnalyze->GetValue();
+   }
+
+   return true;
+}
+
+bool TimeScaleDialog::CheckParameters()
+{
+   return 
+      (m_RateStart >= -90.0 && m_RateStart <= 500.0) 
+      &&
+      (m_RateEnd >= -90.0 && m_RateEnd <= 500.0) 
+      &&
+      (m_HalfStepsStart >= -12 && m_HalfStepsStart <=12)
+      &&
+      (m_HalfStepsEnd >= -12 && m_HalfStepsEnd <=12);
+}
+
+// handler implementations for TimeScaleDialog
+
+void TimeScaleDialog::OnText_RateStart(wxCommandEvent & event)
+{
+   if (m_bLoopDetect)
+      return;
+
+   if (m_pTextCtrl_RateStart) {
+      wxString str = m_pTextCtrl_RateStart->GetValue();
+      double newValue = 0;
+      str.ToDouble(&newValue);
+      m_RateStart = newValue;
+
+      m_bLoopDetect = true;
+      this->Update_Slider_RateStart();
+      m_bLoopDetect = false;
+
+      FindWindow(wxID_OK)->Enable(CheckParameters());
+   }
+}
+
+void TimeScaleDialog::OnText_RateEnd(wxCommandEvent & event)
+{
+   if (m_bLoopDetect)
+      return;
+
+   if (m_pTextCtrl_RateEnd) {
+      wxString str = m_pTextCtrl_RateEnd->GetValue();
+      double newValue = 0;
+      str.ToDouble(&newValue);
+      m_RateEnd = newValue;
+
+      m_bLoopDetect = true;
+      this->Update_Slider_RateEnd();
+      m_bLoopDetect = false;
+      
+      FindWindow(wxID_OK)->Enable(CheckParameters());
+   }
+}
+
+void TimeScaleDialog::OnSlider_RateStart(wxCommandEvent & event)
+{
+   if (m_bLoopDetect)
+      return;
+
+   if (m_pSlider_RateStart) {
+      m_RateStart = (double)(m_pSlider_RateStart->GetValue()); 
+      
+      m_bLoopDetect = true;
+      this->Update_Text_RateStart();
+      m_bLoopDetect = false;
+   }
+}
+
+void TimeScaleDialog::OnSlider_RateEnd(wxCommandEvent & event)
+{
+   if (m_bLoopDetect)
+      return;
+
+   if (m_pSlider_RateEnd) {
+      m_RateEnd = (double)(m_pSlider_RateEnd->GetValue()); 
+      
+      m_bLoopDetect = true;
+      this->Update_Text_RateEnd();
+      m_bLoopDetect = false;
+   }
+}
+
+void TimeScaleDialog::OnText_HalfStepsStart(wxCommandEvent & event)
+{
+  if (m_pTextCtrl_HalfStepsStart) {
+    wxString str = m_pTextCtrl_HalfStepsStart->GetValue();
+    double newValue = 0;
+    str.ToDouble(&newValue);
+    m_HalfStepsStart = newValue;
+
+    FindWindow(wxID_OK)->Enable(CheckParameters());
+  }
+}
+
+void TimeScaleDialog::OnText_HalfStepsEnd(wxCommandEvent & event)
+{
+  if (m_pTextCtrl_HalfStepsEnd) {
+    wxString str = m_pTextCtrl_HalfStepsEnd->GetValue();
+    double newValue = 0;
+    str.ToDouble(&newValue);
+    m_HalfStepsEnd = newValue;
+    
+    FindWindow(wxID_OK)->Enable(CheckParameters());
+  }
+}
+
+void TimeScaleDialog::OnCheckBox_PreAnalyze(wxCommandEvent & event)
+{
+   if (m_pCheckBox_PreAnalyze) {
+      m_PreAnalyze = m_pCheckBox_PreAnalyze->GetValue();
+   }
+}
+
+void TimeScaleDialog::Update_Text_RateStart()
+{
+   if (m_pTextCtrl_RateStart) {
+      wxString str;
+      str.Printf(wxT("%.3f"), m_RateStart);
+      m_pTextCtrl_RateStart->SetValue(str);
+   }
+}
+
+void TimeScaleDialog::Update_Text_RateEnd()
+{
+   if (m_pTextCtrl_RateEnd) {
+      wxString str;
+      str.Printf(wxT("%.3f"), m_RateEnd);
+      m_pTextCtrl_RateEnd->SetValue(str);
+   }
+}
+
+void TimeScaleDialog::Update_Slider_RateStart()
+{
+   if (m_pSlider_RateStart) {
+      m_pSlider_RateStart->SetValue((int)(m_RateStart + 0.5)); 
+   }
+}
+
+void TimeScaleDialog::Update_Slider_RateEnd()
+{
+   if (m_pSlider_RateEnd) {
+      m_pSlider_RateEnd->SetValue((int)(m_RateEnd + 0.5)); 
+   }
+}
+
+void TimeScaleDialog::Update_Text_HalfStepsStart()
+{
+   if (m_pTextCtrl_HalfStepsStart) {
+      wxString str;
+      str.Printf(wxT("%.3f"), m_HalfStepsStart);
+      m_pTextCtrl_HalfStepsStart->SetValue(str);
+   }
+}
+
+void TimeScaleDialog::Update_Text_HalfStepsEnd()
+{
+   if (m_pTextCtrl_HalfStepsEnd) {
+      wxString str;
+      str.Printf(wxT("%.3f"), m_HalfStepsEnd);
+      m_pTextCtrl_HalfStepsEnd->SetValue(str);
+   }
+}
+
+void TimeScaleDialog::Update_CheckBox_PreAnalyze()
+{
+   if (m_pCheckBox_PreAnalyze) {
+      m_pCheckBox_PreAnalyze->SetValue(m_PreAnalyze);
+   }
+}
+
+#endif
diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h
new file mode 100644
index 0000000..960192f
--- /dev/null
+++ b/src/effects/TimeScale.h
@@ -0,0 +1,128 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  TimeScale.h
+
+  Clayton Otey
+
+**********************************************************************/
+
+#include "../Audacity.h"
+
+#if USE_SBSMS
+
+#ifndef __AUDACITY_EFFECT_TIMESCALE__
+#define __AUDACITY_EFFECT_TIMESCALE__
+
+#include "SBSMSEffect.h"
+
+#include <wx/intl.h>
+#include <wx/dialog.h>
+#include <wx/slider.h>
+
+class wxString;
+class wxTextCtrl;
+
+class EffectTimeScale : public EffectSBSMS {
+
+ public:
+   EffectTimeScale();
+
+   virtual wxString GetEffectName() {
+      return wxString(_("Sliding Time Scale/Pitch Shift..."));
+   }
+
+   virtual std::set<wxString> GetEffectCategories() {
+     std::set<wxString> result;
+     result.insert(wxT("http://audacityteam.org/namespace#PitchAndTempo"));
+     return result;
+   }
+
+   virtual wxString GetEffectIdentifier() {
+     return wxString(wxT("TimeScale"));
+   }
+
+   virtual wxString GetEffectAction() {
+     return wxString(_("Changing Tempo/Pitch"));
+   }
+   
+   // Useful only after PromptUser values have been set. 
+   virtual wxString GetEffectDescription(); 
+
+   virtual bool Init();
+
+   virtual bool PromptUser();
+   virtual bool TransferParameters( Shuttle & shuttle );
+   virtual bool Process();
+  
+ private:
+   double m_RateStart;
+   double m_RateEnd;
+   double m_HalfStepsStart;
+   double m_HalfStepsEnd;
+   bool m_PreAnalyze;
+
+   friend class TimeScaleDialog;
+};
+
+//----------------------------------------------------------------------------
+// TimeScaleDialog
+//----------------------------------------------------------------------------
+
+class TimeScaleDialog:public EffectDialog {
+ public:
+  TimeScaleDialog(EffectTimeScale * effect, 
+		  wxWindow * parent);
+
+  void PopulateOrExchange(ShuttleGui & S);
+  bool TransferDataToWindow();
+  bool TransferDataFromWindow();
+
+ private:
+  // handlers
+  void OnText_RateStart(wxCommandEvent & event);
+  void OnText_RateEnd(wxCommandEvent & event);
+  void OnText_HalfStepsStart(wxCommandEvent & event);
+  void OnText_HalfStepsEnd(wxCommandEvent & event);
+  void OnSlider_RateStart(wxCommandEvent & event);
+  void OnSlider_RateEnd(wxCommandEvent & event);
+  void OnCheckBox_PreAnalyze(wxCommandEvent & event);
+
+  // helper fns
+  bool CheckParameters();
+  void Update_Text_RateStart();
+  void Update_Text_RateEnd();
+  void Update_Text_HalfStepsStart();
+  void Update_Text_HalfStepsEnd();
+  void Update_Slider_RateStart();
+  void Update_Slider_RateEnd();
+  void Update_CheckBox_PreAnalyze();
+
+ private:
+  EffectTimeScale *mEffect;
+  bool m_bLoopDetect;
+  
+  // controls
+  wxTextCtrl *m_pTextCtrl_RateStart;
+  wxSlider *m_pSlider_RateStart;
+  wxTextCtrl *m_pTextCtrl_RateEnd;
+  wxSlider *m_pSlider_RateEnd;
+  wxTextCtrl *m_pTextCtrl_HalfStepsStart;
+  wxTextCtrl *m_pTextCtrl_HalfStepsEnd;
+  wxCheckBox *m_pCheckBox_PreAnalyze;
+
+ public:
+   double m_RateStart;
+   double m_RateEnd;
+   double m_HalfStepsStart;
+   double m_HalfStepsEnd;
+   bool m_PreAnalyze;
+
+ private:
+   DECLARE_EVENT_TABLE()
+};
+
+#endif // __AUDACITY_EFFECT_TIMESCALE
+
+#endif // USE_SBSMS
diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp
index 5cc463a..26031b9 100644
--- a/src/effects/ToneGen.cpp
+++ b/src/effects/ToneGen.cpp
@@ -332,6 +332,7 @@ void ToneGenDialog::PopulateOrExchangeStandard( ShuttleGui & S )
                       wxDefaultPosition,
                       wxDefaultSize,
                       true);
+         mToneDurationT->SetName(_("Duration"));
          mToneDurationT->SetFormatString(mToneDurationT->GetBuiltinFormat(isSelection==true?(wxT("hh:mm:ss + samples")):(wxT("seconds"))));
          mToneDurationT->EnableMenu();
       }
@@ -354,10 +355,10 @@ void ToneGenDialog::PopulateOrExchangeExtended( ShuttleGui & S )
       S.AddFixedText(wxT(""));
       S.AddTitle(_("Start"));
       S.AddTitle(_("End"));
-      S.TieTextBox(_("Frequency (Hz)"),frequency[0], 10);
-      S.TieTextBox(wxT(""), frequency[1], 10);
-      S.TieTextBox(_("Amplitude (0-1)"),amplitude[0], 10);
-      S.TieTextBox(wxT(""), amplitude[1], 10);
+      S.TieTextBox(_("Frequency (Hz)"),frequency[0], 10)->SetName(_("Frequency Hertz Start"));
+      S.TieTextBox(wxT(""), frequency[1], 10)->SetName(_("Frequency Hertz End"));
+      S.TieTextBox(_("Amplitude (0-1)"),amplitude[0], 10)->SetName(_("Amplitude Start"));
+      S.TieTextBox(wxT(""), amplitude[1], 10)->SetName(_("Amplitude End"));
    }
    S.EndMultiColumn();
    S.StartMultiColumn(2, wxCENTER);
@@ -375,6 +376,7 @@ void ToneGenDialog::PopulateOrExchangeExtended( ShuttleGui & S )
                       wxDefaultPosition,
                       wxDefaultSize,
                       true);
+         mToneDurationT->SetName(_("Duration"));
          mToneDurationT->SetFormatString(mToneDurationT->GetBuiltinFormat(isSelection==true?(wxT("hh:mm:ss + samples")):(wxT("seconds"))));
          mToneDurationT->EnableMenu();
       }
diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp
index df6500e..1bd32d6 100644
--- a/src/effects/lv2/LV2Effect.cpp
+++ b/src/effects/lv2/LV2Effect.cpp
@@ -27,6 +27,8 @@
 #include <wx/intl.h>
 #include <wx/scrolwin.h>
 
+#if defined(USE_SLV2)
+
 #include "../Effect.h"
 #include "LoadLV2.h"
 #include "LV2Effect.h"
@@ -34,7 +36,6 @@
 #include "../Internat.h"
 #include "lv2_event_helpers.h"
 
-
 LV2Effect::LV2Effect(SLV2Plugin data,
                      const std::set<wxString>& categories)
    : mValid(true),
@@ -1249,6 +1250,7 @@ unsigned char LV2EffectDialog::GetNoteKey() {
    return 64;
 }
 
+#endif
 
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
diff --git a/src/effects/lv2/LV2PortGroup.cpp b/src/effects/lv2/LV2PortGroup.cpp
index 2259392..0afa7d6 100644
--- a/src/effects/lv2/LV2PortGroup.cpp
+++ b/src/effects/lv2/LV2PortGroup.cpp
@@ -11,6 +11,7 @@
 
 #include "LV2PortGroup.h"
 
+#if defined(USE_SLV2)
 
 LV2PortGroup::LV2PortGroup(const wxString& name)
   : mName(name) {
@@ -37,6 +38,7 @@ const wxString& LV2PortGroup::GetName() const {
   return mName;
 }
 
+#endif
 
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
diff --git a/src/effects/lv2/LoadLV2.cpp b/src/effects/lv2/LoadLV2.cpp
index a14f228..b894620 100644
--- a/src/effects/lv2/LoadLV2.cpp
+++ b/src/effects/lv2/LoadLV2.cpp
@@ -31,16 +31,17 @@ Functions that find and load all LV2 plugins on the system.
 #include "../../Experimental.h"
 #include "../../Internat.h"
 #include "../EffectManager.h"
+
+#if defined(USE_SLV2)
+
 #include "LV2Effect.h"
 #include "lv2_uri_map.h"
 #include "lv2_event.h"
 
 #include "LoadLV2.h"
 
-
 SLV2World gWorld = 0;
 
-
 // This is the URI Map Feature object. It is required for loading synth
 // plugins.
 static uint32_t uri_to_id(LV2_URI_Map_Callback_Data cbd,
@@ -155,6 +156,8 @@ void UnloadLV2Plugins()
 {
 }
 
+#endif
+
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
 //
diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index fa4582c..79e7f7c 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -404,7 +404,11 @@ bool EffectNyquist::Process()
    mCurTrack[0] = (WaveTrack *) iter.First();
    mOutputTime = mT1 - mT0;
    mCount = 0;
-   mProgress = 0;
+   mProgressIn = 0;
+   mProgressOut = 0;
+   mProgressTot = 0;
+   mScale = (mFlags & PROCESS_EFFECT ? 0.5 : 1.0) / GetNumWaveGroups();
+
    mDebugOutput = wxT("");
    while (mCurTrack[0]) {
       mCurNumChannels = 1;
@@ -427,9 +431,12 @@ bool EffectNyquist::Process()
          sampleCount end = mCurTrack[0]->TimeToLongSamples(mT1);
          mCurLen = (sampleCount)(end - mCurStart[0]);
 
+         mProgressIn = 0.0;
+         mProgressOut = 0.0;
          success = ProcessOne();
          if (!success)
             goto finish;
+         mProgressTot += mProgressIn + mProgressOut;
       }
 
       mCurTrack[0] = (WaveTrack *) iter.Next();
@@ -455,7 +462,7 @@ bool EffectNyquist::Process()
 
 
 int EffectNyquist::GetCallback(float *buffer, int ch,
-                               long start, long len)
+                               long start, long len, long totlen)
 {
    if (mCurBuffer[ch]) {
       if ((mCurStart[ch] + start) < mCurBufferStart[ch] ||
@@ -489,11 +496,10 @@ int EffectNyquist::GetCallback(float *buffer, int ch,
                len);
 
    if (ch==0) {
-      double progress = 1.0*(start+len)/mCurLen;
-      if (progress > mProgress)
-         mProgress = progress;
-
-      if (TotalProgress(mProgress))
+      double progress = mScale*(((float)start+len)/mCurLen);
+      if (progress > mProgressIn)
+         mProgressIn = progress;
+      if (TotalProgress(mProgressIn+mProgressTot))
          return -1;
    }
 
@@ -501,9 +507,16 @@ int EffectNyquist::GetCallback(float *buffer, int ch,
 }
 
 int EffectNyquist::PutCallback(float *buffer, int channel,
-                               long start, long len)
+                               long start, long len, long totlen)
 {
-   
+   if (channel==0) {
+      double progress = mScale*((float)(start+len)/totlen);
+      if (progress > mProgressOut)
+         mProgressOut = progress;
+      if (TotalProgress(mProgressIn+mProgressOut+mProgressTot))
+         return -1;
+   }
+
    if (mOutputTrack[channel]->Append((samplePtr)buffer, floatSample, len))
       return 0;  // success
    else
@@ -511,19 +524,19 @@ int EffectNyquist::PutCallback(float *buffer, int channel,
 }
 
 int EffectNyquist::StaticGetCallback(float *buffer, int channel,
-                                     long start, long len,
+                                     long start, long len, long totlen,
                                      void *userdata)
 {
    EffectNyquist *This = (EffectNyquist *)userdata;
-   return This->GetCallback(buffer, channel, start, len);
+   return This->GetCallback(buffer, channel, start, len, totlen);
 }
 
 int EffectNyquist::StaticPutCallback(float *buffer, int channel,
-                                     long start, long len,
+                                     long start, long len, long totlen,
                                      void *userdata)
 {
    EffectNyquist *This = (EffectNyquist *)userdata;
-   return This->PutCallback(buffer, channel, start, len);
+   return This->PutCallback(buffer, channel, start, len, totlen);
 }
 
 bool EffectNyquist::ProcessOne()
@@ -683,7 +696,18 @@ bool EffectNyquist::ProcessOne()
       mCurBuffer[i] = NULL;
    }
 
-   nyx_get_audio(StaticPutCallback, (void *)this);
+   int success = nyx_get_audio(StaticPutCallback, (void *)this);
+
+   if (!success) {
+      for(i=0; i<outChannels; i++) {
+         delete mOutputTrack[i];
+         mOutputTrack[i] = NULL;
+      }
+
+      nyx_cleanup();
+      setlocale(LC_NUMERIC, "");
+      return false;
+   }
 
    for(i=0; i<outChannels; i++) {
       mOutputTrack[i]->Flush();
@@ -700,12 +724,14 @@ bool EffectNyquist::ProcessOne()
       else
          out = mOutputTrack[0];
 
-      mCurTrack[i]->Clear(mT0, mT1);
-      mCurTrack[i]->Paste(mT0, out);
+      mCurTrack[i]->HandleClear(mT0, mT1, false, false);
+      mCurTrack[i]->HandlePaste(mT0, out);
    }
 
-   for(i=0; i<outChannels; i++)
+   for(i=0; i<outChannels; i++) {
       delete mOutputTrack[i];
+      mOutputTrack[i] = NULL;
+   }
 
    nyx_cleanup();
 
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index afac8eb..33ab20f 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -96,15 +96,15 @@ public:
 private:
    
    int GetCallback(float *buffer, int channel,
-                   long start, long len);
+                   long start, long len, long totlen);
    int PutCallback(float *buffer, int channel,
-                   long start, long len);
+                   long start, long len, long totlen);
 
    static int StaticGetCallback(float *buffer, int channel,
-                                long start, long len,
+                                long start, long len, long totlen,
                                 void *userdata);
    static int StaticPutCallback(float *buffer, int channel,
-                                long start, long len,
+                                long start, long len, long totlen,
                                 void *userdata);
 
    bool       ProcessOne();
@@ -132,14 +132,17 @@ private:
 
    int              mCurNumChannels;
    WaveTrack       *mCurTrack[2];
-   sampleCount  mCurStart[2];
+   sampleCount      mCurStart[2];
    sampleCount      mCurLen;
    double           mOutputTime;
    int              mCount;
-   double           mProgress;
+   double           mProgressIn;
+   double           mProgressOut;
+   double           mProgressTot;
+   double           mScale;
 
    samplePtr        mCurBuffer[2];
-   sampleCount  mCurBufferStart[2];
+   sampleCount      mCurBufferStart[2];
    sampleCount      mCurBufferLen[2];
 
    WaveTrack       *mOutputTrack[2];
diff --git a/src/effects/vamp/LoadVamp.cpp b/src/effects/vamp/LoadVamp.cpp
index d1c23f5..28f6b24 100644
--- a/src/effects/vamp/LoadVamp.cpp
+++ b/src/effects/vamp/LoadVamp.cpp
@@ -95,7 +95,24 @@ void LoadVampPlugins()
 
 #endif
       
-      // For now we only support "time instants" conformable outputs
+      // We limit the listed plugin outputs to those whose results can
+      // readily be displayed in an Audacity label track.
+      //
+      // - Any output whose features have no values (time instants only),
+      //   with or without duration, is fine
+      //
+      // - Any output whose features have more than one value, or an
+      //   unknown or variable number of values, is right out
+      // 
+      // - Any output whose features have exactly one value, with
+      //   variable sample rate or with duration, should be OK --
+      //   this implies a sparse feature, of which the time and/or
+      //   duration are significant aspects worth displaying
+      //
+      // - An output whose features have exactly one value, with
+      //   fixed sample rate and no duration, cannot be usefully
+      //   displayed -- the value is the only significant piece of
+      //   data there and we have no good value plot
 
       Plugin::OutputList outputs = vp->getOutputDescriptors();
 
@@ -105,32 +122,38 @@ void LoadVampPlugins()
       
       for (Plugin::OutputList::iterator j = outputs.begin();
            j != outputs.end(); ++j) {
+
+         if (j->sampleType == Plugin::OutputDescriptor::FixedSampleRate ||
+             j->sampleType == Plugin::OutputDescriptor::OneSamplePerStep ||
+             !j->hasFixedBinCount ||
+             (j->hasFixedBinCount && j->binCount > 1)) {
+
+            // All of these qualities disqualify (see notes above)
+
+            ++n;
+            continue;
+         }
          
-         if (j->hasFixedBinCount &&
-             j->binCount == 0 &&
-             j->sampleType == Plugin::OutputDescriptor::VariableSampleRate) {
-
-            wxString name = LAT1CTOWX(vp->getName().c_str());
-
-            if (outputs.size() > 1) {
-               // This is not the plugin's only output.
-               // Use "plugin name: output name" as the effect name,
-               // unless the output name is the same as the plugin name
-               wxString outputName = LAT1CTOWX(j->name.c_str());
-               if (outputName != name) {
-                  name = wxString::Format(wxT("%s: %s"),
-                                          name.c_str(), outputName.c_str());
-               }
+         wxString name = LAT1CTOWX(vp->getName().c_str());
+
+         if (outputs.size() > 1) {
+            // This is not the plugin's only output.
+            // Use "plugin name: output name" as the effect name,
+            // unless the output name is the same as the plugin name
+            wxString outputName = LAT1CTOWX(j->name.c_str());
+            if (outputName != name) {
+               name = wxString::Format(wxT("%s: %s"),
+                                       name.c_str(), outputName.c_str());
             }
+         }
 
 #ifdef EFFECT_CATEGORIES
-            VampEffect *effect = new VampEffect(*i, n, hasParameters, name,
+         VampEffect *effect = new VampEffect(*i, n, hasParameters, name,
                                                 vampCategory);
 #else
-            VampEffect *effect = new VampEffect(*i, n, hasParameters, name);
+         VampEffect *effect = new VampEffect(*i, n, hasParameters, name);
 #endif
-            em.RegisterEffect(effect);
-         }
+         em.RegisterEffect(effect);
 
          ++n;
       }
diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp
index ca418b4..070c2e6 100644
--- a/src/effects/vamp/VampEffect.cpp
+++ b/src/effects/vamp/VampEffect.cpp
@@ -13,15 +13,9 @@
 
 #include "VampEffect.h"
 
-#ifdef _WIN32
-#include "../../../lib-src/libvamp/vamp-sdk/Plugin.h"
-#include "../../../lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.h"
-#include "../../../lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.h"
-#else
-#include <vamp-sdk/Plugin.h>
-#include <vamp-sdk/hostext/PluginChannelAdapter.h>
-#include <vamp-sdk/hostext/PluginInputDomainAdapter.h>
-#endif
+#include <vamp-hostsdk/Plugin.h>
+#include <vamp-hostsdk/PluginChannelAdapter.h>
+#include <vamp-hostsdk/PluginInputDomainAdapter.h>
 
 #include <wx/wxprec.h>
 #include <wx/button.h>
@@ -314,15 +308,23 @@ void VampEffect::AddFeatures(LabelTrack *ltrack,
    for (Vamp::Plugin::FeatureList::iterator fli = features[mOutput].begin();
         fli != features[mOutput].end(); ++fli) {
       
-      Vamp::RealTime ftime = fli->timestamp;
-      double ltime = ftime.sec + (double(ftime.nsec) / 1000000000.0);
+      Vamp::RealTime ftime0 = fli->timestamp;
+      double ltime0 = ftime0.sec + (double(ftime0.nsec) / 1000000000.0);
+
+      Vamp::RealTime ftime1 = ftime0;
+      if (fli->hasDuration) ftime1 = ftime0 + fli->duration;
+      double ltime1 = ftime1.sec + (double(ftime1.nsec) / 1000000000.0);
 
       wxString label = LAT1CTOWX(fli->label.c_str());
       if (label == wxString()) {
-         label = wxString::Format(LAT1CTOWX("%.3f"), ltime);
+         if (fli->values.empty()) {
+            label = wxString::Format(LAT1CTOWX("%.3f"), ltime0);
+         } else {
+            label = wxString::Format(LAT1CTOWX("%.3f"), *fli->values.begin());
+         }
       }
       
-      ltrack->AddLabel(ltime, ltime, label);
+      ltrack->AddLabel(ltime0, ltime1, label);
    }
 }
 
diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h
index 6577b0a..1390e8e 100644
--- a/src/effects/vamp/VampEffect.h
+++ b/src/effects/vamp/VampEffect.h
@@ -22,11 +22,7 @@ class wxComboBox;
 
 #include <wx/dialog.h>
 
-#ifdef _WIN32
-#include "../../../lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h"
-#else
-#include <vamp-sdk/hostext/PluginLoader.h>
-#endif
+#include <vamp-hostsdk/PluginLoader.h>
 
 void LoadVampPlugins();
 
diff --git a/src/export/Export.cpp b/src/export/Export.cpp
index 2c45b6d..42bdad1 100644
--- a/src/export/Export.cpp
+++ b/src/export/Export.cpp
@@ -101,6 +101,13 @@ bool ExportPlugin::CheckFileName(wxFileName &filename, int format)
   return true;
 }
 
+/** \brief Add a new entry to the list of formats this plug-in can export
+ *
+ * To configure the format use SetFormat, SetCanMetaData etc with the index of
+ * the format.
+ * @return The number of formats currently set up. This is one more than the
+ * index of the newly added format.
+ */
 int ExportPlugin::AddFormat()
 {
    FormatInfo *nf = new FormatInfo();
@@ -118,6 +125,10 @@ void ExportPlugin::Destroy()
    delete this;
 }
 
+/**
+ * @param index The plugin to set the format for (range 0 to one less than the
+ * count of formats)
+ */
 void ExportPlugin::SetFormat(const wxString & format, int index)
 {
    mFormatInfos[index]->mFormat = format;
@@ -218,16 +229,7 @@ bool ExportPlugin::IsExtension(wxString & ext, int index)
    return isext;
 }
 
-bool ExportPlugin::DisplayOptions(AudacityProject *project, int format)
-{
-   if (project == NULL) {
-      project = GetActiveProject();
-   }
-
-   return DoDisplayOptions(project, format);
-}
-
-bool ExportPlugin::DoDisplayOptions(AudacityProject *project, int format)
+bool ExportPlugin::DisplayOptions(wxWindow *parent, int format)
 {
    return false;
 }
@@ -343,14 +345,13 @@ bool Exporter::Process(AudacityProject *project, bool selectedOnly, double t0, d
       return false;
    }
 
-   // Ask user for file name
-   if (!GetFilename()) {
+   // Let user edit MetaData 
+   if (!(project->GetTags()->ShowEditDialog(project, _("Edit Metadata"), mProject->GetShowId3Dialog()))) {
       return false;
    }
 
-   // Let user edit MetaData 
-
-   if (!(project->GetTags()->ShowEditDialog(project, _("Edit Metadata"), mProject->GetShowId3Dialog()))) {
+   // Ask user for file name
+   if (!GetFilename()) {
       return false;
    }
 
@@ -422,8 +423,7 @@ bool Exporter::ExamineTracks()
 
    while (tr) {
       if (tr->GetKind() == Track::Wave) {
-         if (tr->GetSelected() || !mSelectedOnly) {
-
+         if ( (tr->GetSelected() || !mSelectedOnly) && !tr->GetMute() ) {  // don't count muted tracks
             mNumSelected++;
 
             if (tr->GetChannel() == Track::LeftChannel) {
@@ -463,8 +463,13 @@ bool Exporter::ExamineTracks()
       tr = iter1.Next();
    }
 
-   if (mSelectedOnly && mNumSelected == 0) {
-      wxMessageBox(_("No tracks are selected! Use Ctrl-A (Select All)\nChoose Export... to export all tracks."),
+   if (mNumSelected == 0) {
+      wxString message;
+      if(mSelectedOnly)
+         message = _("All the selected audio is muted.");
+      else
+         message = _("All the audio is muted.");
+      wxMessageBox(message,
                     _("Unable to export"),
                     wxOK | wxICON_INFORMATION);
       return false;
@@ -524,6 +529,7 @@ bool Exporter::GetFilename()
                     mFilename.GetFullName(),
                     maskString,
                     wxFD_SAVE | wxRESIZE_BORDER);
+      mDialog = &fd;
 
       fd.SetFilterIndex(mFilterIndex);
 
@@ -674,7 +680,11 @@ void Exporter::DisplayOptions(int index)
       return;
    }
 
-   mPlugins[mf]->DisplayOptions(mProject,msf);
+#if defined(__WXMSW__)
+   mPlugins[mf]->DisplayOptions(mProject, msf);
+#else
+   mPlugins[mf]->DisplayOptions(mDialog, msf);
+#endif
 }
 
 bool Exporter::CheckMix()
diff --git a/src/export/Export.h b/src/export/Export.h
index dce9c6c..3df3408 100644
--- a/src/export/Export.h
+++ b/src/export/Export.h
@@ -65,23 +65,35 @@ public:
    virtual int GetFormatCount();
    virtual wxString GetFormat(int index);
    virtual wxString GetDescription(int index);
-   virtual wxString GetExtension(int index);
-   virtual wxArrayString GetExtensions(int index);
+   /** @brief Return the (first) file name extension for the sub-format.
+    * @param index The sub-format for which the extension is wanted */
+   virtual wxString GetExtension(int index = 0);
+   /** @brief Return all the file name extensions used for the sub-format.
+    * @param index the sub-format for which the extension is required */
+   virtual wxArrayString GetExtensions(int index = 0);
    virtual wxString GetMask(int index);
    virtual int GetMaxChannels(int index);
    virtual bool GetCanMetaData(int index);
    
    virtual bool IsExtension(wxString & ext, int index);
 
-   virtual bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
-   virtual bool DoDisplayOptions(AudacityProject *project, int format = 0);
+   virtual bool DisplayOptions(wxWindow *parent, int format = 0);
 
    virtual bool CheckFileName(wxFileName &filename, int format = 0);
 
    /** \brief called to export audio into a file.
     *
+    * @param selectedOnly Set to true if all tracks should be mixed, to false
+    * if only the selected tracks should be mixed and exported.
     * @param metadata A Tags object that will over-ride the one in *project and
     * be used to tag the file that is exported.
+    * @param subformat Control which of the multiple formats this exporter is
+    * capable of exporting should be used. Used where a single export plug-in
+    * handles a number of related formats, but they have separate
+    * entries in the Format drop-down list box. For example, the options to
+    * export to "Other PCM", "AIFF 16 Bit" and "WAV 16 Bit" are all the same
+    * libsndfile export plug-in, but with subformat set to 0, 1, and 2
+    * respectively.
     */
    virtual bool Export(AudacityProject *project,
                        int channels,
@@ -102,7 +114,7 @@ public:
                          MixerSpec *mixerSpec,
                          int subformat);
 
-private:
+protected:
 
    FormatInfoArray mFormatInfos;
 };
@@ -140,7 +152,7 @@ private:
    bool ExportTracks();
 
 private:
-
+   FileDialog *mDialog;
    AudacityProject *mProject;
    MixerSpec *mMixerSpec;
 
diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp
index 273a8cc..defb850 100644
--- a/src/export/ExportCL.cpp
+++ b/src/export/ExportCL.cpp
@@ -51,10 +51,8 @@ END_EVENT_TABLE()
 /// 
 /// 
 ExportCLOptions::ExportCLOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-   wxString(_("Specify Command Line Encoder")),
-   wxDefaultPosition, wxDefaultSize,
-   wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify Command Line Encoder")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -199,7 +197,7 @@ public:
 
    // Required
 
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
    bool Export(AudacityProject *project,
                int channels,
                wxString fName,
@@ -241,15 +239,50 @@ bool ExportCL::Export(AudacityProject *project,
    wxString output;
    wxString cmd;
    bool show;
+   long rc;
 
    // Retrieve settings
    gPrefs->Read(wxT("/FileFormats/ExternalProgramShowOutput"), &show, false);
    cmd = gPrefs->Read(wxT("/FileFormats/ExternalProgramExportCommand"), wxT("lame - \"%f.mp3\""));
    cmd.Replace(wxT("%f"), fName);
 
+#if defined(__WXMSW__)
+   // Give Windows a chance at finding lame command in the default location.
+   wxString paths[] = {wxT("HKEY_LOCAL_MACHINE\\Software\\Lame for Audacity"),
+                       wxT("HKEY_LOCAL_MACHINE\\Software\\FFmpeg for Audacity")};
+   wxString opath;
+   wxString npath;
+   wxRegKey reg;
+
+   wxGetEnv(wxT("PATH"), &opath);
+   npath = opath;
+
+   for (int i = 0; i < WXSIZEOF(paths); i++) {
+      reg.SetName(paths[i]);
+
+      if (reg.Exists()) {
+         wxString ipath;
+         reg.QueryValue(wxT("InstallPath"), ipath);
+         if (!ipath.IsEmpty()) {
+            npath += wxPATH_SEP + ipath;
+         }
+      }
+   }
+
+   wxSetEnv(wxT("PATH"),npath.c_str());
+#endif
+
    // Kick off the command
    p = new ExportCLProcess(&output);
-   if (!wxExecute(cmd, wxEXEC_ASYNC, p)) {
+   rc = wxExecute(cmd, wxEXEC_ASYNC, p);
+
+#if defined(__WXMSW__)
+   if (!opath.IsEmpty()) {
+      wxSetEnv(wxT("PATH"),opath.c_str());
+   }
+#endif
+
+   if (!rc) {
       wxMessageBox(wxString::Format(_("Cannot export audio to %s"),
                                     fName.c_str()));
       p->Detach();
@@ -414,9 +447,9 @@ bool ExportCL::Export(AudacityProject *project,
    return true;
 }
 
-bool ExportCL::DisplayOptions(AudacityProject *project, int format)
+bool ExportCL::DisplayOptions(wxWindow *parent, int format)
 {
-   ExportCLOptions od(project);
+   ExportCLOptions od(parent);
 
    od.ShowModal();
 
diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp
index af64ab4..b1d8b5a 100644
--- a/src/export/ExportFFmpeg.cpp
+++ b/src/export/ExportFFmpeg.cpp
@@ -52,6 +52,15 @@ function.
 
 extern FFmpegLibs *FFmpegLibsInst;
 
+bool CheckFFmpegPresence()
+{
+   if (!FFmpegLibsInst->ValidLibsLoaded())
+   {
+      wxMessageBox(_("Properly configured FFmpeg is required to proceed.\nYou can configure it in Preferences->Import/Export."));
+      return false;
+   }
+   return true;
+}
 
 //----------------------------------------------------------------------------
 // ExportFFmpeg
@@ -68,7 +77,7 @@ public:
    bool CheckFileName(wxFileName &filename, int format = 0);
 
    /// Format intialization
-   bool Init(const char *shortname, AudacityProject *project);
+   bool Init(const char *shortname, AudacityProject *project, Tags *metadata);
    
    /// Codec intialization
    bool InitCodecs(AudacityProject *project);
@@ -84,7 +93,7 @@ public:
 
    /// Shows options dialog
    ///\param format - index of export type
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
 
    /// Check whether or not current project sample rate is compatible with the export codec
    bool CheckSampleRate(int rate, int lowrate, int highrate, const int *sampRates);
@@ -185,15 +194,12 @@ void ExportFFmpeg::Destroy()
 
 bool ExportFFmpeg::CheckFileName(wxFileName &filename, int format)
 {
-  if (!FFmpegLibsInst->ValidLibsLoaded())
-  {
-    wxMessageBox(wxT("Properly configured FFmpeg is required to proceed.\nYou can configure it in Preferences->Import/Export."));
-    return false;
-  }
-  return true;
+   if (!CheckFFmpegPresence())
+     return false;
+   return true;
 }
 
-bool ExportFFmpeg::Init(const char *shortname,AudacityProject *project)
+bool ExportFFmpeg::Init(const char *shortname, AudacityProject *project, Tags *metadata)
 {
    int err;
    //FFmpegLibsInst->LoadLibs(NULL,true); //Loaded at startup or from Prefs now
@@ -232,6 +238,7 @@ bool ExportFFmpeg::Init(const char *shortname,AudacityProject *project)
       return false;
    }
 
+   mEncAudioStream->id = 0;
    mEncFormatCtx->timestamp = 0;
 
    // Open the output file.
@@ -260,6 +267,15 @@ bool ExportFFmpeg::Init(const char *shortname,AudacityProject *project)
    if (!InitCodecs(project))
       return false;
 
+   if (metadata == NULL) metadata = project->GetTags();
+
+   if (fmts[mSubFormat].canmetadata)
+   {
+      mSupportsUTF8 = fmts[mSubFormat].canutf8;
+      AddTags(metadata);
+   }
+
+
    // Write headers to the output file.
    if ((err = FFmpegLibsInst->av_write_header(mEncFormatCtx)) < 0)
    {
@@ -366,23 +382,23 @@ bool ExportFFmpeg::InitCodecs(AudacityProject *project)
    this->mEncAudioStream->quality = mEncAudioCodecCtx->global_quality = mEncAudioCodecCtx->global_quality * FF_QP2LAMBDA;
    mEncAudioCodecCtx->sample_rate = mSampleRate;
    mEncAudioCodecCtx->channels = mChannels;
-   mEncAudioCodecCtx->time_base.num = 0;
-   mEncAudioCodecCtx->time_base.den = 1;
+   mEncAudioCodecCtx->time_base.num = 1;
+   mEncAudioCodecCtx->time_base.den = mEncAudioCodecCtx->sample_rate;
    mEncAudioCodecCtx->sample_fmt = SAMPLE_FMT_S16;
-   mEncAudioCodecCtx->strict_std_compliance = FF_COMPLIANCE_STRICT;
+   //mEncAudioCodecCtx->strict_std_compliance = FF_COMPLIANCE_STRICT;
 
    // Is the required audio codec compiled into libavcodec?
    if ((codec = FFmpegLibsInst->avcodec_find_encoder(mEncAudioCodecCtx->codec_id)) == NULL)
    {
       wxLogMessage(wxT("FFmpeg : ERROR - Can't find audio codec 0x%x."),mEncAudioCodecCtx->codec_id);
-      wxMessageBox(wxString::Format(wxT("FFmpeg cannot find audio codec 0x%x.\nSupport for this codec is probably not compiled in."),mEncAudioCodecCtx->codec_id));
+      wxMessageBox(wxString::Format(_("FFmpeg cannot find audio codec 0x%x.\nSupport for this codec is probably not compiled in."),mEncAudioCodecCtx->codec_id));
       return false;
    }
 
    if (mEncFormatCtx->oformat->flags & AVFMT_GLOBALHEADER)
    {
       mEncAudioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-      mEncAudioStream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+      mEncFormatCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
    }
 
    // Open the codec.
@@ -575,7 +591,7 @@ bool ExportFFmpeg::EncodeAudioFrame(int16_t *pFrame, int frameSize)
       pkt.flags |= PKT_FLAG_KEY;
 
       // Write the encoded audio frame to the output file.
-      if ((ret = FFmpegLibsInst->av_write_frame(mEncFormatCtx, &pkt)) != 0)
+      if ((ret = FFmpegLibsInst->av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0)
       {
          wxLogMessage(wxT("FFmpeg : ERROR - Failed to write audio frame to file."));
          return false;
@@ -589,16 +605,13 @@ bool ExportFFmpeg::Export(AudacityProject *project,
                        int channels, wxString fName,
                        bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec, Tags *metadata, int subformat)
 {
-   if (!FFmpegLibsInst->ValidLibsLoaded())
-   {
-      wxMessageBox(wxT("Properly configured FFmpeg is required to proceed.\nYou can configure it in Preferences->Import/Export."));
+   if (!CheckFFmpegPresence())
       return false;
-   }
    mChannels = channels;
    if (channels > fmts[subformat].maxchannels)
    {
       wxLogMessage(wxT("Attempted to export %d channels, but max. channels = %d"),channels,fmts[subformat].maxchannels);
-      wxMessageBox(wxString::Format(wxT("Attempted to export %d channels, but max. channels for selected output format is %d"),channels,fmts[subformat].maxchannels),wxT("Error"));
+      wxMessageBox(wxString::Format(_("Attempted to export %d channels, but max. channels for selected output format is %d"),channels,fmts[subformat].maxchannels),_("Error"));
       return false;
    }
    mName = fName;
@@ -611,18 +624,10 @@ bool ExportFFmpeg::Export(AudacityProject *project,
    wxString shortname(fmts[mSubFormat].shortname);
    if (mSubFormat == FMT_OTHER)
       shortname = gPrefs->Read(wxT("/FileFormats/FFmpegFormat"),wxT("matroska"));
-   ret = Init(shortname.mb_str(),project);
+   ret = Init(shortname.mb_str(),project, metadata);
 
    if (!ret) return false;
 
-   if (metadata == NULL) metadata = project->GetTags();
-
-   if (fmts[mSubFormat].canmetadata)
-   {
-      this->mSupportsUTF8 = fmts[mSubFormat].canutf8;
-      AddTags(metadata);
-   }
-
    int pcmBufferSize = 1024;
    int numWaveTracks;
    WaveTrack **waveTracks;
@@ -771,46 +776,43 @@ int ExportFFmpeg::AskResample(int bitrate, int rate, int lowrate, int highrate,
 }
 
 
-bool ExportFFmpeg::DisplayOptions(AudacityProject *project, int format)
+bool ExportFFmpeg::DisplayOptions(wxWindow *parent, int format)
 {
-   if (!FFmpegLibsInst->ValidLibsLoaded())
-   {
-      wxMessageBox(wxT("Properly configured FFmpeg is required to proceed.\nYou can configure it in Preferences->Import/Export."));
+   if (!CheckFFmpegPresence())
       return false;
-   }
    if (format == FMT_M4A)
    {
-      ExportFFmpegAACOptions od(project);
+      ExportFFmpegAACOptions od(parent);
       od.ShowModal();
       return true;
    }
    else if (format == FMT_AC3)
    {
-      ExportFFmpegAC3Options od(project);
+      ExportFFmpegAC3Options od(parent);
       od.ShowModal();
       return true;
    }
    else if (format == FMT_AMRNB)
    {
-      ExportFFmpegAMRNBOptions od(project);
+      ExportFFmpegAMRNBOptions od(parent);
       od.ShowModal();
       return true;
    }
    else if (format == FMT_AMRWB)
    {
-      ExportFFmpegAMRWBOptions od(project);
+      ExportFFmpegAMRWBOptions od(parent);
       od.ShowModal();
       return true;
    }
    else if (format == FMT_WMA2)
    {
-      ExportFFmpegWMAOptions od(project);
+      ExportFFmpegWMAOptions od(parent);
       od.ShowModal();
       return true;
    }
    else if (format == FMT_OTHER)
    {
-      ExportFFmpegOptions od(project);
+      ExportFFmpegOptions od(parent);
       od.ShowModal();
       return true;
    }
diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp
index e62828c..dfd877d 100644
--- a/src/export/ExportFFmpegDialogs.cpp
+++ b/src/export/ExportFFmpegDialogs.cpp
@@ -89,10 +89,8 @@ const int ExportFFmpegAC3Options::iAC3BitRates[] = { 32000, 40000, 48000, 56000,
 const int ExportFFmpegAC3Options::iAC3SampleRates[] = { 32000, 44100, 48000, 0 };
 
 ExportFFmpegAC3Options::ExportFFmpegAC3Options(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify AC3 Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify AC3 Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -155,10 +153,8 @@ BEGIN_EVENT_TABLE(ExportFFmpegAACOptions, wxDialog)
 END_EVENT_TABLE()
 
 ExportFFmpegAACOptions::ExportFFmpegAACOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify AAC Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify AAC Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -171,8 +167,12 @@ void ExportFFmpegAACOptions::PopulateOrExchange(ShuttleGui & S)
 {
    S.StartStatic(_("AAC Export Setup"), 1);
    {
+      S.StartTwoColumn();
+      {
       S.TieSlider(wxT("Quality:"),wxT("/FileFormats/AACQuality"),100,500,10);
    }
+      S.EndTwoColumn();
+   }
    S.EndStatic();
 
    S.AddStandardButtons();
@@ -207,10 +207,8 @@ BEGIN_EVENT_TABLE(ExportFFmpegAMRNBOptions, wxDialog)
 END_EVENT_TABLE()
 
 ExportFFmpegAMRNBOptions::ExportFFmpegAMRNBOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify AMR-NB Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify AMR-NB Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -273,10 +271,8 @@ BEGIN_EVENT_TABLE(ExportFFmpegAMRWBOptions, wxDialog)
 END_EVENT_TABLE()
 
 ExportFFmpegAMRWBOptions::ExportFFmpegAMRWBOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify AMR-WB Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify AMR-WB Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -341,10 +337,8 @@ END_EVENT_TABLE()
 const int ExportFFmpegWMAOptions::iWMASampleRates[] = { 8000, 11025, 16000, 22050, 44100, 0};
 
 ExportFFmpegWMAOptions::ExportFFmpegWMAOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify WMA Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify WMA Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -497,9 +491,28 @@ void FFmpegPresets::SavePreset(ExportFFmpegOptions *parent, wxString &name)
    }
    else
    {
+      wxWindow *wnd;
+      wxListBox *lb;
+
+      wnd = dynamic_cast<wxWindow*>(parent)->FindWindowById(FEFormatID,parent);
+      lb = dynamic_cast<wxListBox*>(wnd);
+      if (lb->GetSelection() < 0)
+      {
+         wxMessageBox(_("Please select format before saving a profile"));
+         return;
+      }
+
+      wnd = dynamic_cast<wxWindow*>(parent)->FindWindowById(FECodecID,parent);
+      lb = dynamic_cast<wxListBox*>(wnd);
+      if (lb->GetSelection() < 0)
+      {
+         wxMessageBox(_("Please select codec before saving a profile"));
+         return;
+      }
       preset = new FFmpegPreset(name);
       mPresets->push_front(preset);
    }
+
    wxListBox *lb;
    wxSpinCtrl *sc;
    wxTextCtrl *tc;
@@ -514,14 +527,8 @@ void FFmpegPresets::SavePreset(ExportFFmpegOptions *parent, wxString &name)
          switch(id)
          {
          case FEFormatID:
-            lb = dynamic_cast<wxListBox*>(wnd);
-            if (lb->GetSelection() < 0) { wxMessageBox(wxT("Please select format before saving a profile")); return; }
-            preset->mControlState->Item(id - FEFirstID) = lb->GetString(lb->GetSelection());
             break;
          case FECodecID:
-            lb = dynamic_cast<wxListBox*>(wnd);
-            if (lb->GetSelection() < 0) { wxMessageBox(wxT("Please select codec before saving a profile")); return; }
-            preset->mControlState->Item(id - FEFirstID) = lb->GetString(lb->GetSelection());
             break;
          // Spin control
          case FEBitrateID:
@@ -570,7 +577,7 @@ void FFmpegPresets::LoadPreset(ExportFFmpegOptions *parent, wxString &name)
    FFmpegPreset *preset = FindPreset(name);
    if (!preset)
    {
-      wxMessageBox(wxString::Format(wxT("Preset '%s' does not exist."),name.c_str()));
+      wxMessageBox(wxString::Format(_("Preset '%s' does not exist."),name.c_str()));
       return;
    }
 
@@ -784,10 +791,8 @@ ExportFFmpegOptions::~ExportFFmpegOptions()
 }
 
 ExportFFmpegOptions::ExportFFmpegOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify Other Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify Other Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
    PickFFmpegLibs();
@@ -906,7 +911,7 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
       mFormatList->DeselectAll();
       mCodecList->DeselectAll();
 
-      S.StartStatic(wxT("Options"),0);
+      S.StartStatic(_("Options"),0);
       {
          S.StartMultiColumn(4,wxALIGN_LEFT);
          {
@@ -932,15 +937,15 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                mProfileLabels[0], mProfileNames, mProfileLabels);
             mProfileChoice->SetToolTip(_("AAC Profile\nLow Complexity -default\nMost players won't play anything other than LC"));
 
-            S.AddVariableText(wxT("Use Bit Reservoir"));
+            S.AddVariableText(_("Use Bit Reservoir"));
             S.Id(FEBitReservoirID).TieCheckBox(wxEmptyString, wxT("/FileFormats/FFmpegBitReservoir"), true);
 
-            S.AddVariableText(wxT("Use Variable Block Length"));
+            S.AddVariableText(_("Use Variable Block Length"));
             S.Id(FEVariableBlockLenID).TieCheckBox(wxEmptyString, wxT("/FileFormats/FFmpegVariableBlockLen"), true);
 
          }
          S.EndMultiColumn();
-         S.StartStatic(wxT("FLAC options"),0);
+         S.StartStatic(_("FLAC options"),0);
          {
             S.StartMultiColumn(4);
             {
@@ -969,14 +974,14 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                mMaxPartitionOrderSpin = S.Id(FEMaxPartOrderID).TieSpinCtrl(_("Maximal partition order"), wxT("/FileFormats/FFmpegMaxPredOrder"), -1,8,-1);
                mMaxPartitionOrderSpin->SetToolTip(_("Maximal partition order\nOptional\n-1 - default\nmin - 0\nmax - 8"));
 
-               S.AddVariableText(wxT("Use LPC"));
+               S.AddVariableText(_("Use LPC"));
                S.Id(FEUseLPCID).TieCheckBox(wxEmptyString, wxT("/FileFormats/FFmpegUseLPC"), true);
                
             }
             S.EndMultiColumn();
          }
          S.EndStatic();
-         S.StartStatic(wxT("MPEG container options"),0);
+         S.StartStatic(_("MPEG container options"),0);
          {
             S.StartMultiColumn(4);
             {
@@ -1197,6 +1202,11 @@ void ExportFFmpegOptions::OnDeletePreset(wxCommandEvent& event)
 {
    wxComboBox *preset = dynamic_cast<wxComboBox*>(FindWindowById(FEPresetID,this));
    wxString presetname = preset->GetValue();
+   if (presetname.IsEmpty())
+   {
+      wxMessageBox(_("You can't delete a preset without name"));
+      return;
+   }
 
    wxString query = wxString::Format(_("Delete preset '%s'?"),presetname.c_str());
    int action = wxMessageBox(query,_("Confirm Deletion"),wxYES_NO | wxCENTRE);
@@ -1256,7 +1266,12 @@ void ExportFFmpegOptions::OnLoadPreset(wxCommandEvent& event)
 void ExportFFmpegOptions::OnImportPresets(wxCommandEvent& event)
 {
    wxString path;
-   wxFileDialog dlg(this,_("Select xml file with presets to import"),gPrefs->Read(wxT("/FileFormats/FFmpegPresetDir")),wxEmptyString,wxString(wxT("XML files (*.xml)|*.xml")),wxFD_OPEN);
+   FileDialog dlg(this,
+                  _("Select xml file with presets to import"),
+                  gPrefs->Read(wxT("/FileFormats/FFmpegPresetDir")),
+                  wxEmptyString,
+                  wxString(_("XML files (*.xml)|*.xml|All files (*.*)|*.*")),
+                  wxFD_OPEN);
    if (dlg.ShowModal() == wxID_CANCEL) return;
    path = dlg.GetPath();
    mPresets->ImportPresets(path);
@@ -1271,7 +1286,12 @@ void ExportFFmpegOptions::OnImportPresets(wxCommandEvent& event)
 void ExportFFmpegOptions::OnExportPresets(wxCommandEvent& event)
 {
    wxString path;
-   wxFileDialog dlg(this,_("Select xml file to export presets into"),gPrefs->Read(wxT("/FileFormats/FFmpegPresetDir")),wxEmptyString,wxString(wxT("XML files (*.xml)|*.xml")),wxFD_SAVE);
+   FileDialog dlg(this,
+                  _("Select xml file to export presets into"),
+                  gPrefs->Read(wxT("/FileFormats/FFmpegPresetDir")),
+                  wxEmptyString,
+                  wxString(_("XML files (*.xml)|*.xml|All files (*.*)|*.*")),
+                  wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
    if (dlg.ShowModal() == wxID_CANCEL) return;
    path = dlg.GetPath();
    mPresets->ExportPresets(path);
@@ -1338,7 +1358,7 @@ void ExportFFmpegOptions::DoOnFormatList()
    if (fmt == NULL)
    {
       //This shouldn't really happen
-      mFormatName->SetLabel(wxString(wxT("Failed to guess format")));
+      mFormatName->SetLabel(wxString(_("Failed to guess format")));
       return;
    }
    mFormatName->SetLabel(wxString::Format(wxT("%s"),selfmtlong->c_str()));
@@ -1380,7 +1400,7 @@ void ExportFFmpegOptions::DoOnCodecList()
    if (cdc == NULL)
    {
       //This shouldn't really happen
-      mCodecName->SetLabel(wxString(wxT("Failed to find the codec")));
+      mCodecName->SetLabel(wxString(_("Failed to find the codec")));
       return;
    }
    mCodecName->SetLabel(wxString::Format(wxT("[%d] %s"),cdc->id,selcdclong->c_str()));
diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp
index 8551c51..16c65b8 100644
--- a/src/export/ExportFLAC.cpp
+++ b/src/export/ExportFLAC.cpp
@@ -29,7 +29,6 @@ and libvorbis examples, Monty <monty at xiph.org>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
 
-#include <vorbis/vorbisenc.h>
 #include "FLAC++/encoder.h"
 
 #include "../float_cast.h"
@@ -64,10 +63,8 @@ END_EVENT_TABLE()
 /// 
 /// 
 ExportFLACOptions::ExportFLACOptions(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify FLAC Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify FLAC Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -179,7 +176,7 @@ public:
 
    // Required
 
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
    bool Export(AudacityProject *project,
                int channels,
                wxString fName,
@@ -350,9 +347,9 @@ bool ExportFLAC::Export(AudacityProject *project,
    return !cancelling;
 }
 
-bool ExportFLAC::DisplayOptions(AudacityProject *project, int format)
+bool ExportFLAC::DisplayOptions(wxWindow *parent, int format)
 {
-   ExportFLACOptions od(project);
+   ExportFLACOptions od(parent);
 
    od.ShowModal();
 
@@ -377,6 +374,9 @@ bool ExportFLAC::GetMetadata(AudacityProject *project, Tags *tags)
 
    wxString n, v;
    for (bool cont = tags->GetFirst(n, v); cont; cont = tags->GetNext(n, v)) {
+      if (n == TAG_YEAR) {
+         n = wxT("DATE");
+      }
       FLAC::Metadata::VorbisComment::Entry entry(n.mb_str(wxConvUTF8),
                                                  v.mb_str(wxConvUTF8));
       ::FLAC__metadata_object_vorbiscomment_append_comment(mMetadata,
diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp
index 83d82a8..4bebf2e 100644
--- a/src/export/ExportMP2.cpp
+++ b/src/export/ExportMP2.cpp
@@ -104,10 +104,8 @@ END_EVENT_TABLE()
 /// 
 /// 
 ExportMP2Options::ExportMP2Options(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify MP2 Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify MP2 Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -174,7 +172,7 @@ public:
 
    // Required
 
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
    bool Export(AudacityProject *project,
                int channels,
                wxString fName,
@@ -327,9 +325,9 @@ bool ExportMP2::Export(AudacityProject *project,
    return !cancelling;
 }
 
-bool ExportMP2::DisplayOptions(AudacityProject *project, int format)
+bool ExportMP2::DisplayOptions(wxWindow *parent, int format)
 {
-   ExportMP2Options od(project);
+   ExportMP2Options od(parent);
 
    od.ShowModal();
 
diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
index e0ac1df..40696f1 100644
--- a/src/export/ExportMP3.cpp
+++ b/src/export/ExportMP3.cpp
@@ -63,6 +63,7 @@
 
 #include <wx/choice.h>
 #include <wx/dynlib.h>
+#include <wx/ffile.h>
 #include <wx/intl.h>
 #include <wx/log.h>
 #include <wx/mimetype.h>
@@ -76,7 +77,6 @@
 
 #include "../Audacity.h"
 #include "../float_cast.h"
-#include "../FileIO.h"
 #include "../Internat.h"
 #include "../Mix.h"
 #include "../Prefs.h"
@@ -89,6 +89,8 @@
 
 #include "Export.h"
 
+#include "lame.h"
+
 #ifdef USE_LIBID3TAG 
 #include <id3tag.h>
 #endif
@@ -197,7 +199,7 @@ static CHOICES setRates[] =
 
 static CHOICES sampRates[] =
 {
-   {wxT(""),  8000     },
+   {wxT(""),  8000    },
    {wxT(""), 11025    },
    {wxT(""), 12000    },
    {wxT(""), 16000    },
@@ -299,10 +301,8 @@ END_EVENT_TABLE()
 /// 
 /// 
 ExportMP3Options::ExportMP3Options(wxWindow *parent)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify MP3 Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify MP3 Options")))
 {
    InitMP3_Statics();
    ShuttleGui S(this, eIsCreatingFromPrefs);
@@ -576,7 +576,7 @@ public:
             }
             S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
             S.AddVariableText(_("To get a free copy of Lame, click here -->"), true);
-            S.Id(ID_DLOAD).AddButton(_("Download..."), wxALIGN_RIGHT);
+            S.Id(ID_DLOAD).AddButton(_("Download"), wxALIGN_RIGHT);
          }
          S.EndMultiColumn();
 
@@ -615,7 +615,7 @@ public:
 
    void OnDownload(wxCommandEvent & event)
    {
-      wxString page = wxT("http://audacity.sourceforge.net/help/faq?s=install&i=lame-mp3");
+      wxString page = wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23How_do_I_download_and_install_the_LAME_MP3_encoder.3F");
       ::OpenInDefaultBrowser(page);
    }
 
@@ -646,15 +646,103 @@ END_EVENT_TABLE()
 // MP3Exporter
 //----------------------------------------------------------------------------
 
+typedef lame_global_flags *lame_init_t(void);
+typedef int lame_init_params_t(lame_global_flags*);
+typedef const char* get_lame_version_t(void);
+
+typedef int lame_encode_buffer_t (
+      lame_global_flags* gf,
+      const short int    buffer_l [],
+      const short int    buffer_r [],
+      const int          nsamples,
+      unsigned char *    mp3buf,
+      const int          mp3buf_size );
+
+typedef int lame_encode_buffer_interleaved_t(
+      lame_global_flags* gf,
+      short int          pcm[],
+      int                num_samples,   /* per channel */
+      unsigned char*     mp3buf,
+      int                mp3buf_size );
+
+typedef int lame_encode_flush_t(
+      lame_global_flags *gf,
+      unsigned char*     mp3buf,
+      int                size );
+
+typedef int lame_close_t(lame_global_flags*);
+
+typedef int lame_set_in_samplerate_t(lame_global_flags*, int);
+typedef int lame_set_out_samplerate_t(lame_global_flags*, int);
+typedef int lame_set_num_channels_t(lame_global_flags*, int );
+typedef int lame_set_quality_t(lame_global_flags*, int);
+typedef int lame_set_brate_t(lame_global_flags*, int);
+typedef int lame_set_VBR_t(lame_global_flags *, vbr_mode);
+typedef int lame_set_VBR_q_t(lame_global_flags *, int);
+typedef int lame_set_VBR_min_bitrate_kbps_t(lame_global_flags *, int);
+typedef int lame_set_mode_t(lame_global_flags *, MPEG_mode);
+typedef int lame_set_preset_t(lame_global_flags *, int);
+typedef int lame_set_error_protection_t(lame_global_flags *, int);
+typedef int lame_set_disable_reservoir_t(lame_global_flags *, int);
+typedef int lame_set_padding_type_t(lame_global_flags *, Padding_type);
+typedef int lame_set_bWriteVbrTag_t(lame_global_flags *, int);
+typedef size_t lame_get_lametag_frame_t(const lame_global_flags *, unsigned char* buffer, size_t size);
+typedef void lame_mp3_tags_fid_t(lame_global_flags *, FILE *);
+
+#if defined(__WXMSW__)
+// An alternative solution to give Windows an additional chance of writing the tag before
+// falling bato to lame_mp3_tag_fid().  The latter can have DLL sharing issues when mixing
+// Debug/Release builds of Audacity and the lame DLL.
+typedef unsigned long beWriteInfoTag_t(lame_global_flags *, char *);
+
+// We use this to determine if the user has selected an older, Blade API only, lame_enc.dll
+// so we can be more specific about why their library isn't acceptable.
+typedef struct	{
+
+	// BladeEnc DLL Version number
+
+	BYTE	byDLLMajorVersion;
+	BYTE	byDLLMinorVersion;
+
+	// BladeEnc Engine Version Number
+
+	BYTE	byMajorVersion;
+	BYTE	byMinorVersion;
+
+	// DLL Release date
+
+	BYTE	byDay;
+	BYTE	byMonth;
+	WORD	wYear;
+
+	// BladeEnc	Homepage URL
+
+	CHAR	zHomepage[129];	
+
+	BYTE	byAlphaLevel;
+	BYTE	byBetaLevel;
+	BYTE	byMMXEnabled;
+
+	BYTE	btReserved[125];
+} be_version;
+typedef void beVersion_t(be_version *);
+#endif
+
 class MP3Exporter
 {
 public:
+   enum AskUser
+   {
+      No,
+      Maybe,
+      Yes
+   };
 
    MP3Exporter();
    virtual ~MP3Exporter();
 
    bool FindLibrary(wxWindow *parent);
-   bool LoadLibrary(wxWindow *parent, bool askuser);
+   bool LoadLibrary(wxWindow *parent, AskUser askuser);
    bool ValidLibraryLoaded();
 
    /* These global settings keep state over the life of the object */
@@ -666,55 +754,100 @@ public:
    /* Virtual methods that must be supplied by library interfaces */
 
    /* initialize the library interface */
-   virtual bool InitLibrary(wxString libpath) = 0;
-   virtual void FreeLibrary() = 0;
+   bool InitLibrary(wxString libpath);
+   void FreeLibrary();
 
    /* get library info */
-   virtual wxString GetLibraryVersion() = 0;
-   virtual wxString GetLibraryName() = 0;
-   virtual wxString GetLibraryPath() = 0;
-   virtual wxString GetLibraryTypeString() = 0;
+   wxString GetLibraryVersion();
+   wxString GetLibraryName();
+   wxString GetLibraryPath();
+   wxString GetLibraryTypeString();
 
    /* returns the number of samples PER CHANNEL to send for each call to EncodeBuffer */
-   virtual int InitializeStream(int channels, int sampleRate) = 0;
+   int InitializeStream(int channels, int sampleRate);
 
    /* In bytes. must be called AFTER InitializeStream */
-   virtual int GetOutBufferSize() = 0;
+   int GetOutBufferSize();
 
    /* returns the number of bytes written. input is interleaved if stereo*/
-   virtual int EncodeBuffer(short int inbuffer[], unsigned char outbuffer[]) = 0;
-   virtual int EncodeRemainder(short int inbuffer[], int nSamples,
-                               unsigned char outbuffer[]) = 0;
+   int EncodeBuffer(short int inbuffer[], unsigned char outbuffer[]);
+   int EncodeRemainder(short int inbuffer[], int nSamples,
+                       unsigned char outbuffer[]);
 
-   virtual int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[]) = 0;
-   virtual int EncodeRemainderMono(short int inbuffer[], int nSamples,
-                                   unsigned char outbuffer[]) = 0;
+   int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[]);
+   int EncodeRemainderMono(short int inbuffer[], int nSamples,
+                           unsigned char outbuffer[]);
 
-   virtual int FinishStream(unsigned char outbuffer[]) = 0;
-   virtual void CancelEncoding() = 0;
+   int FinishStream(unsigned char outbuffer[]);
+   void CancelEncoding();
 
-protected:
+   void PutInfoTag(wxFFile & f, wxFileOffset off);
 
-   wxString mLibPath;
+private:
 
+   wxString mLibPath;
+   wxDynamicLibrary lame_lib;
    bool mLibraryLoaded;
-   bool mEncoding;
 
+#if defined(__WXMSW__)
+   wxString mBladeVersion;
+#endif
+
+   bool mEncoding;
    int mMode;
    int mBitrate;
    int mQuality;
    int mRoutine;
    int mChannel;
-};
 
-//----------------------------------------------------------------------------
-// MP3Exporter
-//----------------------------------------------------------------------------
+   /* function pointers to the symbols we get from the library */
+   lame_init_t* lame_init;
+   lame_init_params_t* lame_init_params;
+   lame_encode_buffer_t* lame_encode_buffer;
+   lame_encode_buffer_interleaved_t* lame_encode_buffer_interleaved;
+   lame_encode_flush_t* lame_encode_flush;
+   lame_close_t* lame_close;
+   get_lame_version_t* get_lame_version;
+   
+   lame_set_in_samplerate_t* lame_set_in_samplerate;
+   lame_set_out_samplerate_t* lame_set_out_samplerate;
+   lame_set_num_channels_t* lame_set_num_channels;
+   lame_set_quality_t* lame_set_quality;
+   lame_set_brate_t* lame_set_brate;
+   lame_set_VBR_t* lame_set_VBR;
+   lame_set_VBR_q_t* lame_set_VBR_q;
+   lame_set_VBR_min_bitrate_kbps_t* lame_set_VBR_min_bitrate_kbps;
+   lame_set_mode_t* lame_set_mode;
+   lame_set_preset_t* lame_set_preset;
+   lame_set_error_protection_t* lame_set_error_protection;
+   lame_set_disable_reservoir_t *lame_set_disable_reservoir;
+   lame_set_padding_type_t *lame_set_padding_type;
+   lame_set_bWriteVbrTag_t *lame_set_bWriteVbrTag;
+   lame_get_lametag_frame_t *lame_get_lametag_frame;
+   lame_mp3_tags_fid_t *lame_mp3_tags_fid;
+#if defined(__WXMSW__)
+   beWriteInfoTag_t *beWriteInfoTag;
+   beVersion_t *beVersion;
+#endif
+
+   lame_global_flags *mGF;
+
+   static const int mSamplesPerChunk = 220500;
+   // See lame.h/lame_encode_buffer() for further explanation
+   // As coded here, this should be the worst case.
+   static const int mOutBufferSize = 
+      mSamplesPerChunk * (320 / 8) / 8 + 4 * 1152 * (320 / 8) / 8 + 512;
+
+   // See MAXFRAMESIZE in libmp3lame/VbrTag.c for explanation of 2880.
+   unsigned char mInfoTagBuf[2880];
+   size_t mInfoTagLen;
+};
 
 MP3Exporter::MP3Exporter()
 {
    mLibraryLoaded = false;
    mEncoding = false;
+   mGF = NULL;
 
    if (gPrefs) {
       mLibPath = gPrefs->Read(wxT("/MP3/MP3LibPath"), wxT(""));
@@ -729,6 +862,7 @@ MP3Exporter::MP3Exporter()
 
 MP3Exporter::~MP3Exporter()
 {
+   FreeLibrary();
 }
 
 bool MP3Exporter::FindLibrary(wxWindow *parent)
@@ -767,7 +901,7 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
    return true;
 }
 
-bool MP3Exporter::LoadLibrary(wxWindow *parent, bool askuser)
+bool MP3Exporter::LoadLibrary(wxWindow *parent, AskUser askuser)
 {
    wxLogNull logNo;
 
@@ -776,6 +910,10 @@ bool MP3Exporter::LoadLibrary(wxWindow *parent, bool askuser)
       mLibraryLoaded = false;
    }
 
+#if defined(__WXMSW__)
+   mBladeVersion.Empty();
+#endif
+
    // First try loading it from a previously located path
    if (!mLibPath.IsEmpty()) {
       mLibraryLoaded = InitLibrary(mLibPath);
@@ -796,13 +934,19 @@ bool MP3Exporter::LoadLibrary(wxWindow *parent, bool askuser)
 
    // If not successful, must ask the user
    if (!ValidLibraryLoaded()) {
-      if (askuser && FindLibrary(parent)) {
+      if (askuser == MP3Exporter::Maybe && FindLibrary(parent)) {
          mLibraryLoaded = InitLibrary(mLibPath);
       }
    }
 
    // Oh well, just give up
    if (!ValidLibraryLoaded()) {
+#if defined(__WXMSW__)
+      if (askuser && !mBladeVersion.IsEmpty()) {
+         wxMessageBox(mBladeVersion);
+      }
+#endif
+
       return false;
    }
 
@@ -835,328 +979,390 @@ void MP3Exporter::SetChannel(int mode)
    mChannel = mode;
 }
 
-//----------------------------------------------------------------------------
-// LameExporter
-//----------------------------------------------------------------------------
-
-#if defined(__WXMSW__)
-
-#include "BladeMP3EncDLL.h"
-
-class LameExporter : public MP3Exporter
+bool MP3Exporter::InitLibrary(wxString libpath)
 {
-public:
-   LameExporter() : MP3Exporter()
-   {
+   if (!lame_lib.Load(libpath, wxDL_LAZY)) {
+      return false;
    }
 
-   ~LameExporter()
-   {
-      FreeLibrary();
-   }
+   lame_init = (lame_init_t *)
+      lame_lib.GetSymbol(wxT("lame_init"));
+   get_lame_version = (get_lame_version_t *)
+      lame_lib.GetSymbol(wxT("get_lame_version"));
+   lame_init_params = (lame_init_params_t *)
+      lame_lib.GetSymbol(wxT("lame_init_params"));
+   lame_encode_buffer = (lame_encode_buffer_t *)
+      lame_lib.GetSymbol(wxT("lame_encode_buffer"));
+   lame_encode_buffer_interleaved = (lame_encode_buffer_interleaved_t *)
+      lame_lib.GetSymbol(wxT("lame_encode_buffer_interleaved"));
+   lame_encode_flush = (lame_encode_flush_t *)
+      lame_lib.GetSymbol(wxT("lame_encode_flush"));
+   lame_close = (lame_close_t *)
+      lame_lib.GetSymbol(wxT("lame_close"));
+
+   lame_set_in_samplerate = (lame_set_in_samplerate_t *)
+       lame_lib.GetSymbol(wxT("lame_set_in_samplerate"));
+   lame_set_out_samplerate = (lame_set_out_samplerate_t *)
+       lame_lib.GetSymbol(wxT("lame_set_out_samplerate"));
+   lame_set_num_channels = (lame_set_num_channels_t *)
+       lame_lib.GetSymbol(wxT("lame_set_num_channels"));
+   lame_set_quality = (lame_set_quality_t *)
+       lame_lib.GetSymbol(wxT("lame_set_quality"));
+   lame_set_brate = (lame_set_brate_t *)
+       lame_lib.GetSymbol(wxT("lame_set_brate"));
+   lame_set_VBR = (lame_set_VBR_t *)
+       lame_lib.GetSymbol(wxT("lame_set_VBR"));
+   lame_set_VBR_q = (lame_set_VBR_q_t *)
+       lame_lib.GetSymbol(wxT("lame_set_VBR_q"));
+   lame_set_VBR_min_bitrate_kbps = (lame_set_VBR_min_bitrate_kbps_t *)
+       lame_lib.GetSymbol(wxT("lame_set_VBR_min_bitrate_kbps"));
+   lame_set_mode = (lame_set_mode_t *) 
+       lame_lib.GetSymbol(wxT("lame_set_mode"));
+   lame_set_preset = (lame_set_preset_t *)
+       lame_lib.GetSymbol(wxT("lame_set_preset"));
+   lame_set_error_protection = (lame_set_error_protection_t *)
+       lame_lib.GetSymbol(wxT("lame_set_error_protection"));
+   lame_set_disable_reservoir = (lame_set_disable_reservoir_t *)
+       lame_lib.GetSymbol(wxT("lame_set_disable_reservoir"));
+   lame_set_padding_type = (lame_set_padding_type_t *)
+       lame_lib.GetSymbol(wxT("lame_set_padding_type"));
+   lame_set_bWriteVbrTag = (lame_set_bWriteVbrTag_t *)
+       lame_lib.GetSymbol(wxT("lame_set_bWriteVbrTag"));
+
+   // These are optional
+   lame_get_lametag_frame = (lame_get_lametag_frame_t *)
+       lame_lib.GetSymbol(wxT("lame_get_lametag_frame"));
+   lame_mp3_tags_fid = (lame_mp3_tags_fid_t *)
+       lame_lib.GetSymbol(wxT("lame_mp3_tags_fid"));
+#if defined(__WXMSW__)
+   beWriteInfoTag = (beWriteInfoTag_t *)
+       lame_lib.GetSymbol(wxT("beWriteInfoTag"));
+   beVersion = (beVersion_t *)
+       lame_lib.GetSymbol(wxT("beVersion"));
+#endif
 
-   bool InitLibrary(wxString libpath)
+   if (!lame_init ||
+      !get_lame_version ||
+      !lame_init_params ||
+      !lame_encode_buffer ||
+      !lame_encode_buffer_interleaved ||
+      !lame_encode_flush ||
+      !lame_close ||
+      !lame_set_in_samplerate ||
+      !lame_set_out_samplerate ||
+      !lame_set_num_channels ||
+      !lame_set_quality ||
+      !lame_set_brate ||
+      !lame_set_VBR ||
+      !lame_set_VBR_q ||
+      !lame_set_mode ||
+      !lame_set_preset ||
+      !lame_set_error_protection ||
+      !lame_set_disable_reservoir ||
+      !lame_set_padding_type ||
+      !lame_set_bWriteVbrTag)
    {
-      if (!lame_lib.Load(libpath, wxDL_LAZY)) {
-         return false;
+#if defined(__WXMSW__)
+      if (beVersion) {
+         be_version v;
+         beVersion(&v);
+
+         mBladeVersion.Printf(_("You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\nPlease download the latest version of the LAME MP3 library."),
+                              v.byMajorVersion,
+                              v.byMinorVersion,
+                              AUDACITY_VERSION,
+                              AUDACITY_RELEASE,
+                              AUDACITY_REVISION);
       }
+#endif
 
-      beInitStream = (BEINITSTREAM) lame_lib.GetSymbol(wxT("beInitStream"));
-      beEncodeChunk = (BEENCODECHUNK) lame_lib.GetSymbol(wxT("beEncodeChunk"));
-      beDeinitStream = (BEDEINITSTREAM) lame_lib.GetSymbol(wxT("beDeinitStream"));
-      beCloseStream = (BECLOSESTREAM) lame_lib.GetSymbol(wxT("beCloseStream"));
-      beVersion = (BEVERSION) lame_lib.GetSymbol(wxT("beVersion"));
-
-      if (!beInitStream ||
-         !beEncodeChunk ||
-         !beDeinitStream ||
-         !beCloseStream ||
-         !beVersion) {
-         return false;
-      }
+      lame_lib.Unload();
+      return false;
+   }
 
-      return true;
+   mGF = lame_init();
+   if (mGF == NULL) {
+      return false;
    }
 
-   void FreeLibrary()
-   {
-      lame_lib.Unload();
+   return true;
+}
 
-      return;
+void MP3Exporter::FreeLibrary()
+{
+   if (mGF) {
+      lame_close(mGF);
+      mGF = NULL;
    }
 
-   wxString GetLibraryVersion()
-   {
-      BE_VERSION ver;
+   lame_lib.Unload();
 
-      if (!mLibraryLoaded) {
-         return wxT("");
-      }
+   return;
+}
+
+wxString MP3Exporter::GetLibraryVersion()
+{
+   if (!mLibraryLoaded) {
+      return wxT("");
+   }
+
+   return wxString::Format(wxT("LAME %hs"), get_lame_version());
+}
 
-      beVersion(&ver);
+int MP3Exporter::InitializeStream(int channels, int sampleRate)
+{
+   if (!mLibraryLoaded) {
+      return -1;
+   }
 
-      return wxString::Format(wxT("LAME v%d.%d"), ver.byMajorVersion, ver.byMinorVersion);
+   if (channels > 2) {
+      return -1;
    }
 
-   int InitializeStream(int channels, int sampleRate)
-   {
-      if (!mLibraryLoaded) {
-         return -1;
-      }
+   lame_set_error_protection(mGF, false);
+   lame_set_num_channels(mGF, channels);
+   lame_set_in_samplerate(mGF, sampleRate);
+   lame_set_out_samplerate(mGF, sampleRate);
+   lame_set_disable_reservoir(mGF, true);
+   lame_set_padding_type(mGF, PAD_NO);
 
-      if (channels > 2) {
-         return -1;
-      }
+   // Add the VbrTag for all types.  For ABR/VBR, a Xing tag will be created.
+   // For CBR, it will be a Lame Info tag.
+   lame_set_bWriteVbrTag(mGF, true);
 
-      // Set config defaults to sane values
-      memset(&mConf, 0, CURRENT_STRUCT_SIZE);
-      mConf.dwConfig = BE_CONFIG_LAME;
-      mConf.format.LHV1.dwStructVersion = CURRENT_STRUCT_VERSION;
-      mConf.format.LHV1.dwStructSize = CURRENT_STRUCT_SIZE;
-      mConf.format.LHV1.nPreset = LQP_NOPRESET;
-      mConf.format.LHV1.dwMpegVersion = MPEG1;
-      mConf.format.LHV1.bCRC = true;
-      mConf.format.LHV1.bNoRes = true;
-      mConf.format.LHV1.dwSampleRate = sampleRate;
-      mConf.format.LHV1.dwReSampleRate = sampleRate;
-      mConf.format.LHV1.dwBitrate = mBitrate;
-
-      // Set the VBR quality or ABR/CBR bitrate
-      switch (mMode) {
-         case MODE_SET:
-         {
-            int preset;
+   // Set the VBR quality or ABR/CBR bitrate
+   switch (mMode) {
+      case MODE_SET:
+      {
+         int preset;
 
-            if (mQuality == PRESET_INSANE) {
-               preset = LQP_INSANE;
+         if (mQuality == PRESET_INSANE) {
+            preset = INSANE;
+         }
+         else if (mRoutine == ROUTINE_FAST) {
+            if (mQuality == PRESET_EXTREME) {
+               preset = EXTREME_FAST;
             }
-            else if (mRoutine == ROUTINE_FAST) {
-               if (mQuality == PRESET_EXTREME) {
-                  preset = LQP_FAST_EXTREME;
-               }
-               else if (mQuality == PRESET_STANDARD) {
-                  preset = LQP_FAST_STANDARD;
-               }
-               else {
-                  preset = 14;   // Not defined until 3.96
-               }
+            else if (mQuality == PRESET_STANDARD) {
+               preset = STANDARD_FAST;
             }
             else {
-               if (mQuality == PRESET_EXTREME) {
-                  preset = LQP_EXTREME;
-               }
-               else if (mQuality == PRESET_STANDARD) {
-                  preset = LQP_STANDARD;
-               }
-               else {
-                  preset = 13;   // Not defined until 3.96
-               }
+               preset = 1007;    // Not defined until 3.96
+            }
+         }
+         else {
+            if (mQuality == PRESET_EXTREME) {
+               preset = EXTREME;
+            }
+            else if (mQuality == PRESET_STANDARD) {
+               preset = STANDARD;
+            }
+            else {
+               preset = 1006;    // Not defined until 3.96
             }
-
-             mConf.format.LHV1.nPreset = preset;
          }
-         break;
-
-         case MODE_VBR:
-            mConf.format.LHV1.bEnableVBR = true;
-            mConf.format.LHV1.nVbrMethod = mRoutine == ROUTINE_STANDARD ?
-                                           VBR_METHOD_OLD :
-                                           VBR_METHOD_NEW;
-            mConf.format.LHV1.nVBRQuality = mQuality;
-         break;
-
-         case MODE_ABR:
-            mConf.format.LHV1.bEnableVBR = true;
-            mConf.format.LHV1.nVbrMethod = VBR_METHOD_ABR;
-            mConf.format.LHV1.dwVbrAbr_bps = mBitrate * 1000;
-         break;
-
-         default:
-            mConf.format.LHV1.bEnableVBR = false;
-            mConf.format.LHV1.nVbrMethod = VBR_METHOD_NONE;
-            mConf.format.LHV1.dwBitrate = mBitrate;
-         break;
-      }
 
-      // Set the channel mode
-      int mode;
-      if (channels == 1) {
-         mode = BE_MP3_MODE_MONO;
-      }
-      else if (mChannel == CHANNEL_JOINT) {
-         mode = BE_MP3_MODE_JSTEREO;
-      }
-      else {
-         mode = BE_MP3_MODE_STEREO;
+         lame_set_preset(mGF, preset);
       }
-      mConf.format.LHV1.nMode = mode;
+      break;
 
-      if (beInitStream(&mConf, &mInSampleNum, &mOutBufferSize, &mStreamHandle)) {
-         return -1;
-      }
+      case MODE_VBR:
+         lame_set_VBR(mGF, (mRoutine == ROUTINE_STANDARD ? vbr_rh : vbr_mtrh ));
+         lame_set_VBR_q(mGF, mQuality);
+      break;
 
-      mEncoding = true;
+      case MODE_ABR:
+         lame_set_preset(mGF, mBitrate );
+      break;
 
-      return (mInSampleNum / channels); /* convert samples_total into samples_per_channel */
+      default:
+         lame_set_VBR(mGF, vbr_off);
+         lame_set_brate(mGF, mBitrate);
+      break;
    }
 
-   int GetOutBufferSize()
-   {
-      if (!mEncoding)
-         return -1;
+   // Set the channel mode
+   MPEG_mode mode;
+   if (channels == 1) {
+      mode = MONO;
+   }
+   else if (mChannel == CHANNEL_JOINT) {
+      mode = JOINT_STEREO;
+   }
+   else {
+      mode = STEREO;
+   }
+   lame_set_mode(mGF, mode);
 
-      return mOutBufferSize;
+   int rc = lame_init_params(mGF);
+   if (rc < 0) {
+      return rc;
    }
 
-   int EncodeBuffer(short int inbuffer[], unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
-      
-      unsigned long bytes;
-      if (beEncodeChunk(mStreamHandle, mInSampleNum, inbuffer, outbuffer, &bytes)) {
-         return -1;
-      }
+#if 0
+   dump_config(mGF);
+#endif
 
-      return bytes;
-   }
+   mInfoTagLen = 0;
+   mEncoding = true;
 
-   int EncodeRemainder(short int inbuffer[], int nSamples, unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
+   return mSamplesPerChunk;
+}
 
-      unsigned long bytes;
-      if (beEncodeChunk(mStreamHandle, nSamples, inbuffer, outbuffer, &bytes)) {
-         return -1;
-      }
+int MP3Exporter::GetOutBufferSize()
+{
+   if (!mEncoding)
+      return -1;
 
-      return bytes;
-   }
+   return mOutBufferSize;
+}
 
-   int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[])
-   {
-      return EncodeBuffer(inbuffer, outbuffer);
+int MP3Exporter::EncodeBuffer(short int inbuffer[], unsigned char outbuffer[])
+{
+   if (!mEncoding) {
+      return -1;
    }
 
-   int EncodeRemainderMono(short int inbuffer[], int nSamples,
-                     unsigned char outbuffer[])
-   {
-      return EncodeRemainder(inbuffer, nSamples, outbuffer);
+   return lame_encode_buffer_interleaved(mGF, inbuffer, mSamplesPerChunk,
+      outbuffer, mOutBufferSize);
+}
+
+int MP3Exporter::EncodeRemainder(short int inbuffer[], int nSamples,
+                  unsigned char outbuffer[])
+{
+   if (!mEncoding) {
+      return -1;
    }
 
-   int FinishStream(unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
+   return lame_encode_buffer_interleaved(mGF, inbuffer, nSamples, outbuffer,
+      mOutBufferSize);
+}
 
-      unsigned long bytes;
-      if (beDeinitStream(mStreamHandle, outbuffer, &bytes)) {
-         return -1;
-      }
+int MP3Exporter::EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[])
+{
+   if (!mEncoding) {
+      return -1;
+   }
 
-      if (beCloseStream(mStreamHandle)) {
-         return -1;
-      }
+   return lame_encode_buffer(mGF, inbuffer,inbuffer, mSamplesPerChunk,
+      outbuffer, mOutBufferSize);
+}
 
-      mEncoding = false;
+int MP3Exporter::EncodeRemainderMono(short int inbuffer[], int nSamples,
+                  unsigned char outbuffer[])
+{
+   if (!mEncoding) {
+      return -1;
+   }
 
-      return bytes;
+   return lame_encode_buffer(mGF, inbuffer, inbuffer, nSamples, outbuffer,
+      mOutBufferSize);
+}
+
+int MP3Exporter::FinishStream(unsigned char outbuffer[])
+{
+   if (!mEncoding) {
+      return -1;
    }
 
-   void CancelEncoding()
-   {
-      if (!mEncoding) {
-         return;
-      }
+   mEncoding = false;
 
-      beCloseStream(mStreamHandle);
+   int result = lame_encode_flush(mGF, outbuffer, mOutBufferSize);
 
-      return;
-   }
-   /* note these values are for Windows only - Mac and Unix have their own
-    * sections elsewhere */
-   wxString GetLibraryPath()
-   {
-      return wxT("");
+   if (lame_get_lametag_frame) {
+      mInfoTagLen = lame_get_lametag_frame(mGF, mInfoTagBuf, sizeof(mInfoTagBuf));
    }
 
-   wxString GetLibraryName()
-   {
-      return wxT("lame_enc.dll");
+   return result;
+}
+
+void MP3Exporter::CancelEncoding()
+{
+   mEncoding = false;
+}
+
+void MP3Exporter::PutInfoTag(wxFFile & f, wxFileOffset off)
+{
+   if (mGF) {
+      if (mInfoTagLen > 0) {
+         f.Seek(off, wxFromStart);
+         f.Write(mInfoTagBuf, mInfoTagLen);
+      }
+#if defined(__WXMSW__)
+      else if (beWriteInfoTag) {
+         f.Flush();
+         beWriteInfoTag(mGF, OSFILENAME(f.GetName()));
+      }
+#endif
+      else if (lame_mp3_tags_fid) {   
+         lame_mp3_tags_fid(mGF, f.fp());
+      }
    }
-   
-   wxString GetLibraryTypeString()
-   {
-      return _("Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*");
+
+   f.SeekEnd();
+}
+
+#if defined(__WXMSW__)
+/* values for Windows */
+
+wxString MP3Exporter::GetLibraryPath()
+{
+   wxRegKey reg(wxT("HKEY_LOCAL_MACHINE\\Software\\Lame for Audacity"));
+   wxString path;
+
+   if (reg.Exists()) {
+      reg.QueryValue(wxT("InstallPath"), path);
    }
-   
-private:
-   wxDynamicLibrary lame_lib;
 
-   BE_CONFIG mConf;
-   HBE_STREAM mStreamHandle;
-   unsigned long mOutBufferSize;
-   unsigned long mInSampleNum;
+   return path;
+}
 
-   /* function pointers to the symbols we get from the library */
-   BEINITSTREAM beInitStream;
-   BEENCODECHUNK beEncodeChunk;
-   BEDEINITSTREAM beDeinitStream;
-   BECLOSESTREAM beCloseStream;
-   BEVERSION beVersion;
-};
+wxString MP3Exporter::GetLibraryName()
+{
+   return wxT("lame_enc.dll");
+}
 
-#else //__WXMSW__
+wxString MP3Exporter::GetLibraryTypeString()
+{
+   return _("Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*");
+}
 
-#include <dlfcn.h>
-#include "lame.h"
+#elif defined(__WXMAC__)
+/* values for Mac OS X */
 
-/* --------------------------------------------------------------------------*/
+wxString MP3Exporter::GetLibraryPath()
+{
+   return wxT("/usr/local/lib/audacity");
+}
 
-typedef lame_global_flags *lame_init_t(void);
-typedef int lame_init_params_t(lame_global_flags*);
-typedef const char* get_lame_version_t(void);
+wxString MP3Exporter::GetLibraryName()
+{
+   return wxT("libmp3lame.dylib");
+}
 
-typedef int lame_encode_buffer_t (
-      lame_global_flags* gf,
-      const short int    buffer_l [],
-      const short int    buffer_r [],
-      const int          nsamples,
-      unsigned char *    mp3buf,
-      const int          mp3buf_size );
+wxString MP3Exporter::GetLibraryTypeString()
+{
+   return wxString(_("Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"));
+}
 
-typedef int lame_encode_buffer_interleaved_t(
-      lame_global_flags* gf,
-      short int          pcm[],
-      int                num_samples,   /* per channel */
-      unsigned char*     mp3buf,
-      int                mp3buf_size );
+#else //!__WXMAC__
+/* Values for Linux / Unix systems */
 
-typedef int lame_encode_flush_t(
-      lame_global_flags *gf,
-      unsigned char*     mp3buf,
-      int                size );
+wxString MP3Exporter::GetLibraryPath()
+{
+   return wxT(LIBDIR);
+}
 
-typedef int lame_close_t(lame_global_flags*);
+wxString MP3Exporter::GetLibraryName()
+{
+   return wxT("libmp3lame.so.0");
+}
 
-typedef int lame_set_in_samplerate_t(lame_global_flags*, int);
-typedef int lame_set_out_samplerate_t(lame_global_flags*, int);
-typedef int lame_set_num_channels_t(lame_global_flags*, int );
-typedef int lame_set_quality_t(lame_global_flags*, int);
-typedef int lame_set_brate_t(lame_global_flags*, int);
-typedef int lame_set_VBR_t(lame_global_flags *, vbr_mode);
-typedef int lame_set_VBR_q_t(lame_global_flags *, int);
-typedef int lame_set_VBR_min_bitrate_kbps_t(lame_global_flags *, int);
-typedef int lame_set_mode_t(lame_global_flags *, MPEG_mode);
-typedef int lame_set_preset_t(lame_global_flags *, int);
-typedef int lame_set_error_protection_t(lame_global_flags *, int);
-typedef int lame_set_disable_reservoir_t(lame_global_flags *, int);
-typedef int lame_set_padding_type_t(lame_global_flags *, Padding_type);
-typedef int lame_set_bWriteVbrTag_t(lame_global_flags *, int);
+wxString MP3Exporter::GetLibraryTypeString()
+{
+   return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
+}
+#endif
 
 #if 0
 // Debug routine from BladeMP3EncDLL.c in the libmp3lame distro
@@ -1246,365 +1452,6 @@ static void dump_config( 	lame_global_flags*	gfp )
 	wxPrintf(wxT("Experimental Y         =%d\n"), lame_get_experimentalY( gfp ) );
 	wxPrintf(wxT("Experimental Z         =%d\n"), lame_get_experimentalZ( gfp ) );
 }
-#endif //!__WXMSW__ 
-
-/* --------------------------------------------------------------------------*/
-
-class LameExporter : public MP3Exporter
-{
-public:
-   LameExporter() : MP3Exporter()
-   {
-      mLib = NULL;
-      mGF = NULL;
-   }
-
-   ~LameExporter()
-   {
-      FreeLibrary();
-   }
-
-   bool InitLibrary(wxString libpath)
-   {
-      // Until wxWidgets supports Dynamic Libraries (dylib) on the Mac, we just use
-      // dlopen() and friends to support nixes.
-
-      mLib = dlopen(OSFILENAME(libpath), RTLD_LAZY);
-      if (mLib == NULL) {
-         return false;
-      }
-
-      // These strings should not be translated or unicode enabled
-
-      lame_init = (lame_init_t *)
-         dlsym(mLib, "lame_init");
-      get_lame_version = (get_lame_version_t *)
-         dlsym(mLib, "get_lame_version");
-      lame_init_params = (lame_init_params_t *)
-         dlsym(mLib, "lame_init_params");
-      lame_encode_buffer = (lame_encode_buffer_t *)
-         dlsym(mLib, "lame_encode_buffer");
-      lame_encode_buffer_interleaved = (lame_encode_buffer_interleaved_t *)
-         dlsym(mLib, "lame_encode_buffer_interleaved");
-      lame_encode_flush = (lame_encode_flush_t *)
-         dlsym(mLib, "lame_encode_flush");
-      lame_close = (lame_close_t *)
-         dlsym(mLib, "lame_close");
-
-      lame_set_in_samplerate = (lame_set_in_samplerate_t *)
-          dlsym(mLib, "lame_set_in_samplerate");
-      lame_set_out_samplerate = (lame_set_out_samplerate_t *)
-          dlsym(mLib, "lame_set_out_samplerate");
-      lame_set_num_channels = (lame_set_num_channels_t *)
-          dlsym(mLib, "lame_set_num_channels");
-      lame_set_quality = (lame_set_quality_t *)
-          dlsym(mLib, "lame_set_quality");
-      lame_set_brate = (lame_set_brate_t *)
-          dlsym(mLib, "lame_set_brate");
-      lame_set_VBR = (lame_set_VBR_t *)
-          dlsym(mLib, "lame_set_VBR");
-      lame_set_VBR_q = (lame_set_VBR_q_t *)
-          dlsym(mLib, "lame_set_VBR_q");
-      lame_set_VBR_min_bitrate_kbps = (lame_set_VBR_min_bitrate_kbps_t *)
-          dlsym(mLib, "lame_set_VBR_min_bitrate_kbps");
-      lame_set_mode = (lame_set_mode_t *) 
-          dlsym(mLib, "lame_set_mode");
-      lame_set_preset = (lame_set_preset_t *)
-          dlsym(mLib, "lame_set_preset");
-      lame_set_error_protection = (lame_set_error_protection_t *)
-          dlsym(mLib, "lame_set_error_protection");
-      lame_set_disable_reservoir = (lame_set_disable_reservoir_t *)
-          dlsym(mLib, "lame_set_disable_reservoir");
-      lame_set_padding_type = (lame_set_padding_type_t *)
-          dlsym(mLib, "lame_set_padding_type");
-      lame_set_bWriteVbrTag = (lame_set_bWriteVbrTag_t *)
-          dlsym(mLib, "lame_set_bWriteVbrTag");
-      
-      /* we assume that if all the symbols are found, it's a valid library */
-
-      if (!lame_init ||
-         !get_lame_version ||
-         !lame_init_params ||
-         !lame_encode_buffer ||
-         !lame_encode_buffer_interleaved ||
-         !lame_encode_flush ||
-         !lame_close ||
-         !lame_set_in_samplerate ||
-         !lame_set_out_samplerate ||
-         !lame_set_num_channels ||
-         !lame_set_quality ||
-         !lame_set_brate ||
-         !lame_set_VBR ||
-         !lame_set_VBR_q ||
-         !lame_set_mode ||
-         !lame_set_preset ||
-         !lame_set_error_protection ||
-         !lame_set_disable_reservoir ||
-         !lame_set_padding_type ||
-         !lame_set_bWriteVbrTag) {
-         return false;
-      }
-
-      mGF = lame_init();
-
-      return true;
-   }
-
-   void FreeLibrary()
-   {
-      if (mLib) {
-         dlclose(mLib);
-         mLib = NULL;
-      }
-
-      return;
-   }
-
-   wxString GetLibraryVersion()
-   {
-      if (!mLibraryLoaded) {
-         return wxT("");
-      }
-
-      return wxString::Format(wxT("LAME %hs"), get_lame_version());
-   }
-
-   int InitializeStream(int channels, int sampleRate)
-   {
-      if (!mLibraryLoaded) {
-         return -1;
-      }
-
-      if (channels > 2) {
-         return -1;
-      }
-
-      lame_set_error_protection(mGF, true);
-      lame_set_num_channels(mGF, channels);
-      lame_set_in_samplerate(mGF, sampleRate);
-      lame_set_out_samplerate(mGF, sampleRate);
-      lame_set_disable_reservoir(mGF, true);
-      lame_set_padding_type(mGF, PAD_NO);
-      lame_set_bWriteVbrTag(mGF, false);
-
-      // Set the VBR quality or ABR/CBR bitrate
-      switch (mMode) {
-         case MODE_SET:
-         {
-            int preset;
-
-            if (mQuality == PRESET_INSANE) {
-               preset = INSANE;
-            }
-            else if (mRoutine == ROUTINE_FAST) {
-               if (mQuality == PRESET_EXTREME) {
-                  preset = EXTREME_FAST;
-               }
-               else if (mQuality == PRESET_STANDARD) {
-                  preset = STANDARD_FAST;
-               }
-               else {
-                  preset = 1007;    // Not defined until 3.96
-               }
-            }
-            else {
-               if (mQuality == PRESET_EXTREME) {
-                  preset = EXTREME;
-               }
-               else if (mQuality == PRESET_STANDARD) {
-                  preset = STANDARD;
-               }
-               else {
-                  preset = 1006;    // Not defined until 3.96
-               }
-            }
-
-            lame_set_preset(mGF, preset);
-         }
-         break;
-
-         case MODE_VBR:
-            lame_set_VBR(mGF, (mRoutine == ROUTINE_STANDARD ? vbr_rh : vbr_mtrh ));
-            lame_set_VBR_q(mGF, mQuality);
-         break;
-
-         case MODE_ABR:
-            lame_set_preset(mGF, mBitrate );
-         break;
-
-         default:
-            lame_set_VBR(mGF, vbr_off);
-            lame_set_brate(mGF, mBitrate);
-         break;
-      }
-
-      // Set the channel mode
-      MPEG_mode mode;
-      if (channels == 1) {
-         mode = MONO;
-      }
-      else if (mChannel == CHANNEL_JOINT) {
-         mode = JOINT_STEREO;
-      }
-      else {
-         mode = STEREO;
-      }
-      lame_set_mode(mGF, mode);
-
-      int rc = lame_init_params(mGF);
-      if (rc < 0) {
-         return rc;
-      }
-
-#if 0
-      dump_config(mGF);
-#endif
-
-      mEncoding = true;
-
-      return mSamplesPerChunk;
-   }
-
-   int GetOutBufferSize()
-   {
-      if (!mEncoding)
-         return -1;
-
-      return mOutBufferSize;
-   }
-
-   int EncodeBuffer(short int inbuffer[], unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
-
-      return lame_encode_buffer_interleaved(mGF, inbuffer, mSamplesPerChunk,
-         outbuffer, mOutBufferSize);
-   }
-
-   int EncodeRemainder(short int inbuffer[], int nSamples,
-                     unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
-
-      return lame_encode_buffer_interleaved(mGF, inbuffer, nSamples, outbuffer,
-         mOutBufferSize);
-   }
-
-   int EncodeBufferMono(short int inbuffer[], unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
-
-      return lame_encode_buffer(mGF, inbuffer,inbuffer, mSamplesPerChunk,
-         outbuffer, mOutBufferSize);
-   }
-
-   int EncodeRemainderMono(short int inbuffer[], int nSamples,
-                     unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
-
-      return lame_encode_buffer(mGF, inbuffer, inbuffer, nSamples, outbuffer,
-         mOutBufferSize);
-   }
-
-   int FinishStream(unsigned char outbuffer[])
-   {
-      if (!mEncoding) {
-         return -1;
-      }
-
-      mEncoding = false;
-      int result = lame_encode_flush(mGF, outbuffer, mOutBufferSize);
-      lame_close(mGF);
-      return result;
-   }
-
-   void CancelEncoding()
-   {
-      mEncoding = false;
-   }
-   /* this section is for all *nixes including Mac OS X, but not windows */
-#if defined(__WXMAC__)
-   /* values for Mac OS X */
-
-   wxString GetLibraryPath()
-   {
-      return wxT("/usr/local/lib");
-   }
-
-   wxString GetLibraryName()
-   {
-      return wxT("libmp3lame.dylib");
-   }
-
-   wxString GetLibraryTypeString()
-   {
-      return wxString(_("Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"));
-   }
-
-#else //!__WXMAC__
-   /* Values for Linux / Unix systems */
-   wxString GetLibraryPath()
-   {
-      return wxT(LIBDIR);
-   }
-
-   wxString GetLibraryName()
-   {
-      return wxT("libmp3lame.so.0");
-   }
-
-   wxString GetLibraryTypeString()
-   {
-      return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
-   }
-
-#endif
-
-private:
-
-   void *mLib;
-
-   /* function pointers to the symbols we get from the library */
-   lame_init_t* lame_init;
-   lame_init_params_t* lame_init_params;
-   lame_encode_buffer_t* lame_encode_buffer;
-   lame_encode_buffer_interleaved_t* lame_encode_buffer_interleaved;
-   lame_encode_flush_t* lame_encode_flush;
-   lame_close_t* lame_close;
-   get_lame_version_t* get_lame_version;
-   
-   lame_set_in_samplerate_t* lame_set_in_samplerate;
-   lame_set_out_samplerate_t* lame_set_out_samplerate;
-   lame_set_num_channels_t* lame_set_num_channels;
-   lame_set_quality_t* lame_set_quality;
-   lame_set_brate_t* lame_set_brate;
-   lame_set_VBR_t* lame_set_VBR;
-   lame_set_VBR_q_t* lame_set_VBR_q;
-   lame_set_VBR_min_bitrate_kbps_t* lame_set_VBR_min_bitrate_kbps;
-   lame_set_mode_t* lame_set_mode;
-   lame_set_preset_t* lame_set_preset;
-   lame_set_error_protection_t* lame_set_error_protection;
-   lame_set_disable_reservoir_t *lame_set_disable_reservoir;
-   lame_set_padding_type_t *lame_set_padding_type;
-   lame_set_bWriteVbrTag_t *lame_set_bWriteVbrTag;
-   
-   lame_global_flags *mGF;
-
-   static const int mSamplesPerChunk = 220500;
-   // See lame.h/lame_encode_buffer() for further explanation
-   // As coded here, this should be the worst case.
-   static const int mOutBufferSize = 
-      mSamplesPerChunk * (320 / 8) / 8 + 4 * 1152 * (320 / 8) / 8 + 512;
-};
 #endif
 
 //----------------------------------------------------------------------------
@@ -1620,7 +1467,7 @@ public:
 
    // Required
 
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
    bool Export(AudacityProject *project,
                int channels,
                wxString fName,
@@ -1670,9 +1517,9 @@ bool ExportMP3::Export(AudacityProject *project,
    int rate = lrint(project->GetRate());
    wxWindow *parent = project;
    TrackList *tracks = project->GetTracks();
-   LameExporter exporter;
+   MP3Exporter exporter;
 
-   if (!exporter.LoadLibrary(parent, true)) {
+   if (!exporter.LoadLibrary(parent, MP3Exporter::Maybe)) {
       wxMessageBox(_("Could not open MP3 encoding library!"));
       gPrefs->Write(wxT("/MP3/MP3LibPath"), wxString(wxT("")));
 
@@ -1766,7 +1613,7 @@ bool ExportMP3::Export(AudacityProject *project,
       metadata = project->GetTags();
 
    // Open file for writing
-   FileIO outFile(fName, FileIO::Output);
+   wxFFile outFile(fName, wxT("w+b"));
    if (!outFile.IsOpened()) {
       wxMessageBox(_("Unable to open target file for writing"));
       return false;
@@ -1780,6 +1627,7 @@ bool ExportMP3::Export(AudacityProject *project,
      outFile.Write(id3buffer, id3len);
    }
 
+   wxFileOffset pos = outFile.Tell();
    bool cancelling = false;
    long bytes;
 
@@ -1807,7 +1655,7 @@ bool ExportMP3::Export(AudacityProject *project,
       title.Printf(selectionOnly ?
                    _("Exporting selected audio with VBR quality %s") :
                    _("Exporting entire file with VBR quality %s"),
-                   FindName(varRates, WXSIZEOF(setRates), brate).c_str());
+                   FindName(varRates, WXSIZEOF(varRates), brate).c_str());
    }
    else {
       title.Printf(selectionOnly ?
@@ -1865,9 +1713,8 @@ bool ExportMP3::Export(AudacityProject *project,
    if (bytes) {
       outFile.Write(buffer, bytes);
    }
-   
-   /* Write ID3 tag if it was supposed to be at the end of the file */
-   
+
+   // Write ID3 tag if it was supposed to be at the end of the file
    if (id3len && endOfFile) {
       outFile.Write(id3buffer, id3len);
    }
@@ -1876,17 +1723,22 @@ bool ExportMP3::Export(AudacityProject *project,
       free(id3buffer);
    }
 
-   /* Close file */
+   // Always write the info (Xing/Lame) tag.  Until we stop supporting Lame
+   // versions before 3.98, we must do this after the MP3 file has been
+   // closed.
+   exporter.PutInfoTag(outFile, pos);
+
+   // Close the file
    outFile.Close();
 
-   delete[]buffer;
+   delete [] buffer;
    
    return !cancelling;
 }
 
-bool ExportMP3::DisplayOptions(AudacityProject *project, int format)
+bool ExportMP3::DisplayOptions(wxWindow *parent, int format)
 {
-   ExportMP3Options od(project);
+   ExportMP3Options od(parent);
 
    od.ShowModal();
 
@@ -2005,7 +1857,10 @@ int ExportMP3::AddTags(AudacityProject *project, char **buffer, bool *endOfFile,
          name = ID3_FRAME_ALBUM;
       }
       else if (n.CmpNoCase(TAG_YEAR) == 0) {
-         name = ID3_FRAME_YEAR;
+         // LLL:  This should be ID3_FRAME_YEAR, but some apps do not like the
+         //       newer frame ID, so we force usage of the older one.  (For now
+         //       anyway.)
+         name = "TYER";
       }
       else if (n.CmpNoCase(TAG_GENRE) == 0) {
          name = ID3_FRAME_GENRE;
@@ -2106,14 +1961,14 @@ ExportPlugin *New_ExportMP3()
 
 wxString GetMP3Version(wxWindow *parent, bool prompt)
 {
-   LameExporter exporter;
-   wxString versionString = _("MP3 exporting plugin not found");
+   MP3Exporter exporter;
+   wxString versionString = _("MP3 export library not found");
 
    if (prompt) {
       exporter.FindLibrary(parent);
    }
 
-   if (exporter.LoadLibrary(parent, false)) {
+   if (exporter.LoadLibrary(parent, prompt ? MP3Exporter::Yes : MP3Exporter::No)) {
       versionString = exporter.GetLibraryVersion();
    }
 
diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index 8c27e07..a73973c 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -6,9 +6,6 @@
 
   Dominic Mazzoni
 
-  2004.06.23 added mp3 export using tompg.exe for multiple export, by ChackoN
-  tested under w2k only
-
 *******************************************************************//**
 
 \class ExportMultiple
@@ -191,7 +188,7 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
 
    wxString name = mProject->GetName();
 
-   mFormatIndex = -1;
+   mPluginIndex = -1;
 
    wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"),
       wxT("WAV"));
@@ -202,15 +199,15 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
       for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++)
       {
          if (mPlugins[i]->GetFormat(j) == defaultFormat) {
-            mFormatIndex = i;
+            mPluginIndex = i;
             mSubFormatIndex = j;
          }
-         if (mFormatIndex == -1) mFilterIndex++;
+         if (mPluginIndex == -1) mFilterIndex++;
       }
    }
-   if (mFormatIndex == -1)
+   if (mPluginIndex == -1)
    {
-      mFormatIndex = 0;
+      mPluginIndex = 0;
       mFilterIndex = 0;
       mSubFormatIndex = 0;
    }
@@ -231,7 +228,7 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
       mFormat = S.Id(FormatID)
          .TieChoice(_("Export format:"),
                     wxT("/Export/MultipleFormat"),
-                    mPlugins[mFormatIndex]->GetFormat(mSubFormatIndex),
+                    mPlugins[mPluginIndex]->GetFormat(mSubFormatIndex),
                     formats,
                     formats);
       S.Id(OptionsID).AddButton(_("Options..."));
@@ -356,7 +353,7 @@ void ExportMultiple::EnableControls()
       return;
    }
 
-   mFirst->Enable(mLabel->GetValue() && mByName->GetValue());
+   mFirst->Enable(mLabel->GetValue());
    
    enable = mLabel->GetValue() &&
             mByName->GetValue() &&
@@ -371,7 +368,8 @@ void ExportMultiple::EnableControls()
    bool ok = true;
 
    if (mLabel->GetValue() && mFirst->GetValue() &&
-       mFirstFileName->GetValue() == wxT(""))
+       mFirstFileName->GetValue() == wxT("") &&
+       mPrefix->GetValue() == wxT(""))
       ok = false;
 
    if (mByNumber->GetValue() &&
@@ -398,14 +396,14 @@ void ExportMultiple::OnOptions(wxCommandEvent& event)
        {
          if ((size_t)sel == c)
          {
-            mFormatIndex = i;
+            mPluginIndex = i;
             mSubFormatIndex = j;
          }
          c++;
        }
      }
    }
-   mPlugins[mFormatIndex]->DisplayOptions(mProject,mSubFormatIndex);
+   mPlugins[mPluginIndex]->DisplayOptions(this,mSubFormatIndex);
 }
 
 void ExportMultiple::OnCreate(wxCommandEvent& event)
@@ -496,8 +494,9 @@ void ExportMultiple::OnExport(wxCommandEvent& event)
        for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++)
        {
          if ((size_t)mFilterIndex == c)
-         {
-            mFormatIndex = i;
+         {  // this is the selected format. Store the plug-in and sub-format
+            // needed to acheive it.
+            mPluginIndex = i;
             mSubFormatIndex = j;
          }
          c++;
@@ -505,7 +504,7 @@ void ExportMultiple::OnExport(wxCommandEvent& event)
      }
    }
 
-   bool overwrite = mOverwrite->GetValue();
+//   bool overwrite = mOverwrite->GetValue();
    bool ok;
 
    if (mLabel->GetValue()) {
@@ -572,8 +571,9 @@ bool ExportMultiple::ExportMultipleByLabel(bool byName, wxString prefix)
                               // don't duplicate them
    ExportKit setting;   // the current batch of settings
    setting.destfile.SetPath(mDir->GetValue());
-   setting.destfile.SetExt(mPlugins[mFormatIndex]->GetExtension(mSubFormatIndex));
-
+   setting.destfile.SetExt(mPlugins[mPluginIndex]->GetExtension(mSubFormatIndex));
+   wxLogDebug(wxT("Plug-in index = %d, Sub-format = %d"), mPluginIndex, mSubFormatIndex);
+   wxLogDebug(wxT("File extension is %s"), setting.destfile.GetExt().c_str());
    wxString name;    // used to hold file name whilst we mess with it
    wxString title;   // un-messed-with title of file for tagging with
 
@@ -611,7 +611,10 @@ bool ExportMultiple::ExportMultipleByLabel(bool byName, wxString prefix)
 
       // Numbering files...
       if (!byName) {
-         name.Printf(wxT("%s-%d"), prefix.c_str(), l+1);
+         if (numFiles > 9)
+            name.Printf(wxT("%s-%02d"), prefix.c_str(), l+1);
+         else
+            name.Printf(wxT("%s-%d"), prefix.c_str(), l+1);
       }
 
       // store sanitised and user checjed name in object
@@ -678,6 +681,7 @@ bool ExportMultiple::ExportMultipleByTrack(bool byName,
    Track *tr, *tr2;
    int channels = 0;  // how many channels export?
    int l = 0;     // track counter
+   int numTracks = 0;
    bool ok = true;
    wxArrayString otherNames;
    wxArrayPtrVoid selected;   /**< Array of pointers to the tracks which were
@@ -687,7 +691,7 @@ bool ExportMultiple::ExportMultipleByTrack(bool byName,
    exportSettings.Alloc(mNumLabels);   // allocated some guessed space to use
    ExportKit setting;   // the current batch of settings
    setting.destfile.SetPath(mDir->GetValue());
-   setting.destfile.SetExt(mPlugins[mFormatIndex]->GetExtension(mSubFormatIndex));
+   setting.destfile.SetExt(mPlugins[mPluginIndex]->GetExtension(mSubFormatIndex));
 
    wxString name;    // used to hold file name whilst we mess with it
    wxString title;   // un-messed-with title of file for tagging with
@@ -702,6 +706,10 @@ bool ExportMultiple::ExportMultipleByTrack(bool byName,
          selected.Add(tr);
          tr->SetSelected(false);
       }
+
+      if (!tr->GetLinked()) {
+         numTracks++;
+      }
    }
 
    /* Examine all tracks in turn, collecting export information */
@@ -746,7 +754,12 @@ bool ExportMultiple::ExportMultipleByTrack(bool byName,
          name = title;
       }
       else {
-         name = (wxString::Format(wxT("%s-%d"), prefix.c_str(), l+1));
+         if (numTracks > 9) {
+            name = (wxString::Format(wxT("%s-%02d"), prefix.c_str(), l+1));
+         }
+         else {
+            name = (wxString::Format(wxT("%s-%d"), prefix.c_str(), l+1));
+         }
       }
 
       // store sanitised and user checked name in object
@@ -775,7 +788,7 @@ bool ExportMultiple::ExportMultipleByTrack(bool byName,
       /* add the settings to the array of settings to be used for export */
       exportSettings.Add(setting);
 
-      l++;  // next label, count up one
+      l++;  // next track, count up one
    }
    // end of user-interactive data gathering loop, start of export processing
    // loop
@@ -844,7 +857,10 @@ bool ExportMultiple::DoExport(int channels,
                               double t1,
                               Tags tags)
 {
-
+   wxLogDebug(wxT("Doing multiple Export: File name \"%s\""), (name.GetFullName()).c_str());
+   wxLogDebug(wxT("Channels: %i, Start: %lf, End: %lf "), channels, t0, t1);
+   if (selectedOnly) wxLogDebug(wxT("Selected Region Only"));
+   else wxLogDebug(wxT("Whole Project"));
 
    // Generate a unique name if we're not allowed to overwrite
    if (!mOverwrite->GetValue()) {
@@ -856,14 +872,15 @@ bool ExportMultiple::DoExport(int channels,
    }
 
    // Call the format export routine
-   bool rc = mPlugins[mFormatIndex]->Export(mProject,
+   bool rc = mPlugins[mPluginIndex]->Export(mProject,
                                             channels,
                                             name.GetFullPath(),
                                             selectedOnly,
                                             t0,
                                             t1,
                                             NULL,
-                                            &tags);
+                                            &tags,
+                                            mSubFormatIndex);
    return rc;
 }
 
diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h
index 65b245d..45ab5c2 100644
--- a/src/export/ExportMultiple.h
+++ b/src/export/ExportMultiple.h
@@ -101,7 +101,8 @@ private:
 
 private:
    Exporter mExporter;
-   ExportPluginArray mPlugins;
+   ExportPluginArray mPlugins;   /**< Array of references to available exporter
+                                   plug-ins */
    AudacityProject *mProject;
    TrackList *mTracks;           /**< The list of tracks in the project that is
                                    being exported */
@@ -111,15 +112,21 @@ private:
    int mNumLabels;
    int mNumWaveTracks;
    wxArrayPtrVoid mSelected;
-   int mFilterIndex;
-   int mFormatIndex;
-   int mSubFormatIndex;
+   int mFilterIndex;          /**< The index in the drop-down list of export 
+                                formats (mFormat) of the selected export format.
+                                This list includes all possible
+                                plug-in - subformat combinations. */
+   int mPluginIndex;          /**< The index in mPlugins of the selected export
+                              plug-in */
+   int mSubFormatIndex;       /**< The selected subformat number within the
+                                selected export plug-in set by mPluginIndex */
    bool mInitialized;
 
    /** Array of characters not allowed to be in file names on this platform */
    wxArrayString exclude;
 
-   wxChoice      *mFormat;
+   wxChoice      *mFormat;    /**< Drop-down list of export formats 
+                                (combinations of plug-in and subformat) */
    wxButton      *mOptions;
 
    wxTextCtrl    *mDir;    /**< The directory all the exported files will end
@@ -127,21 +134,21 @@ private:
    wxButton      *mCreate;
    wxButton      *mChoose;
    
-   wxRadioButton *mLabel;
-   wxStaticText  *mLabelLabel;
+   wxRadioButton *mLabel;  /**< button to choose export based on Labels */
+   wxStaticText  *mLabelLabel;   /**< description text for mLabel */
 
-   wxCheckBox    *mFirst;
-   wxStaticText  *mFirstFileLabel;
+   wxCheckBox    *mFirst;  /**< Check box to export audio before first label */
+   wxStaticText  *mFirstFileLabel;  /**< description text for mFirstFileName */
    wxTextCtrl    *mFirstFileName;   /**< Name to use for exporting audio before
                                       the first label in the file */
 
-   wxRadioButton *mTrack;
+   wxRadioButton *mTrack;  /**< button to choose export based on tracks */
    wxStaticText  *mTrackLabel;
    
-   wxRadioButton *mByName;
+   wxRadioButton *mByName; /**< button to choose naming exported file from label text */
    wxStaticText  *mByNameLabel;
 
-   wxRadioButton *mByNumber;
+   wxRadioButton *mByNumber;  /**< button to choose numbering exported files */
    wxStaticText  *mByNumberLabel;
 
    wxStaticText  *mPrefixLabel;
diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp
index c5526c8..864832e 100644
--- a/src/export/ExportOGG.cpp
+++ b/src/export/ExportOGG.cpp
@@ -60,10 +60,8 @@ END_EVENT_TABLE()
 /// 
 /// 
 ExportOGGOptions::ExportOGGOptions(wxWindow *parent, int format)
-:  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify Ogg Vorbis Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP)
+:  wxDialog(parent, wxID_ANY,
+            wxString(_("Specify Ogg Vorbis Options")))
 {
    ShuttleGui S(this, eIsCreatingFromPrefs);
 
@@ -130,7 +128,7 @@ public:
 
    // Required
 
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
    bool Export(AudacityProject *project,
                int channels,
                wxString fName,
@@ -332,9 +330,9 @@ bool ExportOGG::Export(AudacityProject *project,
    return !cancelling;
 }
 
-bool ExportOGG::DisplayOptions(AudacityProject *project, int format)
+bool ExportOGG::DisplayOptions(wxWindow *parent, int format)
 {
-   ExportOGGOptions od(project,format);
+   ExportOGGOptions od(parent, format);
 
    od.ShowModal();
 
@@ -351,6 +349,9 @@ bool ExportOGG::FillComment(AudacityProject *project, vorbis_comment *comment, T
 
    wxString n, v;
    for (bool cont = metadata->GetFirst(n, v); cont; cont = metadata->GetNext(n, v)) {
+      if (n == TAG_YEAR) {
+         n = wxT("DATE");
+      }
       vorbis_comment_add_tag(comment,
                              (char *) (const char *) n.mb_str(wxConvUTF8),
                              (char *) (const char *) v.mb_str(wxConvUTF8));
diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp
index 2f2ae34..f8b6afa 100644
--- a/src/export/ExportPCM.cpp
+++ b/src/export/ExportPCM.cpp
@@ -8,7 +8,11 @@
 
 **********************************************************************/
 
+#include <wx/defs.h>
+
 #include <wx/choice.h>
+#include <wx/dynlib.h>
+#include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/timer.h>
 #include <wx/msgdlg.h>
@@ -33,15 +37,16 @@
 
 #include "Export.h"
 
-#ifdef __WXMAC__
-#define __MOVIES__   /* Apple's Movies.h not compatible with Audacity */
-/* #define __MACHELP__ */
-
-#include <wx/mac/private.h>
-# ifdef __UNIX__
-#  include <CoreServices/CoreServices.h>
-# else
-# endif
+#ifdef USE_LIBID3TAG 
+   #include <id3tag.h>
+   // DM: the following functions were supposed to have been
+   // included in id3tag.h - should be fixed in the next release
+   // of mad.
+   extern "C" {
+      struct id3_frame *id3_frame_new(char const *);
+      id3_length_t id3_latin1_length(id3_latin1_t const *);
+      void id3_latin1_decode(id3_latin1_t const *, id3_ucs4_t *);
+   } 
 #endif
 
 //----------------------------------------------------------------------------
@@ -50,10 +55,11 @@
 
 static int ReadExportFormatPref()
 {
-   return gPrefs->Read(wxT("/FileFormats/ExportFormat_SF1"),
 #if defined(__WXMAC__)
+   return gPrefs->Read(wxT("/FileFormats/ExportFormat_SF1"),
                        (long int)(SF_FORMAT_AIFF | SF_FORMAT_PCM_16));
 #else
+   return gPrefs->Read(wxT("/FileFormats/ExportFormat_SF1"),
                        (long int)(SF_FORMAT_WAV | SF_FORMAT_PCM_16));
 #endif
 }
@@ -110,25 +116,26 @@ END_EVENT_TABLE()
 /// 
 ExportPCMOptions::ExportPCMOptions(wxWindow *parent, int selformat)
 :  wxDialog(NULL, wxID_ANY,
-            wxString(_("Specify Uncompressed Options")),
-            wxDefaultPosition, wxDefaultSize,
-            wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP)
+            wxString(_("Specify Uncompressed Options")))
 {
    mOk = NULL;   
    int format = 0;
    switch (selformat)
    {
-   case 0:
-      format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+   case 0:  // other uncompressed
+      format = ReadExportFormatPref();
       break;
-   case 1:
+   case 1:  // 16-bit AIFF
       format = SF_FORMAT_AIFF | SF_FORMAT_PCM_16;
       break;
-   case 3:
+   case 2:  // 16-bit WAV
+      format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+      break;
+   case 3:  // GSM WAV
       format = SF_FORMAT_WAV | SF_FORMAT_GSM610;
       break;
-   case 2:
-   default:
+   default: // bug - forgot to extend this case statement
+      wxASSERT(false);
       format = ReadExportFormatPref();
       break;
    }
@@ -314,7 +321,7 @@ public:
 
    // Required
 
-   bool DisplayOptions(AudacityProject *project = NULL, int format = 0);
+   bool DisplayOptions(wxWindow *parent, int format = 0);
    bool Export(AudacityProject *project,
                int channels,
                wxString fName,
@@ -324,10 +331,12 @@ public:
                MixerSpec *mixerSpec = NULL,
                Tags *metadata = NULL,
                int subformat = 0); 
-
+   // optional
+   wxString GetExtension(int index = 0);
 private:
 
    bool AddStrings(AudacityProject *project, SNDFILE *sf, Tags *tags);
+   void AddID3Chunk(wxString fName, Tags *tags);
 
 };
 
@@ -340,50 +349,56 @@ ExportPCM::ExportPCM()
    si.samplerate = 0;
    si.channels = 0;
 
-   si.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
-   for (si.channels = 1; sf_format_check(&si); si.channels++){};
-   AddFormat();
-   SetFormat(wxT("WAV"),0);
-   SetCanMetaData(true,0);
-   SetDescription(_("WAV (Microsoft) signed 16 bit PCM"),0);
-   wxString wavext = sf_header_extension(si.format);
-   AddExtension(wavext,0);
-   SetMaxChannels(si.channels - 1,0);
-
-   si.format = SF_FORMAT_AIFF | SF_FORMAT_PCM_16;
-   for (si.channels = 1; sf_format_check(&si); si.channels++){};
-   AddFormat();
-   SetFormat(wxT("AIFF"),1);
-   SetCanMetaData(true,1);
-   SetDescription(_("AIFF (Apple) signed 16 bit PCM"),1);
-   wxString aiffext = sf_header_extension(si.format);
-   AddExtension(aiffext,1);
-   SetMaxChannels(si.channels - 1,1);
+   int format; // the index of the format we are setting up at the moment
 
-   AddFormat();
-   SetFormat(wxT("LIBSNDFILE"),2);
-   SetCanMetaData(true,2);
-   SetDescription(_("Other uncompressed files"),2);
+   /* add default user controlled format to list of formats this plug-in does
+    * at position 0 */
+   format = AddFormat() - 1;  // store the index = 1 less than the count
+   SetFormat(wxT("LIBSNDFILE"),format);
+   SetCanMetaData(true,format);
+   SetDescription(_("Other uncompressed files"),format);
    wxArrayString allext = sf_get_all_extensions();
+   wxString wavext = sf_header_extension(SF_FORMAT_WAV);   // get WAV ext.
 #if defined(wxMSW)
-   // On Windows make sure WAV is at the beginning of the list.
+   // On Windows make sure WAV is at the beginning of the list of all possible
+   // extensions for this format
    allext.Remove(wavext);
    allext.Insert(wavext,0);
-#else
-   allext.Remove(aiffext);
-   allext.Insert(aiffext,0);
 #endif
-   SetExtensions(allext,2);
-   SetMaxChannels(255,2);
+   SetExtensions(allext,format);
+   SetMaxChannels(255,format);
 
+   /* add AIFF 16-bit to list of sub-formats for this plug-in at position 1 */
+   si.format = SF_FORMAT_AIFF | SF_FORMAT_PCM_16;
+   for (si.channels = 1; sf_format_check(&si); si.channels++){};
+   format = AddFormat() - 1;
+   SetFormat(wxT("AIFF"),format);
+   SetCanMetaData(true,format);
+   SetDescription(_("AIFF (Apple) signed 16 bit PCM"),format);
+   wxString aiffext = sf_header_extension(si.format);
+   AddExtension(aiffext,format);
+   SetMaxChannels(si.channels - 1,format);
+
+   /* add WAV 16-bit at position 2 */
+   si.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+   for (si.channels = 1; sf_format_check(&si); si.channels++){};
+   format = AddFormat() - 1;
+   SetFormat(wxT("WAV"),format);
+   SetCanMetaData(true,format);
+   SetDescription(_("WAV (Microsoft) signed 16 bit PCM"),format);
+   // we sorted out wavext near the begining
+   AddExtension(wavext,format);
+   SetMaxChannels(si.channels - 1,format);
+
+   /* add GSM6.10 to list of formats at position 3 */
    si.format = SF_FORMAT_WAV | SF_FORMAT_GSM610;
    for (si.channels = 1; sf_format_check(&si); si.channels++){};
-   AddFormat();
-   SetFormat(wxT("GSM610"),3);
-   SetCanMetaData(true,3);
-   SetDescription(_("GSM 6.10 WAV (mobile)"),3);
-   AddExtension(sf_header_extension(si.format),3);
-   SetMaxChannels(si.channels - 1,3);
+   format = AddFormat() - 1;
+   SetFormat(wxT("GSM610"),format);
+   SetCanMetaData(true,format);
+   SetDescription(_("GSM 6.10 WAV (mobile)"),format);
+   AddExtension(sf_header_extension(si.format),format);
+   SetMaxChannels(si.channels - 1,format);
 }
 
 void ExportPCM::Destroy()
@@ -391,6 +406,12 @@ void ExportPCM::Destroy()
    delete this;
 }
 
+/**
+ *
+ * @param subformat Control whether we are doing a "preset" export to a popular
+ * file type, or giving the user full control over libsndfile. Set to 0 
+ * (default) gives full control, 1 gives 16-bit AIFF, 2 gives 16-bit WAV 
+ * 3 gives a GSM 6.10 WAV file */ 
 bool ExportPCM::Export(AudacityProject *project,
                        int numChannels,
                        wxString fName,
@@ -406,16 +427,25 @@ bool ExportPCM::Export(AudacityProject *project,
    int sf_format;
    switch (subformat)
    {
-   case 0:
-      sf_format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+   case 0:  // other uncompressed
+      sf_format = ReadExportFormatPref();
       break;
-   case 1:
+   case 1:  // AIFF
       sf_format = SF_FORMAT_AIFF | SF_FORMAT_PCM_16;
       break;
-   case 2:
-   default:
-      sf_format = ReadExportFormatPref();
+   case 2:  // WAV
+      sf_format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+      break;
+   case 3:
+      sf_format = SF_FORMAT_WAV | SF_FORMAT_GSM610;
+      break;
+   default: // land here if supplied a sub-format that we don't know about
+      wxASSERT(false);  // raise assertion - this is a bug
+      sf_format = ReadExportFormatPref(); // treat it like 0 so users get a
+      // working result
+   break;
    }
+
    wxString     formatStr;
    SF_INFO      info;
    SNDFILE     *sf = NULL;
@@ -498,7 +528,6 @@ bool ExportPCM::Export(AudacityProject *project,
       
       samplePtr mixed = mixer->GetBuffer();
 
-      
       ODManager::LockLibSndFileMutex();
       if (format == int16Sample)
          sf_writef_short(sf, (short *)mixed, numSamples);
@@ -515,7 +544,6 @@ bool ExportPCM::Export(AudacityProject *project,
 
    delete[] waveTracks;                            
 
-   
    ODManager::LockLibSndFileMutex();
    err = sf_close(sf);
    ODManager::UnlockLibSndFileMutex();
@@ -529,19 +557,14 @@ bool ExportPCM::Export(AudacityProject *project,
                     buffer));
    }
 
-#ifdef __WXMAC__
-
-   FSSpec spec;
-
-   wxMacFilename2FSSpec(fName, &spec);
-
-   FInfo finfo;
-   if (FSpGetFInfo(&spec, &finfo) == noErr) {
-      finfo.fdType = sf_header_mactype(sf_format & SF_FORMAT_TYPEMASK);
-      finfo.fdCreator = AUDACITY_CREATOR;
-
-      FSpSetFInfo(&spec, &finfo);
+   if ((sf_format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AIFF) {
+      AddID3Chunk(fName, metadata);
    }
+
+#ifdef __WXMAC__
+   wxFileName fn(fName);
+   fn.MacSetTypeAndCreator(sf_header_mactype(sf_format & SF_FORMAT_TYPEMASK),
+                           AUDACITY_CREATOR);
 #endif
    
    return !cancelling;
@@ -576,20 +599,171 @@ bool ExportPCM::AddStrings(AudacityProject *project, SNDFILE *sf, Tags *tags)
    return true;
 }
 
-bool ExportPCM::DisplayOptions(AudacityProject *project, int format)
+void ExportPCM::AddID3Chunk(wxString fName, Tags *tags)
 {
-   if (format != 2)
-   {
-      wxMessageBox(wxT("No options for this format. Use 'Other uncompressed files'."));
+#ifdef USE_LIBID3TAG 
+
+   struct id3_tag *tp = id3_tag_new();
+
+   wxString n, v;
+   for (bool cont = tags->GetFirst(n, v); cont; cont = tags->GetNext(n, v)) {
+      const char *name = "TXXX";
+
+      if (n.CmpNoCase(TAG_TITLE) == 0) {
+         name = ID3_FRAME_TITLE;
+      }
+      else if (n.CmpNoCase(TAG_ARTIST) == 0) {
+         name = ID3_FRAME_ARTIST;
+      }
+      else if (n.CmpNoCase(TAG_ALBUM) == 0) {
+         name = ID3_FRAME_ALBUM;
+      }
+      else if (n.CmpNoCase(TAG_YEAR) == 0) {
+         name = ID3_FRAME_YEAR;
+      }
+      else if (n.CmpNoCase(TAG_GENRE) == 0) {
+         name = ID3_FRAME_GENRE;
+      }
+      else if (n.CmpNoCase(TAG_COMMENTS) == 0) {
+         name = ID3_FRAME_COMMENT;
+      }
+      else if (n.CmpNoCase(TAG_TRACK) == 0) {
+         name = ID3_FRAME_TRACK;
+      }
+
+      struct id3_frame *frame = id3_frame_new(name);
+
+      if (!n.IsAscii() || !v.IsAscii()) {
+         id3_field_settextencoding(id3_frame_field(frame, 0), ID3_FIELD_TEXTENCODING_UTF_16);
+      }
+      else {
+         id3_field_settextencoding(id3_frame_field(frame, 0), ID3_FIELD_TEXTENCODING_ISO_8859_1);
+      }
+
+      id3_ucs4_t *ucs4 =
+         id3_utf8_ucs4duplicate((id3_utf8_t *) (const char *) v.mb_str(wxConvUTF8));
+
+      if (strcmp(name, ID3_FRAME_COMMENT) == 0) {
+         // A hack to get around iTunes not recognizing the comment.  The
+         // language defaults to XXX and, since it's not a valid language,
+         // iTunes just ignores the tag.  So, either set it to a valid language
+         // (which one???) or just clear it.  Unfortunately, there's no supported
+         // way of clearing the field, so do it directly.
+         id3_field *f = id3_frame_field(frame, 1);
+         memset(f->immediate.value, 0, sizeof(f->immediate.value));
+         id3_field_setfullstring(id3_frame_field(frame, 3), ucs4);
+      }
+      else if (strcmp(name, "TXXX") == 0) {
+         id3_field_setstring(id3_frame_field(frame, 2), ucs4);
+         free(ucs4);
+
+         ucs4 = id3_utf8_ucs4duplicate((id3_utf8_t *) (const char *) n.mb_str(wxConvUTF8));
+           
+         id3_field_setstring(id3_frame_field(frame, 1), ucs4);
+      }
+      else {
+         id3_field_setstrings(id3_frame_field(frame, 1), 1, &ucs4);
+      }
+
+      free(ucs4);
+
+      id3_tag_attachframe(tp, frame);
+   }
+
+   tp->options &= (~ID3_TAG_OPTION_COMPRESSION); // No compression
+
+   // If this version of libid3tag supports it, use v2.3 ID3
+   // tags instead of the newer, but less well supported, v2.4
+   // that libid3tag uses by default.
+#ifdef ID3_TAG_HAS_TAG_OPTION_ID3V2_3
+   tp->options |= ID3_TAG_OPTION_ID3V2_3;
+#endif
+
+   id3_length_t len;
+
+   len = id3_tag_render(tp, 0);
+   id3_byte_t *buffer = (id3_byte_t *)malloc(len + 1);
+   if (buffer == NULL) {
+      id3_tag_delete(tp);
+      return;
+   }
+   buffer[len + 1] = '\0';
+
+   len = id3_tag_render(tp, buffer);
+
+   id3_tag_delete(tp);
+
+   wxFFile f(fName, wxT("r+b"));
+   if (f.IsOpened()) {
+      wxUint32 sz;
+      
+      sz = wxUINT32_SWAP_ON_LE((wxUint32) len);
+      f.SeekEnd(0);
+      f.Write("ID3 ", 4);
+      f.Write(&sz, 4);
+
+      f.Write(buffer, len + (len & 0x01));
+
+      sz = wxUINT32_SWAP_ON_LE((wxUint32) f.Tell() - 8);
+      f.Seek(4);
+      f.Write(&sz, 4);
+
+      f.Close();
+   }
+
+   free(buffer);
+#endif
+   return;
+}
+
+/** @param format The same information as the subformat argument to the Export
+ * method. Controls use of pre-defined export settings.*/
+bool ExportPCM::DisplayOptions(wxWindow *parent, int format)
+{
+   wxString nopt(_("There are no options for this format.\n"));
+   /* i18n-hint: This is pointing users at another possible export format in 
+    * the list. So you should translate the quoted string 
+    * 'Other uncompressed files' exactly the same as you do the same string
+    * when it comes up on it's own.*/
+   wxString usepcm(_("If you need more control over the export format please use the 'Other uncompressed files' format."));
+
+   /* actual code - decide what options if any are useful to show */
+   if(format == 1)
+   {   // 16-bit AIFF
+      wxMessageBox(nopt + _("Your file will be exported as a 16-bit AIFF (Apple/SGI) file.\n") + usepcm);
+      return true;
+   }
+   else if (format == 2)
+   {  // 16-bit WAV
+      wxMessageBox(nopt + _("Your file will be exported as a 16-bit WAV (Microsoft) file.\n") + usepcm);
+      return true;
+   }
+   else if (format == 3)
+   {  // GSM WAV
+      wxMessageBox(nopt + _("Your file will be exported as a GSM 6.10 WAV file.\n") + usepcm);
       return true;
    }
-   ExportPCMOptions od(project,format);
 
+   // default, full user control
+   ExportPCMOptions od(parent,format);
    od.ShowModal();
 
    return true;
 }
 
+wxString ExportPCM::GetExtension(int index)
+{
+if (index == 0)
+   {  // get extension libsndfile thinks is correct for currently selected
+      // format
+   wxString fileext = sf_header_extension(ReadExportFormatPref());
+   return fileext; 
+   }
+else
+   {  // do as the default in Export.cpp
+   return mFormatInfos[index]->mExtensions[0];
+   }
+}
 //----------------------------------------------------------------------------
 // Constructor
 //----------------------------------------------------------------------------
diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index 56abdef..70fe615 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -111,6 +111,7 @@ int Importer::Import(wxString fName,
                      Tags *tags,
                      wxString &errorMessage)
 {
+   ImportFileHandle *inFile = NULL;
    int numTracks = 0;
 
    wxString extension = fName.AfterLast(wxT('.'));
@@ -166,28 +167,29 @@ int Importer::Import(wxString fName,
    {
       ImportPlugin *plugin = importPluginNode->GetData();
       // Try to open the file with this plugin (probe it)
-      mInFile = plugin->Open(fName);
-      if ( (mInFile != NULL) && (mInFile->GetStreamCount() > 0) )
+      inFile = plugin->Open(fName);
+      if ( (inFile != NULL) && (inFile->GetStreamCount() > 0) )
       {
          // File has more than one stream - display stream selector
-         if (mInFile->GetStreamCount() > 1)                                                  
+         if (inFile->GetStreamCount() > 1)                                                  
          {
-            ImportStreamDialog ImportDlg(mInFile, NULL, -1, _("Select stream(s) to import"));
+            ImportStreamDialog ImportDlg(inFile, NULL, -1, _("Select stream(s) to import"));
 
             if (ImportDlg.ShowModal() == wxID_CANCEL)
             {
+               delete inFile;
                return 0;
             }
          }
          // One stream - import it by default
          else
-            mInFile->SetStreamUsage(0,TRUE);
+            inFile->SetStreamUsage(0,TRUE);
 
          int res;
          
-         res = mInFile->Import(trackFactory, tracks, &numTracks, tags);
+         res = inFile->Import(trackFactory, tracks, &numTracks, tags);
 
-         delete mInFile;
+         delete inFile;
 
          if (res == eImportSuccess)
          {
@@ -325,10 +327,6 @@ int Importer::Import(wxString fName,
    return 0;
 }
 
-wxString Importer::GetFileDescription()
-{
-   return mInFile->GetFileDescription();
-}
 //-------------------------------------------------------------------------
 // ImportStreamDialog
 //-------------------------------------------------------------------------
diff --git a/src/import/Import.h b/src/import/Import.h
index 0aef5c3..4e23f9a 100644
--- a/src/import/Import.h
+++ b/src/import/Import.h
@@ -59,14 +59,9 @@ public:
               Tags *tags,
               wxString &errorMessage);
 
-   // get a possibly more detailed description of the kind of file
-   // that is being opened.  ONLY callable from INSIDE THE CALLBACK.
-   wxString GetFileDescription();
-
 private:
    ImportPluginList *mImportPluginList;
    UnusableImportPluginList *mUnusableImportPluginList;
-   ImportFileHandle *mInFile;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp
index a1532d3..d0617fb 100644
--- a/src/import/ImportFFmpeg.cpp
+++ b/src/import/ImportFFmpeg.cpp
@@ -273,9 +273,6 @@ private:
 
    bool                  mCancelled;     //!< True if importing was canceled by user
    wxString              mName;
-   void                 *mUserData;
-   uint64_t              mNumSamples;    //!< Used for progress dialog. May not really be a number of samples.
-   uint64_t              mSamplesDone;   //!< Used for progress dialog. May not really be a number of samples.
    WaveTrack           ***mChannels;     //!< 2-dimentional array of WaveTrack's. First dimention - streams, second - channels of a stream. Length is mNumStreams
 };
 
@@ -349,9 +346,6 @@ FFmpegImportFileHandle::FFmpegImportFileHandle(const wxString & name)
    mScs = NULL;
    mCancelled =false;
    mName = name;
-   mUserData = NULL;
-   mNumSamples = 0;
-   mSamplesDone = 0;
    mChannels = NULL;
 }
 
@@ -422,9 +416,19 @@ bool FFmpegImportFileHandle::InitCodecs()
             continue;
          }
 
-         // Stream is decodeable and it is audio. Add it and it's decription to the arrays
+         // Stream is decodeable and it is audio. Add it and its decription to the arrays
          wxString strinfo;
-         strinfo.Printf(_("Index[%02x] Codec[%S], Language[%S], Duration[%d]"),sc->m_stream->id,codec->name,sc->m_stream->language,sc->m_stream->duration);
+         int duration = 0;
+         if (sc->m_stream->duration > 0)
+           duration = sc->m_stream->duration * sc->m_stream->time_base.num / sc->m_stream->time_base.den;
+         else
+           duration = mFormatContext->duration / AV_TIME_BASE;
+         wxString bitrate = wxT("");
+         if (sc->m_codecCtx->bit_rate > 0)
+           bitrate.Printf(wxT("%d"),sc->m_codecCtx->bit_rate);
+         else
+           bitrate.Printf(wxT("?"));
+         strinfo.Printf(_("Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"),sc->m_stream->id,codec->name,sc->m_stream->language,bitrate.c_str(),sc->m_stream->codec->channels, duration);
          mStreamInfo->Add(strinfo);
          mScs[mNumStreams++] = sc;
       }
@@ -471,13 +475,9 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory,
    }
 
    mChannels = new WaveTrack **[mNumStreams];
-   mNumSamples = 0;
 
    for (int s = 0; s < mNumStreams; s++)
    {
-      // As you can see, it's really a number of frames.
-      // TODO: use something other than nb_frames for progress reporting (nb_frames is not available for some formats). Maybe something from the format context?
-      mNumSamples += mScs[s]->m_stream->nb_frames;
       // There is a possibility that number of channels will change over time, but we do not have WaveTracks for new channels. Remember the number of channels and stick to it.
       mScs[s]->m_initialchannels = mScs[s]->m_stream->codec->channels;
       mChannels[s] = new WaveTrack *[mScs[s]->m_stream->codec->channels];
@@ -594,7 +594,7 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory,
    *outNumTracks = 0;
    for (int s = 0; s < mNumStreams; s++)
    {
-      *outNumTracks += mScs[s]->m_stream->codec->channels;
+      *outNumTracks += mScs[s]->m_initialchannels;
    }
 
    // Create new tracks
@@ -604,7 +604,7 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory,
    int trackindex = 0;
    for (int s = 0; s < mNumStreams; s++)
    {
-      for(int c = 0; c < mScs[s]->m_stream->codec->channels; c++)
+      for(int c = 0; c < mScs[s]->m_initialchannels; c++)
       {
          mChannels[s][c]->Flush();
          (*outTracks)[trackindex++] = mChannels[s][c];
@@ -777,8 +777,8 @@ int FFmpegImportFileHandle::WriteData(streamContext *sc)
    free(tmp);
    
    // Try to update the progress indicator (and see if user wants to cancel)
-   int tsize = FFmpegLibsInst->url_fsize(mFormatContext->pb);
-   if (!mProgress->Update((wxLongLong)this->mFormatContext->pb->pos, (wxLongLong)(tsize > 0 ? tsize : 1))) {
+   if (!mProgress->Update((wxLongLong)sc->m_pkt.pts * sc->m_stream->time_base.num / sc->m_stream->time_base.den,
+                          (wxLongLong)(mFormatContext->duration > 0 ? mFormatContext->duration / AV_TIME_BASE: 1))) {
       mCancelled = true;
       return 1;
    }
diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp
index 1b5af1b..805f297 100644
--- a/src/import/ImportFLAC.cpp
+++ b/src/import/ImportFLAC.cpp
@@ -91,6 +91,9 @@ class MyFLACFile : public FLAC::Decoder::File
    MyFLACFile(FLACImportFileHandle *handle) : mFile(handle)
    {
       mWasError = false;
+      set_metadata_ignore_all();
+      set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+      set_metadata_respond(FLAC__METADATA_TYPE_STREAMINFO);
    }
    
    bool get_was_error() const
@@ -413,8 +416,15 @@ int FLACImportFileHandle::Import(TrackFactory *trackFactory,
    tags->Clear();
    size_t cnt = mFile->mComments.GetCount();
    for (c = 0; c < cnt; c++) {
-      tags->SetTag(mFile->mComments[c].BeforeFirst(wxT('=')),
-                   mFile->mComments[c].AfterFirst(wxT('=')));
+      wxString name = mFile->mComments[c].BeforeFirst(wxT('='));
+      wxString value = mFile->mComments[c].AfterFirst(wxT('='));
+      if (name.Upper() == wxT("DATE") && !tags->HasTag(TAG_YEAR)) {
+         long val;
+         if (value.Length() == 4 && value.ToLong(&val)) {
+            name = TAG_YEAR;
+         }
+      }
+      tags->SetTag(name, value);
    }
 
    return eImportSuccess;
diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp
index 2163702..dfcffc3 100644
--- a/src/import/ImportLOF.cpp
+++ b/src/import/ImportLOF.cpp
@@ -290,7 +290,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
       
       if (windowCalledOnce)
       {
-         mProject = CreateNewAudacityProject(gParentWindow);
+         mProject = CreateNewAudacityProject();
       }
 
       windowCalledOnce = true;
@@ -313,7 +313,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
                /* i18n-hint: You do not need to translate "LOF" */
                wxMessageBox(_("Invalid window offset in LOF file."),
                             /* i18n-hint: You do not need to translate "LOF" */
-                            _("LOF Error"), wxOK | wxCENTRE, gParentWindow);
+                            _("LOF Error"), wxOK | wxCENTRE);
             }
                
             if (tok.HasMoreTokens())
@@ -334,7 +334,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
                /* i18n-hint: You do not need to translate "LOF" */
                wxMessageBox(_("Invalid duration in LOF file."),
                             /* i18n-hint: You do not need to translate "LOF" */
-                            _("LOF Error"), wxOK | wxCENTRE, gParentWindow);
+                            _("LOF Error"), wxOK | wxCENTRE);
             }
          }     // End if statement
 
@@ -415,7 +415,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
                    targetfile.AfterLast(wxT('.')).IsSameAs(wxT("midi"), false))
                {
                   wxMessageBox(_("MIDI tracks cannot be offset individually, only audio files can be."),
-                               _("LOF Error"), wxOK | wxCENTRE, gParentWindow);
+                               _("LOF Error"), wxOK | wxCENTRE);
                }
                else
 #endif
@@ -436,7 +436,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
             {
                /* i18n-hint: You do not need to translate "LOF" */
                wxMessageBox(_("Invalid track offset in LOF file."),
-                            _("LOF Error"), wxOK | wxCENTRE, gParentWindow);
+                            _("LOF Error"), wxOK | wxCENTRE);
             }
          }     // End if statement
       }     // End if statement
diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp
index 169e263..db1c5c9 100644
--- a/src/import/ImportMP3.cpp
+++ b/src/import/ImportMP3.cpp
@@ -320,6 +320,9 @@ void MP3ImportFileHandle::ImportID3(Tags *tags)
       else if (strcmp(frame->id, ID3_FRAME_TRACK) == 0) {
          n = TAG_TRACK;
       }
+      else if (strcmp(frame->id, "TYER") == 0) {
+         n = TAG_YEAR;
+      }
       else if (strcmp(frame->id, ID3_FRAME_YEAR) == 0) {
          n = TAG_YEAR;
       }
diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp
index 80cf197..2c8674d 100644
--- a/src/import/ImportOGG.cpp
+++ b/src/import/ImportOGG.cpp
@@ -382,8 +382,15 @@ int OggImportFileHandle::Import(TrackFactory *trackFactory, Track ***outTracks,
       tags->Clear();
       for (c = 0; c < mVorbisFile->vc[0].comments; c++) {
          wxString comment = UTF8CTOWX(mVorbisFile->vc[0].user_comments[c]);
-         tags->SetTag(comment.BeforeFirst(wxT('=')),
-                      comment.AfterFirst(wxT('=')));
+         wxString name = comment.BeforeFirst(wxT('='));
+         wxString value = comment.AfterFirst(wxT('='));
+         if (name.Upper() == wxT("DATE") && !tags->HasTag(TAG_YEAR)) {
+            long val;
+            if (value.Length() == 4 && value.ToLong(&val)) {
+               name = TAG_YEAR;
+            }
+         }
+         tags->SetTag(name, value);
       }
    }
 
diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
index 48f6ea8..4abb67c 100644
--- a/src/import/ImportPCM.cpp
+++ b/src/import/ImportPCM.cpp
@@ -51,6 +51,18 @@
 #include "../WaveTrack.h"
 #include "ImportPlugin.h"
 
+#ifdef USE_LIBID3TAG 
+   #include <id3tag.h>
+   // DM: the following functions were supposed to have been
+   // included in id3tag.h - should be fixed in the next release
+   // of mad.
+   extern "C" {
+      struct id3_frame *id3_frame_new(char const *);
+      id3_length_t id3_latin1_length(id3_latin1_t const *);
+      void id3_latin1_decode(id3_latin1_t const *, id3_ucs4_t *);
+   } 
+#endif
+
 #define DESC _("WAV, AIFF, and other uncompressed types")
 
 class PCMImportPlugin : public ImportPlugin
@@ -359,240 +371,148 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
       tags->SetTag(wxT("Software"), UTF8CTOWX(str));
    }
 
-   //comment out to undo profiling.
-   //END_TASK_PROFILING("Pre-GSOC (PCMAliasBlockFile) open an 80 mb wav stereo file");
-
-   return eImportSuccess;
-}
-
-PCMImportFileHandle::~PCMImportFileHandle()
-{
-   sf_close(mFile);
-}
-
-
-#if 0
-
-#include <wx/file.h>
-#include <wx/string.h>
-#include <wx/thread.h>
-#include <wx/timer.h>
-#include <wx/msgdlg.h>
-#include <wx/progdlg.h>
-#include <wx/intl.h>
-
-#include "Import.h"
-#include "ImportPCM.h"
+#if defined(USE_LIBID3TAG)
+   if ((mInfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AIFF) {
+      wxFFile f(mFilename, wxT("rb"));
+      if (f.IsOpened()) {
+         char id[5];
+         wxUint32 len;
 
-#include "../FileFormats.h"
-#include "../WaveTrack.h"
-#include "../DirManager.h"
-#include "../Prefs.h"
+         id[4] = '\0';
 
-#include "sndfile.h"
+         f.Seek(12);        // Skip filetype, length, and formtype
 
-bool IsPCM(wxString fName)
-{
-   wxFile testFile;
-   testFile.Open(fName);
-   if (!testFile.IsOpened())
-      return false;
-   testFile.Close();
-
-   SF_INFO    info;
-   SNDFILE   *fp;
-
-   fp = sf_open_read(OSFILENAME(fName), &info);
-
-   if (fp) {
-      sf_close(fp);
-      return true;
-   }
-
-   return false;
-}
+         while (!f.Eof()) {
+            f.Read(id, 4);    // Get chunk type
+            f.Read(&len, 4);
+            len = wxUINT32_SWAP_ON_LE(len);
 
+            if (strcmp(id, "ID3 ") != 0) {
+               f.Seek(len + (len & 0x01), wxFromCurrent);
+               continue;
+            }
 
-bool ImportPCM(wxWindow * parent,
-               wxString fName, 
-               WaveTrack ** channels[],
-               int *numChannels,
-               DirManager * dirManager)
-{
-   SF_INFO       info;
-   SNDFILE      *fp;
-   sampleFormat  format;
-
-   fp = sf_open_read(OSFILENAME(fName), &info);
-
-   if (!fp) {
-      char str[1000];
-      sf_error_str((SNDFILE *)NULL, str, 1000);
-      wxMessageBox(LAT1CTOWX(str));
-
-      return false;
-   }
-
-   wxString progressStr;
-   wxString formatName = sf_header_name(info.format & SF_FORMAT_TYPEMASK);
-   progressStr.Printf(_("Importing %s File..."),
-                      formatName.c_str());
-
-   *numChannels = info.channels;
-   *channels = new WaveTrack*[*numChannels];
-
-   if (info.pcmbitwidth > 16)
-      format = floatSample;
-   else
-      format = int16Sample;
-
-   int c;
-   for(c=0; c<*numChannels; c++) {
-      (*channels)[c] = new WaveTrack(dirManager, format, info.samplerate);
-      (*channels)[c]->SetName(TrackNameFromFileName(fName));
-      (*channels)[c]->SetChannel(Track::MonoChannel);
-   }
-
-   if (*numChannels == 2) {
-      (*channels)[0]->SetChannel(Track::LeftChannel);
-      (*channels)[1]->SetChannel(Track::RightChannel);
-      (*channels)[0]->SetLinked(true);
-      (*channels)[1]->SetTeamed(true);
-   }
-
-   sampleCount fileTotalFrames = (sampleCount)info.frames;
-   sampleCount maxBlockSize = (*channels)[0]->GetMaxBlockSize();
-
-   wxString copyEdit =
-       gPrefs->Read(wxT("/FileFormats/CopyOrEditUncompressedData"), wxT("edit"));
-
-   // Fall back to "edit" if it doesn't match anything else
-   bool doEdit = true;          
-   if (copyEdit.IsSameAs(wxT("copy"), false))
-      doEdit = false;
-
-   if (doEdit) {
- wxLogDebug(wxT("Importing PCM...ImportPCM \n"));
-
-      // If this mode has been selected, we form the tracks as
-      // aliases to the files we're editing, i.e. ("foo.wav", 12000-18000)
-      // instead of actually making fresh copies of the samples.
-
-      bool cancelling = false;
-
-      GetActiveProject()->ProgressShow(_("Import"), progressStr);
-
-      for (sampleCount i = 0; i < fileTotalFrames; i += maxBlockSize) {
-         sampleCount blockLen = maxBlockSize;
-         if (i + blockLen > fileTotalFrames)
-            blockLen = fileTotalFrames - i;
-
-         for(c=0; c<*numChannels; c++)
-            (*channels)[c]->AppendAlias(fName, i, blockLen, c);
-
-         cancelling = !GetActiveProject()->ProgressUpdate((int)((i*1000.0)/fileTotalFrames));
-
-         if (cancelling)
-            i = fileTotalFrames;
-      }
-
-      GetActiveProject()->ProgressHide();
-
-      //printf(_("Time elapsed: %d\n"), wxGetElapsedTime());
+            id3_byte_t *buffer = (id3_byte_t *)malloc(len);
+            if (!buffer) {
+               break;
+            }
 
-      if (cancelling) {
-         for(c=0; c<*numChannels; c++)
-            delete (*channels)[c];
-         delete[] (*channels);
-         *channels = NULL;
+            f.Read(buffer, len);
+            struct id3_tag *tp = id3_tag_parse(buffer, len);
+            free(buffer);
 
-         return false;
-      }
+            if (!tp) {
+               break;
+            }
 
-      return true;
-   }
+            tags->SetID3V2( tp->options & ID3_TAG_OPTION_ID3V1 ? false : true );
 
-   // Otherwise, we're in the "copy" mode, where we read in the actual
-   // samples from the file and store our own local copy of the
-   // samples in the tracks.
+            // Loop through all frames
+            for (int i = 0; i < (int) tp->nframes; i++) {
+               struct id3_frame *frame = tp->frames[i];
 
-   samplePtr srcbuffer = NewSamples(maxBlockSize * (*numChannels),
-                                    format);
-   samplePtr buffer = NewSamples(maxBlockSize, format);
+               // printf("ID: %08x '%4s'\n", (int) *(int *)frame->id, frame->id);
+               // printf("Desc: %s\n", frame->description);
+               // printf("Num fields: %d\n", frame->nfields);
 
-   sampleCount framescompleted = 0;
+               // for (int j = 0; j < (int) frame->nfields; j++) {
+               //    printf("field %d type %d\n", j, frame->fields[j].type );
+               //    if (frame->fields[j].type == ID3_FIELD_TYPE_STRINGLIST) {
+               //       printf("num strings %d\n", frame->fields[j].stringlist.nstrings);
+               //    }
+               // }
 
-   bool cancelling = false;
+               wxString n, v;
 
-   GetActiveProject->ProgressShow(_("Import"), progressStr);
+               // Determine the tag name
+               if (strcmp(frame->id, ID3_FRAME_TITLE) == 0) {
+                  n = TAG_TITLE;
+               }
+               else if (strcmp(frame->id, ID3_FRAME_ARTIST) == 0) {
+                  n = TAG_ARTIST;
+               }
+               else if (strcmp(frame->id, ID3_FRAME_ALBUM) == 0) {
+                  n = TAG_ALBUM;
+               }
+               else if (strcmp(frame->id, ID3_FRAME_TRACK) == 0) {
+                  n = TAG_TRACK;
+               }
+               else if (strcmp(frame->id, "TYER") == 0) {
+                  n = TAG_YEAR;
+               }
+               else if (strcmp(frame->id, ID3_FRAME_YEAR) == 0) {
+                  n = TAG_YEAR;
+               }
+               else if (strcmp(frame->id, ID3_FRAME_COMMENT) == 0) {
+                  n = TAG_COMMENTS;
+               }
+               else if (strcmp(frame->id, ID3_FRAME_GENRE) == 0) {
+                  n = TAG_GENRE;
+               }
+               else {
+                  // Use frame description as default tag name.  The descriptions
+                  // may include several "meanings" separated by "/" characters, so
+                  // we just use the first meaning
+                  n = UTF8CTOWX(frame->description).BeforeFirst(wxT('/'));
+               }
 
-   long block;
-   do {
-      block = maxBlockSize;
+               const id3_ucs4_t *ustr = NULL;
 
-      if (format == int16Sample)
-         block = sf_readf_short(fp, (short *)srcbuffer, block);
-      else
-         block = sf_readf_float(fp, (float *)srcbuffer, block);
+               if (n == TAG_COMMENTS) {
+                  ustr = id3_field_getfullstring(&frame->fields[3]);
+               }
+               else if (frame->nfields == 3) {
+                  ustr = id3_field_getstring(&frame->fields[1]);
+                  if (ustr) {
+                     char *str = (char *)id3_ucs4_utf8duplicate(ustr);
+                     n = UTF8CTOWX(str);
+                     free(str);
+                  }
+
+                  ustr = id3_field_getstring(&frame->fields[2]);
+               }
+               else if (frame->nfields >= 2) {
+                  ustr = id3_field_getstrings(&frame->fields[1], 0);
+               }
 
-      if (block) {
-         for(c=0; c<(*numChannels); c++) {
+               if (ustr) {
+                  char *str = (char *)id3_ucs4_utf8duplicate(ustr);
+                  v = UTF8CTOWX(str);
+                  free(str);
+               }
 
-            if (format==int16Sample) {
-               if (info.pcmbitwidth == 8) {
-                  for(int j=0; j<block; j++)
-                     ((short *)buffer)[j] =
-                        ((short *)srcbuffer)[(*numChannels)*j+c] << 8;
+               if (!n.IsEmpty() && !v.IsEmpty()) {
+                  tags->SetTag(n, v);
                }
-               else {
-                  for(int j=0; j<block; j++)
-                     ((short *)buffer)[j] =
-                        ((short *)srcbuffer)[(*numChannels)*j+c];
+            }
+
+            // Convert v1 genre to name
+            if (tags->HasTag(TAG_GENRE)) {
+               long g = -1;
+               if (tags->GetTag(TAG_GENRE).ToLong(&g)) {
+                  tags->SetTag(TAG_GENRE, tags->GetGenre(g));
                }
             }
-            else
-               for(int j=0; j<block; j++)
-                  ((float *)buffer)[j] =
-                     ((float *)srcbuffer)[(*numChannels)*j+c];
 
-            (*channels)[c]->Append(buffer, format, block);
+            id3_tag_delete(tp);
+            break;
          }
 
-         framescompleted += block;
+         f.Close();
       }
-
-      int progressvalue = (framescompleted > fileTotalFrames) ?
-          fileTotalFrames : framescompleted;
-
-      cancelling =
-         !GetActiveProject()->ProgressUpdate((int)((progressvalue*1000.0)/fileTotalFrames));
-
-      if (cancelling)
-         block = 0;
-   } while (block > 0);
-
-   GetActiveProject()->ProgressHide();
-
-   sf_close(fp);
-
-   //printf("Time elapsed: %d\n", wxGetElapsedTime());
-
-   DeleteSamples(srcbuffer);
-   DeleteSamples(buffer);
-
-   if (cancelling) {
-      for(c=0; c<*numChannels; c++)
-         delete (*channels)[c];
-      delete[] (*channels);
-      *channels = NULL;
-
-      return false;
    }
+#endif
+
+   //comment out to undo profiling.
+   //END_TASK_PROFILING("Pre-GSOC (PCMAliasBlockFile) open an 80 mb wav stereo file");
 
-   return true;
+   return eImportSuccess;
 }
 
-#endif
+PCMImportFileHandle::~PCMImportFileHandle()
+{
+   sf_close(mFile);
+}
 
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp
index 6093b4c..92ac562 100644
--- a/src/import/ImportQT.cpp
+++ b/src/import/ImportQT.cpp
@@ -13,10 +13,7 @@
 **********************************************************************/
 
 #include "../Audacity.h"
-#include "../Tags.h"
-#include "ImportQT.h"
 #include "ImportPlugin.h"
-#include "wx/intl.h"
 
 #define DESC _("QuickTime files")
 
@@ -40,20 +37,17 @@ void GetQTImportPlugin(ImportPluginList *importPluginList,
 
 #else /* USE_QUICKTIME */
 
-#define Track XTrack
-
-// gives us routines to convert between filenames and FSSpec
-#ifndef WIN32
-#include <wx/mac/private.h>
-#endif
 #include <wx/msgdlg.h>
 
-// I'm not sure what __MACH__ is important for, this list of headers is
-// copied verbatim from the Apple sample code
+// There's a name collision between our Track and QuickTime's...workaround it
+#define Track XTrack
+
 #ifdef __MACH__
+// These get used when building under OSX
    #include <Carbon/Carbon.h>
    #include <QuickTime/QuickTime.h>
 #else
+// These get used when building under Windows
    #include <ConditionalMacros.h>
    #include <Movies.h>
    #include <QuickTimeComponents.h>
@@ -64,15 +58,18 @@ void GetQTImportPlugin(ImportPluginList *importPluginList,
    #include <Navigation.h>
 #endif
 
+// There's a name collision between our Track and QuickTime's...workaround it
 #undef Track
 
+#include "../Internat.h"
+#include "../Tags.h"
 #include "../WaveTrack.h"
+#include "ImportQT.h"
 
 // Prototype for the callback
 static pascal Boolean
 SoundConverterFillBufferCallback(SoundComponentDataPtr *outData, void *userData);
 
-
 Media GetMediaFromMovie(Movie mov);
 
 // Structure used to pass data to the sound converter fill buffer callback
@@ -146,8 +143,9 @@ wxString QTImportPlugin::GetPluginFormatDescription()
 
 ImportFileHandle *QTImportPlugin::Open(wxString Filename)
 {
+   FSRef inRef;
    FSSpec inFile;
-   FInfo fileInfo;
+   FSCatalogInfo catInfo;
    Movie theMovie = 0;
    Media theMedia;
    OSErr err;
@@ -155,22 +153,15 @@ ImportFileHandle *QTImportPlugin::Open(wxString Filename)
    // Make sure QuickTime is initialized
    //::EnterMovies();
 
-#ifdef WIN32
-   char* specFilename = strdup(Filename.GetData());
-   err = FSMakeFSSpec(0,0,c2pstr(specFilename), &inFile);
-   free(specFilename);
+   err = FSPathMakeRef((UInt8 *)OSFILENAME(Filename), &inRef, NULL);
    if (err != noErr)
       return NULL;
 
-#else
-   wxMacFilename2FSSpec(Filename, &inFile);
-#endif
-
-   err = FSpGetFInfo(&inFile, &fileInfo);
+   err = FSGetCatalogInfo(&inRef, kFSCatInfoFinderInfo, &catInfo, NULL, &inFile, NULL);
    if (err != noErr)
       return NULL;
 
-   if (kQTFileTypeSystemSevenSound == fileInfo.fdType)
+   if (((FInfo *)&catInfo.finderInfo)->fdType == kQTFileTypeSystemSevenSound)
    {
       // TODO: handle this case.  it is special because system seven sounds cannot
       // be opened in place
@@ -379,7 +370,6 @@ int QTImportFileHandle::Import(TrackFactory *trackFactory, Track ***outTracks,
 
    // allocate source media buffer
    cbData.hSource            = NewHandle((long)cbData.maxBufferSize);
-   MoveHHi(cbData.hSource);
    HLock(cbData.hSource);
 
    cbData.compData.desc = inputFormat;
diff --git a/src/ondemand/ODManager.cpp b/src/ondemand/ODManager.cpp
index 947d791..214bd94 100644
--- a/src/ondemand/ODManager.cpp
+++ b/src/ondemand/ODManager.cpp
@@ -30,6 +30,78 @@ ODLock sLibSndFileMutex;
 
 DEFINE_EVENT_TYPE(EVT_ODTASK_UPDATE)
 
+//OD files are "greater than" non OD files, to produce a sort that has
+//OD Files at the end.
+int CompareODFileName(const wxString& first, const wxString& second)
+{
+   bool firstIsOD = false;
+   bool secondIsOD = false;
+
+#ifdef EXPERIMENTAL_ONDEMAND         
+   if(first.EndsWith(wxT("wav"))||first.EndsWith(wxT("WAV"))||
+      first.EndsWith(wxT("wave"))||first.EndsWith(wxT("WAVE"))||
+      first.EndsWith(wxT("Wav"))||first.EndsWith(wxT("Wave"))||
+      first.EndsWith(wxT("aif"))||first.EndsWith(wxT("AIF"))||
+      first.EndsWith(wxT("aiff"))||first.EndsWith(wxT("AIFF"))||
+      first.EndsWith(wxT("aiff"))||first.EndsWith(wxT("Aif")) )
+    {
+      firstIsOD=true;
+    }
+   if(second.EndsWith(wxT("wav"))||second.EndsWith(wxT("WAV"))||
+      second.EndsWith(wxT("wave"))||second.EndsWith(wxT("WAVE"))||
+      second.EndsWith(wxT("Wav"))||second.EndsWith(wxT("Wave"))||
+      second.EndsWith(wxT("aif"))||second.EndsWith(wxT("AIF"))||
+      second.EndsWith(wxT("aiff"))||second.EndsWith(wxT("AIFF"))||
+      second.EndsWith(wxT("aiff"))||second.EndsWith(wxT("Aif")) )
+    {
+      secondIsOD=true;
+    }
+        
+#endif
+    
+    if(firstIsOD && !secondIsOD)
+      return 1;
+    else if(secondIsOD&&!firstIsOD)
+      return -1;
+   
+   return first.Cmp(second);
+}
+
+//same as above but OD is less than non-OD
+int CompareODFirstFileName(const wxString& first, const wxString& second)
+{
+   bool firstIsOD = false;
+   bool secondIsOD = false;
+   
+#ifdef EXPERIMENTAL_ONDEMAND      
+   if(first.EndsWith(wxT("wav"))||first.EndsWith(wxT("WAV"))||
+      first.EndsWith(wxT("wave"))||first.EndsWith(wxT("WAVE"))||
+      first.EndsWith(wxT("Wav"))||first.EndsWith(wxT("Wave"))||
+      first.EndsWith(wxT("aif"))||first.EndsWith(wxT("AIF"))||
+      first.EndsWith(wxT("aiff"))||first.EndsWith(wxT("AIFF"))||
+      first.EndsWith(wxT("aiff"))||first.EndsWith(wxT("Aif")) )
+    {
+      firstIsOD=true;
+    }
+   if(second.EndsWith(wxT("wav"))||second.EndsWith(wxT("WAV"))||
+      second.EndsWith(wxT("wave"))||second.EndsWith(wxT("WAVE"))||
+      second.EndsWith(wxT("Wav"))||second.EndsWith(wxT("Wave"))||
+      second.EndsWith(wxT("aif"))||second.EndsWith(wxT("AIF"))||
+      second.EndsWith(wxT("aiff"))||second.EndsWith(wxT("AIFF"))||
+      second.EndsWith(wxT("aiff"))||second.EndsWith(wxT("Aif")) )
+    {
+      secondIsOD=true;
+    }
+        
+#endif    
+    
+    if(firstIsOD && !secondIsOD)
+      return -1;
+    else if(secondIsOD&&!firstIsOD)
+      return 1;
+   
+   return first.Cmp(second);
+}
 
 void ODManager::LockLibSndFileMutex()
 {
diff --git a/src/ondemand/ODManager.h b/src/ondemand/ODManager.h
index 11be78d..1e668b6 100644
--- a/src/ondemand/ODManager.h
+++ b/src/ondemand/ODManager.h
@@ -41,6 +41,10 @@ number of threads.
 
 DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_ODTASK_UPDATE, -1)
 
+///wxstring compare function for sorting filenames with od
+int CompareODFileName(const wxString& first, const wxString& second);
+int CompareODFirstFileName(const wxString& first, const wxString& second);
+
 /// A singleton that manages currently running Tasks on an arbitrary 
 /// number of threads.
 class WaveTrack;
diff --git a/src/prefs/AudioIOPrefs.cpp b/src/prefs/AudioIOPrefs.cpp
index d82008a..5253bfc 100644
--- a/src/prefs/AudioIOPrefs.cpp
+++ b/src/prefs/AudioIOPrefs.cpp
@@ -25,6 +25,7 @@ other settings.
 
 #include "../Audacity.h"
 #include <wx/defs.h>
+#include <wx/choice.h>
 #include <wx/intl.h>
 
 #include "../Prefs.h"
@@ -76,7 +77,7 @@ void AudioIOPrefs::GetNamesAndLabels()
    int nDevices = Pa_CountDevices();
 #endif
 
-   int numChannels = 0; // find max no. of record channels available
+//   int numChannels = 0; // find max no. of record channels available
    for(j=0; j<nDevices; j++) {
       const PaDeviceInfo* info = Pa_GetDeviceInfo(j);
       Name = DeviceName(info);
@@ -88,12 +89,13 @@ void AudioIOPrefs::GetNamesAndLabels()
       if (info->maxInputChannels > 0) {
          mmRecordNames.Add( Name );
          mmRecordLabels.Add( Label );
-         if (info->maxInputChannels > numChannels)
-            numChannels = info->maxInputChannels;
+//         if (info->maxInputChannels > numChannels)
+//            numChannels = info->maxInputChannels;
       }
    }
 
    // Channel counts, mono, stereo etc...
+   const int numChannels = 16;
    for(int c=0; c<numChannels; c++)
    {
       mmChannelNames.Add(  wxString::Format(wxT("%d"), c+1));
@@ -118,7 +120,7 @@ void AudioIOPrefs::PopulateOrExchange( ShuttleGui & S )
    {
       S.StartMultiColumn(2, wxEXPAND);
       S.SetStretchyCol(1);
-      S.TieChoice( _("Device") + wxString(wxT(":")), wxT("PlaybackDevice"), 
+      mPlay = S.TieChoice( _("Device") + wxString(wxT(":")), wxT("PlaybackDevice"), 
          wxT(""), mmPlayNames, mmPlayLabels );
 
       S.AddPrompt( _("Using:") );
@@ -136,7 +138,7 @@ void AudioIOPrefs::PopulateOrExchange( ShuttleGui & S )
    {
       S.StartMultiColumn(2, wxEXPAND);
       S.SetStretchyCol(1);
-      S.TieChoice( _("Device") + wxString(wxT(":")), wxT("RecordingDevice"), 
+      mRec = S.TieChoice( _("Device") + wxString(wxT(":")), wxT("RecordingDevice"), 
          wxT(""), mmRecordNames, mmRecordLabels );
       S.TieChoice( _("Channels") + wxString(wxT(":")), wxT("RecordChannels"), 
          2, mmChannelNames, mmChannelLabels );
@@ -192,10 +194,12 @@ void AudioIOPrefs::PopulateOrExchange( ShuttleGui & S )
 #if USE_PORTAUDIO_V19
       // only show the following controls if we use Portaudio v19, because
       // for Portaudio v18 we always use default buffer sizes
-      S.TieTextBox( _("Audio to buffer:\n(higher = more latency)"),wxT("LatencyDuration"),100.0,9);
+      S.TieTextBox( _("Audio to buffer:\n(higher = more latency)"),wxT("LatencyDuration"),
+         DEFAULT_LATENCY_DURATION,9);
       S.AddUnits(  _("milliseconds") );
 #endif
-      S.TieTextBox( _("Latency correction:\n(negative = backwards)"),wxT("LatencyCorrection"),0.0,9);
+      S.TieTextBox( _("Latency correction:\n(negative = backwards)"),wxT("LatencyCorrection"),
+         DEFAULT_LATENCY_CORRECTION,9);
       S.AddUnits(  _("milliseconds") );
       S.EndThreeColumn();
    }
@@ -244,15 +248,20 @@ AudioIOPrefs::~AudioIOPrefs()
 
 bool AudioIOPrefs::Apply()
 {
+#if USE_PORTAUDIO_V19
+   if (!AudioIO::ValidateDeviceNames(mPlay->GetStringSelection(), mRec->GetStringSelection())) {
+      wxMessageBox(_("Playback and Recording device must use the same type, i.e., MME, DirectSound, etc."));
+      return false;
+   }
+#endif
+
    ShuttleGui S( this, eIsSavingToPrefs );
    PopulateOrExchange( S );
 
-#if USE_PORTAUDIO_V19
-   double latencyDuration = 100.0;
+   double latencyDuration = DEFAULT_LATENCY_DURATION;
    gPrefs->Read(wxT("/AudioIO/LatencyDuration"), &latencyDuration);
    if (latencyDuration < 0)
-      gPrefs->Write(wxT("/AudioIO/LatencyDuration"), 100.0);
-#endif
+      gPrefs->Write(wxT("/AudioIO/LatencyDuration"), DEFAULT_LATENCY_DURATION);
 
 #if USE_PORTMIXER
    if (gAudioIO)
diff --git a/src/prefs/AudioIOPrefs.h b/src/prefs/AudioIOPrefs.h
index a03f46e..f2c84ae 100644
--- a/src/prefs/AudioIOPrefs.h
+++ b/src/prefs/AudioIOPrefs.h
@@ -45,6 +45,9 @@ private:
    wxArrayString mmRecordLabels;
    wxArrayString mmChannelNames;
    wxArrayInt    mmChannelLabels;
+
+   wxChoice *mPlay;
+   wxChoice *mRec;
 };
 
 #endif
diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp
index 75dd956..5f7608b 100644
--- a/src/prefs/BatchPrefs.cpp
+++ b/src/prefs/BatchPrefs.cpp
@@ -112,7 +112,6 @@ bool BatchPrefs::Apply()
       if(gAudacityProjects[i])
       {
          gAudacityProjects[i]->SetCleanSpeechMode(mode == 1);
-         gAudacityProjects[i]->RebuildMenuBar();
          gAudacityProjects[i]->mToolManager->LayoutToolBars(); // Just to add/remove the CleanSpeech button.
       }
    return true;
diff --git a/src/prefs/FileFormatPrefs.cpp b/src/prefs/FileFormatPrefs.cpp
index 840951a..e69a651 100644
--- a/src/prefs/FileFormatPrefs.cpp
+++ b/src/prefs/FileFormatPrefs.cpp
@@ -93,7 +93,7 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui & S )
          S.AddVariableText( _("MP3 Library:"),
             true,
             wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
-         S.Id( ID_MP3_FIND_BUTTON ).AddButton( _("&Find Library"), 
+         S.Id( ID_MP3_FIND_BUTTON ).AddButton( _("&Locate..."), 
             wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
          S.AddVariableText( _("LAME MP3 Library:"),
             true,
@@ -117,7 +117,7 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui & S )
 #endif
       S.AddVariableText( _("FFmpeg Library:"),
          true, wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
-      wxButton *bfnd = S.Id( ID_FFMPEG_FIND_BUTTON ).AddButton( _("&Find Library"), 
+      wxButton *bfnd = S.Id( ID_FFMPEG_FIND_BUTTON ).AddButton( _("&Locate..."), 
          wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
       S.AddVariableText( _("FFmpeg Library:"),
          true,
@@ -184,7 +184,7 @@ void FileFormatPrefs::OnMP3FindButton(wxCommandEvent& evt)
 /// tell us where the MP3 library is.
 void FileFormatPrefs::OnMP3DownButton(wxCommandEvent& evt)
 {
-   wxString url = wxT("http://audacity.sourceforge.net/help/faq?s=install&i=lame-mp3");
+   wxString url = wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23How_do_I_download_and_install_the_LAME_MP3_encoder.3F");
    ::OpenInDefaultBrowser(url);
 }
 
@@ -198,16 +198,22 @@ void FileFormatPrefs::OnFFmpegFindButton(wxCommandEvent& evt)
 {
 #ifdef USE_FFMPEG
    FFmpegLibs* FFmpegLibsInst = PickFFmpegLibs();
+   bool showerrs =
+#if defined(__WXDEBUG__)
+      true;
+#else
+      false;
+#endif
 
    FFmpegLibsInst->FreeLibs();
    // Load the libs ('true' means that all errors will be shown)
-   bool locate = !LoadFFmpeg(true);
+   bool locate = !LoadFFmpeg(showerrs);
 
    // Libs are fine, don't show "locate" dialog unless user really wants it
    if (!locate)
    {
       int response = wxMessageBox(wxT("Audacity has automatically detected valid FFmpeg libraries.\
-                       \nDo you still want to locate them manually?"),wxT("Success"),wxCENTRE | wxYES_NO | wxICON_QUESTION);
+                       \nDo you still want to locate them manually?"),wxT("Success"),wxCENTRE | wxYES_NO | wxNO_DEFAULT |wxICON_QUESTION);
       if (response == wxYES)
         locate = true;
    }
@@ -216,7 +222,7 @@ void FileFormatPrefs::OnFFmpegFindButton(wxCommandEvent& evt)
       // Show "Locate FFmpeg" dialog
       FFmpegLibsInst->FindLibs(this);
       FFmpegLibsInst->FreeLibs();
-      LoadFFmpeg(true);
+      LoadFFmpeg(showerrs);
    }
    SetFFmpegVersionText();
 
diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
index d4317b6..9801afe 100644
--- a/src/prefs/GUIPrefs.cpp
+++ b/src/prefs/GUIPrefs.cpp
@@ -182,15 +182,6 @@ bool GUIPrefs::Apply()
    wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
    wxGetApp().InitLang( lang );
 
-   unsigned int j;
-   for(j = 0; j < gAudacityProjects.GetCount(); j++)
-   {
-      gAudacityProjects[j]->UpdatePrefsVariables();
-      gAudacityProjects[j]->RebuildMenuBar();
-      gAudacityProjects[j]->RebuildOtherMenus();
-      if (gAudacityProjects[j]->GetSelectionBar())
-         gAudacityProjects[j]->GetSelectionBar()->UpdateDisplay();
-   }
    return true;
 }
 
diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index 3daf337..8e8002a 100644
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@@ -68,18 +68,32 @@ PrefsPanel(parent)
 
 void KeyConfigPrefs::Populate( )
 {
+   //------------------------- Main section --------------------
+   // Now construct the GUI itself.
+   // Use 'eIsCreatingFromPrefs' so that the GUI is 
+   // initialised with values from gPrefs.
+   ShuttleGui S(this, eIsCreatingFromPrefs);
+
    // First any pre-processing for constructing the GUI.
    // These steps set up the pointer to the command manager...
    AudacityProject *project = GetActiveProject();
-   if (!project)
+   if (!project) {
+
+      S.StartVerticalLay(true);
+      {
+         S.StartStatic(wxEmptyString, true);
+         {
+            S.AddTitle(_("Keyboard preferences currently unavailable."));
+            S.AddTitle(_("Open a new project to modify keyboard shortcuts."));
+         }
+         S.EndStatic();
+      }
+      S.EndVerticalLay();
+
       return;
+   }
    mManager = project->GetCommandManager();
 
-   //------------------------- Main section --------------------
-   // Now construct the GUI itself.
-   // Use 'eIsCreatingFromPrefs' so that the GUI is 
-   // initialised with values from gPrefs.
-   ShuttleGui S(this, eIsCreatingFromPrefs);
    PopulateOrExchange(S);
    // ----------------------- End of main section --------------
    CreateList();
@@ -107,7 +121,7 @@ void KeyConfigPrefs::PopulateOrExchange( ShuttleGui & S )
       // the sizer scheme later...
       mCurrentComboText = new SysKeyTextCtrl(
             this, CurrentComboID, wxT(""),
-            wxDefaultPosition, wxSize(115, -1), 0 );
+            wxDefaultPosition, wxSize(300, -1), 0 );
 
       // AddWindow is a generic 'Add' for ShuttleGui.
       // It allows us to add 'foreign' controls.
@@ -116,9 +130,11 @@ void KeyConfigPrefs::PopulateOrExchange( ShuttleGui & S )
       S.Id( ClearButtonID ).AddButton( _("&Clear"));
    }
    S.EndHorizontalLay();
-   #ifdef __WXMAC__
+
+#if defined(__WXMAC__)
    S.AddFixedText( _("Note: Pressing Cmd+Q will quit. All other keys are valid."));
-   #endif
+#endif
+
    S.StartHorizontalLay( wxALIGN_LEFT, 0);
    {
       S.Id( AssignDefaultsButtonID ).AddButton( _("&Defaults"));
@@ -139,17 +155,14 @@ void KeyConfigPrefs::CreateList()
    //An empty first column is a workaround - under Win98 the first column 
    //can't be right aligned.
    mList->InsertColumn(BlankColumn,    wxT(""), wxLIST_FORMAT_LEFT );
-   mList->InsertColumn(CommandColumn,  _NoAcc("&Command"),  wxLIST_FORMAT_RIGHT );
+   mList->InsertColumn(CommandColumn,  _NoAcc("&Command"),  wxLIST_FORMAT_LEFT );
    mList->InsertColumn(KeyComboColumn, _("Key Combination"), wxLIST_FORMAT_LEFT );
 
    RepopulateBindingsList();
 
    mList->SetColumnWidth( BlankColumn, 0 ); // First column width is zero, to hide it.
-   // Would like to use wxLIST_AUTOSIZE but
-   // wxWindows does not look at the size of column heading.
-   mList->SetColumnWidth( CommandColumn, 250 );
-//   mList->SetColumnWidth( CommandColumn, wxLIST_AUTOSIZE );
-   mList->SetColumnWidth( KeyComboColumn, 115 );
+   mList->SetColumnWidth( CommandColumn, wxLIST_AUTOSIZE );
+   mList->SetColumnWidth( KeyComboColumn, 250 );
 }
 
 void KeyConfigPrefs::OnSave(wxCommandEvent& event)
@@ -373,14 +386,7 @@ void KeyConfigPrefs::RepopulateBindingsList()
          label = mManager->GetPrefixedLabelFromName(mNames[i]);
       
       label = wxMenuItem::GetLabelFromText(label.BeforeFirst('\t'));
-      wxString key = mManager->GetKeyFromName(mNames[i]);
-
-      #ifdef __WXMAC__
-      // Replace Ctrl with Cmd
-      if (key.Length() >= 5 && key.Left(5)==wxT("Ctrl+")) {
-         key = wxT("Cmd+")+key.Right(key.Length()-5);
-      }
-      #endif
+      wxString key = KeyStringDisplay(mManager->GetKeyFromName(mNames[i]));
 
       mList->SetItem( i, CommandColumn, label );
       mList->SetItem( i, KeyComboColumn, key );
@@ -390,9 +396,11 @@ void KeyConfigPrefs::RepopulateBindingsList()
 void KeyConfigPrefs::OnDefaults(wxCommandEvent& event)
 {
    unsigned int i;
-
-   for(i=0; i<mNames.GetCount(); i++) {
-      mList->SetItem( i, KeyComboColumn, mManager->GetDefaultKeyFromName(mNames[i]) );
+ 
+   for (i=0; i<mNames.GetCount(); i++) {
+      mList->SetItem(i,
+                     KeyComboColumn,
+                     KeyStringDisplay(mManager->GetDefaultKeyFromName(mNames[i])));
    }
 }
 
@@ -417,19 +425,12 @@ bool KeyConfigPrefs::Apply()
       item.SetId( i );
       mList->GetItem(item);
       wxString name = mNames[i];
-      wxString key = item.m_text;
+      wxString key = KeyStringNormalize(item.m_text);
 
-      #ifdef __WXMAC__
-      // Replace Cmd with Ctrl
-      if (key.Length() >= 4 && key.Left(4)==wxT("Cmd+")) {
-         key = wxT("Ctrl+")+key.Right(key.Length()-4);
-      }
-      #endif
-
-      wxString defaultKey = mManager->GetDefaultKeyFromName(name);
+      wxString defaultKey = KeyStringNormalize(mManager->GetDefaultKeyFromName(name));
 
       if (gPrefs->HasEntry(name)) {
-         wxString oldKey = gPrefs->Read(name, key);
+         wxString oldKey = KeyStringNormalize(gPrefs->Read(name, key));
          if (oldKey != key)  {
             gPrefs->Write(name, key);
          }
@@ -446,10 +447,6 @@ bool KeyConfigPrefs::Apply()
 
    gPrefs->SetPath(wxT("/"));
 
-   for(i=0; i<gAudacityProjects.GetCount(); i++)
-      if(gAudacityProjects[i])
-         gAudacityProjects[i]->RebuildMenuBar();
-
    return true;
 }
 
@@ -483,7 +480,7 @@ SysKeyTextCtrl::~SysKeyTextCtrl()
 //DM: On Linux, now it works except for Ctrl+3...Ctrl+8 (April/2003)
 void SysKeyTextCtrl::OnKey(wxKeyEvent& event)
 {
-   SetValue(KeyEventToKeyString(event));
+   SetValue(KeyStringDisplay(KeyEventToKeyString(event)));
 }
 
 //BG: Trap WM_CHAR
diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
index cec138e..0c59505 100644
--- a/src/prefs/SpectrumPrefs.cpp
+++ b/src/prefs/SpectrumPrefs.cpp
@@ -21,6 +21,7 @@
 #include <wx/msgdlg.h>
 
 #include "../Prefs.h"
+#include "../Project.h"
 #include "../ShuttleGui.h"
 #include "SpectrumPrefs.h"
 #include "../FFT.h"
@@ -238,6 +239,12 @@ bool SpectrumPrefs::Apply()
    gPrefs->Write(wxT("/Spectrum/WindowType"), windowType);
 
    // TODO: Force all projects to repaint themselves
+   //v? Or just the active project, voila?
+   // Update the TrackPanel correspondingly. 
+   // Calling RedrawProject is inefficient relative to sending a msg to TrackPanel 
+   // for a particular track and control, but not a real performance hit.
+   GetActiveProject()->RedrawProject(true);
+
    return true;
 }
 
diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h
index b42916c..4bf5a69 100644
--- a/src/toolbars/SelectionBar.h
+++ b/src/toolbars/SelectionBar.h
@@ -94,7 +94,6 @@ class SelectionBar:public ToolBar {
    double mStart, mEnd, mAudio;
    wxString mField[10];
 
-   TimeTextCtrl   *mLeftTime;
    TimeTextCtrl   *mRightTime;
    wxRadioButton  *mRightEndButton;
    wxRadioButton  *mRightLengthButton;
@@ -104,6 +103,7 @@ class SelectionBar:public ToolBar {
    wxCheckBox     *mSnapTo;
 
  public:
+   TimeTextCtrl   *mLeftTime;
 
    DECLARE_CLASS(SelectionBar);
    DECLARE_EVENT_TABLE();
diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp
index 89750c2..70c5219 100644
--- a/src/toolbars/ToolsToolBar.cpp
+++ b/src/toolbars/ToolsToolBar.cpp
@@ -180,7 +180,7 @@ void ToolsToolBar::Populate()
 
    /* Tools */
    mTool[ selectTool   ] = MakeTool( bmpIBeam, selectTool, _("Selection Tool") );
-   mTool[ envelopeTool ] = MakeTool( bmpEnvelope, envelopeTool, _("Time Shift Tool") );
+   mTool[ envelopeTool ] = MakeTool( bmpEnvelope, envelopeTool, _("Envelope Tool") );
    mTool[ drawTool     ] = MakeTool( bmpDraw, drawTool, _("Draw Tool") );
    mTool[ zoomTool     ] = MakeTool( bmpZoom, zoomTool, _("Zoom Tool") );
    mTool[ slideTool    ] = MakeTool( bmpTimeShift, slideTool, _("Slide Tool") );
diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp
index 9c1bf85..86f0aa3 100644
--- a/src/widgets/Grid.cpp
+++ b/src/widgets/Grid.cpp
@@ -395,13 +395,78 @@ void Grid::OnKeyDown(wxKeyEvent &event)
 {
    switch (event.GetKeyCode())
    {
+      case WXK_LEFT:
+      case WXK_RIGHT:
+      {
+         int rows = GetNumberRows();
+         int cols = GetNumberCols();
+         int crow = GetGridCursorRow();
+         int ccol = GetGridCursorCol();
+
+         if (event.GetKeyCode() == WXK_LEFT) {
+            if (crow == 0 && ccol == 0) {
+               // do nothing
+            }
+            else if (ccol == 0) {
+               SetGridCursor(crow - 1, cols - 1);
+            }
+            else {
+               SetGridCursor(crow, ccol - 1);
+            }
+         }
+         else {
+            if (crow == rows - 1 && ccol == cols - 1) {
+               // do nothing
+            }
+            else if (ccol == cols - 1) {
+               SetGridCursor(crow + 1, 0);
+            }
+            else {
+               SetGridCursor(crow, ccol + 1);
+            }
+         }
+      }
+      break;
+
       case WXK_TAB:
       {
-         int flags = wxNavigationKeyEvent::FromTab |
-                     ( event.ShiftDown() ?
-                       wxNavigationKeyEvent::IsBackward :
-                       wxNavigationKeyEvent::IsForward );
-         Navigate(flags);
+         int rows = GetNumberRows();
+         int cols = GetNumberCols();
+         int crow = GetGridCursorRow();
+         int ccol = GetGridCursorCol();
+
+         if (event.ControlDown()) {
+            int flags = wxNavigationKeyEvent::FromTab |
+                        ( event.ShiftDown() ?
+                          wxNavigationKeyEvent::IsBackward :
+                          wxNavigationKeyEvent::IsForward );
+            Navigate(flags);
+         }
+         else if (event.ShiftDown()) {
+            if (crow == 0 && ccol == 0) {
+               Navigate(wxNavigationKeyEvent::FromTab | wxNavigationKeyEvent::IsBackward);
+               return;
+            }
+            else if (ccol == 0) {
+               SetGridCursor(crow - 1, cols - 1);
+            }
+            else {
+               SetGridCursor(crow, ccol - 1);
+            }
+         }
+         else {
+            if (crow == rows - 1 && ccol == cols - 1) {
+               Navigate(wxNavigationKeyEvent::FromTab | wxNavigationKeyEvent::IsForward);
+               return;
+            }
+            else if (ccol == cols - 1) {
+               SetGridCursor(crow + 1, 0);
+            }
+            else {
+               SetGridCursor(crow, ccol + 1);
+            }
+         }
+         MakeCellVisible(GetGridCursorRow(), GetGridCursorCol());
       }
       break;
 
diff --git a/src/widgets/HtmlWindow.cpp b/src/widgets/HtmlWindow.cpp
old mode 100755
new mode 100644
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 89bd657..eb453de 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -70,6 +70,35 @@
 #include "../AllThemeResources.h"
 #include "../Experimental.h"
 
+/* Updates to the meter are passed accross via meter updates, each contained in
+ * a MeterUpdateMsg object */
+wxString MeterUpdateMsg::toString()
+{
+wxString output;  // somewhere to build up a string in
+output = wxString::Format(wxT("Meter update msg: %i channels, %i samples\n"), \
+      kMaxMeterBars, numFrames);
+for (int i = 0; i<kMaxMeterBars; i++)
+   {  // for each channel of the meters
+   output += wxString::Format(wxT("%f peak, %f rms "), peak[i], rms[i]);
+   if (clipping[i])
+      output += wxString::Format(wxT("clipped "));
+   else
+      output += wxString::Format(wxT("no clip "));
+   output += wxString::Format(wxT("%i head, %i tail\n"), headPeakCount[i], tailPeakCount[i]);
+   }
+return output;
+}
+
+wxString MeterUpdateMsg::toStringIfClipped()
+{
+for (int i = 0; i<kMaxMeterBars; i++)
+   {
+   if (clipping[i] || (headPeakCount[i] > 0) || (tailPeakCount[i] > 0))
+      return toString();
+   }
+return wxT("");
+}
+
 //
 // The Meter passes itself messages via this queue so that it can
 // communicate between the audio thread and the GUI thread.
@@ -107,6 +136,8 @@ bool MeterUpdateQueue::Put(MeterUpdateMsg &msg)
    if (len >= mBufferSize-1)
       return false;
 
+   //wxLogDebug(wxT("Put: %s"), msg.toString().c_str());
+
    mBuffer[mEnd] = msg;
    mEnd = (mEnd+1)%mBufferSize;
 
@@ -253,11 +284,7 @@ Meter::Meter(wxWindow* parent, wxWindowID id,
    }
 
    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);
@@ -357,7 +384,7 @@ void Meter::OnMouse(wxMouseEvent &evt)
 
    #if WANT_METER_MENU
       if (evt.RightDown() ||
-          (evt.ButtonDown() && mMenuRect.Inside(evt.m_x, evt.m_y))) 
+          (evt.ButtonDown() && mMenuRect.Contains(evt.m_x, evt.m_y))) 
       {
          wxMenu *menu = new wxMenu();
          // Note: these should be kept in the same order as the enum
@@ -424,7 +451,7 @@ void Meter::Reset(double sampleRate, bool resetClipping)
 
    mT = 0;
    mRate = sampleRate;
-   for(j=0; j<mNumBars; j++)
+   for(j=0; j<kMaxMeterBars; j++)
       ResetBar(&mBar[j], resetClipping);
 
    // wxTimers seem to be a little unreliable - sometimes they stop for
@@ -500,10 +527,8 @@ void Meter::UpdateDisplay(int numChannels, int numFrames, float *sampleData)
 
          // In addition to looking for mNumPeakSamplesToClip peaked
          // samples in a row, also send the number of peaked samples
-         // at the head and tail, in case there's a run of 
-         // Send the number of peaked samples at the head and tail,
-         // in case there's a run of peaked samples that crosses
-         // block boundaries
+         // at the head and tail, in case there's a run of peaked samples
+         // that crosses block boundaries
          if (fabs(sptr[j])>=MAX_AUDIO) {
             if (msg.headPeakCount[j]==i)
                msg.headPeakCount[j]++;
@@ -546,7 +571,8 @@ void Meter::OnMeterUpdate(wxTimerEvent &evt)
       
       if (mMeterDisabled)
          return;
-      
+      //wxLogDebug(wxT("Pop: %s"), msg.toString().c_str());
+
       mT += deltaT;
       for(j=0; j<mNumBars; j++) {
          if (mDecay) {
diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h
index 3aafb50..7cf85c3 100644
--- a/src/widgets/Meter.h
+++ b/src/widgets/Meter.h
@@ -40,14 +40,24 @@ struct MeterBar {
    float  peakPeakHold;
 };
 
-struct MeterUpdateMsg
+class MeterUpdateMsg
 {
+   public:
    int numFrames;
    float peak[kMaxMeterBars];
    float rms[kMaxMeterBars];
    bool clipping[kMaxMeterBars];
    int headPeakCount[kMaxMeterBars];
    int tailPeakCount[kMaxMeterBars];
+
+   /* neither constructor nor destructor do anything */
+   MeterUpdateMsg() { };
+   ~MeterUpdateMsg() { };
+   /* for debugging purposes, printing the values out is really handy */
+   /** \brief Print out all the values in the meter update message */
+   wxString toString();
+   /** \brief Only print meter updates if clipping may be happening */
+   wxString toStringIfClipped();
 };
 
 // Thread-safe queue of update messages
@@ -96,15 +106,38 @@ class Meter : public wxPanel
    Style GetStyle() { return mStyle; }
    void SetStyle(Style newStyle);
 
-   //
-   // These methods are thread-safe!  Feel free to call from a
-   // different thread (like from an audio I/O callback)
+   /** \brief
+    *
+    * This method is thread-safe!  Feel free to call from a
+    * different thread (like from an audio I/O callback).
+    */
    void Reset(double sampleRate, bool resetClipping);
+   /** \brief Update the meters with a block of audio data
+    *
+    * Process the supplied block of audio data, extracting the peak and RMS
+    * levels to send to the meter. Also record runs of clipped samples to detect
+    * clipping that lies on block boundaries.
+    * This method is thread-safe!  Feel free to call from a different thread
+    * (like from an audio I/O callback).
+    * \param numChannels The number of channels of audio being played back or
+    * recorded.
+    * \param numFrames The number of frames (samples) in this data block. It is
+    * assumed that there are the same number of frames in each channel.
+    * \param sampleData The audio data itself, as interleaved samples. So
+    * indexing through the array we get the first sample of channel, first
+    * sample of channel 2 etc up to the first sample of channel (numChannels),
+    * then the second sample of channel 1, second sample of channel 2, and so
+    * to the second sample of channel (numChannels). The last sample in the
+    * array will be the (numFrames) sample for channel (numChannels).
+    */
    void UpdateDisplay(int numChannels,
                       int numFrames, float *sampleData);
+   /** \brief Find out if the level meter is disabled or not.
+    *
+    * This method is thread-safe!  Feel free to call from a
+    * different thread (like from an audio I/O callback).
+    */
    bool IsMeterDisabled();
-   // End thread-safe methods
-   //
    
    float GetMaxPeak();
 
diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
old mode 100755
new mode 100644
index 64dfbff..ead58ad
--- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
@@ -22,6 +22,7 @@
 #include "../Audacity.h"
 
 #include <wx/defs.h>
+#include <wx/app.h>
 #include <wx/button.h>
 #include <wx/dcclient.h>
 #include <wx/datetime.h>
@@ -38,6 +39,942 @@
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 
+#include <wx/sound.h>
+
+// Remove this when wxSound patch gets applied to wxWidgets
+// http://trac.wxwidgets.org/ticket/10362
+#if defined(__WXMAC__)
+#include <Carbon/Carbon.h>
+#endif
+
+// This really should be a Preferences setting
+static const unsigned char beep[] =
+{
+   0x52, 0x49, 0x46, 0x46, 0x36, 0x2B, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45,
+   0x66, 0x6D, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
+   0x44, 0xAC, 0x00, 0x00, 0x88, 0x58, 0x01, 0x00, 0x02, 0x00, 0x10, 0x00,
+   0x64, 0x61, 0x74, 0x61, 0x12, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x13, 0x0B,
+   0xF9, 0x15, 0xC5, 0x20, 0xF0, 0x2A, 0xC0, 0x34, 0xBD, 0x3D, 0x23, 0x46,
+   0x89, 0x4D, 0x0A, 0x54, 0xB7, 0x59, 0x45, 0x5E, 0xE8, 0x61, 0x63, 0x64,
+   0xF5, 0x65, 0x66, 0x66, 0xE1, 0x65, 0x8C, 0x64, 0x42, 0x62, 0x44, 0x5F,
+   0x86, 0x5B, 0x38, 0x57, 0x61, 0x52, 0x23, 0x4D, 0xA0, 0x47, 0xE7, 0x41,
+   0x1A, 0x3C, 0x4F, 0x36, 0x9D, 0x30, 0x1E, 0x2B, 0xDE, 0x25, 0xFD, 0x20,
+   0x85, 0x1C, 0x67, 0x18, 0xD6, 0x14, 0xA8, 0x11, 0x17, 0x0F, 0xDD, 0x0C,
+   0x42, 0x0B, 0x14, 0x0A, 0x26, 0x09, 0xBF, 0x08, 0x70, 0x08, 0x8E, 0x08,
+   0xA5, 0x08, 0x01, 0x09, 0x5D, 0x09, 0x85, 0x09, 0xB3, 0x09, 0x83, 0x09,
+   0x43, 0x09, 0x7B, 0x08, 0x92, 0x07, 0x36, 0x06, 0x4A, 0x04, 0x12, 0x02,
+   0x3E, 0xFF, 0x22, 0xFC, 0x6E, 0xF8, 0x7C, 0xF4, 0x06, 0xF0, 0x60, 0xEB,
+   0x7B, 0xE6, 0x3A, 0xE1, 0x01, 0xDC, 0x93, 0xD6, 0x50, 0xD1, 0x07, 0xCC,
+   0x0E, 0xC7, 0x4F, 0xC2, 0xE0, 0xBD, 0xE6, 0xB9, 0x64, 0xB6, 0x73, 0xB3,
+   0x1C, 0xB1, 0x6C, 0xAF, 0x67, 0xAE, 0x1E, 0xAE, 0x7F, 0xAE, 0xA9, 0xAF,
+   0x75, 0xB1, 0x00, 0xB4, 0x21, 0xB7, 0xDA, 0xBA, 0x33, 0xBF, 0xFA, 0xC3,
+   0x3C, 0xC9, 0xC5, 0xCE, 0xAF, 0xD4, 0xA6, 0xDA, 0xE1, 0xE0, 0xFA, 0xE6,
+   0x06, 0xED, 0x18, 0xF3, 0xC9, 0xF8, 0x65, 0xFE, 0x7C, 0x03, 0x60, 0x08,
+   0xAD, 0x0C, 0x82, 0x10, 0x0F, 0x14, 0xED, 0x16, 0x7D, 0x19, 0x67, 0x1B,
+   0x02, 0x1D, 0x08, 0x1E, 0xA3, 0x1E, 0x0F, 0x1F, 0x04, 0x1F, 0xDD, 0x1E,
+   0x62, 0x1E, 0xE7, 0x1D, 0x37, 0x1D, 0x89, 0x1C, 0x02, 0x1C, 0x7F, 0x1B,
+   0x3B, 0x1B, 0x18, 0x1B, 0x46, 0x1B, 0xAD, 0x1B, 0x69, 0x1C, 0x71, 0x1D,
+   0xC5, 0x1E, 0x78, 0x20, 0x70, 0x22, 0xAC, 0x24, 0x31, 0x27, 0xD9, 0x29,
+   0xBA, 0x2C, 0xA9, 0x2F, 0xA0, 0x32, 0x96, 0x35, 0x63, 0x38, 0x19, 0x3B,
+   0x72, 0x3D, 0x9D, 0x3F, 0x5E, 0x41, 0x98, 0x42, 0x69, 0x43, 0x8F, 0x43,
+   0x38, 0x43, 0x20, 0x42, 0x7D, 0x40, 0x31, 0x3E, 0x0E, 0x3B, 0x65, 0x37,
+   0xEB, 0x32, 0xF7, 0x2D, 0x42, 0x28, 0x29, 0x22, 0x6B, 0x1B, 0x67, 0x14,
+   0x0D, 0x0D, 0x43, 0x05, 0x6F, 0xFD, 0x5F, 0xF5, 0x6E, 0xED, 0x71, 0xE5,
+   0xC3, 0xDD, 0x57, 0xD6, 0x1E, 0xCF, 0x78, 0xC8, 0x28, 0xC2, 0x93, 0xBC,
+   0x75, 0xB7, 0x23, 0xB3, 0x84, 0xAF, 0x86, 0xAC, 0x64, 0xAA, 0xEB, 0xA8,
+   0x49, 0xA8, 0x54, 0xA8, 0x24, 0xA9, 0x99, 0xAA, 0xBB, 0xAC, 0x6F, 0xAF,
+   0xB0, 0xB2, 0x67, 0xB6, 0x8A, 0xBA, 0x02, 0xBF, 0xC3, 0xC3, 0xB2, 0xC8,
+   0xBB, 0xCD, 0xE7, 0xD2, 0xFD, 0xD7, 0x1C, 0xDD, 0xFD, 0xE1, 0xD5, 0xE6,
+   0x51, 0xEB, 0x93, 0xEF, 0xA7, 0xF3, 0x4F, 0xF7, 0xCB, 0xFA, 0xCC, 0xFD,
+   0xA7, 0x00, 0x07, 0x03, 0x22, 0x05, 0x17, 0x07, 0xAD, 0x08, 0x2D, 0x0A,
+   0x5D, 0x0B, 0x8D, 0x0C, 0x7B, 0x0D, 0x7F, 0x0E, 0x56, 0x0F, 0x2E, 0x10,
+   0x39, 0x11, 0x2C, 0x12, 0x64, 0x13, 0x92, 0x14, 0x09, 0x16, 0x86, 0x17,
+   0x28, 0x19, 0x13, 0x1B, 0x07, 0x1D, 0x34, 0x1F, 0x6B, 0x21, 0xCB, 0x23,
+   0x29, 0x26, 0x92, 0x28, 0x05, 0x2B, 0x62, 0x2D, 0xB2, 0x2F, 0xD9, 0x31,
+   0xDA, 0x33, 0xA1, 0x35, 0x29, 0x37, 0x64, 0x38, 0x55, 0x39, 0xDC, 0x39,
+   0x15, 0x3A, 0xD2, 0x39, 0x3A, 0x39, 0x22, 0x38, 0xAD, 0x36, 0xD4, 0x34,
+   0x74, 0x32, 0xD2, 0x2F, 0xAC, 0x2C, 0x52, 0x29, 0x89, 0x25, 0x97, 0x21,
+   0x71, 0x1D, 0xF4, 0x18, 0x7D, 0x14, 0xC5, 0x0F, 0x2C, 0x0B, 0x6E, 0x06,
+   0xE3, 0x01, 0x74, 0xFD, 0x04, 0xF9, 0xE8, 0xF4, 0xE3, 0xF0, 0x3D, 0xED,
+   0xC0, 0xE9, 0xB3, 0xE6, 0xF5, 0xE3, 0x6A, 0xE1, 0x50, 0xDF, 0x70, 0xDD,
+   0xFC, 0xDB, 0xBB, 0xDA, 0xE3, 0xD9, 0x32, 0xD9, 0xDC, 0xD8, 0xBD, 0xD8,
+   0xB4, 0xD8, 0xEE, 0xD8, 0x30, 0xD9, 0xA0, 0xD9, 0x0B, 0xDA, 0x92, 0xDA,
+   0x11, 0xDB, 0x86, 0xDB, 0xF7, 0xDB, 0x4F, 0xDC, 0x9C, 0xDC, 0xCF, 0xDC,
+   0xE6, 0xDC, 0xE7, 0xDC, 0xD8, 0xDC, 0xA9, 0xDC, 0x79, 0xDC, 0x2B, 0xDC,
+   0xE8, 0xDB, 0x94, 0xDB, 0x42, 0xDB, 0x14, 0xDB, 0xE8, 0xDA, 0xEE, 0xDA,
+   0x02, 0xDB, 0x5F, 0xDB, 0xD4, 0xDB, 0xA6, 0xDC, 0x97, 0xDD, 0xD2, 0xDE,
+   0x78, 0xE0, 0x50, 0xE2, 0x9B, 0xE4, 0x12, 0xE7, 0x05, 0xEA, 0x20, 0xED,
+   0x8B, 0xF0, 0x61, 0xF4, 0x57, 0xF8, 0xAB, 0xFC, 0x10, 0x01, 0xC0, 0x05,
+   0x6D, 0x0A, 0x35, 0x0F, 0x1D, 0x14, 0xEC, 0x18, 0xC1, 0x1D, 0x65, 0x22,
+   0xF6, 0x26, 0x41, 0x2B, 0x5B, 0x2F, 0x21, 0x33, 0x8A, 0x36, 0xB2, 0x39,
+   0x5F, 0x3C, 0xB2, 0x3E, 0x89, 0x40, 0xF4, 0x41, 0xDF, 0x42, 0x59, 0x43,
+   0x54, 0x43, 0xE3, 0x42, 0xF2, 0x41, 0x9B, 0x40, 0xD1, 0x3E, 0xAA, 0x3C,
+   0x2B, 0x3A, 0x49, 0x37, 0x25, 0x34, 0xB6, 0x30, 0x14, 0x2D, 0x3A, 0x29,
+   0x49, 0x25, 0x3E, 0x21, 0x0E, 0x1D, 0xE5, 0x18, 0xAC, 0x14, 0x8E, 0x10,
+   0x69, 0x0C, 0x77, 0x08, 0x82, 0x04, 0xD4, 0x00, 0x48, 0xFD, 0xCB, 0xF9,
+   0x98, 0xF6, 0x75, 0xF3, 0xA6, 0xF0, 0xE2, 0xED, 0x73, 0xEB, 0x33, 0xE9,
+   0xFE, 0xE6, 0x1B, 0xE5, 0x3A, 0xE3, 0xA9, 0xE1, 0x17, 0xE0, 0xC9, 0xDE,
+   0x98, 0xDD, 0x69, 0xDC, 0x6F, 0xDB, 0x75, 0xDA, 0xA9, 0xD9, 0xDF, 0xD8,
+   0x39, 0xD8, 0xA6, 0xD7, 0x1B, 0xD7, 0xA7, 0xD6, 0x4C, 0xD6, 0xFC, 0xD5,
+   0xCC, 0xD5, 0xAF, 0xD5, 0xAC, 0xD5, 0xC9, 0xD5, 0xF8, 0xD5, 0x56, 0xD6,
+   0xC7, 0xD6, 0x6D, 0xD7, 0x27, 0xD8, 0x1B, 0xD9, 0x25, 0xDA, 0x5C, 0xDB,
+   0xCB, 0xDC, 0x58, 0xDE, 0x1E, 0xE0, 0xFF, 0xE1, 0x17, 0xE4, 0x4A, 0xE6,
+   0x93, 0xE8, 0x26, 0xEB, 0xB3, 0xED, 0x7F, 0xF0, 0x3E, 0xF3, 0x3A, 0xF6,
+   0x14, 0xF9, 0x0D, 0xFC, 0x17, 0xFF, 0x10, 0x02, 0x1A, 0x05, 0x01, 0x08,
+   0xF5, 0x0A, 0xB8, 0x0D, 0x81, 0x10, 0x12, 0x13, 0x81, 0x15, 0xEC, 0x17,
+   0x13, 0x1A, 0x31, 0x1C, 0x05, 0x1E, 0xCB, 0x1F, 0x48, 0x21, 0x9A, 0x22,
+   0xD6, 0x23, 0xCB, 0x24, 0xAB, 0x25, 0x4B, 0x26, 0xCF, 0x26, 0x21, 0x27,
+   0x4A, 0x27, 0x58, 0x27, 0x3F, 0x27, 0x03, 0x27, 0xB0, 0x26, 0x35, 0x26,
+   0xB0, 0x25, 0x07, 0x25, 0x4C, 0x24, 0x7F, 0x23, 0x98, 0x22, 0xAB, 0x21,
+   0xA0, 0x20, 0x92, 0x1F, 0x6A, 0x1E, 0x3E, 0x1D, 0x0F, 0x1C, 0xB2, 0x1A,
+   0x66, 0x19, 0xEC, 0x17, 0x81, 0x16, 0xEB, 0x14, 0x5C, 0x13, 0xC3, 0x11,
+   0xF3, 0x0F, 0x3A, 0x0E, 0x45, 0x0C, 0x66, 0x0A, 0x4C, 0x08, 0x4A, 0x06,
+   0x29, 0x04, 0xE7, 0x01, 0xA6, 0xFF, 0x43, 0xFD, 0xE9, 0xFA, 0x6C, 0xF8,
+   0xFF, 0xF5, 0x74, 0xF3, 0xFD, 0xF0, 0x87, 0xEE, 0xF9, 0xEB, 0x8A, 0xE9,
+   0x0F, 0xE7, 0xB5, 0xE4, 0x5C, 0xE2, 0x29, 0xE0, 0x0B, 0xDE, 0x03, 0xDC,
+   0x1F, 0xDA, 0x62, 0xD8, 0xC8, 0xD6, 0x5E, 0xD5, 0x23, 0xD4, 0x19, 0xD3,
+   0x42, 0xD2, 0xA2, 0xD1, 0x3A, 0xD1, 0x0E, 0xD1, 0x1A, 0xD1, 0x64, 0xD1,
+   0xDF, 0xD1, 0xAB, 0xD2, 0x9D, 0xD3, 0xE0, 0xD4, 0x48, 0xD6, 0xFA, 0xD7,
+   0xD4, 0xD9, 0xED, 0xDB, 0x2B, 0xDE, 0x8F, 0xE0, 0x39, 0xE3, 0xEC, 0xE5,
+   0xE4, 0xE8, 0xD6, 0xEB, 0x08, 0xEF, 0x2D, 0xF2, 0x65, 0xF5, 0xC9, 0xF8,
+   0x14, 0xFC, 0x82, 0xFF, 0xD1, 0x02, 0x37, 0x06, 0x73, 0x09, 0xA5, 0x0C,
+   0xD5, 0x0F, 0xDF, 0x12, 0xD8, 0x15, 0xA3, 0x18, 0x58, 0x1B, 0xD7, 0x1D,
+   0x20, 0x20, 0x5D, 0x22, 0x49, 0x24, 0x1F, 0x26, 0xA5, 0x27, 0x0D, 0x29,
+   0x26, 0x2A, 0x1B, 0x2B, 0xC4, 0x2B, 0x3B, 0x2C, 0x7D, 0x2C, 0x83, 0x2C,
+   0x56, 0x2C, 0xEC, 0x2B, 0x57, 0x2B, 0x85, 0x2A, 0x8F, 0x29, 0x60, 0x28,
+   0x12, 0x27, 0x8F, 0x25, 0xF7, 0x23, 0x2E, 0x22, 0x57, 0x20, 0x65, 0x1E,
+   0x50, 0x1C, 0x35, 0x1A, 0xFF, 0x17, 0xCA, 0x15, 0x7B, 0x13, 0x3E, 0x11,
+   0xFA, 0x0E, 0xA6, 0x0C, 0x68, 0x0A, 0x1B, 0x08, 0xEE, 0x05, 0xAF, 0x03,
+   0x98, 0x01, 0x73, 0xFF, 0x76, 0xFD, 0x8C, 0xFB, 0x90, 0xF9, 0xC6, 0xF7,
+   0xEF, 0xF5, 0x41, 0xF4, 0x90, 0xF2, 0x00, 0xF1, 0x89, 0xEF, 0x04, 0xEE,
+   0xA8, 0xEC, 0x44, 0xEB, 0x06, 0xEA, 0xBF, 0xE8, 0xA3, 0xE7, 0x87, 0xE6,
+   0x78, 0xE5, 0x7B, 0xE4, 0x87, 0xE3, 0xAF, 0xE2, 0xD9, 0xE1, 0x21, 0xE1,
+   0x80, 0xE0, 0xDE, 0xDF, 0x6A, 0xDF, 0xF4, 0xDE, 0xAC, 0xDE, 0x6E, 0xDE,
+   0x54, 0xDE, 0x57, 0xDE, 0x6F, 0xDE, 0xB0, 0xDE, 0x0C, 0xDF, 0x8E, 0xDF,
+   0x34, 0xE0, 0xF7, 0xE0, 0xEA, 0xE1, 0xF2, 0xE2, 0x1C, 0xE4, 0x7E, 0xE5,
+   0xEB, 0xE6, 0x94, 0xE8, 0x42, 0xEA, 0x25, 0xEC, 0x14, 0xEE, 0x0D, 0xF0,
+   0x49, 0xF2, 0x69, 0xF4, 0xC9, 0xF6, 0x09, 0xF9, 0x7B, 0xFB, 0xCF, 0xFD,
+   0x44, 0x00, 0x9A, 0x02, 0xEE, 0x04, 0x4C, 0x07, 0x91, 0x09, 0xCB, 0x0B,
+   0xF1, 0x0D, 0x01, 0x10, 0xF6, 0x11, 0xC2, 0x13, 0x90, 0x15, 0x25, 0x17,
+   0xB0, 0x18, 0x09, 0x1A, 0x50, 0x1B, 0x67, 0x1C, 0x5B, 0x1D, 0x3E, 0x1E,
+   0xF3, 0x1E, 0x92, 0x1F, 0x0A, 0x20, 0x6B, 0x20, 0xAB, 0x20, 0xD0, 0x20,
+   0xDE, 0x20, 0xD4, 0x20, 0xAF, 0x20, 0x7B, 0x20, 0x26, 0x20, 0xD0, 0x1F,
+   0x4E, 0x1F, 0xD6, 0x1E, 0x39, 0x1E, 0x8F, 0x1D, 0xD4, 0x1C, 0xFF, 0x1B,
+   0x24, 0x1B, 0x25, 0x1A, 0x23, 0x19, 0x0F, 0x18, 0xCD, 0x16, 0x8E, 0x15,
+   0x1D, 0x14, 0xAC, 0x12, 0x09, 0x11, 0x65, 0x0F, 0xA4, 0x0D, 0xB2, 0x0B,
+   0xC0, 0x09, 0x96, 0x07, 0x72, 0x05, 0x1A, 0x03, 0xC5, 0x00, 0x5D, 0xFE,
+   0xCC, 0xFB, 0x45, 0xF9, 0x9B, 0xF6, 0x03, 0xF4, 0x51, 0xF1, 0xB6, 0xEE,
+   0x13, 0xEC, 0x85, 0xE9, 0x15, 0xE7, 0x9E, 0xE4, 0x5B, 0xE2, 0x29, 0xE0,
+   0x26, 0xDE, 0x4E, 0xDC, 0xA2, 0xDA, 0x39, 0xD9, 0xF5, 0xD7, 0xF8, 0xD6,
+   0x39, 0xD6, 0xB6, 0xD5, 0x7E, 0xD5, 0x82, 0xD5, 0xCF, 0xD5, 0x60, 0xD6,
+   0x30, 0xD7, 0x47, 0xD8, 0x94, 0xD9, 0x27, 0xDB, 0xE7, 0xDC, 0xD7, 0xDE,
+   0x08, 0xE1, 0x4C, 0xE3, 0xCA, 0xE5, 0x52, 0xE8, 0x03, 0xEB, 0xB4, 0xED,
+   0x83, 0xF0, 0x40, 0xF3, 0x03, 0xF6, 0xC9, 0xF8, 0x75, 0xFB, 0x23, 0xFE,
+   0xA2, 0x00, 0x21, 0x03, 0x68, 0x05, 0x8B, 0x07, 0xAB, 0x09, 0x83, 0x0B,
+   0x54, 0x0D, 0xDF, 0x0E, 0x63, 0x10, 0x9F, 0x11, 0xBF, 0x12, 0xCA, 0x13,
+   0xA2, 0x14, 0x6B, 0x15, 0x09, 0x16, 0x95, 0x16, 0x07, 0x17, 0x55, 0x17,
+   0xB1, 0x17, 0xE4, 0x17, 0x21, 0x18, 0x45, 0x18, 0x6E, 0x18, 0x8A, 0x18,
+   0xAB, 0x18, 0xC1, 0x18, 0xDA, 0x18, 0xF4, 0x18, 0x0C, 0x19, 0x21, 0x19,
+   0x36, 0x19, 0x42, 0x19, 0x4E, 0x19, 0x51, 0x19, 0x41, 0x19, 0x33, 0x19,
+   0xFF, 0x18, 0xD0, 0x18, 0x76, 0x18, 0x11, 0x18, 0x99, 0x17, 0xE9, 0x16,
+   0x33, 0x16, 0x46, 0x15, 0x48, 0x14, 0x14, 0x13, 0xD0, 0x11, 0x52, 0x10,
+   0xC8, 0x0E, 0x1A, 0x0D, 0x37, 0x0B, 0x4D, 0x09, 0x2E, 0x07, 0x13, 0x05,
+   0xC9, 0x02, 0x88, 0x00, 0x3E, 0xFE, 0xD0, 0xFB, 0x7F, 0xF9, 0x16, 0xF7,
+   0xCF, 0xF4, 0x7F, 0xF2, 0x58, 0xF0, 0x45, 0xEE, 0x41, 0xEC, 0x69, 0xEA,
+   0xAA, 0xE8, 0x1E, 0xE7, 0xB5, 0xE5, 0x7B, 0xE4, 0x7D, 0xE3, 0x93, 0xE2,
+   0xF4, 0xE1, 0x6E, 0xE1, 0x29, 0xE1, 0x05, 0xE1, 0x16, 0xE1, 0x50, 0xE1,
+   0xAB, 0xE1, 0x37, 0xE2, 0xD5, 0xE2, 0x9C, 0xE3, 0x7A, 0xE4, 0x69, 0xE5,
+   0x75, 0xE6, 0x85, 0xE7, 0x9E, 0xE8, 0xD1, 0xE9, 0xF0, 0xEA, 0x2F, 0xEC,
+   0x4D, 0xED, 0x8A, 0xEE, 0xA5, 0xEF, 0xC8, 0xF0, 0xEA, 0xF1, 0x01, 0xF3,
+   0x1A, 0xF4, 0x26, 0xF5, 0x39, 0xF6, 0x3F, 0xF7, 0x3C, 0xF8, 0x57, 0xF9,
+   0x5B, 0xFA, 0x7C, 0xFB, 0x90, 0xFC, 0xC2, 0xFD, 0xEC, 0xFE, 0x38, 0x00,
+   0x7E, 0x01, 0xD3, 0x02, 0x50, 0x04, 0xC7, 0x05, 0x66, 0x07, 0xFF, 0x08,
+   0xBB, 0x0A, 0x70, 0x0C, 0x35, 0x0E, 0x0E, 0x10, 0xDC, 0x11, 0xBF, 0x13,
+   0x89, 0x15, 0x5F, 0x17, 0x18, 0x19, 0xC5, 0x1A, 0x60, 0x1C, 0xDE, 0x1D,
+   0x3A, 0x1F, 0x70, 0x20, 0x80, 0x21, 0x5B, 0x22, 0x0A, 0x23, 0x7E, 0x23,
+   0xBC, 0x23, 0xBB, 0x23, 0x82, 0x23, 0x02, 0x23, 0x4E, 0x22, 0x51, 0x21,
+   0x22, 0x20, 0xB9, 0x1E, 0x09, 0x1D, 0x39, 0x1B, 0x1D, 0x19, 0xF4, 0x16,
+   0x86, 0x14, 0x0E, 0x12, 0x7E, 0x0F, 0xBD, 0x0C, 0x0C, 0x0A, 0x35, 0x07,
+   0x78, 0x04, 0xA8, 0x01, 0xF8, 0xFE, 0x5B, 0xFC, 0xBF, 0xF9, 0x54, 0xF7,
+   0xF9, 0xF4, 0xD1, 0xF2, 0xC6, 0xF0, 0xF2, 0xEE, 0x54, 0xED, 0xCC, 0xEB,
+   0x8A, 0xEA, 0x65, 0xE9, 0x80, 0xE8, 0xBE, 0xE7, 0x31, 0xE7, 0xC9, 0xE6,
+   0x8E, 0xE6, 0x7E, 0xE6, 0x80, 0xE6, 0xA9, 0xE6, 0xE9, 0xE6, 0x40, 0xE7,
+   0xA7, 0xE7, 0x21, 0xE8, 0xA3, 0xE8, 0x2C, 0xE9, 0xBA, 0xE9, 0x48, 0xEA,
+   0xD8, 0xEA, 0x63, 0xEB, 0xEB, 0xEB, 0x6B, 0xEC, 0xEB, 0xEC, 0x64, 0xED,
+   0xDA, 0xED, 0x4A, 0xEE, 0xBD, 0xEE, 0x28, 0xEF, 0xA1, 0xEF, 0x11, 0xF0,
+   0x86, 0xF0, 0x17, 0xF1, 0x9E, 0xF1, 0x4E, 0xF2, 0xF0, 0xF2, 0xC7, 0xF3,
+   0x96, 0xF4, 0x80, 0xF5, 0x98, 0xF6, 0xAD, 0xF7, 0xFD, 0xF8, 0x47, 0xFA,
+   0xC6, 0xFB, 0x44, 0xFD, 0xDD, 0xFE, 0x99, 0x00, 0x5A, 0x02, 0x35, 0x04,
+   0x10, 0x06, 0xFE, 0x07, 0xE2, 0x09, 0xC2, 0x0B, 0xB0, 0x0D, 0x7F, 0x0F,
+   0x54, 0x11, 0x00, 0x13, 0xA8, 0x14, 0x22, 0x16, 0x88, 0x17, 0xC2, 0x18,
+   0xD1, 0x19, 0xC5, 0x1A, 0x7F, 0x1B, 0x14, 0x1C, 0x77, 0x1C, 0xAA, 0x1C,
+   0xB0, 0x1C, 0x81, 0x1C, 0x2F, 0x1C, 0xA6, 0x1B, 0x00, 0x1B, 0x26, 0x1A,
+   0x34, 0x19, 0x1A, 0x18, 0xF1, 0x16, 0x9C, 0x15, 0x46, 0x14, 0xCE, 0x12,
+   0x5B, 0x11, 0xD0, 0x0F, 0x52, 0x0E, 0xCF, 0x0C, 0x46, 0x0B, 0xD2, 0x09,
+   0x50, 0x08, 0xF7, 0x06, 0x8B, 0x05, 0x4B, 0x04, 0x03, 0x03, 0xDD, 0x01,
+   0xCA, 0x00, 0xAF, 0xFF, 0xBC, 0xFE, 0xBD, 0xFD, 0xE1, 0xFC, 0xFC, 0xFB,
+   0x30, 0xFB, 0x6B, 0xFA, 0x9A, 0xF9, 0xD8, 0xF8, 0x0C, 0xF8, 0x47, 0xF7,
+   0x75, 0xF6, 0xA8, 0xF5, 0xD6, 0xF4, 0xF1, 0xF3, 0x0F, 0xF3, 0x1B, 0xF2,
+   0x2A, 0xF1, 0x27, 0xF0, 0x2D, 0xEF, 0x28, 0xEE, 0x23, 0xED, 0x1D, 0xEC,
+   0x1E, 0xEB, 0x24, 0xEA, 0x38, 0xE9, 0x58, 0xE8, 0x8E, 0xE7, 0xD5, 0xE6,
+   0x39, 0xE6, 0xBA, 0xE5, 0x5B, 0xE5, 0x23, 0xE5, 0x0D, 0xE5, 0x29, 0xE5,
+   0x69, 0xE5, 0xD2, 0xE5, 0x77, 0xE6, 0x41, 0xE7, 0x42, 0xE8, 0x6C, 0xE9,
+   0xC7, 0xEA, 0x48, 0xEC, 0xED, 0xED, 0xCA, 0xEF, 0xB4, 0xF1, 0xD7, 0xF3,
+   0xF5, 0xF5, 0x48, 0xF8, 0x8E, 0xFA, 0xE6, 0xFC, 0x51, 0xFF, 0xAB, 0x01,
+   0x12, 0x04, 0x5D, 0x06, 0xA5, 0x08, 0xCD, 0x0A, 0xE4, 0x0C, 0xD4, 0x0E,
+   0x9F, 0x10, 0x52, 0x12, 0xD3, 0x13, 0x32, 0x15, 0x5B, 0x16, 0x63, 0x17,
+   0x2E, 0x18, 0xD2, 0x18, 0x4C, 0x19, 0x96, 0x19, 0xBB, 0x19, 0xB0, 0x19,
+   0x8C, 0x19, 0x34, 0x19, 0xCD, 0x18, 0x39, 0x18, 0x9E, 0x17, 0xDD, 0x16,
+   0x18, 0x16, 0x39, 0x15, 0x57, 0x14, 0x67, 0x13, 0x78, 0x12, 0x83, 0x11,
+   0x8F, 0x10, 0x9C, 0x0F, 0xAC, 0x0E, 0xC5, 0x0D, 0xDA, 0x0C, 0x01, 0x0C,
+   0x30, 0x0B, 0x55, 0x0A, 0x91, 0x09, 0xC0, 0x08, 0x02, 0x08, 0x36, 0x07,
+   0x7B, 0x06, 0xBD, 0x05, 0xED, 0x04, 0x2D, 0x04, 0x4B, 0x03, 0x81, 0x02,
+   0x8F, 0x01, 0xAD, 0x00, 0xBE, 0xFF, 0xAF, 0xFE, 0xAB, 0xFD, 0x85, 0xFC,
+   0x6A, 0xFB, 0x2E, 0xFA, 0x01, 0xF9, 0xB4, 0xF7, 0x78, 0xF6, 0x33, 0xF5,
+   0xE1, 0xF3, 0xA0, 0xF2, 0x54, 0xF1, 0x1E, 0xF0, 0xE8, 0xEE, 0xC8, 0xED,
+   0xBC, 0xEC, 0xBA, 0xEB, 0xDA, 0xEA, 0x0A, 0xEA, 0x61, 0xE9, 0xD0, 0xE8,
+   0x64, 0xE8, 0x1E, 0xE8, 0xF4, 0xE7, 0xF8, 0xE7, 0x1B, 0xE8, 0x67, 0xE8,
+   0xD7, 0xE8, 0x6A, 0xE9, 0x1F, 0xEA, 0xF8, 0xEA, 0xED, 0xEB, 0x05, 0xED,
+   0x2B, 0xEE, 0x7A, 0xEF, 0xC6, 0xF0, 0x38, 0xF2, 0xA7, 0xF3, 0x1B, 0xF5,
+   0xAC, 0xF6, 0x24, 0xF8, 0xB8, 0xF9, 0x2D, 0xFB, 0xB5, 0xFC, 0x1C, 0xFE,
+   0x7C, 0xFF, 0xDD, 0x00, 0x1D, 0x02, 0x61, 0x03, 0x7E, 0x04, 0x9C, 0x05,
+   0x98, 0x06, 0x7E, 0x07, 0x68, 0x08, 0x2B, 0x09, 0xEF, 0x09, 0x96, 0x0A,
+   0x3B, 0x0B, 0xC8, 0x0B, 0x49, 0x0C, 0xCD, 0x0C, 0x3D, 0x0D, 0xB1, 0x0D,
+   0x18, 0x0E, 0x7E, 0x0E, 0xE0, 0x0E, 0x42, 0x0F, 0x9C, 0x0F, 0xFA, 0x0F,
+   0x52, 0x10, 0xB1, 0x10, 0x05, 0x11, 0x5B, 0x11, 0xAB, 0x11, 0xF6, 0x11,
+   0x3D, 0x12, 0x77, 0x12, 0xA9, 0x12, 0xCE, 0x12, 0xE3, 0x12, 0xEC, 0x12,
+   0xD9, 0x12, 0xC5, 0x12, 0x7F, 0x12, 0x39, 0x12, 0xC6, 0x11, 0x45, 0x11,
+   0x9F, 0x10, 0xE4, 0x0F, 0x0E, 0x0F, 0x10, 0x0E, 0xFE, 0x0C, 0xC6, 0x0B,
+   0x81, 0x0A, 0x12, 0x09, 0x9F, 0x07, 0x03, 0x06, 0x67, 0x04, 0xBC, 0x02,
+   0xF3, 0x00, 0x36, 0xFF, 0x5D, 0xFD, 0x9A, 0xFB, 0xC5, 0xF9, 0x08, 0xF8,
+   0x53, 0xF6, 0x9F, 0xF4, 0x0A, 0xF3, 0x7E, 0xF1, 0x12, 0xF0, 0xBD, 0xEE,
+   0x86, 0xED, 0x7A, 0xEC, 0x7B, 0xEB, 0xAF, 0xEA, 0xFD, 0xE9, 0x77, 0xE9,
+   0x0F, 0xE9, 0xD4, 0xE8, 0xB9, 0xE8, 0xC2, 0xE8, 0xEC, 0xE8, 0x3A, 0xE9,
+   0xA0, 0xE9, 0x30, 0xEA, 0xC9, 0xEA, 0x8D, 0xEB, 0x54, 0xEC, 0x3A, 0xED,
+   0x2C, 0xEE, 0x2D, 0xEF, 0x39, 0xF0, 0x4B, 0xF1, 0x69, 0xF2, 0x83, 0xF3,
+   0x9E, 0xF4, 0xC4, 0xF5, 0xD9, 0xF6, 0x00, 0xF8, 0x0A, 0xF9, 0x29, 0xFA,
+   0x2B, 0xFB, 0x2B, 0xFC, 0x33, 0xFD, 0x23, 0xFE, 0x20, 0xFF, 0x03, 0x00,
+   0xF4, 0x00, 0xCE, 0x01, 0xB2, 0x02, 0x8A, 0x03, 0x52, 0x04, 0x34, 0x05,
+   0xF9, 0x05, 0xD4, 0x06, 0x99, 0x07, 0x6E, 0x08, 0x2F, 0x09, 0xF9, 0x09,
+   0xBE, 0x0A, 0x87, 0x0B, 0x45, 0x0C, 0x05, 0x0D, 0xBE, 0x0D, 0x6B, 0x0E,
+   0x17, 0x0F, 0xB7, 0x0F, 0x4F, 0x10, 0xDB, 0x10, 0x57, 0x11, 0xC6, 0x11,
+   0x24, 0x12, 0x6A, 0x12, 0xA9, 0x12, 0xC5, 0x12, 0xD5, 0x12, 0xC9, 0x12,
+   0xA3, 0x12, 0x6E, 0x12, 0x13, 0x12, 0xAD, 0x11, 0x27, 0x11, 0x8A, 0x10,
+   0xD5, 0x0F, 0x09, 0x0F, 0x2B, 0x0E, 0x34, 0x0D, 0x2E, 0x0C, 0x22, 0x0B,
+   0xF1, 0x09, 0xCA, 0x08, 0x87, 0x07, 0x46, 0x06, 0xFA, 0x04, 0xB1, 0x03,
+   0x6C, 0x02, 0x1A, 0x01, 0xD6, 0xFF, 0x8E, 0xFE, 0x5B, 0xFD, 0x20, 0xFC,
+   0x04, 0xFB, 0xEE, 0xF9, 0xDE, 0xF8, 0xE6, 0xF7, 0xF2, 0xF6, 0x1E, 0xF6,
+   0x48, 0xF5, 0x97, 0xF4, 0xE3, 0xF3, 0x52, 0xF3, 0xCC, 0xF2, 0x50, 0xF2,
+   0xE9, 0xF1, 0x8E, 0xF1, 0x40, 0xF1, 0x02, 0xF1, 0xD0, 0xF0, 0xAC, 0xF0,
+   0x8D, 0xF0, 0x7D, 0xF0, 0x71, 0xF0, 0x77, 0xF0, 0x78, 0xF0, 0x92, 0xF0,
+   0x9E, 0xF0, 0xCA, 0xF0, 0xE7, 0xF0, 0x1D, 0xF1, 0x50, 0xF1, 0x90, 0xF1,
+   0xD6, 0xF1, 0x22, 0xF2, 0x80, 0xF2, 0xDE, 0xF2, 0x52, 0xF3, 0xC6, 0xF3,
+   0x51, 0xF4, 0xDF, 0xF4, 0x7F, 0xF5, 0x2B, 0xF6, 0xDA, 0xF6, 0xA9, 0xF7,
+   0x78, 0xF8, 0x5E, 0xF9, 0x4B, 0xFA, 0x4A, 0xFB, 0x4E, 0xFC, 0x59, 0xFD,
+   0x7D, 0xFE, 0x9F, 0xFF, 0xCF, 0x00, 0x00, 0x02, 0x3C, 0x03, 0x6F, 0x04,
+   0xA7, 0x05, 0xE1, 0x06, 0x16, 0x08, 0x45, 0x09, 0x6C, 0x0A, 0x89, 0x0B,
+   0x9A, 0x0C, 0x95, 0x0D, 0x8D, 0x0E, 0x68, 0x0F, 0x39, 0x10, 0xEB, 0x10,
+   0x90, 0x11, 0x16, 0x12, 0x85, 0x12, 0xDD, 0x12, 0x14, 0x13, 0x3A, 0x13,
+   0x3F, 0x13, 0x2D, 0x13, 0xFF, 0x12, 0xBA, 0x12, 0x59, 0x12, 0xE9, 0x11,
+   0x56, 0x11, 0xBA, 0x10, 0xFF, 0x0F, 0x3D, 0x0F, 0x60, 0x0E, 0x7C, 0x0D,
+   0x8E, 0x0C, 0x87, 0x0B, 0x88, 0x0A, 0x6D, 0x09, 0x61, 0x08, 0x3A, 0x07,
+   0x29, 0x06, 0xFC, 0x04, 0xEB, 0x03, 0xCC, 0x02, 0xB3, 0x01, 0x9C, 0x00,
+   0x88, 0xFF, 0x81, 0xFE, 0x75, 0xFD, 0x80, 0xFC, 0x8F, 0xFB, 0x9A, 0xFA,
+   0xC0, 0xF9, 0xDA, 0xF8, 0x15, 0xF8, 0x42, 0xF7, 0x8E, 0xF6, 0xDE, 0xF5,
+   0x33, 0xF5, 0x96, 0xF4, 0x02, 0xF4, 0x78, 0xF3, 0xFE, 0xF2, 0x87, 0xF2,
+   0x2A, 0xF2, 0xC4, 0xF1, 0x7C, 0xF1, 0x30, 0xF1, 0xFF, 0xF0, 0xCD, 0xF0,
+   0xB2, 0xF0, 0x9D, 0xF0, 0x99, 0xF0, 0xA2, 0xF0, 0xB7, 0xF0, 0xDB, 0xF0,
+   0x0E, 0xF1, 0x4B, 0xF1, 0x9F, 0xF1, 0xF4, 0xF1, 0x62, 0xF2, 0xD8, 0xF2,
+   0x60, 0xF3, 0xF6, 0xF3, 0x92, 0xF4, 0x47, 0xF5, 0xF9, 0xF5, 0xBC, 0xF6,
+   0x92, 0xF7, 0x62, 0xF8, 0x4F, 0xF9, 0x2D, 0xFA, 0x28, 0xFB, 0x18, 0xFC,
+   0x0B, 0xFD, 0x11, 0xFE, 0x07, 0xFF, 0x11, 0x00, 0x06, 0x01, 0x0E, 0x02,
+   0x00, 0x03, 0xFB, 0x03, 0xE9, 0x04, 0xC8, 0x05, 0xB4, 0x06, 0x87, 0x07,
+   0x58, 0x08, 0x1E, 0x09, 0xD6, 0x09, 0x84, 0x0A, 0x1E, 0x0B, 0xB8, 0x0B,
+   0x38, 0x0C, 0xB7, 0x0C, 0x1B, 0x0D, 0x7E, 0x0D, 0xC8, 0x0D, 0x04, 0x0E,
+   0x3A, 0x0E, 0x59, 0x0E, 0x71, 0x0E, 0x7A, 0x0E, 0x70, 0x0E, 0x61, 0x0E,
+   0x3E, 0x0E, 0x15, 0x0E, 0xD9, 0x0D, 0x97, 0x0D, 0x48, 0x0D, 0xE9, 0x0C,
+   0x8B, 0x0C, 0x13, 0x0C, 0xA2, 0x0B, 0x21, 0x0B, 0x90, 0x0A, 0x05, 0x0A,
+   0x5D, 0x09, 0xC7, 0x08, 0x0F, 0x08, 0x69, 0x07, 0xAE, 0x06, 0xF0, 0x05,
+   0x2E, 0x05, 0x61, 0x04, 0x99, 0x03, 0xBE, 0x02, 0xF3, 0x01, 0x1C, 0x01,
+   0x40, 0x00, 0x64, 0xFF, 0x87, 0xFE, 0xA9, 0xFD, 0xCE, 0xFC, 0xF1, 0xFB,
+   0x21, 0xFB, 0x45, 0xFA, 0x76, 0xF9, 0xA5, 0xF8, 0xE1, 0xF7, 0x1B, 0xF7,
+   0x65, 0xF6, 0xB1, 0xF5, 0x0A, 0xF5, 0x70, 0xF4, 0xD9, 0xF3, 0x52, 0xF3,
+   0xD8, 0xF2, 0x67, 0xF2, 0x0A, 0xF2, 0xB4, 0xF1, 0x74, 0xF1, 0x40, 0xF1,
+   0x1A, 0xF1, 0x0A, 0xF1, 0x01, 0xF1, 0x13, 0xF1, 0x2B, 0xF1, 0x5B, 0xF1,
+   0x9A, 0xF1, 0xE5, 0xF1, 0x48, 0xF2, 0xB2, 0xF2, 0x32, 0xF3, 0xBD, 0xF3,
+   0x58, 0xF4, 0xFC, 0xF4, 0xAF, 0xF5, 0x6E, 0xF6, 0x38, 0xF7, 0x0F, 0xF8,
+   0xE9, 0xF8, 0xD3, 0xF9, 0xBA, 0xFA, 0xA7, 0xFB, 0xA4, 0xFC, 0x96, 0xFD,
+   0x9C, 0xFE, 0x8F, 0xFF, 0x98, 0x00, 0x89, 0x01, 0x81, 0x02, 0x7B, 0x03,
+   0x68, 0x04, 0x59, 0x05, 0x38, 0x06, 0x19, 0x07, 0xEB, 0x07, 0xAD, 0x08,
+   0x74, 0x09, 0x21, 0x0A, 0xCE, 0x0A, 0x64, 0x0B, 0xF5, 0x0B, 0x6F, 0x0C,
+   0xE3, 0x0C, 0x3F, 0x0D, 0x93, 0x0D, 0xD1, 0x0D, 0x07, 0x0E, 0x28, 0x0E,
+   0x39, 0x0E, 0x40, 0x0E, 0x2E, 0x0E, 0x18, 0x0E, 0xE7, 0x0D, 0xB5, 0x0D,
+   0x67, 0x0D, 0x17, 0x0D, 0xB2, 0x0C, 0x47, 0x0C, 0xCD, 0x0B, 0x49, 0x0B,
+   0xBA, 0x0A, 0x22, 0x0A, 0x81, 0x09, 0xD8, 0x08, 0x27, 0x08, 0x7C, 0x07,
+   0xB7, 0x06, 0xFF, 0x05, 0x36, 0x05, 0x75, 0x04, 0xA8, 0x03, 0xE4, 0x02,
+   0x12, 0x02, 0x51, 0x01, 0x8B, 0x00, 0xBE, 0xFF, 0xFF, 0xFE, 0x34, 0xFE,
+   0x7C, 0xFD, 0xBA, 0xFC, 0x07, 0xFC, 0x5A, 0xFB, 0xA6, 0xFA, 0x03, 0xFA,
+   0x5C, 0xF9, 0xC4, 0xF8, 0x2D, 0xF8, 0xA0, 0xF7, 0x21, 0xF7, 0x9A, 0xF6,
+   0x2D, 0xF6, 0xB7, 0xF5, 0x59, 0xF5, 0xF9, 0xF4, 0xA9, 0xF4, 0x64, 0xF4,
+   0x22, 0xF4, 0xF3, 0xF3, 0xC6, 0xF3, 0xAC, 0xF3, 0x95, 0xF3, 0x92, 0xF3,
+   0x92, 0xF3, 0xA8, 0xF3, 0xBD, 0xF3, 0xEA, 0xF3, 0x1B, 0xF4, 0x5B, 0xF4,
+   0xA9, 0xF4, 0xFF, 0xF4, 0x61, 0xF5, 0xCE, 0xF5, 0x47, 0xF6, 0xCC, 0xF6,
+   0x59, 0xF7, 0xF1, 0xF7, 0x93, 0xF8, 0x3B, 0xF9, 0xE4, 0xF9, 0xA3, 0xFA,
+   0x5A, 0xFB, 0x24, 0xFC, 0xE5, 0xFC, 0xB5, 0xFD, 0x7E, 0xFE, 0x47, 0xFF,
+   0x1C, 0x00, 0xE4, 0x00, 0xB8, 0x01, 0x7C, 0x02, 0x4B, 0x03, 0x04, 0x04,
+   0xCD, 0x04, 0x77, 0x05, 0x2E, 0x06, 0xD3, 0x06, 0x73, 0x07, 0x10, 0x08,
+   0x96, 0x08, 0x25, 0x09, 0x95, 0x09, 0x08, 0x0A, 0x68, 0x0A, 0xC7, 0x0A,
+   0x10, 0x0B, 0x57, 0x0B, 0x8B, 0x0B, 0xB9, 0x0B, 0xD6, 0x0B, 0xED, 0x0B,
+   0xF6, 0x0B, 0xF7, 0x0B, 0xEA, 0x0B, 0xD4, 0x0B, 0xB3, 0x0B, 0x87, 0x0B,
+   0x56, 0x0B, 0x17, 0x0B, 0xCF, 0x0A, 0x80, 0x0A, 0x24, 0x0A, 0xC4, 0x09,
+   0x59, 0x09, 0xE5, 0x08, 0x72, 0x08, 0xE9, 0x07, 0x64, 0x07, 0xD1, 0x06,
+   0x3A, 0x06, 0x9B, 0x05, 0xF6, 0x04, 0x54, 0x04, 0x9C, 0x03, 0xEF, 0x02,
+   0x2E, 0x02, 0x75, 0x01, 0xB0, 0x00, 0xF0, 0xFF, 0x2F, 0xFF, 0x60, 0xFE,
+   0xA0, 0xFD, 0xD0, 0xFC, 0x10, 0xFC, 0x45, 0xFB, 0x86, 0xFA, 0xC7, 0xF9,
+   0x0F, 0xF9, 0x60, 0xF8, 0xB2, 0xF7, 0x0E, 0xF7, 0x73, 0xF6, 0xE5, 0xF5,
+   0x5A, 0xF5, 0xE8, 0xF4, 0x78, 0xF4, 0x1A, 0xF4, 0xCA, 0xF3, 0x87, 0xF3,
+   0x54, 0xF3, 0x36, 0xF3, 0x1D, 0xF3, 0x21, 0xF3, 0x2B, 0xF3, 0x4C, 0xF3,
+   0x7C, 0xF3, 0xB5, 0xF3, 0x0B, 0xF4, 0x5F, 0xF4, 0xCE, 0xF4, 0x46, 0xF5,
+   0xC8, 0xF5, 0x5C, 0xF6, 0xF4, 0xF6, 0x9B, 0xF7, 0x47, 0xF8, 0xFD, 0xF8,
+   0xB4, 0xF9, 0x70, 0xFA, 0x35, 0xFB, 0xFA, 0xFB, 0xBF, 0xFC, 0x88, 0xFD,
+   0x4C, 0xFE, 0x10, 0xFF, 0xCB, 0xFF, 0x8B, 0x00, 0x44, 0x01, 0xF6, 0x01,
+   0xA5, 0x02, 0x4D, 0x03, 0xEA, 0x03, 0x7F, 0x04, 0x16, 0x05, 0x99, 0x05,
+   0x25, 0x06, 0x93, 0x06, 0x11, 0x07, 0x70, 0x07, 0xD6, 0x07, 0x30, 0x08,
+   0x81, 0x08, 0xD0, 0x08, 0x0F, 0x09, 0x52, 0x09, 0x80, 0x09, 0xB6, 0x09,
+   0xD6, 0x09, 0xFA, 0x09, 0x13, 0x0A, 0x23, 0x0A, 0x32, 0x0A, 0x33, 0x0A,
+   0x32, 0x0A, 0x27, 0x0A, 0x16, 0x0A, 0xFB, 0x09, 0xDE, 0x09, 0xAD, 0x09,
+   0x82, 0x09, 0x41, 0x09, 0x03, 0x09, 0xB8, 0x08, 0x60, 0x08, 0x05, 0x08,
+   0x9A, 0x07, 0x2F, 0x07, 0xB1, 0x06, 0x34, 0x06, 0xAE, 0x05, 0x19, 0x05,
+   0x83, 0x04, 0xE0, 0x03, 0x3D, 0x03, 0x8E, 0x02, 0xE1, 0x01, 0x2B, 0x01,
+   0x73, 0x00, 0xC2, 0xFF, 0x02, 0xFF, 0x49, 0xFE, 0x90, 0xFD, 0xDA, 0xFC,
+   0x22, 0xFC, 0x7A, 0xFB, 0xCD, 0xFA, 0x2D, 0xFA, 0x8D, 0xF9, 0xFC, 0xF8,
+   0x6E, 0xF8, 0xF0, 0xF7, 0x76, 0xF7, 0x14, 0xF7, 0xAB, 0xF6, 0x5F, 0xF6,
+   0x12, 0xF6, 0xDA, 0xF5, 0xAB, 0xF5, 0x88, 0xF5, 0x76, 0xF5, 0x69, 0xF5,
+   0x70, 0xF5, 0x7C, 0xF5, 0x95, 0xF5, 0xBD, 0xF5, 0xE5, 0xF5, 0x23, 0xF6,
+   0x60, 0xF6, 0xA6, 0xF6, 0xFD, 0xF6, 0x4C, 0xF7, 0xB3, 0xF7, 0x0D, 0xF8,
+   0x82, 0xF8, 0xE1, 0xF8, 0x5D, 0xF9, 0xCA, 0xF9, 0x48, 0xFA, 0xC3, 0xFA,
+   0x40, 0xFB, 0xC2, 0xFB, 0x45, 0xFC, 0xC3, 0xFC, 0x4F, 0xFD, 0xD3, 0xFD,
+   0x60, 0xFE, 0xE8, 0xFE, 0x78, 0xFF, 0x00, 0x00, 0x94, 0x00, 0x1F, 0x01,
+   0xA8, 0x01, 0x41, 0x02, 0xC8, 0x02, 0x60, 0x03, 0xEA, 0x03, 0x79, 0x04,
+   0x09, 0x05, 0x8A, 0x05, 0x1A, 0x06, 0x99, 0x06, 0x1F, 0x07, 0x97, 0x07,
+   0x11, 0x08, 0x7F, 0x08, 0xE6, 0x08, 0x4C, 0x09, 0xA0, 0x09, 0xF3, 0x09,
+   0x36, 0x0A, 0x72, 0x0A, 0x9F, 0x0A, 0xC1, 0x0A, 0xD6, 0x0A, 0xDE, 0x0A,
+   0xDA, 0x0A, 0xC3, 0x0A, 0xA3, 0x0A, 0x73, 0x0A, 0x33, 0x0A, 0xEA, 0x09,
+   0x8F, 0x09, 0x2A, 0x09, 0xB7, 0x08, 0x35, 0x08, 0xB0, 0x07, 0x13, 0x07,
+   0x80, 0x06, 0xD7, 0x05, 0x2A, 0x05, 0x7A, 0x04, 0xBD, 0x03, 0x08, 0x03,
+   0x45, 0x02, 0x8D, 0x01, 0xD0, 0x00, 0x12, 0x00, 0x5A, 0xFF, 0xA1, 0xFE,
+   0xF4, 0xFD, 0x43, 0xFD, 0xA2, 0xFC, 0x0A, 0xFC, 0x6C, 0xFB, 0xE7, 0xFA,
+   0x5C, 0xFA, 0xE7, 0xF9, 0x72, 0xF9, 0x0D, 0xF9, 0xAF, 0xF8, 0x5C, 0xF8,
+   0x19, 0xF8, 0xD5, 0xF7, 0xA0, 0xF7, 0x75, 0xF7, 0x4F, 0xF7, 0x35, 0xF7,
+   0x22, 0xF7, 0x19, 0xF7, 0x11, 0xF7, 0x1A, 0xF7, 0x1D, 0xF7, 0x32, 0xF7,
+   0x46, 0xF7, 0x61, 0xF7, 0x81, 0xF7, 0xAA, 0xF7, 0xD0, 0xF7, 0x07, 0xF8,
+   0x35, 0xF8, 0x74, 0xF8, 0xAF, 0xF8, 0xF1, 0xF8, 0x3D, 0xF9, 0x85, 0xF9,
+   0xDE, 0xF9, 0x2D, 0xFA, 0x93, 0xFA, 0xEE, 0xFA, 0x59, 0xFB, 0xC6, 0xFB,
+   0x2D, 0xFC, 0xB1, 0xFC, 0x21, 0xFD, 0xAB, 0xFD, 0x2A, 0xFE, 0xB6, 0xFE,
+   0x43, 0xFF, 0xCB, 0xFF, 0x66, 0x00, 0xF4, 0x00, 0x90, 0x01, 0x21, 0x02,
+   0xBD, 0x02, 0x4F, 0x03, 0xDD, 0x03, 0x76, 0x04, 0xF9, 0x04, 0x8C, 0x05,
+   0x06, 0x06, 0x88, 0x06, 0xFA, 0x06, 0x69, 0x07, 0xCB, 0x07, 0x24, 0x08,
+   0x77, 0x08, 0xBA, 0x08, 0xF7, 0x08, 0x24, 0x09, 0x49, 0x09, 0x61, 0x09,
+   0x6B, 0x09, 0x6B, 0x09, 0x5E, 0x09, 0x48, 0x09, 0x26, 0x09, 0xF4, 0x08,
+   0xC3, 0x08, 0x7A, 0x08, 0x39, 0x08, 0xDB, 0x07, 0x8A, 0x07, 0x20, 0x07,
+   0xBC, 0x06, 0x4E, 0x06, 0xDF, 0x05, 0x66, 0x05, 0xEF, 0x04, 0x6F, 0x04,
+   0xF5, 0x03, 0x73, 0x03, 0xF7, 0x02, 0x72, 0x02, 0xF7, 0x01, 0x7A, 0x01,
+   0xFB, 0x00, 0x80, 0x00, 0x03, 0x00, 0x8E, 0xFF, 0x13, 0xFF, 0xA2, 0xFE,
+   0x33, 0xFE, 0xBF, 0xFD, 0x56, 0xFD, 0xE6, 0xFC, 0x81, 0xFC, 0x16, 0xFC,
+   0xB8, 0xFB, 0x54, 0xFB, 0xF9, 0xFA, 0x9A, 0xFA, 0x42, 0xFA, 0xEE, 0xF9,
+   0x97, 0xF9, 0x4D, 0xF9, 0x04, 0xF9, 0xBA, 0xF8, 0x7D, 0xF8, 0x3C, 0xF8,
+   0x08, 0xF8, 0xD9, 0xF7, 0xAD, 0xF7, 0x8C, 0xF7, 0x72, 0xF7, 0x5C, 0xF7,
+   0x57, 0xF7, 0x51, 0xF7, 0x5F, 0xF7, 0x6C, 0xF7, 0x8E, 0xF7, 0xAF, 0xF7,
+   0xE3, 0xF7, 0x1E, 0xF8, 0x65, 0xF8, 0xB4, 0xF8, 0x11, 0xF9, 0x75, 0xF9,
+   0xE2, 0xF9, 0x58, 0xFA, 0xD8, 0xFA, 0x60, 0xFB, 0xED, 0xFB, 0x83, 0xFC,
+   0x1C, 0xFD, 0xBB, 0xFD, 0x56, 0xFE, 0xFF, 0xFE, 0xA0, 0xFF, 0x49, 0x00,
+   0xEB, 0x00, 0x8F, 0x01, 0x2C, 0x02, 0xCC, 0x02, 0x5E, 0x03, 0xEE, 0x03,
+   0x79, 0x04, 0xFB, 0x04, 0x77, 0x05, 0xEA, 0x05, 0x51, 0x06, 0xB1, 0x06,
+   0x05, 0x07, 0x51, 0x07, 0x94, 0x07, 0xC7, 0x07, 0xF9, 0x07, 0x19, 0x08,
+   0x33, 0x08, 0x41, 0x08, 0x47, 0x08, 0x45, 0x08, 0x39, 0x08, 0x26, 0x08,
+   0x09, 0x08, 0xEA, 0x07, 0xBE, 0x07, 0x91, 0x07, 0x5A, 0x07, 0x22, 0x07,
+   0xE1, 0x06, 0x9F, 0x06, 0x57, 0x06, 0x0B, 0x06, 0xBC, 0x05, 0x71, 0x05,
+   0x13, 0x05, 0xC7, 0x04, 0x61, 0x04, 0x11, 0x04, 0xA6, 0x03, 0x51, 0x03,
+   0xEA, 0x02, 0x88, 0x02, 0x20, 0x02, 0xB6, 0x01, 0x50, 0x01, 0xDE, 0x00,
+   0x78, 0x00, 0x07, 0x00, 0x97, 0xFF, 0x2A, 0xFF, 0xB1, 0xFE, 0x49, 0xFE,
+   0xCA, 0xFD, 0x67, 0xFD, 0xE8, 0xFC, 0x84, 0xFC, 0x13, 0xFC, 0xA8, 0xFB,
+   0x40, 0xFB, 0xDA, 0xFA, 0x79, 0xFA, 0x1E, 0xFA, 0xC6, 0xF9, 0x77, 0xF9,
+   0x2B, 0xF9, 0xE8, 0xF8, 0xAC, 0xF8, 0x78, 0xF8, 0x4D, 0xF8, 0x29, 0xF8,
+   0x11, 0xF8, 0x01, 0xF8, 0xFB, 0xF7, 0xFF, 0xF7, 0x0B, 0xF8, 0x23, 0xF8,
+   0x43, 0xF8, 0x6E, 0xF8, 0xA0, 0xF8, 0xDF, 0xF8, 0x20, 0xF9, 0x71, 0xF9,
+   0xC3, 0xF9, 0x1E, 0xFA, 0x83, 0xFA, 0xE5, 0xFA, 0x53, 0xFB, 0xC3, 0xFB,
+   0x35, 0xFC, 0xB0, 0xFC, 0x24, 0xFD, 0xA3, 0xFD, 0x1B, 0xFE, 0x93, 0xFE,
+   0x11, 0xFF, 0x88, 0xFF, 0x02, 0x00, 0x77, 0x00, 0xEC, 0x00, 0x5A, 0x01,
+   0xC4, 0x01, 0x32, 0x02, 0x94, 0x02, 0xF9, 0x02, 0x54, 0x03, 0xB1, 0x03,
+   0x03, 0x04, 0x52, 0x04, 0x9E, 0x04, 0xE9, 0x04, 0x28, 0x05, 0x6B, 0x05,
+   0xA2, 0x05, 0xDA, 0x05, 0x0A, 0x06, 0x39, 0x06, 0x5A, 0x06, 0x88, 0x06,
+   0x9C, 0x06, 0xC1, 0x06, 0xCD, 0x06, 0xE5, 0x06, 0xEB, 0x06, 0xF6, 0x06,
+   0xF2, 0x06, 0xF1, 0x06, 0xE3, 0x06, 0xD3, 0x06, 0xBF, 0x06, 0x9C, 0x06,
+   0x81, 0x06, 0x50, 0x06, 0x20, 0x06, 0xEB, 0x05, 0xA9, 0x05, 0x65, 0x05,
+   0x1A, 0x05, 0xC7, 0x04, 0x6F, 0x04, 0x0F, 0x04, 0xAA, 0x03, 0x3E, 0x03,
+   0xCE, 0x02, 0x5C, 0x02, 0xDE, 0x01, 0x69, 0x01, 0xE6, 0x00, 0x68, 0x00,
+   0xE3, 0xFF, 0x5F, 0xFF, 0xDD, 0xFE, 0x57, 0xFE, 0xD8, 0xFD, 0x5A, 0xFD,
+   0xDC, 0xFC, 0x65, 0xFC, 0xEF, 0xFB, 0x83, 0xFB, 0x14, 0xFB, 0xB8, 0xFA,
+   0x5A, 0xFA, 0x07, 0xFA, 0xBB, 0xF9, 0x74, 0xF9, 0x3D, 0xF9, 0x06, 0xF9,
+   0xE2, 0xF8, 0xBD, 0xF8, 0xAA, 0xF8, 0x98, 0xF8, 0x95, 0xF8, 0x98, 0xF8,
+   0xA6, 0xF8, 0xB6, 0xF8, 0xD9, 0xF8, 0xF7, 0xF8, 0x25, 0xF9, 0x58, 0xF9,
+   0x8E, 0xF9, 0xD0, 0xF9, 0x11, 0xFA, 0x5C, 0xFA, 0xA7, 0xFA, 0xFA, 0xFA,
+   0x4D, 0xFB, 0xA7, 0xFB, 0x00, 0xFC, 0x5F, 0xFC, 0xBB, 0xFC, 0x22, 0xFD,
+   0x77, 0xFD, 0xE7, 0xFD, 0x3E, 0xFE, 0xAC, 0xFE, 0x08, 0xFF, 0x72, 0xFF,
+   0xD1, 0xFF, 0x35, 0x00, 0x99, 0x00, 0xF2, 0x00, 0x5A, 0x01, 0xB1, 0x01,
+   0x14, 0x02, 0x6B, 0x02, 0xCA, 0x02, 0x1B, 0x03, 0x72, 0x03, 0xC2, 0x03,
+   0x14, 0x04, 0x60, 0x04, 0xA7, 0x04, 0xF1, 0x04, 0x2D, 0x05, 0x6C, 0x05,
+   0xA4, 0x05, 0xD7, 0x05, 0x08, 0x06, 0x2D, 0x06, 0x55, 0x06, 0x6D, 0x06,
+   0x88, 0x06, 0x95, 0x06, 0xA0, 0x06, 0xA3, 0x06, 0x9C, 0x06, 0x94, 0x06,
+   0x7E, 0x06, 0x65, 0x06, 0x44, 0x06, 0x1B, 0x06, 0xEE, 0x05, 0xB5, 0x05,
+   0x7A, 0x05, 0x34, 0x05, 0xEF, 0x04, 0x9A, 0x04, 0x52, 0x04, 0xEC, 0x03,
+   0x9A, 0x03, 0x31, 0x03, 0xD0, 0x02, 0x68, 0x02, 0xFF, 0x01, 0x98, 0x01,
+   0x27, 0x01, 0xBF, 0x00, 0x4C, 0x00, 0xE8, 0xFF, 0x74, 0xFF, 0x12, 0xFF,
+   0xA8, 0xFE, 0x44, 0xFE, 0xE2, 0xFD, 0x82, 0xFD, 0x27, 0xFD, 0xD0, 0xFC,
+   0x7D, 0xFC, 0x2C, 0xFC, 0xE7, 0xFB, 0x9F, 0xFB, 0x62, 0xFB, 0x26, 0xFB,
+   0xEE, 0xFA, 0xC3, 0xFA, 0x92, 0xFA, 0x71, 0xFA, 0x51, 0xFA, 0x34, 0xFA,
+   0x1F, 0xFA, 0x10, 0xFA, 0x02, 0xFA, 0x01, 0xFA, 0xFB, 0xF9, 0x01, 0xFA,
+   0x0B, 0xFA, 0x18, 0xFA, 0x2B, 0xFA, 0x43, 0xFA, 0x61, 0xFA, 0x7E, 0xFA,
+   0xA9, 0xFA, 0xCC, 0xFA, 0x03, 0xFB, 0x30, 0xFB, 0x6D, 0xFB, 0xA6, 0xFB,
+   0xE7, 0xFB, 0x2C, 0xFC, 0x74, 0xFC, 0xBD, 0xFC, 0x10, 0xFD, 0x5F, 0xFD,
+   0xBB, 0xFD, 0x0E, 0xFE, 0x71, 0xFE, 0xC8, 0xFE, 0x2A, 0xFF, 0x8D, 0xFF,
+   0xEF, 0xFF, 0x55, 0x00, 0xB8, 0x00, 0x1E, 0x01, 0x83, 0x01, 0xE2, 0x01,
+   0x49, 0x02, 0xA5, 0x02, 0x07, 0x03, 0x5F, 0x03, 0xBB, 0x03, 0x0B, 0x04,
+   0x5D, 0x04, 0xA6, 0x04, 0xEF, 0x04, 0x2D, 0x05, 0x6A, 0x05, 0x9F, 0x05,
+   0xCD, 0x05, 0xF5, 0x05, 0x16, 0x06, 0x2D, 0x06, 0x44, 0x06, 0x4A, 0x06,
+   0x53, 0x06, 0x4D, 0x06, 0x43, 0x06, 0x32, 0x06, 0x18, 0x06, 0xFA, 0x05,
+   0xD4, 0x05, 0xA7, 0x05, 0x74, 0x05, 0x3D, 0x05, 0xFE, 0x04, 0xC0, 0x04,
+   0x73, 0x04, 0x2E, 0x04, 0xD7, 0x03, 0x8C, 0x03, 0x30, 0x03, 0xDA, 0x02,
+   0x84, 0x02, 0x21, 0x02, 0xC9, 0x01, 0x67, 0x01, 0x08, 0x01, 0xAB, 0x00,
+   0x47, 0x00, 0xEC, 0xFF, 0x8D, 0xFF, 0x33, 0xFF, 0xD9, 0xFE, 0x7C, 0xFE,
+   0x29, 0xFE, 0xD1, 0xFD, 0x80, 0xFD, 0x33, 0xFD, 0xE6, 0xFC, 0x9F, 0xFC,
+   0x5A, 0xFC, 0x14, 0xFC, 0xDF, 0xFB, 0x9B, 0xFB, 0x71, 0xFB, 0x39, 0xFB,
+   0x13, 0xFB, 0xE5, 0xFA, 0xC9, 0xFA, 0xA6, 0xFA, 0x91, 0xFA, 0x7D, 0xFA,
+   0x6D, 0xFA, 0x66, 0xFA, 0x61, 0xFA, 0x65, 0xFA, 0x6A, 0xFA, 0x79, 0xFA,
+   0x87, 0xFA, 0xA3, 0xFA, 0xBD, 0xFA, 0xDE, 0xFA, 0x07, 0xFB, 0x30, 0xFB,
+   0x64, 0xFB, 0x98, 0xFB, 0xD2, 0xFB, 0x10, 0xFC, 0x51, 0xFC, 0x97, 0xFC,
+   0xE2, 0xFC, 0x2D, 0xFD, 0x7F, 0xFD, 0xCF, 0xFD, 0x25, 0xFE, 0x77, 0xFE,
+   0xD3, 0xFE, 0x28, 0xFF, 0x86, 0xFF, 0xDC, 0xFF, 0x39, 0x00, 0x91, 0x00,
+   0xEB, 0x00, 0x41, 0x01, 0x95, 0x01, 0xEA, 0x01, 0x3C, 0x02, 0x8B, 0x02,
+   0xD6, 0x02, 0x21, 0x03, 0x64, 0x03, 0xA5, 0x03, 0xE4, 0x03, 0x1B, 0x04,
+   0x54, 0x04, 0x7E, 0x04, 0xB0, 0x04, 0xD2, 0x04, 0xF4, 0x04, 0x13, 0x05,
+   0x26, 0x05, 0x3C, 0x05, 0x46, 0x05, 0x50, 0x05, 0x50, 0x05, 0x4F, 0x05,
+   0x46, 0x05, 0x39, 0x05, 0x29, 0x05, 0x0F, 0x05, 0xF6, 0x04, 0xD2, 0x04,
+   0xB2, 0x04, 0x85, 0x04, 0x5C, 0x04, 0x28, 0x04, 0xF3, 0x03, 0xBC, 0x03,
+   0x7D, 0x03, 0x41, 0x03, 0xFB, 0x02, 0xBC, 0x02, 0x70, 0x02, 0x29, 0x02,
+   0xDB, 0x01, 0x8F, 0x01, 0x3D, 0x01, 0xF0, 0x00, 0xA1, 0x00, 0x4B, 0x00,
+   0xFE, 0xFF, 0xA5, 0xFF, 0x59, 0xFF, 0x04, 0xFF, 0xB6, 0xFE, 0x66, 0xFE,
+   0x1A, 0xFE, 0xCB, 0xFD, 0x84, 0xFD, 0x39, 0xFD, 0xF6, 0xFC, 0xB1, 0xFC,
+   0x76, 0xFC, 0x37, 0xFC, 0x03, 0xFC, 0xCD, 0xFB, 0x9D, 0xFB, 0x74, 0xFB,
+   0x49, 0xFB, 0x2D, 0xFB, 0x09, 0xFB, 0xF8, 0xFA, 0xDF, 0xFA, 0xD7, 0xFA,
+   0xC9, 0xFA, 0xCD, 0xFA, 0xC7, 0xFA, 0xD7, 0xFA, 0xDD, 0xFA, 0xF7, 0xFA,
+   0x07, 0xFB, 0x2C, 0xFB, 0x46, 0xFB, 0x75, 0xFB, 0x9B, 0xFB, 0xCE, 0xFB,
+   0x00, 0xFC, 0x3D, 0xFC, 0x76, 0xFC, 0xBA, 0xFC, 0xFB, 0xFC, 0x45, 0xFD,
+   0x8E, 0xFD, 0xDA, 0xFD, 0x27, 0xFE, 0x78, 0xFE, 0xCA, 0xFE, 0x1D, 0xFF,
+   0x71, 0xFF, 0xC6, 0xFF, 0x19, 0x00, 0x6B, 0x00, 0xC0, 0x00, 0x13, 0x01,
+   0x62, 0x01, 0xB3, 0x01, 0x01, 0x02, 0x49, 0x02, 0x95, 0x02, 0xD4, 0x02,
+   0x1D, 0x03, 0x58, 0x03, 0x95, 0x03, 0xCB, 0x03, 0xFE, 0x03, 0x2E, 0x04,
+   0x57, 0x04, 0x7B, 0x04, 0x9D, 0x04, 0xB6, 0x04, 0xD1, 0x04, 0xDF, 0x04,
+   0xEB, 0x04, 0xF5, 0x04, 0xF5, 0x04, 0xF1, 0x04, 0xED, 0x04, 0xD8, 0x04,
+   0xCF, 0x04, 0xB0, 0x04, 0x9B, 0x04, 0x76, 0x04, 0x55, 0x04, 0x2A, 0x04,
+   0xFE, 0x03, 0xCD, 0x03, 0x9A, 0x03, 0x60, 0x03, 0x2B, 0x03, 0xE8, 0x02,
+   0xAD, 0x02, 0x68, 0x02, 0x24, 0x02, 0xDE, 0x01, 0x96, 0x01, 0x4E, 0x01,
+   0x04, 0x01, 0xBE, 0x00, 0x6D, 0x00, 0x2A, 0x00, 0xD8, 0xFF, 0x94, 0xFF,
+   0x46, 0xFF, 0x01, 0xFF, 0xBB, 0xFE, 0x73, 0xFE, 0x33, 0xFE, 0xEC, 0xFD,
+   0xB1, 0xFD, 0x71, 0xFD, 0x35, 0xFD, 0x03, 0xFD, 0xC8, 0xFC, 0x9C, 0xFC,
+   0x6A, 0xFC, 0x3D, 0xFC, 0x1C, 0xFC, 0xF0, 0xFB, 0xDB, 0xFB, 0xB6, 0xFB,
+   0xA5, 0xFB, 0x8E, 0xFB, 0x81, 0xFB, 0x74, 0xFB, 0x71, 0xFB, 0x6C, 0xFB,
+   0x73, 0xFB, 0x75, 0xFB, 0x85, 0xFB, 0x92, 0xFB, 0xA9, 0xFB, 0xC0, 0xFB,
+   0xDF, 0xFB, 0xFE, 0xFB, 0x25, 0xFC, 0x4B, 0xFC, 0x7D, 0xFC, 0xA8, 0xFC,
+   0xE1, 0xFC, 0x15, 0xFD, 0x51, 0xFD, 0x8B, 0xFD, 0xCD, 0xFD, 0x0B, 0xFE,
+   0x54, 0xFE, 0x93, 0xFE, 0xE0, 0xFE, 0x24, 0xFF, 0x6C, 0xFF, 0xB5, 0xFF,
+   0xFF, 0xFF, 0x47, 0x00, 0x92, 0x00, 0xD9, 0x00, 0x1F, 0x01, 0x66, 0x01,
+   0xA9, 0x01, 0xE8, 0x01, 0x2C, 0x02, 0x66, 0x02, 0xA2, 0x02, 0xDA, 0x02,
+   0x0D, 0x03, 0x41, 0x03, 0x6B, 0x03, 0x98, 0x03, 0xBB, 0x03, 0xE3, 0x03,
+   0xFB, 0x03, 0x1B, 0x04, 0x2E, 0x04, 0x3F, 0x04, 0x50, 0x04, 0x57, 0x04,
+   0x5D, 0x04, 0x5E, 0x04, 0x5A, 0x04, 0x52, 0x04, 0x4A, 0x04, 0x35, 0x04,
+   0x27, 0x04, 0x0B, 0x04, 0xF1, 0x03, 0xD2, 0x03, 0xB0, 0x03, 0x87, 0x03,
+   0x63, 0x03, 0x31, 0x03, 0x07, 0x03, 0xCF, 0x02, 0xA0, 0x02, 0x62, 0x02,
+   0x2C, 0x02, 0xEF, 0x01, 0xB1, 0x01, 0x74, 0x01, 0x2F, 0x01, 0xEF, 0x00,
+   0xA9, 0x00, 0x67, 0x00, 0x1F, 0x00, 0xDF, 0xFF, 0x96, 0xFF, 0x51, 0xFF,
+   0x0D, 0xFF, 0xC9, 0xFE, 0x84, 0xFE, 0x46, 0xFE, 0x01, 0xFE, 0xC6, 0xFD,
+   0x8B, 0xFD, 0x4F, 0xFD, 0x1A, 0xFD, 0xE5, 0xFC, 0xB3, 0xFC, 0x87, 0xFC,
+   0x5C, 0xFC, 0x38, 0xFC, 0x15, 0xFC, 0xF8, 0xFB, 0xDE, 0xFB, 0xC9, 0xFB,
+   0xB9, 0xFB, 0xAE, 0xFB, 0xA8, 0xFB, 0xA6, 0xFB, 0xA7, 0xFB, 0xB2, 0xFB,
+   0xBB, 0xFB, 0xD2, 0xFB, 0xE1, 0xFB, 0x01, 0xFC, 0x1A, 0xFC, 0x43, 0xFC,
+   0x66, 0xFC, 0x92, 0xFC, 0xC2, 0xFC, 0xEF, 0xFC, 0x29, 0xFD, 0x5D, 0xFD,
+   0x95, 0xFD, 0xD6, 0xFD, 0x0D, 0xFE, 0x53, 0xFE, 0x8E, 0xFE, 0xD5, 0xFE,
+   0x14, 0xFF, 0x55, 0xFF, 0x9C, 0xFF, 0xD7, 0xFF, 0x23, 0x00, 0x5B, 0x00,
+   0xA4, 0x00, 0xDC, 0x00, 0x1C, 0x01, 0x59, 0x01, 0x90, 0x01, 0xCC, 0x01,
+   0x00, 0x02, 0x34, 0x02, 0x66, 0x02, 0x92, 0x02, 0xBF, 0x02, 0xE8, 0x02,
+   0x0F, 0x03, 0x31, 0x03, 0x51, 0x03, 0x70, 0x03, 0x85, 0x03, 0xA3, 0x03,
+   0xAE, 0x03, 0xC3, 0x03, 0xCC, 0x03, 0xD6, 0x03, 0xDD, 0x03, 0xDE, 0x03,
+   0xDB, 0x03, 0xD9, 0x03, 0xCD, 0x03, 0xC5, 0x03, 0xB2, 0x03, 0xA1, 0x03,
+   0x89, 0x03, 0x73, 0x03, 0x53, 0x03, 0x34, 0x03, 0x10, 0x03, 0xE8, 0x02,
+   0xBE, 0x02, 0x92, 0x02, 0x5E, 0x02, 0x31, 0x02, 0xF6, 0x01, 0xC1, 0x01,
+   0x87, 0x01, 0x4B, 0x01, 0x0E, 0x01, 0xD0, 0x00, 0x92, 0x00, 0x51, 0x00,
+   0x16, 0x00, 0xCF, 0xFF, 0x99, 0xFF, 0x57, 0xFF, 0x1D, 0xFF, 0xE2, 0xFE,
+   0xA7, 0xFE, 0x71, 0xFE, 0x38, 0xFE, 0x06, 0xFE, 0xD1, 0xFD, 0xA0, 0xFD,
+   0x75, 0xFD, 0x44, 0xFD, 0x25, 0xFD, 0xF7, 0xFC, 0xD8, 0xFC, 0xBB, 0xFC,
+   0x99, 0xFC, 0x88, 0xFC, 0x6E, 0xFC, 0x60, 0xFC, 0x50, 0xFC, 0x4A, 0xFC,
+   0x3E, 0xFC, 0x44, 0xFC, 0x3E, 0xFC, 0x48, 0xFC, 0x50, 0xFC, 0x5A, 0xFC,
+   0x70, 0xFC, 0x7D, 0xFC, 0x9C, 0xFC, 0xB0, 0xFC, 0xD3, 0xFC, 0xF1, 0xFC,
+   0x19, 0xFD, 0x3A, 0xFD, 0x6A, 0xFD, 0x91, 0xFD, 0xC5, 0xFD, 0xF1, 0xFD,
+   0x28, 0xFE, 0x5A, 0xFE, 0x8F, 0xFE, 0xC9, 0xFE, 0xFF, 0xFE, 0x3B, 0xFF,
+   0x74, 0xFF, 0xAE, 0xFF, 0xEB, 0xFF, 0x23, 0x00, 0x61, 0x00, 0x95, 0x00,
+   0xD4, 0x00, 0x08, 0x01, 0x42, 0x01, 0x76, 0x01, 0xAC, 0x01, 0xDE, 0x01,
+   0x0D, 0x02, 0x3B, 0x02, 0x69, 0x02, 0x90, 0x02, 0xBA, 0x02, 0xDB, 0x02,
+   0xFD, 0x02, 0x1C, 0x03, 0x33, 0x03, 0x51, 0x03, 0x5D, 0x03, 0x76, 0x03,
+   0x7C, 0x03, 0x8B, 0x03, 0x8D, 0x03, 0x93, 0x03, 0x8F, 0x03, 0x8D, 0x03,
+   0x81, 0x03, 0x79, 0x03, 0x68, 0x03, 0x55, 0x03, 0x40, 0x03, 0x26, 0x03,
+   0x0B, 0x03, 0xEB, 0x02, 0xC8, 0x02, 0xA5, 0x02, 0x7B, 0x02, 0x53, 0x02,
+   0x27, 0x02, 0xF9, 0x01, 0xC8, 0x01, 0x97, 0x01, 0x63, 0x01, 0x2D, 0x01,
+   0xFB, 0x00, 0xC2, 0x00, 0x8D, 0x00, 0x52, 0x00, 0x1E, 0x00, 0xE2, 0xFF,
+   0xAF, 0xFF, 0x72, 0xFF, 0x43, 0xFF, 0x06, 0xFF, 0xD8, 0xFE, 0xA0, 0xFE,
+   0x71, 0xFE, 0x3E, 0xFE, 0x11, 0xFE, 0xE5, 0xFD, 0xBA, 0xFD, 0x95, 0xFD,
+   0x6D, 0xFD, 0x4D, 0xFD, 0x2B, 0xFD, 0x10, 0xFD, 0xF3, 0xFC, 0xE0, 0xFC,
+   0xCC, 0xFC, 0xBA, 0xFC, 0xAF, 0xFC, 0xA4, 0xFC, 0x9F, 0xFC, 0x9B, 0xFC,
+   0x9C, 0xFC, 0xA1, 0xFC, 0xA8, 0xFC, 0xB2, 0xFC, 0xC2, 0xFC, 0xD0, 0xFC,
+   0xE9, 0xFC, 0xFD, 0xFC, 0x18, 0xFD, 0x37, 0xFD, 0x55, 0xFD, 0x7A, 0xFD,
+   0x9E, 0xFD, 0xC5, 0xFD, 0xF2, 0xFD, 0x19, 0xFE, 0x4D, 0xFE, 0x73, 0xFE,
+   0xAC, 0xFE, 0xD8, 0xFE, 0x0E, 0xFF, 0x42, 0xFF, 0x75, 0xFF, 0xAC, 0xFF,
+   0xDD, 0xFF, 0x15, 0x00, 0x49, 0x00, 0x7E, 0x00, 0xB1, 0x00, 0xE7, 0x00,
+   0x15, 0x01, 0x49, 0x01, 0x75, 0x01, 0xA7, 0x01, 0xD0, 0x01, 0xFE, 0x01,
+   0x22, 0x02, 0x4C, 0x02, 0x6B, 0x02, 0x90, 0x02, 0xAD, 0x02, 0xC8, 0x02,
+   0xE3, 0x02, 0xF7, 0x02, 0x0B, 0x03, 0x1A, 0x03, 0x27, 0x03, 0x31, 0x03,
+   0x36, 0x03, 0x3A, 0x03, 0x39, 0x03, 0x36, 0x03, 0x2F, 0x03, 0x25, 0x03,
+   0x18, 0x03, 0x09, 0x03, 0xF3, 0x02, 0xE1, 0x02, 0xC4, 0x02, 0xAB, 0x02,
+   0x8B, 0x02, 0x6C, 0x02, 0x48, 0x02, 0x23, 0x02, 0xFB, 0x01, 0xD2, 0x01,
+   0xA6, 0x01, 0x7A, 0x01, 0x4B, 0x01, 0x1C, 0x01, 0xEE, 0x00, 0xBA, 0x00,
+   0x8B, 0x00, 0x55, 0x00, 0x26, 0x00, 0xF1, 0xFF, 0xC0, 0xFF, 0x8F, 0xFF,
+   0x5B, 0xFF, 0x2E, 0xFF, 0xFB, 0xFE, 0xCE, 0xFE, 0x9F, 0xFE, 0x74, 0xFE,
+   0x4B, 0xFE, 0x21, 0xFE, 0xFC, 0xFD, 0xD7, 0xFD, 0xB4, 0xFD, 0x96, 0xFD,
+   0x75, 0xFD, 0x5F, 0xFD, 0x45, 0xFD, 0x2F, 0xFD, 0x20, 0xFD, 0x0C, 0xFD,
+   0x03, 0xFD, 0xF7, 0xFC, 0xF5, 0xFC, 0xEB, 0xFC, 0xF3, 0xFC, 0xEF, 0xFC,
+   0xFA, 0xFC, 0x01, 0xFD, 0x0C, 0xFD, 0x1E, 0xFD, 0x2D, 0xFD, 0x43, 0xFD,
+   0x5A, 0xFD, 0x74, 0xFD, 0x92, 0xFD, 0xAE, 0xFD, 0xD3, 0xFD, 0xF2, 0xFD,
+   0x1B, 0xFE, 0x3F, 0xFE, 0x6B, 0xFE, 0x92, 0xFE, 0xC0, 0xFE, 0xED, 0xFE,
+   0x19, 0xFF, 0x49, 0xFF, 0x77, 0xFF, 0xA8, 0xFF, 0xD7, 0xFF, 0x08, 0x00,
+   0x37, 0x00, 0x68, 0x00, 0x96, 0x00, 0xC7, 0x00, 0xEE, 0x00, 0x23, 0x01,
+   0x45, 0x01, 0x77, 0x01, 0x9B, 0x01, 0xC3, 0x01, 0xE9, 0x01, 0x08, 0x02,
+   0x2C, 0x02, 0x49, 0x02, 0x65, 0x02, 0x80, 0x02, 0x96, 0x02, 0xAB, 0x02,
+   0xBC, 0x02, 0xCB, 0x02, 0xD6, 0x02, 0xE3, 0x02, 0xE4, 0x02, 0xED, 0x02,
+   0xE9, 0x02, 0xE7, 0x02, 0xE6, 0x02, 0xD7, 0x02, 0xD2, 0x02, 0xBF, 0x02,
+   0xB1, 0x02, 0x9E, 0x02, 0x85, 0x02, 0x70, 0x02, 0x53, 0x02, 0x37, 0x02,
+   0x19, 0x02, 0xF3, 0x01, 0xD5, 0x01, 0xAC, 0x01, 0x87, 0x01, 0x61, 0x01,
+   0x34, 0x01, 0x0E, 0x01, 0xDD, 0x00, 0xB6, 0x00, 0x83, 0x00, 0x5B, 0x00,
+   0x2D, 0x00, 0xFC, 0xFF, 0xD4, 0xFF, 0xA0, 0xFF, 0x78, 0xFF, 0x49, 0xFF,
+   0x1E, 0xFF, 0xF8, 0xFE, 0xC7, 0xFE, 0xA7, 0xFE, 0x7A, 0xFE, 0x59, 0xFE,
+   0x34, 0xFE, 0x12, 0xFE, 0xF4, 0xFD, 0xD6, 0xFD, 0xBC, 0xFD, 0xA3, 0xFD,
+   0x8D, 0xFD, 0x78, 0xFD, 0x69, 0xFD, 0x58, 0xFD, 0x4F, 0xFD, 0x43, 0xFD,
+   0x40, 0xFD, 0x39, 0xFD, 0x3C, 0xFD, 0x3A, 0xFD, 0x43, 0xFD, 0x47, 0xFD,
+   0x54, 0xFD, 0x5E, 0xFD, 0x72, 0xFD, 0x7E, 0xFD, 0x9A, 0xFD, 0xAA, 0xFD,
+   0xC8, 0xFD, 0xE3, 0xFD, 0xFE, 0xFD, 0x20, 0xFE, 0x3F, 0xFE, 0x64, 0xFE,
+   0x88, 0xFE, 0xAD, 0xFE, 0xD7, 0xFE, 0xFC, 0xFE, 0x27, 0xFF, 0x51, 0xFF,
+   0x7A, 0xFF, 0xA7, 0xFF, 0xD1, 0xFF, 0xFE, 0xFF, 0x29, 0x00, 0x53, 0x00,
+   0x7C, 0x00, 0xAA, 0x00, 0xD0, 0x00, 0xFB, 0x00, 0x23, 0x01, 0x45, 0x01,
+   0x6F, 0x01, 0x8C, 0x01, 0xB4, 0x01, 0xCF, 0x01, 0xF1, 0x01, 0x0B, 0x02,
+   0x25, 0x02, 0x3E, 0x02, 0x52, 0x02, 0x64, 0x02, 0x78, 0x02, 0x82, 0x02,
+   0x91, 0x02, 0x97, 0x02, 0xA0, 0x02, 0xA0, 0x02, 0xA7, 0x02, 0x9E, 0x02,
+   0x9F, 0x02, 0x96, 0x02, 0x8C, 0x02, 0x82, 0x02, 0x71, 0x02, 0x62, 0x02,
+   0x4D, 0x02, 0x3A, 0x02, 0x1F, 0x02, 0x07, 0x02, 0xEB, 0x01, 0xCB, 0x01,
+   0xB2, 0x01, 0x88, 0x01, 0x6D, 0x01, 0x45, 0x01, 0x20, 0x01, 0xFC, 0x00,
+   0xD1, 0x00, 0xAC, 0x00, 0x82, 0x00, 0x5B, 0x00, 0x31, 0x00, 0x08, 0x00,
+   0xDD, 0xFF, 0xB6, 0xFF, 0x8B, 0xFF, 0x65, 0xFF, 0x40, 0xFF, 0x13, 0xFF,
+   0xF4, 0xFE, 0xCA, 0xFE, 0xAC, 0xFE, 0x85, 0xFE, 0x69, 0xFE, 0x48, 0xFE,
+   0x2E, 0xFE, 0x11, 0xFE, 0xF8, 0xFD, 0xE1, 0xFD, 0xCF, 0xFD, 0xB8, 0xFD,
+   0xAF, 0xFD, 0x99, 0xFD, 0x95, 0xFD, 0x88, 0xFD, 0x83, 0xFD, 0x7F, 0xFD,
+   0x7E, 0xFD, 0x80, 0xFD, 0x82, 0xFD, 0x8A, 0xFD, 0x92, 0xFD, 0x9C, 0xFD,
+   0xAE, 0xFD, 0xB7, 0xFD, 0xD0, 0xFD, 0xE0, 0xFD, 0xF7, 0xFD, 0x11, 0xFE,
+   0x29, 0xFE, 0x47, 0xFE, 0x65, 0xFE, 0x82, 0xFE, 0xA6, 0xFE, 0xC4, 0xFE,
+   0xEB, 0xFE, 0x0D, 0xFF, 0x33, 0xFF, 0x58, 0xFF, 0x80, 0xFF, 0xA6, 0xFF,
+   0xCC, 0xFF, 0xF5, 0xFF, 0x1B, 0x00, 0x41, 0x00, 0x6C, 0x00, 0x8D, 0x00,
+   0xB7, 0x00, 0xDA, 0x00, 0xFD, 0x00, 0x20, 0x01, 0x43, 0x01, 0x61, 0x01,
+   0x82, 0x01, 0x9D, 0x01, 0xBB, 0x01, 0xD4, 0x01, 0xEA, 0x01, 0x02, 0x02,
+   0x13, 0x02, 0x2B, 0x02, 0x31, 0x02, 0x49, 0x02, 0x49, 0x02, 0x5C, 0x02,
+   0x59, 0x02, 0x65, 0x02, 0x60, 0x02, 0x63, 0x02, 0x5D, 0x02, 0x59, 0x02,
+   0x51, 0x02, 0x45, 0x02, 0x3B, 0x02, 0x28, 0x02, 0x1C, 0x02, 0x05, 0x02,
+   0xF2, 0x01, 0xD9, 0x01, 0xC2, 0x01, 0xA8, 0x01, 0x89, 0x01, 0x71, 0x01,
+   0x4B, 0x01, 0x30, 0x01, 0x0B, 0x01, 0xEB, 0x00, 0xC7, 0x00, 0xA5, 0x00,
+   0x7D, 0x00, 0x5B, 0x00, 0x35, 0x00, 0x0E, 0x00, 0xEB, 0xFF, 0xC4, 0xFF,
+   0xA2, 0xFF, 0x7A, 0xFF, 0x5A, 0xFF, 0x33, 0xFF, 0x14, 0xFF, 0xEF, 0xFE,
+   0xD3, 0xFE, 0xB0, 0xFE, 0x98, 0xFE, 0x77, 0xFE, 0x60, 0xFE, 0x46, 0xFE,
+   0x2E, 0xFE, 0x1B, 0xFE, 0x06, 0xFE, 0xF7, 0xFD, 0xE7, 0xFD, 0xDB, 0xFD,
+   0xCE, 0xFD, 0xC9, 0xFD, 0xBF, 0xFD, 0xBF, 0xFD, 0xBB, 0xFD, 0xBC, 0xFD,
+   0xBF, 0xFD, 0xC4, 0xFD, 0xCC, 0xFD, 0xD5, 0xFD, 0xE2, 0xFD, 0xEE, 0xFD,
+   0xFE, 0xFD, 0x12, 0xFE, 0x23, 0xFE, 0x3D, 0xFE, 0x4F, 0xFE, 0x6D, 0xFE,
+   0x84, 0xFE, 0xA3, 0xFE, 0xBE, 0xFE, 0xDC, 0xFE, 0xFE, 0xFE, 0x1D, 0xFF,
+   0x40, 0xFF, 0x60, 0xFF, 0x85, 0xFF, 0xA4, 0xFF, 0xCC, 0xFF, 0xEC, 0xFF,
+   0x12, 0x00, 0x33, 0x00, 0x59, 0x00, 0x79, 0x00, 0x9C, 0x00, 0xBE, 0x00,
+   0xDC, 0x00, 0x00, 0x01, 0x1B, 0x01, 0x3B, 0x01, 0x55, 0x01, 0x72, 0x01,
+   0x87, 0x01, 0xA5, 0x01, 0xB4, 0x01, 0xCF, 0x01, 0xDC, 0x01, 0xF0, 0x01,
+   0xFD, 0x01, 0x08, 0x02, 0x17, 0x02, 0x17, 0x02, 0x28, 0x02, 0x22, 0x02,
+   0x2A, 0x02, 0x27, 0x02, 0x24, 0x02, 0x22, 0x02, 0x19, 0x02, 0x10, 0x02,
+   0x06, 0x02, 0xF9, 0x01, 0xE8, 0x01, 0xDB, 0x01, 0xC4, 0x01, 0xB4, 0x01,
+   0x9A, 0x01, 0x85, 0x01, 0x6B, 0x01, 0x4F, 0x01, 0x38, 0x01, 0x14, 0x01,
+   0xFE, 0x00, 0xD8, 0x00, 0xBE, 0x00, 0x99, 0x00, 0x7C, 0x00, 0x57, 0x00,
+   0x37, 0x00, 0x16, 0x00, 0xF4, 0xFF, 0xD2, 0xFF, 0xB2, 0xFF, 0x8E, 0xFF,
+   0x71, 0xFF, 0x4E, 0xFF, 0x30, 0xFF, 0x14, 0xFF, 0xF3, 0xFE, 0xDC, 0xFE,
+   0xBA, 0xFE, 0xA8, 0xFE, 0x88, 0xFE, 0x78, 0xFE, 0x5F, 0xFE, 0x4E, 0xFE,
+   0x3B, 0xFE, 0x2B, 0xFE, 0x1E, 0xFE, 0x10, 0xFE, 0x09, 0xFE, 0xFD, 0xFD,
+   0xFC, 0xFD, 0xF3, 0xFD, 0xF3, 0xFD, 0xF6, 0xFD, 0xF2, 0xFD, 0xFE, 0xFD,
+   0xFC, 0xFD, 0x0B, 0xFE, 0x11, 0xFE, 0x1F, 0xFE, 0x2E, 0xFE, 0x3A, 0xFE,
+   0x51, 0xFE, 0x5E, 0xFE, 0x79, 0xFE, 0x8A, 0xFE, 0xA6, 0xFE, 0xBC, 0xFE,
+   0xD7, 0xFE, 0xF3, 0xFE, 0x10, 0xFF, 0x2C, 0xFF, 0x4A, 0xFF, 0x69, 0xFF,
+   0x87, 0xFF, 0xA9, 0xFF, 0xC8, 0xFF, 0xE8, 0xFF, 0x08, 0x00, 0x27, 0x00,
+   0x4A, 0x00, 0x65, 0x00, 0x88, 0x00, 0xA3, 0x00, 0xC3, 0x00, 0xDF, 0x00,
+   0xFB, 0x00, 0x17, 0x01, 0x2D, 0x01, 0x4B, 0x01, 0x5C, 0x01, 0x78, 0x01,
+   0x87, 0x01, 0x9C, 0x01, 0xAE, 0x01, 0xBB, 0x01, 0xCA, 0x01, 0xD5, 0x01,
+   0xDE, 0x01, 0xE8, 0x01, 0xED, 0x01, 0xF0, 0x01, 0xF4, 0x01, 0xF2, 0x01,
+   0xF2, 0x01, 0xEC, 0x01, 0xEA, 0x01, 0xDE, 0x01, 0xD8, 0x01, 0xCA, 0x01,
+   0xBE, 0x01, 0xAF, 0x01, 0xA0, 0x01, 0x8C, 0x01, 0x79, 0x01, 0x64, 0x01,
+   0x4D, 0x01, 0x36, 0x01, 0x1C, 0x01, 0x06, 0x01, 0xE5, 0x00, 0xD0, 0x00,
+   0xAD, 0x00, 0x94, 0x00, 0x74, 0x00, 0x59, 0x00, 0x39, 0x00, 0x19, 0x00,
+   0xFF, 0xFF, 0xD9, 0xFF, 0xC4, 0xFF, 0x9C, 0xFF, 0x89, 0xFF, 0x64, 0xFF,
+   0x4B, 0xFF, 0x31, 0xFF, 0x12, 0xFF, 0xFC, 0xFE, 0xE2, 0xFE, 0xC9, 0xFE,
+   0xB5, 0xFE, 0xA1, 0xFE, 0x8B, 0xFE, 0x7C, 0xFE, 0x68, 0xFE, 0x5D, 0xFE,
+   0x4C, 0xFE, 0x47, 0xFE, 0x35, 0xFE, 0x36, 0xFE, 0x29, 0xFE, 0x29, 0xFE,
+   0x26, 0xFE, 0x25, 0xFE, 0x27, 0xFE, 0x2A, 0xFE, 0x31, 0xFE, 0x34, 0xFE,
+   0x42, 0xFE, 0x49, 0xFE, 0x56, 0xFE, 0x66, 0xFE, 0x72, 0xFE, 0x85, 0xFE,
+   0x97, 0xFE, 0xAC, 0xFE, 0xC0, 0xFE, 0xD7, 0xFE, 0xEE, 0xFE, 0x07, 0xFF,
+   0x21, 0xFF, 0x3A, 0xFF, 0x56, 0xFF, 0x6F, 0xFF, 0x90, 0xFF, 0xA7, 0xFF,
+   0xCB, 0xFF, 0xE0, 0xFF, 0x03, 0x00, 0x1B, 0x00, 0x3B, 0x00, 0x59, 0x00,
+   0x70, 0x00, 0x92, 0x00, 0xA7, 0x00, 0xC4, 0x00, 0xDF, 0x00, 0xF3, 0x00,
+   0x0F, 0x01, 0x23, 0x01, 0x38, 0x01, 0x4F, 0x01, 0x5D, 0x01, 0x73, 0x01,
+   0x7E, 0x01, 0x90, 0x01, 0x9A, 0x01, 0xA5, 0x01, 0xB2, 0x01, 0xB4, 0x01,
+   0xBF, 0x01, 0xC0, 0x01, 0xC2, 0x01, 0xC4, 0x01, 0xC1, 0x01, 0xC0, 0x01,
+   0xBA, 0x01, 0xB4, 0x01, 0xAC, 0x01, 0xA0, 0x01, 0x99, 0x01, 0x86, 0x01,
+   0x7D, 0x01, 0x69, 0x01, 0x58, 0x01, 0x4A, 0x01, 0x2E, 0x01, 0x21, 0x01,
+   0x04, 0x01, 0xF2, 0x00, 0xD6, 0x00, 0xBE, 0x00, 0xA5, 0x00, 0x8B, 0x00,
+   0x70, 0x00, 0x57, 0x00, 0x37, 0x00, 0x20, 0x00, 0x01, 0x00, 0xE8, 0xFF,
+   0xCA, 0xFF, 0xB3, 0xFF, 0x94, 0xFF, 0x7D, 0xFF, 0x60, 0xFF, 0x4A, 0xFF,
+   0x2F, 0xFF, 0x19, 0xFF, 0x04, 0xFF, 0xEB, 0xFE, 0xDC, 0xFE, 0xC3, 0xFE,
+   0xB4, 0xFE, 0xA4, 0xFE, 0x93, 0xFE, 0x89, 0xFE, 0x78, 0xFE, 0x71, 0xFE,
+   0x67, 0xFE, 0x5F, 0xFE, 0x5B, 0xFE, 0x55, 0xFE, 0x53, 0xFE, 0x54, 0xFE,
+   0x52, 0xFE, 0x58, 0xFE, 0x5B, 0xFE, 0x60, 0xFE, 0x69, 0xFE, 0x72, 0xFE,
+   0x7B, 0xFE, 0x8B, 0xFE, 0x94, 0xFE, 0xA8, 0xFE, 0xB4, 0xFE, 0xC9, 0xFE,
+   0xD9, 0xFE, 0xF1, 0xFE, 0x01, 0xFF, 0x1C, 0xFF, 0x2D, 0xFF, 0x4B, 0xFF,
+   0x5E, 0xFF, 0x7C, 0xFF, 0x90, 0xFF, 0xAC, 0xFF, 0xC8, 0xFF, 0xDD, 0xFF,
+   0xFF, 0xFF, 0x10, 0x00, 0x32, 0x00, 0x48, 0x00, 0x63, 0x00, 0x7B, 0x00,
+   0x94, 0x00, 0xAA, 0x00, 0xC6, 0x00, 0xD6, 0x00, 0xF1, 0x00, 0x02, 0x01,
+   0x18, 0x01, 0x28, 0x01, 0x3A, 0x01, 0x4B, 0x01, 0x56, 0x01, 0x68, 0x01,
+   0x6F, 0x01, 0x7D, 0x01, 0x84, 0x01, 0x8B, 0x01, 0x90, 0x01, 0x96, 0x01,
+   0x96, 0x01, 0x9A, 0x01, 0x96, 0x01, 0x95, 0x01, 0x91, 0x01, 0x8B, 0x01,
+   0x86, 0x01, 0x7B, 0x01, 0x71, 0x01, 0x67, 0x01, 0x59, 0x01, 0x4B, 0x01,
+   0x3C, 0x01, 0x2A, 0x01, 0x1A, 0x01, 0x07, 0x01, 0xF2, 0x00, 0xDB, 0x00,
+   0xCB, 0x00, 0xAF, 0x00, 0x9D, 0x00, 0x82, 0x00, 0x6A, 0x00, 0x55, 0x00,
+   0x36, 0x00, 0x24, 0x00, 0x07, 0x00, 0xEF, 0xFF, 0xD7, 0xFF, 0xBE, 0xFF,
+   0xA3, 0xFF, 0x90, 0xFF, 0x75, 0xFF, 0x5F, 0xFF, 0x4B, 0xFF, 0x32, 0xFF,
+   0x20, 0xFF, 0x0D, 0xFF, 0xF7, 0xFE, 0xE9, 0xFE, 0xD5, 0xFE, 0xC9, 0xFE,
+   0xBB, 0xFE, 0xAB, 0xFE, 0xA6, 0xFE, 0x93, 0xFE, 0x95, 0xFE, 0x85, 0xFE,
+   0x85, 0xFE, 0x7F, 0xFE, 0x7D, 0xFE, 0x7B, 0xFE, 0x7E, 0xFE, 0x7D, 0xFE,
+   0x83, 0xFE, 0x88, 0xFE, 0x8C, 0xFE, 0x97, 0xFE, 0x9F, 0xFE, 0xA9, 0xFE,
+   0xB8, 0xFE, 0xC2, 0xFE, 0xD3, 0xFE, 0xE2, 0xFE, 0xF2, 0xFE, 0x06, 0xFF,
+   0x15, 0xFF, 0x2E, 0xFF, 0x3C, 0xFF, 0x59, 0xFF, 0x66, 0xFF, 0x86, 0xFF,
+   0x93, 0xFF, 0xB2, 0xFF, 0xC4, 0xFF, 0xE0, 0xFF, 0xF4, 0xFF, 0x10, 0x00,
+   0x22, 0x00, 0x3F, 0x00, 0x52, 0x00, 0x6B, 0x00, 0x81, 0x00, 0x95, 0x00,
+   0xAD, 0x00, 0xC0, 0x00, 0xD2, 0x00, 0xE8, 0x00, 0xF6, 0x00, 0x09, 0x01,
+   0x1A, 0x01, 0x25, 0x01, 0x36, 0x01, 0x41, 0x01, 0x4B, 0x01, 0x55, 0x01,
+   0x5D, 0x01, 0x64, 0x01, 0x6A, 0x01, 0x6E, 0x01, 0x6F, 0x01, 0x71, 0x01,
+   0x71, 0x01, 0x6E, 0x01, 0x6C, 0x01, 0x68, 0x01, 0x5F, 0x01, 0x5A, 0x01,
+   0x50, 0x01, 0x47, 0x01, 0x3B, 0x01, 0x2F, 0x01, 0x20, 0x01, 0x12, 0x01,
+   0x02, 0x01, 0xF1, 0x00, 0xDF, 0x00, 0xCE, 0x00, 0xB9, 0x00, 0xA5, 0x00,
+   0x91, 0x00, 0x7A, 0x00, 0x67, 0x00, 0x4F, 0x00, 0x39, 0x00, 0x23, 0x00,
+   0x0D, 0x00, 0xF4, 0xFF, 0xE3, 0xFF, 0xC4, 0xFF, 0xB7, 0xFF, 0x9A, 0xFF,
+   0x8A, 0xFF, 0x73, 0xFF, 0x5F, 0xFF, 0x4C, 0xFF, 0x38, 0xFF, 0x28, 0xFF,
+   0x15, 0xFF, 0x06, 0xFF, 0xF8, 0xFE, 0xE7, 0xFE, 0xDE, 0xFE, 0xCF, 0xFE,
+   0xC6, 0xFE, 0xBD, 0xFE, 0xB4, 0xFE, 0xAF, 0xFE, 0xA8, 0xFE, 0xA6, 0xFE,
+   0xA1, 0xFE, 0xA3, 0xFE, 0x9F, 0xFE, 0xA6, 0xFE, 0xA2, 0xFE, 0xAE, 0xFE,
+   0xAE, 0xFE, 0xB7, 0xFE, 0xC0, 0xFE, 0xC7, 0xFE, 0xD4, 0xFE, 0xE0, 0xFE,
+   0xEA, 0xFE, 0xFB, 0xFE, 0x08, 0xFF, 0x1B, 0xFF, 0x28, 0xFF, 0x3C, 0xFF,
+   0x4D, 0xFF, 0x61, 0xFF, 0x74, 0xFF, 0x89, 0xFF, 0x9C, 0xFF, 0xB2, 0xFF,
+   0xC8, 0xFF, 0xDB, 0xFF, 0xF2, 0xFF, 0x08, 0x00, 0x1C, 0x00, 0x32, 0x00,
+   0x46, 0x00, 0x5C, 0x00, 0x70, 0x00, 0x85, 0x00, 0x96, 0x00, 0xA9, 0x00,
+   0xBC, 0x00, 0xCA, 0x00, 0xE1, 0x00, 0xE8, 0x00, 0xFE, 0x00, 0x06, 0x01,
+   0x15, 0x01, 0x1F, 0x01, 0x2A, 0x01, 0x33, 0x01, 0x3A, 0x01, 0x41, 0x01,
+   0x44, 0x01, 0x4D, 0x01, 0x49, 0x01, 0x51, 0x01, 0x4A, 0x01, 0x4E, 0x01,
+   0x49, 0x01, 0x46, 0x01, 0x41, 0x01, 0x38, 0x01, 0x34, 0x01, 0x27, 0x01,
+   0x22, 0x01, 0x12, 0x01, 0x0A, 0x01, 0xF8, 0x00, 0xEF, 0x00, 0xDC, 0x00,
+   0xCE, 0x00, 0xBF, 0x00, 0xA8, 0x00, 0x9D, 0x00, 0x84, 0x00, 0x75, 0x00,
+   0x61, 0x00, 0x4D, 0x00, 0x37, 0x00, 0x26, 0x00, 0x0E, 0x00, 0xFC, 0xFF,
+   0xE7, 0xFF, 0xD3, 0xFF, 0xBF, 0xFF, 0xAC, 0xFF, 0x97, 0xFF, 0x85, 0xFF,
+   0x73, 0xFF, 0x61, 0xFF, 0x4E, 0xFF, 0x43, 0xFF, 0x2B, 0xFF, 0x26, 0xFF,
+   0x0F, 0xFF, 0x0A, 0xFF, 0xF8, 0xFE, 0xF1, 0xFE, 0xE5, 0xFE, 0xDD, 0xFE,
+   0xD7, 0xFE, 0xCF, 0xFE, 0xCC, 0xFE, 0xC5, 0xFE, 0xC5, 0xFE, 0xC3, 0xFE,
+   0xC2, 0xFE, 0xC5, 0xFE, 0xC6, 0xFE, 0xC9, 0xFE, 0xD1, 0xFE, 0xD3, 0xFE,
+   0xDC, 0xFE, 0xE5, 0xFE, 0xEC, 0xFE, 0xFB, 0xFE, 0x01, 0xFF, 0x12, 0xFF,
+   0x1B, 0xFF, 0x2E, 0xFF, 0x3A, 0xFF, 0x4C, 0xFF, 0x58, 0xFF, 0x6E, 0xFF,
+   0x7C, 0xFF, 0x92, 0xFF, 0xA0, 0xFF, 0xB8, 0xFF, 0xC5, 0xFF, 0xDE, 0xFF,
+   0xED, 0xFF, 0x02, 0x00, 0x17, 0x00, 0x28, 0x00, 0x3D, 0x00, 0x4E, 0x00,
+   0x5F, 0x00, 0x76, 0x00, 0x80, 0x00, 0x9C, 0x00, 0x9E, 0x00, 0xBD, 0x00,
+   0xBE, 0x00, 0xD6, 0x00, 0xDF, 0x00, 0xEB, 0x00, 0xF9, 0x00, 0x00, 0x01,
+   0x0C, 0x01, 0x14, 0x01, 0x1A, 0x01, 0x22, 0x01, 0x25, 0x01, 0x29, 0x01,
+   0x2D, 0x01, 0x2C, 0x01, 0x30, 0x01, 0x2A, 0x01, 0x2D, 0x01, 0x25, 0x01,
+   0x25, 0x01, 0x1C, 0x01, 0x17, 0x01, 0x0F, 0x01, 0x04, 0x01, 0xFF, 0x00,
+   0xEE, 0x00, 0xE9, 0x00, 0xD7, 0x00, 0xCD, 0x00, 0xBC, 0x00, 0xAE, 0x00,
+   0xA0, 0x00, 0x8E, 0x00, 0x7F, 0x00, 0x6C, 0x00, 0x5B, 0x00, 0x4A, 0x00,
+   0x37, 0x00, 0x25, 0x00, 0x12, 0x00, 0x00, 0x00, 0xED, 0xFF, 0xDD, 0xFF,
+   0xC8, 0xFF, 0xB9, 0xFF, 0xA3, 0xFF, 0x97, 0xFF, 0x81, 0xFF, 0x77, 0xFF,
+   0x62, 0xFF, 0x57, 0xFF, 0x45, 0xFF, 0x3B, 0xFF, 0x2B, 0xFF, 0x22, 0xFF,
+   0x17, 0xFF, 0x0A, 0xFF, 0x05, 0xFF, 0xF8, 0xFE, 0xF8, 0xFE, 0xEB, 0xFE,
+   0xEB, 0xFE, 0xE4, 0xFE, 0xE3, 0xFE, 0xE3, 0xFE, 0xDF, 0xFE, 0xE5, 0xFE,
+   0xE0, 0xFE, 0xEA, 0xFE, 0xE8, 0xFE, 0xF3, 0xFE, 0xF4, 0xFE, 0x00, 0xFF,
+   0x03, 0xFF, 0x11, 0xFF, 0x1A, 0xFF, 0x22, 0xFF, 0x34, 0xFF, 0x38, 0xFF,
+   0x4F, 0xFF, 0x56, 0xFF, 0x68, 0xFF, 0x77, 0xFF, 0x85, 0xFF, 0x99, 0xFF,
+   0xA5, 0xFF, 0xBA, 0xFF, 0xC9, 0xFF, 0xDA, 0xFF, 0xED, 0xFF, 0xFE, 0xFF,
+   0x0F, 0x00, 0x22, 0x00, 0x33, 0x00, 0x40, 0x00, 0x58, 0x00, 0x60, 0x00,
+   0x77, 0x00, 0x83, 0x00, 0x92, 0x00, 0xA2, 0x00, 0xAD, 0x00, 0xBD, 0x00,
+   0xC6, 0x00, 0xD4, 0x00, 0xDD, 0x00, 0xE7, 0x00, 0xF0, 0x00, 0xF7, 0x00,
+   0xFF, 0x00, 0x03, 0x01, 0x0A, 0x01, 0x0A, 0x01, 0x11, 0x01, 0x0F, 0x01,
+   0x12, 0x01, 0x10, 0x01, 0x0D, 0x01, 0x0E, 0x01, 0x06, 0x01, 0x05, 0x01,
+   0xFC, 0x00, 0xF7, 0x00, 0xEF, 0x00, 0xE5, 0x00, 0xDD, 0x00, 0xD3, 0x00,
+   0xC5, 0x00, 0xBD, 0x00, 0xAC, 0x00, 0xA1, 0x00, 0x94, 0x00, 0x83, 0x00,
+   0x77, 0x00, 0x65, 0x00, 0x56, 0x00, 0x46, 0x00, 0x35, 0x00, 0x27, 0x00,
+   0x13, 0x00, 0x05, 0x00, 0xF2, 0xFF, 0xE3, 0xFF, 0xD3, 0xFF, 0xC0, 0xFF,
+   0xB4, 0xFF, 0xA1, 0xFF, 0x94, 0xFF, 0x85, 0xFF, 0x75, 0xFF, 0x6A, 0xFF,
+   0x5A, 0xFF, 0x50, 0xFF, 0x43, 0xFF, 0x39, 0xFF, 0x2E, 0xFF, 0x27, 0xFF,
+   0x1B, 0xFF, 0x17, 0xFF, 0x0D, 0xFF, 0x0B, 0xFF, 0x04, 0xFF, 0x02, 0xFF,
+   0xFE, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0x03, 0xFF,
+   0x03, 0xFF, 0x0A, 0xFF, 0x0E, 0xFF, 0x14, 0xFF, 0x1D, 0xFF, 0x24, 0xFF,
+   0x2D, 0xFF, 0x38, 0xFF, 0x40, 0xFF, 0x4F, 0xFF, 0x57, 0xFF, 0x67, 0xFF,
+   0x73, 0xFF, 0x7F, 0xFF, 0x92, 0xFF, 0x99, 0xFF, 0xB1, 0xFF, 0xB8, 0xFF,
+   0xCE, 0xFF, 0xD9, 0xFF, 0xEC, 0xFF, 0xFA, 0xFF, 0x0B, 0x00, 0x1A, 0x00,
+   0x29, 0x00, 0x3B, 0x00, 0x46, 0x00, 0x5A, 0x00, 0x64, 0x00, 0x74, 0x00,
+   0x83, 0x00, 0x8C, 0x00, 0x9D, 0x00, 0xA6, 0x00, 0xB2, 0x00, 0xBD, 0x00,
+   0xC6, 0x00, 0xD0, 0x00, 0xD5, 0x00, 0xE1, 0x00, 0xE2, 0x00, 0xEB, 0x00,
+   0xEF, 0x00, 0xF1, 0x00, 0xF4, 0x00, 0xF9, 0x00, 0xF2, 0x00, 0xFB, 0x00,
+   0xF1, 0x00, 0xF6, 0x00, 0xEC, 0x00, 0xEF, 0x00, 0xE3, 0x00, 0xE3, 0x00,
+   0xD8, 0x00, 0xD2, 0x00, 0xCB, 0x00, 0xBE, 0x00, 0xB7, 0x00, 0xAB, 0x00,
+   0xA1, 0x00, 0x95, 0x00, 0x86, 0x00, 0x7B, 0x00, 0x6E, 0x00, 0x5E, 0x00,
+   0x54, 0x00, 0x3D, 0x00, 0x39, 0x00, 0x21, 0x00, 0x1A, 0x00, 0x04, 0x00,
+   0xF9, 0xFF, 0xE8, 0xFF, 0xD9, 0xFF, 0xCD, 0xFF, 0xBC, 0xFF, 0xAF, 0xFF,
+   0xA0, 0xFF, 0x94, 0xFF, 0x85, 0xFF, 0x7B, 0xFF, 0x6E, 0xFF, 0x61, 0xFF,
+   0x5A, 0xFF, 0x4D, 0xFF, 0x44, 0xFF, 0x3E, 0xFF, 0x32, 0xFF, 0x2F, 0xFF,
+   0x27, 0xFF, 0x22, 0xFF, 0x1E, 0xFF, 0x1B, 0xFF, 0x16, 0xFF, 0x18, 0xFF,
+   0x13, 0xFF, 0x18, 0xFF, 0x15, 0xFF, 0x1A, 0xFF, 0x1C, 0xFF, 0x1D, 0xFF,
+   0x29, 0xFF, 0x25, 0xFF, 0x35, 0xFF, 0x35, 0xFF, 0x40, 0xFF, 0x49, 0xFF,
+   0x50, 0xFF, 0x5E, 0xFF, 0x65, 0xFF, 0x73, 0xFF, 0x7D, 0xFF, 0x89, 0xFF,
+   0x98, 0xFF, 0xA2, 0xFF, 0xB4, 0xFF, 0xBC, 0xFF, 0xD0, 0xFF, 0xD9, 0xFF,
+   0xEA, 0xFF, 0xF8, 0xFF, 0x05, 0x00, 0x16, 0x00, 0x22, 0x00, 0x31, 0x00,
+   0x3E, 0x00, 0x4D, 0x00, 0x57, 0x00, 0x69, 0x00, 0x6F, 0x00, 0x81, 0x00,
+   0x89, 0x00, 0x93, 0x00, 0xA2, 0x00, 0xA5, 0x00, 0xB3, 0x00, 0xB9, 0x00,
+   0xC1, 0x00, 0xC7, 0x00, 0xD0, 0x00, 0xCF, 0x00, 0xDA, 0x00, 0xD8, 0x00,
+   0xDC, 0x00, 0xE1, 0x00, 0xDC, 0x00, 0xE2, 0x00, 0xDC, 0x00, 0xDC, 0x00,
+   0xDA, 0x00, 0xD5, 0x00, 0xD3, 0x00, 0xCB, 0x00, 0xC6, 0x00, 0xC1, 0x00,
+   0xB4, 0x00, 0xB5, 0x00, 0xA1, 0x00, 0xA3, 0x00, 0x8E, 0x00, 0x8D, 0x00,
+   0x7A, 0x00, 0x73, 0x00, 0x66, 0x00, 0x57, 0x00, 0x4F, 0x00, 0x3E, 0x00,
+   0x33, 0x00, 0x23, 0x00, 0x18, 0x00, 0x08, 0x00, 0xFD, 0xFF, 0xEF, 0xFF,
+   0xDE, 0xFF, 0xD6, 0xFF, 0xC4, 0xFF, 0xBB, 0xFF, 0xAA, 0xFF, 0xA3, 0xFF,
+   0x92, 0xFF, 0x8C, 0xFF, 0x7D, 0xFF, 0x74, 0xFF, 0x69, 0xFF, 0x63, 0xFF,
+   0x56, 0xFF, 0x53, 0xFF, 0x48, 0xFF, 0x44, 0xFF, 0x3B, 0xFF, 0x3C, 0xFF,
+   0x2F, 0xFF, 0x37, 0xFF, 0x2A, 0xFF, 0x2F, 0xFF, 0x2B, 0xFF, 0x2C, 0xFF,
+   0x2E, 0xFF, 0x2C, 0xFF, 0x34, 0xFF, 0x32, 0xFF, 0x3A, 0xFF, 0x3D, 0xFF,
+   0x41, 0xFF, 0x4C, 0xFF, 0x4D, 0xFF, 0x5C, 0xFF, 0x5D, 0xFF, 0x6C, 0xFF,
+   0x72, 0xFF, 0x7D, 0xFF, 0x87, 0xFF, 0x94, 0xFF, 0x9D, 0xFF, 0xAA, 0xFF,
+   0xB7, 0xFF, 0xC2, 0xFF, 0xCF, 0xFF, 0xDD, 0xFF, 0xE6, 0xFF, 0xF8, 0xFF,
+   0x01, 0x00, 0x11, 0x00, 0x1C, 0x00, 0x29, 0x00, 0x36, 0x00, 0x41, 0x00,
+   0x4F, 0x00, 0x58, 0x00, 0x67, 0x00, 0x6E, 0x00, 0x7C, 0x00, 0x82, 0x00,
+   0x8F, 0x00, 0x96, 0x00, 0x9D, 0x00, 0xA9, 0x00, 0xAA, 0x00, 0xB5, 0x00,
+   0xB8, 0x00, 0xBD, 0x00, 0xC3, 0x00, 0xC2, 0x00, 0xCA, 0x00, 0xC6, 0x00,
+   0xCB, 0x00, 0xCA, 0x00, 0xC7, 0x00, 0xCB, 0x00, 0xC1, 0x00, 0xC5, 0x00,
+   0xBD, 0x00, 0xBA, 0x00, 0xB5, 0x00, 0xAD, 0x00, 0xAA, 0x00, 0x9F, 0x00,
+   0x9A, 0x00, 0x8F, 0x00, 0x88, 0x00, 0x7D, 0x00, 0x74, 0x00, 0x69, 0x00,
+   0x5F, 0x00, 0x53, 0x00, 0x47, 0x00, 0x3D, 0x00, 0x2E, 0x00, 0x26, 0x00,
+   0x15, 0x00, 0x0E, 0x00, 0xFC, 0xFF, 0xF6, 0xFF, 0xE3, 0xFF, 0xDD, 0xFF,
+   0xCD, 0xFF, 0xC2, 0xFF, 0xB9, 0xFF, 0xA9, 0xFF, 0xA5, 0xFF, 0x95, 0xFF,
+   0x8D, 0xFF, 0x84, 0xFF, 0x79, 0xFF, 0x73, 0xFF, 0x6B, 0xFF, 0x62, 0xFF,
+   0x5C, 0xFF, 0x58, 0xFF, 0x4E, 0xFF, 0x4F, 0xFF, 0x47, 0xFF, 0x46, 0xFF,
+   0x44, 0xFF, 0x3F, 0xFF, 0x43, 0xFF, 0x3D, 0xFF, 0x44, 0xFF, 0x40, 0xFF,
+   0x46, 0xFF, 0x46, 0xFF, 0x4B, 0xFF, 0x4E, 0xFF, 0x55, 0xFF, 0x59, 0xFF,
+   0x5F, 0xFF, 0x68, 0xFF, 0x6C, 0xFF, 0x78, 0xFF, 0x7C, 0xFF, 0x89, 0xFF,
+   0x90, 0xFF, 0x9D, 0xFF, 0xA3, 0xFF, 0xB1, 0xFF, 0xB9, 0xFF, 0xC6, 0xFF,
+   0xD3, 0xFF, 0xDA, 0xFF, 0xEB, 0xFF, 0xF2, 0xFF, 0x00, 0x00, 0x0D, 0x00,
+   0x15, 0x00, 0x24, 0x00, 0x2D, 0x00, 0x3A, 0x00, 0x43, 0x00, 0x51, 0x00,
+   0x56, 0x00, 0x65, 0x00, 0x6B, 0x00, 0x76, 0x00, 0x7E, 0x00, 0x86, 0x00,
+   0x8E, 0x00, 0x95, 0x00, 0x9A, 0x00, 0xA1, 0x00, 0xA6, 0x00, 0xAA, 0x00,
+   0xAF, 0x00, 0xB0, 0x00, 0xB4, 0x00, 0xB5, 0x00, 0xB7, 0x00, 0xB5, 0x00,
+   0xB8, 0x00, 0xB2, 0x00, 0xB5, 0x00, 0xAF, 0x00, 0xAE, 0x00, 0xA8, 0x00,
+   0xA6, 0x00, 0x9D, 0x00, 0x9A, 0x00, 0x94, 0x00, 0x89, 0x00, 0x88, 0x00,
+   0x78, 0x00, 0x77, 0x00, 0x69, 0x00, 0x62, 0x00, 0x57, 0x00, 0x4D, 0x00,
+   0x45, 0x00, 0x36, 0x00, 0x32, 0x00, 0x1E, 0x00, 0x1D, 0x00, 0x08, 0x00,
+   0x05, 0x00, 0xF4, 0xFF, 0xED, 0xFF, 0xE0, 0xFF, 0xD6, 0xFF, 0xC9, 0xFF,
+   0xC3, 0xFF, 0xB4, 0xFF, 0xB0, 0xFF, 0x9E, 0xFF, 0x9E, 0xFF, 0x8D, 0xFF,
+   0x8E, 0xFF, 0x7D, 0xFF, 0x7E, 0xFF, 0x6F, 0xFF, 0x71, 0xFF, 0x65, 0xFF,
+   0x65, 0xFF, 0x5D, 0xFF, 0x5C, 0xFF, 0x57, 0xFF, 0x56, 0xFF, 0x53, 0xFF,
+   0x55, 0xFF, 0x50, 0xFF, 0x55, 0xFF, 0x52, 0xFF, 0x58, 0xFF, 0x57, 0xFF,
+   0x5B, 0xFF, 0x60, 0xFF, 0x61, 0xFF, 0x6B, 0xFF, 0x6C, 0xFF, 0x74, 0xFF,
+   0x7B, 0xFF, 0x80, 0xFF, 0x8A, 0xFF, 0x92, 0xFF, 0x98, 0xFF, 0xA4, 0xFF,
+   0xAA, 0xFF, 0xB7, 0xFF, 0xBE, 0xFF, 0xCA, 0xFF, 0xD2, 0xFF, 0xDE, 0xFF,
+   0xEA, 0xFF, 0xF1, 0xFF, 0xFE, 0xFF, 0x07, 0x00, 0x13, 0x00, 0x1D, 0x00,
+   0x28, 0x00, 0x30, 0x00, 0x3C, 0x00, 0x45, 0x00, 0x4D, 0x00, 0x5A, 0x00,
+   0x5C, 0x00, 0x6E, 0x00, 0x6B, 0x00, 0x7C, 0x00, 0x7C, 0x00, 0x85, 0x00,
+   0x8C, 0x00, 0x8F, 0x00, 0x96, 0x00, 0x98, 0x00, 0x9F, 0x00, 0x9D, 0x00,
+   0xA4, 0x00, 0xA2, 0x00, 0xA5, 0x00, 0xA5, 0x00, 0xA5, 0x00, 0xA4, 0x00,
+   0xA1, 0x00, 0xA1, 0x00, 0x9C, 0x00, 0x9A, 0x00, 0x96, 0x00, 0x90, 0x00,
+   0x8C, 0x00, 0x87, 0x00, 0x7F, 0x00, 0x7A, 0x00, 0x70, 0x00, 0x6C, 0x00,
+   0x61, 0x00, 0x5C, 0x00, 0x4F, 0x00, 0x4A, 0x00, 0x3C, 0x00, 0x39, 0x00,
+   0x28, 0x00, 0x25, 0x00, 0x15, 0x00, 0x10, 0x00, 0x02, 0x00, 0xFB, 0xFF,
+   0xEE, 0xFF, 0xE7, 0xFF, 0xDB, 0xFF, 0xD3, 0xFF, 0xC8, 0xFF, 0xC0, 0xFF,
+   0xB5, 0xFF, 0xB0, 0xFF, 0xA4, 0xFF, 0x9F, 0xFF, 0x95, 0xFF, 0x8F, 0xFF,
+   0x89, 0xFF, 0x82, 0xFF, 0x7D, 0xFF, 0x77, 0xFF, 0x72, 0xFF, 0x71, 0xFF,
+   0x69, 0xFF, 0x6A, 0xFF, 0x66, 0xFF, 0x64, 0xFF, 0x65, 0xFF, 0x62, 0xFF,
+   0x64, 0xFF, 0x63, 0xFF, 0x67, 0xFF, 0x67, 0xFF, 0x6B, 0xFF, 0x6D, 0xFF,
+   0x71, 0xFF, 0x76, 0xFF, 0x7A, 0xFF, 0x81, 0xFF, 0x84, 0xFF, 0x8E, 0xFF,
+   0x91, 0xFF, 0x9B, 0xFF, 0xA1, 0xFF, 0xAB, 0xFF, 0xB0, 0xFF, 0xBC, 0xFF,
+   0xC2, 0xFF, 0xCD, 0xFF, 0xD5, 0xFF, 0xE0, 0xFF, 0xE5, 0xFF, 0xF6, 0xFF,
+   0xF7, 0xFF, 0x0A, 0x00, 0x09, 0x00, 0x1D, 0x00, 0x1D, 0x00, 0x2E, 0x00,
+   0x32, 0x00, 0x3C, 0x00, 0x46, 0x00, 0x4C, 0x00, 0x57, 0x00, 0x5B, 0x00,
+   0x65, 0x00, 0x6A, 0x00, 0x72, 0x00, 0x76, 0x00, 0x7E, 0x00, 0x7F, 0x00,
+   0x88, 0x00, 0x88, 0x00, 0x8E, 0x00, 0x90, 0x00, 0x91, 0x00, 0x94, 0x00,
+   0x94, 0x00, 0x96, 0x00, 0x94, 0x00, 0x96, 0x00, 0x91, 0x00, 0x93, 0x00,
+   0x8C, 0x00, 0x8E, 0x00, 0x87, 0x00, 0x84, 0x00, 0x81, 0x00, 0x78, 0x00,
+   0x77, 0x00, 0x6E, 0x00, 0x69, 0x00, 0x61, 0x00, 0x5C, 0x00, 0x51, 0x00,
+   0x4D, 0x00, 0x43, 0x00, 0x3A, 0x00, 0x33, 0x00, 0x2A, 0x00, 0x1F, 0x00,
+   0x19, 0x00, 0x0D, 0x00, 0x07, 0x00, 0xFC, 0xFF, 0xF3, 0xFF, 0xEA, 0xFF,
+   0xE1, 0xFF, 0xD8, 0xFF, 0xD2, 0xFF, 0xC5, 0xFF, 0xC1, 0xFF, 0xB7, 0xFF,
+   0xAF, 0xFF, 0xAB, 0xFF, 0x9E, 0xFF, 0x9F, 0xFF, 0x92, 0xFF, 0x91, 0xFF,
+   0x8A, 0xFF, 0x86, 0xFF, 0x80, 0xFF, 0x7F, 0xFF, 0x78, 0xFF, 0x7A, 0xFF,
+   0x73, 0xFF, 0x76, 0xFF, 0x70, 0xFF, 0x76, 0xFF, 0x6E, 0xFF, 0x77, 0xFF,
+   0x70, 0xFF, 0x7A, 0xFF, 0x74, 0xFF, 0x7E, 0xFF, 0x7C, 0xFF, 0x84, 0xFF,
+   0x84, 0xFF, 0x8C, 0xFF, 0x90, 0xFF, 0x96, 0xFF, 0x9D, 0xFF, 0xA0, 0xFF,
+   0xAB, 0xFF, 0xAE, 0xFF, 0xBB, 0xFF, 0xBC, 0xFF, 0xCA, 0xFF, 0xCE, 0xFF,
+   0xD8, 0xFF, 0xDF, 0xFF, 0xE9, 0xFF, 0xF2, 0xFF, 0xF8, 0xFF, 0x07, 0x00,
+   0x05, 0x00, 0x19, 0x00, 0x19, 0x00, 0x26, 0x00, 0x2D, 0x00, 0x34, 0x00,
+   0x3D, 0x00, 0x44, 0x00, 0x4B, 0x00, 0x54, 0x00, 0x56, 0x00, 0x62, 0x00,
+   0x62, 0x00, 0x6D, 0x00, 0x6D, 0x00, 0x77, 0x00, 0x75, 0x00, 0x7F, 0x00,
+   0x7B, 0x00, 0x85, 0x00, 0x81, 0x00, 0x87, 0x00, 0x86, 0x00, 0x86, 0x00,
+   0x88, 0x00, 0x85, 0x00, 0x86, 0x00, 0x84, 0x00, 0x81, 0x00, 0x7F, 0x00,
+   0x7C, 0x00, 0x78, 0x00, 0x75, 0x00, 0x6F, 0x00, 0x6C, 0x00, 0x64, 0x00,
+   0x61, 0x00, 0x5A, 0x00, 0x53, 0x00, 0x4D, 0x00, 0x45, 0x00, 0x3F, 0x00,
+   0x37, 0x00, 0x2F, 0x00, 0x27, 0x00, 0x1F, 0x00, 0x18, 0x00, 0x0E, 0x00,
+   0x08, 0x00, 0xFD, 0xFF, 0xF7, 0xFF, 0xEE, 0xFF, 0xE6, 0xFF, 0xDE, 0xFF,
+   0xD6, 0xFF, 0xD0, 0xFF, 0xC4, 0xFF, 0xC5, 0xFF, 0xB4, 0xFF, 0xB5, 0xFF,
+   0xAD, 0xFF, 0xA4, 0xFF, 0xA3, 0xFF, 0x9A, 0xFF, 0x96, 0xFF, 0x93, 0xFF,
+   0x8F, 0xFF, 0x89, 0xFF, 0x8A, 0xFF, 0x83, 0xFF, 0x84, 0xFF, 0x82, 0xFF,
+   0x7F, 0xFF, 0x81, 0xFF, 0x80, 0xFF, 0x80, 0xFF, 0x81, 0xFF, 0x83, 0xFF,
+   0x83, 0xFF, 0x89, 0xFF, 0x89, 0xFF, 0x8E, 0xFF, 0x90, 0xFF, 0x96, 0xFF,
+   0x99, 0xFF, 0x9F, 0xFF, 0xA4, 0xFF, 0xAB, 0xFF, 0xAF, 0xFF, 0xB8, 0xFF,
+   0xBA, 0xFF, 0xC7, 0xFF, 0xC8, 0xFF, 0xD6, 0xFF, 0xD6, 0xFF, 0xE4, 0xFF,
+   0xE7, 0xFF, 0xF3, 0xFF, 0xF7, 0xFF, 0x01, 0x00, 0x08, 0x00, 0x10, 0x00,
+   0x18, 0x00, 0x20, 0x00, 0x26, 0x00, 0x2F, 0x00, 0x35, 0x00, 0x3B, 0x00,
+   0x44, 0x00, 0x47, 0x00, 0x53, 0x00, 0x50, 0x00, 0x5F, 0x00, 0x5A, 0x00,
+   0x69, 0x00, 0x64, 0x00, 0x6E, 0x00, 0x6E, 0x00, 0x73, 0x00, 0x74, 0x00,
+   0x77, 0x00, 0x77, 0x00, 0x7B, 0x00, 0x78, 0x00, 0x7B, 0x00, 0x79, 0x00,
+   0x78, 0x00, 0x79, 0x00, 0x74, 0x00, 0x75, 0x00, 0x6F, 0x00, 0x6E, 0x00,
+   0x6B, 0x00, 0x65, 0x00, 0x63, 0x00, 0x5B, 0x00, 0x59, 0x00, 0x53, 0x00,
+   0x4C, 0x00, 0x47, 0x00, 0x41, 0x00, 0x39, 0x00, 0x34, 0x00, 0x2C, 0x00,
+   0x25, 0x00, 0x1F, 0x00, 0x15, 0x00, 0x11, 0x00, 0x06, 0x00, 0x03, 0x00,
+   0xF6, 0xFF, 0xF4, 0xFF, 0xE9, 0xFF, 0xE2, 0xFF, 0xDF, 0xFF, 0xD2, 0xFF,
+   0xCF, 0xFF, 0xC9, 0xFF, 0xBE, 0xFF, 0xBF, 0xFF, 0xB3, 0xFF, 0xB0, 0xFF,
+   0xAD, 0xFF, 0xA3, 0xFF, 0xA4, 0xFF, 0x9C, 0xFF, 0x9B, 0xFF, 0x96, 0xFF,
+   0x94, 0xFF, 0x92, 0xFF, 0x8E, 0xFF, 0x8F, 0xFF, 0x8C, 0xFF, 0x8D, 0xFF,
+   0x8B, 0xFF, 0x8E, 0xFF, 0x8B, 0xFF, 0x90, 0xFF, 0x8F, 0xFF, 0x92, 0xFF,
+   0x94, 0xFF, 0x9A, 0xFF, 0x98, 0xFF, 0xA1, 0xFF, 0xA0, 0xFF, 0xA9, 0xFF,
+   0xAB, 0xFF, 0xB2, 0xFF, 0xB5, 0xFF, 0xBE, 0xFF, 0xBF, 0xFF, 0xCC, 0xFF,
+   0xCB, 0xFF, 0xD7, 0xFF, 0xDB, 0xFF, 0xE3, 0xFF, 0xEB, 0xFF, 0xEF, 0xFF,
+   0xF9, 0xFF, 0xFD, 0xFF, 0x07, 0x00, 0x0E, 0x00, 0x13, 0x00, 0x1B, 0x00,
+   0x22, 0x00, 0x26, 0x00, 0x32, 0x00, 0x32, 0x00, 0x3D, 0x00, 0x40, 0x00,
+   0x45, 0x00, 0x4E, 0x00, 0x4E, 0x00, 0x56, 0x00, 0x5A, 0x00, 0x5B, 0x00,
+   0x64, 0x00, 0x61, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6D, 0x00,
+   0x6D, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x70, 0x00, 0x6B, 0x00, 0x6E, 0x00,
+   0x6A, 0x00, 0x69, 0x00, 0x67, 0x00, 0x63, 0x00, 0x61, 0x00, 0x5D, 0x00,
+   0x59, 0x00, 0x56, 0x00, 0x4F, 0x00, 0x4D, 0x00, 0x46, 0x00, 0x41, 0x00,
+   0x3C, 0x00, 0x36, 0x00, 0x2E, 0x00, 0x2D, 0x00, 0x1F, 0x00, 0x20, 0x00,
+   0x13, 0x00, 0x11, 0x00, 0x09, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xF1, 0xFF,
+   0xF1, 0xFF, 0xE5, 0xFF, 0xE2, 0xFF, 0xDA, 0xFF, 0xD4, 0xFF, 0xCF, 0xFF,
+   0xC8, 0xFF, 0xC3, 0xFF, 0xBE, 0xFF, 0xB9, 0xFF, 0xB3, 0xFF, 0xB1, 0xFF,
+   0xAA, 0xFF, 0xA8, 0xFF, 0xA6, 0xFF, 0x9F, 0xFF, 0xA2, 0xFF, 0x99, 0xFF,
+   0x9D, 0xFF, 0x97, 0xFF, 0x9A, 0xFF, 0x96, 0xFF, 0x99, 0xFF, 0x95, 0xFF,
+   0x9A, 0xFF, 0x96, 0xFF, 0x9E, 0xFF, 0x99, 0xFF, 0xA1, 0xFF, 0x9F, 0xFF,
+   0xA4, 0xFF, 0xA8, 0xFF, 0xAA, 0xFF, 0xB0, 0xFF, 0xB1, 0xFF, 0xB9, 0xFF,
+   0xBB, 0xFF, 0xC3, 0xFF, 0xC5, 0xFF, 0xCD, 0xFF, 0xD2, 0xFF, 0xD8, 0xFF,
+   0xDD, 0xFF, 0xE5, 0xFF, 0xEA, 0xFF, 0xF0, 0xFF, 0xF9, 0xFF, 0xFB, 0xFF,
+   0x07, 0x00, 0x07, 0x00, 0x15, 0x00, 0x12, 0x00, 0x21, 0x00, 0x20, 0x00,
+   0x2A, 0x00, 0x2F, 0x00, 0x34, 0x00, 0x39, 0x00, 0x3F, 0x00, 0x42, 0x00,
+   0x49, 0x00, 0x4B, 0x00, 0x51, 0x00, 0x52, 0x00, 0x59, 0x00, 0x57, 0x00,
+   0x5F, 0x00, 0x5C, 0x00, 0x62, 0x00, 0x60, 0x00, 0x65, 0x00, 0x61, 0x00,
+   0x66, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x5E, 0x00, 0x63, 0x00,
+   0x59, 0x00, 0x5E, 0x00, 0x56, 0x00, 0x57, 0x00, 0x4F, 0x00, 0x51, 0x00,
+   0x46, 0x00, 0x4A, 0x00, 0x3C, 0x00, 0x40, 0x00, 0x34, 0x00, 0x34, 0x00,
+   0x2C, 0x00, 0x26, 0x00, 0x21, 0x00, 0x1C, 0x00, 0x14, 0x00, 0x10, 0x00,
+   0x0A, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xF5, 0xFF, 0xF2, 0xFF, 0xEA, 0xFF,
+   0xE7, 0xFF, 0xDD, 0xFF, 0xDB, 0xFF, 0xD4, 0xFF, 0xCE, 0xFF, 0xCC, 0xFF,
+   0xC3, 0xFF, 0xC2, 0xFF, 0xBB, 0xFF, 0xB9, 0xFF, 0xB5, 0xFF, 0xAF, 0xFF,
+   0xB0, 0xFF, 0xA9, 0xFF, 0xAA, 0xFF, 0xA5, 0xFF, 0xA6, 0xFF, 0xA2, 0xFF,
+   0xA3, 0xFF, 0xA2, 0xFF, 0xA0, 0xFF, 0xA2, 0xFF, 0xA2, 0xFF, 0xA1, 0xFF,
+   0xA6, 0xFF, 0xA3, 0xFF, 0xAA, 0xFF, 0xA6, 0xFF, 0xAF, 0xFF, 0xAC, 0xFF,
+   0xB4, 0xFF, 0xB5, 0xFF, 0xB9, 0xFF, 0xBE, 0xFF, 0xC2, 0xFF, 0xC5, 0xFF,
+   0xCD, 0xFF, 0xCF, 0xFF, 0xD5, 0xFF, 0xDC, 0xFF, 0xDE, 0xFF, 0xE7, 0xFF,
+   0xEB, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xFB, 0xFF, 0x03, 0x00, 0x08, 0x00,
+   0x0E, 0x00, 0x13, 0x00, 0x18, 0x00, 0x21, 0x00, 0x21, 0x00, 0x2C, 0x00,
+   0x2B, 0x00, 0x35, 0x00, 0x35, 0x00, 0x3F, 0x00, 0x3D, 0x00, 0x46, 0x00,
+   0x46, 0x00, 0x4B, 0x00, 0x4D, 0x00, 0x52, 0x00, 0x52, 0x00, 0x55, 0x00,
+   0x57, 0x00, 0x56, 0x00, 0x5C, 0x00, 0x59, 0x00, 0x59, 0x00, 0x5C, 0x00,
+   0x56, 0x00, 0x5D, 0x00, 0x55, 0x00, 0x59, 0x00, 0x52, 0x00, 0x55, 0x00,
+   0x4F, 0x00, 0x4D, 0x00, 0x4C, 0x00, 0x46, 0x00, 0x43, 0x00, 0x43, 0x00,
+   0x37, 0x00, 0x3B, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x2A, 0x00, 0x24, 0x00,
+   0x1E, 0x00, 0x1C, 0x00, 0x11, 0x00, 0x12, 0x00, 0x08, 0x00, 0x04, 0x00,
+   0xFF, 0xFF, 0xF9, 0xFF, 0xF2, 0xFF, 0xF2, 0xFF, 0xE4, 0xFF, 0xE7, 0xFF,
+   0xDD, 0xFF, 0xDA, 0xFF, 0xD5, 0xFF, 0xD1, 0xFF, 0xC9, 0xFF, 0xCC, 0xFF,
+   0xBF, 0xFF, 0xC4, 0xFF, 0xB9, 0xFF, 0xBC, 0xFF, 0xB4, 0xFF, 0xB6, 0xFF,
+   0xB0, 0xFF, 0xB0, 0xFF, 0xAE, 0xFF, 0xAB, 0xFF, 0xAD, 0xFF, 0xAA, 0xFF,
+   0xAB, 0xFF, 0xAA, 0xFF, 0xAA, 0xFF, 0xAC, 0xFF, 0xAC, 0xFF, 0xAE, 0xFF,
+   0xAF, 0xFF, 0xB1, 0xFF, 0xB4, 0xFF, 0xB5, 0xFF, 0xBA, 0xFF, 0xBB, 0xFF,
+   0xC0, 0xFF, 0xC2, 0xFF, 0xC9, 0xFF, 0xC7, 0xFF, 0xD3, 0xFF, 0xD1, 0xFF,
+   0xDA, 0xFF, 0xDC, 0xFF, 0xE2, 0xFF, 0xE7, 0xFF, 0xEC, 0xFF, 0xF2, 0xFF,
+   0xF5, 0xFF, 0xFC, 0xFF, 0x02, 0x00, 0x04, 0x00, 0x0D, 0x00, 0x10, 0x00,
+   0x15, 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x25, 0x00, 0x2A, 0x00, 0x2B, 0x00,
+   0x33, 0x00, 0x33, 0x00, 0x3C, 0x00, 0x3A, 0x00, 0x41, 0x00, 0x43, 0x00,
+   0x46, 0x00, 0x48, 0x00, 0x4B, 0x00, 0x4B, 0x00, 0x50, 0x00, 0x4E, 0x00,
+   0x51, 0x00, 0x50, 0x00, 0x53, 0x00, 0x51, 0x00, 0x50, 0x00, 0x52, 0x00,
+   0x4F, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x48, 0x00, 0x4C, 0x00, 0x45, 0x00,
+   0x44, 0x00, 0x42, 0x00, 0x3D, 0x00, 0x3B, 0x00, 0x36, 0x00, 0x34, 0x00,
+   0x2D, 0x00, 0x2D, 0x00, 0x24, 0x00, 0x24, 0x00, 0x1B, 0x00, 0x1A, 0x00,
+   0x13, 0x00, 0x0F, 0x00, 0x09, 0x00, 0x06, 0x00, 0xFE, 0xFF, 0xFD, 0xFF,
+   0xF4, 0xFF, 0xF2, 0xFF, 0xEC, 0xFF, 0xE6, 0xFF, 0xE5, 0xFF, 0xDC, 0xFF,
+   0xDC, 0xFF, 0xD4, 0xFF, 0xD3, 0xFF, 0xCD, 0xFF, 0xCB, 0xFF, 0xC6, 0xFF,
+   0xC4, 0xFF, 0xC1, 0xFF, 0xBD, 0xFF, 0xBD, 0xFF, 0xB8, 0xFF, 0xB8, 0xFF,
+   0xB7, 0xFF, 0xB2, 0xFF, 0xB6, 0xFF, 0xB2, 0xFF, 0xB3, 0xFF, 0xB2, 0xFF,
+   0xB3, 0xFF, 0xB2, 0xFF, 0xB7, 0xFF, 0xB2, 0xFF, 0xB9, 0xFF, 0xB7, 0xFF,
+   0xBA, 0xFF, 0xBE, 0xFF, 0xBD, 0xFF, 0xC4, 0xFF, 0xC4, 0xFF, 0xC8, 0xFF,
+   0xCB, 0xFF, 0xD1, 0xFF, 0xD0, 0xFF, 0xDB, 0xFF, 0xD7, 0xFF, 0xE2, 0xFF,
+   0xE2, 0xFF, 0xEB, 0xFF, 0xEA, 0xFF, 0xF3, 0xFF, 0xF5, 0xFF, 0xFC, 0xFF,
+   0x00, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x15, 0x00, 0x16, 0x00,
+   0x19, 0x00, 0x23, 0x00, 0x20, 0x00, 0x2B, 0x00, 0x2B, 0x00, 0x2D, 0x00,
+   0x35, 0x00, 0x35, 0x00, 0x39, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x40, 0x00,
+   0x45, 0x00, 0x42, 0x00, 0x49, 0x00, 0x45, 0x00, 0x4B, 0x00, 0x47, 0x00,
+   0x4C, 0x00, 0x47, 0x00, 0x4C, 0x00, 0x46, 0x00, 0x4C, 0x00, 0x45, 0x00,
+   0x46, 0x00, 0x46, 0x00, 0x3F, 0x00, 0x45, 0x00, 0x3A, 0x00, 0x3F, 0x00,
+   0x36, 0x00, 0x36, 0x00, 0x33, 0x00, 0x2E, 0x00, 0x2D, 0x00, 0x25, 0x00,
+   0x26, 0x00, 0x1E, 0x00, 0x1C, 0x00, 0x16, 0x00, 0x14, 0x00, 0x0D, 0x00,
+   0x0C, 0x00, 0x03, 0x00, 0x02, 0x00, 0xFC, 0xFF, 0xF7, 0xFF, 0xF5, 0xFF,
+   0xED, 0xFF, 0xEE, 0xFF, 0xE2, 0xFF, 0xE6, 0xFF, 0xDC, 0xFF, 0xDC, 0xFF,
+   0xD8, 0xFF, 0xD1, 0xFF, 0xD2, 0xFF, 0xCC, 0xFF, 0xCA, 0xFF, 0xC9, 0xFF,
+   0xC2, 0xFF, 0xC6, 0xFF, 0xBC, 0xFF, 0xC4, 0xFF, 0xB8, 0xFF, 0xC2, 0xFF,
+   0xB6, 0xFF, 0xBE, 0xFF, 0xB7, 0xFF, 0xBC, 0xFF, 0xB9, 0xFF, 0xBC, 0xFF,
+   0xB9, 0xFF, 0xBE, 0xFF, 0xBC, 0xFF, 0xC0, 0xFF, 0xC0, 0xFF, 0xC2, 0xFF,
+   0xC6, 0xFF, 0xC5, 0xFF, 0xCD, 0xFF, 0xC9, 0xFF, 0xD4, 0xFF, 0xCF, 0xFF,
+   0xDA, 0xFF, 0xD6, 0xFF, 0xE2, 0xFF, 0xDE, 0xFF, 0xE8, 0xFF, 0xE8, 0xFF,
+   0xEF, 0xFF, 0xF1, 0xFF, 0xF7, 0xFF, 0xF9, 0xFF, 0x00, 0x00, 0x02, 0x00,
+   0x08, 0x00, 0x0B, 0x00, 0x10, 0x00, 0x13, 0x00, 0x19, 0x00, 0x1B, 0x00,
+   0x1F, 0x00, 0x25, 0x00, 0x25, 0x00, 0x2B, 0x00, 0x2D, 0x00, 0x30, 0x00,
+   0x34, 0x00, 0x34, 0x00, 0x3A, 0x00, 0x37, 0x00, 0x40, 0x00, 0x3B, 0x00,
+   0x40, 0x00, 0x41, 0x00, 0x40, 0x00, 0x43, 0x00, 0x42, 0x00, 0x43, 0x00,
+   0x42, 0x00, 0x44, 0x00, 0x3E, 0x00, 0x44, 0x00, 0x3D, 0x00, 0x41, 0x00,
+   0x3A, 0x00, 0x3C, 0x00, 0x38, 0x00, 0x37, 0x00, 0x33, 0x00, 0x32, 0x00,
+   0x2E, 0x00, 0x2B, 0x00, 0x28, 0x00, 0x24, 0x00, 0x22, 0x00, 0x1D, 0x00,
+   0x19, 0x00, 0x16, 0x00, 0x12, 0x00, 0x0E, 0x00, 0x09, 0x00, 0x06, 0x00,
+   0x02, 0x00, 0xFD, 0xFF, 0xFA, 0xFF, 0xF6, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF,
+   0xE7, 0xFF, 0xE9, 0xFF, 0xDF, 0xFF, 0xE3, 0xFF, 0xD8, 0xFF, 0xDB, 0xFF,
+   0xD4, 0xFF, 0xD3, 0xFF, 0xD0, 0xFF, 0xCC, 0xFF, 0xCD, 0xFF, 0xC6, 0xFF,
+   0xCB, 0xFF, 0xC2, 0xFF, 0xC6, 0xFF, 0xC2, 0xFF, 0xC1, 0xFF, 0xC3, 0xFF,
+   0xBF, 0xFF, 0xC3, 0xFF, 0xBE, 0xFF, 0xC3, 0xFF, 0xC0, 0xFF, 0xC4, 0xFF,
+   0xC2, 0xFF, 0xC6, 0xFF, 0xC6, 0xFF, 0xC6, 0xFF, 0xCD, 0xFF, 0xC9, 0xFF,
+   0xD2, 0xFF, 0xCE, 0xFF, 0xD5, 0xFF, 0xD9, 0xFF, 0xDD, 0xFF, 0xE2, 0xFF,
+   0xE7, 0xFF, 0xE9, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF5, 0xFF, 0xFA, 0xFF,
+   0xF9, 0xFF, 0x00, 0x00, 0xFD, 0xFF
+};
+
 ////////////////////////////////////////////////////////////
 /// Methods for ProgressDialog
 ////////////////////////////////////////////////////////////
@@ -50,7 +987,7 @@ END_EVENT_TABLE()
 // Constructor
 //
 ProgressDialog::ProgressDialog(const wxString & title, const wxString & message)
-: wxDialog(wxGetTopLevelParent(FindFocus()),
+: wxDialog(wxTheApp->GetTopWindow(),
            wxID_ANY,
            title,
            wxDefaultPosition,
@@ -64,6 +1001,30 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message)
    wxWindow *w;
    wxSize ds;
 
+   SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
+
+   // There's a problem where the focus is not returned to the window that had
+   // it before creating this object.  The reason is not entirely understood
+   // but if the dialog window never gets shown then the focus does not get
+   // returned to the original window.  It seems to have something to do with
+   // wxWindowDisabler as the problem doesn't occur when it isn't created.
+   //
+   // This only seems to be a problem on OSX and GTK.
+   //
+   // This never used to be a problem for us because we didn't actually create
+   // the wxProgressDialog until after the elapsed time reached .5 seconds.
+   // This also meant that the app modal state was not established until .5
+   // seconds had passed.  This left a small window where the user would be able
+   // to interact with the main window and possibly do things like get two
+   // effects running at the same time.
+   //
+   // The resolution (workaround...hackage) seems to be that this dialog MUST
+   // have a parent and that we set the focus back to that parent when we're done.
+   //
+   // Therefore we use whatever wxApp::GetTopWindow() returns as the parent.  The
+   // only time this will be NULL is when Audacity is either starting or stopping.
+   // In either case, it doesn't really matter where focus winds up.
+
    v = new wxBoxSizer(wxVERTICAL);
 
    mMessage = new wxStaticText(this,
@@ -166,17 +1127,17 @@ ProgressDialog::~ProgressDialog()
    {
       Show(false);
 
-      bool bBeepOnCompletion;
-      gPrefs->Read(wxT("/GUI/BeepOnCompletion"), &bBeepOnCompletion, false);
-      if (bBeepOnCompletion)
-      {
-         wxBell();
-      }
+      Beep();
    }
 
    if (mDisable)
    {
       delete mDisable;
+
+   }
+
+   if (GetParent()) {
+      GetParent()->SetFocus();
    }
 }
 
@@ -273,6 +1234,15 @@ ProgressDialog::Update(int value, const wxString & message)
 // Update the time and, optionally, the message
 //
 bool
+ProgressDialog::Update(double current, const wxString & message)
+{
+   return Update((int)(current * 1000), message);
+}
+
+//
+// Update the time and, optionally, the message
+//
+bool
 ProgressDialog::Update(wxULongLong_t current, wxULongLong_t total, const wxString & message)
 {
    return Update((int)(current * 1000 / total), message);
@@ -334,6 +1304,36 @@ ProgressDialog::OnCancel(wxCommandEvent & e)
    mCancel = true;
 }
 
+void
+ProgressDialog::Beep()
+{
+   int after;
+   bool should;
+   wxString name;
+
+   gPrefs->Read(wxT("/GUI/BeepOnCompletion"), &should, false);
+   gPrefs->Read(wxT("/GUI/BeepAfterDuration"), &after, 60);
+   gPrefs->Read(wxT("/GUI/BeepFileName"), &name, wxEmptyString);
+
+   if (should && wxGetLocalTimeMillis().GetValue() - mStartTime > after * 1000)
+   {
+      wxBusyCursor busy;
+      wxSound s;
+
+      if (name.IsEmpty()) {
+         s.Create(sizeof(beep), beep);
+      }
+      else {
+         s.Create(name);
+      }
+
+      if (s.IsOk())
+      {
+         s.Play(wxSOUND_SYNC);
+      }
+   }
+}
+
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
 //
diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h
old mode 100755
new mode 100644
index 6045ca3..e4b5e6d
--- a/src/widgets/ProgressDialog.h
+++ b/src/widgets/ProgressDialog.h
@@ -34,6 +34,7 @@ class AUDACITY_DLL_API ProgressDialog:public wxDialog
    bool Show(bool show = true);
 
    bool Update(int value, const wxString & message = wxEmptyString);
+   bool Update(double current, const wxString & message = wxEmptyString);
    bool Update(double current, double total, const wxString & message = wxEmptyString);
    bool Update(wxULongLong_t current, wxULongLong_t total, const wxString & message = wxEmptyString);
    bool Update(wxLongLong current, wxLongLong total, const wxString & message = wxEmptyString);
@@ -43,6 +44,7 @@ class AUDACITY_DLL_API ProgressDialog:public wxDialog
 
  private:
    void OnCancel(wxCommandEvent & e);
+   void Beep();
 
  private:
    wxGauge *mGauge;
diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index dd2d072..96681a1 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -115,27 +115,21 @@ Ruler::Ruler()
    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;
@@ -150,7 +144,6 @@ Ruler::~Ruler()
       delete [] mUserBits;//JKC
    delete mMinorFont;
    delete mMajorFont;
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    delete mMinorMinorFont;
 
    if (mMajorLabels)
@@ -159,7 +152,6 @@ Ruler::~Ruler()
       delete[] mMinorLabels;
    if (mMinorMinorLabels)
       delete[] mMinorMinorLabels;
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 void Ruler::SetFormat(RulerFormat format)
@@ -261,22 +253,14 @@ void Ruler::SetFlip(bool flip)
    }
 }
 
-#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
@@ -339,17 +323,6 @@ void Ruler::Invalidate()
    else
       mLength = mBottom-mTop;
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-   if (mMajorLabels) {
-      delete [] mMajorLabels;
-      mMajorLabels = NULL;
-   }
-   if (mMinorLabels) {
-      delete [] mMinorLabels;
-      mMinorLabels = NULL;
-   }
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
    if (mBits) {
       delete [] mBits;
       mBits = NULL;
@@ -692,11 +665,7 @@ wxString Ruler::LabelString(double d, bool major)
    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;
@@ -704,10 +673,8 @@ void Ruler::Tick(int pos, double d, bool major)
 
    // 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 )
@@ -716,26 +683,17 @@ void Ruler::Tick(int pos, double d, bool major)
    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);
 
@@ -752,13 +710,7 @@ void Ruler::Tick(int pos, double d, bool major)
          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);
       }
    }
@@ -774,14 +726,8 @@ void Ruler::Tick(int pos, double d, bool major)
          strLeft = mLeft + 5;
          mMaxWidth = max(mMaxWidth, strW + 5);
       }
-      else {
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+      else
          strLeft =-strW-6;
-#else //!EXPERIMENTAL_RULER_AUTOSIZE
-         strLeft = mRight - strW - 6;
-         mMaxWidth = max(mMaxWidth, strW + 6);
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
-      }
    }
 
 
@@ -821,10 +767,8 @@ void Ruler::Tick(int pos, double d, bool major)
    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()
@@ -850,21 +794,10 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
      if (mOrientation == wxHORIZONTAL)
        desiredPixelHeight = mBottom-mTop-5; // height less ticks and 1px gap
      else
-     {
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
          desiredPixelHeight = 12;   // why 12?  10 -> 12 seems to be max/min
-#else
-       desiredPixelHeight = (mRight-mLeft)/2;
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
-     }
 
-#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;
 
@@ -889,11 +822,9 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
         delete mMinorFont;
      mMinorFont = new wxFont(fontSize, wxSWISS, wxNORMAL, wxNORMAL);
 
-#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.
@@ -906,23 +837,18 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
    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;
    mNumMinor = 0;
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    mNumMinorMinor = 0;
    if (mLength!=mLengthOld) {
       if (mMajorLabels)
@@ -936,10 +862,6 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
       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;
@@ -959,23 +881,14 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
       
       // 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
       }
       
       // 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;
@@ -1003,11 +916,7 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
          
          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
          }
       }
          
@@ -1034,23 +943,14 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
          
          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
       }
       
    }
@@ -1077,11 +977,7 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
          {  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;
@@ -1101,11 +997,7 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
             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;
@@ -1125,11 +1017,7 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
                val = decade * f/10;
                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
                }
             }
          }
@@ -1137,7 +1025,6 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
       }
    }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    int displacementx=0, displacementy=0;
    if (!mFlip) {
       if (mOrientation==wxHORIZONTAL) {
@@ -1176,8 +1063,6 @@ void Ruler::Update( Envelope *speedEnv, long minSpeed, long maxSpeed )
    }
    mMaxWidth = mRect.GetWidth ();
    mMaxHeight= mRect.GetHeight();
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
-
    mValid = true;
 }
 
@@ -1217,11 +1102,7 @@ void Ruler::Draw(wxDC& dc, Envelope *speedEnv, long minSpeed, long maxSpeed)
          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
       }
    }
 
@@ -1297,7 +1178,6 @@ void Ruler::Draw(wxDC& dc, Envelope *speedEnv, long minSpeed, long maxSpeed)
                        mMinorLabels[i].ly);
    }
 
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    mDC->SetFont(*mMinorMinorFont);
 
    for(i=0; i<mNumMinorMinor; i++) {
@@ -1331,7 +1211,6 @@ void Ruler::Draw(wxDC& dc, Envelope *speedEnv, long minSpeed, long maxSpeed)
                        mMinorMinorLabels[i].ly);
       }
    }
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 void Ruler::GetMaxSize(wxCoord *width, wxCoord *height)
@@ -1346,18 +1225,10 @@ void Ruler::GetMaxSize(wxCoord *width, wxCoord *height)
    }
 
    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
 }
 
 
@@ -1890,12 +1761,10 @@ void AdornedRulerPanel::GetPlayRegion(double* playRegionStart,
    }
 }
 
-#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.
diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h
index 920c3e1..9d4aa64 100644
--- a/src/widgets/Ruler.h
+++ b/src/widgets/Ruler.h
@@ -81,11 +81,7 @@ class AUDACITY_DLL_API Ruler {
    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
@@ -118,18 +114,12 @@ class AUDACITY_DLL_API Ruler {
    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;
@@ -138,15 +128,11 @@ private:
    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;
@@ -162,12 +148,8 @@ private:
 
    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;
@@ -177,10 +159,8 @@ private:
    Label       *mMajorLabels;
    int          mNumMinor;
    Label       *mMinorLabels;   
-#ifdef EXPERIMENTAL_RULER_AUTOSIZE
    int          mNumMinorMinor;
    Label       *mMinorMinorLabels;   
-#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 
    int          mOrientation;
@@ -248,9 +228,7 @@ public:
    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);
diff --git a/src/widgets/TimeTextCtrl.cpp b/src/widgets/TimeTextCtrl.cpp
index 4f9a736..423ac5f 100644
--- a/src/widgets/TimeTextCtrl.cpp
+++ b/src/widgets/TimeTextCtrl.cpp
@@ -284,100 +284,109 @@ TimeTextCtrl::TimeTextCtrl(wxWindow *parent,
     * 24 hours in a day in your locale */
    BuiltinFormatStrings[2].formatStr = _("0100 days 024 h 060 m 060 s");
    /* i18n-hint: Name of time display format that shows time in hours,
+    * minutes, seconds and hundreths of a second (1/100 second) */
+   BuiltinFormatStrings[3].name = _("hh:mm:ss + hundredths");
+   /* i18n-hint: Format string for displaying time in hours, minutes, seconds
+    * and hundredths of a second. Change the 'h' to the abbreviation for hours,
+    * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds (the
+    * hundredths are shown as decimal seconds) . Don't change the numbers
+    * unless there aren't 60 minutes in an hour in your locale */
+   BuiltinFormatStrings[3].formatStr =_("0100 h 060 m 060.0100 s");
+   /* i18n-hint: Name of time display format that shows time in hours,
     * minutes, seconds and milliseconds (1/1000 second) */
-   BuiltinFormatStrings[3].name = _("hh:mm:ss + milliseconds");
+   BuiltinFormatStrings[4].name = _("hh:mm:ss + milliseconds");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
     * abbreviation for minutes and 's' to the abbreviation for seconds (the
     * milliseconds are shown as decimal seconds) . Don't change the numbers
     * unless there aren't 60 minutes in an hour in your locale */
-   BuiltinFormatStrings[3].formatStr =_("0100 h 060 m 060.01000 s");
+   BuiltinFormatStrings[4].formatStr =_("0100 h 060 m 060.01000 s");
    /* i18n-hint: Name of time display format that shows time in hours,
     * minutes, seconds and samples (at the current project sample rate) */
-   BuiltinFormatStrings[4].name = _("hh:mm:ss + samples");
+   BuiltinFormatStrings[5].name = _("hh:mm:ss + samples");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and samples. Change the 'h' to the abbreviation for hours, 'm' to the
     * abbreviation for minutes, 's' to the abbreviation for seconds and
     * translate samples . Don't change the numbers
     * unless there aren't 60 seconds in a minute in your locale */
-   BuiltinFormatStrings[4].formatStr = _("0100 h 060 m 060 s+.# samples");
+   BuiltinFormatStrings[5].formatStr = _("0100 h 060 m 060 s+.# samples");
    /* i18n-hint: Name of time display format that shows time in samples (at the
     * current project sample rate) */
-   BuiltinFormatStrings[5].name = _("samples");
+   BuiltinFormatStrings[6].name = _("samples");
    /* i18n-hint: Format string for displaying time in samples (lots of samples).
     * Change the ',' to the 1000s separator for your locale, and translate
     * samples. If 1000s aren't a base multiple for your number system, then you
     * can change the numbers to an appropriate one, and put a 0 on the front */
-   BuiltinFormatStrings[5].formatStr = _("01000,01000,01000 samples|#");
+   BuiltinFormatStrings[6].formatStr = _("01000,01000,01000 samples|#");
    /* i18n-hint: Name of time display format that shows time in hours, minutes,
     * seconds and frames at 24 frames per second (commonly used for films) */
-   BuiltinFormatStrings[6].name = _("hh:mm:ss + film frames (24 fps)");
+   BuiltinFormatStrings[7].name = _("hh:mm:ss + film frames (24 fps)");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and frames at 24 frames per second. Change the 'h' to the abbreviation
     * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
     * for seconds and translate 'frames' . Don't change the numbers
     * unless there aren't 60 seconds in a minute in your locale */
-   BuiltinFormatStrings[6].formatStr = _("0100 h 060 m 060 s+.24 frames");
+   BuiltinFormatStrings[7].formatStr = _("0100 h 060 m 060 s+.24 frames");
    /* i18n-hint: Name of time display format that shows time in frames (lots of
     * frames) at 24 frames per second (commonly used for films) */
-   BuiltinFormatStrings[7].name = _("film frames (24 fps)");
+   BuiltinFormatStrings[8].name = _("film frames (24 fps)");
    /* i18n-hint: Format string for displaying time in frames at 24 frames per
     * second. Translate 'frames' and leave the rest alone */
-   BuiltinFormatStrings[7].formatStr = _("01000,01000 frames|24");
+   BuiltinFormatStrings[8].formatStr = _("01000,01000 frames|24");
    /* i18n-hint: Name of time display format that shows time in hours, minutes,
     * seconds and frames at NTSC TV drop-frame rate (used for American /
     * Japananese TV, and very odd) */
-   BuiltinFormatStrings[8].name = _("hh:mm:ss + NTSC drop frames");
+   BuiltinFormatStrings[9].name = _("hh:mm:ss + NTSC drop frames");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and frames with NTSC drop frames. Change the 'h' to the abbreviation
     * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
     * for seconds and translate 'frames'. Leave the |N alone, it's important! */
-   BuiltinFormatStrings[8].formatStr = _("0100 h 060 m 060 s+.30 frames|N");
+   BuiltinFormatStrings[9].formatStr = _("0100 h 060 m 060 s+.30 frames|N");
    /* i18n-hint: Name of time display format that shows time in hours, minutes,
     * seconds and frames at NTSC TV non-drop-frame rate (used for American /
     * Japananese TV, and doesn't quite match wall time */
-   BuiltinFormatStrings[9].name = _("hh:mm:ss + NTSC non-drop frames");
+   BuiltinFormatStrings[10].name = _("hh:mm:ss + NTSC non-drop frames");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and frames with NTSC drop frames. Change the 'h' to the abbreviation
     * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
     * for seconds and translate 'frames'. Leave the | .999000999 alone, 
     * the whole things really is slightly off-speed! */
-   BuiltinFormatStrings[9].formatStr = _("0100 h 060 m 060 s+.030 frames| .999000999");
+   BuiltinFormatStrings[10].formatStr = _("0100 h 060 m 060 s+.030 frames| .999000999");
    /* i18n-hint: Name of time display format that shows time in frames at NTSC
     * TV frame rate (used for American / Japananese TV */
-   BuiltinFormatStrings[10].name = _("NTSC frames");
+   BuiltinFormatStrings[11].name = _("NTSC frames");
    /* i18n-hint: Format string for displaying time in frames with NTSC frames.
     * Translate 'frames' and leave the rest alone. That really is the frame
     * rate! */
-   BuiltinFormatStrings[10].formatStr = _("01000,01000 frames|29.97002997");
+   BuiltinFormatStrings[11].formatStr = _("01000,01000 frames|29.97002997");
    /* i18n-hint: Name of time display format that shows time in hours, minutes,
     * seconds and frames at PAL TV frame rate (used for European TV) */
-   BuiltinFormatStrings[11].name = _("hh:mm:ss + PAL frames (25 fps)");
+   BuiltinFormatStrings[12].name = _("hh:mm:ss + PAL frames (25 fps)");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and frames with PAL TV frames. Change the 'h' to the abbreviation
     * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
     * for seconds and translate 'frames'. Nice simple time code! */
-   BuiltinFormatStrings[11].formatStr = _("0100 h 060 m 060 s+.25 frames");
+   BuiltinFormatStrings[12].formatStr = _("0100 h 060 m 060 s+.25 frames");
    /* i18n-hint: Name of time display format that shows time in frames at PAL
     * TV frame rate (used for European TV */
-   BuiltinFormatStrings[12].name = _("PAL frames (25 fps)");
+   BuiltinFormatStrings[13].name = _("PAL frames (25 fps)");
    /* i18n-hint: Format string for displaying time in frames with NTSC frames.
     * Translate 'frames' and leave the rest alone. */
-   BuiltinFormatStrings[12].formatStr = _("01000,01000 frames|25");
+   BuiltinFormatStrings[13].formatStr = _("01000,01000 frames|25");
    /* i18n-hint: Name of time display format that shows time in hours, minutes,
     * seconds and frames at CD Audio frame rate (75 frames per second) */
-   BuiltinFormatStrings[13].name = _("hh:mm:ss + CDDA frames (75 fps)");
+   BuiltinFormatStrings[14].name = _("hh:mm:ss + CDDA frames (75 fps)");
    /* i18n-hint: Format string for displaying time in hours, minutes, seconds
     * and frames with CD Audio frames. Change the 'h' to the abbreviation
     * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
     * for seconds and translate 'frames'. */
-   BuiltinFormatStrings[13].formatStr = _("0100 h 060 m 060 s+.75 frames");
+   BuiltinFormatStrings[14].formatStr = _("0100 h 060 m 060 s+.75 frames");
    /* i18n-hint: Name of time display format that shows time in frames at CD
     * Audio frame rate (75 frames per second) */
-   BuiltinFormatStrings[14].name = _("CDDA frames (75 fps)");
+   BuiltinFormatStrings[15].name = _("CDDA frames (75 fps)");
    /* i18n-hint: Format string for displaying time in frames with CD Audio
     * frames. Translate 'frames' and leave the rest alone */
-   BuiltinFormatStrings[14].formatStr = _("01000,01000 frames|75");
+   BuiltinFormatStrings[15].formatStr = _("01000,01000 frames|75");
 
    mDigitBoxW = 10;
    mDigitBoxH = 16;
@@ -402,6 +411,7 @@ TimeTextCtrl::TimeTextCtrl(wxWindow *parent,
    }
 
 #if wxUSE_ACCESSIBILITY
+   SetLabel(wxT(""));
    SetName(wxT(""));
    SetAccessible(new TimeTextCtrlAx(this));
 #endif
diff --git a/src/widgets/TimeTextCtrl.h b/src/widgets/TimeTextCtrl.h
index c22b885..66910c7 100644
--- a/src/widgets/TimeTextCtrl.h
+++ b/src/widgets/TimeTextCtrl.h
@@ -112,7 +112,7 @@ private:
     *  needed to create that format output. This is used for the pop-up
     *  list of formats to choose from in the control. Note that the size will
     *  need adjusting if new time formats are added */
-   BuiltinFormatString BuiltinFormatStrings[15];
+   BuiltinFormatString BuiltinFormatStrings[16];
    double         mTimeValue;
    double         mSampleRate;
    wxString       mFormatString;
diff --git a/src/widgets/treebook.cpp b/src/widgets/treebook.cpp
deleted file mode 100644
index fc91491..0000000
--- a/src/widgets/treebook.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-///////////////////////////////////////////////////////////////////////////// 
-// Name:        treebook.cpp 
-// Purpose:      
-// Author:      Hartmut Seichter, Troels K 
-// Modified by: James Crook
-// Created:     2005/06/21 
-// License:     wxWindows license 
-///////////////////////////////////////////////////////////////////////////// 
-
-#include <wx/version.h>
-
-#if !wxCHECK_VERSION(2,7,0)
-
-//
-// For wxWidgets 2.6.x, use our backported version of wxTreebook
-//
-
-#include "wx/listctrl.h" 
-#include "wx/statline.h" 
-#include "wx/listbook.h"  // wxListbookEvent 
-#include "treebook.h" 
-
-class wxTreebookItemData : public wxTreeItemData 
-{ 
-protected: 
-    int m_page; 
-public:    
-    wxTreebookItemData(int nPage) : wxTreeItemData(), m_page(nPage) { } 
-    int GetPage(void) const { return m_page; } 
-}; 
-
-// ---------------------------------------------------------------------------- 
-// constants 
-// ---------------------------------------------------------------------------- 
-
-// margin between the list and the page, should be bigger than wxStaticLine 
-// size 
-const wxCoord MARGIN = 5; 
-
-// ---------------------------------------------------------------------------- 
-// various wxWidgets macros 
-// ---------------------------------------------------------------------------- 
-
-// check that the page index is valid 
-#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) 
-
-// ---------------------------------------------------------------------------- 
-// event table 
-// ---------------------------------------------------------------------------- 
-
-IMPLEMENT_DYNAMIC_CLASS(wxTreebook, wxControl) 
-
-const int wxID_TREEBOOKCTRL = wxNewId(); 
-
-BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase) 
-    EVT_SIZE(wxTreebook::OnSize) 
-    EVT_TREE_SEL_CHANGED(wxID_TREEBOOKCTRL, wxTreebook::OnListSelected) 
-
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxTreebook)
-END_EVENT_TABLE() 
-
-// ============================================================================ 
-// wxTreebook implementation 
-// ============================================================================ 
-#if wxCHECK_VERSION(2,7,0)
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook, wxWindow)
-#else
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook)
-#endif
-
-// ---------------------------------------------------------------------------- 
-// wxTreebook creation 
-// ---------------------------------------------------------------------------- 
-
-void wxTreebook::Init() 
-{ 
-    m_list = NULL; 
-#if wxUSE_LINE_IN_LISTBOOK 
-    m_line = NULL; 
-#endif // wxUSE_LINE_IN_LISTBOOK 
-    m_selection = wxNOT_FOUND; 
-    m_container.SetContainerWindow(this);
-} 
-
-bool 
-wxTreebook::Create(wxWindow *parent, 
-                   wxWindowID id, 
-                   const wxPoint& pos, 
-                   const wxSize& size, 
-                   long style, 
-                   const wxString& name) 
-{ 
-    if ( (style & wxLB_ALIGN_MASK) == wxLB_DEFAULT ) 
-    { 
-#ifdef __WXMAC__ 
-        style |= wxLB_TOP; 
-#else // !__WXMAC__ 
-        style |= wxLB_LEFT; 
-#endif // __WXMAC__/!__WXMAC__ 
-    } 
-
-    // no border for this control, it doesn't look nice together with 
-    // wxListCtrl border 
-    style &= ~wxBORDER_MASK; 
-    style |= wxBORDER_NONE; 
-
-    if ( !wxControl::Create(parent, id, pos, size, style, 
-                            wxDefaultValidator, name) ) 
-        return false; 
-
-    m_list = new wxTreeCtrl(this,wxID_TREEBOOKCTRL, 
-        wxDefaultPosition, 
-        wxDefaultSize, 
-//        wxTR_HIDE_ROOT | wxTR_SINGLE /*| wxTR_HIDE_ROOT |  wxTR_LINES_AT_ROOT */| wxTR_HAS_BUTTONS); 
-        wxTR_HIDE_ROOT | wxTR_SINGLE | wxTR_NO_LINES | wxTR_NO_BUTTONS );
-
-    GetTreeCtrl()->SetIndent(0);
-    GetTreeCtrl()->SetSpacing(2);
-    GetTreeCtrl()->AddRoot(name); 
-
-#if wxUSE_LINE_IN_LISTBOOK 
-    m_line = new wxStaticLine 
-                 ( 
-                    this, 
-                    wxID_ANY, 
-                    wxDefaultPosition, 
-                    wxDefaultSize, 
-                    IsVertical() ? wxLI_HORIZONTAL : wxLI_VERTICAL 
-                 ); 
-#endif // wxUSE_LINE_IN_LISTBOOK 
-
-#ifdef __WXMSW__ 
-    // On XP with themes enabled the GetViewRect used in GetListSize to 
-    // determine the space needed for the list view will incorrectly return 
-    // (0,0,0,0) the first time.  So send a pending event so OnSize will be 
-    // called again after the window is ready to go.  Technically we don't 
-    // need to do this on non-XP windows, but if things are already sized 
-    // correctly then nothing changes and so there is no harm. 
-    wxSizeEvent evt; 
-    GetEventHandler()->AddPendingEvent(evt); 
-#endif 
-    return true; 
-} 
-
-// ---------------------------------------------------------------------------- 
-// wxTreebook geometry management 
-// ---------------------------------------------------------------------------- 
-wxSize wxTreebook::GetListSize() const 
-{ 
-    const wxSize sizeClient = GetClientSize(), 
-                 sizeList = m_list->/*GetViewRect().*/GetSize(); 
-    wxSize size; 
-    if ( IsVertical() ) 
-    { 
-        size.x = sizeClient.x; 
-        size.y = sizeList.y; 
-    } 
-    else // left/right aligned 
-    { 
-        size.x = sizeList.x; 
-        size.y = sizeClient.y; 
-    } 
-    return size; 
-} 
-
-wxRect wxTreebook::GetPageRect() const 
-{ 
-    const wxSize sizeList = m_list->GetSize(); 
-
-    wxPoint pt; 
-    wxRect rectPage(pt, GetClientSize()); 
-    switch ( GetWindowStyle() & wxLB_ALIGN_MASK ) 
-    { 
-        default: 
-            wxFAIL_MSG( _T("unexpected wxTreebook alignment") ); 
-            // fall through 
-
-        case wxLB_TOP: 
-            rectPage.y = sizeList.y + MARGIN; 
-            // fall through 
-
-        case wxLB_BOTTOM: 
-            rectPage.height -= sizeList.y + MARGIN; 
-            break; 
-
-        case wxLB_LEFT: 
-            rectPage.x = sizeList.x + MARGIN; 
-            // fall through 
-
-        case wxLB_RIGHT: 
-            rectPage.width -= sizeList.x + MARGIN; 
-            break; 
-    } 
-    return rectPage; 
-} 
-
-void wxTreebook::OnSize(wxSizeEvent& event) 
-{ 
-    event.Skip(); 
-    if ( !m_list ) 
-    { 
-        // we're not fully created yet 
-        return; 
-    } 
-    // resize the list control and the page area to fit inside our new size 
-    const wxSize sizeClient = GetClientSize(), 
-                 sizeList = GetListSize(); 
-    wxPoint posList; 
-    switch ( GetWindowStyle() & wxLB_ALIGN_MASK ) 
-    { 
-        default: 
-            wxFAIL_MSG( _T("unexpected wxTreebook alignment") ); 
-            // fall through 
-
-        case wxLB_TOP: 
-        case wxLB_LEFT: 
-            // posList is already ok 
-            break; 
-
-        case wxLB_BOTTOM: 
-            posList.y = sizeClient.y - sizeList.y; 
-            break; 
-
-        case wxLB_RIGHT: 
-            posList.x = sizeClient.x - sizeList.x; 
-            break; 
-    } 
-
-    m_list->Move(posList.x, posList.y);
-   // JKC Reduce x-size slightly to prevent drift when resizing.
-   // The constant of 4 is needed on WindowsXP, 
-   //    wxWidgets 2.6.1 (reported JKC)
-   // A constant of 0 should be used on Windows XP and on Mac with 
-   //    wxWidgets 2.6.3 (reportaed LL)
-   // 
-   // This is a temporary fix.  We plan to use the real wxTreebook when
-   // wxWidgets 2.7.x is ready, so it is not worth investing huge time
-   // in patching this fully.
-
-   // If you see the tree shrinking in width, you need a smaller iBorder.
-   // If you see the tree increasing in width, you need a larger iBorder.
-
-   // #if wxCHECK_VERSION(2, 6, 2)
-   //    const int iBorder = 0;
-   // #else 
-   //    const int iBorder = 4;
-   // #endif
-
-   // m_list->SetClientSize(sizeList.x-iBorder, sizeList.y); 
-    m_list->SetSize(sizeList.x, sizeList.y); 
-
-#if wxUSE_LINE_IN_LISTBOOK 
-    if ( m_line ) 
-    { 
-        wxRect rectLine(sizeClient); 
-        switch ( GetWindowStyle() & wxLB_ALIGN_MASK ) 
-        { 
-            case wxLB_TOP: 
-                rectLine.y = sizeList.y + 1; 
-                rectLine.height = MARGIN - 2; 
-                break; 
-
-            case wxLB_BOTTOM: 
-                rectLine.height = MARGIN - 2; 
-                rectLine.y = sizeClient.y - sizeList.y - rectLine.height; 
-                break; 
-
-            case wxLB_LEFT: 
-                rectLine.x = sizeList.x + 1; 
-                rectLine.width = MARGIN - 2; 
-                break; 
-
-            case wxLB_RIGHT: 
-                rectLine.width = MARGIN - 2; 
-                rectLine.x = sizeClient.x - sizeList.x - rectLine.width; 
-                break; 
-        } 
-
-        m_line->SetSize(rectLine); 
-    } 
-#endif // wxUSE_LINE_IN_LISTBOOK 
-    // resize the currently shown page 
-    if (m_selection != wxNOT_FOUND) 
-    { 
-        wxWindow *page = m_pages[m_selection]; 
-        wxCHECK_RET( page, _T("NULL page in wxTreebook?") ); 
-        page->SetSize(GetPageRect()); 
-    } 
-} 
-
-wxSize wxTreebook::CalcSizeFromPage(const wxSize& sizePage) const 
-{ 
-    // we need to add the size of the list control and the margin 
-    const wxSize sizeList = GetListSize(); 
-
-    wxSize size = sizePage; 
-    if ( IsVertical() ) 
-    { 
-        size.y += sizeList.y + MARGIN; 
-    } 
-    else // left/right aligned 
-    { 
-        size.x += sizeList.x + MARGIN; 
-    } 
-
-    return size; 
-} 
-
-// ---------------------------------------------------------------------------- 
-// accessing the pages 
-// ---------------------------------------------------------------------------- 
-bool wxTreebook::SetPageText(size_t n, const wxString& strText) 
-{ 
-    m_list->SetItemText(FindItemByPageNum(n), strText); 
-
-    return true; 
-} 
-
-wxString wxTreebook::GetPageText(size_t n) const 
-{ 
-    return m_list->GetItemText(FindItemByPageNum(n)); 
-} 
-
-// ---------------------------------------------------------------------------- 
-// selection 
-// ---------------------------------------------------------------------------- 
-int wxTreebook::GetSelection() const 
-{ 
-    return m_selection; 
-} 
-
-int wxTreebook::SetSelection(size_t n) 
-{ 
-    wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND, 
-                 wxT("invalid page index in wxTreebook::SetSelection()") ); 
-
-    const int oldSel = m_selection; 
-
-    if ( int(n) != m_selection ) 
-    { 
-        wxListbookEvent event(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId); 
-        event.SetSelection(n); 
-        event.SetOldSelection(m_selection); 
-        event.SetEventObject(this); 
-        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) 
-        { 
-            if ( m_selection != wxNOT_FOUND ) 
-                m_pages[m_selection]->Hide(); 
-
-            wxWindow *page = m_pages[n]; 
-            page->SetSize(GetPageRect()); 
-            page->Show(); 
-
-            // change m_selection now to ignore the selection change event 
-            m_selection = n; 
-            SelectByPageNum(n); 
-
-            // program allows the page change 
-            event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED); 
-            (void)GetEventHandler()->ProcessEvent(event); 
-        } 
-    } 
-    return oldSel; 
-} 
-
-// ---------------------------------------------------------------------------- 
-// adding/removing the pages 
-// ---------------------------------------------------------------------------- 
-wxTreeItemId 
-wxTreebook::InsertPage(const wxTreeItemId& parent, 
-                       size_t n, 
-                       wxWindow *page, 
-                       const wxString& text, 
-                       bool bSelect, 
-                       int imageId) 
-{ 
-    wxTreeItemId _id; 
-    if (wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) 
-    { 
-       _id = GetTreeCtrl()->AppendItem(parent, text, imageId, imageId, new wxTreebookItemData(n)); 
-       if (_id.IsOk()) 
-       { 
-          if (parent != GetRootItem()) GetTreeCtrl()->Expand(parent); 
-          // if the inserted page is before the selected one, we must update the 
-          // index of the selected page 
-          if ( int(n) <= m_selection ) 
-          { 
-              // one extra page added 
-              m_selection++; 
-              SelectByPageNum(m_selection); 
-          } 
-          // some page should be selected: either this one or the first one if there 
-          // is still no selection 
-          int selNew = -1; 
-          if ( bSelect ) 
-              selNew = n; 
-          else if ( m_selection == -1 ) selNew = 0; 
-
-          if ( selNew != m_selection ) 
-              page->Hide(); 
-
-          //if ( selNew != -1 ) SetSelection(selNew); // this activates TransferFromWindow! it's too early! 
-
-          InvalidateBestSize(); 
-       } 
-    } 
-    return _id; 
-} 
-
-wxWindow *wxTreebook::DoRemovePage(size_t page) 
-{ 
-    const int page_count = GetPageCount(); 
-    wxWindow *win = wxBookCtrlBase::DoRemovePage(page); 
-    if ( win ) 
-    { 
-        m_list->Delete(FindItemByPageNum(page)); 
-
-        if (m_selection >= (int)page) 
-        { 
-            // force new sel valid if possible 
-            int sel = m_selection - 1; 
-            if (page_count == 1) 
-                sel = wxNOT_FOUND; 
-            else if ((page_count == 2) || (sel == -1)) 
-                sel = 0; 
-
-            // force sel invalid if deleting current page - don't try to hide it 
-            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1; 
-
-            if ((sel != wxNOT_FOUND) && (sel != m_selection)) 
-                SetSelection(sel); 
-        } 
-    } 
-    return win; 
-} 
-
-bool wxTreebook::DeleteAllPages() 
-{ 
-    m_list->DeleteAllItems(); 
-    return wxBookCtrlBase::DeleteAllPages(); 
-} 
-
-// ---------------------------------------------------------------------------- 
-// wxTreebook events 
-// ---------------------------------------------------------------------------- 
-
-void wxTreebook::OnListSelected(wxTreeEvent& event) 
-{ 
-   int selNew = wxNOT_FOUND; 
-
-    wxTreeItemId _itemId = event.GetItem(); 
-    if (_itemId) 
-    { 
-       wxTreebookItemData *_item = (wxTreebookItemData *)GetTreeCtrl()->GetItemData(_itemId); 
-       if (_item)  selNew = _item->GetPage(); 
-    } 
-
-    if ( (selNew == wxNOT_FOUND) || (selNew == m_selection) ) 
-    { 
-        // this event can only come from our own Select(m_selection) below 
-        // which we call when the page change is vetoed, so we should simply 
-        // ignore it 
-        return; 
-    } 
-
-    SetSelection(selNew); 
-
-    // change wasn't allowed, return to previous state 
-    if (m_selection != selNew) 
-    { 
-       SelectByPageNum(m_selection); 
-    } 
-} 
-
-bool wxTreebook::FindItemRecursively(const wxTreeItemId& idParent, 
-                                     wxTreeItemIdValue* cookie, 
-                                     int nPage, 
-                                     wxTreeItemId* foundid) const
-{ 
-   wxTreeItemIdValue temp; 
-   wxTreeItemId id = cookie ? GetTreeCtrl()->GetNextChild(idParent, *cookie) : GetTreeCtrl()->GetFirstChild(idParent, temp); 
-   if (cookie == NULL) cookie = &temp; 
-
-    if(id <= 0) return FALSE; 
-
-    // do something with the thingiee here 
-    wxTreebookItemData *_item = (wxTreebookItemData *)GetTreeCtrl()->GetItemData(id); 
-
-    if (nPage == _item->GetPage()) 
-    { 
-        *foundid = id; 
-        return TRUE; 
-    } 
-    if (GetTreeCtrl()->ItemHasChildren(id)) 
-    {        
-        if (FindItemRecursively(id,NULL,nPage,foundid)) return TRUE;    
-    } 
-    if (FindItemRecursively(idParent, cookie, nPage, foundid)) return TRUE; 
-    return FALSE; 
-} 
-
-wxTreeItemId wxTreebook::FindItemByPageNum(const wxTreeItemId& parent,int nPage) const 
-{    
-    wxTreeItemId id; 
-    FindItemRecursively(parent,NULL,nPage,&id); 
-    return id;    
-} 
-
-void wxTreebook::SelectByPageNum(int nPage) 
-{ 
-    GetTreeCtrl()->SelectItem(FindItemByPageNum(nPage)); 
-} 
-
-int wxTreebook::GetPageImage(size_t WXUNUSED(n)) const 
-{ 
-    wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") ); 
-    return -1; 
-} 
-
-bool wxTreebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) 
-{ 
-    //return m_list->SetItemImage(n, imageId); 
-   return false; 
-}
-
-#endif // wxCHECK_VERSION(2,7,0)
diff --git a/src/widgets/treebook.h b/src/widgets/treebook.h
deleted file mode 100644
index b4817ae..0000000
--- a/src/widgets/treebook.h
+++ /dev/null
@@ -1,149 +0,0 @@
-///////////////////////////////////////////////////////////////////////////// 
-// Name:        treebook.h 
-// Purpose:      
-// Author:      Hartmut Seichter, Troels K 
-// Modified by: 
-// Created:     2005/06/21 
-// License:     wxWindows license 
-///////////////////////////////////////////////////////////////////////////// 
-
-#include <wx/version.h>
-
-#if wxCHECK_VERSION(2,7,0)
-
-// wxWidgets 2.7.x and greater does have wxTreebook
-#include <wx/treebook.h>
-
-#else
-
-#ifndef __TREEBOOK_H__ 
-#define __TREEBOOK_H__ 
-
-#include "wx/treectrl.h" 
-#include "wx/bookctrl.h"
-#include "wx/containr.h"
-
-// ---------------------------------------------------------------------------- 
-// wxTreebook 
-// ---------------------------------------------------------------------------- 
-
-class wxTreebook : public wxBookCtrlBase 
-{ 
-public: 
-    wxTreebook() : wxBookCtrlBase() { Init(); } 
-    wxTreebook(wxWindow *parent, 
-               wxWindowID id, 
-               const wxPoint& pos = wxDefaultPosition, 
-               const wxSize& size = wxDefaultSize, 
-               long style = wxLB_LEFT | wxTAB_TRAVERSAL, 
-               const wxString& name = wxEmptyString) : wxBookCtrlBase() 
-    { 
-        Init(); 
-
-        (void)Create(parent, id, pos, size, style, name); 
-    } 
-
-    // quasi ctor 
-    bool Create(wxWindow *parent, 
-                wxWindowID id, 
-                const wxPoint& pos = wxDefaultPosition, 
-                const wxSize& size = wxDefaultSize, 
-                long style = wxLB_LEFT | wxTAB_TRAVERSAL, 
-                const wxString& name = wxEmptyString); 
-
-    wxTreeItemId InsertPage(const wxTreeItemId& parent, 
-                            size_t n, 
-                            wxWindow *page, 
-                            const wxString& text, 
-                            bool bSelect = false, 
-                            int imageId = -1); 
-
-    wxTreeItemId AddPage(const wxTreeItemId& parent, wxWindow *page, 
-                         const wxString& text, 
-                         bool bSelect = false, 
-                         int imageId = -1) 
-    { 
-        InvalidateBestSize(); 
-        return InsertPage(parent, GetPageCount(), page, text, bSelect, imageId); 
-    } 
-    virtual bool AddPage(wxWindow *page, 
-                         const wxString& text, 
-                         bool bSelect = false, 
-                         int imageId = -1) 
-    { 
-        InvalidateBestSize(); 
-        return InsertPage(GetRootItem(), GetPageCount(), page, text, bSelect, imageId).IsOk(); 
-    } 
-
-    virtual int GetSelection() const; 
-    virtual bool SetPageText(size_t n, const wxString& strText); 
-    virtual wxString GetPageText(size_t n) const; 
-    virtual int GetPageImage(size_t n) const; 
-    virtual bool SetPageImage(size_t n, int imageId); 
-    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; 
-    virtual bool InsertPage(size_t n, 
-                            wxWindow *page, 
-                            const wxString& text, 
-                            bool bSelect = false, 
-                            int imageId = -1) 
-    { 
-       return InsertPage(GetRootItem(), n, page, text, bSelect, imageId).IsOk(); 
-    } 
-    virtual int SetSelection(size_t n);
-    int ChangeSelection(size_t n) { return SetSelection(n); };
-
-    // returns true if we have wxLB_TOP or wxLB_BOTTOM style 
-    bool IsVertical() const { return HasFlag(wxLB_BOTTOM | wxLB_TOP); } 
-
-    virtual bool DeleteAllPages(); 
-
-          wxTreeCtrl* GetTreeCtrl()       { return m_list; } 
-    const wxTreeCtrl* GetTreeCtrl() const { return m_list; } 
-
-protected: 
-    virtual wxWindow *DoRemovePage(size_t page); 
-
-    // get the size which the list control should have 
-    wxSize GetListSize() const; 
-
-    // get the page area 
-    wxRect GetPageRect() const; 
-
-    // event handlers 
-    void OnSize(wxSizeEvent& event); 
-    void OnListSelected(wxTreeEvent& event); 
-
-    // the list control we use for showing the pages index 
-    wxTreeCtrl *m_list; 
-
-#if wxUSE_LINE_IN_LISTBOOK 
-    // the line separating it from the page area 
-    wxStaticLine *m_line; 
-#endif // wxUSE_LINE_IN_LISTBOOK 
-
-    // the currently selected page or wxNOT_FOUND if none 
-    int m_selection; 
-public: 
-    wxTreeItemId GetRootItem() const { return GetTreeCtrl()->GetRootItem(); } 
-
-    bool FindItemRecursively(const wxTreeItemId& idParent, 
-                                     wxTreeItemIdValue* cookie, 
-                                     int nPage, 
-                                     wxTreeItemId* foundid) const; 
-    wxTreeItemId FindItemByPageNum(const wxTreeItemId& parent,int nPage) const; 
-    wxTreeItemId FindItemByPageNum(int nPage) const { return FindItemByPageNum(GetRootItem(), nPage); } 
-    void SelectByPageNum(int nPage); 
-
-protected: 
-    // common part of all constructors 
-    void Init(); 
-
-    DECLARE_EVENT_TABLE() 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook) 
-
-    WX_DECLARE_CONTROL_CONTAINER();
-}; 
-
-#endif // __TREEBOOK_H__ 
-
-#endif // wxCHECK_VERSION(2,7,0)
diff --git a/win/Projects/Audacity/Audacity.vcproj b/win/Projects/Audacity/Audacity.vcproj
index 1517be5..3d6aa29 100644
--- a/win/Projects/Audacity/Audacity.vcproj
+++ b/win/Projects/Audacity/Audacity.vcproj
@@ -39,8 +39,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswu&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;..\..\..\lib-src\FileDialog;..\..\..\lib-src\expat;..\..\..\lib-src\ffmpeg\win32;..\..\..\lib-src\ffmpeg;..\..\..\lib-src\lib-widget-extra;..\..\..\lib-src\libflac\include;..\..\..\lib-src\libid3tag;..\..\..\lib-src\liblrdf;..\..\..\lib-src\libmad;..\..\..\lib-src\libnyquist\nyx;..\..\..\lib-src\libogg\include;..\..\..\lib-src\libresample\include;..\..\..\lib-src\libsamplerate\src;..\..\..\lib-src\libscorealign;..\..\..\lib-src\libsndfile\Win32;..\..\..\lib-src\libsndfile\src;..\..\..\lib-src\libvamp;..\..\..\lib-src\libvorbis\include;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portmixer\include;..\..\..\lib-src\portsmf;..\..\..\lib-src\redland\raptor\src;..\..\..\lib-src\slv2;..\..\..\lib-src\soundtouch\include;..\..\..\lib-src\twolame\libtwolame;"
-				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;WXUSINGDLL;__WXMSW__;NDEBUG;WIN32;STRICT"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswu&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;&quot;..\..\..\lib-src\FileDialog&quot;;&quot;..\..\..\lib-src\expat&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;;&quot;..\..\..\lib-src\ffmpeg&quot;;&quot;..\..\..\lib-src\lib-widget-extra&quot;;&quot;..\..\..\lib-src\libflac\include&quot;;&quot;..\..\..\lib-src\libid3tag&quot;;&quot;..\..\..\lib-src\liblrdf&quot;;&quot;..\..\..\lib-src\libmad&quot;;&quot;..\..\..\lib-src\libnyquist\nyx&quot;;&quot;..\..\..\lib-src\libogg\include&quot;;&quot;..\..\..\lib-src\libresample\include&quot;;&quot;..\..\..\lib-src\libsamplerate\src&quot;;&quot;..\..\..\lib-src\libscorealign&quot;;&quot;..\..\..\lib-src\libsndfile\Win32&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\libvamp&quot;;&quot;..\..\..\lib-src\libvorbis\include&quot;;&quot;..\..\..\lib-src\portaudio-v19\include&quot;;&quot;..\..\..\lib-src\portmixer\include&quot;;&quot;..\..\..\lib-src\portsmf&quot;;&quot;..\..\..\lib-src\redland\raptor\src&quot;;&quot;..\..\..\lib-src\slv2&quot;;&quot;..\..\..\lib-src\sbsms\include&quot;;&quot;..\..\..\lib-src\soundtouch\include&quot;;&quot;..\..\..\lib-src\twolame\libtwolame&quot;"
+				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;NDEBUG;WIN32;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -122,8 +122,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswud&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;..\..\..\lib-src\FileDialog;..\..\..\lib-src\expat;..\..\..\lib-src\ffmpeg\win32;..\..\..\lib-src\ffmpeg;..\..\..\lib-src\lib-widget-extra;..\..\..\lib-src\libflac\include;..\..\..\lib-src\libid3tag;..\..\..\lib-src\liblrdf;..\..\..\lib-src\libmad;..\..\..\lib-src\libnyquist\nyx;..\..\..\lib-src\libogg\include;..\..\..\lib-src\libresample\include;..\..\..\lib-src\libsamplerate\src;..\..\..\lib-src\libscorealign;..\..\..\lib-src\libsndfile\Win32;..\..\..\lib-src\libsndfile\src;..\..\..\lib-src\libvamp;..\..\..\lib-src\libvorbis\include;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portmixer\include;..\..\..\lib-src\portsmf;..\..\..\lib-src\redland\raptor\src;..\..\..\lib-src\slv2;..\..\..\lib-src\soundtouch\include;..\..\..\lib-src\twolame\libtwolame;"
-				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswud&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;&quot;..\..\..\lib-src\FileDialog&quot;;&quot;..\..\..\lib-src\expat&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;;&quot;..\..\..\lib-src\ffmpeg&quot;;&quot;..\..\..\lib-src\lib-widget-extra&quot;;&quot;..\..\..\lib-src\libflac\include&quot;;&quot;..\..\..\lib-src\libid3tag&quot;;&quot;..\..\..\lib-src\liblrdf&quot;;&quot;..\..\..\lib-src\libmad&quot;;&quot;..\..\..\lib-src\libnyquist\nyx&quot;;&quot;..\..\..\lib-src\libogg\include&quot;;&quot;..\..\..\lib-src\libresample\include&quot;;&quot;..\..\..\lib-src\libsamplerate\src&quot;;&quot;..\..\..\lib-src\libscorealign&quot;;&quot;..\..\..\lib-src\libsndfile\Win32&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\libvamp&quot;;&quot;..\..\..\lib-src\libvorbis\include&quot;;&quot;..\..\..\lib-src\portaudio-v19\include&quot;;&quot;..\..\..\lib-src\portmixer\include&quot;;&quot;..\..\..\lib-src\portsmf&quot;;&quot;..\..\..\lib-src\redland\raptor\src&quot;;&quot;..\..\..\lib-src\slv2&quot;;&quot;..\..\..\lib-src\sbsms\include&quot;;&quot;..\..\..\lib-src\soundtouch\include&quot;;&quot;..\..\..\lib-src\twolame\libtwolame&quot;"
+				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT"
 				StringPooling="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -210,8 +210,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswd&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;..\..\..\lib-src\FileDialog;..\..\..\lib-src\expat;..\..\..\lib-src\ffmpeg\win32;..\..\..\lib-src\ffmpeg;..\..\..\lib-src\lib-widget-extra;..\..\..\lib-src\libflac\include;..\..\..\lib-src\libid3tag;..\..\..\lib-src\liblrdf;..\..\..\lib-src\libmad;..\..\..\lib-src\libnyquist\nyx;..\..\..\lib-src\libogg\include;..\..\..\lib-src\libresample\include;..\..\..\lib-src\libsamplerate\src;..\..\..\lib-src\libscorealign;..\..\..\lib-src\libsndfile\Win32;..\..\..\lib-src\libsndfile\src;..\..\..\lib-src\libvamp;..\..\..\lib-src\libvorbis\include;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portmixer\include;..\..\..\lib-src\portsmf;..\..\..\lib-src\redland\raptor\src;..\..\..\lib-src\slv2;..\..\..\lib-src\soundtouch\include;..\..\..\lib-src\twolame\libtwolame;"
-				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\mswd&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;&quot;..\..\..\lib-src\FileDialog&quot;;&quot;..\..\..\lib-src\expat&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;;&quot;..\..\..\lib-src\ffmpeg&quot;;&quot;..\..\..\lib-src\lib-widget-extra&quot;;&quot;..\..\..\lib-src\libflac\include&quot;;&quot;..\..\..\lib-src\libid3tag&quot;;&quot;..\..\..\lib-src\liblrdf&quot;;&quot;..\..\..\lib-src\libmad&quot;;&quot;..\..\..\lib-src\libnyquist\nyx&quot;;&quot;..\..\..\lib-src\libogg\include&quot;;&quot;..\..\..\lib-src\libresample\include&quot;;&quot;..\..\..\lib-src\libsamplerate\src&quot;;&quot;..\..\..\lib-src\libscorealign&quot;;&quot;..\..\..\lib-src\libsndfile\Win32&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\libvamp&quot;;&quot;..\..\..\lib-src\libvorbis\include&quot;;&quot;..\..\..\lib-src\portaudio-v19\include&quot;;&quot;..\..\..\lib-src\portmixer\include&quot;;&quot;..\..\..\lib-src\portsmf&quot;;&quot;..\..\..\lib-src\redland\raptor\src&quot;;&quot;..\..\..\lib-src\slv2&quot;;&quot;..\..\..\lib-src\sbsms\include&quot;;&quot;..\..\..\lib-src\soundtouch\include&quot;;&quot;..\..\..\lib-src\twolame\libtwolame&quot;"
+				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT"
 				StringPooling="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -297,8 +297,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\msw&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;..\..\..\lib-src\FileDialog;..\..\..\lib-src\expat;..\..\..\lib-src\ffmpeg\win32;..\..\..\lib-src\ffmpeg;..\..\..\lib-src\lib-widget-extra;..\..\..\lib-src\libflac\include;..\..\..\lib-src\libid3tag;..\..\..\lib-src\liblrdf;..\..\..\lib-src\libmad;..\..\..\lib-src\libnyquist\nyx;..\..\..\lib-src\libogg\include;..\..\..\lib-src\libresample\include;..\..\..\lib-src\libsamplerate\src;..\..\..\lib-src\libscorealign;..\..\..\lib-src\libsndfile\Win32;..\..\..\lib-src\libsndfile\src;..\..\..\lib-src\libvamp;..\..\..\lib-src\libvorbis\include;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portmixer\include;..\..\..\lib-src\portsmf;..\..\..\lib-src\redland\raptor\src;..\..\..\lib-src\slv2;..\..\..\lib-src\soundtouch\include;..\..\..\lib-src\twolame\libtwolame;"
-				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;WXUSINGDLL;__WXMSW__;NDEBUG;WIN32;STRICT"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\lib\vc_dll\msw&quot;;&quot;$(WXWIN)\include&quot;;..\..;..\..\..\src\include\win32;..\..\..\src\include;&quot;..\..\..\lib-src\FileDialog&quot;;&quot;..\..\..\lib-src\expat&quot;;&quot;..\..\..\lib-src\ffmpeg\win32&quot;;&quot;..\..\..\lib-src\ffmpeg&quot;;&quot;..\..\..\lib-src\lib-widget-extra&quot;;&quot;..\..\..\lib-src\libflac\include&quot;;&quot;..\..\..\lib-src\libid3tag&quot;;&quot;..\..\..\lib-src\liblrdf&quot;;&quot;..\..\..\lib-src\libmad&quot;;&quot;..\..\..\lib-src\libnyquist\nyx&quot;;&quot;..\..\..\lib-src\libogg\include&quot;;&quot;..\..\..\lib-src\libresample\include&quot;;&quot;..\..\..\lib-src\libsamplerate\src&quot;;&quot;..\..\..\lib-src\libscorealign&quot;;&quot;..\..\..\lib-src\libsndfile\Win32&quot;;&quot;..\..\..\lib-src\libsndfile\src&quot;;&quot;..\..\..\lib-src\libvamp&quot;;&quot;..\..\..\lib-src\libvorbis\include&quot;;&quot;..\..\..\lib-src\portaudio-v19\include&quot;;&quot;..\..\..\lib-src\portmixer\include&quot;;&quot;..\..\..\lib-src\portsmf&quot;;&quot;..\..\..\lib-src\redland\raptor\src&quot;;&quot;..\..\..\lib-src\slv2&quot;;&quot;..\..\..\lib-src\sbsms\include&quot;;&quot;..\..\..\lib-src\soundtouch\include&quot;;&quot;..\..\..\lib-src\twolame\libtwolame&quot;"
+				PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;NDEBUG;WIN32;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -1066,6 +1066,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\effects\Contrast.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\effects\Contrast.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\effects\DtmfGen.cpp"
 				>
 			</File>
@@ -1210,6 +1218,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\effects\SBSMSEffect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\effects\SBSMSEffect.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\effects\Silence.cpp"
 				>
 			</File>
@@ -1258,6 +1274,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\effects\TimeScale.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\effects\TimeScale.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\effects\ToneGen.cpp"
 				>
 			</File>
@@ -1710,14 +1734,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\widgets\treebook.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\widgets\treebook.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\src\widgets\Warning.cpp"
 				>
 			</File>
diff --git a/win/Projects/libnyquist/libnyquist.vcproj b/win/Projects/libnyquist/libnyquist.vcproj
index 6fb227b..d1990cf 100644
--- a/win/Projects/libnyquist/libnyquist.vcproj
+++ b/win/Projects/libnyquist/libnyquist.vcproj
@@ -24,6 +24,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="set OUTDIR=$(InputDir)&#x0D;&#x0A;set INTGEN=&quot;$(InputDir)/$(ConfigurationName)/intgen.exe&quot;&#x0D;&#x0A;cd ..\..\..\lib-src\libnyquist&#x0D;&#x0A;cl /Fe%INTGEN% /D WIN32 /D NDEBUG /I win  /I cmt misc\intgen.c misc\cmdline.c&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/sndfnint&quot; snd/snd.h nyqsrc/sound.h nyqsrc/downsample.h nyqsrc/sndread.h nyqsrc/sndseq.h nyqsrc/add.h nyqsrc/multiseq.h nyqsrc/samples.h nyqsrc/sndwrite.h nyqsrc/sndmax.h nyqsrc/compose.h nyqsrc/inverse.h nyqsrc/resamp.h nyqsrc/resampv.h nyqsrc/fft.h nyqsrc/avg.h tran/amosc.h tran/clip.h tran/const.h tran/fmosc.h tran/integrate.h tran/log.h tran/maxv.h tran/osc.h tran/prod.h tran/buzz.h tran/pwl.h tran/recip.h tran/upsample.h tran/scale.h tran/sine.h tran/partial.h tran/white.h tran/tone.h tran/tonev.h tran/atonev.h tran/atone.h tran/reson.h tran/areson.h tran/resonvc.h tran/resoncv.h tran/aresonvc.h tran/aresoncv.h tran/resonvv.h tran/aresonvv.h tran/offset.h tran/slope.h tran/delay.h tran/delaycv.h tran/shape.h tran/sampler.h tran/exp.h tran/siosc.h tran/follow.h tran/gate.h tran/quantize.h tran/ifft.h tran/congen.h tran/fromobject.h tran/fromarraystream.h tran/coterm.h tran/convolve.h tran/alpass.h tran/oneshot.h tran/chase.h tran/tapv.h tran/biquad.h tran/pluck.h tran/abs.h tran/sqrt.h tran/alpasscv.h tran/alpassvc.h&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/seqfnint&quot; cmt/seqdecls.h nyqsrc/seqext.h cmt/seq.h nyqsrc/seqinterf.h cmt/seqread.h cmt/seqmread.h cmt/seqwrite.h cmt/seqmwrite.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -39,7 +40,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
+				AdditionalIncludeDirectories="&quot;$(ConfigurationName)&quot;;&quot;..\..\..\lib-src\libnyquist&quot;;&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -87,6 +88,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="set OUTDIR=$(InputDir)&#x0D;&#x0A;set INTGEN=&quot;$(InputDir)/$(ConfigurationName)/intgen.exe&quot;&#x0D;&#x0A;cd ..\..\..\lib-src\libnyquist&#x0D;&#x0A;cl /Fe%INTGEN% /D WIN32 /D NDEBUG /I win  /I cmt misc\intgen.c misc\cmdline.c&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/sndfnint&quot; snd/snd.h nyqsrc/sound.h nyqsrc/downsample.h nyqsrc/sndread.h nyqsrc/sndseq.h nyqsrc/add.h nyqsrc/multiseq.h nyqsrc/samples.h nyqsrc/sndwrite.h nyqsrc/sndmax.h nyqsrc/compose.h nyqsrc/inverse.h nyqsrc/resamp.h nyqsrc/resampv.h nyqsrc/fft.h nyqsrc/avg.h tran/amosc.h tran/clip.h tran/const.h tran/fmosc.h tran/integrate.h tran/log.h tran/maxv.h tran/osc.h tran/prod.h tran/buzz.h tran/pwl.h tran/recip.h tran/upsample.h tran/scale.h tran/sine.h tran/partial.h tran/white.h tran/tone.h tran/tonev.h tran/atonev.h tran/atone.h tran/reson.h tran/areson.h tran/resonvc.h tran/resoncv.h tran/aresonvc.h tran/aresoncv.h tran/resonvv.h tran/aresonvv.h tran/offset.h tran/slope.h tran/delay.h tran/delaycv.h tran/shape.h tran/sampler.h tran/exp.h tran/siosc.h tran/follow.h tran/gate.h tran/quantize.h tran/ifft.h tran/congen.h tran/fromobject.h tran/fromarraystream.h tran/coterm.h tran/convolve.h tran/alpass.h tran/oneshot.h tran/chase.h tran/tapv.h tran/biquad.h tran/pluck.h tran/abs.h tran/sqrt.h tran/alpasscv.h tran/alpassvc.h&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/seqfnint&quot; cmt/seqdecls.h nyqsrc/seqext.h cmt/seq.h nyqsrc/seqinterf.h cmt/seqread.h cmt/seqmread.h cmt/seqwrite.h cmt/seqmwrite.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -103,7 +105,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
+				AdditionalIncludeDirectories="&quot;$(ConfigurationName)&quot;;&quot;..\..\..\lib-src\libnyquist&quot;;&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
 				StringPooling="true"
 				BasicRuntimeChecks="3"
@@ -153,6 +155,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="set OUTDIR=$(InputDir)&#x0D;&#x0A;set INTGEN=&quot;$(InputDir)/$(ConfigurationName)/intgen.exe&quot;&#x0D;&#x0A;cd ..\..\..\lib-src\libnyquist&#x0D;&#x0A;cl /Fe%INTGEN% /D WIN32 /D NDEBUG /I win  /I cmt misc\intgen.c misc\cmdline.c&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/sndfnint&quot; snd/snd.h nyqsrc/sound.h nyqsrc/downsample.h nyqsrc/sndread.h nyqsrc/sndseq.h nyqsrc/add.h nyqsrc/multiseq.h nyqsrc/samples.h nyqsrc/sndwrite.h nyqsrc/sndmax.h nyqsrc/compose.h nyqsrc/inverse.h nyqsrc/resamp.h nyqsrc/resampv.h nyqsrc/fft.h nyqsrc/avg.h tran/amosc.h tran/clip.h tran/const.h tran/fmosc.h tran/integrate.h tran/log.h tran/maxv.h tran/osc.h tran/prod.h tran/buzz.h tran/pwl.h tran/recip.h tran/upsample.h tran/scale.h tran/sine.h tran/partial.h tran/white.h tran/tone.h tran/tonev.h tran/atonev.h tran/atone.h tran/reson.h tran/areson.h tran/resonvc.h tran/resoncv.h tran/aresonvc.h tran/aresoncv.h tran/resonvv.h tran/aresonvv.h tran/offset.h tran/slope.h tran/delay.h tran/delaycv.h tran/shape.h tran/sampler.h tran/exp.h tran/siosc.h tran/follow.h tran/gate.h tran/quantize.h tran/ifft.h tran/congen.h tran/fromobject.h tran/fromarraystream.h tran/coterm.h tran/convolve.h tran/alpass.h tran/oneshot.h tran/chase.h tran/tapv.h tran/biquad.h tran/pluck.h tran/abs.h tran/sqrt.h tran/alpasscv.h tran/alpassvc.h&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/seqfnint&quot; cmt/seqdecls.h nyqsrc/seqext.h cmt/seq.h nyqsrc/seqinterf.h cmt/seqread.h cmt/seqmread.h cmt/seqwrite.h cmt/seqmwrite.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -169,7 +172,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
+				AdditionalIncludeDirectories="&quot;$(ConfigurationName)&quot;;&quot;..\..\..\lib-src\libnyquist&quot;;&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
 				StringPooling="true"
 				BasicRuntimeChecks="3"
@@ -219,6 +222,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="set OUTDIR=$(InputDir)&#x0D;&#x0A;set INTGEN=&quot;$(InputDir)/$(ConfigurationName)/intgen.exe&quot;&#x0D;&#x0A;cd ..\..\..\lib-src\libnyquist&#x0D;&#x0A;cl /Fe%INTGEN% /D WIN32 /D NDEBUG /I win  /I cmt misc\intgen.c misc\cmdline.c&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/sndfnint&quot; snd/snd.h nyqsrc/sound.h nyqsrc/downsample.h nyqsrc/sndread.h nyqsrc/sndseq.h nyqsrc/add.h nyqsrc/multiseq.h nyqsrc/samples.h nyqsrc/sndwrite.h nyqsrc/sndmax.h nyqsrc/compose.h nyqsrc/inverse.h nyqsrc/resamp.h nyqsrc/resampv.h nyqsrc/fft.h nyqsrc/avg.h tran/amosc.h tran/clip.h tran/const.h tran/fmosc.h tran/integrate.h tran/log.h tran/maxv.h tran/osc.h tran/prod.h tran/buzz.h tran/pwl.h tran/recip.h tran/upsample.h tran/scale.h tran/sine.h tran/partial.h tran/white.h tran/tone.h tran/tonev.h tran/atonev.h tran/atone.h tran/reson.h tran/areson.h tran/resonvc.h tran/resoncv.h tran/aresonvc.h tran/aresoncv.h tran/resonvv.h tran/aresonvv.h tran/offset.h tran/slope.h tran/delay.h tran/delaycv.h tran/shape.h tran/sampler.h tran/exp.h tran/siosc.h tran/follow.h tran/gate.h tran/quantize.h tran/ifft.h tran/congen.h tran/fromobject.h tran/fromarraystream.h tran/coterm.h tran/convolve.h tran/alpass.h tran/oneshot.h tran/chase.h tran/tapv.h tran/biquad.h tran/pluck.h tran/abs.h tran/sqrt.h tran/alpasscv.h tran/alpassvc.h&#x0D;&#x0A;%INTGEN% &quot;%OUTDIR%/seqfnint&quot; cmt/seqdecls.h nyqsrc/seqext.h cmt/seq.h nyqsrc/seqinterf.h cmt/seqread.h cmt/seqmread.h cmt/seqwrite.h cmt/seqmwrite.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -234,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
+				AdditionalIncludeDirectories="&quot;$(ConfigurationName)&quot;;&quot;..\..\..\lib-src\libnyquist&quot;;&quot;..\..\..\lib-src\libnyquist\win&quot;;&quot;..\..\..\lib-src\libnyquist\xlisp&quot;;&quot;..\..\..\lib-src\libnyquist\nyqsrc&quot;;&quot;..\..\..\lib-src\libnyquist\cmt&quot;;&quot;..\..\..\lib-src\libnyquist\fft&quot;;&quot;..\..\..\lib-src\libnyquist\tran&quot;;&quot;..\..\..\lib-src\libnyquist\snd&quot;;&quot;..\..\..\lib-src\libnyquist\sys&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -352,10 +356,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libnyquist\nyqsrc\seqfnint.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\lib-src\libnyquist\nyqsrc\seqinterf.c"
 				>
 			</File>
@@ -364,10 +364,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libnyquist\nyqsrc\sndfnint.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\lib-src\libnyquist\nyqsrc\sndmax.c"
 				>
 			</File>
@@ -868,6 +864,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="gen"
+			>
+			<File
+				RelativePath=".\seqfnint.c"
+				>
+			</File>
+			<File
+				RelativePath=".\sndfnint.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/win/Projects/libnyquist/seqfnint.c b/win/Projects/libnyquist/seqfnint.c
new file mode 100644
index 0000000..95d6bf4
--- /dev/null
+++ b/win/Projects/libnyquist/seqfnint.c
@@ -0,0 +1,249 @@
+/* c:\documents and settings\administrator\my documents\audacity\win\projects\libnyquist\/seqfnint.c -- interface to  
+ * cmt/seqdecls.h, nyqsrc/seqext.h, cmt/seq.h, 
+ * nyqsrc/seqinterf.h, cmt/seqread.h, cmt/seqmread.h, 
+ * cmt/seqwrite.h, cmt/seqmwrite.h */
+
+#ifndef mips
+#include "stdlib.h"
+#endif
+#include "xlisp.h"
+
+extern LVAL s_true;
+#define cvboolean(i) ((i) ? s_true : NIL)
+#define testarg2(e) (moreargs() ? (e) : (getflonum(xltoofew())))
+#define xlgaanynum() (floatp(*xlargv) ? getflonum(nextarg()) : \
+    (fixp(*xlargv) ? (double) getfixnum(nextarg()) : \
+        getflonum(xlbadtype(*xlargv))))
+#define getboolean(lval) ((lval) != NIL)
+
+extern LVAL RSLT_sym;
+
+
+#include "cmt/seqdecls.h"
+
+#include "nyqsrc/seqext.h"
+
+#include "cmt/seq.h"
+
+/* xlc_seq_reset -- interface to C routine seq_reset */
+/**/
+LVAL xlc_seq_reset(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+
+    xllastarg();
+    seq_reset(arg1);
+    return NIL;
+}
+
+
+/* xlc_seq_insert_ctrl -- interface to C routine insert_ctrl */
+/**/
+LVAL xlc_seq_insert_ctrl(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+
+    xllastarg();
+    insert_ctrl(arg1, arg2, arg3, arg4, arg5, arg6);
+    return NIL;
+}
+
+
+/* xlc_seq_insert_ramp -- interface to C routine insert_ctrlramp */
+/**/
+LVAL xlc_seq_insert_ramp(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+    long arg7 = getfixnum(xlgafixnum());
+    long arg8 = getfixnum(xlgafixnum());
+    long arg9 = getfixnum(xlgafixnum());
+
+    xllastarg();
+    insert_ctrlramp(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+    return NIL;
+}
+
+
+/* xlc_seq_insert_macctrl -- interface to C routine insert_macctrl */
+/**/
+LVAL xlc_seq_insert_macctrl(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+
+    xllastarg();
+    insert_macctrl(arg1, arg2, arg3, arg4, arg5, arg6);
+    return NIL;
+}
+
+
+/* xlc_seq_insert_note -- interface to C routine insert_note */
+/**/
+LVAL xlc_seq_insert_note(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+    long arg7 = getfixnum(xlgafixnum());
+
+    xllastarg();
+    insert_note(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    return NIL;
+}
+
+
+/* xlc_seq_copy -- interface to C routine seq_copy */
+/**/
+LVAL xlc_seq_copy(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    seq_type result;
+
+    xllastarg();
+    result = seq_copy(arg1);
+    return cvseq(result);
+}
+
+
+/* xlc_seq_create -- interface to C routine seq_create */
+/**/
+LVAL xlc_seq_create(void)
+{
+    seq_type result;
+
+    xllastarg();
+    result = seq_create();
+    return cvseq(result);
+}
+
+
+#include "nyqsrc/seqinterf.h"
+
+/* xlc_seq_next -- interface to C routine seq_next */
+/**/
+LVAL xlc_seq_next(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    boolean result;
+
+    xllastarg();
+    result = seq_next(arg1);
+    return cvboolean(result);
+}
+
+
+/* xlc_seq_get -- interface to C routine seq_get */
+/**/
+LVAL xlc_seq_get(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    long arg2 = 0;
+    long arg3 = 0;
+    long arg4 = 0;
+    long arg5 = 0;
+    long arg6 = 0;
+    long arg7 = 0;
+    long arg8 = 0;
+    LVAL result;
+
+    xllastarg();
+    seq_get(arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8);
+    {	LVAL *next = &getvalue(RSLT_sym);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg2);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg3);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg4);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg5);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg6);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg7);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg8);
+    }
+    result = getvalue(RSLT_sym);
+    return result;
+}
+
+
+#include "cmt/seqread.h"
+
+/* xlc_seq_read -- interface to C routine seq_read */
+/**/
+LVAL xlc_seq_read(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    FILE * arg2 = getfile(xlgastream());
+
+    xllastarg();
+    seq_read(arg1, arg2);
+    return NIL;
+}
+
+
+#include "cmt/seqmread.h"
+
+/* xlc_seq_read_smf -- interface to C routine seq_read_smf */
+/**/
+LVAL xlc_seq_read_smf(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    FILE * arg2 = getfile(xlgastream());
+
+    xllastarg();
+    seq_read_smf(arg1, arg2);
+    return NIL;
+}
+
+
+#include "cmt/seqwrite.h"
+
+/* xlc_seq_write -- interface to C routine seq_write */
+/**/
+LVAL xlc_seq_write(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    FILE * arg2 = getfile(xlgastream());
+    int arg3 = getboolean(xlgetarg());
+
+    xllastarg();
+    seq_write(arg1, arg2, arg3);
+    return NIL;
+}
+
+
+#include "cmt/seqmwrite.h"
+
+/* xlc_seq_write_smf -- interface to C routine seq_write_smf */
+/**/
+LVAL xlc_seq_write_smf(void)
+{
+    seq_type arg1 = getseq(xlgaseq());
+    FILE * arg2 = getfile(xlgastream());
+
+    xllastarg();
+    seq_write_smf(arg1, arg2);
+    return NIL;
+}
+
+
diff --git a/win/Projects/libnyquist/sndfnint.c b/win/Projects/libnyquist/sndfnint.c
new file mode 100644
index 0000000..e018b48
--- /dev/null
+++ b/win/Projects/libnyquist/sndfnint.c
@@ -0,0 +1,1670 @@
+/* c:\documents and settings\administrator\my documents\audacity\win\projects\libnyquist\/sndfnint.c -- interface to  
+ * snd/snd.h, nyqsrc/sound.h, nyqsrc/downsample.h, 
+ * nyqsrc/sndread.h, nyqsrc/sndseq.h, nyqsrc/add.h, 
+ * nyqsrc/multiseq.h, nyqsrc/samples.h, nyqsrc/sndwrite.h, 
+ * nyqsrc/sndmax.h, nyqsrc/compose.h, nyqsrc/inverse.h, 
+ * nyqsrc/resamp.h, nyqsrc/resampv.h, nyqsrc/fft.h, 
+ * nyqsrc/avg.h, tran/amosc.h, tran/clip.h, tran/const.h, 
+ * tran/fmosc.h, tran/integrate.h, tran/log.h, 
+ * tran/maxv.h, tran/osc.h, tran/prod.h, tran/buzz.h, 
+ * tran/pwl.h, tran/recip.h, tran/upsample.h, 
+ * tran/scale.h, tran/sine.h, tran/partial.h, 
+ * tran/white.h, tran/tone.h, tran/tonev.h, 
+ * tran/atonev.h, tran/atone.h, tran/reson.h, 
+ * tran/areson.h, tran/resonvc.h, tran/resoncv.h, 
+ * tran/aresonvc.h, tran/aresoncv.h, tran/resonvv.h, 
+ * tran/aresonvv.h, tran/offset.h, tran/slope.h, 
+ * tran/delay.h, tran/delaycv.h, tran/shape.h, 
+ * tran/sampler.h, tran/exp.h, tran/siosc.h, 
+ * tran/follow.h, tran/gate.h, tran/quantize.h, 
+ * tran/ifft.h, tran/congen.h, tran/fromobject.h, 
+ * tran/fromarraystream.h, tran/coterm.h, tran/convolve.h, 
+ * tran/alpass.h, tran/oneshot.h, tran/chase.h, 
+ * tran/tapv.h, tran/biquad.h, tran/pluck.h, tran/abs.h, 
+ * tran/sqrt.h, tran/alpasscv.h, tran/alpassvc.h */
+
+#ifndef mips
+#include "stdlib.h"
+#endif
+#include "xlisp.h"
+
+extern LVAL s_true;
+#define cvboolean(i) ((i) ? s_true : NIL)
+#define testarg2(e) (moreargs() ? (e) : (getflonum(xltoofew())))
+#define xlgaanynum() (floatp(*xlargv) ? getflonum(nextarg()) : \
+    (fixp(*xlargv) ? (double) getfixnum(nextarg()) : \
+        getflonum(xlbadtype(*xlargv))))
+#define getboolean(lval) ((lval) != NIL)
+
+extern LVAL RSLT_sym;
+
+
+#include "snd/snd.h"
+
+#include "nyqsrc/sound.h"
+
+/* xlc_soundp -- interface to C routine soundp */
+/**/
+LVAL xlc_soundp(void)
+{
+    LVAL arg1 = xlgetarg();
+    boolean result;
+
+    xllastarg();
+    result = soundp(arg1);
+    return cvboolean(result);
+}
+
+
+/* xlc_hz_to_step -- interface to C routine hz_to_step */
+/**/
+LVAL xlc_hz_to_step(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double result;
+
+    xllastarg();
+    result = hz_to_step(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_set_logical_stop -- interface to C routine set_logical_stop_time */
+/**/
+LVAL xlc_snd_set_logical_stop(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+
+    xllastarg();
+    set_logical_stop_time(arg1, arg2);
+    return NIL;
+}
+
+
+/* xlc_log -- interface to C routine xlog */
+/**/
+LVAL xlc_log(void)
+{
+    double arg1 = getflonum(xlgaflonum());
+    double result;
+
+    xllastarg();
+    result = xlog(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_sref -- interface to C routine snd_sref */
+/**/
+LVAL xlc_snd_sref(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double result;
+
+    xllastarg();
+    result = snd_sref(arg1, arg2);
+    return cvflonum(result);
+}
+
+
+/* xlc_sref_inverse -- interface to C routine snd_sref_inverse */
+/**/
+LVAL xlc_sref_inverse(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double result;
+
+    xllastarg();
+    result = snd_sref_inverse(arg1, arg2);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_stop_time -- interface to C routine snd_stop_time */
+/**/
+LVAL xlc_snd_stop_time(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double result;
+
+    xllastarg();
+    result = snd_stop_time(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_time -- interface to C routine snd_time */
+/**/
+LVAL xlc_snd_time(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double result;
+
+    xllastarg();
+    result = snd_time(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_srate -- interface to C routine snd_srate */
+/**/
+LVAL xlc_snd_srate(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double result;
+
+    xllastarg();
+    result = snd_srate(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_t0 -- interface to C routine snd_t0 */
+/**/
+LVAL xlc_snd_t0(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double result;
+
+    xllastarg();
+    result = snd_t0(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_xform -- interface to C routine snd_xform */
+/**/
+LVAL xlc_snd_xform(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    double arg6 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_xform(arg1, arg2, arg3, arg4, arg5, arg6);
+    return cvsound(result);
+}
+
+
+/* xlc_block_watch -- interface to C routine block_watch */
+/**/
+LVAL xlc_block_watch(void)
+{
+    long arg1 = getfixnum(xlgafixnum());
+
+    xllastarg();
+    block_watch(arg1);
+    return NIL;
+}
+
+
+/* xlc_sound_nth_block -- interface to C routine sound_nth_block */
+/**/
+LVAL xlc_sound_nth_block(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    long result;
+
+    xllastarg();
+    result = sound_nth_block(arg1, arg2);
+    return cvfixnum(result);
+}
+
+
+/* xlc_snd_copy -- interface to C routine sound_copy */
+/**/
+LVAL xlc_snd_copy(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = sound_copy(arg1);
+    return cvsound(result);
+}
+
+
+/* xlc_snd_print -- interface to C routine sound_print */
+/**/
+LVAL xlc_snd_print(void)
+{
+    LVAL arg1 = xlgetarg();
+    long arg2 = getfixnum(xlgafixnum());
+
+    xllastarg();
+    sound_print(arg1, arg2);
+    return NIL;
+}
+
+
+/* xlc_snd_play -- interface to C routine sound_play */
+/**/
+LVAL xlc_snd_play(void)
+{
+    LVAL arg1 = xlgetarg();
+
+    xllastarg();
+    sound_play(arg1);
+    return NIL;
+}
+
+
+/* xlc_stats -- interface to C routine stats */
+/**/
+LVAL xlc_stats(void)
+{
+
+    xllastarg();
+    stats();
+    return NIL;
+}
+
+
+/* xlc_snd_print_tree -- interface to C routine sound_print_tree */
+/**/
+LVAL xlc_snd_print_tree(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+
+    xllastarg();
+    sound_print_tree(arg1);
+    return NIL;
+}
+
+
+/* xlc_snd_scale -- interface to C routine sound_scale */
+/**/
+LVAL xlc_snd_scale(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = sound_scale(arg1, arg2);
+    return cvsound(result);
+}
+
+
+/* xlc_snd_zero -- interface to C routine sound_zero */
+/**/
+LVAL xlc_snd_zero(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = sound_zero(arg1, arg2);
+    return cvsound(result);
+}
+
+
+/* xlc_step_to_hz -- interface to C routine step_to_hz */
+/**/
+LVAL xlc_step_to_hz(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double result;
+
+    xllastarg();
+    result = step_to_hz(arg1);
+    return cvflonum(result);
+}
+
+
+#include "nyqsrc/downsample.h"
+
+/* xlc_snd_down -- interface to C routine snd_down */
+/**/
+LVAL xlc_snd_down(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_down(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/sndread.h"
+
+/* xlc_snd_read -- interface to C routine snd_make_read */
+/**/
+LVAL xlc_snd_read(void)
+{
+    unsigned char * arg1 = getstring(xlgastring());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+    long arg7 = getfixnum(xlgafixnum());
+    long arg8 = getfixnum(xlgafixnum());
+    double arg9 = testarg2(xlgaanynum());
+    double arg10 = testarg2(xlgaanynum());
+    long arg11 = 0;
+    long arg12 = 0;
+    LVAL result;
+
+    xllastarg();
+    xlprot1(result);
+    result = snd_make_read(arg1, arg2, arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, &arg10, &arg11, &arg12);
+    {	LVAL *next = &getvalue(RSLT_sym);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg4);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg5);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg6);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg7);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg8);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvflonum(arg9);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvflonum(arg10);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg11);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg12);
+    }
+    xlpop();
+    return (result);
+}
+
+
+#include "nyqsrc/sndseq.h"
+
+/* xlc_snd_seq -- interface to C routine snd_sndseq */
+/**/
+LVAL xlc_snd_seq(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    LVAL arg2 = xlgetarg();
+    sound_type result;
+
+    xllastarg();
+    result = snd_sndseq(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/add.h"
+
+/* xlc_snd_add -- interface to C routine snd_add */
+/**/
+LVAL xlc_snd_add(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_add(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/multiseq.h"
+
+/* xlc_snd_multiseq -- interface to C routine snd_make_multiseq */
+/**/
+LVAL xlc_snd_multiseq(void)
+{
+    LVAL arg1 = xlgetarg();
+    LVAL arg2 = xlgetarg();
+    LVAL result;
+
+    xllastarg();
+    result = snd_make_multiseq(arg1, arg2);
+    return (result);
+}
+
+
+#include "nyqsrc/samples.h"
+
+/* xlc_snd_from_array -- interface to C routine snd_from_array */
+/**/
+LVAL xlc_snd_from_array(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    LVAL arg3 = xlgetarg();
+    sound_type result;
+
+    xllastarg();
+    result = snd_from_array(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+/* xlc_snd_samples -- interface to C routine snd_samples */
+/**/
+LVAL xlc_snd_samples(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    LVAL result;
+
+    xllastarg();
+    result = snd_samples(arg1, arg2);
+    return (result);
+}
+
+
+/* xlc_snd_length -- interface to C routine snd_length */
+/**/
+LVAL xlc_snd_length(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    long result;
+
+    xllastarg();
+    result = snd_length(arg1, arg2);
+    return cvfixnum(result);
+}
+
+
+/* xlc_snd_maxsamp -- interface to C routine snd_maxsamp */
+/**/
+LVAL xlc_snd_maxsamp(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double result;
+
+    xllastarg();
+    result = snd_maxsamp(arg1);
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_fetch -- interface to C routine snd_fetch */
+/**/
+LVAL xlc_snd_fetch(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    LVAL result;
+
+    xllastarg();
+    result = snd_fetch(arg1);
+    return (result);
+}
+
+
+/* xlc_snd_fetch_array -- interface to C routine snd_fetch_array */
+/**/
+LVAL xlc_snd_fetch_array(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    LVAL result;
+
+    xllastarg();
+    result = snd_fetch_array(arg1, arg2, arg3);
+    return (result);
+}
+
+
+#include "nyqsrc/sndwrite.h"
+
+/* xlc_snd_save -- interface to C routine sound_save */
+/**/
+LVAL xlc_snd_save(void)
+{
+    LVAL arg1 = xlgetarg();
+    long arg2 = getfixnum(xlgafixnum());
+    unsigned char * arg3 = getstring(xlgastring());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+    long arg7 = getfixnum(xlgafixnum());
+    double arg8 = 0.0;
+    long arg9 = 0;
+    double arg10 = 0.0;
+    LVAL arg11 = xlgetarg();
+    double result;
+
+    xllastarg();
+    result = sound_save(arg1, arg2, arg3, arg4, arg5, arg6, arg7, &arg8, &arg9, &arg10, arg11);
+    {	LVAL *next = &getvalue(RSLT_sym);
+	*next = cons(NIL, NIL);
+	car(*next) = cvflonum(arg8);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvfixnum(arg9);	next = &cdr(*next);
+	*next = cons(NIL, NIL);
+	car(*next) = cvflonum(arg10);
+    }
+    return cvflonum(result);
+}
+
+
+/* xlc_snd_overwrite -- interface to C routine sound_overwrite */
+/**/
+LVAL xlc_snd_overwrite(void)
+{
+    LVAL arg1 = xlgetarg();
+    long arg2 = getfixnum(xlgafixnum());
+    unsigned char * arg3 = getstring(xlgastring());
+    long arg4 = getfixnum(xlgafixnum());
+    long arg5 = getfixnum(xlgafixnum());
+    long arg6 = getfixnum(xlgafixnum());
+    long arg7 = getfixnum(xlgafixnum());
+    long arg8 = getfixnum(xlgafixnum());
+    double arg9 = testarg2(xlgaanynum());
+    long arg10 = getfixnum(xlgafixnum());
+    double arg11 = 0.0;
+    double result;
+
+    xllastarg();
+    result = sound_overwrite(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, &arg11);
+    {	LVAL *next = &getvalue(RSLT_sym);
+	*next = cons(NIL, NIL);
+	car(*next) = cvflonum(arg11);
+    }
+    return cvflonum(result);
+}
+
+
+#include "nyqsrc/sndmax.h"
+
+/* xlc_snd_max -- interface to C routine sound_max */
+/**/
+LVAL xlc_snd_max(void)
+{
+    LVAL arg1 = xlgetarg();
+    long arg2 = getfixnum(xlgafixnum());
+    double result;
+
+    xllastarg();
+    result = sound_max(arg1, arg2);
+    return cvflonum(result);
+}
+
+
+#include "nyqsrc/compose.h"
+
+/* xlc_snd_compose -- interface to C routine snd_compose */
+/**/
+LVAL xlc_snd_compose(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_compose(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/inverse.h"
+
+/* xlc_snd_inverse -- interface to C routine snd_inverse */
+/**/
+LVAL xlc_snd_inverse(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_inverse(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/resamp.h"
+
+/* xlc_snd_resample -- interface to C routine snd_resample */
+/**/
+LVAL xlc_snd_resample(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_resample(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/resampv.h"
+
+/* xlc_snd_resamplev -- interface to C routine snd_resamplev */
+/**/
+LVAL xlc_snd_resamplev(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_resamplev(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "nyqsrc/fft.h"
+
+/* xlc_snd_fft -- interface to C routine snd_fft */
+/**/
+LVAL xlc_snd_fft(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    LVAL arg4 = xlgetarg();
+    LVAL result;
+
+    xllastarg();
+    result = snd_fft(arg1, arg2, arg3, arg4);
+    return (result);
+}
+
+
+#include "nyqsrc/avg.h"
+
+/* xlc_snd_avg -- interface to C routine snd_avg */
+/**/
+LVAL xlc_snd_avg(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    long arg3 = getfixnum(xlgafixnum());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_avg(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/amosc.h"
+
+/* xlc_snd_amosc -- interface to C routine snd_amosc */
+/**/
+LVAL xlc_snd_amosc(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    sound_type arg6 = getsound(xlgasound());
+    double arg7 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_amosc(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    return cvsound(result);
+}
+
+
+#include "tran/clip.h"
+
+/* xlc_snd_clip -- interface to C routine snd_clip */
+/**/
+LVAL xlc_snd_clip(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_clip(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/const.h"
+
+/* xlc_snd_const -- interface to C routine snd_const */
+/**/
+LVAL xlc_snd_const(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_const(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/fmosc.h"
+
+/* xlc_snd_fmosc -- interface to C routine snd_fmosc */
+/**/
+LVAL xlc_snd_fmosc(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    sound_type arg6 = getsound(xlgasound());
+    double arg7 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_fmosc(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    return cvsound(result);
+}
+
+
+#include "tran/integrate.h"
+
+/* xlc_snd_integrate -- interface to C routine snd_integrate */
+/**/
+LVAL xlc_snd_integrate(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_integrate(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/log.h"
+
+/* xlc_snd_log -- interface to C routine snd_log */
+/**/
+LVAL xlc_snd_log(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_log(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/maxv.h"
+
+/* xlc_snd_maxv -- interface to C routine snd_maxv */
+/**/
+LVAL xlc_snd_maxv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_maxv(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/osc.h"
+
+/* xlc_snd_osc -- interface to C routine snd_osc */
+/**/
+LVAL xlc_snd_osc(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    double arg6 = testarg2(xlgaanynum());
+    double arg7 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_osc(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    return cvsound(result);
+}
+
+
+#include "tran/prod.h"
+
+/* xlc_snd_prod -- interface to C routine snd_prod */
+/**/
+LVAL xlc_snd_prod(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_prod(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/buzz.h"
+
+/* xlc_snd_buzz -- interface to C routine snd_buzz */
+/**/
+LVAL xlc_snd_buzz(void)
+{
+    long arg1 = getfixnum(xlgafixnum());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    sound_type arg5 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_buzz(arg1, arg2, arg3, arg4, arg5);
+    return cvsound(result);
+}
+
+
+#include "tran/pwl.h"
+
+/* xlc_snd_pwl -- interface to C routine snd_pwl */
+/**/
+LVAL xlc_snd_pwl(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    LVAL arg3 = xlgetarg();
+    sound_type result;
+
+    xllastarg();
+    result = snd_pwl(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/recip.h"
+
+/* xlc_snd_recip -- interface to C routine snd_recip */
+/**/
+LVAL xlc_snd_recip(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_recip(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/upsample.h"
+
+/* xlc_snd_up -- interface to C routine snd_up */
+/**/
+LVAL xlc_snd_up(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_up(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/scale.h"
+
+/* xlc_snd_normalize -- interface to C routine snd_normalize */
+/**/
+LVAL xlc_snd_normalize(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_normalize(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/sine.h"
+
+/* xlc_snd_sine -- interface to C routine snd_sine */
+/**/
+LVAL xlc_snd_sine(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_sine(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/partial.h"
+
+/* xlc_snd_partial -- interface to C routine snd_partial */
+/**/
+LVAL xlc_snd_partial(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_partial(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/white.h"
+
+/* xlc_snd_white -- interface to C routine snd_white */
+/**/
+LVAL xlc_snd_white(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_white(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/tone.h"
+
+/* xlc_snd_tone -- interface to C routine snd_tone */
+/**/
+LVAL xlc_snd_tone(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_tone(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/tonev.h"
+
+/* xlc_snd_tonev -- interface to C routine snd_tonev */
+/**/
+LVAL xlc_snd_tonev(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_tonev(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/atonev.h"
+
+/* xlc_snd_atonev -- interface to C routine snd_atonev */
+/**/
+LVAL xlc_snd_atonev(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_atonev(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/atone.h"
+
+/* xlc_snd_atone -- interface to C routine snd_atone */
+/**/
+LVAL xlc_snd_atone(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_atone(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/reson.h"
+
+/* xlc_snd_reson -- interface to C routine snd_reson */
+/**/
+LVAL xlc_snd_reson(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_reson(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/areson.h"
+
+/* xlc_snd_areson -- interface to C routine snd_areson */
+/**/
+LVAL xlc_snd_areson(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_areson(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/resonvc.h"
+
+/* xlc_snd_resonvc -- interface to C routine snd_resonvc */
+/**/
+LVAL xlc_snd_resonvc(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    double arg3 = testarg2(xlgaanynum());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_resonvc(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/resoncv.h"
+
+/* xlc_snd_resoncv -- interface to C routine snd_resoncv */
+/**/
+LVAL xlc_snd_resoncv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_resoncv(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/aresonvc.h"
+
+/* xlc_snd_aresonvc -- interface to C routine snd_aresonvc */
+/**/
+LVAL xlc_snd_aresonvc(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    double arg3 = testarg2(xlgaanynum());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_aresonvc(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/aresoncv.h"
+
+/* xlc_snd_aresoncv -- interface to C routine snd_aresoncv */
+/**/
+LVAL xlc_snd_aresoncv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_aresoncv(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/resonvv.h"
+
+/* xlc_snd_resonvv -- interface to C routine snd_resonvv */
+/**/
+LVAL xlc_snd_resonvv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type arg3 = getsound(xlgasound());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_resonvv(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/aresonvv.h"
+
+/* xlc_snd_aresonvv -- interface to C routine snd_aresonvv */
+/**/
+LVAL xlc_snd_aresonvv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type arg3 = getsound(xlgasound());
+    long arg4 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_aresonvv(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/offset.h"
+
+/* xlc_snd_offset -- interface to C routine snd_offset */
+/**/
+LVAL xlc_snd_offset(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_offset(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/slope.h"
+
+/* xlc_snd_slope -- interface to C routine snd_slope */
+/**/
+LVAL xlc_snd_slope(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_slope(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/delay.h"
+
+/* xlc_snd_delay -- interface to C routine snd_delay */
+/**/
+LVAL xlc_snd_delay(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_delay(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/delaycv.h"
+
+/* xlc_snd_delaycv -- interface to C routine snd_delaycv */
+/**/
+LVAL xlc_snd_delaycv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_delaycv(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/shape.h"
+
+/* xlc_snd_shape -- interface to C routine snd_shape */
+/**/
+LVAL xlc_snd_shape(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_shape(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/sampler.h"
+
+/* xlc_snd_sampler -- interface to C routine snd_sampler */
+/**/
+LVAL xlc_snd_sampler(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    double arg6 = testarg2(xlgaanynum());
+    sound_type arg7 = getsound(xlgasound());
+    long arg8 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_sampler(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+    return cvsound(result);
+}
+
+
+#include "tran/exp.h"
+
+/* xlc_snd_exp -- interface to C routine snd_exp */
+/**/
+LVAL xlc_snd_exp(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_exp(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/siosc.h"
+
+/* xlc_snd_siosc -- interface to C routine snd_siosc */
+/**/
+LVAL xlc_snd_siosc(void)
+{
+    LVAL arg1 = xlgetarg();
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    sound_type arg5 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_siosc(arg1, arg2, arg3, arg4, arg5);
+    return cvsound(result);
+}
+
+
+#include "tran/follow.h"
+
+/* xlc_snd_follow -- interface to C routine snd_follow */
+/**/
+LVAL xlc_snd_follow(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    long arg5 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_follow(arg1, arg2, arg3, arg4, arg5);
+    return cvsound(result);
+}
+
+
+#include "tran/gate.h"
+
+/* xlc_snd_gate -- interface to C routine snd_gate */
+/**/
+LVAL xlc_snd_gate(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    double arg6 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_gate(arg1, arg2, arg3, arg4, arg5, arg6);
+    return cvsound(result);
+}
+
+
+#include "tran/quantize.h"
+
+/* xlc_snd_quantize -- interface to C routine snd_quantize */
+/**/
+LVAL xlc_snd_quantize(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    long arg2 = getfixnum(xlgafixnum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_quantize(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/ifft.h"
+
+/* xlc_snd_ifft -- interface to C routine snd_ifft */
+/**/
+LVAL xlc_snd_ifft(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    LVAL arg3 = xlgetarg();
+    long arg4 = getfixnum(xlgafixnum());
+    LVAL arg5 = xlgetarg();
+    sound_type result;
+
+    xllastarg();
+    result = snd_ifft(arg1, arg2, arg3, arg4, arg5);
+    return cvsound(result);
+}
+
+
+#include "tran/congen.h"
+
+/* xlc_snd_congen -- interface to C routine snd_congen */
+/**/
+LVAL xlc_snd_congen(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_congen(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/fromobject.h"
+
+/* xlc_snd_fromobject -- interface to C routine snd_fromobject */
+/**/
+LVAL xlc_snd_fromobject(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    LVAL arg3 = xlgetarg();
+    sound_type result;
+
+    xllastarg();
+    result = snd_fromobject(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/fromarraystream.h"
+
+/* xlc_snd_fromarraystream -- interface to C routine snd_fromarraystream */
+/**/
+LVAL xlc_snd_fromarraystream(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    LVAL arg3 = xlgetarg();
+    sound_type result;
+
+    xllastarg();
+    result = snd_fromarraystream(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/coterm.h"
+
+/* xlc_snd_coterm -- interface to C routine snd_coterm */
+/**/
+LVAL xlc_snd_coterm(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_coterm(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/convolve.h"
+
+/* xlc_snd_convolve -- interface to C routine snd_convolve */
+/**/
+LVAL xlc_snd_convolve(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_convolve(arg1, arg2);
+    return cvsound(result);
+}
+
+
+#include "tran/alpass.h"
+
+/* xlc_snd_alpass -- interface to C routine snd_alpass */
+/**/
+LVAL xlc_snd_alpass(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_alpass(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/oneshot.h"
+
+/* xlc_snd_oneshot -- interface to C routine snd_oneshot */
+/**/
+LVAL xlc_snd_oneshot(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_oneshot(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/chase.h"
+
+/* xlc_snd_chase -- interface to C routine snd_chase */
+/**/
+LVAL xlc_snd_chase(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_chase(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/tapv.h"
+
+/* xlc_snd_tapv -- interface to C routine snd_tapv */
+/**/
+LVAL xlc_snd_tapv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    double arg4 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_tapv(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
+#include "tran/biquad.h"
+
+/* xlc_snd_biquad -- interface to C routine snd_biquad */
+/**/
+LVAL xlc_snd_biquad(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    double arg6 = testarg2(xlgaanynum());
+    double arg7 = testarg2(xlgaanynum());
+    double arg8 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_biquad(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+    return cvsound(result);
+}
+
+
+#include "tran/pluck.h"
+
+/* xlc_snd_pluck -- interface to C routine snd_pluck */
+/**/
+LVAL xlc_snd_pluck(void)
+{
+    double arg1 = testarg2(xlgaanynum());
+    double arg2 = testarg2(xlgaanynum());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    double arg5 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_pluck(arg1, arg2, arg3, arg4, arg5);
+    return cvsound(result);
+}
+
+
+#include "tran/abs.h"
+
+/* xlc_snd_abs -- interface to C routine snd_abs */
+/**/
+LVAL xlc_snd_abs(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_abs(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/sqrt.h"
+
+/* xlc_snd_sqrt -- interface to C routine snd_sqrt */
+/**/
+LVAL xlc_snd_sqrt(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_sqrt(arg1);
+    return cvsound(result);
+}
+
+
+#include "tran/alpasscv.h"
+
+/* xlc_snd_alpasscv -- interface to C routine snd_alpasscv */
+/**/
+LVAL xlc_snd_alpasscv(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    double arg2 = testarg2(xlgaanynum());
+    sound_type arg3 = getsound(xlgasound());
+    sound_type result;
+
+    xllastarg();
+    result = snd_alpasscv(arg1, arg2, arg3);
+    return cvsound(result);
+}
+
+
+#include "tran/alpassvc.h"
+
+/* xlc_snd_alpassvc -- interface to C routine snd_alpassvc */
+/**/
+LVAL xlc_snd_alpassvc(void)
+{
+    sound_type arg1 = getsound(xlgasound());
+    sound_type arg2 = getsound(xlgasound());
+    double arg3 = testarg2(xlgaanynum());
+    double arg4 = testarg2(xlgaanynum());
+    sound_type result;
+
+    xllastarg();
+    result = snd_alpassvc(arg1, arg2, arg3, arg4);
+    return cvsound(result);
+}
+
+
diff --git a/win/Projects/libvamp/libvamp.vcproj b/win/Projects/libvamp/libvamp.vcproj
index 3072021..83fd41f 100644
--- a/win/Projects/libvamp/libvamp.vcproj
+++ b/win/Projects/libvamp/libvamp.vcproj
@@ -277,82 +277,90 @@
 	</References>
 	<Files>
 		<Filter
-			Name="src"
+			Name="Header Files"
 			>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\Plugin.h"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\hostguard.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\PluginAdapter.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\Plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\PluginAdapter.h"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginBase.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\PluginBase.h"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginBufferingAdapter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\PluginHostAdapter.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginChannelAdapter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\PluginHostAdapter.h"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginHostAdapter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\RealTime.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginInputDomainAdapter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\RealTime.h"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginLoader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginSummarisingAdapter.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="src/hostext"
-			>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginBufferingAdapter.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\PluginWrapper.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginBufferingAdapter.h"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\RealTime.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginChannelAdapter.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\vamp-hostsdk\vamp-hostsdk.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginBufferingAdapter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginChannelAdapter.h"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginChannelAdapter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginInputDomainAdapter.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginHostAdapter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginInputDomainAdapter.h"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginInputDomainAdapter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginLoader.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginLoader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginLoader.h"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginSummarisingAdapter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginWrapper.cpp"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\PluginWrapper.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib-src\libvamp\vamp-sdk\hostext\PluginWrapper.h"
+				RelativePath="..\..\..\lib-src\libvamp\src\vamp-hostsdk\RealTime.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win/Projects/locale/locale.vcproj b/win/Projects/locale/locale.vcproj
index 39aabd4..47aa990 100644
--- a/win/Projects/locale/locale.vcproj
+++ b/win/Projects/locale/locale.vcproj
@@ -297,14 +297,18 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\locale\ca.po"
+				RelativePath="..\..\..\locale\bs.po"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\locale\cb.po"
+				RelativePath="..\..\..\locale\ca.po"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\locale\ca at valencia.po"
+				>
+			</File> 
+			<File
 				RelativePath="..\..\..\locale\cs.po"
 				>
 			</File>
@@ -361,6 +365,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\locale\id.po"
+				>
+			</File> 
+			<File
 				RelativePath="..\..\..\locale\it.po"
 				>
 			</File>
@@ -369,6 +377,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\locale\ka.po"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\locale\km.po"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\locale\ko.po"
 				>
 			</File>
diff --git a/win/Projects/sbsms/sbsms.vcproj b/win/Projects/sbsms/sbsms.vcproj
new file mode 100644
index 0000000..a18b1d8
--- /dev/null
+++ b/win/Projects/sbsms/sbsms.vcproj
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="sbsms"
+	ProjectGUID="{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}"
+	RootNamespace="sbsms"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\lib-src\sbsms\include;..\..\..\lib-src\sbsms\win"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="..\..\..\lib-src\sbsms\include;..\..\..\lib-src\sbsms\win"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+				CompileAs="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\lib-src\sbsms\include;..\..\..\lib-src\sbsms\win"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Unicode Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="..\..\..\lib-src\sbsms\include;..\..\..\lib-src\sbsms\win"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+				CompileAs="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\audio.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\buffer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\fft.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\grain.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\peak.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\pitch.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\resample.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\sbsms.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\sms.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\subband.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\track.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\trackpoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\utils.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\audio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\defs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\fft.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\grain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\peak.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\real.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\sincCoeffs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\sms.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\subband.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\track.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\trackpoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lib-src\sbsms\src\utils.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win/audacity.sln b/win/audacity.sln
index d5ec74b..c662fed 100644
--- a/win/audacity.sln
+++ b/win/audacity.sln
@@ -1,30 +1,31 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audacity", "Projects\Audacity\Audacity.vcproj", "{1D64095C-F936-4FCF-B609-56E9DDF941FA}"
 	ProjectSection(ProjectDependencies) = postProject
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF} = {A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}
+		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D} = {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}
+		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1} = {5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}
 		{BEF965EB-6330-4D18-858C-3B9F66CA9F18} = {BEF965EB-6330-4D18-858C-3B9F66CA9F18}
-		{7E111491-6A07-4661-90CD-6DEBB83CE755} = {7E111491-6A07-4661-90CD-6DEBB83CE755}
-		{F1E127C2-58B1-4CBF-B91F-0CF6DB9CC6DD} = {F1E127C2-58B1-4CBF-B91F-0CF6DB9CC6DD}
-		{7BAFA434-3257-408A-AAC0-A8D352B2CE54} = {7BAFA434-3257-408A-AAC0-A8D352B2CE54}
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637} = {EC3F5835-C486-4970-8A6B-A0700F4B3637}
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245} = {6C7DC635-26FB-419A-B69A-7ECBBB068245}
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06} = {B28C9F3F-FF0E-4FEC-844C-685390B8AC06}
-		{5284D863-3813-479F-BBF0-AC234E216BC6} = {5284D863-3813-479F-BBF0-AC234E216BC6}
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952} = {F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0} = {727D6675-67EE-4D0B-9DC1-177A0AF741F0}
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59} = {7ABA0F80-94AE-4E82-AB89-2E1258212D59}
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569} = {3A76129B-55AB-4D54-BAA7-08F63ED52569}
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177} = {A52BBEA5-8B02-4147-8734-5D9BBF4D1177}
-		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC} = {3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}
-		{38C2C6B1-FBF8-4C5C-BB90-63F996083F56} = {38C2C6B1-FBF8-4C5C-BB90-63F996083F56}
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B} = {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425} = {D96C7BE1-E3F1-4767-BBBB-320E082CE425}
-		{7AA41BED-41B0-427A-9148-DEA40549D158} = {7AA41BED-41B0-427A-9148-DEA40549D158}
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E} = {A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}
-		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2} = {F00717F2-67C8-44E1-AF00-541DFA9CB7F2}
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857} = {A939AAF8-44F1-4CE7-9DD0-7A6E99814857}
-		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1} = {5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D} = {8A1C2514-85DD-4AE2-9CF3-3183B66C537D}
+		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2} = {F00717F2-67C8-44E1-AF00-541DFA9CB7F2}
+		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E} = {A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}
+		{7AA41BED-41B0-427A-9148-DEA40549D158} = {7AA41BED-41B0-427A-9148-DEA40549D158}
+		{D96C7BE1-E3F1-4767-BBBB-320E082CE425} = {D96C7BE1-E3F1-4767-BBBB-320E082CE425}
+		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B} = {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}
+		{38C2C6B1-FBF8-4C5C-BB90-63F996083F56} = {38C2C6B1-FBF8-4C5C-BB90-63F996083F56}
+		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC} = {3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}
+		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177} = {A52BBEA5-8B02-4147-8734-5D9BBF4D1177}
+		{3A76129B-55AB-4D54-BAA7-08F63ED52569} = {3A76129B-55AB-4D54-BAA7-08F63ED52569}
+		{7ABA0F80-94AE-4E82-AB89-2E1258212D59} = {7ABA0F80-94AE-4E82-AB89-2E1258212D59}
+		{727D6675-67EE-4D0B-9DC1-177A0AF741F0} = {727D6675-67EE-4D0B-9DC1-177A0AF741F0}
+		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952} = {F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}
+		{5284D863-3813-479F-BBF0-AC234E216BC6} = {5284D863-3813-479F-BBF0-AC234E216BC6}
+		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06} = {B28C9F3F-FF0E-4FEC-844C-685390B8AC06}
+		{6C7DC635-26FB-419A-B69A-7ECBBB068245} = {6C7DC635-26FB-419A-B69A-7ECBBB068245}
+		{EC3F5835-C486-4970-8A6B-A0700F4B3637} = {EC3F5835-C486-4970-8A6B-A0700F4B3637}
+		{7BAFA434-3257-408A-AAC0-A8D352B2CE54} = {7BAFA434-3257-408A-AAC0-A8D352B2CE54}
+		{F1E127C2-58B1-4CBF-B91F-0CF6DB9CC6DD} = {F1E127C2-58B1-4CBF-B91F-0CF6DB9CC6DD}
+		{7E111491-6A07-4661-90CD-6DEBB83CE755} = {7E111491-6A07-4661-90CD-6DEBB83CE755}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "Projects\expat\expat.vcproj", "{38C2C6B1-FBF8-4C5C-BB90-63F996083F56}"
@@ -49,6 +50,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvamp", "Projects\libvamp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portsmf", "Projects\portsmf\portsmf.vcproj", "{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sbsms", "Projects\sbsms\sbsms.vcproj", "{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -261,6 +264,14 @@ Global
 		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
 		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
 		{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Debug|Win32.Build.0 = Debug|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Release|Win32.ActiveCfg = Release|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Release|Win32.Build.0 = Release|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
+		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win/configwin.h b/win/configwin.h
index a5541ab..e0a27fd 100644
--- a/win/configwin.h
+++ b/win/configwin.h
@@ -14,11 +14,12 @@
 #define USE_NYQUIST 1
 #define USE_PORTMIXER 1
 // #define USE_SLV2 1
+#define USE_SBSMS 1
 #define USE_SOUNDTOUCH 1
 #define USE_VAMP 1
 #undef USE_VST
 #define USE_MIDI 1 // define this to use portSMF for midi file support
-#define EXPERIMENTAL_SCOREALIGN 1
+//#define EXPERIMENTAL_SCOREALIGN 1
 
 #define INSTALL_PREFIX "."
 
diff --git a/win/locale.vcproj b/win/locale.vcproj
index aa5e887..a587198 100644
--- a/win/locale.vcproj
+++ b/win/locale.vcproj
@@ -421,11 +421,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\locale\bs.po"
+				>
+			</File>
+			<File
 				RelativePath="..\locale\ca.po"
 				>
 			</File>
 			<File
-				RelativePath="..\locale\cb.po"
+				RelativePath="..\locale\ca at valencia.po"
 				>
 			</File>
 			<File
@@ -477,6 +481,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\locale\id.po"
+				>
+			</File>  
+			<File
 				RelativePath="..\locale\it.po"
 				>
 			</File>
@@ -485,6 +493,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\locale\ka.po"
+				>
+			</File>
+			<File
+				RelativePath="..\locale\km.po"
+				>
+			</File>
+			<File
+				RelativePath="..\locale\ko.po"
+				>
+			</File>
+			<File
 				RelativePath="..\locale\lt.po"
 				>
 			</File>
@@ -505,6 +525,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\locale\pt_BR.po"
+				>
+			</File>
+			<File
 				RelativePath="..\locale\ru.po"
 				>
 			</File>

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list